diff --git a/.gitignore b/.gitignore
index c8f2cce2a..cce018e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.pro.user
 *.o
 *moc_*
+src/moc_*
 *.rar
 debug/*
 release/*
@@ -24,10 +25,12 @@ makefile.*
 Makefile.*
 Makefile*
 makefile*
+!/Makefile
 include/Libs*
 .cproject
 .project
 .settings
+src/moc_*.cpp
 *.log
 *.cppcheck
 *.rc
@@ -106,3 +109,17 @@ src/ui/ui_*.h
 bin/douml
 qrc_*.cpp
 src/CppReverse/cpp_reverse
+/bin/
+!/bin/settings.ini
+!src/settings_ini.h
+/install/
+.DS_Store
+.qmake.stash
+xcuserdata/
+Info.plist
+*.xcodeproj
+project.pbxproj
+project.xcworkspace
+qt_makeqmake.mak
+qt_preprocess.mak
+xcshareddata/
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..0a0b81c30
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,140 @@
+
+
+# Next release
+[#155]: https://github.com/DoUML/douml/pull/155
+[#161]: https://github.com/DoUML/douml/pull/161
+[#167]: https://github.com/DoUML/douml/pull/167
+[#170]: https://github.com/DoUML/douml/pull/170
+[#173]: https://github.com/DoUML/douml/pull/173
+[#179]: https://github.com/DoUML/douml/pull/179
+[#194]: https://github.com/DoUML/douml/pull/194
+
+* Fixed compilation on OS X El Capitan [#155]
+* Fixed warning about duplicated uml entities showing up needlessly [#161]
+* Build date and time automated [#161]
+* Fixed mutually exclusive attribute menus when they should not be [#161] [#167]
+* Fixed some keywords not being parsed by cpp reverse and roundtrip [#161]
+* Some UI improvements [#161] [#194]
+* Version bump [#161]
+* Improvements regarding Qt5 style handling [#167]
+* Crash fix and code improvements [#167] [#179]
+* Missing specifiers of c++ operation added to CppReverse and CppRoundtrip [#167]
+* Fix missing = sign in default and delete specifiers [#167]
+* Reduce amount of warnings [#170]
+* Warnings about deprecated use of Qt will be shown when compiling. [#170]
+* Various improvements on Makefiles and .pro files [#170]
+* The Makefile 'install' target on OS X now builds a .app bundle with all the executables inside (so that they can be launched from DoUML). For this reason only douml is still build as a bundle. Then macdeployqt adds needed frameworks and makes a .dmg file, but it's still very rough and needs more work (for instance, including all support files, translation, documentation, etc.) [#170]
+* Added to the Makefile the target 'xcodeprojects' to generate Xcode projects. [#170]
+* Changed some remaining "BoUML" text to "DoUML" [#170]
+* Set a better size for the Image dialog box and its Browse button. [#170]
+* Removed a misplaced text only appearing on Mac OS X in the Shortcut dialog. [#170]
+* Fixed segmentation fault when quitting DoUML with opened project. [#170]
+* Non latin1 string support is added [#173] 
+* Fix positioning of sequence diagrams labels [#194]
+* Some dialogs are now modal [#194]
+* Fix diagrams appearing twice when double clicked in browser view [#194]
+* Correct tabs disappearing in the drawing settings dialog [#194]
+* Fix snapshots and copying pictures of diagrams [#194]
+* Fix zValue of diagrams not being saved correctly [#194]
+
+# v1.0.8
+* Numerous bugfixes
+
+# v1.0b7.4
+* Fixed the crash at editing unidirectional association.
+
+# v1.0b7.1 
+* Fixed the crash that could occur if the user closed quick edit while editing param type
+* Attribute and operations added through quick edit now appear at their proper places in main tree view
+* Fixed operation propagation that got broken during previous releases
+
+# v1.0b7.1 
+* Fixed the issue that stopped app from closing rpoperly
+
+# v1.0b7
+
+* Previously, after "close window" button was clicked and user selected "Cancel" the app closed nevertheless. No longer the case.
+* Fixed crash when reopening operation window that had different amount of KV-pairs
+* Duplicated items in tree appear next to their source (valid of class, attribute, operation, extra member)
+* Settings will now be craeted automatically if there is no file present.
+* Fixed "relative path" for cpp generation.
+* Added capability of adding enum items and class attributes to Quickedit window
+* Added buttons for clipboard access and Quickedit to the toolbar
+* List of recent projects now lives in settings.ini
+* Updated "About" dialog and a new icon 
+
+# v1.0b6
+* Import/Export XMI2.1 are working now. Pls test for any possible bugs before fully embracing them.
+
+# v1.0b5
+* Duplicating class, operation and attribute produces its name in the name request edit.
+* Vastly expanded functionality of Quickedit window. 
+* Repeatedly pressing "ctrl-e" closes it if it is already open
+* It will remember the state it was in prior to close and restore itself accordingly.
+* Almost all features necessary for C++ editing are present. 
+* Postfix/prefix columns in quickedit table mean how parameter is actually passed in the function where: const/volatile(prefix), \*,&(postfix) 
+* You can add operation by clicking on +Operation button if you are currently on the operation or class node.
+* You can add operation parameters by clicking on +Parameter button if you are on an attribute or operation node.
+* You can delete all nodes by clicking on "Delete" column. Deleting is done in Bouml way where "deleted" node is marked as deleted but is not actually deleted until program is closed.
+A thing to note - operation parameters are also deleted in this way, but they are only present in their "deleted" state until window is closed or trr is filtered.
+10. You can move operation parameters within a single function (I will expand this later). To move parameters - click on their "mark" column, then right click on parameter you want to move them to and select either "Move after" or "Move before"
+11. If you do not ant to see c++ columns in the table - untick "C++" checkbox on the top of the window.
+!. There is a drawback to using this window atm - it knows nothing of propagation through hierarchy. Once You've edited an operation - make sure to make same edits in the others.
+!!. Quickedit, at the moment, knows _nothing_ of the changes you make in the other dialogs, if you are using it in windowed mode - make sure to press refresh button on the top left after you've changed stuff! Although I'd recommend closing it immediately after you edited what you wanted and reopening with correct data later.
+
+Now the only major things missing from Quickedit are management of enums and adding attributes to classes. These will be added in the next version.
+
+
+# v1.0b4
+Added a new class/operation/parameter control. It is brought up by pressing Ctlr-E on Package, Classview, Class, Operation or Attribute nodes in main tree
+This control is essentially an alternative way to insert quick fixes into class hierarchy. 
+Things of note:
+* you can quickly search for classes/operation etc... by entering text in lineedit on the top. It even picks operation parameters!
+* two buttons to the left of the search lineedit allow you to expand/collapse whole levels in the tree
+* "Type" of an operation node is actually its return type.
+* Nodes below operations are their parameters
+* Changes made into editable cells are IMMEDIATELY done to the model. So far there is no rollback once you've edited something.
+* Classviews/Packages are not shown in the tree, but they are used to create it.
+
+Currently, the changes you can insert in this editor are limited, and some buttons are disabled but you can expect to have MUCH more control from it in later versions.
+Feedback and requests will be appreciated.
+
+
+
+# v1.0b3
+* App entered endless cycle while trying to open some diagrams. Fixed
+
+
+# v1.0b2
+
+## Changes
+* Previously, opened tab was saved in operation dialog between dialog opens.This turned out to be very anoying and is now disabled.
+
+
+## Bugfixes
+* cpp header file was not produced correctly on generation of new projects.
+* Deploy plugin was freezing on some classes due to some weird bug which involved ->bytesAvailable function to return different value than what was written to socket.
+* Mini toolbar could crash when user tried navigating above the highest node via arrow buttons.
+* Some icons were not shown in minit-toolbar.
+* "Unmark all" did not change the color of generator label.
+* Propagating changes from abstract operation will not null op definition in subclasses.
+* Clicking OK in relations dialog while ot editing relation's name produced "illegal name" error.
+* static class members were incorrectly given "= {$value] " when generated in cpp headers.
+* In Properties tables around the app pressing enter or any arrow button finished editing of the cell.
+* Reopening class dialog did not properly reinitialize formals/inheritance/properties.
+* Reopening operation dialog did not properly reinitialize exceptions.
+
+
+## Features
+* Added "Catalog" widget below class tree. This widget is used for quick tree navigation and has 3 tabs.
+* "Visited" tab updates each time user clicks on a node in a tree. This node is inserted into visited and clicking on it will.
+  immediately scroll the main tree to it.
+* "Marked" tab tracks user selection and serves double purpose of tree navigation(as in "Visited") and node deselection via rightclick menu.
+* "Favourites" tab is used when user ahs often visited tree nodes and wants an easy wasy to return to the in a tree.
+* Adding nodes s done by dragging them from the main tree onto favourites tabs.
+* Catalog widget has line edit under tabs which serves the purpose of filtering the Visited view (only Visited atm).
+* "Builtin types" tab in generation settings has been completely reworked. 
+* User can now search and sort it.
+* User can selectively turn off languages he does not use in the table.
+* When a new row is being produced it is initialized with enough defaults to make assigning UML name the only obligatory edit before clicking "OK".
+* Adding new rows is now done through "Add type" button and a few options were removed from "do" menu as they no longer make sense.
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..605d7ad9e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,219 @@
+# The directory where all the douml files will be installed, you
+# can change it for instance because you don't have root permission
+DOUML_LIB = /usr/lib/douml
+
+# The directory where the douml shell script will be installed, you
+# can change it for instance because you don't have root permission
+DOUML_DIR = /usr/bin
+
+# The directory where the doc will be installed, you
+# can change it for instance because you don't have root permission
+DOUML_DOC_DIR = /usr/share/doc/douml
+
+# The directory where the doc will be installed, you
+# can change it for instance because you don't have root permission
+DOUML_LOCALE_DIR = ${DOUML_LIB}/locale
+
+# The directory containing douml.desktop
+# The copy is not done if you comment the definition
+DOUML_DESKTOP_DIR = /usr/share/applications
+
+# The directories containing the douml icons are
+# <DOUML_ICONS_PREFIX_DIR>/<size>x<size>/apps
+# The copy is not done if you comment the definition
+DOUML_ICONS_PREFIX_DIR = /usr/share/icons/hicolor
+
+# On several Unix systems, the icons used inside the
+# menus must be stored inside the pixmaps' directory.
+# The copy is done if you uncomment the definition.
+DOUML_UNIX_PIXMAPS_DIR = /usr/share/pixmaps
+
+# Using uname to detect the platform
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+
+# If not defined (local install), DoUML will be install into LOCAL_DESTDIR or "./install" directory
+# Else (packaging) desktop and executable script are copied into DESTDIR but reference are /
+ifndef DESTDIR
+  ifndef LOCAL_DESTDIR
+    LOCAL_DESTDIR = ${PWD}/install
+  endif
+  DESTDIR = ${LOCAL_DESTDIR}
+endif
+
+QMAKE=qmake
+
+MAKE=make
+
+# using CONFIG variable for 'release' or 'debug' and it's case sensitive!
+ifndef CONFIG
+  CONFIG=release
+endif
+
+SRC_DIRS=\
+	src/CppGenerator  \
+	src/CppReverse  \
+	src/CppRoundtrip  \
+	src/IdlGenerator  \
+	src/JavaCat  \
+	src/JavaGenerator  \
+	src/JavaReverse  \
+	src/JavaRoundtrip  \
+	src/PhpGenerator  \
+	src/PhpReverse  \
+	src/PlugOutUpgrade  \
+	src/ProjectControl  \
+	src/ProjectSynchro  \
+	src/PythonGenerator  \
+	src/RoundtripBody
+
+PLUGOUT_DIRS=genplugouts/BrowserSort  \
+	genplugouts/CppUtilities  \
+	genplugouts/deploy  \
+	genplugouts/FileControl  \
+	genplugouts/GlobalChange  \
+	genplugouts/gpro  \
+	genplugouts/HtmlDoc  \
+	genplugouts/import_rose  \
+	genplugouts/singleton  \
+	genplugouts/sm  \
+	genplugouts/uml_projection  \
+	genplugouts/usecasewizard  \
+	genplugouts/xmi  \
+	genplugouts/Xmi2Generator  \
+	genplugouts/xmi2import
+
+# the main program (built as a .app bundle on OS X)
+MAINPROG=douml
+
+# all the other side programs (NOT built as .app bundle on OS X)
+SIDEPROGS= \
+	browsersort  \
+	cpp_generator  \
+	cpp_reverse  \
+	cpp_roundtrip  \
+	cpp_util  \
+	deplcl \
+	file_control  \
+	ghtml  \
+	global_change \
+	gpro \
+	gxmi \
+	gxmi2  \
+	idl_generator  \
+	ixmi2 \
+	java_catalog  \
+	java_generator  \
+	java_reverse  \
+	java_roundtrip  \
+	php_generator  \
+	php_reverse  \
+	python_generator  \
+	roundtrip_body  \
+	usecasewizard
+
+# all the programs
+PROGS = $(MAINPROG) $(SIDEPROGS)
+
+compile:
+	( cd src/Libs/L_UniversalModels ; $(QMAKE) -config ${CONFIG} L_UniversalModels.pro; ) || exit 1 ; $(MAKE) -C src/Libs/L_UniversalModels || exit 1
+	( cd src ; $(QMAKE) -config ${CONFIG} douml.pro; ) || exit 1 ; $(MAKE) -C src || exit 1
+	for i in $(SRC_DIRS); do if [ -d $$i ]; then ( cd $$i; $(QMAKE) -config ${CONFIG}; ) || exit 1 ; $(MAKE) -C $$i || exit 1 ; fi; done
+	for i in $(PLUGOUT_DIRS); do if [ -d $$i ]; then ( cd $$i; $(QMAKE) -config ${CONFIG}; ) || exit 1 ; $(MAKE) -C $$i || exit 1 ; fi; done
+
+# Useful for debugging on OS X with XCode, this target will generate appropriate xcode projects files
+xcodeprojects: $(QTPROJECTFILES)
+	( cd src/Libs/L_UniversalModels ; $(QMAKE) -config ${CONFIG} -spec macx-xcode L_UniversalModels.pro; ) || exit 1
+	( cd src ; $(QMAKE) -config ${CONFIG} -spec macx-xcode douml.pro; ) || exit 1
+	for i in $(SRC_DIRS); do if [ -d $$i ]; then ( cd $$i; $(QMAKE) -config ${CONFIG} -spec macx-xcode; ) || exit 1 ; fi; done
+	for i in $(PLUGOUT_DIRS); do if [ -d $$i ]; then ( cd $$i; $(QMAKE) -config ${CONFIG} -spec macx-xcode; ) || exit 1 ; fi; done
+
+install:
+	mkdir -p "$(DESTDIR)$(DOUML_DIR)"
+	if test -n "$(DOUML_ICONS_PREFIX_DIR)" ; \
+	then \
+		for i in 16 32 48 64; do \
+			mkdir -p "$(DESTDIR)$(DOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps"; \
+			cp -p douml.$$i.png "$(DESTDIR)$(DOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/douml.png"; \
+		done; \
+	fi
+	if test -n "$(DOUML_UNIX_PIXMAPS_DIR)"; then \
+		mkdir -p "$(DESTDIR)$(DOUML_UNIX_PIXMAPS_DIR)"; \
+		cp -f douml.48.png "$(DESTDIR)$(DOUML_UNIX_PIXMAPS_DIR)/douml.png"; \
+	fi
+	mkdir -p "$(DESTDIR)$(DOUML_LIB)"
+	cp -Rp plugouts/empty "$(DESTDIR)$(DOUML_LIB)"
+	mkdir -p "$(DESTDIR)$(DOUML_DOC_DIR)"
+	mkdir -p "$(DESTDIR)$(DOUML_LOCALE_DIR)"
+	cp -p *.lang "$(DESTDIR)$(DOUML_LOCALE_DIR)"
+# If on Darwin/Mac OS X, we are building a .dmg for deployment of a .app bundle
+ifeq ($(uname_S),Darwin)
+# First we copy the douml.app bundle directory that only contains the douml executable
+	cp -pR bin/$(MAINPROG).app "$(DESTDIR)$(DOUML_LIB)"
+# We then copy all the other side programs (executables built with qt no app bundle option)
+# inside the bundle's Contents/MacOS subfolder.
+	for i in $(SIDEPROGS); do cp -p bin/$$i "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/MacOS" ; done
+# We also copy the douml icon for OS X in the Resources subfolder
+	mkdir -p "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/Resources/"
+	cp ./douml.icns "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/Resources/"
+# We run the macdeployqt tool to add the appropriate frameworks and
+# configuration files to the bundle and to create a .dmg disk image file.
+ifeq ($(CONFIG),debug)
+# In debug mode we don't create the dmg file. Instead we tell macdeployqt to add the debug versions of
+# the Qt frameworks, and we edit the bundle's Info.plist to set the environment variable
+# DYLD_IMAGE_SUFFIX=_debug so that the app will load the debug versions of Qt libraries
+	/usr/libexec/PlistBuddy -c "Add :LS_Environment dict" "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/Info.plist"
+	/usr/libexec/PlistBuddy -c "Add :LS_Environment:DYLD_IMAGE_SUFFIX string '_debug'" "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/Info.plist"
+	macdeployqt "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app" -verbose=2 -use-debug-libs \
+		$(patsubst %,-executable="$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/MacOS/%",$(SIDEPROGS))
+else
+	macdeployqt "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app" -verbose=2 -dmg \
+		$(patsubst %,-executable="$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/MacOS/%",$(SIDEPROGS))
+endif
+else
+	for i in $(PROGS); do cp -p bin/$$i "$(DESTDIR)$(DOUML_LIB)" ; done
+endif
+	echo "#!/bin/sh" >$(DESTDIR)$(DOUML_DIR)/douml
+	echo "PATH=$(LOCAL_DESTDIR)$(DOUML_LIB):$$"PATH >>$(DESTDIR)$(DOUML_DIR)/douml
+	echo "DOUML_LIB_DIR=$(LOCAL_DESTDIR)$(DOUML_LIB)" >>$(DESTDIR)$(DOUML_DIR)/douml
+	echo "export PATH" >>$(DESTDIR)$(DOUML_DIR)/douml
+	echo "export DOUML_LIB_DIR" >>$(DESTDIR)$(DOUML_DIR)/douml
+	echo "exec $(LOCAL_DESTDIR)$(DOUML_LIB)/douml \"$$"@"\"" >>$(DESTDIR)$(DOUML_DIR)/douml
+	chmod +x "$(DESTDIR)$(DOUML_DIR)/douml"
+	if test -n "$(DOUML_DESKTOP_DIR)" ; \
+	then \
+		mkdir -p "$(DESTDIR)$(DOUML_DESKTOP_DIR)" ; \
+		echo "[Desktop Entry]" > "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Encoding=UTF-8" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Name=DoUML" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Type=Application" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "GenericName=Free UML 2 modeler" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Comment=Free UML 2 modeler" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Exec=$(LOCAL_DESTDIR)$(DOUML_DIR)/douml" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "TryExec=douml" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Icon=douml" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Categories=Development;Building;GUIDesigner;IDE;Documentation;" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+	fi
+
+uninstall:
+	rm -rf $(DESTDIR)$(DOUML_LIB) $(DESTDIR)$(DOUML_DIR)/douml
+	for i in 16 32 48 64; do \
+		rm -f "$(DESTDIR)$(DOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/douml.png"; \
+	done
+	rm -f "$(DESTDIR)$(DOUML_UNIX_PIXMAPS_DIR)/douml.png"
+	rm -f "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop"
+
+clean:
+	for i in $(SRC_DIRS) $(PLUGOUT_DIRS); do if [ -d $$i ]; then (cd $$i; $(QMAKE) -config ${CONFIG}; $(MAKE) clean; rm -f Makefile; ) || exit 1 ; fi; done
+	( cd src ; $(QMAKE) -config ${CONFIG} douml.pro; ) || exit 1 ; (cd src; $(MAKE) clean; rm -f Makefile; ) || exit 1
+	( cd src/Libs/L_UniversalModels ; $(QMAKE) -config ${CONFIG} L_UniversalModels.pro; ) || exit 1 ; (cd src/Libs/L_UniversalModels; $(MAKE) clean; rm -f Makefile; ) || exit 1
+# If on Darwin/Mac OS X we are removing the douml .app bundle
+ifeq ($(uname_S),Darwin)
+	rm -rf "bin/$(MAINPROG).app"
+	for i in $(SIDEPROGS); do rm -f bin/$$i; done
+else
+	for i in $(PROGS); do rm -f bin/$$i; done
+endif
+	rm -rf bin/moc_release bin/moc_debug
+	rm -rf bin/obj_release bin/obj_debug
+
+.PHONY: compile clean install uninstall
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..a7d54632a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,167 @@
+DoUML
+==================
+
+##IMPORTANT NOTICE
+
+This is still a work in progress and the fact that the release is made doesn't mean that it is bug free. We recommend that you use DoUML along with source control and save your work frequently.
+
+**A discussion group for DoUML was created for subjects other than issues: https://groups.google.com/forum/#!forum/douml**
+
+___________________
+
+About
+-----
+
+ 
+ DoUML is a UML diagram editor capable of generating/reversing code in a multitude of programming
+ languages(namely -  C++, Java, Python, idl, Php).
+ 
+ DoUML is a fork of the original Bouml editor by Bruno Pages that was born when Bouml's development
+ abruptly came to  a stop due to author's conflict with wikipedia administration.
+ 
+ Not wanting to lose (possibly) best free UML modelling software an effort was made to port the
+ original to Qt5 and continue developing it as a community.
+ 
+ DoUML is based on a source code of Bouml 4.22 but can read projects saved with versions up to 4.23
+ patch 7. Support for later, commercial versions, of Bouml is possible but sample projects will be
+ required.
+	
+Project status:
+--------------
+
+ * Core editor seems to be working. It is still very rough around the edges but much easier to work
+   with than bouml 4.23 (I am biased, lol)
+ * Generators/reversers seem to be working.
+ * Some of the plugouts do not work yet, but these are not critical to actual modelling.
+ * A list of failing plugouts can be found in settings.ini file
+
+Bugfixes:
+---------
+
+ * clicking left-right arrows when editing a parameter in an operation dialog will no longer switch
+   table cells.
+ * when you are inheriting from a base class, a definition is automatically produced even if it was 
+   completely empty in base class
+ * changing a default value in Uml tab of an operation dialog will automatically refresh function
+   declaration in C++ tab.
+ * user aliases are no longer lost when operation is copied or when "deploy classes" is used.
+	
+Enchancements:
+--------------
+		
+   * In Bouml when .lock file was not deleted during previous session the editor notified the user
+     of this fact and closed. Now it will offer the possibility to take ownership of that lock and
+     continue.
+		
+   * Operation and class dialogs have "up/down" buttons so user can traverse the tree without
+     reopening the dialogs.  This will later work for other dialogs too but making dialogs
+     compatible with the feature is very time consuming so there's still time before that.
+		
+   * Operation, class and artifact dialogs can be moved around with a new sticky control appearing
+    at wherever cursor leaves the dialog. A mini toolbar will appear wherever cursor touches the 
+    edge of the dialog. This toolbar will have mouse icon on it. 
+      * Left click-drag on this icon - drags the window around
+      * Right click-drag on this icon - resizes the winow
+      * Scrolling on this icon switches tabs of the dialog	
+		
+   * entering constructor initializers for C++ classes no longer requires navigation to properties
+     panel. Right clicking on a constructor produces a menu entry "Add constructor initializer"
+     which calls a dialog designed just for this purpose.
+		
+   * changes to inherited functions propatate above/below through the hierachy. User no longer need
+     to manually adjust the whole tree each time.
+	   
+   * added C++ modifiers default,delete,override, final to operations
+		
+   * added non-static data initialization for C++ headers.  Basically - "initial value" now works
+     for non-static data attributes.
+		
+   * "Up" right click menu option will appear in operation's right click menu. This option will
+      instantly select and scroll to container class.
+		
+   * operations, class and artifact dialogs have clipboard history button on their mini toolbar.
+     By clicking it user has access to recently copied chuncks of text.
+
+   * when adding inherited functions from a base class (right click on a class node) user can now
+     inherit whole inteface of a base class in one click.
+		
+   * all dialogs that have mini toolbar next to them will spawn near the cursor instead of the
+     center of the screen.
+
+   * user can now "move into", "move after" and "duplicate" into a parameter that has Get/Set
+     functions. The operation also copies/moves getters/setters.
+		
+   * getters/setters can now be marked and "move after" within the same class
+		
+   * non-english characters are now allowed in comments, init values of attributes, notes on
+      diagrams and all non-generatable nodes in the tree(i.e. - use cases). 
+		
+   * there is now "Generate" label on the main toolbar. 
+     Next to this label C++/Php/Python... buttons will appear according to which language is set for
+     the project clicking on these buttons will either generate code for currently selected node in
+     the tree or marked nodes in the tree. To make it obvious which will be applied "Generate" label
+     is color-coded. 
+      * If its background is red - there are marked items in the tree and their nodes will be generated
+      * If its background is blue - there are no marked in the tree so generation will be done on user-selected node
+      * The generation is done on a "first generatable node upwards in the tree" Meaning - if an attribute is marked the app will traverse to containing class and generate it
+   * Added "Catalog" widget below class tree. This widget is used for quick tree navigation and has 3 tabs.
+      * "Visited" tab updates each time user clicks on a node in a tree. This node is inserted into visited and clicking on it will immediately scroll the main tree to it.
+      * "Marked" tab tracks user selection and serves double purpose of tree navigation(as in "Visited") and node deselection via rightclick menu.
+      * "Favourites" tab is used when user ahs often visited tree nodes and wants an easy wasy to return to the in a tree.
+      * Adding nodes s done by dragging them from the main tree onto favourites tabs.
+      * Catalog widget has line edit under tabs which serves the purpose of filtering the Visited view (only Visited atm).
+      
+   * Builtin types" tab in generation settings has been completely reworked. 
+      * User can now search and sort it.
+      * User can selectively turn off languages he does not use in the table.
+      * When a new row is being added it is initialized with enough defaults to make assigning UML name the only obligatory edit before clicking "OK".
+      * Adding new rows is now done through "Add type" button and a few options were removed from "do" menu as they no longer make sense.
+
+   * A totally new control can be brought up by pressing Ctlr-E on tree nodes. See changelog.txt for details. (section 1.0b4) 
+      
+Manual
+------
+
+  Currently - the manual of Bouml version 4.22 is being used. To access it, set "Manual" path in
+  miscelaneous settings in application's menu.
+
+Compiling & Installing
+----------------------
+
+#### Under Linux:
+  
+ * dependencies: libqt5-dev, libboost-dev, g++ (>=4.7)
+ * `make`
+ * `make install` default directory is ${PWD}/install or `make install LOCAL_DESTDIR=[path]`
+    
+  
+#### Under Windows:
+
+  ```
+  L_UniversalModels library needs to be built prior to douml compilation. It is located in src/Libs/L_UniversalModels
+  ```
+
+ * Mingw based on gcc 4.7+
+ * Qt 5.4+ built with aforementioned mingw.
+ * Boost's headers of version 1.5+ must be visible in scope.
+ 
+#### Pre-built binaries
+
+Binaries are kindly provided by the community.
+
+- OpenSUSE binaries were provided by @gilbertoca
+- Ubuntu PPA, provided by @pasgui: https://launchpad.net/%7Epasgui/+archive/ubuntu/ppa
+
+Be a maintainer! Contact-us through the mainling list or issues.
+ 
+Webpage
+-------
+
+http://douml.github.io/douml/
+
+  *** CONTRIBUTORS NEEDED ***		
+	
+And remember - we all own a debt of gratitude to Bouml's original creator - Bruno Pages. 
+Without him, there'd be nothing for us to continue developing.
+Current (non-free) version of original Bouml that he works on now can be found at:
+	http://bouml.fr
diff --git a/Readme.txt b/Readme.txt
deleted file mode 100644
index 78ef49eae..000000000
--- a/Readme.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-=========
-Douml version 1.0b
-=========
-
-*** IMPORTANT NOTICE ***
-	This is still a work in progress and the fact that the release is made doesn't mean that it is bug free.
-	We recommend that you use Douml along with source control and save your work frequently.
-
-About
-
-    Douml is a UML diagram editor capable of generating/reversing code in a multitude of programming languages(namely -  C++, Java, Python, idl, Php)
-	Douml is a fork of the original Bouml editor by Bruno Pages that was born when Bouml's development abruptly came to a stop due to author's conflict with wikipedia administration.
-	Not wanting to lose (possibly) best free UML modelling software an effort was made to port the original to Qt4 and continue developing it as a community.
-	Douml is based on a source code of Bouml 4.22 but can read projects saved with versions up to 4.23 patch 7.
-	Support for later, commercial versions, of Bouml is possible but sample projects will be required.
-	
-Project status:
-
-
-	Core editor seems to be working. It is still very rough around the edges but much easier to work with than bouml 4.23 (I am biased, lol)
-	Generators/reversers seem to be working.
-	Some of the plugouts do not work yet, but these are not critical to actual modelling.
-	A list of failing plugouts can be found in settings.ini file
-	
-	A multitude of improvements/fixes have been made to the editor. Version 1 will include these:
-	
-	Bugfixes:
-		-- clicking left-right arrows when editing a parameter in an operation dialog will no longer switch table cells.
-		-- when you are inheriting from a base class, a definition is automatically produced even if it was completely empty in base class
-		-- changing a default value in Uml tab of an operation dialog will automatically refresh function declaration in C++ tab.
-		-- user aliases are no longer lost when operation is copied or when "deploy classes" is used.
-	
-	Enchancements:
-		
-		-- In Bouml when .lock file was not deleted during previous session the editor notified the user of this fact and closed. 
-			Now it will offer the possibility to take ownership of that lock and continue.
-		
-		-- operation and class dialogs have "up/down" buttons so user can traverse the tree without reopening the dialogs. 
-			This will later work for other dialogs too but making dialogs compatible with the feature is very time consuming so there's still time before that.
-		
-		-- operation, class and artifact dialogs can be moved around with a new sticky control appearing at wherever cursor leaves the dialog
-			A mini toolbar will appear wherever cursor touches the edge of the dialog.
-			This toolbar will have mouse icon on it. 
-			Left click-drag on this icon - drags the window around
-			Right click-drag on this icon - resizes the winow
-			Scrolling on this icon switches tabs of the dialog	
-		
-		-- entering constructor initializers for C++ classes no longer requires navigation to properties panel.
-			Right clicking on a constructor produces a menu entry "Add constructor initializer" which calls a dialog designed just for this purpose.
-		
-		-- changes to inherited functions propatate above/below through the hierachy. User no longer need to manually adjust the whole tree each time.
-	   
-		-- added C++ modifiers default,delete,override, final to operations
-		
-		-- added non-static data initialization for C++ headers. 
-			Basically - "initial value" now works for non-static data attributes.
-		
-		-- "Up" right click menu option will appear in operation's right click menu. This option will instantly select and scroll to container class.
-		
-		-- operations, class and artifact dialogs have clipboard history button on their mini toolbar. By clicking it user has access to recently copied chuncks of text
-
-		-- when adding inherited functions from a base class (right click on a class node) user can now inherit whole inteface of a base class in one click.
-		
-		-- all dialogs that have mini toolbar next to them will spawn near the cursor instead of the center of the screen.
-
-		-- user can now "move into", "move after" and "duplicate" into a parameter that has Get/Set functions. The operation also copies/moves getters/setters.
-		
-		-- getters/setters can now be marked and "move after" within the same class
-		
-		-- non-english characters are now allowed in comments, init values of attributes, notes on diagrams and all non-generatable nodes in the tree(i.e. - use cases). 
-		
-		-- there is now "Generate" label on the main toolbar. 
-			Next to this label C++/Php/Python... buttons will appear according to which language is set for the project
-			clicking on these buttons will either generate code for currently selected node in the tree or marked nodes in the tree.
-			To make it obvious which will be applied "Generate" label is color-coded. 
-			If its background is red - there are marked items in the tree and their nodes will be generated
-			If its background is blue - there are no marked in the tree so generation will be done on user-selected node
-			The generation is done on a "first generatable node upwards in the tree" Meaning - if an attribute is marked the app will traverse to containing class and generate it
-	
-
-Manual
-    Currently - the manual of Bouml version 4.22 is being used. To access it, set "Manual" path in miscelaneous settings in application's menu.
-
-Compiling
-	These are needed: 
-			Mingw based on gcc 4.7+
-			Qt 4.7+ built with aforementioned mingw.
-			Boost's headers of version 1.5+ must be visible in scope.
-
-	
-Webpage
-	http://sourceforge.net/projects/douml/
-Contact email: 
-	doumleditor@gmail.com
-	!!! CONTRIBUTORS NEEDED!!!		
-	
-	
-And remember - we all own a debt of gratitude to Bouml's original creator - Bruno Pages. 
-Without him, there'd be nothing for us to continue developing.
-Current(non-free) version of original Bouml that he works on now can be found at:
-	http://bouml.fr
-
diff --git a/bin/GenerationSettings_PastDefines.ini b/bin/GenerationSettings_PastDefines.ini
deleted file mode 100644
index 07fd1a7ba..000000000
--- a/bin/GenerationSettings_PastDefines.ini
+++ /dev/null
@@ -1,96 +0,0 @@
-[General]
-compatibility_save=1
-
-CPP_H_CONTENT="#ifndef ${NAMESPACE}_${NAME}_H
-${NAMESPACE}_${NAME}_H
-
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-\#endif"
-
-CPP_SRC_CONTENT="${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-
-JAVA_SRC_CONTENT="${comment}
-${package}
-${imports}
-${definition}";
-
-PHP_SRC_CONTENT="<?php
-${comment}
-${namespace}
-${require_once}
-${definition}
-?>";
-
-PYTHON_SRC_CONTENT="${comment}
-${import}
-${definition}";
-
-IDL_SRC_CONTENT="#ifndef ${MODULE}_${NAME}_H
-${MODULE}_${NAME}_H
-${comment}
-${includes}
-${module_start}
-${definition}
-${module_end}
-\#endif"
-
-CPP_ATTR_DECL1="    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value};"
-CPP_ATTR_DECL2="    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};"
-CPP_ATTR_DESCR1="    ${description}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value};"
-CPP_ATTR_DESCR2="    ${description}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};"
-CPP_INDENT_VISIBILITY="  "
-JAVA_ATTR_DECL1="  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};"
-JAVA_ATTR_DECL2="  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};"
-JAVA_ATTR_DESCR1="  ${description}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};"
-JAVA_ATTR_DESCR2="  ${description}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};"
-PHP_CLASS="${comment}${final}${abstract}class ${name}${extends}${implements} {${members}}"
-PHP_ENUM="${comment}${visibility}final class ${name} {${items}}"
-PHP_INTERFACE="${comment}interface ${name} {${members}}"
-PHP_ATTR="  ${comment}${visibility}${const}${static}${var}${name}${value};"
-PHP_ENUMITEM="  const ${name}${value};${comment}"
-PHP_REL="  ${comment}${visibility}${const}${static}${var}${name}${value};"
-PHP_OPER="  ${comment}${final}${visibility}${abstract}${static}function ${name}${(}${)}{  ${body}}"
-PYTHON_INDENT_STEP="    "
-PYTHON_CLASS="class ${name}${inherit}:${docstring}${members}"
-PYTHON_ENUM="class ${name}:${docstring}${members}"
-PYTHON_ATTR1="${comment}${self}${name} = ${value}"
-PYTHON_ATTR2="${comment}${self}${name} = ${stereotype}()"
-PYTHON_ENUMITEM="${comment}${self}${name} = ${value}"
-PYTHON_REL1="${comment}${self}${name} = ${value}"
-PYTHON_REL2="${comment}${self}${name} = ${stereotype}()"
-PYTHON_REL_COMP="${comment}${self}${name} = ${type}()"
-PYTHON_OPER="${@}${static}${abstract}def ${name}${(}${)}:${docstring}${body}"
-PYTHON_INITOPER="${@}${static}${abstract}def ${name}${(}${p0}${v0}${)}:${docstring}super(${class}, ${p0}).__init__()${body}"
-IDL_EXTERNAL_CLASS_DECL="${name}#include \"${name}.idl\"";
-IDL_VALUETYPE_DECL="${comment}${abstract}${custom}valuetype ${name}${inherit} {${members}};";
-IDL_ATTR_DECL1="  ${comment}${readonly}${attribute}${stereotype}<${type}> ${name};"
-IDL_ATTR_DECL2="  ${comment}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};"
-IDL_ATTR_DESCR1="  ${description}${readonly}${attribute}${stereotype}<${type}> ${name};"
-IDL_ATTR_DESCR2="  ${description}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};"
-IDL_VALUETYPE_ATTRIBUTE_DECL0="  ${comment}${visibility}${type} ${name};"
-IDL_VALUETYPE_ATTRIBUTE_DECL1="  ${comment}${visibility}${stereotype}<${type}> ${name};"
-IDL_VALUETYPE_ATTRIBUTE_DECL2="  ${comment}${visibility}${stereotype}<${type},${multiplicity}> ${name};"
-IDL_VALUETYPE_ATTRIBUTE_DESCR1="  ${description}${visibility}${stereotype}<${type}> ${name};"
-IDL_VALUETYPE_ATTRIBUTE_DESCR2="  ${description}${visibility}${stereotype}<${type},${multiplicity}> ${name};"
-IDL_CONST_ATTR_DECL1="  ${comment}const ${stereotype}<${type}> ${name}${value};"
-IDL_CONST_ATTR_DECL2="  ${comment}const ${stereotype}<${type},${multiplicity}> ${name}${value};"
-IDL_CONST_ATTR_DESCR1="  ${description}const ${stereotype}<${type}> ${name}${value};"
-IDL_CONST_ATTR_DESCR2="  ${description}const ${stereotype}<${type},${multiplicity}> ${name}${value};"
-IDL_UNION_ATTR_DECL1="  ${comment}case ${case} : ${readonly}${stereotype}<${type}> ${name};";
-IDL_UNION_ATTR_DECL2="  ${comment}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};";
-IDL_UNION_ATTR_DESCR1="  ${description}case ${case} : ${readonly}${stereotype}<${type}> ${name};";
-IDL_UNION_ATTR_DESCR2="  ${description}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};";
-IDL_VALUETYPE_REL_DECL0="  ${comment}${visibility}${type} ${name};"
-IDL_VALUETYPE_REL_DECL1="  ${comment}${visibility}${stereotype}<${type}> ${name};"
-IDL_VALUETYPE_REL_DECL2="  ${comment}${visibility}${stereotype}<${type},${multiplicity}> ${name};"
-IDL_VALUETYPE_REL_DESCR1="  ${description}${visibility}${stereotype}<${type}> ${name};"
-IDL_VALUETYPE_REL_DESCR2="  ${description}${visibility}${stereotype}<${type},${multiplicity}> ${name};"
diff --git a/bin/settings.ini b/bin/settings.ini
deleted file mode 100644
index 3a3bf3ecf..000000000
--- a/bin/settings.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[General]
-test=test
-
-[Main]
-compatibility_save=1
-fileformat=77
-encoding=UTF-8
-
-[Failing_Tools]
-Tools="Import Rose,Uml projection,C++ state machine,Import XMI 2.x,Generate XMI 2.x,Generate XMI 1.2,Generate .pro"
diff --git a/douml.icns b/douml.icns
new file mode 100644
index 000000000..0eb1021db
Binary files /dev/null and b/douml.icns differ
diff --git a/douml.ico b/douml.ico
new file mode 100644
index 000000000..bb83bdafa
Binary files /dev/null and b/douml.ico differ
diff --git a/douml.png b/douml.png
new file mode 100644
index 000000000..f4fe512b9
Binary files /dev/null and b/douml.png differ
diff --git a/douml.qrc b/douml.qrc
new file mode 100644
index 000000000..6cf1d233c
--- /dev/null
+++ b/douml.qrc
@@ -0,0 +1,9 @@
+<RCC>
+  <qresource>
+    <file>douml.16.png</file>
+    <file>douml.32.png</file>
+    <file>douml.48.png</file>
+    <file>douml.64.png</file>
+    <file>douml.png</file>
+  </qresource>
+</RCC>
diff --git a/douml.xcworkspace/contents.xcworkspacedata b/douml.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..c82ce6d10
--- /dev/null
+++ b/douml.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Makefile">
+   </FileRef>
+   <FileRef
+      location = "group:src/douml.xcodeproj">
+   </FileRef>
+   <Group
+      location = "container:"
+      name = "Libs">
+      <FileRef
+         location = "group:src/Libs/L_UniversalModels/UniversalModels_debug.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/Libs/L_UniversalModels/UniversalModels.xcodeproj">
+      </FileRef>
+   </Group>
+   <Group
+      location = "container:"
+      name = "Src">
+      <FileRef
+         location = "group:src/CppGenerator/cpp_generator.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/CppReverse/cpp_reverse.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/CppRoundtrip/cpp_roundtrip.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/IdlGenerator/idl_generator.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/JavaCat/java_catalog.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/JavaGenerator/java_generator.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/JavaReverse/java_reverse.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/JavaRoundtrip/java_roundtrip.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/PhpGenerator/php_generator.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/PhpReverse/php_reverse.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/PlugOutUpgrade/plug_out_upgrade.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/ProjectControl/projectControl.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/ProjectSynchro/projectSynchro.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/PythonGenerator/python_generator.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:src/RoundtripBody/roundtrip_body.xcodeproj">
+      </FileRef>
+   </Group>
+   <Group
+      location = "container:"
+      name = "Plugout">
+      <FileRef
+         location = "group:genplugouts/BrowserSort/browsersort.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/CppUtilities/cpp_util.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/deploy/deplcl.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/FileControl/file_control.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/GlobalChange/global_change.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/gpro/gpro.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/HtmlDoc/ghtml.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/import_rose/irose.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/singleton/singleton.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/sm/stmgen.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/uml_projection/uml_proj.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/usecasewizard/usecasewizard.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/xmi/gxmi.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/Xmi2Generator/gxmi2.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "group:genplugouts/xmi2import/ixmi2.xcodeproj">
+      </FileRef>
+   </Group>
+</Workspace>
diff --git a/genplugouts/BrowserSort/BrowserSort.pro b/genplugouts/BrowserSort/BrowserSort.pro
index dc2cd75d8..63f522586 100644
--- a/genplugouts/BrowserSort/BrowserSort.pro
+++ b/genplugouts/BrowserSort/BrowserSort.pro
@@ -1,6 +1,8 @@
 TEMPLATE	= app
 TARGET		= browsersort
-CONFIG		+= warn_on qt
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+DEFINES += QT_DEPRECATED_WARNINGS
 INCLUDEPATH += ../../src
 HEADERS		= ./UmlActivityPin.h \
 		  ./TransitionBehavior.h \
@@ -319,18 +321,16 @@ SOURCES		= ./UmlActivityPin.cpp \
 		  ./UmlBaseClassView.cpp \
 		  ./UmlBaseDeepHistoryPseudoState.cpp \
 		  ./UmlBaseShallowHistoryPseudoState.cpp
-#The following line was inserted by qt3to4
-QT += network  qt3support 
-QMAKE_CXXFLAGS += -std=gnu++11
-CONFIG(release){
-    MOC_DIR = ../../bin/MOC_release/sort/
-    OBJECTS_DIR = ../../bin/Obj_release/sort
+DEFINES += TRUE=true FALSE=false
+QT += network
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/browsersort
+    OBJECTS_DIR = $${DESTDIR}/obj_release/browsersort
 }
-
-CONFIG(debug){
-    MOC_DIR = ../../bin/MOC_debug/sort/
-    OBJECTS_DIR = ../../bin/Obj_debug/sort
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/browsersort
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/browsersort
 }
-
-    DESTDIR = ../../bin
diff --git a/genplugouts/BrowserSort/CppSettings.cpp b/genplugouts/BrowserSort/CppSettings.cpp
index 9be970344..6fed78bdb 100644
--- a/genplugouts/BrowserSort/CppSettings.cpp
+++ b/genplugouts/BrowserSort/CppSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationStereotype(Q3CString s)
+QByteArray CppSettings::relationStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, v);
 
@@ -171,14 +171,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, v);
 
@@ -190,14 +190,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, v);
 
@@ -209,14 +209,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, v);
 
@@ -228,14 +228,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, v);
 
@@ -266,14 +266,14 @@ bool CppSettings::set_IncludeWithPath(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, v);
 
@@ -285,14 +285,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, v);
 
@@ -304,14 +304,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, v);
 
@@ -323,14 +323,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, v);
 
@@ -342,14 +342,14 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, v);
 
@@ -361,14 +361,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, v);
 
@@ -380,14 +380,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, v);
 
@@ -399,14 +399,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, v);
 
@@ -418,14 +418,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, v);
 
@@ -437,14 +437,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, v);
 
@@ -456,14 +456,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, v);
 
@@ -475,14 +475,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, v);
 
@@ -494,14 +494,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, v);
 
@@ -513,14 +513,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, v);
 
@@ -532,14 +532,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl()
+const QByteArray & CppSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool CppSettings::set_AttributeDecl(Q3CString v)
+bool CppSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, v);
 
@@ -551,14 +551,14 @@ bool CppSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, v);
 
@@ -570,7 +570,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -589,14 +589,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, v);
 
@@ -608,14 +608,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, v);
 
@@ -665,14 +665,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, v);
 
@@ -760,14 +760,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, v);
 
@@ -819,51 +819,51 @@ bool CppSettings::set_IsSetParamConst(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl;
+QByteArray CppSettings::_attr_decl;
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -873,23 +873,23 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
 bool CppSettings::_is_set_param_const;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
@@ -922,13 +922,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/BrowserSort/CppSettings.h b/genplugouts/BrowserSort/CppSettings.h
index 24507102f..282078ef3 100644
--- a/genplugouts/BrowserSort/CppSettings.h
+++ b/genplugouts/BrowserSort/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(Q3CString s);
+    static QByteArray relationStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -138,70 +138,70 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -209,83 +209,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -294,20 +294,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -331,13 +331,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -383,14 +383,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -421,51 +421,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -475,23 +475,23 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
     static bool _is_set_param_const;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/BrowserSort/FlowBehavior.h b/genplugouts/BrowserSort/FlowBehavior.h
index 55dde8146..09f17529a 100644
--- a/genplugouts/BrowserSort/FlowBehavior.h
+++ b/genplugouts/BrowserSort/FlowBehavior.h
@@ -2,18 +2,18 @@
 #define _FLOWBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class FlowBehavior
 {
 public:
-    Q3CString weight;
+    QByteArray weight;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString selection;
+    QByteArray selection;
 
-    Q3CString transformation;
+    QByteArray transformation;
 
     void read();
 
diff --git a/genplugouts/BrowserSort/IdlSettings.cpp b/genplugouts/BrowserSort/IdlSettings.cpp
index 65f2ae619..d5b25b151 100644
--- a/genplugouts/BrowserSort/IdlSettings.cpp
+++ b/genplugouts/BrowserSort/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, v);
 
@@ -171,14 +171,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, v);
 
@@ -190,14 +190,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, v);
 
@@ -209,14 +209,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, v);
 
@@ -228,14 +228,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, v);
 
@@ -247,14 +247,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, v);
 
@@ -266,14 +266,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, v);
 
@@ -285,14 +285,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, v);
 
@@ -304,14 +304,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, v);
 
@@ -323,14 +323,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, v);
 
@@ -342,14 +342,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, v);
 
@@ -361,14 +361,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl()
+const QByteArray & IdlSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool IdlSettings::set_AttributeDecl(Q3CString v)
+bool IdlSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, v);
 
@@ -380,14 +380,14 @@ bool IdlSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl()
+const QByteArray & IdlSettings::valuetypeAttributeDecl()
 {
     read_if_needed_();
 
     return _valuetype_attr_decl;
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, v);
 
@@ -399,14 +399,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl()
+const QByteArray & IdlSettings::unionItemDecl()
 {
     read_if_needed_();
 
     return _union_item_decl;
 }
 
-bool IdlSettings::set_UnionItemDecl(Q3CString v)
+bool IdlSettings::set_UnionItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, v);
 
@@ -418,14 +418,14 @@ bool IdlSettings::set_UnionItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, v);
 
@@ -437,14 +437,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl()
+const QByteArray & IdlSettings::constDecl()
 {
     read_if_needed_();
 
     return _const_decl;
 }
 
-bool IdlSettings::set_ConstDecl(Q3CString v)
+bool IdlSettings::set_ConstDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, v);
 
@@ -456,14 +456,14 @@ bool IdlSettings::set_ConstDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
 
@@ -475,14 +475,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
 
@@ -494,14 +494,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
 
@@ -513,14 +513,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, v);
 
@@ -532,14 +532,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, v);
 
@@ -551,14 +551,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, v);
 
@@ -591,53 +591,53 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl;
+QByteArray IdlSettings::_attr_decl;
 
-Q3CString IdlSettings::_valuetype_attr_decl;
+QByteArray IdlSettings::_valuetype_attr_decl;
 
-Q3CString IdlSettings::_union_item_decl;
+QByteArray IdlSettings::_union_item_decl;
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl;
+QByteArray IdlSettings::_const_decl;
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
@@ -666,13 +666,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/BrowserSort/IdlSettings.h b/genplugouts/BrowserSort/IdlSettings.h
index aa23439f0..8ccc92056 100644
--- a/genplugouts/BrowserSort/IdlSettings.h
+++ b/genplugouts/BrowserSort/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype
-    static const Q3CString & valuetypeAttributeDecl();
+    static const QByteArray & valuetypeAttributeDecl();
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(Q3CString v);
+    static bool set_ValuetypeAttributeDecl(QByteArray v);
 
     // returns the default definition of an union item
-    static const Q3CString & unionItemDecl();
+    static const QByteArray & unionItemDecl();
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(Q3CString v);
+    static bool set_UnionItemDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute
-    static const Q3CString & constDecl();
+    static const QByteArray & constDecl();
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(Q3CString v);
+    static bool set_ConstDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _valuetype_attr_decl;
+    static QByteArray _valuetype_attr_decl;
 
-    static Q3CString _union_item_decl;
+    static QByteArray _union_item_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl;
+    static QByteArray _const_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/BrowserSort/IdlSettingsCmd.h b/genplugouts/BrowserSort/IdlSettingsCmd.h
index 5eb74f465..07cbf12b6 100644
--- a/genplugouts/BrowserSort/IdlSettingsCmd.h
+++ b/genplugouts/BrowserSort/IdlSettingsCmd.h
@@ -8,7 +8,7 @@ enum IdlSettingsCmd {
     getIdlUseDefaultsCmd,
     setIdlUseDefaultsCmd,
     setIdlTypeCmd,
-    setIdlRelationStereotypeCmd,
+    setIdlRelationAttributeStereotypeCmd,
     setIdlClassStereotypeCmd,
     setIdlIncludeCmd,
     setIdlRootDirCmd,
diff --git a/genplugouts/BrowserSort/JavaSettings.cpp b/genplugouts/BrowserSort/JavaSettings.cpp
index ad3a57327..8bd7c93c0 100644
--- a/genplugouts/BrowserSort/JavaSettings.cpp
+++ b/genplugouts/BrowserSort/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, v);
 
@@ -171,14 +171,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, v);
 
@@ -190,14 +190,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, v);
 
@@ -209,14 +209,14 @@ bool JavaSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, v);
 
@@ -228,14 +228,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, v);
 
@@ -247,14 +247,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternDecl()
+const QByteArray & JavaSettings::enumPatternDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_decl;
 }
 
-bool JavaSettings::set_EnumPatternDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternDeclCmd, v);
 
@@ -266,14 +266,14 @@ bool JavaSettings::set_EnumPatternDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumDecl()
+QByteArray JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, v);
 
@@ -285,14 +285,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, v);
 
@@ -304,14 +304,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl()
+const QByteArray & JavaSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool JavaSettings::set_AttributeDecl(Q3CString v)
+bool JavaSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, v);
 
@@ -323,14 +323,14 @@ bool JavaSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemDecl()
+const QByteArray & JavaSettings::enumPatternItemDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_item_decl;
 }
 
-bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemDeclCmd, v);
 
@@ -342,14 +342,14 @@ bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemCase()
+const QByteArray & JavaSettings::enumPatternItemCase()
 {
     read_if_needed_();
 
     return _enum_pattern_item_case;
 }
 
-bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
+bool JavaSettings::set_EnumPatternItemCase(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemCaseCmd, v);
 
@@ -361,14 +361,14 @@ bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumItemDecl()
+QByteArray JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, v);
 
@@ -380,14 +380,14 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
 
@@ -399,14 +399,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, v);
 
@@ -437,14 +437,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, v);
 
@@ -456,14 +456,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, v);
 
@@ -553,49 +553,49 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_pattern_decl;
+QByteArray JavaSettings::_enum_pattern_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl;
+QByteArray JavaSettings::_attr_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_decl;
+QByteArray JavaSettings::_enum_pattern_item_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_case;
+QByteArray JavaSettings::_enum_pattern_item_case;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray,QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
@@ -624,13 +624,13 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/BrowserSort/JavaSettings.h b/genplugouts/BrowserSort/JavaSettings.h
index 3a8f9e19d..e646aba85 100644
--- a/genplugouts/BrowserSort/JavaSettings.h
+++ b/genplugouts/BrowserSort/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,176 +31,176 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationUmlStereotype(const Q3CString & s);
+    static QByteArray relationUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumPatternDecl();
+    static const QByteArray & enumPatternDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternDecl(Q3CString v);
+    static bool set_EnumPatternDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumPatternItemDecl();
+    static const QByteArray & enumPatternItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternItemDecl(Q3CString v);
+    static bool set_EnumPatternItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumPatternItemCase();
+    static const QByteArray & enumPatternItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumPatternItemCase(Q3CString v);
+    static bool set_EnumPatternItemCase(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -214,23 +214,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -279,49 +279,49 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_pattern_decl;
+    static QByteArray _enum_pattern_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_pattern_item_decl;
+    static QByteArray _enum_pattern_item_decl;
 
-    static Q3CString _enum_pattern_item_case;
+    static QByteArray _enum_pattern_item_case;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/BrowserSort/JavaSettingsCmd.h b/genplugouts/BrowserSort/JavaSettingsCmd.h
index 2b197e805..8ed70d7d4 100644
--- a/genplugouts/BrowserSort/JavaSettingsCmd.h
+++ b/genplugouts/BrowserSort/JavaSettingsCmd.h
@@ -8,7 +8,7 @@ enum JavaSettingsCmd {
     getJavaUseDefaultsCmd,
     setJavaUseDefaultsCmd,
     setJavaTypeCmd,
-    setJavaRelationStereotypeCmd,
+    setJavaRelationAttributeStereotypeCmd,
     setJavaClassStereotypeCmd,
     setJavaImportCmd,
     setJavaRootdirCmd,
diff --git a/genplugouts/BrowserSort/PackageGlobalCmd.h b/genplugouts/BrowserSort/PackageGlobalCmd.h
index 76a30534b..0eed58b55 100644
--- a/genplugouts/BrowserSort/PackageGlobalCmd.h
+++ b/genplugouts/BrowserSort/PackageGlobalCmd.h
@@ -4,9 +4,9 @@
 
 // Internal enum
 enum PackageGlobalCmd {
-    findNamespaceCmd,
-    findPackageCmd,
-    findModuleCmd,
+    findCppNamespaceCmd,
+    findJavaPackageCmd,
+    findIdlModuleCmd,
     getProjectCmd,
     isProjectModifiedCmd,
     saveProjectCmd
diff --git a/genplugouts/BrowserSort/StateBehavior.h b/genplugouts/BrowserSort/StateBehavior.h
index 91a42cb82..66ac09c00 100644
--- a/genplugouts/BrowserSort/StateBehavior.h
+++ b/genplugouts/BrowserSort/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/BrowserSort/TransitionBehavior.h b/genplugouts/BrowserSort/TransitionBehavior.h
index 856ede3c0..8714c541d 100644
--- a/genplugouts/BrowserSort/TransitionBehavior.h
+++ b/genplugouts/BrowserSort/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/BrowserSort/UmlAccessVariableValueAction.h b/genplugouts/BrowserSort/UmlAccessVariableValueAction.h
index dc92b3e25..8d4f9ae87 100644
--- a/genplugouts/BrowserSort/UmlAccessVariableValueAction.h
+++ b/genplugouts/BrowserSort/UmlAccessVariableValueAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseAccessVariableValueAction.h"
-#include <q3cstring.h>
+
 
 class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAccessVariableValueAction(void * id, const Q3CString & s) : UmlBaseAccessVariableValueAction(id, s) {
+    UmlAccessVariableValueAction(void * id, const QByteArray & s) : UmlBaseAccessVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivity.h b/genplugouts/BrowserSort/UmlActivity.h
index 8f9886b0e..6f8bd5244 100644
--- a/genplugouts/BrowserSort/UmlActivity.h
+++ b/genplugouts/BrowserSort/UmlActivity.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivity.h"
-#include <q3cstring.h>
+
 
 class UmlActivity : public UmlBaseActivity
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivity(void * id, const Q3CString & s) : UmlBaseActivity(id, s) {
+    UmlActivity(void * id, const QByteArray & s) : UmlBaseActivity(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityAction.h b/genplugouts/BrowserSort/UmlActivityAction.h
index f359c755a..3079e18ba 100644
--- a/genplugouts/BrowserSort/UmlActivityAction.h
+++ b/genplugouts/BrowserSort/UmlActivityAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlActivityAction : public UmlBaseActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityAction(void * id, const Q3CString & s) : UmlBaseActivityAction(id, s) {
+    UmlActivityAction(void * id, const QByteArray & s) : UmlBaseActivityAction(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityActionClasses.h b/genplugouts/BrowserSort/UmlActivityActionClasses.h
index 15677a746..62369cdab 100644
--- a/genplugouts/BrowserSort/UmlActivityActionClasses.h
+++ b/genplugouts/BrowserSort/UmlActivityActionClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityActionClasses.h"
-#include <q3cstring.h>
+
 
 class UmlSendObjectAction : public UmlBaseSendObjectAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendObjectAction(void * id, const Q3CString & s) : UmlBaseSendObjectAction(id, s) {
+    UmlSendObjectAction(void * id, const QByteArray & s) : UmlBaseSendObjectAction(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlUnmarshallAction : public UmlBaseUnmarshallAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlUnmarshallAction(void * id, const Q3CString & s) : UmlBaseUnmarshallAction(id, s) {
+    UmlUnmarshallAction(void * id, const QByteArray & s) : UmlBaseUnmarshallAction(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlSendSignalAction : public UmlBaseSendSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendSignalAction(void * id, const Q3CString & s) : UmlBaseSendSignalAction(id, s) {
+    UmlSendSignalAction(void * id, const QByteArray & s) : UmlBaseSendSignalAction(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlBroadcastSignalAction : public UmlBaseBroadcastSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBroadcastSignalAction(void * id, const Q3CString & s) : UmlBaseBroadcastSignalAction(id, s) {
+    UmlBroadcastSignalAction(void * id, const QByteArray & s) : UmlBaseBroadcastSignalAction(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlValueSpecificationAction : public UmlBaseValueSpecificationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlValueSpecificationAction(void * id, const Q3CString & s) : UmlBaseValueSpecificationAction(id, s) {
+    UmlValueSpecificationAction(void * id, const QByteArray & s) : UmlBaseValueSpecificationAction(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlOpaqueAction : public UmlBaseOpaqueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOpaqueAction(void * id, const Q3CString & s) : UmlBaseOpaqueAction(id, s) {
+    UmlOpaqueAction(void * id, const QByteArray & s) : UmlBaseOpaqueAction(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlAcceptEventAction : public UmlBaseAcceptEventAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptEventAction(void * id, const Q3CString & s) : UmlBaseAcceptEventAction(id, s) {
+    UmlAcceptEventAction(void * id, const QByteArray & s) : UmlBaseAcceptEventAction(id, s) {
     }
 
 };
@@ -72,7 +72,7 @@ class UmlCallOperationAction : public UmlBaseCallOperationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallOperationAction(void * id, const Q3CString & s) : UmlBaseCallOperationAction(id, s) {
+    UmlCallOperationAction(void * id, const QByteArray & s) : UmlBaseCallOperationAction(id, s) {
     }
 
 };
@@ -81,7 +81,7 @@ class UmlCallBehaviorAction : public UmlBaseCallBehaviorAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallBehaviorAction(void * id, const Q3CString & s) : UmlBaseCallBehaviorAction(id, s) {
+    UmlCallBehaviorAction(void * id, const QByteArray & s) : UmlBaseCallBehaviorAction(id, s) {
     }
 
 };
@@ -90,7 +90,7 @@ class UmlClearVariableValueAction : public UmlBaseClearVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClearVariableValueAction(void * id, const Q3CString & s) : UmlBaseClearVariableValueAction(id, s) {
+    UmlClearVariableValueAction(void * id, const QByteArray & s) : UmlBaseClearVariableValueAction(id, s) {
     }
 
 };
@@ -99,7 +99,7 @@ class UmlReadVariableValueAction : public UmlBaseReadVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReadVariableValueAction(void * id, const Q3CString & s) : UmlBaseReadVariableValueAction(id, s) {
+    UmlReadVariableValueAction(void * id, const QByteArray & s) : UmlBaseReadVariableValueAction(id, s) {
     }
 
 };
@@ -108,7 +108,7 @@ class UmlWriteVariableValueAction : public UmlBaseWriteVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlWriteVariableValueAction(void * id, const Q3CString & s) : UmlBaseWriteVariableValueAction(id, s) {
+    UmlWriteVariableValueAction(void * id, const QByteArray & s) : UmlBaseWriteVariableValueAction(id, s) {
     }
 
 };
@@ -117,7 +117,7 @@ class UmlAddVariableValueAction : public UmlBaseAddVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAddVariableValueAction(void * id, const Q3CString & s) : UmlBaseAddVariableValueAction(id, s) {
+    UmlAddVariableValueAction(void * id, const QByteArray & s) : UmlBaseAddVariableValueAction(id, s) {
     }
 
 };
@@ -126,7 +126,7 @@ class UmlRemoveVariableValueAction : public UmlBaseRemoveVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRemoveVariableValueAction(void * id, const Q3CString & s) : UmlBaseRemoveVariableValueAction(id, s) {
+    UmlRemoveVariableValueAction(void * id, const QByteArray & s) : UmlBaseRemoveVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityControlNode.h b/genplugouts/BrowserSort/UmlActivityControlNode.h
index 8ebf04bf7..1396fd3e2 100644
--- a/genplugouts/BrowserSort/UmlActivityControlNode.h
+++ b/genplugouts/BrowserSort/UmlActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNode.h"
-#include <q3cstring.h>
+
 
 class UmlActivityControlNode : public UmlBaseActivityControlNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityControlNode(void * id, const Q3CString & s) : UmlBaseActivityControlNode(id, s) {
+    UmlActivityControlNode(void * id, const QByteArray & s) : UmlBaseActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityControlNodeClasses.h b/genplugouts/BrowserSort/UmlActivityControlNodeClasses.h
index f698adeca..2be0cd946 100644
--- a/genplugouts/BrowserSort/UmlActivityControlNodeClasses.h
+++ b/genplugouts/BrowserSort/UmlActivityControlNodeClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNodeClasses.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode : public UmlBaseInitialActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInitialActivityNode(void * id, const Q3CString & s) : UmlBaseInitialActivityNode(id, s) {
+    UmlInitialActivityNode(void * id, const QByteArray & s) : UmlBaseInitialActivityNode(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlFlowFinalActivityNode : public UmlBaseFlowFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlFlowFinalActivityNode(void * id, const Q3CString & s) : UmlBaseFlowFinalActivityNode(id, s) {
+    UmlFlowFinalActivityNode(void * id, const QByteArray & s) : UmlBaseFlowFinalActivityNode(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlActivityFinalActivityNode : public UmlBaseActivityFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityFinalActivityNode(void * id, const Q3CString & s) : UmlBaseActivityFinalActivityNode(id, s) {
+    UmlActivityFinalActivityNode(void * id, const QByteArray & s) : UmlBaseActivityFinalActivityNode(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlDecisionActivityNode : public UmlBaseDecisionActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDecisionActivityNode(void * id, const Q3CString & s) : UmlBaseDecisionActivityNode(id, s) {
+    UmlDecisionActivityNode(void * id, const QByteArray & s) : UmlBaseDecisionActivityNode(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlMergeActivityNode : public UmlBaseMergeActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlMergeActivityNode(void * id, const Q3CString & s) : UmlBaseMergeActivityNode(id, s) {
+    UmlMergeActivityNode(void * id, const QByteArray & s) : UmlBaseMergeActivityNode(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlForkActivityNode : public UmlBaseForkActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlForkActivityNode(void * id, const Q3CString & s) : UmlBaseForkActivityNode(id, s) {
+    UmlForkActivityNode(void * id, const QByteArray & s) : UmlBaseForkActivityNode(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlJoinActivityNode : public UmlBaseJoinActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlJoinActivityNode(void * id, const Q3CString & s) : UmlBaseJoinActivityNode(id, s) {
+    UmlJoinActivityNode(void * id, const QByteArray & s) : UmlBaseJoinActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityDiagram.h b/genplugouts/BrowserSort/UmlActivityDiagram.h
index 4b48b12f2..b45a0410a 100644
--- a/genplugouts/BrowserSort/UmlActivityDiagram.h
+++ b/genplugouts/BrowserSort/UmlActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseActivityDiagram.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 // This class manages 'activity diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -15,7 +15,7 @@ class UmlActivityDiagram : public UmlBaseActivityDiagram, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityDiagram(void * id, const Q3CString & s) : UmlBaseActivityDiagram(id, s) {
+    UmlActivityDiagram(void * id, const QByteArray & s) : UmlBaseActivityDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityNode.h b/genplugouts/BrowserSort/UmlActivityNode.h
index 8429d2396..770c06359 100644
--- a/genplugouts/BrowserSort/UmlActivityNode.h
+++ b/genplugouts/BrowserSort/UmlActivityNode.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityNode.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityNode : public UmlBaseActivityNode, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityNode(void * id, const Q3CString & s) : UmlBaseActivityNode(id, s) {
+    UmlActivityNode(void * id, const QByteArray & s) : UmlBaseActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityObject.h b/genplugouts/BrowserSort/UmlActivityObject.h
index f75bccd9b..22de36492 100644
--- a/genplugouts/BrowserSort/UmlActivityObject.h
+++ b/genplugouts/BrowserSort/UmlActivityObject.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityObject.h"
-#include <q3cstring.h>
+
 
 class UmlActivityObject : public UmlBaseActivityObject
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityObject(void * id, const Q3CString & s) : UmlBaseActivityObject(id, s) {
+    UmlActivityObject(void * id, const QByteArray & s) : UmlBaseActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityParameter.h b/genplugouts/BrowserSort/UmlActivityParameter.h
index b51b0fec0..57474b452 100644
--- a/genplugouts/BrowserSort/UmlActivityParameter.h
+++ b/genplugouts/BrowserSort/UmlActivityParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityParameter.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter : public UmlBaseActivityParameter
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityParameter(void * id, const Q3CString & s) : UmlBaseActivityParameter(id, s) {
+    UmlActivityParameter(void * id, const QByteArray & s) : UmlBaseActivityParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityPin.h b/genplugouts/BrowserSort/UmlActivityPin.h
index 5d7ae2e0f..a53330fe2 100644
--- a/genplugouts/BrowserSort/UmlActivityPin.h
+++ b/genplugouts/BrowserSort/UmlActivityPin.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityPin.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin : public UmlBaseActivityPin
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPin(void * id, const Q3CString & s) : UmlBaseActivityPin(id, s) {
+    UmlActivityPin(void * id, const QByteArray & s) : UmlBaseActivityPin(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlActivityRegion.h b/genplugouts/BrowserSort/UmlActivityRegion.h
index 420b4bde2..1db9fe05f 100644
--- a/genplugouts/BrowserSort/UmlActivityRegion.h
+++ b/genplugouts/BrowserSort/UmlActivityRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityRegion.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityRegion : public UmlBaseActivityRegion, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityRegion(void * id, const Q3CString & s) : UmlBaseActivityRegion(id, s) {
+    UmlActivityRegion(void * id, const QByteArray & s) : UmlBaseActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlArtifact.h b/genplugouts/BrowserSort/UmlArtifact.h
index 75618a15c..ae1cc2571 100644
--- a/genplugouts/BrowserSort/UmlArtifact.h
+++ b/genplugouts/BrowserSort/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+
 
 // This class manages 'artifacts'
 //
@@ -11,9 +11,9 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
-    virtual int orderWeight();
+    virtual int orderWeight() override;
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlAttribute.h b/genplugouts/BrowserSort/UmlAttribute.h
index 19ee0a4c6..427658b45 100644
--- a/genplugouts/BrowserSort/UmlAttribute.h
+++ b/genplugouts/BrowserSort/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseAccessVariableValueAction.h b/genplugouts/BrowserSort/UmlBaseAccessVariableValueAction.h
index 311fefa08..6c3dbe588 100644
--- a/genplugouts/BrowserSort/UmlBaseAccessVariableValueAction.h
+++ b/genplugouts/BrowserSort/UmlBaseAccessVariableValueAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlItem;
 
@@ -11,7 +11,7 @@ class UmlBaseAccessVariableValueAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAccessVariableValueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAccessVariableValueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -30,7 +30,7 @@ class UmlBaseAccessVariableValueAction : public UmlActivityAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseActivity.cpp b/genplugouts/BrowserSort/UmlBaseActivity.cpp
index 2f992ddd1..45801f46c 100644
--- a/genplugouts/BrowserSort/UmlBaseActivity.cpp
+++ b/genplugouts/BrowserSort/UmlBaseActivity.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassView.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivity * UmlBaseActivity::create(UmlClassView * parent, const char * s)
 {
@@ -17,7 +17,7 @@ anItemKind UmlBaseActivity::kind()
     return anActivity;
 }
 
-const Q3CString & UmlBaseActivity::preCondition()
+const QByteArray & UmlBaseActivity::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivity::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::postCondition()
+const QByteArray & UmlBaseActivity::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -40,7 +40,7 @@ bool UmlBaseActivity::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivity::cppPreCondition()
+const QByteArray & UmlBaseActivity::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -51,7 +51,7 @@ bool UmlBaseActivity::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::cppPostCondition()
+const QByteArray & UmlBaseActivity::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -64,7 +64,7 @@ bool UmlBaseActivity::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivity::javaPreCondition()
+const QByteArray & UmlBaseActivity::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -75,7 +75,7 @@ bool UmlBaseActivity::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::javaPostCondition()
+const QByteArray & UmlBaseActivity::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/BrowserSort/UmlBaseActivity.h b/genplugouts/BrowserSort/UmlBaseActivity.h
index a0eca47eb..591850504 100644
--- a/genplugouts/BrowserSort/UmlBaseActivity.h
+++ b/genplugouts/BrowserSort/UmlBaseActivity.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivity;
 class UmlClassView;
@@ -21,18 +21,18 @@ class UmlBaseActivity : public UmlItem
     static UmlActivity * create(UmlClassView * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivity(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivity(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -40,7 +40,7 @@ class UmlBaseActivity : public UmlItem
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -49,7 +49,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -57,7 +57,7 @@ class UmlBaseActivity : public UmlItem
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -75,7 +75,7 @@ class UmlBaseActivity : public UmlItem
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -113,24 +113,24 @@ class UmlBaseActivity : public UmlItem
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     bool _read_only;
@@ -141,7 +141,7 @@ class UmlBaseActivity : public UmlItem
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
     virtual void read_cpp_();
diff --git a/genplugouts/BrowserSort/UmlBaseActivityAction.cpp b/genplugouts/BrowserSort/UmlBaseActivityAction.cpp
index fb47b7b1b..de084771d 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityAction.cpp
+++ b/genplugouts/BrowserSort/UmlBaseActivityAction.cpp
@@ -3,9 +3,9 @@
 #include "UmlBaseActivityAction.h"
 #include "UmlDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseActivityAction::preCondition()
+const QByteArray & UmlBaseActivityAction::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -16,7 +16,7 @@ bool UmlBaseActivityAction::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::postCondition()
+const QByteArray & UmlBaseActivityAction::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivityAction::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityAction::cppPreCondition()
+const QByteArray & UmlBaseActivityAction::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -39,7 +39,7 @@ bool UmlBaseActivityAction::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::cppPostCondition()
+const QByteArray & UmlBaseActivityAction::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivityAction::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityAction::javaPreCondition()
+const QByteArray & UmlBaseActivityAction::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -63,7 +63,7 @@ bool UmlBaseActivityAction::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::javaPostCondition()
+const QByteArray & UmlBaseActivityAction::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/BrowserSort/UmlBaseActivityAction.h b/genplugouts/BrowserSort/UmlBaseActivityAction.h
index 4a06ccffe..612326f18 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityAction.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlDiagram;
 
@@ -11,13 +11,13 @@ class UmlBaseActivityAction : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityAction(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityAction(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -25,7 +25,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -34,7 +34,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -42,7 +42,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -52,7 +52,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -60,7 +60,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -82,38 +82,38 @@ class UmlBaseActivityAction : public UmlActivityNode
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     UmlDiagram * _assoc_diagram;
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseActivityActionClasses.cpp b/genplugouts/BrowserSort/UmlBaseActivityActionClasses.cpp
index c94136abc..41c5e828e 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityActionClasses.cpp
+++ b/genplugouts/BrowserSort/UmlBaseActivityActionClasses.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlSendObjectAction * UmlBaseSendObjectAction::create(UmlItem * parent, const char * s)
 {
@@ -57,7 +57,7 @@ anItemKind UmlBaseValueSpecificationAction::kind()
     return aValueSpecificationAction;
 }
 
-const Q3CString & UmlBaseValueSpecificationAction::value()
+const QByteArray & UmlBaseValueSpecificationAction::value()
 {
     read_if_needed_();
     return _value;
@@ -69,7 +69,7 @@ bool UmlBaseValueSpecificationAction::set_Value(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseValueSpecificationAction::cppValue()
+const QByteArray & UmlBaseValueSpecificationAction::cppValue()
 {
     read_if_needed_();
     return _cpp_value;
@@ -82,7 +82,7 @@ bool UmlBaseValueSpecificationAction::set_CppValue(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseValueSpecificationAction::javaValue()
+const QByteArray & UmlBaseValueSpecificationAction::javaValue()
 {
     read_if_needed_();
     return _java_value;
@@ -138,7 +138,7 @@ anItemKind UmlBaseOpaqueAction::kind()
     return anOpaqueAction;
 }
 
-const Q3CString & UmlBaseOpaqueAction::behavior()
+const QByteArray & UmlBaseOpaqueAction::behavior()
 {
     read_if_needed_();
     return _behavior;
@@ -150,7 +150,7 @@ bool UmlBaseOpaqueAction::set_Behavior(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOpaqueAction::cppBehavior()
+const QByteArray & UmlBaseOpaqueAction::cppBehavior()
 {
     read_if_needed_();
     return _cpp_behavior;
@@ -163,7 +163,7 @@ bool UmlBaseOpaqueAction::set_CppBehavior(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOpaqueAction::javaBehavior()
+const QByteArray & UmlBaseOpaqueAction::javaBehavior()
 {
     read_if_needed_();
     return _java_behavior;
@@ -241,7 +241,7 @@ bool UmlBaseAcceptEventAction::set_isTimeEvent(bool v)
     return set_it_(_timeevent, v, setTimeEventCmd);
 }
 
-const Q3CString & UmlBaseAcceptEventAction::trigger()
+const QByteArray & UmlBaseAcceptEventAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -253,7 +253,7 @@ bool UmlBaseAcceptEventAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptEventAction::cppTrigger()
+const QByteArray & UmlBaseAcceptEventAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -266,7 +266,7 @@ bool UmlBaseAcceptEventAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptEventAction::javaTrigger()
+const QByteArray & UmlBaseAcceptEventAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
diff --git a/genplugouts/BrowserSort/UmlBaseActivityActionClasses.h b/genplugouts/BrowserSort/UmlBaseActivityActionClasses.h
index 1a3b14b5f..61217e32e 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityActionClasses.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityActionClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityAction.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlOnSignalAction.h"
 #include "UmlAccessVariableValueAction.h"
 
@@ -36,12 +36,12 @@ class UmlBaseSendObjectAction : public UmlActivityAction
     static UmlSendObjectAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseSendObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -57,12 +57,12 @@ class UmlBaseUnmarshallAction : public UmlActivityAction
     static UmlUnmarshallAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUnmarshallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseUnmarshallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -78,12 +78,12 @@ class UmlBaseSendSignalAction : public UmlOnSignalAction
     static UmlSendSignalAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseSendSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -99,12 +99,12 @@ class UmlBaseBroadcastSignalAction : public UmlOnSignalAction
     static UmlBroadcastSignalAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseBroadcastSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseBroadcastSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -120,18 +120,18 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
     static UmlValueSpecificationAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseValueSpecificationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseValueSpecificationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the value
-    const Q3CString & value();
+    const QByteArray & value();
 
     // set the value
     //
@@ -140,7 +140,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the value in C++
-    const Q3CString & cppValue();
+    const QByteArray & cppValue();
 
     // set the value in C++
     //
@@ -150,7 +150,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the value in Java
-    const Q3CString & javaValue();
+    const QByteArray & javaValue();
 
     // set the value in Java
     //
@@ -164,30 +164,30 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _value;
+    QByteArray _value;
 
 #ifdef WITHCPP
-    Q3CString _cpp_value;
+    QByteArray _cpp_value;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_value;
+    QByteArray _java_value;
 #endif
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
@@ -203,18 +203,18 @@ class UmlBaseOpaqueAction : public UmlActivityAction
     static UmlOpaqueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOpaqueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOpaqueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the behavior
-    const Q3CString & behavior();
+    const QByteArray & behavior();
 
     // set the behavior
     //
@@ -223,7 +223,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the behavior in C++
-    const Q3CString & cppBehavior();
+    const QByteArray & cppBehavior();
 
     // set the behavior in C++
     //
@@ -233,7 +233,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the behavior in Java
-    const Q3CString & javaBehavior();
+    const QByteArray & javaBehavior();
 
     // set the behavior in Java
     //
@@ -247,30 +247,30 @@ class UmlBaseOpaqueAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _behavior;
+    QByteArray _behavior;
 
 #ifdef WITHCPP
-    Q3CString _cpp_behavior;
+    QByteArray _cpp_behavior;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_behavior;
+    QByteArray _java_behavior;
 #endif
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
@@ -286,12 +286,12 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     static UmlAcceptEventAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptEventAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptEventAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -313,7 +313,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     bool set_isTimeEvent(bool v);
 
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -322,7 +322,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -332,7 +332,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -346,7 +346,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
@@ -354,26 +354,26 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
     bool _timeevent;
 
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
@@ -389,12 +389,12 @@ class UmlBaseCallOperationAction : public UmlActivityAction
     static UmlCallOperationAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallOperationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallOperationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -423,7 +423,7 @@ class UmlBaseCallOperationAction : public UmlActivityAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -438,12 +438,12 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
     static UmlCallBehaviorAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallBehaviorAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallBehaviorAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -472,7 +472,7 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -487,12 +487,12 @@ class UmlBaseClearVariableValueAction : public UmlAccessVariableValueAction
     static UmlClearVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClearVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseClearVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -508,12 +508,12 @@ class UmlBaseReadVariableValueAction : public UmlAccessVariableValueAction
     static UmlReadVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReadVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseReadVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -529,12 +529,12 @@ class UmlBaseWriteVariableValueAction : public UmlAccessVariableValueAction
     static UmlWriteVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseWriteVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseWriteVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -550,12 +550,12 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
     static UmlAddVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAddVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseAddVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -574,7 +574,7 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -589,12 +589,12 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
     static UmlRemoveVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRemoveVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseRemoveVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -613,7 +613,7 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseActivityControlNode.h b/genplugouts/BrowserSort/UmlBaseActivityControlNode.h
index 9f1c0931a..3d07467c1 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityControlNode.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityControlNode : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityControlNode(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityControlNode(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseActivityControlNodeClasses.h b/genplugouts/BrowserSort/UmlBaseActivityControlNodeClasses.h
index 84dd781f7..1ef579e8c 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityControlNodeClasses.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityControlNodeClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityControlNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode;
 class UmlItem;
@@ -31,7 +31,7 @@ class UmlBaseInitialActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseInitialActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -52,7 +52,7 @@ class UmlBaseFlowFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlowFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseFlowFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -73,7 +73,7 @@ class UmlBaseActivityFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseActivityFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -94,7 +94,7 @@ class UmlBaseDecisionActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDecisionActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseDecisionActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -115,7 +115,7 @@ class UmlBaseMergeActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseMergeActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseMergeActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -136,7 +136,7 @@ class UmlBaseForkActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseForkActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -157,7 +157,7 @@ class UmlBaseJoinActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseJoinActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseActivityDiagram.h b/genplugouts/BrowserSort/UmlBaseActivityDiagram.h
index 8ed6ca9d6..67d2ff8af 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseActivityDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseActivityDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseActivityNode.h b/genplugouts/BrowserSort/UmlBaseActivityNode.h
index 9018d75ce..54536ed90 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityNode.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityNode : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityNode(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityNode(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseActivityObject.cpp b/genplugouts/BrowserSort/UmlBaseActivityObject.cpp
index 748e7c22b..f96d4a344 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityObject.cpp
+++ b/genplugouts/BrowserSort/UmlBaseActivityObject.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityObject * UmlBaseActivityObject::create(UmlItem * parent, const char * s)
 {
@@ -28,7 +28,7 @@ bool UmlBaseActivityObject::set_Type(const UmlTypeSpec & v)
     return set_it_(_type, v, setTypeCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::multiplicity()
+const QByteArray & UmlBaseActivityObject::multiplicity()
 {
     read_if_needed_();
     return _multiplicity;
@@ -39,7 +39,7 @@ bool UmlBaseActivityObject::set_Multiplicity(const char * v)
     return set_it_(_multiplicity, v, setMultiplicityCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::inState()
+const QByteArray & UmlBaseActivityObject::inState()
 {
     read_if_needed_();
     return _in_state;
@@ -50,7 +50,7 @@ bool UmlBaseActivityObject::set_InState(const char * v)
     return set_it_(_in_state, v, setInStateCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::selection()
+const QByteArray & UmlBaseActivityObject::selection()
 {
     read_if_needed_();
     return _selection;
@@ -62,7 +62,7 @@ bool UmlBaseActivityObject::set_Selection(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityObject::cppSelection()
+const QByteArray & UmlBaseActivityObject::cppSelection()
 {
     read_if_needed_();
     return _cpp_selection;
@@ -75,7 +75,7 @@ bool UmlBaseActivityObject::set_CppSelection(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityObject::javaSelection()
+const QByteArray & UmlBaseActivityObject::javaSelection()
 {
     read_if_needed_();
     return _java_selection;
diff --git a/genplugouts/BrowserSort/UmlBaseActivityObject.h b/genplugouts/BrowserSort/UmlBaseActivityObject.h
index 5c1938905..8b331ae01 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityObject.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityObject.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "anOrdering.h"
 
@@ -28,7 +28,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityObject(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityObject(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
@@ -42,7 +42,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Type(const UmlTypeSpec & v);
 
     // return the multiplicity
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // set the multiplicity
     //
@@ -50,7 +50,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Multiplicity(const char * v);
 
     // return the inState attribute
-    const Q3CString & inState();
+    const QByteArray & inState();
 
     // set the inState attribute
     //
@@ -58,7 +58,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_InState(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -67,7 +67,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -123,18 +123,18 @@ class UmlBaseActivityObject : public UmlActivityNode
 
     UmlTypeSpec _type;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _in_state;
+    QByteArray _in_state;
 
-    Q3CString _selection;
+    QByteArray _selection;
 
 #ifdef WITHCPP
-    Q3CString _cpp_selection;
+    QByteArray _cpp_selection;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_selection;
+    QByteArray _java_selection;
 #endif
 
     anOrdering _ordering : 8;
diff --git a/genplugouts/BrowserSort/UmlBaseActivityParameter.cpp b/genplugouts/BrowserSort/UmlBaseActivityParameter.cpp
index 067b1ba5c..0e5dd560c 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityParameter.cpp
+++ b/genplugouts/BrowserSort/UmlBaseActivityParameter.cpp
@@ -4,7 +4,7 @@
 #include "UmlActivityParameter.h"
 #include "UmlActivity.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityParameter * UmlBaseActivityParameter::create(UmlActivity * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseActivityParameter::kind()
     return anActivityParameter;
 }
 
-const Q3CString & UmlBaseActivityParameter::defaultValue()
+const QByteArray & UmlBaseActivityParameter::defaultValue()
 {
     read_if_needed_();
     return _default_value;
diff --git a/genplugouts/BrowserSort/UmlBaseActivityParameter.h b/genplugouts/BrowserSort/UmlBaseActivityParameter.h
index 1f05aabe8..fcdd9cecc 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityParameter.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityParameter.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter;
 class UmlActivity;
@@ -25,13 +25,13 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityParameter(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityParameter(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 
 public:
     // return the default value
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // set the default value
     //
@@ -48,7 +48,7 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 
 private:
-    Q3CString _default_value;
+    QByteArray _default_value;
 
 
 protected:
diff --git a/genplugouts/BrowserSort/UmlBaseActivityPin.h b/genplugouts/BrowserSort/UmlBaseActivityPin.h
index 52f5d4072..9ef909129 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityPin.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityPin.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin;
 class UmlActivityAction;
@@ -25,7 +25,7 @@ class UmlBaseActivityPin : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPin(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityPin(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseActivityRegion.h b/genplugouts/BrowserSort/UmlBaseActivityRegion.h
index 95e516e75..cf3b637c1 100644
--- a/genplugouts/BrowserSort/UmlBaseActivityRegion.h
+++ b/genplugouts/BrowserSort/UmlBaseActivityRegion.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 
@@ -11,7 +11,7 @@ class UmlBaseActivityRegion : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/BrowserSort/UmlBaseArtifact.cpp b/genplugouts/BrowserSort/UmlBaseArtifact.cpp
index 86e17851e..36fca0e65 100644
--- a/genplugouts/BrowserSort/UmlBaseArtifact.cpp
+++ b/genplugouts/BrowserSort/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,9 +78,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
-            _assoc_classes.resize(last);
+            _assoc_classes.reserve(last);
         }
 
         return TRUE;
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         if (_defined)
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] =  _associated[last];
 
             _associated.resize(last);
         }
@@ -166,54 +168,54 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -248,13 +250,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] =  (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/BrowserSort/UmlBaseArtifact.h b/genplugouts/BrowserSort/UmlBaseArtifact.h
index 7ff662554..0fce0ece3 100644
--- a/genplugouts/BrowserSort/UmlBaseArtifact.h
+++ b/genplugouts/BrowserSort/UmlBaseArtifact.h
@@ -4,9 +4,9 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
 
-#include <q3cstring.h>
+
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -38,7 +38,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -57,11 +57,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -84,40 +84,40 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -129,22 +129,22 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -172,11 +172,11 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/BrowserSort/UmlBaseAttribute.cpp b/genplugouts/BrowserSort/UmlBaseAttribute.cpp
index f5a6d51bd..b6700e578 100644
--- a/genplugouts/BrowserSort/UmlBaseAttribute.cpp
+++ b/genplugouts/BrowserSort/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -29,7 +29,7 @@ bool UmlBaseAttribute::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -121,7 +121,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/BrowserSort/UmlBaseAttribute.h b/genplugouts/BrowserSort/UmlBaseAttribute.h
index 3ce2c69c1..0fc286acc 100644
--- a/genplugouts/BrowserSort/UmlBaseAttribute.h
+++ b/genplugouts/BrowserSort/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -35,7 +35,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -89,7 +89,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -119,7 +119,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -131,13 +131,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -165,7 +165,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/BrowserSort/UmlBaseChoicePseudoState.h b/genplugouts/BrowserSort/UmlBaseChoicePseudoState.h
index fb682dd91..8d15fc093 100644
--- a/genplugouts/BrowserSort/UmlBaseChoicePseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseClass.cpp b/genplugouts/BrowserSort/UmlBaseClass.cpp
index 72861919d..e522d3d9a 100644
--- a/genplugouts/BrowserSort/UmlBaseClass.cpp
+++ b/genplugouts/BrowserSort/UmlBaseClass.cpp
@@ -10,8 +10,8 @@
 #include "UmlCom.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -46,11 +46,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -82,11 +82,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -131,17 +131,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -299,7 +299,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -325,15 +325,15 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -345,9 +345,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray,UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -355,7 +355,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/BrowserSort/UmlBaseClass.h b/genplugouts/BrowserSort/UmlBaseClass.h
index 7d411a8c5..d72487c0b 100644
--- a/genplugouts/BrowserSort/UmlBaseClass.h
+++ b/genplugouts/BrowserSort/UmlBaseClass.h
@@ -5,12 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-
-#include <q3cstring.h>
-#include <q3dict.h>
-
+#include <QList>
+#include <QByteArray>
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
 class UmlClass;
@@ -55,7 +51,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -78,7 +74,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -101,7 +97,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -185,7 +181,7 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -198,13 +194,13 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     friend class UmlBaseRelation;
     friend class UmlBaseArtifact;
 
 private:
-    static Q3Dict<UmlClass> _classes;
+    static QHash<QByteArray,UmlClass*> _classes;
 
     bool _abstract;
 
@@ -241,7 +237,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/BrowserSort/UmlBaseClassDiagram.h b/genplugouts/BrowserSort/UmlBaseClassDiagram.h
index e0990d31f..a3f406b00 100644
--- a/genplugouts/BrowserSort/UmlBaseClassDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseClassItem.cpp b/genplugouts/BrowserSort/UmlBaseClassItem.cpp
index 345c1a18d..8babd321f 100644
--- a/genplugouts/BrowserSort/UmlBaseClassItem.cpp
+++ b/genplugouts/BrowserSort/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/BrowserSort/UmlBaseClassItem.h b/genplugouts/BrowserSort/UmlBaseClassItem.h
index 2569d9776..c5348dadc 100644
--- a/genplugouts/BrowserSort/UmlBaseClassItem.h
+++ b/genplugouts/BrowserSort/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -50,20 +50,20 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/BrowserSort/UmlBaseClassMember.cpp b/genplugouts/BrowserSort/UmlBaseClassMember.cpp
index eafbf7355..ab0696da4 100644
--- a/genplugouts/BrowserSort/UmlBaseClassMember.cpp
+++ b/genplugouts/BrowserSort/UmlBaseClassMember.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlBaseClassMember::isClassMember()
 {
     read_if_needed_();
@@ -70,7 +70,7 @@ bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
 #endif
 
 #ifdef WITHJAVA
-Q3CString UmlBaseClassMember::javaAnnotations()
+QByteArray UmlBaseClassMember::javaAnnotations()
 {
     read_if_needed_();
 
diff --git a/genplugouts/BrowserSort/UmlBaseClassMember.h b/genplugouts/BrowserSort/UmlBaseClassMember.h
index 520bfe17a..0c7fcbb87 100644
--- a/genplugouts/BrowserSort/UmlBaseClassMember.h
+++ b/genplugouts/BrowserSort/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -57,7 +57,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 #ifdef WITHJAVA
     // returns the Java annotations
-    Q3CString javaAnnotations();
+    QByteArray javaAnnotations();
 
     // set the Java annotations
     //
@@ -79,7 +79,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
@@ -102,7 +102,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 private:
 #ifdef WITHJAVA
-    Q3CString _java_annotation;
+    QByteArray _java_annotation;
 #endif
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseClassView.h b/genplugouts/BrowserSort/UmlBaseClassView.h
index 5687a666f..cec17090f 100644
--- a/genplugouts/BrowserSort/UmlBaseClassView.h
+++ b/genplugouts/BrowserSort/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseCollaborationDiagram.h b/genplugouts/BrowserSort/UmlBaseCollaborationDiagram.h
index 0a49b41e6..39c8eb5db 100644
--- a/genplugouts/BrowserSort/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseComponent.cpp b/genplugouts/BrowserSort/UmlBaseComponent.cpp
index 0fe6d1aed..fa399b975 100644
--- a/genplugouts/BrowserSort/UmlBaseComponent.cpp
+++ b/genplugouts/BrowserSort/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizedClasses()
 {
     read_if_needed_();
 
     return _realized;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realized, provided, required);
@@ -96,18 +96,18 @@ void UmlBaseComponent::read_uml_()
     _realized.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realized.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realized[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/BrowserSort/UmlBaseComponent.h b/genplugouts/BrowserSort/UmlBaseComponent.h
index 80f18c1e0..5d077c045 100644
--- a/genplugouts/BrowserSort/UmlBaseComponent.h
+++ b/genplugouts/BrowserSort/UmlBaseComponent.h
@@ -4,9 +4,9 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
 
-#include <q3cstring.h>
+
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -37,18 +37,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realized classes
-    const Q3PtrVector<UmlClass> & realizedClasses();
+    const QVector<UmlClass*> & realizedClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realized, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -58,11 +58,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realized;
+    QVector<UmlClass*> _realized;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -71,11 +71,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/BrowserSort/UmlBaseComponentDiagram.h b/genplugouts/BrowserSort/UmlBaseComponentDiagram.h
index 43466da7c..b235e0717 100644
--- a/genplugouts/BrowserSort/UmlBaseComponentDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseComponentView.h b/genplugouts/BrowserSort/UmlBaseComponentView.h
index 0cb5c0769..a8ff514fb 100644
--- a/genplugouts/BrowserSort/UmlBaseComponentView.h
+++ b/genplugouts/BrowserSort/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseDeepHistoryPseudoState.h b/genplugouts/BrowserSort/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..9224eb152 100644
--- a/genplugouts/BrowserSort/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseDeployment.h b/genplugouts/BrowserSort/UmlBaseDeployment.h
index b268e0c17..b16902170 100644
--- a/genplugouts/BrowserSort/UmlBaseDeployment.h
+++ b/genplugouts/BrowserSort/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseDeploymentDiagram.h b/genplugouts/BrowserSort/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..db1cfc67d 100644
--- a/genplugouts/BrowserSort/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseDeploymentView.h b/genplugouts/BrowserSort/UmlBaseDeploymentView.h
index 08c540330..df550cb1b 100644
--- a/genplugouts/BrowserSort/UmlBaseDeploymentView.h
+++ b/genplugouts/BrowserSort/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseDiagram.cpp b/genplugouts/BrowserSort/UmlBaseDiagram.cpp
index e1ceb269d..d0fb2d705 100644
--- a/genplugouts/BrowserSort/UmlBaseDiagram.cpp
+++ b/genplugouts/BrowserSort/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/BrowserSort/UmlBaseDiagram.h b/genplugouts/BrowserSort/UmlBaseDiagram.h
index 9cf05ff22..19e34654b 100644
--- a/genplugouts/BrowserSort/UmlBaseDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseEntryPointPseudoState.h b/genplugouts/BrowserSort/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..60dd28bb0 100644
--- a/genplugouts/BrowserSort/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseExitPointPseudoState.h b/genplugouts/BrowserSort/UmlBaseExitPointPseudoState.h
index ff2ad12bc..29563f22b 100644
--- a/genplugouts/BrowserSort/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseExpansionNode.h b/genplugouts/BrowserSort/UmlBaseExpansionNode.h
index 41bcbece2..6642afe1b 100644
--- a/genplugouts/BrowserSort/UmlBaseExpansionNode.h
+++ b/genplugouts/BrowserSort/UmlBaseExpansionNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityObject.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode;
 class UmlExpansionRegion;
@@ -25,7 +25,7 @@ class UmlBaseExpansionNode : public UmlActivityObject
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionNode(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBaseExpansionNode(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseExpansionRegion.h b/genplugouts/BrowserSort/UmlBaseExpansionRegion.h
index 913b4ec4a..2ca1994ad 100644
--- a/genplugouts/BrowserSort/UmlBaseExpansionRegion.h
+++ b/genplugouts/BrowserSort/UmlBaseExpansionRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "anExpansionKind.h"
 
 class UmlExpansionRegion;
@@ -26,7 +26,7 @@ class UmlBaseExpansionRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseExpansionRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 
diff --git a/genplugouts/BrowserSort/UmlBaseExtraClassMember.cpp b/genplugouts/BrowserSort/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/BrowserSort/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/BrowserSort/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/BrowserSort/UmlBaseExtraClassMember.h b/genplugouts/BrowserSort/UmlBaseExtraClassMember.h
index e2b9d4f30..4f07b5583 100644
--- a/genplugouts/BrowserSort/UmlBaseExtraClassMember.h
+++ b/genplugouts/BrowserSort/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/BrowserSort/UmlBaseFinalState.h b/genplugouts/BrowserSort/UmlBaseFinalState.h
index 16e0816cf..2fa133da6 100644
--- a/genplugouts/BrowserSort/UmlBaseFinalState.h
+++ b/genplugouts/BrowserSort/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseFlow.cpp b/genplugouts/BrowserSort/UmlBaseFlow.cpp
index 5da07fbe8..b05e3eb62 100644
--- a/genplugouts/BrowserSort/UmlBaseFlow.cpp
+++ b/genplugouts/BrowserSort/UmlBaseFlow.cpp
@@ -4,7 +4,7 @@
 #include "UmlFlow.h"
 #include "UmlActivityNode.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseFlow::kind()
 {
@@ -29,7 +29,7 @@ UmlActivityNode * UmlBaseFlow::target()
     return _target;
 }
 
-const Q3CString & UmlBaseFlow::weight()
+const QByteArray & UmlBaseFlow::weight()
 {
     read_if_needed_();
     return _uml.weight;
@@ -40,7 +40,7 @@ bool UmlBaseFlow::set_Weight(const char * v)
     return set_it_(_uml.weight, v, setUmlActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::guard()
+const QByteArray & UmlBaseFlow::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -51,7 +51,7 @@ bool UmlBaseFlow::set_Guard(const char * v)
     return set_it_(_uml.guard, v, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::selection()
+const QByteArray & UmlBaseFlow::selection()
 {
     read_if_needed_();
     return _uml.selection;
@@ -62,7 +62,7 @@ bool UmlBaseFlow::set_Selection(const char * v)
     return set_it_(_uml.selection, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::transformation()
+const QByteArray & UmlBaseFlow::transformation()
 {
     read_if_needed_();
     return _uml.transformation;
@@ -74,7 +74,7 @@ bool UmlBaseFlow::set_Transformation(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseFlow::cppWeight()
+const QByteArray & UmlBaseFlow::cppWeight()
 {
     read_if_needed_();
     return _cpp.weight;
@@ -85,7 +85,7 @@ bool UmlBaseFlow::set_CppWeight(const char * v)
     return set_it_(_cpp.weight, v, setCppActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppGuard()
+const QByteArray & UmlBaseFlow::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -96,7 +96,7 @@ bool UmlBaseFlow::set_CppGuard(const char * v)
     return set_it_(_cpp.guard, v, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppSelection()
+const QByteArray & UmlBaseFlow::cppSelection()
 {
     read_if_needed_();
     return _cpp.selection;
@@ -107,7 +107,7 @@ bool UmlBaseFlow::set_CppSelection(const char * v)
     return set_it_(_cpp.selection, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppTransformation()
+const QByteArray & UmlBaseFlow::cppTransformation()
 {
     read_if_needed_();
     return _cpp.transformation;
@@ -120,7 +120,7 @@ bool UmlBaseFlow::set_CppTransformation(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseFlow::javaWeight()
+const QByteArray & UmlBaseFlow::javaWeight()
 {
     read_if_needed_();
     return _java.weight;
@@ -131,7 +131,7 @@ bool UmlBaseFlow::set_JavaWeight(const char * v)
     return set_it_(_java.weight, v, setJavaActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaGuard()
+const QByteArray & UmlBaseFlow::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -142,7 +142,7 @@ bool UmlBaseFlow::set_JavaGuard(const char * v)
     return set_it_(_java.guard, v, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaSelection()
+const QByteArray & UmlBaseFlow::javaSelection()
 {
     read_if_needed_();
     return _java.selection;
@@ -153,7 +153,7 @@ bool UmlBaseFlow::set_JavaSelection(const char * v)
     return set_it_(_java.selection, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaTransformation()
+const QByteArray & UmlBaseFlow::javaTransformation()
 {
     read_if_needed_();
     return _java.transformation;
diff --git a/genplugouts/BrowserSort/UmlBaseFlow.h b/genplugouts/BrowserSort/UmlBaseFlow.h
index b50ce3323..4edb40caf 100644
--- a/genplugouts/BrowserSort/UmlBaseFlow.h
+++ b/genplugouts/BrowserSort/UmlBaseFlow.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "FlowBehavior.h"
 
 class UmlFlow;
@@ -27,7 +27,7 @@ class UmlBaseFlow : public UmlItem
     virtual UmlActivityNode * target();
 
     // return the weight in OCL
-    const Q3CString & weight();
+    const QByteArray & weight();
 
     // set the weight in OCL
     //
@@ -35,7 +35,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Weight(const char * v);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Guard(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Selection(const char * v);
 
     // return the transformation in OCL
-    const Q3CString & transformation();
+    const QByteArray & transformation();
 
     // set the transformation in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHCPP
     // return the weight in C++
-    const Q3CString & cppWeight();
+    const QByteArray & cppWeight();
 
     // set the weight in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppWeight(const char * v);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppGuard(const char * v);
 
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppSelection(const char * v);
 
     // return the transformation in C++
-    const Q3CString & cppTransformation();
+    const QByteArray & cppTransformation();
 
     // set the transformation in C++
     //
@@ -94,7 +94,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHJAVA
     // return the weight in Java
-    const Q3CString & javaWeight();
+    const QByteArray & javaWeight();
 
     // set the weight in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaWeight(const char * v);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -110,7 +110,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaGuard(const char * v);
 
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -118,7 +118,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaSelection(const char * v);
 
     // return the transformation in Java
-    const Q3CString & javaTransformation();
+    const QByteArray & javaTransformation();
 
     // set the transformation in Java
     //
@@ -161,7 +161,7 @@ class UmlBaseFlow : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlow(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseFlow(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseForkPseudoState.h b/genplugouts/BrowserSort/UmlBaseForkPseudoState.h
index 009499bfa..9dfa5025c 100644
--- a/genplugouts/BrowserSort/UmlBaseForkPseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseFormalParameter.h b/genplugouts/BrowserSort/UmlBaseFormalParameter.h
index 84867aec4..70b9e6d68 100644
--- a/genplugouts/BrowserSort/UmlBaseFormalParameter.h
+++ b/genplugouts/BrowserSort/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -35,10 +35,10 @@ class UmlBaseFormalParameter
     friend class UmlBaseClass;
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/BrowserSort/UmlBaseInitialPseudoState.h b/genplugouts/BrowserSort/UmlBaseInitialPseudoState.h
index 88dae1cc6..2f31e4340 100644
--- a/genplugouts/BrowserSort/UmlBaseInitialPseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseInterruptibleActivityRegion.h b/genplugouts/BrowserSort/UmlBaseInterruptibleActivityRegion.h
index 70f988488..de6e56aed 100644
--- a/genplugouts/BrowserSort/UmlBaseInterruptibleActivityRegion.h
+++ b/genplugouts/BrowserSort/UmlBaseInterruptibleActivityRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInterruptibleActivityRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseItem.cpp b/genplugouts/BrowserSort/UmlBaseItem.cpp
index 23699eca4..b67cb9122 100644
--- a/genplugouts/BrowserSort/UmlBaseItem.cpp
+++ b/genplugouts/BrowserSort/UmlBaseItem.cpp
@@ -56,33 +56,33 @@
 #include "UmlActivityControlNodeClasses.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     return set_it_(_name, s, setNameCmd);
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -98,7 +98,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -118,11 +118,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -132,7 +132,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -140,10 +140,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -154,7 +154,7 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray *> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -163,8 +163,7 @@ const Q3Dict<Q3CString> UmlBaseItem::properties()
 
 bool UmlBaseItem::moveAfter(const UmlItem * x)
 {
-    UmlCom::send_cmd(_identifier, moveAfterCmd, (x != 0) ? ((UmlBaseItem *)x)->_identifier : 0);
-
+    UmlCom::send_cmd(_identifier, moveAfterCmd, x!=0?((UmlBaseItem *)x)->_identifier:0);
     if (UmlCom::read_bool()) {
         ((UmlBaseItem *)parent())->reread_children_if_needed_();
         return TRUE;
@@ -173,7 +172,7 @@ bool UmlBaseItem::moveAfter(const UmlItem * x)
         return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -185,7 +184,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
     return (int) UmlCom::read_unsigned();
@@ -203,11 +202,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -222,7 +221,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -241,17 +240,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -266,11 +265,11 @@ void UmlBaseItem::read_if_needed_()
         read_idl_();
 #  else
         ... WITHIDL must be defined when WITHCPP and WITHJAVA are both defined
-#  endif
-# else
+        #  endif
+        # else
 #  ifdef WITHIDL
         ... WITHJAVA must be defined when WITHCPP and WITHIDL are both defined
-#  else
+        #  else
         UmlCom::send_cmd(_identifier, getCppDefCmd);
         read_uml_();
         read_cpp_();
@@ -280,7 +279,7 @@ void UmlBaseItem::read_if_needed_()
 # ifdef WITHJAVA
 #  ifdef WITHIDL
         ... WITHCPP must be defined when WITHIDL and WITHJAVA are both defined
-#  else
+        #  else
         UmlCom::send_cmd(_identifier, getJavaDefCmd);
         read_uml_();
         read_java_();
@@ -328,9 +327,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -359,7 +358,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -413,7 +412,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -450,7 +449,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -669,20 +668,20 @@ UmlItem * UmlBaseItem::read_()
             //return new UmlPartition(id, name);
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/BrowserSort/UmlBaseItem.h b/genplugouts/BrowserSort/UmlBaseItem.h
index 2b53bf114..ddeeb9d02 100644
--- a/genplugouts/BrowserSort/UmlBaseItem.h
+++ b/genplugouts/BrowserSort/UmlBaseItem.h
@@ -3,16 +3,11 @@
 
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-
-#include <q3dict.h>
-#include <q3ptrdict.h>
-//#include "OnInstanceCmd.h"
 #include "Tools/ApiCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
-
+#include <QByteArray>
+#include <QHash>
 class UmlItem;
 class UmlTypeSpec;
 
@@ -39,35 +34,35 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -92,16 +87,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -136,7 +131,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -144,7 +139,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -157,7 +152,7 @@ class UmlBaseItem
     //  The result may contains UmlAttribute, UmlRelations, UmlNcRelations,
     //  UmlOperation (their bodies are not taken into account) , UmlClass
     //  and UmlComponents.
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -170,7 +165,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
     friend class UmlBaseClassItem;
     friend class UmlBaseAttribute;
@@ -206,23 +201,23 @@ class UmlBaseItem
 
     bool _marked;
 
-    void * _identifier;
+    void * _identifier = 0;
 
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
 protected:
@@ -278,7 +273,7 @@ class UmlBaseItem
 
     //internal, do NOT use it
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
 
@@ -291,7 +286,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/BrowserSort/UmlBaseJoinPseudoState.h b/genplugouts/BrowserSort/UmlBaseJoinPseudoState.h
index 31976dfff..c95cfff9c 100644
--- a/genplugouts/BrowserSort/UmlBaseJoinPseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseJunctionPseudoState.h b/genplugouts/BrowserSort/UmlBaseJunctionPseudoState.h
index 9b76d88e7..96cdfe959 100644
--- a/genplugouts/BrowserSort/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseNcRelation.h b/genplugouts/BrowserSort/UmlBaseNcRelation.h
index 7418e3406..0ad29c67b 100644
--- a/genplugouts/BrowserSort/UmlBaseNcRelation.h
+++ b/genplugouts/BrowserSort/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/BrowserSort/UmlBaseNode.h b/genplugouts/BrowserSort/UmlBaseNode.h
index 07a980e66..208e951f2 100644
--- a/genplugouts/BrowserSort/UmlBaseNode.h
+++ b/genplugouts/BrowserSort/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/BrowserSort/UmlBaseObjectDiagram.h b/genplugouts/BrowserSort/UmlBaseObjectDiagram.h
index dfe6983ef..720256a2d 100644
--- a/genplugouts/BrowserSort/UmlBaseObjectDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseObjectDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlObjectDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseObjectDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseObjectDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseObjectDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseOnSignalAction.cpp b/genplugouts/BrowserSort/UmlBaseOnSignalAction.cpp
index 8c887e113..aec5db337 100644
--- a/genplugouts/BrowserSort/UmlBaseOnSignalAction.cpp
+++ b/genplugouts/BrowserSort/UmlBaseOnSignalAction.cpp
@@ -2,9 +2,9 @@
 #include "UmlCom.h"
 #include "UmlBaseOnSignalAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseOnSignalAction::signal()
+const QByteArray & UmlBaseOnSignalAction::signal()
 {
     read_if_needed_();
     return _signal;
@@ -16,7 +16,7 @@ bool UmlBaseOnSignalAction::set_Signal(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOnSignalAction::cppSignal()
+const QByteArray & UmlBaseOnSignalAction::cppSignal()
 {
     read_if_needed_();
     return _cpp_signal;
@@ -29,7 +29,7 @@ bool UmlBaseOnSignalAction::set_CppSignal(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOnSignalAction::javaSignal()
+const QByteArray & UmlBaseOnSignalAction::javaSignal()
 {
     read_if_needed_();
     return _java_signal;
diff --git a/genplugouts/BrowserSort/UmlBaseOnSignalAction.h b/genplugouts/BrowserSort/UmlBaseOnSignalAction.h
index 6ad499b79..0d648e38c 100644
--- a/genplugouts/BrowserSort/UmlBaseOnSignalAction.h
+++ b/genplugouts/BrowserSort/UmlBaseOnSignalAction.h
@@ -3,19 +3,19 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlBaseOnSignalAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOnSignalAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOnSignalAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the signal
-    const Q3CString & signal();
+    const QByteArray & signal();
 
     // set the signal
     //
@@ -24,7 +24,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the signal in C++
-    const Q3CString & cppSignal();
+    const QByteArray & cppSignal();
 
     // set the signal in C++
     //
@@ -34,7 +34,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the signal in Java
-    const Q3CString & javaSignal();
+    const QByteArray & javaSignal();
 
     // set the signal in Java
     //
@@ -52,14 +52,14 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 
 private:
-    Q3CString _signal;
+    QByteArray _signal;
 
 #ifdef WITHCPP
-    Q3CString _cpp_signal;
+    QByteArray _cpp_signal;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_signal;
+    QByteArray _java_signal;
 #endif
 
 
diff --git a/genplugouts/BrowserSort/UmlBaseOperation.cpp b/genplugouts/BrowserSort/UmlBaseOperation.cpp
index 26096f11c..cb0f4ff19 100644
--- a/genplugouts/BrowserSort/UmlBaseOperation.cpp
+++ b/genplugouts/BrowserSort/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -54,7 +54,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -68,7 +68,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -82,7 +82,9 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+        {
+            _params.removeAt(rank);
+        }
 
         return TRUE;
     }
@@ -105,7 +107,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -118,7 +120,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -132,7 +134,9 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+        {
+            _exceptions.removeAt(rank);
+        }
 
         return TRUE;
     }
@@ -245,7 +249,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -257,7 +261,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -271,7 +275,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -323,7 +327,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -333,7 +337,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -347,7 +351,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -380,7 +384,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
diff --git a/genplugouts/BrowserSort/UmlBaseOperation.h b/genplugouts/BrowserSort/UmlBaseOperation.h
index a17e88a74..d4ce85ea5 100644
--- a/genplugouts/BrowserSort/UmlBaseOperation.h
+++ b/genplugouts/BrowserSort/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -44,7 +44,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -62,7 +62,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -122,7 +122,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -131,9 +131,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -143,7 +143,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -171,7 +171,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -180,9 +180,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -192,7 +192,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -212,7 +212,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -254,22 +254,22 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -281,7 +281,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
@@ -307,7 +307,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/BrowserSort/UmlBasePackage.cpp b/genplugouts/BrowserSort/UmlBasePackage.cpp
index 5a07c0346..11a6b77ab 100644
--- a/genplugouts/BrowserSort/UmlBasePackage.cpp
+++ b/genplugouts/BrowserSort/UmlBasePackage.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -38,111 +38,111 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findNamespace(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPackage(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findModule(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
@@ -167,7 +167,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/BrowserSort/UmlBasePackage.h b/genplugouts/BrowserSort/UmlBasePackage.h
index 25983d22b..914798364 100644
--- a/genplugouts/BrowserSort/UmlBasePackage.h
+++ b/genplugouts/BrowserSort/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlPackage;
 class UmlDiagram;
@@ -34,87 +34,87 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findNamespace(const Q3CString & n) const;
+    UmlPackage * findNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPackage(const Q3CString & n) const;
+    UmlPackage * findPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findModule(const Q3CString & n) const;
+    UmlPackage * findModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -127,12 +127,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -147,25 +147,25 @@ class UmlBasePackage : public UmlItem
     UmlDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -194,11 +194,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/BrowserSort/UmlBaseParameterSet.cpp b/genplugouts/BrowserSort/UmlBaseParameterSet.cpp
index 307417d45..2c680249f 100644
--- a/genplugouts/BrowserSort/UmlBaseParameterSet.cpp
+++ b/genplugouts/BrowserSort/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         if (_defined) _pins = v;
@@ -43,6 +43,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/BrowserSort/UmlBaseParameterSet.h b/genplugouts/BrowserSort/UmlBaseParameterSet.h
index 21ad661b0..5e4f93f66 100644
--- a/genplugouts/BrowserSort/UmlBaseParameterSet.h
+++ b/genplugouts/BrowserSort/UmlBaseParameterSet.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASEPARAMETERSET_H
 #define _UMLBASEPARAMETERSET_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
+
+
 
 
 class UmlActivityParameter;
@@ -28,16 +28,16 @@ class UmlBaseParameterSet : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseParameterSet(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseParameterSet(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -49,7 +49,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/BrowserSort/UmlBasePinParameter.h b/genplugouts/BrowserSort/UmlBasePinParameter.h
index 77cc462eb..898abf523 100644
--- a/genplugouts/BrowserSort/UmlBasePinParameter.h
+++ b/genplugouts/BrowserSort/UmlBasePinParameter.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityObject.h"
-#include <q3cstring.h>
+
 #include "aDirection.h"
 #include "aParameterEffectKind.h"
 
@@ -11,7 +11,7 @@ class UmlBasePinParameter : public UmlActivityObject
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePinParameter(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBasePinParameter(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 
diff --git a/genplugouts/BrowserSort/UmlBaseRegion.h b/genplugouts/BrowserSort/UmlBaseRegion.h
index 58a9f8b78..efd32acb9 100644
--- a/genplugouts/BrowserSort/UmlBaseRegion.h
+++ b/genplugouts/BrowserSort/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseRelation.cpp b/genplugouts/BrowserSort/UmlBaseRelation.cpp
index d635eaa27..4ad62f168 100644
--- a/genplugouts/BrowserSort/UmlBaseRelation.cpp
+++ b/genplugouts/BrowserSort/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -70,7 +70,7 @@ bool UmlBaseRelation::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -82,7 +82,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -124,7 +124,7 @@ bool UmlBaseRelation::set_Association(const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -136,7 +136,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -268,7 +268,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/BrowserSort/UmlBaseRelation.h b/genplugouts/BrowserSort/UmlBaseRelation.h
index ce0fd509a..a9a65090c 100644
--- a/genplugouts/BrowserSort/UmlBaseRelation.h
+++ b/genplugouts/BrowserSort/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlRelation;
@@ -44,7 +44,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -56,7 +56,7 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
@@ -70,7 +70,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_Association(const UmlTypeSpec & t);
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -78,7 +78,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -141,7 +141,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -180,13 +180,13 @@ class UmlBaseRelation : public UmlClassMember
 
     aRelationKind _rel_kind : 8;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlTypeSpec _association;
 
@@ -198,7 +198,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -226,11 +226,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/BrowserSort/UmlBaseSequenceDiagram.h b/genplugouts/BrowserSort/UmlBaseSequenceDiagram.h
index 2025fab49..b2e83e1af 100644
--- a/genplugouts/BrowserSort/UmlBaseSequenceDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseShallowHistoryPseudoState.h b/genplugouts/BrowserSort/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..cb82c3ec1 100644
--- a/genplugouts/BrowserSort/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseState.cpp b/genplugouts/BrowserSort/UmlBaseState.cpp
index c47523cff..05370f44f 100644
--- a/genplugouts/BrowserSort/UmlBaseState.cpp
+++ b/genplugouts/BrowserSort/UmlBaseState.cpp
@@ -4,7 +4,7 @@
 #include "UmlState.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -27,7 +27,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -38,7 +38,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -50,7 +50,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -61,7 +61,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -72,7 +72,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -85,7 +85,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -96,7 +96,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -107,7 +107,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/BrowserSort/UmlBaseState.h b/genplugouts/BrowserSort/UmlBaseState.h
index efc98a1af..bb578e0ab 100644
--- a/genplugouts/BrowserSort/UmlBaseState.h
+++ b/genplugouts/BrowserSort/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "StateBehavior.h"
 
 class UmlState;
@@ -26,13 +26,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -48,7 +48,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -57,7 +57,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -65,7 +65,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -73,7 +73,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -83,7 +83,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -91,7 +91,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -99,7 +99,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/BrowserSort/UmlBaseStateAction.cpp b/genplugouts/BrowserSort/UmlBaseStateAction.cpp
index 1f080b00e..1879387b9 100644
--- a/genplugouts/BrowserSort/UmlBaseStateAction.cpp
+++ b/genplugouts/BrowserSort/UmlBaseStateAction.cpp
@@ -4,7 +4,7 @@
 #include "UmlStateAction.h"
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlState * parent)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -28,7 +28,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -41,7 +41,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/BrowserSort/UmlBaseStateAction.h b/genplugouts/BrowserSort/UmlBaseStateAction.h
index 0432258b3..9c74adf3f 100644
--- a/genplugouts/BrowserSort/UmlBaseStateAction.h
+++ b/genplugouts/BrowserSort/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateAction;
 class UmlState;
@@ -25,13 +25,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -50,7 +50,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -68,14 +68,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/BrowserSort/UmlBaseStateDiagram.h b/genplugouts/BrowserSort/UmlBaseStateDiagram.h
index ea7e37ee0..d3c5bd101 100644
--- a/genplugouts/BrowserSort/UmlBaseStateDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseTerminatePseudoState.h b/genplugouts/BrowserSort/UmlBaseTerminatePseudoState.h
index e8553f4be..5328f4055 100644
--- a/genplugouts/BrowserSort/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/BrowserSort/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseTransition.cpp b/genplugouts/BrowserSort/UmlBaseTransition.cpp
index 3516921f8..f9dd2341f 100644
--- a/genplugouts/BrowserSort/UmlBaseTransition.cpp
+++ b/genplugouts/BrowserSort/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -28,7 +28,7 @@ UmlItem * UmlBaseTransition::target()
     return _target;
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -62,7 +62,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -97,7 +97,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/BrowserSort/UmlBaseTransition.h b/genplugouts/BrowserSort/UmlBaseTransition.h
index bb98f97d1..f72122ca5 100644
--- a/genplugouts/BrowserSort/UmlBaseTransition.h
+++ b/genplugouts/BrowserSort/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -26,7 +26,7 @@ class UmlBaseTransition : public UmlItem
     virtual UmlItem * target();
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -34,7 +34,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -42,7 +42,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -59,7 +59,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -85,7 +85,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -93,7 +93,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
@@ -136,7 +136,7 @@ class UmlBaseTransition : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTransition(void * id, const Q3CString & n) : UmlItem(id, n) {
+    UmlBaseTransition(void * id, const QByteArray & n) : UmlItem(id, n) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlBaseUseCase.cpp b/genplugouts/BrowserSort/UmlBaseUseCase.cpp
index 5a3a32ccd..bee601a21 100644
--- a/genplugouts/BrowserSort/UmlBaseUseCase.cpp
+++ b/genplugouts/BrowserSort/UmlBaseUseCase.cpp
@@ -37,5 +37,7 @@ void UmlBaseUseCase::read_uml_()
 {
     _assoc_diagram = (UmlUseCaseDiagram *) UmlBaseItem::read_();
     UmlBaseItem::read_uml_();
+    _extension_points = UmlCom::read_string();
+
 }
 
diff --git a/genplugouts/BrowserSort/UmlBaseUseCase.h b/genplugouts/BrowserSort/UmlBaseUseCase.h
index 1bdef8f61..cc8fdbe8c 100644
--- a/genplugouts/BrowserSort/UmlBaseUseCase.h
+++ b/genplugouts/BrowserSort/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -33,6 +33,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
+    QByteArray _extension_points;
     UmlUseCaseDiagram * _assoc_diagram;
 
 
@@ -42,7 +43,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseUseCaseDiagram.h b/genplugouts/BrowserSort/UmlBaseUseCaseDiagram.h
index fd2481e49..f2a8dfb95 100644
--- a/genplugouts/BrowserSort/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/BrowserSort/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBaseUseCaseView.h b/genplugouts/BrowserSort/UmlBaseUseCaseView.h
index e289a3543..17498b275 100644
--- a/genplugouts/BrowserSort/UmlBaseUseCaseView.h
+++ b/genplugouts/BrowserSort/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseView;
 
@@ -25,7 +25,7 @@ class UmlBaseUseCaseView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlBuiltin.h b/genplugouts/BrowserSort/UmlBuiltin.h
index 4f5c16f41..5312a6d74 100644
--- a/genplugouts/BrowserSort/UmlBuiltin.h
+++ b/genplugouts/BrowserSort/UmlBuiltin.h
@@ -1,32 +1,30 @@
 #ifndef _UMLBUILTIN_H
 #define _UMLBUILTIN_H
-
-
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/BrowserSort/UmlClass.h b/genplugouts/BrowserSort/UmlClass.h
index 10418b7e1..bea5a50d8 100644
--- a/genplugouts/BrowserSort/UmlClass.h
+++ b/genplugouts/BrowserSort/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+
 
 // This class manages 'classes', notes that the class 'ClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlClassDiagram.h b/genplugouts/BrowserSort/UmlClassDiagram.h
index f0bb6f0bb..930e620bd 100644
--- a/genplugouts/BrowserSort/UmlClassDiagram.h
+++ b/genplugouts/BrowserSort/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlClassItem.h b/genplugouts/BrowserSort/UmlClassItem.h
index bf64f4dbb..7c4a888f7 100644
--- a/genplugouts/BrowserSort/UmlClassItem.h
+++ b/genplugouts/BrowserSort/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlClassMember.h b/genplugouts/BrowserSort/UmlClassMember.h
index 9119443c6..35fdddb52 100644
--- a/genplugouts/BrowserSort/UmlClassMember.h
+++ b/genplugouts/BrowserSort/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlClassView.h b/genplugouts/BrowserSort/UmlClassView.h
index de08d4d31..e9fbf9b0c 100644
--- a/genplugouts/BrowserSort/UmlClassView.h
+++ b/genplugouts/BrowserSort/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class view'
 //
@@ -13,7 +13,7 @@ class UmlClassView : public UmlBaseClassView
 public:
     virtual void sort();
 
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlCollaborationDiagram.h b/genplugouts/BrowserSort/UmlCollaborationDiagram.h
index f39737990..7000ff950 100644
--- a/genplugouts/BrowserSort/UmlCollaborationDiagram.h
+++ b/genplugouts/BrowserSort/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlCom.cpp b/genplugouts/BrowserSort/UmlCom.cpp
index efdba45e2..feaadfe5a 100644
--- a/genplugouts/BrowserSort/UmlCom.cpp
+++ b/genplugouts/BrowserSort/UmlCom.cpp
@@ -1,21 +1,20 @@
 
 #include "UmlCom.h"
-
-#include <q3socketdevice.h>
-//Added by qt3to4:
-#include <Q3CString>
-
+#include <QByteArray>
+#include <QTcpSocket>
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 #include "UmlSettings.h"
 #include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
-
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+#ifdef habip
+    //sock->setAddressReusable(TRUE);
+#endif
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
     buffer_in_end = p_buffer_in = 0;
@@ -28,7 +27,8 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
         // send API version
         write_unsigned(25);
         flush();
@@ -65,11 +65,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -79,11 +79,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -100,13 +100,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -115,10 +115,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -127,16 +127,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -145,18 +145,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -202,7 +202,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -212,7 +212,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -223,7 +223,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -235,7 +235,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -247,7 +247,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -259,7 +259,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -272,7 +272,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -285,7 +285,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -299,7 +299,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -311,7 +311,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -324,7 +324,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -337,7 +337,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -350,7 +350,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +372,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -386,7 +386,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -400,7 +400,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -415,7 +415,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -428,7 +428,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -442,7 +442,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -464,8 +464,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -498,7 +498,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -521,10 +521,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -541,10 +541,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -578,7 +578,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -595,7 +595,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -606,12 +606,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -643,28 +643,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -673,7 +674,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -684,7 +685,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/BrowserSort/UmlCom.h b/genplugouts/BrowserSort/UmlCom.h
index cc9a2a255..509f1e371 100644
--- a/genplugouts/BrowserSort/UmlCom.h
+++ b/genplugouts/BrowserSort/UmlCom.h
@@ -1,25 +1,21 @@
 #ifndef _UMLCOM_H
 #define _UMLCOM_H
 
-
-#include <q3socketdevice.h>
-////#include "CmdFamily.h"
-////#include "OnInstanceCmd.h"
 #include "Tools/ApiCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3ptrvector.h>
 
-#include <q3cstring.h>
 
-#include <q3ptrvector.h>
+
+
+
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -66,11 +62,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -80,19 +76,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -174,8 +170,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -198,10 +194,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
diff --git a/genplugouts/BrowserSort/UmlComponent.h b/genplugouts/BrowserSort/UmlComponent.h
index 940404d29..b421d5c52 100644
--- a/genplugouts/BrowserSort/UmlComponent.h
+++ b/genplugouts/BrowserSort/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlComponentDiagram.h b/genplugouts/BrowserSort/UmlComponentDiagram.h
index 80ee3b0f0..0a1cb5bb2 100644
--- a/genplugouts/BrowserSort/UmlComponentDiagram.h
+++ b/genplugouts/BrowserSort/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlComponentView.h b/genplugouts/BrowserSort/UmlComponentView.h
index 1588d2d71..86e6889b1 100644
--- a/genplugouts/BrowserSort/UmlComponentView.h
+++ b/genplugouts/BrowserSort/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'component view'
 //
@@ -13,7 +13,7 @@ class UmlComponentView : public UmlBaseComponentView
 public:
     virtual void sort();
 
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlDeploymentDiagram.h b/genplugouts/BrowserSort/UmlDeploymentDiagram.h
index 1639ef52a..e2dcb1b09 100644
--- a/genplugouts/BrowserSort/UmlDeploymentDiagram.h
+++ b/genplugouts/BrowserSort/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlDeploymentView.h b/genplugouts/BrowserSort/UmlDeploymentView.h
index 9a0060704..e490c3f50 100644
--- a/genplugouts/BrowserSort/UmlDeploymentView.h
+++ b/genplugouts/BrowserSort/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment view'
 //
@@ -13,7 +13,7 @@ class UmlDeploymentView : public UmlBaseDeploymentView
 public:
     virtual void sort();
 
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlDiagram.h b/genplugouts/BrowserSort/UmlDiagram.h
index ffee38e5c..99e0f81e4 100644
--- a/genplugouts/BrowserSort/UmlDiagram.h
+++ b/genplugouts/BrowserSort/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlEntryPointPseudoState.h b/genplugouts/BrowserSort/UmlEntryPointPseudoState.h
index 838a4bf5b..3fd7f6eca 100644
--- a/genplugouts/BrowserSort/UmlEntryPointPseudoState.h
+++ b/genplugouts/BrowserSort/UmlEntryPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlExitPointPseudoState.h b/genplugouts/BrowserSort/UmlExitPointPseudoState.h
index 1a57b8230..e63c68782 100644
--- a/genplugouts/BrowserSort/UmlExitPointPseudoState.h
+++ b/genplugouts/BrowserSort/UmlExitPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlExpansionNode.h b/genplugouts/BrowserSort/UmlExpansionNode.h
index 65d1cff2a..e2dbd5565 100644
--- a/genplugouts/BrowserSort/UmlExpansionNode.h
+++ b/genplugouts/BrowserSort/UmlExpansionNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionNode.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode : public UmlBaseExpansionNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionNode(void * id, const Q3CString & s) : UmlBaseExpansionNode(id, s) {
+    UmlExpansionNode(void * id, const QByteArray & s) : UmlBaseExpansionNode(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlExpansionRegion.h b/genplugouts/BrowserSort/UmlExpansionRegion.h
index cfe999374..6d9130ca6 100644
--- a/genplugouts/BrowserSort/UmlExpansionRegion.h
+++ b/genplugouts/BrowserSort/UmlExpansionRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionRegion.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionRegion : public UmlBaseExpansionRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionRegion(void * id, const Q3CString & s) : UmlBaseExpansionRegion(id, s) {
+    UmlExpansionRegion(void * id, const QByteArray & s) : UmlBaseExpansionRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlExtraClassMember.h b/genplugouts/BrowserSort/UmlExtraClassMember.h
index cf0b2bf47..95b851b8d 100644
--- a/genplugouts/BrowserSort/UmlExtraClassMember.h
+++ b/genplugouts/BrowserSort/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlFlow.h b/genplugouts/BrowserSort/UmlFlow.h
index 6e78a8c4b..e31afeb31 100644
--- a/genplugouts/BrowserSort/UmlFlow.h
+++ b/genplugouts/BrowserSort/UmlFlow.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseFlow.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlFlow : public UmlBaseFlow, public UmlActivityItem
 {
 public:
-    UmlFlow(void * id, const Q3CString & n) : UmlBaseFlow(id, n) {
+    UmlFlow(void * id, const QByteArray & n) : UmlBaseFlow(id, n) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlInterruptibleActivityRegion.h b/genplugouts/BrowserSort/UmlInterruptibleActivityRegion.h
index 0f78665c1..a696f6b2d 100644
--- a/genplugouts/BrowserSort/UmlInterruptibleActivityRegion.h
+++ b/genplugouts/BrowserSort/UmlInterruptibleActivityRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseInterruptibleActivityRegion.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion : public UmlBaseInterruptibleActivityRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlBaseInterruptibleActivityRegion(id, s) {
+    UmlInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlBaseInterruptibleActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlItem.cpp b/genplugouts/BrowserSort/UmlItem.cpp
index b49e121b6..ec965f3b6 100644
--- a/genplugouts/BrowserSort/UmlItem.cpp
+++ b/genplugouts/BrowserSort/UmlItem.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3PtrCollection>
+
 UmlItem::~UmlItem()
 {
 }
@@ -20,7 +20,7 @@ int UmlItem::orderWeight()
 
 void UmlItem::sortChildren()
 {
-    const Q3PtrVector<UmlItem> & qv = children();
+    const QVector<UmlItem*> & qv = children();
 
     if (!qv.isEmpty()) {
         unsigned sz = qv.size();
@@ -31,10 +31,14 @@ void UmlItem::sortChildren()
         v.resize(sz);
 
         for (u = 0; u != sz; u += 1)
-            v.insert(u, qv[u]);
+            v[u] = qv[u];
 
         // sort in memory
+#ifdef habip
         v.sort();
+#else
+        std::sort(v.begin(), v.end());
+#endif
 
         // update browser
         UmlItem * previous = 0;
@@ -46,7 +50,7 @@ void UmlItem::sortChildren()
     }
 }
 
-int VectorOfUmlItem::compareItems(Q3PtrCollection::Item d1, Q3PtrCollection::Item d2)
+int VectorOfUmlItem::compareItems(UmlItem *d1, UmlItem* d2)
 {
     UmlItem * e1 = (UmlItem *) d1;
     UmlItem * e2 = (UmlItem *) d2;
diff --git a/genplugouts/BrowserSort/UmlItem.h b/genplugouts/BrowserSort/UmlItem.h
index dbcde4db9..9f9ec370f 100644
--- a/genplugouts/BrowserSort/UmlItem.h
+++ b/genplugouts/BrowserSort/UmlItem.h
@@ -1,13 +1,8 @@
 #ifndef _UMLITEM_H
 #define _UMLITEM_H
 
-
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-//Added by qt3to4:
-#include <Q3PtrCollection>
-
+#include <QVector>
 
 // This class is a mother class for all the other Uml* classes, this
 // allows to generalize their management, declare virtual operations etc ...
@@ -16,7 +11,7 @@
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
@@ -28,10 +23,10 @@ class UmlItem : public UmlBaseItem
 
 };
 
-class VectorOfUmlItem : public Q3PtrVector<UmlItem>
+class VectorOfUmlItem : public QVector<UmlItem*>
 {
 public:
-    int compareItems(Q3PtrCollection::Item d1, Q3PtrCollection::Item d2);
+    int compareItems(UmlItem *d1, UmlItem *d2);
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlNcRelation.h b/genplugouts/BrowserSort/UmlNcRelation.h
index 08dc2c2b2..b785e3609 100644
--- a/genplugouts/BrowserSort/UmlNcRelation.h
+++ b/genplugouts/BrowserSort/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlNode.h b/genplugouts/BrowserSort/UmlNode.h
index a530a3ebf..3a1911c5b 100644
--- a/genplugouts/BrowserSort/UmlNode.h
+++ b/genplugouts/BrowserSort/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlObjectDiagram.h b/genplugouts/BrowserSort/UmlObjectDiagram.h
index ba429242a..c194e4613 100644
--- a/genplugouts/BrowserSort/UmlObjectDiagram.h
+++ b/genplugouts/BrowserSort/UmlObjectDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseObjectDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'object diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -14,7 +14,7 @@ class UmlObjectDiagram : public UmlBaseObjectDiagram
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlObjectDiagram(void * id, const Q3CString & s) : UmlBaseObjectDiagram(id, s) {
+    UmlObjectDiagram(void * id, const QByteArray & s) : UmlBaseObjectDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlOnSignalAction.h b/genplugouts/BrowserSort/UmlOnSignalAction.h
index 158c0ddc0..82fd5747f 100644
--- a/genplugouts/BrowserSort/UmlOnSignalAction.h
+++ b/genplugouts/BrowserSort/UmlOnSignalAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseOnSignalAction.h"
-#include <q3cstring.h>
+
 
 class UmlOnSignalAction : public UmlBaseOnSignalAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOnSignalAction(void * id, const Q3CString & s) : UmlBaseOnSignalAction(id, s) {
+    UmlOnSignalAction(void * id, const QByteArray & s) : UmlBaseOnSignalAction(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlOperation.h b/genplugouts/BrowserSort/UmlOperation.h
index eec043152..f4c9e6547 100644
--- a/genplugouts/BrowserSort/UmlOperation.h
+++ b/genplugouts/BrowserSort/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlPackage.h b/genplugouts/BrowserSort/UmlPackage.h
index b1c79924d..63313f16f 100644
--- a/genplugouts/BrowserSort/UmlPackage.h
+++ b/genplugouts/BrowserSort/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+
 
 // This class manages a 'package', notes that the project itself is a package
 //
@@ -11,7 +11,7 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
     virtual void sort();
 
diff --git a/genplugouts/BrowserSort/UmlParameter.h b/genplugouts/BrowserSort/UmlParameter.h
index ef6f522b0..4b18f0e02 100644
--- a/genplugouts/BrowserSort/UmlParameter.h
+++ b/genplugouts/BrowserSort/UmlParameter.h
@@ -4,7 +4,7 @@
 
 #include "aDirection.h"
 #include "UmlTypeSpec.h"
-#include <q3cstring.h>
+
 
 //  Represent an operation's parameter
 
@@ -13,9 +13,9 @@ struct UmlParameter {
 
     UmlTypeSpec type;
 
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlParameterSet.h b/genplugouts/BrowserSort/UmlParameterSet.h
index 781e77c1d..1116bee16 100644
--- a/genplugouts/BrowserSort/UmlParameterSet.h
+++ b/genplugouts/BrowserSort/UmlParameterSet.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseParameterSet.h"
-#include <q3cstring.h>
+
 
 class UmlParameterSet : public UmlBaseParameterSet
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlParameterSet(void * id, const Q3CString & s) : UmlBaseParameterSet(id, s) {
+    UmlParameterSet(void * id, const QByteArray & s) : UmlBaseParameterSet(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlPinParameter.h b/genplugouts/BrowserSort/UmlPinParameter.h
index d48cb7343..3d3283d6b 100644
--- a/genplugouts/BrowserSort/UmlPinParameter.h
+++ b/genplugouts/BrowserSort/UmlPinParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBasePinParameter.h"
-#include <q3cstring.h>
+
 
 class UmlPinParameter : public UmlBasePinParameter
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPinParameter(void * id, const Q3CString & s) : UmlBasePinParameter(id, s) {
+    UmlPinParameter(void * id, const QByteArray & s) : UmlBasePinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlPseudoState.h b/genplugouts/BrowserSort/UmlPseudoState.h
index 075761ec7..1c350a942 100644
--- a/genplugouts/BrowserSort/UmlPseudoState.h
+++ b/genplugouts/BrowserSort/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlRegion.h b/genplugouts/BrowserSort/UmlRegion.h
index d3f32cb7b..d0ce11dde 100644
--- a/genplugouts/BrowserSort/UmlRegion.h
+++ b/genplugouts/BrowserSort/UmlRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlRelation.h b/genplugouts/BrowserSort/UmlRelation.h
index def10e743..4568f833d 100644
--- a/genplugouts/BrowserSort/UmlRelation.h
+++ b/genplugouts/BrowserSort/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'relations' between classes, notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlSequenceDiagram.h b/genplugouts/BrowserSort/UmlSequenceDiagram.h
index 6d89b12b3..fe73bedf3 100644
--- a/genplugouts/BrowserSort/UmlSequenceDiagram.h
+++ b/genplugouts/BrowserSort/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlSettings.cpp b/genplugouts/BrowserSort/UmlSettings.cpp
index b3013e645..e13a72a2e 100644
--- a/genplugouts/BrowserSort/UmlSettings.cpp
+++ b/genplugouts/BrowserSort/UmlSettings.cpp
@@ -6,15 +6,15 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -26,14 +26,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -45,14 +45,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -64,14 +64,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -83,14 +83,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -104,39 +104,39 @@ bool UmlSettings::set_RelationDescription(Q3CString v)
 
 bool UmlSettings::_defined;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -148,7 +148,7 @@ void UmlSettings::read_()
     _relation_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_stereotypes[index].uml = UmlCom::read_string();
@@ -161,7 +161,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -185,18 +185,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -207,7 +207,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_stereotypes.count();
 
@@ -218,7 +218,7 @@ Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlSter
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -229,15 +229,15 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         builtins[index] = _builtins[index];
@@ -265,15 +265,15 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         relation_stereotypes[index] = _relation_stereotypes[index];
@@ -298,15 +298,15 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         class_stereotypes[index] = _class_stereotypes[index];
diff --git a/genplugouts/BrowserSort/UmlSettings.h b/genplugouts/BrowserSort/UmlSettings.h
index 57d228d02..bb327286f 100644
--- a/genplugouts/BrowserSort/UmlSettings.h
+++ b/genplugouts/BrowserSort/UmlSettings.h
@@ -1,10 +1,7 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
-
-
-#include <q3cstring.h>
-#include <q3dict.h>
-
+#include <QByteArray>
+#include <QHash>
 struct UmlBuiltin;
 struct UmlStereotype;
 
@@ -19,44 +16,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
 
 protected:
@@ -65,25 +62,25 @@ class UmlSettings
 
     static bool _defined;
 
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_stereotypes;
 
     static UmlStereotype * _relation_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -97,31 +94,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlState.h b/genplugouts/BrowserSort/UmlState.h
index 6633712d6..010221a7e 100644
--- a/genplugouts/BrowserSort/UmlState.h
+++ b/genplugouts/BrowserSort/UmlState.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
     virtual int orderWeight();
diff --git a/genplugouts/BrowserSort/UmlStateDiagram.h b/genplugouts/BrowserSort/UmlStateDiagram.h
index f49b5fb44..c639f9193 100644
--- a/genplugouts/BrowserSort/UmlStateDiagram.h
+++ b/genplugouts/BrowserSort/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlStereotype.h b/genplugouts/BrowserSort/UmlStereotype.h
index 290517202..0ba9f3d9b 100644
--- a/genplugouts/BrowserSort/UmlStereotype.h
+++ b/genplugouts/BrowserSort/UmlStereotype.h
@@ -1,24 +1,24 @@
 #ifndef _UMLSTEREOTYPE_H
 #define _UMLSTEREOTYPE_H
 
+#include <QByteArray>
 
-#include <q3cstring.h>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/BrowserSort/UmlTransition.h b/genplugouts/BrowserSort/UmlTransition.h
index 3edd626c7..59ccc3e65 100644
--- a/genplugouts/BrowserSort/UmlTransition.h
+++ b/genplugouts/BrowserSort/UmlTransition.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlTransition : public UmlBaseTransition, public UmlStateItem
 {
 public:
-    UmlTransition(void * id, const Q3CString & n) : UmlBaseTransition(id, n) {
+    UmlTransition(void * id, const QByteArray & n) : UmlBaseTransition(id, n) {
     }
 
 };
diff --git a/genplugouts/BrowserSort/UmlTypeSpec.cpp b/genplugouts/BrowserSort/UmlTypeSpec.cpp
index 4bcfebb95..ec194d414 100644
--- a/genplugouts/BrowserSort/UmlTypeSpec.cpp
+++ b/genplugouts/BrowserSort/UmlTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlTypeSpec::toString() const
+const QByteArray & UmlTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/BrowserSort/UmlTypeSpec.h b/genplugouts/BrowserSort/UmlTypeSpec.h
index 1c939ea94..6f4a78c19 100644
--- a/genplugouts/BrowserSort/UmlTypeSpec.h
+++ b/genplugouts/BrowserSort/UmlTypeSpec.h
@@ -1,9 +1,6 @@
 #ifndef _UMLTYPESPEC_H
 #define _UMLTYPESPEC_H
-
-
-#include <q3cstring.h>
-
+#include <QByteArray>
 class UmlClass;
 
 // this class memorize a type specification, which may be
@@ -15,7 +12,7 @@ class UmlTypeSpec
 {
 public:
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     // if != 0 the class representing the type
     UmlClass * type;
@@ -23,7 +20,7 @@ class UmlTypeSpec
     UmlTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
 };
 
diff --git a/genplugouts/BrowserSort/UmlUseCase.h b/genplugouts/BrowserSort/UmlUseCase.h
index 104c90586..57ed02480 100644
--- a/genplugouts/BrowserSort/UmlUseCase.h
+++ b/genplugouts/BrowserSort/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case'
 //
@@ -13,7 +13,7 @@ class UmlUseCase : public UmlBaseUseCase
 public:
     virtual void sort();
 
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlUseCaseDiagram.h b/genplugouts/BrowserSort/UmlUseCaseDiagram.h
index fa0da495a..ed28cfe79 100644
--- a/genplugouts/BrowserSort/UmlUseCaseDiagram.h
+++ b/genplugouts/BrowserSort/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/BrowserSort/UmlUseCaseView.h b/genplugouts/BrowserSort/UmlUseCaseView.h
index d4ab8b388..35b8ec322 100644
--- a/genplugouts/BrowserSort/UmlUseCaseView.h
+++ b/genplugouts/BrowserSort/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case view'
 //
@@ -13,7 +13,7 @@ class UmlUseCaseView : public UmlBaseUseCaseView
 public:
     virtual void sort();
 
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
     virtual int orderWeight();
 
diff --git a/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp b/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp
index e38bca4af..cc49d3c7c 100644
--- a/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp
+++ b/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp
@@ -5,18 +5,19 @@
 #include "ConstrDestrCopyDialog.h"
 #include "UmlClass.h"
 
-#include <qlist.h>
-#include <q3ptrlist.h>
-#include <q3hgroupbox.h>
+#include <QList>
+
+#include <gridbox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3hbox.h>
-#include <q3vbox.h>
+#include <hhbox.h>
+#include <vvbox.h>
 #include <qdir.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 #include "Logging/QsLog.h"
+#include <QSettings>
+
 class FunctionTracer
 {
 public:
@@ -39,11 +40,12 @@ ConstrDestrCopyDialog::ConstrDestrCopyDialog(UmlClass * cl, bool have_constructo
         bool have_destructor, bool have_copy,
         bool have_const_copy, bool have_assignment,
         bool have_const_assignment)
-    : QDialog(0, 0, TRUE), target(cl)
+    : QDialog(0), target(cl)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HGroupBox * g;
-    Q3PtrList<QLabel> labels;
+    setModal(true);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    GridBox * g;
+    QList<QLabel*> labels;
     QLabel * lbl;
 
     vbox->setSpacing(5);
@@ -57,32 +59,36 @@ ConstrDestrCopyDialog::ConstrDestrCopyDialog(UmlClass * cl, bool have_constructo
 
     // constructor
 
-    g = new Q3HGroupBox(this);
+    g = new GridBox(2, this);
     vbox->addWidget(g);
 
-    labels.append(new QLabel((have_constructor)
+    labels.append(lbl = new QLabel((have_constructor)
                              ? "the class already have contructor  "
                              : "the class doesn't have contructor  ",
                              g));
+    g->addWidget(lbl);
 
-    Q3HBox * h = new Q3HBox(g);
+    HHBox * h;
+    g->addWidget(h = new HHBox(g));
 
-    add_constr = new QCheckBox("add constructor", h);
-    constr_explicit = new QCheckBox("explicit", h);
+    h->addWidget(add_constr = new QCheckBox("add constructor", h));
+    h->addWidget(constr_explicit = new QCheckBox("explicit", h));
 
     // destructor
 
     if (! have_destructor) {
-        g = new Q3HGroupBox(this);
+        g = new GridBox(2,this);
         vbox->addWidget(g);
 
-        labels.append(new QLabel("the class doesn't have destructor  ",
+        labels.append(lbl = new QLabel("the class doesn't have destructor  ",
                                  g));
+        g->addWidget(lbl);
 
-        h = new Q3HBox(g);
+        h = new HHBox(g);
+        g->addWidget(h);
 
-        add_destr = new QCheckBox("add destructor", h);
-        virtual_destr = new QCheckBox("virtual", h);
+        h->addWidget(add_destr = new QCheckBox("add destructor", h));
+        h->addWidget(virtual_destr = new QCheckBox("virtual", h));
     }
     else
         add_destr = 0;
@@ -93,39 +99,42 @@ ConstrDestrCopyDialog::ConstrDestrCopyDialog(UmlClass * cl, bool have_constructo
         add_copy = 0;
 
         if (!have_const_copy) {
-            g = new Q3HGroupBox(this);
+            g = new GridBox(2, this);
             vbox->addWidget(g);
 
-            labels.append(new QLabel("the class doesn't have copy contructor  \nwith const argument  ",
+            labels.append(lbl = new QLabel("the class doesn't have copy contructor  \nwith const argument  ",
                                      g));
-            add_const_copy = new QCheckBox("add copy constructor\nwith const argument",
-                                           g);
+            g->addWidget(lbl);
+            g->addWidget(add_const_copy = new QCheckBox("add copy constructor\nwith const argument",
+                                           g));
         }
         else
             add_const_copy = 0;
     }
     else if (!have_const_copy) {
-        g = new Q3HGroupBox(this);
+        g = new GridBox(2, this);
         vbox->addWidget(g);
 
-        labels.append(new QLabel("the class doesn't have copy contructor  ",
+        labels.append(lbl = new QLabel("the class doesn't have copy contructor  ",
                                  g));
-
-        Q3VBox * v = new Q3VBox(g);
-
-        add_const_copy = new QCheckBox("add copy constructor\nwith const argument",
-                                       v);
-        add_copy = new QCheckBox("add copy constructor\nwith non const argument",
-                                 v);
+        g->addWidget(lbl);
+
+        VVBox * v = new VVBox(g);
+        g->addWidget(v);
+        v->addWidget(add_const_copy = new QCheckBox("add copy constructor\nwith const argument",
+                                       v));
+        v->addWidget(add_copy = new QCheckBox("add copy constructor\nwith non const argument",
+                                 v));
     }
     else {
-        g = new Q3HGroupBox(this);
+        g = new GridBox(2,this);
         vbox->addWidget(g);
 
-        labels.append(new QLabel("the class doesn't have copy contructor  \nwith non const argument  ",
+        labels.append(lbl = new QLabel("the class doesn't have copy contructor  \nwith non const argument  ",
+                                 g));
+        g->addWidget(lbl);
+        g->addWidget(add_copy = new QCheckBox("add copy constructor\nwith non const argument",
                                  g));
-        add_copy = new QCheckBox("add copy constructor\nwith non const argument",
-                                 g);
         add_const_copy = 0;
     }
 
@@ -135,38 +144,42 @@ ConstrDestrCopyDialog::ConstrDestrCopyDialog(UmlClass * cl, bool have_constructo
         add_assign = 0;
 
         if (!have_const_assignment) {
-            g = new Q3HGroupBox(this);
+            g = new GridBox(2, this);
             vbox->addWidget(g);
 
-            labels.append(new QLabel("the class doesn't have assignment\noperator with const argument  ",
+            labels.append(lbl = new QLabel("the class doesn't have assignment\noperator with const argument  ",
                                      g));
-            add_const_assign = new QCheckBox("add assignment\nwith const argument",
-                                             g);
+            g->addWidget(lbl);
+            g->addWidget(add_const_assign = new QCheckBox("add assignment\nwith const argument",
+                                             g));
         }
         else
             add_const_assign = 0;
     }
     else if (!have_const_assignment) {
-        g = new Q3HGroupBox(this);
+        g = new GridBox(2, this);
         vbox->addWidget(g);
 
-        labels.append(new QLabel("the class doesn't have assignment operator  ", g));
+        labels.append(lbl = new QLabel("the class doesn't have assignment operator  ", g));
 
-        Q3VBox * v = new Q3VBox(g);
+        g->addWidget(lbl);
+        VVBox * v = new VVBox(g);
+        g->addWidget(v);
 
-        add_const_assign = new QCheckBox("add assignment\nwith const argument",
-                                         v);
-        add_assign = new QCheckBox("add assignment\nwith non const argument",
-                                   v);
+        v->addWidget(add_const_assign = new QCheckBox("add assignment\nwith const argument",
+                                         v));
+        v->addWidget(add_assign = new QCheckBox("add assignment\nwith non const argument",
+                                   v));
     }
     else {
-        g = new Q3HGroupBox(this);
+        g = new GridBox(2,this);
         vbox->addWidget(g);
 
-        labels.append(new QLabel("the class doesn't have assignment operator  \nwith non const argument  ",
+        labels.append(lbl = new QLabel("the class doesn't have assignment operator  \nwith non const argument  ",
                                  g));
-        add_assign = new QCheckBox("add assignment\nwith non const argument",
-                                   g);
+        g->addWidget(lbl);
+        g->addWidget(add_assign = new QCheckBox("add assignment\nwith non const argument",
+                                   g));
         add_const_assign = 0;
     }
 
@@ -174,24 +187,26 @@ ConstrDestrCopyDialog::ConstrDestrCopyDialog(UmlClass * cl, bool have_constructo
 
     QSize sz(labels.first()->sizeHint());
 
-    while ((lbl = labels.next()) != 0) {
+    foreach (lbl,labels) {
         if (lbl->sizeHint().width() > sz.width())
             sz.setWidth(lbl->sizeHint().width());
     }
 
-    for (lbl = labels.first(); lbl != 0; lbl = labels.next()) {
+    foreach (lbl,labels) {
         sz.setHeight(lbl->sizeHint().height());
         lbl->setFixedSize(sz);
     }
 
     // ok & cancel buttons
 
-    Q3HBox * hbox = new Q3HBox(this);
+    HHBox * hbox = new HHBox(this);
 
     vbox->addWidget(hbox);
 
     QPushButton * ok = new QPushButton("&OK", hbox);
     QPushButton * cancel = new QPushButton("&Cancel", hbox);
+    hbox->addWidget(ok);
+    hbox->addWidget(cancel);
 
     QSize bs(cancel->sizeHint());
 
@@ -206,53 +221,27 @@ ConstrDestrCopyDialog::ConstrDestrCopyDialog(UmlClass * cl, bool have_constructo
 
 void ConstrDestrCopyDialog::polish()
 {
-    QDialog::polish();
-
-    // try to read .doumlrc
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-#ifdef WIN32
-
-    if (fp == 0) {
-        QString hd = getenv("USERPROFILE");
-
-        if (! hd.isEmpty()) {
-            QDir d(hd);
-            QString s2 = d.absFilePath(".doumlrc");
-
-            fp = fopen((const char *) s2, "r");
-        }
-    }
-
-#endif
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        int cx = (r + l) / 2;
-                        int cy = (t + b) / 2;
-
-                        move(x() + cx - (x() + width() / 2),
-                             y() + cy - (y() + height() / 2));
-                    }
-                }
-
-                break;
-            }
-        }
-
-        fclose(fp);
+    QDialog::ensurePolished();
+
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        int cx = (r + l) / 2;
+        int cy = (t + b) / 2;
+
+        move(x() + cx - (x() + width() / 2), y() + cy - (y() + height() / 2));
+      }
     }
 }
 
diff --git a/genplugouts/CppUtilities/CppSettings.cpp b/genplugouts/CppUtilities/CppSettings.cpp
index f95daa113..a326a89fe 100644
--- a/genplugouts/CppUtilities/CppSettings.cpp
+++ b/genplugouts/CppUtilities/CppSettings.cpp
@@ -10,7 +10,7 @@
 #include "UmlStereotype.h"
 #include "Logging/QsLog.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -23,22 +23,22 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -51,29 +51,29 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationAttributeStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -86,29 +86,29 @@ bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -121,32 +121,32 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, (const char *)s, (const char *)v); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -157,14 +157,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -176,14 +176,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -195,14 +195,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -214,14 +214,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -233,14 +233,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -353,14 +353,14 @@ bool CppSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -372,14 +372,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -391,14 +391,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -410,14 +410,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -429,22 +429,22 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinIn(Q3CString s)
+QByteArray CppSettings::builtinIn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_in : Q3CString();
+    return (b) ? b->cpp_in : QByteArray();
 }
 
-bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinIn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)type, (const char *)form); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -457,22 +457,22 @@ bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinOut(Q3CString s)
+QByteArray CppSettings::builtinOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_out : Q3CString();
+    return (b) ? b->cpp_out : QByteArray();
 }
 
-bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)type, (const char *)form); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -485,22 +485,22 @@ bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinInOut(Q3CString s)
+QByteArray CppSettings::builtinInOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_inout : Q3CString();
+    return (b) ? b->cpp_inout : QByteArray();
 }
 
-bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinInOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)type, (const char *)form); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -513,22 +513,22 @@ bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinReturn(Q3CString s)
+QByteArray CppSettings::builtinReturn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_return : Q3CString();
+    return (b) ? b->cpp_return : QByteArray();
 }
 
-bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinReturn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)type, (const char *)form); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -541,14 +541,14 @@ bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v, ""); //[rageek] Fix Prototype
 
@@ -560,14 +560,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v, ""); //[rageek] Fix Prototype
 
@@ -579,14 +579,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v, ""); //[rageek] Fix Prototype
 
@@ -598,14 +598,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)v, ""); //[rageek] Fix Prototype
 
@@ -617,14 +617,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -636,14 +636,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -655,14 +655,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -674,14 +674,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -693,14 +693,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -712,14 +712,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -731,14 +731,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl(const char * multiplicity)
+const QByteArray & CppSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool CppSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix Prototype
@@ -751,14 +751,14 @@ bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -770,7 +770,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -790,14 +790,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -809,7 +809,7 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     QLOG_INFO() << "2.1";
     read_if_needed_();
@@ -817,7 +817,7 @@ const Q3CString & CppSettings::operationDef()
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -867,14 +867,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -962,14 +962,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -1040,51 +1040,51 @@ bool CppSettings::set_IsSetParamRef(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl[3/*multiplicity*/];
+QByteArray CppSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -1094,7 +1094,7 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
@@ -1102,13 +1102,13 @@ bool CppSettings::_is_set_param_const;
 
 bool CppSettings::_is_set_param_ref;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
@@ -1120,14 +1120,14 @@ bool CppSettings::_is_force_namespace_gen;
 
 bool CppSettings::_is_generate_javadoc_comment;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray, QByteArray*> CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1153,13 +1153,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/CppUtilities/CppSettings.h b/genplugouts/CppUtilities/CppSettings.h
index c455cc67f..d21574f87 100644
--- a/genplugouts/CppUtilities/CppSettings.h
+++ b/genplugouts/CppUtilities/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(Q3CString s);
+    static QByteArray relationAttributeStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -175,47 +175,47 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinIn(Q3CString s);
+    static QByteArray builtinIn(QByteArray s);
 
     // set the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
@@ -223,13 +223,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinIn(Q3CString type, Q3CString form);
+    static bool set_BuiltinIn(QByteArray type, QByteArray form);
 
     // returns the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinOut(Q3CString s);
+    static QByteArray builtinOut(QByteArray s);
 
     // set the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
@@ -237,13 +237,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinInOut(Q3CString s);
+    static QByteArray builtinInOut(QByteArray s);
 
     // set the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
@@ -251,13 +251,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinInOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinInOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinReturn(Q3CString s);
+    static QByteArray builtinReturn(QByteArray s);
 
     // set the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
@@ -265,36 +265,36 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinReturn(Q3CString type, Q3CString form);
+    static bool set_BuiltinReturn(QByteArray type, QByteArray form);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -302,83 +302,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -387,20 +387,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -424,13 +424,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -476,14 +476,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -524,51 +524,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -578,7 +578,7 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
@@ -586,13 +586,13 @@ class CppSettings : public UmlSettings
 
     static bool _is_set_param_ref;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
@@ -604,7 +604,7 @@ class CppSettings : public UmlSettings
 
     static bool _is_generate_javadoc_comment;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray, QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/CppUtilities/CppUtilities.pro b/genplugouts/CppUtilities/CppUtilities.pro
index b089fcc90..7fefc7402 100644
--- a/genplugouts/CppUtilities/CppUtilities.pro
+++ b/genplugouts/CppUtilities/CppUtilities.pro
@@ -1,7 +1,11 @@
+#ok
 TEMPLATE    = app
 TARGET        = cpp_util
-CONFIG        +=  warn_on qt
-DEFINES        = WITHCPP TRACE
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES        += WITHCPP TRACE
 INCLUDEPATH += ../../src
 HEADERS        = ./UmlBasePackage.h \
           ./UmlFragmentCompartment.h \
@@ -204,7 +208,10 @@ HEADERS        = ./UmlBasePackage.h \
           ./UmlBaseTypeSpec.h \
     Logging/QsLogDest.h \
     Logging/QsLog.h \
-    Logging/QsDebugOutput.h
+    Logging/QsDebugOutput.h \
+    gridbox.h \
+    hhbox.h \
+    vvbox.h
 SOURCES        = ./UmlBasePackage.cpp \
           ./UmlFragmentCompartment.cpp \
           ./UmlBaseUseCase.cpp \
@@ -407,24 +414,22 @@ SOURCES        = ./UmlBasePackage.cpp \
           ./UmlBaseTypeSpec.cpp \
     Logging/QsLogDest.cpp \
     Logging/QsLog.cpp \
-    Logging/QsDebugOutput.cpp
+    Logging/QsDebugOutput.cpp \
+    gridbox.cpp \
+    hhbox.cpp \
+    vvbox.cpp
 
-#The following line was inserted by qt3to4
-QT += network  qt3support 
-
-Release{
-
-
-    MOC_DIR = bin/douml/MOC_release
-    OBJECTS_DIR = bin/douml/Obj_release
+QT += network widgets
+DEFINES += TRUE=true FALSE=false
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/cpp_util
+    OBJECTS_DIR = $${DESTDIR}/obj_release/cpp_util
 }
-
-Debug{
-    MOC_DIR = bin/douml/MOC_Debug
-    OBJECTS_DIR = bin/douml/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/cpp_util
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/cpp_util
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/genplugouts/CppUtilities/FlowBehavior.h b/genplugouts/CppUtilities/FlowBehavior.h
index 55dde8146..09f17529a 100644
--- a/genplugouts/CppUtilities/FlowBehavior.h
+++ b/genplugouts/CppUtilities/FlowBehavior.h
@@ -2,18 +2,18 @@
 #define _FLOWBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class FlowBehavior
 {
 public:
-    Q3CString weight;
+    QByteArray weight;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString selection;
+    QByteArray selection;
 
-    Q3CString transformation;
+    QByteArray transformation;
 
     void read();
 
diff --git a/genplugouts/CppUtilities/IdlSettings.cpp b/genplugouts/CppUtilities/IdlSettings.cpp
index 60ceb5c64..7d74a37a5 100644
--- a/genplugouts/CppUtilities/IdlSettings.cpp
+++ b/genplugouts/CppUtilities/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, v);
 
@@ -175,14 +175,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, v);
 
@@ -194,14 +194,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, v);
 
@@ -213,14 +213,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, v);
 
@@ -232,14 +232,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, v);
 
@@ -251,14 +251,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, v);
 
@@ -270,14 +270,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, v);
 
@@ -289,14 +289,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, v);
 
@@ -308,14 +308,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, v);
 
@@ -327,14 +327,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, v);
 
@@ -346,14 +346,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, v);
 
@@ -365,14 +365,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, multiplicity, v);
@@ -385,14 +385,14 @@ bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, multiplicity, v);
@@ -405,14 +405,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CStrin
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionItemDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_item_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionItemDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, multiplicity, v);
@@ -425,14 +425,14 @@ bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, v);
 
@@ -444,14 +444,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl(const char * multiplicity)
+const QByteArray & IdlSettings::constDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _const_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ConstDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, multiplicity, v);
@@ -464,14 +464,14 @@ bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
@@ -484,14 +484,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
@@ -504,14 +504,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
@@ -524,14 +524,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, v);
 
@@ -543,14 +543,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, v);
 
@@ -562,14 +562,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, v);
 
@@ -602,53 +602,53 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_item_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_item_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_const_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
@@ -677,13 +677,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/CppUtilities/IdlSettings.h b/genplugouts/CppUtilities/IdlSettings.h
index d28a0bf7a..86e0b1473 100644
--- a/genplugouts/CppUtilities/IdlSettings.h
+++ b/genplugouts/CppUtilities/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype depending on the multiplicity
-    static const Q3CString & valuetypeAttributeDecl(const char * multiplicity);
+    static const QByteArray & valuetypeAttributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an union item depending on the multiplicity
-    static const Q3CString & unionItemDecl(const char * multiplicity);
+    static const QByteArray & unionItemDecl(const char * multiplicity);
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionItemDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute depending on the multiplicity
-    static const Q3CString & constDecl(const char * multiplicity);
+    static const QByteArray & constDecl(const char * multiplicity);
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(const char * multiplicity, Q3CString v);
+    static bool set_ConstDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_attr_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_attr_decl[3/*multiplicity*/];
 
-    static Q3CString _union_item_decl[3/*multiplicity*/];
+    static QByteArray _union_item_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl[3/*multiplicity*/];
+    static QByteArray _const_decl[3/*multiplicity*/];
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/CppUtilities/JavaSettings.cpp b/genplugouts/CppUtilities/JavaSettings.cpp
index cd3123306..5bb6c4747 100644
--- a/genplugouts/CppUtilities/JavaSettings.cpp
+++ b/genplugouts/CppUtilities/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, v);
 
@@ -175,14 +175,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, v);
 
@@ -194,14 +194,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, v);
 
@@ -251,14 +251,14 @@ bool JavaSettings::set_IsForcePackagePrefixGeneration(bool v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, v);
 
@@ -270,14 +270,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, v);
 
@@ -289,14 +289,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternDecl()
+const QByteArray & JavaSettings::enumPatternDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_decl;
 }
 
-bool JavaSettings::set_EnumPatternDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternDeclCmd, v);
 
@@ -308,14 +308,14 @@ bool JavaSettings::set_EnumPatternDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumDecl()
+QByteArray JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, v);
 
@@ -327,14 +327,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, v);
 
@@ -346,14 +346,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl(const char * multiplicity)
+const QByteArray & JavaSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, multiplicity, v);
@@ -366,14 +366,14 @@ bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemDecl()
+const QByteArray & JavaSettings::enumPatternItemDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_item_decl;
 }
 
-bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemDeclCmd, v);
 
@@ -385,14 +385,14 @@ bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemCase()
+const QByteArray & JavaSettings::enumPatternItemCase()
 {
     read_if_needed_();
 
     return _enum_pattern_item_case;
 }
 
-bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
+bool JavaSettings::set_EnumPatternItemCase(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemCaseCmd, v);
 
@@ -404,14 +404,14 @@ bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumItemDecl()
+QByteArray JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, v);
 
@@ -423,14 +423,14 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
@@ -443,14 +443,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, v);
 
@@ -481,14 +481,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, v);
 
@@ -500,14 +500,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, v);
 
@@ -597,53 +597,53 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_pattern_decl;
+QByteArray JavaSettings::_enum_pattern_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_enum_pattern_item_decl;
+QByteArray JavaSettings::_enum_pattern_item_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_case;
+QByteArray JavaSettings::_enum_pattern_item_case;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
 bool JavaSettings::_is_generate_javadoc_comment;
 
 bool JavaSettings::_is_force_package_gen;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray,QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
@@ -672,13 +672,13 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/CppUtilities/JavaSettings.h b/genplugouts/CppUtilities/JavaSettings.h
index 2c0fc5e18..12192156a 100644
--- a/genplugouts/CppUtilities/JavaSettings.h
+++ b/genplugouts/CppUtilities/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,80 +31,80 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -126,100 +126,100 @@ class JavaSettings : public UmlSettings
     static bool set_IsForcePackagePrefixGeneration(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumPatternDecl();
+    static const QByteArray & enumPatternDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternDecl(Q3CString v);
+    static bool set_EnumPatternDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumPatternItemDecl();
+    static const QByteArray & enumPatternItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternItemDecl(Q3CString v);
+    static bool set_EnumPatternItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumPatternItemCase();
+    static const QByteArray & enumPatternItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumPatternItemCase(Q3CString v);
+    static bool set_EnumPatternItemCase(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -233,23 +233,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -298,53 +298,53 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_pattern_decl;
+    static QByteArray _enum_pattern_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_pattern_item_decl;
+    static QByteArray _enum_pattern_item_decl;
 
-    static Q3CString _enum_pattern_item_case;
+    static QByteArray _enum_pattern_item_case;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
     static bool _is_generate_javadoc_comment;
 
     static bool _is_force_package_gen;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/CppUtilities/PhpSettings.cpp b/genplugouts/CppUtilities/PhpSettings.cpp
index bd3def979..d193d646f 100644
--- a/genplugouts/CppUtilities/PhpSettings.cpp
+++ b/genplugouts/CppUtilities/PhpSettings.cpp
@@ -8,7 +8,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHJAVA
 #include "JavaSettings.h"
 #endif
@@ -24,22 +24,22 @@ bool PhpSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PhpSettings::classStereotype(const Q3CString & s)
+QByteArray PhpSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
 
-bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PhpSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -52,21 +52,21 @@ bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PhpSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::php);
 }
 
-const Q3CString & PhpSettings::rootDir()
+const QByteArray & PhpSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PhpSettings::set_RootDir(Q3CString v)
+bool PhpSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRootdirCmd, v);
 
@@ -78,14 +78,14 @@ bool PhpSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceContent()
+const QByteArray & PhpSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PhpSettings::set_SourceContent(Q3CString v)
+bool PhpSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceContentCmd, v);
 
@@ -97,14 +97,14 @@ bool PhpSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceExtension()
+const QByteArray & PhpSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PhpSettings::set_SourceExtension(Q3CString v)
+bool PhpSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceExtensionCmd, v);
 
@@ -135,14 +135,14 @@ bool PhpSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::classDecl()
+const QByteArray & PhpSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PhpSettings::set_ClassDecl(Q3CString v)
+bool PhpSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassDeclCmd, v);
 
@@ -154,14 +154,14 @@ bool PhpSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::externalClassDecl()
+const QByteArray & PhpSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PhpSettings::set_ExternalClassDecl(Q3CString v)
+bool PhpSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpExternalClassDeclCmd, v);
 
@@ -173,14 +173,14 @@ bool PhpSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumDecl()
+QByteArray PhpSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PhpSettings::set_EnumDecl(Q3CString v)
+bool PhpSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumDeclCmd, v);
 
@@ -192,14 +192,14 @@ bool PhpSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::interfaceDecl()
+const QByteArray & PhpSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool PhpSettings::set_InterfaceDecl(Q3CString v)
+bool PhpSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpInterfaceDeclCmd, v);
 
@@ -211,14 +211,14 @@ bool PhpSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::attributeDecl()
+const QByteArray & PhpSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool PhpSettings::set_AttributeDecl(Q3CString v)
+bool PhpSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpAttributeDeclCmd, v);
 
@@ -230,14 +230,14 @@ bool PhpSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumItemDecl()
+QByteArray PhpSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PhpSettings::set_EnumItemDecl(Q3CString v)
+bool PhpSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumItemDeclCmd, v);
 
@@ -249,14 +249,14 @@ bool PhpSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::relationDecl()
+const QByteArray & PhpSettings::relationDecl()
 {
     read_if_needed_();
 
     return _rel_decl;
 }
 
-bool PhpSettings::set_RelationDecl(Q3CString v)
+bool PhpSettings::set_RelationDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRelationDeclCmd, v);
 
@@ -268,14 +268,14 @@ bool PhpSettings::set_RelationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::operationDef()
+const QByteArray & PhpSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PhpSettings::set_OperationDef(Q3CString v)
+bool PhpSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpOperationDefCmd, v);
 
@@ -315,14 +315,14 @@ bool PhpSettings::set_GetVisibility(aVisibility v)
 #endif
 }
 
-const Q3CString & PhpSettings::getName()
+const QByteArray & PhpSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PhpSettings::set_GetName(Q3CString v)
+bool PhpSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpGetNameCmd, v);
 
@@ -334,14 +334,14 @@ bool PhpSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::setName()
+const QByteArray & PhpSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PhpSettings::set_SetName(Q3CString v)
+bool PhpSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSetNameCmd, v);
 
@@ -421,29 +421,29 @@ bool PhpSettings::set_SetVisibility(aVisibility v)
 
 bool PhpSettings::_defined;
 
-Q3CString PhpSettings::_root;
+QByteArray PhpSettings::_root;
 
-Q3CString PhpSettings::_class_decl;
+QByteArray PhpSettings::_class_decl;
 
-Q3CString PhpSettings::_external_class_decl;
+QByteArray PhpSettings::_external_class_decl;
 
-Q3CString PhpSettings::_enum_decl;
+QByteArray PhpSettings::_enum_decl;
 
-Q3CString PhpSettings::_interface_decl;
+QByteArray PhpSettings::_interface_decl;
 
-Q3CString PhpSettings::_attr_decl;
+QByteArray PhpSettings::_attr_decl;
 
-Q3CString PhpSettings::_enum_item_decl;
+QByteArray PhpSettings::_enum_item_decl;
 
-Q3CString PhpSettings::_rel_decl;
+QByteArray PhpSettings::_rel_decl;
 
-Q3CString PhpSettings::_oper_def;
+QByteArray PhpSettings::_oper_def;
 
 #ifndef WITHJAVA
 aVisibility PhpSettings::_get_visibility;
 #endif
 
-Q3CString PhpSettings::_get_name;
+QByteArray PhpSettings::_get_name;
 
 bool PhpSettings::_is_get_final;
 
@@ -451,15 +451,30 @@ bool PhpSettings::_is_get_final;
 aVisibility PhpSettings::_set_visibility;
 #endif
 
-Q3CString PhpSettings::_set_name;
+QByteArray PhpSettings::_set_name;
 
 bool PhpSettings::_is_set_final;
 
-Q3CString PhpSettings::_src_content;
+QByteArray PhpSettings::_src_content;
 
-Q3CString PhpSettings::_ext;
+QByteArray PhpSettings::_ext;
+
+WrapperStr PhpSettings::_dir_regexp;
+
+bool PhpSettings::_dir_regexp_case_sensitive;
+
+WrapperStr PhpSettings::_file_regexp;
+
+bool PhpSettings::_file_regexp_case_sensitive;
 
 bool PhpSettings::_is_generate_javadoc_comment;
+bool PhpSettings::_req_with_path;
+
+bool PhpSettings::_is_relative_path;
+
+bool PhpSettings::_is_root_relative_path;
+
+bool PhpSettings::_is_force_namespace_gen;
 
 void PhpSettings::read_()
 {
@@ -497,6 +512,17 @@ void PhpSettings::read_()
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
     _is_generate_javadoc_comment = UmlCom::read_bool();
+    _req_with_path = UmlCom::read_bool();
+    _is_relative_path = UmlCom::read_bool();
+    _is_root_relative_path = UmlCom::read_bool();
+
+    _dir_regexp = UmlCom::read_string();
+    _dir_regexp_case_sensitive = UmlCom::read_bool();
+
+    _file_regexp = UmlCom::read_string();
+    _file_regexp_case_sensitive = UmlCom::read_bool();
+
+    _is_force_namespace_gen = UmlCom::read_bool();
 }
 
 void PhpSettings::read_if_needed_()
diff --git a/genplugouts/CppUtilities/PhpSettings.h b/genplugouts/CppUtilities/PhpSettings.h
index 2f83561bc..4b33afd05 100644
--- a/genplugouts/CppUtilities/PhpSettings.h
+++ b/genplugouts/CppUtilities/PhpSettings.h
@@ -4,7 +4,7 @@
 #ifdef WITHPHP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
 
@@ -29,41 +29,41 @@ class PhpSettings : public UmlSettings
 
     // returns the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PHP one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PHP code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PHP code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -74,68 +74,68 @@ class PhpSettings : public UmlSettings
     static bool set_IsGenerateJavadocStyleComment(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of an relation
-    static const Q3CString & relationDecl();
+    static const QByteArray & relationDecl();
 
     // set the default definition of an relation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(Q3CString v);
+    static bool set_RelationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -153,23 +153,23 @@ class PhpSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -212,29 +212,29 @@ class PhpSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl;
+    static QByteArray _rel_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
 #ifndef WITHJAVA
     static aVisibility _get_visibility;
 #endif
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
@@ -242,16 +242,32 @@ class PhpSettings : public UmlSettings
     static aVisibility _set_visibility;
 #endif
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
+
+    static QByteArray _ext;
+
+    static WrapperStr _dir_regexp;
+
+    static bool _dir_regexp_case_sensitive;
+
+    static WrapperStr _file_regexp;
 
-    static Q3CString _ext;
+    static bool _file_regexp_case_sensitive;
 
     static bool _is_generate_javadoc_comment;
 
+    static bool _req_with_path;
+
+    static bool _is_relative_path;
+
+    static bool _is_root_relative_path;
+
+    static bool _is_force_namespace_gen;
+
 
 protected:
     static void read_();
diff --git a/genplugouts/CppUtilities/PythonSettings.cpp b/genplugouts/CppUtilities/PythonSettings.cpp
index b2cebb2cc..e43ebd605 100644
--- a/genplugouts/CppUtilities/PythonSettings.cpp
+++ b/genplugouts/CppUtilities/PythonSettings.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool PythonSettings::isPython_2_2()
 {
     read_if_needed_();
@@ -26,7 +26,7 @@ bool PythonSettings::set_IsPython_2_2(bool y)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::indentStep()
+const QByteArray & PythonSettings::indentStep()
 {
     read_if_needed_();
     return _indent_step;
@@ -56,22 +56,22 @@ bool PythonSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PythonSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -84,29 +84,29 @@ bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::classStereotype(const Q3CString & s)
+QByteArray PythonSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -119,32 +119,32 @@ bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::get_import(const Q3CString & s)
+QByteArray PythonSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool PythonSettings::set_Import(Q3CString s, Q3CString v)
+bool PythonSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -155,14 +155,14 @@ bool PythonSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::rootDir()
+const QByteArray & PythonSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PythonSettings::set_RootDir(Q3CString v)
+bool PythonSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRootdirCmd, v);
 
@@ -174,14 +174,14 @@ bool PythonSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceContent()
+const QByteArray & PythonSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PythonSettings::set_SourceContent(Q3CString v)
+bool PythonSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceContentCmd, v);
 
@@ -193,14 +193,14 @@ bool PythonSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceExtension()
+const QByteArray & PythonSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PythonSettings::set_SourceExtension(Q3CString v)
+bool PythonSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceExtensionCmd, v);
 
@@ -212,14 +212,14 @@ bool PythonSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::classDecl()
+const QByteArray & PythonSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PythonSettings::set_ClassDecl(Q3CString v)
+bool PythonSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassDeclCmd, v);
 
@@ -231,14 +231,14 @@ bool PythonSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::externalClassDecl()
+const QByteArray & PythonSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PythonSettings::set_ExternalClassDecl(Q3CString v)
+bool PythonSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonExternalClassDeclCmd, v);
 
@@ -250,14 +250,14 @@ bool PythonSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumDecl()
+QByteArray PythonSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PythonSettings::set_EnumDecl(Q3CString v)
+bool PythonSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumDeclCmd, v);
 
@@ -269,14 +269,14 @@ bool PythonSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::attributeDecl(const char * multiplicity)
+const QByteArray & PythonSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[mult_column(multiplicity)];
 }
 
-bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool PythonSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonAttributeDeclCmd, multiplicity, v);
@@ -289,14 +289,14 @@ bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumItemDecl()
+QByteArray PythonSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PythonSettings::set_EnumItemDecl(Q3CString v)
+bool PythonSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumItemDeclCmd, v);
 
@@ -308,7 +308,7 @@ bool PythonSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -328,14 +328,14 @@ bool PythonSettings::set_RelationDecl(bool by_value, const char * multiplicity,
         return FALSE;
 }
 
-const Q3CString & PythonSettings::operationDef()
+const QByteArray & PythonSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PythonSettings::set_OperationDef(Q3CString v)
+bool PythonSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonOperationDefCmd, v);
 
@@ -347,14 +347,14 @@ bool PythonSettings::set_OperationDef(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::initOperationDef()
+const QByteArray & PythonSettings::initOperationDef()
 {
     read_if_needed_();
 
     return _initoper_def;
 }
 
-bool PythonSettings::set_InitOperationDef(Q3CString v)
+bool PythonSettings::set_InitOperationDef(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonInitOperationDefCmd, v);
 
@@ -366,14 +366,14 @@ bool PythonSettings::set_InitOperationDef(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::getName()
+const QByteArray & PythonSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PythonSettings::set_GetName(Q3CString v)
+bool PythonSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonGetNameCmd, v);
 
@@ -385,14 +385,14 @@ bool PythonSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::setName()
+const QByteArray & PythonSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PythonSettings::set_SetName(Q3CString v)
+bool PythonSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSetNameCmd, v);
 
@@ -404,7 +404,7 @@ bool PythonSettings::set_SetName(Q3CString v)
         return FALSE;
 }
 
-unsigned PythonSettings::mult_column(const Q3CString & mult)
+unsigned PythonSettings::mult_column(const QByteArray & mult)
 {
     return (mult.isEmpty() || (mult == "1")) ? 0 : 1;
 }
@@ -413,35 +413,35 @@ bool PythonSettings::_defined;
 
 bool PythonSettings::_2_2;
 
-Q3CString PythonSettings::_indent_step;
+QByteArray PythonSettings::_indent_step;
 
-Q3CString PythonSettings::_root;
+QByteArray PythonSettings::_root;
 
-Q3CString PythonSettings::_class_decl;
+QByteArray PythonSettings::_class_decl;
 
-Q3CString PythonSettings::_external_class_decl;
+QByteArray PythonSettings::_external_class_decl;
 
-Q3CString PythonSettings::_enum_decl;
+QByteArray PythonSettings::_enum_decl;
 
-Q3CString PythonSettings::_attr_decl[2/*multiplicity*/];
+QByteArray PythonSettings::_attr_decl[2/*multiplicity*/];
 
-Q3CString PythonSettings::_enum_item_decl;
+QByteArray PythonSettings::_enum_item_decl;
 
-Q3CString PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
+QByteArray PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-Q3CString PythonSettings::_oper_def;
+QByteArray PythonSettings::_oper_def;
 
-Q3CString PythonSettings::_initoper_def;
+QByteArray PythonSettings::_initoper_def;
 
-Q3CString PythonSettings::_get_name;
+QByteArray PythonSettings::_get_name;
 
-Q3CString PythonSettings::_set_name;
+QByteArray PythonSettings::_set_name;
 
-Q3CString PythonSettings::_src_content;
+QByteArray PythonSettings::_src_content;
 
-Q3CString PythonSettings::_ext;
+QByteArray PythonSettings::_ext;
 
-Q3Dict<Q3CString> PythonSettings::_map_imports;
+QHash<QByteArray, QByteArray*> PythonSettings::_map_imports;
 
 void PythonSettings::read_()
 {
@@ -468,13 +468,13 @@ void PythonSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/CppUtilities/PythonSettings.h b/genplugouts/CppUtilities/PythonSettings.h
index 9b3b004a6..3d16578e1 100644
--- a/genplugouts/CppUtilities/PythonSettings.h
+++ b/genplugouts/CppUtilities/PythonSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHPYTHON
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PYTHON, configured through
 // the 'Generation settings' dialog.
@@ -26,7 +26,7 @@ class PythonSettings : public UmlSettings
     static bool set_IsPython_2_2(bool y);
 
     // return the  default indent step
-    static const Q3CString & indentStep();
+    static const QByteArray & indentStep();
 
     // set default indent step
     //
@@ -45,109 +45,109 @@ class PythonSettings : public UmlSettings
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Python type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Python type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PYTHON code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PYTHON code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -156,85 +156,85 @@ class PythonSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default definition of __init__
-    static const Q3CString & initOperationDef();
+    static const QByteArray & initOperationDef();
 
     // set the default definition of __init__
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InitOperationDef(Q3CString v);
+    static bool set_InitOperationDef(QByteArray v);
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
 
 private:
     // never called !
     PythonSettings() {};
 
-    static unsigned mult_column(const Q3CString & mult);
+    static unsigned mult_column(const QByteArray & mult);
 
     static bool _defined;
 
     static bool _2_2;
 
-    static Q3CString _indent_step;
+    static QByteArray _indent_step;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _attr_decl[2/*multiplicity*/];
+    static QByteArray _attr_decl[2/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][2/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
 
 protected:
-    static Q3CString _initoper_def;
+    static QByteArray _initoper_def;
 
 
 private:
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/CppUtilities/SlotAttribute.h b/genplugouts/CppUtilities/SlotAttribute.h
index d1c59eabf..bbbe69d0d 100644
--- a/genplugouts/CppUtilities/SlotAttribute.h
+++ b/genplugouts/CppUtilities/SlotAttribute.h
@@ -1,21 +1,18 @@
 #ifndef _SLOTATTRIBUTE_H
 #define _SLOTATTRIBUTE_H
-
-
-#include <q3cstring.h>
-
+#include <QByteArray>
 class UmlAttribute;
 
 struct SlotAttribute {
     UmlAttribute * attribute;
 
-    Q3CString value;
+    QByteArray value;
 
     // because of QValueList use
     SlotAttribute() : attribute(0) {
     }
 
-    SlotAttribute(UmlAttribute * a, Q3CString v) : attribute(a), value(v) {
+    SlotAttribute(UmlAttribute * a, QByteArray v) : attribute(a), value(v) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/StateBehavior.h b/genplugouts/CppUtilities/StateBehavior.h
index 91a42cb82..66ac09c00 100644
--- a/genplugouts/CppUtilities/StateBehavior.h
+++ b/genplugouts/CppUtilities/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/CppUtilities/TransitionBehavior.h b/genplugouts/CppUtilities/TransitionBehavior.h
index 856ede3c0..8714c541d 100644
--- a/genplugouts/CppUtilities/TransitionBehavior.h
+++ b/genplugouts/CppUtilities/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/CppUtilities/UmlAccessVariableValueAction.h b/genplugouts/CppUtilities/UmlAccessVariableValueAction.h
index dc92b3e25..8d4f9ae87 100644
--- a/genplugouts/CppUtilities/UmlAccessVariableValueAction.h
+++ b/genplugouts/CppUtilities/UmlAccessVariableValueAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseAccessVariableValueAction.h"
-#include <q3cstring.h>
+
 
 class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAccessVariableValueAction(void * id, const Q3CString & s) : UmlBaseAccessVariableValueAction(id, s) {
+    UmlAccessVariableValueAction(void * id, const QByteArray & s) : UmlBaseAccessVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivity.h b/genplugouts/CppUtilities/UmlActivity.h
index 8f9886b0e..6f8bd5244 100644
--- a/genplugouts/CppUtilities/UmlActivity.h
+++ b/genplugouts/CppUtilities/UmlActivity.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivity.h"
-#include <q3cstring.h>
+
 
 class UmlActivity : public UmlBaseActivity
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivity(void * id, const Q3CString & s) : UmlBaseActivity(id, s) {
+    UmlActivity(void * id, const QByteArray & s) : UmlBaseActivity(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityAction.h b/genplugouts/CppUtilities/UmlActivityAction.h
index f359c755a..3079e18ba 100644
--- a/genplugouts/CppUtilities/UmlActivityAction.h
+++ b/genplugouts/CppUtilities/UmlActivityAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlActivityAction : public UmlBaseActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityAction(void * id, const Q3CString & s) : UmlBaseActivityAction(id, s) {
+    UmlActivityAction(void * id, const QByteArray & s) : UmlBaseActivityAction(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityActionClasses.h b/genplugouts/CppUtilities/UmlActivityActionClasses.h
index 8c1eeb1b1..8632a6331 100644
--- a/genplugouts/CppUtilities/UmlActivityActionClasses.h
+++ b/genplugouts/CppUtilities/UmlActivityActionClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityActionClasses.h"
-#include <q3cstring.h>
+
 
 class UmlSendObjectAction : public UmlBaseSendObjectAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendObjectAction(void * id, const Q3CString & s) : UmlBaseSendObjectAction(id, s) {
+    UmlSendObjectAction(void * id, const QByteArray & s) : UmlBaseSendObjectAction(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlUnmarshallAction : public UmlBaseUnmarshallAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlUnmarshallAction(void * id, const Q3CString & s) : UmlBaseUnmarshallAction(id, s) {
+    UmlUnmarshallAction(void * id, const QByteArray & s) : UmlBaseUnmarshallAction(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlSendSignalAction : public UmlBaseSendSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendSignalAction(void * id, const Q3CString & s) : UmlBaseSendSignalAction(id, s) {
+    UmlSendSignalAction(void * id, const QByteArray & s) : UmlBaseSendSignalAction(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlBroadcastSignalAction : public UmlBaseBroadcastSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBroadcastSignalAction(void * id, const Q3CString & s) : UmlBaseBroadcastSignalAction(id, s) {
+    UmlBroadcastSignalAction(void * id, const QByteArray & s) : UmlBaseBroadcastSignalAction(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlValueSpecificationAction : public UmlBaseValueSpecificationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlValueSpecificationAction(void * id, const Q3CString & s) : UmlBaseValueSpecificationAction(id, s) {
+    UmlValueSpecificationAction(void * id, const QByteArray & s) : UmlBaseValueSpecificationAction(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlOpaqueAction : public UmlBaseOpaqueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOpaqueAction(void * id, const Q3CString & s) : UmlBaseOpaqueAction(id, s) {
+    UmlOpaqueAction(void * id, const QByteArray & s) : UmlBaseOpaqueAction(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlAcceptEventAction : public UmlBaseAcceptEventAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptEventAction(void * id, const Q3CString & s) : UmlBaseAcceptEventAction(id, s) {
+    UmlAcceptEventAction(void * id, const QByteArray & s) : UmlBaseAcceptEventAction(id, s) {
     }
 
 };
@@ -72,7 +72,7 @@ class UmlCallOperationAction : public UmlBaseCallOperationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallOperationAction(void * id, const Q3CString & s) : UmlBaseCallOperationAction(id, s) {
+    UmlCallOperationAction(void * id, const QByteArray & s) : UmlBaseCallOperationAction(id, s) {
     }
 
 };
@@ -81,7 +81,7 @@ class UmlCallBehaviorAction : public UmlBaseCallBehaviorAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallBehaviorAction(void * id, const Q3CString & s) : UmlBaseCallBehaviorAction(id, s) {
+    UmlCallBehaviorAction(void * id, const QByteArray & s) : UmlBaseCallBehaviorAction(id, s) {
     }
 
 };
@@ -90,7 +90,7 @@ class UmlClearVariableValueAction : public UmlBaseClearVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClearVariableValueAction(void * id, const Q3CString & s) : UmlBaseClearVariableValueAction(id, s) {
+    UmlClearVariableValueAction(void * id, const QByteArray & s) : UmlBaseClearVariableValueAction(id, s) {
     }
 
 };
@@ -99,7 +99,7 @@ class UmlReadVariableValueAction : public UmlBaseReadVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReadVariableValueAction(void * id, const Q3CString & s) : UmlBaseReadVariableValueAction(id, s) {
+    UmlReadVariableValueAction(void * id, const QByteArray & s) : UmlBaseReadVariableValueAction(id, s) {
     }
 
 };
@@ -108,7 +108,7 @@ class UmlWriteVariableValueAction : public UmlBaseWriteVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlWriteVariableValueAction(void * id, const Q3CString & s) : UmlBaseWriteVariableValueAction(id, s) {
+    UmlWriteVariableValueAction(void * id, const QByteArray & s) : UmlBaseWriteVariableValueAction(id, s) {
     }
 
 };
@@ -117,7 +117,7 @@ class UmlAddVariableValueAction : public UmlBaseAddVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAddVariableValueAction(void * id, const Q3CString & s) : UmlBaseAddVariableValueAction(id, s) {
+    UmlAddVariableValueAction(void * id, const QByteArray & s) : UmlBaseAddVariableValueAction(id, s) {
     }
 
 };
@@ -126,7 +126,7 @@ class UmlRemoveVariableValueAction : public UmlBaseRemoveVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRemoveVariableValueAction(void * id, const Q3CString & s) : UmlBaseRemoveVariableValueAction(id, s) {
+    UmlRemoveVariableValueAction(void * id, const QByteArray & s) : UmlBaseRemoveVariableValueAction(id, s) {
     }
 
 };
@@ -135,7 +135,7 @@ class UmlAcceptCallAction : public UmlBaseAcceptCallAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptCallAction(void * id, const Q3CString & s) : UmlBaseAcceptCallAction(id, s) {
+    UmlAcceptCallAction(void * id, const QByteArray & s) : UmlBaseAcceptCallAction(id, s) {
     }
 
 };
@@ -144,7 +144,7 @@ class UmlReplyAction : public UmlBaseReplyAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReplyAction(void * id, const Q3CString & s) : UmlBaseReplyAction(id, s) {
+    UmlReplyAction(void * id, const QByteArray & s) : UmlBaseReplyAction(id, s) {
     }
 
 };
@@ -153,7 +153,7 @@ class UmlCreateObjectAction : public UmlBaseCreateObjectAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCreateObjectAction(void * id, const Q3CString & s) : UmlBaseCreateObjectAction(id, s) {
+    UmlCreateObjectAction(void * id, const QByteArray & s) : UmlBaseCreateObjectAction(id, s) {
     }
 
 };
@@ -162,7 +162,7 @@ class UmlDestroyObjectAction : public UmlBaseDestroyObjectAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDestroyObjectAction(void * id, const Q3CString & s) : UmlBaseDestroyObjectAction(id, s) {
+    UmlDestroyObjectAction(void * id, const QByteArray & s) : UmlBaseDestroyObjectAction(id, s) {
     }
 
 };
@@ -171,7 +171,7 @@ class UmlTestIdentityAction : public UmlBaseTestIdentityAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlTestIdentityAction(void * id, const Q3CString & s) : UmlBaseTestIdentityAction(id, s) {
+    UmlTestIdentityAction(void * id, const QByteArray & s) : UmlBaseTestIdentityAction(id, s) {
     }
 
 };
@@ -180,7 +180,7 @@ class UmlRaiseExceptionAction : public UmlBaseRaiseExceptionAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRaiseExceptionAction(void * id, const Q3CString & s) : UmlBaseRaiseExceptionAction(id, s) {
+    UmlRaiseExceptionAction(void * id, const QByteArray & s) : UmlBaseRaiseExceptionAction(id, s) {
     }
 
 };
@@ -189,7 +189,7 @@ class UmlReduceAction : public UmlBaseReduceAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReduceAction(void * id, const Q3CString & s) : UmlBaseReduceAction(id, s) {
+    UmlReduceAction(void * id, const QByteArray & s) : UmlBaseReduceAction(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityControlNode.h b/genplugouts/CppUtilities/UmlActivityControlNode.h
index 8ebf04bf7..1396fd3e2 100644
--- a/genplugouts/CppUtilities/UmlActivityControlNode.h
+++ b/genplugouts/CppUtilities/UmlActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNode.h"
-#include <q3cstring.h>
+
 
 class UmlActivityControlNode : public UmlBaseActivityControlNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityControlNode(void * id, const Q3CString & s) : UmlBaseActivityControlNode(id, s) {
+    UmlActivityControlNode(void * id, const QByteArray & s) : UmlBaseActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityControlNodeClasses.h b/genplugouts/CppUtilities/UmlActivityControlNodeClasses.h
index f698adeca..2be0cd946 100644
--- a/genplugouts/CppUtilities/UmlActivityControlNodeClasses.h
+++ b/genplugouts/CppUtilities/UmlActivityControlNodeClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNodeClasses.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode : public UmlBaseInitialActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInitialActivityNode(void * id, const Q3CString & s) : UmlBaseInitialActivityNode(id, s) {
+    UmlInitialActivityNode(void * id, const QByteArray & s) : UmlBaseInitialActivityNode(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlFlowFinalActivityNode : public UmlBaseFlowFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlFlowFinalActivityNode(void * id, const Q3CString & s) : UmlBaseFlowFinalActivityNode(id, s) {
+    UmlFlowFinalActivityNode(void * id, const QByteArray & s) : UmlBaseFlowFinalActivityNode(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlActivityFinalActivityNode : public UmlBaseActivityFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityFinalActivityNode(void * id, const Q3CString & s) : UmlBaseActivityFinalActivityNode(id, s) {
+    UmlActivityFinalActivityNode(void * id, const QByteArray & s) : UmlBaseActivityFinalActivityNode(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlDecisionActivityNode : public UmlBaseDecisionActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDecisionActivityNode(void * id, const Q3CString & s) : UmlBaseDecisionActivityNode(id, s) {
+    UmlDecisionActivityNode(void * id, const QByteArray & s) : UmlBaseDecisionActivityNode(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlMergeActivityNode : public UmlBaseMergeActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlMergeActivityNode(void * id, const Q3CString & s) : UmlBaseMergeActivityNode(id, s) {
+    UmlMergeActivityNode(void * id, const QByteArray & s) : UmlBaseMergeActivityNode(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlForkActivityNode : public UmlBaseForkActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlForkActivityNode(void * id, const Q3CString & s) : UmlBaseForkActivityNode(id, s) {
+    UmlForkActivityNode(void * id, const QByteArray & s) : UmlBaseForkActivityNode(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlJoinActivityNode : public UmlBaseJoinActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlJoinActivityNode(void * id, const Q3CString & s) : UmlBaseJoinActivityNode(id, s) {
+    UmlJoinActivityNode(void * id, const QByteArray & s) : UmlBaseJoinActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityDiagram.h b/genplugouts/CppUtilities/UmlActivityDiagram.h
index 4b48b12f2..b45a0410a 100644
--- a/genplugouts/CppUtilities/UmlActivityDiagram.h
+++ b/genplugouts/CppUtilities/UmlActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseActivityDiagram.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 // This class manages 'activity diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -15,7 +15,7 @@ class UmlActivityDiagram : public UmlBaseActivityDiagram, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityDiagram(void * id, const Q3CString & s) : UmlBaseActivityDiagram(id, s) {
+    UmlActivityDiagram(void * id, const QByteArray & s) : UmlBaseActivityDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityNode.h b/genplugouts/CppUtilities/UmlActivityNode.h
index 8429d2396..770c06359 100644
--- a/genplugouts/CppUtilities/UmlActivityNode.h
+++ b/genplugouts/CppUtilities/UmlActivityNode.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityNode.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityNode : public UmlBaseActivityNode, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityNode(void * id, const Q3CString & s) : UmlBaseActivityNode(id, s) {
+    UmlActivityNode(void * id, const QByteArray & s) : UmlBaseActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityObject.h b/genplugouts/CppUtilities/UmlActivityObject.h
index f75bccd9b..22de36492 100644
--- a/genplugouts/CppUtilities/UmlActivityObject.h
+++ b/genplugouts/CppUtilities/UmlActivityObject.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityObject.h"
-#include <q3cstring.h>
+
 
 class UmlActivityObject : public UmlBaseActivityObject
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityObject(void * id, const Q3CString & s) : UmlBaseActivityObject(id, s) {
+    UmlActivityObject(void * id, const QByteArray & s) : UmlBaseActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityParameter.h b/genplugouts/CppUtilities/UmlActivityParameter.h
index b51b0fec0..57474b452 100644
--- a/genplugouts/CppUtilities/UmlActivityParameter.h
+++ b/genplugouts/CppUtilities/UmlActivityParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityParameter.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter : public UmlBaseActivityParameter
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityParameter(void * id, const Q3CString & s) : UmlBaseActivityParameter(id, s) {
+    UmlActivityParameter(void * id, const QByteArray & s) : UmlBaseActivityParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityPartition.h b/genplugouts/CppUtilities/UmlActivityPartition.h
index 60c79b24b..e8b884bf0 100644
--- a/genplugouts/CppUtilities/UmlActivityPartition.h
+++ b/genplugouts/CppUtilities/UmlActivityPartition.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityPartition.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPartition : public UmlBaseActivityPartition, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPartition(void * id, const Q3CString & s) : UmlBaseActivityPartition(id, s) {
+    UmlActivityPartition(void * id, const QByteArray & s) : UmlBaseActivityPartition(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlActivityPin.h b/genplugouts/CppUtilities/UmlActivityPin.h
index 27d1c29c8..573c3cdd9 100644
--- a/genplugouts/CppUtilities/UmlActivityPin.h
+++ b/genplugouts/CppUtilities/UmlActivityPin.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityPin.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin : public UmlBaseActivityPin
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPin(void * id, const Q3CString & s) : UmlBaseActivityPin(id, s) {
+    UmlActivityPin(void * id, const QByteArray & s) : UmlBaseActivityPin(id, s) {
     }
     virtual ~UmlActivityPin(){}
 
diff --git a/genplugouts/CppUtilities/UmlActivityRegion.h b/genplugouts/CppUtilities/UmlActivityRegion.h
index 420b4bde2..1db9fe05f 100644
--- a/genplugouts/CppUtilities/UmlActivityRegion.h
+++ b/genplugouts/CppUtilities/UmlActivityRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityRegion.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityRegion : public UmlBaseActivityRegion, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityRegion(void * id, const Q3CString & s) : UmlBaseActivityRegion(id, s) {
+    UmlActivityRegion(void * id, const QByteArray & s) : UmlBaseActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlArtifact.h b/genplugouts/CppUtilities/UmlArtifact.h
index 9f6a30622..030e1717b 100644
--- a/genplugouts/CppUtilities/UmlArtifact.h
+++ b/genplugouts/CppUtilities/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+
 
 // This class manages 'artifacts'
 //
@@ -11,7 +11,7 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlAttribute.h b/genplugouts/CppUtilities/UmlAttribute.h
index 19ee0a4c6..427658b45 100644
--- a/genplugouts/CppUtilities/UmlAttribute.h
+++ b/genplugouts/CppUtilities/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseAccessVariableValueAction.h b/genplugouts/CppUtilities/UmlBaseAccessVariableValueAction.h
index 311fefa08..0e2856d02 100644
--- a/genplugouts/CppUtilities/UmlBaseAccessVariableValueAction.h
+++ b/genplugouts/CppUtilities/UmlBaseAccessVariableValueAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlItem;
 
@@ -11,7 +11,7 @@ class UmlBaseAccessVariableValueAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAccessVariableValueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAccessVariableValueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
diff --git a/genplugouts/CppUtilities/UmlBaseActivity.cpp b/genplugouts/CppUtilities/UmlBaseActivity.cpp
index eb1afd7eb..6dc14cc2d 100644
--- a/genplugouts/CppUtilities/UmlBaseActivity.cpp
+++ b/genplugouts/CppUtilities/UmlBaseActivity.cpp
@@ -6,7 +6,7 @@
 #include "UmlOperation.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivity * UmlBaseActivity::create(UmlClassView * parent, const char * s)
 {
@@ -18,7 +18,7 @@ anItemKind UmlBaseActivity::kind()
     return anActivity;
 }
 
-const Q3CString & UmlBaseActivity::preCondition()
+const QByteArray & UmlBaseActivity::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -29,7 +29,7 @@ bool UmlBaseActivity::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::postCondition()
+const QByteArray & UmlBaseActivity::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -41,7 +41,7 @@ bool UmlBaseActivity::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivity::cppPreCondition()
+const QByteArray & UmlBaseActivity::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivity::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::cppPostCondition()
+const QByteArray & UmlBaseActivity::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -65,7 +65,7 @@ bool UmlBaseActivity::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivity::javaPreCondition()
+const QByteArray & UmlBaseActivity::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -76,7 +76,7 @@ bool UmlBaseActivity::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::javaPostCondition()
+const QByteArray & UmlBaseActivity::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/CppUtilities/UmlBaseActivity.h b/genplugouts/CppUtilities/UmlBaseActivity.h
index 0f987a252..723a0a93f 100644
--- a/genplugouts/CppUtilities/UmlBaseActivity.h
+++ b/genplugouts/CppUtilities/UmlBaseActivity.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivity;
 class UmlClassView;
@@ -27,13 +27,13 @@ class UmlBaseActivity : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivity(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivity(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -41,7 +41,7 @@ class UmlBaseActivity : public UmlItem
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -50,7 +50,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -58,7 +58,7 @@ class UmlBaseActivity : public UmlItem
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -76,7 +76,7 @@ class UmlBaseActivity : public UmlItem
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -126,20 +126,20 @@ class UmlBaseActivity : public UmlItem
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     bool _read_only;
diff --git a/genplugouts/CppUtilities/UmlBaseActivityAction.cpp b/genplugouts/CppUtilities/UmlBaseActivityAction.cpp
index 8aff0f82e..5c58036dd 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityAction.cpp
+++ b/genplugouts/CppUtilities/UmlBaseActivityAction.cpp
@@ -3,9 +3,9 @@
 #include "UmlBaseActivityAction.h"
 #include "UmlDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseActivityAction::preCondition()
+const QByteArray & UmlBaseActivityAction::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -16,7 +16,7 @@ bool UmlBaseActivityAction::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::postCondition()
+const QByteArray & UmlBaseActivityAction::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivityAction::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityAction::cppPreCondition()
+const QByteArray & UmlBaseActivityAction::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -39,7 +39,7 @@ bool UmlBaseActivityAction::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::cppPostCondition()
+const QByteArray & UmlBaseActivityAction::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivityAction::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityAction::javaPreCondition()
+const QByteArray & UmlBaseActivityAction::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -63,7 +63,7 @@ bool UmlBaseActivityAction::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::javaPostCondition()
+const QByteArray & UmlBaseActivityAction::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/CppUtilities/UmlBaseActivityAction.h b/genplugouts/CppUtilities/UmlBaseActivityAction.h
index 4a06ccffe..a0c197cab 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityAction.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlDiagram;
 
@@ -11,13 +11,13 @@ class UmlBaseActivityAction : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityAction(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityAction(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -25,7 +25,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -34,7 +34,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -42,7 +42,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -52,7 +52,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -60,7 +60,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -86,20 +86,20 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     UmlDiagram * _assoc_diagram;
diff --git a/genplugouts/CppUtilities/UmlBaseActivityActionClasses.cpp b/genplugouts/CppUtilities/UmlBaseActivityActionClasses.cpp
index d6ad5ffbb..82ab59225 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityActionClasses.cpp
+++ b/genplugouts/CppUtilities/UmlBaseActivityActionClasses.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlSendObjectAction * UmlBaseSendObjectAction::create(UmlItem * parent, const char * s)
 {
@@ -57,7 +57,7 @@ anItemKind UmlBaseValueSpecificationAction::kind()
     return aValueSpecificationAction;
 }
 
-const Q3CString & UmlBaseValueSpecificationAction::value()
+const QByteArray & UmlBaseValueSpecificationAction::value()
 {
     read_if_needed_();
     return _value;
@@ -69,7 +69,7 @@ bool UmlBaseValueSpecificationAction::set_Value(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseValueSpecificationAction::cppValue()
+const QByteArray & UmlBaseValueSpecificationAction::cppValue()
 {
     read_if_needed_();
     return _cpp_value;
@@ -82,7 +82,7 @@ bool UmlBaseValueSpecificationAction::set_CppValue(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseValueSpecificationAction::javaValue()
+const QByteArray & UmlBaseValueSpecificationAction::javaValue()
 {
     read_if_needed_();
     return _java_value;
@@ -138,7 +138,7 @@ anItemKind UmlBaseOpaqueAction::kind()
     return anOpaqueAction;
 }
 
-const Q3CString & UmlBaseOpaqueAction::behavior()
+const QByteArray & UmlBaseOpaqueAction::behavior()
 {
     read_if_needed_();
     return _behavior;
@@ -150,7 +150,7 @@ bool UmlBaseOpaqueAction::set_Behavior(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOpaqueAction::cppBehavior()
+const QByteArray & UmlBaseOpaqueAction::cppBehavior()
 {
     read_if_needed_();
     return _cpp_behavior;
@@ -163,7 +163,7 @@ bool UmlBaseOpaqueAction::set_CppBehavior(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOpaqueAction::javaBehavior()
+const QByteArray & UmlBaseOpaqueAction::javaBehavior()
 {
     read_if_needed_();
     return _java_behavior;
@@ -241,7 +241,7 @@ bool UmlBaseAcceptEventAction::set_isTimeEvent(bool v)
     return set_it_(_timeevent, v, setTimeEventCmd);
 }
 
-const Q3CString & UmlBaseAcceptEventAction::trigger()
+const QByteArray & UmlBaseAcceptEventAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -253,7 +253,7 @@ bool UmlBaseAcceptEventAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptEventAction::cppTrigger()
+const QByteArray & UmlBaseAcceptEventAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -266,7 +266,7 @@ bool UmlBaseAcceptEventAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptEventAction::javaTrigger()
+const QByteArray & UmlBaseAcceptEventAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
@@ -500,7 +500,7 @@ anItemKind UmlBaseAcceptCallAction::kind()
     return anAcceptCallAction;
 }
 
-const Q3CString & UmlBaseAcceptCallAction::trigger()
+const QByteArray & UmlBaseAcceptCallAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -512,7 +512,7 @@ bool UmlBaseAcceptCallAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptCallAction::cppTrigger()
+const QByteArray & UmlBaseAcceptCallAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -525,7 +525,7 @@ bool UmlBaseAcceptCallAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptCallAction::javaTrigger()
+const QByteArray & UmlBaseAcceptCallAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
@@ -581,7 +581,7 @@ anItemKind UmlBaseReplyAction::kind()
     return aReplyAction;
 }
 
-const Q3CString & UmlBaseReplyAction::replyToCall()
+const QByteArray & UmlBaseReplyAction::replyToCall()
 {
     read_if_needed_();
     return _trigger;
@@ -593,7 +593,7 @@ bool UmlBaseReplyAction::set_ReplyToCall(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseReplyAction::cppReplyToCall()
+const QByteArray & UmlBaseReplyAction::cppReplyToCall()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -606,7 +606,7 @@ bool UmlBaseReplyAction::set_CppReplyToCall(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseReplyAction::javaReplyToCall()
+const QByteArray & UmlBaseReplyAction::javaReplyToCall()
 {
     read_if_needed_();
     return _java_trigger;
@@ -662,7 +662,7 @@ anItemKind UmlBaseCreateObjectAction::kind()
     return aCreateObjectAction;
 }
 
-const Q3CString & UmlBaseCreateObjectAction::classifier()
+const QByteArray & UmlBaseCreateObjectAction::classifier()
 {
     read_if_needed_();
     return _classifier;
diff --git a/genplugouts/CppUtilities/UmlBaseActivityActionClasses.h b/genplugouts/CppUtilities/UmlBaseActivityActionClasses.h
index 7bac53d23..d9539f6e5 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityActionClasses.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityActionClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityAction.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlOnSignalAction.h"
 #include "UmlAccessVariableValueAction.h"
 
@@ -48,7 +48,7 @@ class UmlBaseSendObjectAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseSendObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -69,7 +69,7 @@ class UmlBaseUnmarshallAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUnmarshallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseUnmarshallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -90,7 +90,7 @@ class UmlBaseSendSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseSendSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -111,7 +111,7 @@ class UmlBaseBroadcastSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseBroadcastSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseBroadcastSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -132,13 +132,13 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseValueSpecificationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseValueSpecificationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the value
-    const Q3CString & value();
+    const QByteArray & value();
 
     // set the value
     //
@@ -147,7 +147,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the value in C++
-    const Q3CString & cppValue();
+    const QByteArray & cppValue();
 
     // set the value in C++
     //
@@ -157,7 +157,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the value in Java
-    const Q3CString & javaValue();
+    const QByteArray & javaValue();
 
     // set the value in Java
     //
@@ -175,14 +175,14 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 
 private:
-    Q3CString _value;
+    QByteArray _value;
 
 #ifdef WITHCPP
-    Q3CString _cpp_value;
+    QByteArray _cpp_value;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_value;
+    QByteArray _java_value;
 #endif
 
 
@@ -215,13 +215,13 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOpaqueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOpaqueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the behavior
-    const Q3CString & behavior();
+    const QByteArray & behavior();
 
     // set the behavior
     //
@@ -230,7 +230,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the behavior in C++
-    const Q3CString & cppBehavior();
+    const QByteArray & cppBehavior();
 
     // set the behavior in C++
     //
@@ -240,7 +240,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the behavior in Java
-    const Q3CString & javaBehavior();
+    const QByteArray & javaBehavior();
 
     // set the behavior in Java
     //
@@ -258,14 +258,14 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 
 private:
-    Q3CString _behavior;
+    QByteArray _behavior;
 
 #ifdef WITHCPP
-    Q3CString _cpp_behavior;
+    QByteArray _cpp_behavior;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_behavior;
+    QByteArray _java_behavior;
 #endif
 
 
@@ -298,7 +298,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptEventAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptEventAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -320,7 +320,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     bool set_isTimeEvent(bool v);
 
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -329,7 +329,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -339,7 +339,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -361,14 +361,14 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
     bool _timeevent;
 
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
@@ -401,7 +401,7 @@ class UmlBaseCallOperationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallOperationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallOperationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -450,7 +450,7 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallBehaviorAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallBehaviorAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -499,7 +499,7 @@ class UmlBaseClearVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClearVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseClearVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -520,7 +520,7 @@ class UmlBaseReadVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReadVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseReadVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -541,7 +541,7 @@ class UmlBaseWriteVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseWriteVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseWriteVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -562,7 +562,7 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAddVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseAddVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -601,7 +601,7 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRemoveVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseRemoveVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -640,13 +640,13 @@ class UmlBaseAcceptCallAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptCallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptCallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -655,7 +655,7 @@ class UmlBaseAcceptCallAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -665,7 +665,7 @@ class UmlBaseAcceptCallAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -683,14 +683,14 @@ class UmlBaseAcceptCallAction : public UmlActivityAction
 
 
 private:
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
@@ -723,13 +723,13 @@ class UmlBaseReplyAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReplyAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseReplyAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the replyToCall trigger
-    const Q3CString & replyToCall();
+    const QByteArray & replyToCall();
 
     // set the replyToCall trigger
     //
@@ -738,7 +738,7 @@ class UmlBaseReplyAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the replyToCall trigger in C++
-    const Q3CString & cppReplyToCall();
+    const QByteArray & cppReplyToCall();
 
     // set the replyToCall trigger in C++
     //
@@ -748,7 +748,7 @@ class UmlBaseReplyAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the replyToCall trigger in Java
-    const Q3CString & javaReplyToCall();
+    const QByteArray & javaReplyToCall();
 
     // set the replyToCall trigger in Java
     //
@@ -766,14 +766,14 @@ class UmlBaseReplyAction : public UmlActivityAction
 
 
 private:
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
@@ -806,13 +806,13 @@ class UmlBaseCreateObjectAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCreateObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCreateObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the classifier
-    const Q3CString & classifier();
+    const QByteArray & classifier();
 
     // set the classifier
     //
@@ -829,7 +829,7 @@ class UmlBaseCreateObjectAction : public UmlActivityAction
 
 
 private:
-    Q3CString _classifier;
+    QByteArray _classifier;
 
 
 protected:
@@ -853,7 +853,7 @@ class UmlBaseDestroyObjectAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDestroyObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseDestroyObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -902,7 +902,7 @@ class UmlBaseTestIdentityAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTestIdentityAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseTestIdentityAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -923,7 +923,7 @@ class UmlBaseRaiseExceptionAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRaiseExceptionAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseRaiseExceptionAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -944,7 +944,7 @@ class UmlBaseReduceAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReduceAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseReduceAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
diff --git a/genplugouts/CppUtilities/UmlBaseActivityControlNode.h b/genplugouts/CppUtilities/UmlBaseActivityControlNode.h
index 9f1c0931a..3d07467c1 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityControlNode.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityControlNode : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityControlNode(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityControlNode(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseActivityControlNodeClasses.h b/genplugouts/CppUtilities/UmlBaseActivityControlNodeClasses.h
index 84dd781f7..1ef579e8c 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityControlNodeClasses.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityControlNodeClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityControlNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode;
 class UmlItem;
@@ -31,7 +31,7 @@ class UmlBaseInitialActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseInitialActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -52,7 +52,7 @@ class UmlBaseFlowFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlowFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseFlowFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -73,7 +73,7 @@ class UmlBaseActivityFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseActivityFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -94,7 +94,7 @@ class UmlBaseDecisionActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDecisionActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseDecisionActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -115,7 +115,7 @@ class UmlBaseMergeActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseMergeActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseMergeActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -136,7 +136,7 @@ class UmlBaseForkActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseForkActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -157,7 +157,7 @@ class UmlBaseJoinActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseJoinActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseActivityDiagram.h b/genplugouts/CppUtilities/UmlBaseActivityDiagram.h
index 8ed6ca9d6..67d2ff8af 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseActivityDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseActivityDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseActivityNode.h b/genplugouts/CppUtilities/UmlBaseActivityNode.h
index 9018d75ce..54536ed90 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityNode.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityNode : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityNode(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityNode(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseActivityObject.cpp b/genplugouts/CppUtilities/UmlBaseActivityObject.cpp
index efd18c63d..3a6e5f8a3 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityObject.cpp
+++ b/genplugouts/CppUtilities/UmlBaseActivityObject.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityObject * UmlBaseActivityObject::create(UmlItem * parent, const char * s)
 {
@@ -28,7 +28,7 @@ bool UmlBaseActivityObject::set_Type(const UmlTypeSpec & v)
     return set_it_(_type, v, setTypeCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::multiplicity()
+const QByteArray & UmlBaseActivityObject::multiplicity()
 {
     read_if_needed_();
     return _multiplicity;
@@ -39,7 +39,7 @@ bool UmlBaseActivityObject::set_Multiplicity(const char * v)
     return set_it_(_multiplicity, v, setMultiplicityCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::inState()
+const QByteArray & UmlBaseActivityObject::inState()
 {
     read_if_needed_();
     return _in_state;
@@ -50,7 +50,7 @@ bool UmlBaseActivityObject::set_InState(const char * v)
     return set_it_(_in_state, v, setInStateCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::selection()
+const QByteArray & UmlBaseActivityObject::selection()
 {
     read_if_needed_();
     return _selection;
@@ -62,7 +62,7 @@ bool UmlBaseActivityObject::set_Selection(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityObject::cppSelection()
+const QByteArray & UmlBaseActivityObject::cppSelection()
 {
     read_if_needed_();
     return _cpp_selection;
@@ -75,7 +75,7 @@ bool UmlBaseActivityObject::set_CppSelection(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityObject::javaSelection()
+const QByteArray & UmlBaseActivityObject::javaSelection()
 {
     read_if_needed_();
     return _java_selection;
diff --git a/genplugouts/CppUtilities/UmlBaseActivityObject.h b/genplugouts/CppUtilities/UmlBaseActivityObject.h
index a3db42010..ffb8ecc78 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityObject.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityObject.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "anOrdering.h"
 
@@ -28,7 +28,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityObject(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityObject(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
@@ -42,7 +42,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Type(const UmlTypeSpec & v);
 
     // return the multiplicity
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // set the multiplicity
     //
@@ -50,7 +50,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Multiplicity(const char * v);
 
     // return the inState attribute
-    const Q3CString & inState();
+    const QByteArray & inState();
 
     // set the inState attribute
     //
@@ -58,7 +58,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_InState(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -67,7 +67,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -123,18 +123,18 @@ class UmlBaseActivityObject : public UmlActivityNode
 
     UmlTypeSpec _type;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _in_state;
+    QByteArray _in_state;
 
-    Q3CString _selection;
+    QByteArray _selection;
 
 #ifdef WITHCPP
-    Q3CString _cpp_selection;
+    QByteArray _cpp_selection;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_selection;
+    QByteArray _java_selection;
 #endif
 
     anOrdering _ordering : 8;
diff --git a/genplugouts/CppUtilities/UmlBaseActivityParameter.cpp b/genplugouts/CppUtilities/UmlBaseActivityParameter.cpp
index 067b1ba5c..0e5dd560c 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityParameter.cpp
+++ b/genplugouts/CppUtilities/UmlBaseActivityParameter.cpp
@@ -4,7 +4,7 @@
 #include "UmlActivityParameter.h"
 #include "UmlActivity.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityParameter * UmlBaseActivityParameter::create(UmlActivity * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseActivityParameter::kind()
     return anActivityParameter;
 }
 
-const Q3CString & UmlBaseActivityParameter::defaultValue()
+const QByteArray & UmlBaseActivityParameter::defaultValue()
 {
     read_if_needed_();
     return _default_value;
diff --git a/genplugouts/CppUtilities/UmlBaseActivityParameter.h b/genplugouts/CppUtilities/UmlBaseActivityParameter.h
index 1f05aabe8..fcdd9cecc 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityParameter.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityParameter.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter;
 class UmlActivity;
@@ -25,13 +25,13 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityParameter(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityParameter(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 
 public:
     // return the default value
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // set the default value
     //
@@ -48,7 +48,7 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 
 private:
-    Q3CString _default_value;
+    QByteArray _default_value;
 
 
 protected:
diff --git a/genplugouts/CppUtilities/UmlBaseActivityPartition.h b/genplugouts/CppUtilities/UmlBaseActivityPartition.h
index 313c14414..97cef2c5b 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityPartition.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityPartition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPartition;
 class UmlActivityDiagram;
@@ -25,7 +25,7 @@ class UmlBaseActivityPartition : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPartition(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityPartition(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/CppUtilities/UmlBaseActivityPin.h b/genplugouts/CppUtilities/UmlBaseActivityPin.h
index 52f5d4072..9ef909129 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityPin.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityPin.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin;
 class UmlActivityAction;
@@ -25,7 +25,7 @@ class UmlBaseActivityPin : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPin(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityPin(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseActivityRegion.h b/genplugouts/CppUtilities/UmlBaseActivityRegion.h
index 95e516e75..cf3b637c1 100644
--- a/genplugouts/CppUtilities/UmlBaseActivityRegion.h
+++ b/genplugouts/CppUtilities/UmlBaseActivityRegion.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 
@@ -11,7 +11,7 @@ class UmlBaseActivityRegion : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/CppUtilities/UmlBaseArtifact.cpp b/genplugouts/CppUtilities/UmlBaseArtifact.cpp
index c0955445d..cfbdcb8f5 100644
--- a/genplugouts/CppUtilities/UmlBaseArtifact.cpp
+++ b/genplugouts/CppUtilities/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         // tests != to bypass Qt 2.3 bug
@@ -103,7 +104,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -117,8 +118,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -134,7 +136,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -143,7 +145,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] = _associated[last];
 
             _associated.resize(last);
         }
@@ -167,82 +169,82 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseArtifact::phpSource()
+const QByteArray & UmlBaseArtifact::phpSource()
 {
     read_if_needed_();
 
     return _php_src;
 }
 
-bool UmlBaseArtifact::set_PhpSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PhpSource(const QByteArray & s)
 {
     return set_it_(_php_src, s, setPhpSrcCmd);
 }
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseArtifact::pythonSource()
+const QByteArray & UmlBaseArtifact::pythonSource()
 {
     read_if_needed_();
 
     return _python_src;
 }
 
-bool UmlBaseArtifact::set_PythonSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PythonSource(const QByteArray & s)
 {
     return set_it_(_python_src, s, setPythonSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -283,13 +285,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/CppUtilities/UmlBaseArtifact.h b/genplugouts/CppUtilities/UmlBaseArtifact.h
index 19359a371..bfe0b9a0b 100644
--- a/genplugouts/CppUtilities/UmlBaseArtifact.h
+++ b/genplugouts/CppUtilities/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,60 +83,60 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPHP
     // returns the Php file definition
-    const Q3CString & phpSource();
+    const QByteArray & phpSource();
 
     // to set the Php file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpSource(const Q3CString & s);
+    bool set_PhpSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPYTHON
     // returns the Python file definition
-    const Q3CString & pythonSource();
+    const QByteArray & pythonSource();
 
     // to set the Python file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonSource(const Q3CString & s);
+    bool set_PythonSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -147,30 +147,30 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_src;
+    QByteArray _php_src;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_src;
+    QByteArray _python_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -210,12 +210,12 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
     friend class UmlBaseClass;
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/CppUtilities/UmlBaseAttribute.cpp b/genplugouts/CppUtilities/UmlBaseAttribute.cpp
index 5a9b4b549..ae721c8dd 100644
--- a/genplugouts/CppUtilities/UmlBaseAttribute.cpp
+++ b/genplugouts/CppUtilities/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -98,7 +98,7 @@ bool UmlBaseAttribute::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -122,7 +122,7 @@ bool UmlBaseAttribute::set_Type(const UmlTypeSpec & t)
     return set_it_(_type, t, setTypeCmd);
 }
 
-const Q3CString & UmlBaseAttribute::multiplicity()
+const QByteArray & UmlBaseAttribute::multiplicity()
 {
     read_if_needed_();
 
@@ -215,7 +215,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/CppUtilities/UmlBaseAttribute.h b/genplugouts/CppUtilities/UmlBaseAttribute.h
index 766a99f05..d3094bdf4 100644
--- a/genplugouts/CppUtilities/UmlBaseAttribute.h
+++ b/genplugouts/CppUtilities/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -62,7 +62,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -78,7 +78,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_Type(const UmlTypeSpec & t);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -125,7 +125,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -163,9 +163,9 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient : 1;
 #endif
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -177,13 +177,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -223,7 +223,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/CppUtilities/UmlBaseChoicePseudoState.h b/genplugouts/CppUtilities/UmlBaseChoicePseudoState.h
index fb682dd91..8d15fc093 100644
--- a/genplugouts/CppUtilities/UmlBaseChoicePseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseClass.cpp b/genplugouts/CppUtilities/UmlBaseClass.cpp
index 126b3bddc..2a22539e2 100644
--- a/genplugouts/CppUtilities/UmlBaseClass.cpp
+++ b/genplugouts/CppUtilities/UmlBaseClass.cpp
@@ -11,8 +11,8 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -47,11 +47,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -83,11 +83,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -132,17 +132,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -370,7 +370,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -385,7 +385,7 @@ UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
     return (UmlClass *) UmlBaseItem::read_();
 }
 
-UmlClass * UmlBaseClass::findStereotype(Q3CString s, bool caseSensitive)
+UmlClass * UmlBaseClass::findStereotype(QByteArray s, bool caseSensitive)
 {
     UmlCom::send_cmd(packageGlobalCmd, findStereotypeCmd,
                      (caseSensitive) ? "y" : "n", (const char *) s);
@@ -403,15 +403,15 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -423,9 +423,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray, UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -433,7 +433,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/CppUtilities/UmlBaseClass.h b/genplugouts/CppUtilities/UmlBaseClass.h
index b297e2cf6..ca6bcd04e 100644
--- a/genplugouts/CppUtilities/UmlBaseClass.h
+++ b/genplugouts/CppUtilities/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+
+
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -54,7 +54,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -77,7 +77,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -100,7 +100,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -224,11 +224,11 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // Return the class supporting the stereotype corresponding to
     // the first parameter being 'profile_name:stereotype_name', or 0/null
-    static UmlClass * findStereotype(Q3CString s, bool caseSensitive);
+    static UmlClass * findStereotype(QByteArray s, bool caseSensitive);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -241,11 +241,11 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
 
 private:
-    static Q3Dict<UmlClass> _classes;
+    static QHash<QByteArray, UmlClass*> _classes;
 
     bool _abstract;
 
@@ -292,7 +292,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/CppUtilities/UmlBaseClassDiagram.h b/genplugouts/CppUtilities/UmlBaseClassDiagram.h
index e0990d31f..a3f406b00 100644
--- a/genplugouts/CppUtilities/UmlBaseClassDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseClassInstance.cpp b/genplugouts/CppUtilities/UmlBaseClassInstance.cpp
index bdfcd7472..2d0e1cb24 100644
--- a/genplugouts/CppUtilities/UmlBaseClassInstance.cpp
+++ b/genplugouts/CppUtilities/UmlBaseClassInstance.cpp
@@ -6,8 +6,8 @@
 #include "UmlAttribute.h"
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
+#include <QVector>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -47,7 +47,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
         return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -62,7 +62,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -77,16 +77,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QVector<UmlAttribute *> &result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -97,7 +97,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -107,7 +107,7 @@ bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance
 
 bool UmlBaseClassInstance::remove_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/genplugouts/CppUtilities/UmlBaseClassInstance.h b/genplugouts/CppUtilities/UmlBaseClassInstance.h
index 3dde839de..769970305 100644
--- a/genplugouts/CppUtilities/UmlBaseClassInstance.h
+++ b/genplugouts/CppUtilities/UmlBaseClassInstance.h
@@ -6,9 +6,9 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QList>
+
+
 
 class UmlClassInstance;
 class UmlClass;
@@ -40,17 +40,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QVector<UmlAttribute*> & result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QVector<UmlRelation*> & result);
 
     // Remove the slot if the value is an empty string.
     // Else set the value for the given attribute, replacing it
@@ -87,7 +87,7 @@ class UmlBaseClassInstance : public UmlItem
     virtual void read_uml_();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassInstance(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseClassInstance(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseClassInstanceReference.cpp b/genplugouts/CppUtilities/UmlBaseClassInstanceReference.cpp
index 1223c08e8..c3c0d64a0 100644
--- a/genplugouts/CppUtilities/UmlBaseClassInstanceReference.cpp
+++ b/genplugouts/CppUtilities/UmlBaseClassInstanceReference.cpp
@@ -4,14 +4,14 @@
 #include "UmlClass.h"
 #include "UmlClassInstance.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlClass * UmlBaseClassInstanceReference::type() const
 {
     return (_instance) ? _instance->type() : _class;
 }
 
-const Q3CString & UmlBaseClassInstanceReference::name() const
+const QByteArray & UmlBaseClassInstanceReference::name() const
 {
     return (_instance) ? _instance->name() : _name;
 }
diff --git a/genplugouts/CppUtilities/UmlBaseClassInstanceReference.h b/genplugouts/CppUtilities/UmlBaseClassInstanceReference.h
index f21836362..50bd4f9f4 100644
--- a/genplugouts/CppUtilities/UmlBaseClassInstanceReference.h
+++ b/genplugouts/CppUtilities/UmlBaseClassInstanceReference.h
@@ -1,9 +1,6 @@
 #ifndef _UMLBASECLASSINSTANCEREFERENCE_H
 #define _UMLBASECLASSINSTANCEREFERENCE_H
-
-
-#include <q3cstring.h>
-
+#include <QByteArray>
 class UmlClass;
 class UmlClassInstance;
 
@@ -20,7 +17,7 @@ class UmlBaseClassInstanceReference
     }
 
     // return the name of the instance
-    const Q3CString & name() const;
+    const QByteArray & name() const;
 
 
 private:
@@ -28,7 +25,7 @@ class UmlBaseClassInstanceReference
 
     UmlClassInstance * _instance;
 
-    Q3CString _name;
+    QByteArray _name;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/CppUtilities/UmlBaseClassItem.cpp b/genplugouts/CppUtilities/UmlBaseClassItem.cpp
index fa856e466..3a02e784e 100644
--- a/genplugouts/CppUtilities/UmlBaseClassItem.cpp
+++ b/genplugouts/CppUtilities/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseClassItem::phpDecl()
+const QByteArray & UmlBaseClassItem::phpDecl()
 {
     read_if_needed_();
 
@@ -47,7 +47,7 @@ bool UmlBaseClassItem::set_PhpDecl(const char * s)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseClassItem::pythonDecl()
+const QByteArray & UmlBaseClassItem::pythonDecl()
 {
     read_if_needed_();
 
@@ -61,7 +61,7 @@ bool UmlBaseClassItem::set_PythonDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/CppUtilities/UmlBaseClassItem.h b/genplugouts/CppUtilities/UmlBaseClassItem.h
index 19037f5fe..c3749c6e1 100644
--- a/genplugouts/CppUtilities/UmlBaseClassItem.h
+++ b/genplugouts/CppUtilities/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPHP
     //  return the Php defininition
 
-    const Q3CString & phpDecl();
+    const QByteArray & phpDecl();
 
     //  to set the Php definition
     //
@@ -45,7 +45,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPYTHON
     //  return the Python defininition
 
-    const Q3CString & pythonDecl();
+    const QByteArray & pythonDecl();
 
     //  to set the Python definition
     //
@@ -56,7 +56,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -69,28 +69,28 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_decl;
+    QByteArray _php_decl;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_decl;
+    QByteArray _python_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/CppUtilities/UmlBaseClassMember.cpp b/genplugouts/CppUtilities/UmlBaseClassMember.cpp
index da9a56bb5..47325ddfb 100644
--- a/genplugouts/CppUtilities/UmlBaseClassMember.cpp
+++ b/genplugouts/CppUtilities/UmlBaseClassMember.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlBaseClassMember::isClassMember()
 {
     read_if_needed_();
@@ -70,7 +70,7 @@ bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
 #endif
 
 #ifdef WITHJAVA
-Q3CString UmlBaseClassMember::javaAnnotations()
+QByteArray UmlBaseClassMember::javaAnnotations()
 {
     read_if_needed_();
 
@@ -83,7 +83,7 @@ bool UmlBaseClassMember::set_JavaAnnotations(const char * v)
 }
 #endif
 
-const Q3CString & UmlBaseClassMember::constraint()
+const QByteArray & UmlBaseClassMember::constraint()
 {
     read_if_needed_();
     return _constraint;
diff --git a/genplugouts/CppUtilities/UmlBaseClassMember.h b/genplugouts/CppUtilities/UmlBaseClassMember.h
index 60778142e..920bec8ef 100644
--- a/genplugouts/CppUtilities/UmlBaseClassMember.h
+++ b/genplugouts/CppUtilities/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -57,7 +57,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 #ifdef WITHJAVA
     // returns the Java annotations
-    Q3CString javaAnnotations();
+    QByteArray javaAnnotations();
 
     // set the Java annotations
     //
@@ -66,7 +66,7 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
     // return the constraint
-    const Q3CString & constraint();
+    const QByteArray & constraint();
 
     // set the constraint
     //
@@ -87,7 +87,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
@@ -106,10 +106,10 @@ class UmlBaseClassMember : public UmlClassItem
 
 private:
 #ifdef WITHJAVA
-    Q3CString _java_annotation;
+    QByteArray _java_annotation;
 #endif
 
-    Q3CString _constraint;
+    QByteArray _constraint;
 
     friend class UmlBaseClass;
     friend class UmlBaseRelation;
diff --git a/genplugouts/CppUtilities/UmlBaseClassView.h b/genplugouts/CppUtilities/UmlBaseClassView.h
index 43fb0714a..2de2d70e7 100644
--- a/genplugouts/CppUtilities/UmlBaseClassView.h
+++ b/genplugouts/CppUtilities/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlView
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseCollaborationDiagram.h b/genplugouts/CppUtilities/UmlBaseCollaborationDiagram.h
index 001de487c..f5f96e840 100644
--- a/genplugouts/CppUtilities/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.cpp b/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.cpp
index 63b89f7b5..aa78ceb97 100644
--- a/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.cpp
+++ b/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseCollaborationDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -15,11 +15,11 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -31,7 +31,7 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         m->read_(instances);
     }
 
-    _messages.setAutoDelete(TRUE);
+   // _messages.setAutoDelete(TRUE);
 }
 
 UmlBaseCollaborationDiagramDefinition::~UmlBaseCollaborationDiagramDefinition()
diff --git a/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.h b/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.h
index 7053607ce..60749725f 100644
--- a/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.h
+++ b/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.h
@@ -5,8 +5,8 @@
 // to avoid compiler warning
 #include "UmlCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
+#include <QVector>
 
-#include <q3ptrvector.h>
 
 class UmlClassInstanceReference;
 class UmlCollaborationMessage;
@@ -16,21 +16,21 @@ class UmlBaseCollaborationDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following their rank
-    const Q3PtrVector<UmlCollaborationMessage> & messages() const {
+    const QVector<UmlCollaborationMessage*> & messages() const {
         return _messages;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlCollaborationMessage> _messages;
+    QVector<UmlCollaborationMessage*> _messages;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/CppUtilities/UmlBaseCollaborationMessage.cpp b/genplugouts/CppUtilities/UmlBaseCollaborationMessage.cpp
index 8ea8e0890..ee0388197 100644
--- a/genplugouts/CppUtilities/UmlBaseCollaborationMessage.cpp
+++ b/genplugouts/CppUtilities/UmlBaseCollaborationMessage.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-void UmlBaseCollaborationMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseCollaborationMessage::read_(const QHash<void *, UmlClassInstanceReference *> &instances)
 {
     UmlBaseMessage::read_(instances);
     _rank = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/CppUtilities/UmlBaseCollaborationMessage.h b/genplugouts/CppUtilities/UmlBaseCollaborationMessage.h
index 276b0801e..5454e8c7d 100644
--- a/genplugouts/CppUtilities/UmlBaseCollaborationMessage.h
+++ b/genplugouts/CppUtilities/UmlBaseCollaborationMessage.h
@@ -2,8 +2,8 @@
 #define _UMLBASECOLLABORATIONMESSAGE_H
 
 
-#include <q3cstring.h>
-#include <q3ptrdict.h>
+
+
 #include "UmlMessage.h"
 
 class UmlClassInstanceReference;
@@ -18,7 +18,7 @@ class UmlBaseCollaborationMessage : public UmlMessage
     }
 
     // return the hierarchical rank of the message
-    const Q3CString & hrank() const {
+    const QByteArray & hrank() const {
         return _hrank;
     }
 
@@ -26,10 +26,10 @@ class UmlBaseCollaborationMessage : public UmlMessage
 private:
     int _rank;
 
-    Q3CString _hrank;
+    QByteArray _hrank;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference *> &instances);
 
     friend class UmlBaseCollaborationDiagramDefinition;
 };
diff --git a/genplugouts/CppUtilities/UmlBaseComponent.cpp b/genplugouts/CppUtilities/UmlBaseComponent.cpp
index 427c8d71f..abc5de755 100644
--- a/genplugouts/CppUtilities/UmlBaseComponent.cpp
+++ b/genplugouts/CppUtilities/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizingClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizingClasses()
 {
     read_if_needed_();
 
     return _realizing;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realizing, provided, required);
@@ -98,18 +98,18 @@ void UmlBaseComponent::read_uml_()
     _realizing.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realizing.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realizing[index] =  (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/CppUtilities/UmlBaseComponent.h b/genplugouts/CppUtilities/UmlBaseComponent.h
index 209914a57..160f2c481 100644
--- a/genplugouts/CppUtilities/UmlBaseComponent.h
+++ b/genplugouts/CppUtilities/UmlBaseComponent.h
@@ -1,12 +1,9 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
 
-
+#include <QVector>
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
 class UmlComponentView;
@@ -36,18 +33,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realizing classes
-    const Q3PtrVector<UmlClass> & realizingClasses();
+    const QVector<UmlClass*> & realizingClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realizing, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +54,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realizing;
+    QVector<UmlClass*> _realizing;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -70,11 +67,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/CppUtilities/UmlBaseComponentDiagram.h b/genplugouts/CppUtilities/UmlBaseComponentDiagram.h
index 43466da7c..b235e0717 100644
--- a/genplugouts/CppUtilities/UmlBaseComponentDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseComponentView.h b/genplugouts/CppUtilities/UmlBaseComponentView.h
index 0b9d2d0bd..e70c3b9d5 100644
--- a/genplugouts/CppUtilities/UmlBaseComponentView.h
+++ b/genplugouts/CppUtilities/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseDeepHistoryPseudoState.h b/genplugouts/CppUtilities/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..9224eb152 100644
--- a/genplugouts/CppUtilities/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseDeployment.h b/genplugouts/CppUtilities/UmlBaseDeployment.h
index b268e0c17..b16902170 100644
--- a/genplugouts/CppUtilities/UmlBaseDeployment.h
+++ b/genplugouts/CppUtilities/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseDeploymentDiagram.h b/genplugouts/CppUtilities/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..db1cfc67d 100644
--- a/genplugouts/CppUtilities/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseDeploymentView.h b/genplugouts/CppUtilities/UmlBaseDeploymentView.h
index f5213d38a..12b21aefe 100644
--- a/genplugouts/CppUtilities/UmlBaseDeploymentView.h
+++ b/genplugouts/CppUtilities/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseDiagram.cpp b/genplugouts/CppUtilities/UmlBaseDiagram.cpp
index e1ceb269d..d0fb2d705 100644
--- a/genplugouts/CppUtilities/UmlBaseDiagram.cpp
+++ b/genplugouts/CppUtilities/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/CppUtilities/UmlBaseDiagram.h b/genplugouts/CppUtilities/UmlBaseDiagram.h
index 9cf05ff22..19e34654b 100644
--- a/genplugouts/CppUtilities/UmlBaseDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseEntryPointPseudoState.h b/genplugouts/CppUtilities/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..60dd28bb0 100644
--- a/genplugouts/CppUtilities/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseExitPointPseudoState.h b/genplugouts/CppUtilities/UmlBaseExitPointPseudoState.h
index ff2ad12bc..29563f22b 100644
--- a/genplugouts/CppUtilities/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseExpansionNode.h b/genplugouts/CppUtilities/UmlBaseExpansionNode.h
index 41bcbece2..6642afe1b 100644
--- a/genplugouts/CppUtilities/UmlBaseExpansionNode.h
+++ b/genplugouts/CppUtilities/UmlBaseExpansionNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityObject.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode;
 class UmlExpansionRegion;
@@ -25,7 +25,7 @@ class UmlBaseExpansionNode : public UmlActivityObject
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionNode(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBaseExpansionNode(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseExpansionRegion.h b/genplugouts/CppUtilities/UmlBaseExpansionRegion.h
index 54795871e..4240a0570 100644
--- a/genplugouts/CppUtilities/UmlBaseExpansionRegion.h
+++ b/genplugouts/CppUtilities/UmlBaseExpansionRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "anExpansionKind.h"
 
 class UmlExpansionRegion;
@@ -26,7 +26,7 @@ class UmlBaseExpansionRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseExpansionRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 
diff --git a/genplugouts/CppUtilities/UmlBaseExtraClassMember.cpp b/genplugouts/CppUtilities/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/CppUtilities/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/CppUtilities/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/CppUtilities/UmlBaseExtraClassMember.h b/genplugouts/CppUtilities/UmlBaseExtraClassMember.h
index e2b9d4f30..4f07b5583 100644
--- a/genplugouts/CppUtilities/UmlBaseExtraClassMember.h
+++ b/genplugouts/CppUtilities/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/CppUtilities/UmlBaseFinalState.h b/genplugouts/CppUtilities/UmlBaseFinalState.h
index 16e0816cf..2fa133da6 100644
--- a/genplugouts/CppUtilities/UmlBaseFinalState.h
+++ b/genplugouts/CppUtilities/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseFlow.cpp b/genplugouts/CppUtilities/UmlBaseFlow.cpp
index 5da07fbe8..b05e3eb62 100644
--- a/genplugouts/CppUtilities/UmlBaseFlow.cpp
+++ b/genplugouts/CppUtilities/UmlBaseFlow.cpp
@@ -4,7 +4,7 @@
 #include "UmlFlow.h"
 #include "UmlActivityNode.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseFlow::kind()
 {
@@ -29,7 +29,7 @@ UmlActivityNode * UmlBaseFlow::target()
     return _target;
 }
 
-const Q3CString & UmlBaseFlow::weight()
+const QByteArray & UmlBaseFlow::weight()
 {
     read_if_needed_();
     return _uml.weight;
@@ -40,7 +40,7 @@ bool UmlBaseFlow::set_Weight(const char * v)
     return set_it_(_uml.weight, v, setUmlActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::guard()
+const QByteArray & UmlBaseFlow::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -51,7 +51,7 @@ bool UmlBaseFlow::set_Guard(const char * v)
     return set_it_(_uml.guard, v, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::selection()
+const QByteArray & UmlBaseFlow::selection()
 {
     read_if_needed_();
     return _uml.selection;
@@ -62,7 +62,7 @@ bool UmlBaseFlow::set_Selection(const char * v)
     return set_it_(_uml.selection, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::transformation()
+const QByteArray & UmlBaseFlow::transformation()
 {
     read_if_needed_();
     return _uml.transformation;
@@ -74,7 +74,7 @@ bool UmlBaseFlow::set_Transformation(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseFlow::cppWeight()
+const QByteArray & UmlBaseFlow::cppWeight()
 {
     read_if_needed_();
     return _cpp.weight;
@@ -85,7 +85,7 @@ bool UmlBaseFlow::set_CppWeight(const char * v)
     return set_it_(_cpp.weight, v, setCppActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppGuard()
+const QByteArray & UmlBaseFlow::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -96,7 +96,7 @@ bool UmlBaseFlow::set_CppGuard(const char * v)
     return set_it_(_cpp.guard, v, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppSelection()
+const QByteArray & UmlBaseFlow::cppSelection()
 {
     read_if_needed_();
     return _cpp.selection;
@@ -107,7 +107,7 @@ bool UmlBaseFlow::set_CppSelection(const char * v)
     return set_it_(_cpp.selection, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppTransformation()
+const QByteArray & UmlBaseFlow::cppTransformation()
 {
     read_if_needed_();
     return _cpp.transformation;
@@ -120,7 +120,7 @@ bool UmlBaseFlow::set_CppTransformation(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseFlow::javaWeight()
+const QByteArray & UmlBaseFlow::javaWeight()
 {
     read_if_needed_();
     return _java.weight;
@@ -131,7 +131,7 @@ bool UmlBaseFlow::set_JavaWeight(const char * v)
     return set_it_(_java.weight, v, setJavaActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaGuard()
+const QByteArray & UmlBaseFlow::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -142,7 +142,7 @@ bool UmlBaseFlow::set_JavaGuard(const char * v)
     return set_it_(_java.guard, v, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaSelection()
+const QByteArray & UmlBaseFlow::javaSelection()
 {
     read_if_needed_();
     return _java.selection;
@@ -153,7 +153,7 @@ bool UmlBaseFlow::set_JavaSelection(const char * v)
     return set_it_(_java.selection, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaTransformation()
+const QByteArray & UmlBaseFlow::javaTransformation()
 {
     read_if_needed_();
     return _java.transformation;
diff --git a/genplugouts/CppUtilities/UmlBaseFlow.h b/genplugouts/CppUtilities/UmlBaseFlow.h
index b50ce3323..4edb40caf 100644
--- a/genplugouts/CppUtilities/UmlBaseFlow.h
+++ b/genplugouts/CppUtilities/UmlBaseFlow.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "FlowBehavior.h"
 
 class UmlFlow;
@@ -27,7 +27,7 @@ class UmlBaseFlow : public UmlItem
     virtual UmlActivityNode * target();
 
     // return the weight in OCL
-    const Q3CString & weight();
+    const QByteArray & weight();
 
     // set the weight in OCL
     //
@@ -35,7 +35,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Weight(const char * v);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Guard(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Selection(const char * v);
 
     // return the transformation in OCL
-    const Q3CString & transformation();
+    const QByteArray & transformation();
 
     // set the transformation in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHCPP
     // return the weight in C++
-    const Q3CString & cppWeight();
+    const QByteArray & cppWeight();
 
     // set the weight in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppWeight(const char * v);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppGuard(const char * v);
 
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppSelection(const char * v);
 
     // return the transformation in C++
-    const Q3CString & cppTransformation();
+    const QByteArray & cppTransformation();
 
     // set the transformation in C++
     //
@@ -94,7 +94,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHJAVA
     // return the weight in Java
-    const Q3CString & javaWeight();
+    const QByteArray & javaWeight();
 
     // set the weight in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaWeight(const char * v);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -110,7 +110,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaGuard(const char * v);
 
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -118,7 +118,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaSelection(const char * v);
 
     // return the transformation in Java
-    const Q3CString & javaTransformation();
+    const QByteArray & javaTransformation();
 
     // set the transformation in Java
     //
@@ -161,7 +161,7 @@ class UmlBaseFlow : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlow(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseFlow(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseForkPseudoState.h b/genplugouts/CppUtilities/UmlBaseForkPseudoState.h
index 009499bfa..9dfa5025c 100644
--- a/genplugouts/CppUtilities/UmlBaseForkPseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseFormalParameter.h b/genplugouts/CppUtilities/UmlBaseFormalParameter.h
index d8284c71d..aafb2fb40 100644
--- a/genplugouts/CppUtilities/UmlBaseFormalParameter.h
+++ b/genplugouts/CppUtilities/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -34,10 +34,10 @@ class UmlBaseFormalParameter
     };
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/CppUtilities/UmlBaseFragment.cpp b/genplugouts/CppUtilities/UmlBaseFragment.cpp
index 730755358..76a200303 100644
--- a/genplugouts/CppUtilities/UmlBaseFragment.cpp
+++ b/genplugouts/CppUtilities/UmlBaseFragment.cpp
@@ -25,7 +25,7 @@ void UmlBaseFragment::read_()
         fc->read_(this, rank);
     }
 
-    _compartments.setAutoDelete(TRUE);
+    //_compartments.setAutoDelete(TRUE);
     _container = 0;
     _refer = (UmlDiagram *) UmlBaseItem::read_();
     _arguments = UmlCom::read_string();
@@ -38,7 +38,7 @@ int UmlBaseFragment::vcenter_(int rank) const
     return (t + _compartments[rank]->b()) / 2;
 }
 
-void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseFragment::read_covered_(QHash<void*,UmlClassInstanceReference *> &instances)
 {
     unsigned n = UmlCom::read_unsigned();
     unsigned rank;
@@ -46,10 +46,10 @@ void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & insta
     _covered.resize(n);
 
     for (rank = 0; rank != n; rank += 1)
-        _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]);
+        _covered.insert(rank, instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))]);
 }
 
-UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments)
+UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector<UmlFragment *> &fragments)
 {
     UmlFragmentCompartment * r = 0;
     int nf = fragments.count();
@@ -82,7 +82,7 @@ UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, in
     return r;
 }
 
-void UmlBaseFragment::compute_container_(Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseFragment::compute_container_(QVector<UmlFragment *> &fragments)
 {
     int rank = fragments.count();
 
diff --git a/genplugouts/CppUtilities/UmlBaseFragment.h b/genplugouts/CppUtilities/UmlBaseFragment.h
index 932913148..3d6b53c14 100644
--- a/genplugouts/CppUtilities/UmlBaseFragment.h
+++ b/genplugouts/CppUtilities/UmlBaseFragment.h
@@ -1,11 +1,8 @@
 #ifndef _UMLBASEFRAGMENT_H
 #define _UMLBASEFRAGMENT_H
-
-
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3ptrdict.h>
-
+#include <QByteArray>
+#include <QVector>
+#include <QHash>
 class UmlFragmentCompartment;
 class UmlDiagram;
 class UmlClassInstanceReference;
@@ -16,12 +13,12 @@ class UmlBaseFragment
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the compartments, at least one compartment exists
-    const Q3PtrVector<UmlFragmentCompartment> & compartments() const {
+    const QVector<UmlFragmentCompartment*> & compartments() const {
         return _compartments;
     }
 
@@ -39,12 +36,12 @@ class UmlBaseFragment
 
     // return the form corresponding to the arguments
     // and return value of the interaction use
-    Q3CString arguments() const {
+    QByteArray arguments() const {
         return _arguments;
     }
 
     // return the the list of covered instances (life lines)
-    const Q3PtrVector<UmlClassInstanceReference> & covered() const {
+    const QVector<UmlClassInstanceReference*> & covered() const {
         return _covered;
     }
 
@@ -52,9 +49,9 @@ class UmlBaseFragment
 private:
     UmlFragmentCompartment * _container;
 
-    Q3PtrVector<UmlFragmentCompartment> _compartments;
+    QVector<UmlFragmentCompartment*> _compartments;
 
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -66,9 +63,9 @@ class UmlBaseFragment
 
     UmlDiagram * _refer;
 
-    Q3CString _arguments;
+    QByteArray _arguments;
 
-    Q3PtrVector<UmlClassInstanceReference> _covered;
+    QVector<UmlClassInstanceReference*> _covered;
 
     // internal, don't call it
     void read_();
@@ -81,15 +78,15 @@ class UmlBaseFragment
 
     //internal, do NOT use it
 
-    void read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_covered_(QHash<void *, UmlClassInstanceReference *> &instances);
 
     // internal
-    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments);
+    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments);
 
 
 private:
     // internal
-    static void compute_container_(Q3PtrVector<UmlFragment> & fragments);
+    static void compute_container_(QVector<UmlFragment*> & fragments);
 
 
 public:
diff --git a/genplugouts/CppUtilities/UmlBaseFragmentCompartment.cpp b/genplugouts/CppUtilities/UmlBaseFragmentCompartment.cpp
index 2ff876f6a..148f56823 100644
--- a/genplugouts/CppUtilities/UmlBaseFragmentCompartment.cpp
+++ b/genplugouts/CppUtilities/UmlBaseFragmentCompartment.cpp
@@ -3,21 +3,23 @@
 #include "UmlBaseFragmentCompartment.h"
 #include "UmlBaseFragment.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlBaseFragmentCompartment::add_contained_(UmlFragment * x)
 {
-    _contained.resize(_contained.size() + 1);
-    _contained.insert(_contained.size() - 1, x);
+    //_contained.resize(_contained.size() + 1);
+    //_contained.insert(_contained.size() - 1, x);
+    _contained.append(x);
 }
 
-void UmlBaseFragmentCompartment::add_text_(Q3CString x)
+void UmlBaseFragmentCompartment::add_text_(QByteArray x)
 {
-    _texts.resize(_texts.size() + 1);
-    _texts.insert(_texts.size() - 1, strdup(x));
+    //_texts.resize(_texts.size() + 1);
+    //_texts.insert(_texts.size() - 1, strdup(x));
+    _texts.append(strdup(x));
 }
 
-void UmlBaseFragmentCompartment::add_cont_(Q3CString s, int cy)
+void UmlBaseFragmentCompartment::add_cont_(QByteArray s, int cy)
 {
     if (cy < _fragment->vcenter_(_rank))
         _start_continuation = s;
diff --git a/genplugouts/CppUtilities/UmlBaseFragmentCompartment.h b/genplugouts/CppUtilities/UmlBaseFragmentCompartment.h
index 8943ecf60..129b1dc86 100644
--- a/genplugouts/CppUtilities/UmlBaseFragmentCompartment.h
+++ b/genplugouts/CppUtilities/UmlBaseFragmentCompartment.h
@@ -5,8 +5,8 @@
 // to avoid compiler warning
 #include "UmlFragment.h"
 
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+
+
 
 class UmlFragment;
 class UmlBaseFragment;
@@ -27,23 +27,23 @@ class UmlBaseFragmentCompartment
     }
 
     // the texts placed in the compartment
-    const Q3PtrVector<char> & texts() const {
+    const QVector<char*> & texts() const {
         return _texts;
     }
 
     // return the fragments contained in the compartment,
     // may be none
-    const Q3PtrVector<UmlFragment> & contained() const {
+    const QVector<UmlFragment*> & contained() const {
         return _contained;
     }
 
     // return the continuation ('label' case), or an empty string/null
-    Q3CString startContinuation() const {
+    QByteArray startContinuation() const {
         return _start_continuation;
     }
 
     // return the continuation ('goto' case), or an empty string/null
-    Q3CString endContinuation() const {
+    QByteArray endContinuation() const {
         return _end_continuation;
     }
 
@@ -51,27 +51,27 @@ class UmlBaseFragmentCompartment
 private:
     UmlFragment * _fragment;
 
-    Q3PtrVector<UmlFragment> _contained;
+    QVector<UmlFragment*> _contained;
 
     int _rank;
 
-    Q3PtrVector<char> _texts;
+    QVector<char*> _texts;
 
     int _y;
 
-    Q3CString _start_continuation;
+    QByteArray _start_continuation;
 
-    Q3CString _end_continuation;
+    QByteArray _end_continuation;
 
 
 public:
     void add_contained_(UmlFragment * x);
 
-    void add_text_(Q3CString x);
+    void add_text_(QByteArray x);
 
     //internal, do NOT use it
 
-    void add_cont_(Q3CString s, int cy);
+    void add_cont_(QByteArray s, int cy);
 
     int b() const {
         return _y;
diff --git a/genplugouts/CppUtilities/UmlBaseInitialPseudoState.h b/genplugouts/CppUtilities/UmlBaseInitialPseudoState.h
index 88dae1cc6..2f31e4340 100644
--- a/genplugouts/CppUtilities/UmlBaseInitialPseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseInterruptibleActivityRegion.h b/genplugouts/CppUtilities/UmlBaseInterruptibleActivityRegion.h
index 70f988488..de6e56aed 100644
--- a/genplugouts/CppUtilities/UmlBaseInterruptibleActivityRegion.h
+++ b/genplugouts/CppUtilities/UmlBaseInterruptibleActivityRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInterruptibleActivityRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseItem.cpp b/genplugouts/CppUtilities/UmlBaseItem.cpp
index 2da856781..969811f33 100644
--- a/genplugouts/CppUtilities/UmlBaseItem.cpp
+++ b/genplugouts/CppUtilities/UmlBaseItem.cpp
@@ -58,293 +58,294 @@
 #include "UmlActivityPartition.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s) {
-  UmlCom::send_cmd(_identifier, setNameCmd, (const char *)s); //[rageek] Fix prototype
-  if (UmlCom::read_bool()) {
-    _name = s;
-    return TRUE;
-  }
-  else
-    return FALSE;
+bool UmlBaseItem::set_Name(const QByteArray & s) {
+    UmlCom::send_cmd(_identifier, setNameCmd, (const char *)s); //[rageek] Fix prototype
+    if (UmlCom::read_bool()) {
+        _name = s;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
-const Q3CString & UmlBaseItem::stereotype() {
-  read_if_needed_();
-  
-  return _stereotype;
+const QByteArray & UmlBaseItem::stereotype() {
+    read_if_needed_();
+
+    return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s) {
-  return set_it_(_stereotype, s, setStereotypeCmd);
+bool UmlBaseItem::set_Stereotype(const QByteArray & s) {
+    return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
 bool UmlBaseItem::applyStereotype() {
-  UmlCom::send_cmd(_identifier, applyStereotypeCmd);
-  if (UmlCom::read_bool() == 0) return FALSE;
-  unload(false, false);
-  return TRUE;
+    UmlCom::send_cmd(_identifier, applyStereotypeCmd);
+    if (UmlCom::read_bool() == 0) return FALSE;
+    unload(false, false);
+    return TRUE;
 }
 
-const Q3CString & UmlBaseItem::description() {
-  read_if_needed_();
-  
-  return _description;
+const QByteArray & UmlBaseItem::description() {
+    read_if_needed_();
+
+    return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s) {
-  return set_it_(_description, s, setDescriptionCmd);
+bool UmlBaseItem::set_Description(const QByteArray & s) {
+    return set_it_(_description, s, setDescriptionCmd);
 }
 
 UmlItem * UmlBaseItem::parent() {
-  if (_parent == 0) {
-    UmlCom::send_cmd(_identifier, parentCmd);
-    
-    _parent = UmlBaseItem::read_();
-  }
-  
-  return _parent;
+    if (_parent == 0) {
+        UmlCom::send_cmd(_identifier, parentCmd);
+
+        _parent = UmlBaseItem::read_();
+    }
+
+    return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children() {
-  if (_children == 0)
-    read_children_();
-  
-  return *_children;
+const QVector<UmlItem*> UmlBaseItem::children() {
+    if (_children == 0)
+        read_children_();
+
+    return *_children;
 }
 
 bool UmlBaseItem::childrenVisible() {
-  UmlCom::send_cmd(_identifier, isOpenCmd);
-  return UmlCom::read_bool();
+    UmlCom::send_cmd(_identifier, isOpenCmd);
+    return UmlCom::read_bool();
 }
 
 bool UmlBaseItem::set_childrenVisible(bool y) {
-  UmlCom::send_cmd(_identifier, setOpenCmd, (char) y);
-  return UmlCom::read_bool();
-}
-
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v) {
-  read_if_needed_();
-  
-  Q3CString * s = _dict[k];
-  
-  if (s == 0)
-    return FALSE;
-  
-  v = *s;
-  return TRUE;
-
-}
-
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v) {
-  read_if_needed_();
-  
-  UmlCom::send_cmd(_identifier, setCoupleValueCmd,  (const char *)k, (const char *)v ); //[rageek] Fix prototype
-  if (UmlCom::read_bool()) {
-    if (_defined) {
-      Q3CString * s = _dict[k];
-      
-      if (s == 0)
-	_dict.insert(k, new Q3CString(v));
-      else
-	*s = v;
-    }
-    
+    UmlCom::send_cmd(_identifier, setOpenCmd, (char) y);
+    return UmlCom::read_bool();
+}
+
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v) {
+    read_if_needed_();
+
+    QByteArray * s = _dict[k];
+
+    if (s == 0)
+        return FALSE;
+
+    v = *s;
     return TRUE;
-  }
-  else
-    return FALSE;
+
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties() {
-  read_if_needed_();
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v) {
+    read_if_needed_();
+
+    UmlCom::send_cmd(_identifier, setCoupleValueCmd,  (const char *)k, (const char *)v ); //[rageek] Fix prototype
+    if (UmlCom::read_bool()) {
+        if (_defined) {
+            QByteArray * s = _dict[k];
 
-  return _dict;
+            if (s == 0)
+                _dict.insert(k, new QByteArray(v));
+            else
+                *s = v;
+        }
+
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+const QHash<QByteArray, QByteArray *> UmlBaseItem::properties()
+{
+    read_if_needed_();
+
+    return _dict;
 }
 
 bool UmlBaseItem::moveAfter(const UmlItem * x) {
-  UmlCom::send_cmd(_identifier, moveAfterCmd, (x != 0) ? ((UmlBaseItem *) x)->_identifier : 0);
-  if (UmlCom::read_bool()) {
-    ((UmlBaseItem *) parent())->reread_children_if_needed_();
-    return TRUE;
-  }
-  else
-    return FALSE;
+    UmlCom::send_cmd(_identifier, moveAfterCmd, (x != 0) ? ((UmlBaseItem *) x)->_identifier : 0);
+    if (UmlCom::read_bool()) {
+        ((UmlBaseItem *) parent())->reread_children_if_needed_();
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile() {
-  UmlCom::send_cmd(_identifier, supportFileCmd); 
-  return UmlCom::read_string();
+QByteArray UmlBaseItem::supportFile() {
+    UmlCom::send_cmd(_identifier, supportFileCmd);
+    return UmlCom::read_string();
 }
 
 bool UmlBaseItem::isWritable() {
-  UmlCom::send_cmd(_identifier, isWritableCmd); 
-  return UmlCom::read_bool();
+    UmlCom::send_cmd(_identifier, isWritableCmd);
+    return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd) {
-  UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
-  return (int) UmlCom::read_unsigned();
+int UmlBaseItem::apply(QByteArray cmd) {
+    UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
+    return (int) UmlCom::read_unsigned();
 }
 
 bool UmlBaseItem::isMarked() {
-  read_if_needed_();
+    read_if_needed_();
 
-  return _marked;
+    return _marked;
 }
 
 bool UmlBaseItem::set_isMarked(bool y) {
-  return set_it_(_marked, y, setMarkedCmd);
+    return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy() {
-  UmlCom::send_cmd(_identifier, referencedByCmd);
-  
-  Q3PtrVector<UmlItem> result;
-  
-  UmlCom::read_item_list(result);
-  return result;
+const QVector<UmlItem*> UmlBaseItem::referencedBy() {
+    UmlCom::send_cmd(_identifier, referencedByCmd);
+
+    QVector<UmlItem*> result;
+
+    UmlCom::read_item_list(result);
+    return result;
 }
 
 int UmlBaseItem::getIdentifier() {
-  read_if_needed_();
+    read_if_needed_();
 
-  return _modeler_id;
+    return _modeler_id;
 }
 
 void UmlBaseItem::unload(bool rec, bool del) {
-  _defined = FALSE;
-  _stereotype = 0;
-  _dict.clear();
-  _description = 0;
-
-  if (_children != 0) {
-    if (rec) {
-      for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
-	_children->at(chindex)->unload(TRUE, del);
-	if (del)
-	  delete _children->at(chindex);
-      }
+    _defined = FALSE;
+    _stereotype = 0;
+    _dict.clear();
+    _description = 0;
+
+    if (_children != 0) {
+        if (rec) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
+                _children->at(chindex)->unload(TRUE, del);
+                if (del)
+                    delete _children->at(chindex);
+            }
+        }
+
+        delete _children;
+        _children = 0;
     }
-    
-    delete _children;
-    _children = 0;
-  }
 }
 
 bool UmlBaseItem::deleteIt() {
-  UmlCom::send_cmd(_identifier, deleteCmd);
-  if (UmlCom::read_bool() == 0) return FALSE;
-  parent()->unload(TRUE);
-  return TRUE;
+    UmlCom::send_cmd(_identifier, deleteCmd);
+    if (UmlCom::read_bool() == 0) return FALSE;
+    parent()->unload(TRUE);
+    return TRUE;
 }
 
 bool UmlBaseItem::isToolRunning(int id)
 {
-  UmlCom::send_cmd(miscGlobalCmd, toolRunningCmd, id, "");
-  return UmlCom::read_bool();
+    UmlCom::send_cmd(miscGlobalCmd, toolRunningCmd, id, "");
+    return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
-  UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
-  
-  Q3PtrVector<UmlItem> result;
-  
-  UmlCom::read_item_list(result);
-  return result;
+    UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
+
+    QVector<UmlItem*> result;
+
+    UmlCom::read_item_list(result);
+    return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_() {
-  if (!_defined) {
+    if (!_defined) {
 #if defined(WITHCPP) & defined(WITHJAVA) & defined(WITHPHP) & defined(WITHPYTHON) & defined(WITHIDL)
-    UmlCom::send_cmd(_identifier, getDefCmd);
-    read_uml_();
-    read_cpp_();
-    read_java_();
-    read_php_();
-    read_python_();
-    read_idl_();
+        UmlCom::send_cmd(_identifier, getDefCmd);
+        read_uml_();
+        read_cpp_();
+        read_java_();
+        read_php_();
+        read_python_();
+        read_idl_();
 #else
 # if defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
-    UmlCom::send_cmd(_identifier, getCppDefCmd);
-    read_uml_();
-    read_cpp_();
+        UmlCom::send_cmd(_identifier, getCppDefCmd);
+        read_uml_();
+        read_cpp_();
 # else
 #  if !defined(WITHCPP) & defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
-    UmlCom::send_cmd(_identifier, getJavaDefCmd);
-    read_uml_();
-    read_java_();
+        UmlCom::send_cmd(_identifier, getJavaDefCmd);
+        read_uml_();
+        read_java_();
 #  else
 #   if !defined(WITHCPP) & !defined(WITHJAVA) & defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
-    UmlCom::send_cmd(_identifier, getPhpDefCmd);
-    read_uml_();
-    read_php_();
+        UmlCom::send_cmd(_identifier, getPhpDefCmd);
+        read_uml_();
+        read_php_();
 #   else
 #    if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & defined(WITHPYTHON) & !defined(WITHIDL)
-    UmlCom::send_cmd(_identifier, getPythonDefCmd);
-    read_uml_();
-    read_python_();
+        UmlCom::send_cmd(_identifier, getPythonDefCmd);
+        read_uml_();
+        read_python_();
 #    else
 #     if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & defined(WITHIDL)
-    UmlCom::send_cmd(_identifier, getIdlDefCmd);
-    read_uml_();
-    read_idl_();
+        UmlCom::send_cmd(_identifier, getIdlDefCmd);
+        read_uml_();
+        read_idl_();
 #     else
 #      if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
-    UmlCom::send_cmd(_identifier, getUmlDefCmd);
-    read_uml_();
+        UmlCom::send_cmd(_identifier, getUmlDefCmd);
+        read_uml_();
 #      else
-    ... WITHCPP and WITHJAVA and WITHPHP and WITHPYTHON and WITHIDL must be both defined or undefined
-    ... or only one of them must be defined
-#      endif
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-    
-    _defined = TRUE;
-  }
+        ... WITHCPP and WITHJAVA and WITHPHP and WITHPYTHON and WITHIDL must be both defined or undefined
+                ... or only one of them must be defined
+        #      endif
+        #     endif
+        #    endif
+        #   endif
+        #  endif
+        # endif
+        #endif
+
+                _defined = TRUE;
+    }
 }
 
 UmlItem * UmlBaseItem::create_(anItemKind k, const char * s) {
-  UmlCom::send_cmd(_identifier, createCmd, k, s);
+    UmlCom::send_cmd(_identifier, createCmd, k, s);
 
-  UmlItem * result = UmlBaseItem::read_();
-  
-  if (result != 0) {
-    if (_children != 0) {
-      unsigned n = _children->count();
-      
-      _children->resize(n + 1);
-      _children->insert(n, result);
+    UmlItem * result = UmlBaseItem::read_();
+
+    if (result != 0) {
+        if (_children != 0) {
+            unsigned n = _children->count();
+
+            _children->resize(n + 1);
+            _children->insert(n, result);
+        }
+        ((UmlBaseItem *) result)->_parent = (UmlItem *) this;
     }
-    ((UmlBaseItem *) result)->_parent = (UmlItem *) this;
-  }
-  
-  return result;
+
+    return result;
 }
 
 void UmlBaseItem::read_uml_() {
-  _stereotype = UmlCom::read_string();
-
-  unsigned n = UmlCom::read_unsigned();
-  
-  while (n--) {
-    Q3CString k = UmlCom::read_string();
-    
-    _dict.insert(k, new Q3CString(UmlCom::read_string()));
-  }
-  
-  _description = UmlCom::read_string();
-  
-  _marked = UmlCom::read_bool();
-  _modeler_id = (int) UmlCom::read_unsigned();
+    _stereotype = UmlCom::read_string();
+
+    unsigned n = UmlCom::read_unsigned();
+
+    while (n--) {
+        QByteArray k = UmlCom::read_string();
+
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
+    }
+
+    _description = UmlCom::read_string();
+
+    _marked = UmlCom::read_bool();
+    _modeler_id = (int) UmlCom::read_unsigned();
 }
 
 #ifdef WITHCPP
@@ -373,267 +374,269 @@ void UmlBaseItem::read_idl_() {
 #endif
 
 void UmlBaseItem::read_children_() {
-  UmlCom::send_cmd(_identifier, childrenCmd);
-  _children = new Q3PtrVector<UmlItem>;
-  
-  UmlCom::read_item_list(*_children);
-  
-  unsigned n = _children->size();
-  
-  while (n--)
-    ((UmlBaseItem *) _children->at(n))->_parent = (UmlItem *) this;
+    UmlCom::send_cmd(_identifier, childrenCmd);
+    _children = new QVector<UmlItem*>;
+
+    UmlCom::read_item_list(*_children);
+
+    unsigned n = _children->size();
+
+    while (n--)
+    {
+            ((UmlBaseItem *) _children->at(n))->_parent = (UmlItem *) this;
+    }
 }
 
 void UmlBaseItem::reread_children_if_needed_() {
-  if (_children != 0) {
-    delete _children;
-    read_children_();
-  }
+    if (_children != 0) {
+        delete _children;
+        read_children_();
+    }
 }
 
 bool UmlBaseItem::set_it_(bool & r, bool v, OnInstanceCmd cmd) {
-  UmlCom::send_cmd(_identifier, cmd, (char) v);
-  if (UmlCom::read_bool()) {
-    r = v;
-    return TRUE;
-  }
-  else
-    return FALSE;
+    UmlCom::send_cmd(_identifier, cmd, (char) v);
+    if (UmlCom::read_bool()) {
+        r = v;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
 bool UmlBaseItem::set_it_(aVisibility & r, aVisibility v, OnInstanceCmd cmd) {
-  UmlCom::send_cmd(_identifier, cmd, (char) v);
-  if (UmlCom::read_bool()) {
-    r = v;
-    return TRUE;
-  }
-  else
-    return FALSE;
+    UmlCom::send_cmd(_identifier, cmd, (char) v);
+    if (UmlCom::read_bool()) {
+        r = v;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
 bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd) {
-  UmlCom::send_cmd(_identifier, cmd, (char) v);
-  if (UmlCom::read_bool()) {
-    r = v;
-    return TRUE;
-  }
-  else
-    return FALSE;
+    UmlCom::send_cmd(_identifier, cmd, (char) v);
+    if (UmlCom::read_bool()) {
+        r = v;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd) {
-  UmlCom::send_cmd(_identifier, cmd, v);
-  if (UmlCom::read_bool()) {
-    if (_defined) r = v;
-    return TRUE;
-  }
-  else
-    return FALSE;
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd) {
+    UmlCom::send_cmd(_identifier, cmd, v);
+    if (UmlCom::read_bool()) {
+        if (_defined) r = v;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
 bool UmlBaseItem::set_it_(UmlTypeSpec & r, const UmlTypeSpec & t, OnInstanceCmd cmd) {
-  UmlCom::send_cmd(_identifier, cmd, t);
-  if (UmlCom::read_bool()) {
-    if (_defined) r = t;
-    return TRUE;
-  }
- else
-   return FALSE;
+    UmlCom::send_cmd(_identifier, cmd, t);
+    if (UmlCom::read_bool()) {
+        if (_defined) r = t;
+        return TRUE;
+    }
+    else
+        return FALSE;
 }
 
 UmlItem * UmlBaseItem::read_()
 {
-  void * id = UmlCom::read_id();
-  
-  if (id == 0)
-    return 0;
-  
-  anItemKind kind = (anItemKind) UmlCom::read_char();
-  const char * name = UmlCom::read_string();
-  
+    void * id = UmlCom::read_id();
+
+    if (id == 0)
+        return 0;
+
+    anItemKind kind = (anItemKind) UmlCom::read_char();
+    const char * name = UmlCom::read_string();
+
 #ifndef WIN32
-  //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
-  
-  UmlItem * result = _all[id];
-  
-  if (result == 0) {
-    switch (kind) {
-    case aRelation:
-      return new UmlRelation(id, name);
-    case anAttribute:
-      return new UmlAttribute(id, name);
-    case anOperation:
-      return new UmlOperation(id, name);
-    case anExtraClassMember:
-      return new UmlExtraClassMember(id, name);
-    case aClass:
-      return new UmlClass(id, name);
-    case anUseCase:
-      return new UmlUseCase(id, name);
-    case aComponent:
-      return new UmlComponent(id, name);
-    case anArtifact:
-      return new UmlArtifact(id, name);
-    case aNode:
-      return new UmlNode(id, name);
-    case aNcRelation:
-      return new UmlNcRelation(id, name);
-    case aClassDiagram:
-      return new UmlClassDiagram(id, name);
-    case anUseCaseDiagram:
-      return new UmlUseCaseDiagram(id, name);
-    case aSequenceDiagram:
-      return new UmlSequenceDiagram(id, name);
-    case aCollaborationDiagram:
-      return new UmlCollaborationDiagram(id, name);
-    case aComponentDiagram:
-      return new UmlComponentDiagram(id, name);
-    case aDeploymentDiagram:
-      return new UmlDeploymentDiagram(id, name);
-    case aClassView:
-      return new UmlClassView(id, name);
-    case anUseCaseView:
-      return new UmlUseCaseView(id, name);
-    case aComponentView:
-      return new UmlComponentView(id, name);
-    case aDeploymentView:
-      return new UmlDeploymentView(id, name);
-    case aPackage:
-      return new UmlPackage(id, name);
-    case aState:
-      return new UmlState(id, name);
-    case aTransition:
-      return new UmlTransition(id);
-    case aRegion:
-      return new UmlRegion(id, name);
-    case aStateDiagram:
-      return new UmlStateDiagram(id, name);
-    case aStateAction:
-      return new UmlStateAction(id);
-    case anInitialPseudoState:
-      return new UmlInitialPseudoState(id);
-    case anEntryPointPseudoState:
-      return new UmlEntryPointPseudoState(id, name);
-    case aFinalState:
-      return new UmlFinalState(id);
-    case aTerminatePseudoState:
-      return new UmlTerminatePseudoState(id);
-    case anExitPointPseudoState:
-      return new UmlExitPointPseudoState(id, name);
-    case aDeepHistoryPseudoState:
-      return new UmlDeepHistoryPseudoState(id);
-    case aShallowHistoryPseudoState:
-      return new UmlShallowHistoryPseudoState(id);
-    case aJunctionPseudoState:
-      return new UmlJunctionPseudoState(id);
-    case aChoicePseudoState:
-      return new UmlChoicePseudoState(id);
-    case aForkPseudoState:
-      return new UmlForkPseudoState(id);
-    case aJoinPseudoState:
-      return new UmlJoinPseudoState(id);
-    case anObjectDiagram:
-      return new UmlObjectDiagram(id, name);
-    case anActivityDiagram:
-      return new UmlActivityDiagram(id, name);
-    case anActivity:
-      return new UmlActivity(id, name);
-    case aFlow:
-      return new UmlFlow(id, name);
-    case anActivityParameter:
-      return new UmlActivityParameter(id, name);
-    case aParameterSet:
-      return new UmlParameterSet(id, name);
-    case anExpansionRegion:
-      return new UmlExpansionRegion(id, name);
-    case anInterruptibleActivityRegion:
-      return new UmlInterruptibleActivityRegion(id, name);
-    case anOpaqueAction:
-      return new UmlOpaqueAction(id, name);
-    case anAcceptEventAction:
-      return new UmlAcceptEventAction(id, name);
-    case aReadVariableValueAction:
-      return new UmlReadVariableValueAction(id, name);
-    case aClearVariableValueAction:
-      return new UmlClearVariableValueAction(id, name);
-    case aWriteVariableValueAction:
-      return new UmlWriteVariableValueAction(id, name);
-    case anAddVariableValueAction:
-      return new UmlAddVariableValueAction(id, name);
-    case aRemoveVariableValueAction:
-      return new UmlRemoveVariableValueAction(id, name);
-    case aCallBehaviorAction:
-      return new UmlCallBehaviorAction(id, name);
-    case aCallOperationAction:
-      return new UmlCallOperationAction(id, name);
-    case aSendObjectAction:
-      return new UmlSendObjectAction(id, name);
-    case aSendSignalAction:
-      return new UmlSendSignalAction(id, name);
-    case aBroadcastSignalAction:
-      return new UmlBroadcastSignalAction(id, name);
-    case anUnmarshallAction:
-      return new UmlUnmarshallAction(id, name);
-    case aValueSpecificationAction:
-      return new UmlValueSpecificationAction(id, name);
-    case anActivityObject:
-      return new UmlActivityObject(id, name);
-    case anExpansionNode:
-      return new UmlExpansionNode(id, name);
-    case anActivityPin:
-      return new UmlActivityPin(id, name);
-    case anInitialActivityNode:
-      return new UmlInitialActivityNode(id, name);
-    case aFlowFinalActivityNode:
-      return new UmlFlowFinalActivityNode(id, name);
-    case anActivityFinalActivityNode:
-      return new UmlActivityFinalActivityNode(id, name);
-    case aDecisionActivityNode:
-      return new UmlDecisionActivityNode(id, name);
-    case aMergeActivityNode:
-      return new UmlMergeActivityNode(id, name);
-    case aForkActivityNode:
-      return new UmlForkActivityNode(id, name);
-    case aJoinActivityNode:
-      return new UmlJoinActivityNode(id, name);
-    case aPartition:
-      return new UmlActivityPartition(id, name);
-    case aClassInstance:
-      return new UmlClassInstance(id, name);
-    case anAcceptCallAction:
-      return new UmlAcceptCallAction(id, name);
-    case aReplyAction:
-      return new UmlReplyAction(id, name);
-    case aCreateObjectAction:
-      return new UmlCreateObjectAction(id, name);
-    case aDestroyObjectAction:
-      return new UmlDestroyObjectAction(id, name);
-    case aTestIdentityAction:
-      return new UmlTestIdentityAction(id, name);
-    case aRaiseExceptionAction:
-      return new UmlRaiseExceptionAction(id, name);
-    case aReduceAction:
-      return new UmlReduceAction(id, name);
-    default:
-      UmlCom::bye();
-      UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+
+    UmlItem * result = _all[id];
+
+    if (result == 0) {
+        switch (kind) {
+        case aRelation:
+            return new UmlRelation(id, name);
+        case anAttribute:
+            return new UmlAttribute(id, name);
+        case anOperation:
+            return new UmlOperation(id, name);
+        case anExtraClassMember:
+            return new UmlExtraClassMember(id, name);
+        case aClass:
+            return new UmlClass(id, name);
+        case anUseCase:
+            return new UmlUseCase(id, name);
+        case aComponent:
+            return new UmlComponent(id, name);
+        case anArtifact:
+            return new UmlArtifact(id, name);
+        case aNode:
+            return new UmlNode(id, name);
+        case aNcRelation:
+            return new UmlNcRelation(id, name);
+        case aClassDiagram:
+            return new UmlClassDiagram(id, name);
+        case anUseCaseDiagram:
+            return new UmlUseCaseDiagram(id, name);
+        case aSequenceDiagram:
+            return new UmlSequenceDiagram(id, name);
+        case aCollaborationDiagram:
+            return new UmlCollaborationDiagram(id, name);
+        case aComponentDiagram:
+            return new UmlComponentDiagram(id, name);
+        case aDeploymentDiagram:
+            return new UmlDeploymentDiagram(id, name);
+        case aClassView:
+            return new UmlClassView(id, name);
+        case anUseCaseView:
+            return new UmlUseCaseView(id, name);
+        case aComponentView:
+            return new UmlComponentView(id, name);
+        case aDeploymentView:
+            return new UmlDeploymentView(id, name);
+        case aPackage:
+            return new UmlPackage(id, name);
+        case aState:
+            return new UmlState(id, name);
+        case aTransition:
+            return new UmlTransition(id);
+        case aRegion:
+            return new UmlRegion(id, name);
+        case aStateDiagram:
+            return new UmlStateDiagram(id, name);
+        case aStateAction:
+            return new UmlStateAction(id);
+        case anInitialPseudoState:
+            return new UmlInitialPseudoState(id);
+        case anEntryPointPseudoState:
+            return new UmlEntryPointPseudoState(id, name);
+        case aFinalState:
+            return new UmlFinalState(id);
+        case aTerminatePseudoState:
+            return new UmlTerminatePseudoState(id);
+        case anExitPointPseudoState:
+            return new UmlExitPointPseudoState(id, name);
+        case aDeepHistoryPseudoState:
+            return new UmlDeepHistoryPseudoState(id);
+        case aShallowHistoryPseudoState:
+            return new UmlShallowHistoryPseudoState(id);
+        case aJunctionPseudoState:
+            return new UmlJunctionPseudoState(id);
+        case aChoicePseudoState:
+            return new UmlChoicePseudoState(id);
+        case aForkPseudoState:
+            return new UmlForkPseudoState(id);
+        case aJoinPseudoState:
+            return new UmlJoinPseudoState(id);
+        case anObjectDiagram:
+            return new UmlObjectDiagram(id, name);
+        case anActivityDiagram:
+            return new UmlActivityDiagram(id, name);
+        case anActivity:
+            return new UmlActivity(id, name);
+        case aFlow:
+            return new UmlFlow(id, name);
+        case anActivityParameter:
+            return new UmlActivityParameter(id, name);
+        case aParameterSet:
+            return new UmlParameterSet(id, name);
+        case anExpansionRegion:
+            return new UmlExpansionRegion(id, name);
+        case anInterruptibleActivityRegion:
+            return new UmlInterruptibleActivityRegion(id, name);
+        case anOpaqueAction:
+            return new UmlOpaqueAction(id, name);
+        case anAcceptEventAction:
+            return new UmlAcceptEventAction(id, name);
+        case aReadVariableValueAction:
+            return new UmlReadVariableValueAction(id, name);
+        case aClearVariableValueAction:
+            return new UmlClearVariableValueAction(id, name);
+        case aWriteVariableValueAction:
+            return new UmlWriteVariableValueAction(id, name);
+        case anAddVariableValueAction:
+            return new UmlAddVariableValueAction(id, name);
+        case aRemoveVariableValueAction:
+            return new UmlRemoveVariableValueAction(id, name);
+        case aCallBehaviorAction:
+            return new UmlCallBehaviorAction(id, name);
+        case aCallOperationAction:
+            return new UmlCallOperationAction(id, name);
+        case aSendObjectAction:
+            return new UmlSendObjectAction(id, name);
+        case aSendSignalAction:
+            return new UmlSendSignalAction(id, name);
+        case aBroadcastSignalAction:
+            return new UmlBroadcastSignalAction(id, name);
+        case anUnmarshallAction:
+            return new UmlUnmarshallAction(id, name);
+        case aValueSpecificationAction:
+            return new UmlValueSpecificationAction(id, name);
+        case anActivityObject:
+            return new UmlActivityObject(id, name);
+        case anExpansionNode:
+            return new UmlExpansionNode(id, name);
+        case anActivityPin:
+            return new UmlActivityPin(id, name);
+        case anInitialActivityNode:
+            return new UmlInitialActivityNode(id, name);
+        case aFlowFinalActivityNode:
+            return new UmlFlowFinalActivityNode(id, name);
+        case anActivityFinalActivityNode:
+            return new UmlActivityFinalActivityNode(id, name);
+        case aDecisionActivityNode:
+            return new UmlDecisionActivityNode(id, name);
+        case aMergeActivityNode:
+            return new UmlMergeActivityNode(id, name);
+        case aForkActivityNode:
+            return new UmlForkActivityNode(id, name);
+        case aJoinActivityNode:
+            return new UmlJoinActivityNode(id, name);
+        case aPartition:
+            return new UmlActivityPartition(id, name);
+        case aClassInstance:
+            return new UmlClassInstance(id, name);
+        case anAcceptCallAction:
+            return new UmlAcceptCallAction(id, name);
+        case aReplyAction:
+            return new UmlReplyAction(id, name);
+        case aCreateObjectAction:
+            return new UmlCreateObjectAction(id, name);
+        case aDestroyObjectAction:
+            return new UmlDestroyObjectAction(id, name);
+        case aTestIdentityAction:
+            return new UmlTestIdentityAction(id, name);
+        case aRaiseExceptionAction:
+            return new UmlRaiseExceptionAction(id, name);
+        case aReduceAction:
+            return new UmlReduceAction(id, name);
+        default:
+            UmlCom::bye();
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
+        }
     }
-  }
-  
-  return result;
+
+    return result;
 }
 
- UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)  {
-  _all.insert(id, (UmlItem *) this);
-  if (_all.count()/_all.size() > 10)
-    _all.resize(_all.size() * 2 - 1);
+    _all.insert(id, (UmlItem *) this);
+    if (_all.count()/_all.size() > 10)
+        _all.reserve(_all.size() * 2 - 1);
 }
 
- UmlBaseItem::~UmlBaseItem() {
-  if (_children != 0)
-    delete _children;
-  _all.remove(_identifier);
+UmlBaseItem::~UmlBaseItem() {
+    if (_children != 0)
+        delete _children;
+    _all.remove(_identifier);
 }
 
diff --git a/genplugouts/CppUtilities/UmlBaseItem.h b/genplugouts/CppUtilities/UmlBaseItem.h
index 7288ae51a..f4699c5f5 100644
--- a/genplugouts/CppUtilities/UmlBaseItem.h
+++ b/genplugouts/CppUtilities/UmlBaseItem.h
@@ -1,17 +1,11 @@
 #ifndef _UMLBASEITEM_H
 #define _UMLBASEITEM_H
-
-
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
 #include "Tools/ApiCmd.h"
-
 #include "aVisibility.h"
 #include "aDirection.h"
-
+#include <QByteArray>
+#include <QHash>
 class UmlItem;
 class UmlTypeSpec;
 
@@ -37,19 +31,19 @@ class UmlBaseItem {
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() { return _name; };
+    const QByteArray & name() { return _name; };
 
     // to set the name
     // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // If the current stereotype is part of a profile add needed properties.
     // In all cases remove extra properties whose keys contain two ':'.
@@ -58,18 +52,18 @@ class UmlBaseItem {
     bool applyStereotype();
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -94,16 +88,16 @@ class UmlBaseItem {
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
     
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -138,7 +132,7 @@ class UmlBaseItem {
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     // 
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -146,7 +140,7 @@ class UmlBaseItem {
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -160,7 +154,7 @@ class UmlBaseItem {
     //  item), UmlNcRelations (their target is the current item) or
     //  UmlComponents (the associated component of the current item when it is
     //  a UmlClass, a non source component associated with the current one).
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // return a constant identifier, it is unique within a given
     // kind of element (two classes can't have the same identifiers, but
@@ -186,7 +180,7 @@ class UmlBaseItem {
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
 
   private:
@@ -202,21 +196,21 @@ class UmlBaseItem {
 
 
   private:
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
   protected:
@@ -284,7 +278,7 @@ class UmlBaseItem {
 
     //internal, do NOT use it
     
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
     
@@ -297,7 +291,7 @@ class UmlBaseItem {
 
   public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/CppUtilities/UmlBaseJoinPseudoState.h b/genplugouts/CppUtilities/UmlBaseJoinPseudoState.h
index 31976dfff..c95cfff9c 100644
--- a/genplugouts/CppUtilities/UmlBaseJoinPseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseJunctionPseudoState.h b/genplugouts/CppUtilities/UmlBaseJunctionPseudoState.h
index 9b76d88e7..96cdfe959 100644
--- a/genplugouts/CppUtilities/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseMessage.cpp b/genplugouts/CppUtilities/UmlBaseMessage.cpp
index 77851f8dd..2d220aa8e 100644
--- a/genplugouts/CppUtilities/UmlBaseMessage.cpp
+++ b/genplugouts/CppUtilities/UmlBaseMessage.cpp
@@ -4,13 +4,13 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlOperation.h"
 
-void UmlBaseMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     _operation = (UmlOperation *) UmlBaseItem::read_();
 
     if (_operation == 0) _form = UmlCom::read_string();
 
-    _from = instances[(void *) UmlCom::read_unsigned()];
-    _to = instances[(void *) UmlCom::read_unsigned()];
+    _from = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
+    _to = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
 }
 
diff --git a/genplugouts/CppUtilities/UmlBaseMessage.h b/genplugouts/CppUtilities/UmlBaseMessage.h
index 81fc500c8..8af6c57cc 100644
--- a/genplugouts/CppUtilities/UmlBaseMessage.h
+++ b/genplugouts/CppUtilities/UmlBaseMessage.h
@@ -1,10 +1,7 @@
 #ifndef _UMLBASEMESSAGE_H
 #define _UMLBASEMESSAGE_H
-
-
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-
+#include <QByteArray>
+#include <QHash>
 class UmlClassInstanceReference;
 class UmlOperation;
 
@@ -30,7 +27,7 @@ class UmlBaseMessage
 
     // return message as a string, may be empty/null,
     // exclusive with operation()
-    const Q3CString & form() const {
+    const QByteArray & form() const {
         return _form;
     }
 
@@ -42,10 +39,10 @@ class UmlBaseMessage
 
     UmlOperation * _operation;
 
-    Q3CString _form;
+    QByteArray _form;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances);
 
     friend class UmlBaseSequenceMessage;
     friend class UmlBaseCollaborationMessage;
diff --git a/genplugouts/CppUtilities/UmlBaseNcRelation.h b/genplugouts/CppUtilities/UmlBaseNcRelation.h
index 7418e3406..0ad29c67b 100644
--- a/genplugouts/CppUtilities/UmlBaseNcRelation.h
+++ b/genplugouts/CppUtilities/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/CppUtilities/UmlBaseNode.h b/genplugouts/CppUtilities/UmlBaseNode.h
index 07a980e66..208e951f2 100644
--- a/genplugouts/CppUtilities/UmlBaseNode.h
+++ b/genplugouts/CppUtilities/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/CppUtilities/UmlBaseObjectDiagram.h b/genplugouts/CppUtilities/UmlBaseObjectDiagram.h
index dfe6983ef..720256a2d 100644
--- a/genplugouts/CppUtilities/UmlBaseObjectDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseObjectDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlObjectDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseObjectDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseObjectDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseObjectDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseOnSignalAction.cpp b/genplugouts/CppUtilities/UmlBaseOnSignalAction.cpp
index 8c887e113..aec5db337 100644
--- a/genplugouts/CppUtilities/UmlBaseOnSignalAction.cpp
+++ b/genplugouts/CppUtilities/UmlBaseOnSignalAction.cpp
@@ -2,9 +2,9 @@
 #include "UmlCom.h"
 #include "UmlBaseOnSignalAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseOnSignalAction::signal()
+const QByteArray & UmlBaseOnSignalAction::signal()
 {
     read_if_needed_();
     return _signal;
@@ -16,7 +16,7 @@ bool UmlBaseOnSignalAction::set_Signal(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOnSignalAction::cppSignal()
+const QByteArray & UmlBaseOnSignalAction::cppSignal()
 {
     read_if_needed_();
     return _cpp_signal;
@@ -29,7 +29,7 @@ bool UmlBaseOnSignalAction::set_CppSignal(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOnSignalAction::javaSignal()
+const QByteArray & UmlBaseOnSignalAction::javaSignal()
 {
     read_if_needed_();
     return _java_signal;
diff --git a/genplugouts/CppUtilities/UmlBaseOnSignalAction.h b/genplugouts/CppUtilities/UmlBaseOnSignalAction.h
index 6ad499b79..0d648e38c 100644
--- a/genplugouts/CppUtilities/UmlBaseOnSignalAction.h
+++ b/genplugouts/CppUtilities/UmlBaseOnSignalAction.h
@@ -3,19 +3,19 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlBaseOnSignalAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOnSignalAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOnSignalAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the signal
-    const Q3CString & signal();
+    const QByteArray & signal();
 
     // set the signal
     //
@@ -24,7 +24,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the signal in C++
-    const Q3CString & cppSignal();
+    const QByteArray & cppSignal();
 
     // set the signal in C++
     //
@@ -34,7 +34,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the signal in Java
-    const Q3CString & javaSignal();
+    const QByteArray & javaSignal();
 
     // set the signal in Java
     //
@@ -52,14 +52,14 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 
 private:
-    Q3CString _signal;
+    QByteArray _signal;
 
 #ifdef WITHCPP
-    Q3CString _cpp_signal;
+    QByteArray _cpp_signal;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_signal;
+    QByteArray _java_signal;
 #endif
 
 
diff --git a/genplugouts/CppUtilities/UmlBaseOperation.cpp b/genplugouts/CppUtilities/UmlBaseOperation.cpp
index e202b6e8c..45fcdae67 100644
--- a/genplugouts/CppUtilities/UmlBaseOperation.cpp
+++ b/genplugouts/CppUtilities/UmlBaseOperation.cpp
@@ -8,8 +8,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 #include "Logging/QsLog.h"
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
@@ -64,7 +64,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t) {
   return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params() {
+const QList<UmlParameter> UmlBaseOperation::params() {
   read_if_needed_();
     
   return _params;
@@ -75,7 +75,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p) {
 		   p.default_value, p.type);
   if (UmlCom::read_bool()) {
     if (_defined)
-      _params.insert(_params.at(rank), p);
+      _params.insert(rank, p);
     return TRUE;
   }
   else
@@ -86,7 +86,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank) {
   UmlCom::send_cmd(_identifier, removeParameterCmd, rank);
   if (UmlCom::read_bool()) {
     if (_defined)
-      _params.remove(_params.at(rank));
+      _params.removeAt(rank);
     return TRUE;
   }
   else
@@ -105,7 +105,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p) {
     return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions() {
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions() {
   read_if_needed_();
     
   return _exceptions;
@@ -115,7 +115,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t) {
   UmlCom::send_cmd(_identifier, addExceptionCmd, rank, t);
   if (UmlCom::read_bool()) {
     if (_defined)
-      _exceptions.insert(_exceptions.at(rank), t);
+      _exceptions.insert(rank, t);
     return TRUE;
   }
   else
@@ -126,7 +126,7 @@ bool UmlBaseOperation::removeException(unsigned rank) {
   UmlCom::send_cmd(_identifier, removeExceptionCmd, rank);
   if (UmlCom::read_bool()) {
     if (_defined)
-      _exceptions.remove(_exceptions.at(rank));
+      _exceptions.removeAt(rank);
     return TRUE;
   }
   else
@@ -144,8 +144,8 @@ bool UmlBaseOperation::replaceException(unsigned rank, const UmlTypeSpec & t) {
     return FALSE;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseOperation::methods() const {
-  Q3PtrVector<UmlItem> l;
+const QVector<UmlItem*> UmlBaseOperation::methods() const {
+  QVector<UmlItem*> l;
 
   UmlCom::send_cmd(_identifier, sideCmd);
   UmlCom::read_item_list(l);
@@ -233,7 +233,7 @@ bool UmlBaseOperation::set_isCppInline(bool y) {
     return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef() {
+const QByteArray & UmlBaseOperation::cppDef() {
   read_if_needed_();
     
   return _cpp_def;
@@ -243,7 +243,7 @@ bool UmlBaseOperation::set_CppDef(const char * s) {
   return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody() {
+QByteArray UmlBaseOperation::cppBody() {
   // not memorized in the instance for memory size reason
   UmlCom::send_cmd(_identifier, cppBodyCmd);
   return UmlCom::read_string();
@@ -255,7 +255,7 @@ bool UmlBaseOperation::set_CppBody(const char * s) {
   return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec() {
+const QByteArray & UmlBaseOperation::cppNameSpec() {
   read_if_needed_();
     
   return _cpp_name_spec;
@@ -335,7 +335,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y) {
     return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef() {
+const QByteArray & UmlBaseOperation::javaDef() {
   return javaDecl();
 }
 
@@ -343,7 +343,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s) {
   return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody() {
+QByteArray UmlBaseOperation::javaBody() {
   // not memorized in the instance for memory size reason
   UmlCom::send_cmd(_identifier, javaBodyCmd);
   return UmlCom::read_string();
@@ -355,7 +355,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s) {
   return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec() {
+const QByteArray & UmlBaseOperation::javaNameSpec() {
   read_if_needed_();
     
   return _java_name_spec;
@@ -418,7 +418,7 @@ bool UmlBaseOperation::set_isPhpFinal(bool y) {
     return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::phpDef() {
+const QByteArray & UmlBaseOperation::phpDef() {
   return phpDecl();
 }
 
@@ -426,7 +426,7 @@ bool UmlBaseOperation::set_PhpDef(const char * s) {
   return set_PhpDecl(s);
 }
 
-Q3CString UmlBaseOperation::phpBody() {
+QByteArray UmlBaseOperation::phpBody() {
   // not memorized in the instance for memory size reason
   UmlCom::send_cmd(_identifier, phpBodyCmd);
   return UmlCom::read_string();
@@ -438,7 +438,7 @@ bool UmlBaseOperation::set_PhpBody(const char * s) {
   return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::phpNameSpec() {
+const QByteArray & UmlBaseOperation::phpNameSpec() {
   read_if_needed_();
     
   return _php_name_spec;
@@ -484,7 +484,7 @@ bool UmlBaseOperation::set_PhpContextualBodyIndent(bool v) {
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDef() {
+const QByteArray & UmlBaseOperation::pythonDef() {
   return pythonDecl();
 }
 
@@ -492,7 +492,7 @@ bool UmlBaseOperation::set_PythonDef(const char * s) {
   return set_PythonDecl(s);
 }
 
-Q3CString UmlBaseOperation::pythonBody() {
+QByteArray UmlBaseOperation::pythonBody() {
   // not memorized in the instance for memory size reason
   UmlCom::send_cmd(_identifier, pythonBodyCmd);
   return UmlCom::read_string();
@@ -504,7 +504,7 @@ bool UmlBaseOperation::set_PythonBody(const char * s) {
   return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::pythonNameSpec() {
+const QByteArray & UmlBaseOperation::pythonNameSpec() {
   read_if_needed_();
     
   return _python_name_spec;
@@ -550,7 +550,7 @@ bool UmlBaseOperation::set_PythonContextualBodyIndent(bool v) {
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDecorators() {
+const QByteArray & UmlBaseOperation::pythonDecorators() {
   read_if_needed_();
   return _python_decorators;
 }
@@ -578,7 +578,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y) {
     return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec() {
+const QByteArray & UmlBaseOperation::idlNameSpec() {
   read_if_needed_();
     
   return _idl_name_spec;
diff --git a/genplugouts/CppUtilities/UmlBaseOperation.h b/genplugouts/CppUtilities/UmlBaseOperation.h
index 5205a3dd7..8725071dd 100644
--- a/genplugouts/CppUtilities/UmlBaseOperation.h
+++ b/genplugouts/CppUtilities/UmlBaseOperation.h
@@ -5,9 +5,9 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QList>
+
+
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -53,7 +53,7 @@ class UmlBaseOperation : public UmlClassMember {
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -71,7 +71,7 @@ class UmlBaseOperation : public UmlClassMember {
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -89,7 +89,7 @@ class UmlBaseOperation : public UmlClassMember {
     bool replaceException(unsigned rank, const UmlTypeSpec & t);
 
     // return the behaviors (state and activities) implementing the operation
-    const Q3PtrVector<UmlItem> methods() const;
+    const QVector<UmlItem*> methods() const;
 
     // in case the operation is a 'get' operation, returns the associated
     // attribute or relation
@@ -134,7 +134,7 @@ class UmlBaseOperation : public UmlClassMember {
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -143,9 +143,9 @@ class UmlBaseOperation : public UmlClassMember {
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not 
     // contains ${body}
@@ -155,7 +155,7 @@ class UmlBaseOperation : public UmlClassMember {
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -203,7 +203,7 @@ class UmlBaseOperation : public UmlClassMember {
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -212,9 +212,9 @@ class UmlBaseOperation : public UmlClassMember {
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not 
     // contains ${body}
@@ -224,7 +224,7 @@ class UmlBaseOperation : public UmlClassMember {
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -264,7 +264,7 @@ class UmlBaseOperation : public UmlClassMember {
 
     // returns the operation's definition in Php, notes that it is
     // already made by the inherited PhpDecl operation
-    const Q3CString & phpDef();
+    const QByteArray & phpDef();
 
     // sets the operation's definition in Php, notes that it is
     // already made by the inherited set_PhpDecl operation
@@ -273,9 +273,9 @@ class UmlBaseOperation : public UmlClassMember {
     bool set_PhpDef(const char * s);
 
     // returns the operation's body in Php++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString phpBody();
+    QByteArray phpBody();
 
     // sets the operation's body in Php, useless if the def does not 
     // contains ${body}
@@ -285,7 +285,7 @@ class UmlBaseOperation : public UmlClassMember {
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
-    const Q3CString & phpNameSpec();
+    const QByteArray & phpNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
@@ -317,7 +317,7 @@ class UmlBaseOperation : public UmlClassMember {
 #ifdef WITHPYTHON
     // returns the operation's definition in Python, notes that it is
     // already made by the inherited PythonDecl operation
-    const Q3CString & pythonDef();
+    const QByteArray & pythonDef();
 
     // sets the operation's definition in Python, notes that it is
     // already made by the inherited set_PythonDecl operation
@@ -326,9 +326,9 @@ class UmlBaseOperation : public UmlClassMember {
     bool set_PythonDef(const char * s);
 
     // returns the operation's body in Python++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString pythonBody();
+    QByteArray pythonBody();
 
     // sets the operation's body in Python, useless if the def does not 
     // contains ${body}
@@ -338,7 +338,7 @@ class UmlBaseOperation : public UmlClassMember {
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
-    const Q3CString & pythonNameSpec();
+    const QByteArray & pythonNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
@@ -369,7 +369,7 @@ class UmlBaseOperation : public UmlClassMember {
 
 #ifdef WITHPYTHON
     // return the  decorators
-    const Q3CString & pythonDecorators();
+    const QByteArray & pythonDecorators();
 
     // set the  decorators
     //
@@ -388,7 +388,7 @@ class UmlBaseOperation : public UmlClassMember {
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -483,32 +483,32 @@ class UmlBaseOperation : public UmlClassMember {
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_name_spec;
+    QByteArray _php_name_spec;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_name_spec;
+    QByteArray _python_name_spec;
 
-    Q3CString _python_decorators;
+    QByteArray _python_decorators;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -520,7 +520,7 @@ class UmlBaseOperation : public UmlClassMember {
 
   protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
     
@@ -558,7 +558,7 @@ class UmlBaseOperation : public UmlClassMember {
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n) {
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n) {
   _get_of = 0;
   _set_of = 0;
 }
diff --git a/genplugouts/CppUtilities/UmlBasePackage.cpp b/genplugouts/CppUtilities/UmlBasePackage.cpp
index daf35a61d..38dcaa7b9 100644
--- a/genplugouts/CppUtilities/UmlBasePackage.cpp
+++ b/genplugouts/CppUtilities/UmlBasePackage.cpp
@@ -6,7 +6,7 @@
 #include "UmlCom.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -36,50 +36,50 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlDiagram * d)
         return FALSE;
 }
 
-UmlPackage * UmlBasePackage::importProject(const Q3CString & fn)
+UmlPackage * UmlBasePackage::importProject(const QByteArray & fn)
 {
     UmlCom::send_cmd(_identifier, importProjectCmd, (const char *)fn); //[rageek] Fix prototype
     return (UmlPackage *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findCppNamespace(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, _identifier, n);
 
@@ -88,31 +88,31 @@ UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n) const
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findJavaPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, _identifier, n);
 
@@ -121,45 +121,45 @@ UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBasePackage::phpDir()
+const QByteArray & UmlBasePackage::phpDir()
 {
     read_if_needed_();
 
     return _php_dir;
 }
 
-bool UmlBasePackage::set_PhpDir(const Q3CString & s)
+bool UmlBasePackage::set_PhpDir(const QByteArray & s)
 {
     return set_it_(_php_dir, s, setPhpDirCmd);
 }
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBasePackage::pythonDir()
+const QByteArray & UmlBasePackage::pythonDir()
 {
     read_if_needed_();
 
     return _python_dir;
 }
 
-bool UmlBasePackage::set_PythonDir(const Q3CString & s)
+bool UmlBasePackage::set_PythonDir(const QByteArray & s)
 {
     return set_it_(_python_dir, s, setPythonDirCmd);
 }
 
-Q3CString UmlBasePackage::pythonPackage()
+QByteArray UmlBasePackage::pythonPackage()
 {
     read_if_needed_();
 
     return _python_package;
 }
 
-bool UmlBasePackage::set_PythonPackage(const Q3CString & s)
+bool UmlBasePackage::set_PythonPackage(const QByteArray & s)
 {
     return set_it_(_python_package, s, setPythonPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPythonPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findPythonPackageCmd, _identifier, n);
 
@@ -168,31 +168,31 @@ UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findIdlModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findIdlModule(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, _identifier, n);
 
@@ -219,7 +219,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/CppUtilities/UmlBasePackage.h b/genplugouts/CppUtilities/UmlBasePackage.h
index 6bf3b9d1d..49a8de089 100644
--- a/genplugouts/CppUtilities/UmlBasePackage.h
+++ b/genplugouts/CppUtilities/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlPackage;
 class UmlDiagram;
@@ -36,130 +36,130 @@ class UmlBasePackage : public UmlItem
     // or an empty string (the project will be set through a dialog)
     // Return the new UmlPackage containing the imported project, or
     // 0/null on error
-    UmlPackage * importProject(const Q3CString & fn);
+    UmlPackage * importProject(const QByteArray & fn);
 
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findCppNamespace(const Q3CString & n) const;
+    UmlPackage * findCppNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findJavaPackage(const Q3CString & n) const;
+    UmlPackage * findJavaPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHPHP
     // returns the path where the PHP files are generated by the
     // PHP generator.
-    const Q3CString & phpDir();
+    const QByteArray & phpDir();
 
     // to set the path where the PHP files are generated by the
     // PHP generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpDir(const Q3CString & s);
+    bool set_PhpDir(const QByteArray & s);
 #endif
 
 #ifdef WITHPYTHON
     // returns the path where the PYTHON files are generated by the
     // PYTHON generator.
-    const Q3CString & pythonDir();
+    const QByteArray & pythonDir();
 
     // to set the path where the PYTHON files are generated by the
     // PYTHON generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonDir(const Q3CString & s);
+    bool set_PythonDir(const QByteArray & s);
 
     //returns the python package name associed to the package
-    Q3CString pythonPackage();
+    QByteArray pythonPackage();
 
     // to set the python package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonPackage(const Q3CString & s);
+    bool set_PythonPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Python package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPythonPackage(const Q3CString & n) const;
+    UmlPackage * findPythonPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findIdlModule(const Q3CString & n) const;
+    UmlPackage * findIdlModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -172,12 +172,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // Force consistency concerning the profiles and their stereotypes
 
@@ -196,35 +196,35 @@ class UmlBasePackage : public UmlItem
     UmlDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHPHP
-    Q3CString _php_dir;
+    QByteArray _php_dir;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_dir;
+    QByteArray _python_dir;
 
-    Q3CString _python_package;
+    QByteArray _python_package;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -265,11 +265,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/CppUtilities/UmlBaseParameter.h b/genplugouts/CppUtilities/UmlBaseParameter.h
index 71202a64d..0fdea9d7f 100644
--- a/genplugouts/CppUtilities/UmlBaseParameter.h
+++ b/genplugouts/CppUtilities/UmlBaseParameter.h
@@ -2,16 +2,16 @@
 #define _UMLBASEPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "aDirection.h"
 
 //  Represent an operation's parameter
 
 struct UmlBaseParameter {
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
     UmlTypeSpec type;
 
diff --git a/genplugouts/CppUtilities/UmlBaseParameterSet.cpp b/genplugouts/CppUtilities/UmlBaseParameterSet.cpp
index a2e4a1756..7eb8a3931 100644
--- a/genplugouts/CppUtilities/UmlBaseParameterSet.cpp
+++ b/genplugouts/CppUtilities/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         // tests != to bypass Qt 2.3 bug
@@ -44,6 +44,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/CppUtilities/UmlBaseParameterSet.h b/genplugouts/CppUtilities/UmlBaseParameterSet.h
index 71e77cbfe..866cb7d23 100644
--- a/genplugouts/CppUtilities/UmlBaseParameterSet.h
+++ b/genplugouts/CppUtilities/UmlBaseParameterSet.h
@@ -1,11 +1,8 @@
 #ifndef _UMLBASEPARAMETERSET_H
 #define _UMLBASEPARAMETERSET_H
-
-
+#include <QVector>
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
 
 class UmlActivityParameter;
 class UmlActivityAction;
@@ -27,16 +24,16 @@ class UmlBaseParameterSet : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseParameterSet(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseParameterSet(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +45,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/CppUtilities/UmlBasePinParameter.h b/genplugouts/CppUtilities/UmlBasePinParameter.h
index a68b5c5eb..201f520a7 100644
--- a/genplugouts/CppUtilities/UmlBasePinParameter.h
+++ b/genplugouts/CppUtilities/UmlBasePinParameter.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityObject.h"
-#include <q3cstring.h>
+
 #include "aDirection.h"
 #include "aParameterEffectKind.h"
 
@@ -11,7 +11,7 @@ class UmlBasePinParameter : public UmlActivityObject
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePinParameter(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBasePinParameter(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 
diff --git a/genplugouts/CppUtilities/UmlBaseRegion.h b/genplugouts/CppUtilities/UmlBaseRegion.h
index 58a9f8b78..efd32acb9 100644
--- a/genplugouts/CppUtilities/UmlBaseRegion.h
+++ b/genplugouts/CppUtilities/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseRelation.cpp b/genplugouts/CppUtilities/UmlBaseRelation.cpp
index 3c141d439..860b61402 100644
--- a/genplugouts/CppUtilities/UmlBaseRelation.cpp
+++ b/genplugouts/CppUtilities/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -139,7 +139,7 @@ bool UmlBaseRelation::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -151,7 +151,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -193,7 +193,7 @@ bool UmlBaseRelation::set_Association(const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -205,7 +205,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -337,7 +337,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/CppUtilities/UmlBaseRelation.h b/genplugouts/CppUtilities/UmlBaseRelation.h
index 536a4eee9..ed2d12172 100644
--- a/genplugouts/CppUtilities/UmlBaseRelation.h
+++ b/genplugouts/CppUtilities/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlRelation;
@@ -71,7 +71,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -83,7 +83,7 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
@@ -97,7 +97,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_Association(const UmlTypeSpec & t);
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -105,7 +105,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -168,7 +168,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -215,13 +215,13 @@ class UmlBaseRelation : public UmlClassMember
     bool _idl_truncatable : 1;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlTypeSpec _association;
 
@@ -233,7 +233,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -273,11 +273,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/CppUtilities/UmlBaseSequenceDiagram.h b/genplugouts/CppUtilities/UmlBaseSequenceDiagram.h
index 345c08b13..5f33ab882 100644
--- a/genplugouts/CppUtilities/UmlBaseSequenceDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/CppUtilities/UmlBaseSequenceDiagramDefinition.cpp b/genplugouts/CppUtilities/UmlBaseSequenceDiagramDefinition.cpp
index eb3b1751b..975bbd0c3 100644
--- a/genplugouts/CppUtilities/UmlBaseSequenceDiagramDefinition.cpp
+++ b/genplugouts/CppUtilities/UmlBaseSequenceDiagramDefinition.cpp
@@ -2,7 +2,7 @@
 #include "UmlCom.h"
 #include "UmlBaseSequenceDiagramDefinition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 static void qsort(UmlSequenceMessage ** v, int low, int high)
 {
@@ -40,7 +40,7 @@ static void qsort(UmlSequenceMessage ** v, int low, int high)
 }
 void UmlBaseSequenceDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -54,7 +54,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -64,11 +64,11 @@ void UmlBaseSequenceDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -82,7 +82,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         }
 
         ::qsort(_messages.data(), 0, n - 1);
-        _messages.setAutoDelete(TRUE);
+        //_messages.setAutoDelete(TRUE);
     }
 
     n = _fragments.count();
@@ -92,7 +92,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
 
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
@@ -103,7 +103,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
     }
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/CppUtilities/UmlBaseSequenceDiagramDefinition.h b/genplugouts/CppUtilities/UmlBaseSequenceDiagramDefinition.h
index 6be419e66..f80c8b3f6 100644
--- a/genplugouts/CppUtilities/UmlBaseSequenceDiagramDefinition.h
+++ b/genplugouts/CppUtilities/UmlBaseSequenceDiagramDefinition.h
@@ -8,7 +8,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlSequenceMessage.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlSequenceMessage;
@@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following the sending time
-    const Q3PtrVector<UmlSequenceMessage> & messages() const {
+    const QVector<UmlSequenceMessage*> & messages() const {
         return _messages;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlSequenceMessage> _messages;
+    QVector<UmlSequenceMessage*> _messages;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/CppUtilities/UmlBaseSequenceMessage.cpp b/genplugouts/CppUtilities/UmlBaseSequenceMessage.cpp
index 379ba53a7..6fe9ec8c2 100644
--- a/genplugouts/CppUtilities/UmlBaseSequenceMessage.cpp
+++ b/genplugouts/CppUtilities/UmlBaseSequenceMessage.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlFragment.h"
 
-void UmlBaseSequenceMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseSequenceMessage::read_(const QHash<void*,UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments)
 {
     UmlBaseMessage::read_(instances);
     _kind = (aMessageKind) UmlCom::read_char();
diff --git a/genplugouts/CppUtilities/UmlBaseSequenceMessage.h b/genplugouts/CppUtilities/UmlBaseSequenceMessage.h
index 4eb0b884d..e53b0a32d 100644
--- a/genplugouts/CppUtilities/UmlBaseSequenceMessage.h
+++ b/genplugouts/CppUtilities/UmlBaseSequenceMessage.h
@@ -3,9 +3,9 @@
 
 
 #include "aMessageKind.h"
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-#include <q3ptrvector.h>
+
+
+
 #include "UmlMessage.h"
 
 class UmlFragmentCompartment;
@@ -37,7 +37,7 @@ class UmlBaseSequenceMessage : public UmlMessage
     }
 
     // return the arguments of the operation, may be empty
-    const Q3CString & arguments() const {
+    const QByteArray & arguments() const {
         return _args;
     }
 
@@ -53,10 +53,10 @@ class UmlBaseSequenceMessage : public UmlMessage
 
     int _received_at;
 
-    Q3CString _args;
+    QByteArray _args;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments);
 
     friend class UmlBaseSequenceDiagramDefinition;
 };
diff --git a/genplugouts/CppUtilities/UmlBaseShallowHistoryPseudoState.h b/genplugouts/CppUtilities/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..cb82c3ec1 100644
--- a/genplugouts/CppUtilities/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseState.cpp b/genplugouts/CppUtilities/UmlBaseState.cpp
index 5b5f76fce..e8bb5109c 100644
--- a/genplugouts/CppUtilities/UmlBaseState.cpp
+++ b/genplugouts/CppUtilities/UmlBaseState.cpp
@@ -5,7 +5,7 @@
 #include "UmlOperation.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -17,7 +17,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -28,7 +28,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -39,7 +39,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -51,7 +51,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -62,7 +62,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -73,7 +73,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -86,7 +86,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -97,7 +97,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -108,7 +108,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/CppUtilities/UmlBaseState.h b/genplugouts/CppUtilities/UmlBaseState.h
index 72915ba74..615306ec9 100644
--- a/genplugouts/CppUtilities/UmlBaseState.h
+++ b/genplugouts/CppUtilities/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "StateBehavior.h"
 
 class UmlState;
@@ -27,13 +27,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -41,7 +41,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -49,7 +49,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -58,7 +58,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -66,7 +66,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -74,7 +74,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -92,7 +92,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -100,7 +100,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/CppUtilities/UmlBaseStateAction.cpp b/genplugouts/CppUtilities/UmlBaseStateAction.cpp
index 32063a1ac..ddae8212d 100644
--- a/genplugouts/CppUtilities/UmlBaseStateAction.cpp
+++ b/genplugouts/CppUtilities/UmlBaseStateAction.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseStateAction.h"
 #include "UmlStateAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlItem * parent)
 {
@@ -15,7 +15,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -27,7 +27,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -40,7 +40,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/CppUtilities/UmlBaseStateAction.h b/genplugouts/CppUtilities/UmlBaseStateAction.h
index 058903e1f..0ddee639e 100644
--- a/genplugouts/CppUtilities/UmlBaseStateAction.h
+++ b/genplugouts/CppUtilities/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateAction;
 
@@ -24,13 +24,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -39,7 +39,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -49,7 +49,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -67,14 +67,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/CppUtilities/UmlBaseStateDiagram.h b/genplugouts/CppUtilities/UmlBaseStateDiagram.h
index ea7e37ee0..d3c5bd101 100644
--- a/genplugouts/CppUtilities/UmlBaseStateDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseSubject.cpp b/genplugouts/CppUtilities/UmlBaseSubject.cpp
index b15d380d3..3c6453182 100644
--- a/genplugouts/CppUtilities/UmlBaseSubject.cpp
+++ b/genplugouts/CppUtilities/UmlBaseSubject.cpp
@@ -12,7 +12,7 @@ void UmlBaseSubject::read_()
     _h = (int) UmlCom::read_unsigned();
 }
 
-UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects)
+UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> &subjects)
 {
     int rank = subjects.count();
 
diff --git a/genplugouts/CppUtilities/UmlBaseSubject.h b/genplugouts/CppUtilities/UmlBaseSubject.h
index da0098ff6..9e1359732 100644
--- a/genplugouts/CppUtilities/UmlBaseSubject.h
+++ b/genplugouts/CppUtilities/UmlBaseSubject.h
@@ -1,10 +1,7 @@
 #ifndef _UMLBASESUBJECT_H
 #define _UMLBASESUBJECT_H
-
-
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-
+#include <QByteArray>
+#include <QVector>
 class UmlSubject;
 
 // this class manages subjects
@@ -12,13 +9,13 @@ class UmlBaseSubject
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -34,7 +31,7 @@ class UmlBaseSubject
 
 public:
     // internal
-    static UmlSubject * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects);
+    static UmlSubject * get_container_(int x, int y, int w, int h, const QVector<UmlSubject *> &subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/CppUtilities/UmlBaseTerminatePseudoState.h b/genplugouts/CppUtilities/UmlBaseTerminatePseudoState.h
index e8553f4be..5328f4055 100644
--- a/genplugouts/CppUtilities/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/CppUtilities/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBaseTransition.cpp b/genplugouts/CppUtilities/UmlBaseTransition.cpp
index 8fe2570a0..7dec536d7 100644
--- a/genplugouts/CppUtilities/UmlBaseTransition.cpp
+++ b/genplugouts/CppUtilities/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_IsExternal(bool v)
     return set_it_(_is_external, v, setIsCppExternalCmd);
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -61,7 +61,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -95,7 +95,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -130,7 +130,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/CppUtilities/UmlBaseTransition.h b/genplugouts/CppUtilities/UmlBaseTransition.h
index a72261c68..8a308a509 100644
--- a/genplugouts/CppUtilities/UmlBaseTransition.h
+++ b/genplugouts/CppUtilities/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -36,7 +36,7 @@ class UmlBaseTransition : public UmlItem
     bool set_IsExternal(bool v);
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -44,7 +44,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -52,7 +52,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -61,7 +61,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -69,7 +69,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -87,7 +87,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -95,7 +95,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -103,7 +103,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/CppUtilities/UmlBaseTypeSpec.cpp b/genplugouts/CppUtilities/UmlBaseTypeSpec.cpp
index 4070a4a45..cddda026a 100644
--- a/genplugouts/CppUtilities/UmlBaseTypeSpec.cpp
+++ b/genplugouts/CppUtilities/UmlBaseTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlBaseTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseTypeSpec::toString() const
+const QByteArray & UmlBaseTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/CppUtilities/UmlBaseTypeSpec.h b/genplugouts/CppUtilities/UmlBaseTypeSpec.h
index 16fce750a..775ce2e3b 100644
--- a/genplugouts/CppUtilities/UmlBaseTypeSpec.h
+++ b/genplugouts/CppUtilities/UmlBaseTypeSpec.h
@@ -1,9 +1,6 @@
 #ifndef _UMLBASETYPESPEC_H
 #define _UMLBASETYPESPEC_H
-
-
-#include <q3cstring.h>
-
+#include <QByteArray>
 class UmlClass;
 
 // this class memorize a type specification, which may be
@@ -17,10 +14,10 @@ class UmlBaseTypeSpec
     UmlBaseTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     UmlClass * type;
 
diff --git a/genplugouts/CppUtilities/UmlBaseUseCase.cpp b/genplugouts/CppUtilities/UmlBaseUseCase.cpp
index 2acd65351..01b460067 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCase.cpp
+++ b/genplugouts/CppUtilities/UmlBaseUseCase.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlUseCase * UmlBaseUseCase::create(UmlItem * parent, const char * s)
 {
     return (UmlUseCase *) parent->create_(anUseCase, s);
@@ -35,7 +35,7 @@ bool UmlBaseUseCase::set_AssociatedDiagram(UmlUseCaseDiagram * d)
         return FALSE;
 }
 
-const Q3CString & UmlBaseUseCase::extensionPoints()
+const QByteArray & UmlBaseUseCase::extensionPoints()
 {
     read_if_needed_();
     return _extension_points;
diff --git a/genplugouts/CppUtilities/UmlBaseUseCase.h b/genplugouts/CppUtilities/UmlBaseUseCase.h
index 9bd21249f..c1898a3c8 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCase.h
+++ b/genplugouts/CppUtilities/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -32,7 +32,7 @@ class UmlBaseUseCase : public UmlItem
     bool set_AssociatedDiagram(UmlUseCaseDiagram * d);
 
     // return the extension points
-    const Q3CString & extensionPoints();
+    const QByteArray & extensionPoints();
 
     // set the extension points
     //
@@ -41,7 +41,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
-    Q3CString _extension_points;
+    QByteArray _extension_points;
 
     UmlUseCaseDiagram * _assoc_diagram;
 
@@ -52,7 +52,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.cpp b/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.cpp
index ebee930a9..6a91c0e5c 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.cpp
+++ b/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.cpp
@@ -4,9 +4,9 @@
 #include "UmlUseCaseReference.h"
 #include "UmlClass.h"
 
-void UmlBaseUseCaseAssociation::read_(const Q3PtrDict<UmlUseCaseReference> & useCases)
+void UmlBaseUseCaseAssociation::read_(const QHash<void*,UmlUseCaseReference*> & useCases)
 {
-    _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()];
+    _use_case = (UmlUseCaseReference *) useCases[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
     _actor = (UmlClass *) UmlBaseItem::read_();
     _primary = UmlCom::read_bool();
     _name = UmlCom::read_string();
diff --git a/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.h b/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.h
index 9538e6ba7..e93593edf 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.h
+++ b/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.h
@@ -1,10 +1,7 @@
 #ifndef _UMLBASEUSECASEASSOCIATION_H
 #define _UMLBASEUSECASEASSOCIATION_H
-
-
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-
+#include <QByteArray>
+#include <QHash>
 class UmlUseCaseReference;
 class UmlClass;
 
@@ -13,12 +10,12 @@ class UmlBaseUseCaseAssociation
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the stereotype
-    const Q3CString & stereotype() const {
+    const QByteArray & stereotype() const {
         return _stereotype;
     }
 
@@ -43,14 +40,14 @@ class UmlBaseUseCaseAssociation
 
     UmlClass * _actor;
 
-    Q3CString _name;
+    QByteArray _name;
 
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
     bool _primary;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlUseCaseReference> & useCases);
+    void read_(const QHash<void *, UmlUseCaseReference *> &useCases);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/CppUtilities/UmlBaseUseCaseDiagram.h b/genplugouts/CppUtilities/UmlBaseUseCaseDiagram.h
index 4370e63a4..9467f8f23 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/CppUtilities/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.cpp b/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.cpp
index b8780daf2..ff9acd825 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.cpp
+++ b/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseUseCaseDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlUseCaseReference> ucrefs;
+    QHash<void*,UmlUseCaseReference*> ucrefs;
     unsigned n;
     unsigned rank;
 
@@ -18,7 +18,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -31,7 +31,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         sb->read_();
     }
 
-    _subjects.setAutoDelete(TRUE);
+    //_subjects.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _use_cases.resize(n);
@@ -40,11 +40,11 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         UmlUseCaseReference * uc = new UmlUseCaseReference();
 
         _use_cases.insert(rank, uc);
-        ucrefs.insert((void *) UmlCom::read_unsigned(), uc);
+        ucrefs.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), uc);
         uc->read_(_fragments, _subjects);
     }
 
-    _use_cases.setAutoDelete(TRUE);
+   // _use_cases.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _actors.resize(n);
@@ -62,7 +62,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         r->read_(ucrefs);
     }
 
-    _rels.setAutoDelete(TRUE);
+    //_rels.setAutoDelete(TRUE);
 }
 
 UmlBaseUseCaseDiagramDefinition::~UmlBaseUseCaseDiagramDefinition()
diff --git a/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.h b/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.h
index d2cefc68d..364e2f259 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.h
+++ b/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.h
@@ -9,9 +9,7 @@
 #include "UmlFragmentCompartment.h"
 #include "UmlUseCaseReference.h"
 #include "UmlUseCaseAssociation.h"
-
-#include <q3ptrvector.h>
-
+#include <QVector>
 class UmlUseCaseReference;
 class UmlClass;
 class UmlUseCaseAssociation;
@@ -23,41 +21,41 @@ class UmlBaseUseCaseDiagramDefinition
 {
 public:
     // return the use cases present in the diagram
-    const Q3PtrVector<UmlUseCaseReference> & useCases() const {
+    const QVector<UmlUseCaseReference*> & useCases() const {
         return _use_cases;
     }
 
     // return the actors present in the diagram
-    const Q3PtrVector<UmlClass> & actors() const {
+    const QVector<UmlClass*> & actors() const {
         return _actors;
     }
 
     // return the associations between actor and use case present in the diagram
-    const Q3PtrVector<UmlUseCaseAssociation> & associations() const {
+    const QVector<UmlUseCaseAssociation*> & associations() const {
         return _rels;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
     // return the subjects present in the diagram
-    const Q3PtrVector<UmlSubject> & subjects() const {
+    const QVector<UmlSubject*> & subjects() const {
         return _subjects;
     }
 
 
 private:
-    Q3PtrVector<UmlUseCaseReference> _use_cases;
+    QVector<UmlUseCaseReference*> _use_cases;
 
-    Q3PtrVector<UmlClass> _actors;
+    QVector<UmlClass*> _actors;
 
-    Q3PtrVector<UmlUseCaseAssociation> _rels;
+    QVector<UmlUseCaseAssociation*> _rels;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
-    Q3PtrVector<UmlSubject> _subjects;
+    QVector<UmlSubject*> _subjects;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/CppUtilities/UmlBaseUseCaseReference.cpp b/genplugouts/CppUtilities/UmlBaseUseCaseReference.cpp
index c599f87d4..ac41d32fb 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCaseReference.cpp
+++ b/genplugouts/CppUtilities/UmlBaseUseCaseReference.cpp
@@ -6,7 +6,7 @@
 #include "UmlSubject.h"
 #include "UmlFragment.h"
 
-void UmlBaseUseCaseReference::read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects)
+void UmlBaseUseCaseReference::read_(const QVector<UmlFragment *> &fragments, const QVector<UmlSubject *> &subjects)
 {
     _use_case = (UmlUseCase *) UmlBaseItem::read_();
     _x = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/CppUtilities/UmlBaseUseCaseReference.h b/genplugouts/CppUtilities/UmlBaseUseCaseReference.h
index 5e5590920..8331f896f 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCaseReference.h
+++ b/genplugouts/CppUtilities/UmlBaseUseCaseReference.h
@@ -1,9 +1,7 @@
 #ifndef _UMLBASEUSECASEREFERENCE_H
 #define _UMLBASEUSECASEREFERENCE_H
 
-
-#include <q3ptrvector.h>
-
+#include <QVector>
 class UmlUseCase;
 class UmlFragmentCompartment;
 class UmlSubject;
@@ -46,7 +44,7 @@ class UmlBaseUseCaseReference
     int _h;
 
     // internal, don't call it
-    void read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects);
+    void read_(const QVector<UmlFragment*> & fragments, const QVector<UmlSubject*> & subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/CppUtilities/UmlBaseUseCaseView.h b/genplugouts/CppUtilities/UmlBaseUseCaseView.h
index 19d836b64..b5140abd8 100644
--- a/genplugouts/CppUtilities/UmlBaseUseCaseView.h
+++ b/genplugouts/CppUtilities/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseView;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlBaseView.h b/genplugouts/CppUtilities/UmlBaseView.h
index ee8c0dd38..1e346b17b 100644
--- a/genplugouts/CppUtilities/UmlBaseView.h
+++ b/genplugouts/CppUtilities/UmlBaseView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseView : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseView(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseView(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlBuiltin.h b/genplugouts/CppUtilities/UmlBuiltin.h
index 4f5c16f41..360517a4b 100644
--- a/genplugouts/CppUtilities/UmlBuiltin.h
+++ b/genplugouts/CppUtilities/UmlBuiltin.h
@@ -1,32 +1,32 @@
 #ifndef _UMLBUILTIN_H
 #define _UMLBUILTIN_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/CppUtilities/UmlClass.cpp b/genplugouts/CppUtilities/UmlClass.cpp
index 75ecf54ef..8de03e005 100644
--- a/genplugouts/CppUtilities/UmlClass.cpp
+++ b/genplugouts/CppUtilities/UmlClass.cpp
@@ -8,8 +8,8 @@
 #include "UmlCom.h"
 
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 #include "Logging/QsLog.h"
 class FunctionTracer
 {
@@ -30,27 +30,26 @@ class FunctionTracer
 void UmlClass::utilities()
 {
     TRACE_FUNCTION;
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     bool have_constructor = FALSE;
     bool have_destructor = FALSE;
-    Q3CString destr = "~" + name();
+    QByteArray destr = "~" + name();
     bool have_copy = FALSE;
     bool have_const_copy = FALSE;
     bool have_assignment = FALSE;
     bool have_const_assignment = FALSE;
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) { //[rageek] literal comparison
-            Q3CString s = ch[i]->name(); //[rageek]
+            QByteArray s = ch[i]->name(); //[rageek]
 
 
             if (s == name()) {
                 // may be a constructor or a copy constructor
-                const Q3ValueList<UmlParameter> params =
-                    ((UmlOperation *) ch[i])->params();
+                const QList<UmlParameter> params = ((UmlOperation *) ch[i])->params();
 
                 if (params.count() == 1) {
-                    const UmlParameter & param = *(params.at(0));
+                    const UmlParameter & param = (params.at(0));
 
                     if (param.type.type == this) {
                         if (param.dir == InputDirection)
@@ -67,11 +66,11 @@ void UmlClass::utilities()
             else if (s == destr)
                 have_destructor = TRUE;
             else if (s == "operator=") {
-                const Q3ValueList<UmlParameter> params =
+                const QList<UmlParameter> params =
                     ((UmlOperation *) ch[i])->params();
 
                 if (params.count() == 1) {
-                    if ((*(params.at(0))).dir == InputDirection)
+                    if (((params.at(0))).dir == InputDirection)
                         have_const_assignment = TRUE;
                     else
                         have_assignment = TRUE;
@@ -99,7 +98,7 @@ void UmlClass::addContructor(bool expl)
         UmlCom::trace("can't add contructor");
     else {
         QLOG_INFO() << "1.1.3";
-        Q3CString s;
+        QByteArray s;
         int index;
 
         // remove the useless "${type} " mainly to remove the space
@@ -111,11 +110,11 @@ void UmlClass::addContructor(bool expl)
             s = CppSettings::operationDecl();
         QLOG_INFO() << s;
         QLOG_INFO() << "1.1.5";
-        if ((index = s.find("${type} ")) != -1)
+        if ((index = s.indexOf("${type} ")) != -1)
             s.remove(index, 8);
         QLOG_INFO() << s;
         QLOG_INFO() << "1.1.6";
-        if (expl && ((index = s.find("${name}")) != -1))
+        if (expl && ((index = s.indexOf("${name}")) != -1))
             s.insert(index, "explicit ");
         QLOG_INFO() << s;
         QLOG_INFO() << "1.1.7";
@@ -128,7 +127,7 @@ void UmlClass::addContructor(bool expl)
         if (s.isEmpty())
             s = CppSettings::operationDef();
         QLOG_INFO() << "1.1.9";
-        if ((index = s.find("${type} ")) != -1)
+        if ((index = s.indexOf("${type} ")) != -1)
             s.remove(index, 8);
         QLOG_INFO() << "1.1.10";
         op->set_CppDef(s);
@@ -146,7 +145,7 @@ void UmlClass::addDestructor(bool virt)
         if (virt)
             op->set_isCppVirtual(TRUE);
 
-        Q3CString s;
+        QByteArray s;
         int index;
 
         // remove the useless "${type} " mainly to remove the space
@@ -156,7 +155,7 @@ void UmlClass::addDestructor(bool virt)
         if (s.isEmpty())
             s = CppSettings::operationDecl();
 
-        if ((index = s.find("${type} ")) != -1) {
+        if ((index = s.indexOf("${type} ")) != -1) {
             s.remove(index, 8);
             op->set_CppDecl(s);
         }
@@ -166,7 +165,7 @@ void UmlClass::addDestructor(bool virt)
         if (s.isEmpty())
             s = CppSettings::operationDef();
 
-        if ((index = s.find("${type} ")) != -1) {
+        if ((index = s.indexOf("${type} ")) != -1) {
             s.remove(index, 8);
             op->set_CppDef(s);
         }
@@ -197,8 +196,8 @@ void UmlClass::addCopy(bool cte)
         // add the parameter profile, and
         // remove the useless "${type} " mainly to remove the space
 
-        Q3CString p = (cte) ? "const ${t0} & ${p0}" : "${t0} & ${p0}";
-        Q3CString s;
+        QByteArray p = (cte) ? "const ${t0} & ${p0}" : "${t0} & ${p0}";
+        QByteArray s;
         int index;
 
         s = op->cppDecl();
@@ -206,10 +205,10 @@ void UmlClass::addCopy(bool cte)
         if (s.isEmpty())
             s = CppSettings::operationDecl();
 
-        if ((index = s.find("${(}")) != -1)
-            s.insert(index + 4, (const char *)p); //[rageek] cast because Q3CString
+        if ((index = s.indexOf("${(}")) != -1)
+            s.insert(index + 4, (const char *)p); //[rageek] cast because QByteArray
 
-        if ((index = s.find("${type} ")) != -1)
+        if ((index = s.indexOf("${type} ")) != -1)
             s.remove(index, 8);
 
         op->set_CppDecl(s);
@@ -219,10 +218,10 @@ void UmlClass::addCopy(bool cte)
         if (s.isEmpty())
             s = CppSettings::operationDef();
 
-        if ((index = s.find("${(}")) != -1)
-            s.insert(index + 4, (const char *)p); //[rageek] cast because Q3CString
+        if ((index = s.indexOf("${(}")) != -1)
+            s.insert(index + 4, (const char *)p); //[rageek] cast because QByteArray
 
-        if ((index = s.find("${type} ")) != -1)
+        if ((index = s.indexOf("${type} ")) != -1)
             s.remove(index, 8);
 
         op->set_CppDef(s);
@@ -255,8 +254,8 @@ void UmlClass::addAssign(bool cte)
 
         op->set_ReturnType(t);
 
-        Q3CString p = (cte) ? "const ${t0} & ${p0}" : "${t0} & ${p0}";
-        Q3CString s;
+        QByteArray p = (cte) ? "const ${t0} & ${p0}" : "${t0} & ${p0}";
+        QByteArray s;
         int index;
 
         s = op->cppDecl();
@@ -264,10 +263,10 @@ void UmlClass::addAssign(bool cte)
         if (s.isEmpty())
             s = CppSettings::operationDecl();
 
-        if ((index = s.find("${(}")) != -1)
-            s.insert(index + 4, (const char *)p); //[rageek] cast because Q3CString
+        if ((index = s.indexOf("${(}")) != -1)
+            s.insert(index + 4, (const char *)p); //[rageek] cast because QByteArray
 
-        if ((index = s.find("${type}")) != -1)
+        if ((index = s.indexOf("${type}")) != -1)
             s.insert(index + 7, " &");
 
         op->set_CppDecl(s);
@@ -277,10 +276,10 @@ void UmlClass::addAssign(bool cte)
         if (s.isEmpty())
             s = CppSettings::operationDef();
 
-        if ((index = s.find("${(}")) != -1)
-            s.insert(index + 4, (const char *)p); //[rageek] cast because Q3CString
+        if ((index = s.indexOf("${(}")) != -1)
+            s.insert(index + 4, (const char *)p); //[rageek] cast because QByteArray
 
-        if ((index = s.find("${type}")) != -1)
+        if ((index = s.indexOf("${type}")) != -1)
             s.insert(index + 7, " &");
 
         op->set_CppDef(s);
diff --git a/genplugouts/CppUtilities/UmlClass.h b/genplugouts/CppUtilities/UmlClass.h
index 5636b42ac..e6c132cac 100644
--- a/genplugouts/CppUtilities/UmlClass.h
+++ b/genplugouts/CppUtilities/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+
 
 // This class manages 'classes', notes that the class 'ClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
     //virtual operation doing 'something'
     //
diff --git a/genplugouts/CppUtilities/UmlClassDiagram.h b/genplugouts/CppUtilities/UmlClassDiagram.h
index 76134392d..ac4781283 100644
--- a/genplugouts/CppUtilities/UmlClassDiagram.h
+++ b/genplugouts/CppUtilities/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlClassInstance.h b/genplugouts/CppUtilities/UmlClassInstance.h
index c0c0e5a90..cb4473236 100644
--- a/genplugouts/CppUtilities/UmlClassInstance.h
+++ b/genplugouts/CppUtilities/UmlClassInstance.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseClassInstance.h"
-#include <q3cstring.h>
+
 
 class UmlClassInstance : public UmlBaseClassInstance
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClassInstance(void * id, const Q3CString & s) : UmlBaseClassInstance(id, s) {
+    UmlClassInstance(void * id, const QByteArray & s) : UmlBaseClassInstance(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlClassItem.h b/genplugouts/CppUtilities/UmlClassItem.h
index bf64f4dbb..7c4a888f7 100644
--- a/genplugouts/CppUtilities/UmlClassItem.h
+++ b/genplugouts/CppUtilities/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlClassMember.h b/genplugouts/CppUtilities/UmlClassMember.h
index 9119443c6..35fdddb52 100644
--- a/genplugouts/CppUtilities/UmlClassMember.h
+++ b/genplugouts/CppUtilities/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlClassView.h b/genplugouts/CppUtilities/UmlClassView.h
index a152eff28..3b6eb53ed 100644
--- a/genplugouts/CppUtilities/UmlClassView.h
+++ b/genplugouts/CppUtilities/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class view'
 //
@@ -11,7 +11,7 @@
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlCollaborationDiagram.h b/genplugouts/CppUtilities/UmlCollaborationDiagram.h
index ab1388561..fc69dea4c 100644
--- a/genplugouts/CppUtilities/UmlCollaborationDiagram.h
+++ b/genplugouts/CppUtilities/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlCom.cpp b/genplugouts/CppUtilities/UmlCom.cpp
index c90512a59..5c9948e61 100644
--- a/genplugouts/CppUtilities/UmlCom.cpp
+++ b/genplugouts/CppUtilities/UmlCom.cpp
@@ -1,10 +1,9 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
-//Added by qt3to4:
-#include <Q3CString>
-
+#include <QHostAddress>
+#include <QByteArray>
+#include <QTcpSocket>
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
@@ -14,9 +13,10 @@
 #include "Logging/QsLog.h"
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
-
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+#ifdef habip
+    //sock->setAddressReusable(TRUE);
+#endif
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
     buffer_in_end = p_buffer_in = 0;
@@ -29,7 +29,8 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
         // send API version
         write_unsigned(46);
         flush();
@@ -72,6 +73,7 @@ void UmlCom::message(const char * s)
 void UmlCom::bye()
 {
     send_cmd(miscGlobalCmd, byeCmd);
+    sock->waitForBytesWritten();
 }
 
 void UmlCom::close()
@@ -80,11 +82,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -94,11 +96,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -150,14 +152,15 @@ void UmlCom::read_size()
     buffer_in_size = 4;
     buffer_in = new char[buffer_in_size];
 
-    int remainder = 4;
-    int nread;
+    qint64 remainder = 4;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;)
     {
-        while(sock->bytesAvailable() < 4);
-        nread = sock->readBlock(p, 4);
+
+        while(sock->bytesAvailable() < 4)sock->waitForReadyRead();
+        nread = sock->read(p, 4);
 //        if(nread != 4)
 //            continue;
 
@@ -186,7 +189,7 @@ void UmlCom::read_size()
     buffer_in_end = buffer_in + 4;
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
     QLOG_INFO() << "enter UmlCom::read_buffer(" << len << ")\n";
@@ -200,14 +203,15 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
     QLOG_INFO() << "Allocated address" << (size_t) buffer_in;
     for (;;)
     {
-        while(sock->bytesAvailable() != len);
-        nread = sock->readBlock(p, len);
+
+        while (sock->bytesAvailable() != remainder)sock->waitForReadyRead();
+        nread = sock->read(p, remainder);
         p += nread;
 
         QLOG_INFO() << "nread = " + QString::number(nread);
@@ -265,7 +269,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -552,8 +556,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -609,10 +613,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -629,10 +633,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -683,7 +687,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -695,7 +699,7 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
@@ -710,8 +714,9 @@ bool UmlCom::read_bool()
 {
     read_if_needed();
     QLOG_INFO() << "read bool" << *p_buffer_in;
-    if(*p_buffer_in != 0 && *p_buffer_in != 1)
+    if (*p_buffer_in != 0 && *p_buffer_in != 1) {
         QLOG_INFO() << "read bool" << QString(p_buffer_in);
+    }
     return *p_buffer_in++ != 0;
 }
 
@@ -735,7 +740,7 @@ unsigned int UmlCom::read_unsigned()
     return value;
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
@@ -746,16 +751,16 @@ void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-                         #ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+                         #ifdef DEBUG_DOUML
                          msg
                          #endif
                          )
 {
-#ifdef DEBUG_BOUML
+#ifdef DEBUG_DOUML
     QLOG_INFO() << msg << '\n';
 #endif
 
@@ -766,7 +771,7 @@ void UmlCom::flush()
 {
     if (sock != 0)
     {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -778,7 +783,7 @@ void UmlCom::flush()
 
         for (;;)
         {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1)
             {
diff --git a/genplugouts/CppUtilities/UmlCom.h b/genplugouts/CppUtilities/UmlCom.h
index a57c56a9e..8bc8a835e 100644
--- a/genplugouts/CppUtilities/UmlCom.h
+++ b/genplugouts/CppUtilities/UmlCom.h
@@ -1,15 +1,10 @@
 #ifndef _UMLCOM_H
 #define _UMLCOM_H
-
-
-#include <q3socketdevice.h>
-
-
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
 
-#include <q3ptrvector.h>
+
+
 #include <qstring.h>
 #include "Tools/ApiCmd.h"
 
@@ -17,7 +12,7 @@ class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -78,11 +73,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -92,20 +87,20 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     static void read_size();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -195,8 +190,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -219,10 +214,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
diff --git a/genplugouts/CppUtilities/UmlComponent.h b/genplugouts/CppUtilities/UmlComponent.h
index bb4fdbb25..e8961ed60 100644
--- a/genplugouts/CppUtilities/UmlComponent.h
+++ b/genplugouts/CppUtilities/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlComponentDiagram.h b/genplugouts/CppUtilities/UmlComponentDiagram.h
index 15d707dc2..9afaa7eb4 100644
--- a/genplugouts/CppUtilities/UmlComponentDiagram.h
+++ b/genplugouts/CppUtilities/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlComponentView.h b/genplugouts/CppUtilities/UmlComponentView.h
index 000a74744..cc09cecc6 100644
--- a/genplugouts/CppUtilities/UmlComponentView.h
+++ b/genplugouts/CppUtilities/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlDeploymentDiagram.h b/genplugouts/CppUtilities/UmlDeploymentDiagram.h
index 727d0ffd0..1f0add3d0 100644
--- a/genplugouts/CppUtilities/UmlDeploymentDiagram.h
+++ b/genplugouts/CppUtilities/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlDeploymentView.h b/genplugouts/CppUtilities/UmlDeploymentView.h
index 52e5e627d..1c47fedbf 100644
--- a/genplugouts/CppUtilities/UmlDeploymentView.h
+++ b/genplugouts/CppUtilities/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment view'
 //
@@ -11,7 +11,7 @@
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlDiagram.h b/genplugouts/CppUtilities/UmlDiagram.h
index ffee38e5c..99e0f81e4 100644
--- a/genplugouts/CppUtilities/UmlDiagram.h
+++ b/genplugouts/CppUtilities/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlEntryPointPseudoState.h b/genplugouts/CppUtilities/UmlEntryPointPseudoState.h
index 838a4bf5b..3fd7f6eca 100644
--- a/genplugouts/CppUtilities/UmlEntryPointPseudoState.h
+++ b/genplugouts/CppUtilities/UmlEntryPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlExitPointPseudoState.h b/genplugouts/CppUtilities/UmlExitPointPseudoState.h
index 1a57b8230..e63c68782 100644
--- a/genplugouts/CppUtilities/UmlExitPointPseudoState.h
+++ b/genplugouts/CppUtilities/UmlExitPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlExpansionNode.h b/genplugouts/CppUtilities/UmlExpansionNode.h
index 65d1cff2a..e2dbd5565 100644
--- a/genplugouts/CppUtilities/UmlExpansionNode.h
+++ b/genplugouts/CppUtilities/UmlExpansionNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionNode.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode : public UmlBaseExpansionNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionNode(void * id, const Q3CString & s) : UmlBaseExpansionNode(id, s) {
+    UmlExpansionNode(void * id, const QByteArray & s) : UmlBaseExpansionNode(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlExpansionRegion.h b/genplugouts/CppUtilities/UmlExpansionRegion.h
index cfe999374..6d9130ca6 100644
--- a/genplugouts/CppUtilities/UmlExpansionRegion.h
+++ b/genplugouts/CppUtilities/UmlExpansionRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionRegion.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionRegion : public UmlBaseExpansionRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionRegion(void * id, const Q3CString & s) : UmlBaseExpansionRegion(id, s) {
+    UmlExpansionRegion(void * id, const QByteArray & s) : UmlBaseExpansionRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlExtraClassMember.h b/genplugouts/CppUtilities/UmlExtraClassMember.h
index cf0b2bf47..95b851b8d 100644
--- a/genplugouts/CppUtilities/UmlExtraClassMember.h
+++ b/genplugouts/CppUtilities/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlFlow.h b/genplugouts/CppUtilities/UmlFlow.h
index 6e78a8c4b..e31afeb31 100644
--- a/genplugouts/CppUtilities/UmlFlow.h
+++ b/genplugouts/CppUtilities/UmlFlow.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseFlow.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlFlow : public UmlBaseFlow, public UmlActivityItem
 {
 public:
-    UmlFlow(void * id, const Q3CString & n) : UmlBaseFlow(id, n) {
+    UmlFlow(void * id, const QByteArray & n) : UmlBaseFlow(id, n) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlInterruptibleActivityRegion.h b/genplugouts/CppUtilities/UmlInterruptibleActivityRegion.h
index 0f78665c1..a696f6b2d 100644
--- a/genplugouts/CppUtilities/UmlInterruptibleActivityRegion.h
+++ b/genplugouts/CppUtilities/UmlInterruptibleActivityRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseInterruptibleActivityRegion.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion : public UmlBaseInterruptibleActivityRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlBaseInterruptibleActivityRegion(id, s) {
+    UmlInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlBaseInterruptibleActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlItem.h b/genplugouts/CppUtilities/UmlItem.h
index 5e4bc50c0..38a2f5eeb 100644
--- a/genplugouts/CppUtilities/UmlItem.h
+++ b/genplugouts/CppUtilities/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+
 
 // This class is a mother class for all the other Uml* classes, this
 // allows to generalize their management, declare virtual operations etc ...
@@ -12,7 +12,7 @@
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
diff --git a/genplugouts/CppUtilities/UmlNcRelation.h b/genplugouts/CppUtilities/UmlNcRelation.h
index 60032619a..3d73ec633 100644
--- a/genplugouts/CppUtilities/UmlNcRelation.h
+++ b/genplugouts/CppUtilities/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlNode.h b/genplugouts/CppUtilities/UmlNode.h
index 95edbe709..4c72e14fd 100644
--- a/genplugouts/CppUtilities/UmlNode.h
+++ b/genplugouts/CppUtilities/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlObjectDiagram.h b/genplugouts/CppUtilities/UmlObjectDiagram.h
index ba429242a..c194e4613 100644
--- a/genplugouts/CppUtilities/UmlObjectDiagram.h
+++ b/genplugouts/CppUtilities/UmlObjectDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseObjectDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'object diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -14,7 +14,7 @@ class UmlObjectDiagram : public UmlBaseObjectDiagram
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlObjectDiagram(void * id, const Q3CString & s) : UmlBaseObjectDiagram(id, s) {
+    UmlObjectDiagram(void * id, const QByteArray & s) : UmlBaseObjectDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlOnSignalAction.h b/genplugouts/CppUtilities/UmlOnSignalAction.h
index 158c0ddc0..82fd5747f 100644
--- a/genplugouts/CppUtilities/UmlOnSignalAction.h
+++ b/genplugouts/CppUtilities/UmlOnSignalAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseOnSignalAction.h"
-#include <q3cstring.h>
+
 
 class UmlOnSignalAction : public UmlBaseOnSignalAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOnSignalAction(void * id, const Q3CString & s) : UmlBaseOnSignalAction(id, s) {
+    UmlOnSignalAction(void * id, const QByteArray & s) : UmlBaseOnSignalAction(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlOperation.h b/genplugouts/CppUtilities/UmlOperation.h
index eec043152..f4c9e6547 100644
--- a/genplugouts/CppUtilities/UmlOperation.h
+++ b/genplugouts/CppUtilities/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlPackage.h b/genplugouts/CppUtilities/UmlPackage.h
index 84e80d71e..c190ad80c 100644
--- a/genplugouts/CppUtilities/UmlPackage.h
+++ b/genplugouts/CppUtilities/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+
 
 // This class manages a 'package', notes that the project itself is a package
 //
@@ -11,7 +11,7 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlParameterSet.h b/genplugouts/CppUtilities/UmlParameterSet.h
index 55a597fd4..f9927f672 100644
--- a/genplugouts/CppUtilities/UmlParameterSet.h
+++ b/genplugouts/CppUtilities/UmlParameterSet.h
@@ -3,14 +3,14 @@
 
 
 #include "UmlBaseParameterSet.h"
-#include <q3cstring.h>
+
 #include "UmlActivityItem.h"
 
 class UmlParameterSet : public UmlBaseParameterSet, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlParameterSet(void * id, const Q3CString & s) : UmlBaseParameterSet(id, s) {
+    UmlParameterSet(void * id, const QByteArray & s) : UmlBaseParameterSet(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlPinParameter.h b/genplugouts/CppUtilities/UmlPinParameter.h
index d48cb7343..3d3283d6b 100644
--- a/genplugouts/CppUtilities/UmlPinParameter.h
+++ b/genplugouts/CppUtilities/UmlPinParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBasePinParameter.h"
-#include <q3cstring.h>
+
 
 class UmlPinParameter : public UmlBasePinParameter
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPinParameter(void * id, const Q3CString & s) : UmlBasePinParameter(id, s) {
+    UmlPinParameter(void * id, const QByteArray & s) : UmlBasePinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlPseudoState.h b/genplugouts/CppUtilities/UmlPseudoState.h
index 075761ec7..1c350a942 100644
--- a/genplugouts/CppUtilities/UmlPseudoState.h
+++ b/genplugouts/CppUtilities/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlRegion.h b/genplugouts/CppUtilities/UmlRegion.h
index d3f32cb7b..d0ce11dde 100644
--- a/genplugouts/CppUtilities/UmlRegion.h
+++ b/genplugouts/CppUtilities/UmlRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlRelation.h b/genplugouts/CppUtilities/UmlRelation.h
index 6b4358b40..a246cfcfd 100644
--- a/genplugouts/CppUtilities/UmlRelation.h
+++ b/genplugouts/CppUtilities/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'relations' between classes, notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlSequenceDiagram.h b/genplugouts/CppUtilities/UmlSequenceDiagram.h
index d3b3d83fc..a36e34a65 100644
--- a/genplugouts/CppUtilities/UmlSequenceDiagram.h
+++ b/genplugouts/CppUtilities/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlSettings.cpp b/genplugouts/CppUtilities/UmlSettings.cpp
index f3e7e8a83..0e177102f 100644
--- a/genplugouts/CppUtilities/UmlSettings.cpp
+++ b/genplugouts/CppUtilities/UmlSettings.cpp
@@ -7,15 +7,15 @@
 #include "UmlStereotype.h"
 #include "Logging/QsLog.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -27,14 +27,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -46,14 +46,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -65,14 +65,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -84,14 +84,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -147,33 +147,33 @@ aLanguage UmlSettings::_uml_get_name;
 
 aLanguage UmlSettings::_uml_set_name;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
     QLOG_INFO() << "2.2.4";
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
     QLOG_INFO() << "2.2.4.1";
@@ -183,7 +183,7 @@ void UmlSettings::read_()
 
     QLOG_INFO() << "2.2.5";
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -195,7 +195,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
     QLOG_INFO() << "2.2.6";
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -208,7 +208,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -237,18 +237,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -259,7 +259,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_attribute_stereotypes.count();
 
@@ -270,7 +270,7 @@ Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString Um
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -281,19 +281,19 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         builtins[index] = _builtins[index];
-        _map_builtins.replace(builtins[index].uml, &builtins[index]);
+        _map_builtins.insert(builtins[index].uml, &builtins[index]);
     }
 
     builtins[index].uml = s;
@@ -318,19 +318,19 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
     return &_builtins[index];
 }
 
-UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_attr_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_attribute_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         relation_attribute_stereotypes[index] = _relation_attribute_stereotypes[index];
-        _map_relation_attribute_stereotypes.replace(relation_attribute_stereotypes[index].uml,
+        _map_relation_attribute_stereotypes.insert(relation_attribute_stereotypes[index].uml,
                 &relation_attribute_stereotypes[index]);
     }
 
@@ -353,19 +353,19 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
     return &_relation_attribute_stereotypes[index];
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         class_stereotypes[index] = _class_stereotypes[index];
-        _map_class_stereotypes.replace(class_stereotypes[index].uml, &class_stereotypes[index]);
+        _map_class_stereotypes.insert(class_stereotypes[index].uml, &class_stereotypes[index]);
     }
 
     class_stereotypes[index].uml = s;
diff --git a/genplugouts/CppUtilities/UmlSettings.h b/genplugouts/CppUtilities/UmlSettings.h
index c37c13a10..4375d747d 100644
--- a/genplugouts/CppUtilities/UmlSettings.h
+++ b/genplugouts/CppUtilities/UmlSettings.h
@@ -1,10 +1,8 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
-
-
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aLanguage.h"
-#include <q3dict.h>
+#include <QHash>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -20,44 +18,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
     // return the language from which the getter's name rule must be followed at Uml level
     static aLanguage umlGetName();
@@ -90,25 +88,26 @@ class UmlSettings
 
 
 protected:
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_attribute_stereotypes;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -122,31 +121,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_attr_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_attr_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlState.h b/genplugouts/CppUtilities/UmlState.h
index b8a04be4a..e760bb6b6 100644
--- a/genplugouts/CppUtilities/UmlState.h
+++ b/genplugouts/CppUtilities/UmlState.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlStateDiagram.h b/genplugouts/CppUtilities/UmlStateDiagram.h
index f49b5fb44..c639f9193 100644
--- a/genplugouts/CppUtilities/UmlStateDiagram.h
+++ b/genplugouts/CppUtilities/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/UmlStereotype.h b/genplugouts/CppUtilities/UmlStereotype.h
index 8c5bf56c0..5863e0904 100644
--- a/genplugouts/CppUtilities/UmlStereotype.h
+++ b/genplugouts/CppUtilities/UmlStereotype.h
@@ -1,32 +1,32 @@
 #ifndef _UMLSTEREOTYPE_H
 #define _UMLSTEREOTYPE_H
 
+#include <QByteArray>
 
-#include <q3cstring.h>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHPHP
-    Q3CString php;
+    QByteArray php;
 #endif
 
 #ifdef WITHPHP
-    Q3CString python;
+    QByteArray python;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/CppUtilities/UmlUseCase.h b/genplugouts/CppUtilities/UmlUseCase.h
index 392773262..c21cc521d 100644
--- a/genplugouts/CppUtilities/UmlUseCase.h
+++ b/genplugouts/CppUtilities/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case'
 //
@@ -11,7 +11,7 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlUseCaseDiagram.h b/genplugouts/CppUtilities/UmlUseCaseDiagram.h
index 132b56d36..bf490aa90 100644
--- a/genplugouts/CppUtilities/UmlUseCaseDiagram.h
+++ b/genplugouts/CppUtilities/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlUseCaseView.h b/genplugouts/CppUtilities/UmlUseCaseView.h
index a715b2f5f..ef475b173 100644
--- a/genplugouts/CppUtilities/UmlUseCaseView.h
+++ b/genplugouts/CppUtilities/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case view'
 //
@@ -11,7 +11,7 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/CppUtilities/UmlView.h b/genplugouts/CppUtilities/UmlView.h
index 418e689ab..2435ce96b 100644
--- a/genplugouts/CppUtilities/UmlView.h
+++ b/genplugouts/CppUtilities/UmlView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseView.h"
-#include <q3cstring.h>
+
 
 class UmlView : public UmlBaseView
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlView(void * id, const Q3CString & s) : UmlBaseView(id, s) {
+    UmlView(void * id, const QByteArray & s) : UmlBaseView(id, s) {
     }
 
 };
diff --git a/genplugouts/CppUtilities/gridbox.cpp b/genplugouts/CppUtilities/gridbox.cpp
new file mode 100644
index 000000000..78233be1d
--- /dev/null
+++ b/genplugouts/CppUtilities/gridbox.cpp
@@ -0,0 +1,37 @@
+#include "gridbox.h"
+#include <QGridLayout>
+GridBox::GridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void GridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void GridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void GridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+}
+
+QString GridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/genplugouts/CppUtilities/gridbox.h b/genplugouts/CppUtilities/gridbox.h
new file mode 100644
index 000000000..64793941d
--- /dev/null
+++ b/genplugouts/CppUtilities/gridbox.h
@@ -0,0 +1,26 @@
+#ifndef GRIDBOX_H
+#define GRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class GridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit GridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/genplugouts/CppUtilities/hhbox.cpp b/genplugouts/CppUtilities/hhbox.cpp
new file mode 100644
index 000000000..95a09b5ea
--- /dev/null
+++ b/genplugouts/CppUtilities/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/CppUtilities/hhbox.h b/genplugouts/CppUtilities/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/genplugouts/CppUtilities/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/genplugouts/CppUtilities/vvbox.cpp b/genplugouts/CppUtilities/vvbox.cpp
new file mode 100644
index 000000000..288eb93ac
--- /dev/null
+++ b/genplugouts/CppUtilities/vvbox.cpp
@@ -0,0 +1,26 @@
+#include "vvbox.h"
+
+VVBox::VVBox(QWidget *parent) :
+    QWidget(parent)
+{
+    m_layout = new QVBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+}
+
+void VVBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+bool VVBox::setStretchFactor(QWidget *w, int stretch)
+{
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+void VVBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/CppUtilities/vvbox.h b/genplugouts/CppUtilities/vvbox.h
new file mode 100644
index 000000000..7f27f2ea8
--- /dev/null
+++ b/genplugouts/CppUtilities/vvbox.h
@@ -0,0 +1,22 @@
+#ifndef VVBOX_H
+#define VVBOX_H
+
+#include <QWidget>
+#include <QVBoxLayout>
+class VVBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit VVBox(QWidget *parent = 0);
+    void addWidget(QWidget* widget);
+
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+signals:
+
+public slots:
+private:
+    QVBoxLayout *m_layout;
+};
+
+#endif // VVBOX_H
diff --git a/genplugouts/FileControl/CppSettings.cpp b/genplugouts/FileControl/CppSettings.cpp
index 9be970344..6fed78bdb 100644
--- a/genplugouts/FileControl/CppSettings.cpp
+++ b/genplugouts/FileControl/CppSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationStereotype(Q3CString s)
+QByteArray CppSettings::relationStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, v);
 
@@ -171,14 +171,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, v);
 
@@ -190,14 +190,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, v);
 
@@ -209,14 +209,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, v);
 
@@ -228,14 +228,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, v);
 
@@ -266,14 +266,14 @@ bool CppSettings::set_IncludeWithPath(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, v);
 
@@ -285,14 +285,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, v);
 
@@ -304,14 +304,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, v);
 
@@ -323,14 +323,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, v);
 
@@ -342,14 +342,14 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, v);
 
@@ -361,14 +361,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, v);
 
@@ -380,14 +380,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, v);
 
@@ -399,14 +399,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, v);
 
@@ -418,14 +418,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, v);
 
@@ -437,14 +437,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, v);
 
@@ -456,14 +456,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, v);
 
@@ -475,14 +475,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, v);
 
@@ -494,14 +494,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, v);
 
@@ -513,14 +513,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, v);
 
@@ -532,14 +532,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl()
+const QByteArray & CppSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool CppSettings::set_AttributeDecl(Q3CString v)
+bool CppSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, v);
 
@@ -551,14 +551,14 @@ bool CppSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, v);
 
@@ -570,7 +570,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -589,14 +589,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, v);
 
@@ -608,14 +608,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, v);
 
@@ -665,14 +665,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, v);
 
@@ -760,14 +760,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, v);
 
@@ -819,51 +819,51 @@ bool CppSettings::set_IsSetParamConst(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl;
+QByteArray CppSettings::_attr_decl;
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -873,23 +873,23 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
 bool CppSettings::_is_set_param_const;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
@@ -922,13 +922,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/FileControl/CppSettings.h b/genplugouts/FileControl/CppSettings.h
index 24507102f..282078ef3 100644
--- a/genplugouts/FileControl/CppSettings.h
+++ b/genplugouts/FileControl/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(Q3CString s);
+    static QByteArray relationStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -138,70 +138,70 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -209,83 +209,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -294,20 +294,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -331,13 +331,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -383,14 +383,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -421,51 +421,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -475,23 +475,23 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
     static bool _is_set_param_const;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/FileControl/Dialog.cpp b/genplugouts/FileControl/Dialog.cpp
index ebf7168ee..b33229829 100644
--- a/genplugouts/FileControl/Dialog.cpp
+++ b/genplugouts/FileControl/Dialog.cpp
@@ -8,70 +8,75 @@
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlabel.h>
-#include <q3hbox.h>
+#include <hhbox.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qdir.h>
-//Added by qt3to4:
-#include <Q3CString>
-#include <Q3VBoxLayout>
-Dialog::Dialog(bool ci, Q3CString & cmd, BooL & rec, BooL & reload)
-    : QDialog(0, 0, TRUE), _cmd(cmd), _rec(rec), _reload(reload)
+#include <QByteArray>
+#include <QVBoxLayout>
+#include <QSettings>
+#include <QTextCodec>
+
+Dialog::Dialog(bool ci, QByteArray & cmd, BooL & rec, BooL & reload)
+    : QDialog(0), _cmd(cmd), _rec(rec), _reload(reload)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBox * htab;
+    setModal(true);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    HHBox * htab;
 
     vbox->setMargin(5);
 
     // add recursive check box
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    rec_cb = new QCheckBox((ci) ? "Check-in sub packages" : "Check-out sub-packages",
-                           htab);
+    htab->addWidget(rec_cb = new QCheckBox((ci) ? "Check-in sub packages" : "Check-out sub-packages",
+                           htab));
 
     // add comment
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
-    new QLabel("In the command %file will be replaced by the file's name,"
+    htab->addWidget(new QLabel("In the command %file will be replaced by the file's name,"
                " %dir by the directory where is the file\n"
-               "%dironly is replaced by the directory without the drive", htab);
+               "%dironly is replaced by the directory without the drive", htab));
 
     // add command edit
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel("Command : ", htab);
-    cmd_ed = new QLineEdit(htab);
+    htab->addWidget(new QLabel("Command : ", htab));
+    htab->addWidget(cmd_ed = new QLineEdit(htab));
     cmd_ed->setText(_cmd);
 
     // save & load
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    reload_cb = new QCheckBox("Save then reload the project to see the new write permission of the files",
-                              htab);
+    htab->addWidget(reload_cb = new QCheckBox("Save then reload the project to see the new write permission of the files",
+                              htab));
     reload_cb->setChecked(TRUE);
 
     // ok & cancel
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel(htab);
-    QPushButton * ok = new QPushButton("&Ok", htab);
-    new QLabel(htab);
-    QPushButton * cancel = new QPushButton("&Cancel", htab);
-    new QLabel(htab);
+    htab->addWidget(new QLabel(htab));
+    QPushButton * ok;
+    htab->addWidget(ok = new QPushButton("&Ok", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * cancel;
+    htab->addWidget(cancel = new QPushButton("&Cancel", htab));
+    htab->addWidget(new QLabel(htab));
     QSize bs(cancel->sizeHint());
 
     ok->setFixedSize(bs);
@@ -83,62 +88,36 @@ Dialog::Dialog(bool ci, Q3CString & cmd, BooL & rec, BooL & reload)
 
 void Dialog::polish()
 {
-    QDialog::polish();
-
-    // try to read .doumlrc
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-#ifdef WIN32
-
-    if (fp == 0) {
-        QString hd = getenv("USERPROFILE");
-
-        if (! hd.isEmpty()) {
-            QDir d(hd);
-            QString s2 = d.absFilePath(".doumlrc");
-
-            fp = fopen((const char *) s2, "r");
-        }
-    }
-
-#endif
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        int cx = (r + l) / 2;
-                        int cy = (t + b) / 2;
-
-                        move(x() + cx - (x() + width() / 2),
-                             y() + cy - (y() + height() / 2));
-                    }
-                }
-
-                break;
-            }
-        }
-
-        fclose(fp);
+    QDialog::ensurePolished();
+
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        int cx = (r + l) / 2;
+        int cy = (t + b) / 2;
+
+        move(x() + cx - (x() + width() / 2), y() + cy - (y() + height() / 2));
+      }
     }
 }
 
 void Dialog::accept()
 {
-    if (cmd_ed->text().find("%file") == -1)
+    if (cmd_ed->text().indexOf("%file") == -1)
         QMessageBox::critical(this, "Error", "the command must contain %file");
     else {
-        _cmd = cmd_ed->text();
+        _cmd = cmd_ed->text().toLatin1();
         _rec = rec_cb->isChecked();
         _reload = reload_cb->isChecked();
         QDialog::accept();
diff --git a/genplugouts/FileControl/Dialog.h b/genplugouts/FileControl/Dialog.h
index e67e7e2a9..11d3dab96 100644
--- a/genplugouts/FileControl/Dialog.h
+++ b/genplugouts/FileControl/Dialog.h
@@ -2,7 +2,7 @@
 #define _DIALOG_H
 
 
-#include <q3cstring.h>
+
 
 #include <qdialog.h>
 class QLineEdit;
@@ -14,11 +14,11 @@ class Dialog : public QDialog
     Q_OBJECT
 
 public:
-    Dialog(bool ci, Q3CString & cmd, BooL & rec, BooL & reload);
+    Dialog(bool ci, QByteArray & cmd, BooL & rec, BooL & reload);
 
 
 protected:
-    Q3CString & _cmd;
+    QByteArray & _cmd;
 
     BooL & _rec;
 
diff --git a/genplugouts/FileControl/FileControl.pro b/genplugouts/FileControl/FileControl.pro
index 9be6a813b..104a28753 100644
--- a/genplugouts/FileControl/FileControl.pro
+++ b/genplugouts/FileControl/FileControl.pro
@@ -1,7 +1,10 @@
 TEMPLATE    = app
 TARGET        = file_control
-CONFIG        +=  warn_on qt
-DEFINES        = BooL=bool
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES        += BooL=bool
 HEADERS        = ./aVisibility.h \
           ./UmlBaseExtraClassMember.h \
           ./UmlBaseComponentDiagram.h \
@@ -113,7 +116,8 @@ HEADERS        = ./aVisibility.h \
           ./UmlBaseDeployment.h \
           ./UmlStereotype.h \
           ./UmlDeploymentDiagram.h \
-          ./UmlUseCase.h
+          ./UmlUseCase.h \
+    hhbox.h
 SOURCES        = ./aVisibility.cpp \
           ./UmlBaseExtraClassMember.cpp \
           ./UmlBaseComponentDiagram.cpp \
@@ -226,25 +230,22 @@ SOURCES        = ./aVisibility.cpp \
           ./UmlBaseDeployment.cpp \
           ./UmlStereotype.cpp \
           ./UmlDeploymentDiagram.cpp \
-          ./UmlUseCase.cpp
+          ./UmlUseCase.cpp \
+    hhbox.cpp
 
-#The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+DEFINES += TRUE=true FALSE=false
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/fcontrol/MOC_release
-    OBJECTS_DIR = bin/douml/fcontrol/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/file_control
+    OBJECTS_DIR = $${DESTDIR}/obj_release/file_control
 }
-
-Debug{
-    MOC_DIR = bin/douml/fcontrol/MOC_Debug
-    OBJECTS_DIR = bin/douml/fcontrol/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/file_control
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/file_control
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/genplugouts/FileControl/IdlSettings.cpp b/genplugouts/FileControl/IdlSettings.cpp
index 65f2ae619..d5b25b151 100644
--- a/genplugouts/FileControl/IdlSettings.cpp
+++ b/genplugouts/FileControl/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, v);
 
@@ -171,14 +171,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, v);
 
@@ -190,14 +190,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, v);
 
@@ -209,14 +209,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, v);
 
@@ -228,14 +228,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, v);
 
@@ -247,14 +247,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, v);
 
@@ -266,14 +266,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, v);
 
@@ -285,14 +285,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, v);
 
@@ -304,14 +304,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, v);
 
@@ -323,14 +323,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, v);
 
@@ -342,14 +342,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, v);
 
@@ -361,14 +361,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl()
+const QByteArray & IdlSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool IdlSettings::set_AttributeDecl(Q3CString v)
+bool IdlSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, v);
 
@@ -380,14 +380,14 @@ bool IdlSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl()
+const QByteArray & IdlSettings::valuetypeAttributeDecl()
 {
     read_if_needed_();
 
     return _valuetype_attr_decl;
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, v);
 
@@ -399,14 +399,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl()
+const QByteArray & IdlSettings::unionItemDecl()
 {
     read_if_needed_();
 
     return _union_item_decl;
 }
 
-bool IdlSettings::set_UnionItemDecl(Q3CString v)
+bool IdlSettings::set_UnionItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, v);
 
@@ -418,14 +418,14 @@ bool IdlSettings::set_UnionItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, v);
 
@@ -437,14 +437,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl()
+const QByteArray & IdlSettings::constDecl()
 {
     read_if_needed_();
 
     return _const_decl;
 }
 
-bool IdlSettings::set_ConstDecl(Q3CString v)
+bool IdlSettings::set_ConstDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, v);
 
@@ -456,14 +456,14 @@ bool IdlSettings::set_ConstDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
 
@@ -475,14 +475,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
 
@@ -494,14 +494,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
 
@@ -513,14 +513,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, v);
 
@@ -532,14 +532,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, v);
 
@@ -551,14 +551,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, v);
 
@@ -591,53 +591,53 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl;
+QByteArray IdlSettings::_attr_decl;
 
-Q3CString IdlSettings::_valuetype_attr_decl;
+QByteArray IdlSettings::_valuetype_attr_decl;
 
-Q3CString IdlSettings::_union_item_decl;
+QByteArray IdlSettings::_union_item_decl;
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl;
+QByteArray IdlSettings::_const_decl;
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
@@ -666,13 +666,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/FileControl/IdlSettings.h b/genplugouts/FileControl/IdlSettings.h
index aa23439f0..8ccc92056 100644
--- a/genplugouts/FileControl/IdlSettings.h
+++ b/genplugouts/FileControl/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype
-    static const Q3CString & valuetypeAttributeDecl();
+    static const QByteArray & valuetypeAttributeDecl();
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(Q3CString v);
+    static bool set_ValuetypeAttributeDecl(QByteArray v);
 
     // returns the default definition of an union item
-    static const Q3CString & unionItemDecl();
+    static const QByteArray & unionItemDecl();
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(Q3CString v);
+    static bool set_UnionItemDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute
-    static const Q3CString & constDecl();
+    static const QByteArray & constDecl();
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(Q3CString v);
+    static bool set_ConstDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _valuetype_attr_decl;
+    static QByteArray _valuetype_attr_decl;
 
-    static Q3CString _union_item_decl;
+    static QByteArray _union_item_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl;
+    static QByteArray _const_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/FileControl/IdlSettingsCmd.h b/genplugouts/FileControl/IdlSettingsCmd.h
index 5eb74f465..07cbf12b6 100644
--- a/genplugouts/FileControl/IdlSettingsCmd.h
+++ b/genplugouts/FileControl/IdlSettingsCmd.h
@@ -8,7 +8,7 @@ enum IdlSettingsCmd {
     getIdlUseDefaultsCmd,
     setIdlUseDefaultsCmd,
     setIdlTypeCmd,
-    setIdlRelationStereotypeCmd,
+    setIdlRelationAttributeStereotypeCmd,
     setIdlClassStereotypeCmd,
     setIdlIncludeCmd,
     setIdlRootDirCmd,
diff --git a/genplugouts/FileControl/JavaSettings.cpp b/genplugouts/FileControl/JavaSettings.cpp
index 104029d1e..715db5516 100644
--- a/genplugouts/FileControl/JavaSettings.cpp
+++ b/genplugouts/FileControl/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, v);
 
@@ -171,14 +171,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, v);
 
@@ -190,14 +190,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, v);
 
@@ -209,14 +209,14 @@ bool JavaSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, v);
 
@@ -228,14 +228,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, v);
 
@@ -247,14 +247,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumDecl()
+const QByteArray & JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, v);
 
@@ -266,14 +266,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, v);
 
@@ -285,14 +285,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl()
+const QByteArray & JavaSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool JavaSettings::set_AttributeDecl(Q3CString v)
+bool JavaSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, v);
 
@@ -304,14 +304,14 @@ bool JavaSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemDecl()
+const QByteArray & JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, v);
 
@@ -323,16 +323,16 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemCase()
+const QByteArray & JavaSettings::enumItemCase()
 {
     read_if_needed_();
 
     return _enum_item_case;
 }
 
-bool JavaSettings::set_EnumItemCase(Q3CString v)
+bool JavaSettings::set_EnumItemCase(QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemCaseCmd, v);
+    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, v);
 
     if (UmlCom::read_bool()) {
         _enum_item_case = v;
@@ -342,14 +342,14 @@ bool JavaSettings::set_EnumItemCase(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
 
@@ -361,14 +361,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, v);
 
@@ -399,14 +399,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, v);
 
@@ -418,14 +418,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, v);
 
@@ -515,45 +515,45 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl;
+QByteArray JavaSettings::_attr_decl;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_enum_item_case;
+QByteArray JavaSettings::_enum_item_case;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray,QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
@@ -581,13 +581,13 @@ void JavaSettings::read_()
     n = UmlCom::read_unsigned();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/FileControl/JavaSettings.h b/genplugouts/FileControl/JavaSettings.h
index 166820623..220a7de82 100644
--- a/genplugouts/FileControl/JavaSettings.h
+++ b/genplugouts/FileControl/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,160 +31,160 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationUmlStereotype(const Q3CString & s);
+    static QByteArray relationUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumItemCase();
+    static const QByteArray & enumItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumItemCase(Q3CString v);
+    static bool set_EnumItemCase(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -198,23 +198,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -263,45 +263,45 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _enum_item_case;
+    static QByteArray _enum_item_case;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/FileControl/JavaSettingsCmd.h b/genplugouts/FileControl/JavaSettingsCmd.h
index 7d66bf1f0..2ec6baf59 100644
--- a/genplugouts/FileControl/JavaSettingsCmd.h
+++ b/genplugouts/FileControl/JavaSettingsCmd.h
@@ -8,7 +8,7 @@ enum JavaSettingsCmd {
     getJavaUseDefaultsCmd,
     setJavaUseDefaultsCmd,
     setJavaTypeCmd,
-    setJavaRelationStereotypeCmd,
+    setJavaRelationAttributeStereotypeCmd,
     setJavaClassStereotypeCmd,
     setJavaImportCmd,
     setJavaRootdirCmd,
@@ -20,7 +20,7 @@ enum JavaSettingsCmd {
     setJavaInterfaceDeclCmd,
     setJavaAttributeDeclCmd,
     setJavaEnumItemDeclCmd,
-    setJavaEnumItemCaseCmd,
+    setJavaEnumItemDeclCmd,
     setJavaRelationDeclCmd,
     setJavaOperationDefCmd,
     setJavaGetvisibilityCmd,
diff --git a/genplugouts/FileControl/PackageGlobalCmd.h b/genplugouts/FileControl/PackageGlobalCmd.h
index 76a30534b..0eed58b55 100644
--- a/genplugouts/FileControl/PackageGlobalCmd.h
+++ b/genplugouts/FileControl/PackageGlobalCmd.h
@@ -4,9 +4,9 @@
 
 // Internal enum
 enum PackageGlobalCmd {
-    findNamespaceCmd,
-    findPackageCmd,
-    findModuleCmd,
+    findCppNamespaceCmd,
+    findJavaPackageCmd,
+    findIdlModuleCmd,
     getProjectCmd,
     isProjectModifiedCmd,
     saveProjectCmd
diff --git a/genplugouts/FileControl/StateBehavior.h b/genplugouts/FileControl/StateBehavior.h
index 91a42cb82..66ac09c00 100644
--- a/genplugouts/FileControl/StateBehavior.h
+++ b/genplugouts/FileControl/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/FileControl/TransitionBehavior.h b/genplugouts/FileControl/TransitionBehavior.h
index 856ede3c0..8714c541d 100644
--- a/genplugouts/FileControl/TransitionBehavior.h
+++ b/genplugouts/FileControl/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/FileControl/UmlArtifact.h b/genplugouts/FileControl/UmlArtifact.h
index 9f6a30622..030e1717b 100644
--- a/genplugouts/FileControl/UmlArtifact.h
+++ b/genplugouts/FileControl/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+
 
 // This class manages 'artifacts'
 //
@@ -11,7 +11,7 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlAttribute.h b/genplugouts/FileControl/UmlAttribute.h
index 19ee0a4c6..427658b45 100644
--- a/genplugouts/FileControl/UmlAttribute.h
+++ b/genplugouts/FileControl/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseArtifact.cpp b/genplugouts/FileControl/UmlBaseArtifact.cpp
index 5f11e7a44..fce76aaa0 100644
--- a/genplugouts/FileControl/UmlBaseArtifact.cpp
+++ b/genplugouts/FileControl/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,7 +89,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd, l);
 
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] = _associated[last];
 
             _associated.resize(last);
         }
@@ -166,54 +168,54 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -248,13 +250,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/FileControl/UmlBaseArtifact.h b/genplugouts/FileControl/UmlBaseArtifact.h
index d2c5a7fba..fcbf691a0 100644
--- a/genplugouts/FileControl/UmlBaseArtifact.h
+++ b/genplugouts/FileControl/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,40 +83,40 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -128,22 +128,22 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -171,11 +171,11 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/FileControl/UmlBaseAttribute.cpp b/genplugouts/FileControl/UmlBaseAttribute.cpp
index 1273e14af..401e44d9b 100644
--- a/genplugouts/FileControl/UmlBaseAttribute.cpp
+++ b/genplugouts/FileControl/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -29,7 +29,7 @@ bool UmlBaseAttribute::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -121,7 +121,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/FileControl/UmlBaseAttribute.h b/genplugouts/FileControl/UmlBaseAttribute.h
index 3ce2c69c1..0fc286acc 100644
--- a/genplugouts/FileControl/UmlBaseAttribute.h
+++ b/genplugouts/FileControl/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -35,7 +35,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -89,7 +89,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -119,7 +119,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -131,13 +131,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -165,7 +165,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/FileControl/UmlBaseChoicePseudoState.h b/genplugouts/FileControl/UmlBaseChoicePseudoState.h
index fb682dd91..8d15fc093 100644
--- a/genplugouts/FileControl/UmlBaseChoicePseudoState.h
+++ b/genplugouts/FileControl/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseClass.cpp b/genplugouts/FileControl/UmlBaseClass.cpp
index b9d9228ab..4ab3fd2ac 100644
--- a/genplugouts/FileControl/UmlBaseClass.cpp
+++ b/genplugouts/FileControl/UmlBaseClass.cpp
@@ -10,8 +10,8 @@
 #include "UmlCom.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -46,11 +46,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -82,11 +82,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -131,17 +131,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -299,7 +299,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -325,15 +325,15 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -345,9 +345,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray, UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -355,7 +355,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/FileControl/UmlBaseClass.h b/genplugouts/FileControl/UmlBaseClass.h
index 062977b1c..e72a13f78 100644
--- a/genplugouts/FileControl/UmlBaseClass.h
+++ b/genplugouts/FileControl/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+
+
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -54,7 +54,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -77,7 +77,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -100,7 +100,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -184,7 +184,7 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -197,13 +197,14 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     friend class UmlBaseRelation;
     friend class UmlBaseArtifact;
 
 private:
-    static Q3Dict<UmlClass> _classes;
+        static QHash<QByteArray, UmlClass*> _classes;
+
 
     bool _abstract;
 
@@ -240,7 +241,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/FileControl/UmlBaseClassDiagram.h b/genplugouts/FileControl/UmlBaseClassDiagram.h
index e0990d31f..a3f406b00 100644
--- a/genplugouts/FileControl/UmlBaseClassDiagram.h
+++ b/genplugouts/FileControl/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseClassItem.cpp b/genplugouts/FileControl/UmlBaseClassItem.cpp
index 345c1a18d..8babd321f 100644
--- a/genplugouts/FileControl/UmlBaseClassItem.cpp
+++ b/genplugouts/FileControl/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/FileControl/UmlBaseClassItem.h b/genplugouts/FileControl/UmlBaseClassItem.h
index 2569d9776..c5348dadc 100644
--- a/genplugouts/FileControl/UmlBaseClassItem.h
+++ b/genplugouts/FileControl/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -50,20 +50,20 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/FileControl/UmlBaseClassMember.h b/genplugouts/FileControl/UmlBaseClassMember.h
index a412a7048..fd8e96992 100644
--- a/genplugouts/FileControl/UmlBaseClassMember.h
+++ b/genplugouts/FileControl/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -69,7 +69,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/FileControl/UmlBaseClassView.h b/genplugouts/FileControl/UmlBaseClassView.h
index 5687a666f..cec17090f 100644
--- a/genplugouts/FileControl/UmlBaseClassView.h
+++ b/genplugouts/FileControl/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseCollaborationDiagram.h b/genplugouts/FileControl/UmlBaseCollaborationDiagram.h
index 0a49b41e6..39c8eb5db 100644
--- a/genplugouts/FileControl/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/FileControl/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseComponent.cpp b/genplugouts/FileControl/UmlBaseComponent.cpp
index 0fe6d1aed..fa399b975 100644
--- a/genplugouts/FileControl/UmlBaseComponent.cpp
+++ b/genplugouts/FileControl/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizedClasses()
 {
     read_if_needed_();
 
     return _realized;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realized, provided, required);
@@ -96,18 +96,18 @@ void UmlBaseComponent::read_uml_()
     _realized.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realized.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realized[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/FileControl/UmlBaseComponent.h b/genplugouts/FileControl/UmlBaseComponent.h
index 8b0bbc531..2b7c2e2ef 100644
--- a/genplugouts/FileControl/UmlBaseComponent.h
+++ b/genplugouts/FileControl/UmlBaseComponent.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -36,18 +36,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realized classes
-    const Q3PtrVector<UmlClass> & realizedClasses();
+    const QVector<UmlClass*> & realizedClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realized, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +57,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realized;
+    QVector<UmlClass*> _realized;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -70,11 +70,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/FileControl/UmlBaseComponentDiagram.h b/genplugouts/FileControl/UmlBaseComponentDiagram.h
index 43466da7c..b235e0717 100644
--- a/genplugouts/FileControl/UmlBaseComponentDiagram.h
+++ b/genplugouts/FileControl/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseComponentView.h b/genplugouts/FileControl/UmlBaseComponentView.h
index 0cb5c0769..a8ff514fb 100644
--- a/genplugouts/FileControl/UmlBaseComponentView.h
+++ b/genplugouts/FileControl/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseDeepHistoryPseudoState.h b/genplugouts/FileControl/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..9224eb152 100644
--- a/genplugouts/FileControl/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/FileControl/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseDeployment.h b/genplugouts/FileControl/UmlBaseDeployment.h
index b268e0c17..b16902170 100644
--- a/genplugouts/FileControl/UmlBaseDeployment.h
+++ b/genplugouts/FileControl/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseDeploymentDiagram.h b/genplugouts/FileControl/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..db1cfc67d 100644
--- a/genplugouts/FileControl/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/FileControl/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseDeploymentView.h b/genplugouts/FileControl/UmlBaseDeploymentView.h
index 08c540330..df550cb1b 100644
--- a/genplugouts/FileControl/UmlBaseDeploymentView.h
+++ b/genplugouts/FileControl/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseDiagram.cpp b/genplugouts/FileControl/UmlBaseDiagram.cpp
index 478be9710..cc8ca974e 100644
--- a/genplugouts/FileControl/UmlBaseDiagram.cpp
+++ b/genplugouts/FileControl/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[jasa] Handle ambiguous call.
     return UmlCom::read_bool();
diff --git a/genplugouts/FileControl/UmlBaseDiagram.h b/genplugouts/FileControl/UmlBaseDiagram.h
index 9cf05ff22..19e34654b 100644
--- a/genplugouts/FileControl/UmlBaseDiagram.h
+++ b/genplugouts/FileControl/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseEntryPointPseudoState.h b/genplugouts/FileControl/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..60dd28bb0 100644
--- a/genplugouts/FileControl/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/FileControl/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseExitPointPseudoState.h b/genplugouts/FileControl/UmlBaseExitPointPseudoState.h
index ff2ad12bc..29563f22b 100644
--- a/genplugouts/FileControl/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/FileControl/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseExtraClassMember.cpp b/genplugouts/FileControl/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/FileControl/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/FileControl/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/FileControl/UmlBaseExtraClassMember.h b/genplugouts/FileControl/UmlBaseExtraClassMember.h
index e2b9d4f30..4f07b5583 100644
--- a/genplugouts/FileControl/UmlBaseExtraClassMember.h
+++ b/genplugouts/FileControl/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/FileControl/UmlBaseFinalState.h b/genplugouts/FileControl/UmlBaseFinalState.h
index 16e0816cf..2fa133da6 100644
--- a/genplugouts/FileControl/UmlBaseFinalState.h
+++ b/genplugouts/FileControl/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseForkPseudoState.h b/genplugouts/FileControl/UmlBaseForkPseudoState.h
index 009499bfa..9dfa5025c 100644
--- a/genplugouts/FileControl/UmlBaseForkPseudoState.h
+++ b/genplugouts/FileControl/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseFormalParameter.h b/genplugouts/FileControl/UmlBaseFormalParameter.h
index 4d2f3428f..c58ead471 100644
--- a/genplugouts/FileControl/UmlBaseFormalParameter.h
+++ b/genplugouts/FileControl/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -31,10 +31,10 @@ class UmlBaseFormalParameter
     friend class UmlBaseClass;
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/FileControl/UmlBaseInitialPseudoState.h b/genplugouts/FileControl/UmlBaseInitialPseudoState.h
index 88dae1cc6..2f31e4340 100644
--- a/genplugouts/FileControl/UmlBaseInitialPseudoState.h
+++ b/genplugouts/FileControl/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseItem.cpp b/genplugouts/FileControl/UmlBaseItem.cpp
index b7bf9afcf..886e0b4d5 100644
--- a/genplugouts/FileControl/UmlBaseItem.cpp
+++ b/genplugouts/FileControl/UmlBaseItem.cpp
@@ -43,33 +43,33 @@
 #include "UmlJoinPseudoState.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     return set_it_(_name, s, setNameCmd);
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -85,7 +85,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -105,11 +105,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -119,7 +119,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -127,10 +127,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -141,7 +141,7 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -160,7 +160,7 @@ bool UmlBaseItem::moveAfter(const UmlItem * x)
         return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -172,7 +172,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[jasa] handle ambiguous call.
     return (int) UmlCom::read_unsigned();
@@ -190,11 +190,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -209,7 +209,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -228,17 +228,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -315,9 +315,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -346,7 +346,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -400,7 +400,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -437,7 +437,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -557,20 +557,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/FileControl/UmlBaseItem.h b/genplugouts/FileControl/UmlBaseItem.h
index ed4c00698..c067cb058 100644
--- a/genplugouts/FileControl/UmlBaseItem.h
+++ b/genplugouts/FileControl/UmlBaseItem.h
@@ -1,16 +1,17 @@
 #ifndef _UMLBASEITEM_H
 #define _UMLBASEITEM_H
-
+#include <QByteArray>
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+
+
+
+
 //#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 
 #include "aDirection.h"
+#include <QHash>
 
 class UmlItem;
 class UmlTypeSpec;
@@ -38,35 +39,35 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -91,16 +92,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -135,7 +136,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -143,7 +144,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -156,7 +157,7 @@ class UmlBaseItem
     //  The result may contains UmlAttribute, UmlRelations, UmlNcRelations,
     //  UmlOperation (their bodies are not taken into account) , UmlClass
     //  and UmlComponents.
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -169,7 +170,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
     friend class UmlBaseClassItem;
     friend class UmlBaseAttribute;
@@ -207,21 +208,23 @@ class UmlBaseItem
 
     void * _identifier;
 
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
+
+        QHash<QByteArray, QByteArray*> _dict;
+
 
-    Q3Dict<Q3CString> _dict;
+        static QHash<void*,UmlItem*> _all;
 
-    static Q3PtrDict<UmlItem> _all;
 
 
 protected:
@@ -277,7 +280,7 @@ class UmlBaseItem
 
     //internal, do NOT use it
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
 
@@ -290,7 +293,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/FileControl/UmlBaseJoinPseudoState.h b/genplugouts/FileControl/UmlBaseJoinPseudoState.h
index 31976dfff..c95cfff9c 100644
--- a/genplugouts/FileControl/UmlBaseJoinPseudoState.h
+++ b/genplugouts/FileControl/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseJunctionPseudoState.h b/genplugouts/FileControl/UmlBaseJunctionPseudoState.h
index 9b76d88e7..96cdfe959 100644
--- a/genplugouts/FileControl/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/FileControl/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseNcRelation.h b/genplugouts/FileControl/UmlBaseNcRelation.h
index 7418e3406..0ad29c67b 100644
--- a/genplugouts/FileControl/UmlBaseNcRelation.h
+++ b/genplugouts/FileControl/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/FileControl/UmlBaseNode.h b/genplugouts/FileControl/UmlBaseNode.h
index 07a980e66..208e951f2 100644
--- a/genplugouts/FileControl/UmlBaseNode.h
+++ b/genplugouts/FileControl/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/FileControl/UmlBaseOperation.cpp b/genplugouts/FileControl/UmlBaseOperation.cpp
index 26096f11c..c811bf05a 100644
--- a/genplugouts/FileControl/UmlBaseOperation.cpp
+++ b/genplugouts/FileControl/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -54,7 +54,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -68,7 +68,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -82,7 +82,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -105,7 +105,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -118,7 +118,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -132,7 +132,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -245,7 +245,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -257,7 +257,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -271,7 +271,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -323,7 +323,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -333,7 +333,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -347,7 +347,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -380,7 +380,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
diff --git a/genplugouts/FileControl/UmlBaseOperation.h b/genplugouts/FileControl/UmlBaseOperation.h
index a17e88a74..d4ce85ea5 100644
--- a/genplugouts/FileControl/UmlBaseOperation.h
+++ b/genplugouts/FileControl/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -44,7 +44,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -62,7 +62,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -122,7 +122,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -131,9 +131,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -143,7 +143,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -171,7 +171,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -180,9 +180,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -192,7 +192,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -212,7 +212,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -254,22 +254,22 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -281,7 +281,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
@@ -307,7 +307,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/FileControl/UmlBasePackage.cpp b/genplugouts/FileControl/UmlBasePackage.cpp
index 0242ec238..f1eca57ae 100644
--- a/genplugouts/FileControl/UmlBasePackage.cpp
+++ b/genplugouts/FileControl/UmlBasePackage.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -38,111 +38,111 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlClassDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findNamespace(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPackage(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findModule(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
@@ -167,7 +167,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/FileControl/UmlBasePackage.h b/genplugouts/FileControl/UmlBasePackage.h
index a297b9cc6..9107e973a 100644
--- a/genplugouts/FileControl/UmlBasePackage.h
+++ b/genplugouts/FileControl/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlPackage;
 class UmlClassDiagram;
@@ -34,87 +34,87 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findNamespace(const Q3CString & n) const;
+    UmlPackage * findNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPackage(const Q3CString & n) const;
+    UmlPackage * findPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findModule(const Q3CString & n) const;
+    UmlPackage * findModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -127,12 +127,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -147,25 +147,25 @@ class UmlBasePackage : public UmlItem
     UmlClassDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -194,11 +194,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/FileControl/UmlBaseRegion.h b/genplugouts/FileControl/UmlBaseRegion.h
index 58a9f8b78..efd32acb9 100644
--- a/genplugouts/FileControl/UmlBaseRegion.h
+++ b/genplugouts/FileControl/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseRelation.cpp b/genplugouts/FileControl/UmlBaseRelation.cpp
index 466ba2582..e17198d39 100644
--- a/genplugouts/FileControl/UmlBaseRelation.cpp
+++ b/genplugouts/FileControl/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -63,7 +63,7 @@ bool UmlBaseRelation::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -75,7 +75,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -96,7 +96,7 @@ UmlClass * UmlBaseRelation::roleType()
     return _role_type;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -108,7 +108,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -240,7 +240,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/FileControl/UmlBaseRelation.h b/genplugouts/FileControl/UmlBaseRelation.h
index 718dec6e5..316a72476 100644
--- a/genplugouts/FileControl/UmlBaseRelation.h
+++ b/genplugouts/FileControl/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRelation;
 class UmlClass;
@@ -38,7 +38,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -50,13 +50,13 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -64,7 +64,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -127,7 +127,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -166,13 +166,13 @@ class UmlBaseRelation : public UmlClassMember
 
     aRelationKind _rel_kind : 8;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlOperation * _get_oper;
 
@@ -182,7 +182,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -210,11 +210,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/FileControl/UmlBaseSequenceDiagram.h b/genplugouts/FileControl/UmlBaseSequenceDiagram.h
index 2025fab49..b2e83e1af 100644
--- a/genplugouts/FileControl/UmlBaseSequenceDiagram.h
+++ b/genplugouts/FileControl/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseShallowHistoryPseudoState.h b/genplugouts/FileControl/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..cb82c3ec1 100644
--- a/genplugouts/FileControl/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/FileControl/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseState.cpp b/genplugouts/FileControl/UmlBaseState.cpp
index 50ccddcf5..6d396996c 100644
--- a/genplugouts/FileControl/UmlBaseState.cpp
+++ b/genplugouts/FileControl/UmlBaseState.cpp
@@ -3,7 +3,7 @@
 #include "UmlState.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -15,7 +15,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -26,7 +26,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -37,7 +37,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -49,7 +49,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -60,7 +60,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -71,7 +71,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -84,7 +84,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -95,7 +95,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -106,7 +106,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/FileControl/UmlBaseState.h b/genplugouts/FileControl/UmlBaseState.h
index efc98a1af..bb578e0ab 100644
--- a/genplugouts/FileControl/UmlBaseState.h
+++ b/genplugouts/FileControl/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "StateBehavior.h"
 
 class UmlState;
@@ -26,13 +26,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -48,7 +48,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -57,7 +57,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -65,7 +65,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -73,7 +73,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -83,7 +83,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -91,7 +91,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -99,7 +99,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/FileControl/UmlBaseStateAction.cpp b/genplugouts/FileControl/UmlBaseStateAction.cpp
index 1f080b00e..1879387b9 100644
--- a/genplugouts/FileControl/UmlBaseStateAction.cpp
+++ b/genplugouts/FileControl/UmlBaseStateAction.cpp
@@ -4,7 +4,7 @@
 #include "UmlStateAction.h"
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlState * parent)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -28,7 +28,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -41,7 +41,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/FileControl/UmlBaseStateAction.h b/genplugouts/FileControl/UmlBaseStateAction.h
index 0432258b3..9c74adf3f 100644
--- a/genplugouts/FileControl/UmlBaseStateAction.h
+++ b/genplugouts/FileControl/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateAction;
 class UmlState;
@@ -25,13 +25,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -50,7 +50,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -68,14 +68,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/FileControl/UmlBaseStateDiagram.h b/genplugouts/FileControl/UmlBaseStateDiagram.h
index ea7e37ee0..d3c5bd101 100644
--- a/genplugouts/FileControl/UmlBaseStateDiagram.h
+++ b/genplugouts/FileControl/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseTerminatePseudoState.h b/genplugouts/FileControl/UmlBaseTerminatePseudoState.h
index e8553f4be..5328f4055 100644
--- a/genplugouts/FileControl/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/FileControl/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseTransition.cpp b/genplugouts/FileControl/UmlBaseTransition.cpp
index 3516921f8..f9dd2341f 100644
--- a/genplugouts/FileControl/UmlBaseTransition.cpp
+++ b/genplugouts/FileControl/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -28,7 +28,7 @@ UmlItem * UmlBaseTransition::target()
     return _target;
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -62,7 +62,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -97,7 +97,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/FileControl/UmlBaseTransition.h b/genplugouts/FileControl/UmlBaseTransition.h
index bb98f97d1..f72122ca5 100644
--- a/genplugouts/FileControl/UmlBaseTransition.h
+++ b/genplugouts/FileControl/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -26,7 +26,7 @@ class UmlBaseTransition : public UmlItem
     virtual UmlItem * target();
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -34,7 +34,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -42,7 +42,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -59,7 +59,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -85,7 +85,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -93,7 +93,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
@@ -136,7 +136,7 @@ class UmlBaseTransition : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTransition(void * id, const Q3CString & n) : UmlItem(id, n) {
+    UmlBaseTransition(void * id, const QByteArray & n) : UmlItem(id, n) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlBaseUseCase.cpp b/genplugouts/FileControl/UmlBaseUseCase.cpp
index 5a3a32ccd..c091723cb 100644
--- a/genplugouts/FileControl/UmlBaseUseCase.cpp
+++ b/genplugouts/FileControl/UmlBaseUseCase.cpp
@@ -37,5 +37,6 @@ void UmlBaseUseCase::read_uml_()
 {
     _assoc_diagram = (UmlUseCaseDiagram *) UmlBaseItem::read_();
     UmlBaseItem::read_uml_();
+    _extension_points = UmlCom::read_string();
 }
 
diff --git a/genplugouts/FileControl/UmlBaseUseCase.h b/genplugouts/FileControl/UmlBaseUseCase.h
index 1bdef8f61..cc8fdbe8c 100644
--- a/genplugouts/FileControl/UmlBaseUseCase.h
+++ b/genplugouts/FileControl/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -33,6 +33,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
+    QByteArray _extension_points;
     UmlUseCaseDiagram * _assoc_diagram;
 
 
@@ -42,7 +43,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseUseCaseDiagram.h b/genplugouts/FileControl/UmlBaseUseCaseDiagram.h
index fd2481e49..f2a8dfb95 100644
--- a/genplugouts/FileControl/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/FileControl/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBaseUseCaseView.h b/genplugouts/FileControl/UmlBaseUseCaseView.h
index e289a3543..17498b275 100644
--- a/genplugouts/FileControl/UmlBaseUseCaseView.h
+++ b/genplugouts/FileControl/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseView;
 
@@ -25,7 +25,7 @@ class UmlBaseUseCaseView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlBuiltin.h b/genplugouts/FileControl/UmlBuiltin.h
index 4f5c16f41..79815c251 100644
--- a/genplugouts/FileControl/UmlBuiltin.h
+++ b/genplugouts/FileControl/UmlBuiltin.h
@@ -2,31 +2,31 @@
 #define _UMLBUILTIN_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/FileControl/UmlClass.h b/genplugouts/FileControl/UmlClass.h
index e2b1f8cc3..13ffc5ac6 100644
--- a/genplugouts/FileControl/UmlClass.h
+++ b/genplugouts/FileControl/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+
 
 // This class manages 'classes', notes that the class 'ClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlClassDiagram.h b/genplugouts/FileControl/UmlClassDiagram.h
index 76134392d..ac4781283 100644
--- a/genplugouts/FileControl/UmlClassDiagram.h
+++ b/genplugouts/FileControl/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlClassItem.h b/genplugouts/FileControl/UmlClassItem.h
index bf64f4dbb..7c4a888f7 100644
--- a/genplugouts/FileControl/UmlClassItem.h
+++ b/genplugouts/FileControl/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlClassMember.h b/genplugouts/FileControl/UmlClassMember.h
index 9119443c6..35fdddb52 100644
--- a/genplugouts/FileControl/UmlClassMember.h
+++ b/genplugouts/FileControl/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlClassView.h b/genplugouts/FileControl/UmlClassView.h
index a152eff28..3b6eb53ed 100644
--- a/genplugouts/FileControl/UmlClassView.h
+++ b/genplugouts/FileControl/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class view'
 //
@@ -11,7 +11,7 @@
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlCollaborationDiagram.h b/genplugouts/FileControl/UmlCollaborationDiagram.h
index ab1388561..fc69dea4c 100644
--- a/genplugouts/FileControl/UmlCollaborationDiagram.h
+++ b/genplugouts/FileControl/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlCom.cpp b/genplugouts/FileControl/UmlCom.cpp
index 514578bed..a43406bdc 100644
--- a/genplugouts/FileControl/UmlCom.cpp
+++ b/genplugouts/FileControl/UmlCom.cpp
@@ -1,20 +1,19 @@
 
 #include "UmlCom.h"
-
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
-
+#include <QByteArray>
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 #include "UmlSettings.h"
 #include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +27,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(17);
         flush();
@@ -65,11 +66,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -79,11 +80,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -100,25 +101,25 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
-                    (((unsigned char *) buffer_in)[1] << 16) +
-                    (((unsigned char *) buffer_in)[2] << 8) +
-                    ((unsigned char *) buffer_in)[3]);
+                (((unsigned char *) buffer_in)[1] << 16) +
+                (((unsigned char *) buffer_in)[2] << 8) +
+                ((unsigned char *) buffer_in)[3]);
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -127,16 +128,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -145,18 +146,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -202,7 +203,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -212,7 +213,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -223,7 +224,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -235,7 +236,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -247,7 +248,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -259,7 +260,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -272,7 +273,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -285,7 +286,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -299,7 +300,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -311,7 +312,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -324,7 +325,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -337,7 +338,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -350,7 +351,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +373,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -386,7 +387,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -400,7 +401,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -415,7 +416,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -428,7 +429,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -442,7 +443,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -465,7 +466,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ", " << ((arg3) ? arg3 : "") << ", " << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ", " << ((arg3) ? arg3 : "") << ", " << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -490,7 +491,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -513,10 +514,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -533,10 +534,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -570,7 +571,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -587,7 +588,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -598,12 +599,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -630,33 +631,34 @@ unsigned int UmlCom::read_unsigned()
     p_buffer_in += 4;
 
     return (((unsigned char *) p_buffer_in)[-4] << 24) +
-           (((unsigned char *) p_buffer_in)[-3] << 16) +
-           (((unsigned char *) p_buffer_in)[-2] << 8) +
-           ((unsigned char *) p_buffer_in)[-1];
+            (((unsigned char *) p_buffer_in)[-3] << 16) +
+            (((unsigned char *) p_buffer_in)[-2] << 8) +
+            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+                         #ifdef DEBUG_DOUML
                          msg
-#endif
-                        )
+                         #endif
+                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -665,7 +667,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -676,7 +678,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/FileControl/UmlCom.h b/genplugouts/FileControl/UmlCom.h
index fd29272d0..07dbb2687 100644
--- a/genplugouts/FileControl/UmlCom.h
+++ b/genplugouts/FileControl/UmlCom.h
@@ -2,21 +2,21 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //#include "CmdFamily.h"
 //#include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
 
-#include <q3ptrvector.h>
+
+
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -63,11 +63,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -77,19 +77,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -171,8 +171,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -195,10 +195,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
diff --git a/genplugouts/FileControl/UmlComponent.h b/genplugouts/FileControl/UmlComponent.h
index bb4fdbb25..e8961ed60 100644
--- a/genplugouts/FileControl/UmlComponent.h
+++ b/genplugouts/FileControl/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlComponentDiagram.h b/genplugouts/FileControl/UmlComponentDiagram.h
index 15d707dc2..9afaa7eb4 100644
--- a/genplugouts/FileControl/UmlComponentDiagram.h
+++ b/genplugouts/FileControl/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlComponentView.h b/genplugouts/FileControl/UmlComponentView.h
index 000a74744..cc09cecc6 100644
--- a/genplugouts/FileControl/UmlComponentView.h
+++ b/genplugouts/FileControl/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlDeploymentDiagram.h b/genplugouts/FileControl/UmlDeploymentDiagram.h
index 727d0ffd0..1f0add3d0 100644
--- a/genplugouts/FileControl/UmlDeploymentDiagram.h
+++ b/genplugouts/FileControl/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlDeploymentView.h b/genplugouts/FileControl/UmlDeploymentView.h
index 52e5e627d..1c47fedbf 100644
--- a/genplugouts/FileControl/UmlDeploymentView.h
+++ b/genplugouts/FileControl/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment view'
 //
@@ -11,7 +11,7 @@
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlDiagram.h b/genplugouts/FileControl/UmlDiagram.h
index ffee38e5c..99e0f81e4 100644
--- a/genplugouts/FileControl/UmlDiagram.h
+++ b/genplugouts/FileControl/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlEntryPointPseudoState.h b/genplugouts/FileControl/UmlEntryPointPseudoState.h
index 838a4bf5b..3fd7f6eca 100644
--- a/genplugouts/FileControl/UmlEntryPointPseudoState.h
+++ b/genplugouts/FileControl/UmlEntryPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlExitPointPseudoState.h b/genplugouts/FileControl/UmlExitPointPseudoState.h
index 1a57b8230..e63c68782 100644
--- a/genplugouts/FileControl/UmlExitPointPseudoState.h
+++ b/genplugouts/FileControl/UmlExitPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlExtraClassMember.h b/genplugouts/FileControl/UmlExtraClassMember.h
index cf0b2bf47..95b851b8d 100644
--- a/genplugouts/FileControl/UmlExtraClassMember.h
+++ b/genplugouts/FileControl/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlItem.cpp b/genplugouts/FileControl/UmlItem.cpp
index c3b26940b..1890f06b8 100644
--- a/genplugouts/FileControl/UmlItem.cpp
+++ b/genplugouts/FileControl/UmlItem.cpp
@@ -12,15 +12,15 @@ void UmlItem::fileControl(bool)
     UmlCom::trace("Error : must be applied on a <i>Package</i>");
 }
 
-void UmlItem::getFiles(Q3Dict<void> & files, unsigned rec)
+void UmlItem::getFiles(QHash<QString, void *> &files, unsigned rec)
 {
     QFileInfo fi(supportFile());
 
     if (fi.exists())
-        files.replace(fi.fileName(), (void *) 1);
+        files.insert(fi.fileName(), (void *) 1);
 
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned index;
+    const QVector<UmlItem*> ch = children();
+    int index;
 
     for (index = 0; index != ch.size(); index += 1)
         ch[index]->getFiles(files, rec);
diff --git a/genplugouts/FileControl/UmlItem.h b/genplugouts/FileControl/UmlItem.h
index 780b69dcc..e2280f241 100644
--- a/genplugouts/FileControl/UmlItem.h
+++ b/genplugouts/FileControl/UmlItem.h
@@ -3,9 +3,9 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
 
-#include <q3dict.h>
+
+
 // This class is a mother class for all the other Uml* classes, this
 // allows to generalize their management, declare virtual operations etc ...
 //
@@ -13,7 +13,7 @@
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
@@ -22,7 +22,7 @@ class UmlItem : public UmlBaseItem
     virtual void fileControl(bool ci);
 
     //Put files list in 'files', without considering 'rec' here contrarilly to the package case
-    virtual void getFiles(Q3Dict<void> & files, unsigned rec);
+    virtual void getFiles(QHash<QString,void*> & files, unsigned rec);
 
 };
 
diff --git a/genplugouts/FileControl/UmlNcRelation.h b/genplugouts/FileControl/UmlNcRelation.h
index 60032619a..3d73ec633 100644
--- a/genplugouts/FileControl/UmlNcRelation.h
+++ b/genplugouts/FileControl/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlNode.h b/genplugouts/FileControl/UmlNode.h
index 95edbe709..4c72e14fd 100644
--- a/genplugouts/FileControl/UmlNode.h
+++ b/genplugouts/FileControl/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlOperation.h b/genplugouts/FileControl/UmlOperation.h
index eec043152..f4c9e6547 100644
--- a/genplugouts/FileControl/UmlOperation.h
+++ b/genplugouts/FileControl/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlPackage.cpp b/genplugouts/FileControl/UmlPackage.cpp
index 9021d3d84..feefc5517 100644
--- a/genplugouts/FileControl/UmlPackage.cpp
+++ b/genplugouts/FileControl/UmlPackage.cpp
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "Dialog.h"
 #include "UmlCom.h"
@@ -12,10 +12,10 @@
 void UmlPackage::fileControl(bool ci)
 {
     UmlPackage * prj = getProject();
-    Q3CString prjfile = prj->supportFile();
+    QByteArray prjfile = prj->supportFile();
     BooL rec;
     BooL reload;
-    Q3CString cmd;
+    QByteArray cmd;
 
     if (! prj->propertyValue((ci) ? "check-in-cmd" : "check-out-cmd", cmd))
         cmd = "specify the command containing %file and %dir or %dironly";
@@ -30,7 +30,7 @@ void UmlPackage::fileControl(bool ci)
             saveProject();
 
         // get files list
-        Q3Dict<void> files;
+        QHash<QString,void*> files;
 
         getFiles(files, (rec) ? ~0u : 1);
 
@@ -38,31 +38,32 @@ void UmlPackage::fileControl(bool ci)
             getAuxFiles(files);
 
         // apply the command on each file
-        Q3DictIterator<void> it(files);
+        QHashIterator<QString,void*> it(files);
         QFileInfo prjpath(prjfile);
-        QString dir = prjpath.dirPath(TRUE);
+        QString dir = prjpath.path();
         QString dironly = dir;
         int index;
 
         if ((dironly.length() > 3) &&
-            (((const char *) dironly)[1] == ':') &&
-            (((const char *) dironly)[2] == '/'))
+            (dironly[1] == ':') &&
+            (dironly[2] == '/'))
             dironly = dironly.mid(2);
 
-        while ((index = cmd.find("%dironly")) != -1)
-            cmd.replace(index, 8, dironly);
+        while ((index = cmd.indexOf("%dironly")) != -1)
+            cmd.replace(index, 8, dironly.toLatin1());
 
-        while ((index = cmd.find("%dir")) != -1)
-            cmd.replace(index, 4, dir);
+        while ((index = cmd.indexOf("%dir")) != -1)
+            cmd.replace(index, 4, dir.toLatin1());
 
-        while (it.current()) {
+        while (it.hasNext()) {
+            it.next();
             QString s = cmd;
 
-            while ((index = s.find("%file")) != -1)
-                s.replace(index, 5, it.currentKey());
+            while ((index = s.indexOf("%file")) != -1)
+                s.replace(index, 5, it.key().toLatin1());
 
-            system((const char *) s);
-            ++it;
+            system((const char *) s.toLatin1().constData());
+            //++it;
         }
 
         UmlCom::trace("Done.");
@@ -72,13 +73,13 @@ void UmlPackage::fileControl(bool ci)
     }
 }
 
-void UmlPackage::getFiles(Q3Dict<void> & files, unsigned rec)
+void UmlPackage::getFiles(QHash<QString, void *> &files, unsigned rec)
 {
     if (rec != 0)
         UmlItem::getFiles(files, rec - 1);
 }
 
-void UmlPackage::getAuxFiles(Q3Dict<void> & files)
+void UmlPackage::getAuxFiles(QHash<QString,void*> & files)
 {
     static const char * aux[] = {
         "cpp_includes", "generation_settings", "idl_includes",
@@ -87,13 +88,13 @@ void UmlPackage::getAuxFiles(Q3Dict<void> & files)
 
     const char ** p = aux;
     QFileInfo prjpath(supportFile());
-    QString dir = prjpath.dirPath(TRUE) + "/";
+    QString dir = prjpath.path() + "/";
 
     while (*p != 0) {
         QFileInfo fi(dir + *p);
 
         if (fi.exists())
-            files.replace(*p, (void *) 1);
+            files.insert(*p, (void *) 1);
 
         p += 1;
     }
diff --git a/genplugouts/FileControl/UmlPackage.h b/genplugouts/FileControl/UmlPackage.h
index 8c9e12fb9..901e6076a 100644
--- a/genplugouts/FileControl/UmlPackage.h
+++ b/genplugouts/FileControl/UmlPackage.h
@@ -3,8 +3,8 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
-#include <q3dict.h>
+
+
 
 // This class manages a 'package', notes that the project itself is a package
 //
@@ -12,7 +12,7 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
     //Entry point
     //Ask for the way to do check-in/out, execute the check-in/out command on the files
@@ -20,11 +20,11 @@ class UmlPackage : public UmlBasePackage
     virtual void fileControl(bool ci);
 
     //Put files list in 'files' if 'rec' is not null.
-    virtual void getFiles(Q3Dict<void> & files, unsigned rec);
+    virtual void getFiles(QHash<QString,void*> & files, unsigned rec);
 
     //Add auxiliary files in 'files'
     //must be applied on the project
-    virtual void getAuxFiles(Q3Dict<void> & files);
+    virtual void getAuxFiles(QHash<QString,void*> & files);
 
 };
 
diff --git a/genplugouts/FileControl/UmlParameter.h b/genplugouts/FileControl/UmlParameter.h
index ef6f522b0..3c967ad60 100644
--- a/genplugouts/FileControl/UmlParameter.h
+++ b/genplugouts/FileControl/UmlParameter.h
@@ -4,7 +4,7 @@
 
 #include "aDirection.h"
 #include "UmlTypeSpec.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Represent an operation's parameter
 
@@ -13,9 +13,9 @@ struct UmlParameter {
 
     UmlTypeSpec type;
 
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
 };
 
diff --git a/genplugouts/FileControl/UmlPseudoState.h b/genplugouts/FileControl/UmlPseudoState.h
index 075761ec7..1c350a942 100644
--- a/genplugouts/FileControl/UmlPseudoState.h
+++ b/genplugouts/FileControl/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlRegion.h b/genplugouts/FileControl/UmlRegion.h
index d3f32cb7b..d0ce11dde 100644
--- a/genplugouts/FileControl/UmlRegion.h
+++ b/genplugouts/FileControl/UmlRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlRelation.h b/genplugouts/FileControl/UmlRelation.h
index 6b4358b40..a246cfcfd 100644
--- a/genplugouts/FileControl/UmlRelation.h
+++ b/genplugouts/FileControl/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'relations' between classes, notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlSequenceDiagram.h b/genplugouts/FileControl/UmlSequenceDiagram.h
index d3b3d83fc..a36e34a65 100644
--- a/genplugouts/FileControl/UmlSequenceDiagram.h
+++ b/genplugouts/FileControl/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlSettings.cpp b/genplugouts/FileControl/UmlSettings.cpp
index 57be360e5..e35b306ad 100644
--- a/genplugouts/FileControl/UmlSettings.cpp
+++ b/genplugouts/FileControl/UmlSettings.cpp
@@ -6,15 +6,15 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -26,14 +26,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -45,14 +45,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v);//[jasa] handle ambiguous call
 
@@ -64,14 +64,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -83,14 +83,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -104,39 +104,39 @@ bool UmlSettings::set_RelationDescription(Q3CString v)
 
 bool UmlSettings::_defined;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -148,7 +148,7 @@ void UmlSettings::read_()
     _relation_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_stereotypes[index].uml = UmlCom::read_string();
@@ -161,7 +161,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -185,18 +185,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -207,7 +207,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_stereotypes.count();
 
@@ -218,7 +218,7 @@ Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlSter
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -229,15 +229,15 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         builtins[index] = _builtins[index];
@@ -265,15 +265,15 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         relation_stereotypes[index] = _relation_stereotypes[index];
@@ -298,15 +298,15 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         class_stereotypes[index] = _class_stereotypes[index];
diff --git a/genplugouts/FileControl/UmlSettings.h b/genplugouts/FileControl/UmlSettings.h
index 57d228d02..838e6dc2f 100644
--- a/genplugouts/FileControl/UmlSettings.h
+++ b/genplugouts/FileControl/UmlSettings.h
@@ -1,9 +1,10 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
+#include <QHash>
+#include <QByteArray>
+
 
 
-#include <q3cstring.h>
-#include <q3dict.h>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -19,44 +20,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
 
 protected:
@@ -65,25 +66,25 @@ class UmlSettings
 
     static bool _defined;
 
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_stereotypes;
 
     static UmlStereotype * _relation_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -97,31 +98,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/FileControl/UmlState.h b/genplugouts/FileControl/UmlState.h
index b8a04be4a..e760bb6b6 100644
--- a/genplugouts/FileControl/UmlState.h
+++ b/genplugouts/FileControl/UmlState.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlStateDiagram.h b/genplugouts/FileControl/UmlStateDiagram.h
index f49b5fb44..c639f9193 100644
--- a/genplugouts/FileControl/UmlStateDiagram.h
+++ b/genplugouts/FileControl/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlStereotype.h b/genplugouts/FileControl/UmlStereotype.h
index 290517202..5c84a3962 100644
--- a/genplugouts/FileControl/UmlStereotype.h
+++ b/genplugouts/FileControl/UmlStereotype.h
@@ -2,23 +2,23 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
 
+#include <QByteArray>
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/FileControl/UmlTransition.h b/genplugouts/FileControl/UmlTransition.h
index 3edd626c7..59ccc3e65 100644
--- a/genplugouts/FileControl/UmlTransition.h
+++ b/genplugouts/FileControl/UmlTransition.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlTransition : public UmlBaseTransition, public UmlStateItem
 {
 public:
-    UmlTransition(void * id, const Q3CString & n) : UmlBaseTransition(id, n) {
+    UmlTransition(void * id, const QByteArray & n) : UmlBaseTransition(id, n) {
     }
 
 };
diff --git a/genplugouts/FileControl/UmlTypeSpec.cpp b/genplugouts/FileControl/UmlTypeSpec.cpp
index 4bcfebb95..ec194d414 100644
--- a/genplugouts/FileControl/UmlTypeSpec.cpp
+++ b/genplugouts/FileControl/UmlTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlTypeSpec::toString() const
+const QByteArray & UmlTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/FileControl/UmlTypeSpec.h b/genplugouts/FileControl/UmlTypeSpec.h
index 1c939ea94..e6ec4b176 100644
--- a/genplugouts/FileControl/UmlTypeSpec.h
+++ b/genplugouts/FileControl/UmlTypeSpec.h
@@ -1,8 +1,8 @@
 #ifndef _UMLTYPESPEC_H
 #define _UMLTYPESPEC_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 class UmlClass;
 
@@ -15,7 +15,7 @@ class UmlTypeSpec
 {
 public:
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     // if != 0 the class representing the type
     UmlClass * type;
@@ -23,7 +23,7 @@ class UmlTypeSpec
     UmlTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
 };
 
diff --git a/genplugouts/FileControl/UmlUseCase.h b/genplugouts/FileControl/UmlUseCase.h
index 392773262..c21cc521d 100644
--- a/genplugouts/FileControl/UmlUseCase.h
+++ b/genplugouts/FileControl/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case'
 //
@@ -11,7 +11,7 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlUseCaseDiagram.h b/genplugouts/FileControl/UmlUseCaseDiagram.h
index 132b56d36..bf490aa90 100644
--- a/genplugouts/FileControl/UmlUseCaseDiagram.h
+++ b/genplugouts/FileControl/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/UmlUseCaseView.h b/genplugouts/FileControl/UmlUseCaseView.h
index a715b2f5f..ef475b173 100644
--- a/genplugouts/FileControl/UmlUseCaseView.h
+++ b/genplugouts/FileControl/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case view'
 //
@@ -11,7 +11,7 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/FileControl/gridbox.cpp b/genplugouts/FileControl/gridbox.cpp
new file mode 100644
index 000000000..78233be1d
--- /dev/null
+++ b/genplugouts/FileControl/gridbox.cpp
@@ -0,0 +1,37 @@
+#include "gridbox.h"
+#include <QGridLayout>
+GridBox::GridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void GridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void GridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void GridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+}
+
+QString GridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/genplugouts/FileControl/gridbox.h b/genplugouts/FileControl/gridbox.h
new file mode 100644
index 000000000..64793941d
--- /dev/null
+++ b/genplugouts/FileControl/gridbox.h
@@ -0,0 +1,26 @@
+#ifndef GRIDBOX_H
+#define GRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class GridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit GridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/genplugouts/FileControl/hhbox.cpp b/genplugouts/FileControl/hhbox.cpp
new file mode 100644
index 000000000..95a09b5ea
--- /dev/null
+++ b/genplugouts/FileControl/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/FileControl/hhbox.h b/genplugouts/FileControl/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/genplugouts/FileControl/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/genplugouts/FileControl/vvbox.cpp b/genplugouts/FileControl/vvbox.cpp
new file mode 100644
index 000000000..288eb93ac
--- /dev/null
+++ b/genplugouts/FileControl/vvbox.cpp
@@ -0,0 +1,26 @@
+#include "vvbox.h"
+
+VVBox::VVBox(QWidget *parent) :
+    QWidget(parent)
+{
+    m_layout = new QVBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+}
+
+void VVBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+bool VVBox::setStretchFactor(QWidget *w, int stretch)
+{
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+void VVBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/FileControl/vvbox.h b/genplugouts/FileControl/vvbox.h
new file mode 100644
index 000000000..7f27f2ea8
--- /dev/null
+++ b/genplugouts/FileControl/vvbox.h
@@ -0,0 +1,22 @@
+#ifndef VVBOX_H
+#define VVBOX_H
+
+#include <QWidget>
+#include <QVBoxLayout>
+class VVBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit VVBox(QWidget *parent = 0);
+    void addWidget(QWidget* widget);
+
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+signals:
+
+public slots:
+private:
+    QVBoxLayout *m_layout;
+};
+
+#endif // VVBOX_H
diff --git a/genplugouts/GlobalChange/Context.cpp b/genplugouts/GlobalChange/Context.cpp
index ff9c0e1d9..52b07de46 100644
--- a/genplugouts/GlobalChange/Context.cpp
+++ b/genplugouts/GlobalChange/Context.cpp
@@ -1,14 +1,14 @@
 
 #include "Context.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Context::Context(const Q3CString & o, const Q3CString & f)
+Context::Context(const QByteArray & o, const QByteArray & f)
     : _old(o), _future(f), _n_match(0), _n_err(0)
 {
 }
 
-const char * Context::set_filters(const Q3CString & f1, const Q3CString & f2, const Q3CString & f3, bool w1, bool w2, bool w3, bool and12, bool and23)
+const char * Context::set_filters(const QByteArray & f1, const QByteArray & f2, const QByteArray & f3, bool w1, bool w2, bool w3, bool and12, bool and23)
 {
     _filter1 = f1;
     _filter2 = f2;
@@ -43,7 +43,7 @@ const char * Context::set_filters(const Q3CString & f1, const Q3CString & f2, co
     return 0;
 }
 
-bool Context::match_stereotype(const Q3CString & s)
+bool Context::match_stereotype(const QByteArray & s)
 {
     if (_is)
         return (s == _stereotype);
@@ -53,14 +53,14 @@ bool Context::match_stereotype(const Q3CString & s)
         return TRUE;
 }
 
-bool Context::match(Q3CString s)
+bool Context::match(QByteArray s)
 {
     int index = 0;
 
-    while ((index = s.find("\r", index)) != -1)
+    while ((index = s.indexOf("\r", index)) != -1)
         s.remove(index, 1);
 
-    if (s.find(_old) == -1)
+    if (s.indexOf(_old) == -1)
         return FALSE;
 
     switch (_equation) {
@@ -81,10 +81,10 @@ bool Context::match(Q3CString s)
         return match(s, _filter1, _with1) && match(s, _filter2, _with2) && match(s, _filter3, _with3);
 
     case And12_Or23:
-        return match(s, _filter1, _with1) && match(s, _filter2, _with2) || match(s, _filter3, _with3);
+        return (match(s, _filter1, _with1) && match(s, _filter2, _with2)) || match(s, _filter3, _with3);
 
     case Or12_And23:
-        return match(s, _filter1, _with1) || match(s, _filter2, _with2) && match(s, _filter3, _with3);
+        return match(s, _filter1, _with1) || (match(s, _filter2, _with2) && match(s, _filter3, _with3));
 
     default:
         //Or12_Or23:
@@ -97,19 +97,19 @@ void Context::err()
     _n_err += 1;
 }
 
-Q3CString Context::replace(Q3CString s)
+QByteArray Context::replace(QByteArray s)
 {
     int index = 0;
 
-    while ((index = s.find("\r", index)) != -1)
+    while ((index = s.indexOf("\r", index)) != -1)
         s.remove(index, 1);
 
-    return s.replace(s.find(_old), _old.length(), _future);
+    return s.replace(s.indexOf(_old), _old.length(), _future);
 }
 
-bool Context::match(Q3CString s, const Q3CString & filter, bool with)
+bool Context::match(QByteArray s, const QByteArray & filter, bool with)
 {
-    if ((with) ? (s.find(filter) != -1) : (s.find(filter) == -1)) {
+    if ((with) ? (s.indexOf(filter) != -1) : (s.indexOf(filter) == -1)) {
         _n_match += 1;
         return TRUE;
     }
diff --git a/genplugouts/GlobalChange/Context.h b/genplugouts/GlobalChange/Context.h
index 8373f9beb..2ee21b909 100644
--- a/genplugouts/GlobalChange/Context.h
+++ b/genplugouts/GlobalChange/Context.h
@@ -1,8 +1,8 @@
 #ifndef _CONTEXT_H
 #define _CONTEXT_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 enum Equation {
     NoFilter,
@@ -18,23 +18,23 @@ enum Equation {
 class Context
 {
 public:
-    Context(const Q3CString & o, const Q3CString & f);
+    Context(const QByteArray & o, const QByteArray & f);
 
-    const char * set_filters(const Q3CString & f1, const Q3CString & f2, const Q3CString & f3, bool w1, bool w2, bool w3, bool and12, bool and23);
+    const char * set_filters(const QByteArray & f1, const QByteArray & f2, const QByteArray & f3, bool w1, bool w2, bool w3, bool and12, bool and23);
 
-    void set_stereotype(const Q3CString & s, bool eq, bool neq);
+    void set_stereotype(const QByteArray & s, bool eq, bool neq);
 
     void set_targets(bool art, bool cl, bool op, bool att, bool rel);
 
     void set_language(bool c, bool j, bool p, bool y, bool i);
 
-    bool match_stereotype(const Q3CString & s);
+    bool match_stereotype(const QByteArray & s);
 
-    bool match(Q3CString s);
+    bool match(QByteArray s);
 
     void err();
 
-    Q3CString replace(Q3CString s);
+    QByteArray replace(QByteArray s);
 
     bool onArtifact() const;
 
@@ -62,11 +62,11 @@ class Context
 
 
 protected:
-    Q3CString _filter1;
+    QByteArray _filter1;
 
-    Q3CString _filter2;
+    QByteArray _filter2;
 
-    Q3CString _filter3;
+    QByteArray _filter3;
 
     bool _with1;
 
@@ -74,7 +74,7 @@ class Context
 
     bool _with3;
 
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
     bool _is;
 
@@ -100,9 +100,9 @@ class Context
 
     bool _idl;
 
-    Q3CString _old;
+    QByteArray _old;
 
-    Q3CString _future;
+    QByteArray _future;
 
     Equation _equation;
 
@@ -110,11 +110,11 @@ class Context
 
     int _n_err;
 
-    bool match(Q3CString s, const Q3CString & filter, bool with);
+    bool match(QByteArray s, const QByteArray & filter, bool with);
 
 };
 
-inline void Context::set_stereotype(const Q3CString & s, bool eq, bool neq)
+inline void Context::set_stereotype(const QByteArray & s, bool eq, bool neq)
 {
     _stereotype = s;
     _is = eq;
diff --git a/genplugouts/GlobalChange/CppSettings.cpp b/genplugouts/GlobalChange/CppSettings.cpp
index 60c47fda6..6cbade338 100644
--- a/genplugouts/GlobalChange/CppSettings.cpp
+++ b/genplugouts/GlobalChange/CppSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationAttributeStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, (const char *)s, (const char *)v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, (const char *)s, (const char *)v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -175,14 +175,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -194,14 +194,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -213,14 +213,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -232,14 +232,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -352,14 +352,14 @@ bool CppSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -371,14 +371,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -390,14 +390,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -409,14 +409,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -428,22 +428,22 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinIn(Q3CString s)
+QByteArray CppSettings::builtinIn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_in : Q3CString();
+    return (b) ? b->cpp_in : QByteArray();
 }
 
-bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinIn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)type, (const char *)form); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -456,22 +456,22 @@ bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinOut(Q3CString s)
+QByteArray CppSettings::builtinOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_out : Q3CString();
+    return (b) ? b->cpp_out : QByteArray();
 }
 
-bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)type, (const char *)form); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -484,22 +484,22 @@ bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinInOut(Q3CString s)
+QByteArray CppSettings::builtinInOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_inout : Q3CString();
+    return (b) ? b->cpp_inout : QByteArray();
 }
 
-bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinInOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)type, (const char *)form); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -512,22 +512,22 @@ bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinReturn(Q3CString s)
+QByteArray CppSettings::builtinReturn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_return : Q3CString();
+    return (b) ? b->cpp_return : QByteArray();
 }
 
-bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinReturn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)type, (const char *)form); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -540,14 +540,14 @@ bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v, ""); //[jasa] handle ambiguous call
 
@@ -559,14 +559,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v, ""); //[jasa] handle ambiguous call
 
@@ -578,14 +578,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v, "");
 
@@ -597,14 +597,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)v, ""); //[jasa] handle ambiguous call
 
@@ -616,14 +616,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -635,14 +635,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -654,14 +654,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -673,14 +673,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -692,14 +692,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -711,14 +711,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -730,14 +730,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl(const char * multiplicity)
+const QByteArray & CppSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool CppSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -750,14 +750,14 @@ bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -769,7 +769,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -789,14 +789,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -808,14 +808,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -865,14 +865,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -960,14 +960,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -1038,51 +1038,51 @@ bool CppSettings::set_IsSetParamRef(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl[3/*multiplicity*/];
+QByteArray CppSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -1092,7 +1092,7 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
@@ -1100,13 +1100,13 @@ bool CppSettings::_is_set_param_const;
 
 bool CppSettings::_is_set_param_ref;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
@@ -1118,14 +1118,14 @@ bool CppSettings::_is_force_namespace_gen;
 
 bool CppSettings::_is_generate_javadoc_comment;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1151,13 +1151,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/GlobalChange/CppSettings.h b/genplugouts/GlobalChange/CppSettings.h
index c455cc67f..6ad480d7c 100644
--- a/genplugouts/GlobalChange/CppSettings.h
+++ b/genplugouts/GlobalChange/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(Q3CString s);
+    static QByteArray relationAttributeStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -175,47 +175,47 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinIn(Q3CString s);
+    static QByteArray builtinIn(QByteArray s);
 
     // set the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
@@ -223,13 +223,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinIn(Q3CString type, Q3CString form);
+    static bool set_BuiltinIn(QByteArray type, QByteArray form);
 
     // returns the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinOut(Q3CString s);
+    static QByteArray builtinOut(QByteArray s);
 
     // set the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
@@ -237,13 +237,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinInOut(Q3CString s);
+    static QByteArray builtinInOut(QByteArray s);
 
     // set the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
@@ -251,13 +251,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinInOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinInOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinReturn(Q3CString s);
+    static QByteArray builtinReturn(QByteArray s);
 
     // set the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
@@ -265,36 +265,36 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinReturn(Q3CString type, Q3CString form);
+    static bool set_BuiltinReturn(QByteArray type, QByteArray form);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -302,83 +302,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -387,20 +387,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -424,13 +424,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -476,14 +476,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -524,51 +524,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -578,7 +578,7 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
@@ -586,13 +586,13 @@ class CppSettings : public UmlSettings
 
     static bool _is_set_param_ref;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
@@ -604,7 +604,7 @@ class CppSettings : public UmlSettings
 
     static bool _is_generate_javadoc_comment;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/GlobalChange/Dialog.cpp b/genplugouts/GlobalChange/Dialog.cpp
index 731816a4f..b4534ce9f 100644
--- a/genplugouts/GlobalChange/Dialog.cpp
+++ b/genplugouts/GlobalChange/Dialog.cpp
@@ -9,21 +9,20 @@
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3hbox.h>
-#include <q3vbox.h>
+#include <hhbox.h>
+#include <vvbox.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 //#include <qhbuttongroup.h> //[jasa] has compiler errors.
 //[jasa] including q3buttongroup.h instead seems to work.
-#include <q3buttongroup.h>
-#include <q3vgroupbox.h>
-#include <q3grid.h>
+#include <bbuttongroup.h>
+#include "vgridbox.h"
+#include "gridbox.h"
 #include <qmessagebox.h>
-//Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #include <QKeyEvent>
-#include <Q3VBoxLayout>
-
+#include <QVBoxLayout>
+#include <QSettings>
 #include "UmlCom.h"
 #include "Context.h"
 #include "UmlItem.h"
@@ -58,171 +57,174 @@ void LineEdit::keyPressEvent(QKeyEvent * e)
     }
 }
 
-Dialog::Dialog() : QDialog(0, 0, TRUE)
+Dialog::Dialog() : QDialog(0)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3VGroupBox * gbox;
-    Q3HButtonGroup * bg;
-    Q3HBox * htab;
+    setModal(true);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    VGridBox * gbox;
+    BButtonGroup * bg;
+    HHBox * htab;
 
     vbox->setMargin(5);
 
-    gbox = new Q3VGroupBox("Filters" , this);
+    gbox = new VGridBox(10,this,"Filters");
     vbox->addWidget(gbox);
 
-    htab = new Q3HBox(gbox);
+    gbox->addWidget(htab = new HHBox(gbox));
     //htab->setMargin(5);
 
-    new QLabel("filter 1 : ", htab);
-    filter1_le = new LineEdit(htab);
+    htab->addWidget(new QLabel("filter 1 : ", htab));
+    htab->addWidget(filter1_le = new LineEdit(htab));
 
-    new QLabel("  ", htab);
+    htab->addWidget(new QLabel("  ", htab));
 
-    bg = new Q3HButtonGroup(htab);
-    bg->setRadioButtonExclusive(TRUE);
+    htab->addWidget(bg = new BButtonGroup(htab));
+    //bg->setRadioButtonExclusive(TRUE);
 
-    with1_rb = new QRadioButton("with", bg);
-    new QRadioButton("without", bg);
+    bg->addWidget(with1_rb = new QRadioButton("with", bg));
+    bg->addWidget(new QRadioButton("without", bg));
     with1_rb->setChecked(TRUE);
 
     //
 
-    htab = new Q3HBox(gbox);
+    gbox->addWidget(htab = new HHBox(gbox));
     //htab->setMargin(5);
 
-    new QLabel("", htab);
-    bg = new Q3HButtonGroup(htab);
-    bg->setRadioButtonExclusive(TRUE);
+    htab->addWidget(new QLabel("", htab));
+    htab->addWidget(bg = new BButtonGroup(htab));
+    //bg->setRadioButtonExclusive(TRUE);
 
-    and12_rb = new QRadioButton("and", bg);
-    new QRadioButton("or", bg);
+    bg->addWidget(and12_rb = new QRadioButton("and", bg));
+    bg->addWidget(new QRadioButton("or", bg));
     and12_rb->setChecked(TRUE);
 
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
     //
 
-    htab = new Q3HBox(gbox);
+    gbox->addWidget(htab = new HHBox(gbox));
     //htab->setMargin(5);
 
-    new QLabel("filter 2 : ", htab);
-    filter2_le = new LineEdit(htab);
+    htab->addWidget(new QLabel("filter 2 : ", htab));
+    htab->addWidget(filter2_le = new LineEdit(htab));
 
-    new QLabel("  ", htab);
+    htab->addWidget(new QLabel("  ", htab));
 
-    bg = new Q3HButtonGroup(htab);
-    bg->setRadioButtonExclusive(TRUE);
+    htab->addWidget(bg = new BButtonGroup(htab));
+    //bg->setRadioButtonExclusive(TRUE);
 
-    with2_rb = new QRadioButton("with", bg);
-    new QRadioButton("without", bg);
+    bg->addWidget(with2_rb = new QRadioButton("with", bg));
+    bg->addWidget(new QRadioButton("without", bg));
     with2_rb->setChecked(TRUE);
 
     //
 
-    htab = new Q3HBox(gbox);
+    gbox->addWidget(htab = new HHBox(gbox));
     //htab->setMargin(5);
 
-    new QLabel("", htab);
-    bg = new Q3HButtonGroup(htab);
-    bg->setRadioButtonExclusive(TRUE);
+    htab->addWidget(new QLabel("", htab));
+    htab->addWidget(bg = new BButtonGroup(htab));
+    //bg->setRadioButtonExclusive(TRUE);
 
-    and23_rb = new QRadioButton("and", bg);
-    new QRadioButton("or", bg);
+    bg->addWidget(and23_rb = new QRadioButton("and", bg));
+    bg->addWidget(new QRadioButton("or", bg));
     and23_rb->setChecked(TRUE);
 
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
     //
 
-    htab = new Q3HBox(gbox);
+    gbox->addWidget(htab = new HHBox(gbox));
     //htab->setMargin(5);
 
-    new QLabel("filter 3 : ", htab);
-    filter3_le = new LineEdit(htab);
+    htab->addWidget(new QLabel("filter 3 : ", htab));
+    htab->addWidget(filter3_le = new LineEdit(htab));
 
-    new QLabel("  ", htab);
+    htab->addWidget(new QLabel("  ", htab));
 
-    bg = new Q3HButtonGroup(htab);
-    bg->setRadioButtonExclusive(TRUE);
+    htab->addWidget(bg = new BButtonGroup(htab));
+    //bg->setRadioButtonExclusive(TRUE);
 
-    with3_rb = new QRadioButton("with", bg);
-    new QRadioButton("without", bg);
+    bg->addWidget(with3_rb = new QRadioButton("with", bg));
+    bg->addWidget(new QRadioButton("without", bg));
     with3_rb->setChecked(TRUE);
 
     //
     //
 
-    gbox = new Q3VGroupBox("Stereotype" , this);
+    gbox = new VGridBox(2,this,"Stereotype" );
     vbox->addWidget(gbox);
 
-    htab = new Q3HBox(gbox);
+    gbox->addWidget(htab = new HHBox(gbox));
     //htab->setMargin(5);
 
-    bg = new Q3HButtonGroup(htab);
-    bg->setRadioButtonExclusive(TRUE);
+    htab->addWidget(bg = new BButtonGroup(htab));
+    //bg->setRadioButtonExclusive(TRUE);
 
-    any_rb = new QRadioButton("any", bg);
-    is_rb = new QRadioButton("is", bg);
-    isnot_rb = new QRadioButton("is not", bg);
+    bg->addWidget(any_rb = new QRadioButton("any", bg));
+    bg->addWidget(is_rb = new QRadioButton("is", bg));
+    bg->addWidget(isnot_rb = new QRadioButton("is not", bg));
     any_rb->setChecked(TRUE);
-    stereotype_le = new QLineEdit(htab);
+    htab->addWidget(stereotype_le = new QLineEdit(htab));
 
     //
     //
 
-    gbox = new Q3VGroupBox("Targets" , this);
+    gbox = new VGridBox(2,this,"Targets" );
     vbox->addWidget(gbox);
 
-    htab = new Q3HBox(gbox);
+    gbox->addWidget(htab = new HHBox(gbox));
     //htab->setMargin(5);
 
-    artifact_cb = new QCheckBox("artifact", htab);
-    class_cb = new QCheckBox("class", htab);
-    operation_cb = new QCheckBox("operation", htab);
-    attribute_cb = new QCheckBox("attribute", htab);
-    relation_cb = new QCheckBox("relation", htab);
+    htab->addWidget(artifact_cb = new QCheckBox("artifact", htab));
+    htab->addWidget(class_cb = new QCheckBox("class", htab));
+    htab->addWidget(operation_cb = new QCheckBox("operation", htab));
+    htab->addWidget(attribute_cb = new QCheckBox("attribute", htab));
+    htab->addWidget(relation_cb = new QCheckBox("relation", htab));
 
     //
     //
 
-    gbox = new Q3VGroupBox("Languages" , this);
+    gbox = new VGridBox(2,this,"Languages");
     vbox->addWidget(gbox);
 
-    htab = new Q3HBox(gbox);
+    gbox->addWidget(htab = new HHBox(gbox));
     //htab->setMargin(5);
 
-    cpp_cb = new QCheckBox("C++", htab);
-    java_cb = new QCheckBox("Java", htab);
-    php_cb = new QCheckBox("Php", htab);
-    python_cb = new QCheckBox("Python", htab);
-    idl_cb = new QCheckBox("Idl", htab);
+    htab->addWidget(cpp_cb = new QCheckBox("C++", htab));
+    htab->addWidget(java_cb = new QCheckBox("Java", htab));
+    htab->addWidget(php_cb = new QCheckBox("Php", htab));
+    htab->addWidget(python_cb = new QCheckBox("Python", htab));
+    htab->addWidget(idl_cb = new QCheckBox("Idl", htab));
 
     //
     //
 
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
     vbox->addWidget(grid);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel("current : ", grid);
-    current_le  = new LineEdit(grid);
+    grid->addWidget(new QLabel("current : ", grid));
+    grid->addWidget(current_le  = new LineEdit(grid));
 
-    new QLabel("new : ", grid);
-    new_le  = new LineEdit(grid);
+    grid->addWidget(new QLabel("new : ", grid));
+    grid->addWidget(new_le  = new LineEdit(grid));
 
     //
     //
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel(htab);
-    QPushButton * replace = new QPushButton("Replace", htab);
-    new QLabel(htab);
-    QPushButton * quit = new QPushButton("Quit", htab);
-    new QLabel(htab);
+    htab->addWidget(new QLabel(htab));
+    QPushButton * replace;
+    htab->addWidget(replace = new QPushButton("Replace", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * quit;
+    htab->addWidget(quit = new QPushButton("Quit", htab));
+    htab->addWidget(new QLabel(htab));
 
     QSize bs(replace->sizeHint());
 
@@ -245,7 +247,7 @@ void Dialog::do_replace()
     if (err != 0)
         QMessageBox::critical(this, "Global change", err);
     else {
-        ctx.set_stereotype(Q3CString(stereotype_le->text().toAscii()),//[jasa] change QString to QByteArray to const char* for Q3CString constructor.
+        ctx.set_stereotype(QByteArray(stereotype_le->text().toLatin1()),//[jasa] change QString to QByteArray to const char* for QByteArray constructor.
                            is_rb->isChecked(), isnot_rb->isChecked());
         ctx.set_targets(artifact_cb->isChecked(), class_cb->isChecked(),
                         operation_cb->isChecked(), attribute_cb->isChecked(), relation_cb->isChecked());
@@ -270,28 +272,28 @@ void Dialog::do_replace()
     }
 }
 
-Q3CString Dialog::digest(const QString s)
+QByteArray Dialog::digest(const QString s)
 {
-    Q3CString c = (const char *) s;
+    QByteArray c = s.toLatin1();
     int index;
 
     index = 0;
 
-    while ((index = c.find("\\n", index)) != -1) {
+    while ((index = c.indexOf("\\n", index)) != -1) {
         c.replace(index, 2, "\n");
         index += 1;
     }
 
     index = 0;
 
-    while ((index = c.find("\\t", index)) != -1) {
+    while ((index = c.indexOf("\\t", index)) != -1) {
         c.replace(index, 2, "\t");
         index += 1;
     }
 
     index = 0;
 
-    while ((index = c.find("\r", index)) != -1) {
+    while ((index = c.indexOf("\r", index)) != -1) {
         c.remove(index, 1);
     }
 
@@ -300,57 +302,31 @@ Q3CString Dialog::digest(const QString s)
 
 void Dialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     QSize sz = size();
 
     // width = height
     resize(sz.height(), sz.height());
 
-    // try to read .doumlrc
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-#ifdef WIN32
-
-    if (fp == 0) {
-        QString hd = getenv("USERPROFILE");
-
-        if (! hd.isEmpty()) {
-            QDir d(hd);
-            QString s2 = d.absFilePath(".doumlrc");
-
-            fp = fopen((const char *) s2, "r");
-        }
-    }
-
-#endif
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        int cx = (r + l) / 2;
-                        int cy = (t + b) / 2;
-
-                        move(x() + cx - (x() + width() / 2),
-                             y() + cy - (y() + height() / 2));
-                    }
-                }
-
-                break;
-            }
-        }
-
-        fclose(fp);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        int cx = (r + l) / 2;
+        int cy = (t + b) / 2;
+
+        move(x() + cx - (x() + width() / 2), y() + cy - (y() + height() / 2));
+      }
     }
 }
 
diff --git a/genplugouts/GlobalChange/Dialog.h b/genplugouts/GlobalChange/Dialog.h
index 9edb07c1b..0c9a2f8f7 100644
--- a/genplugouts/GlobalChange/Dialog.h
+++ b/genplugouts/GlobalChange/Dialog.h
@@ -2,7 +2,7 @@
 #define _DIALOG_H
 
 
-#include <q3cstring.h>
+
 #include <qstring.h>
 
 #include <qdialog.h>
@@ -86,7 +86,7 @@ class Dialog : public QDialog
 protected slots:
     void do_replace();
 
-    Q3CString digest(const QString s);
+    QByteArray digest(const QString s);
 
     virtual void polish();
 
diff --git a/genplugouts/GlobalChange/FlowBehavior.h b/genplugouts/GlobalChange/FlowBehavior.h
index 55dde8146..09f17529a 100644
--- a/genplugouts/GlobalChange/FlowBehavior.h
+++ b/genplugouts/GlobalChange/FlowBehavior.h
@@ -2,18 +2,18 @@
 #define _FLOWBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class FlowBehavior
 {
 public:
-    Q3CString weight;
+    QByteArray weight;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString selection;
+    QByteArray selection;
 
-    Q3CString transformation;
+    QByteArray transformation;
 
     void read();
 
diff --git a/genplugouts/GlobalChange/GlobalChange.pro b/genplugouts/GlobalChange/GlobalChange.pro
index 965c3e32d..48a822a27 100644
--- a/genplugouts/GlobalChange/GlobalChange.pro
+++ b/genplugouts/GlobalChange/GlobalChange.pro
@@ -1,7 +1,10 @@
 TEMPLATE    = app
 TARGET        = global_change
-CONFIG        +=  warn_on qt
-DEFINES        = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES        += WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON
 HEADERS        = ./UmlBaseUseCaseAssociation.h \
           ./UmlActivityDiagram.h \
           ./UmlForkPseudoState.h \
@@ -199,7 +202,12 @@ HEADERS        = ./UmlBaseUseCaseAssociation.h \
           ./UmlPackage.h \
           ./UmlBaseExpansionNode.h \
           ./UmlBaseArtifact.h \
-          ./UmlBaseChoicePseudoState.h
+          ./UmlBaseChoicePseudoState.h \
+    vgridbox.h \
+    vvbox.h \
+    gridbox.h \
+    hhbox.h \
+    bbuttongroup.h
 SOURCES        = ./UmlBaseUseCaseAssociation.cpp \
           ./UmlActivityDiagram.cpp \
           ./UmlForkPseudoState.cpp \
@@ -398,25 +406,26 @@ SOURCES        = ./UmlBaseUseCaseAssociation.cpp \
           ./UmlPackage.cpp \
           ./UmlBaseExpansionNode.cpp \
           ./UmlBaseArtifact.cpp \
-          ./UmlBaseChoicePseudoState.cpp
+          ./UmlBaseChoicePseudoState.cpp \
+    vgridbox.cpp \
+    vvbox.cpp \
+    gridbox.cpp \
+    hhbox.cpp \
+    bbuttongroup.cpp
 
-#The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+DEFINES += TRUE=true FALSE=false
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/global_change/MOC_release
-    OBJECTS_DIR = bin/douml/global_change/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/global_change
+    OBJECTS_DIR = $${DESTDIR}/obj_release/global_change
 }
-
-Debug{
-    MOC_DIR = bin/douml/global_change/MOC_Debug
-    OBJECTS_DIR = bin/douml/global_change/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/global_change
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/global_change
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/genplugouts/GlobalChange/IdlSettings.cpp b/genplugouts/GlobalChange/IdlSettings.cpp
index de9092f14..84d4dba81 100644
--- a/genplugouts/GlobalChange/IdlSettings.cpp
+++ b/genplugouts/GlobalChange/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -175,14 +175,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -194,14 +194,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -213,14 +213,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -232,14 +232,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -251,14 +251,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -270,14 +270,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -289,14 +289,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -308,14 +308,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -327,14 +327,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -346,14 +346,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -365,14 +365,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -385,14 +385,14 @@ bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -405,14 +405,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CStrin
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionItemDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_item_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionItemDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -425,14 +425,14 @@ bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -444,14 +444,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl(const char * multiplicity)
+const QByteArray & IdlSettings::constDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _const_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ConstDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, multiplicity, (const char *)v);
@@ -464,14 +464,14 @@ bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -484,14 +484,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -504,14 +504,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -524,14 +524,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -543,14 +543,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -562,14 +562,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -602,60 +602,60 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_item_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_item_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_const_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -677,13 +677,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/GlobalChange/IdlSettings.h b/genplugouts/GlobalChange/IdlSettings.h
index d28a0bf7a..86e0b1473 100644
--- a/genplugouts/GlobalChange/IdlSettings.h
+++ b/genplugouts/GlobalChange/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype depending on the multiplicity
-    static const Q3CString & valuetypeAttributeDecl(const char * multiplicity);
+    static const QByteArray & valuetypeAttributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an union item depending on the multiplicity
-    static const Q3CString & unionItemDecl(const char * multiplicity);
+    static const QByteArray & unionItemDecl(const char * multiplicity);
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionItemDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute depending on the multiplicity
-    static const Q3CString & constDecl(const char * multiplicity);
+    static const QByteArray & constDecl(const char * multiplicity);
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(const char * multiplicity, Q3CString v);
+    static bool set_ConstDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_attr_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_attr_decl[3/*multiplicity*/];
 
-    static Q3CString _union_item_decl[3/*multiplicity*/];
+    static QByteArray _union_item_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl[3/*multiplicity*/];
+    static QByteArray _const_decl[3/*multiplicity*/];
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/GlobalChange/JavaSettings.cpp b/genplugouts/GlobalChange/JavaSettings.cpp
index e95f2d595..f7f1985f8 100644
--- a/genplugouts/GlobalChange/JavaSettings.cpp
+++ b/genplugouts/GlobalChange/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -175,14 +175,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -194,14 +194,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -251,14 +251,14 @@ bool JavaSettings::set_IsForcePackagePrefixGeneration(bool v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -270,14 +270,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -289,14 +289,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternDecl()
+const QByteArray & JavaSettings::enumPatternDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_decl;
 }
 
-bool JavaSettings::set_EnumPatternDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -308,14 +308,14 @@ bool JavaSettings::set_EnumPatternDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumDecl()
+QByteArray JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -327,14 +327,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -346,14 +346,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl(const char * multiplicity)
+const QByteArray & JavaSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -366,14 +366,14 @@ bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemDecl()
+const QByteArray & JavaSettings::enumPatternItemDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_item_decl;
 }
 
-bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -385,14 +385,14 @@ bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemCase()
+const QByteArray & JavaSettings::enumPatternItemCase()
 {
     read_if_needed_();
 
     return _enum_pattern_item_case;
 }
 
-bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
+bool JavaSettings::set_EnumPatternItemCase(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemCaseCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -404,14 +404,14 @@ bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumItemDecl()
+QByteArray JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -423,14 +423,14 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -443,14 +443,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -481,14 +481,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -500,14 +500,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -597,60 +597,60 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_pattern_decl;
+QByteArray JavaSettings::_enum_pattern_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_enum_pattern_item_decl;
+QByteArray JavaSettings::_enum_pattern_item_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_case;
+QByteArray JavaSettings::_enum_pattern_item_case;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
 bool JavaSettings::_is_generate_javadoc_comment;
 
 bool JavaSettings::_is_force_package_gen;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray,QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -672,13 +672,13 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/GlobalChange/JavaSettings.h b/genplugouts/GlobalChange/JavaSettings.h
index 2c0fc5e18..12192156a 100644
--- a/genplugouts/GlobalChange/JavaSettings.h
+++ b/genplugouts/GlobalChange/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,80 +31,80 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -126,100 +126,100 @@ class JavaSettings : public UmlSettings
     static bool set_IsForcePackagePrefixGeneration(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumPatternDecl();
+    static const QByteArray & enumPatternDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternDecl(Q3CString v);
+    static bool set_EnumPatternDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumPatternItemDecl();
+    static const QByteArray & enumPatternItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternItemDecl(Q3CString v);
+    static bool set_EnumPatternItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumPatternItemCase();
+    static const QByteArray & enumPatternItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumPatternItemCase(Q3CString v);
+    static bool set_EnumPatternItemCase(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -233,23 +233,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -298,53 +298,53 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_pattern_decl;
+    static QByteArray _enum_pattern_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_pattern_item_decl;
+    static QByteArray _enum_pattern_item_decl;
 
-    static Q3CString _enum_pattern_item_case;
+    static QByteArray _enum_pattern_item_case;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
     static bool _is_generate_javadoc_comment;
 
     static bool _is_force_package_gen;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/GlobalChange/PhpSettings.cpp b/genplugouts/GlobalChange/PhpSettings.cpp
index 2d453b551..6fd1b65ef 100644
--- a/genplugouts/GlobalChange/PhpSettings.cpp
+++ b/genplugouts/GlobalChange/PhpSettings.cpp
@@ -8,7 +8,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHJAVA
 #include "JavaSettings.h"
 #endif
@@ -24,22 +24,22 @@ bool PhpSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PhpSettings::classStereotype(const Q3CString & s)
+QByteArray PhpSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
 
-bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PhpSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -52,21 +52,21 @@ bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PhpSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::php);
 }
 
-const Q3CString & PhpSettings::rootDir()
+const QByteArray & PhpSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PhpSettings::set_RootDir(Q3CString v)
+bool PhpSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRootdirCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -78,14 +78,14 @@ bool PhpSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceContent()
+const QByteArray & PhpSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PhpSettings::set_SourceContent(Q3CString v)
+bool PhpSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceContentCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -97,14 +97,14 @@ bool PhpSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceExtension()
+const QByteArray & PhpSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PhpSettings::set_SourceExtension(Q3CString v)
+bool PhpSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceExtensionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -135,14 +135,14 @@ bool PhpSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::classDecl()
+const QByteArray & PhpSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PhpSettings::set_ClassDecl(Q3CString v)
+bool PhpSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -154,14 +154,14 @@ bool PhpSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::externalClassDecl()
+const QByteArray & PhpSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PhpSettings::set_ExternalClassDecl(Q3CString v)
+bool PhpSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpExternalClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -173,14 +173,14 @@ bool PhpSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumDecl()
+QByteArray PhpSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PhpSettings::set_EnumDecl(Q3CString v)
+bool PhpSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -192,14 +192,14 @@ bool PhpSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::interfaceDecl()
+const QByteArray & PhpSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool PhpSettings::set_InterfaceDecl(Q3CString v)
+bool PhpSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpInterfaceDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -211,14 +211,14 @@ bool PhpSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::attributeDecl()
+const QByteArray & PhpSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool PhpSettings::set_AttributeDecl(Q3CString v)
+bool PhpSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpAttributeDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -230,14 +230,14 @@ bool PhpSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumItemDecl()
+QByteArray PhpSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PhpSettings::set_EnumItemDecl(Q3CString v)
+bool PhpSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumItemDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -249,14 +249,14 @@ bool PhpSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::relationDecl()
+const QByteArray & PhpSettings::relationDecl()
 {
     read_if_needed_();
 
     return _rel_decl;
 }
 
-bool PhpSettings::set_RelationDecl(Q3CString v)
+bool PhpSettings::set_RelationDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRelationDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -268,14 +268,14 @@ bool PhpSettings::set_RelationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::operationDef()
+const QByteArray & PhpSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PhpSettings::set_OperationDef(Q3CString v)
+bool PhpSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpOperationDefCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -315,14 +315,14 @@ bool PhpSettings::set_GetVisibility(aVisibility v)
 #endif
 }
 
-const Q3CString & PhpSettings::getName()
+const QByteArray & PhpSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PhpSettings::set_GetName(Q3CString v)
+bool PhpSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpGetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -334,14 +334,14 @@ bool PhpSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::setName()
+const QByteArray & PhpSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PhpSettings::set_SetName(Q3CString v)
+bool PhpSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -421,29 +421,29 @@ bool PhpSettings::set_SetVisibility(aVisibility v)
 
 bool PhpSettings::_defined;
 
-Q3CString PhpSettings::_root;
+QByteArray PhpSettings::_root;
 
-Q3CString PhpSettings::_class_decl;
+QByteArray PhpSettings::_class_decl;
 
-Q3CString PhpSettings::_external_class_decl;
+QByteArray PhpSettings::_external_class_decl;
 
-Q3CString PhpSettings::_enum_decl;
+QByteArray PhpSettings::_enum_decl;
 
-Q3CString PhpSettings::_interface_decl;
+QByteArray PhpSettings::_interface_decl;
 
-Q3CString PhpSettings::_attr_decl;
+QByteArray PhpSettings::_attr_decl;
 
-Q3CString PhpSettings::_enum_item_decl;
+QByteArray PhpSettings::_enum_item_decl;
 
-Q3CString PhpSettings::_rel_decl;
+QByteArray PhpSettings::_rel_decl;
 
-Q3CString PhpSettings::_oper_def;
+QByteArray PhpSettings::_oper_def;
 
 #ifndef WITHJAVA
 aVisibility PhpSettings::_get_visibility;
 #endif
 
-Q3CString PhpSettings::_get_name;
+QByteArray PhpSettings::_get_name;
 
 bool PhpSettings::_is_get_final;
 
@@ -451,15 +451,29 @@ bool PhpSettings::_is_get_final;
 aVisibility PhpSettings::_set_visibility;
 #endif
 
-Q3CString PhpSettings::_set_name;
+QByteArray PhpSettings::_set_name;
 
 bool PhpSettings::_is_set_final;
 
-Q3CString PhpSettings::_src_content;
+QByteArray PhpSettings::_src_content;
 
-Q3CString PhpSettings::_ext;
+QByteArray PhpSettings::_ext;
 
+QByteArray PhpSettings::_dir_regexp;
+
+bool PhpSettings::_dir_regexp_case_sensitive;
+
+QByteArray PhpSettings::_file_regexp;
+
+bool PhpSettings::_file_regexp_case_sensitive;
 bool PhpSettings::_is_generate_javadoc_comment;
+bool PhpSettings::_req_with_path;
+
+bool PhpSettings::_is_relative_path;
+
+bool PhpSettings::_is_root_relative_path;
+
+bool PhpSettings::_is_force_namespace_gen;
 
 void PhpSettings::read_()
 {
@@ -485,18 +499,31 @@ void PhpSettings::read_()
     _rel_decl = UmlCom::read_string();
     _oper_def = UmlCom::read_string();
 #ifndef WITHJAVA
-    _get_visibility =
+    _get_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _get_name = UmlCom::read_string();
     _is_get_final = UmlCom::read_bool();
 #ifndef WITHJAVA
-    _set_visibility =
+    _set_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
     _is_generate_javadoc_comment = UmlCom::read_bool();
+    _req_with_path = UmlCom::read_bool();
+    _is_relative_path = UmlCom::read_bool();
+    _is_root_relative_path = UmlCom::read_bool();
+
+    _dir_regexp = UmlCom::read_string();
+    _dir_regexp_case_sensitive = UmlCom::read_bool();
+
+    _file_regexp = UmlCom::read_string();
+    _file_regexp_case_sensitive = UmlCom::read_bool();
+
+    _is_force_namespace_gen = UmlCom::read_bool();
 }
 
 void PhpSettings::read_if_needed_()
diff --git a/genplugouts/GlobalChange/PhpSettings.h b/genplugouts/GlobalChange/PhpSettings.h
index 2f83561bc..17775cb79 100644
--- a/genplugouts/GlobalChange/PhpSettings.h
+++ b/genplugouts/GlobalChange/PhpSettings.h
@@ -4,7 +4,7 @@
 #ifdef WITHPHP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
 
@@ -29,41 +29,41 @@ class PhpSettings : public UmlSettings
 
     // returns the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PHP one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PHP code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PHP code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -74,68 +74,68 @@ class PhpSettings : public UmlSettings
     static bool set_IsGenerateJavadocStyleComment(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of an relation
-    static const Q3CString & relationDecl();
+    static const QByteArray & relationDecl();
 
     // set the default definition of an relation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(Q3CString v);
+    static bool set_RelationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -153,23 +153,23 @@ class PhpSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -212,29 +212,29 @@ class PhpSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl;
+    static QByteArray _rel_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
 #ifndef WITHJAVA
     static aVisibility _get_visibility;
 #endif
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
@@ -242,15 +242,29 @@ class PhpSettings : public UmlSettings
     static aVisibility _set_visibility;
 #endif
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
+
+    static QByteArray _ext;
+
+    static QByteArray _dir_regexp;
+
+    static bool _dir_regexp_case_sensitive;
 
-    static Q3CString _ext;
+    static QByteArray _file_regexp;
 
+    static bool _file_regexp_case_sensitive;
     static bool _is_generate_javadoc_comment;
+    static bool _req_with_path;
+
+    static bool _is_relative_path;
+
+    static bool _is_root_relative_path;
+
+    static bool _is_force_namespace_gen;
 
 
 protected:
diff --git a/genplugouts/GlobalChange/PythonSettings.cpp b/genplugouts/GlobalChange/PythonSettings.cpp
index f14fabfd5..77558457d 100644
--- a/genplugouts/GlobalChange/PythonSettings.cpp
+++ b/genplugouts/GlobalChange/PythonSettings.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool PythonSettings::isPython_2_2()
 {
     read_if_needed_();
@@ -26,7 +26,7 @@ bool PythonSettings::set_IsPython_2_2(bool y)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::indentStep()
+const QByteArray & PythonSettings::indentStep()
 {
     read_if_needed_();
     return _indent_step;
@@ -56,22 +56,22 @@ bool PythonSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PythonSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -84,29 +84,29 @@ bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::classStereotype(const Q3CString & s)
+QByteArray PythonSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -119,32 +119,32 @@ bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::get_import(const Q3CString & s)
+QByteArray PythonSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool PythonSettings::set_Import(Q3CString s, Q3CString v)
+bool PythonSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonImportCmd, (const char *)s, (const char *)v); //[jasa] handle ambiguous call
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -155,14 +155,14 @@ bool PythonSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::rootDir()
+const QByteArray & PythonSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PythonSettings::set_RootDir(Q3CString v)
+bool PythonSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRootdirCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -174,14 +174,14 @@ bool PythonSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceContent()
+const QByteArray & PythonSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PythonSettings::set_SourceContent(Q3CString v)
+bool PythonSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceContentCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -193,14 +193,14 @@ bool PythonSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceExtension()
+const QByteArray & PythonSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PythonSettings::set_SourceExtension(Q3CString v)
+bool PythonSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceExtensionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -212,14 +212,14 @@ bool PythonSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::classDecl()
+const QByteArray & PythonSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PythonSettings::set_ClassDecl(Q3CString v)
+bool PythonSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -231,14 +231,14 @@ bool PythonSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::externalClassDecl()
+const QByteArray & PythonSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PythonSettings::set_ExternalClassDecl(Q3CString v)
+bool PythonSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonExternalClassDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -250,14 +250,14 @@ bool PythonSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumDecl()
+QByteArray PythonSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PythonSettings::set_EnumDecl(Q3CString v)
+bool PythonSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -269,14 +269,14 @@ bool PythonSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::attributeDecl(const char * multiplicity)
+const QByteArray & PythonSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[mult_column(multiplicity)];
 }
 
-bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool PythonSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonAttributeDeclCmd, multiplicity, (const char *)v); //[jasa] handle ambiguous call
@@ -289,14 +289,14 @@ bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumItemDecl()
+QByteArray PythonSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PythonSettings::set_EnumItemDecl(Q3CString v)
+bool PythonSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumItemDeclCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -308,7 +308,7 @@ bool PythonSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -328,14 +328,14 @@ bool PythonSettings::set_RelationDecl(bool by_value, const char * multiplicity,
         return FALSE;
 }
 
-const Q3CString & PythonSettings::operationDef()
+const QByteArray & PythonSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PythonSettings::set_OperationDef(Q3CString v)
+bool PythonSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonOperationDefCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -347,14 +347,14 @@ bool PythonSettings::set_OperationDef(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::getName()
+const QByteArray & PythonSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PythonSettings::set_GetName(Q3CString v)
+bool PythonSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonGetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -366,14 +366,14 @@ bool PythonSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::setName()
+const QByteArray & PythonSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PythonSettings::set_SetName(Q3CString v)
+bool PythonSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSetNameCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -385,7 +385,7 @@ bool PythonSettings::set_SetName(Q3CString v)
         return FALSE;
 }
 
-unsigned PythonSettings::mult_column(const Q3CString & mult)
+unsigned PythonSettings::mult_column(const QByteArray & mult)
 {
     return (mult.isEmpty() || (mult == "1")) ? 0 : 1;
 }
@@ -394,33 +394,33 @@ bool PythonSettings::_defined;
 
 bool PythonSettings::_2_2;
 
-Q3CString PythonSettings::_indent_step;
+QByteArray PythonSettings::_indent_step;
 
-Q3CString PythonSettings::_root;
+QByteArray PythonSettings::_root;
 
-Q3CString PythonSettings::_class_decl;
+QByteArray PythonSettings::_class_decl;
 
-Q3CString PythonSettings::_external_class_decl;
+QByteArray PythonSettings::_external_class_decl;
 
-Q3CString PythonSettings::_enum_decl;
+QByteArray PythonSettings::_enum_decl;
 
-Q3CString PythonSettings::_attr_decl[2/*multiplicity*/];
+QByteArray PythonSettings::_attr_decl[2/*multiplicity*/];
 
-Q3CString PythonSettings::_enum_item_decl;
+QByteArray PythonSettings::_enum_item_decl;
 
-Q3CString PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
+QByteArray PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-Q3CString PythonSettings::_oper_def;
+QByteArray PythonSettings::_oper_def;
 
-Q3CString PythonSettings::_get_name;
+QByteArray PythonSettings::_get_name;
 
-Q3CString PythonSettings::_set_name;
+QByteArray PythonSettings::_set_name;
 
-Q3CString PythonSettings::_src_content;
+QByteArray PythonSettings::_src_content;
 
-Q3CString PythonSettings::_ext;
+QByteArray PythonSettings::_ext;
 
-Q3Dict<Q3CString> PythonSettings::_map_imports;
+QHash<QByteArray, QByteArray*> PythonSettings::_map_imports;
 
 void PythonSettings::read_()
 {
@@ -430,8 +430,8 @@ void PythonSettings::read_()
 
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -447,13 +447,13 @@ void PythonSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/GlobalChange/PythonSettings.h b/genplugouts/GlobalChange/PythonSettings.h
index 5b32a95f4..a5f985577 100644
--- a/genplugouts/GlobalChange/PythonSettings.h
+++ b/genplugouts/GlobalChange/PythonSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHPYTHON
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PYTHON, configured through
 // the 'Generation settings' dialog.
@@ -26,7 +26,7 @@ class PythonSettings : public UmlSettings
     static bool set_IsPython_2_2(bool y);
 
     // return the  default indent step
-    static const Q3CString & indentStep();
+    static const QByteArray & indentStep();
 
     // set default indent step
     //
@@ -45,109 +45,109 @@ class PythonSettings : public UmlSettings
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Python type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Python type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PYTHON code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PYTHON code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -156,71 +156,71 @@ class PythonSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
 
 private:
     // never called !
     PythonSettings() {};
 
-    static unsigned mult_column(const Q3CString & mult);
+    static unsigned mult_column(const QByteArray & mult);
 
     static bool _defined;
 
     static bool _2_2;
 
-    static Q3CString _indent_step;
+    static QByteArray _indent_step;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _attr_decl[2/*multiplicity*/];
+    static QByteArray _attr_decl[2/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][2/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/GlobalChange/SlotAttribute.h b/genplugouts/GlobalChange/SlotAttribute.h
index d1c59eabf..768d9c729 100644
--- a/genplugouts/GlobalChange/SlotAttribute.h
+++ b/genplugouts/GlobalChange/SlotAttribute.h
@@ -1,21 +1,21 @@
 #ifndef _SLOTATTRIBUTE_H
 #define _SLOTATTRIBUTE_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 class UmlAttribute;
 
 struct SlotAttribute {
     UmlAttribute * attribute;
 
-    Q3CString value;
+    QByteArray value;
 
     // because of QValueList use
     SlotAttribute() : attribute(0) {
     }
 
-    SlotAttribute(UmlAttribute * a, Q3CString v) : attribute(a), value(v) {
+    SlotAttribute(UmlAttribute * a, QByteArray v) : attribute(a), value(v) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/StateBehavior.h b/genplugouts/GlobalChange/StateBehavior.h
index 91a42cb82..66ac09c00 100644
--- a/genplugouts/GlobalChange/StateBehavior.h
+++ b/genplugouts/GlobalChange/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/GlobalChange/TransitionBehavior.h b/genplugouts/GlobalChange/TransitionBehavior.h
index 856ede3c0..8714c541d 100644
--- a/genplugouts/GlobalChange/TransitionBehavior.h
+++ b/genplugouts/GlobalChange/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/GlobalChange/UmlAccessVariableValueAction.h b/genplugouts/GlobalChange/UmlAccessVariableValueAction.h
index dc92b3e25..8d4f9ae87 100644
--- a/genplugouts/GlobalChange/UmlAccessVariableValueAction.h
+++ b/genplugouts/GlobalChange/UmlAccessVariableValueAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseAccessVariableValueAction.h"
-#include <q3cstring.h>
+
 
 class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAccessVariableValueAction(void * id, const Q3CString & s) : UmlBaseAccessVariableValueAction(id, s) {
+    UmlAccessVariableValueAction(void * id, const QByteArray & s) : UmlBaseAccessVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivity.h b/genplugouts/GlobalChange/UmlActivity.h
index 8f9886b0e..6f8bd5244 100644
--- a/genplugouts/GlobalChange/UmlActivity.h
+++ b/genplugouts/GlobalChange/UmlActivity.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivity.h"
-#include <q3cstring.h>
+
 
 class UmlActivity : public UmlBaseActivity
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivity(void * id, const Q3CString & s) : UmlBaseActivity(id, s) {
+    UmlActivity(void * id, const QByteArray & s) : UmlBaseActivity(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityAction.h b/genplugouts/GlobalChange/UmlActivityAction.h
index f359c755a..3079e18ba 100644
--- a/genplugouts/GlobalChange/UmlActivityAction.h
+++ b/genplugouts/GlobalChange/UmlActivityAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlActivityAction : public UmlBaseActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityAction(void * id, const Q3CString & s) : UmlBaseActivityAction(id, s) {
+    UmlActivityAction(void * id, const QByteArray & s) : UmlBaseActivityAction(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityActionClasses.h b/genplugouts/GlobalChange/UmlActivityActionClasses.h
index 15677a746..62369cdab 100644
--- a/genplugouts/GlobalChange/UmlActivityActionClasses.h
+++ b/genplugouts/GlobalChange/UmlActivityActionClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityActionClasses.h"
-#include <q3cstring.h>
+
 
 class UmlSendObjectAction : public UmlBaseSendObjectAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendObjectAction(void * id, const Q3CString & s) : UmlBaseSendObjectAction(id, s) {
+    UmlSendObjectAction(void * id, const QByteArray & s) : UmlBaseSendObjectAction(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlUnmarshallAction : public UmlBaseUnmarshallAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlUnmarshallAction(void * id, const Q3CString & s) : UmlBaseUnmarshallAction(id, s) {
+    UmlUnmarshallAction(void * id, const QByteArray & s) : UmlBaseUnmarshallAction(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlSendSignalAction : public UmlBaseSendSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendSignalAction(void * id, const Q3CString & s) : UmlBaseSendSignalAction(id, s) {
+    UmlSendSignalAction(void * id, const QByteArray & s) : UmlBaseSendSignalAction(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlBroadcastSignalAction : public UmlBaseBroadcastSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBroadcastSignalAction(void * id, const Q3CString & s) : UmlBaseBroadcastSignalAction(id, s) {
+    UmlBroadcastSignalAction(void * id, const QByteArray & s) : UmlBaseBroadcastSignalAction(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlValueSpecificationAction : public UmlBaseValueSpecificationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlValueSpecificationAction(void * id, const Q3CString & s) : UmlBaseValueSpecificationAction(id, s) {
+    UmlValueSpecificationAction(void * id, const QByteArray & s) : UmlBaseValueSpecificationAction(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlOpaqueAction : public UmlBaseOpaqueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOpaqueAction(void * id, const Q3CString & s) : UmlBaseOpaqueAction(id, s) {
+    UmlOpaqueAction(void * id, const QByteArray & s) : UmlBaseOpaqueAction(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlAcceptEventAction : public UmlBaseAcceptEventAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptEventAction(void * id, const Q3CString & s) : UmlBaseAcceptEventAction(id, s) {
+    UmlAcceptEventAction(void * id, const QByteArray & s) : UmlBaseAcceptEventAction(id, s) {
     }
 
 };
@@ -72,7 +72,7 @@ class UmlCallOperationAction : public UmlBaseCallOperationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallOperationAction(void * id, const Q3CString & s) : UmlBaseCallOperationAction(id, s) {
+    UmlCallOperationAction(void * id, const QByteArray & s) : UmlBaseCallOperationAction(id, s) {
     }
 
 };
@@ -81,7 +81,7 @@ class UmlCallBehaviorAction : public UmlBaseCallBehaviorAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallBehaviorAction(void * id, const Q3CString & s) : UmlBaseCallBehaviorAction(id, s) {
+    UmlCallBehaviorAction(void * id, const QByteArray & s) : UmlBaseCallBehaviorAction(id, s) {
     }
 
 };
@@ -90,7 +90,7 @@ class UmlClearVariableValueAction : public UmlBaseClearVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClearVariableValueAction(void * id, const Q3CString & s) : UmlBaseClearVariableValueAction(id, s) {
+    UmlClearVariableValueAction(void * id, const QByteArray & s) : UmlBaseClearVariableValueAction(id, s) {
     }
 
 };
@@ -99,7 +99,7 @@ class UmlReadVariableValueAction : public UmlBaseReadVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReadVariableValueAction(void * id, const Q3CString & s) : UmlBaseReadVariableValueAction(id, s) {
+    UmlReadVariableValueAction(void * id, const QByteArray & s) : UmlBaseReadVariableValueAction(id, s) {
     }
 
 };
@@ -108,7 +108,7 @@ class UmlWriteVariableValueAction : public UmlBaseWriteVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlWriteVariableValueAction(void * id, const Q3CString & s) : UmlBaseWriteVariableValueAction(id, s) {
+    UmlWriteVariableValueAction(void * id, const QByteArray & s) : UmlBaseWriteVariableValueAction(id, s) {
     }
 
 };
@@ -117,7 +117,7 @@ class UmlAddVariableValueAction : public UmlBaseAddVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAddVariableValueAction(void * id, const Q3CString & s) : UmlBaseAddVariableValueAction(id, s) {
+    UmlAddVariableValueAction(void * id, const QByteArray & s) : UmlBaseAddVariableValueAction(id, s) {
     }
 
 };
@@ -126,7 +126,7 @@ class UmlRemoveVariableValueAction : public UmlBaseRemoveVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRemoveVariableValueAction(void * id, const Q3CString & s) : UmlBaseRemoveVariableValueAction(id, s) {
+    UmlRemoveVariableValueAction(void * id, const QByteArray & s) : UmlBaseRemoveVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityControlNode.h b/genplugouts/GlobalChange/UmlActivityControlNode.h
index 8ebf04bf7..1396fd3e2 100644
--- a/genplugouts/GlobalChange/UmlActivityControlNode.h
+++ b/genplugouts/GlobalChange/UmlActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNode.h"
-#include <q3cstring.h>
+
 
 class UmlActivityControlNode : public UmlBaseActivityControlNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityControlNode(void * id, const Q3CString & s) : UmlBaseActivityControlNode(id, s) {
+    UmlActivityControlNode(void * id, const QByteArray & s) : UmlBaseActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityControlNodeClasses.h b/genplugouts/GlobalChange/UmlActivityControlNodeClasses.h
index f698adeca..2be0cd946 100644
--- a/genplugouts/GlobalChange/UmlActivityControlNodeClasses.h
+++ b/genplugouts/GlobalChange/UmlActivityControlNodeClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNodeClasses.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode : public UmlBaseInitialActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInitialActivityNode(void * id, const Q3CString & s) : UmlBaseInitialActivityNode(id, s) {
+    UmlInitialActivityNode(void * id, const QByteArray & s) : UmlBaseInitialActivityNode(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlFlowFinalActivityNode : public UmlBaseFlowFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlFlowFinalActivityNode(void * id, const Q3CString & s) : UmlBaseFlowFinalActivityNode(id, s) {
+    UmlFlowFinalActivityNode(void * id, const QByteArray & s) : UmlBaseFlowFinalActivityNode(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlActivityFinalActivityNode : public UmlBaseActivityFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityFinalActivityNode(void * id, const Q3CString & s) : UmlBaseActivityFinalActivityNode(id, s) {
+    UmlActivityFinalActivityNode(void * id, const QByteArray & s) : UmlBaseActivityFinalActivityNode(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlDecisionActivityNode : public UmlBaseDecisionActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDecisionActivityNode(void * id, const Q3CString & s) : UmlBaseDecisionActivityNode(id, s) {
+    UmlDecisionActivityNode(void * id, const QByteArray & s) : UmlBaseDecisionActivityNode(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlMergeActivityNode : public UmlBaseMergeActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlMergeActivityNode(void * id, const Q3CString & s) : UmlBaseMergeActivityNode(id, s) {
+    UmlMergeActivityNode(void * id, const QByteArray & s) : UmlBaseMergeActivityNode(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlForkActivityNode : public UmlBaseForkActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlForkActivityNode(void * id, const Q3CString & s) : UmlBaseForkActivityNode(id, s) {
+    UmlForkActivityNode(void * id, const QByteArray & s) : UmlBaseForkActivityNode(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlJoinActivityNode : public UmlBaseJoinActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlJoinActivityNode(void * id, const Q3CString & s) : UmlBaseJoinActivityNode(id, s) {
+    UmlJoinActivityNode(void * id, const QByteArray & s) : UmlBaseJoinActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityDiagram.h b/genplugouts/GlobalChange/UmlActivityDiagram.h
index 4b48b12f2..b45a0410a 100644
--- a/genplugouts/GlobalChange/UmlActivityDiagram.h
+++ b/genplugouts/GlobalChange/UmlActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseActivityDiagram.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 // This class manages 'activity diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -15,7 +15,7 @@ class UmlActivityDiagram : public UmlBaseActivityDiagram, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityDiagram(void * id, const Q3CString & s) : UmlBaseActivityDiagram(id, s) {
+    UmlActivityDiagram(void * id, const QByteArray & s) : UmlBaseActivityDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityNode.h b/genplugouts/GlobalChange/UmlActivityNode.h
index 8429d2396..770c06359 100644
--- a/genplugouts/GlobalChange/UmlActivityNode.h
+++ b/genplugouts/GlobalChange/UmlActivityNode.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityNode.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityNode : public UmlBaseActivityNode, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityNode(void * id, const Q3CString & s) : UmlBaseActivityNode(id, s) {
+    UmlActivityNode(void * id, const QByteArray & s) : UmlBaseActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityObject.h b/genplugouts/GlobalChange/UmlActivityObject.h
index f75bccd9b..22de36492 100644
--- a/genplugouts/GlobalChange/UmlActivityObject.h
+++ b/genplugouts/GlobalChange/UmlActivityObject.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityObject.h"
-#include <q3cstring.h>
+
 
 class UmlActivityObject : public UmlBaseActivityObject
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityObject(void * id, const Q3CString & s) : UmlBaseActivityObject(id, s) {
+    UmlActivityObject(void * id, const QByteArray & s) : UmlBaseActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityParameter.h b/genplugouts/GlobalChange/UmlActivityParameter.h
index b51b0fec0..57474b452 100644
--- a/genplugouts/GlobalChange/UmlActivityParameter.h
+++ b/genplugouts/GlobalChange/UmlActivityParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityParameter.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter : public UmlBaseActivityParameter
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityParameter(void * id, const Q3CString & s) : UmlBaseActivityParameter(id, s) {
+    UmlActivityParameter(void * id, const QByteArray & s) : UmlBaseActivityParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityPin.h b/genplugouts/GlobalChange/UmlActivityPin.h
index 5d7ae2e0f..a53330fe2 100644
--- a/genplugouts/GlobalChange/UmlActivityPin.h
+++ b/genplugouts/GlobalChange/UmlActivityPin.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityPin.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin : public UmlBaseActivityPin
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPin(void * id, const Q3CString & s) : UmlBaseActivityPin(id, s) {
+    UmlActivityPin(void * id, const QByteArray & s) : UmlBaseActivityPin(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlActivityRegion.h b/genplugouts/GlobalChange/UmlActivityRegion.h
index 420b4bde2..1db9fe05f 100644
--- a/genplugouts/GlobalChange/UmlActivityRegion.h
+++ b/genplugouts/GlobalChange/UmlActivityRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityRegion.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityRegion : public UmlBaseActivityRegion, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityRegion(void * id, const Q3CString & s) : UmlBaseActivityRegion(id, s) {
+    UmlActivityRegion(void * id, const QByteArray & s) : UmlBaseActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlArtifact.cpp b/genplugouts/GlobalChange/UmlArtifact.cpp
index c95c5289c..c3aadc72a 100644
--- a/genplugouts/GlobalChange/UmlArtifact.cpp
+++ b/genplugouts/GlobalChange/UmlArtifact.cpp
@@ -2,20 +2,20 @@
 #include "UmlArtifact.h"
 #include "Context.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlArtifact::change(Context & ctx)
 {
     if (ctx.onArtifact() && ctx.match_stereotype(stereotype())) {
         if (ctx.cpp()) {
-            const Q3CString & h = cppHeader();
+            const QByteArray & h = cppHeader();
 
             if (!h.isEmpty() && ctx.match(h)) {
                 if (!set_CppHeader(ctx.replace(h)))
                     ctx.err();
             }
 
-            const Q3CString & c = cppSource();
+            const QByteArray & c = cppSource();
 
             if (!h.isEmpty() && ctx.match(c)) {
                 if (!set_CppSource(ctx.replace(c)))
@@ -24,7 +24,7 @@ void UmlArtifact::change(Context & ctx)
         }
 
         if (ctx.java()) {
-            const Q3CString & c = javaSource();
+            const QByteArray & c = javaSource();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_JavaSource(ctx.replace(c)))
@@ -33,7 +33,7 @@ void UmlArtifact::change(Context & ctx)
         }
 
         if (ctx.php()) {
-            const Q3CString & c = phpSource();
+            const QByteArray & c = phpSource();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PhpSource(ctx.replace(c)))
@@ -42,7 +42,7 @@ void UmlArtifact::change(Context & ctx)
         }
 
         if (ctx.python()) {
-            const Q3CString & c = pythonSource();
+            const QByteArray & c = pythonSource();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PythonSource(ctx.replace(c)))
@@ -51,7 +51,7 @@ void UmlArtifact::change(Context & ctx)
         }
 
         if (ctx.idl()) {
-            const Q3CString & c = idlSource();
+            const QByteArray & c = idlSource();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_IdlSource(ctx.replace(c)))
diff --git a/genplugouts/GlobalChange/UmlArtifact.h b/genplugouts/GlobalChange/UmlArtifact.h
index 4b6cd6555..4417b415d 100644
--- a/genplugouts/GlobalChange/UmlArtifact.h
+++ b/genplugouts/GlobalChange/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -13,7 +13,7 @@ class Context;
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
     virtual void change(Context & ctx);
 
diff --git a/genplugouts/GlobalChange/UmlAttribute.cpp b/genplugouts/GlobalChange/UmlAttribute.cpp
index 37515e0c0..fa4ad411c 100644
--- a/genplugouts/GlobalChange/UmlAttribute.cpp
+++ b/genplugouts/GlobalChange/UmlAttribute.cpp
@@ -2,13 +2,13 @@
 #include "UmlAttribute.h"
 #include "Context.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlAttribute::change(Context & ctx)
 {
     if (ctx.onAttribute() && ctx.match_stereotype(stereotype())) {
         if (ctx.cpp()) {
-            const Q3CString & c = cppDecl();
+            const QByteArray & c = cppDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_CppDecl(ctx.replace(c)))
@@ -17,7 +17,7 @@ void UmlAttribute::change(Context & ctx)
         }
 
         if (ctx.java()) {
-            const Q3CString & c = javaDecl();
+            const QByteArray & c = javaDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_JavaDecl(ctx.replace(c)))
@@ -26,7 +26,7 @@ void UmlAttribute::change(Context & ctx)
         }
 
         if (ctx.php()) {
-            const Q3CString & c = phpDecl();
+            const QByteArray & c = phpDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PhpDecl(ctx.replace(c)))
@@ -35,7 +35,7 @@ void UmlAttribute::change(Context & ctx)
         }
 
         if (ctx.python()) {
-            const Q3CString & c = pythonDecl();
+            const QByteArray & c = pythonDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PythonDecl(ctx.replace(c)))
@@ -44,7 +44,7 @@ void UmlAttribute::change(Context & ctx)
         }
 
         if (ctx.idl()) {
-            const Q3CString & c = idlDecl();
+            const QByteArray & c = idlDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_IdlDecl(ctx.replace(c)))
diff --git a/genplugouts/GlobalChange/UmlAttribute.h b/genplugouts/GlobalChange/UmlAttribute.h
index 9da206d83..7a9f7a621 100644
--- a/genplugouts/GlobalChange/UmlAttribute.h
+++ b/genplugouts/GlobalChange/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -14,7 +14,7 @@ class Context;
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
     virtual void change(Context & ctx);
 
diff --git a/genplugouts/GlobalChange/UmlBaseAccessVariableValueAction.h b/genplugouts/GlobalChange/UmlBaseAccessVariableValueAction.h
index 311fefa08..0e2856d02 100644
--- a/genplugouts/GlobalChange/UmlBaseAccessVariableValueAction.h
+++ b/genplugouts/GlobalChange/UmlBaseAccessVariableValueAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlItem;
 
@@ -11,7 +11,7 @@ class UmlBaseAccessVariableValueAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAccessVariableValueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAccessVariableValueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
diff --git a/genplugouts/GlobalChange/UmlBaseActivity.cpp b/genplugouts/GlobalChange/UmlBaseActivity.cpp
index 2f992ddd1..45801f46c 100644
--- a/genplugouts/GlobalChange/UmlBaseActivity.cpp
+++ b/genplugouts/GlobalChange/UmlBaseActivity.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassView.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivity * UmlBaseActivity::create(UmlClassView * parent, const char * s)
 {
@@ -17,7 +17,7 @@ anItemKind UmlBaseActivity::kind()
     return anActivity;
 }
 
-const Q3CString & UmlBaseActivity::preCondition()
+const QByteArray & UmlBaseActivity::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivity::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::postCondition()
+const QByteArray & UmlBaseActivity::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -40,7 +40,7 @@ bool UmlBaseActivity::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivity::cppPreCondition()
+const QByteArray & UmlBaseActivity::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -51,7 +51,7 @@ bool UmlBaseActivity::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::cppPostCondition()
+const QByteArray & UmlBaseActivity::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -64,7 +64,7 @@ bool UmlBaseActivity::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivity::javaPreCondition()
+const QByteArray & UmlBaseActivity::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -75,7 +75,7 @@ bool UmlBaseActivity::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::javaPostCondition()
+const QByteArray & UmlBaseActivity::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/GlobalChange/UmlBaseActivity.h b/genplugouts/GlobalChange/UmlBaseActivity.h
index a0eca47eb..0d009bd8f 100644
--- a/genplugouts/GlobalChange/UmlBaseActivity.h
+++ b/genplugouts/GlobalChange/UmlBaseActivity.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivity;
 class UmlClassView;
@@ -26,13 +26,13 @@ class UmlBaseActivity : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivity(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivity(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -40,7 +40,7 @@ class UmlBaseActivity : public UmlItem
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -49,7 +49,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -57,7 +57,7 @@ class UmlBaseActivity : public UmlItem
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -75,7 +75,7 @@ class UmlBaseActivity : public UmlItem
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -117,20 +117,20 @@ class UmlBaseActivity : public UmlItem
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     bool _read_only;
diff --git a/genplugouts/GlobalChange/UmlBaseActivityAction.cpp b/genplugouts/GlobalChange/UmlBaseActivityAction.cpp
index fb47b7b1b..de084771d 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityAction.cpp
+++ b/genplugouts/GlobalChange/UmlBaseActivityAction.cpp
@@ -3,9 +3,9 @@
 #include "UmlBaseActivityAction.h"
 #include "UmlDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseActivityAction::preCondition()
+const QByteArray & UmlBaseActivityAction::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -16,7 +16,7 @@ bool UmlBaseActivityAction::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::postCondition()
+const QByteArray & UmlBaseActivityAction::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivityAction::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityAction::cppPreCondition()
+const QByteArray & UmlBaseActivityAction::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -39,7 +39,7 @@ bool UmlBaseActivityAction::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::cppPostCondition()
+const QByteArray & UmlBaseActivityAction::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivityAction::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityAction::javaPreCondition()
+const QByteArray & UmlBaseActivityAction::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -63,7 +63,7 @@ bool UmlBaseActivityAction::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::javaPostCondition()
+const QByteArray & UmlBaseActivityAction::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/GlobalChange/UmlBaseActivityAction.h b/genplugouts/GlobalChange/UmlBaseActivityAction.h
index 4a06ccffe..a0c197cab 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityAction.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlDiagram;
 
@@ -11,13 +11,13 @@ class UmlBaseActivityAction : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityAction(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityAction(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -25,7 +25,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -34,7 +34,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -42,7 +42,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -52,7 +52,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -60,7 +60,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -86,20 +86,20 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     UmlDiagram * _assoc_diagram;
diff --git a/genplugouts/GlobalChange/UmlBaseActivityActionClasses.cpp b/genplugouts/GlobalChange/UmlBaseActivityActionClasses.cpp
index adeceb749..eba28a614 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityActionClasses.cpp
+++ b/genplugouts/GlobalChange/UmlBaseActivityActionClasses.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlSendObjectAction * UmlBaseSendObjectAction::create(UmlItem * parent, const char * s)
 {
@@ -57,7 +57,7 @@ anItemKind UmlBaseValueSpecificationAction::kind()
     return aValueSpecificationAction;
 }
 
-const Q3CString & UmlBaseValueSpecificationAction::value()
+const QByteArray & UmlBaseValueSpecificationAction::value()
 {
     read_if_needed_();
     return _value;
@@ -69,7 +69,7 @@ bool UmlBaseValueSpecificationAction::set_Value(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseValueSpecificationAction::cppValue()
+const QByteArray & UmlBaseValueSpecificationAction::cppValue()
 {
     read_if_needed_();
     return _cpp_value;
@@ -82,7 +82,7 @@ bool UmlBaseValueSpecificationAction::set_CppValue(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseValueSpecificationAction::javaValue()
+const QByteArray & UmlBaseValueSpecificationAction::javaValue()
 {
     read_if_needed_();
     return _java_value;
@@ -138,7 +138,7 @@ anItemKind UmlBaseOpaqueAction::kind()
     return anOpaqueAction;
 }
 
-const Q3CString & UmlBaseOpaqueAction::behavior()
+const QByteArray & UmlBaseOpaqueAction::behavior()
 {
     read_if_needed_();
     return _behavior;
@@ -150,7 +150,7 @@ bool UmlBaseOpaqueAction::set_Behavior(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOpaqueAction::cppBehavior()
+const QByteArray & UmlBaseOpaqueAction::cppBehavior()
 {
     read_if_needed_();
     return _cpp_behavior;
@@ -163,7 +163,7 @@ bool UmlBaseOpaqueAction::set_CppBehavior(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOpaqueAction::javaBehavior()
+const QByteArray & UmlBaseOpaqueAction::javaBehavior()
 {
     read_if_needed_();
     return _java_behavior;
@@ -241,7 +241,7 @@ bool UmlBaseAcceptEventAction::set_isTimeEvent(bool v)
     return set_it_(_timeevent, v, setTimeEventCmd);
 }
 
-const Q3CString & UmlBaseAcceptEventAction::trigger()
+const QByteArray & UmlBaseAcceptEventAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -253,7 +253,7 @@ bool UmlBaseAcceptEventAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptEventAction::cppTrigger()
+const QByteArray & UmlBaseAcceptEventAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -266,7 +266,7 @@ bool UmlBaseAcceptEventAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptEventAction::javaTrigger()
+const QByteArray & UmlBaseAcceptEventAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
diff --git a/genplugouts/GlobalChange/UmlBaseActivityActionClasses.h b/genplugouts/GlobalChange/UmlBaseActivityActionClasses.h
index 1a3b14b5f..1a826cd23 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityActionClasses.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityActionClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityAction.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlOnSignalAction.h"
 #include "UmlAccessVariableValueAction.h"
 
@@ -41,7 +41,7 @@ class UmlBaseSendObjectAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseSendObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -62,7 +62,7 @@ class UmlBaseUnmarshallAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUnmarshallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseUnmarshallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -83,7 +83,7 @@ class UmlBaseSendSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseSendSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -104,7 +104,7 @@ class UmlBaseBroadcastSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseBroadcastSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseBroadcastSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -125,13 +125,13 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseValueSpecificationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseValueSpecificationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the value
-    const Q3CString & value();
+    const QByteArray & value();
 
     // set the value
     //
@@ -140,7 +140,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the value in C++
-    const Q3CString & cppValue();
+    const QByteArray & cppValue();
 
     // set the value in C++
     //
@@ -150,7 +150,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the value in Java
-    const Q3CString & javaValue();
+    const QByteArray & javaValue();
 
     // set the value in Java
     //
@@ -168,14 +168,14 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 
 private:
-    Q3CString _value;
+    QByteArray _value;
 
 #ifdef WITHCPP
-    Q3CString _cpp_value;
+    QByteArray _cpp_value;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_value;
+    QByteArray _java_value;
 #endif
 
 
@@ -208,13 +208,13 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOpaqueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOpaqueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the behavior
-    const Q3CString & behavior();
+    const QByteArray & behavior();
 
     // set the behavior
     //
@@ -223,7 +223,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the behavior in C++
-    const Q3CString & cppBehavior();
+    const QByteArray & cppBehavior();
 
     // set the behavior in C++
     //
@@ -233,7 +233,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the behavior in Java
-    const Q3CString & javaBehavior();
+    const QByteArray & javaBehavior();
 
     // set the behavior in Java
     //
@@ -251,14 +251,14 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 
 private:
-    Q3CString _behavior;
+    QByteArray _behavior;
 
 #ifdef WITHCPP
-    Q3CString _cpp_behavior;
+    QByteArray _cpp_behavior;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_behavior;
+    QByteArray _java_behavior;
 #endif
 
 
@@ -291,7 +291,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptEventAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptEventAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -313,7 +313,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     bool set_isTimeEvent(bool v);
 
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -322,7 +322,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -332,7 +332,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -354,14 +354,14 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
     bool _timeevent;
 
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
@@ -394,7 +394,7 @@ class UmlBaseCallOperationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallOperationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallOperationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -443,7 +443,7 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallBehaviorAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallBehaviorAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -492,7 +492,7 @@ class UmlBaseClearVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClearVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseClearVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -513,7 +513,7 @@ class UmlBaseReadVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReadVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseReadVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -534,7 +534,7 @@ class UmlBaseWriteVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseWriteVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseWriteVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -555,7 +555,7 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAddVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseAddVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -594,7 +594,7 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRemoveVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseRemoveVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
diff --git a/genplugouts/GlobalChange/UmlBaseActivityControlNode.h b/genplugouts/GlobalChange/UmlBaseActivityControlNode.h
index 9f1c0931a..3d07467c1 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityControlNode.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityControlNode : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityControlNode(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityControlNode(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseActivityControlNodeClasses.h b/genplugouts/GlobalChange/UmlBaseActivityControlNodeClasses.h
index 84dd781f7..1ef579e8c 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityControlNodeClasses.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityControlNodeClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityControlNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode;
 class UmlItem;
@@ -31,7 +31,7 @@ class UmlBaseInitialActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseInitialActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -52,7 +52,7 @@ class UmlBaseFlowFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlowFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseFlowFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -73,7 +73,7 @@ class UmlBaseActivityFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseActivityFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -94,7 +94,7 @@ class UmlBaseDecisionActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDecisionActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseDecisionActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -115,7 +115,7 @@ class UmlBaseMergeActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseMergeActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseMergeActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -136,7 +136,7 @@ class UmlBaseForkActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseForkActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -157,7 +157,7 @@ class UmlBaseJoinActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseJoinActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseActivityDiagram.h b/genplugouts/GlobalChange/UmlBaseActivityDiagram.h
index 8ed6ca9d6..67d2ff8af 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseActivityDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseActivityDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseActivityNode.h b/genplugouts/GlobalChange/UmlBaseActivityNode.h
index 9018d75ce..54536ed90 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityNode.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityNode : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityNode(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityNode(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseActivityObject.cpp b/genplugouts/GlobalChange/UmlBaseActivityObject.cpp
index 748e7c22b..f96d4a344 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityObject.cpp
+++ b/genplugouts/GlobalChange/UmlBaseActivityObject.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityObject * UmlBaseActivityObject::create(UmlItem * parent, const char * s)
 {
@@ -28,7 +28,7 @@ bool UmlBaseActivityObject::set_Type(const UmlTypeSpec & v)
     return set_it_(_type, v, setTypeCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::multiplicity()
+const QByteArray & UmlBaseActivityObject::multiplicity()
 {
     read_if_needed_();
     return _multiplicity;
@@ -39,7 +39,7 @@ bool UmlBaseActivityObject::set_Multiplicity(const char * v)
     return set_it_(_multiplicity, v, setMultiplicityCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::inState()
+const QByteArray & UmlBaseActivityObject::inState()
 {
     read_if_needed_();
     return _in_state;
@@ -50,7 +50,7 @@ bool UmlBaseActivityObject::set_InState(const char * v)
     return set_it_(_in_state, v, setInStateCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::selection()
+const QByteArray & UmlBaseActivityObject::selection()
 {
     read_if_needed_();
     return _selection;
@@ -62,7 +62,7 @@ bool UmlBaseActivityObject::set_Selection(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityObject::cppSelection()
+const QByteArray & UmlBaseActivityObject::cppSelection()
 {
     read_if_needed_();
     return _cpp_selection;
@@ -75,7 +75,7 @@ bool UmlBaseActivityObject::set_CppSelection(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityObject::javaSelection()
+const QByteArray & UmlBaseActivityObject::javaSelection()
 {
     read_if_needed_();
     return _java_selection;
diff --git a/genplugouts/GlobalChange/UmlBaseActivityObject.h b/genplugouts/GlobalChange/UmlBaseActivityObject.h
index 5c1938905..8b331ae01 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityObject.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityObject.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "anOrdering.h"
 
@@ -28,7 +28,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityObject(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityObject(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
@@ -42,7 +42,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Type(const UmlTypeSpec & v);
 
     // return the multiplicity
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // set the multiplicity
     //
@@ -50,7 +50,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Multiplicity(const char * v);
 
     // return the inState attribute
-    const Q3CString & inState();
+    const QByteArray & inState();
 
     // set the inState attribute
     //
@@ -58,7 +58,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_InState(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -67,7 +67,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -123,18 +123,18 @@ class UmlBaseActivityObject : public UmlActivityNode
 
     UmlTypeSpec _type;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _in_state;
+    QByteArray _in_state;
 
-    Q3CString _selection;
+    QByteArray _selection;
 
 #ifdef WITHCPP
-    Q3CString _cpp_selection;
+    QByteArray _cpp_selection;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_selection;
+    QByteArray _java_selection;
 #endif
 
     anOrdering _ordering : 8;
diff --git a/genplugouts/GlobalChange/UmlBaseActivityParameter.cpp b/genplugouts/GlobalChange/UmlBaseActivityParameter.cpp
index 067b1ba5c..0e5dd560c 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityParameter.cpp
+++ b/genplugouts/GlobalChange/UmlBaseActivityParameter.cpp
@@ -4,7 +4,7 @@
 #include "UmlActivityParameter.h"
 #include "UmlActivity.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityParameter * UmlBaseActivityParameter::create(UmlActivity * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseActivityParameter::kind()
     return anActivityParameter;
 }
 
-const Q3CString & UmlBaseActivityParameter::defaultValue()
+const QByteArray & UmlBaseActivityParameter::defaultValue()
 {
     read_if_needed_();
     return _default_value;
diff --git a/genplugouts/GlobalChange/UmlBaseActivityParameter.h b/genplugouts/GlobalChange/UmlBaseActivityParameter.h
index 1f05aabe8..fcdd9cecc 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityParameter.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityParameter.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter;
 class UmlActivity;
@@ -25,13 +25,13 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityParameter(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityParameter(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 
 public:
     // return the default value
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // set the default value
     //
@@ -48,7 +48,7 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 
 private:
-    Q3CString _default_value;
+    QByteArray _default_value;
 
 
 protected:
diff --git a/genplugouts/GlobalChange/UmlBaseActivityPin.h b/genplugouts/GlobalChange/UmlBaseActivityPin.h
index 52f5d4072..9ef909129 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityPin.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityPin.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin;
 class UmlActivityAction;
@@ -25,7 +25,7 @@ class UmlBaseActivityPin : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPin(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityPin(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseActivityRegion.h b/genplugouts/GlobalChange/UmlBaseActivityRegion.h
index 95e516e75..cf3b637c1 100644
--- a/genplugouts/GlobalChange/UmlBaseActivityRegion.h
+++ b/genplugouts/GlobalChange/UmlBaseActivityRegion.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 
@@ -11,7 +11,7 @@ class UmlBaseActivityRegion : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/GlobalChange/UmlBaseArtifact.cpp b/genplugouts/GlobalChange/UmlBaseArtifact.cpp
index d3707b9e2..0898cb139 100644
--- a/genplugouts/GlobalChange/UmlBaseArtifact.cpp
+++ b/genplugouts/GlobalChange/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         if (_defined)
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+           // _associated.resize(_associated.size() + 1);
+           // _associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] = _associated[last];
 
             _associated.resize(last);
         }
@@ -166,82 +168,82 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseArtifact::phpSource()
+const QByteArray & UmlBaseArtifact::phpSource()
 {
     read_if_needed_();
 
     return _php_src;
 }
 
-bool UmlBaseArtifact::set_PhpSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PhpSource(const QByteArray & s)
 {
     return set_it_(_php_src, s, setPhpSrcCmd);
 }
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseArtifact::pythonSource()
+const QByteArray & UmlBaseArtifact::pythonSource()
 {
     read_if_needed_();
 
     return _python_src;
 }
 
-bool UmlBaseArtifact::set_PythonSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PythonSource(const QByteArray & s)
 {
     return set_it_(_python_src, s, setPythonSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -282,13 +284,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] =  (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/GlobalChange/UmlBaseArtifact.h b/genplugouts/GlobalChange/UmlBaseArtifact.h
index 19359a371..bfe0b9a0b 100644
--- a/genplugouts/GlobalChange/UmlBaseArtifact.h
+++ b/genplugouts/GlobalChange/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,60 +83,60 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPHP
     // returns the Php file definition
-    const Q3CString & phpSource();
+    const QByteArray & phpSource();
 
     // to set the Php file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpSource(const Q3CString & s);
+    bool set_PhpSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPYTHON
     // returns the Python file definition
-    const Q3CString & pythonSource();
+    const QByteArray & pythonSource();
 
     // to set the Python file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonSource(const Q3CString & s);
+    bool set_PythonSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -147,30 +147,30 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_src;
+    QByteArray _php_src;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_src;
+    QByteArray _python_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -210,12 +210,12 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
     friend class UmlBaseClass;
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/GlobalChange/UmlBaseAttribute.cpp b/genplugouts/GlobalChange/UmlBaseAttribute.cpp
index 5a9b4b549..ae721c8dd 100644
--- a/genplugouts/GlobalChange/UmlBaseAttribute.cpp
+++ b/genplugouts/GlobalChange/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -98,7 +98,7 @@ bool UmlBaseAttribute::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -122,7 +122,7 @@ bool UmlBaseAttribute::set_Type(const UmlTypeSpec & t)
     return set_it_(_type, t, setTypeCmd);
 }
 
-const Q3CString & UmlBaseAttribute::multiplicity()
+const QByteArray & UmlBaseAttribute::multiplicity()
 {
     read_if_needed_();
 
@@ -215,7 +215,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/GlobalChange/UmlBaseAttribute.h b/genplugouts/GlobalChange/UmlBaseAttribute.h
index 766a99f05..d3094bdf4 100644
--- a/genplugouts/GlobalChange/UmlBaseAttribute.h
+++ b/genplugouts/GlobalChange/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -62,7 +62,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -78,7 +78,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_Type(const UmlTypeSpec & t);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -125,7 +125,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -163,9 +163,9 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient : 1;
 #endif
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -177,13 +177,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -223,7 +223,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/GlobalChange/UmlBaseChoicePseudoState.h b/genplugouts/GlobalChange/UmlBaseChoicePseudoState.h
index fb682dd91..8d15fc093 100644
--- a/genplugouts/GlobalChange/UmlBaseChoicePseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseClass.cpp b/genplugouts/GlobalChange/UmlBaseClass.cpp
index cb2f5544b..34ab5a54c 100644
--- a/genplugouts/GlobalChange/UmlBaseClass.cpp
+++ b/genplugouts/GlobalChange/UmlBaseClass.cpp
@@ -11,8 +11,8 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -47,11 +47,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -83,11 +83,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -132,17 +132,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -370,7 +370,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -385,7 +385,7 @@ UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
     return (UmlClass *) UmlBaseItem::read_();
 }
 
-UmlClass * UmlBaseClass::findStereotype(Q3CString s, bool caseSensitive)
+UmlClass * UmlBaseClass::findStereotype(QByteArray s, bool caseSensitive)
 {
     UmlCom::send_cmd(packageGlobalCmd, findStereotypeCmd,
                      (caseSensitive) ? "y" : "n", (const char *) s);
@@ -403,15 +403,15 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -423,9 +423,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray, UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -433,7 +433,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/GlobalChange/UmlBaseClass.h b/genplugouts/GlobalChange/UmlBaseClass.h
index b297e2cf6..c31cbe36f 100644
--- a/genplugouts/GlobalChange/UmlBaseClass.h
+++ b/genplugouts/GlobalChange/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+
+
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -54,7 +54,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -77,7 +77,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -100,7 +100,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -224,11 +224,11 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // Return the class supporting the stereotype corresponding to
     // the first parameter being 'profile_name:stereotype_name', or 0/null
-    static UmlClass * findStereotype(Q3CString s, bool caseSensitive);
+    static UmlClass * findStereotype(QByteArray s, bool caseSensitive);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -241,11 +241,12 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
 
 private:
-    static Q3Dict<UmlClass> _classes;
+        static QHash<QByteArray, UmlClass*> _classes;
+
 
     bool _abstract;
 
@@ -292,7 +293,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/GlobalChange/UmlBaseClassDiagram.h b/genplugouts/GlobalChange/UmlBaseClassDiagram.h
index e0990d31f..a3f406b00 100644
--- a/genplugouts/GlobalChange/UmlBaseClassDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseClassInstance.cpp b/genplugouts/GlobalChange/UmlBaseClassInstance.cpp
index 772b8fe6b..4c185c3fb 100644
--- a/genplugouts/GlobalChange/UmlBaseClassInstance.cpp
+++ b/genplugouts/GlobalChange/UmlBaseClassInstance.cpp
@@ -7,7 +7,7 @@
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -46,7 +46,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
     else     return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -61,7 +61,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -76,16 +76,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QVector<UmlAttribute *> &result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -96,7 +96,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -106,7 +106,7 @@ bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance
 
 bool UmlBaseClassInstance::remove_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/genplugouts/GlobalChange/UmlBaseClassInstance.h b/genplugouts/GlobalChange/UmlBaseClassInstance.h
index 3dde839de..a78dfd230 100644
--- a/genplugouts/GlobalChange/UmlBaseClassInstance.h
+++ b/genplugouts/GlobalChange/UmlBaseClassInstance.h
@@ -6,9 +6,9 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QList>
+
+
 
 class UmlClassInstance;
 class UmlClass;
@@ -40,17 +40,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QVector<UmlAttribute *> & result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result);
 
     // Remove the slot if the value is an empty string.
     // Else set the value for the given attribute, replacing it
@@ -87,7 +87,7 @@ class UmlBaseClassInstance : public UmlItem
     virtual void read_uml_();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassInstance(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseClassInstance(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseClassInstanceReference.cpp b/genplugouts/GlobalChange/UmlBaseClassInstanceReference.cpp
index 1223c08e8..c3c0d64a0 100644
--- a/genplugouts/GlobalChange/UmlBaseClassInstanceReference.cpp
+++ b/genplugouts/GlobalChange/UmlBaseClassInstanceReference.cpp
@@ -4,14 +4,14 @@
 #include "UmlClass.h"
 #include "UmlClassInstance.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlClass * UmlBaseClassInstanceReference::type() const
 {
     return (_instance) ? _instance->type() : _class;
 }
 
-const Q3CString & UmlBaseClassInstanceReference::name() const
+const QByteArray & UmlBaseClassInstanceReference::name() const
 {
     return (_instance) ? _instance->name() : _name;
 }
diff --git a/genplugouts/GlobalChange/UmlBaseClassInstanceReference.h b/genplugouts/GlobalChange/UmlBaseClassInstanceReference.h
index f21836362..be081ecd7 100644
--- a/genplugouts/GlobalChange/UmlBaseClassInstanceReference.h
+++ b/genplugouts/GlobalChange/UmlBaseClassInstanceReference.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASECLASSINSTANCEREFERENCE_H
 #define _UMLBASECLASSINSTANCEREFERENCE_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 class UmlClass;
 class UmlClassInstance;
@@ -20,7 +20,7 @@ class UmlBaseClassInstanceReference
     }
 
     // return the name of the instance
-    const Q3CString & name() const;
+    const QByteArray & name() const;
 
 
 private:
@@ -28,7 +28,7 @@ class UmlBaseClassInstanceReference
 
     UmlClassInstance * _instance;
 
-    Q3CString _name;
+    QByteArray _name;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/GlobalChange/UmlBaseClassItem.cpp b/genplugouts/GlobalChange/UmlBaseClassItem.cpp
index fa856e466..3a02e784e 100644
--- a/genplugouts/GlobalChange/UmlBaseClassItem.cpp
+++ b/genplugouts/GlobalChange/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseClassItem::phpDecl()
+const QByteArray & UmlBaseClassItem::phpDecl()
 {
     read_if_needed_();
 
@@ -47,7 +47,7 @@ bool UmlBaseClassItem::set_PhpDecl(const char * s)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseClassItem::pythonDecl()
+const QByteArray & UmlBaseClassItem::pythonDecl()
 {
     read_if_needed_();
 
@@ -61,7 +61,7 @@ bool UmlBaseClassItem::set_PythonDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/GlobalChange/UmlBaseClassItem.h b/genplugouts/GlobalChange/UmlBaseClassItem.h
index 19037f5fe..c3749c6e1 100644
--- a/genplugouts/GlobalChange/UmlBaseClassItem.h
+++ b/genplugouts/GlobalChange/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPHP
     //  return the Php defininition
 
-    const Q3CString & phpDecl();
+    const QByteArray & phpDecl();
 
     //  to set the Php definition
     //
@@ -45,7 +45,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPYTHON
     //  return the Python defininition
 
-    const Q3CString & pythonDecl();
+    const QByteArray & pythonDecl();
 
     //  to set the Python definition
     //
@@ -56,7 +56,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -69,28 +69,28 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_decl;
+    QByteArray _php_decl;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_decl;
+    QByteArray _python_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/GlobalChange/UmlBaseClassMember.cpp b/genplugouts/GlobalChange/UmlBaseClassMember.cpp
index da9a56bb5..47325ddfb 100644
--- a/genplugouts/GlobalChange/UmlBaseClassMember.cpp
+++ b/genplugouts/GlobalChange/UmlBaseClassMember.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlBaseClassMember::isClassMember()
 {
     read_if_needed_();
@@ -70,7 +70,7 @@ bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
 #endif
 
 #ifdef WITHJAVA
-Q3CString UmlBaseClassMember::javaAnnotations()
+QByteArray UmlBaseClassMember::javaAnnotations()
 {
     read_if_needed_();
 
@@ -83,7 +83,7 @@ bool UmlBaseClassMember::set_JavaAnnotations(const char * v)
 }
 #endif
 
-const Q3CString & UmlBaseClassMember::constraint()
+const QByteArray & UmlBaseClassMember::constraint()
 {
     read_if_needed_();
     return _constraint;
diff --git a/genplugouts/GlobalChange/UmlBaseClassMember.h b/genplugouts/GlobalChange/UmlBaseClassMember.h
index f19767bf8..19e4f15ba 100644
--- a/genplugouts/GlobalChange/UmlBaseClassMember.h
+++ b/genplugouts/GlobalChange/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -57,7 +57,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 #ifdef WITHJAVA
     // returns the Java annotations
-    Q3CString javaAnnotations();
+    QByteArray javaAnnotations();
 
     // set the Java annotations
     //
@@ -66,7 +66,7 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
     // return the constraint
-    const Q3CString & constraint();
+    const QByteArray & constraint();
 
     // set the constraint
     //
@@ -86,14 +86,14 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_annotation;
+    QByteArray _java_annotation;
 #endif
 
-    Q3CString _constraint;
+    QByteArray _constraint;
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/GlobalChange/UmlBaseClassView.h b/genplugouts/GlobalChange/UmlBaseClassView.h
index 43fb0714a..2de2d70e7 100644
--- a/genplugouts/GlobalChange/UmlBaseClassView.h
+++ b/genplugouts/GlobalChange/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlView
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseCollaborationDiagram.h b/genplugouts/GlobalChange/UmlBaseCollaborationDiagram.h
index 001de487c..f5f96e840 100644
--- a/genplugouts/GlobalChange/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.cpp b/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.cpp
index 63b89f7b5..177cc8c00 100644
--- a/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.cpp
+++ b/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseCollaborationDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -15,11 +15,11 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -31,7 +31,7 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         m->read_(instances);
     }
 
-    _messages.setAutoDelete(TRUE);
+    //_messages.setAutoDelete(TRUE);
 }
 
 UmlBaseCollaborationDiagramDefinition::~UmlBaseCollaborationDiagramDefinition()
diff --git a/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.h b/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.h
index 7053607ce..905cc6dc5 100644
--- a/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.h
+++ b/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.h
@@ -1,12 +1,12 @@
 #ifndef _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
 #define _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
-
+#include <QVector>
 
 // to avoid compiler warning
 #include "UmlCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlCollaborationMessage;
@@ -16,21 +16,21 @@ class UmlBaseCollaborationDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following their rank
-    const Q3PtrVector<UmlCollaborationMessage> & messages() const {
+    const QVector<UmlCollaborationMessage*> & messages() const {
         return _messages;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlCollaborationMessage> _messages;
+    QVector<UmlCollaborationMessage*> _messages;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/GlobalChange/UmlBaseCollaborationMessage.cpp b/genplugouts/GlobalChange/UmlBaseCollaborationMessage.cpp
index 8ea8e0890..12a94d5de 100644
--- a/genplugouts/GlobalChange/UmlBaseCollaborationMessage.cpp
+++ b/genplugouts/GlobalChange/UmlBaseCollaborationMessage.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-void UmlBaseCollaborationMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseCollaborationMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     UmlBaseMessage::read_(instances);
     _rank = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/GlobalChange/UmlBaseCollaborationMessage.h b/genplugouts/GlobalChange/UmlBaseCollaborationMessage.h
index 276b0801e..a273c2714 100644
--- a/genplugouts/GlobalChange/UmlBaseCollaborationMessage.h
+++ b/genplugouts/GlobalChange/UmlBaseCollaborationMessage.h
@@ -2,8 +2,8 @@
 #define _UMLBASECOLLABORATIONMESSAGE_H
 
 
-#include <q3cstring.h>
-#include <q3ptrdict.h>
+
+
 #include "UmlMessage.h"
 
 class UmlClassInstanceReference;
@@ -18,7 +18,7 @@ class UmlBaseCollaborationMessage : public UmlMessage
     }
 
     // return the hierarchical rank of the message
-    const Q3CString & hrank() const {
+    const QByteArray & hrank() const {
         return _hrank;
     }
 
@@ -26,10 +26,10 @@ class UmlBaseCollaborationMessage : public UmlMessage
 private:
     int _rank;
 
-    Q3CString _hrank;
+    QByteArray _hrank;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseCollaborationDiagramDefinition;
 };
diff --git a/genplugouts/GlobalChange/UmlBaseComponent.cpp b/genplugouts/GlobalChange/UmlBaseComponent.cpp
index 211d911fb..aa2d770b0 100644
--- a/genplugouts/GlobalChange/UmlBaseComponent.cpp
+++ b/genplugouts/GlobalChange/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizingClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizingClasses()
 {
     read_if_needed_();
 
     return _realizing;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realizing, provided, required);
@@ -95,18 +95,18 @@ void UmlBaseComponent::read_uml_()
     _realizing.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realizing.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realizing[index] =  (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/GlobalChange/UmlBaseComponent.h b/genplugouts/GlobalChange/UmlBaseComponent.h
index 209914a57..9f5cf4553 100644
--- a/genplugouts/GlobalChange/UmlBaseComponent.h
+++ b/genplugouts/GlobalChange/UmlBaseComponent.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -36,18 +36,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realizing classes
-    const Q3PtrVector<UmlClass> & realizingClasses();
+    const QVector<UmlClass*> & realizingClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realizing, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +57,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realizing;
+    QVector<UmlClass*> _realizing;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -70,11 +70,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/GlobalChange/UmlBaseComponentDiagram.h b/genplugouts/GlobalChange/UmlBaseComponentDiagram.h
index 43466da7c..b235e0717 100644
--- a/genplugouts/GlobalChange/UmlBaseComponentDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseComponentView.h b/genplugouts/GlobalChange/UmlBaseComponentView.h
index 0b9d2d0bd..e70c3b9d5 100644
--- a/genplugouts/GlobalChange/UmlBaseComponentView.h
+++ b/genplugouts/GlobalChange/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseDeepHistoryPseudoState.h b/genplugouts/GlobalChange/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..9224eb152 100644
--- a/genplugouts/GlobalChange/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseDeployment.h b/genplugouts/GlobalChange/UmlBaseDeployment.h
index b268e0c17..b16902170 100644
--- a/genplugouts/GlobalChange/UmlBaseDeployment.h
+++ b/genplugouts/GlobalChange/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseDeploymentDiagram.h b/genplugouts/GlobalChange/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..db1cfc67d 100644
--- a/genplugouts/GlobalChange/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseDeploymentView.h b/genplugouts/GlobalChange/UmlBaseDeploymentView.h
index f5213d38a..12b21aefe 100644
--- a/genplugouts/GlobalChange/UmlBaseDeploymentView.h
+++ b/genplugouts/GlobalChange/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseDiagram.cpp b/genplugouts/GlobalChange/UmlBaseDiagram.cpp
index 303d79211..899b1e32a 100644
--- a/genplugouts/GlobalChange/UmlBaseDiagram.cpp
+++ b/genplugouts/GlobalChange/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[jasa] handle ambiguous call
     return UmlCom::read_bool();
diff --git a/genplugouts/GlobalChange/UmlBaseDiagram.h b/genplugouts/GlobalChange/UmlBaseDiagram.h
index 9cf05ff22..19e34654b 100644
--- a/genplugouts/GlobalChange/UmlBaseDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseEntryPointPseudoState.h b/genplugouts/GlobalChange/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..60dd28bb0 100644
--- a/genplugouts/GlobalChange/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseExitPointPseudoState.h b/genplugouts/GlobalChange/UmlBaseExitPointPseudoState.h
index ff2ad12bc..29563f22b 100644
--- a/genplugouts/GlobalChange/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseExpansionNode.h b/genplugouts/GlobalChange/UmlBaseExpansionNode.h
index 41bcbece2..6642afe1b 100644
--- a/genplugouts/GlobalChange/UmlBaseExpansionNode.h
+++ b/genplugouts/GlobalChange/UmlBaseExpansionNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityObject.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode;
 class UmlExpansionRegion;
@@ -25,7 +25,7 @@ class UmlBaseExpansionNode : public UmlActivityObject
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionNode(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBaseExpansionNode(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseExpansionRegion.h b/genplugouts/GlobalChange/UmlBaseExpansionRegion.h
index 913b4ec4a..2ca1994ad 100644
--- a/genplugouts/GlobalChange/UmlBaseExpansionRegion.h
+++ b/genplugouts/GlobalChange/UmlBaseExpansionRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "anExpansionKind.h"
 
 class UmlExpansionRegion;
@@ -26,7 +26,7 @@ class UmlBaseExpansionRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseExpansionRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 
diff --git a/genplugouts/GlobalChange/UmlBaseExtraClassMember.cpp b/genplugouts/GlobalChange/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/GlobalChange/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/GlobalChange/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/GlobalChange/UmlBaseExtraClassMember.h b/genplugouts/GlobalChange/UmlBaseExtraClassMember.h
index e2b9d4f30..4f07b5583 100644
--- a/genplugouts/GlobalChange/UmlBaseExtraClassMember.h
+++ b/genplugouts/GlobalChange/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/GlobalChange/UmlBaseFinalState.h b/genplugouts/GlobalChange/UmlBaseFinalState.h
index 16e0816cf..2fa133da6 100644
--- a/genplugouts/GlobalChange/UmlBaseFinalState.h
+++ b/genplugouts/GlobalChange/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseFlow.cpp b/genplugouts/GlobalChange/UmlBaseFlow.cpp
index 5da07fbe8..b05e3eb62 100644
--- a/genplugouts/GlobalChange/UmlBaseFlow.cpp
+++ b/genplugouts/GlobalChange/UmlBaseFlow.cpp
@@ -4,7 +4,7 @@
 #include "UmlFlow.h"
 #include "UmlActivityNode.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseFlow::kind()
 {
@@ -29,7 +29,7 @@ UmlActivityNode * UmlBaseFlow::target()
     return _target;
 }
 
-const Q3CString & UmlBaseFlow::weight()
+const QByteArray & UmlBaseFlow::weight()
 {
     read_if_needed_();
     return _uml.weight;
@@ -40,7 +40,7 @@ bool UmlBaseFlow::set_Weight(const char * v)
     return set_it_(_uml.weight, v, setUmlActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::guard()
+const QByteArray & UmlBaseFlow::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -51,7 +51,7 @@ bool UmlBaseFlow::set_Guard(const char * v)
     return set_it_(_uml.guard, v, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::selection()
+const QByteArray & UmlBaseFlow::selection()
 {
     read_if_needed_();
     return _uml.selection;
@@ -62,7 +62,7 @@ bool UmlBaseFlow::set_Selection(const char * v)
     return set_it_(_uml.selection, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::transformation()
+const QByteArray & UmlBaseFlow::transformation()
 {
     read_if_needed_();
     return _uml.transformation;
@@ -74,7 +74,7 @@ bool UmlBaseFlow::set_Transformation(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseFlow::cppWeight()
+const QByteArray & UmlBaseFlow::cppWeight()
 {
     read_if_needed_();
     return _cpp.weight;
@@ -85,7 +85,7 @@ bool UmlBaseFlow::set_CppWeight(const char * v)
     return set_it_(_cpp.weight, v, setCppActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppGuard()
+const QByteArray & UmlBaseFlow::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -96,7 +96,7 @@ bool UmlBaseFlow::set_CppGuard(const char * v)
     return set_it_(_cpp.guard, v, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppSelection()
+const QByteArray & UmlBaseFlow::cppSelection()
 {
     read_if_needed_();
     return _cpp.selection;
@@ -107,7 +107,7 @@ bool UmlBaseFlow::set_CppSelection(const char * v)
     return set_it_(_cpp.selection, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppTransformation()
+const QByteArray & UmlBaseFlow::cppTransformation()
 {
     read_if_needed_();
     return _cpp.transformation;
@@ -120,7 +120,7 @@ bool UmlBaseFlow::set_CppTransformation(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseFlow::javaWeight()
+const QByteArray & UmlBaseFlow::javaWeight()
 {
     read_if_needed_();
     return _java.weight;
@@ -131,7 +131,7 @@ bool UmlBaseFlow::set_JavaWeight(const char * v)
     return set_it_(_java.weight, v, setJavaActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaGuard()
+const QByteArray & UmlBaseFlow::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -142,7 +142,7 @@ bool UmlBaseFlow::set_JavaGuard(const char * v)
     return set_it_(_java.guard, v, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaSelection()
+const QByteArray & UmlBaseFlow::javaSelection()
 {
     read_if_needed_();
     return _java.selection;
@@ -153,7 +153,7 @@ bool UmlBaseFlow::set_JavaSelection(const char * v)
     return set_it_(_java.selection, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaTransformation()
+const QByteArray & UmlBaseFlow::javaTransformation()
 {
     read_if_needed_();
     return _java.transformation;
diff --git a/genplugouts/GlobalChange/UmlBaseFlow.h b/genplugouts/GlobalChange/UmlBaseFlow.h
index b50ce3323..4edb40caf 100644
--- a/genplugouts/GlobalChange/UmlBaseFlow.h
+++ b/genplugouts/GlobalChange/UmlBaseFlow.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "FlowBehavior.h"
 
 class UmlFlow;
@@ -27,7 +27,7 @@ class UmlBaseFlow : public UmlItem
     virtual UmlActivityNode * target();
 
     // return the weight in OCL
-    const Q3CString & weight();
+    const QByteArray & weight();
 
     // set the weight in OCL
     //
@@ -35,7 +35,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Weight(const char * v);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Guard(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Selection(const char * v);
 
     // return the transformation in OCL
-    const Q3CString & transformation();
+    const QByteArray & transformation();
 
     // set the transformation in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHCPP
     // return the weight in C++
-    const Q3CString & cppWeight();
+    const QByteArray & cppWeight();
 
     // set the weight in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppWeight(const char * v);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppGuard(const char * v);
 
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppSelection(const char * v);
 
     // return the transformation in C++
-    const Q3CString & cppTransformation();
+    const QByteArray & cppTransformation();
 
     // set the transformation in C++
     //
@@ -94,7 +94,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHJAVA
     // return the weight in Java
-    const Q3CString & javaWeight();
+    const QByteArray & javaWeight();
 
     // set the weight in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaWeight(const char * v);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -110,7 +110,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaGuard(const char * v);
 
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -118,7 +118,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaSelection(const char * v);
 
     // return the transformation in Java
-    const Q3CString & javaTransformation();
+    const QByteArray & javaTransformation();
 
     // set the transformation in Java
     //
@@ -161,7 +161,7 @@ class UmlBaseFlow : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlow(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseFlow(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseForkPseudoState.h b/genplugouts/GlobalChange/UmlBaseForkPseudoState.h
index 009499bfa..9dfa5025c 100644
--- a/genplugouts/GlobalChange/UmlBaseForkPseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseFormalParameter.h b/genplugouts/GlobalChange/UmlBaseFormalParameter.h
index d8284c71d..aafb2fb40 100644
--- a/genplugouts/GlobalChange/UmlBaseFormalParameter.h
+++ b/genplugouts/GlobalChange/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -34,10 +34,10 @@ class UmlBaseFormalParameter
     };
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/GlobalChange/UmlBaseFragment.cpp b/genplugouts/GlobalChange/UmlBaseFragment.cpp
index 730755358..44fdee6e6 100644
--- a/genplugouts/GlobalChange/UmlBaseFragment.cpp
+++ b/genplugouts/GlobalChange/UmlBaseFragment.cpp
@@ -25,7 +25,7 @@ void UmlBaseFragment::read_()
         fc->read_(this, rank);
     }
 
-    _compartments.setAutoDelete(TRUE);
+    //_compartments.setAutoDelete(TRUE);
     _container = 0;
     _refer = (UmlDiagram *) UmlBaseItem::read_();
     _arguments = UmlCom::read_string();
@@ -38,7 +38,7 @@ int UmlBaseFragment::vcenter_(int rank) const
     return (t + _compartments[rank]->b()) / 2;
 }
 
-void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseFragment::read_covered_(QHash<void*,UmlClassInstanceReference*> & instances)
 {
     unsigned n = UmlCom::read_unsigned();
     unsigned rank;
@@ -46,10 +46,10 @@ void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & insta
     _covered.resize(n);
 
     for (rank = 0; rank != n; rank += 1)
-        _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]);
+        _covered.insert(rank, instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))]);
 }
 
-UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments)
+UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments)
 {
     UmlFragmentCompartment * r = 0;
     int nf = fragments.count();
@@ -82,7 +82,7 @@ UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, in
     return r;
 }
 
-void UmlBaseFragment::compute_container_(Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseFragment::compute_container_(QVector<UmlFragment*> & fragments)
 {
     int rank = fragments.count();
 
diff --git a/genplugouts/GlobalChange/UmlBaseFragment.h b/genplugouts/GlobalChange/UmlBaseFragment.h
index 932913148..8443a2eab 100644
--- a/genplugouts/GlobalChange/UmlBaseFragment.h
+++ b/genplugouts/GlobalChange/UmlBaseFragment.h
@@ -1,11 +1,8 @@
 #ifndef _UMLBASEFRAGMENT_H
 #define _UMLBASEFRAGMENT_H
-
-
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3ptrdict.h>
-
+#include <QVector>
+#include <QByteArray>
+#include <QHash>
 class UmlFragmentCompartment;
 class UmlDiagram;
 class UmlClassInstanceReference;
@@ -16,12 +13,12 @@ class UmlBaseFragment
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the compartments, at least one compartment exists
-    const Q3PtrVector<UmlFragmentCompartment> & compartments() const {
+    const QVector<UmlFragmentCompartment*> & compartments() const {
         return _compartments;
     }
 
@@ -39,12 +36,12 @@ class UmlBaseFragment
 
     // return the form corresponding to the arguments
     // and return value of the interaction use
-    Q3CString arguments() const {
+    QByteArray arguments() const {
         return _arguments;
     }
 
     // return the the list of covered instances (life lines)
-    const Q3PtrVector<UmlClassInstanceReference> & covered() const {
+    const QVector<UmlClassInstanceReference*> & covered() const {
         return _covered;
     }
 
@@ -52,9 +49,9 @@ class UmlBaseFragment
 private:
     UmlFragmentCompartment * _container;
 
-    Q3PtrVector<UmlFragmentCompartment> _compartments;
+    QVector<UmlFragmentCompartment*> _compartments;
 
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -66,9 +63,9 @@ class UmlBaseFragment
 
     UmlDiagram * _refer;
 
-    Q3CString _arguments;
+    QByteArray _arguments;
 
-    Q3PtrVector<UmlClassInstanceReference> _covered;
+    QVector<UmlClassInstanceReference*> _covered;
 
     // internal, don't call it
     void read_();
@@ -81,15 +78,15 @@ class UmlBaseFragment
 
     //internal, do NOT use it
 
-    void read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_covered_(QHash<void*,UmlClassInstanceReference*> & instances);
 
     // internal
-    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments);
+    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments);
 
 
 private:
     // internal
-    static void compute_container_(Q3PtrVector<UmlFragment> & fragments);
+    static void compute_container_(QVector<UmlFragment*> & fragments);
 
 
 public:
diff --git a/genplugouts/GlobalChange/UmlBaseFragmentCompartment.cpp b/genplugouts/GlobalChange/UmlBaseFragmentCompartment.cpp
index 2ff876f6a..148f56823 100644
--- a/genplugouts/GlobalChange/UmlBaseFragmentCompartment.cpp
+++ b/genplugouts/GlobalChange/UmlBaseFragmentCompartment.cpp
@@ -3,21 +3,23 @@
 #include "UmlBaseFragmentCompartment.h"
 #include "UmlBaseFragment.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlBaseFragmentCompartment::add_contained_(UmlFragment * x)
 {
-    _contained.resize(_contained.size() + 1);
-    _contained.insert(_contained.size() - 1, x);
+    //_contained.resize(_contained.size() + 1);
+    //_contained.insert(_contained.size() - 1, x);
+    _contained.append(x);
 }
 
-void UmlBaseFragmentCompartment::add_text_(Q3CString x)
+void UmlBaseFragmentCompartment::add_text_(QByteArray x)
 {
-    _texts.resize(_texts.size() + 1);
-    _texts.insert(_texts.size() - 1, strdup(x));
+    //_texts.resize(_texts.size() + 1);
+    //_texts.insert(_texts.size() - 1, strdup(x));
+    _texts.append(strdup(x));
 }
 
-void UmlBaseFragmentCompartment::add_cont_(Q3CString s, int cy)
+void UmlBaseFragmentCompartment::add_cont_(QByteArray s, int cy)
 {
     if (cy < _fragment->vcenter_(_rank))
         _start_continuation = s;
diff --git a/genplugouts/GlobalChange/UmlBaseFragmentCompartment.h b/genplugouts/GlobalChange/UmlBaseFragmentCompartment.h
index 8943ecf60..129b1dc86 100644
--- a/genplugouts/GlobalChange/UmlBaseFragmentCompartment.h
+++ b/genplugouts/GlobalChange/UmlBaseFragmentCompartment.h
@@ -5,8 +5,8 @@
 // to avoid compiler warning
 #include "UmlFragment.h"
 
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+
+
 
 class UmlFragment;
 class UmlBaseFragment;
@@ -27,23 +27,23 @@ class UmlBaseFragmentCompartment
     }
 
     // the texts placed in the compartment
-    const Q3PtrVector<char> & texts() const {
+    const QVector<char*> & texts() const {
         return _texts;
     }
 
     // return the fragments contained in the compartment,
     // may be none
-    const Q3PtrVector<UmlFragment> & contained() const {
+    const QVector<UmlFragment*> & contained() const {
         return _contained;
     }
 
     // return the continuation ('label' case), or an empty string/null
-    Q3CString startContinuation() const {
+    QByteArray startContinuation() const {
         return _start_continuation;
     }
 
     // return the continuation ('goto' case), or an empty string/null
-    Q3CString endContinuation() const {
+    QByteArray endContinuation() const {
         return _end_continuation;
     }
 
@@ -51,27 +51,27 @@ class UmlBaseFragmentCompartment
 private:
     UmlFragment * _fragment;
 
-    Q3PtrVector<UmlFragment> _contained;
+    QVector<UmlFragment*> _contained;
 
     int _rank;
 
-    Q3PtrVector<char> _texts;
+    QVector<char*> _texts;
 
     int _y;
 
-    Q3CString _start_continuation;
+    QByteArray _start_continuation;
 
-    Q3CString _end_continuation;
+    QByteArray _end_continuation;
 
 
 public:
     void add_contained_(UmlFragment * x);
 
-    void add_text_(Q3CString x);
+    void add_text_(QByteArray x);
 
     //internal, do NOT use it
 
-    void add_cont_(Q3CString s, int cy);
+    void add_cont_(QByteArray s, int cy);
 
     int b() const {
         return _y;
diff --git a/genplugouts/GlobalChange/UmlBaseInitialPseudoState.h b/genplugouts/GlobalChange/UmlBaseInitialPseudoState.h
index 88dae1cc6..2f31e4340 100644
--- a/genplugouts/GlobalChange/UmlBaseInitialPseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseInterruptibleActivityRegion.h b/genplugouts/GlobalChange/UmlBaseInterruptibleActivityRegion.h
index 70f988488..de6e56aed 100644
--- a/genplugouts/GlobalChange/UmlBaseInterruptibleActivityRegion.h
+++ b/genplugouts/GlobalChange/UmlBaseInterruptibleActivityRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInterruptibleActivityRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseItem.cpp b/genplugouts/GlobalChange/UmlBaseItem.cpp
index a1a4991d4..7c6b24f40 100644
--- a/genplugouts/GlobalChange/UmlBaseItem.cpp
+++ b/genplugouts/GlobalChange/UmlBaseItem.cpp
@@ -57,9 +57,9 @@
 #include "UmlActivityControlNodeClasses.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     UmlCom::send_cmd(_identifier, setNameCmd, (const char *)s); //[jasa] handle ambiguous call
 
@@ -71,14 +71,14 @@ bool UmlBaseItem::set_Name(const Q3CString & s)
         return FALSE;
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
@@ -93,14 +93,14 @@ bool UmlBaseItem::applyStereotype()
     return TRUE;
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -116,7 +116,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -136,11 +136,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -150,7 +150,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -158,10 +158,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -172,7 +172,7 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -191,7 +191,7 @@ bool UmlBaseItem::moveAfter(const UmlItem * x)
         return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -203,7 +203,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[jasa] handle ambiguous call
     return (int) UmlCom::read_unsigned();
@@ -221,11 +221,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -247,7 +247,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -276,17 +276,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -370,9 +370,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -414,7 +414,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -468,7 +468,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -505,7 +505,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -727,20 +727,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/GlobalChange/UmlBaseItem.h b/genplugouts/GlobalChange/UmlBaseItem.h
index 67b03808c..994f7546e 100644
--- a/genplugouts/GlobalChange/UmlBaseItem.h
+++ b/genplugouts/GlobalChange/UmlBaseItem.h
@@ -1,15 +1,16 @@
 #ifndef _UMLBASEITEM_H
 #define _UMLBASEITEM_H
-
+#include <QByteArray>
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+
+
+
+
 //#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
+#include <QHash>
 
 class UmlItem;
 class UmlTypeSpec;
@@ -37,21 +38,21 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // If the current stereotype is part of a profile add needed properties.
     // In all cases remove extra properties whose keys contain two ':'.
@@ -60,18 +61,18 @@ class UmlBaseItem
     bool applyStereotype();
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -96,16 +97,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -140,7 +141,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -148,7 +149,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -161,7 +162,7 @@ class UmlBaseItem
     //  The result may contains UmlAttribute, UmlRelations, UmlNcRelations,
     //  UmlOperation (their bodies are not taken into account) , UmlClass
     //  and UmlComponents.
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // return a constant identifier, it is unique within a given
     // kind of element (two classes can't have the same identifiers, but
@@ -187,7 +188,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
 
 private:
@@ -203,21 +204,23 @@ class UmlBaseItem
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
+
+        QHash<QByteArray, QByteArray*> _dict;
+
 
-    Q3Dict<Q3CString> _dict;
+        static QHash<void*,UmlItem*> _all;
 
-    static Q3PtrDict<UmlItem> _all;
 
 
 protected:
@@ -285,7 +288,7 @@ class UmlBaseItem
 
     //internal, do NOT use it
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
 
@@ -298,7 +301,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/GlobalChange/UmlBaseJoinPseudoState.h b/genplugouts/GlobalChange/UmlBaseJoinPseudoState.h
index 31976dfff..c95cfff9c 100644
--- a/genplugouts/GlobalChange/UmlBaseJoinPseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseJunctionPseudoState.h b/genplugouts/GlobalChange/UmlBaseJunctionPseudoState.h
index 9b76d88e7..96cdfe959 100644
--- a/genplugouts/GlobalChange/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseMessage.cpp b/genplugouts/GlobalChange/UmlBaseMessage.cpp
index 77851f8dd..2d220aa8e 100644
--- a/genplugouts/GlobalChange/UmlBaseMessage.cpp
+++ b/genplugouts/GlobalChange/UmlBaseMessage.cpp
@@ -4,13 +4,13 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlOperation.h"
 
-void UmlBaseMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     _operation = (UmlOperation *) UmlBaseItem::read_();
 
     if (_operation == 0) _form = UmlCom::read_string();
 
-    _from = instances[(void *) UmlCom::read_unsigned()];
-    _to = instances[(void *) UmlCom::read_unsigned()];
+    _from = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
+    _to = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
 }
 
diff --git a/genplugouts/GlobalChange/UmlBaseMessage.h b/genplugouts/GlobalChange/UmlBaseMessage.h
index 81fc500c8..ca6f6fc5e 100644
--- a/genplugouts/GlobalChange/UmlBaseMessage.h
+++ b/genplugouts/GlobalChange/UmlBaseMessage.h
@@ -1,10 +1,7 @@
 #ifndef _UMLBASEMESSAGE_H
 #define _UMLBASEMESSAGE_H
-
-
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-
+#include <QByteArray>
+#include <QHash>
 class UmlClassInstanceReference;
 class UmlOperation;
 
@@ -30,7 +27,7 @@ class UmlBaseMessage
 
     // return message as a string, may be empty/null,
     // exclusive with operation()
-    const Q3CString & form() const {
+    const QByteArray & form() const {
         return _form;
     }
 
@@ -42,10 +39,10 @@ class UmlBaseMessage
 
     UmlOperation * _operation;
 
-    Q3CString _form;
+    QByteArray _form;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseSequenceMessage;
     friend class UmlBaseCollaborationMessage;
diff --git a/genplugouts/GlobalChange/UmlBaseNcRelation.h b/genplugouts/GlobalChange/UmlBaseNcRelation.h
index 7418e3406..0ad29c67b 100644
--- a/genplugouts/GlobalChange/UmlBaseNcRelation.h
+++ b/genplugouts/GlobalChange/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/GlobalChange/UmlBaseNode.h b/genplugouts/GlobalChange/UmlBaseNode.h
index 07a980e66..208e951f2 100644
--- a/genplugouts/GlobalChange/UmlBaseNode.h
+++ b/genplugouts/GlobalChange/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/GlobalChange/UmlBaseObjectDiagram.h b/genplugouts/GlobalChange/UmlBaseObjectDiagram.h
index dfe6983ef..720256a2d 100644
--- a/genplugouts/GlobalChange/UmlBaseObjectDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseObjectDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlObjectDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseObjectDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseObjectDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseObjectDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseOnSignalAction.cpp b/genplugouts/GlobalChange/UmlBaseOnSignalAction.cpp
index 8c887e113..aec5db337 100644
--- a/genplugouts/GlobalChange/UmlBaseOnSignalAction.cpp
+++ b/genplugouts/GlobalChange/UmlBaseOnSignalAction.cpp
@@ -2,9 +2,9 @@
 #include "UmlCom.h"
 #include "UmlBaseOnSignalAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseOnSignalAction::signal()
+const QByteArray & UmlBaseOnSignalAction::signal()
 {
     read_if_needed_();
     return _signal;
@@ -16,7 +16,7 @@ bool UmlBaseOnSignalAction::set_Signal(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOnSignalAction::cppSignal()
+const QByteArray & UmlBaseOnSignalAction::cppSignal()
 {
     read_if_needed_();
     return _cpp_signal;
@@ -29,7 +29,7 @@ bool UmlBaseOnSignalAction::set_CppSignal(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOnSignalAction::javaSignal()
+const QByteArray & UmlBaseOnSignalAction::javaSignal()
 {
     read_if_needed_();
     return _java_signal;
diff --git a/genplugouts/GlobalChange/UmlBaseOnSignalAction.h b/genplugouts/GlobalChange/UmlBaseOnSignalAction.h
index 6ad499b79..0d648e38c 100644
--- a/genplugouts/GlobalChange/UmlBaseOnSignalAction.h
+++ b/genplugouts/GlobalChange/UmlBaseOnSignalAction.h
@@ -3,19 +3,19 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlBaseOnSignalAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOnSignalAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOnSignalAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the signal
-    const Q3CString & signal();
+    const QByteArray & signal();
 
     // set the signal
     //
@@ -24,7 +24,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the signal in C++
-    const Q3CString & cppSignal();
+    const QByteArray & cppSignal();
 
     // set the signal in C++
     //
@@ -34,7 +34,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the signal in Java
-    const Q3CString & javaSignal();
+    const QByteArray & javaSignal();
 
     // set the signal in Java
     //
@@ -52,14 +52,14 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 
 private:
-    Q3CString _signal;
+    QByteArray _signal;
 
 #ifdef WITHCPP
-    Q3CString _cpp_signal;
+    QByteArray _cpp_signal;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_signal;
+    QByteArray _java_signal;
 #endif
 
 
diff --git a/genplugouts/GlobalChange/UmlBaseOperation.cpp b/genplugouts/GlobalChange/UmlBaseOperation.cpp
index dc2247fab..1d2b61490 100644
--- a/genplugouts/GlobalChange/UmlBaseOperation.cpp
+++ b/genplugouts/GlobalChange/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -72,7 +72,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -86,7 +86,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -100,7 +100,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -123,7 +123,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -136,7 +136,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -150,7 +150,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -263,7 +263,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -275,7 +275,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -289,7 +289,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -381,7 +381,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -391,7 +391,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -405,7 +405,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -478,7 +478,7 @@ bool UmlBaseOperation::set_isPhpFinal(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::phpDef()
+const QByteArray & UmlBaseOperation::phpDef()
 {
     return phpDecl();
 }
@@ -488,7 +488,7 @@ bool UmlBaseOperation::set_PhpDef(const char * s)
     return set_PhpDecl(s);
 }
 
-Q3CString UmlBaseOperation::phpBody()
+QByteArray UmlBaseOperation::phpBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, phpBodyCmd);
@@ -502,7 +502,7 @@ bool UmlBaseOperation::set_PhpBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::phpNameSpec()
+const QByteArray & UmlBaseOperation::phpNameSpec()
 {
     read_if_needed_();
 
@@ -556,7 +556,7 @@ bool UmlBaseOperation::set_PhpContextualBodyIndent(bool v)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDef()
+const QByteArray & UmlBaseOperation::pythonDef()
 {
     return pythonDecl();
 }
@@ -566,7 +566,7 @@ bool UmlBaseOperation::set_PythonDef(const char * s)
     return set_PythonDecl(s);
 }
 
-Q3CString UmlBaseOperation::pythonBody()
+QByteArray UmlBaseOperation::pythonBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, pythonBodyCmd);
@@ -580,7 +580,7 @@ bool UmlBaseOperation::set_PythonBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::pythonNameSpec()
+const QByteArray & UmlBaseOperation::pythonNameSpec()
 {
     read_if_needed_();
 
@@ -634,7 +634,7 @@ bool UmlBaseOperation::set_PythonContextualBodyIndent(bool v)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDecorators()
+const QByteArray & UmlBaseOperation::pythonDecorators()
 {
     read_if_needed_();
     return _python_decorators;
@@ -666,7 +666,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
diff --git a/genplugouts/GlobalChange/UmlBaseOperation.h b/genplugouts/GlobalChange/UmlBaseOperation.h
index fd0437960..14c03ec99 100644
--- a/genplugouts/GlobalChange/UmlBaseOperation.h
+++ b/genplugouts/GlobalChange/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -52,7 +52,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -70,7 +70,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -130,7 +130,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -139,9 +139,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -151,7 +151,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -199,7 +199,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -208,9 +208,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -220,7 +220,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -260,7 +260,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Php, notes that it is
     // already made by the inherited PhpDecl operation
-    const Q3CString & phpDef();
+    const QByteArray & phpDef();
 
     // sets the operation's definition in Php, notes that it is
     // already made by the inherited set_PhpDecl operation
@@ -269,9 +269,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PhpDef(const char * s);
 
     // returns the operation's body in Php++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString phpBody();
+    QByteArray phpBody();
 
     // sets the operation's body in Php, useless if the def does not
     // contains ${body}
@@ -281,7 +281,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
-    const Q3CString & phpNameSpec();
+    const QByteArray & phpNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
@@ -313,7 +313,7 @@ class UmlBaseOperation : public UmlClassMember
 #ifdef WITHPYTHON
     // returns the operation's definition in Python, notes that it is
     // already made by the inherited PythonDecl operation
-    const Q3CString & pythonDef();
+    const QByteArray & pythonDef();
 
     // sets the operation's definition in Python, notes that it is
     // already made by the inherited set_PythonDecl operation
@@ -322,9 +322,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PythonDef(const char * s);
 
     // returns the operation's body in Python++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString pythonBody();
+    QByteArray pythonBody();
 
     // sets the operation's body in Python, useless if the def does not
     // contains ${body}
@@ -334,7 +334,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
-    const Q3CString & pythonNameSpec();
+    const QByteArray & pythonNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
@@ -365,7 +365,7 @@ class UmlBaseOperation : public UmlClassMember
 
 #ifdef WITHPYTHON
     // return the  decorators
-    const Q3CString & pythonDecorators();
+    const QByteArray & pythonDecorators();
 
     // set the  decorators
     //
@@ -384,7 +384,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -478,32 +478,32 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_name_spec;
+    QByteArray _php_name_spec;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_name_spec;
+    QByteArray _python_name_spec;
 
-    Q3CString _python_decorators;
+    QByteArray _python_decorators;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -515,7 +515,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
@@ -553,7 +553,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/GlobalChange/UmlBasePackage.cpp b/genplugouts/GlobalChange/UmlBasePackage.cpp
index dcef8ed04..a4a083250 100644
--- a/genplugouts/GlobalChange/UmlBasePackage.cpp
+++ b/genplugouts/GlobalChange/UmlBasePackage.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -38,43 +38,43 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findCppNamespace(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, _identifier, n);
 
@@ -83,31 +83,31 @@ UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n) const
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findJavaPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, _identifier, n);
 
@@ -116,45 +116,45 @@ UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBasePackage::phpDir()
+const QByteArray & UmlBasePackage::phpDir()
 {
     read_if_needed_();
 
     return _php_dir;
 }
 
-bool UmlBasePackage::set_PhpDir(const Q3CString & s)
+bool UmlBasePackage::set_PhpDir(const QByteArray & s)
 {
     return set_it_(_php_dir, s, setPhpDirCmd);
 }
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBasePackage::pythonDir()
+const QByteArray & UmlBasePackage::pythonDir()
 {
     read_if_needed_();
 
     return _python_dir;
 }
 
-bool UmlBasePackage::set_PythonDir(const Q3CString & s)
+bool UmlBasePackage::set_PythonDir(const QByteArray & s)
 {
     return set_it_(_python_dir, s, setPythonDirCmd);
 }
 
-Q3CString UmlBasePackage::pythonPackage()
+QByteArray UmlBasePackage::pythonPackage()
 {
     read_if_needed_();
 
     return _python_package;
 }
 
-bool UmlBasePackage::set_PythonPackage(const Q3CString & s)
+bool UmlBasePackage::set_PythonPackage(const QByteArray & s)
 {
     return set_it_(_python_package, s, setPythonPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPythonPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findPythonPackageCmd, _identifier, n);
 
@@ -163,31 +163,31 @@ UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findIdlModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findIdlModule(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, _identifier, n);
 
@@ -214,7 +214,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/GlobalChange/UmlBasePackage.h b/genplugouts/GlobalChange/UmlBasePackage.h
index 5e761888b..de75405b3 100644
--- a/genplugouts/GlobalChange/UmlBasePackage.h
+++ b/genplugouts/GlobalChange/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlPackage;
 class UmlDiagram;
@@ -34,125 +34,125 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findCppNamespace(const Q3CString & n) const;
+    UmlPackage * findCppNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findJavaPackage(const Q3CString & n) const;
+    UmlPackage * findJavaPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHPHP
     // returns the path where the PHP files are generated by the
     // PHP generator.
-    const Q3CString & phpDir();
+    const QByteArray & phpDir();
 
     // to set the path where the PHP files are generated by the
     // PHP generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpDir(const Q3CString & s);
+    bool set_PhpDir(const QByteArray & s);
 #endif
 
 #ifdef WITHPYTHON
     // returns the path where the PYTHON files are generated by the
     // PYTHON generator.
-    const Q3CString & pythonDir();
+    const QByteArray & pythonDir();
 
     // to set the path where the PYTHON files are generated by the
     // PYTHON generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonDir(const Q3CString & s);
+    bool set_PythonDir(const QByteArray & s);
 
     //returns the python package name associed to the package
-    Q3CString pythonPackage();
+    QByteArray pythonPackage();
 
     // to set the python package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonPackage(const Q3CString & s);
+    bool set_PythonPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Python package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPythonPackage(const Q3CString & n) const;
+    UmlPackage * findPythonPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findIdlModule(const Q3CString & n) const;
+    UmlPackage * findIdlModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -165,12 +165,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // Force consistency concerning the profiles and their stereotypes
 
@@ -189,35 +189,35 @@ class UmlBasePackage : public UmlItem
     UmlDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHPHP
-    Q3CString _php_dir;
+    QByteArray _php_dir;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_dir;
+    QByteArray _python_dir;
 
-    Q3CString _python_package;
+    QByteArray _python_package;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -258,11 +258,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/GlobalChange/UmlBaseParameter.h b/genplugouts/GlobalChange/UmlBaseParameter.h
index 71202a64d..0fdea9d7f 100644
--- a/genplugouts/GlobalChange/UmlBaseParameter.h
+++ b/genplugouts/GlobalChange/UmlBaseParameter.h
@@ -2,16 +2,16 @@
 #define _UMLBASEPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "aDirection.h"
 
 //  Represent an operation's parameter
 
 struct UmlBaseParameter {
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
     UmlTypeSpec type;
 
diff --git a/genplugouts/GlobalChange/UmlBaseParameterSet.cpp b/genplugouts/GlobalChange/UmlBaseParameterSet.cpp
index 307417d45..2c680249f 100644
--- a/genplugouts/GlobalChange/UmlBaseParameterSet.cpp
+++ b/genplugouts/GlobalChange/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         if (_defined) _pins = v;
@@ -43,6 +43,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/GlobalChange/UmlBaseParameterSet.h b/genplugouts/GlobalChange/UmlBaseParameterSet.h
index 71e77cbfe..37c507a5b 100644
--- a/genplugouts/GlobalChange/UmlBaseParameterSet.h
+++ b/genplugouts/GlobalChange/UmlBaseParameterSet.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASEPARAMETERSET_H
 #define _UMLBASEPARAMETERSET_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
+
+
 
 class UmlActivityParameter;
 class UmlActivityAction;
@@ -27,16 +27,16 @@ class UmlBaseParameterSet : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseParameterSet(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseParameterSet(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +48,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/GlobalChange/UmlBasePinParameter.h b/genplugouts/GlobalChange/UmlBasePinParameter.h
index d629b7122..6b3d683a4 100644
--- a/genplugouts/GlobalChange/UmlBasePinParameter.h
+++ b/genplugouts/GlobalChange/UmlBasePinParameter.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityObject.h"
-#include <q3cstring.h>
+
 #include "aDirection.h"
 #include "aParameterEffectKind.h"
 
@@ -11,7 +11,7 @@ class UmlBasePinParameter : public UmlActivityObject
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePinParameter(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBasePinParameter(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 
diff --git a/genplugouts/GlobalChange/UmlBaseRegion.h b/genplugouts/GlobalChange/UmlBaseRegion.h
index 58a9f8b78..efd32acb9 100644
--- a/genplugouts/GlobalChange/UmlBaseRegion.h
+++ b/genplugouts/GlobalChange/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseRelation.cpp b/genplugouts/GlobalChange/UmlBaseRelation.cpp
index 3c141d439..860b61402 100644
--- a/genplugouts/GlobalChange/UmlBaseRelation.cpp
+++ b/genplugouts/GlobalChange/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -139,7 +139,7 @@ bool UmlBaseRelation::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -151,7 +151,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -193,7 +193,7 @@ bool UmlBaseRelation::set_Association(const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -205,7 +205,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -337,7 +337,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/GlobalChange/UmlBaseRelation.h b/genplugouts/GlobalChange/UmlBaseRelation.h
index 536a4eee9..ed2d12172 100644
--- a/genplugouts/GlobalChange/UmlBaseRelation.h
+++ b/genplugouts/GlobalChange/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlRelation;
@@ -71,7 +71,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -83,7 +83,7 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
@@ -97,7 +97,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_Association(const UmlTypeSpec & t);
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -105,7 +105,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -168,7 +168,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -215,13 +215,13 @@ class UmlBaseRelation : public UmlClassMember
     bool _idl_truncatable : 1;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlTypeSpec _association;
 
@@ -233,7 +233,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -273,11 +273,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/GlobalChange/UmlBaseSequenceDiagram.h b/genplugouts/GlobalChange/UmlBaseSequenceDiagram.h
index 345c08b13..5f33ab882 100644
--- a/genplugouts/GlobalChange/UmlBaseSequenceDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/GlobalChange/UmlBaseSequenceDiagramDefinition.cpp b/genplugouts/GlobalChange/UmlBaseSequenceDiagramDefinition.cpp
index eb3b1751b..975bbd0c3 100644
--- a/genplugouts/GlobalChange/UmlBaseSequenceDiagramDefinition.cpp
+++ b/genplugouts/GlobalChange/UmlBaseSequenceDiagramDefinition.cpp
@@ -2,7 +2,7 @@
 #include "UmlCom.h"
 #include "UmlBaseSequenceDiagramDefinition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 static void qsort(UmlSequenceMessage ** v, int low, int high)
 {
@@ -40,7 +40,7 @@ static void qsort(UmlSequenceMessage ** v, int low, int high)
 }
 void UmlBaseSequenceDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -54,7 +54,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -64,11 +64,11 @@ void UmlBaseSequenceDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -82,7 +82,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         }
 
         ::qsort(_messages.data(), 0, n - 1);
-        _messages.setAutoDelete(TRUE);
+        //_messages.setAutoDelete(TRUE);
     }
 
     n = _fragments.count();
@@ -92,7 +92,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
 
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
@@ -103,7 +103,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
     }
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/GlobalChange/UmlBaseSequenceDiagramDefinition.h b/genplugouts/GlobalChange/UmlBaseSequenceDiagramDefinition.h
index 6be419e66..f80c8b3f6 100644
--- a/genplugouts/GlobalChange/UmlBaseSequenceDiagramDefinition.h
+++ b/genplugouts/GlobalChange/UmlBaseSequenceDiagramDefinition.h
@@ -8,7 +8,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlSequenceMessage.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlSequenceMessage;
@@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following the sending time
-    const Q3PtrVector<UmlSequenceMessage> & messages() const {
+    const QVector<UmlSequenceMessage*> & messages() const {
         return _messages;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlSequenceMessage> _messages;
+    QVector<UmlSequenceMessage*> _messages;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/GlobalChange/UmlBaseSequenceMessage.cpp b/genplugouts/GlobalChange/UmlBaseSequenceMessage.cpp
index 379ba53a7..459327d24 100644
--- a/genplugouts/GlobalChange/UmlBaseSequenceMessage.cpp
+++ b/genplugouts/GlobalChange/UmlBaseSequenceMessage.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlFragment.h"
 
-void UmlBaseSequenceMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseSequenceMessage::read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments)
 {
     UmlBaseMessage::read_(instances);
     _kind = (aMessageKind) UmlCom::read_char();
diff --git a/genplugouts/GlobalChange/UmlBaseSequenceMessage.h b/genplugouts/GlobalChange/UmlBaseSequenceMessage.h
index 4eb0b884d..e53b0a32d 100644
--- a/genplugouts/GlobalChange/UmlBaseSequenceMessage.h
+++ b/genplugouts/GlobalChange/UmlBaseSequenceMessage.h
@@ -3,9 +3,9 @@
 
 
 #include "aMessageKind.h"
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-#include <q3ptrvector.h>
+
+
+
 #include "UmlMessage.h"
 
 class UmlFragmentCompartment;
@@ -37,7 +37,7 @@ class UmlBaseSequenceMessage : public UmlMessage
     }
 
     // return the arguments of the operation, may be empty
-    const Q3CString & arguments() const {
+    const QByteArray & arguments() const {
         return _args;
     }
 
@@ -53,10 +53,10 @@ class UmlBaseSequenceMessage : public UmlMessage
 
     int _received_at;
 
-    Q3CString _args;
+    QByteArray _args;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments);
 
     friend class UmlBaseSequenceDiagramDefinition;
 };
diff --git a/genplugouts/GlobalChange/UmlBaseShallowHistoryPseudoState.h b/genplugouts/GlobalChange/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..cb82c3ec1 100644
--- a/genplugouts/GlobalChange/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseState.cpp b/genplugouts/GlobalChange/UmlBaseState.cpp
index fbdec19f6..5437698d7 100644
--- a/genplugouts/GlobalChange/UmlBaseState.cpp
+++ b/genplugouts/GlobalChange/UmlBaseState.cpp
@@ -4,7 +4,7 @@
 #include "UmlState.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -27,7 +27,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -38,7 +38,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -50,7 +50,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -61,7 +61,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -72,7 +72,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -85,7 +85,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -96,7 +96,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -107,7 +107,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/GlobalChange/UmlBaseState.h b/genplugouts/GlobalChange/UmlBaseState.h
index 97337032a..480d1688a 100644
--- a/genplugouts/GlobalChange/UmlBaseState.h
+++ b/genplugouts/GlobalChange/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "StateBehavior.h"
 
 class UmlState;
@@ -26,13 +26,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -48,7 +48,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -57,7 +57,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -65,7 +65,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -73,7 +73,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -83,7 +83,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -91,7 +91,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -99,7 +99,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/GlobalChange/UmlBaseStateAction.cpp b/genplugouts/GlobalChange/UmlBaseStateAction.cpp
index 32063a1ac..ddae8212d 100644
--- a/genplugouts/GlobalChange/UmlBaseStateAction.cpp
+++ b/genplugouts/GlobalChange/UmlBaseStateAction.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseStateAction.h"
 #include "UmlStateAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlItem * parent)
 {
@@ -15,7 +15,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -27,7 +27,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -40,7 +40,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/GlobalChange/UmlBaseStateAction.h b/genplugouts/GlobalChange/UmlBaseStateAction.h
index 058903e1f..0ddee639e 100644
--- a/genplugouts/GlobalChange/UmlBaseStateAction.h
+++ b/genplugouts/GlobalChange/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateAction;
 
@@ -24,13 +24,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -39,7 +39,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -49,7 +49,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -67,14 +67,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/GlobalChange/UmlBaseStateDiagram.h b/genplugouts/GlobalChange/UmlBaseStateDiagram.h
index ea7e37ee0..d3c5bd101 100644
--- a/genplugouts/GlobalChange/UmlBaseStateDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseSubject.cpp b/genplugouts/GlobalChange/UmlBaseSubject.cpp
index b15d380d3..f55c74c8a 100644
--- a/genplugouts/GlobalChange/UmlBaseSubject.cpp
+++ b/genplugouts/GlobalChange/UmlBaseSubject.cpp
@@ -12,7 +12,7 @@ void UmlBaseSubject::read_()
     _h = (int) UmlCom::read_unsigned();
 }
 
-UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects)
+UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects)
 {
     int rank = subjects.count();
 
diff --git a/genplugouts/GlobalChange/UmlBaseSubject.h b/genplugouts/GlobalChange/UmlBaseSubject.h
index da0098ff6..a7ee545c2 100644
--- a/genplugouts/GlobalChange/UmlBaseSubject.h
+++ b/genplugouts/GlobalChange/UmlBaseSubject.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASESUBJECT_H
 #define _UMLBASESUBJECT_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
-#include <q3ptrvector.h>
 
+#include <QVector>
 class UmlSubject;
 
 // this class manages subjects
@@ -12,13 +12,13 @@ class UmlBaseSubject
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -34,7 +34,7 @@ class UmlBaseSubject
 
 public:
     // internal
-    static UmlSubject * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects);
+    static UmlSubject * get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/GlobalChange/UmlBaseTerminatePseudoState.h b/genplugouts/GlobalChange/UmlBaseTerminatePseudoState.h
index e8553f4be..5328f4055 100644
--- a/genplugouts/GlobalChange/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/GlobalChange/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseTransition.cpp b/genplugouts/GlobalChange/UmlBaseTransition.cpp
index 8fe2570a0..7dec536d7 100644
--- a/genplugouts/GlobalChange/UmlBaseTransition.cpp
+++ b/genplugouts/GlobalChange/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_IsExternal(bool v)
     return set_it_(_is_external, v, setIsCppExternalCmd);
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -61,7 +61,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -95,7 +95,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -130,7 +130,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/GlobalChange/UmlBaseTransition.h b/genplugouts/GlobalChange/UmlBaseTransition.h
index 0cf346693..df0dded28 100644
--- a/genplugouts/GlobalChange/UmlBaseTransition.h
+++ b/genplugouts/GlobalChange/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -36,7 +36,7 @@ class UmlBaseTransition : public UmlItem
     bool set_IsExternal(bool v);
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -44,7 +44,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -52,7 +52,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -61,7 +61,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -69,7 +69,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -87,7 +87,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -95,7 +95,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -103,7 +103,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
@@ -152,7 +152,7 @@ class UmlBaseTransition : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTransition(void * id, const Q3CString & n) : UmlItem(id, n) {
+    UmlBaseTransition(void * id, const QByteArray & n) : UmlItem(id, n) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBaseTypeSpec.cpp b/genplugouts/GlobalChange/UmlBaseTypeSpec.cpp
index 4070a4a45..cddda026a 100644
--- a/genplugouts/GlobalChange/UmlBaseTypeSpec.cpp
+++ b/genplugouts/GlobalChange/UmlBaseTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlBaseTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseTypeSpec::toString() const
+const QByteArray & UmlBaseTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/GlobalChange/UmlBaseTypeSpec.h b/genplugouts/GlobalChange/UmlBaseTypeSpec.h
index 16fce750a..65940678a 100644
--- a/genplugouts/GlobalChange/UmlBaseTypeSpec.h
+++ b/genplugouts/GlobalChange/UmlBaseTypeSpec.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASETYPESPEC_H
 #define _UMLBASETYPESPEC_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 class UmlClass;
 
@@ -17,10 +17,10 @@ class UmlBaseTypeSpec
     UmlBaseTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     UmlClass * type;
 
diff --git a/genplugouts/GlobalChange/UmlBaseUseCase.cpp b/genplugouts/GlobalChange/UmlBaseUseCase.cpp
index 5e1d6d1b3..c85af9ddc 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCase.cpp
+++ b/genplugouts/GlobalChange/UmlBaseUseCase.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlUseCase * UmlBaseUseCase::create(UmlItem * parent, const char * s)
 {
     return (UmlUseCase *) parent->create_(anUseCase, s);
@@ -35,7 +35,7 @@ bool UmlBaseUseCase::set_AssociatedDiagram(UmlUseCaseDiagram * d)
         return FALSE;
 }
 
-const Q3CString & UmlBaseUseCase::extensionPoints()
+const QByteArray & UmlBaseUseCase::extensionPoints()
 {
     read_if_needed_();
     return _extension_points;
diff --git a/genplugouts/GlobalChange/UmlBaseUseCase.h b/genplugouts/GlobalChange/UmlBaseUseCase.h
index 9bd21249f..c1898a3c8 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCase.h
+++ b/genplugouts/GlobalChange/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -32,7 +32,7 @@ class UmlBaseUseCase : public UmlItem
     bool set_AssociatedDiagram(UmlUseCaseDiagram * d);
 
     // return the extension points
-    const Q3CString & extensionPoints();
+    const QByteArray & extensionPoints();
 
     // set the extension points
     //
@@ -41,7 +41,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
-    Q3CString _extension_points;
+    QByteArray _extension_points;
 
     UmlUseCaseDiagram * _assoc_diagram;
 
@@ -52,7 +52,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.cpp b/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.cpp
index ebee930a9..6a91c0e5c 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.cpp
+++ b/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.cpp
@@ -4,9 +4,9 @@
 #include "UmlUseCaseReference.h"
 #include "UmlClass.h"
 
-void UmlBaseUseCaseAssociation::read_(const Q3PtrDict<UmlUseCaseReference> & useCases)
+void UmlBaseUseCaseAssociation::read_(const QHash<void*,UmlUseCaseReference*> & useCases)
 {
-    _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()];
+    _use_case = (UmlUseCaseReference *) useCases[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
     _actor = (UmlClass *) UmlBaseItem::read_();
     _primary = UmlCom::read_bool();
     _name = UmlCom::read_string();
diff --git a/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.h b/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.h
index 9538e6ba7..c02d52d03 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.h
+++ b/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.h
@@ -2,9 +2,9 @@
 #define _UMLBASEUSECASEASSOCIATION_H
 
 
-#include <q3cstring.h>
-#include <q3ptrdict.h>
 
+#include <QByteArray>
+#include <QHash>
 class UmlUseCaseReference;
 class UmlClass;
 
@@ -13,12 +13,12 @@ class UmlBaseUseCaseAssociation
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the stereotype
-    const Q3CString & stereotype() const {
+    const QByteArray & stereotype() const {
         return _stereotype;
     }
 
@@ -43,14 +43,14 @@ class UmlBaseUseCaseAssociation
 
     UmlClass * _actor;
 
-    Q3CString _name;
+    QByteArray _name;
 
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
     bool _primary;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlUseCaseReference> & useCases);
+    void read_(const QHash<void *, UmlUseCaseReference *> &useCases);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/GlobalChange/UmlBaseUseCaseDiagram.h b/genplugouts/GlobalChange/UmlBaseUseCaseDiagram.h
index 4370e63a4..9467f8f23 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/GlobalChange/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.cpp b/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.cpp
index b8780daf2..00a1ebe8a 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.cpp
+++ b/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseUseCaseDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlUseCaseReference> ucrefs;
+    QHash<void*,UmlUseCaseReference*> ucrefs;
     unsigned n;
     unsigned rank;
 
@@ -18,7 +18,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -31,7 +31,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         sb->read_();
     }
 
-    _subjects.setAutoDelete(TRUE);
+    //_subjects.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _use_cases.resize(n);
@@ -40,11 +40,11 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         UmlUseCaseReference * uc = new UmlUseCaseReference();
 
         _use_cases.insert(rank, uc);
-        ucrefs.insert((void *) UmlCom::read_unsigned(), uc);
+        ucrefs.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), uc);
         uc->read_(_fragments, _subjects);
     }
 
-    _use_cases.setAutoDelete(TRUE);
+    //_use_cases.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _actors.resize(n);
@@ -62,7 +62,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         r->read_(ucrefs);
     }
 
-    _rels.setAutoDelete(TRUE);
+    //_rels.setAutoDelete(TRUE);
 }
 
 UmlBaseUseCaseDiagramDefinition::~UmlBaseUseCaseDiagramDefinition()
diff --git a/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.h b/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.h
index d2cefc68d..fe556d93b 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.h
+++ b/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.h
@@ -10,7 +10,7 @@
 #include "UmlUseCaseReference.h"
 #include "UmlUseCaseAssociation.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlUseCaseReference;
 class UmlClass;
@@ -23,41 +23,41 @@ class UmlBaseUseCaseDiagramDefinition
 {
 public:
     // return the use cases present in the diagram
-    const Q3PtrVector<UmlUseCaseReference> & useCases() const {
+    const QVector<UmlUseCaseReference*> & useCases() const {
         return _use_cases;
     }
 
     // return the actors present in the diagram
-    const Q3PtrVector<UmlClass> & actors() const {
+    const QVector<UmlClass*> & actors() const {
         return _actors;
     }
 
     // return the associations between actor and use case present in the diagram
-    const Q3PtrVector<UmlUseCaseAssociation> & associations() const {
+    const QVector<UmlUseCaseAssociation*> & associations() const {
         return _rels;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
     // return the subjects present in the diagram
-    const Q3PtrVector<UmlSubject> & subjects() const {
+    const QVector<UmlSubject*> & subjects() const {
         return _subjects;
     }
 
 
 private:
-    Q3PtrVector<UmlUseCaseReference> _use_cases;
+    QVector<UmlUseCaseReference*> _use_cases;
 
-    Q3PtrVector<UmlClass> _actors;
+    QVector<UmlClass*> _actors;
 
-    Q3PtrVector<UmlUseCaseAssociation> _rels;
+    QVector<UmlUseCaseAssociation*> _rels;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
-    Q3PtrVector<UmlSubject> _subjects;
+    QVector<UmlSubject*> _subjects;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/GlobalChange/UmlBaseUseCaseReference.cpp b/genplugouts/GlobalChange/UmlBaseUseCaseReference.cpp
index c599f87d4..d20f93f30 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCaseReference.cpp
+++ b/genplugouts/GlobalChange/UmlBaseUseCaseReference.cpp
@@ -6,7 +6,7 @@
 #include "UmlSubject.h"
 #include "UmlFragment.h"
 
-void UmlBaseUseCaseReference::read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects)
+void UmlBaseUseCaseReference::read_(const QVector<UmlFragment *> & fragments, const QVector<UmlSubject *> & subjects)
 {
     _use_case = (UmlUseCase *) UmlBaseItem::read_();
     _x = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/GlobalChange/UmlBaseUseCaseReference.h b/genplugouts/GlobalChange/UmlBaseUseCaseReference.h
index 5e5590920..b29d782cc 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCaseReference.h
+++ b/genplugouts/GlobalChange/UmlBaseUseCaseReference.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASEUSECASEREFERENCE_H
 #define _UMLBASEUSECASEREFERENCE_H
+#include <QVector>
 
 
-#include <q3ptrvector.h>
 
 class UmlUseCase;
 class UmlFragmentCompartment;
@@ -46,7 +46,7 @@ class UmlBaseUseCaseReference
     int _h;
 
     // internal, don't call it
-    void read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects);
+    void read_(const QVector<UmlFragment *> &fragments, const QVector<UmlSubject *> &subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/GlobalChange/UmlBaseUseCaseView.h b/genplugouts/GlobalChange/UmlBaseUseCaseView.h
index 19d836b64..b5140abd8 100644
--- a/genplugouts/GlobalChange/UmlBaseUseCaseView.h
+++ b/genplugouts/GlobalChange/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseView;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlBaseView.h b/genplugouts/GlobalChange/UmlBaseView.h
index ee8c0dd38..1e346b17b 100644
--- a/genplugouts/GlobalChange/UmlBaseView.h
+++ b/genplugouts/GlobalChange/UmlBaseView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseView : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseView(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseView(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlBuiltin.h b/genplugouts/GlobalChange/UmlBuiltin.h
index 4f5c16f41..9194f9c76 100644
--- a/genplugouts/GlobalChange/UmlBuiltin.h
+++ b/genplugouts/GlobalChange/UmlBuiltin.h
@@ -1,32 +1,33 @@
 #ifndef _UMLBUILTIN_H
 #define _UMLBUILTIN_H
+#include <QByteArray>
+
 
 
-#include <q3cstring.h>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/GlobalChange/UmlClass.cpp b/genplugouts/GlobalChange/UmlClass.cpp
index e0fa7577a..24ee2bcf4 100644
--- a/genplugouts/GlobalChange/UmlClass.cpp
+++ b/genplugouts/GlobalChange/UmlClass.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlClass.h"
 #include "Context.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include <QVector>
+#include <QByteArray>
 
 void UmlClass::change(Context & ctx)
 {
     if (ctx.onClass() && ctx.match_stereotype(stereotype())) {
         if (ctx.cpp()) {
-            const Q3CString & c = cppDecl();
+            const QByteArray & c = cppDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_CppDecl(ctx.replace(c)))
@@ -17,7 +17,7 @@ void UmlClass::change(Context & ctx)
         }
 
         if (ctx.java()) {
-            const Q3CString & c = javaDecl();
+            const QByteArray & c = javaDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_JavaDecl(ctx.replace(c)))
@@ -26,7 +26,7 @@ void UmlClass::change(Context & ctx)
         }
 
         if (ctx.php()) {
-            const Q3CString & c = phpDecl();
+            const QByteArray & c = phpDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PhpDecl(ctx.replace(c)))
@@ -35,7 +35,7 @@ void UmlClass::change(Context & ctx)
         }
 
         if (ctx.python()) {
-            const Q3CString & c = pythonDecl();
+            const QByteArray & c = pythonDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PythonDecl(ctx.replace(c)))
@@ -44,7 +44,7 @@ void UmlClass::change(Context & ctx)
         }
 
         if (ctx.idl()) {
-            const Q3CString & c = idlDecl();
+            const QByteArray & c = idlDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_IdlDecl(ctx.replace(c)))
@@ -53,8 +53,8 @@ void UmlClass::change(Context & ctx)
         }
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned i;
+    const QVector<UmlItem*> ch = children();
+    int i;
 
     for (i = 0; i != ch.size(); i += 1)
         ch[i]->change(ctx);
diff --git a/genplugouts/GlobalChange/UmlClass.h b/genplugouts/GlobalChange/UmlClass.h
index d9bcccd8d..da6b4a5ca 100644
--- a/genplugouts/GlobalChange/UmlClass.h
+++ b/genplugouts/GlobalChange/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -14,7 +14,7 @@ class Context;
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
     virtual void change(Context & ctx);
 
diff --git a/genplugouts/GlobalChange/UmlClassDiagram.h b/genplugouts/GlobalChange/UmlClassDiagram.h
index 76134392d..ac4781283 100644
--- a/genplugouts/GlobalChange/UmlClassDiagram.h
+++ b/genplugouts/GlobalChange/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlClassInstance.h b/genplugouts/GlobalChange/UmlClassInstance.h
index c0c0e5a90..cb4473236 100644
--- a/genplugouts/GlobalChange/UmlClassInstance.h
+++ b/genplugouts/GlobalChange/UmlClassInstance.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseClassInstance.h"
-#include <q3cstring.h>
+
 
 class UmlClassInstance : public UmlBaseClassInstance
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClassInstance(void * id, const Q3CString & s) : UmlBaseClassInstance(id, s) {
+    UmlClassInstance(void * id, const QByteArray & s) : UmlBaseClassInstance(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlClassItem.h b/genplugouts/GlobalChange/UmlClassItem.h
index bf64f4dbb..7c4a888f7 100644
--- a/genplugouts/GlobalChange/UmlClassItem.h
+++ b/genplugouts/GlobalChange/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlClassMember.h b/genplugouts/GlobalChange/UmlClassMember.h
index 9119443c6..35fdddb52 100644
--- a/genplugouts/GlobalChange/UmlClassMember.h
+++ b/genplugouts/GlobalChange/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlClassView.cpp b/genplugouts/GlobalChange/UmlClassView.cpp
index d4257984f..4d4dbc3cb 100644
--- a/genplugouts/GlobalChange/UmlClassView.cpp
+++ b/genplugouts/GlobalChange/UmlClassView.cpp
@@ -1,13 +1,14 @@
 
 #include "UmlClassView.h"
 #include "Context.h"
+#include <QVector>
 
 void UmlClassView::change(Context & ctx)
 {
     if (ctx.onClass() || ctx.onOperation() ||
         ctx.onAttribute() || ctx.onRelation()) {
-        const Q3PtrVector<UmlItem> ch = children();
-        unsigned i;
+        const QVector<UmlItem*> ch = children();
+        int i;
 
         for (i = 0; i != ch.size(); i += 1)
             ch[i]->change(ctx);
diff --git a/genplugouts/GlobalChange/UmlClassView.h b/genplugouts/GlobalChange/UmlClassView.h
index 8b6c90e34..a1c9e29b3 100644
--- a/genplugouts/GlobalChange/UmlClassView.h
+++ b/genplugouts/GlobalChange/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -13,7 +13,7 @@ class Context;
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
     virtual void change(Context & ctx);
 
diff --git a/genplugouts/GlobalChange/UmlCollaborationDiagram.h b/genplugouts/GlobalChange/UmlCollaborationDiagram.h
index ab1388561..fc69dea4c 100644
--- a/genplugouts/GlobalChange/UmlCollaborationDiagram.h
+++ b/genplugouts/GlobalChange/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlCom.cpp b/genplugouts/GlobalChange/UmlCom.cpp
index 35d409bee..809316374 100644
--- a/genplugouts/GlobalChange/UmlCom.cpp
+++ b/genplugouts/GlobalChange/UmlCom.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
@@ -11,10 +11,11 @@
 #include "UmlClass.h"
 #include "UmlSettings.h"
 #include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +29,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(42);
         flush();
@@ -75,11 +78,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -89,11 +92,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -110,13 +113,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -125,10 +128,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -137,16 +140,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -155,18 +158,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -212,7 +215,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -222,7 +225,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -233,7 +236,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
 #endif
 
     write_char(f);
@@ -246,7 +249,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -258,7 +261,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
 #endif
 
     write_char(f);
@@ -270,7 +273,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -282,7 +285,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -294,7 +297,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -307,7 +310,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -320,7 +323,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -334,7 +337,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -346,7 +349,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -359,7 +362,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +375,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -385,7 +388,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -407,7 +410,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -421,7 +424,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -435,7 +438,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -450,7 +453,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -463,7 +466,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -477,7 +480,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -499,8 +502,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -533,7 +536,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -556,10 +559,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -576,10 +579,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -613,7 +616,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -630,7 +633,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -641,12 +644,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -678,28 +681,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -708,7 +712,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -719,7 +723,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/GlobalChange/UmlCom.h b/genplugouts/GlobalChange/UmlCom.h
index ecdb8d127..bfce98c00 100644
--- a/genplugouts/GlobalChange/UmlCom.h
+++ b/genplugouts/GlobalChange/UmlCom.h
@@ -2,21 +2,21 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //#include "CmdFamily.h"
 //#include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
 
-#include <q3ptrvector.h>
+
+
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -77,11 +77,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -91,19 +91,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -193,8 +193,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -217,10 +217,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
diff --git a/genplugouts/GlobalChange/UmlComponent.h b/genplugouts/GlobalChange/UmlComponent.h
index bb4fdbb25..e8961ed60 100644
--- a/genplugouts/GlobalChange/UmlComponent.h
+++ b/genplugouts/GlobalChange/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlComponentDiagram.h b/genplugouts/GlobalChange/UmlComponentDiagram.h
index 15d707dc2..9afaa7eb4 100644
--- a/genplugouts/GlobalChange/UmlComponentDiagram.h
+++ b/genplugouts/GlobalChange/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlComponentView.h b/genplugouts/GlobalChange/UmlComponentView.h
index 000a74744..cc09cecc6 100644
--- a/genplugouts/GlobalChange/UmlComponentView.h
+++ b/genplugouts/GlobalChange/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlDeploymentDiagram.h b/genplugouts/GlobalChange/UmlDeploymentDiagram.h
index 727d0ffd0..1f0add3d0 100644
--- a/genplugouts/GlobalChange/UmlDeploymentDiagram.h
+++ b/genplugouts/GlobalChange/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlDeploymentView.cpp b/genplugouts/GlobalChange/UmlDeploymentView.cpp
index 222b10e29..c7c0970b1 100644
--- a/genplugouts/GlobalChange/UmlDeploymentView.cpp
+++ b/genplugouts/GlobalChange/UmlDeploymentView.cpp
@@ -1,12 +1,13 @@
 
 #include "UmlDeploymentView.h"
 #include "Context.h"
+#include <QVector>
 
 void UmlDeploymentView::change(Context & ctx)
 {
     if (ctx.onArtifact()) {
-        const Q3PtrVector<UmlItem> ch = children();
-        unsigned i;
+        const QVector<UmlItem*> ch = children();
+        int i;
 
         for (i = 0; i != ch.size(); i += 1)
             ch[i]->change(ctx);
diff --git a/genplugouts/GlobalChange/UmlDeploymentView.h b/genplugouts/GlobalChange/UmlDeploymentView.h
index f70c2a23a..99e2e6fd0 100644
--- a/genplugouts/GlobalChange/UmlDeploymentView.h
+++ b/genplugouts/GlobalChange/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -13,7 +13,7 @@ class Context;
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
     virtual void change(Context & ctx);
 
diff --git a/genplugouts/GlobalChange/UmlDiagram.h b/genplugouts/GlobalChange/UmlDiagram.h
index ffee38e5c..99e0f81e4 100644
--- a/genplugouts/GlobalChange/UmlDiagram.h
+++ b/genplugouts/GlobalChange/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlEntryPointPseudoState.h b/genplugouts/GlobalChange/UmlEntryPointPseudoState.h
index 838a4bf5b..3fd7f6eca 100644
--- a/genplugouts/GlobalChange/UmlEntryPointPseudoState.h
+++ b/genplugouts/GlobalChange/UmlEntryPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlExitPointPseudoState.h b/genplugouts/GlobalChange/UmlExitPointPseudoState.h
index 1a57b8230..e63c68782 100644
--- a/genplugouts/GlobalChange/UmlExitPointPseudoState.h
+++ b/genplugouts/GlobalChange/UmlExitPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlExpansionNode.h b/genplugouts/GlobalChange/UmlExpansionNode.h
index 65d1cff2a..e2dbd5565 100644
--- a/genplugouts/GlobalChange/UmlExpansionNode.h
+++ b/genplugouts/GlobalChange/UmlExpansionNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionNode.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode : public UmlBaseExpansionNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionNode(void * id, const Q3CString & s) : UmlBaseExpansionNode(id, s) {
+    UmlExpansionNode(void * id, const QByteArray & s) : UmlBaseExpansionNode(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlExpansionRegion.h b/genplugouts/GlobalChange/UmlExpansionRegion.h
index cfe999374..6d9130ca6 100644
--- a/genplugouts/GlobalChange/UmlExpansionRegion.h
+++ b/genplugouts/GlobalChange/UmlExpansionRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionRegion.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionRegion : public UmlBaseExpansionRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionRegion(void * id, const Q3CString & s) : UmlBaseExpansionRegion(id, s) {
+    UmlExpansionRegion(void * id, const QByteArray & s) : UmlBaseExpansionRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlExtraClassMember.h b/genplugouts/GlobalChange/UmlExtraClassMember.h
index cf0b2bf47..95b851b8d 100644
--- a/genplugouts/GlobalChange/UmlExtraClassMember.h
+++ b/genplugouts/GlobalChange/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlFlow.h b/genplugouts/GlobalChange/UmlFlow.h
index 6e78a8c4b..e31afeb31 100644
--- a/genplugouts/GlobalChange/UmlFlow.h
+++ b/genplugouts/GlobalChange/UmlFlow.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseFlow.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlFlow : public UmlBaseFlow, public UmlActivityItem
 {
 public:
-    UmlFlow(void * id, const Q3CString & n) : UmlBaseFlow(id, n) {
+    UmlFlow(void * id, const QByteArray & n) : UmlBaseFlow(id, n) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlInterruptibleActivityRegion.h b/genplugouts/GlobalChange/UmlInterruptibleActivityRegion.h
index 0f78665c1..a696f6b2d 100644
--- a/genplugouts/GlobalChange/UmlInterruptibleActivityRegion.h
+++ b/genplugouts/GlobalChange/UmlInterruptibleActivityRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseInterruptibleActivityRegion.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion : public UmlBaseInterruptibleActivityRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlBaseInterruptibleActivityRegion(id, s) {
+    UmlInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlBaseInterruptibleActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlItem.h b/genplugouts/GlobalChange/UmlItem.h
index 6f3506f63..74b823d69 100644
--- a/genplugouts/GlobalChange/UmlItem.h
+++ b/genplugouts/GlobalChange/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -14,7 +14,7 @@ class Context;
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
diff --git a/genplugouts/GlobalChange/UmlNcRelation.h b/genplugouts/GlobalChange/UmlNcRelation.h
index 60032619a..3d73ec633 100644
--- a/genplugouts/GlobalChange/UmlNcRelation.h
+++ b/genplugouts/GlobalChange/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlNode.h b/genplugouts/GlobalChange/UmlNode.h
index 95edbe709..4c72e14fd 100644
--- a/genplugouts/GlobalChange/UmlNode.h
+++ b/genplugouts/GlobalChange/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlObjectDiagram.h b/genplugouts/GlobalChange/UmlObjectDiagram.h
index ba429242a..c194e4613 100644
--- a/genplugouts/GlobalChange/UmlObjectDiagram.h
+++ b/genplugouts/GlobalChange/UmlObjectDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseObjectDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'object diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -14,7 +14,7 @@ class UmlObjectDiagram : public UmlBaseObjectDiagram
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlObjectDiagram(void * id, const Q3CString & s) : UmlBaseObjectDiagram(id, s) {
+    UmlObjectDiagram(void * id, const QByteArray & s) : UmlBaseObjectDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlOnSignalAction.h b/genplugouts/GlobalChange/UmlOnSignalAction.h
index 158c0ddc0..82fd5747f 100644
--- a/genplugouts/GlobalChange/UmlOnSignalAction.h
+++ b/genplugouts/GlobalChange/UmlOnSignalAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseOnSignalAction.h"
-#include <q3cstring.h>
+
 
 class UmlOnSignalAction : public UmlBaseOnSignalAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOnSignalAction(void * id, const Q3CString & s) : UmlBaseOnSignalAction(id, s) {
+    UmlOnSignalAction(void * id, const QByteArray & s) : UmlBaseOnSignalAction(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlOperation.cpp b/genplugouts/GlobalChange/UmlOperation.cpp
index c81ccd11a..c728b1016 100644
--- a/genplugouts/GlobalChange/UmlOperation.cpp
+++ b/genplugouts/GlobalChange/UmlOperation.cpp
@@ -2,20 +2,20 @@
 #include "UmlOperation.h"
 #include "Context.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlOperation::change(Context & ctx)
 {
     if (ctx.onOperation() && ctx.match_stereotype(stereotype())) {
         if (ctx.cpp()) {
-            const Q3CString & c = cppDecl();
+            const QByteArray & c = cppDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_CppDecl(ctx.replace(c)))
                     ctx.err();
             }
 
-            const Q3CString & f = cppDef();
+            const QByteArray & f = cppDef();
 
             if (!f.isEmpty() && ctx.match(f)) {
                 if (!set_CppDef(ctx.replace(f)))
@@ -24,7 +24,7 @@ void UmlOperation::change(Context & ctx)
         }
 
         if (ctx.java()) {
-            const Q3CString & c = javaDecl();
+            const QByteArray & c = javaDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_JavaDecl(ctx.replace(c)))
@@ -33,7 +33,7 @@ void UmlOperation::change(Context & ctx)
         }
 
         if (ctx.php()) {
-            const Q3CString & c = phpDecl();
+            const QByteArray & c = phpDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PhpDecl(ctx.replace(c)))
@@ -42,7 +42,7 @@ void UmlOperation::change(Context & ctx)
         }
 
         if (ctx.python()) {
-            const Q3CString & c = pythonDecl();
+            const QByteArray & c = pythonDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PythonDecl(ctx.replace(c)))
@@ -51,7 +51,7 @@ void UmlOperation::change(Context & ctx)
         }
 
         if (ctx.idl()) {
-            const Q3CString & c = idlDecl();
+            const QByteArray & c = idlDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_IdlDecl(ctx.replace(c)))
diff --git a/genplugouts/GlobalChange/UmlOperation.h b/genplugouts/GlobalChange/UmlOperation.h
index f1268a122..42b33c891 100644
--- a/genplugouts/GlobalChange/UmlOperation.h
+++ b/genplugouts/GlobalChange/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -14,7 +14,7 @@ class Context;
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
     virtual void change(Context & ctx);
 
diff --git a/genplugouts/GlobalChange/UmlPackage.cpp b/genplugouts/GlobalChange/UmlPackage.cpp
index 74aea16dc..7cc0f863c 100644
--- a/genplugouts/GlobalChange/UmlPackage.cpp
+++ b/genplugouts/GlobalChange/UmlPackage.cpp
@@ -1,11 +1,11 @@
 
 #include "UmlPackage.h"
 #include "Context.h"
-
+#include <QVector>
 void UmlPackage::change(Context & ctx)
 {
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned i;
+    const QVector<UmlItem*> ch = children();
+    int i;
 
     for (i = 0; i != ch.size(); i += 1)
         ch[i]->change(ctx);
diff --git a/genplugouts/GlobalChange/UmlPackage.h b/genplugouts/GlobalChange/UmlPackage.h
index 3d6daae6f..647a2f8f1 100644
--- a/genplugouts/GlobalChange/UmlPackage.h
+++ b/genplugouts/GlobalChange/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -13,7 +13,7 @@ class Context;
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
     virtual void change(Context & ctx);
 
diff --git a/genplugouts/GlobalChange/UmlParameterSet.h b/genplugouts/GlobalChange/UmlParameterSet.h
index 55a597fd4..f9927f672 100644
--- a/genplugouts/GlobalChange/UmlParameterSet.h
+++ b/genplugouts/GlobalChange/UmlParameterSet.h
@@ -3,14 +3,14 @@
 
 
 #include "UmlBaseParameterSet.h"
-#include <q3cstring.h>
+
 #include "UmlActivityItem.h"
 
 class UmlParameterSet : public UmlBaseParameterSet, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlParameterSet(void * id, const Q3CString & s) : UmlBaseParameterSet(id, s) {
+    UmlParameterSet(void * id, const QByteArray & s) : UmlBaseParameterSet(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlPinParameter.h b/genplugouts/GlobalChange/UmlPinParameter.h
index d48cb7343..3d3283d6b 100644
--- a/genplugouts/GlobalChange/UmlPinParameter.h
+++ b/genplugouts/GlobalChange/UmlPinParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBasePinParameter.h"
-#include <q3cstring.h>
+
 
 class UmlPinParameter : public UmlBasePinParameter
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPinParameter(void * id, const Q3CString & s) : UmlBasePinParameter(id, s) {
+    UmlPinParameter(void * id, const QByteArray & s) : UmlBasePinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlPseudoState.h b/genplugouts/GlobalChange/UmlPseudoState.h
index 075761ec7..1c350a942 100644
--- a/genplugouts/GlobalChange/UmlPseudoState.h
+++ b/genplugouts/GlobalChange/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlRegion.h b/genplugouts/GlobalChange/UmlRegion.h
index d3f32cb7b..d0ce11dde 100644
--- a/genplugouts/GlobalChange/UmlRegion.h
+++ b/genplugouts/GlobalChange/UmlRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlRelation.cpp b/genplugouts/GlobalChange/UmlRelation.cpp
index 6fef01375..6acac0964 100644
--- a/genplugouts/GlobalChange/UmlRelation.cpp
+++ b/genplugouts/GlobalChange/UmlRelation.cpp
@@ -2,13 +2,13 @@
 #include "UmlRelation.h"
 #include "Context.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlRelation::change(Context & ctx)
 {
     if (ctx.onRelation() && ctx.match_stereotype(stereotype())) {
         if (ctx.cpp()) {
-            const Q3CString & c = cppDecl();
+            const QByteArray & c = cppDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_CppDecl(ctx.replace(c)))
@@ -17,7 +17,7 @@ void UmlRelation::change(Context & ctx)
         }
 
         if (ctx.java()) {
-            const Q3CString & c = javaDecl();
+            const QByteArray & c = javaDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_JavaDecl(ctx.replace(c)))
@@ -26,7 +26,7 @@ void UmlRelation::change(Context & ctx)
         }
 
         if (ctx.php()) {
-            const Q3CString & c = phpDecl();
+            const QByteArray & c = phpDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PhpDecl(ctx.replace(c)))
@@ -35,7 +35,7 @@ void UmlRelation::change(Context & ctx)
         }
 
         if (ctx.python()) {
-            const Q3CString & c = pythonDecl();
+            const QByteArray & c = pythonDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_PythonDecl(ctx.replace(c)))
@@ -44,7 +44,7 @@ void UmlRelation::change(Context & ctx)
         }
 
         if (ctx.idl()) {
-            const Q3CString & c = idlDecl();
+            const QByteArray & c = idlDecl();
 
             if (!c.isEmpty() && ctx.match(c)) {
                 if (!set_IdlDecl(ctx.replace(c)))
diff --git a/genplugouts/GlobalChange/UmlRelation.h b/genplugouts/GlobalChange/UmlRelation.h
index cf0e48c38..a98630564 100644
--- a/genplugouts/GlobalChange/UmlRelation.h
+++ b/genplugouts/GlobalChange/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+
 
 class Context;
 
@@ -14,7 +14,7 @@ class Context;
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
     virtual void change(Context & ctx);
 
diff --git a/genplugouts/GlobalChange/UmlSequenceDiagram.h b/genplugouts/GlobalChange/UmlSequenceDiagram.h
index d3b3d83fc..a36e34a65 100644
--- a/genplugouts/GlobalChange/UmlSequenceDiagram.h
+++ b/genplugouts/GlobalChange/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlSettings.cpp b/genplugouts/GlobalChange/UmlSettings.cpp
index e1dbe6f5c..78f70b12a 100644
--- a/genplugouts/GlobalChange/UmlSettings.cpp
+++ b/genplugouts/GlobalChange/UmlSettings.cpp
@@ -6,15 +6,15 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -26,14 +26,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -45,14 +45,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -64,14 +64,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[jasa] handle ambiguous call
 
@@ -83,14 +83,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v);
 
@@ -146,39 +146,39 @@ aLanguage UmlSettings::_uml_get_name;
 
 aLanguage UmlSettings::_uml_set_name;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -190,7 +190,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -203,7 +203,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -229,18 +229,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -251,7 +251,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_attribute_stereotypes.count();
 
@@ -262,7 +262,7 @@ Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString Um
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -273,19 +273,19 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         builtins[index] = _builtins[index];
-        _map_builtins.replace(builtins[index].uml, &builtins[index]);
+        _map_builtins.insert(builtins[index].uml, &builtins[index]);
     }
 
     builtins[index].uml = s;
@@ -310,19 +310,19 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
     return &_builtins[index];
 }
 
-UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_attr_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_attribute_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         relation_attribute_stereotypes[index] = _relation_attribute_stereotypes[index];
-        _map_relation_attribute_stereotypes.replace(relation_attribute_stereotypes[index].uml,
+        _map_relation_attribute_stereotypes.insert(relation_attribute_stereotypes[index].uml,
                 &relation_attribute_stereotypes[index]);
     }
 
@@ -345,19 +345,19 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
     return &_relation_attribute_stereotypes[index];
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         class_stereotypes[index] = _class_stereotypes[index];
-        _map_class_stereotypes.replace(class_stereotypes[index].uml, &class_stereotypes[index]);
+        _map_class_stereotypes.insert(class_stereotypes[index].uml, &class_stereotypes[index]);
     }
 
     class_stereotypes[index].uml = s;
diff --git a/genplugouts/GlobalChange/UmlSettings.h b/genplugouts/GlobalChange/UmlSettings.h
index c37c13a10..8d88457b8 100644
--- a/genplugouts/GlobalChange/UmlSettings.h
+++ b/genplugouts/GlobalChange/UmlSettings.h
@@ -1,10 +1,11 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
+#include <QByteArray>
+#include <QHash>
 
 
-#include <q3cstring.h>
 #include "aLanguage.h"
-#include <q3dict.h>
+
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -20,44 +21,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
     // return the language from which the getter's name rule must be followed at Uml level
     static aLanguage umlGetName();
@@ -90,25 +91,25 @@ class UmlSettings
 
 
 protected:
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_attribute_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -122,31 +123,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_attr_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_attr_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlState.h b/genplugouts/GlobalChange/UmlState.h
index b8a04be4a..e760bb6b6 100644
--- a/genplugouts/GlobalChange/UmlState.h
+++ b/genplugouts/GlobalChange/UmlState.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlStateDiagram.h b/genplugouts/GlobalChange/UmlStateDiagram.h
index f49b5fb44..c639f9193 100644
--- a/genplugouts/GlobalChange/UmlStateDiagram.h
+++ b/genplugouts/GlobalChange/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlStereotype.h b/genplugouts/GlobalChange/UmlStereotype.h
index 8c5bf56c0..1a43adfdc 100644
--- a/genplugouts/GlobalChange/UmlStereotype.h
+++ b/genplugouts/GlobalChange/UmlStereotype.h
@@ -2,31 +2,31 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
 
+#include <QByteArray>
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHPHP
-    Q3CString php;
+    QByteArray php;
 #endif
 
 #ifdef WITHPHP
-    Q3CString python;
+    QByteArray python;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/GlobalChange/UmlTransition.h b/genplugouts/GlobalChange/UmlTransition.h
index 3edd626c7..59ccc3e65 100644
--- a/genplugouts/GlobalChange/UmlTransition.h
+++ b/genplugouts/GlobalChange/UmlTransition.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlTransition : public UmlBaseTransition, public UmlStateItem
 {
 public:
-    UmlTransition(void * id, const Q3CString & n) : UmlBaseTransition(id, n) {
+    UmlTransition(void * id, const QByteArray & n) : UmlBaseTransition(id, n) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/UmlUseCase.h b/genplugouts/GlobalChange/UmlUseCase.h
index 392773262..c21cc521d 100644
--- a/genplugouts/GlobalChange/UmlUseCase.h
+++ b/genplugouts/GlobalChange/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case'
 //
@@ -11,7 +11,7 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlUseCaseDiagram.h b/genplugouts/GlobalChange/UmlUseCaseDiagram.h
index 132b56d36..bf490aa90 100644
--- a/genplugouts/GlobalChange/UmlUseCaseDiagram.h
+++ b/genplugouts/GlobalChange/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlUseCaseView.h b/genplugouts/GlobalChange/UmlUseCaseView.h
index a715b2f5f..ef475b173 100644
--- a/genplugouts/GlobalChange/UmlUseCaseView.h
+++ b/genplugouts/GlobalChange/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case view'
 //
@@ -11,7 +11,7 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/GlobalChange/UmlView.h b/genplugouts/GlobalChange/UmlView.h
index 418e689ab..2435ce96b 100644
--- a/genplugouts/GlobalChange/UmlView.h
+++ b/genplugouts/GlobalChange/UmlView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseView.h"
-#include <q3cstring.h>
+
 
 class UmlView : public UmlBaseView
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlView(void * id, const Q3CString & s) : UmlBaseView(id, s) {
+    UmlView(void * id, const QByteArray & s) : UmlBaseView(id, s) {
     }
 
 };
diff --git a/genplugouts/GlobalChange/bbuttongroup.cpp b/genplugouts/GlobalChange/bbuttongroup.cpp
new file mode 100644
index 000000000..4526db928
--- /dev/null
+++ b/genplugouts/GlobalChange/bbuttongroup.cpp
@@ -0,0 +1,66 @@
+#include "bbuttongroup.h"
+
+BButtonGroup::BButtonGroup(QWidget *parent) :
+    QGroupBox(parent)
+{
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = Qt::Horizontal;
+    m_hLayout = new QHBoxLayout(this);
+    this->setLayout(m_hLayout);
+    m_hLayout->setSpacing(0);
+    m_hLayout->setMargin(0);
+}
+
+BButtonGroup::BButtonGroup(const QString &title, QWidget *parent):
+    QGroupBox(title, parent)
+{
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = Qt::Horizontal;
+    m_hLayout = new QHBoxLayout(this);
+    this->setLayout(m_hLayout);
+    m_hLayout->setSpacing(0);
+    m_hLayout->setMargin(0);
+}
+
+BButtonGroup::BButtonGroup(int strips, Qt::Orientation orientation, const QString &title, QWidget *parent, QString):
+QGroupBox(title, parent)
+{
+    Q_UNUSED(strips);
+
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = orientation;
+    if(orientation == Qt::Horizontal)
+    {
+        m_hLayout = new QHBoxLayout(this);
+        this->setLayout(m_hLayout);
+        m_hLayout->setSpacing(0);
+        m_hLayout->setMargin(0);
+    }
+    else
+    {
+        m_vLayout = new QHBoxLayout(this);
+        this->setLayout(m_vLayout);
+        m_vLayout->setSpacing(0);
+        m_vLayout->setMargin(0);
+    }
+}
+
+void BButtonGroup::setExclusive(bool isEx)
+{
+    Q_UNUSED(isEx);
+}
+
+void BButtonGroup::addWidget(QWidget *widget)
+{
+    if(m_orientation == Qt::Horizontal)
+    {
+        m_hLayout->addWidget(widget);
+    }
+    else
+    {
+        m_vLayout->addWidget(widget);
+    }
+}
diff --git a/genplugouts/GlobalChange/bbuttongroup.h b/genplugouts/GlobalChange/bbuttongroup.h
new file mode 100644
index 000000000..e54f93d2e
--- /dev/null
+++ b/genplugouts/GlobalChange/bbuttongroup.h
@@ -0,0 +1,26 @@
+#ifndef BBUTTONGROUP_H
+#define BBUTTONGROUP_H
+
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QWidget>
+class BButtonGroup : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit BButtonGroup(QWidget *parent = 0);
+    explicit BButtonGroup(const QString &title, QWidget* parent=0);
+    BButtonGroup( int strips, Qt::Orientation orientation, const QString & title, QWidget * parent = 0, QString = QString());
+    void setExclusive(bool isEx);
+    void addWidget(QWidget* widget);
+    QHBoxLayout *m_hLayout;
+    QHBoxLayout *m_vLayout;
+    Qt::Orientation m_orientation;
+signals:
+
+public slots:
+
+};
+
+#endif // BBUTTONGROUP_H
diff --git a/genplugouts/GlobalChange/gridbox.cpp b/genplugouts/GlobalChange/gridbox.cpp
new file mode 100644
index 000000000..78233be1d
--- /dev/null
+++ b/genplugouts/GlobalChange/gridbox.cpp
@@ -0,0 +1,37 @@
+#include "gridbox.h"
+#include <QGridLayout>
+GridBox::GridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void GridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void GridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void GridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+}
+
+QString GridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/genplugouts/GlobalChange/gridbox.h b/genplugouts/GlobalChange/gridbox.h
new file mode 100644
index 000000000..64793941d
--- /dev/null
+++ b/genplugouts/GlobalChange/gridbox.h
@@ -0,0 +1,26 @@
+#ifndef GRIDBOX_H
+#define GRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class GridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit GridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/genplugouts/GlobalChange/hhbox.cpp b/genplugouts/GlobalChange/hhbox.cpp
new file mode 100644
index 000000000..95a09b5ea
--- /dev/null
+++ b/genplugouts/GlobalChange/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/GlobalChange/hhbox.h b/genplugouts/GlobalChange/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/genplugouts/GlobalChange/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/genplugouts/GlobalChange/vgridbox.cpp b/genplugouts/GlobalChange/vgridbox.cpp
new file mode 100644
index 000000000..69add1149
--- /dev/null
+++ b/genplugouts/GlobalChange/vgridbox.cpp
@@ -0,0 +1,37 @@
+#include "vgridbox.h"
+#include <QGridLayout>
+VGridBox::VGridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void VGridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void VGridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void VGridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex%m_numCols, currentIndex/m_numCols);
+    currentIndex ++;
+}
+
+QString VGridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/genplugouts/GlobalChange/vgridbox.h b/genplugouts/GlobalChange/vgridbox.h
new file mode 100644
index 000000000..503424ed5
--- /dev/null
+++ b/genplugouts/GlobalChange/vgridbox.h
@@ -0,0 +1,26 @@
+#ifndef VGRIDBOX_H
+#define VGRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class VGridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit VGridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/genplugouts/GlobalChange/vvbox.cpp b/genplugouts/GlobalChange/vvbox.cpp
new file mode 100644
index 000000000..288eb93ac
--- /dev/null
+++ b/genplugouts/GlobalChange/vvbox.cpp
@@ -0,0 +1,26 @@
+#include "vvbox.h"
+
+VVBox::VVBox(QWidget *parent) :
+    QWidget(parent)
+{
+    m_layout = new QVBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+}
+
+void VVBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+bool VVBox::setStretchFactor(QWidget *w, int stretch)
+{
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+void VVBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/GlobalChange/vvbox.h b/genplugouts/GlobalChange/vvbox.h
new file mode 100644
index 000000000..7f27f2ea8
--- /dev/null
+++ b/genplugouts/GlobalChange/vvbox.h
@@ -0,0 +1,22 @@
+#ifndef VVBOX_H
+#define VVBOX_H
+
+#include <QWidget>
+#include <QVBoxLayout>
+class VVBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit VVBox(QWidget *parent = 0);
+    void addWidget(QWidget* widget);
+
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+signals:
+
+public slots:
+private:
+    QVBoxLayout *m_layout;
+};
+
+#endif // VVBOX_H
diff --git a/genplugouts/HtmlDoc/CppSettings.cpp b/genplugouts/HtmlDoc/CppSettings.cpp
index c1ee8e9b4..d04e030e2 100644
--- a/genplugouts/HtmlDoc/CppSettings.cpp
+++ b/genplugouts/HtmlDoc/CppSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationAttributeStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -175,14 +175,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -194,14 +194,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -213,14 +213,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -232,14 +232,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -251,7 +251,7 @@ bool CppSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::reverseRoundtripDirRegExp()
+QByteArray CppSettings::reverseRoundtripDirRegExp()
 {
     read_if_needed_();
 
@@ -265,7 +265,7 @@ bool CppSettings::isReverseRoundtripDirRegExpCaseSensitive()
     return _dir_regexp_case_sensitive;
 }
 
-bool CppSettings::set_ReverseRoundtripDirRegExp(Q3CString s, bool cs)
+bool CppSettings::set_ReverseRoundtripDirRegExp(QByteArray s, bool cs)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppDirRevFilterCmd, s, cs);
 
@@ -278,7 +278,7 @@ bool CppSettings::set_ReverseRoundtripDirRegExp(Q3CString s, bool cs)
         return FALSE;
 }
 
-Q3CString CppSettings::reverseRoundtripFileRegExp()
+QByteArray CppSettings::reverseRoundtripFileRegExp()
 {
     read_if_needed_();
 
@@ -292,7 +292,7 @@ bool CppSettings::isReverseRoundtripFileRegExpCaseSensitive()
     return _file_regexp_case_sensitive;
 }
 
-bool CppSettings::set_ReverseRoundtripFileRegExp(Q3CString s, bool cs)
+bool CppSettings::set_ReverseRoundtripFileRegExp(QByteArray s, bool cs)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppFileRevFilterCmd, s, cs);
 
@@ -425,14 +425,14 @@ bool CppSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::visibilityIndent()
+const QByteArray & CppSettings::visibilityIndent()
 {
     read_if_needed_();
 
     return _visibility_indent;
 }
 
-bool CppSettings::set_VisibilityIndent(Q3CString v)
+bool CppSettings::set_VisibilityIndent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIndentVisibilityCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -444,14 +444,14 @@ bool CppSettings::set_VisibilityIndent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -463,14 +463,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -482,14 +482,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -501,14 +501,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -520,22 +520,22 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinIn(Q3CString s)
+QByteArray CppSettings::builtinIn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_in : Q3CString();
+    return (b) ? b->cpp_in : QByteArray();
 }
 
-bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinIn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -548,22 +548,22 @@ bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinOut(Q3CString s)
+QByteArray CppSettings::builtinOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_out : Q3CString();
+    return (b) ? b->cpp_out : QByteArray();
 }
 
-bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -576,22 +576,22 @@ bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinInOut(Q3CString s)
+QByteArray CppSettings::builtinInOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_inout : Q3CString();
+    return (b) ? b->cpp_inout : QByteArray();
 }
 
-bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinInOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -604,22 +604,22 @@ bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinReturn(Q3CString s)
+QByteArray CppSettings::builtinReturn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_return : Q3CString();
+    return (b) ? b->cpp_return : QByteArray();
 }
 
-bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinReturn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -632,14 +632,14 @@ bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v, ""); //[rageek] Fix prototype
 
@@ -651,14 +651,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v, ""); //[rageek] Fix prototype
 
@@ -670,14 +670,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v, ""); //[rageek] Fix prototype
 
@@ -689,14 +689,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)v, ""); //[rageek] Fix prototype
 
@@ -708,14 +708,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -727,14 +727,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -746,14 +746,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -765,14 +765,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -784,14 +784,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -803,14 +803,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -822,14 +822,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl(const char * multiplicity)
+const QByteArray & CppSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool CppSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -842,14 +842,14 @@ bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -861,7 +861,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -881,14 +881,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -900,14 +900,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -957,14 +957,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -1052,14 +1052,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -1130,51 +1130,51 @@ bool CppSettings::set_IsSetParamRef(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl[3/*multiplicity*/];
+QByteArray CppSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -1184,7 +1184,7 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
@@ -1192,19 +1192,19 @@ bool CppSettings::_is_set_param_const;
 
 bool CppSettings::_is_set_param_ref;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
-Q3CString CppSettings::_dir_regexp;
+QByteArray CppSettings::_dir_regexp;
 
 bool CppSettings::_dir_regexp_case_sensitive;
 
-Q3CString CppSettings::_file_regexp;
+QByteArray CppSettings::_file_regexp;
 
 bool CppSettings::_file_regexp_case_sensitive;
 
@@ -1220,16 +1220,16 @@ bool CppSettings::_is_generate_javadoc_comment;
 
 bool CppSettings::_is_inline_force_header_in_h;
 
-Q3CString CppSettings::_visibility_indent;
+QByteArray CppSettings::_visibility_indent;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1255,13 +1255,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/HtmlDoc/CppSettings.h b/genplugouts/HtmlDoc/CppSettings.h
index 086713522..b4c78cd83 100644
--- a/genplugouts/HtmlDoc/CppSettings.h
+++ b/genplugouts/HtmlDoc/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,104 +31,104 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(Q3CString s);
+    static QByteArray relationAttributeStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return the regular expression used to bypass
     // dir s on reverse/roundtrip
-    static Q3CString reverseRoundtripDirRegExp();
+    static QByteArray reverseRoundtripDirRegExp();
 
     // return if the regular expression used to bypass
     // dir s on reverse/roundtrip is case sensitive
@@ -137,11 +137,11 @@ class CppSettings : public UmlSettings
     // set the regular expression used to bypass
     // dir s on reverse/roundtrip
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ReverseRoundtripDirRegExp(Q3CString s, bool cs);
+    static bool set_ReverseRoundtripDirRegExp(QByteArray s, bool cs);
 
     // return the regular expression used to bypass
     // file s on reverse/roundtrip
-    static Q3CString reverseRoundtripFileRegExp();
+    static QByteArray reverseRoundtripFileRegExp();
 
     // return if the regular expression used to bypass
     // file s on reverse/roundtrip is case sensitive
@@ -150,7 +150,7 @@ class CppSettings : public UmlSettings
     // set the regular expression used to bypass
     // file s on reverse/roundtrip
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ReverseRoundtripFileRegExp(Q3CString s, bool cs);
+    static bool set_ReverseRoundtripFileRegExp(QByteArray s, bool cs);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -212,56 +212,56 @@ class CppSettings : public UmlSettings
 
     // return the indent of the visibility specifiers
 
-    static const Q3CString & visibilityIndent();
+    static const QByteArray & visibilityIndent();
 
     // set visibility specifiers indent
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_VisibilityIndent(Q3CString v);
+    static bool set_VisibilityIndent(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinIn(Q3CString s);
+    static QByteArray builtinIn(QByteArray s);
 
     // set the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
@@ -269,13 +269,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinIn(Q3CString type, Q3CString form);
+    static bool set_BuiltinIn(QByteArray type, QByteArray form);
 
     // returns the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinOut(Q3CString s);
+    static QByteArray builtinOut(QByteArray s);
 
     // set the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
@@ -283,13 +283,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinInOut(Q3CString s);
+    static QByteArray builtinInOut(QByteArray s);
 
     // set the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
@@ -297,13 +297,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinInOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinInOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinReturn(Q3CString s);
+    static QByteArray builtinReturn(QByteArray s);
 
     // set the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
@@ -311,36 +311,36 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinReturn(Q3CString type, Q3CString form);
+    static bool set_BuiltinReturn(QByteArray type, QByteArray form);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -348,83 +348,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -433,20 +433,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -470,13 +470,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -522,14 +522,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -570,51 +570,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -624,7 +624,7 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
@@ -632,19 +632,19 @@ class CppSettings : public UmlSettings
 
     static bool _is_set_param_ref;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
-    static Q3CString _dir_regexp;
+    static QByteArray _dir_regexp;
 
     static bool _dir_regexp_case_sensitive;
 
-    static Q3CString _file_regexp;
+    static QByteArray _file_regexp;
 
     static bool _file_regexp_case_sensitive;
 
@@ -660,9 +660,9 @@ class CppSettings : public UmlSettings
 
     static bool _is_inline_force_header_in_h;
 
-    static Q3CString _visibility_indent;
+    static QByteArray _visibility_indent;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/HtmlDoc/FileWriter.cpp b/genplugouts/HtmlDoc/FileWriter.cpp
index acd4faa16..94932f870 100644
--- a/genplugouts/HtmlDoc/FileWriter.cpp
+++ b/genplugouts/HtmlDoc/FileWriter.cpp
@@ -1,12 +1,12 @@
 
 #include "FileWriter.h"
 
-#include <q3textstream.h>
+#include <qtextstream.h>
 #include <qfile.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool FileWriter::open(Q3CString s)
+bool FileWriter::open(QByteArray s)
 {
     f = new QFile(s);
 
@@ -15,7 +15,7 @@ bool FileWriter::open(Q3CString s)
         return FALSE;
     }
 
-    ts = new Q3TextStream(f);
+    ts = new QTextStream(f);
     return TRUE;
 }
 
@@ -29,28 +29,32 @@ void FileWriter::close()
     ts = 0;
 }
 
-void FileWriter::write(Q3CString s)
+void FileWriter::write(QByteArray s)
 {
-    ts->writeRawBytes(s, s.length());
+    //ts->writeRawBytes(s, s.length());
+    *ts<<s;
 }
 
 void FileWriter::write(const char * s)
 {
-    ts->writeRawBytes(s, strlen(s));
+    //ts->writeRawBytes(s, strlen(s));
+    *ts<<s;
 }
 
 void FileWriter::write(char c)
 {
-    ts->writeRawBytes(&c, 1);
+    //ts->writeRawBytes(&c, 1);
+    *ts<<c;
 }
 
 void FileWriter::write(unsigned n)
 {
-    Q3CString s;
+    QByteArray s;
 
     s.setNum(n);
 
-    ts->writeRawBytes(s, s.length());
+    //ts->writeRawBytes(s, s.length());
+    *ts<<s;
 
 }
 
diff --git a/genplugouts/HtmlDoc/FileWriter.h b/genplugouts/HtmlDoc/FileWriter.h
index 4030dad99..9e14a29ab 100644
--- a/genplugouts/HtmlDoc/FileWriter.h
+++ b/genplugouts/HtmlDoc/FileWriter.h
@@ -1,13 +1,10 @@
 #ifndef _FILEWRITER_H
 #define _FILEWRITER_H
 
-
-#include <q3cstring.h>
-//Added by qt3to4:
-#include <Q3TextStream>
+#include <QTextStream>
 
 class QFile;
-class Q3TextStream;
+class QTextStream;
 
 // The original html generator was written in Java to test the Java
 // version of the API, this class allows to have a source code similar
@@ -15,11 +12,11 @@ class Q3TextStream;
 class FileWriter
 {
 public:
-    bool open(Q3CString s);
+    bool open(QByteArray s);
 
     void close();
 
-    void write(Q3CString s);
+    void write(QByteArray s);
 
     void write(const char * s);
 
@@ -29,7 +26,7 @@ class FileWriter
 
 
 protected:
-    Q3TextStream * ts;
+    QTextStream * ts;
 
     QFile * f;
 
diff --git a/genplugouts/HtmlDoc/FlowBehavior.h b/genplugouts/HtmlDoc/FlowBehavior.h
index 55dde8146..09f17529a 100644
--- a/genplugouts/HtmlDoc/FlowBehavior.h
+++ b/genplugouts/HtmlDoc/FlowBehavior.h
@@ -2,18 +2,18 @@
 #define _FLOWBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class FlowBehavior
 {
 public:
-    Q3CString weight;
+    QByteArray weight;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString selection;
+    QByteArray selection;
 
-    Q3CString transformation;
+    QByteArray transformation;
 
     void read();
 
diff --git a/genplugouts/HtmlDoc/HtmlDoc.pro b/genplugouts/HtmlDoc/HtmlDoc.pro
index 209368d9e..e48f8c2f0 100644
--- a/genplugouts/HtmlDoc/HtmlDoc.pro
+++ b/genplugouts/HtmlDoc/HtmlDoc.pro
@@ -1,7 +1,10 @@
 TEMPLATE	= app
 TARGET		= ghtml
-CONFIG		+=  warn_on qt
-DEFINES		= WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES		+= WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON
 HEADERS		= ./UmlBaseRelation.h \
 		  ./UmlFormalParameter.h \
 		  ./UmlCollaborationMessage.h \
@@ -404,24 +407,20 @@ SOURCES		= ./UmlBaseRelation.cpp \
 		  ./UmlBaseActivityNode.cpp \
 		  ./UmlTransition.cpp
 
-#The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+DEFINES += TRUE=true FALSE=false
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/html/MOC_release
-    OBJECTS_DIR = bin/douml/html/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/ghtml
+    OBJECTS_DIR = $${DESTDIR}/obj_release/ghtml
 }
-
-Debug{
-    MOC_DIR = bin/douml/html/MOC_Debug
-    OBJECTS_DIR = bin/douml/html/Obj_Debug
-
+CONFIG(debug, debug|release) {
+DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/ghtml
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/ghtml
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/genplugouts/HtmlDoc/IdlSettings.cpp b/genplugouts/HtmlDoc/IdlSettings.cpp
index 526c000b3..d1d58fb25 100644
--- a/genplugouts/HtmlDoc/IdlSettings.cpp
+++ b/genplugouts/HtmlDoc/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -175,14 +175,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -194,14 +194,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -213,14 +213,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -232,14 +232,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -251,14 +251,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -270,14 +270,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -289,14 +289,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -308,14 +308,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -327,14 +327,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -346,14 +346,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -365,14 +365,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -385,14 +385,14 @@ bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -405,14 +405,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CStrin
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionItemDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_item_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionItemDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -425,14 +425,14 @@ bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -444,14 +444,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl(const char * multiplicity)
+const QByteArray & IdlSettings::constDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _const_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ConstDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -464,14 +464,14 @@ bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -484,14 +484,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -504,14 +504,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -524,14 +524,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -543,14 +543,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -562,14 +562,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -602,60 +602,60 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_item_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_item_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_const_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -677,13 +677,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/HtmlDoc/IdlSettings.h b/genplugouts/HtmlDoc/IdlSettings.h
index f0cf0f823..a9e6fb492 100644
--- a/genplugouts/HtmlDoc/IdlSettings.h
+++ b/genplugouts/HtmlDoc/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype depending on the multiplicity
-    static const Q3CString & valuetypeAttributeDecl(const char * multiplicity);
+    static const QByteArray & valuetypeAttributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an union item depending on the multiplicity
-    static const Q3CString & unionItemDecl(const char * multiplicity);
+    static const QByteArray & unionItemDecl(const char * multiplicity);
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionItemDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute depending on the multiplicity
-    static const Q3CString & constDecl(const char * multiplicity);
+    static const QByteArray & constDecl(const char * multiplicity);
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(const char * multiplicity, Q3CString v);
+    static bool set_ConstDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_attr_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_attr_decl[3/*multiplicity*/];
 
-    static Q3CString _union_item_decl[3/*multiplicity*/];
+    static QByteArray _union_item_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl[3/*multiplicity*/];
+    static QByteArray _const_decl[3/*multiplicity*/];
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/HtmlDoc/JavaSettings.cpp b/genplugouts/HtmlDoc/JavaSettings.cpp
index 0eef9d723..09abee7b1 100644
--- a/genplugouts/HtmlDoc/JavaSettings.cpp
+++ b/genplugouts/HtmlDoc/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -175,14 +175,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -194,14 +194,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -213,7 +213,7 @@ bool JavaSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::reverseRoundtripDirRegExp()
+QByteArray JavaSettings::reverseRoundtripDirRegExp()
 {
     read_if_needed_();
 
@@ -227,7 +227,7 @@ bool JavaSettings::isReverseRoundtripDirRegExpCaseSensitive()
     return _dir_regexp_case_sensitive;
 }
 
-bool JavaSettings::set_ReverseRoundtripDirRegExp(Q3CString s, bool cs)
+bool JavaSettings::set_ReverseRoundtripDirRegExp(QByteArray s, bool cs)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaDirRevFilterCmd, s, cs);
 
@@ -240,7 +240,7 @@ bool JavaSettings::set_ReverseRoundtripDirRegExp(Q3CString s, bool cs)
         return FALSE;
 }
 
-Q3CString JavaSettings::reverseRoundtripFileRegExp()
+QByteArray JavaSettings::reverseRoundtripFileRegExp()
 {
     read_if_needed_();
 
@@ -254,7 +254,7 @@ bool JavaSettings::isReverseRoundtripFileRegExpCaseSensitive()
     return _file_regexp_case_sensitive;
 }
 
-bool JavaSettings::set_ReverseRoundtripFileRegExp(Q3CString s, bool cs)
+bool JavaSettings::set_ReverseRoundtripFileRegExp(QByteArray s, bool cs)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaFileRevFilterCmd, s, cs);
 
@@ -305,14 +305,14 @@ bool JavaSettings::set_IsForcePackagePrefixGeneration(bool v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -324,14 +324,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -343,14 +343,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternDecl()
+const QByteArray & JavaSettings::enumPatternDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_decl;
 }
 
-bool JavaSettings::set_EnumPatternDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -362,14 +362,14 @@ bool JavaSettings::set_EnumPatternDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumDecl()
+QByteArray JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -381,14 +381,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -400,14 +400,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl(const char * multiplicity)
+const QByteArray & JavaSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -420,14 +420,14 @@ bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemDecl()
+const QByteArray & JavaSettings::enumPatternItemDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_item_decl;
 }
 
-bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -439,14 +439,14 @@ bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemCase()
+const QByteArray & JavaSettings::enumPatternItemCase()
 {
     read_if_needed_();
 
     return _enum_pattern_item_case;
 }
 
-bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
+bool JavaSettings::set_EnumPatternItemCase(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemCaseCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -458,14 +458,14 @@ bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumItemDecl()
+QByteArray JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -477,14 +477,14 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -497,14 +497,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -535,14 +535,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -554,14 +554,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -651,53 +651,53 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_pattern_decl;
+QByteArray JavaSettings::_enum_pattern_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_enum_pattern_item_decl;
+QByteArray JavaSettings::_enum_pattern_item_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_case;
+QByteArray JavaSettings::_enum_pattern_item_case;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
-Q3CString JavaSettings::_dir_regexp;
+QByteArray JavaSettings::_dir_regexp;
 
 bool JavaSettings::_dir_regexp_case_sensitive;
 
-Q3CString JavaSettings::_file_regexp;
+QByteArray JavaSettings::_file_regexp;
 
 bool JavaSettings::_file_regexp_case_sensitive;
 
@@ -705,14 +705,14 @@ bool JavaSettings::_is_generate_javadoc_comment;
 
 bool JavaSettings::_is_force_package_gen;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray,QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -734,13 +734,13 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/HtmlDoc/JavaSettings.h b/genplugouts/HtmlDoc/JavaSettings.h
index 45b191f18..a34e9f831 100644
--- a/genplugouts/HtmlDoc/JavaSettings.h
+++ b/genplugouts/HtmlDoc/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,84 +31,84 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return the regular expression used to bypass
     // dir s on reverse/roundtrip
-    static Q3CString reverseRoundtripDirRegExp();
+    static QByteArray reverseRoundtripDirRegExp();
 
     // return if the regular expression used to bypass
     // dir s on reverse/roundtrip is case sensitive
@@ -117,11 +117,11 @@ class JavaSettings : public UmlSettings
     // set the regular expression used to bypass
     // dir s on reverse/roundtrip
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ReverseRoundtripDirRegExp(Q3CString s, bool cs);
+    static bool set_ReverseRoundtripDirRegExp(QByteArray s, bool cs);
 
     // return the regular expression used to bypass
     // file s on reverse/roundtrip
-    static Q3CString reverseRoundtripFileRegExp();
+    static QByteArray reverseRoundtripFileRegExp();
 
     // return if the regular expression used to bypass
     // file s on reverse/roundtrip is case sensitive
@@ -130,7 +130,7 @@ class JavaSettings : public UmlSettings
     // set the regular expression used to bypass
     // file s on reverse/roundtrip
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ReverseRoundtripFileRegExp(Q3CString s, bool cs);
+    static bool set_ReverseRoundtripFileRegExp(QByteArray s, bool cs);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -152,100 +152,100 @@ class JavaSettings : public UmlSettings
     static bool set_IsForcePackagePrefixGeneration(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumPatternDecl();
+    static const QByteArray & enumPatternDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternDecl(Q3CString v);
+    static bool set_EnumPatternDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumPatternItemDecl();
+    static const QByteArray & enumPatternItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternItemDecl(Q3CString v);
+    static bool set_EnumPatternItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumPatternItemCase();
+    static const QByteArray & enumPatternItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumPatternItemCase(Q3CString v);
+    static bool set_EnumPatternItemCase(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -259,23 +259,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -324,53 +324,53 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_pattern_decl;
+    static QByteArray _enum_pattern_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_pattern_item_decl;
+    static QByteArray _enum_pattern_item_decl;
 
-    static Q3CString _enum_pattern_item_case;
+    static QByteArray _enum_pattern_item_case;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3CString _dir_regexp;
+    static QByteArray _dir_regexp;
 
     static bool _dir_regexp_case_sensitive;
 
-    static Q3CString _file_regexp;
+    static QByteArray _file_regexp;
 
     static bool _file_regexp_case_sensitive;
 
@@ -378,7 +378,7 @@ class JavaSettings : public UmlSettings
 
     static bool _is_force_package_gen;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/HtmlDoc/Main.cpp b/genplugouts/HtmlDoc/Main.cpp
index 00c1f44af..2fac37c32 100644
--- a/genplugouts/HtmlDoc/Main.cpp
+++ b/genplugouts/HtmlDoc/Main.cpp
@@ -1,6 +1,6 @@
 #include <qapplication.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
@@ -11,25 +11,36 @@
 
 int main(int argc, char ** argv)
 {
+#define habip
+#ifdef habip
     if (argc < 2)
         return 0;
-
+#endif
     QApplication a(argc, argv);
-
+#ifdef habip
     if (UmlCom::connect(QString(argv[argc - 1]).toUInt())) {
+#else
+    if (UmlCom::connect(5000)) {
+#endif
         try {
             UmlCom::trace("<b>Html generator</b> release 2.20 (C++ version)<br />");
 
             UmlItem * target = UmlCom::targetItem();
-
+#ifdef habip
             target->set_dir(argc - 2, argv + 1);
+#else
+            char* args[]={
+                "ghtml","1024"
+            };
+            target->set_dir(0, args+1);
+#endif
             UmlCom::message("Memorize references ...");
             target->memo_ref();
             UmlItem::frame();
             UmlCom::message("Indexes ...");
             UmlItem::generate_indexes();
             UmlItem::start_file("index", target->name() + "\nDocumentation", FALSE);
-            target->html(Q3CString(""), 0u, 0u);
+            target->html(QByteArray(""), 0u, 0u);
             UmlItem::end_file();
             UmlItem::start_file("navig", "", TRUE);
             UmlItem::end_file();
@@ -43,7 +54,9 @@ int main(int argc, char ** argv)
         // must be called to cleanly inform that all is done
         UmlCom::bye(0);
     }
-
+#ifdef habip
+#undef habip
+#endif
     UmlCom::close();
     return 0;
 }
diff --git a/genplugouts/HtmlDoc/PhpSettings.cpp b/genplugouts/HtmlDoc/PhpSettings.cpp
index 80b7cb83e..dac254231 100644
--- a/genplugouts/HtmlDoc/PhpSettings.cpp
+++ b/genplugouts/HtmlDoc/PhpSettings.cpp
@@ -8,7 +8,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHJAVA
 #include "JavaSettings.h"
 #endif
@@ -24,22 +24,22 @@ bool PhpSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PhpSettings::classStereotype(const Q3CString & s)
+QByteArray PhpSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
 
-bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PhpSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -52,21 +52,21 @@ bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PhpSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::php);
 }
 
-const Q3CString & PhpSettings::rootDir()
+const QByteArray & PhpSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PhpSettings::set_RootDir(Q3CString v)
+bool PhpSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -78,14 +78,14 @@ bool PhpSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceContent()
+const QByteArray & PhpSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PhpSettings::set_SourceContent(Q3CString v)
+bool PhpSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -97,14 +97,14 @@ bool PhpSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceExtension()
+const QByteArray & PhpSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PhpSettings::set_SourceExtension(Q3CString v)
+bool PhpSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -116,7 +116,7 @@ bool PhpSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::reverseRoundtripDirRegExp()
+QByteArray PhpSettings::reverseRoundtripDirRegExp()
 {
     read_if_needed_();
 
@@ -130,7 +130,7 @@ bool PhpSettings::isReverseRoundtripDirRegExpCaseSensitive()
     return _dir_regexp_case_sensitive;
 }
 
-bool PhpSettings::set_ReverseRoundtripDirRegExp(Q3CString s, bool cs)
+bool PhpSettings::set_ReverseRoundtripDirRegExp(QByteArray s, bool cs)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpDirRevFilterCmd, s, cs);
 
@@ -143,7 +143,7 @@ bool PhpSettings::set_ReverseRoundtripDirRegExp(Q3CString s, bool cs)
         return FALSE;
 }
 
-Q3CString PhpSettings::reverseRoundtripFileRegExp()
+QByteArray PhpSettings::reverseRoundtripFileRegExp()
 {
     read_if_needed_();
 
@@ -157,7 +157,7 @@ bool PhpSettings::isReverseRoundtripFileRegExpCaseSensitive()
     return _file_regexp_case_sensitive;
 }
 
-bool PhpSettings::set_ReverseRoundtripFileRegExp(Q3CString s, bool cs)
+bool PhpSettings::set_ReverseRoundtripFileRegExp(QByteArray s, bool cs)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpFileRevFilterCmd, s, cs);
 
@@ -271,14 +271,14 @@ bool PhpSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::classDecl()
+const QByteArray & PhpSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PhpSettings::set_ClassDecl(Q3CString v)
+bool PhpSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -290,14 +290,14 @@ bool PhpSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::externalClassDecl()
+const QByteArray & PhpSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PhpSettings::set_ExternalClassDecl(Q3CString v)
+bool PhpSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -309,14 +309,14 @@ bool PhpSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumDecl()
+QByteArray PhpSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PhpSettings::set_EnumDecl(Q3CString v)
+bool PhpSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -328,14 +328,14 @@ bool PhpSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::interfaceDecl()
+const QByteArray & PhpSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool PhpSettings::set_InterfaceDecl(Q3CString v)
+bool PhpSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -347,14 +347,14 @@ bool PhpSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::attributeDecl()
+const QByteArray & PhpSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool PhpSettings::set_AttributeDecl(Q3CString v)
+bool PhpSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -366,14 +366,14 @@ bool PhpSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumItemDecl()
+QByteArray PhpSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PhpSettings::set_EnumItemDecl(Q3CString v)
+bool PhpSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -385,14 +385,14 @@ bool PhpSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::relationDecl()
+const QByteArray & PhpSettings::relationDecl()
 {
     read_if_needed_();
 
     return _rel_decl;
 }
 
-bool PhpSettings::set_RelationDecl(Q3CString v)
+bool PhpSettings::set_RelationDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRelationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -404,14 +404,14 @@ bool PhpSettings::set_RelationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::operationDef()
+const QByteArray & PhpSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PhpSettings::set_OperationDef(Q3CString v)
+bool PhpSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -451,14 +451,14 @@ bool PhpSettings::set_GetVisibility(aVisibility v)
 #endif
 }
 
-const Q3CString & PhpSettings::getName()
+const QByteArray & PhpSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PhpSettings::set_GetName(Q3CString v)
+bool PhpSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -470,14 +470,14 @@ bool PhpSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::setName()
+const QByteArray & PhpSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PhpSettings::set_SetName(Q3CString v)
+bool PhpSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -557,29 +557,29 @@ bool PhpSettings::set_SetVisibility(aVisibility v)
 
 bool PhpSettings::_defined;
 
-Q3CString PhpSettings::_root;
+QByteArray PhpSettings::_root;
 
-Q3CString PhpSettings::_class_decl;
+QByteArray PhpSettings::_class_decl;
 
-Q3CString PhpSettings::_external_class_decl;
+QByteArray PhpSettings::_external_class_decl;
 
-Q3CString PhpSettings::_enum_decl;
+QByteArray PhpSettings::_enum_decl;
 
-Q3CString PhpSettings::_interface_decl;
+QByteArray PhpSettings::_interface_decl;
 
-Q3CString PhpSettings::_attr_decl;
+QByteArray PhpSettings::_attr_decl;
 
-Q3CString PhpSettings::_enum_item_decl;
+QByteArray PhpSettings::_enum_item_decl;
 
-Q3CString PhpSettings::_rel_decl;
+QByteArray PhpSettings::_rel_decl;
 
-Q3CString PhpSettings::_oper_def;
+QByteArray PhpSettings::_oper_def;
 
 #ifndef WITHJAVA
 aVisibility PhpSettings::_get_visibility;
 #endif
 
-Q3CString PhpSettings::_get_name;
+QByteArray PhpSettings::_get_name;
 
 bool PhpSettings::_is_get_final;
 
@@ -587,19 +587,19 @@ bool PhpSettings::_is_get_final;
 aVisibility PhpSettings::_set_visibility;
 #endif
 
-Q3CString PhpSettings::_set_name;
+QByteArray PhpSettings::_set_name;
 
 bool PhpSettings::_is_set_final;
 
-Q3CString PhpSettings::_src_content;
+QByteArray PhpSettings::_src_content;
 
-Q3CString PhpSettings::_ext;
+QByteArray PhpSettings::_ext;
 
-Q3CString PhpSettings::_dir_regexp;
+QByteArray PhpSettings::_dir_regexp;
 
 bool PhpSettings::_dir_regexp_case_sensitive;
 
-Q3CString PhpSettings::_file_regexp;
+QByteArray PhpSettings::_file_regexp;
 
 bool PhpSettings::_file_regexp_case_sensitive;
 
@@ -637,15 +637,17 @@ void PhpSettings::read_()
     _rel_decl = UmlCom::read_string();
     _oper_def = UmlCom::read_string();
 #ifndef WITHJAVA
-    _get_visibility =
+    _get_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _get_name = UmlCom::read_string();
     _is_get_final = UmlCom::read_bool();
 #ifndef WITHJAVA
-    _set_visibility =
+    _set_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
     _is_generate_javadoc_comment = UmlCom::read_bool();
diff --git a/genplugouts/HtmlDoc/PhpSettings.h b/genplugouts/HtmlDoc/PhpSettings.h
index 98246bc67..b3d7b398d 100644
--- a/genplugouts/HtmlDoc/PhpSettings.h
+++ b/genplugouts/HtmlDoc/PhpSettings.h
@@ -4,7 +4,7 @@
 #ifdef WITHPHP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
 
@@ -29,45 +29,45 @@ class PhpSettings : public UmlSettings
 
     // returns the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PHP one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PHP code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PHP code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return the regular expression used to bypass
     // dir s on reverse/roundtrip
-    static Q3CString reverseRoundtripDirRegExp();
+    static QByteArray reverseRoundtripDirRegExp();
 
     // return if the regular expression used to bypass
     // dir s on reverse/roundtrip is case sensitive
@@ -76,11 +76,11 @@ class PhpSettings : public UmlSettings
     // set the regular expression used to bypass
     // dir s on reverse/roundtrip
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ReverseRoundtripDirRegExp(Q3CString s, bool cs);
+    static bool set_ReverseRoundtripDirRegExp(QByteArray s, bool cs);
 
     // return the regular expression used to bypass
     // file s on reverse/roundtrip
-    static Q3CString reverseRoundtripFileRegExp();
+    static QByteArray reverseRoundtripFileRegExp();
 
     // return if the regular expression used to bypass
     // file s on reverse/roundtrip is case sensitive
@@ -89,7 +89,7 @@ class PhpSettings : public UmlSettings
     // set the regular expression used to bypass
     // file s on reverse/roundtrip
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ReverseRoundtripFileRegExp(Q3CString s, bool cs);
+    static bool set_ReverseRoundtripFileRegExp(QByteArray s, bool cs);
 
     // indicates to the code generator if the require_once may specify
     // the path of just the file's name
@@ -139,68 +139,68 @@ class PhpSettings : public UmlSettings
     static bool set_IsGenerateJavadocStyleComment(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of an relation
-    static const Q3CString & relationDecl();
+    static const QByteArray & relationDecl();
 
     // set the default definition of an relation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(Q3CString v);
+    static bool set_RelationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -218,23 +218,23 @@ class PhpSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -277,29 +277,29 @@ class PhpSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl;
+    static QByteArray _rel_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
 #ifndef WITHJAVA
     static aVisibility _get_visibility;
 #endif
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
@@ -307,19 +307,19 @@ class PhpSettings : public UmlSettings
     static aVisibility _set_visibility;
 #endif
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3CString _dir_regexp;
+    static QByteArray _dir_regexp;
 
     static bool _dir_regexp_case_sensitive;
 
-    static Q3CString _file_regexp;
+    static QByteArray _file_regexp;
 
     static bool _file_regexp_case_sensitive;
 
diff --git a/genplugouts/HtmlDoc/PythonSettings.cpp b/genplugouts/HtmlDoc/PythonSettings.cpp
index 9f5fddd90..9380d3264 100644
--- a/genplugouts/HtmlDoc/PythonSettings.cpp
+++ b/genplugouts/HtmlDoc/PythonSettings.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool PythonSettings::isPython_2_2()
 {
     read_if_needed_();
@@ -45,7 +45,7 @@ bool PythonSettings::set_IsPython_3_operation(bool y)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::indentStep()
+const QByteArray & PythonSettings::indentStep()
 {
     read_if_needed_();
     return _indent_step;
@@ -75,22 +75,22 @@ bool PythonSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PythonSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -103,29 +103,29 @@ bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::classStereotype(const Q3CString & s)
+QByteArray PythonSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -138,32 +138,32 @@ bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::get_import(const Q3CString & s)
+QByteArray PythonSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool PythonSettings::set_Import(Q3CString s, Q3CString v)
+bool PythonSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonImportCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -174,14 +174,14 @@ bool PythonSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::rootDir()
+const QByteArray & PythonSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PythonSettings::set_RootDir(Q3CString v)
+bool PythonSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -193,14 +193,14 @@ bool PythonSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceContent()
+const QByteArray & PythonSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PythonSettings::set_SourceContent(Q3CString v)
+bool PythonSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -212,14 +212,14 @@ bool PythonSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceExtension()
+const QByteArray & PythonSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PythonSettings::set_SourceExtension(Q3CString v)
+bool PythonSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -231,14 +231,14 @@ bool PythonSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::classDecl()
+const QByteArray & PythonSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PythonSettings::set_ClassDecl(Q3CString v)
+bool PythonSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -250,14 +250,14 @@ bool PythonSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::externalClassDecl()
+const QByteArray & PythonSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PythonSettings::set_ExternalClassDecl(Q3CString v)
+bool PythonSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -269,14 +269,14 @@ bool PythonSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumDecl()
+QByteArray PythonSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PythonSettings::set_EnumDecl(Q3CString v)
+bool PythonSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -288,14 +288,14 @@ bool PythonSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::attributeDecl(const char * multiplicity)
+const QByteArray & PythonSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[mult_column(multiplicity)];
 }
 
-bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool PythonSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -308,14 +308,14 @@ bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumItemDecl()
+QByteArray PythonSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PythonSettings::set_EnumItemDecl(Q3CString v)
+bool PythonSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -327,7 +327,7 @@ bool PythonSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -347,14 +347,14 @@ bool PythonSettings::set_RelationDecl(bool by_value, const char * multiplicity,
         return FALSE;
 }
 
-const Q3CString & PythonSettings::operationDef()
+const QByteArray & PythonSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PythonSettings::set_OperationDef(Q3CString v)
+bool PythonSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -366,14 +366,14 @@ bool PythonSettings::set_OperationDef(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::initOperationDef()
+const QByteArray & PythonSettings::initOperationDef()
 {
     read_if_needed_();
 
     return _initoper_def;
 }
 
-bool PythonSettings::set_InitOperationDef(Q3CString v)
+bool PythonSettings::set_InitOperationDef(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonInitOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -385,14 +385,14 @@ bool PythonSettings::set_InitOperationDef(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::getName()
+const QByteArray & PythonSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PythonSettings::set_GetName(Q3CString v)
+bool PythonSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -404,14 +404,14 @@ bool PythonSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::setName()
+const QByteArray & PythonSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PythonSettings::set_SetName(Q3CString v)
+bool PythonSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -423,7 +423,7 @@ bool PythonSettings::set_SetName(Q3CString v)
         return FALSE;
 }
 
-unsigned PythonSettings::mult_column(const Q3CString & mult)
+unsigned PythonSettings::mult_column(const QByteArray & mult)
 {
     return (mult.isEmpty() || (mult == "1")) ? 0 : 1;
 }
@@ -434,35 +434,35 @@ bool PythonSettings::_2_2;
 
 bool PythonSettings::_operation_3;
 
-Q3CString PythonSettings::_indent_step;
+QByteArray PythonSettings::_indent_step;
 
-Q3CString PythonSettings::_root;
+QByteArray PythonSettings::_root;
 
-Q3CString PythonSettings::_class_decl;
+QByteArray PythonSettings::_class_decl;
 
-Q3CString PythonSettings::_external_class_decl;
+QByteArray PythonSettings::_external_class_decl;
 
-Q3CString PythonSettings::_enum_decl;
+QByteArray PythonSettings::_enum_decl;
 
-Q3CString PythonSettings::_attr_decl[2/*multiplicity*/];
+QByteArray PythonSettings::_attr_decl[2/*multiplicity*/];
 
-Q3CString PythonSettings::_enum_item_decl;
+QByteArray PythonSettings::_enum_item_decl;
 
-Q3CString PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
+QByteArray PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-Q3CString PythonSettings::_oper_def;
+QByteArray PythonSettings::_oper_def;
 
-Q3CString PythonSettings::_initoper_def;
+QByteArray PythonSettings::_initoper_def;
 
-Q3CString PythonSettings::_get_name;
+QByteArray PythonSettings::_get_name;
 
-Q3CString PythonSettings::_set_name;
+QByteArray PythonSettings::_set_name;
 
-Q3CString PythonSettings::_src_content;
+QByteArray PythonSettings::_src_content;
 
-Q3CString PythonSettings::_ext;
+QByteArray PythonSettings::_ext;
 
-Q3Dict<Q3CString> PythonSettings::_map_imports;
+QHash<QByteArray, QByteArray*> PythonSettings::_map_imports;
 
 void PythonSettings::read_()
 {
@@ -472,8 +472,8 @@ void PythonSettings::read_()
 
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -489,13 +489,13 @@ void PythonSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/HtmlDoc/PythonSettings.h b/genplugouts/HtmlDoc/PythonSettings.h
index 825b1abc4..fd9f143b8 100644
--- a/genplugouts/HtmlDoc/PythonSettings.h
+++ b/genplugouts/HtmlDoc/PythonSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHPYTHON
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PYTHON, configured through
 // the 'Generation settings' dialog.
@@ -34,7 +34,7 @@ class PythonSettings : public UmlSettings
     static bool set_IsPython_3_operation(bool y);
 
     // return the  default indent step
-    static const Q3CString & indentStep();
+    static const QByteArray & indentStep();
 
     // set default indent step
     //
@@ -53,109 +53,109 @@ class PythonSettings : public UmlSettings
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Python type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Python type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PYTHON code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PYTHON code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -164,47 +164,47 @@ class PythonSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default definition of __init__
-    static const Q3CString & initOperationDef();
+    static const QByteArray & initOperationDef();
 
     // set the default definition of __init__
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InitOperationDef(Q3CString v);
+    static bool set_InitOperationDef(QByteArray v);
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
 
 private:
     // never called !
     PythonSettings() {};
 
-    static unsigned mult_column(const Q3CString & mult);
+    static unsigned mult_column(const QByteArray & mult);
 
     static bool _defined;
 
@@ -216,39 +216,39 @@ class PythonSettings : public UmlSettings
 
 
 private:
-    static Q3CString _indent_step;
+    static QByteArray _indent_step;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _attr_decl[2/*multiplicity*/];
+    static QByteArray _attr_decl[2/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][2/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
 
 protected:
-    static Q3CString _initoper_def;
+    static QByteArray _initoper_def;
 
 
 private:
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/HtmlDoc/SlotAttribute.h b/genplugouts/HtmlDoc/SlotAttribute.h
index d1c59eabf..59399af64 100644
--- a/genplugouts/HtmlDoc/SlotAttribute.h
+++ b/genplugouts/HtmlDoc/SlotAttribute.h
@@ -1,21 +1,21 @@
 #ifndef _SLOTATTRIBUTE_H
 #define _SLOTATTRIBUTE_H
 
+#include <QByteArray>
 
-#include <q3cstring.h>
 
 class UmlAttribute;
 
 struct SlotAttribute {
     UmlAttribute * attribute;
 
-    Q3CString value;
+    QByteArray value;
 
     // because of QValueList use
     SlotAttribute() : attribute(0) {
     }
 
-    SlotAttribute(UmlAttribute * a, Q3CString v) : attribute(a), value(v) {
+    SlotAttribute(UmlAttribute * a, QByteArray v) : attribute(a), value(v) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/StateBehavior.h b/genplugouts/HtmlDoc/StateBehavior.h
index 91a42cb82..66ac09c00 100644
--- a/genplugouts/HtmlDoc/StateBehavior.h
+++ b/genplugouts/HtmlDoc/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/HtmlDoc/TransitionBehavior.h b/genplugouts/HtmlDoc/TransitionBehavior.h
index 856ede3c0..8714c541d 100644
--- a/genplugouts/HtmlDoc/TransitionBehavior.h
+++ b/genplugouts/HtmlDoc/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/HtmlDoc/UmlAccessVariableValueAction.cpp b/genplugouts/HtmlDoc/UmlAccessVariableValueAction.cpp
index 286f4a4af..81d6296fd 100644
--- a/genplugouts/HtmlDoc/UmlAccessVariableValueAction.cpp
+++ b/genplugouts/HtmlDoc/UmlAccessVariableValueAction.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlAccessVariableValueAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlAccessVariableValueAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlAccessVariableValueAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
diff --git a/genplugouts/HtmlDoc/UmlAccessVariableValueAction.h b/genplugouts/HtmlDoc/UmlAccessVariableValueAction.h
index 27cb78b7d..d12052d77 100644
--- a/genplugouts/HtmlDoc/UmlAccessVariableValueAction.h
+++ b/genplugouts/HtmlDoc/UmlAccessVariableValueAction.h
@@ -2,7 +2,7 @@
 #define _UMLACCESSVARIABLEVALUEACTION_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseAccessVariableValueAction.h"
 
 class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction
@@ -10,12 +10,13 @@ class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction
 public:
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    using UmlBaseAccessVariableValueAction::html;
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAccessVariableValueAction(void * id, const Q3CString & s) : UmlBaseAccessVariableValueAction(id, s) {
+    UmlAccessVariableValueAction(void * id, const QByteArray & s) : UmlBaseAccessVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlActivity.cpp b/genplugouts/HtmlDoc/UmlActivity.cpp
index 147f033ed..fba425111 100644
--- a/genplugouts/HtmlDoc/UmlActivity.cpp
+++ b/genplugouts/HtmlDoc/UmlActivity.cpp
@@ -3,20 +3,20 @@
 #include "UmlOperation.h"
 #include "UmlActivity.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlActivity::sKind()
+QByteArray UmlActivity::sKind()
 {
     return "activity";
 }
 
-void UmlActivity::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlActivity::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
     chapter("Activity", pfix, rank, "activity", level);
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
@@ -44,7 +44,7 @@ void UmlActivity::html(Q3CString pfix, unsigned int rank, unsigned int level)
     else if (isSingleExecution())
         fw.write("<p>Single execution</p>");
 
-    Q3CString scpp, sjava;
+    QByteArray scpp, sjava;
 
     s = preCondition();
     scpp = cppPreCondition();
diff --git a/genplugouts/HtmlDoc/UmlActivity.h b/genplugouts/HtmlDoc/UmlActivity.h
index 8afb60193..d4f3cdc93 100644
--- a/genplugouts/HtmlDoc/UmlActivity.h
+++ b/genplugouts/HtmlDoc/UmlActivity.h
@@ -3,22 +3,22 @@
 
 
 #include "UmlBaseActivity.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 class UmlActivity : public UmlBaseActivity
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivity(void * id, const Q3CString & s) : UmlBaseActivity(id, s) {
+    UmlActivity(void * id, const QByteArray & s) : UmlBaseActivity(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //set the html ref
     //set the activity list
diff --git a/genplugouts/HtmlDoc/UmlActivityAction.cpp b/genplugouts/HtmlDoc/UmlActivityAction.cpp
index 474dea3bb..eab63387a 100644
--- a/genplugouts/HtmlDoc/UmlActivityAction.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityAction.cpp
@@ -3,14 +3,14 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlActivityAction::html()
 {
     UmlCom::message(name());
 
-    Q3CString s = sKind();
+    QByteArray s = sKind();
 
-    s.replace(0, 1, s.left(1).upper());
+    s.replace(0, 1, s.left(1).toUpper());
 
     UmlItem::html(s, (UmlDiagram *) associatedDiagram());
 
@@ -18,7 +18,7 @@ void UmlActivityAction::html()
     parent()->write();
     fw.write("</p>");
 
-    Q3CString scpp, sjava;
+    QByteArray scpp, sjava;
 
     s = preCondition();
     scpp = cppPreCondition();
diff --git a/genplugouts/HtmlDoc/UmlActivityAction.h b/genplugouts/HtmlDoc/UmlActivityAction.h
index b08586287..637ea343f 100644
--- a/genplugouts/HtmlDoc/UmlActivityAction.h
+++ b/genplugouts/HtmlDoc/UmlActivityAction.h
@@ -3,11 +3,13 @@
 
 
 #include "UmlBaseActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlActivityAction : public UmlBaseActivityAction
 {
 public:
+    using UmlBaseActivityAction::html;
+
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
     virtual void html();
@@ -15,7 +17,7 @@ class UmlActivityAction : public UmlBaseActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityAction(void * id, const Q3CString & s) : UmlBaseActivityAction(id, s) {
+    UmlActivityAction(void * id, const QByteArray & s) : UmlBaseActivityAction(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlActivityActionClasses.cpp b/genplugouts/HtmlDoc/UmlActivityActionClasses.cpp
index de37bc336..6f745af32 100644
--- a/genplugouts/HtmlDoc/UmlActivityActionClasses.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityActionClasses.cpp
@@ -3,13 +3,13 @@
 
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSendObjectAction::sKind()
+#include <QByteArray>
+QByteArray UmlSendObjectAction::sKind()
 {
     return "send object activity action";
 }
 
-void UmlSendObjectAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlSendObjectAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -18,12 +18,12 @@ void UmlSendObjectAction::html(Q3CString pfix, unsigned int rank, unsigned int l
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlUnmarshallAction::sKind()
+QByteArray UmlUnmarshallAction::sKind()
 {
     return "unmarshall activity action";
 }
 
-void UmlUnmarshallAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlUnmarshallAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -32,28 +32,28 @@ void UmlUnmarshallAction::html(Q3CString pfix, unsigned int rank, unsigned int l
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlSendSignalAction::sKind()
+QByteArray UmlSendSignalAction::sKind()
 {
     return "send signal activity action";
 }
 
-Q3CString UmlBroadcastSignalAction::sKind()
+QByteArray UmlBroadcastSignalAction::sKind()
 {
     return "broadcast signal activity action";
 }
 
-Q3CString UmlValueSpecificationAction::sKind()
+QByteArray UmlValueSpecificationAction::sKind()
 {
     return "value specification activity action";
 }
 
-void UmlValueSpecificationAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlValueSpecificationAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
-    Q3CString s = value();
-    Q3CString scpp = cppValue();
-    Q3CString sjava = javaValue();
+    QByteArray s = value();
+    QByteArray scpp = cppValue();
+    QByteArray sjava = javaValue();
 
     if (!s.isEmpty() || !scpp.isEmpty() || !sjava.isEmpty()) {
         fw.write("<p>Value :</p><ul>");
@@ -84,18 +84,18 @@ void UmlValueSpecificationAction::html(Q3CString pfix, unsigned int rank, unsign
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlOpaqueAction::sKind()
+QByteArray UmlOpaqueAction::sKind()
 {
     return "opaque activity action";
 }
 
-void UmlOpaqueAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlOpaqueAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
-    Q3CString s = behavior();
-    Q3CString scpp = cppBehavior();
-    Q3CString sjava = javaBehavior();
+    QByteArray s = behavior();
+    QByteArray scpp = cppBehavior();
+    QByteArray sjava = javaBehavior();
 
     if (!s.isEmpty() || !scpp.isEmpty() || !sjava.isEmpty()) {
         fw.write("<p>Behavior :</p><ul>");
@@ -126,12 +126,12 @@ void UmlOpaqueAction::html(Q3CString pfix, unsigned int rank, unsigned int level
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlAcceptEventAction::sKind()
+QByteArray UmlAcceptEventAction::sKind()
 {
     return "accept event activity action";
 }
 
-void UmlAcceptEventAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlAcceptEventAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -144,9 +144,9 @@ void UmlAcceptEventAction::html(Q3CString pfix, unsigned int rank, unsigned int
     else if (isTimeEvent())
         fw.write("<p>Event is a time event</p>");
 
-    Q3CString s = trigger();
-    Q3CString scpp = cppTrigger();
-    Q3CString sjava = javaTrigger();
+    QByteArray s = trigger();
+    QByteArray scpp = cppTrigger();
+    QByteArray sjava = javaTrigger();
 
     if (!s.isEmpty() || !scpp.isEmpty() || !sjava.isEmpty()) {
         fw.write("<p>Trigger :</p><ul>");
@@ -177,12 +177,12 @@ void UmlAcceptEventAction::html(Q3CString pfix, unsigned int rank, unsigned int
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlCallOperationAction::sKind()
+QByteArray UmlCallOperationAction::sKind()
 {
     return "call operation activity action";
 }
 
-void UmlCallOperationAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlCallOperationAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -200,12 +200,12 @@ void UmlCallOperationAction::html(Q3CString pfix, unsigned int rank, unsigned in
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlCallBehaviorAction::sKind()
+QByteArray UmlCallBehaviorAction::sKind()
 {
     return "call behavior activity action";
 }
 
-void UmlCallBehaviorAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlCallBehaviorAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -223,27 +223,27 @@ void UmlCallBehaviorAction::html(Q3CString pfix, unsigned int rank, unsigned int
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlClearVariableValueAction::sKind()
+QByteArray UmlClearVariableValueAction::sKind()
 {
     return "clear variable value activity action";
 }
 
-Q3CString UmlReadVariableValueAction::sKind()
+QByteArray UmlReadVariableValueAction::sKind()
 {
     return "read variable value activity action";
 }
 
-Q3CString UmlWriteVariableValueAction::sKind()
+QByteArray UmlWriteVariableValueAction::sKind()
 {
     return "write variable value activity action";
 }
 
-Q3CString UmlAddVariableValueAction::sKind()
+QByteArray UmlAddVariableValueAction::sKind()
 {
     return "add variable value activity action";
 }
 
-void UmlAddVariableValueAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlAddVariableValueAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -261,12 +261,12 @@ void UmlAddVariableValueAction::html(Q3CString pfix, unsigned int rank, unsigned
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlRemoveVariableValueAction::sKind()
+QByteArray UmlRemoveVariableValueAction::sKind()
 {
     return "remove variable value activity action";
 }
 
-void UmlRemoveVariableValueAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlRemoveVariableValueAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -284,18 +284,18 @@ void UmlRemoveVariableValueAction::html(Q3CString pfix, unsigned int rank, unsig
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlAcceptCallAction::sKind()
+QByteArray UmlAcceptCallAction::sKind()
 {
     return "accept call activity action";
 }
 
-void UmlAcceptCallAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlAcceptCallAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
-    Q3CString s = trigger();
-    Q3CString scpp = cppTrigger();
-    Q3CString sjava = javaTrigger();
+    QByteArray s = trigger();
+    QByteArray scpp = cppTrigger();
+    QByteArray sjava = javaTrigger();
 
     if (!s.isEmpty() || !scpp.isEmpty() || !sjava.isEmpty()) {
         fw.write("<p>Trigger :</p><ul>");
@@ -326,18 +326,18 @@ void UmlAcceptCallAction::html(Q3CString pfix, unsigned int rank, unsigned int l
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlReplyAction::sKind()
+QByteArray UmlReplyAction::sKind()
 {
     return "reply activity action";
 }
 
-void UmlReplyAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlReplyAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
-    Q3CString s = replyToCall();
-    Q3CString scpp = cppReplyToCall();
-    Q3CString sjava = javaReplyToCall();
+    QByteArray s = replyToCall();
+    QByteArray scpp = cppReplyToCall();
+    QByteArray sjava = javaReplyToCall();
 
     if (!s.isEmpty() || !scpp.isEmpty() || !sjava.isEmpty()) {
         fw.write("<p>replyToCall :</p><ul>");
@@ -368,12 +368,12 @@ void UmlReplyAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlCreateObjectAction::sKind()
+QByteArray UmlCreateObjectAction::sKind()
 {
     return "create object activity action";
 }
 
-void UmlCreateObjectAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlCreateObjectAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -388,12 +388,12 @@ void UmlCreateObjectAction::html(Q3CString pfix, unsigned int rank, unsigned int
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlDestroyObjectAction::sKind()
+QByteArray UmlDestroyObjectAction::sKind()
 {
     return "destroy object activity action";
 }
 
-void UmlDestroyObjectAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlDestroyObjectAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -411,12 +411,12 @@ void UmlDestroyObjectAction::html(Q3CString pfix, unsigned int rank, unsigned in
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlTestIdentityAction::sKind()
+QByteArray UmlTestIdentityAction::sKind()
 {
     return "test identity activity action";
 }
 
-void UmlTestIdentityAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlTestIdentityAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -425,12 +425,12 @@ void UmlTestIdentityAction::html(Q3CString pfix, unsigned int rank, unsigned int
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlRaiseExceptionAction::sKind()
+QByteArray UmlRaiseExceptionAction::sKind()
 {
     return "raise exception activity action";
 }
 
-void UmlRaiseExceptionAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlRaiseExceptionAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
@@ -439,12 +439,12 @@ void UmlRaiseExceptionAction::html(Q3CString pfix, unsigned int rank, unsigned i
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlReduceAction::sKind()
+QByteArray UmlReduceAction::sKind()
 {
     return "reduce activity action";
 }
 
-void UmlReduceAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlReduceAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
diff --git a/genplugouts/HtmlDoc/UmlActivityActionClasses.h b/genplugouts/HtmlDoc/UmlActivityActionClasses.h
index d3693a7f9..59287f29f 100644
--- a/genplugouts/HtmlDoc/UmlActivityActionClasses.h
+++ b/genplugouts/HtmlDoc/UmlActivityActionClasses.h
@@ -2,21 +2,22 @@
 #define _UMLACTIVITYACTIONCLASSES_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseActivityActionClasses.h"
 
 class UmlSendObjectAction : public UmlBaseSendObjectAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseSendObjectAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendObjectAction(void * id, const Q3CString & s) : UmlBaseSendObjectAction(id, s) {
+    UmlSendObjectAction(void * id, const QByteArray & s) : UmlBaseSendObjectAction(id, s) {
     }
 
 };
@@ -25,14 +26,15 @@ class UmlUnmarshallAction : public UmlBaseUnmarshallAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseUnmarshallAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlUnmarshallAction(void * id, const Q3CString & s) : UmlBaseUnmarshallAction(id, s) {
+    UmlUnmarshallAction(void * id, const QByteArray & s) : UmlBaseUnmarshallAction(id, s) {
     }
 
 };
@@ -41,10 +43,10 @@ class UmlSendSignalAction : public UmlBaseSendSignalAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendSignalAction(void * id, const Q3CString & s) : UmlBaseSendSignalAction(id, s) {
+    UmlSendSignalAction(void * id, const QByteArray & s) : UmlBaseSendSignalAction(id, s) {
     }
 
 };
@@ -53,10 +55,10 @@ class UmlBroadcastSignalAction : public UmlBaseBroadcastSignalAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBroadcastSignalAction(void * id, const Q3CString & s) : UmlBaseBroadcastSignalAction(id, s) {
+    UmlBroadcastSignalAction(void * id, const QByteArray & s) : UmlBaseBroadcastSignalAction(id, s) {
     }
 
 };
@@ -65,14 +67,15 @@ class UmlValueSpecificationAction : public UmlBaseValueSpecificationAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseValueSpecificationAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlValueSpecificationAction(void * id, const Q3CString & s) : UmlBaseValueSpecificationAction(id, s) {
+    UmlValueSpecificationAction(void * id, const QByteArray & s) : UmlBaseValueSpecificationAction(id, s) {
     }
 
 };
@@ -81,14 +84,15 @@ class UmlOpaqueAction : public UmlBaseOpaqueAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseOpaqueAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOpaqueAction(void * id, const Q3CString & s) : UmlBaseOpaqueAction(id, s) {
+    UmlOpaqueAction(void * id, const QByteArray & s) : UmlBaseOpaqueAction(id, s) {
     }
 
 };
@@ -97,14 +101,15 @@ class UmlAcceptEventAction : public UmlBaseAcceptEventAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseAcceptEventAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptEventAction(void * id, const Q3CString & s) : UmlBaseAcceptEventAction(id, s) {
+    UmlAcceptEventAction(void * id, const QByteArray & s) : UmlBaseAcceptEventAction(id, s) {
     }
 
 };
@@ -113,14 +118,15 @@ class UmlCallOperationAction : public UmlBaseCallOperationAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseCallOperationAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallOperationAction(void * id, const Q3CString & s) : UmlBaseCallOperationAction(id, s) {
+    UmlCallOperationAction(void * id, const QByteArray & s) : UmlBaseCallOperationAction(id, s) {
     }
 
 };
@@ -129,14 +135,15 @@ class UmlCallBehaviorAction : public UmlBaseCallBehaviorAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseCallBehaviorAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallBehaviorAction(void * id, const Q3CString & s) : UmlBaseCallBehaviorAction(id, s) {
+    UmlCallBehaviorAction(void * id, const QByteArray & s) : UmlBaseCallBehaviorAction(id, s) {
     }
 
 };
@@ -145,10 +152,11 @@ class UmlClearVariableValueAction : public UmlBaseClearVariableValueAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseClearVariableValueAction::html;
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClearVariableValueAction(void * id, const Q3CString & s) : UmlBaseClearVariableValueAction(id, s) {
+    UmlClearVariableValueAction(void * id, const QByteArray & s) : UmlBaseClearVariableValueAction(id, s) {
     }
 
 };
@@ -157,10 +165,10 @@ class UmlReadVariableValueAction : public UmlBaseReadVariableValueAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReadVariableValueAction(void * id, const Q3CString & s) : UmlBaseReadVariableValueAction(id, s) {
+    UmlReadVariableValueAction(void * id, const QByteArray & s) : UmlBaseReadVariableValueAction(id, s) {
     }
 
 };
@@ -169,10 +177,10 @@ class UmlWriteVariableValueAction : public UmlBaseWriteVariableValueAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlWriteVariableValueAction(void * id, const Q3CString & s) : UmlBaseWriteVariableValueAction(id, s) {
+    UmlWriteVariableValueAction(void * id, const QByteArray & s) : UmlBaseWriteVariableValueAction(id, s) {
     }
 
 };
@@ -181,14 +189,14 @@ class UmlAddVariableValueAction : public UmlBaseAddVariableValueAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAddVariableValueAction(void * id, const Q3CString & s) : UmlBaseAddVariableValueAction(id, s) {
+    UmlAddVariableValueAction(void * id, const QByteArray & s) : UmlBaseAddVariableValueAction(id, s) {
     }
 
 };
@@ -197,14 +205,14 @@ class UmlRemoveVariableValueAction : public UmlBaseRemoveVariableValueAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRemoveVariableValueAction(void * id, const Q3CString & s) : UmlBaseRemoveVariableValueAction(id, s) {
+    UmlRemoveVariableValueAction(void * id, const QByteArray & s) : UmlBaseRemoveVariableValueAction(id, s) {
     }
 
 };
@@ -213,14 +221,15 @@ class UmlAcceptCallAction : public UmlBaseAcceptCallAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseAcceptCallAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptCallAction(void * id, const Q3CString & s) : UmlBaseAcceptCallAction(id, s) {
+    UmlAcceptCallAction(void * id, const QByteArray & s) : UmlBaseAcceptCallAction(id, s) {
     }
 
 };
@@ -229,14 +238,15 @@ class UmlReplyAction : public UmlBaseReplyAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseReplyAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReplyAction(void * id, const Q3CString & s) : UmlBaseReplyAction(id, s) {
+    UmlReplyAction(void * id, const QByteArray & s) : UmlBaseReplyAction(id, s) {
     }
 
 };
@@ -245,14 +255,15 @@ class UmlCreateObjectAction : public UmlBaseCreateObjectAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseCreateObjectAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCreateObjectAction(void * id, const Q3CString & s) : UmlBaseCreateObjectAction(id, s) {
+    UmlCreateObjectAction(void * id, const QByteArray & s) : UmlBaseCreateObjectAction(id, s) {
     }
 
 };
@@ -261,14 +272,15 @@ class UmlDestroyObjectAction : public UmlBaseDestroyObjectAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseDestroyObjectAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDestroyObjectAction(void * id, const Q3CString & s) : UmlBaseDestroyObjectAction(id, s) {
+    UmlDestroyObjectAction(void * id, const QByteArray & s) : UmlBaseDestroyObjectAction(id, s) {
     }
 
 };
@@ -277,14 +289,15 @@ class UmlTestIdentityAction : public UmlBaseTestIdentityAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseTestIdentityAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlTestIdentityAction(void * id, const Q3CString & s) : UmlBaseTestIdentityAction(id, s) {
+    UmlTestIdentityAction(void * id, const QByteArray & s) : UmlBaseTestIdentityAction(id, s) {
     }
 
 };
@@ -293,14 +306,15 @@ class UmlRaiseExceptionAction : public UmlBaseRaiseExceptionAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseRaiseExceptionAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRaiseExceptionAction(void * id, const Q3CString & s) : UmlBaseRaiseExceptionAction(id, s) {
+    UmlRaiseExceptionAction(void * id, const QByteArray & s) : UmlBaseRaiseExceptionAction(id, s) {
     }
 
 };
@@ -309,14 +323,15 @@ class UmlReduceAction : public UmlBaseReduceAction
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind() override;
 
+    using UmlBaseReduceAction::html;
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReduceAction(void * id, const Q3CString & s) : UmlBaseReduceAction(id, s) {
+    UmlReduceAction(void * id, const QByteArray & s) : UmlBaseReduceAction(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlActivityControlNode.cpp b/genplugouts/HtmlDoc/UmlActivityControlNode.cpp
index f61c804bd..584ddc461 100644
--- a/genplugouts/HtmlDoc/UmlActivityControlNode.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityControlNode.cpp
@@ -2,17 +2,17 @@
 #include "UmlCom.h"
 #include "UmlActivityControlNode.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlActivityControlNode::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlActivityControlNode::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
     UmlCom::message(name());
 
-    Q3CString s = sKind();
+    QByteArray s = sKind();
 
-    s.replace(0, 1, s.left(1).upper());
+    s.replace(0, 1, s.left(1).toUpper());
     UmlItem::html(s, (UmlDiagram *) 0);
 
     fw.write("<p>Defined in ");
diff --git a/genplugouts/HtmlDoc/UmlActivityControlNode.h b/genplugouts/HtmlDoc/UmlActivityControlNode.h
index d8680145e..5feea06eb 100644
--- a/genplugouts/HtmlDoc/UmlActivityControlNode.h
+++ b/genplugouts/HtmlDoc/UmlActivityControlNode.h
@@ -3,20 +3,20 @@
 
 
 #include "UmlBaseActivityControlNode.h"
-#include <q3cstring.h>
+
 
 class UmlActivityControlNode : public UmlBaseActivityControlNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityControlNode(void * id, const Q3CString & s) : UmlBaseActivityControlNode(id, s) {
+    UmlActivityControlNode(void * id, const QByteArray & s) : UmlBaseActivityControlNode(id, s) {
     }
 
 
 public:
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlActivityControlNodeClasses.cpp b/genplugouts/HtmlDoc/UmlActivityControlNodeClasses.cpp
index 221c5454e..235b090ef 100644
--- a/genplugouts/HtmlDoc/UmlActivityControlNodeClasses.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityControlNodeClasses.cpp
@@ -1,39 +1,39 @@
 
 #include "UmlActivityControlNodeClasses.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlInitialActivityNode::sKind()
+QByteArray UmlInitialActivityNode::sKind()
 {
     return "initial activity node";
 }
 
-Q3CString UmlFlowFinalActivityNode::sKind()
+QByteArray UmlFlowFinalActivityNode::sKind()
 {
     return "flow final";
 }
 
-Q3CString UmlActivityFinalActivityNode::sKind()
+QByteArray UmlActivityFinalActivityNode::sKind()
 {
     return "activity final";
 }
 
-Q3CString UmlDecisionActivityNode::sKind()
+QByteArray UmlDecisionActivityNode::sKind()
 {
     return "decision activity node";
 }
 
-Q3CString UmlMergeActivityNode::sKind()
+QByteArray UmlMergeActivityNode::sKind()
 {
     return "merge activity node";
 }
 
-Q3CString UmlForkActivityNode::sKind()
+QByteArray UmlForkActivityNode::sKind()
 {
     return "fork activity node";
 }
 
-Q3CString UmlJoinActivityNode::sKind()
+QByteArray UmlJoinActivityNode::sKind()
 {
     return "join activity node";
 }
diff --git a/genplugouts/HtmlDoc/UmlActivityControlNodeClasses.h b/genplugouts/HtmlDoc/UmlActivityControlNodeClasses.h
index 8340bc2ad..f0ddae0c6 100644
--- a/genplugouts/HtmlDoc/UmlActivityControlNodeClasses.h
+++ b/genplugouts/HtmlDoc/UmlActivityControlNodeClasses.h
@@ -3,17 +3,17 @@
 
 
 #include "UmlBaseActivityControlNodeClasses.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode : public UmlBaseInitialActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInitialActivityNode(void * id, const Q3CString & s) : UmlBaseInitialActivityNode(id, s) {
+    UmlInitialActivityNode(void * id, const QByteArray & s) : UmlBaseInitialActivityNode(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
 };
 
@@ -21,11 +21,11 @@ class UmlFlowFinalActivityNode : public UmlBaseFlowFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlFlowFinalActivityNode(void * id, const Q3CString & s) : UmlBaseFlowFinalActivityNode(id, s) {
+    UmlFlowFinalActivityNode(void * id, const QByteArray & s) : UmlBaseFlowFinalActivityNode(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
 };
 
@@ -33,11 +33,11 @@ class UmlActivityFinalActivityNode : public UmlBaseActivityFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityFinalActivityNode(void * id, const Q3CString & s) : UmlBaseActivityFinalActivityNode(id, s) {
+    UmlActivityFinalActivityNode(void * id, const QByteArray & s) : UmlBaseActivityFinalActivityNode(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
 };
 
@@ -45,11 +45,11 @@ class UmlDecisionActivityNode : public UmlBaseDecisionActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDecisionActivityNode(void * id, const Q3CString & s) : UmlBaseDecisionActivityNode(id, s) {
+    UmlDecisionActivityNode(void * id, const QByteArray & s) : UmlBaseDecisionActivityNode(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
 };
 
@@ -57,11 +57,11 @@ class UmlMergeActivityNode : public UmlBaseMergeActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlMergeActivityNode(void * id, const Q3CString & s) : UmlBaseMergeActivityNode(id, s) {
+    UmlMergeActivityNode(void * id, const QByteArray & s) : UmlBaseMergeActivityNode(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
 };
 
@@ -69,11 +69,11 @@ class UmlForkActivityNode : public UmlBaseForkActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlForkActivityNode(void * id, const Q3CString & s) : UmlBaseForkActivityNode(id, s) {
+    UmlForkActivityNode(void * id, const QByteArray & s) : UmlBaseForkActivityNode(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
 };
 
@@ -81,11 +81,11 @@ class UmlJoinActivityNode : public UmlBaseJoinActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlJoinActivityNode(void * id, const Q3CString & s) : UmlBaseJoinActivityNode(id, s) {
+    UmlJoinActivityNode(void * id, const QByteArray & s) : UmlBaseJoinActivityNode(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlActivityDiagram.cpp b/genplugouts/HtmlDoc/UmlActivityDiagram.cpp
index c2c32963b..678c68f65 100644
--- a/genplugouts/HtmlDoc/UmlActivityDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityDiagram.cpp
@@ -1,7 +1,7 @@
 
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlActivityDiagram::memo_ref()
 {
@@ -9,7 +9,7 @@ void UmlActivityDiagram::memo_ref()
     UmlDiagram::memo_ref();
 }
 
-Q3CString UmlActivityDiagram::sKind()
+QByteArray UmlActivityDiagram::sKind()
 {
     return "activity diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlActivityDiagram.h b/genplugouts/HtmlDoc/UmlActivityDiagram.h
index f5410d83d..ebf37608f 100644
--- a/genplugouts/HtmlDoc/UmlActivityDiagram.h
+++ b/genplugouts/HtmlDoc/UmlActivityDiagram.h
@@ -2,7 +2,7 @@
 #define _UMLACTIVITYDIAGRAM_H
 
 
-#include <q3cstring.h>
+
 #include "Vector.h"
 #include "UmlBaseActivityDiagram.h"
 #include "UmlActivityItem.h"
@@ -20,7 +20,7 @@ class UmlActivityDiagram : public UmlBaseActivityDiagram, public UmlActivityItem
     virtual void memo_ref();
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     static void ref_index();
 
@@ -33,7 +33,7 @@ class UmlActivityDiagram : public UmlBaseActivityDiagram, public UmlActivityItem
 
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityDiagram(void * id, const Q3CString & s) : UmlBaseActivityDiagram(id, s) {
+    UmlActivityDiagram(void * id, const QByteArray & s) : UmlBaseActivityDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlActivityNode.h b/genplugouts/HtmlDoc/UmlActivityNode.h
index 8429d2396..770c06359 100644
--- a/genplugouts/HtmlDoc/UmlActivityNode.h
+++ b/genplugouts/HtmlDoc/UmlActivityNode.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityNode.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityNode : public UmlBaseActivityNode, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityNode(void * id, const Q3CString & s) : UmlBaseActivityNode(id, s) {
+    UmlActivityNode(void * id, const QByteArray & s) : UmlBaseActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlActivityObject.cpp b/genplugouts/HtmlDoc/UmlActivityObject.cpp
index 0076f352a..073ee539b 100644
--- a/genplugouts/HtmlDoc/UmlActivityObject.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityObject.cpp
@@ -2,14 +2,14 @@
 #include "UmlActivityDiagram.h"
 #include "UmlActivityObject.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlActivityObject::sKind()
+QByteArray UmlActivityObject::sKind()
 {
     return "activity object";
 }
 
-void UmlActivityObject::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlActivityObject::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
@@ -22,9 +22,9 @@ void UmlActivityObject::html(Q3CString pfix, unsigned int rank, unsigned int lev
     unload(FALSE, FALSE);
 }
 
-void UmlActivityObject::html_internal(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlActivityObject::html_internal(QByteArray pfix, unsigned int rank, unsigned int level)
 {
-    Q3CString s = description();
+    QByteArray s = description();
 
     s = description();
 
@@ -52,8 +52,8 @@ void UmlActivityObject::html_internal(Q3CString pfix, unsigned int rank, unsigne
 
     s = selection();
 
-    Q3CString scpp = cppSelection();
-    Q3CString sjava = javaSelection();
+    QByteArray scpp = cppSelection();
+    QByteArray sjava = javaSelection();
 
     if (!s.isEmpty() || !scpp.isEmpty() || !sjava.isEmpty()) {
         fw.write("<p>Selection :</p><ul>");
diff --git a/genplugouts/HtmlDoc/UmlActivityObject.h b/genplugouts/HtmlDoc/UmlActivityObject.h
index 34a4ce4ea..8f132b555 100644
--- a/genplugouts/HtmlDoc/UmlActivityObject.h
+++ b/genplugouts/HtmlDoc/UmlActivityObject.h
@@ -3,25 +3,25 @@
 
 
 #include "UmlBaseActivityObject.h"
-#include <q3cstring.h>
+
 
 class UmlActivityObject : public UmlBaseActivityObject
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityObject(void * id, const Q3CString & s) : UmlBaseActivityObject(id, s) {
+    UmlActivityObject(void * id, const QByteArray & s) : UmlBaseActivityObject(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html_internal(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html_internal(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlActivityParameter.cpp b/genplugouts/HtmlDoc/UmlActivityParameter.cpp
index 5944decd2..6138a14da 100644
--- a/genplugouts/HtmlDoc/UmlActivityParameter.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityParameter.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlActivityParameter.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlActivityParameter::sKind()
+QByteArray UmlActivityParameter::sKind()
 {
     return "activity parameter";
 }
 
-void UmlActivityParameter::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlActivityParameter::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
@@ -16,7 +16,7 @@ void UmlActivityParameter::html(Q3CString pfix, unsigned int rank, unsigned int
     writeq(name());
     fw.write("</b></div></td></tr></table>\n");
 
-    Q3CString s = defaultValue();
+    QByteArray s = defaultValue();
 
     if (! s.isEmpty()) {
         fw.write("<p>Default value :</p><ul>");
diff --git a/genplugouts/HtmlDoc/UmlActivityParameter.h b/genplugouts/HtmlDoc/UmlActivityParameter.h
index 65f4473cc..5bc872c5c 100644
--- a/genplugouts/HtmlDoc/UmlActivityParameter.h
+++ b/genplugouts/HtmlDoc/UmlActivityParameter.h
@@ -3,21 +3,21 @@
 
 
 #include "UmlBaseActivityParameter.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter : public UmlBaseActivityParameter
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityParameter(void * id, const Q3CString & s) : UmlBaseActivityParameter(id, s) {
+    UmlActivityParameter(void * id, const QByteArray & s) : UmlBaseActivityParameter(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlActivityPartition.cpp b/genplugouts/HtmlDoc/UmlActivityPartition.cpp
index d0f4dba62..d636f591b 100644
--- a/genplugouts/HtmlDoc/UmlActivityPartition.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityPartition.cpp
@@ -3,24 +3,24 @@
 
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlActivityPartition::chapterp()
 {
     return TRUE;
 }
 
-Q3CString UmlActivityPartition::sKind()
+QByteArray UmlActivityPartition::sKind()
 {
     return "activity partition";
 }
 
-void UmlActivityPartition::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlActivityPartition::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
     chapter("Activity partition", pfix, rank, "activitypartition", level);
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
diff --git a/genplugouts/HtmlDoc/UmlActivityPartition.h b/genplugouts/HtmlDoc/UmlActivityPartition.h
index 2cd17192d..f237c717d 100644
--- a/genplugouts/HtmlDoc/UmlActivityPartition.h
+++ b/genplugouts/HtmlDoc/UmlActivityPartition.h
@@ -2,7 +2,7 @@
 #define _UMLACTIVITYPARTITION_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseActivityPartition.h"
 #include "UmlActivityItem.h"
 
@@ -12,14 +12,14 @@ class UmlActivityPartition : public UmlBaseActivityPartition, public UmlActivity
     virtual bool chapterp();
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPartition(void * id, const Q3CString & s) : UmlBaseActivityPartition(id, s) {
+    UmlActivityPartition(void * id, const QByteArray & s) : UmlBaseActivityPartition(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlActivityPin.cpp b/genplugouts/HtmlDoc/UmlActivityPin.cpp
index 15e296380..b1eac9ab0 100644
--- a/genplugouts/HtmlDoc/UmlActivityPin.cpp
+++ b/genplugouts/HtmlDoc/UmlActivityPin.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlActivityPin.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlActivityPin::sKind()
+QByteArray UmlActivityPin::sKind()
 {
     return "activity action pin";
 }
 
-void UmlActivityPin::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlActivityPin::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
diff --git a/genplugouts/HtmlDoc/UmlActivityPin.h b/genplugouts/HtmlDoc/UmlActivityPin.h
index 543a7c623..ae276265f 100644
--- a/genplugouts/HtmlDoc/UmlActivityPin.h
+++ b/genplugouts/HtmlDoc/UmlActivityPin.h
@@ -3,21 +3,21 @@
 
 
 #include "UmlBaseActivityPin.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin : public UmlBaseActivityPin
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPin(void * id, const Q3CString & s) : UmlBaseActivityPin(id, s) {
+    UmlActivityPin(void * id, const QByteArray & s) : UmlBaseActivityPin(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlActivityRegion.h b/genplugouts/HtmlDoc/UmlActivityRegion.h
index f1cfa536d..92b06bf32 100644
--- a/genplugouts/HtmlDoc/UmlActivityRegion.h
+++ b/genplugouts/HtmlDoc/UmlActivityRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityRegion.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityRegion : public UmlBaseActivityRegion, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityRegion(void * id, const Q3CString & s) : UmlBaseActivityRegion(id, s) {
+    UmlActivityRegion(void * id, const QByteArray & s) : UmlBaseActivityRegion(id, s) {
     }
 
 
diff --git a/genplugouts/HtmlDoc/UmlArtifact.cpp b/genplugouts/HtmlDoc/UmlArtifact.cpp
index e75294406..a31ffa9f8 100644
--- a/genplugouts/HtmlDoc/UmlArtifact.cpp
+++ b/genplugouts/HtmlDoc/UmlArtifact.cpp
@@ -5,8 +5,8 @@
 #include "UmlClass.h"
 #include "UmlDeploymentDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
-void UmlArtifact::html(Q3CString, unsigned int, unsigned int)
+#include <QByteArray>
+void UmlArtifact::html(QByteArray, unsigned int, unsigned int)
 {
     UmlCom::message(name());
 
@@ -17,9 +17,9 @@ void UmlArtifact::html(Q3CString, unsigned int, unsigned int)
     if (stereotype() == "source") {
         fw.write("<p>Artifact <i>source</i>");
 
-        const Q3PtrVector<UmlClass> l = associatedClasses();
+        const QVector<UmlClass*> l = associatedClasses();
 
-        for (unsigned i = 0; i != l.size(); i += 1) {
+        for (int i = 0; i != l.size(); i += 1) {
             fw.write(sep);
             l[i]->write();
             sep = ", ";
@@ -30,9 +30,9 @@ void UmlArtifact::html(Q3CString, unsigned int, unsigned int)
         writeq(stereotype());
         fw.write("</i>");
 
-        const Q3PtrVector<UmlArtifact> l = associatedArtifacts();
+        const QVector<UmlArtifact*> l = associatedArtifacts();
 
-        for (unsigned i = 0; i != l.size(); i += 1) {
+        for (int i = 0; i != l.size(); i += 1) {
             fw.write(sep);
             l[i]->write();
             sep = ", ";
@@ -44,7 +44,7 @@ void UmlArtifact::html(Q3CString, unsigned int, unsigned int)
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlArtifact::sKind()
+QByteArray UmlArtifact::sKind()
 {
     return "artifact";
 }
diff --git a/genplugouts/HtmlDoc/UmlArtifact.h b/genplugouts/HtmlDoc/UmlArtifact.h
index 3a61228aa..4d650f561 100644
--- a/genplugouts/HtmlDoc/UmlArtifact.h
+++ b/genplugouts/HtmlDoc/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+
 
 // This class manages 'artifacts'
 //
@@ -11,14 +11,14 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlAttribute.cpp b/genplugouts/HtmlDoc/UmlAttribute.cpp
index 61bef9833..4b8d557a2 100644
--- a/genplugouts/HtmlDoc/UmlAttribute.cpp
+++ b/genplugouts/HtmlDoc/UmlAttribute.cpp
@@ -6,8 +6,8 @@
 #include "PhpSettings.h"
 #include "PythonSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlAttribute::sKind()
+#include <QByteArray>
+QByteArray UmlAttribute::sKind()
 {
     return "attribute";
 }
@@ -16,7 +16,7 @@ void UmlAttribute::memo_ref()
 {
     if (visibility() == PublicVisibility) {
 
-        Q3CString s = parent()->stereotype();
+        QByteArray s = parent()->stereotype();
 
         if ((s != "enum") && (s != "enum_pattern"))
             attrs.addElement(this);
@@ -25,7 +25,7 @@ void UmlAttribute::memo_ref()
     UmlItem::memo_ref();
 }
 
-void UmlAttribute::html(Q3CString, unsigned int, unsigned int)
+void UmlAttribute::html(QByteArray, unsigned int, unsigned int)
 {
     define();
 
@@ -33,7 +33,7 @@ void UmlAttribute::html(Q3CString, unsigned int, unsigned int)
     writeq(name());
     fw.write("</b></div></td></tr></table>\n");
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
@@ -132,7 +132,7 @@ void UmlAttribute::generate_index()
     }
 }
 
-void UmlAttribute::gen_cpp_decl(Q3CString s, bool descr)
+void UmlAttribute::gen_cpp_decl(QByteArray s, bool descr)
 {
     const char * p;
 
@@ -163,7 +163,7 @@ void UmlAttribute::gen_cpp_decl(Q3CString s, bool descr)
             else if (!strncmp(p, "${multiplicity}", 15)) {
                 p += 15;
 
-                Q3CString m = multiplicity();
+                QByteArray m = multiplicity();
 
                 if (m.isEmpty() || (((const char *) m)[0] != '[')) {
                     fw.write("[");
@@ -250,7 +250,7 @@ void UmlAttribute::gen_cpp_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlAttribute::gen_java_decl(Q3CString s, bool descr)
+void UmlAttribute::gen_java_decl(QByteArray s, bool descr)
 {
     const char * p = bypass_comment(s);
 
@@ -266,7 +266,7 @@ void UmlAttribute::gen_java_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${multiplicity}", 15)) {
             p += 15;
 
-            Q3CString m = multiplicity();
+            QByteArray m = multiplicity();
 
             if (! m.isEmpty()) {
                 const char * s = m;
@@ -365,9 +365,9 @@ void UmlAttribute::gen_java_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlAttribute::gen_php_decl(Q3CString s, bool descr)
+void UmlAttribute::gen_php_decl(QByteArray s, bool descr)
 {
-    Q3CString st = PhpSettings::classStereotype(stereotype());
+    QByteArray st = PhpSettings::classStereotype(stereotype());
     const char * p = bypass_comment(s);
 
     while (*p) {
@@ -445,9 +445,9 @@ void UmlAttribute::gen_php_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlAttribute::gen_python_decl(Q3CString s)
+void UmlAttribute::gen_python_decl(QByteArray s)
 {
-    Q3CString st = PythonSettings::classStereotype(stereotype());
+    QByteArray st = PythonSettings::classStereotype(stereotype());
     const char * p = bypass_comment(s);
 
     while (*p) {
@@ -496,7 +496,7 @@ void UmlAttribute::gen_uml_decl()
     fw.write(" : ");
     write(type());
 
-    Q3CString s;
+    QByteArray s;
 
     s = defaultValue();
 
diff --git a/genplugouts/HtmlDoc/UmlAttribute.h b/genplugouts/HtmlDoc/UmlAttribute.h
index bf1688bd6..0eb5b9d99 100644
--- a/genplugouts/HtmlDoc/UmlAttribute.h
+++ b/genplugouts/HtmlDoc/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
@@ -13,32 +13,32 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     virtual void memo_ref();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     static void ref_index();
 
     static void generate_index();
 
     //produce the definition in C++
-    void gen_cpp_decl(Q3CString s, bool descr);
+    void gen_cpp_decl(QByteArray s, bool descr);
 
     //produce the definition in Java
-    void gen_java_decl(Q3CString s, bool descr);
+    void gen_java_decl(QByteArray s, bool descr);
 
     //produce the definition in Php
-    void gen_php_decl(Q3CString s, bool descr);
+    void gen_php_decl(QByteArray s, bool descr);
 
     //produce the definition in Python
-    void gen_python_decl(Q3CString s);
+    void gen_python_decl(QByteArray s);
 
 
 private:
diff --git a/genplugouts/HtmlDoc/UmlBaseAccessVariableValueAction.h b/genplugouts/HtmlDoc/UmlBaseAccessVariableValueAction.h
index 311fefa08..0e2856d02 100644
--- a/genplugouts/HtmlDoc/UmlBaseAccessVariableValueAction.h
+++ b/genplugouts/HtmlDoc/UmlBaseAccessVariableValueAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlItem;
 
@@ -11,7 +11,7 @@ class UmlBaseAccessVariableValueAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAccessVariableValueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAccessVariableValueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseActivity.cpp b/genplugouts/HtmlDoc/UmlBaseActivity.cpp
index 8723c2694..8971d0dd3 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivity.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseActivity.cpp
@@ -6,7 +6,7 @@
 #include "UmlOperation.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivity * UmlBaseActivity::create(UmlClassView * parent, const char * s)
 {
@@ -18,7 +18,7 @@ anItemKind UmlBaseActivity::kind()
     return anActivity;
 }
 
-const Q3CString & UmlBaseActivity::preCondition()
+const QByteArray & UmlBaseActivity::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -29,7 +29,7 @@ bool UmlBaseActivity::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::postCondition()
+const QByteArray & UmlBaseActivity::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -41,7 +41,7 @@ bool UmlBaseActivity::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivity::cppPreCondition()
+const QByteArray & UmlBaseActivity::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivity::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::cppPostCondition()
+const QByteArray & UmlBaseActivity::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -65,7 +65,7 @@ bool UmlBaseActivity::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivity::javaPreCondition()
+const QByteArray & UmlBaseActivity::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -76,7 +76,7 @@ bool UmlBaseActivity::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::javaPostCondition()
+const QByteArray & UmlBaseActivity::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
@@ -88,7 +88,7 @@ bool UmlBaseActivity::set_JavaPostCondition(const char * v)
 }
 #endif
 
-const Q3CString & UmlBaseActivity::constraint()
+const QByteArray & UmlBaseActivity::constraint()
 {
     read_if_needed_();
     return _constraint;
diff --git a/genplugouts/HtmlDoc/UmlBaseActivity.h b/genplugouts/HtmlDoc/UmlBaseActivity.h
index 3c29a3a35..3a67ce943 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivity.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivity.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivity;
 class UmlClassView;
@@ -27,13 +27,13 @@ class UmlBaseActivity : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivity(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivity(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -41,7 +41,7 @@ class UmlBaseActivity : public UmlItem
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -50,7 +50,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -58,7 +58,7 @@ class UmlBaseActivity : public UmlItem
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -76,7 +76,7 @@ class UmlBaseActivity : public UmlItem
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -85,7 +85,7 @@ class UmlBaseActivity : public UmlItem
 #endif
 
     // return the constraint
-    const Q3CString & constraint();
+    const QByteArray & constraint();
 
     // set the constraint
     //
@@ -142,23 +142,23 @@ class UmlBaseActivity : public UmlItem
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
-    Q3CString _constraint;
+    QByteArray _constraint;
 
     bool _read_only;
 
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityAction.cpp b/genplugouts/HtmlDoc/UmlBaseActivityAction.cpp
index 762a0cf19..4bd45ff5e 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityAction.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseActivityAction.cpp
@@ -3,9 +3,9 @@
 #include "UmlBaseActivityAction.h"
 #include "UmlDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseActivityAction::preCondition()
+const QByteArray & UmlBaseActivityAction::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -16,7 +16,7 @@ bool UmlBaseActivityAction::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::postCondition()
+const QByteArray & UmlBaseActivityAction::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivityAction::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityAction::cppPreCondition()
+const QByteArray & UmlBaseActivityAction::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -39,7 +39,7 @@ bool UmlBaseActivityAction::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::cppPostCondition()
+const QByteArray & UmlBaseActivityAction::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivityAction::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityAction::javaPreCondition()
+const QByteArray & UmlBaseActivityAction::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -63,7 +63,7 @@ bool UmlBaseActivityAction::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::javaPostCondition()
+const QByteArray & UmlBaseActivityAction::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
@@ -75,7 +75,7 @@ bool UmlBaseActivityAction::set_JavaPostCondition(const char * v)
 }
 #endif
 
-const Q3CString & UmlBaseActivityAction::constraint()
+const QByteArray & UmlBaseActivityAction::constraint()
 {
     read_if_needed_();
     return _constraint;
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityAction.h b/genplugouts/HtmlDoc/UmlBaseActivityAction.h
index 1add0a3b3..52582e190 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityAction.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlDiagram;
 
@@ -11,13 +11,13 @@ class UmlBaseActivityAction : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityAction(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityAction(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -25,7 +25,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -34,7 +34,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -42,7 +42,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -52,7 +52,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -60,7 +60,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -69,7 +69,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 #endif
 
     // return the constraint
-    const Q3CString & constraint();
+    const QByteArray & constraint();
 
     // set the constraint
     //
@@ -90,40 +90,40 @@ class UmlBaseActivityAction : public UmlActivityNode
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
-    Q3CString _constraint;
+    QByteArray _constraint;
 
     UmlDiagram * _assoc_diagram;
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityActionClasses.cpp b/genplugouts/HtmlDoc/UmlBaseActivityActionClasses.cpp
index 0085babe7..1dcd61155 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityActionClasses.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseActivityActionClasses.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlSendObjectAction * UmlBaseSendObjectAction::create(UmlItem * parent, const char * s)
 {
@@ -57,7 +57,7 @@ anItemKind UmlBaseValueSpecificationAction::kind()
     return aValueSpecificationAction;
 }
 
-const Q3CString & UmlBaseValueSpecificationAction::value()
+const QByteArray & UmlBaseValueSpecificationAction::value()
 {
     read_if_needed_();
     return _value;
@@ -69,7 +69,7 @@ bool UmlBaseValueSpecificationAction::set_Value(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseValueSpecificationAction::cppValue()
+const QByteArray & UmlBaseValueSpecificationAction::cppValue()
 {
     read_if_needed_();
     return _cpp_value;
@@ -82,7 +82,7 @@ bool UmlBaseValueSpecificationAction::set_CppValue(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseValueSpecificationAction::javaValue()
+const QByteArray & UmlBaseValueSpecificationAction::javaValue()
 {
     read_if_needed_();
     return _java_value;
@@ -138,7 +138,7 @@ anItemKind UmlBaseOpaqueAction::kind()
     return anOpaqueAction;
 }
 
-const Q3CString & UmlBaseOpaqueAction::behavior()
+const QByteArray & UmlBaseOpaqueAction::behavior()
 {
     read_if_needed_();
     return _behavior;
@@ -150,7 +150,7 @@ bool UmlBaseOpaqueAction::set_Behavior(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOpaqueAction::cppBehavior()
+const QByteArray & UmlBaseOpaqueAction::cppBehavior()
 {
     read_if_needed_();
     return _cpp_behavior;
@@ -163,7 +163,7 @@ bool UmlBaseOpaqueAction::set_CppBehavior(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOpaqueAction::javaBehavior()
+const QByteArray & UmlBaseOpaqueAction::javaBehavior()
 {
     read_if_needed_();
     return _java_behavior;
@@ -241,7 +241,7 @@ bool UmlBaseAcceptEventAction::set_isTimeEvent(bool v)
     return set_it_(_timeevent, v, setTimeEventCmd);
 }
 
-const Q3CString & UmlBaseAcceptEventAction::trigger()
+const QByteArray & UmlBaseAcceptEventAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -253,7 +253,7 @@ bool UmlBaseAcceptEventAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptEventAction::cppTrigger()
+const QByteArray & UmlBaseAcceptEventAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -266,7 +266,7 @@ bool UmlBaseAcceptEventAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptEventAction::javaTrigger()
+const QByteArray & UmlBaseAcceptEventAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
@@ -498,7 +498,7 @@ anItemKind UmlBaseAcceptCallAction::kind()
     return anAcceptCallAction;
 }
 
-const Q3CString & UmlBaseAcceptCallAction::trigger()
+const QByteArray & UmlBaseAcceptCallAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -510,7 +510,7 @@ bool UmlBaseAcceptCallAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptCallAction::cppTrigger()
+const QByteArray & UmlBaseAcceptCallAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -523,7 +523,7 @@ bool UmlBaseAcceptCallAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptCallAction::javaTrigger()
+const QByteArray & UmlBaseAcceptCallAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
@@ -579,7 +579,7 @@ anItemKind UmlBaseReplyAction::kind()
     return aReplyAction;
 }
 
-const Q3CString & UmlBaseReplyAction::replyToCall()
+const QByteArray & UmlBaseReplyAction::replyToCall()
 {
     read_if_needed_();
     return _trigger;
@@ -591,7 +591,7 @@ bool UmlBaseReplyAction::set_ReplyToCall(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseReplyAction::cppReplyToCall()
+const QByteArray & UmlBaseReplyAction::cppReplyToCall()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -604,7 +604,7 @@ bool UmlBaseReplyAction::set_CppReplyToCall(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseReplyAction::javaReplyToCall()
+const QByteArray & UmlBaseReplyAction::javaReplyToCall()
 {
     read_if_needed_();
     return _java_trigger;
@@ -660,7 +660,7 @@ anItemKind UmlBaseCreateObjectAction::kind()
     return aCreateObjectAction;
 }
 
-const Q3CString & UmlBaseCreateObjectAction::classifier()
+const QByteArray & UmlBaseCreateObjectAction::classifier()
 {
     read_if_needed_();
     return _classifier;
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityActionClasses.h b/genplugouts/HtmlDoc/UmlBaseActivityActionClasses.h
index 34e33cee5..0530785cb 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityActionClasses.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityActionClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityAction.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlOnSignalAction.h"
 #include "UmlAccessVariableValueAction.h"
 
@@ -43,12 +43,12 @@ class UmlBaseSendObjectAction : public UmlActivityAction
     static UmlSendObjectAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseSendObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -64,12 +64,12 @@ class UmlBaseUnmarshallAction : public UmlActivityAction
     static UmlUnmarshallAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUnmarshallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseUnmarshallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -85,12 +85,12 @@ class UmlBaseSendSignalAction : public UmlOnSignalAction
     static UmlSendSignalAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseSendSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -106,12 +106,12 @@ class UmlBaseBroadcastSignalAction : public UmlOnSignalAction
     static UmlBroadcastSignalAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseBroadcastSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseBroadcastSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -127,18 +127,18 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
     static UmlValueSpecificationAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseValueSpecificationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseValueSpecificationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the value
-    const Q3CString & value();
+    const QByteArray & value();
 
     // set the value
     //
@@ -147,7 +147,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the value in C++
-    const Q3CString & cppValue();
+    const QByteArray & cppValue();
 
     // set the value in C++
     //
@@ -157,7 +157,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the value in Java
-    const Q3CString & javaValue();
+    const QByteArray & javaValue();
 
     // set the value in Java
     //
@@ -171,30 +171,30 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _value;
+    QByteArray _value;
 
 #ifdef WITHCPP
-    Q3CString _cpp_value;
+    QByteArray _cpp_value;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_value;
+    QByteArray _java_value;
 #endif
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
@@ -210,18 +210,18 @@ class UmlBaseOpaqueAction : public UmlActivityAction
     static UmlOpaqueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOpaqueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOpaqueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the behavior
-    const Q3CString & behavior();
+    const QByteArray & behavior();
 
     // set the behavior
     //
@@ -230,7 +230,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the behavior in C++
-    const Q3CString & cppBehavior();
+    const QByteArray & cppBehavior();
 
     // set the behavior in C++
     //
@@ -240,7 +240,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the behavior in Java
-    const Q3CString & javaBehavior();
+    const QByteArray & javaBehavior();
 
     // set the behavior in Java
     //
@@ -254,30 +254,30 @@ class UmlBaseOpaqueAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _behavior;
+    QByteArray _behavior;
 
 #ifdef WITHCPP
-    Q3CString _cpp_behavior;
+    QByteArray _cpp_behavior;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_behavior;
+    QByteArray _java_behavior;
 #endif
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
@@ -293,12 +293,12 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     static UmlAcceptEventAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptEventAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptEventAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -320,7 +320,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     bool set_isTimeEvent(bool v);
 
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -329,7 +329,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -339,7 +339,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -353,7 +353,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
@@ -361,26 +361,26 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
     bool _timeevent;
 
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
@@ -396,12 +396,12 @@ class UmlBaseCallOperationAction : public UmlActivityAction
     static UmlCallOperationAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallOperationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallOperationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -430,7 +430,7 @@ class UmlBaseCallOperationAction : public UmlActivityAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -445,12 +445,12 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
     static UmlCallBehaviorAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallBehaviorAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallBehaviorAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -479,7 +479,7 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -494,12 +494,12 @@ class UmlBaseClearVariableValueAction : public UmlAccessVariableValueAction
     static UmlClearVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClearVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseClearVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -515,12 +515,12 @@ class UmlBaseReadVariableValueAction : public UmlAccessVariableValueAction
     static UmlReadVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReadVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseReadVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -536,12 +536,12 @@ class UmlBaseWriteVariableValueAction : public UmlAccessVariableValueAction
     static UmlWriteVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseWriteVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseWriteVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -557,12 +557,12 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
     static UmlAddVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAddVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseAddVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -581,7 +581,7 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -596,12 +596,12 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
     static UmlRemoveVariableValueAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRemoveVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseRemoveVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -620,7 +620,7 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -635,18 +635,18 @@ class UmlBaseAcceptCallAction : public UmlActivityAction
     static UmlAcceptCallAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptCallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptCallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -655,7 +655,7 @@ class UmlBaseAcceptCallAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -665,7 +665,7 @@ class UmlBaseAcceptCallAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -679,30 +679,30 @@ class UmlBaseAcceptCallAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
@@ -718,18 +718,18 @@ class UmlBaseReplyAction : public UmlActivityAction
     static UmlReplyAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReplyAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseReplyAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the replyToCall trigger
-    const Q3CString & replyToCall();
+    const QByteArray & replyToCall();
 
     // set the replyToCall trigger
     //
@@ -738,7 +738,7 @@ class UmlBaseReplyAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the replyToCall trigger in C++
-    const Q3CString & cppReplyToCall();
+    const QByteArray & cppReplyToCall();
 
     // set the replyToCall trigger in C++
     //
@@ -748,7 +748,7 @@ class UmlBaseReplyAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the replyToCall trigger in Java
-    const Q3CString & javaReplyToCall();
+    const QByteArray & javaReplyToCall();
 
     // set the replyToCall trigger in Java
     //
@@ -762,30 +762,30 @@ class UmlBaseReplyAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 #ifdef WITHCPP
-    virtual void read_cpp_();
+    virtual void read_cpp_() override;
 #endif
 
 #ifdef WITHJAVA
-    virtual void read_java_();
+    virtual void read_java_() override;
 #endif
 
 };
@@ -801,18 +801,18 @@ class UmlBaseCreateObjectAction : public UmlActivityAction
     static UmlCreateObjectAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCreateObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCreateObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the classifier
-    const Q3CString & classifier();
+    const QByteArray & classifier();
 
     // set the classifier
     //
@@ -825,15 +825,15 @@ class UmlBaseCreateObjectAction : public UmlActivityAction
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = FALSE, bool = FALSE) override;
 
 
 private:
-    Q3CString _classifier;
+    QByteArray _classifier;
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -848,12 +848,12 @@ class UmlBaseDestroyObjectAction : public UmlActivityAction
     static UmlDestroyObjectAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDestroyObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseDestroyObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -882,7 +882,7 @@ class UmlBaseDestroyObjectAction : public UmlActivityAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
@@ -897,12 +897,12 @@ class UmlBaseTestIdentityAction : public UmlActivityAction
     static UmlTestIdentityAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTestIdentityAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseTestIdentityAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -918,12 +918,12 @@ class UmlBaseRaiseExceptionAction : public UmlActivityAction
     static UmlRaiseExceptionAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRaiseExceptionAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseRaiseExceptionAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -939,12 +939,12 @@ class UmlBaseReduceAction : public UmlActivityAction
     static UmlReduceAction * create(UmlItem * parent, const char * s);
 
     // returns the kind of the item
-    virtual anItemKind kind();
+    virtual anItemKind kind() override;
 
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReduceAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseReduceAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -973,7 +973,7 @@ class UmlBaseReduceAction : public UmlActivityAction
 
 
 protected:
-    virtual void read_uml_();
+    virtual void read_uml_() override;
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityControlNode.h b/genplugouts/HtmlDoc/UmlBaseActivityControlNode.h
index 9f1c0931a..3d07467c1 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityControlNode.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityControlNode : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityControlNode(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityControlNode(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityControlNodeClasses.h b/genplugouts/HtmlDoc/UmlBaseActivityControlNodeClasses.h
index 84dd781f7..1ef579e8c 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityControlNodeClasses.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityControlNodeClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityControlNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode;
 class UmlItem;
@@ -31,7 +31,7 @@ class UmlBaseInitialActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseInitialActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -52,7 +52,7 @@ class UmlBaseFlowFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlowFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseFlowFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -73,7 +73,7 @@ class UmlBaseActivityFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseActivityFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -94,7 +94,7 @@ class UmlBaseDecisionActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDecisionActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseDecisionActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -115,7 +115,7 @@ class UmlBaseMergeActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseMergeActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseMergeActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -136,7 +136,7 @@ class UmlBaseForkActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseForkActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -157,7 +157,7 @@ class UmlBaseJoinActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseJoinActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityDiagram.h b/genplugouts/HtmlDoc/UmlBaseActivityDiagram.h
index 8ed6ca9d6..67d2ff8af 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseActivityDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseActivityDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityNode.h b/genplugouts/HtmlDoc/UmlBaseActivityNode.h
index 9018d75ce..54536ed90 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityNode.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityNode : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityNode(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityNode(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityObject.cpp b/genplugouts/HtmlDoc/UmlBaseActivityObject.cpp
index ce9da4399..f13b02630 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityObject.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseActivityObject.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityObject * UmlBaseActivityObject::create(UmlItem * parent, const char * s)
 {
@@ -28,7 +28,7 @@ bool UmlBaseActivityObject::set_Type(const UmlTypeSpec & v)
     return set_it_(_type, v, setTypeCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::multiplicity()
+const QByteArray & UmlBaseActivityObject::multiplicity()
 {
     read_if_needed_();
     return _multiplicity;
@@ -39,7 +39,7 @@ bool UmlBaseActivityObject::set_Multiplicity(const char * v)
     return set_it_(_multiplicity, v, setMultiplicityCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::inState()
+const QByteArray & UmlBaseActivityObject::inState()
 {
     read_if_needed_();
     return _in_state;
@@ -50,7 +50,7 @@ bool UmlBaseActivityObject::set_InState(const char * v)
     return set_it_(_in_state, v, setInStateCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::selection()
+const QByteArray & UmlBaseActivityObject::selection()
 {
     read_if_needed_();
     return _selection;
@@ -62,7 +62,7 @@ bool UmlBaseActivityObject::set_Selection(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityObject::cppSelection()
+const QByteArray & UmlBaseActivityObject::cppSelection()
 {
     read_if_needed_();
     return _cpp_selection;
@@ -75,7 +75,7 @@ bool UmlBaseActivityObject::set_CppSelection(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityObject::javaSelection()
+const QByteArray & UmlBaseActivityObject::javaSelection()
 {
     read_if_needed_();
     return _java_selection;
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityObject.h b/genplugouts/HtmlDoc/UmlBaseActivityObject.h
index 5c1938905..8b331ae01 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityObject.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityObject.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "anOrdering.h"
 
@@ -28,7 +28,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityObject(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityObject(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
@@ -42,7 +42,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Type(const UmlTypeSpec & v);
 
     // return the multiplicity
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // set the multiplicity
     //
@@ -50,7 +50,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Multiplicity(const char * v);
 
     // return the inState attribute
-    const Q3CString & inState();
+    const QByteArray & inState();
 
     // set the inState attribute
     //
@@ -58,7 +58,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_InState(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -67,7 +67,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -123,18 +123,18 @@ class UmlBaseActivityObject : public UmlActivityNode
 
     UmlTypeSpec _type;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _in_state;
+    QByteArray _in_state;
 
-    Q3CString _selection;
+    QByteArray _selection;
 
 #ifdef WITHCPP
-    Q3CString _cpp_selection;
+    QByteArray _cpp_selection;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_selection;
+    QByteArray _java_selection;
 #endif
 
     anOrdering _ordering : 8;
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityParameter.cpp b/genplugouts/HtmlDoc/UmlBaseActivityParameter.cpp
index 067b1ba5c..0e5dd560c 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityParameter.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseActivityParameter.cpp
@@ -4,7 +4,7 @@
 #include "UmlActivityParameter.h"
 #include "UmlActivity.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityParameter * UmlBaseActivityParameter::create(UmlActivity * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseActivityParameter::kind()
     return anActivityParameter;
 }
 
-const Q3CString & UmlBaseActivityParameter::defaultValue()
+const QByteArray & UmlBaseActivityParameter::defaultValue()
 {
     read_if_needed_();
     return _default_value;
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityParameter.h b/genplugouts/HtmlDoc/UmlBaseActivityParameter.h
index 1f05aabe8..fcdd9cecc 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityParameter.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityParameter.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter;
 class UmlActivity;
@@ -25,13 +25,13 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityParameter(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityParameter(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 
 public:
     // return the default value
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // set the default value
     //
@@ -48,7 +48,7 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 
 private:
-    Q3CString _default_value;
+    QByteArray _default_value;
 
 
 protected:
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityPartition.h b/genplugouts/HtmlDoc/UmlBaseActivityPartition.h
index 313c14414..97cef2c5b 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityPartition.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityPartition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPartition;
 class UmlActivityDiagram;
@@ -25,7 +25,7 @@ class UmlBaseActivityPartition : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPartition(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityPartition(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityPin.h b/genplugouts/HtmlDoc/UmlBaseActivityPin.h
index 52f5d4072..9ef909129 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityPin.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityPin.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin;
 class UmlActivityAction;
@@ -25,7 +25,7 @@ class UmlBaseActivityPin : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPin(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityPin(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseActivityRegion.h b/genplugouts/HtmlDoc/UmlBaseActivityRegion.h
index 95e516e75..cf3b637c1 100644
--- a/genplugouts/HtmlDoc/UmlBaseActivityRegion.h
+++ b/genplugouts/HtmlDoc/UmlBaseActivityRegion.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 
@@ -11,7 +11,7 @@ class UmlBaseActivityRegion : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseArtifact.cpp b/genplugouts/HtmlDoc/UmlBaseArtifact.cpp
index c0955445d..23b622f9b 100644
--- a/genplugouts/HtmlDoc/UmlBaseArtifact.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         // tests != to bypass Qt 2.3 bug
@@ -103,7 +104,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -117,8 +118,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -134,7 +136,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -143,8 +145,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
-
+                _associated[index] = _associated[last];
             _associated.resize(last);
         }
 
@@ -167,82 +168,82 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseArtifact::phpSource()
+const QByteArray & UmlBaseArtifact::phpSource()
 {
     read_if_needed_();
 
     return _php_src;
 }
 
-bool UmlBaseArtifact::set_PhpSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PhpSource(const QByteArray & s)
 {
     return set_it_(_php_src, s, setPhpSrcCmd);
 }
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseArtifact::pythonSource()
+const QByteArray & UmlBaseArtifact::pythonSource()
 {
     read_if_needed_();
 
     return _python_src;
 }
 
-bool UmlBaseArtifact::set_PythonSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PythonSource(const QByteArray & s)
 {
     return set_it_(_python_src, s, setPythonSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -283,13 +284,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/HtmlDoc/UmlBaseArtifact.h b/genplugouts/HtmlDoc/UmlBaseArtifact.h
index 3ec6b12d7..4f7d56e90 100644
--- a/genplugouts/HtmlDoc/UmlBaseArtifact.h
+++ b/genplugouts/HtmlDoc/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,60 +83,60 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPHP
     // returns the Php file definition
-    const Q3CString & phpSource();
+    const QByteArray & phpSource();
 
     // to set the Php file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpSource(const Q3CString & s);
+    bool set_PhpSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPYTHON
     // returns the Python file definition
-    const Q3CString & pythonSource();
+    const QByteArray & pythonSource();
 
     // to set the Python file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonSource(const Q3CString & s);
+    bool set_PythonSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -147,30 +147,30 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_src;
+    QByteArray _php_src;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_src;
+    QByteArray _python_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -200,12 +200,12 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
     friend class UmlBaseClass;
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/HtmlDoc/UmlBaseAttribute.cpp b/genplugouts/HtmlDoc/UmlBaseAttribute.cpp
index 5a9b4b549..ae721c8dd 100644
--- a/genplugouts/HtmlDoc/UmlBaseAttribute.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -98,7 +98,7 @@ bool UmlBaseAttribute::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -122,7 +122,7 @@ bool UmlBaseAttribute::set_Type(const UmlTypeSpec & t)
     return set_it_(_type, t, setTypeCmd);
 }
 
-const Q3CString & UmlBaseAttribute::multiplicity()
+const QByteArray & UmlBaseAttribute::multiplicity()
 {
     read_if_needed_();
 
@@ -215,7 +215,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseAttribute.h b/genplugouts/HtmlDoc/UmlBaseAttribute.h
index 1ceb8d9cc..8c73c3db1 100644
--- a/genplugouts/HtmlDoc/UmlBaseAttribute.h
+++ b/genplugouts/HtmlDoc/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -62,7 +62,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -78,7 +78,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_Type(const UmlTypeSpec & t);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -125,7 +125,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -163,9 +163,9 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient : 1;
 #endif
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -177,13 +177,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -213,7 +213,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/HtmlDoc/UmlBaseChoicePseudoState.h b/genplugouts/HtmlDoc/UmlBaseChoicePseudoState.h
index fb682dd91..8d15fc093 100644
--- a/genplugouts/HtmlDoc/UmlBaseChoicePseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseClass.cpp b/genplugouts/HtmlDoc/UmlBaseClass.cpp
index 835e1f897..8cdc6058c 100644
--- a/genplugouts/HtmlDoc/UmlBaseClass.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseClass.cpp
@@ -11,8 +11,8 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -65,11 +65,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -101,11 +101,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -150,17 +150,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -388,7 +388,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = classes[n];
@@ -403,7 +403,7 @@ UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
     return (UmlClass *) UmlBaseItem::read_();
 }
 
-UmlClass * UmlBaseClass::findStereotype(Q3CString s, bool caseSensitive)
+UmlClass * UmlBaseClass::findStereotype(QByteArray s, bool caseSensitive)
 {
     UmlCom::send_cmd(packageGlobalCmd, findStereotypeCmd,
                      (caseSensitive) ? "y" : "n", (const char *) s);
@@ -422,9 +422,9 @@ void UmlBaseClass::unload(bool rec, bool del)
 }
 
 //key includes package/class-container
-Q3Dict<UmlClass> UmlBaseClass::classes(1001);
+QHash<QByteArray,UmlClass*> UmlBaseClass::classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -432,7 +432,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     classes.insert(n, (UmlClass *) this);
 
     if ((classes.count() / 2) >= classes.size())
-        classes.resize(classes.size() * 2 - 1);
+        classes.reserve(classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
@@ -509,15 +509,15 @@ void UmlBaseClass::reread_if_needed_()
     }
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
diff --git a/genplugouts/HtmlDoc/UmlBaseClass.h b/genplugouts/HtmlDoc/UmlBaseClass.h
index c67fed638..baea3ae8b 100644
--- a/genplugouts/HtmlDoc/UmlBaseClass.h
+++ b/genplugouts/HtmlDoc/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+
+
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -62,7 +62,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -85,7 +85,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -108,7 +108,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -232,11 +232,11 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified, the class must
     //be defined in a sub-level of the package
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // Return the class supporting the stereotype corresponding to
     // the first parameter being 'profile_name:stereotype_name', or 0/null
-    static UmlClass * findStereotype(Q3CString s, bool caseSensitive);
+    static UmlClass * findStereotype(QByteArray s, bool caseSensitive);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -249,7 +249,7 @@ class UmlBaseClass : public UmlClassMember
 
 private:
     //key includes package/class-container
-    static Q3Dict<UmlClass> classes;
+    static QHash<QByteArray,UmlClass*> classes;
 
     bool _abstract;
 
@@ -298,7 +298,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     virtual void read_uml_();
 
@@ -331,7 +331,7 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     friend class UmlBaseArtifact;
     friend class UmlBaseRelation;
diff --git a/genplugouts/HtmlDoc/UmlBaseClassDiagram.h b/genplugouts/HtmlDoc/UmlBaseClassDiagram.h
index 441594365..9060d9aed 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseClassInstance.cpp b/genplugouts/HtmlDoc/UmlBaseClassInstance.cpp
index 09237f3fb..f4faf3790 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassInstance.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseClassInstance.cpp
@@ -7,7 +7,7 @@
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -46,7 +46,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
     else     return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -61,7 +61,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -76,16 +76,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QVector<UmlAttribute *> &result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -96,7 +96,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -106,7 +106,7 @@ bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance
 
 bool UmlBaseClassInstance::remove_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/genplugouts/HtmlDoc/UmlBaseClassInstance.h b/genplugouts/HtmlDoc/UmlBaseClassInstance.h
index 660cbb785..f67ad593c 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassInstance.h
+++ b/genplugouts/HtmlDoc/UmlBaseClassInstance.h
@@ -6,9 +6,9 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QList>
+
+
 
 class UmlClassInstance;
 class UmlClass;
@@ -40,17 +40,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QVector<UmlAttribute *> & result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result);
 
     // Remove the slot if the value is null.
     // Else set the value for the given attribute, replacing it
@@ -87,7 +87,7 @@ class UmlBaseClassInstance : public UmlItem
     virtual void read_uml_();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassInstance(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseClassInstance(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseClassInstanceReference.cpp b/genplugouts/HtmlDoc/UmlBaseClassInstanceReference.cpp
index 1223c08e8..c3c0d64a0 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassInstanceReference.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseClassInstanceReference.cpp
@@ -4,14 +4,14 @@
 #include "UmlClass.h"
 #include "UmlClassInstance.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlClass * UmlBaseClassInstanceReference::type() const
 {
     return (_instance) ? _instance->type() : _class;
 }
 
-const Q3CString & UmlBaseClassInstanceReference::name() const
+const QByteArray & UmlBaseClassInstanceReference::name() const
 {
     return (_instance) ? _instance->name() : _name;
 }
diff --git a/genplugouts/HtmlDoc/UmlBaseClassInstanceReference.h b/genplugouts/HtmlDoc/UmlBaseClassInstanceReference.h
index f21836362..be081ecd7 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassInstanceReference.h
+++ b/genplugouts/HtmlDoc/UmlBaseClassInstanceReference.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASECLASSINSTANCEREFERENCE_H
 #define _UMLBASECLASSINSTANCEREFERENCE_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 class UmlClass;
 class UmlClassInstance;
@@ -20,7 +20,7 @@ class UmlBaseClassInstanceReference
     }
 
     // return the name of the instance
-    const Q3CString & name() const;
+    const QByteArray & name() const;
 
 
 private:
@@ -28,7 +28,7 @@ class UmlBaseClassInstanceReference
 
     UmlClassInstance * _instance;
 
-    Q3CString _name;
+    QByteArray _name;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/HtmlDoc/UmlBaseClassItem.cpp b/genplugouts/HtmlDoc/UmlBaseClassItem.cpp
index fa856e466..3a02e784e 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassItem.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseClassItem::phpDecl()
+const QByteArray & UmlBaseClassItem::phpDecl()
 {
     read_if_needed_();
 
@@ -47,7 +47,7 @@ bool UmlBaseClassItem::set_PhpDecl(const char * s)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseClassItem::pythonDecl()
+const QByteArray & UmlBaseClassItem::pythonDecl()
 {
     read_if_needed_();
 
@@ -61,7 +61,7 @@ bool UmlBaseClassItem::set_PythonDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseClassItem.h b/genplugouts/HtmlDoc/UmlBaseClassItem.h
index 0fc63c6fe..881af70e4 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassItem.h
+++ b/genplugouts/HtmlDoc/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPHP
     //  return the Php defininition
 
-    const Q3CString & phpDecl();
+    const QByteArray & phpDecl();
 
     //  to set the Php definition
     //
@@ -45,7 +45,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPYTHON
     //  return the Python defininition
 
-    const Q3CString & pythonDecl();
+    const QByteArray & pythonDecl();
 
     //  to set the Python definition
     //
@@ -56,7 +56,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -69,28 +69,28 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_decl;
+    QByteArray _php_decl;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_decl;
+    QByteArray _python_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     virtual void read_cpp_();
diff --git a/genplugouts/HtmlDoc/UmlBaseClassMember.cpp b/genplugouts/HtmlDoc/UmlBaseClassMember.cpp
index 78b9c7447..db3f5cc04 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassMember.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseClassMember.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlBaseClassMember::isClassMember()
 {
     read_if_needed_();
@@ -69,7 +69,7 @@ bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
 #endif
 
 #ifdef WITHJAVA
-Q3CString UmlBaseClassMember::javaAnnotations()
+QByteArray UmlBaseClassMember::javaAnnotations()
 {
     read_if_needed_();
 
@@ -82,7 +82,7 @@ bool UmlBaseClassMember::set_JavaAnnotations(const char * v)
 }
 #endif
 
-const Q3CString & UmlBaseClassMember::constraint()
+const QByteArray & UmlBaseClassMember::constraint()
 {
     read_if_needed_();
     return _constraint;
diff --git a/genplugouts/HtmlDoc/UmlBaseClassMember.h b/genplugouts/HtmlDoc/UmlBaseClassMember.h
index 04dd84231..a39774c8d 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassMember.h
+++ b/genplugouts/HtmlDoc/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -56,7 +56,7 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 #ifdef WITHJAVA
     // returns the Java annotations
-    Q3CString javaAnnotations();
+    QByteArray javaAnnotations();
 
     // set the Java annotations
     //
@@ -65,7 +65,7 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
     // return the constraint
-    const Q3CString & constraint();
+    const QByteArray & constraint();
 
     // set the constraint
     //
@@ -84,14 +84,14 @@ class UmlBaseClassMember : public UmlClassItem
     aVisibility _cpp_visibility : 8;
 #endif
 #ifdef WITHJAVA
-    Q3CString _java_annotation;
+    QByteArray _java_annotation;
 #endif
 
-    Q3CString _constraint;
+    QByteArray _constraint;
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     void read_uml_();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseClassView.h b/genplugouts/HtmlDoc/UmlBaseClassView.h
index 3c9f9ad36..a35ddc04a 100644
--- a/genplugouts/HtmlDoc/UmlBaseClassView.h
+++ b/genplugouts/HtmlDoc/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassView;
 class UmlPackage;
@@ -42,7 +42,7 @@ class UmlBaseClassView : public UmlView
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseCollaborationDiagram.h b/genplugouts/HtmlDoc/UmlBaseCollaborationDiagram.h
index a11ffe947..c4046afe6 100644
--- a/genplugouts/HtmlDoc/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/HtmlDoc/UmlBaseCollaborationDiagramDefinition.cpp b/genplugouts/HtmlDoc/UmlBaseCollaborationDiagramDefinition.cpp
index 63b89f7b5..177cc8c00 100644
--- a/genplugouts/HtmlDoc/UmlBaseCollaborationDiagramDefinition.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseCollaborationDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseCollaborationDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -15,11 +15,11 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -31,7 +31,7 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         m->read_(instances);
     }
 
-    _messages.setAutoDelete(TRUE);
+    //_messages.setAutoDelete(TRUE);
 }
 
 UmlBaseCollaborationDiagramDefinition::~UmlBaseCollaborationDiagramDefinition()
diff --git a/genplugouts/HtmlDoc/UmlBaseCollaborationDiagramDefinition.h b/genplugouts/HtmlDoc/UmlBaseCollaborationDiagramDefinition.h
index 7053607ce..905cc6dc5 100644
--- a/genplugouts/HtmlDoc/UmlBaseCollaborationDiagramDefinition.h
+++ b/genplugouts/HtmlDoc/UmlBaseCollaborationDiagramDefinition.h
@@ -1,12 +1,12 @@
 #ifndef _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
 #define _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
-
+#include <QVector>
 
 // to avoid compiler warning
 #include "UmlCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlCollaborationMessage;
@@ -16,21 +16,21 @@ class UmlBaseCollaborationDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following their rank
-    const Q3PtrVector<UmlCollaborationMessage> & messages() const {
+    const QVector<UmlCollaborationMessage*> & messages() const {
         return _messages;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlCollaborationMessage> _messages;
+    QVector<UmlCollaborationMessage*> _messages;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/HtmlDoc/UmlBaseCollaborationMessage.cpp b/genplugouts/HtmlDoc/UmlBaseCollaborationMessage.cpp
index 8ea8e0890..12a94d5de 100644
--- a/genplugouts/HtmlDoc/UmlBaseCollaborationMessage.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseCollaborationMessage.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-void UmlBaseCollaborationMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseCollaborationMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     UmlBaseMessage::read_(instances);
     _rank = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/HtmlDoc/UmlBaseCollaborationMessage.h b/genplugouts/HtmlDoc/UmlBaseCollaborationMessage.h
index 276b0801e..a273c2714 100644
--- a/genplugouts/HtmlDoc/UmlBaseCollaborationMessage.h
+++ b/genplugouts/HtmlDoc/UmlBaseCollaborationMessage.h
@@ -2,8 +2,8 @@
 #define _UMLBASECOLLABORATIONMESSAGE_H
 
 
-#include <q3cstring.h>
-#include <q3ptrdict.h>
+
+
 #include "UmlMessage.h"
 
 class UmlClassInstanceReference;
@@ -18,7 +18,7 @@ class UmlBaseCollaborationMessage : public UmlMessage
     }
 
     // return the hierarchical rank of the message
-    const Q3CString & hrank() const {
+    const QByteArray & hrank() const {
         return _hrank;
     }
 
@@ -26,10 +26,10 @@ class UmlBaseCollaborationMessage : public UmlMessage
 private:
     int _rank;
 
-    Q3CString _hrank;
+    QByteArray _hrank;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseCollaborationDiagramDefinition;
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseComponent.cpp b/genplugouts/HtmlDoc/UmlBaseComponent.cpp
index 142a00357..36c41bc6b 100644
--- a/genplugouts/HtmlDoc/UmlBaseComponent.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseComponent.cpp
@@ -35,21 +35,21 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizingClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizingClasses()
 {
     read_if_needed_();
 
     return _realizing;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
@@ -68,18 +68,18 @@ void UmlBaseComponent::read_uml_()
     _realizing.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realizing.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realizing[index] =  (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/HtmlDoc/UmlBaseComponent.h b/genplugouts/HtmlDoc/UmlBaseComponent.h
index a8618a732..4231a43f4 100644
--- a/genplugouts/HtmlDoc/UmlBaseComponent.h
+++ b/genplugouts/HtmlDoc/UmlBaseComponent.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -36,34 +36,34 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realizing classes
-    const Q3PtrVector<UmlClass> & realizingClasses();
+    const QVector<UmlClass*> & realizingClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
 
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realizing;
+    QVector<UmlClass*> _realizing;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/HtmlDoc/UmlBaseComponentDiagram.h b/genplugouts/HtmlDoc/UmlBaseComponentDiagram.h
index 3bafc2f97..18b4a294a 100644
--- a/genplugouts/HtmlDoc/UmlBaseComponentDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseComponentView.h b/genplugouts/HtmlDoc/UmlBaseComponentView.h
index 167343b1d..4ea032201 100644
--- a/genplugouts/HtmlDoc/UmlBaseComponentView.h
+++ b/genplugouts/HtmlDoc/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseDeepHistoryPseudoState.h b/genplugouts/HtmlDoc/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..9224eb152 100644
--- a/genplugouts/HtmlDoc/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseDeployment.h b/genplugouts/HtmlDoc/UmlBaseDeployment.h
index b268e0c17..b16902170 100644
--- a/genplugouts/HtmlDoc/UmlBaseDeployment.h
+++ b/genplugouts/HtmlDoc/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseDeploymentDiagram.h b/genplugouts/HtmlDoc/UmlBaseDeploymentDiagram.h
index 7dab18bb5..25b5971a5 100644
--- a/genplugouts/HtmlDoc/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseDeploymentView.h b/genplugouts/HtmlDoc/UmlBaseDeploymentView.h
index 256b3455b..cdcfea604 100644
--- a/genplugouts/HtmlDoc/UmlBaseDeploymentView.h
+++ b/genplugouts/HtmlDoc/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseDiagram.cpp b/genplugouts/HtmlDoc/UmlBaseDiagram.cpp
index e1ceb269d..d0fb2d705 100644
--- a/genplugouts/HtmlDoc/UmlBaseDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/HtmlDoc/UmlBaseDiagram.h b/genplugouts/HtmlDoc/UmlBaseDiagram.h
index 9cf05ff22..19e34654b 100644
--- a/genplugouts/HtmlDoc/UmlBaseDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseEntryPointPseudoState.h b/genplugouts/HtmlDoc/UmlBaseEntryPointPseudoState.h
index d3b28921c..ab0bfec00 100644
--- a/genplugouts/HtmlDoc/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -34,7 +34,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseExitPointPseudoState.h b/genplugouts/HtmlDoc/UmlBaseExitPointPseudoState.h
index dfa60405d..3a28bde8a 100644
--- a/genplugouts/HtmlDoc/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -34,7 +34,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseExpansionNode.h b/genplugouts/HtmlDoc/UmlBaseExpansionNode.h
index 41bcbece2..6642afe1b 100644
--- a/genplugouts/HtmlDoc/UmlBaseExpansionNode.h
+++ b/genplugouts/HtmlDoc/UmlBaseExpansionNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityObject.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode;
 class UmlExpansionRegion;
@@ -25,7 +25,7 @@ class UmlBaseExpansionNode : public UmlActivityObject
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionNode(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBaseExpansionNode(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseExpansionRegion.h b/genplugouts/HtmlDoc/UmlBaseExpansionRegion.h
index 913b4ec4a..2ca1994ad 100644
--- a/genplugouts/HtmlDoc/UmlBaseExpansionRegion.h
+++ b/genplugouts/HtmlDoc/UmlBaseExpansionRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "anExpansionKind.h"
 
 class UmlExpansionRegion;
@@ -26,7 +26,7 @@ class UmlBaseExpansionRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseExpansionRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseExtraClassMember.cpp b/genplugouts/HtmlDoc/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/HtmlDoc/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseExtraClassMember.h b/genplugouts/HtmlDoc/UmlBaseExtraClassMember.h
index 39ac1d594..3381c264f 100644
--- a/genplugouts/HtmlDoc/UmlBaseExtraClassMember.h
+++ b/genplugouts/HtmlDoc/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     virtual void read_cpp_();
diff --git a/genplugouts/HtmlDoc/UmlBaseFinalState.h b/genplugouts/HtmlDoc/UmlBaseFinalState.h
index 16e0816cf..2fa133da6 100644
--- a/genplugouts/HtmlDoc/UmlBaseFinalState.h
+++ b/genplugouts/HtmlDoc/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseFlow.cpp b/genplugouts/HtmlDoc/UmlBaseFlow.cpp
index 5da07fbe8..b05e3eb62 100644
--- a/genplugouts/HtmlDoc/UmlBaseFlow.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseFlow.cpp
@@ -4,7 +4,7 @@
 #include "UmlFlow.h"
 #include "UmlActivityNode.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseFlow::kind()
 {
@@ -29,7 +29,7 @@ UmlActivityNode * UmlBaseFlow::target()
     return _target;
 }
 
-const Q3CString & UmlBaseFlow::weight()
+const QByteArray & UmlBaseFlow::weight()
 {
     read_if_needed_();
     return _uml.weight;
@@ -40,7 +40,7 @@ bool UmlBaseFlow::set_Weight(const char * v)
     return set_it_(_uml.weight, v, setUmlActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::guard()
+const QByteArray & UmlBaseFlow::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -51,7 +51,7 @@ bool UmlBaseFlow::set_Guard(const char * v)
     return set_it_(_uml.guard, v, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::selection()
+const QByteArray & UmlBaseFlow::selection()
 {
     read_if_needed_();
     return _uml.selection;
@@ -62,7 +62,7 @@ bool UmlBaseFlow::set_Selection(const char * v)
     return set_it_(_uml.selection, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::transformation()
+const QByteArray & UmlBaseFlow::transformation()
 {
     read_if_needed_();
     return _uml.transformation;
@@ -74,7 +74,7 @@ bool UmlBaseFlow::set_Transformation(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseFlow::cppWeight()
+const QByteArray & UmlBaseFlow::cppWeight()
 {
     read_if_needed_();
     return _cpp.weight;
@@ -85,7 +85,7 @@ bool UmlBaseFlow::set_CppWeight(const char * v)
     return set_it_(_cpp.weight, v, setCppActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppGuard()
+const QByteArray & UmlBaseFlow::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -96,7 +96,7 @@ bool UmlBaseFlow::set_CppGuard(const char * v)
     return set_it_(_cpp.guard, v, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppSelection()
+const QByteArray & UmlBaseFlow::cppSelection()
 {
     read_if_needed_();
     return _cpp.selection;
@@ -107,7 +107,7 @@ bool UmlBaseFlow::set_CppSelection(const char * v)
     return set_it_(_cpp.selection, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppTransformation()
+const QByteArray & UmlBaseFlow::cppTransformation()
 {
     read_if_needed_();
     return _cpp.transformation;
@@ -120,7 +120,7 @@ bool UmlBaseFlow::set_CppTransformation(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseFlow::javaWeight()
+const QByteArray & UmlBaseFlow::javaWeight()
 {
     read_if_needed_();
     return _java.weight;
@@ -131,7 +131,7 @@ bool UmlBaseFlow::set_JavaWeight(const char * v)
     return set_it_(_java.weight, v, setJavaActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaGuard()
+const QByteArray & UmlBaseFlow::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -142,7 +142,7 @@ bool UmlBaseFlow::set_JavaGuard(const char * v)
     return set_it_(_java.guard, v, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaSelection()
+const QByteArray & UmlBaseFlow::javaSelection()
 {
     read_if_needed_();
     return _java.selection;
@@ -153,7 +153,7 @@ bool UmlBaseFlow::set_JavaSelection(const char * v)
     return set_it_(_java.selection, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaTransformation()
+const QByteArray & UmlBaseFlow::javaTransformation()
 {
     read_if_needed_();
     return _java.transformation;
diff --git a/genplugouts/HtmlDoc/UmlBaseFlow.h b/genplugouts/HtmlDoc/UmlBaseFlow.h
index b50ce3323..4edb40caf 100644
--- a/genplugouts/HtmlDoc/UmlBaseFlow.h
+++ b/genplugouts/HtmlDoc/UmlBaseFlow.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "FlowBehavior.h"
 
 class UmlFlow;
@@ -27,7 +27,7 @@ class UmlBaseFlow : public UmlItem
     virtual UmlActivityNode * target();
 
     // return the weight in OCL
-    const Q3CString & weight();
+    const QByteArray & weight();
 
     // set the weight in OCL
     //
@@ -35,7 +35,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Weight(const char * v);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Guard(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Selection(const char * v);
 
     // return the transformation in OCL
-    const Q3CString & transformation();
+    const QByteArray & transformation();
 
     // set the transformation in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHCPP
     // return the weight in C++
-    const Q3CString & cppWeight();
+    const QByteArray & cppWeight();
 
     // set the weight in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppWeight(const char * v);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppGuard(const char * v);
 
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppSelection(const char * v);
 
     // return the transformation in C++
-    const Q3CString & cppTransformation();
+    const QByteArray & cppTransformation();
 
     // set the transformation in C++
     //
@@ -94,7 +94,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHJAVA
     // return the weight in Java
-    const Q3CString & javaWeight();
+    const QByteArray & javaWeight();
 
     // set the weight in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaWeight(const char * v);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -110,7 +110,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaGuard(const char * v);
 
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -118,7 +118,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaSelection(const char * v);
 
     // return the transformation in Java
-    const Q3CString & javaTransformation();
+    const QByteArray & javaTransformation();
 
     // set the transformation in Java
     //
@@ -161,7 +161,7 @@ class UmlBaseFlow : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlow(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseFlow(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseForkPseudoState.h b/genplugouts/HtmlDoc/UmlBaseForkPseudoState.h
index 009499bfa..9dfa5025c 100644
--- a/genplugouts/HtmlDoc/UmlBaseForkPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseFormalParameter.h b/genplugouts/HtmlDoc/UmlBaseFormalParameter.h
index c0cb721c9..7012fb47c 100644
--- a/genplugouts/HtmlDoc/UmlBaseFormalParameter.h
+++ b/genplugouts/HtmlDoc/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -34,10 +34,10 @@ class UmlBaseFormalParameter
     };
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/HtmlDoc/UmlBaseFragment.cpp b/genplugouts/HtmlDoc/UmlBaseFragment.cpp
index 730755358..44fdee6e6 100644
--- a/genplugouts/HtmlDoc/UmlBaseFragment.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseFragment.cpp
@@ -25,7 +25,7 @@ void UmlBaseFragment::read_()
         fc->read_(this, rank);
     }
 
-    _compartments.setAutoDelete(TRUE);
+    //_compartments.setAutoDelete(TRUE);
     _container = 0;
     _refer = (UmlDiagram *) UmlBaseItem::read_();
     _arguments = UmlCom::read_string();
@@ -38,7 +38,7 @@ int UmlBaseFragment::vcenter_(int rank) const
     return (t + _compartments[rank]->b()) / 2;
 }
 
-void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseFragment::read_covered_(QHash<void*,UmlClassInstanceReference*> & instances)
 {
     unsigned n = UmlCom::read_unsigned();
     unsigned rank;
@@ -46,10 +46,10 @@ void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & insta
     _covered.resize(n);
 
     for (rank = 0; rank != n; rank += 1)
-        _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]);
+        _covered.insert(rank, instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))]);
 }
 
-UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments)
+UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments)
 {
     UmlFragmentCompartment * r = 0;
     int nf = fragments.count();
@@ -82,7 +82,7 @@ UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, in
     return r;
 }
 
-void UmlBaseFragment::compute_container_(Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseFragment::compute_container_(QVector<UmlFragment*> & fragments)
 {
     int rank = fragments.count();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseFragment.h b/genplugouts/HtmlDoc/UmlBaseFragment.h
index 932913148..cca2d9e66 100644
--- a/genplugouts/HtmlDoc/UmlBaseFragment.h
+++ b/genplugouts/HtmlDoc/UmlBaseFragment.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASEFRAGMENT_H
 #define _UMLBASEFRAGMENT_H
+#include <QByteArray>
+#include <QHash>
+#include <QVector>
 
 
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3ptrdict.h>
 
 class UmlFragmentCompartment;
 class UmlDiagram;
@@ -16,12 +16,12 @@ class UmlBaseFragment
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the compartments, at least one compartment exists
-    const Q3PtrVector<UmlFragmentCompartment> & compartments() const {
+    const QVector<UmlFragmentCompartment*> & compartments() const {
         return _compartments;
     }
 
@@ -39,12 +39,12 @@ class UmlBaseFragment
 
     // return the form corresponding to the arguments
     // and return value of the interaction use
-    Q3CString arguments() const {
+    QByteArray arguments() const {
         return _arguments;
     }
 
     // return the the list of covered instances (life lines)
-    const Q3PtrVector<UmlClassInstanceReference> & covered() const {
+    const QVector<UmlClassInstanceReference*> & covered() const {
         return _covered;
     }
 
@@ -52,9 +52,9 @@ class UmlBaseFragment
 private:
     UmlFragmentCompartment * _container;
 
-    Q3PtrVector<UmlFragmentCompartment> _compartments;
+    QVector<UmlFragmentCompartment*> _compartments;
 
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -66,9 +66,9 @@ class UmlBaseFragment
 
     UmlDiagram * _refer;
 
-    Q3CString _arguments;
+    QByteArray _arguments;
 
-    Q3PtrVector<UmlClassInstanceReference> _covered;
+    QVector<UmlClassInstanceReference*> _covered;
 
     // internal, don't call it
     void read_();
@@ -81,15 +81,15 @@ class UmlBaseFragment
 
     //internal, do NOT use it
 
-    void read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_covered_(QHash<void*,UmlClassInstanceReference*> & instances);
 
     // internal
-    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments);
+    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments);
 
 
 private:
     // internal
-    static void compute_container_(Q3PtrVector<UmlFragment> & fragments);
+    static void compute_container_(QVector<UmlFragment*> & fragments);
 
 
 public:
diff --git a/genplugouts/HtmlDoc/UmlBaseFragmentCompartment.cpp b/genplugouts/HtmlDoc/UmlBaseFragmentCompartment.cpp
index 2ff876f6a..148f56823 100644
--- a/genplugouts/HtmlDoc/UmlBaseFragmentCompartment.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseFragmentCompartment.cpp
@@ -3,21 +3,23 @@
 #include "UmlBaseFragmentCompartment.h"
 #include "UmlBaseFragment.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlBaseFragmentCompartment::add_contained_(UmlFragment * x)
 {
-    _contained.resize(_contained.size() + 1);
-    _contained.insert(_contained.size() - 1, x);
+    //_contained.resize(_contained.size() + 1);
+    //_contained.insert(_contained.size() - 1, x);
+    _contained.append(x);
 }
 
-void UmlBaseFragmentCompartment::add_text_(Q3CString x)
+void UmlBaseFragmentCompartment::add_text_(QByteArray x)
 {
-    _texts.resize(_texts.size() + 1);
-    _texts.insert(_texts.size() - 1, strdup(x));
+    //_texts.resize(_texts.size() + 1);
+    //_texts.insert(_texts.size() - 1, strdup(x));
+    _texts.append(strdup(x));
 }
 
-void UmlBaseFragmentCompartment::add_cont_(Q3CString s, int cy)
+void UmlBaseFragmentCompartment::add_cont_(QByteArray s, int cy)
 {
     if (cy < _fragment->vcenter_(_rank))
         _start_continuation = s;
diff --git a/genplugouts/HtmlDoc/UmlBaseFragmentCompartment.h b/genplugouts/HtmlDoc/UmlBaseFragmentCompartment.h
index 8943ecf60..c293b252b 100644
--- a/genplugouts/HtmlDoc/UmlBaseFragmentCompartment.h
+++ b/genplugouts/HtmlDoc/UmlBaseFragmentCompartment.h
@@ -4,9 +4,9 @@
 
 // to avoid compiler warning
 #include "UmlFragment.h"
+#include <QVector>
+
 
-#include <q3ptrvector.h>
-#include <q3cstring.h>
 
 class UmlFragment;
 class UmlBaseFragment;
@@ -27,23 +27,23 @@ class UmlBaseFragmentCompartment
     }
 
     // the texts placed in the compartment
-    const Q3PtrVector<char> & texts() const {
+    const QVector<char*> & texts() const {
         return _texts;
     }
 
     // return the fragments contained in the compartment,
     // may be none
-    const Q3PtrVector<UmlFragment> & contained() const {
+    const QVector<UmlFragment*> & contained() const {
         return _contained;
     }
 
     // return the continuation ('label' case), or an empty string/null
-    Q3CString startContinuation() const {
+    QByteArray startContinuation() const {
         return _start_continuation;
     }
 
     // return the continuation ('goto' case), or an empty string/null
-    Q3CString endContinuation() const {
+    QByteArray endContinuation() const {
         return _end_continuation;
     }
 
@@ -51,27 +51,27 @@ class UmlBaseFragmentCompartment
 private:
     UmlFragment * _fragment;
 
-    Q3PtrVector<UmlFragment> _contained;
+    QVector<UmlFragment*> _contained;
 
     int _rank;
 
-    Q3PtrVector<char> _texts;
+    QVector<char*> _texts;
 
     int _y;
 
-    Q3CString _start_continuation;
+    QByteArray _start_continuation;
 
-    Q3CString _end_continuation;
+    QByteArray _end_continuation;
 
 
 public:
     void add_contained_(UmlFragment * x);
 
-    void add_text_(Q3CString x);
+    void add_text_(QByteArray x);
 
     //internal, do NOT use it
 
-    void add_cont_(Q3CString s, int cy);
+    void add_cont_(QByteArray s, int cy);
 
     int b() const {
         return _y;
diff --git a/genplugouts/HtmlDoc/UmlBaseInitialPseudoState.h b/genplugouts/HtmlDoc/UmlBaseInitialPseudoState.h
index 88dae1cc6..2f31e4340 100644
--- a/genplugouts/HtmlDoc/UmlBaseInitialPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseInterruptibleActivityRegion.h b/genplugouts/HtmlDoc/UmlBaseInterruptibleActivityRegion.h
index 70f988488..de6e56aed 100644
--- a/genplugouts/HtmlDoc/UmlBaseInterruptibleActivityRegion.h
+++ b/genplugouts/HtmlDoc/UmlBaseInterruptibleActivityRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInterruptibleActivityRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseItem.cpp b/genplugouts/HtmlDoc/UmlBaseItem.cpp
index f0194131a..6a0c92f00 100644
--- a/genplugouts/HtmlDoc/UmlBaseItem.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseItem.cpp
@@ -58,7 +58,7 @@
 #include "UmlActivityPartition.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 int UmlBaseItem::getIdentifier()
 {
@@ -67,7 +67,7 @@ int UmlBaseItem::getIdentifier()
     return _modeler_id;
 }
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     UmlCom::send_cmd(_identifier, setNameCmd, (const char *)s); //[rageek] Fix prototype
 
@@ -79,14 +79,14 @@ bool UmlBaseItem::set_Name(const Q3CString & s)
         return FALSE;
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
@@ -101,14 +101,14 @@ bool UmlBaseItem::applyStereotype()
     return TRUE;
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -124,7 +124,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -144,11 +144,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -158,7 +158,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -166,10 +166,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -180,7 +180,7 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -199,7 +199,7 @@ bool UmlBaseItem::moveAfter(const UmlItem * x)
         return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -211,7 +211,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
     return (int) UmlCom::read_unsigned();
@@ -228,11 +228,11 @@ bool UmlBaseItem::set_isMarked(bool v)
     return set_it_(_marked, v, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -247,7 +247,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -276,17 +276,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -345,6 +345,13 @@ void UmlBaseItem::read_if_needed_()
 
 UmlItem * UmlBaseItem::create_(anItemKind k, const char * s)
 {
+    //habip read all data if there is
+    QByteArray garbageData = UmlCom::read_all();
+    if(!garbageData.isEmpty())
+    {
+        int garbageCount = garbageData.count();
+        printf("!!!!garbage data:%d\r\n",garbageCount);
+    }
     UmlCom::send_cmd(_identifier, createCmd, k, s);
 
     UmlItem * result = UmlBaseItem::read_();
@@ -370,9 +377,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -414,7 +421,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -468,7 +475,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -505,7 +512,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -769,20 +776,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye(-1);
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/HtmlDoc/UmlBaseItem.h b/genplugouts/HtmlDoc/UmlBaseItem.h
index 1ebd335c8..9f2c3ec43 100644
--- a/genplugouts/HtmlDoc/UmlBaseItem.h
+++ b/genplugouts/HtmlDoc/UmlBaseItem.h
@@ -1,15 +1,16 @@
 #ifndef _UMLBASEITEM_H
 #define _UMLBASEITEM_H
-
+#include <QByteArray>
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+
+
+
+
 //#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
+#include <QHash>
 
 class UmlItem;
 class UmlTypeSpec;
@@ -44,21 +45,21 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // If the current stereotype is part of a profile add needed properties.
     // In all cases remove extra properties whose keys contain two ':'.
@@ -67,18 +68,18 @@ class UmlBaseItem
     bool applyStereotype();
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -103,16 +104,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -147,7 +148,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -155,7 +156,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     // return TRUE in case the item is marked
     bool isMarked();
@@ -169,7 +170,7 @@ class UmlBaseItem
     //  The result may contains UmlAttribute, UmlRelations, UmlNcRelations,
     //  UmlOperation (their bodies are not taken into account) , UmlClass
     //  and UmlComponents.
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -188,7 +189,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
 
 private:
@@ -204,21 +205,23 @@ class UmlBaseItem
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
+
+        QHash<QByteArray, QByteArray*> _dict;
+
 
-    Q3Dict<Q3CString> _dict;
+        static QHash<void*,UmlItem*> _all;
 
-    static Q3PtrDict<UmlItem> _all;
 
 
 protected:
@@ -260,7 +263,7 @@ class UmlBaseItem
 
     bool set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd);
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     bool set_it_(UmlTypeSpec & r, const UmlTypeSpec & t, OnInstanceCmd cmd);
 
@@ -269,7 +272,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/HtmlDoc/UmlBaseJoinPseudoState.h b/genplugouts/HtmlDoc/UmlBaseJoinPseudoState.h
index 31976dfff..c95cfff9c 100644
--- a/genplugouts/HtmlDoc/UmlBaseJoinPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseJunctionPseudoState.h b/genplugouts/HtmlDoc/UmlBaseJunctionPseudoState.h
index 9b76d88e7..96cdfe959 100644
--- a/genplugouts/HtmlDoc/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseMessage.cpp b/genplugouts/HtmlDoc/UmlBaseMessage.cpp
index 77851f8dd..2d220aa8e 100644
--- a/genplugouts/HtmlDoc/UmlBaseMessage.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseMessage.cpp
@@ -4,13 +4,13 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlOperation.h"
 
-void UmlBaseMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     _operation = (UmlOperation *) UmlBaseItem::read_();
 
     if (_operation == 0) _form = UmlCom::read_string();
 
-    _from = instances[(void *) UmlCom::read_unsigned()];
-    _to = instances[(void *) UmlCom::read_unsigned()];
+    _from = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
+    _to = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
 }
 
diff --git a/genplugouts/HtmlDoc/UmlBaseMessage.h b/genplugouts/HtmlDoc/UmlBaseMessage.h
index 81fc500c8..216f87762 100644
--- a/genplugouts/HtmlDoc/UmlBaseMessage.h
+++ b/genplugouts/HtmlDoc/UmlBaseMessage.h
@@ -1,9 +1,10 @@
 #ifndef _UMLBASEMESSAGE_H
 #define _UMLBASEMESSAGE_H
+#include <QByteArray>
+#include <QHash>
+
 
 
-#include <q3cstring.h>
-#include <q3ptrdict.h>
 
 class UmlClassInstanceReference;
 class UmlOperation;
@@ -30,7 +31,7 @@ class UmlBaseMessage
 
     // return message as a string, may be empty/null,
     // exclusive with operation()
-    const Q3CString & form() const {
+    const QByteArray & form() const {
         return _form;
     }
 
@@ -42,10 +43,10 @@ class UmlBaseMessage
 
     UmlOperation * _operation;
 
-    Q3CString _form;
+    QByteArray _form;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseSequenceMessage;
     friend class UmlBaseCollaborationMessage;
diff --git a/genplugouts/HtmlDoc/UmlBaseNcRelation.h b/genplugouts/HtmlDoc/UmlBaseNcRelation.h
index 8aa58975e..f181b53b9 100644
--- a/genplugouts/HtmlDoc/UmlBaseNcRelation.h
+++ b/genplugouts/HtmlDoc/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNcRelation;
 
@@ -41,11 +41,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/HtmlDoc/UmlBaseNode.h b/genplugouts/HtmlDoc/UmlBaseNode.h
index 5e62daff2..62675cacc 100644
--- a/genplugouts/HtmlDoc/UmlBaseNode.h
+++ b/genplugouts/HtmlDoc/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     virtual void read_uml_();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseObjectDiagram.h b/genplugouts/HtmlDoc/UmlBaseObjectDiagram.h
index dfe6983ef..720256a2d 100644
--- a/genplugouts/HtmlDoc/UmlBaseObjectDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseObjectDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlObjectDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseObjectDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseObjectDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseObjectDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseOnSignalAction.cpp b/genplugouts/HtmlDoc/UmlBaseOnSignalAction.cpp
index 8c887e113..aec5db337 100644
--- a/genplugouts/HtmlDoc/UmlBaseOnSignalAction.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseOnSignalAction.cpp
@@ -2,9 +2,9 @@
 #include "UmlCom.h"
 #include "UmlBaseOnSignalAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseOnSignalAction::signal()
+const QByteArray & UmlBaseOnSignalAction::signal()
 {
     read_if_needed_();
     return _signal;
@@ -16,7 +16,7 @@ bool UmlBaseOnSignalAction::set_Signal(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOnSignalAction::cppSignal()
+const QByteArray & UmlBaseOnSignalAction::cppSignal()
 {
     read_if_needed_();
     return _cpp_signal;
@@ -29,7 +29,7 @@ bool UmlBaseOnSignalAction::set_CppSignal(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOnSignalAction::javaSignal()
+const QByteArray & UmlBaseOnSignalAction::javaSignal()
 {
     read_if_needed_();
     return _java_signal;
diff --git a/genplugouts/HtmlDoc/UmlBaseOnSignalAction.h b/genplugouts/HtmlDoc/UmlBaseOnSignalAction.h
index 6ad499b79..0d648e38c 100644
--- a/genplugouts/HtmlDoc/UmlBaseOnSignalAction.h
+++ b/genplugouts/HtmlDoc/UmlBaseOnSignalAction.h
@@ -3,19 +3,19 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlBaseOnSignalAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOnSignalAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOnSignalAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the signal
-    const Q3CString & signal();
+    const QByteArray & signal();
 
     // set the signal
     //
@@ -24,7 +24,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the signal in C++
-    const Q3CString & cppSignal();
+    const QByteArray & cppSignal();
 
     // set the signal in C++
     //
@@ -34,7 +34,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the signal in Java
-    const Q3CString & javaSignal();
+    const QByteArray & javaSignal();
 
     // set the signal in Java
     //
@@ -52,14 +52,14 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 
 private:
-    Q3CString _signal;
+    QByteArray _signal;
 
 #ifdef WITHCPP
-    Q3CString _cpp_signal;
+    QByteArray _cpp_signal;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_signal;
+    QByteArray _java_signal;
 #endif
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseOperation.cpp b/genplugouts/HtmlDoc/UmlBaseOperation.cpp
index 2d6c3e528..3baf8a49d 100644
--- a/genplugouts/HtmlDoc/UmlBaseOperation.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseOperation.cpp
@@ -8,8 +8,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -73,7 +73,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -87,7 +87,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -101,7 +101,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -124,7 +124,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -137,7 +137,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -151,7 +151,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -173,9 +173,9 @@ bool UmlBaseOperation::replaceException(unsigned rank, const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseOperation::methods() const
+const QVector<UmlItem*> UmlBaseOperation::methods() const
 {
-    Q3PtrVector<UmlItem> l;
+    QVector<UmlItem*> l;
 
     UmlCom::send_cmd(_identifier, sideCmd);
     UmlCom::read_item_list(l);
@@ -273,7 +273,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -285,7 +285,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -299,7 +299,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -391,7 +391,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -401,7 +401,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -415,7 +415,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -488,7 +488,7 @@ bool UmlBaseOperation::set_isPhpFinal(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::phpDef()
+const QByteArray & UmlBaseOperation::phpDef()
 {
     return phpDecl();
 }
@@ -498,7 +498,7 @@ bool UmlBaseOperation::set_PhpDef(const char * s)
     return set_PhpDecl(s);
 }
 
-Q3CString UmlBaseOperation::phpBody()
+QByteArray UmlBaseOperation::phpBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, phpBodyCmd);
@@ -512,7 +512,7 @@ bool UmlBaseOperation::set_PhpBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::phpNameSpec()
+const QByteArray & UmlBaseOperation::phpNameSpec()
 {
     read_if_needed_();
 
@@ -566,7 +566,7 @@ bool UmlBaseOperation::set_PhpContextualBodyIndent(bool v)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDef()
+const QByteArray & UmlBaseOperation::pythonDef()
 {
     return pythonDecl();
 }
@@ -576,7 +576,7 @@ bool UmlBaseOperation::set_PythonDef(const char * s)
     return set_PythonDecl(s);
 }
 
-Q3CString UmlBaseOperation::pythonBody()
+QByteArray UmlBaseOperation::pythonBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, pythonBodyCmd);
@@ -590,7 +590,7 @@ bool UmlBaseOperation::set_PythonBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::pythonNameSpec()
+const QByteArray & UmlBaseOperation::pythonNameSpec()
 {
     read_if_needed_();
 
@@ -644,7 +644,7 @@ bool UmlBaseOperation::set_PythonContextualBodyIndent(bool v)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDecorators()
+const QByteArray & UmlBaseOperation::pythonDecorators()
 {
     read_if_needed_();
     return _python_decorators;
@@ -676,7 +676,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseOperation.h b/genplugouts/HtmlDoc/UmlBaseOperation.h
index d67476f14..bb23afd5b 100644
--- a/genplugouts/HtmlDoc/UmlBaseOperation.h
+++ b/genplugouts/HtmlDoc/UmlBaseOperation.h
@@ -5,9 +5,9 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QList>
+
+
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -54,7 +54,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -72,7 +72,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -90,7 +90,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceException(unsigned rank, const UmlTypeSpec & t);
 
     // return the behaviors (state and activities) implementing the operation
-    const Q3PtrVector<UmlItem> methods() const;
+    const QVector<UmlItem*> methods() const;
 
     // in case the operation is a 'get' operation, returns the associated
     // attribute or relation
@@ -135,7 +135,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -144,9 +144,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -156,7 +156,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -204,7 +204,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -213,9 +213,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -225,7 +225,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -265,7 +265,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Php, notes that it is
     // already made by the inherited PhpDecl operation
-    const Q3CString & phpDef();
+    const QByteArray & phpDef();
 
     // sets the operation's definition in Php, notes that it is
     // already made by the inherited set_PhpDecl operation
@@ -274,9 +274,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PhpDef(const char * s);
 
     // returns the operation's body in Php++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString phpBody();
+    QByteArray phpBody();
 
     // sets the operation's body in Php, useless if the def does not
     // contains ${body}
@@ -286,7 +286,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
-    const Q3CString & phpNameSpec();
+    const QByteArray & phpNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
@@ -318,7 +318,7 @@ class UmlBaseOperation : public UmlClassMember
 #ifdef WITHPYTHON
     // returns the operation's definition in Python, notes that it is
     // already made by the inherited PythonDecl operation
-    const Q3CString & pythonDef();
+    const QByteArray & pythonDef();
 
     // sets the operation's definition in Python, notes that it is
     // already made by the inherited set_PythonDecl operation
@@ -327,9 +327,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PythonDef(const char * s);
 
     // returns the operation's body in Python++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString pythonBody();
+    QByteArray pythonBody();
 
     // sets the operation's body in Python, useless if the def does not
     // contains ${body}
@@ -339,7 +339,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
-    const Q3CString & pythonNameSpec();
+    const QByteArray & pythonNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
@@ -370,7 +370,7 @@ class UmlBaseOperation : public UmlClassMember
 
 #ifdef WITHPYTHON
     // return the  decorators
-    const Q3CString & pythonDecorators();
+    const QByteArray & pythonDecorators();
 
     // set the  decorators
     //
@@ -389,7 +389,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -483,32 +483,32 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_name_spec;
+    QByteArray _php_name_spec;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_name_spec;
+    QByteArray _python_name_spec;
 
-    Q3CString _python_decorators;
+    QByteArray _python_decorators;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -520,7 +520,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     virtual void read_uml_();
 
@@ -548,7 +548,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/HtmlDoc/UmlBasePackage.cpp b/genplugouts/HtmlDoc/UmlBasePackage.cpp
index 8d3fe4db4..b5f5aab87 100644
--- a/genplugouts/HtmlDoc/UmlBasePackage.cpp
+++ b/genplugouts/HtmlDoc/UmlBasePackage.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -37,7 +37,7 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlDiagram * d)
         return FALSE;
 }
 
-UmlPackage * UmlBasePackage::importProject(const Q3CString & fn)
+UmlPackage * UmlBasePackage::importProject(const QByteArray & fn)
 {
     UmlCom::send_cmd(_identifier, importProjectCmd, (const char *)fn); //[rageek] Fix prototype
 
@@ -45,43 +45,43 @@ UmlPackage * UmlBasePackage::importProject(const Q3CString & fn)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::findCppNamespace(const QByteArray & n, const UmlBasePackage * p)
 {
     UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, (p) ? p->_identifier : 0, n);
 
@@ -90,31 +90,31 @@ UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n, const UmlBase
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::findJavaPackage(const QByteArray & n, const UmlBasePackage * p)
 {
     UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, (p) ? p->_identifier : 0, n);
 
@@ -123,30 +123,30 @@ UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n, const UmlBaseP
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBasePackage::phpDir()
+const QByteArray & UmlBasePackage::phpDir()
 {
     read_if_needed_();
 
     return _php_dir;
 }
 
-bool UmlBasePackage::set_PhpDir(const Q3CString & s)
+bool UmlBasePackage::set_PhpDir(const QByteArray & s)
 {
     return set_it_(_php_dir, s, setPhpDirCmd);
 }
-const Q3CString & UmlBasePackage::phpNamespace()
+const QByteArray & UmlBasePackage::phpNamespace()
 {
     read_if_needed_();
 
     return _php_namespace;
 }
 
-bool UmlBasePackage::set_PhpNamespace(const Q3CString & v)
+bool UmlBasePackage::set_PhpNamespace(const QByteArray & v)
 {
     return set_it_(_php_namespace, v, setPhpNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findPhpNamespace(const Q3CString & n)
+UmlPackage * UmlBasePackage::findPhpNamespace(const QByteArray & n)
 {
     UmlCom::send_cmd(packageGlobalCmd, findPhpNamespaceCmd, _identifier, n);
 
@@ -155,31 +155,31 @@ UmlPackage * UmlBasePackage::findPhpNamespace(const Q3CString & n)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBasePackage::pythonDir()
+const QByteArray & UmlBasePackage::pythonDir()
 {
     read_if_needed_();
 
     return _python_dir;
 }
 
-bool UmlBasePackage::set_PythonDir(const Q3CString & s)
+bool UmlBasePackage::set_PythonDir(const QByteArray & s)
 {
     return set_it_(_python_dir, s, setPythonDirCmd);
 }
 
-Q3CString UmlBasePackage::pythonPackage()
+QByteArray UmlBasePackage::pythonPackage()
 {
     read_if_needed_();
 
     return _python_package;
 }
 
-bool UmlBasePackage::set_PythonPackage(const Q3CString & s)
+bool UmlBasePackage::set_PythonPackage(const QByteArray & s)
 {
     return set_it_(_python_package, s, setPythonPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::findPythonPackage(const QByteArray & n, const UmlBasePackage * p)
 {
     UmlCom::send_cmd(packageGlobalCmd, findPythonPackageCmd, (p) ? p->_identifier : 0, n);
 
@@ -188,31 +188,31 @@ UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n, const UmlBas
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findIdlModule(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::findIdlModule(const QByteArray & n, const UmlBasePackage * p)
 {
     UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, (p) ? p->_identifier : 0, n);
 
@@ -239,7 +239,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/HtmlDoc/UmlBasePackage.h b/genplugouts/HtmlDoc/UmlBasePackage.h
index 2a1e8940a..fb177fe7c 100644
--- a/genplugouts/HtmlDoc/UmlBasePackage.h
+++ b/genplugouts/HtmlDoc/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlPackage;
 class UmlDiagram;
@@ -36,143 +36,143 @@ class UmlBasePackage : public UmlItem
     // or an empty string (the project will be set through a dialog)
     // Return the new UmlPackage containing the imported project, or
     // 0/null on error
-    UmlPackage * importProject(const Q3CString & fn);
+    UmlPackage * importProject(const QByteArray & fn);
 
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns the sub package of 'p' package having the c++ namespace 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * findCppNamespace(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * findCppNamespace(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns the sub package of 'p' package having the java package 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * findJavaPackage(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * findJavaPackage(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHPHP
     // returns the path where the PHP files are generated by the
     // PHP generator.
-    const Q3CString & phpDir();
+    const QByteArray & phpDir();
 
     // to set the path where the PHP files are generated by the
     // PHP generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpDir(const Q3CString & s);
+    bool set_PhpDir(const QByteArray & s);
     // return the namespace name associed to the package
 
-    const Q3CString & phpNamespace();
+    const QByteArray & phpNamespace();
 
     // the namespace name associed to the package.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpNamespace(const Q3CString & v);
+    bool set_PhpNamespace(const QByteArray & v);
 
     // returns a sub package of the current one having the php namespace 'n'
     // (including the current one), else 0/null
 
-    UmlPackage * findPhpNamespace(const Q3CString & n);
+    UmlPackage * findPhpNamespace(const QByteArray & n);
 #endif
 
 #ifdef WITHPYTHON
     // returns the path where the PYTHON files are generated by the
     // PYTHON generator.
-    const Q3CString & pythonDir();
+    const QByteArray & pythonDir();
 
     // to set the path where the PYTHON files are generated by the
     // PYTHON generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonDir(const Q3CString & s);
+    bool set_PythonDir(const QByteArray & s);
 
     //returns the python package name associed to the package
-    Q3CString pythonPackage();
+    QByteArray pythonPackage();
 
     // to set the python package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonPackage(const Q3CString & s);
+    bool set_PythonPackage(const QByteArray & s);
 
     // returns the sub package of 'p' package having the python package 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * findPythonPackage(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * findPythonPackage(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns the sub package of 'p' package having the IDL module 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * findIdlModule(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * findIdlModule(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
     //  Returns the project
@@ -184,12 +184,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // Force consistency concerning the profiles and their stereotypes
 
@@ -208,36 +208,36 @@ class UmlBasePackage : public UmlItem
     UmlDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHPHP
-    Q3CString _php_dir;
-    Q3CString _php_namespace;
+    QByteArray _php_dir;
+    QByteArray _php_namespace;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_dir;
+    QByteArray _python_dir;
 
-    Q3CString _python_package;
+    QByteArray _python_package;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -268,11 +268,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/HtmlDoc/UmlBaseParameter.h b/genplugouts/HtmlDoc/UmlBaseParameter.h
index 71202a64d..0fdea9d7f 100644
--- a/genplugouts/HtmlDoc/UmlBaseParameter.h
+++ b/genplugouts/HtmlDoc/UmlBaseParameter.h
@@ -2,16 +2,16 @@
 #define _UMLBASEPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "aDirection.h"
 
 //  Represent an operation's parameter
 
 struct UmlBaseParameter {
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
     UmlTypeSpec type;
 
diff --git a/genplugouts/HtmlDoc/UmlBaseParameterSet.cpp b/genplugouts/HtmlDoc/UmlBaseParameterSet.cpp
index a2e4a1756..7eb8a3931 100644
--- a/genplugouts/HtmlDoc/UmlBaseParameterSet.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         // tests != to bypass Qt 2.3 bug
@@ -44,6 +44,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/HtmlDoc/UmlBaseParameterSet.h b/genplugouts/HtmlDoc/UmlBaseParameterSet.h
index 71e77cbfe..37c507a5b 100644
--- a/genplugouts/HtmlDoc/UmlBaseParameterSet.h
+++ b/genplugouts/HtmlDoc/UmlBaseParameterSet.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASEPARAMETERSET_H
 #define _UMLBASEPARAMETERSET_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
+
+
 
 class UmlActivityParameter;
 class UmlActivityAction;
@@ -27,16 +27,16 @@ class UmlBaseParameterSet : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseParameterSet(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseParameterSet(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +48,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/HtmlDoc/UmlBasePinParameter.h b/genplugouts/HtmlDoc/UmlBasePinParameter.h
index d629b7122..6b3d683a4 100644
--- a/genplugouts/HtmlDoc/UmlBasePinParameter.h
+++ b/genplugouts/HtmlDoc/UmlBasePinParameter.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityObject.h"
-#include <q3cstring.h>
+
 #include "aDirection.h"
 #include "aParameterEffectKind.h"
 
@@ -11,7 +11,7 @@ class UmlBasePinParameter : public UmlActivityObject
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePinParameter(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBasePinParameter(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseRegion.h b/genplugouts/HtmlDoc/UmlBaseRegion.h
index 58a9f8b78..efd32acb9 100644
--- a/genplugouts/HtmlDoc/UmlBaseRegion.h
+++ b/genplugouts/HtmlDoc/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseRelation.cpp b/genplugouts/HtmlDoc/UmlBaseRelation.cpp
index 3c141d439..860b61402 100644
--- a/genplugouts/HtmlDoc/UmlBaseRelation.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -139,7 +139,7 @@ bool UmlBaseRelation::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -151,7 +151,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -193,7 +193,7 @@ bool UmlBaseRelation::set_Association(const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -205,7 +205,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -337,7 +337,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseRelation.h b/genplugouts/HtmlDoc/UmlBaseRelation.h
index 883f84535..9590b02c0 100644
--- a/genplugouts/HtmlDoc/UmlBaseRelation.h
+++ b/genplugouts/HtmlDoc/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlRelation;
@@ -71,7 +71,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -83,7 +83,7 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
@@ -97,7 +97,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_Association(const UmlTypeSpec & t);
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -105,7 +105,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -168,7 +168,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -215,13 +215,13 @@ class UmlBaseRelation : public UmlClassMember
     bool _idl_truncatable : 1;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlTypeSpec _association;
 
@@ -233,7 +233,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -263,11 +263,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/HtmlDoc/UmlBaseSequenceDiagram.h b/genplugouts/HtmlDoc/UmlBaseSequenceDiagram.h
index bca798470..dfa760b18 100644
--- a/genplugouts/HtmlDoc/UmlBaseSequenceDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/HtmlDoc/UmlBaseSequenceDiagramDefinition.cpp b/genplugouts/HtmlDoc/UmlBaseSequenceDiagramDefinition.cpp
index eb3b1751b..72ba71021 100644
--- a/genplugouts/HtmlDoc/UmlBaseSequenceDiagramDefinition.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseSequenceDiagramDefinition.cpp
@@ -2,7 +2,7 @@
 #include "UmlCom.h"
 #include "UmlBaseSequenceDiagramDefinition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 static void qsort(UmlSequenceMessage ** v, int low, int high)
 {
@@ -40,7 +40,7 @@ static void qsort(UmlSequenceMessage ** v, int low, int high)
 }
 void UmlBaseSequenceDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -54,7 +54,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -64,11 +64,11 @@ void UmlBaseSequenceDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+   // _instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -82,7 +82,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         }
 
         ::qsort(_messages.data(), 0, n - 1);
-        _messages.setAutoDelete(TRUE);
+       // _messages.setAutoDelete(TRUE);
     }
 
     n = _fragments.count();
@@ -92,7 +92,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
 
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
@@ -103,7 +103,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
     }
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/HtmlDoc/UmlBaseSequenceDiagramDefinition.h b/genplugouts/HtmlDoc/UmlBaseSequenceDiagramDefinition.h
index 6be419e66..f80c8b3f6 100644
--- a/genplugouts/HtmlDoc/UmlBaseSequenceDiagramDefinition.h
+++ b/genplugouts/HtmlDoc/UmlBaseSequenceDiagramDefinition.h
@@ -8,7 +8,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlSequenceMessage.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlSequenceMessage;
@@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following the sending time
-    const Q3PtrVector<UmlSequenceMessage> & messages() const {
+    const QVector<UmlSequenceMessage*> & messages() const {
         return _messages;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlSequenceMessage> _messages;
+    QVector<UmlSequenceMessage*> _messages;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/HtmlDoc/UmlBaseSequenceMessage.cpp b/genplugouts/HtmlDoc/UmlBaseSequenceMessage.cpp
index 1dd8efeae..4e3878bce 100644
--- a/genplugouts/HtmlDoc/UmlBaseSequenceMessage.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseSequenceMessage.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlFragment.h"
 
-void UmlBaseSequenceMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseSequenceMessage::read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments)
 {
     UmlBaseMessage::read_(instances);
     _kind = (aMessageKind) UmlCom::read_char();
diff --git a/genplugouts/HtmlDoc/UmlBaseSequenceMessage.h b/genplugouts/HtmlDoc/UmlBaseSequenceMessage.h
index caeb43f15..ad8461e90 100644
--- a/genplugouts/HtmlDoc/UmlBaseSequenceMessage.h
+++ b/genplugouts/HtmlDoc/UmlBaseSequenceMessage.h
@@ -3,9 +3,9 @@
 
 
 #include "aMessageKind.h"
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-#include <q3ptrvector.h>
+
+
+
 #include "UmlMessage.h"
 
 class UmlFragmentCompartment;
@@ -22,7 +22,7 @@ class UmlBaseSequenceMessage : public UmlMessage
     }
 
     // return the stereotype of the message
-    Q3CString stereotype() const {
+    QByteArray stereotype() const {
         return _stereotype;
     }
 
@@ -42,7 +42,7 @@ class UmlBaseSequenceMessage : public UmlMessage
     }
 
     // return the arguments of the operation, may be empty
-    const Q3CString & arguments() const {
+    const QByteArray & arguments() const {
         return _args;
     }
 
@@ -58,12 +58,12 @@ class UmlBaseSequenceMessage : public UmlMessage
 
     int _received_at;
 
-    Q3CString _args;
+    QByteArray _args;
 
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments);
 
     friend class UmlBaseSequenceDiagramDefinition;
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseShallowHistoryPseudoState.h b/genplugouts/HtmlDoc/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..cb82c3ec1 100644
--- a/genplugouts/HtmlDoc/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseState.cpp b/genplugouts/HtmlDoc/UmlBaseState.cpp
index ee6782b7e..67b452b69 100644
--- a/genplugouts/HtmlDoc/UmlBaseState.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseState.cpp
@@ -5,7 +5,7 @@
 #include "UmlOperation.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -17,7 +17,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -28,7 +28,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -39,7 +39,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -51,7 +51,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -62,7 +62,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -73,7 +73,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -86,7 +86,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -97,7 +97,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -108,7 +108,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/HtmlDoc/UmlBaseState.h b/genplugouts/HtmlDoc/UmlBaseState.h
index 8fc36c55d..e176d07ef 100644
--- a/genplugouts/HtmlDoc/UmlBaseState.h
+++ b/genplugouts/HtmlDoc/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "StateBehavior.h"
 
 class UmlState;
@@ -27,13 +27,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -41,7 +41,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -49,7 +49,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -58,7 +58,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -66,7 +66,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -74,7 +74,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -92,7 +92,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -100,7 +100,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/HtmlDoc/UmlBaseStateAction.cpp b/genplugouts/HtmlDoc/UmlBaseStateAction.cpp
index 32063a1ac..ddae8212d 100644
--- a/genplugouts/HtmlDoc/UmlBaseStateAction.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseStateAction.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseStateAction.h"
 #include "UmlStateAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlItem * parent)
 {
@@ -15,7 +15,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -27,7 +27,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -40,7 +40,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/HtmlDoc/UmlBaseStateAction.h b/genplugouts/HtmlDoc/UmlBaseStateAction.h
index 058903e1f..0ddee639e 100644
--- a/genplugouts/HtmlDoc/UmlBaseStateAction.h
+++ b/genplugouts/HtmlDoc/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateAction;
 
@@ -24,13 +24,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -39,7 +39,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -49,7 +49,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -67,14 +67,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/HtmlDoc/UmlBaseStateDiagram.h b/genplugouts/HtmlDoc/UmlBaseStateDiagram.h
index ea7e37ee0..d3c5bd101 100644
--- a/genplugouts/HtmlDoc/UmlBaseStateDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseSubject.cpp b/genplugouts/HtmlDoc/UmlBaseSubject.cpp
index b15d380d3..f55c74c8a 100644
--- a/genplugouts/HtmlDoc/UmlBaseSubject.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseSubject.cpp
@@ -12,7 +12,7 @@ void UmlBaseSubject::read_()
     _h = (int) UmlCom::read_unsigned();
 }
 
-UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects)
+UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects)
 {
     int rank = subjects.count();
 
diff --git a/genplugouts/HtmlDoc/UmlBaseSubject.h b/genplugouts/HtmlDoc/UmlBaseSubject.h
index da0098ff6..167d3d543 100644
--- a/genplugouts/HtmlDoc/UmlBaseSubject.h
+++ b/genplugouts/HtmlDoc/UmlBaseSubject.h
@@ -1,9 +1,9 @@
 #ifndef _UMLBASESUBJECT_H
 #define _UMLBASESUBJECT_H
+#include <QByteArray>
+
 
 
-#include <q3cstring.h>
-#include <q3ptrvector.h>
 
 class UmlSubject;
 
@@ -12,13 +12,13 @@ class UmlBaseSubject
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -34,7 +34,7 @@ class UmlBaseSubject
 
 public:
     // internal
-    static UmlSubject * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects);
+    static UmlSubject * get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseTerminatePseudoState.h b/genplugouts/HtmlDoc/UmlBaseTerminatePseudoState.h
index e8553f4be..5328f4055 100644
--- a/genplugouts/HtmlDoc/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/HtmlDoc/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseTransition.cpp b/genplugouts/HtmlDoc/UmlBaseTransition.cpp
index 8fe2570a0..7dec536d7 100644
--- a/genplugouts/HtmlDoc/UmlBaseTransition.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_IsExternal(bool v)
     return set_it_(_is_external, v, setIsCppExternalCmd);
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -61,7 +61,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -95,7 +95,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -130,7 +130,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/HtmlDoc/UmlBaseTransition.h b/genplugouts/HtmlDoc/UmlBaseTransition.h
index cab4fd850..cc03ded6e 100644
--- a/genplugouts/HtmlDoc/UmlBaseTransition.h
+++ b/genplugouts/HtmlDoc/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -35,7 +35,7 @@ class UmlBaseTransition : public UmlItem
     bool set_IsExternal(bool v);
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -86,7 +86,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -94,7 +94,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
@@ -151,7 +151,7 @@ class UmlBaseTransition : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTransition(void * id, const Q3CString & n) : UmlItem(id, n) {
+    UmlBaseTransition(void * id, const QByteArray & n) : UmlItem(id, n) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseTypeSpec.cpp b/genplugouts/HtmlDoc/UmlBaseTypeSpec.cpp
index 4070a4a45..cddda026a 100644
--- a/genplugouts/HtmlDoc/UmlBaseTypeSpec.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlBaseTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseTypeSpec::toString() const
+const QByteArray & UmlBaseTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/HtmlDoc/UmlBaseTypeSpec.h b/genplugouts/HtmlDoc/UmlBaseTypeSpec.h
index 16fce750a..65940678a 100644
--- a/genplugouts/HtmlDoc/UmlBaseTypeSpec.h
+++ b/genplugouts/HtmlDoc/UmlBaseTypeSpec.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASETYPESPEC_H
 #define _UMLBASETYPESPEC_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 class UmlClass;
 
@@ -17,10 +17,10 @@ class UmlBaseTypeSpec
     UmlBaseTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     UmlClass * type;
 
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCase.cpp b/genplugouts/HtmlDoc/UmlBaseUseCase.cpp
index 2acd65351..01b460067 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCase.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseUseCase.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlUseCase * UmlBaseUseCase::create(UmlItem * parent, const char * s)
 {
     return (UmlUseCase *) parent->create_(anUseCase, s);
@@ -35,7 +35,7 @@ bool UmlBaseUseCase::set_AssociatedDiagram(UmlUseCaseDiagram * d)
         return FALSE;
 }
 
-const Q3CString & UmlBaseUseCase::extensionPoints()
+const QByteArray & UmlBaseUseCase::extensionPoints()
 {
     read_if_needed_();
     return _extension_points;
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCase.h b/genplugouts/HtmlDoc/UmlBaseUseCase.h
index 506bde76f..83f5ff29c 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCase.h
+++ b/genplugouts/HtmlDoc/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -32,7 +32,7 @@ class UmlBaseUseCase : public UmlItem
     bool set_AssociatedDiagram(UmlUseCaseDiagram * d);
 
     // return the extension points
-    const Q3CString & extensionPoints();
+    const QByteArray & extensionPoints();
 
     // set the extension points
     //
@@ -41,7 +41,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
-    Q3CString _extension_points;
+    QByteArray _extension_points;
 
     UmlUseCaseDiagram * _assoc_diagram;
 
@@ -50,7 +50,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCaseAssociation.cpp b/genplugouts/HtmlDoc/UmlBaseUseCaseAssociation.cpp
index ebee930a9..6a91c0e5c 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCaseAssociation.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseUseCaseAssociation.cpp
@@ -4,9 +4,9 @@
 #include "UmlUseCaseReference.h"
 #include "UmlClass.h"
 
-void UmlBaseUseCaseAssociation::read_(const Q3PtrDict<UmlUseCaseReference> & useCases)
+void UmlBaseUseCaseAssociation::read_(const QHash<void*,UmlUseCaseReference*> & useCases)
 {
-    _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()];
+    _use_case = (UmlUseCaseReference *) useCases[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
     _actor = (UmlClass *) UmlBaseItem::read_();
     _primary = UmlCom::read_bool();
     _name = UmlCom::read_string();
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCaseAssociation.h b/genplugouts/HtmlDoc/UmlBaseUseCaseAssociation.h
index 9538e6ba7..addc9bb3b 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCaseAssociation.h
+++ b/genplugouts/HtmlDoc/UmlBaseUseCaseAssociation.h
@@ -1,9 +1,10 @@
 #ifndef _UMLBASEUSECASEASSOCIATION_H
 #define _UMLBASEUSECASEASSOCIATION_H
+#include <QByteArray>
+#include <QHash>
+
 
 
-#include <q3cstring.h>
-#include <q3ptrdict.h>
 
 class UmlUseCaseReference;
 class UmlClass;
@@ -13,12 +14,12 @@ class UmlBaseUseCaseAssociation
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the stereotype
-    const Q3CString & stereotype() const {
+    const QByteArray & stereotype() const {
         return _stereotype;
     }
 
@@ -43,14 +44,14 @@ class UmlBaseUseCaseAssociation
 
     UmlClass * _actor;
 
-    Q3CString _name;
+    QByteArray _name;
 
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
     bool _primary;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlUseCaseReference> & useCases);
+    void read_(const QHash<void*,UmlUseCaseReference*> & useCases);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCaseDiagram.h b/genplugouts/HtmlDoc/UmlBaseUseCaseDiagram.h
index 72c0eab73..4f0e14c29 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/HtmlDoc/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCaseDiagramDefinition.cpp b/genplugouts/HtmlDoc/UmlBaseUseCaseDiagramDefinition.cpp
index b8780daf2..7252035a3 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCaseDiagramDefinition.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseUseCaseDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseUseCaseDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlUseCaseReference> ucrefs;
+    QHash<void*,UmlUseCaseReference*> ucrefs;
     unsigned n;
     unsigned rank;
 
@@ -18,7 +18,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -31,7 +31,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         sb->read_();
     }
 
-    _subjects.setAutoDelete(TRUE);
+    //_subjects.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _use_cases.resize(n);
@@ -40,11 +40,11 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         UmlUseCaseReference * uc = new UmlUseCaseReference();
 
         _use_cases.insert(rank, uc);
-        ucrefs.insert((void *) UmlCom::read_unsigned(), uc);
+        ucrefs.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), uc);
         uc->read_(_fragments, _subjects);
     }
 
-    _use_cases.setAutoDelete(TRUE);
+    //_use_cases.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _actors.resize(n);
@@ -62,7 +62,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         r->read_(ucrefs);
     }
 
-    _rels.setAutoDelete(TRUE);
+   // _rels.setAutoDelete(TRUE);
 }
 
 UmlBaseUseCaseDiagramDefinition::~UmlBaseUseCaseDiagramDefinition()
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCaseDiagramDefinition.h b/genplugouts/HtmlDoc/UmlBaseUseCaseDiagramDefinition.h
index d2cefc68d..fe556d93b 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCaseDiagramDefinition.h
+++ b/genplugouts/HtmlDoc/UmlBaseUseCaseDiagramDefinition.h
@@ -10,7 +10,7 @@
 #include "UmlUseCaseReference.h"
 #include "UmlUseCaseAssociation.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlUseCaseReference;
 class UmlClass;
@@ -23,41 +23,41 @@ class UmlBaseUseCaseDiagramDefinition
 {
 public:
     // return the use cases present in the diagram
-    const Q3PtrVector<UmlUseCaseReference> & useCases() const {
+    const QVector<UmlUseCaseReference*> & useCases() const {
         return _use_cases;
     }
 
     // return the actors present in the diagram
-    const Q3PtrVector<UmlClass> & actors() const {
+    const QVector<UmlClass*> & actors() const {
         return _actors;
     }
 
     // return the associations between actor and use case present in the diagram
-    const Q3PtrVector<UmlUseCaseAssociation> & associations() const {
+    const QVector<UmlUseCaseAssociation*> & associations() const {
         return _rels;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
     // return the subjects present in the diagram
-    const Q3PtrVector<UmlSubject> & subjects() const {
+    const QVector<UmlSubject*> & subjects() const {
         return _subjects;
     }
 
 
 private:
-    Q3PtrVector<UmlUseCaseReference> _use_cases;
+    QVector<UmlUseCaseReference*> _use_cases;
 
-    Q3PtrVector<UmlClass> _actors;
+    QVector<UmlClass*> _actors;
 
-    Q3PtrVector<UmlUseCaseAssociation> _rels;
+    QVector<UmlUseCaseAssociation*> _rels;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
-    Q3PtrVector<UmlSubject> _subjects;
+    QVector<UmlSubject*> _subjects;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCaseReference.cpp b/genplugouts/HtmlDoc/UmlBaseUseCaseReference.cpp
index c599f87d4..d20f93f30 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCaseReference.cpp
+++ b/genplugouts/HtmlDoc/UmlBaseUseCaseReference.cpp
@@ -6,7 +6,7 @@
 #include "UmlSubject.h"
 #include "UmlFragment.h"
 
-void UmlBaseUseCaseReference::read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects)
+void UmlBaseUseCaseReference::read_(const QVector<UmlFragment *> & fragments, const QVector<UmlSubject *> & subjects)
 {
     _use_case = (UmlUseCase *) UmlBaseItem::read_();
     _x = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCaseReference.h b/genplugouts/HtmlDoc/UmlBaseUseCaseReference.h
index 5e5590920..b29d782cc 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCaseReference.h
+++ b/genplugouts/HtmlDoc/UmlBaseUseCaseReference.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASEUSECASEREFERENCE_H
 #define _UMLBASEUSECASEREFERENCE_H
+#include <QVector>
 
 
-#include <q3ptrvector.h>
 
 class UmlUseCase;
 class UmlFragmentCompartment;
@@ -46,7 +46,7 @@ class UmlBaseUseCaseReference
     int _h;
 
     // internal, don't call it
-    void read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects);
+    void read_(const QVector<UmlFragment *> &fragments, const QVector<UmlSubject *> &subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/HtmlDoc/UmlBaseUseCaseView.h b/genplugouts/HtmlDoc/UmlBaseUseCaseView.h
index dc3509612..1c9c2fc1d 100644
--- a/genplugouts/HtmlDoc/UmlBaseUseCaseView.h
+++ b/genplugouts/HtmlDoc/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseView;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlBaseView.h b/genplugouts/HtmlDoc/UmlBaseView.h
index ee8c0dd38..1e346b17b 100644
--- a/genplugouts/HtmlDoc/UmlBaseView.h
+++ b/genplugouts/HtmlDoc/UmlBaseView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseView : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseView(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseView(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlBuiltin.h b/genplugouts/HtmlDoc/UmlBuiltin.h
index 4f5c16f41..9194f9c76 100644
--- a/genplugouts/HtmlDoc/UmlBuiltin.h
+++ b/genplugouts/HtmlDoc/UmlBuiltin.h
@@ -1,32 +1,33 @@
 #ifndef _UMLBUILTIN_H
 #define _UMLBUILTIN_H
+#include <QByteArray>
+
 
 
-#include <q3cstring.h>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/HtmlDoc/UmlChoicePseudoState.cpp b/genplugouts/HtmlDoc/UmlChoicePseudoState.cpp
index ef24ac3db..1b6798ceb 100644
--- a/genplugouts/HtmlDoc/UmlChoicePseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlChoicePseudoState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlChoicePseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlChoicePseudoState::sKind()
+QByteArray UmlChoicePseudoState::sKind()
 {
     return "choice pseudo state";
 }
diff --git a/genplugouts/HtmlDoc/UmlChoicePseudoState.h b/genplugouts/HtmlDoc/UmlChoicePseudoState.h
index fb3a12073..8a87578bc 100644
--- a/genplugouts/HtmlDoc/UmlChoicePseudoState.h
+++ b/genplugouts/HtmlDoc/UmlChoicePseudoState.h
@@ -2,14 +2,14 @@
 #define _UMLCHOICEPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseChoicePseudoState.h"
 
 class UmlChoicePseudoState : public UmlBaseChoicePseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlChoicePseudoState(void * id) : UmlBaseChoicePseudoState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlClass.cpp b/genplugouts/HtmlDoc/UmlClass.cpp
index dae551b5c..cb63f418f 100644
--- a/genplugouts/HtmlDoc/UmlClass.cpp
+++ b/genplugouts/HtmlDoc/UmlClass.cpp
@@ -13,10 +13,10 @@
 #include "UmlRelation.h"
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 
-Q3CString UmlClass::sKind()
+QByteArray UmlClass::sKind()
 {
     return (stereotype() == "stereotype")
            ? "stereotype" : "class";
@@ -27,12 +27,12 @@ void UmlClass::memo_ref()
     classes.addElement(this);
     UmlItem::memo_ref();
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
     if (inherited_opers == 0)
         add_inherited_opers(0);
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == aRelation) {
             UmlRelation * rel = (UmlRelation *) ch[i];
             aRelationKind k = rel->relationKind();
@@ -45,9 +45,9 @@ void UmlClass::memo_ref()
     unload(TRUE, FALSE);
 }
 
-void UmlClass::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlClass::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
-    Q3CString s = stereotype();
+    QByteArray s = stereotype();
 
     if (flat) {
         define();
@@ -77,7 +77,7 @@ void UmlClass::html(Q3CString pfix, unsigned int rank, unsigned int level)
 
 void UmlClass::html()
 {
-    Q3CString s;
+    QByteArray s;
 
     UmlCom::message(name());
 
@@ -95,11 +95,11 @@ void UmlClass::html()
     unload(FALSE, FALSE);
 }
 
-void UmlClass::gen_html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlClass::gen_html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlCom::message(name());
 
-    Q3CString s;
+    QByteArray s;
 
     s = description();
 
@@ -187,7 +187,7 @@ void UmlClass::gen_html(Q3CString pfix, unsigned int rank, unsigned int level)
         x->write();
     }
 
-    const Q3PtrVector<UmlComponent> comps = associatedComponents();
+    const QVector<UmlComponent*> comps = associatedComponents();
 
     if (comps.size() != 0) {
         if (p)
@@ -197,7 +197,7 @@ void UmlClass::gen_html(Q3CString pfix, unsigned int rank, unsigned int level)
             fw.write("<p>Component(s) :");
         }
 
-        for (unsigned i = 0; i != comps.size(); i += 1) {
+        for (int i = 0; i != comps.size(); i += 1) {
             fw.write(' ');
             comps[i]->write();
         }
@@ -227,13 +227,13 @@ void UmlClass::gen_html(Q3CString pfix, unsigned int rank, unsigned int level)
 
     //
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
     if (ch.size() != 0) {
         if (stereotype() == "enum_pattern") {
             p = FALSE;
 
-            for (unsigned i = 0; i != ch.size(); i += 1) {
+            for (int i = 0; i != ch.size(); i += 1) {
                 if (ch[i]->kind() == anAttribute) {
                     if (!p) {
                         p = TRUE;
@@ -253,7 +253,7 @@ void UmlClass::gen_html(Q3CString pfix, unsigned int rank, unsigned int level)
             fw.write("<div class=\"sub\">\n");
 
             if (stereotype() == "enum") {
-                unsigned i;
+                int i;
 
                 p = FALSE;
 
@@ -287,14 +287,13 @@ void UmlClass::gen_html(Q3CString pfix, unsigned int rank, unsigned int level)
                 // non flat
                 s = "";
 
-                for (unsigned i = 0; i != ch.size(); i += 1)
+                for (int i = 0; i != ch.size(); i += 1)
                     ch[i]->html(s, 0, 0);
             }
 
             fw.write("</div>\n");
         }
     }
-
     sort(*inherited_opers);
     bool already = FALSE;
 
@@ -319,7 +318,7 @@ void UmlClass::write()
     if (!known)
         writeq(name());
     else {
-        Q3CString s = stereotype();
+        QByteArray s = stereotype();
 
         if ((s != "stereotype") && (s != "metaclass"))
             s = "class";
@@ -341,10 +340,10 @@ void UmlClass::write()
     }
 }
 
-void UmlClass::write(Q3CString target)
+void UmlClass::write(QByteArray target)
 {
     if (known) {
-        Q3CString s = stereotype();
+        QByteArray s = stereotype();
 
         if ((s != "stereotype") && (s != "metaclass"))
             s = "class";
@@ -399,11 +398,11 @@ void UmlClass::generate_index()
 void UmlClass::add_inherited_opers(Vector * ops)
 {
     if (inherited_opers == 0) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
 
         inherited_opers = new Vector;
 
-        for (unsigned i = 0; i != ch.size(); i += 1) {
+        for (int i = 0; i != ch.size(); i += 1) {
             switch (ch[i]->kind()) {
             case aRelation: {
                 UmlRelation * rel = (UmlRelation *) ch[i];
@@ -439,7 +438,7 @@ void UmlClass::add_inherited_opers(Vector * ops)
 
 Vector UmlClass::classes;
 
-void UmlClass::gen_cpp_decl(Q3CString s, bool descr)
+void UmlClass::gen_cpp_decl(QByteArray s, bool descr)
 {
     const char * p = (descr)
                      ? (const char *) s
@@ -456,9 +455,9 @@ void UmlClass::gen_cpp_decl(Q3CString s, bool descr)
 
             if (baseType().type != 0) {
                 UmlClass * mother = baseType().type;
-                const Q3PtrVector<UmlItem> ch = children();
+                const QVector<UmlItem*> ch = children();
 
-                for (unsigned i = 0; i != ch.size(); i += 1) {
+                for (int i = 0; i != ch.size(); i += 1) {
                     if (ch[i]->kind() == aRelation) {
                         UmlRelation * rel = (UmlRelation *) ch[i];
                         aRelationKind k = rel->relationKind();
@@ -489,10 +488,10 @@ void UmlClass::gen_cpp_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${inherit}", 10)) {
             p += 10;
 
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             const char * sep = " : ";
 
-            for (unsigned i = 0; i != ch.size(); i += 1) {
+            for (int i = 0; i != ch.size(); i += 1) {
                 if (ch[i]->kind() == aRelation) {
                     UmlRelation * rel = (UmlRelation *) ch[i];
                     aRelationKind k = rel->relationKind();
@@ -543,7 +542,7 @@ void UmlClass::gen_cpp_decl(Q3CString s, bool descr)
 
 }
 
-void UmlClass::gen_java_decl(Q3CString s, bool descr)
+void UmlClass::gen_java_decl(QByteArray s, bool descr)
 {
     const char * p = bypass_comment(s);
     UmlRelation * extend = 0;
@@ -584,9 +583,9 @@ void UmlClass::gen_java_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${extends}", 10)) {
             p += 10;
 
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
 
-            for (unsigned i = 0; i != ch.size(); i += 1) {
+            for (int i = 0; i != ch.size(); i += 1) {
                 if (ch[i]->kind() == aRelation) {
                     UmlRelation * rel = (UmlRelation *) ch[i];
                     aRelationKind k = rel->relationKind();
@@ -608,10 +607,10 @@ void UmlClass::gen_java_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${implements}", 13)) {
             p += 13;
 
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             const char * sep = " implements ";
 
-            for (unsigned i = 0; i != ch.size(); i += 1) {
+            for (int i = 0; i != ch.size(); i += 1) {
                 if (ch[i]->kind() == aRelation) {
                     UmlRelation * rel = (UmlRelation *) ch[i];
                     aRelationKind k = rel->relationKind();
@@ -659,9 +658,9 @@ void UmlClass::gen_java_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlClass::gen_php_decl(Q3CString s, bool descr)
+void UmlClass::gen_php_decl(QByteArray s, bool descr)
 {
-    Q3CString st = PhpSettings::classStereotype(stereotype());
+    QByteArray st = PhpSettings::classStereotype(stereotype());
 
     if (st == "ignored")
         return;
@@ -699,9 +698,9 @@ void UmlClass::gen_php_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${extends}", 10)) {
             p += 10;
 
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
 
-            for (unsigned i = 0; i != ch.size(); i += 1) {
+            for (int i = 0; i != ch.size(); i += 1) {
                 if (ch[i]->kind() == aRelation) {
                     UmlRelation * rel = (UmlRelation *) ch[i];
                     aRelationKind k = rel->relationKind();
@@ -722,10 +721,10 @@ void UmlClass::gen_php_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${implements}", 13)) {
             p += 13;
 
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             const char * sep = " implements ";
 
-            for (unsigned i = 0; i != ch.size(); i += 1) {
+            for (int i = 0; i != ch.size(); i += 1) {
                 if (ch[i]->kind() == aRelation) {
                     UmlRelation * rel = (UmlRelation *) ch[i];
                     aRelationKind k = rel->relationKind();
@@ -770,9 +769,9 @@ void UmlClass::gen_php_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlClass::gen_python_decl(Q3CString s, bool descr)
+void UmlClass::gen_python_decl(QByteArray s, bool descr)
 {
-    Q3CString st = PythonSettings::classStereotype(stereotype());
+    QByteArray st = PythonSettings::classStereotype(stereotype());
 
     if (st == "ignored")
         return;
@@ -793,10 +792,10 @@ void UmlClass::gen_python_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${inherit}", 10)) {
             p += 10;
 
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             bool inh = FALSE;
 
-            for (unsigned i = 0; i != ch.size(); i += 1) {
+            for (int i = 0; i != ch.size(); i += 1) {
                 if (ch[i]->kind() == aRelation) {
                     UmlRelation * rel = (UmlRelation *) ch[i];
                     aRelationKind k = rel->relationKind();
@@ -831,7 +830,7 @@ void UmlClass::gen_python_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlClass::generate(const Q3ValueList<UmlActualParameter> a, UmlClass * mother, bool cpp)
+void UmlClass::generate(const QList<UmlActualParameter> a, UmlClass * mother, bool cpp)
 {
     unsigned i;
     unsigned n = a.count();
@@ -858,7 +857,7 @@ void UmlClass::generate(const Q3ValueList<UmlActualParameter> a, UmlClass * moth
     writeq('>');
 }
 
-void UmlClass::generate(const Q3ValueList<UmlFormalParameter> f)
+void UmlClass::generate(const QList<UmlFormalParameter> f)
 {
     unsigned n = f.count();
 
@@ -876,13 +875,13 @@ void UmlClass::generate(const Q3ValueList<UmlFormalParameter> f)
 
         writeq("> ");
     }
-    else if (name().find("<") != -1)
+    else if (name().indexOf("<") != -1)
         writeq("template<> ");
 }
 
 void UmlClass::generics()
 {
-    Q3ValueList<UmlFormalParameter> f = formals();
+    QList<UmlFormalParameter> f = formals();
     unsigned n = f.count();
 
     if (n != 0) {
@@ -912,7 +911,11 @@ void UmlClass::generate()
         int n = classes.size();
 
         for (int i = 0; i != n; i += 1)
-            ((UmlClass *) classes.elementAt(i))->html();
+        {
+
+            UmlClass * cl = (UmlClass *)classes.elementAt(i);
+            cl->html();
+        }
     }
 }
 
diff --git a/genplugouts/HtmlDoc/UmlClass.h b/genplugouts/HtmlDoc/UmlClass.h
index 1adc6a069..f9c69096f 100644
--- a/genplugouts/HtmlDoc/UmlClass.h
+++ b/genplugouts/HtmlDoc/UmlClass.h
@@ -3,9 +3,9 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
-#include <q3valuelist.h>
+#include <QList>
 
 class UmlActualParameter;
 class UmlFormalParameter;
@@ -17,12 +17,12 @@ class UmlFormalParameter;
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {
         inherited_opers = 0;
     };
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //set he html ref
     //set the classes list
@@ -32,7 +32,7 @@ class UmlClass : public UmlBaseClass
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //generate the html definition in an own file
 
@@ -40,13 +40,13 @@ class UmlClass : public UmlBaseClass
 
     //generate the html definition except header/chapter in the current file
 
-    void gen_html(Q3CString pfix, unsigned int rank, unsigned int level);
+    void gen_html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //write a html ref to the class
     virtual void write();
 
     //write a html ref to the class going to an other html file
-    virtual void write(Q3CString target);
+    virtual void write(QByteArray target);
 
     static void ref_index();
 
@@ -65,20 +65,20 @@ class UmlClass : public UmlBaseClass
 
 private:
     //produce the definition in C++
-    void gen_cpp_decl(Q3CString s, bool descr);
+    void gen_cpp_decl(QByteArray s, bool descr);
 
     //produce the definition in Java
-    void gen_java_decl(Q3CString s, bool descr);
+    void gen_java_decl(QByteArray s, bool descr);
 
     //produce the definition in Php
-    void gen_php_decl(Q3CString s, bool descr);
+    void gen_php_decl(QByteArray s, bool descr);
 
     //produce the definition in Python
-    void gen_python_decl(Q3CString s, bool descr);
+    void gen_python_decl(QByteArray s, bool descr);
 
-    void generate(const Q3ValueList<UmlActualParameter> a, UmlClass * mother, bool cpp);
+    void generate(const QList<UmlActualParameter> a, UmlClass * mother, bool cpp);
 
-    void generate(const Q3ValueList<UmlFormalParameter> f);
+    void generate(const QList<UmlFormalParameter> f);
 
     void generics();
 
diff --git a/genplugouts/HtmlDoc/UmlClassDiagram.cpp b/genplugouts/HtmlDoc/UmlClassDiagram.cpp
index f8d976da6..9f3c8374d 100644
--- a/genplugouts/HtmlDoc/UmlClassDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlClassDiagram.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlClassDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlClassDiagram::sKind()
+QByteArray UmlClassDiagram::sKind()
 {
     return "class diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlClassDiagram.h b/genplugouts/HtmlDoc/UmlClassDiagram.h
index b6fc9d6f0..098e5ddcd 100644
--- a/genplugouts/HtmlDoc/UmlClassDiagram.h
+++ b/genplugouts/HtmlDoc/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
@@ -14,10 +14,10 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //set he html ref
     //set the diagrams list
diff --git a/genplugouts/HtmlDoc/UmlClassInstance.cpp b/genplugouts/HtmlDoc/UmlClassInstance.cpp
index 8ddd04b79..adc4afb6a 100644
--- a/genplugouts/HtmlDoc/UmlClassInstance.cpp
+++ b/genplugouts/HtmlDoc/UmlClassInstance.cpp
@@ -5,15 +5,15 @@
 #include "UmlRelation.h"
 #include "UmlClassInstance.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 
-Q3CString UmlClassInstance::sKind()
+QByteArray UmlClassInstance::sKind()
 {
     return "class instance";
 }
 
-void UmlClassInstance::html(Q3CString, unsigned int, unsigned int)
+void UmlClassInstance::html(QByteArray, unsigned int, unsigned int)
 {
     define();
 
@@ -21,7 +21,7 @@ void UmlClassInstance::html(Q3CString, unsigned int, unsigned int)
     writeq(name());
     fw.write("</b></div></td></tr></table>");
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
@@ -33,14 +33,14 @@ void UmlClassInstance::html(Q3CString, unsigned int, unsigned int)
     type()->write();
     fw.write("</p>");
 
-    Q3ValueList<SlotAttribute> va;
+    QList<SlotAttribute> va;
 
     attributesValue(va);
 
     if (!va.isEmpty()) {
         fw.write("<p>attributes :</p><ul>\n");
 
-        Q3ValueList<SlotAttribute>::Iterator it;
+        QList<SlotAttribute>::Iterator it;
 
         for (it = va.begin(); it != va.end(); ++it) {
             SlotAttribute & slot = *it;
@@ -55,14 +55,14 @@ void UmlClassInstance::html(Q3CString, unsigned int, unsigned int)
         fw.write("</ul>");
     }
 
-    Q3ValueList<SlotRelation> vr;
+    QList<SlotRelation> vr;
 
     relationsValue(vr);
 
     if (!vr.isEmpty()) {
         fw.write("<p>relations :</p><ul>\n");
 
-        Q3ValueList<SlotRelation>::Iterator it;
+        QList<SlotRelation>::Iterator it;
 
         for (it = vr.begin(); it != vr.end(); ++it) {
             SlotRelation & slot = *it;
diff --git a/genplugouts/HtmlDoc/UmlClassInstance.h b/genplugouts/HtmlDoc/UmlClassInstance.h
index b23e60c0a..75dcd7ad7 100644
--- a/genplugouts/HtmlDoc/UmlClassInstance.h
+++ b/genplugouts/HtmlDoc/UmlClassInstance.h
@@ -3,21 +3,21 @@
 
 
 #include "UmlBaseClassInstance.h"
-#include <q3cstring.h>
+
 
 class UmlClassInstance : public UmlBaseClassInstance
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClassInstance(void * id, const Q3CString & s) : UmlBaseClassInstance(id, s) {
+    UmlClassInstance(void * id, const QByteArray & s) : UmlBaseClassInstance(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlClassItem.h b/genplugouts/HtmlDoc/UmlClassItem.h
index bf64f4dbb..7c4a888f7 100644
--- a/genplugouts/HtmlDoc/UmlClassItem.h
+++ b/genplugouts/HtmlDoc/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlClassMember.h b/genplugouts/HtmlDoc/UmlClassMember.h
index 373df5a22..47605f244 100644
--- a/genplugouts/HtmlDoc/UmlClassMember.h
+++ b/genplugouts/HtmlDoc/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
     void annotation_constraint();
 
diff --git a/genplugouts/HtmlDoc/UmlClassView.cpp b/genplugouts/HtmlDoc/UmlClassView.cpp
index 1cdd03279..407d41e6c 100644
--- a/genplugouts/HtmlDoc/UmlClassView.cpp
+++ b/genplugouts/HtmlDoc/UmlClassView.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlClassView.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlClassView::sKind()
+QByteArray UmlClassView::sKind()
 {
     return "class view";
 }
 
-void UmlClassView::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlClassView::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlItem::html(pfix, rank, "Class View", level, "view");
 
diff --git a/genplugouts/HtmlDoc/UmlClassView.h b/genplugouts/HtmlDoc/UmlClassView.h
index 21720c88e..65fed9516 100644
--- a/genplugouts/HtmlDoc/UmlClassView.h
+++ b/genplugouts/HtmlDoc/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class view'
 //
@@ -11,14 +11,14 @@
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     virtual bool chapterp();
 
diff --git a/genplugouts/HtmlDoc/UmlCollaborationDiagram.cpp b/genplugouts/HtmlDoc/UmlCollaborationDiagram.cpp
index c926b6074..a2d808398 100644
--- a/genplugouts/HtmlDoc/UmlCollaborationDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlCollaborationDiagram.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlCollaborationDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlCollaborationDiagram::sKind()
+QByteArray UmlCollaborationDiagram::sKind()
 {
     return "collaboration diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlCollaborationDiagram.h b/genplugouts/HtmlDoc/UmlCollaborationDiagram.h
index c69ee6eb8..137882cae 100644
--- a/genplugouts/HtmlDoc/UmlCollaborationDiagram.h
+++ b/genplugouts/HtmlDoc/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
@@ -14,10 +14,10 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //set he html ref
     //set the diagrams list
diff --git a/genplugouts/HtmlDoc/UmlCom.cpp b/genplugouts/HtmlDoc/UmlCom.cpp
index 1afec3d46..c7f2284e6 100644
--- a/genplugouts/HtmlDoc/UmlCom.cpp
+++ b/genplugouts/HtmlDoc/UmlCom.cpp
@@ -1,20 +1,23 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 #include "UmlSettings.h"
+#include <iostream>
+using namespace std;
 #include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +31,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(55);
         flush();
@@ -75,11 +80,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -89,11 +94,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -110,13 +115,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -125,10 +130,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -137,16 +142,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -155,18 +160,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -212,7 +217,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -222,7 +227,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -233,7 +238,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
 #endif
 
     write_char(f);
@@ -246,7 +251,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ")\n";
 #endif
 
     write_char(f);
@@ -258,7 +263,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
 #endif
 
     write_char(f);
@@ -270,7 +275,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -282,7 +287,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ")\n";
 #endif
 
     write_char(f);
@@ -294,7 +299,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -307,7 +312,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ", " << v << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ", " << v << ")\n";
 #endif
 
     write_char(f);
@@ -320,7 +325,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << s << ", " << v << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << s << ", " << v << ")\n";
 #endif
 
     write_char(f);
@@ -334,7 +339,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -346,7 +351,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -359,7 +364,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +377,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -385,7 +390,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -407,7 +412,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -421,7 +426,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -435,7 +440,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -450,7 +455,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -463,7 +468,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << arg2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << arg2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -477,7 +482,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -499,8 +504,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -533,7 +538,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << arg4 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << arg4 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -556,10 +561,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -579,7 +584,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -596,7 +601,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -607,12 +612,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -644,28 +649,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -674,7 +680,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -685,7 +691,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
@@ -702,3 +708,12 @@ void UmlCom::flush()
     }
 }
 
+QByteArray UmlCom::read_all()
+{
+    if (sock != 0)
+    {
+        sock->waitForReadyRead(100);
+        return sock->readAll();
+    }
+    return QByteArray();
+}
diff --git a/genplugouts/HtmlDoc/UmlCom.h b/genplugouts/HtmlDoc/UmlCom.h
index 013a8482a..fe20872f2 100644
--- a/genplugouts/HtmlDoc/UmlCom.h
+++ b/genplugouts/HtmlDoc/UmlCom.h
@@ -2,20 +2,20 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //#include "CmdFamily.h"
 //#include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
+
 
-#include <q3ptrvector.h>
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -76,11 +76,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -90,13 +90,13 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     static void read_if_needed();
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     static void write_bool(bool b);
     static void write_char(char c);
     static void write_unsigned(unsigned int u);
@@ -135,7 +135,7 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2);
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5);
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
     //internal, do NOT use it
 
     static void send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2);
@@ -147,9 +147,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // reads the selected items when the tool is called
     // you MUST call it only one time after the connexion
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
-    static void fatal_error(const Q3CString & msg);
+    static void read_item_list(QVector<UmlItem*> & v);
+    static void fatal_error(const QByteArray & msg);
     static void flush();
+    static QByteArray read_all();
 };
 
 #endif
diff --git a/genplugouts/HtmlDoc/UmlComponent.cpp b/genplugouts/HtmlDoc/UmlComponent.cpp
index fe18b8873..96015ff93 100644
--- a/genplugouts/HtmlDoc/UmlComponent.cpp
+++ b/genplugouts/HtmlDoc/UmlComponent.cpp
@@ -4,8 +4,8 @@
 #include "UmlCom.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
-void UmlComponent::html(Q3CString pfix, unsigned int rank, unsigned int level)
+#include <QByteArray>
+void UmlComponent::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlCom::message(name());
 
@@ -17,12 +17,12 @@ void UmlComponent::html(Q3CString pfix, unsigned int rank, unsigned int level)
         fw.write("</p>\n");
     }
 
-    const Q3PtrVector<UmlClass> & provided = providedClasses();
+    const QVector<UmlClass*> & provided = providedClasses();
 
     if (provided.size() != 0) {
         const char * sep = "<p>provided classes : ";
 
-        for (unsigned i = 0; i != provided.size(); i += 1) {
+        for (int i = 0; i != provided.size(); i += 1) {
             fw.write(sep);
             sep = ", ";
             provided[i]->write();
@@ -31,12 +31,12 @@ void UmlComponent::html(Q3CString pfix, unsigned int rank, unsigned int level)
         fw.write("</p>\n");
     }
 
-    const Q3PtrVector<UmlClass> & required = requiredClasses();
+    const QVector<UmlClass*> & required = requiredClasses();
 
     if (required.size() != 0) {
         const char * sep = "<p>required classes : ";
 
-        for (unsigned i = 0; i != required.size(); i += 1) {
+        for (int i = 0; i != required.size(); i += 1) {
             fw.write(sep);
             sep = ", ";
             required[i]->write();
@@ -45,12 +45,12 @@ void UmlComponent::html(Q3CString pfix, unsigned int rank, unsigned int level)
         fw.write("</p>\n");
     }
 
-    const Q3PtrVector<UmlClass> & realizing = realizingClasses();
+    const QVector<UmlClass*> & realizing = realizingClasses();
 
     if (realizing.size() != 0) {
         const char * sep = "<p>realizing classes : ";
 
-        for (unsigned i = 0; i != realizing.size(); i += 1) {
+        for (int i = 0; i != realizing.size(); i += 1) {
             fw.write(sep);
             sep = ", ";
             realizing[i]->write();
@@ -64,7 +64,7 @@ void UmlComponent::html(Q3CString pfix, unsigned int rank, unsigned int level)
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlComponent::sKind()
+QByteArray UmlComponent::sKind()
 {
     return "component";
 }
diff --git a/genplugouts/HtmlDoc/UmlComponent.h b/genplugouts/HtmlDoc/UmlComponent.h
index 9fb312c36..e4691eacd 100644
--- a/genplugouts/HtmlDoc/UmlComponent.h
+++ b/genplugouts/HtmlDoc/UmlComponent.h
@@ -2,7 +2,7 @@
 #define _UMLCOMPONENT_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseComponent.h"
 
 // This class manages 'components'
@@ -13,11 +13,11 @@ class UmlComponent : public UmlBaseComponent
 public:
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlComponentDiagram.cpp b/genplugouts/HtmlDoc/UmlComponentDiagram.cpp
index 0e04de5d5..f7b57d29f 100644
--- a/genplugouts/HtmlDoc/UmlComponentDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlComponentDiagram.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlComponentDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlComponentDiagram::sKind()
+QByteArray UmlComponentDiagram::sKind()
 {
     return "component diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlComponentDiagram.h b/genplugouts/HtmlDoc/UmlComponentDiagram.h
index 51e17addd..edc7bf448 100644
--- a/genplugouts/HtmlDoc/UmlComponentDiagram.h
+++ b/genplugouts/HtmlDoc/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
@@ -14,10 +14,10 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //set he html ref
     //set the diagrams list
diff --git a/genplugouts/HtmlDoc/UmlComponentView.cpp b/genplugouts/HtmlDoc/UmlComponentView.cpp
index 93a66814d..8b59cfc48 100644
--- a/genplugouts/HtmlDoc/UmlComponentView.cpp
+++ b/genplugouts/HtmlDoc/UmlComponentView.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlComponentView.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlComponentView::sKind()
+QByteArray UmlComponentView::sKind()
 {
     return "component view";
 }
 
-void UmlComponentView::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlComponentView::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlItem::html(pfix, rank, "Component View", level, "view");
 
diff --git a/genplugouts/HtmlDoc/UmlComponentView.h b/genplugouts/HtmlDoc/UmlComponentView.h
index d066ecbf0..9f05ff940 100644
--- a/genplugouts/HtmlDoc/UmlComponentView.h
+++ b/genplugouts/HtmlDoc/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'component view'
 //
@@ -11,14 +11,14 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     virtual bool chapterp();
 
diff --git a/genplugouts/HtmlDoc/UmlDeepHistoryPseudoState.cpp b/genplugouts/HtmlDoc/UmlDeepHistoryPseudoState.cpp
index 712058335..38f3b1e93 100644
--- a/genplugouts/HtmlDoc/UmlDeepHistoryPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlDeepHistoryPseudoState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlDeepHistoryPseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlDeepHistoryPseudoState::sKind()
+QByteArray UmlDeepHistoryPseudoState::sKind()
 {
     return "deep history pseudo state";
 }
diff --git a/genplugouts/HtmlDoc/UmlDeepHistoryPseudoState.h b/genplugouts/HtmlDoc/UmlDeepHistoryPseudoState.h
index 37b3d5bf7..c48471a7a 100644
--- a/genplugouts/HtmlDoc/UmlDeepHistoryPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlDeepHistoryPseudoState.h
@@ -2,14 +2,14 @@
 #define _UMLDEEPHISTORYPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseDeepHistoryPseudoState.h"
 
 class UmlDeepHistoryPseudoState : public UmlBaseDeepHistoryPseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlDeepHistoryPseudoState(void * id) : UmlBaseDeepHistoryPseudoState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlDeploymentDiagram.cpp b/genplugouts/HtmlDoc/UmlDeploymentDiagram.cpp
index 446d3c6f7..9919a4810 100644
--- a/genplugouts/HtmlDoc/UmlDeploymentDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlDeploymentDiagram.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlDeploymentDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlDeploymentDiagram::sKind()
+QByteArray UmlDeploymentDiagram::sKind()
 {
     return "deployment diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlDeploymentDiagram.h b/genplugouts/HtmlDoc/UmlDeploymentDiagram.h
index f0b7441e0..f76ba4954 100644
--- a/genplugouts/HtmlDoc/UmlDeploymentDiagram.h
+++ b/genplugouts/HtmlDoc/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
@@ -14,10 +14,10 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //set he html ref
     //set the diagrams list
diff --git a/genplugouts/HtmlDoc/UmlDeploymentView.cpp b/genplugouts/HtmlDoc/UmlDeploymentView.cpp
index 6ca2b5a94..259623a06 100644
--- a/genplugouts/HtmlDoc/UmlDeploymentView.cpp
+++ b/genplugouts/HtmlDoc/UmlDeploymentView.cpp
@@ -1,16 +1,16 @@
 
 #include "UmlDeploymentView.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlDeploymentView::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlDeploymentView::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlItem::html(pfix, rank, "Deployment View", level, "view");
 
     unload(FALSE, FALSE);
 }
 
-Q3CString UmlDeploymentView::sKind()
+QByteArray UmlDeploymentView::sKind()
 {
     return "deployment view";
 }
diff --git a/genplugouts/HtmlDoc/UmlDeploymentView.h b/genplugouts/HtmlDoc/UmlDeploymentView.h
index 5cdd5c128..f85a27cd7 100644
--- a/genplugouts/HtmlDoc/UmlDeploymentView.h
+++ b/genplugouts/HtmlDoc/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment view'
 //
@@ -11,14 +11,14 @@
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     virtual bool chapterp();
 
diff --git a/genplugouts/HtmlDoc/UmlDiagram.cpp b/genplugouts/HtmlDoc/UmlDiagram.cpp
index df820e69c..e115ab89f 100644
--- a/genplugouts/HtmlDoc/UmlDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlDiagram.cpp
@@ -3,14 +3,14 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-void UmlDiagram::html(Q3CString, unsigned int, unsigned int)
+#include <QByteArray>
+void UmlDiagram::html(QByteArray, unsigned int, unsigned int)
 {
     UmlCom::message(name());
 
     define();
 
-    Q3CString s;
+    QByteArray s;
 
     s.setNum(getIdentifier());
     s = "fig" + s + ((svg) ? ".svg" : ".png");
diff --git a/genplugouts/HtmlDoc/UmlDiagram.h b/genplugouts/HtmlDoc/UmlDiagram.h
index f510bd943..70725af3e 100644
--- a/genplugouts/HtmlDoc/UmlDiagram.h
+++ b/genplugouts/HtmlDoc/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage diagram
 //
@@ -11,11 +11,11 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlEntryPointPseudoState.cpp b/genplugouts/HtmlDoc/UmlEntryPointPseudoState.cpp
index b254c0865..85a7bb6ec 100644
--- a/genplugouts/HtmlDoc/UmlEntryPointPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlEntryPointPseudoState.cpp
@@ -3,21 +3,21 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlEntryPointPseudoState::sKind()
+#include <QByteArray>
+QByteArray UmlEntryPointPseudoState::sKind()
 {
     return "entry point pseudo state";
 }
 
-void UmlEntryPointPseudoState::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlEntryPointPseudoState::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
     UmlCom::message(name());
 
-    Q3CString s = sKind();
+    QByteArray s = sKind();
 
-    s.replace(0, 1, s.left(1).upper());
+    s.replace(0, 1, s.left(1).toUpper());
     UmlItem::html(s, (UmlDiagram *) 0);
 
     fw.write("<p>Defined in ");
diff --git a/genplugouts/HtmlDoc/UmlEntryPointPseudoState.h b/genplugouts/HtmlDoc/UmlEntryPointPseudoState.h
index 99779067e..6dab73b53 100644
--- a/genplugouts/HtmlDoc/UmlEntryPointPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlEntryPointPseudoState.h
@@ -2,22 +2,22 @@
 #define _UMLENTRYPOINTPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseEntryPointPseudoState.h"
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlExitPointPseudoState.cpp b/genplugouts/HtmlDoc/UmlExitPointPseudoState.cpp
index d6e030348..e69e69498 100644
--- a/genplugouts/HtmlDoc/UmlExitPointPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlExitPointPseudoState.cpp
@@ -3,21 +3,21 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlExitPointPseudoState::sKind()
+#include <QByteArray>
+QByteArray UmlExitPointPseudoState::sKind()
 {
     return "exit point pseudo state";
 }
 
-void UmlExitPointPseudoState::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlExitPointPseudoState::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
     UmlCom::message(name());
 
-    Q3CString s = sKind();
+    QByteArray s = sKind();
 
-    s.replace(0, 1, s.left(1).upper());
+    s.replace(0, 1, s.left(1).toUpper());
     UmlItem::html(s, (UmlDiagram *) 0);
 
     fw.write("<p>Defined in ");
diff --git a/genplugouts/HtmlDoc/UmlExitPointPseudoState.h b/genplugouts/HtmlDoc/UmlExitPointPseudoState.h
index 8bffa4fb6..bee6fc383 100644
--- a/genplugouts/HtmlDoc/UmlExitPointPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlExitPointPseudoState.h
@@ -2,22 +2,22 @@
 #define _UMLEXITPOINTPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseExitPointPseudoState.h"
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlExpansionNode.h b/genplugouts/HtmlDoc/UmlExpansionNode.h
index 65d1cff2a..e2dbd5565 100644
--- a/genplugouts/HtmlDoc/UmlExpansionNode.h
+++ b/genplugouts/HtmlDoc/UmlExpansionNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionNode.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode : public UmlBaseExpansionNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionNode(void * id, const Q3CString & s) : UmlBaseExpansionNode(id, s) {
+    UmlExpansionNode(void * id, const QByteArray & s) : UmlBaseExpansionNode(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlExpansionRegion.cpp b/genplugouts/HtmlDoc/UmlExpansionRegion.cpp
index a96700845..bfa85c8ce 100644
--- a/genplugouts/HtmlDoc/UmlExpansionRegion.cpp
+++ b/genplugouts/HtmlDoc/UmlExpansionRegion.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlExpansionRegion.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlExpansionRegion::sKind()
+QByteArray UmlExpansionRegion::sKind()
 {
     return "expansion region";
 }
 
-void UmlExpansionRegion::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlExpansionRegion::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlItem::html(pfix, rank, "Expansion region", level, "expansionregion");
 
diff --git a/genplugouts/HtmlDoc/UmlExpansionRegion.h b/genplugouts/HtmlDoc/UmlExpansionRegion.h
index f2ea8305e..2b4b6ed97 100644
--- a/genplugouts/HtmlDoc/UmlExpansionRegion.h
+++ b/genplugouts/HtmlDoc/UmlExpansionRegion.h
@@ -3,21 +3,21 @@
 
 
 #include "UmlBaseExpansionRegion.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionRegion : public UmlBaseExpansionRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionRegion(void * id, const Q3CString & s) : UmlBaseExpansionRegion(id, s) {
+    UmlExpansionRegion(void * id, const QByteArray & s) : UmlBaseExpansionRegion(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlExtraClassMember.cpp b/genplugouts/HtmlDoc/UmlExtraClassMember.cpp
index 124dcbe0d..307de7a65 100644
--- a/genplugouts/HtmlDoc/UmlExtraClassMember.cpp
+++ b/genplugouts/HtmlDoc/UmlExtraClassMember.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlExtraClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlExtraClassMember::sKind()
+QByteArray UmlExtraClassMember::sKind()
 {
     return "extra class member";
 }
 
-void UmlExtraClassMember::html(Q3CString, unsigned int, unsigned int)
+void UmlExtraClassMember::html(QByteArray, unsigned int, unsigned int)
 {
     define();
 
@@ -16,7 +16,7 @@ void UmlExtraClassMember::html(Q3CString, unsigned int, unsigned int)
     writeq(name());
     fw.write("</b></div></td></tr></table>");
 
-    Q3CString s;
+    QByteArray s;
 
     if (! cppDecl().isEmpty() || !javaDecl().isEmpty()) {
         fw.write("<p>Definition :</p><ul>");
diff --git a/genplugouts/HtmlDoc/UmlExtraClassMember.h b/genplugouts/HtmlDoc/UmlExtraClassMember.h
index de27e38ba..da77267e8 100644
--- a/genplugouts/HtmlDoc/UmlExtraClassMember.h
+++ b/genplugouts/HtmlDoc/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,14 +14,14 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlFinalState.cpp b/genplugouts/HtmlDoc/UmlFinalState.cpp
index 7d4091034..d93c3deb0 100644
--- a/genplugouts/HtmlDoc/UmlFinalState.cpp
+++ b/genplugouts/HtmlDoc/UmlFinalState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlFinalState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlFinalState::sKind()
+QByteArray UmlFinalState::sKind()
 {
     return "final state";
 }
diff --git a/genplugouts/HtmlDoc/UmlFinalState.h b/genplugouts/HtmlDoc/UmlFinalState.h
index 47dba2dee..a365965b2 100644
--- a/genplugouts/HtmlDoc/UmlFinalState.h
+++ b/genplugouts/HtmlDoc/UmlFinalState.h
@@ -2,14 +2,14 @@
 #define _UMLFINALSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseFinalState.h"
 
 class UmlFinalState : public UmlBaseFinalState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlFinalState(void * id) : UmlBaseFinalState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlFlow.cpp b/genplugouts/HtmlDoc/UmlFlow.cpp
index 8dd01556f..4cf70d301 100644
--- a/genplugouts/HtmlDoc/UmlFlow.cpp
+++ b/genplugouts/HtmlDoc/UmlFlow.cpp
@@ -2,14 +2,14 @@
 #include "UmlActivityNode.h"
 #include "UmlFlow.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlFlow::sKind()
+QByteArray UmlFlow::sKind()
 {
     return "transition";
 }
 
-void UmlFlow::html(Q3CString, unsigned int, unsigned int)
+void UmlFlow::html(QByteArray, unsigned int, unsigned int)
 {
     fw.write("<table><tr><td><div class=\"element\">Flow  <b>");
     writeq(name());
@@ -21,7 +21,7 @@ void UmlFlow::html(Q3CString, unsigned int, unsigned int)
     target()->write();
     fw.write("</p>");
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
@@ -29,7 +29,7 @@ void UmlFlow::html(Q3CString, unsigned int, unsigned int)
         fw.write("<br /></p>");
     }
 
-    Q3CString scpp, sjava;
+    QByteArray scpp, sjava;
 
     s = weight();
     scpp = cppWeight();
diff --git a/genplugouts/HtmlDoc/UmlFlow.h b/genplugouts/HtmlDoc/UmlFlow.h
index ba48bd787..23f738d77 100644
--- a/genplugouts/HtmlDoc/UmlFlow.h
+++ b/genplugouts/HtmlDoc/UmlFlow.h
@@ -2,7 +2,7 @@
 #define _UMLFLOW_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseFlow.h"
 #include "UmlActivityItem.h"
 
@@ -10,13 +10,13 @@ class UmlFlow : public UmlBaseFlow, public UmlActivityItem
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
-    UmlFlow(void * id, const Q3CString & n) : UmlBaseFlow(id, n) {
+    UmlFlow(void * id, const QByteArray & n) : UmlBaseFlow(id, n) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlForkPseudoState.cpp b/genplugouts/HtmlDoc/UmlForkPseudoState.cpp
index f036cd41d..05c2c9f31 100644
--- a/genplugouts/HtmlDoc/UmlForkPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlForkPseudoState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlForkPseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlForkPseudoState::sKind()
+QByteArray UmlForkPseudoState::sKind()
 {
     return "fork pseudo state";
 }
diff --git a/genplugouts/HtmlDoc/UmlForkPseudoState.h b/genplugouts/HtmlDoc/UmlForkPseudoState.h
index 8f1a558e3..9e06ac82f 100644
--- a/genplugouts/HtmlDoc/UmlForkPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlForkPseudoState.h
@@ -2,14 +2,14 @@
 #define _UMLFORKPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseForkPseudoState.h"
 
 class UmlForkPseudoState : public UmlBaseForkPseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlForkPseudoState(void * id) : UmlBaseForkPseudoState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlInitialPseudoState.cpp b/genplugouts/HtmlDoc/UmlInitialPseudoState.cpp
index bb6f32c8a..52f4c1fb3 100644
--- a/genplugouts/HtmlDoc/UmlInitialPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlInitialPseudoState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlInitialPseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlInitialPseudoState::sKind()
+QByteArray UmlInitialPseudoState::sKind()
 {
     return "initial pseudo state";
 }
diff --git a/genplugouts/HtmlDoc/UmlInitialPseudoState.h b/genplugouts/HtmlDoc/UmlInitialPseudoState.h
index 25832b908..65d1b5d4f 100644
--- a/genplugouts/HtmlDoc/UmlInitialPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlInitialPseudoState.h
@@ -2,14 +2,14 @@
 #define _UMLINITIALPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseInitialPseudoState.h"
 
 class UmlInitialPseudoState : public UmlBaseInitialPseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlInitialPseudoState(void * id) : UmlBaseInitialPseudoState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlInterruptibleActivityRegion.cpp b/genplugouts/HtmlDoc/UmlInterruptibleActivityRegion.cpp
index e4df3032b..b61190a0e 100644
--- a/genplugouts/HtmlDoc/UmlInterruptibleActivityRegion.cpp
+++ b/genplugouts/HtmlDoc/UmlInterruptibleActivityRegion.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlInterruptibleActivityRegion.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlInterruptibleActivityRegion::sKind()
+QByteArray UmlInterruptibleActivityRegion::sKind()
 {
     return "interruptible activity region";
 }
 
-void UmlInterruptibleActivityRegion::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlInterruptibleActivityRegion::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlItem::html(pfix, rank, "Interruptible activity region", level, "interruptibleactivityregion");
 
diff --git a/genplugouts/HtmlDoc/UmlInterruptibleActivityRegion.h b/genplugouts/HtmlDoc/UmlInterruptibleActivityRegion.h
index 99630e238..c98faff43 100644
--- a/genplugouts/HtmlDoc/UmlInterruptibleActivityRegion.h
+++ b/genplugouts/HtmlDoc/UmlInterruptibleActivityRegion.h
@@ -3,21 +3,21 @@
 
 
 #include "UmlBaseInterruptibleActivityRegion.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion : public UmlBaseInterruptibleActivityRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlBaseInterruptibleActivityRegion(id, s) {
+    UmlInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlBaseInterruptibleActivityRegion(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlItem.cpp b/genplugouts/HtmlDoc/UmlItem.cpp
index f1ca1f7d3..b4ab3b8b9 100644
--- a/genplugouts/HtmlDoc/UmlItem.cpp
+++ b/genplugouts/HtmlDoc/UmlItem.cpp
@@ -4,10 +4,10 @@
 #include "UmlTypeSpec.h"
 
 #include <qdir.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qmessagebox.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlClass.h"
 #include "UmlOperation.h"
@@ -34,7 +34,7 @@ UmlItem::~UmlItem()
 {
 }
 
-Q3CString UmlItem::sKind()
+QByteArray UmlItem::sKind()
 {
     return "???";
 }
@@ -45,7 +45,6 @@ void UmlItem::set_dir(int argc, char ** argv)
     bool ask;
     bool rem;
     bool replace_css;
-
     if ((argc != 0) && !strcmp(argv[0], "-flat")) {
         flat = TRUE;
         argc -= 1;
@@ -61,13 +60,12 @@ void UmlItem::set_dir(int argc, char ** argv)
     }
     else
         svg = FALSE;
-
     if (argc == 0) {
         if (!UmlBasePackage::getProject()->propertyValue("html dir", directory))
             directory = "/tmp/" + name() + "_html";
 
         d = directory;
-        d = Q3FileDialog::getExistingDirectory(d, 0, "", "Directory where the files will be produced", TRUE);
+        d = QFileDialog::getExistingDirectory(0,"Directory where the files will be produced",d);
 
         if (d.isEmpty())
             throw 0;
@@ -115,7 +113,7 @@ void UmlItem::set_dir(int argc, char ** argv)
     if ((d.at(d.length() - 1) != '/') && (d.at(d.length() - 1) != '\\'))
         d += '/';
 
-    directory = (const char *) d;
+    directory = d.toLatin1();
 
     QDir dir(d);
     unsigned i;
@@ -124,7 +122,7 @@ void UmlItem::set_dir(int argc, char ** argv)
         if (ask) {
             // remove old html files ?
             for (i = 0; i != dir.count(); i += 1) {
-                if (dir[i].right(5).lower() == ".html") {
+                if (dir[i].right(5).toLower() == ".html") {
                     if (!rem &&
                         (QMessageBox::critical(0, "Html generator",
                                                "Delete already existing html files ?",
@@ -154,7 +152,7 @@ void UmlItem::set_dir(int argc, char ** argv)
         else {
             if (rem) {
                 for (i = 0; i != dir.count(); i += 1) {
-                    if (dir[i].right(5).lower() == ".html")
+                    if (dir[i].right(5).toLower() == ".html")
                         dir.remove(dir[i]);
                 }
             }
@@ -228,9 +226,9 @@ void UmlItem::memo_ref()
     all.addElement(this);
     known = TRUE;
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1)
+    for (int i = 0; i != ch.size(); i += 1)
         ch[i]->memo_ref();
 }
 
@@ -243,16 +241,16 @@ void UmlItem::define()
     fw.write("\"></a>\n");
 }
 
-void UmlItem::start_file(Q3CString f, Q3CString s, bool withrefs)
+void UmlItem::start_file(QByteArray f, QByteArray s, bool withrefs)
 {
-    Q3CString filename = directory + f;
+    QByteArray filename = directory + f;
     bool is_frame = (f == "index-withframe");
 
     if (! fw.open(filename + ".html"))
         throw 0;
 
     fw.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-    fw.write("<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->\n");
+    fw.write("<!-- Documentation produced by the Html generator of DoUML (https://github.com/DoUML) -->\n");
     fw.write((is_frame)
              ? "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">\n"
              : "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
@@ -326,7 +324,7 @@ void UmlItem::ref_indexes()
     UmlDeploymentDiagram::ref_index();
     fw.write("</p>\n<p>\n</p>\n<p>");
 
-    for (unsigned i = 0; i != letters.length(); i += 1) {
+    for (int i = 0; i != letters.length(); i += 1) {
         fw.write("<a href=\"index_");
         fw.write(letters.at(i) & 255u);
         fw.write(".html\" target = \"projectFrame\"><b> ");
@@ -366,7 +364,7 @@ void UmlItem::generate_indexes()
 
     for (i = 0; i != n; i += 1) {
         UmlItem * x = all.elementAt(i);
-        Q3CString s = x->pretty_name();
+        QByteArray s = x->pretty_name();
 
         if (! s.isEmpty()) {
             char c = *((const char *) s);
@@ -385,7 +383,7 @@ void UmlItem::generate_indexes()
 
     for (i = 0; i != n; i += 1) {
         UmlItem * x = all.elementAt(i);
-        Q3CString s = x->pretty_name();
+        QByteArray s = x->pretty_name();
 
         if (! s.isEmpty()) {
             char c = *((const char *) s);
@@ -401,11 +399,11 @@ void UmlItem::generate_indexes()
 
                 previous = c;
 
-                Q3CString sn;
+                QByteArray sn;
 
                 sn.setNum((int)(c & 255));
 
-                start_file(Q3CString("index_") + sn, Q3CString("") + c, TRUE);
+                start_file(QByteArray("index_") + sn, QByteArray("") + c, TRUE);
 
                 fw.write("<table>\n");
                 fw.write("<tr bgcolor=\"#f0f0f0\"><td align=\"center\"><b>Name</b></td><td align=\"center\"><b>Kind</b></td><td align=\"center\"><b>Description</b></td></tr>\n");
@@ -461,7 +459,7 @@ bool UmlItem::chapterp()
     return FALSE;
 }
 
-void UmlItem::html(Q3CString pfix, unsigned int rank, Q3CString what, unsigned int level, Q3CString kind)
+void UmlItem::html(QByteArray pfix, unsigned int rank, QByteArray what, unsigned int level, QByteArray kind)
 {
     define();
 
@@ -475,11 +473,11 @@ void UmlItem::html(Q3CString pfix, unsigned int rank, Q3CString what, unsigned i
 
     write_properties();
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     if (n != 0) {
-        Q3CString spfix;
+        QByteArray spfix;
 
         if (rank != 0) {
             spfix.setNum(rank);
@@ -511,7 +509,7 @@ void UmlItem::html(const char * what, UmlDiagram * diagram)
     writeq(name());
     fw.write("</b></div></td></tr></table>\n");
 
-    Q3CString d = description();
+    QByteArray d = description();
 
     if (!d.isEmpty()) {
         fw.write("<p>");
@@ -530,13 +528,13 @@ void UmlItem::html(const char * what, UmlDiagram * diagram)
     write_properties();
 }
 
-void UmlItem::write_children(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlItem::write_children(QByteArray pfix, unsigned int rank, unsigned int level)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     if (n != 0) {
-        Q3CString spfix;
+        QByteArray spfix;
         unsigned srank = 1;
 
         if (rank != 0) {
@@ -561,7 +559,7 @@ void UmlItem::write_children(Q3CString pfix, unsigned int rank, unsigned int lev
 
 void UmlItem::write_dependencies()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1) {
@@ -582,27 +580,27 @@ void UmlItem::write_properties()
         fw.write("</p>\n");
     }
 
-    const Q3Dict<Q3CString> d = properties();
+    const QHash<QByteArray, QByteArray*> d = properties();
 
     if (! d.isEmpty()) {
         fw.write("<p>Properties:</p><ul>\n");
 
-        Q3DictIterator<Q3CString> it(d);
+        QHashIterator<QByteArray, QByteArray*> it(d);
 
-        while (it.current()) {
+        while (it.hasNext()) {
+            it.next();
             fw.write("<li>");
-            writeq(it.currentKey().latin1());
+            writeq(it.key());
             fw.write(":<br /><div class=\"sub\">");
-            writeq(*(it.current()));
+            writeq(*(it.value()));
             fw.write("</div></li>\n");
-            ++it;
         }
 
         fw.write("</ul>\n");
     }
 }
 
-void UmlItem::chapter(Q3CString k, Q3CString pfix, unsigned int rank, Q3CString kind, unsigned int level)
+void UmlItem::chapter(QByteArray k, QByteArray pfix, unsigned int rank, QByteArray kind, unsigned int level)
 {
     if (rank != 0) {
         if (level > 4)
@@ -676,8 +674,8 @@ void UmlItem::manage_alias(const char *& p)
     const char * pclosed;
 
     if ((p[1] == '{') && ((pclosed = strchr(p + 2, '}')) != 0)) {
-        Q3CString key(p + 2, pclosed - p - 1);
-        Q3CString value;
+        QByteArray key(p + 2, pclosed - p - 1);
+        QByteArray value;
         UmlItem * node = this;
 
         do {
@@ -732,7 +730,7 @@ void UmlItem::write()
         writeq(name());
 }
 
-void UmlItem::write(Q3CString target)
+void UmlItem::write(QByteArray target)
 {
     if (known) {
         fw.write("<a href=\"index.html#ref");
@@ -749,7 +747,7 @@ void UmlItem::write(Q3CString target)
         writeq(name());
 }
 
-void UmlItem::writeq(Q3CString s)
+void UmlItem::writeq(QByteArray s)
 {
     const char * p = s;
 
@@ -948,7 +946,7 @@ void UmlItem::write(anOrdering d)
     }
 }
 
-void UmlItem::generate_index(Vector & v, Q3CString k, Q3CString r)
+void UmlItem::generate_index(Vector & v, QByteArray k, QByteArray r)
 {
     int n = v.size();
 
@@ -1019,8 +1017,8 @@ void UmlItem::sort(Vector & v, int low, int high)
 
 bool UmlItem::gt(UmlItem * other)
 {
-    Q3CString s1 = pretty_name();
-    Q3CString s2 = other->pretty_name();
+    QByteArray s1 = pretty_name();
+    QByteArray s2 = other->pretty_name();
     int i = qstricmp((const char *) s1, (const char *) s2);
 
     if ((i == 0) && (parent() != 0) && (other->parent() != 0)) {
@@ -1033,7 +1031,7 @@ bool UmlItem::gt(UmlItem * other)
         return (i > 0);
 }
 
-Q3CString UmlItem::pretty_name()
+QByteArray UmlItem::pretty_name()
 {
     return name().isEmpty() ? sKind() : name();
 }
@@ -1042,11 +1040,11 @@ Vector UmlItem::all;
 
 FileWriter UmlItem::fw;
 
-Q3CString UmlItem::directory;
+QByteArray UmlItem::directory;
 
 unsigned int UmlItem::nrefs = 0;
 
-Q3CString UmlItem::letters;
+QByteArray UmlItem::letters;
 
 //true => use SVG picture rather than PNG
 bool UmlItem::flat;
diff --git a/genplugouts/HtmlDoc/UmlItem.h b/genplugouts/HtmlDoc/UmlItem.h
index 8ce4c9caa..fb2bc8c76 100644
--- a/genplugouts/HtmlDoc/UmlItem.h
+++ b/genplugouts/HtmlDoc/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+
 #include "aLanguage.h"
 #include "aVisibility.h"
 #include "aDirection.h"
@@ -12,7 +12,7 @@
 #include "Vector.h"
 #include "FileWriter.h"
 
-#include <q3textstream.h>
+#include <qtextstream.h>
 class UmlDiagram;
 class UmlTypeSpec;
 
@@ -23,12 +23,12 @@ class UmlTypeSpec;
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n), known(FALSE) { };
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n), known(FALSE) { };
 
     virtual ~UmlItem();
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  Set the directory where the files will be generated
     //  initializing 'directory'.
@@ -41,7 +41,7 @@ class UmlItem : public UmlBaseItem
 
     void define();
 
-    static void start_file(Q3CString f, Q3CString s, bool withrefs);
+    static void start_file(QByteArray f, QByteArray s, bool withrefs);
 
     static void end_file();
 
@@ -53,21 +53,21 @@ class UmlItem : public UmlBaseItem
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level) = 0;
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) = 0;
 
     virtual bool chapterp();
 
-    void html(Q3CString pfix, unsigned int rank, Q3CString what, unsigned int level, Q3CString kind);
+    void html(QByteArray pfix, unsigned int rank, QByteArray what, unsigned int level, QByteArray kind);
 
     void html(const char * what, UmlDiagram * diagram);
 
-    void write_children(Q3CString pfix, unsigned int rank, unsigned int level);
+    void write_children(QByteArray pfix, unsigned int rank, unsigned int level);
 
     void write_dependencies();
 
     void write_properties();
 
-    void chapter(Q3CString k, Q3CString pfix, unsigned int rank, Q3CString kind, unsigned int level);
+    void chapter(QByteArray k, QByteArray pfix, unsigned int rank, QByteArray kind, unsigned int level);
 
     //bypass the comments at the beginning of the form
 
@@ -77,9 +77,9 @@ class UmlItem : public UmlBaseItem
 
     virtual void write();
 
-    virtual void write(Q3CString target);
+    virtual void write(QByteArray target);
 
-    static void writeq(Q3CString s);
+    static void writeq(QByteArray s);
 
     static void writeq(char c);
 
@@ -97,7 +97,7 @@ class UmlItem : public UmlBaseItem
 
     static void write(anOrdering d);
 
-    static void generate_index(Vector & v, Q3CString k, Q3CString r);
+    static void generate_index(Vector & v, QByteArray k, QByteArray r);
 
     static void sort(Vector & v);
 
@@ -109,7 +109,7 @@ class UmlItem : public UmlBaseItem
 
 
 public:
-    virtual Q3CString pretty_name();
+    virtual QByteArray pretty_name();
 
 
 protected:
@@ -119,11 +119,11 @@ class UmlItem : public UmlBaseItem
 
     static FileWriter fw;
 
-    static Q3CString directory;
+    static QByteArray directory;
 
     static unsigned int nrefs;
 
-    static Q3CString letters;
+    static QByteArray letters;
 
     //true => use SVG picture rather than PNG
     static bool flat;
diff --git a/genplugouts/HtmlDoc/UmlJoinPseudoState.cpp b/genplugouts/HtmlDoc/UmlJoinPseudoState.cpp
index b33f7ef46..be813b106 100644
--- a/genplugouts/HtmlDoc/UmlJoinPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlJoinPseudoState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlJoinPseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlJoinPseudoState::sKind()
+QByteArray UmlJoinPseudoState::sKind()
 {
     return "join pseudo state";
 }
diff --git a/genplugouts/HtmlDoc/UmlJoinPseudoState.h b/genplugouts/HtmlDoc/UmlJoinPseudoState.h
index 8d5430c44..2b40bedaf 100644
--- a/genplugouts/HtmlDoc/UmlJoinPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlJoinPseudoState.h
@@ -2,14 +2,14 @@
 #define _UMLJOINPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseJoinPseudoState.h"
 
 class UmlJoinPseudoState : public UmlBaseJoinPseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlJoinPseudoState(void * id) : UmlBaseJoinPseudoState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlJunctionPseudoState.cpp b/genplugouts/HtmlDoc/UmlJunctionPseudoState.cpp
index db93aae02..bc1928411 100644
--- a/genplugouts/HtmlDoc/UmlJunctionPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlJunctionPseudoState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlJunctionPseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlJunctionPseudoState::sKind()
+QByteArray UmlJunctionPseudoState::sKind()
 {
     return "junction pseudo state";
 }
diff --git a/genplugouts/HtmlDoc/UmlJunctionPseudoState.h b/genplugouts/HtmlDoc/UmlJunctionPseudoState.h
index ba84bd26b..c45c073e0 100644
--- a/genplugouts/HtmlDoc/UmlJunctionPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlJunctionPseudoState.h
@@ -2,14 +2,14 @@
 #define _UMLJUNCTIONPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseJunctionPseudoState.h"
 
 class UmlJunctionPseudoState : public UmlBaseJunctionPseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlJunctionPseudoState(void * id) : UmlBaseJunctionPseudoState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlNcRelation.cpp b/genplugouts/HtmlDoc/UmlNcRelation.cpp
index 513783e7f..a5fe541e5 100644
--- a/genplugouts/HtmlDoc/UmlNcRelation.cpp
+++ b/genplugouts/HtmlDoc/UmlNcRelation.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlNcRelation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlNcRelation::sKind()
+QByteArray UmlNcRelation::sKind()
 {
     return "non class relation";
 }
 
-void UmlNcRelation::html(Q3CString, unsigned int, unsigned int)
+void UmlNcRelation::html(QByteArray, unsigned int, unsigned int)
 {
 }
 
diff --git a/genplugouts/HtmlDoc/UmlNcRelation.h b/genplugouts/HtmlDoc/UmlNcRelation.h
index 45b549357..d56854e6d 100644
--- a/genplugouts/HtmlDoc/UmlNcRelation.h
+++ b/genplugouts/HtmlDoc/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+
 
 //This class manages 'relations' between non class objects
 //
@@ -11,14 +11,14 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     virtual void memo_ref();
 
diff --git a/genplugouts/HtmlDoc/UmlNode.cpp b/genplugouts/HtmlDoc/UmlNode.cpp
index aaadb6d3a..ff1823a69 100644
--- a/genplugouts/HtmlDoc/UmlNode.cpp
+++ b/genplugouts/HtmlDoc/UmlNode.cpp
@@ -3,13 +3,13 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlNode::sKind()
+#include <QByteArray>
+QByteArray UmlNode::sKind()
 {
     return "node";
 }
 
-void UmlNode::html(Q3CString, unsigned int, unsigned int)
+void UmlNode::html(QByteArray, unsigned int, unsigned int)
 {
     UmlCom::message(name());
 
diff --git a/genplugouts/HtmlDoc/UmlNode.h b/genplugouts/HtmlDoc/UmlNode.h
index 1955b7f78..3bee35996 100644
--- a/genplugouts/HtmlDoc/UmlNode.h
+++ b/genplugouts/HtmlDoc/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+
 
 // This class manages 'nodes'
 //
@@ -11,14 +11,14 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlObjectDiagram.cpp b/genplugouts/HtmlDoc/UmlObjectDiagram.cpp
index 098eb9f4a..26f8cdd36 100644
--- a/genplugouts/HtmlDoc/UmlObjectDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlObjectDiagram.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlObjectDiagram::sKind()
+QByteArray UmlObjectDiagram::sKind()
 {
     return "object diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlObjectDiagram.h b/genplugouts/HtmlDoc/UmlObjectDiagram.h
index e24a995bd..faac82ad6 100644
--- a/genplugouts/HtmlDoc/UmlObjectDiagram.h
+++ b/genplugouts/HtmlDoc/UmlObjectDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseObjectDiagram.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'object diagrams', notes that the class 'UmlDiagram'
@@ -15,11 +15,11 @@ class UmlObjectDiagram : public UmlBaseObjectDiagram
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlObjectDiagram(void * id, const Q3CString & s) : UmlBaseObjectDiagram(id, s) {
+    UmlObjectDiagram(void * id, const QByteArray & s) : UmlBaseObjectDiagram(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //set he html ref
     //set the diagrams list
diff --git a/genplugouts/HtmlDoc/UmlOnSignalAction.cpp b/genplugouts/HtmlDoc/UmlOnSignalAction.cpp
index 8a26beb48..ea490974f 100644
--- a/genplugouts/HtmlDoc/UmlOnSignalAction.cpp
+++ b/genplugouts/HtmlDoc/UmlOnSignalAction.cpp
@@ -1,15 +1,15 @@
 
 #include "UmlOnSignalAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlOnSignalAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlOnSignalAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlActivityAction::html();
 
-    Q3CString s = signal();
-    Q3CString scpp = cppSignal();
-    Q3CString sjava = javaSignal();
+    QByteArray s = signal();
+    QByteArray scpp = cppSignal();
+    QByteArray sjava = javaSignal();
 
     if (!s.isEmpty() || !scpp.isEmpty() || !sjava.isEmpty()) {
         fw.write("<p>Signal :</p><ul>");
diff --git a/genplugouts/HtmlDoc/UmlOnSignalAction.h b/genplugouts/HtmlDoc/UmlOnSignalAction.h
index ecea7956e..a6dbf1f65 100644
--- a/genplugouts/HtmlDoc/UmlOnSignalAction.h
+++ b/genplugouts/HtmlDoc/UmlOnSignalAction.h
@@ -2,7 +2,7 @@
 #define _UMLONSIGNALACTION_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseOnSignalAction.h"
 
 class UmlOnSignalAction : public UmlBaseOnSignalAction
@@ -10,12 +10,13 @@ class UmlOnSignalAction : public UmlBaseOnSignalAction
 public:
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level) override;
 
+    using UmlBaseOnSignalAction::html;
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOnSignalAction(void * id, const Q3CString & s) : UmlBaseOnSignalAction(id, s) {
+    UmlOnSignalAction(void * id, const QByteArray & s) : UmlBaseOnSignalAction(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlOperation.cpp b/genplugouts/HtmlDoc/UmlOperation.cpp
index 7bdef161a..8c464e77e 100644
--- a/genplugouts/HtmlDoc/UmlOperation.cpp
+++ b/genplugouts/HtmlDoc/UmlOperation.cpp
@@ -7,10 +7,10 @@
 #include "PythonSettings.h"
 #include "UmlRelation.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 
-Q3CString UmlOperation::sKind()
+QByteArray UmlOperation::sKind()
 {
     return "operation";
 }
@@ -23,7 +23,7 @@ void UmlOperation::memo_ref()
     UmlItem::memo_ref();
 }
 
-void UmlOperation::html(Q3CString, unsigned int, unsigned int)
+void UmlOperation::html(QByteArray, unsigned int, unsigned int)
 {
     define();
 
@@ -31,7 +31,7 @@ void UmlOperation::html(Q3CString, unsigned int, unsigned int)
     writeq(name());
     fw.write("</b></div></td></tr></table>");
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (! s.isEmpty()) {
         fw.write("<p>");
@@ -142,7 +142,7 @@ void UmlOperation::gen_uml_decl()
     write(visibility());
     writeq(name());
 
-    const Q3ValueList<UmlParameter> & pa = params();
+    const QList<UmlParameter> & pa = params();
     unsigned npa = pa.count();
     unsigned rank;
     const char * sep = "(";
@@ -171,7 +171,7 @@ void UmlOperation::gen_uml_decl()
         fw.write(" : ");
         write(p.type);
 
-        Q3CString s = p.default_value;
+        QByteArray s = p.default_value;
 
         if (!s.isEmpty()) {
             if (s[0] != '=')
@@ -186,7 +186,7 @@ void UmlOperation::gen_uml_decl()
 
     sep = ",  exceptions : ";
 
-    const Q3ValueList<UmlTypeSpec> e = exceptions();
+    const QList<UmlTypeSpec> e = exceptions();
     unsigned n = e.count();
 
     for (unsigned index2 = 0; index2 != n; index2 += 1) {
@@ -196,7 +196,7 @@ void UmlOperation::gen_uml_decl()
     }
 }
 
-void UmlOperation::gen_cpp_decl(Q3CString s, bool descr)
+void UmlOperation::gen_cpp_decl(QByteArray s, bool descr)
 {
     const char * p = bypass_comment(s);
 
@@ -210,9 +210,9 @@ void UmlOperation::gen_cpp_decl(Q3CString s, bool descr)
     else
         p = s;
 
-    const Q3ValueList<UmlParameter> & pa = params();
-    unsigned npa = pa.count();
-    unsigned rank;
+    const QList<UmlParameter> & pa = params();
+    int npa = pa.count();
+    int rank;
 
     while (*p) {
         if (!strncmp(p, "${comment}", 10))
@@ -275,7 +275,7 @@ void UmlOperation::gen_cpp_decl(Q3CString s, bool descr)
             p += 8;
 
             const char * sep = " throw (";
-            Q3ValueList<UmlTypeSpec> e = exceptions();
+            QList<UmlTypeSpec> e = exceptions();
             unsigned n = e.count();
             unsigned index2;
 
@@ -368,10 +368,10 @@ void UmlOperation::gen_cpp_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlOperation::gen_java_decl(Q3CString s, bool descr)
+void UmlOperation::gen_java_decl(QByteArray s, bool descr)
 {
     const char * p = bypass_comment(s);
-    const Q3ValueList<UmlParameter> & pa = params();
+    const QList<UmlParameter> & pa = params();
     unsigned npa = pa.count();
     unsigned rank;
 
@@ -429,7 +429,7 @@ void UmlOperation::gen_java_decl(Q3CString s, bool descr)
             p += 9;
 
             const char * sep = " throws ";
-            const Q3ValueList<UmlTypeSpec> e = exceptions();
+            const QList<UmlTypeSpec> e = exceptions();
             unsigned n = e.count();
 
             for (unsigned index2 = 0; index2 != n; index2 += 1) {
@@ -504,12 +504,12 @@ void UmlOperation::gen_java_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlOperation::gen_php_decl(Q3CString s, bool descr)
+void UmlOperation::gen_php_decl(QByteArray s, bool descr)
 {
-    Q3CString cl_stereotype =
+    QByteArray cl_stereotype =
         PhpSettings::classStereotype(parent()->stereotype());
     const char * p = bypass_comment(s);
-    const Q3ValueList<UmlParameter> & pa = params();
+    const QList<UmlParameter> & pa = params();
     unsigned npa = pa.count();
     unsigned rank;
 
@@ -612,12 +612,12 @@ void UmlOperation::gen_php_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlOperation::gen_python_decl(Q3CString s, bool descr)
+void UmlOperation::gen_python_decl(QByteArray s, bool descr)
 {
-    Q3CString cl_stereotype =
+    QByteArray cl_stereotype =
         PythonSettings::classStereotype(parent()->stereotype());
     const char * p = bypass_comment(s);
-    const Q3ValueList<UmlParameter> & pa = params();
+    const QList<UmlParameter> & pa = params();
     unsigned npa = pa.count();
     bool in_params = FALSE;
     unsigned rank;
@@ -724,23 +724,23 @@ void UmlOperation::gen_python_decl(Q3CString s, bool descr)
     }
 }
 
-Q3CString UmlOperation::compute_name(Q3CString s)
+QByteArray UmlOperation::compute_name(QByteArray s)
 {
     if (!s.isEmpty()) {
         UmlClassMember * m = getOf();
 
         if ((m != 0) || ((m = setOf()) != 0)) {
-            Q3CString n = (m->kind() == aRelation)
+            QByteArray n = (m->kind() == aRelation)
                           ? ((UmlRelation *) m)->roleName()
                           : m->name();
             int index;
 
-            if ((index = s.find("${name}")) != -1)
+            if ((index = s.indexOf("${name}")) != -1)
                 return s.left(index) + n + s.mid(index + 7);
-            else if ((index = s.find("${Name}")) != -1)
-                return s.left(index) + n.left(1).upper() + n.mid(1) + s.mid(index + 7);
-            else if ((index = s.find("${NAME}")) != -1)
-                return s.left(index) + n.upper() + s.mid(index + 7);
+            else if ((index = s.indexOf("${Name}")) != -1)
+                return s.left(index) + n.left(1).toUpper() + n.mid(1) + s.mid(index + 7);
+            else if ((index = s.indexOf("${NAME}")) != -1)
+                return s.left(index) + n.toUpper() + s.mid(index + 7);
             else
                 return s;
         }
diff --git a/genplugouts/HtmlDoc/UmlOperation.h b/genplugouts/HtmlDoc/UmlOperation.h
index ecfb5c514..3f170c6b1 100644
--- a/genplugouts/HtmlDoc/UmlOperation.h
+++ b/genplugouts/HtmlDoc/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
@@ -13,16 +13,16 @@
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     virtual void memo_ref();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     static void ref_index();
 
@@ -34,20 +34,20 @@ class UmlOperation : public UmlBaseOperation
     void gen_uml_decl();
 
     //produce the definition in C++
-    void gen_cpp_decl(Q3CString s, bool descr);
+    void gen_cpp_decl(QByteArray s, bool descr);
 
     //produce the definition in Java
-    void gen_java_decl(Q3CString s, bool descr);
+    void gen_java_decl(QByteArray s, bool descr);
 
     //produce the definition in Php
-    void gen_php_decl(Q3CString s, bool descr);
+    void gen_php_decl(QByteArray s, bool descr);
 
     //produce the definition in Python
-    void gen_python_decl(Q3CString s, bool descr);
+    void gen_python_decl(QByteArray s, bool descr);
 
 
 public:
-    Q3CString compute_name(Q3CString s);
+    QByteArray compute_name(QByteArray s);
 
 
 protected:
diff --git a/genplugouts/HtmlDoc/UmlPackage.cpp b/genplugouts/HtmlDoc/UmlPackage.cpp
index 67a0e184c..3c81e7004 100644
--- a/genplugouts/HtmlDoc/UmlPackage.cpp
+++ b/genplugouts/HtmlDoc/UmlPackage.cpp
@@ -3,15 +3,15 @@
 
 #include "UmlClassDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlPackage::sKind()
+QByteArray UmlPackage::sKind()
 {
     return (stereotype() == "profile")
            ? "profile" : "package";
 }
 
-void UmlPackage::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlPackage::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
@@ -20,7 +20,7 @@ void UmlPackage::html(Q3CString pfix, unsigned int rank, unsigned int level)
     else
         chapter("Package", pfix, rank, "package", level);
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
diff --git a/genplugouts/HtmlDoc/UmlPackage.h b/genplugouts/HtmlDoc/UmlPackage.h
index 2ea0fccf7..b67944945 100644
--- a/genplugouts/HtmlDoc/UmlPackage.h
+++ b/genplugouts/HtmlDoc/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages a 'package', notes that the project itself is a package
@@ -12,14 +12,14 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //set the html ref
     //set the package list
diff --git a/genplugouts/HtmlDoc/UmlParameterSet.cpp b/genplugouts/HtmlDoc/UmlParameterSet.cpp
index 280cc4f33..af82e23e1 100644
--- a/genplugouts/HtmlDoc/UmlParameterSet.cpp
+++ b/genplugouts/HtmlDoc/UmlParameterSet.cpp
@@ -2,20 +2,20 @@
 #include "UmlActivityPin.h"
 #include "UmlParameterSet.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlParameterSet::sKind()
+QByteArray UmlParameterSet::sKind()
 {
     return "parameter set";
 }
 
-void UmlParameterSet::html(Q3CString, unsigned int, unsigned int)
+void UmlParameterSet::html(QByteArray, unsigned int, unsigned int)
 {
     fw.write("<table><tr><td><div class=\"element\">Parameter set  <b>");
     writeq(name());
     fw.write("</b></div></td></tr></table>");
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
@@ -25,7 +25,7 @@ void UmlParameterSet::html(Q3CString, unsigned int, unsigned int)
 
     fw.write("<p>Contains :");
 
-    const Q3PtrVector<UmlActivityPin> & p = pins();
+    const QVector<UmlActivityPin*> & p = pins();
     unsigned n = p.size();
 
     for (unsigned i = 0; i != n; i += 1) {
diff --git a/genplugouts/HtmlDoc/UmlParameterSet.h b/genplugouts/HtmlDoc/UmlParameterSet.h
index 71124ae05..b4ae530a1 100644
--- a/genplugouts/HtmlDoc/UmlParameterSet.h
+++ b/genplugouts/HtmlDoc/UmlParameterSet.h
@@ -3,22 +3,22 @@
 
 
 #include "UmlBaseParameterSet.h"
-#include <q3cstring.h>
+
 #include "UmlActivityItem.h"
 
 class UmlParameterSet : public UmlBaseParameterSet, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlParameterSet(void * id, const Q3CString & s) : UmlBaseParameterSet(id, s) {
+    UmlParameterSet(void * id, const QByteArray & s) : UmlBaseParameterSet(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlPinParameter.cpp b/genplugouts/HtmlDoc/UmlPinParameter.cpp
index d61a4c896..ddc4c0391 100644
--- a/genplugouts/HtmlDoc/UmlPinParameter.cpp
+++ b/genplugouts/HtmlDoc/UmlPinParameter.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlPinParameter.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlPinParameter::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlPinParameter::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     if (isUnique()) {
         if (isException())
diff --git a/genplugouts/HtmlDoc/UmlPinParameter.h b/genplugouts/HtmlDoc/UmlPinParameter.h
index 41f6e5df2..38c71a7d2 100644
--- a/genplugouts/HtmlDoc/UmlPinParameter.h
+++ b/genplugouts/HtmlDoc/UmlPinParameter.h
@@ -3,20 +3,20 @@
 
 
 #include "UmlBasePinParameter.h"
-#include <q3cstring.h>
+
 
 class UmlPinParameter : public UmlBasePinParameter
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPinParameter(void * id, const Q3CString & s) : UmlBasePinParameter(id, s) {
+    UmlPinParameter(void * id, const QByteArray & s) : UmlBasePinParameter(id, s) {
     }
 
 
 public:
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlPseudoState.cpp b/genplugouts/HtmlDoc/UmlPseudoState.cpp
index a4aa1b1c0..9e7ebd4c8 100644
--- a/genplugouts/HtmlDoc/UmlPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlPseudoState.cpp
@@ -2,17 +2,17 @@
 #include "UmlCom.h"
 #include "UmlPseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlPseudoState::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlPseudoState::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
     UmlCom::message(name());
 
-    Q3CString s = sKind();
+    QByteArray s = sKind();
 
-    s.replace(0, 1, s.left(1).upper());
+    s.replace(0, 1, s.left(1).toUpper());
     UmlItem::html(s, (UmlDiagram *) 0);
 
     fw.write("<p>Defined in ");
diff --git a/genplugouts/HtmlDoc/UmlPseudoState.h b/genplugouts/HtmlDoc/UmlPseudoState.h
index 7cbae98fd..49d6ef292 100644
--- a/genplugouts/HtmlDoc/UmlPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,12 +10,12 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlRegion.cpp b/genplugouts/HtmlDoc/UmlRegion.cpp
index b52af4fac..6a7baceed 100644
--- a/genplugouts/HtmlDoc/UmlRegion.cpp
+++ b/genplugouts/HtmlDoc/UmlRegion.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlRegion.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlRegion::sKind()
+QByteArray UmlRegion::sKind()
 {
     return "region";
 }
 
-void UmlRegion::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlRegion::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlItem::html(pfix, rank, "State region", level, "stateregion");
 
diff --git a/genplugouts/HtmlDoc/UmlRegion.h b/genplugouts/HtmlDoc/UmlRegion.h
index 8e8adfd82..608bbbd71 100644
--- a/genplugouts/HtmlDoc/UmlRegion.h
+++ b/genplugouts/HtmlDoc/UmlRegion.h
@@ -2,7 +2,7 @@
 #define _UMLREGION_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
 
@@ -10,15 +10,15 @@ class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     virtual bool chapterp();
 
diff --git a/genplugouts/HtmlDoc/UmlRelation.cpp b/genplugouts/HtmlDoc/UmlRelation.cpp
index aa4ca6632..71765c6e7 100644
--- a/genplugouts/HtmlDoc/UmlRelation.cpp
+++ b/genplugouts/HtmlDoc/UmlRelation.cpp
@@ -7,9 +7,9 @@
 #include "JavaSettings.h"
 #include "PythonSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlRelation::sKind()
+QByteArray UmlRelation::sKind()
 {
     return "relation";
 }
@@ -31,7 +31,7 @@ void UmlRelation::memo_ref()
     }
 }
 
-void UmlRelation::html(Q3CString, unsigned int, unsigned int)
+void UmlRelation::html(QByteArray, unsigned int, unsigned int)
 {
     bool extension;
 
@@ -60,7 +60,7 @@ void UmlRelation::html(Q3CString, unsigned int, unsigned int)
         fw.write("</b></div></td></tr></table>");
     }
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
@@ -130,7 +130,7 @@ void UmlRelation::html(Q3CString, unsigned int, unsigned int)
     unload(FALSE, FALSE);
 }
 
-void UmlRelation::gen_cpp_decl(Q3CString s, bool descr)
+void UmlRelation::gen_cpp_decl(QByteArray s, bool descr)
 {
     const char * p;
 
@@ -184,7 +184,7 @@ void UmlRelation::gen_cpp_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${multiplicity}", 15)) {
             p += 15;
 
-            Q3CString m = multiplicity();
+            QByteArray m = multiplicity();
 
             if (m.isEmpty() || (((const char *) m)[0] != '[')) {
                 fw.write("[");
@@ -234,7 +234,7 @@ void UmlRelation::gen_cpp_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlRelation::gen_java_decl(Q3CString s, bool descr)
+void UmlRelation::gen_java_decl(QByteArray s, bool descr)
 {
     const char * p = bypass_comment(s);
 
@@ -283,7 +283,7 @@ void UmlRelation::gen_java_decl(Q3CString s, bool descr)
         else if (!strncmp(p, "${multiplicity}", 15)) {
             p += 15;
 
-            Q3CString m = multiplicity();
+            QByteArray m = multiplicity();
 
             if (! m.isEmpty()) {
                 const char * s = m;
@@ -349,7 +349,7 @@ void UmlRelation::gen_java_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlRelation::gen_php_decl(Q3CString s, bool descr)
+void UmlRelation::gen_php_decl(QByteArray s, bool descr)
 {
     const char * p = bypass_comment(s);
 
@@ -423,9 +423,9 @@ void UmlRelation::gen_php_decl(Q3CString s, bool descr)
     }
 }
 
-void UmlRelation::gen_python_decl(Q3CString s)
+void UmlRelation::gen_python_decl(QByteArray s)
 {
-    Q3CString st = PythonSettings::classStereotype(stereotype());
+    QByteArray st = PythonSettings::classStereotype(stereotype());
     const char * p = bypass_comment(s);
 
     while (*p) {
@@ -474,7 +474,7 @@ void UmlRelation::gen_uml_decl()
     fw.write(" : ");
     roleType()->write();
 
-    Q3CString s;
+    QByteArray s;
 
     s = defaultValue();
 
@@ -506,7 +506,7 @@ void UmlRelation::gen_uml_decl()
 
 }
 
-Q3CString UmlRelation::pretty_name()
+QByteArray UmlRelation::pretty_name()
 {
     return roleName();
 }
diff --git a/genplugouts/HtmlDoc/UmlRelation.h b/genplugouts/HtmlDoc/UmlRelation.h
index d1c9e690c..5e2c5fa1a 100644
--- a/genplugouts/HtmlDoc/UmlRelation.h
+++ b/genplugouts/HtmlDoc/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'relations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,28 +12,28 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     virtual void memo_ref();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //produce the definition in C++
-    void gen_cpp_decl(Q3CString s, bool descr);
+    void gen_cpp_decl(QByteArray s, bool descr);
 
     //produce the definition in Java
-    void gen_java_decl(Q3CString s, bool descr);
+    void gen_java_decl(QByteArray s, bool descr);
 
     //produce the definition in Php
-    void gen_php_decl(Q3CString s, bool descr);
+    void gen_php_decl(QByteArray s, bool descr);
 
     //produce the definition in Python
-    void gen_python_decl(Q3CString s);
+    void gen_python_decl(QByteArray s);
 
 
 private:
@@ -42,7 +42,7 @@ class UmlRelation : public UmlBaseRelation
 
 
 public:
-    virtual Q3CString pretty_name();
+    virtual QByteArray pretty_name();
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlSequenceDiagram.cpp b/genplugouts/HtmlDoc/UmlSequenceDiagram.cpp
index 670355e74..e721c8ea3 100644
--- a/genplugouts/HtmlDoc/UmlSequenceDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlSequenceDiagram.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlSequenceDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlSequenceDiagram::sKind()
+QByteArray UmlSequenceDiagram::sKind()
 {
     return "sequence diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlSequenceDiagram.h b/genplugouts/HtmlDoc/UmlSequenceDiagram.h
index 72fdf93fa..be9a1dfdf 100644
--- a/genplugouts/HtmlDoc/UmlSequenceDiagram.h
+++ b/genplugouts/HtmlDoc/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
@@ -14,10 +14,10 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //set he html ref
     //set the diagrams list
diff --git a/genplugouts/HtmlDoc/UmlSettings.cpp b/genplugouts/HtmlDoc/UmlSettings.cpp
index a883d1744..b5397c9cb 100644
--- a/genplugouts/HtmlDoc/UmlSettings.cpp
+++ b/genplugouts/HtmlDoc/UmlSettings.cpp
@@ -6,15 +6,15 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -26,14 +26,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -45,14 +45,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -64,14 +64,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -83,14 +83,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -146,39 +146,39 @@ aLanguage UmlSettings::_uml_get_name;
 
 aLanguage UmlSettings::_uml_set_name;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -190,7 +190,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -203,7 +203,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -229,18 +229,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -251,7 +251,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_attribute_stereotypes.count();
 
@@ -262,7 +262,7 @@ Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString Um
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -273,19 +273,19 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         builtins[index] = _builtins[index];
-        _map_builtins.replace(builtins[index].uml, &builtins[index]);
+        _map_builtins.insert(builtins[index].uml, &builtins[index]);
     }
 
     builtins[index].uml = s;
@@ -310,19 +310,19 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
     return &_builtins[index];
 }
 
-UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_attr_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_attribute_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         relation_attribute_stereotypes[index] = _relation_attribute_stereotypes[index];
-        _map_relation_attribute_stereotypes.replace(relation_attribute_stereotypes[index].uml,
+        _map_relation_attribute_stereotypes.insert(relation_attribute_stereotypes[index].uml,
                 &relation_attribute_stereotypes[index]);
     }
 
@@ -345,19 +345,19 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
     return &_relation_attribute_stereotypes[index];
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         class_stereotypes[index] = _class_stereotypes[index];
-        _map_class_stereotypes.replace(class_stereotypes[index].uml, &class_stereotypes[index]);
+        _map_class_stereotypes.insert(class_stereotypes[index].uml, &class_stereotypes[index]);
     }
 
     class_stereotypes[index].uml = s;
diff --git a/genplugouts/HtmlDoc/UmlSettings.h b/genplugouts/HtmlDoc/UmlSettings.h
index dd49a85b1..2ecbd0f32 100644
--- a/genplugouts/HtmlDoc/UmlSettings.h
+++ b/genplugouts/HtmlDoc/UmlSettings.h
@@ -1,10 +1,10 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
+#include <QByteArray>
+#include <QHash>
 
-
-#include <q3cstring.h>
 #include "aLanguage.h"
-#include <q3dict.h>
+
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -20,44 +20,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
     // return the language from which the getter's name rule must be followed at Uml level
     static aLanguage umlGetName();
@@ -90,25 +90,25 @@ class UmlSettings
 
 
 protected:
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_attribute_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -116,19 +116,19 @@ class UmlSettings
 
     static void read_if_needed_();
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
-    static Q3CString uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
-    static UmlStereotype * add_rel_attr_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_attr_stereotype(const QByteArray & s);
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/HtmlDoc/UmlShallowHistoryPseudoState.cpp b/genplugouts/HtmlDoc/UmlShallowHistoryPseudoState.cpp
index 03734c0cc..b934d7082 100644
--- a/genplugouts/HtmlDoc/UmlShallowHistoryPseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlShallowHistoryPseudoState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlShallowHistoryPseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlShallowHistoryPseudoState::sKind()
+QByteArray UmlShallowHistoryPseudoState::sKind()
 {
     return "shallow history pseudo state";
 }
diff --git a/genplugouts/HtmlDoc/UmlShallowHistoryPseudoState.h b/genplugouts/HtmlDoc/UmlShallowHistoryPseudoState.h
index 79bfda906..3ade70e67 100644
--- a/genplugouts/HtmlDoc/UmlShallowHistoryPseudoState.h
+++ b/genplugouts/HtmlDoc/UmlShallowHistoryPseudoState.h
@@ -2,14 +2,14 @@
 #define _UMLSHALLOWHISTORYPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseShallowHistoryPseudoState.h"
 
 class UmlShallowHistoryPseudoState : public UmlBaseShallowHistoryPseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlShallowHistoryPseudoState(void * id) : UmlBaseShallowHistoryPseudoState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlState.cpp b/genplugouts/HtmlDoc/UmlState.cpp
index 6757805a5..f8093e89e 100644
--- a/genplugouts/HtmlDoc/UmlState.cpp
+++ b/genplugouts/HtmlDoc/UmlState.cpp
@@ -3,15 +3,15 @@
 #include "UmlOperation.h"
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlState::sKind()
+QByteArray UmlState::sKind()
 {
     return (parent()->kind() == aClassView)
            ? "state machine" : "state";
 }
 
-void UmlState::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlState::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     define();
 
@@ -19,7 +19,7 @@ void UmlState::html(Q3CString pfix, unsigned int rank, unsigned int level)
             ? "StateMachine" : "State",
             pfix, rank, "state", level);
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
@@ -46,7 +46,7 @@ void UmlState::html(Q3CString pfix, unsigned int rank, unsigned int level)
             fw.write("</p>");
         }
 
-        Q3CString scpp, sjava;
+        QByteArray scpp, sjava;
 
         s = entryBehavior();
         scpp = cppEntryBehavior();
diff --git a/genplugouts/HtmlDoc/UmlState.h b/genplugouts/HtmlDoc/UmlState.h
index 41d384963..abcbf058f 100644
--- a/genplugouts/HtmlDoc/UmlState.h
+++ b/genplugouts/HtmlDoc/UmlState.h
@@ -4,22 +4,22 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //set the html ref
     //set the state list
diff --git a/genplugouts/HtmlDoc/UmlStateAction.cpp b/genplugouts/HtmlDoc/UmlStateAction.cpp
index e3049d7d3..a0a6240a1 100644
--- a/genplugouts/HtmlDoc/UmlStateAction.cpp
+++ b/genplugouts/HtmlDoc/UmlStateAction.cpp
@@ -2,18 +2,18 @@
 #include "UmlCom.h"
 #include "UmlStateAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlStateAction::sKind()
+QByteArray UmlStateAction::sKind()
 {
     return "state action";
 }
 
-void UmlStateAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlStateAction::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlCom::message(name());
 
-    Q3CString s = stereotype();
+    QByteArray s = stereotype();
 
     if (s.isEmpty())
         s = "State action";
@@ -33,8 +33,8 @@ void UmlStateAction::html(Q3CString pfix, unsigned int rank, unsigned int level)
 
     s = expression();
 
-    Q3CString scpp = cppExpression();
-    Q3CString sjava = javaExpression();
+    QByteArray scpp = cppExpression();
+    QByteArray sjava = javaExpression();
 
     if ((!s.isEmpty()) || (!scpp.isEmpty()) || (!sjava.isEmpty())) {
         fw.write("<p>Expression :</p><ul>");
diff --git a/genplugouts/HtmlDoc/UmlStateAction.h b/genplugouts/HtmlDoc/UmlStateAction.h
index e436be3f3..c9cf06f59 100644
--- a/genplugouts/HtmlDoc/UmlStateAction.h
+++ b/genplugouts/HtmlDoc/UmlStateAction.h
@@ -2,7 +2,7 @@
 #define _UMLSTATEACTION_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseStateAction.h"
 #include "UmlStateItem.h"
 
@@ -10,11 +10,11 @@ class UmlStateAction : public UmlBaseStateAction, public UmlStateItem
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlStateAction(void * id) : UmlBaseStateAction(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlStateDiagram.cpp b/genplugouts/HtmlDoc/UmlStateDiagram.cpp
index e7ffa2df5..6c39463f4 100644
--- a/genplugouts/HtmlDoc/UmlStateDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlStateDiagram.cpp
@@ -1,7 +1,7 @@
 
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlStateDiagram::memo_ref()
 {
@@ -9,7 +9,7 @@ void UmlStateDiagram::memo_ref()
     UmlDiagram::memo_ref();
 }
 
-Q3CString UmlStateDiagram::sKind()
+QByteArray UmlStateDiagram::sKind()
 {
     return "state diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlStateDiagram.h b/genplugouts/HtmlDoc/UmlStateDiagram.h
index 3685f1446..4d09ed80c 100644
--- a/genplugouts/HtmlDoc/UmlStateDiagram.h
+++ b/genplugouts/HtmlDoc/UmlStateDiagram.h
@@ -2,7 +2,7 @@
 #define _UMLSTATEDIAGRAM_H
 
 
-#include <q3cstring.h>
+
 #include "Vector.h"
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
@@ -15,7 +15,7 @@ class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
     virtual void memo_ref();
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     static void ref_index();
 
@@ -28,7 +28,7 @@ class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlStereotype.h b/genplugouts/HtmlDoc/UmlStereotype.h
index 93a094aed..c30227884 100644
--- a/genplugouts/HtmlDoc/UmlStereotype.h
+++ b/genplugouts/HtmlDoc/UmlStereotype.h
@@ -2,31 +2,31 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
 
+#include <QByteArray>
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHPHP
-    Q3CString php;
+    QByteArray php;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString python;
+    QByteArray python;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/HtmlDoc/UmlTerminatePseudoState.cpp b/genplugouts/HtmlDoc/UmlTerminatePseudoState.cpp
index d66a0fb88..2c1c50e8f 100644
--- a/genplugouts/HtmlDoc/UmlTerminatePseudoState.cpp
+++ b/genplugouts/HtmlDoc/UmlTerminatePseudoState.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlTerminatePseudoState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlTerminatePseudoState::sKind()
+QByteArray UmlTerminatePseudoState::sKind()
 {
     return "terminate pseudo state";
 }
diff --git a/genplugouts/HtmlDoc/UmlTerminatePseudoState.h b/genplugouts/HtmlDoc/UmlTerminatePseudoState.h
index d8c8fb1a2..8c9445ecd 100644
--- a/genplugouts/HtmlDoc/UmlTerminatePseudoState.h
+++ b/genplugouts/HtmlDoc/UmlTerminatePseudoState.h
@@ -2,14 +2,14 @@
 #define _UMLTERMINATEPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseTerminatePseudoState.h"
 
 class UmlTerminatePseudoState : public UmlBaseTerminatePseudoState
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
     UmlTerminatePseudoState(void * id) : UmlBaseTerminatePseudoState(id, "") {
diff --git a/genplugouts/HtmlDoc/UmlTransition.cpp b/genplugouts/HtmlDoc/UmlTransition.cpp
index d89992ad9..268e9a840 100644
--- a/genplugouts/HtmlDoc/UmlTransition.cpp
+++ b/genplugouts/HtmlDoc/UmlTransition.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlTransition::sKind()
+QByteArray UmlTransition::sKind()
 {
     return "transition";
 }
 
-void UmlTransition::html(Q3CString, unsigned int, unsigned int)
+void UmlTransition::html(QByteArray, unsigned int, unsigned int)
 {
     fw.write("<table><tr><td><div class=\"element\">Transition  <b>");
     writeq(name());
@@ -27,7 +27,7 @@ void UmlTransition::html(Q3CString, unsigned int, unsigned int)
         fw.write("</p>");
     }
 
-    Q3CString s = description();
+    QByteArray s = description();
 
     if (!s.isEmpty()) {
         fw.write("<p>");
@@ -35,7 +35,7 @@ void UmlTransition::html(Q3CString, unsigned int, unsigned int)
         fw.write("<br /></p>");
     }
 
-    Q3CString scpp, sjava;
+    QByteArray scpp, sjava;
 
     s = trigger();
     scpp = cppTrigger();
diff --git a/genplugouts/HtmlDoc/UmlTransition.h b/genplugouts/HtmlDoc/UmlTransition.h
index d29b82147..0f191d14e 100644
--- a/genplugouts/HtmlDoc/UmlTransition.h
+++ b/genplugouts/HtmlDoc/UmlTransition.h
@@ -2,7 +2,7 @@
 #define _UMLTRANSITION_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
 
@@ -10,13 +10,13 @@ class UmlTransition : public UmlBaseTransition, public UmlStateItem
 {
 public:
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
-    UmlTransition(void * id, const Q3CString & n) : UmlBaseTransition(id, n) {
+    UmlTransition(void * id, const QByteArray & n) : UmlBaseTransition(id, n) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/UmlUseCase.cpp b/genplugouts/HtmlDoc/UmlUseCase.cpp
index 2afc253e2..dcaa58853 100644
--- a/genplugouts/HtmlDoc/UmlUseCase.cpp
+++ b/genplugouts/HtmlDoc/UmlUseCase.cpp
@@ -3,17 +3,17 @@
 
 #include "UmlUseCaseDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlUseCase::sKind()
+#include <QByteArray>
+QByteArray UmlUseCase::sKind()
 {
     return "use case";
 }
 
-void UmlUseCase::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlUseCase::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlItem::html(pfix, rank, "Use Case", level, "usecase");
 
-    Q3CString ep = extensionPoints();
+    QByteArray ep = extensionPoints();
 
     if (! ep.isEmpty()) {
         fw.write("<p>Extension points:<br /><div class=\"sub\">");
diff --git a/genplugouts/HtmlDoc/UmlUseCase.h b/genplugouts/HtmlDoc/UmlUseCase.h
index 754ededb6..e9de2e4cc 100644
--- a/genplugouts/HtmlDoc/UmlUseCase.h
+++ b/genplugouts/HtmlDoc/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'use case'
@@ -12,14 +12,14 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     //set the html ref
     //set the use case list
diff --git a/genplugouts/HtmlDoc/UmlUseCaseDiagram.cpp b/genplugouts/HtmlDoc/UmlUseCaseDiagram.cpp
index c83a2e6da..69344116c 100644
--- a/genplugouts/HtmlDoc/UmlUseCaseDiagram.cpp
+++ b/genplugouts/HtmlDoc/UmlUseCaseDiagram.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlUseCaseDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlUseCaseDiagram::sKind()
+QByteArray UmlUseCaseDiagram::sKind()
 {
     return "use case diagram";
 }
diff --git a/genplugouts/HtmlDoc/UmlUseCaseDiagram.h b/genplugouts/HtmlDoc/UmlUseCaseDiagram.h
index f1fa7a1ef..a0bdfdbd1 100644
--- a/genplugouts/HtmlDoc/UmlUseCaseDiagram.h
+++ b/genplugouts/HtmlDoc/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+
 #include "Vector.h"
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
@@ -14,10 +14,10 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //set he html ref
     //set the diagrams list
diff --git a/genplugouts/HtmlDoc/UmlUseCaseView.cpp b/genplugouts/HtmlDoc/UmlUseCaseView.cpp
index d39a93ca4..f21475a60 100644
--- a/genplugouts/HtmlDoc/UmlUseCaseView.cpp
+++ b/genplugouts/HtmlDoc/UmlUseCaseView.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlUseCaseView.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-Q3CString UmlUseCaseView::sKind()
+QByteArray UmlUseCaseView::sKind()
 {
     return "use case view";
 }
 
-void UmlUseCaseView::html(Q3CString pfix, unsigned int rank, unsigned int level)
+void UmlUseCaseView::html(QByteArray pfix, unsigned int rank, unsigned int level)
 {
     UmlItem::html(pfix, rank, "Use Case View", level, "view");
 
diff --git a/genplugouts/HtmlDoc/UmlUseCaseView.h b/genplugouts/HtmlDoc/UmlUseCaseView.h
index 13dab0f8b..d67206119 100644
--- a/genplugouts/HtmlDoc/UmlUseCaseView.h
+++ b/genplugouts/HtmlDoc/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case view'
 //
@@ -11,14 +11,14 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
     //returns a string indicating the king of the element
-    virtual Q3CString sKind();
+    virtual QByteArray sKind();
 
     //entry to produce the html code receiving chapter number
     //path, rank in the mother and level in the browser tree
-    virtual void html(Q3CString pfix, unsigned int rank, unsigned int level);
+    virtual void html(QByteArray pfix, unsigned int rank, unsigned int level);
 
     virtual bool chapterp();
 
diff --git a/genplugouts/HtmlDoc/UmlView.h b/genplugouts/HtmlDoc/UmlView.h
index 418e689ab..2435ce96b 100644
--- a/genplugouts/HtmlDoc/UmlView.h
+++ b/genplugouts/HtmlDoc/UmlView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseView.h"
-#include <q3cstring.h>
+
 
 class UmlView : public UmlBaseView
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlView(void * id, const Q3CString & s) : UmlBaseView(id, s) {
+    UmlView(void * id, const QByteArray & s) : UmlBaseView(id, s) {
     }
 
 };
diff --git a/genplugouts/HtmlDoc/Vector.cpp b/genplugouts/HtmlDoc/Vector.cpp
index 981066b81..f1d37162f 100644
--- a/genplugouts/HtmlDoc/Vector.cpp
+++ b/genplugouts/HtmlDoc/Vector.cpp
@@ -4,9 +4,9 @@
 
 void Vector::addElement(const UmlItem * x)
 {
-    if (v.count() == v.size())
-        v.resize(v.size() + 256);
+    if (v.capacity() == v.size())
+        v.reserve(v.size() + 256);
 
-    v.insert(v.count(), x);
+    v.append(const_cast<UmlItem*>(x));
 }
 
diff --git a/genplugouts/HtmlDoc/Vector.h b/genplugouts/HtmlDoc/Vector.h
index 8aca783f8..0efb01948 100644
--- a/genplugouts/HtmlDoc/Vector.h
+++ b/genplugouts/HtmlDoc/Vector.h
@@ -1,8 +1,8 @@
 #ifndef _VECTOR_H
 #define _VECTOR_H
+#include <QVector>
 
 
-#include <q3ptrvector.h>
 
 class UmlItem;
 
@@ -27,16 +27,16 @@ class Vector
     }
 
     void setElementAt(const UmlItem * x, unsigned int i) {
-        v.insert(i, x);
+        v[i] = const_cast<UmlItem *>(x);
     }
 
     bool contains(const UmlItem * x) {
-        return (!v.isEmpty() && (v.findRef(x) != -1));
+        return (!v.isEmpty() && (v.indexOf(const_cast<UmlItem *>(x)) != -1));
     }
 
 
 protected:
-    Q3PtrVector<UmlItem> v;
+    QVector<UmlItem*> v;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/CppSettings.cpp b/genplugouts/Xmi2Generator/CppSettings.cpp
index 450fbdb49..d1442a765 100644
--- a/genplugouts/Xmi2Generator/CppSettings.cpp
+++ b/genplugouts/Xmi2Generator/CppSettings.cpp
@@ -26,7 +26,7 @@ WrapperStr CppSettings::type(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -37,7 +37,7 @@ bool CppSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -61,7 +61,7 @@ WrapperStr CppSettings::relationAttributeStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -72,7 +72,7 @@ bool CppSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -96,7 +96,7 @@ WrapperStr CppSettings::classStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -107,7 +107,7 @@ bool CppSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -524,7 +524,7 @@ WrapperStr CppSettings::builtinIn(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_in : WrapperStr();
 }
@@ -535,7 +535,7 @@ bool CppSettings::set_BuiltinIn(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)type, (const char *)form); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -552,7 +552,7 @@ WrapperStr CppSettings::builtinOut(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_out : WrapperStr();
 }
@@ -563,7 +563,7 @@ bool CppSettings::set_BuiltinOut(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)type, (const char *)form); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -580,7 +580,7 @@ WrapperStr CppSettings::builtinInOut(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_inout : WrapperStr();
 }
@@ -591,7 +591,7 @@ bool CppSettings::set_BuiltinInOut(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)type, (const char *)form); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -608,7 +608,7 @@ WrapperStr CppSettings::builtinReturn(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_return : WrapperStr();
 }
@@ -619,7 +619,7 @@ bool CppSettings::set_BuiltinReturn(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)type, (const char *)form); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -1222,14 +1222,14 @@ bool CppSettings::_is_inline_force_header_in_h;
 
 WrapperStr CppSettings::_visibility_indent;
 
-Q3Dict<WrapperStr> CppSettings::_map_includes;
+QHash<WrapperStr,WrapperStr*> CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1255,7 +1255,7 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/genplugouts/Xmi2Generator/CppSettings.h b/genplugouts/Xmi2Generator/CppSettings.h
index 684c6bcff..29dd0f3ca 100644
--- a/genplugouts/Xmi2Generator/CppSettings.h
+++ b/genplugouts/Xmi2Generator/CppSettings.h
@@ -7,7 +7,7 @@
 
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -662,7 +662,7 @@ class CppSettings : public UmlSettings
 
     static WrapperStr _visibility_indent;
 
-    static Q3Dict<WrapperStr> _map_includes;
+    static QHash<WrapperStr,WrapperStr*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/Xmi2Generator/Dialog.cpp b/genplugouts/Xmi2Generator/Dialog.cpp
index e3d541b9b..12971bf6f 100644
--- a/genplugouts/Xmi2Generator/Dialog.cpp
+++ b/genplugouts/Xmi2Generator/Dialog.cpp
@@ -6,103 +6,107 @@
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
-#include <q3hbox.h>
+#include <hhbox.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
-#include <q3buttongroup.h>
+#include <bbuttongroup.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3VBoxLayout>
-
+#include <QVBoxLayout>
+#include <QSettings>
 #include "SmallPushButton.h"
 
 Dialog::Dialog(WrapperStr & path, WrapperStr & encoding, WrapperStr & nomodel, WrapperStr & genview, WrapperStr & uml20, WrapperStr & pk, WrapperStr & vis, WrapperStr & primitivetype, WrapperStr & genextension, WrapperStr & geneclipse, WrapperStr & commentexporter, WrapperStr & linefeed, Language & lang)
-    : QDialog(0, 0, TRUE), _path(path), _encoding(encoding), _nomodel(nomodel), _genview(genview), _uml20(uml20), _pk(pk), _vis(vis), _primitivetype(primitivetype), _genextension(genextension), _geneclipse(geneclipse), _commentexporter(commentexporter), _linefeed(linefeed), _lang(lang)
+    : QDialog(0), _path(path), _encoding(encoding), _nomodel(nomodel), _genview(genview), _uml20(uml20), _pk(pk), _vis(vis), _primitivetype(primitivetype), _genextension(genextension), _geneclipse(geneclipse), _commentexporter(commentexporter), _linefeed(linefeed), _lang(lang)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBox * htab;
+    setModal(true);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    HHBox * htab;
 
     vbox->setMargin(5);
 
     // get xmi pathname
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel("generated \nXMI file : ", htab);
+    htab->addWidget(new QLabel("generated \nXMI file : ", htab));
 
-    ed = new QLineEdit(htab);
+    htab->addWidget(ed = new QLineEdit(htab));
     ed->setText(_path);
 
-    new QLabel(" ", htab);
+    htab->addWidget(new QLabel(" ", htab));
 
-    SmallPushButton * br = new SmallPushButton("browse", htab);
+    SmallPushButton * br;
+    htab->addWidget(br = new SmallPushButton("browse", htab));
 
     connect(br, SIGNAL(clicked()), this, SLOT(browse()));
 
     // to choose encoding
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel("Encoding : ", htab);
+    htab->addWidget(new QLabel("Encoding : ", htab));
 
     QString charset = getenv("BOUML_CHARSET");
     int index = 0;
 
-    while ((index = charset.find('_')) != -1) {
+    while ((index = charset.indexOf('_')) != -1) {
         charset[index] = '-';
         index += 1;
     }
 
-    encoding_cb = new QComboBox(TRUE, htab);
+    htab->addWidget(encoding_cb = new QComboBox(htab));
+    encoding_cb->setEditable(true);
     htab->setStretchFactor(encoding_cb, 1000);
 
     if (_encoding.isEmpty())
         _encoding = "UTF-8";
 
-    encoding_cb->insertItem(QString(_encoding));
+    encoding_cb->addItem(_encoding);
 
-    if (!charset.isEmpty() && (_encoding != (const char *) charset))
-        encoding_cb->insertItem(charset);
+    if (!charset.isEmpty() && (_encoding != charset))
+        encoding_cb->addItem(charset);
 
     if (_encoding != "UTF-8")
-        encoding_cb->insertItem("UTF-8");
+        encoding_cb->addItem("UTF-8");
 
 #ifdef WIN32
 
     if ((_encoding != "windows-1252") && (charset != "windows-1252"))
-        encoding_cb->insertItem("windows-1252");
+        encoding_cb->addItem("windows-1252");
 
     if ((_encoding != "ISO-8859-1") && (charset != "ISO-8859-1"))
-        encoding_cb->insertItem("ISO-8859-1");
+        encoding_cb->addItem("ISO-8859-1");
 
 #else
 
     if ((_encoding != "ISO-8859-1") && (charset != "ISO-8859-1"))
-        encoding_cb->insertItem("ISO-8859-1");
+        encoding_cb->addItem("ISO-8859-1");
 
     if ((_encoding != "windows-1252") && (charset != "windows-1252"))
-        encoding_cb->insertItem("windows-1252");
+        encoding_cb->addItem("windows-1252");
 
 #endif
 
     // uml 2.0 or uml2.1
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    Q3ButtonGroup * bg = new Q3ButtonGroup(2, Qt::Horizontal, "Uml", htab);
+    BButtonGroup * bg;
+    htab->addWidget( bg = new BButtonGroup(2, Qt::Horizontal, "Uml", htab));
 
-    uml20_rb = new QRadioButton("uml 2.0", bg);
-    uml21_rb = new QRadioButton("uml 2.1", bg);
+    bg->addWidget(uml20_rb = new QRadioButton("uml 2.0", bg));
+    bg->addWidget(uml21_rb = new QRadioButton("uml 2.1", bg));
 
     if (uml20 == "yes")
         uml20_rb->setChecked(TRUE);
@@ -111,118 +115,122 @@ Dialog::Dialog(WrapperStr & path, WrapperStr & encoding, WrapperStr & nomodel, W
 
     // generate model
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    nomodel_cb = new QCheckBox("Don't generate model level", htab);
+    htab->addWidget(nomodel_cb = new QCheckBox("Don't generate model level", htab));
 
     if (_nomodel == "yes")
         nomodel_cb->setChecked(TRUE);
 
     // generate view checkbox
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    genview_cb = new QCheckBox("Generate views as package (not compatible with profile generation)", htab);
+    htab->addWidget(genview_cb = new QCheckBox("Generate views as package (not compatible with profile generation)", htab));
 
     if (_genview == "yes")
         genview_cb->setChecked(TRUE);
 
     // generate pk_ prefix
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    pk_cb = new QCheckBox("Generate 'pk_' prefix for parameter direction", htab);
+    htab->addWidget(pk_cb = new QCheckBox("Generate 'pk_' prefix for parameter direction", htab));
 
     if (_pk == "yes")
         pk_cb->setChecked(TRUE);
 
     // generate vis_ prefix
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    vis_cb = new QCheckBox("Generate 'vis_' prefix for visibility", htab);
+    htab->addWidget(vis_cb = new QCheckBox("Generate 'vis_' prefix for visibility", htab));
 
     if (_vis == "yes")
         vis_cb->setChecked(TRUE);
 
     // use PrimitiveType rather than DataType
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    primitivetype_cb = new QCheckBox("Use PrimitiveType rather than DataType", htab);
+    htab->addWidget(primitivetype_cb = new QCheckBox("Use PrimitiveType rather than DataType", htab));
 
     if (_primitivetype == "yes")
         primitivetype_cb->setChecked(TRUE);
 
     // generate extension
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    genextension_cb = new QCheckBox("Generate extensions", htab);
+    htab->addWidget(genextension_cb = new QCheckBox("Generate extensions", htab));
 
     if (_genextension == "yes")
         genextension_cb->setChecked(TRUE);
 
     // generate for Eclipse
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    geneclipse_cb = new QCheckBox("Generate for Eclipse (aggregation set on other relation side)", htab);
+    htab->addWidget(geneclipse_cb = new QCheckBox("Generate for Eclipse (aggregation set on other relation side)", htab));
 
     if (_geneclipse == "yes")
         geneclipse_cb->setChecked(TRUE);
 
     // comment exporter
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    commentexporter_cb = new QCheckBox("Comment exporter indication (needed to import in some tools like Rsa)", htab);
+    htab->addWidget(commentexporter_cb = new QCheckBox("Comment exporter indication (needed to import in some tools like Rsa)", htab));
 
     if (_commentexporter == "yes")
         commentexporter_cb->setChecked(TRUE);
 
     // generate &#10; rather than linefeed
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    linefeed_cb = new QCheckBox("Generate lf and cr characters in string rather than '&&#10;' and '&&#13;'", htab);
+    htab->addWidget(linefeed_cb = new QCheckBox("Generate lf and cr characters in string rather than '&&#10;' and '&&#13;'", htab));
 
     if (_linefeed == "yes")
         linefeed_cb->setChecked(TRUE);
 
     // uml , c++, java, cancel buttons
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel(htab);
-    QPushButton * uml = new QPushButton("&Uml", htab);
-    new QLabel(htab);
-    QPushButton * cpp = new QPushButton("&C++", htab);
-    new QLabel(htab);
-    QPushButton * java = new QPushButton("&Java", htab);
-    new QLabel(htab);
-    QPushButton * cancel = new QPushButton("&Cancel", htab);
-    new QLabel(htab);
+    htab->addWidget(new QLabel(htab));
+    QPushButton * uml;
+    htab->addWidget(uml = new QPushButton("&Uml", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * cpp;
+    htab->addWidget(cpp = new QPushButton("&C++", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * java;
+    htab->addWidget(java = new QPushButton("&Java", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * cancel;
+    htab->addWidget(cancel = new QPushButton("&Cancel", htab));
+    htab->addWidget(new QLabel(htab));
     QSize bs(cancel->sizeHint());
 
     uml->setFixedSize(bs);
@@ -236,74 +244,48 @@ Dialog::Dialog(WrapperStr & path, WrapperStr & encoding, WrapperStr & nomodel, W
 
     // help
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel(htab);
-    new QLabel("Remark : to help Eclipse to import the generated file,\n"
-               "choose Uml 2.1 and name the file with the extension '.xmi'", htab);
-    new QLabel(htab);
+    htab->addWidget(new QLabel(htab));
+    htab->addWidget(new QLabel("Remark : to help Eclipse to import the generated file,\n"
+               "choose Uml 2.1 and name the file with the extension '.xmi'", htab));
+    htab->addWidget(new QLabel(htab));
 }
 
 void Dialog::polish()
 {
-    QDialog::polish();
-
-    // try to read .doumlrc
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-#ifdef WIN32
-
-    if (fp == 0) {
-        QString hd = getenv("USERPROFILE");
-
-        if (! hd.isEmpty()) {
-            QDir d(hd);
-            QString s2 = d.absFilePath(".doumlrc");
-
-            fp = fopen((const char *) s2, "r");
-        }
-    }
-
-#endif
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        int cx = (r + l) / 2;
-                        int cy = (t + b) / 2;
-
-                        move(x() + cx - (x() + width() / 2),
-                             y() + cy - (y() + height() / 2));
-                    }
-                }
-
-                break;
-            }
-        }
-
-        fclose(fp);
+    QDialog::ensurePolished();
+
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        int cx = (r + l) / 2;
+        int cy = (t + b) / 2;
+
+        move(x() + cx - (x() + width() / 2), y() + cy - (y() + height() / 2));
+      }
     }
 }
 
 void Dialog::browse()
 {
-    QString s = Q3FileDialog::getSaveFileName(_path, "*.xmi", 0);
+    QString s = QFileDialog::getSaveFileName(0, "",_path, "*.xmi");
 
     if (! s.isEmpty()) {
-        if (s.right(4).lower() != ".xmi")
+        if (s.right(4).toLower() != ".xmi")
             ed->setText(s + ".xmi");
         else
             ed->setText(s);
diff --git a/genplugouts/Xmi2Generator/FileOut.cpp b/genplugouts/Xmi2Generator/FileOut.cpp
index 64585fd86..392e9782d 100644
--- a/genplugouts/Xmi2Generator/FileOut.cpp
+++ b/genplugouts/Xmi2Generator/FileOut.cpp
@@ -2,19 +2,21 @@
 #include "FileOut.h"
 #include "UmlItem.h"
 
-#include <q3textstream.h>
+#include <qtextstream.h>
 #include <qfile.h>
+#include <unordered_map>
 //Added by qt3to4:
 #include "misc/mystr.h"
-FileOut::FileOut(QFile * fp, bool lf, bool utf8) : Q3TextStream(fp), _lf(lf), _indent(0)
+#include <functional> // std::function
+FileOut::FileOut(QFile * fp, bool lf, bool utf8) : QTextStream(fp), _lf(lf), _indent(0)
 {
     if (utf8)
-        setEncoding(Q3TextStream::UnicodeUTF8);
+        setCodec("UTF8");
 }
 
 void FileOut::indent()
 {
-    Q3TextStream & ts = *this;
+    QTextStream & ts = *this;
 
     for (int n = _indent; n > 0; n -= 1)
         ts << '\t';
@@ -22,23 +24,23 @@ void FileOut::indent()
 
 void FileOut::id(UmlItem * x)
 {
-    ((Q3TextStream &) *this) << " xmi:id=\"BOUML_" << ((void *) x->getIdentifier()) << "_" << x->kind() << '"';
+    ((QTextStream &) *this) << " xmi:id=\"BOUML_" << (reinterpret_cast<void*>(x->getIdentifier())) << "_" << x->kind() << '"';
 
 }
 
 void FileOut::id_prefix(UmlItem * x, const char * pfix)
 {
-    ((Q3TextStream &) *this) << " xmi:id=\"BOUML_" << pfix << ((void *) x->getIdentifier()) << "_" << x->kind() << '"';
+    ((QTextStream &) *this) << " xmi:id=\"BOUML_" << pfix << (reinterpret_cast<void*>(x->getIdentifier())) << "_" << x->kind() << '"';
 }
 
 void FileOut::id_prefix(UmlItem * x, const char * pfix, int n)
 {
-    ((Q3TextStream &) *this) << " xmi:id=\"BOUML_" << pfix << n << "_" << ((void *) x->getIdentifier()) << "_" << x->kind() << '"';
+    ((QTextStream &) *this) << " xmi:id=\"BOUML_" << pfix << n << "_" << (reinterpret_cast<void*>(x->getIdentifier())) << "_" << x->kind() << '"';
 }
 
 void FileOut::idref(UmlItem * x)
 {
-    ((Q3TextStream &) *this) << " xmi:idref=\"BOUML_" << ((void *) x->getIdentifier()) << "_" << x->kind() << '"';
+    ((QTextStream &) *this) << " xmi:idref=\"BOUML_" << (reinterpret_cast<void*>(x->getIdentifier())) << "_" << x->kind() << '"';
 
 }
 
@@ -46,33 +48,33 @@ void FileOut::idref(WrapperStr s, UmlItem * x)
 {
     QString keys;
     {
-        Q3TextStream keyst(&keys, QIODevice::WriteOnly);
+        QTextStream keyst(&keys, QIODevice::WriteOnly);
 
-        keyst << ((void *) x) << "_" << s;
+        keyst << ((void *) x) << "_" << s.operator QString();
     }
 
-    QMap<WrapperStr, int>::ConstIterator it =
-        _modifiedtypes.find((const char *) keys);
+    QMap<QString, int>::ConstIterator it =
+            _modifiedtypes.find( keys);
 
     if (it == _modifiedtypes.end())
-        it = _modifiedtypes.insert((const char *) keys, _modifiedtypes.count());
+        it = _modifiedtypes.insert(keys, _modifiedtypes.count());
 
-    ((Q3TextStream &) *this) << " xmi:idref=\"BOUML_basedontype_"
-                             << it.data() << '"';
+    ((QTextStream &) *this) << " xmi:idref=\"BOUML_basedontype_"
+                             << it.value() << '"';
 
 }
 
 void FileOut::idref_prefix(UmlItem * x, const char * pfix)
 {
-    ((Q3TextStream &) *this) << " xmi:idref=\"BOUML_"
-                             << pfix << ((void *) x->getIdentifier()) << "_" << x->kind() << '"';
+    ((QTextStream &) *this) << " xmi:idref=\"BOUML_"
+                             << pfix << (reinterpret_cast<void*>(x->getIdentifier())) << "_" << x->kind() << '"';
 
 }
 
 void FileOut::idref_prefix(UmlItem * x, const char * pfix, int n)
 {
-    ((Q3TextStream &) *this) << " xmi:idref=\"BOUML_"
-                             << pfix << n << "_" << ((void *) x->getIdentifier()) << "_" << x->kind() << '"';
+    ((QTextStream &) *this) << " xmi:idref=\"BOUML_"
+                             << pfix << n << "_" << (reinterpret_cast<void*>(x->getIdentifier())) << "_" << x->kind() << '"';
 
 }
 
@@ -81,56 +83,56 @@ void FileOut::idref_datatype(const WrapperStr & t)
     if (t.isEmpty())
         return;
 
-    QMap<WrapperStr, int>::ConstIterator it = _datatypes.find(t);
+    QMap<QString, int>::ConstIterator it = _datatypes.find(t);
 
     if (it == _datatypes.end())
         it = _datatypes.insert(t, _datatypes.count());
 
-    ((Q3TextStream &) *this) << " xmi:idref=\"BOUML_datatype_"
-                             << it.data() << '"';
+    ((QTextStream &) *this) << " xmi:idref=\"BOUML_datatype_"
+                             << it.value() << '"';
 
 }
 
 void FileOut::ref(UmlItem * x, const char * pfix1, const char * pfix2)
 {
-    ((Q3TextStream &) *this) << " " << pfix1 << "=\"BOUML_"
-                             << pfix2 << ((void *) x->getIdentifier()) << "_" << x->kind() << '"';
+    ((QTextStream &) *this) << " " << pfix1 << "=\"BOUML_"
+                             << pfix2 << (reinterpret_cast<void*>(x->getIdentifier())) << "_" << x->kind() << '"';
 }
 
 void FileOut::ref(UmlItem * x, const char * pfix1, const char * pfix2, int n)
 {
-    ((Q3TextStream &) *this) << " " << pfix1 << "=\"BOUML_"
-                             << pfix2 << n << "_" << ((void *) x->getIdentifier()) << "_" << x->kind() << '"';
+    ((QTextStream &) *this) << " " << pfix1 << "=\"BOUML_"
+                             << pfix2 << n << "_" << (reinterpret_cast<void*>(x->getIdentifier())) << "_" << x->kind() << '"';
 }
 
 void FileOut::ref_only(UmlItem * x, const char * pfix)
 {
-    ((Q3TextStream &) *this) << "BOUML_" << pfix << ((void *) x->getIdentifier())
+    ((QTextStream &) *this) << "BOUML_" << pfix << (reinterpret_cast<void*>(x->getIdentifier()))
                              << "_" << x->kind();
 }
 
 void FileOut::define_datatypes(bool uml_20, bool primitive_type, bool gen_extension)
 {
     const char * pfix = (primitive_type)
-                        ? ((uml_20) ? "<ownedMember xmi:type=\"uml:PrimitiveType\""
-                           : "<packagedElement xmi:type=\"uml:PrimitiveType\"")
-                            : ((uml_20) ? "<ownedMember xmi:type=\"uml:DataType\""
-                               : "<packagedElement xmi:type=\"uml:DataType\"");
+            ? ((uml_20) ? "<ownedMember xmi:type=\"uml:PrimitiveType\""
+                        : "<packagedElement xmi:type=\"uml:PrimitiveType\"")
+            : ((uml_20) ? "<ownedMember xmi:type=\"uml:DataType\""
+                        : "<packagedElement xmi:type=\"uml:DataType\"");
 
-    QMap<WrapperStr, int>::ConstIterator it;
+    QMap<QString, int>::ConstIterator it;
 
     for (it = _datatypes.begin();
          it != _datatypes.end();
          ++it) {
         indent();
         (*this) << pfix << " xmi:id=\"BOUML_datatype_"
-                << it.data() << "\" name=\"";
-        quote((const char *)it.key()); //[jasa] ambiguous call
+                        << it.value() << "\" name=\"";
+        quote(it.key()); //[jasa] ambiguous call
         (*this) << "\"/>\n";
     }
 
     const char * postfix =
-        (uml_20) ? "</ownedMember>\n" : "</packagedElement>\n";
+            (uml_20) ? "</ownedMember>\n" : "</packagedElement>\n";
 
     for (it = _modifiedtypes.begin();
          it != _modifiedtypes.end();
@@ -140,7 +142,7 @@ void FileOut::define_datatypes(bool uml_20, bool primitive_type, bool gen_extens
 
         indent();
         (*this) << pfix << " xmi:id=\"BOUML_basedontype_"
-                << it.data() << "\" name = \"";
+                        << it.value() << "\" name = \"";
         quote((const char *)k.mid(index + 1));
         (*this) << '"';
 
@@ -149,7 +151,7 @@ void FileOut::define_datatypes(bool uml_20, bool primitive_type, bool gen_extens
             indent();
             (*this) << "\t<xmi:Extension extender=\"Bouml\">\n";
             indent();
-            (*this) << "\t\t<basedOn \"BOUML_" << k.left(index) << "\"/>\n";
+            (*this) << "\t\t<basedOn \"BOUML_" << k.left(index).operator QString() << "\"/>\n";
             indent();
             (*this) << "\t</xmi:Extension>\n";
             indent();
@@ -160,90 +162,25 @@ void FileOut::define_datatypes(bool uml_20, bool primitive_type, bool gen_extens
     }
 }
 
-void FileOut::quote(const WrapperStr & s)
+void FileOut::quote(const QString &s)
 {
-    //[jasa] added to handle ambiguous calls with WrapperStr.
-    quote((const char *)s);
-}
-
-void FileOut::quote(const char * s)
-{
-    for (;;) {
-        switch (*s) {
-        case 0:
-            return;
-
-        case '<':
-            (*this) << "&lt;";
-            break;
-
-        case '>':
-            (*this) << "&gt;";
-            break;
-
-        case '"':
-            (*this) << "&quot;";
-            break;
-
-        case '&':
-            (*this) << "&amp;";
-            break;
+    int i = 0;
+    static std::unordered_map <std::string, std::function<void()>> converter = {
+    {"<", [&](){ (*this) <<  "&lt;";}},
+    {">", [&](){ (*this) <<  "&gt;";}},
+    {"\"", [&](){ (*this) <<  "&quot;";}},
+    {"&", [&](){ (*this) <<  "&amp;";}},
+    {"\n", [&](){if (_lf) (*this) << s.mid(i, 1); else (*this) << "&#10;";}},
+    {"\r", [&](){if (_lf) (*this) << s.mid(i, 1); else (*this) << "&#13;";}},
+};
 
-        case '\n':
-            if (_lf)(*this) << *s;
-            else (*this) << "&#10;";
-
-            break;
-
-        case '\r':
-            if (_lf)(*this) << *s;
-            else (*this) << "&#13;";
-
-            break;
-
-        default:
-            (*this) << *s;
-            break;
-        }
-
-        s += 1;
-    }
-}
-
-void FileOut::quote(char c)
-{
-    switch (c) {
-    case '<':
-        (*this) << "&lt;";
-        break;
-
-    case '>':
-        (*this) << "&gt;";
-        break;
-
-    case '"':
-        (*this) << "&quot;";
-        break;
-
-    case '&':
-        (*this) << "&amp;";
-        break;
-
-    case '\n':
-        if (_lf)(*this) << c;
-        else (*this) << "&#10;";
-
-        break;
-
-    case '\r':
-        if (_lf)(*this) << c;
-        else (*this) << "&#13;";
-
-        break;
-
-    default:
-        (*this) << c;
-        break;
+    while(i < s.length())
+    {
+        if(converter.count(s.mid(i, 1).toStdString()) > 0)
+            converter[s.mid(i, 1).toStdString()]();
+        else
+            (*this) << s.mid(i, 1);
+        i++;
     }
 }
 
diff --git a/genplugouts/Xmi2Generator/FileOut.h b/genplugouts/Xmi2Generator/FileOut.h
index 2f6db9676..4e02ec4ec 100644
--- a/genplugouts/Xmi2Generator/FileOut.h
+++ b/genplugouts/Xmi2Generator/FileOut.h
@@ -2,7 +2,7 @@
 #define _FILEOUT_H
 
 
-#include <q3textstream.h>
+#include <qtextstream.h>
 #include <qmap.h>
 
 
@@ -10,7 +10,7 @@ class QFile;
 class UmlItem;
 
 //QTextOStream + usefull operations
-class FileOut : public Q3TextStream
+class FileOut : public QTextStream
 {
 public:
     FileOut(QFile * fp, bool lf, bool utf8);
@@ -49,11 +49,11 @@ class FileOut : public Q3TextStream
 
     void define_datatypes(bool uml_20, bool primitive_type, bool gen_extension);
 
-    void quote(const WrapperStr & s);
+    void quote(const QString & s);
 
-    void quote(const char * s);
+    //void quote(const char * s);
 
-    void quote(char c);
+    //void quote(QString c);
 
 
 protected:
@@ -61,9 +61,9 @@ class FileOut : public Q3TextStream
 
     int _indent;
 
-    QMap<WrapperStr, int> _datatypes;
+    QMap<QString, int> _datatypes;
 
-    QMap<WrapperStr, int> _modifiedtypes;
+    QMap<QString, int> _modifiedtypes;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/FlowContainer.cpp b/genplugouts/Xmi2Generator/FlowContainer.cpp
index 3c49280ab..be5180429 100644
--- a/genplugouts/Xmi2Generator/FlowContainer.cpp
+++ b/genplugouts/Xmi2Generator/FlowContainer.cpp
@@ -15,6 +15,6 @@ void FlowContainer::memo_flow(UmlFlow * flow)
 void FlowContainer::write_flows(FileOut & out)
 {
     while (! _flows.isEmpty())
-        _flows.take(0)->write_it(out);
+        _flows.takeAt(0)->write_it(out);
 }
 
diff --git a/genplugouts/Xmi2Generator/FlowContainer.h b/genplugouts/Xmi2Generator/FlowContainer.h
index 58ed69fcd..b5fa8fd7b 100644
--- a/genplugouts/Xmi2Generator/FlowContainer.h
+++ b/genplugouts/Xmi2Generator/FlowContainer.h
@@ -2,7 +2,7 @@
 #define _FLOWCONTAINER_H
 
 
-#include <q3ptrlist.h>
+#include <QList>
 
 class UmlFlow;
 class FileOut;
@@ -22,7 +22,7 @@ class FlowContainer
 
 protected:
     //he flows, to produce them in the upper level of the source - dest
-    Q3PtrList<UmlFlow> _flows;
+    QList<UmlFlow*> _flows;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/IdlSettings.cpp b/genplugouts/Xmi2Generator/IdlSettings.cpp
index 995de87d9..68bf72c74 100644
--- a/genplugouts/Xmi2Generator/IdlSettings.cpp
+++ b/genplugouts/Xmi2Generator/IdlSettings.cpp
@@ -26,7 +26,7 @@ WrapperStr IdlSettings::type(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
@@ -37,7 +37,7 @@ bool IdlSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -61,7 +61,7 @@ WrapperStr IdlSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
@@ -72,7 +72,7 @@ bool IdlSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -96,7 +96,7 @@ WrapperStr IdlSettings::classStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
@@ -107,7 +107,7 @@ bool IdlSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -648,14 +648,14 @@ WrapperStr IdlSettings::_src_content;
 
 WrapperStr IdlSettings::_ext;
 
-Q3Dict<WrapperStr> IdlSettings::_map_includes;
+QHash<WrapperStr,WrapperStr*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -677,7 +677,7 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/genplugouts/Xmi2Generator/IdlSettings.h b/genplugouts/Xmi2Generator/IdlSettings.h
index c6129e855..a14462373 100644
--- a/genplugouts/Xmi2Generator/IdlSettings.h
+++ b/genplugouts/Xmi2Generator/IdlSettings.h
@@ -6,7 +6,7 @@
 
 
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -333,7 +333,7 @@ class IdlSettings : public UmlSettings
 
     static WrapperStr _ext;
 
-    static Q3Dict<WrapperStr> _map_includes;
+    static QHash<WrapperStr,WrapperStr*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/Xmi2Generator/JavaSettings.cpp b/genplugouts/Xmi2Generator/JavaSettings.cpp
index b3097af90..079c13ed9 100644
--- a/genplugouts/Xmi2Generator/JavaSettings.cpp
+++ b/genplugouts/Xmi2Generator/JavaSettings.cpp
@@ -26,7 +26,7 @@ WrapperStr JavaSettings::type(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
@@ -37,7 +37,7 @@ bool JavaSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -61,7 +61,7 @@ WrapperStr JavaSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
@@ -72,7 +72,7 @@ bool JavaSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -96,7 +96,7 @@ WrapperStr JavaSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
@@ -107,7 +107,7 @@ bool JavaSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -705,14 +705,14 @@ bool JavaSettings::_is_generate_javadoc_comment;
 
 bool JavaSettings::_is_force_package_gen;
 
-Q3Dict<WrapperStr> JavaSettings::_map_imports;
+QHash<WrapperStr,WrapperStr*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -734,7 +734,7 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/genplugouts/Xmi2Generator/JavaSettings.h b/genplugouts/Xmi2Generator/JavaSettings.h
index 47407d950..87ab80849 100644
--- a/genplugouts/Xmi2Generator/JavaSettings.h
+++ b/genplugouts/Xmi2Generator/JavaSettings.h
@@ -7,7 +7,7 @@
 
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -378,7 +378,7 @@ class JavaSettings : public UmlSettings
 
     static bool _is_force_package_gen;
 
-    static Q3Dict<WrapperStr> _map_imports;
+    static QHash<WrapperStr,WrapperStr*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/Xmi2Generator/Main.cpp b/genplugouts/Xmi2Generator/Main.cpp
index 1e40ed037..0ba099035 100644
--- a/genplugouts/Xmi2Generator/Main.cpp
+++ b/genplugouts/Xmi2Generator/Main.cpp
@@ -7,16 +7,28 @@
 
 int main(int argc, char ** argv)
 {
+#define habip
+#ifdef habip
     if (argc < 2)
         return 0;
-
+#endif
     QApplication a(argc, argv);
-
+#ifdef habip
     if (UmlCom::connect(QString(argv[argc - 1]).toUInt())) {
+#else
+    if (UmlCom::connect(5000)) {
+#endif
         try {
             // warning : update release number in UmlPackage::xmi !
             UmlCom::trace("<b>Xmi 2.1 generator</b> release 1.14.1<br>");
+#ifdef habip
             UmlCom::targetItem()->xmi(argc - 2, argv + 1);
+#else
+            char* args[]={
+                "gxmi2","1024"
+            };
+            UmlCom::targetItem()->xmi(0, args + 1);
+#endif
         }
         catch (...) {
         }
@@ -24,7 +36,9 @@ int main(int argc, char ** argv)
         // must be called to cleanly inform that all is done
         UmlCom::bye(0);
     }
-
+#ifdef habip
+    #undef habip
+#endif
     UmlCom::close();
     return 0;
 }
diff --git a/genplugouts/Xmi2Generator/PhpSettings.cpp b/genplugouts/Xmi2Generator/PhpSettings.cpp
index d49756a6d..47f02b005 100644
--- a/genplugouts/Xmi2Generator/PhpSettings.cpp
+++ b/genplugouts/Xmi2Generator/PhpSettings.cpp
@@ -28,7 +28,7 @@ WrapperStr PhpSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
@@ -39,7 +39,7 @@ bool PhpSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa]
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -637,15 +637,17 @@ void PhpSettings::read_()
     _rel_decl = UmlCom::read_string();
     _oper_def = UmlCom::read_string();
 #ifndef WITHJAVA
-    _get_visibility =
+    _get_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _get_name = UmlCom::read_string();
     _is_get_final = UmlCom::read_bool();
 #ifndef WITHJAVA
-    _set_visibility =
+    _set_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
     _is_generate_javadoc_comment = UmlCom::read_bool();
diff --git a/genplugouts/Xmi2Generator/PythonSettings.cpp b/genplugouts/Xmi2Generator/PythonSettings.cpp
index 4f560d653..d17b4fde2 100644
--- a/genplugouts/Xmi2Generator/PythonSettings.cpp
+++ b/genplugouts/Xmi2Generator/PythonSettings.cpp
@@ -79,7 +79,7 @@ WrapperStr PythonSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
@@ -90,7 +90,7 @@ bool PythonSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -114,7 +114,7 @@ WrapperStr PythonSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
@@ -125,7 +125,7 @@ bool PythonSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassStereotypeCmd, (const char *)s, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -462,7 +462,7 @@ WrapperStr PythonSettings::_src_content;
 
 WrapperStr PythonSettings::_ext;
 
-Q3Dict<WrapperStr> PythonSettings::_map_imports;
+QHash<WrapperStr,WrapperStr*> PythonSettings::_map_imports;
 
 void PythonSettings::read_()
 {
@@ -472,8 +472,8 @@ void PythonSettings::read_()
 
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -489,7 +489,7 @@ void PythonSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/genplugouts/Xmi2Generator/PythonSettings.h b/genplugouts/Xmi2Generator/PythonSettings.h
index 2df07c146..ceb38d39c 100644
--- a/genplugouts/Xmi2Generator/PythonSettings.h
+++ b/genplugouts/Xmi2Generator/PythonSettings.h
@@ -6,7 +6,7 @@
 
 
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PYTHON, configured through
 // the 'Generation settings' dialog.
@@ -240,7 +240,7 @@ class PythonSettings : public UmlSettings
 
     static WrapperStr _ext;
 
-    static Q3Dict<WrapperStr> _map_imports;
+    static QHash<WrapperStr,WrapperStr*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/Xmi2Generator/SlotAttribute.h b/genplugouts/Xmi2Generator/SlotAttribute.h
index ad9d95f95..23176a5f9 100644
--- a/genplugouts/Xmi2Generator/SlotAttribute.h
+++ b/genplugouts/Xmi2Generator/SlotAttribute.h
@@ -1,6 +1,6 @@
 #ifndef _SLOTATTRIBUTE_H
 #define _SLOTATTRIBUTE_H
-
+#include <QByteArray>
 
 
 
diff --git a/genplugouts/Xmi2Generator/UmlActivity.cpp b/genplugouts/Xmi2Generator/UmlActivity.cpp
index dce127b31..51278cf74 100644
--- a/genplugouts/Xmi2Generator/UmlActivity.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivity.cpp
@@ -76,7 +76,7 @@ void UmlActivity::write(FileOut & out)
         break;
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
@@ -92,12 +92,12 @@ void UmlActivity::write(FileOut & out)
 
     write_flows(out);
 
-    QMap<WrapperStr, Opaque>::ConstIterator ito;
+    QMap<QString, Opaque>::ConstIterator ito;
 
     for (ito = _opaque_behavior.begin(); ito != _opaque_behavior.end(); ++ito) {
         out.indent();
         out << "<ownedBehavior xmi:type=\"uml:OpaqueBehavior\"";
-        out.id_prefix(ito.data().item, ito.data().kind);
+        out.id_prefix((*ito).item, (*ito).kind);
         out << ">\n";
         out.indent();
         out << "\t<body>";
@@ -111,12 +111,12 @@ void UmlActivity::write(FileOut & out)
     out.indent();
     out << "</" << k << ">\n";
 
-    QMap<WrapperStr, UmlItem *>::ConstIterator ite;
+    QMap<QString, UmlItem *>::ConstIterator ite;
 
     for (ite = _opaque_expression.begin(); ite != _opaque_expression.end(); ++ite) {
         out.indent();
         out << '<' << k << " xmi:type=\"uml:OpaqueExpression\"";
-        out.id_prefix(ite.data(), "OPAQUE_EXPRESSION_");
+        out.id_prefix(*ite, "OPAQUE_EXPRESSION_");
         out << ">\n";
         out.indent();
         out << "\t<body>";
@@ -164,25 +164,25 @@ void UmlActivity::write_condition(FileOut & out, WrapperStr cond, bool pre)
 
 UmlItem * UmlActivity::add_opaque_behavior(WrapperStr beh, UmlItem * who, const char * k)
 {
-    QMap<WrapperStr, Opaque>::Iterator iter = _opaque_behavior.find(beh);
+    QMap<QString, Opaque>::Iterator iter = _opaque_behavior.find(beh);
 
     if (iter == _opaque_behavior.end()) {
         _opaque_behavior.insert(beh, Opaque(who, k));
         return who;
     }
     else
-        return iter.data().item;
+        return (*iter).item;
 }
 
 UmlItem * UmlActivity::add_opaque_expression(WrapperStr val, UmlItem * who)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator iter = _opaque_expression.find(val);
+    QMap<QString, UmlItem *>::Iterator iter = _opaque_expression.find(val);
 
     if (iter == _opaque_expression.end()) {
         _opaque_expression.insert(val, who);
         return who;
     }
     else
-        return iter.data();
+        return (*iter);
 }
 
diff --git a/genplugouts/Xmi2Generator/UmlActivity.h b/genplugouts/Xmi2Generator/UmlActivity.h
index eb865573a..eadd9d0fe 100644
--- a/genplugouts/Xmi2Generator/UmlActivity.h
+++ b/genplugouts/Xmi2Generator/UmlActivity.h
@@ -42,9 +42,9 @@ class UmlActivity : public UmlBaseActivity, public FlowContainer
 
 
 protected:
-    QMap<WrapperStr, Opaque> _opaque_behavior;
+    QMap<QString, Opaque> _opaque_behavior;
 
-    QMap<WrapperStr, UmlItem *> _opaque_expression;
+    QMap<QString, UmlItem *> _opaque_expression;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlActivityAction.cpp b/genplugouts/Xmi2Generator/UmlActivityAction.cpp
index 34d408750..b8d07590f 100644
--- a/genplugouts/Xmi2Generator/UmlActivityAction.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityAction.cpp
@@ -9,7 +9,7 @@ void UmlActivityAction::write_begin(FileOut & out, WrapperStr k)
 {
     out.indent();
     out << ((parent()->kind() == anActivity) ? "<node" : "<containedNode")
-        << " xmi:type=\"uml:" << k << '"';
+        << " xmi:type=\"uml:" << k.operator QString() << '"';
     out.id(this);
 
     if (!name().isEmpty()) {
@@ -65,7 +65,7 @@ void UmlActivityAction::write_end(FileOut & out, bool dontclose)
         write_condition(out, javaPostCondition(), FALSE);
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -121,7 +121,7 @@ void UmlActivityAction::write_condition(FileOut & out, WrapperStr cond, bool pre
 
 void UmlActivityAction::solve_output_flows()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1) {
diff --git a/genplugouts/Xmi2Generator/UmlActivityControlNode.cpp b/genplugouts/Xmi2Generator/UmlActivityControlNode.cpp
index 8ee5bbe09..10505c63c 100644
--- a/genplugouts/Xmi2Generator/UmlActivityControlNode.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityControlNode.cpp
@@ -20,7 +20,7 @@ void UmlActivityControlNode::write(FileOut & out)
 
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlActivityControlNodeClasses.cpp b/genplugouts/Xmi2Generator/UmlActivityControlNodeClasses.cpp
index d6a94cf5a..0d4d42794 100644
--- a/genplugouts/Xmi2Generator/UmlActivityControlNodeClasses.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityControlNodeClasses.cpp
@@ -8,7 +8,7 @@ const char * UmlInitialActivityNode::sKind() const
 
 void UmlInitialActivityNode::solve_output_flows()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1) {
@@ -27,11 +27,11 @@ const char * UmlFlowFinalActivityNode::sKind() const
 
 void UmlFlowFinalActivityNode::solve_output_flows()
 {
-    Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+    QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-    while (it.current() != 0) {
-        if (it.current()->control_or_data() == Unset)
-            it.current()->set_control_or_data(IsControl);
+    while (it != _incoming_flows.end()) {
+        if ((*it)->control_or_data() == Unset)
+            (*it)->set_control_or_data(IsControl);
 
         ++it;
     }
@@ -44,11 +44,11 @@ const char * UmlActivityFinalActivityNode::sKind() const
 
 void UmlActivityFinalActivityNode::solve_output_flows()
 {
-    Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+    QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-    while (it.current() != 0) {
-        if (it.current()->control_or_data() == Unset)
-            it.current()->set_control_or_data(IsControl);
+    while (it != _incoming_flows.end()) {
+        if ((*it)->control_or_data() == Unset)
+            (*it)->set_control_or_data(IsControl);
 
         ++it;
     }
@@ -67,7 +67,7 @@ void UmlDecisionActivityNode::solve_output_flows()
     ControlOrData k = Unset;
 
     // look at output flows
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
@@ -86,10 +86,10 @@ void UmlDecisionActivityNode::solve_output_flows()
             int ndata = 0;
             bool hascontrol = FALSE;
             bool hasunset = FALSE;
-            Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+            QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-            while (it.current() != 0) {
-                k = it.current()->control_or_data();
+            while (it != _incoming_flows.end()) {
+                k = (*it)->control_or_data();
 
                 if (k == IsControl) {
                     hascontrol = TRUE;
@@ -123,10 +123,10 @@ void UmlDecisionActivityNode::solve_output_flows()
             already = TRUE;
 
             // solve input flows
-            it.toFirst();
+            it = _incoming_flows.begin();
 
-            while (it.current() != 0) {
-                ((UmlActivityNode *) it.current()->parent())->solve_output_flows();
+            while (it != _incoming_flows.end()) {
+                ((UmlActivityNode *) (*it)->parent())->solve_output_flows();
                 ++it;
             }
         }
@@ -140,11 +140,11 @@ void UmlDecisionActivityNode::solve_output_flows()
             f->set_control_or_data(k);
     }
 
-    Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+    QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-    while (it.current() != 0) {
-        if (it.current()->control_or_data() == Unset)
-            it.current()->set_control_or_data(k);
+    while (it != _incoming_flows.end()) {
+        if ((*it)->control_or_data() == Unset)
+            (*it)->set_control_or_data(k);
 
         ++it;
     }
@@ -162,7 +162,7 @@ void UmlMergeActivityNode::solve_output_flows()
     ControlOrData k = Unset;
 
     // look at output flows
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
@@ -181,10 +181,10 @@ void UmlMergeActivityNode::solve_output_flows()
             bool hasdata = FALSE;
             bool hascontrol = FALSE;
             bool hasunset = FALSE;
-            Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+            QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-            while (it.current() != 0) {
-                k = it.current()->control_or_data();
+            while (it != _incoming_flows.end()) {
+                k = (*it)->control_or_data();
 
                 if (k == IsControl) {
                     hascontrol = TRUE;
@@ -211,10 +211,10 @@ void UmlMergeActivityNode::solve_output_flows()
             already = TRUE;
 
             // solve input flows
-            it.toFirst();
+            it = _incoming_flows.begin();
 
-            while (it.current() != 0) {
-                ((UmlActivityNode *) it.current()->parent())->solve_output_flows();
+            while (it != _incoming_flows.end()) {
+                ((UmlActivityNode *) (*it)->parent())->solve_output_flows();
                 ++it;
             }
         }
@@ -228,11 +228,11 @@ void UmlMergeActivityNode::solve_output_flows()
             f->set_control_or_data(k);
     }
 
-    Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+    QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-    while (it.current() != 0) {
-        if (it.current()->control_or_data() == Unset)
-            it.current()->set_control_or_data(k);
+    while (it != _incoming_flows.end()) {
+        if ((*it)->control_or_data() == Unset)
+            (*it)->set_control_or_data(k);
 
         ++it;
     }
@@ -250,11 +250,11 @@ void UmlForkActivityNode::solve_output_flows()
 
     UmlFlow * f;
     ControlOrData k;
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     if (!_incoming_flows.isEmpty()) {
-        f = _incoming_flows.getFirst();
+        f = _incoming_flows.first();
         k = f->control_or_data();
     }
     else {
@@ -311,7 +311,7 @@ void UmlJoinActivityNode::solve_output_flows()
 {
     // output is data if at least one input is data
     ControlOrData k = Unset;
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size(); // theo 1
 
     if (n == 0)
@@ -320,14 +320,14 @@ void UmlJoinActivityNode::solve_output_flows()
     UmlFlow * f = (UmlFlow *) ch[0];
 
     // look at input flows
-    Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+    QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-    while (it.current() != 0) {
-        k = it.current()->control_or_data();
+    while (it != _incoming_flows.end()) {
+        k = (*it)->control_or_data();
 
         if (k == Unset) {
-            ((UmlActivityNode *) it.current()->parent())->solve_output_flows();
-            k = it.current()->control_or_data();
+            ((UmlActivityNode *) (*it)->parent())->solve_output_flows();
+            k = (*it)->control_or_data();
         }
 
         if (k == IsData)
diff --git a/genplugouts/Xmi2Generator/UmlActivityItem.h b/genplugouts/Xmi2Generator/UmlActivityItem.h
index 6d64609da..6109c9cb5 100644
--- a/genplugouts/Xmi2Generator/UmlActivityItem.h
+++ b/genplugouts/Xmi2Generator/UmlActivityItem.h
@@ -1,7 +1,7 @@
 #ifndef _UMLACTIVITYITEM_H
 #define _UMLACTIVITYITEM_H
 
-
+#include "../src/misc/mystr.h"
 
 
 class FileOut;
diff --git a/genplugouts/Xmi2Generator/UmlActivityNode.cpp b/genplugouts/Xmi2Generator/UmlActivityNode.cpp
index 2563a2510..33f76fd18 100644
--- a/genplugouts/Xmi2Generator/UmlActivityNode.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityNode.cpp
@@ -4,7 +4,7 @@
 
 void UmlActivityNode::memo_incoming_flow()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
@@ -23,12 +23,12 @@ void UmlActivityNode::add_incoming_flow(UmlFlow * flow)
 
 void UmlActivityNode::write_incoming_flows(FileOut & out)
 {
-    Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+    QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-    while (it.current() != 0) {
+    while (it != _incoming_flows.end()) {
         out.indent();
         out << "<incoming";
-        out.idref(it.current());
+        out.idref(*it);
         out << "/>\n";
         ++it;
     }
diff --git a/genplugouts/Xmi2Generator/UmlActivityNode.h b/genplugouts/Xmi2Generator/UmlActivityNode.h
index aff81ae2e..dcb3d3fed 100644
--- a/genplugouts/Xmi2Generator/UmlActivityNode.h
+++ b/genplugouts/Xmi2Generator/UmlActivityNode.h
@@ -6,7 +6,7 @@
 #include "UmlBaseActivityNode.h"
 #include "UmlActivityItem.h"
 
-#include <q3ptrlist.h>
+
 
 class UmlFlow;
 class FileOut;
@@ -35,7 +35,7 @@ class UmlActivityNode : public UmlBaseActivityNode, public UmlActivityItem
 
 protected:
     //the flows whose target is the object
-    Q3PtrList<UmlFlow> _incoming_flows;
+    QList<UmlFlow*> _incoming_flows;
 
 
 public:
diff --git a/genplugouts/Xmi2Generator/UmlActivityObject.cpp b/genplugouts/Xmi2Generator/UmlActivityObject.cpp
index 399c96ccb..a0eb92adf 100644
--- a/genplugouts/Xmi2Generator/UmlActivityObject.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityObject.cpp
@@ -42,7 +42,7 @@ void UmlActivityObject::write(FileOut & out)
     write_multiplicity(out, multiplicity(), this);
     UmlItem::write_type(out, type());
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -61,7 +61,7 @@ void UmlActivityObject::write(FileOut & out)
 void UmlActivityObject::solve_output_flows()
 {
     ControlOrData v = (isControlType()) ? IsControl : IsData;
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1) {
@@ -71,11 +71,11 @@ void UmlActivityObject::solve_output_flows()
             f->set_control_or_data(v);
     }
 
-    Q3PtrListIterator<UmlFlow> it(_incoming_flows);
+    QList<UmlFlow*>::Iterator it = _incoming_flows.begin();
 
-    while (it.current() != 0) {
-        if (it.current()->control_or_data() == Unset)
-            it.current()->set_control_or_data(v);
+    while (it != _incoming_flows.end()) {
+        if ((*it)->control_or_data() == Unset)
+            (*it)->set_control_or_data(v);
 
         ++it;
     }
diff --git a/genplugouts/Xmi2Generator/UmlActivityParameter.cpp b/genplugouts/Xmi2Generator/UmlActivityParameter.cpp
index 3fbcfab07..5453364ba 100644
--- a/genplugouts/Xmi2Generator/UmlActivityParameter.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityParameter.cpp
@@ -46,7 +46,7 @@ void UmlActivityParameter::write(FileOut & out)
 
     UmlItem::write_type(out, type());
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlActivityPartition.cpp b/genplugouts/Xmi2Generator/UmlActivityPartition.cpp
index 8f4ffdb8c..60878ece0 100644
--- a/genplugouts/Xmi2Generator/UmlActivityPartition.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityPartition.cpp
@@ -27,7 +27,7 @@ void UmlActivityPartition::write(FileOut & out)
 
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlActivityPin.cpp b/genplugouts/Xmi2Generator/UmlActivityPin.cpp
index 5dfa1f327..ce787e17b 100644
--- a/genplugouts/Xmi2Generator/UmlActivityPin.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityPin.cpp
@@ -127,7 +127,7 @@ void UmlActivityPin::write(FileOut & out)
     write_multiplicity(out, multiplicity(), this);
     UmlItem::write_type(out, type());
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlActivityRegion.cpp b/genplugouts/Xmi2Generator/UmlActivityRegion.cpp
index 1471da458..24aa3427c 100644
--- a/genplugouts/Xmi2Generator/UmlActivityRegion.cpp
+++ b/genplugouts/Xmi2Generator/UmlActivityRegion.cpp
@@ -4,7 +4,7 @@
 #include "UmlFlow.h"
 void UmlActivityRegion::memo_incoming_flow()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
diff --git a/genplugouts/Xmi2Generator/UmlArtifact.cpp b/genplugouts/Xmi2Generator/UmlArtifact.cpp
index 836676274..285c28bce 100644
--- a/genplugouts/Xmi2Generator/UmlArtifact.cpp
+++ b/genplugouts/Xmi2Generator/UmlArtifact.cpp
@@ -18,7 +18,7 @@ void UmlArtifact::write(FileOut & out)
 
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned i;
     unsigned n = ch.size();
     unsigned rank = 0;
@@ -35,7 +35,7 @@ void UmlArtifact::write(FileOut & out)
     }
 
     if (stereotype() == "source") {
-        const Q3PtrVector<UmlClass> & cls = associatedClasses();
+        const QVector<UmlClass*> & cls = associatedClasses();
 
         n = cls.size();
 
@@ -43,7 +43,7 @@ void UmlArtifact::write(FileOut & out)
             write_manifest(out, cls[i], "source", ++rank);
     }
     else {
-        const Q3PtrVector<UmlArtifact> & arts = associatedArtifacts();
+        const QVector<UmlArtifact*> & arts = associatedArtifacts();
 
         n = arts.size();
 
diff --git a/genplugouts/Xmi2Generator/UmlAttribute.cpp b/genplugouts/Xmi2Generator/UmlAttribute.cpp
index cd0c65cbd..513f94337 100644
--- a/genplugouts/Xmi2Generator/UmlAttribute.cpp
+++ b/genplugouts/Xmi2Generator/UmlAttribute.cpp
@@ -27,7 +27,7 @@ void UmlAttribute::write(FileOut & out)
     switch (_lang) {
     case Uml:
         out.indent();
-        out << "<" << k << kk << name() << '"';
+        out << "<" << k << kk << name().operator QString() << '"';
         break;
 
     case Cpp:
@@ -35,7 +35,7 @@ void UmlAttribute::write(FileOut & out)
             return;
 
         out.indent();
-        out << "<" << k << kk << true_name(name(), cppDecl()) << '"';
+        out << "<" << k << kk << true_name(name(), cppDecl()).operator QString() << '"';
         break;
 
     default: // Java
@@ -43,7 +43,7 @@ void UmlAttribute::write(FileOut & out)
             return;
 
         out.indent();
-        out << "<" << k << kk << true_name(name(), javaDecl()) << '"';
+        out << "<" << k << kk << true_name(name(), javaDecl()).operator QString() << '"';
         break;
     }
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseArtifact.cpp b/genplugouts/Xmi2Generator/UmlBaseArtifact.cpp
index afa7cc344..9d616cdb1 100644
--- a/genplugouts/Xmi2Generator/UmlBaseArtifact.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseArtifact.cpp
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         // tests != to bypass Qt 2.3 bug
@@ -103,7 +104,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -117,8 +118,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -134,7 +136,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -143,7 +145,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] =  _associated[last];
 
             _associated.resize(last);
         }
@@ -283,13 +285,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] =  (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/Xmi2Generator/UmlBaseArtifact.h b/genplugouts/Xmi2Generator/UmlBaseArtifact.h
index f13c0890a..6db980ba6 100644
--- a/genplugouts/Xmi2Generator/UmlBaseArtifact.h
+++ b/genplugouts/Xmi2Generator/UmlBaseArtifact.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
+#include <QVector>
 
 
 #include "UmlClass.h"	// to avoid destructor problem
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -147,9 +147,9 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
     WrapperStr _cpp_h;
diff --git a/genplugouts/Xmi2Generator/UmlBaseClass.cpp b/genplugouts/Xmi2Generator/UmlBaseClass.cpp
index ffd776fe4..b1bddb0bd 100644
--- a/genplugouts/Xmi2Generator/UmlBaseClass.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseClass.cpp
@@ -12,7 +12,7 @@
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -65,11 +65,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -101,11 +101,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -150,17 +150,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -426,10 +426,10 @@ bool UmlBaseClass::set_Name(const WrapperStr & s)
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     WrapperStr destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -441,7 +441,7 @@ bool UmlBaseClass::set_Name(const WrapperStr & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<WrapperStr, UmlClass*> UmlBaseClass::_classes;
 
 UmlBaseClass::UmlBaseClass(void * id, const WrapperStr & n)
     : UmlClassMember(id, n)
@@ -451,7 +451,7 @@ UmlBaseClass::UmlBaseClass(void * id, const WrapperStr & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/Xmi2Generator/UmlBaseClass.h b/genplugouts/Xmi2Generator/UmlBaseClass.h
index d02e1bf17..30c547e96 100644
--- a/genplugouts/Xmi2Generator/UmlBaseClass.h
+++ b/genplugouts/Xmi2Generator/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
+#include <QList>
+
+
 
-#include <q3dict.h>
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -62,7 +62,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -85,7 +85,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -108,7 +108,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -253,7 +253,8 @@ class UmlBaseClass : public UmlClassMember
 
 
 private:
-    static Q3Dict<UmlClass> _classes;
+        static QHash<WrapperStr, UmlClass*> _classes;
+
 
     bool _abstract;
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseClassInstance.cpp b/genplugouts/Xmi2Generator/UmlBaseClassInstance.cpp
index 09237f3fb..f4faf3790 100644
--- a/genplugouts/Xmi2Generator/UmlBaseClassInstance.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseClassInstance.cpp
@@ -7,7 +7,7 @@
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -46,7 +46,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
     else     return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -61,7 +61,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -76,16 +76,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QVector<UmlAttribute *> &result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -96,7 +96,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -106,7 +106,7 @@ bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance
 
 bool UmlBaseClassInstance::remove_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/genplugouts/Xmi2Generator/UmlBaseClassInstance.h b/genplugouts/Xmi2Generator/UmlBaseClassInstance.h
index f944a8bf6..213113526 100644
--- a/genplugouts/Xmi2Generator/UmlBaseClassInstance.h
+++ b/genplugouts/Xmi2Generator/UmlBaseClassInstance.h
@@ -6,8 +6,8 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
+#include <QList>
+
 
 
 class UmlClassInstance;
@@ -40,17 +40,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QVector<UmlAttribute *> & result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result);
 
     // Remove the slot if the value is an empty string.
     // Else set the value for the given attribute, replacing it
diff --git a/genplugouts/Xmi2Generator/UmlBaseClassInstanceReference.h b/genplugouts/Xmi2Generator/UmlBaseClassInstanceReference.h
index a9e14281e..a655ca40f 100644
--- a/genplugouts/Xmi2Generator/UmlBaseClassInstanceReference.h
+++ b/genplugouts/Xmi2Generator/UmlBaseClassInstanceReference.h
@@ -1,6 +1,6 @@
 #ifndef _UMLBASECLASSINSTANCEREFERENCE_H
 #define _UMLBASECLASSINSTANCEREFERENCE_H
-
+#include <QByteArray>
 
 
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseCollaborationDiagramDefinition.cpp b/genplugouts/Xmi2Generator/UmlBaseCollaborationDiagramDefinition.cpp
index 63b89f7b5..177cc8c00 100644
--- a/genplugouts/Xmi2Generator/UmlBaseCollaborationDiagramDefinition.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseCollaborationDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseCollaborationDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -15,11 +15,11 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -31,7 +31,7 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         m->read_(instances);
     }
 
-    _messages.setAutoDelete(TRUE);
+    //_messages.setAutoDelete(TRUE);
 }
 
 UmlBaseCollaborationDiagramDefinition::~UmlBaseCollaborationDiagramDefinition()
diff --git a/genplugouts/Xmi2Generator/UmlBaseCollaborationDiagramDefinition.h b/genplugouts/Xmi2Generator/UmlBaseCollaborationDiagramDefinition.h
index 7053607ce..905cc6dc5 100644
--- a/genplugouts/Xmi2Generator/UmlBaseCollaborationDiagramDefinition.h
+++ b/genplugouts/Xmi2Generator/UmlBaseCollaborationDiagramDefinition.h
@@ -1,12 +1,12 @@
 #ifndef _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
 #define _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
-
+#include <QVector>
 
 // to avoid compiler warning
 #include "UmlCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlCollaborationMessage;
@@ -16,21 +16,21 @@ class UmlBaseCollaborationDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following their rank
-    const Q3PtrVector<UmlCollaborationMessage> & messages() const {
+    const QVector<UmlCollaborationMessage*> & messages() const {
         return _messages;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlCollaborationMessage> _messages;
+    QVector<UmlCollaborationMessage*> _messages;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/Xmi2Generator/UmlBaseCollaborationMessage.cpp b/genplugouts/Xmi2Generator/UmlBaseCollaborationMessage.cpp
index 8ea8e0890..12a94d5de 100644
--- a/genplugouts/Xmi2Generator/UmlBaseCollaborationMessage.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseCollaborationMessage.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-void UmlBaseCollaborationMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseCollaborationMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     UmlBaseMessage::read_(instances);
     _rank = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/Xmi2Generator/UmlBaseCollaborationMessage.h b/genplugouts/Xmi2Generator/UmlBaseCollaborationMessage.h
index 90932c4db..4e8e871e1 100644
--- a/genplugouts/Xmi2Generator/UmlBaseCollaborationMessage.h
+++ b/genplugouts/Xmi2Generator/UmlBaseCollaborationMessage.h
@@ -3,7 +3,7 @@
 
 
 
-#include <q3ptrdict.h>
+
 #include "UmlMessage.h"
 
 class UmlClassInstanceReference;
@@ -29,7 +29,7 @@ class UmlBaseCollaborationMessage : public UmlMessage
     WrapperStr _hrank;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseCollaborationDiagramDefinition;
 };
diff --git a/genplugouts/Xmi2Generator/UmlBaseComponent.cpp b/genplugouts/Xmi2Generator/UmlBaseComponent.cpp
index 427c8d71f..abc5de755 100644
--- a/genplugouts/Xmi2Generator/UmlBaseComponent.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizingClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizingClasses()
 {
     read_if_needed_();
 
     return _realizing;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realizing, provided, required);
@@ -98,18 +98,18 @@ void UmlBaseComponent::read_uml_()
     _realizing.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realizing.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realizing[index] =  (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseComponent.h b/genplugouts/Xmi2Generator/UmlBaseComponent.h
index 5cb67ef38..1b588dd46 100644
--- a/genplugouts/Xmi2Generator/UmlBaseComponent.h
+++ b/genplugouts/Xmi2Generator/UmlBaseComponent.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
+
 
 
 #include "UmlClass.h"	// to avoid destructor problem
@@ -36,18 +36,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realizing classes
-    const Q3PtrVector<UmlClass> & realizingClasses();
+    const QVector<UmlClass*> & realizingClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realizing, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +57,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realizing;
+    QVector<UmlClass*> _realizing;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
diff --git a/genplugouts/Xmi2Generator/UmlBaseFragment.cpp b/genplugouts/Xmi2Generator/UmlBaseFragment.cpp
index 730755358..44fdee6e6 100644
--- a/genplugouts/Xmi2Generator/UmlBaseFragment.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseFragment.cpp
@@ -25,7 +25,7 @@ void UmlBaseFragment::read_()
         fc->read_(this, rank);
     }
 
-    _compartments.setAutoDelete(TRUE);
+    //_compartments.setAutoDelete(TRUE);
     _container = 0;
     _refer = (UmlDiagram *) UmlBaseItem::read_();
     _arguments = UmlCom::read_string();
@@ -38,7 +38,7 @@ int UmlBaseFragment::vcenter_(int rank) const
     return (t + _compartments[rank]->b()) / 2;
 }
 
-void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseFragment::read_covered_(QHash<void*,UmlClassInstanceReference*> & instances)
 {
     unsigned n = UmlCom::read_unsigned();
     unsigned rank;
@@ -46,10 +46,10 @@ void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & insta
     _covered.resize(n);
 
     for (rank = 0; rank != n; rank += 1)
-        _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]);
+        _covered.insert(rank, instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))]);
 }
 
-UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments)
+UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments)
 {
     UmlFragmentCompartment * r = 0;
     int nf = fragments.count();
@@ -82,7 +82,7 @@ UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, in
     return r;
 }
 
-void UmlBaseFragment::compute_container_(Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseFragment::compute_container_(QVector<UmlFragment*> & fragments)
 {
     int rank = fragments.count();
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseFragment.h b/genplugouts/Xmi2Generator/UmlBaseFragment.h
index e1f2b8406..443bda524 100644
--- a/genplugouts/Xmi2Generator/UmlBaseFragment.h
+++ b/genplugouts/Xmi2Generator/UmlBaseFragment.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASEFRAGMENT_H
 #define _UMLBASEFRAGMENT_H
+#include <QByteArray>
+#include <QHash>
+#include <QVector>
 
 
 
-#include <q3ptrvector.h>
-#include <q3ptrdict.h>
-
 class UmlFragmentCompartment;
 class UmlDiagram;
 class UmlClassInstanceReference;
@@ -21,7 +21,7 @@ class UmlBaseFragment
     }
 
     // return the compartments, at least one compartment exists
-    const Q3PtrVector<UmlFragmentCompartment> & compartments() const {
+    const QVector<UmlFragmentCompartment*> & compartments() const {
         return _compartments;
     }
 
@@ -44,7 +44,7 @@ class UmlBaseFragment
     }
 
     // return the the list of covered instances (life lines)
-    const Q3PtrVector<UmlClassInstanceReference> & covered() const {
+    const QVector<UmlClassInstanceReference*> & covered() const {
         return _covered;
     }
 
@@ -52,7 +52,7 @@ class UmlBaseFragment
 private:
     UmlFragmentCompartment * _container;
 
-    Q3PtrVector<UmlFragmentCompartment> _compartments;
+    QVector<UmlFragmentCompartment*> _compartments;
 
     WrapperStr _name;
 
@@ -68,7 +68,7 @@ class UmlBaseFragment
 
     WrapperStr _arguments;
 
-    Q3PtrVector<UmlClassInstanceReference> _covered;
+    QVector<UmlClassInstanceReference*> _covered;
 
     // internal, don't call it
     void read_();
@@ -81,15 +81,15 @@ class UmlBaseFragment
 
     //internal, do NOT use it
 
-    void read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_covered_(QHash<void*,UmlClassInstanceReference*> & instances);
 
     // internal
-    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments);
+    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments);
 
 
 private:
     // internal
-    static void compute_container_(Q3PtrVector<UmlFragment> & fragments);
+    static void compute_container_(QVector<UmlFragment*> & fragments);
 
 
 public:
diff --git a/genplugouts/Xmi2Generator/UmlBaseFragmentCompartment.cpp b/genplugouts/Xmi2Generator/UmlBaseFragmentCompartment.cpp
index bcfa492e8..dcf510bb7 100644
--- a/genplugouts/Xmi2Generator/UmlBaseFragmentCompartment.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseFragmentCompartment.cpp
@@ -7,14 +7,16 @@
 
 void UmlBaseFragmentCompartment::add_contained_(UmlFragment * x)
 {
-    _contained.resize(_contained.size() + 1);
-    _contained.insert(_contained.size() - 1, x);
+    //_contained.resize(_contained.size() + 1);
+    //_contained.insert(_contained.size() - 1, x);
+    _contained.append(x);
 }
 
 void UmlBaseFragmentCompartment::add_text_(WrapperStr x)
 {
-    _texts.resize(_texts.size() + 1);
-    _texts.insert(_texts.size() - 1, strdup(x));
+    //_texts.resize(_texts.size() + 1);
+    //_texts.insert(_texts.size() - 1, strdup(x));
+    _texts.append(strdup(x));
 }
 
 void UmlBaseFragmentCompartment::add_cont_(WrapperStr s, int cy)
diff --git a/genplugouts/Xmi2Generator/UmlBaseFragmentCompartment.h b/genplugouts/Xmi2Generator/UmlBaseFragmentCompartment.h
index 0e5cf1835..25a007d52 100644
--- a/genplugouts/Xmi2Generator/UmlBaseFragmentCompartment.h
+++ b/genplugouts/Xmi2Generator/UmlBaseFragmentCompartment.h
@@ -5,7 +5,7 @@
 // to avoid compiler warning
 #include "UmlFragment.h"
 
-#include <q3ptrvector.h>
+
 
 
 class UmlFragment;
@@ -27,13 +27,13 @@ class UmlBaseFragmentCompartment
     }
 
     // the texts placed in the compartment
-    const Q3PtrVector<char> & texts() const {
+    const QVector<char*> & texts() const {
         return _texts;
     }
 
     // return the fragments contained in the compartment,
     // may be none
-    const Q3PtrVector<UmlFragment> & contained() const {
+    const QVector<UmlFragment*> & contained() const {
         return _contained;
     }
 
@@ -41,11 +41,11 @@ class UmlBaseFragmentCompartment
 private:
     UmlFragment * _fragment;
 
-    Q3PtrVector<UmlFragment> _contained;
+    QVector<UmlFragment*> _contained;
 
     int _rank;
 
-    Q3PtrVector<char> _texts;
+    QVector<char*> _texts;
 
     int _y;
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseItem.cpp b/genplugouts/Xmi2Generator/UmlBaseItem.cpp
index 18a2c0e64..b851714fb 100644
--- a/genplugouts/Xmi2Generator/UmlBaseItem.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseItem.cpp
@@ -117,7 +117,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -173,7 +173,7 @@ bool UmlBaseItem::set_PropertyValue(const WrapperStr & k, const WrapperStr & v)
         return FALSE;
 }
 
-const Q3Dict<WrapperStr> UmlBaseItem::properties()
+const QHash<WrapperStr, WrapperStr *> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -222,11 +222,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -248,7 +248,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -277,17 +277,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -415,7 +415,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -506,10 +506,10 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
-    UmlItem * result = _all[id];
+    UmlItem * result = _all.value(id, 0);
 
     if (result == 0) {
         switch (kind) {
@@ -756,13 +756,13 @@ UmlItem * UmlBaseItem::read_()
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const UmlItem & n)
+UmlBaseItem::UmlBaseItem(void * id, const WrapperStr & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/Xmi2Generator/UmlBaseItem.h b/genplugouts/Xmi2Generator/UmlBaseItem.h
index dd6b5ce8b..e08edaaef 100644
--- a/genplugouts/Xmi2Generator/UmlBaseItem.h
+++ b/genplugouts/Xmi2Generator/UmlBaseItem.h
@@ -1,12 +1,12 @@
 #ifndef _UMLBASEITEM_H
 #define _UMLBASEITEM_H
-
+#include <QByteArray>
 
 #include "anItemKind.h"
 
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+
+
+
 //#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
@@ -72,7 +72,7 @@ class UmlBaseItem
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -106,7 +106,7 @@ class UmlBaseItem
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<WrapperStr> properties();
+    const QHash<WrapperStr,WrapperStr*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -163,7 +163,7 @@ class UmlBaseItem
     //  item), UmlNcRelations (their target is the current item) or
     //  UmlComponents (the associated component of the current item when it is
     //  a UmlClass, a non source component associated with the current one).
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // return a constant identifier, it is unique within a given
     // kind of element (two classes can't have the same identifiers, but
@@ -189,7 +189,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
 
 private:
@@ -215,11 +215,12 @@ class UmlBaseItem
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
+
+    QHash<WrapperStr,WrapperStr*> _dict;
 
-    Q3Dict<WrapperStr> _dict;
+        static QHash<void*,UmlItem*> _all;
 
-    static Q3PtrDict<UmlItem> _all;
 
 
 protected:
@@ -300,7 +301,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const UmlItem &n);
+    UmlBaseItem(void * id, const WrapperStr &n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/Xmi2Generator/UmlBaseMessage.cpp b/genplugouts/Xmi2Generator/UmlBaseMessage.cpp
index 77851f8dd..2d220aa8e 100644
--- a/genplugouts/Xmi2Generator/UmlBaseMessage.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseMessage.cpp
@@ -4,13 +4,13 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlOperation.h"
 
-void UmlBaseMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     _operation = (UmlOperation *) UmlBaseItem::read_();
 
     if (_operation == 0) _form = UmlCom::read_string();
 
-    _from = instances[(void *) UmlCom::read_unsigned()];
-    _to = instances[(void *) UmlCom::read_unsigned()];
+    _from = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
+    _to = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
 }
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseMessage.h b/genplugouts/Xmi2Generator/UmlBaseMessage.h
index f823cff1a..0b7ee022b 100644
--- a/genplugouts/Xmi2Generator/UmlBaseMessage.h
+++ b/genplugouts/Xmi2Generator/UmlBaseMessage.h
@@ -1,10 +1,11 @@
 #ifndef _UMLBASEMESSAGE_H
 #define _UMLBASEMESSAGE_H
+#include "../src/misc/mystr.h"
+#include <QByteArray>
+#include <QHash>
 
 
 
-#include <q3ptrdict.h>
-
 class UmlClassInstanceReference;
 class UmlOperation;
 
@@ -45,7 +46,7 @@ class UmlBaseMessage
     WrapperStr _form;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseSequenceMessage;
     friend class UmlBaseCollaborationMessage;
diff --git a/genplugouts/Xmi2Generator/UmlBaseOperation.cpp b/genplugouts/Xmi2Generator/UmlBaseOperation.cpp
index aba86ce60..84b19c6cf 100644
--- a/genplugouts/Xmi2Generator/UmlBaseOperation.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseOperation.cpp
@@ -9,7 +9,7 @@
 #include "UmlClassMember.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -73,7 +73,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -87,7 +87,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -101,7 +101,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -124,7 +124,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -137,7 +137,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -151,7 +151,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -173,9 +173,9 @@ bool UmlBaseOperation::replaceException(unsigned rank, const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseOperation::methods() const
+const QVector<UmlItem*> UmlBaseOperation::methods() const
 {
-    Q3PtrVector<UmlItem> l;
+    QVector<UmlItem*> l;
 
     UmlCom::send_cmd(_identifier, sideCmd);
     UmlCom::read_item_list(l);
diff --git a/genplugouts/Xmi2Generator/UmlBaseOperation.h b/genplugouts/Xmi2Generator/UmlBaseOperation.h
index f9065dd8b..199443494 100644
--- a/genplugouts/Xmi2Generator/UmlBaseOperation.h
+++ b/genplugouts/Xmi2Generator/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
+#include <QList>
+
 
 
 #include "UmlParameter.h"
@@ -54,7 +54,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -72,7 +72,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -90,7 +90,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceException(unsigned rank, const UmlTypeSpec & t);
 
     // return the behaviors (state and activities) implementing the operation
-    const Q3PtrVector<UmlItem> methods() const;
+    const QVector<UmlItem*> methods() const;
 
     // in case the operation is a 'get' operation, returns the associated
     // attribute or relation
@@ -144,7 +144,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
     WrapperStr cppBody();
 
@@ -213,7 +213,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
     WrapperStr javaBody();
 
@@ -274,7 +274,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PhpDef(const char * s);
 
     // returns the operation's body in Php++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
     WrapperStr phpBody();
 
@@ -327,7 +327,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PythonDef(const char * s);
 
     // returns the operation's body in Python++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
     WrapperStr pythonBody();
 
@@ -483,9 +483,9 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
     WrapperStr _cpp_def;
diff --git a/genplugouts/Xmi2Generator/UmlBasePackage.h b/genplugouts/Xmi2Generator/UmlBasePackage.h
index 1c1d7a691..a261ab953 100644
--- a/genplugouts/Xmi2Generator/UmlBasePackage.h
+++ b/genplugouts/Xmi2Generator/UmlBasePackage.h
@@ -185,7 +185,7 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
diff --git a/genplugouts/Xmi2Generator/UmlBaseParameterSet.cpp b/genplugouts/Xmi2Generator/UmlBaseParameterSet.cpp
index a2e4a1756..7eb8a3931 100644
--- a/genplugouts/Xmi2Generator/UmlBaseParameterSet.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         // tests != to bypass Qt 2.3 bug
@@ -44,6 +44,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseParameterSet.h b/genplugouts/Xmi2Generator/UmlBaseParameterSet.h
index 5c394e83d..ba220d375 100644
--- a/genplugouts/Xmi2Generator/UmlBaseParameterSet.h
+++ b/genplugouts/Xmi2Generator/UmlBaseParameterSet.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASEPARAMETERSET_H
 #define _UMLBASEPARAMETERSET_H
 
-
+#include <QVector>
 #include "UmlItem.h"
 #include "anItemKind.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlActivityParameter;
 class UmlActivityAction;
@@ -33,10 +33,10 @@ class UmlBaseParameterSet : public UmlItem
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +48,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/Xmi2Generator/UmlBaseSequenceDiagramDefinition.cpp b/genplugouts/Xmi2Generator/UmlBaseSequenceDiagramDefinition.cpp
index 5c3ed6d9c..fed4b82f3 100644
--- a/genplugouts/Xmi2Generator/UmlBaseSequenceDiagramDefinition.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseSequenceDiagramDefinition.cpp
@@ -40,7 +40,7 @@ static void qsort(UmlSequenceMessage ** v, int low, int high)
 }
 void UmlBaseSequenceDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -54,7 +54,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -64,11 +64,11 @@ void UmlBaseSequenceDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -82,7 +82,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         }
 
         ::qsort(_messages.data(), 0, n - 1);
-        _messages.setAutoDelete(TRUE);
+        //_messages.setAutoDelete(TRUE);
     }
 
     n = _fragments.count();
diff --git a/genplugouts/Xmi2Generator/UmlBaseSequenceDiagramDefinition.h b/genplugouts/Xmi2Generator/UmlBaseSequenceDiagramDefinition.h
index 6be419e66..f80c8b3f6 100644
--- a/genplugouts/Xmi2Generator/UmlBaseSequenceDiagramDefinition.h
+++ b/genplugouts/Xmi2Generator/UmlBaseSequenceDiagramDefinition.h
@@ -8,7 +8,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlSequenceMessage.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlSequenceMessage;
@@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following the sending time
-    const Q3PtrVector<UmlSequenceMessage> & messages() const {
+    const QVector<UmlSequenceMessage*> & messages() const {
         return _messages;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlSequenceMessage> _messages;
+    QVector<UmlSequenceMessage*> _messages;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/Xmi2Generator/UmlBaseSequenceMessage.cpp b/genplugouts/Xmi2Generator/UmlBaseSequenceMessage.cpp
index 1dd8efeae..4e3878bce 100644
--- a/genplugouts/Xmi2Generator/UmlBaseSequenceMessage.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseSequenceMessage.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlFragment.h"
 
-void UmlBaseSequenceMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseSequenceMessage::read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments)
 {
     UmlBaseMessage::read_(instances);
     _kind = (aMessageKind) UmlCom::read_char();
diff --git a/genplugouts/Xmi2Generator/UmlBaseSequenceMessage.h b/genplugouts/Xmi2Generator/UmlBaseSequenceMessage.h
index 6fc2ccbe9..8f2b50b80 100644
--- a/genplugouts/Xmi2Generator/UmlBaseSequenceMessage.h
+++ b/genplugouts/Xmi2Generator/UmlBaseSequenceMessage.h
@@ -4,8 +4,8 @@
 
 #include "aMessageKind.h"
 
-#include <q3ptrdict.h>
-#include <q3ptrvector.h>
+
+
 #include "UmlMessage.h"
 
 class UmlFragmentCompartment;
@@ -63,7 +63,7 @@ class UmlBaseSequenceMessage : public UmlMessage
     WrapperStr _stereotype;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments);
 
     friend class UmlBaseSequenceDiagramDefinition;
 };
diff --git a/genplugouts/Xmi2Generator/UmlBaseSubject.cpp b/genplugouts/Xmi2Generator/UmlBaseSubject.cpp
index b15d380d3..f55c74c8a 100644
--- a/genplugouts/Xmi2Generator/UmlBaseSubject.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseSubject.cpp
@@ -12,7 +12,7 @@ void UmlBaseSubject::read_()
     _h = (int) UmlCom::read_unsigned();
 }
 
-UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects)
+UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects)
 {
     int rank = subjects.count();
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseSubject.h b/genplugouts/Xmi2Generator/UmlBaseSubject.h
index e34a953be..df776d7c5 100644
--- a/genplugouts/Xmi2Generator/UmlBaseSubject.h
+++ b/genplugouts/Xmi2Generator/UmlBaseSubject.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASESUBJECT_H
 #define _UMLBASESUBJECT_H
+#include <QByteArray>
+#include "../src/misc/mystr.h"
 
 
 
-#include <q3ptrvector.h>
-
 class UmlSubject;
 
 // this class manages subjects
@@ -34,7 +34,7 @@ class UmlBaseSubject
 
 public:
     // internal
-    static UmlSubject * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects);
+    static UmlSubject * get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/Xmi2Generator/UmlBaseTypeSpec.h b/genplugouts/Xmi2Generator/UmlBaseTypeSpec.h
index aecc28abe..9bf3fb936 100644
--- a/genplugouts/Xmi2Generator/UmlBaseTypeSpec.h
+++ b/genplugouts/Xmi2Generator/UmlBaseTypeSpec.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASETYPESPEC_H
 #define _UMLBASETYPESPEC_H
+#include <QByteArray>
 
-
-
+#include "../src/misc/mystr.h"
 
 class UmlClass;
 
diff --git a/genplugouts/Xmi2Generator/UmlBaseUseCaseAssociation.cpp b/genplugouts/Xmi2Generator/UmlBaseUseCaseAssociation.cpp
index ebee930a9..6a91c0e5c 100644
--- a/genplugouts/Xmi2Generator/UmlBaseUseCaseAssociation.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseUseCaseAssociation.cpp
@@ -4,9 +4,9 @@
 #include "UmlUseCaseReference.h"
 #include "UmlClass.h"
 
-void UmlBaseUseCaseAssociation::read_(const Q3PtrDict<UmlUseCaseReference> & useCases)
+void UmlBaseUseCaseAssociation::read_(const QHash<void*,UmlUseCaseReference*> & useCases)
 {
-    _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()];
+    _use_case = (UmlUseCaseReference *) useCases[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
     _actor = (UmlClass *) UmlBaseItem::read_();
     _primary = UmlCom::read_bool();
     _name = UmlCom::read_string();
diff --git a/genplugouts/Xmi2Generator/UmlBaseUseCaseAssociation.h b/genplugouts/Xmi2Generator/UmlBaseUseCaseAssociation.h
index 5dfad9e70..25c361996 100644
--- a/genplugouts/Xmi2Generator/UmlBaseUseCaseAssociation.h
+++ b/genplugouts/Xmi2Generator/UmlBaseUseCaseAssociation.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASEUSECASEASSOCIATION_H
 #define _UMLBASEUSECASEASSOCIATION_H
+#include <QByteArray>
+#include <QHash>
 
 
 
-#include <q3ptrdict.h>
-
 class UmlUseCaseReference;
 class UmlClass;
 
@@ -50,7 +50,7 @@ class UmlBaseUseCaseAssociation
     bool _primary;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlUseCaseReference> & useCases);
+    void read_(const QHash<void*,UmlUseCaseReference*> & useCases);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/Xmi2Generator/UmlBaseUseCaseDiagramDefinition.cpp b/genplugouts/Xmi2Generator/UmlBaseUseCaseDiagramDefinition.cpp
index b8780daf2..7252035a3 100644
--- a/genplugouts/Xmi2Generator/UmlBaseUseCaseDiagramDefinition.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseUseCaseDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseUseCaseDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlUseCaseReference> ucrefs;
+    QHash<void*,UmlUseCaseReference*> ucrefs;
     unsigned n;
     unsigned rank;
 
@@ -18,7 +18,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -31,7 +31,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         sb->read_();
     }
 
-    _subjects.setAutoDelete(TRUE);
+    //_subjects.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _use_cases.resize(n);
@@ -40,11 +40,11 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         UmlUseCaseReference * uc = new UmlUseCaseReference();
 
         _use_cases.insert(rank, uc);
-        ucrefs.insert((void *) UmlCom::read_unsigned(), uc);
+        ucrefs.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), uc);
         uc->read_(_fragments, _subjects);
     }
 
-    _use_cases.setAutoDelete(TRUE);
+    //_use_cases.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _actors.resize(n);
@@ -62,7 +62,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         r->read_(ucrefs);
     }
 
-    _rels.setAutoDelete(TRUE);
+   // _rels.setAutoDelete(TRUE);
 }
 
 UmlBaseUseCaseDiagramDefinition::~UmlBaseUseCaseDiagramDefinition()
diff --git a/genplugouts/Xmi2Generator/UmlBaseUseCaseDiagramDefinition.h b/genplugouts/Xmi2Generator/UmlBaseUseCaseDiagramDefinition.h
index d2cefc68d..fe556d93b 100644
--- a/genplugouts/Xmi2Generator/UmlBaseUseCaseDiagramDefinition.h
+++ b/genplugouts/Xmi2Generator/UmlBaseUseCaseDiagramDefinition.h
@@ -10,7 +10,7 @@
 #include "UmlUseCaseReference.h"
 #include "UmlUseCaseAssociation.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlUseCaseReference;
 class UmlClass;
@@ -23,41 +23,41 @@ class UmlBaseUseCaseDiagramDefinition
 {
 public:
     // return the use cases present in the diagram
-    const Q3PtrVector<UmlUseCaseReference> & useCases() const {
+    const QVector<UmlUseCaseReference*> & useCases() const {
         return _use_cases;
     }
 
     // return the actors present in the diagram
-    const Q3PtrVector<UmlClass> & actors() const {
+    const QVector<UmlClass*> & actors() const {
         return _actors;
     }
 
     // return the associations between actor and use case present in the diagram
-    const Q3PtrVector<UmlUseCaseAssociation> & associations() const {
+    const QVector<UmlUseCaseAssociation*> & associations() const {
         return _rels;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
     // return the subjects present in the diagram
-    const Q3PtrVector<UmlSubject> & subjects() const {
+    const QVector<UmlSubject*> & subjects() const {
         return _subjects;
     }
 
 
 private:
-    Q3PtrVector<UmlUseCaseReference> _use_cases;
+    QVector<UmlUseCaseReference*> _use_cases;
 
-    Q3PtrVector<UmlClass> _actors;
+    QVector<UmlClass*> _actors;
 
-    Q3PtrVector<UmlUseCaseAssociation> _rels;
+    QVector<UmlUseCaseAssociation*> _rels;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
-    Q3PtrVector<UmlSubject> _subjects;
+    QVector<UmlSubject*> _subjects;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/Xmi2Generator/UmlBaseUseCaseReference.cpp b/genplugouts/Xmi2Generator/UmlBaseUseCaseReference.cpp
index c599f87d4..d20f93f30 100644
--- a/genplugouts/Xmi2Generator/UmlBaseUseCaseReference.cpp
+++ b/genplugouts/Xmi2Generator/UmlBaseUseCaseReference.cpp
@@ -6,7 +6,7 @@
 #include "UmlSubject.h"
 #include "UmlFragment.h"
 
-void UmlBaseUseCaseReference::read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects)
+void UmlBaseUseCaseReference::read_(const QVector<UmlFragment *> & fragments, const QVector<UmlSubject *> & subjects)
 {
     _use_case = (UmlUseCase *) UmlBaseItem::read_();
     _x = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/Xmi2Generator/UmlBaseUseCaseReference.h b/genplugouts/Xmi2Generator/UmlBaseUseCaseReference.h
index 5e5590920..b29d782cc 100644
--- a/genplugouts/Xmi2Generator/UmlBaseUseCaseReference.h
+++ b/genplugouts/Xmi2Generator/UmlBaseUseCaseReference.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASEUSECASEREFERENCE_H
 #define _UMLBASEUSECASEREFERENCE_H
+#include <QVector>
 
 
-#include <q3ptrvector.h>
 
 class UmlUseCase;
 class UmlFragmentCompartment;
@@ -46,7 +46,7 @@ class UmlBaseUseCaseReference
     int _h;
 
     // internal, don't call it
-    void read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects);
+    void read_(const QVector<UmlFragment *> &fragments, const QVector<UmlSubject *> &subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/Xmi2Generator/UmlBuiltin.h b/genplugouts/Xmi2Generator/UmlBuiltin.h
index 20ec5ac49..1b48f6633 100644
--- a/genplugouts/Xmi2Generator/UmlBuiltin.h
+++ b/genplugouts/Xmi2Generator/UmlBuiltin.h
@@ -1,5 +1,6 @@
 #ifndef _UMLBUILTIN_H
 #define _UMLBUILTIN_H
+#include <QByteArray>
 
 
 
diff --git a/genplugouts/Xmi2Generator/UmlClass.cpp b/genplugouts/Xmi2Generator/UmlClass.cpp
index 198bb1ff5..2215b63c2 100644
--- a/genplugouts/Xmi2Generator/UmlClass.cpp
+++ b/genplugouts/Xmi2Generator/UmlClass.cpp
@@ -6,7 +6,7 @@
 #include "UmlCom.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 void UmlClass::write(FileOut & out)
 {
     WrapperStr st = stereotype();
@@ -100,7 +100,7 @@ void UmlClass::write(FileOut & out)
     write_formals(out);
     write_actuals(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
@@ -114,7 +114,7 @@ void UmlClass::write(FileOut & out)
             out.indent();
             out << "<icon xmi:type=\"uml:Image\"";
             out.id_prefix(this, "Icon_");
-            out << " location=\"" << path << "\"/>\n";
+            out << " location=\"" << path.operator QString() << "\"/>\n";
         }
     }
 
@@ -132,7 +132,7 @@ void UmlClass::write(FileOut & out)
 
 void UmlClass::write_formals(FileOut & out)
 {
-    Q3ValueList<UmlFormalParameter> formal_params = formals();
+    QList<UmlFormalParameter> formal_params = formals();
 
     if (!formal_params.isEmpty()) {
         out.indent();
@@ -147,7 +147,7 @@ void UmlClass::write_formals(FileOut & out)
         out.indent(+1);
 
         int rank;
-        Q3ValueList<UmlFormalParameter>::ConstIterator iter;
+        QList<UmlFormalParameter>::ConstIterator iter;
 
         for (iter = formal_params.begin(), rank = 0;
              iter != formal_params.end();
@@ -162,8 +162,8 @@ void UmlClass::write_formals(FileOut & out)
 
 void UmlClass::write_actuals(FileOut & out)
 {
-    Q3ValueList<UmlActualParameter> actual_params = actuals();
-    Q3ValueList<UmlActualParameter>::ConstIterator iter;
+    QList<UmlActualParameter> actual_params = actuals();
+    QList<UmlActualParameter>::ConstIterator iter;
     int rank;
     UmlClass * super = 0;
 
@@ -209,7 +209,7 @@ void UmlClass::write_actuals(FileOut & out)
 
 void UmlClass::search_class_assoc()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -231,11 +231,11 @@ UmlClass * UmlClass::set_assoc(UmlRelation * rel)
     }
 }
 
-void UmlClass::get_extended(Q3ValueList<WrapperStr> & r)
+void UmlClass::get_extended(QList<WrapperStr> & r)
 {
     r.clear();
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
diff --git a/genplugouts/Xmi2Generator/UmlClass.h b/genplugouts/Xmi2Generator/UmlClass.h
index aac2d8e65..1d5d7fb48 100644
--- a/genplugouts/Xmi2Generator/UmlClass.h
+++ b/genplugouts/Xmi2Generator/UmlClass.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseClass.h"
 
-#include <q3valuelist.h>
+#include <QList>
 
 class FileOut;
 class UmlRelation;
@@ -35,7 +35,7 @@ class UmlClass : public UmlBaseClass
     UmlClass * set_assoc(UmlRelation * rel);
 
     //  the class is a stereotype, computes the list of extended meta classes
-    void get_extended(Q3ValueList<WrapperStr> & r);
+    void get_extended(QList<WrapperStr> & r);
 
 
 protected:
diff --git a/genplugouts/Xmi2Generator/UmlClassInstance.cpp b/genplugouts/Xmi2Generator/UmlClassInstance.cpp
index 778e5e1d7..bf5d8acf5 100644
--- a/genplugouts/Xmi2Generator/UmlClassInstance.cpp
+++ b/genplugouts/Xmi2Generator/UmlClassInstance.cpp
@@ -6,7 +6,7 @@
 #include "UmlAttribute.h"
 #include "UmlRelation.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 void UmlClassInstance::write(FileOut & out)
 {
     const char * k = (_uml_20) ? "ownedMember" : "packagedElement";
@@ -34,8 +34,8 @@ void UmlClassInstance::write(FileOut & out)
         out << "/>\n";
     }
 
-    Q3ValueList<SlotAttribute> attrs;
-    Q3ValueList<SlotAttribute>::Iterator a_iter;
+    QList<SlotAttribute> attrs;
+    QList<SlotAttribute>::Iterator a_iter;
     unsigned rank;
 
     attributesValue(attrs);
@@ -62,8 +62,8 @@ void UmlClassInstance::write(FileOut & out)
         out << "</slot>\n";
     }
 
-    Q3ValueList<SlotRelation> rels;
-    Q3ValueList<SlotRelation>::Iterator r_iter;
+    QList<SlotRelation> rels;
+    QList<SlotRelation>::Iterator r_iter;
 
     relationsValue(rels);
 
diff --git a/genplugouts/Xmi2Generator/UmlClassInstanceReference.cpp b/genplugouts/Xmi2Generator/UmlClassInstanceReference.cpp
index 96891b06d..8aa553dcd 100644
--- a/genplugouts/Xmi2Generator/UmlClassInstanceReference.cpp
+++ b/genplugouts/Xmi2Generator/UmlClassInstanceReference.cpp
@@ -34,7 +34,7 @@ const char * UmlClassInstanceReference::lifeline()
     return s;
 }
 
-void UmlClassInstanceReference::write_lifelines(FileOut & out, UmlItem * diagram, const Q3PtrVector<UmlClassInstanceReference> & insts)
+void UmlClassInstanceReference::write_lifelines(FileOut & out, UmlItem * diagram, const QVector<UmlClassInstanceReference *> &insts)
 {
     unsigned sup = insts.size();
     unsigned index;
@@ -53,7 +53,7 @@ void UmlClassInstanceReference::write_lifelines(FileOut & out, UmlItem * diagram
     }
 }
 
-void UmlClassInstanceReference::write_attributes(FileOut & out, UmlItem * diagram, const Q3PtrVector<UmlClassInstanceReference> & insts)
+void UmlClassInstanceReference::write_attributes(FileOut & out, UmlItem * diagram, const QVector<UmlClassInstanceReference *> &insts)
 {
     unsigned sup = insts.size();
     unsigned index;
diff --git a/genplugouts/Xmi2Generator/UmlClassInstanceReference.h b/genplugouts/Xmi2Generator/UmlClassInstanceReference.h
index 552528aa7..ca35fb5c2 100644
--- a/genplugouts/Xmi2Generator/UmlClassInstanceReference.h
+++ b/genplugouts/Xmi2Generator/UmlClassInstanceReference.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassInstanceReference.h"
-#include <q3ptrvector.h>
+
 
 class FileOut;
 class UmlItem;
@@ -30,9 +30,9 @@ class UmlClassInstanceReference : public UmlBaseClassInstanceReference
 
     const char * lifeline();
 
-    static void write_lifelines(FileOut & out, UmlItem * diagram, const Q3PtrVector<UmlClassInstanceReference> & insts);
+    static void write_lifelines(FileOut & out, UmlItem * diagram, const QVector<UmlClassInstanceReference*> & insts);
 
-    static void write_attributes(FileOut & out, UmlItem * diagram, const Q3PtrVector<UmlClassInstanceReference> & insts);
+    static void write_attributes(FileOut & out, UmlItem * diagram, const QVector<UmlClassInstanceReference*> & insts);
 
 
 private:
diff --git a/genplugouts/Xmi2Generator/UmlClassMember.cpp b/genplugouts/Xmi2Generator/UmlClassMember.cpp
index a2cfe3710..bc40d5bdf 100644
--- a/genplugouts/Xmi2Generator/UmlClassMember.cpp
+++ b/genplugouts/Xmi2Generator/UmlClassMember.cpp
@@ -4,6 +4,7 @@
 #include "UmlTypeSpec.h"
 
 #include "UmlClass.h"
+#include <QRegExp>
 //Added by qt3to4:
 #include "misc/mystr.h"
 void UmlClassMember::write_scope(FileOut & out)
@@ -100,7 +101,7 @@ void UmlClassMember::write_constraint(FileOut & out)
 WrapperStr UmlClassMember::true_name(WrapperStr name, WrapperStr decl)
 {
 //int index = decl.find("${name}", 0, FALSE);//[jasa] no matching call
-    int index = decl.lower().find("${name}", 0);//[jasa] lowercase for find()
+    int index = decl.lower().indexOf("${name}", 0);//[jasa] lowercase for find()
 
     if (index == -1)
         // too complicated, return the Uml one
@@ -132,12 +133,14 @@ WrapperStr UmlClassMember::true_name(WrapperStr name, WrapperStr decl)
     return r;
 }
 
-bool UmlClassMember::identChar(char c)
+bool UmlClassMember::identChar(QCharRef s)
 {
-    return (((c >= 'a') && (c <= 'z')) ||
-            ((c >= 'A') && (c <= 'Z')) ||
-            ((c >= '0') && (c <= '9')) ||
-            (c == '_'));
+    QRegExp rx(QRegExp::escape("[A-Za-z0-9_]"));
+    return rx.indexIn(QString(s)) != -1;
+//    return (((c >= 'a') && (c <= 'z')) ||
+//            ((c >= 'A') && (c <= 'Z')) ||
+//            ((c >= '0') && (c <= '9')) ||
+//            (c == '_'));
 }
 
 void UmlClassMember::write_type(FileOut & out, const UmlTypeSpec & t, WrapperStr s, const char * k_name, const char * k_type)
@@ -148,12 +151,12 @@ void UmlClassMember::write_type(FileOut & out, const UmlTypeSpec & t, WrapperStr
 
     // remove k_name and all after it except []
     //if (k_name && *k_name && ((index = s.find(k_name, 0, FALSE)) != -1)) {//[jasa] original line
-    if (k_name && *k_name && ((index = s.lower().find(WrapperStr(k_name).lower(), 0)) != -1)) {//[jasa] covert to lowercase for find()
+    if (k_name && *k_name && ((index = s.lower().indexOf(WrapperStr(k_name).lower(), 0)) != -1)) {//[jasa] covert to lowercase for find()
         //remove name
         s.remove(index, strlen(k_name));
 
         for (;;) {
-            if (s[index] == " ")
+            if (s[index] == ' ')
                 s.remove(index, 1);
 
             if (s[index] != '[')
diff --git a/genplugouts/Xmi2Generator/UmlClassMember.h b/genplugouts/Xmi2Generator/UmlClassMember.h
index 1d7e8a6e2..d8c7a7513 100644
--- a/genplugouts/Xmi2Generator/UmlClassMember.h
+++ b/genplugouts/Xmi2Generator/UmlClassMember.h
@@ -29,7 +29,7 @@ class UmlClassMember : public UmlBaseClassMember
 
     WrapperStr true_name(WrapperStr name, WrapperStr decl);
 
-    static bool identChar(char c);
+    static bool identChar(QCharRef);
 
     //The keyword link to the language are removed/replaced
     //Have to remove the name and type keywords given in argument,
diff --git a/genplugouts/Xmi2Generator/UmlClassView.cpp b/genplugouts/Xmi2Generator/UmlClassView.cpp
index 38de26247..dc2821db7 100644
--- a/genplugouts/Xmi2Generator/UmlClassView.cpp
+++ b/genplugouts/Xmi2Generator/UmlClassView.cpp
@@ -17,7 +17,7 @@ void UmlClassView::write(FileOut & out)
         write_description_properties(out);
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -25,7 +25,7 @@ void UmlClassView::write(FileOut & out)
 
     if (_gen_views) {
         while (! _relations.isEmpty())
-            _relations.take(0)->write(out, FALSE);
+            _relations.takeAt(0)->write(out, FALSE);
 
         out.indent(-1);
         out.indent();
@@ -35,7 +35,7 @@ void UmlClassView::write(FileOut & out)
 
 void UmlClassView::search_class_assoc()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlClassView.h b/genplugouts/Xmi2Generator/UmlClassView.h
index 1e1e9001d..35f609885 100644
--- a/genplugouts/Xmi2Generator/UmlClassView.h
+++ b/genplugouts/Xmi2Generator/UmlClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseClassView.h"
 
-#include <q3ptrlist.h>
+
 
 class FileOut;
 class UmlItem;
@@ -29,7 +29,7 @@ class UmlClassView : public UmlBaseClassView
 
 
 protected:
-    Q3PtrList<UmlItem> _relations;
+    QList<UmlItem*> _relations;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlCollaborationDiagramDefinition.cpp b/genplugouts/Xmi2Generator/UmlCollaborationDiagramDefinition.cpp
index 1907e1101..2bbb5780c 100644
--- a/genplugouts/Xmi2Generator/UmlCollaborationDiagramDefinition.cpp
+++ b/genplugouts/Xmi2Generator/UmlCollaborationDiagramDefinition.cpp
@@ -10,7 +10,7 @@ UmlCollaborationDiagramDefinition::~UmlCollaborationDiagramDefinition()
 void UmlCollaborationDiagramDefinition::write(FileOut & out, UmlItem * diag)
 {
     UmlMessage::write_connectors(out, diag,
-                                 (const Q3PtrVector<UmlMessage> &) messages());
+                                 (const QVector<UmlMessage*> &) messages());
     UmlClassInstanceReference::write_lifelines(out, diag, instances());
 
     if (! messages().isEmpty()) {
diff --git a/genplugouts/Xmi2Generator/UmlCollaborationMessage.cpp b/genplugouts/Xmi2Generator/UmlCollaborationMessage.cpp
index f6df8e588..b83ff9a6d 100644
--- a/genplugouts/Xmi2Generator/UmlCollaborationMessage.cpp
+++ b/genplugouts/Xmi2Generator/UmlCollaborationMessage.cpp
@@ -2,13 +2,13 @@
 #include "UmlCollaborationMessage.h"
 #include "FileOut.h"
 #include "UmlItem.h"
-
+#include "../src/misc/mystr.h"
 #include "UmlPackage.h"
 #include "UmlOperation.h"
 #include "UmlClassInstanceReference.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-void UmlCollaborationMessage::write(FileOut & out, UmlItem * diagram, const Q3PtrVector< UmlCollaborationMessage > & msgs, unsigned & index)
+void UmlCollaborationMessage::write(FileOut & out, UmlItem * diagram, const QVector< UmlCollaborationMessage* > & msgs, unsigned & index)
 {
     unsigned sup = msgs.size();
     UmlPackage * prj = UmlPackage::getProject();
diff --git a/genplugouts/Xmi2Generator/UmlCollaborationMessage.h b/genplugouts/Xmi2Generator/UmlCollaborationMessage.h
index 1aadd6b31..f3280fc0c 100644
--- a/genplugouts/Xmi2Generator/UmlCollaborationMessage.h
+++ b/genplugouts/Xmi2Generator/UmlCollaborationMessage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationMessage.h"
-#include <q3ptrvector.h>
+
 
 class FileOut;
 class UmlItem;
@@ -13,7 +13,7 @@ class UmlItem;
 class UmlCollaborationMessage : public UmlBaseCollaborationMessage
 {
 public:
-    static void write(FileOut & out, UmlItem * diagram, const Q3PtrVector< UmlCollaborationMessage > & msgs, unsigned & index);
+    static void write(FileOut & out, UmlItem * diagram, const QVector< UmlCollaborationMessage* > & msgs, unsigned & index);
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlCom.cpp b/genplugouts/Xmi2Generator/UmlCom.cpp
index df80c4d37..02029c3a4 100644
--- a/genplugouts/Xmi2Generator/UmlCom.cpp
+++ b/genplugouts/Xmi2Generator/UmlCom.cpp
@@ -1,7 +1,7 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
 #include "misc/mystr.h"
 
@@ -11,10 +11,11 @@
 #include "UmlClass.h"
 #include "UmlSettings.h"
 #include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +29,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(55);
         flush();
@@ -75,11 +78,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -89,11 +92,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -110,13 +113,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -125,10 +128,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -137,16 +140,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -155,18 +158,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -212,7 +215,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -222,7 +225,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -233,7 +236,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
 #endif
 
     write_char(f);
@@ -246,7 +249,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -258,7 +261,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
 #endif
 
     write_char(f);
@@ -270,7 +273,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -282,7 +285,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -294,7 +297,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -307,7 +310,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -320,7 +323,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -334,7 +337,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -346,7 +349,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -359,7 +362,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +375,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -385,7 +388,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -407,7 +410,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -421,7 +424,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -435,7 +438,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -450,7 +453,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -463,7 +466,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -477,7 +480,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -499,8 +502,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -533,7 +536,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -556,10 +559,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -576,10 +579,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -613,7 +616,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -630,7 +633,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -641,12 +644,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -678,28 +681,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
 void UmlCom::fatal_error(const WrapperStr &
-#ifdef DEBUG_BOUML
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -708,7 +712,7 @@ void UmlCom::fatal_error(const WrapperStr &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -719,7 +723,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/Xmi2Generator/UmlCom.h b/genplugouts/Xmi2Generator/UmlCom.h
index 747ca3c43..03ee3bcff 100644
--- a/genplugouts/Xmi2Generator/UmlCom.h
+++ b/genplugouts/Xmi2Generator/UmlCom.h
@@ -2,7 +2,7 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //#include "CmdFamily.h"
 //#include "OnInstanceCmd.h"
 #include "anItemKind.h"
@@ -10,14 +10,14 @@
 #include "misc/mystr.h"
 
 
-#include <q3ptrvector.h>
+
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -78,11 +78,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -92,19 +92,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -194,8 +194,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -218,7 +218,7 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
     static void fatal_error(const WrapperStr & msg);
diff --git a/genplugouts/Xmi2Generator/UmlComponent.cpp b/genplugouts/Xmi2Generator/UmlComponent.cpp
index 16a41ba50..54eede0e2 100644
--- a/genplugouts/Xmi2Generator/UmlComponent.cpp
+++ b/genplugouts/Xmi2Generator/UmlComponent.cpp
@@ -17,7 +17,7 @@ void UmlComponent::write(FileOut & out)
     out.indent(+1);
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned index;
 
@@ -26,7 +26,7 @@ void UmlComponent::write(FileOut & out)
 
     // provided
 
-    const Q3PtrVector< UmlClass > & prov = providedClasses();
+    const QVector< UmlClass* > & prov = providedClasses();
 
     n = prov.size();
 
@@ -44,7 +44,7 @@ void UmlComponent::write(FileOut & out)
 
     // realizing
 
-    const Q3PtrVector< UmlClass > & rea = realizingClasses();
+    const QVector< UmlClass* > & rea = realizingClasses();
 
     n = rea.size();
 
@@ -66,7 +66,7 @@ void UmlComponent::write(FileOut & out)
 
     // required
 
-    const Q3PtrVector< UmlClass > & req = requiredClasses();
+    const QVector< UmlClass* > & req = requiredClasses();
 
     n = req.size();
 
diff --git a/genplugouts/Xmi2Generator/UmlComponentView.cpp b/genplugouts/Xmi2Generator/UmlComponentView.cpp
index af9bfe086..943abbf1c 100644
--- a/genplugouts/Xmi2Generator/UmlComponentView.cpp
+++ b/genplugouts/Xmi2Generator/UmlComponentView.cpp
@@ -17,7 +17,7 @@ void UmlComponentView::write(FileOut & out)
         write_description_properties(out);
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -25,7 +25,7 @@ void UmlComponentView::write(FileOut & out)
 
     if (_gen_views) {
         while (! _relations.isEmpty())
-            _relations.take(0)->write(out, FALSE);
+            _relations.takeAt(0)->write(out, FALSE);
 
         out.indent(-1);
         out.indent();
diff --git a/genplugouts/Xmi2Generator/UmlComponentView.h b/genplugouts/Xmi2Generator/UmlComponentView.h
index 0f946cbf1..df746fd31 100644
--- a/genplugouts/Xmi2Generator/UmlComponentView.h
+++ b/genplugouts/Xmi2Generator/UmlComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseComponentView.h"
 
-#include <q3ptrlist.h>
+
 
 class FileOut;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlComponentView : public UmlBaseComponentView
 
 
 protected:
-    Q3PtrList<UmlItem> _relations;
+    QList<UmlItem*> _relations;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlDeploymentView.cpp b/genplugouts/Xmi2Generator/UmlDeploymentView.cpp
index b0eca629d..53b1e90a2 100644
--- a/genplugouts/Xmi2Generator/UmlDeploymentView.cpp
+++ b/genplugouts/Xmi2Generator/UmlDeploymentView.cpp
@@ -17,7 +17,7 @@ void UmlDeploymentView::write(FileOut & out)
         write_description_properties(out);
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -25,7 +25,7 @@ void UmlDeploymentView::write(FileOut & out)
 
     if (_gen_views) {
         while (! _relations.isEmpty())
-            _relations.take(0)->write(out, FALSE);
+            _relations.takeAt(0)->write(out, FALSE);
 
         out.indent(-1);
         out.indent();
diff --git a/genplugouts/Xmi2Generator/UmlDeploymentView.h b/genplugouts/Xmi2Generator/UmlDeploymentView.h
index cc65e8322..4dad441cb 100644
--- a/genplugouts/Xmi2Generator/UmlDeploymentView.h
+++ b/genplugouts/Xmi2Generator/UmlDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseDeploymentView.h"
 
-#include <q3ptrlist.h>
+
 
 class FileOut;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlDeploymentView : public UmlBaseDeploymentView
 
 
 protected:
-    Q3PtrList<UmlItem> _relations;
+    QList<UmlItem*> _relations;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlEntryPointPseudoState.cpp b/genplugouts/Xmi2Generator/UmlEntryPointPseudoState.cpp
index 8f5ee3c1b..dbd4e82cc 100644
--- a/genplugouts/Xmi2Generator/UmlEntryPointPseudoState.cpp
+++ b/genplugouts/Xmi2Generator/UmlEntryPointPseudoState.cpp
@@ -33,9 +33,9 @@ void UmlEntryPointPseudoState::write(FileOut & out)
     write_description_properties(out);
 
     while (! _incoming_trans.isEmpty())
-        _incoming_trans.take(0)->write_in(out);
+        _incoming_trans.takeAt(0)->write_in(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
diff --git a/genplugouts/Xmi2Generator/UmlExitPointPseudoState.cpp b/genplugouts/Xmi2Generator/UmlExitPointPseudoState.cpp
index 6e773e4c4..926361cc6 100644
--- a/genplugouts/Xmi2Generator/UmlExitPointPseudoState.cpp
+++ b/genplugouts/Xmi2Generator/UmlExitPointPseudoState.cpp
@@ -33,9 +33,9 @@ void UmlExitPointPseudoState::write(FileOut & out)
     write_description_properties(out);
 
     while (! _incoming_trans.isEmpty())
-        _incoming_trans.take(0)->write_in(out);
+        _incoming_trans.takeAt(0)->write_in(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
diff --git a/genplugouts/Xmi2Generator/UmlExpansionNode.cpp b/genplugouts/Xmi2Generator/UmlExpansionNode.cpp
index 24a7194de..ef1b3a05a 100644
--- a/genplugouts/Xmi2Generator/UmlExpansionNode.cpp
+++ b/genplugouts/Xmi2Generator/UmlExpansionNode.cpp
@@ -27,7 +27,7 @@ void UmlExpansionNode::write(FileOut & out)
     write_multiplicity(out, multiplicity(), this);
     UmlItem::write_type(out, type());
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlExpansionRegion.cpp b/genplugouts/Xmi2Generator/UmlExpansionRegion.cpp
index 72c6448d9..8206e775c 100644
--- a/genplugouts/Xmi2Generator/UmlExpansionRegion.cpp
+++ b/genplugouts/Xmi2Generator/UmlExpansionRegion.cpp
@@ -36,7 +36,7 @@ void UmlExpansionRegion::write(FileOut & out)
 
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlFinalState.cpp b/genplugouts/Xmi2Generator/UmlFinalState.cpp
index f6eef1724..4412a567f 100644
--- a/genplugouts/Xmi2Generator/UmlFinalState.cpp
+++ b/genplugouts/Xmi2Generator/UmlFinalState.cpp
@@ -13,7 +13,7 @@ void UmlFinalState::write(FileOut & out)
     write_description_properties(out);
 
     while (! _incoming_trans.isEmpty())
-        _incoming_trans.take(0)->write_in(out);
+        _incoming_trans.takeAt(0)->write_in(out);
 
     out.indent(-1);
     out.indent();
diff --git a/genplugouts/Xmi2Generator/UmlFragment.cpp b/genplugouts/Xmi2Generator/UmlFragment.cpp
index a64e3e840..e326f789c 100644
--- a/genplugouts/Xmi2Generator/UmlFragment.cpp
+++ b/genplugouts/Xmi2Generator/UmlFragment.cpp
@@ -9,7 +9,7 @@
 #include "UmlDiagram.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-void UmlFragment::write(FileOut & out, UmlItem * diagram, Q3PtrList<UmlSequenceMessage> & msgs)
+void UmlFragment::write(FileOut & out, UmlItem * diagram, QList<UmlSequenceMessage *> &msgs)
 {
     WrapperStr oper = name();
 
@@ -39,13 +39,14 @@ void UmlFragment::write(FileOut & out, UmlItem * diagram, Q3PtrList<UmlSequenceM
             if (! covered.isEmpty()) {
                 out << " covered=\"";
 
-                UmlClassInstanceReference * lifeline = covered.first();
+                //UmlClassInstanceReference * lifeline = covered.first();
 
-                for (;;) {
-                    out.ref_only(diagram, lifeline->lifeline());
-                    lifeline = covered.next();
+                for (int i = 0;;) {
+                    out.ref_only(diagram, covered[i]->lifeline());
+                    //lifeline = covered.next();
+                    i++;
 
-                    if (lifeline == 0)
+                    if(!(i < covered.count()))
                         break;
 
                     out << " ";
@@ -54,11 +55,11 @@ void UmlFragment::write(FileOut & out, UmlItem * diagram, Q3PtrList<UmlSequenceM
                 out << '"';
             }
 
-            out << " interactionOperator=\"" << oper << "\">\n";
+            out << " interactionOperator=\"" << oper.operator QString() << "\">\n";
             out.indent(+1);
         }
 
-        const Q3PtrVector<UmlFragmentCompartment> & subs = compartments();
+        const QVector<UmlFragmentCompartment*> & subs = compartments();
         unsigned n = subs.size();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -74,17 +75,17 @@ void UmlFragment::write(FileOut & out, UmlItem * diagram, Q3PtrList<UmlSequenceM
 
 void UmlFragment::cover(UmlSequenceMessage * msg)
 {
-    if (covered.findRef(msg->from()) == -1)
+    if (covered.indexOf(msg->from()) == -1)
         covered.append(msg->from());
 
-    if (covered.findRef(msg->to()) == -1)
+    if (covered.indexOf(msg->to()) == -1)
         covered.append(msg->to());
 
     if (container() != 0)
         container()->fragment()->cover(msg);
 }
 
-void UmlFragment::write_ref(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequenceMessage > & msgs)
+void UmlFragment::write_ref(FileOut & out, UmlItem * diagram, QList<UmlSequenceMessage *> &msgs)
 {
     static int rank = 0;
 
@@ -92,7 +93,7 @@ void UmlFragment::write_ref(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequ
     out << "<fragment xmi:type=\"uml:InteractionUse\"";
     out.id_prefix(diagram, "INTERACTIONUSE", ++rank);
 
-    const Q3PtrVector<UmlClassInstanceReference> & v = UmlBaseFragment::covered();
+    const QVector<UmlClassInstanceReference*> & v = UmlBaseFragment::covered();
     unsigned n;
     unsigned index;
 
@@ -155,7 +156,7 @@ void UmlFragment::write_ref(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequ
 
     // remove internal messages and compartment
 
-    const Q3PtrVector<UmlFragmentCompartment> & subs = compartments();
+    const QVector<UmlFragmentCompartment*> & subs = compartments();
 
     n = subs.size();
 
diff --git a/genplugouts/Xmi2Generator/UmlFragment.h b/genplugouts/Xmi2Generator/UmlFragment.h
index ed4c78a7d..09029ce1b 100644
--- a/genplugouts/Xmi2Generator/UmlFragment.h
+++ b/genplugouts/Xmi2Generator/UmlFragment.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseFragment.h"
-#include <q3ptrlist.h>
+
 
 class FileOut;
 class UmlItem;
@@ -16,7 +16,7 @@ class UmlFragment : public UmlBaseFragment
 public:
     //
 
-    void write(FileOut & out, UmlItem * diagram, Q3PtrList<UmlSequenceMessage> & msgs);
+    void write(FileOut & out, UmlItem * diagram, QList<UmlSequenceMessage*> & msgs);
 
     void cover(UmlSequenceMessage * msg);
 
@@ -24,9 +24,9 @@ class UmlFragment : public UmlBaseFragment
 private:
     //
 
-    void write_ref(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequenceMessage > & msgs);
+    void write_ref(FileOut & out, UmlItem * diagram, QList< UmlSequenceMessage* > & msgs);
 
-    Q3PtrList<UmlClassInstanceReference> covered;
+    QList<UmlClassInstanceReference*> covered;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlFragmentCompartment.cpp b/genplugouts/Xmi2Generator/UmlFragmentCompartment.cpp
index 755cff3de..aeb1fe320 100644
--- a/genplugouts/Xmi2Generator/UmlFragmentCompartment.cpp
+++ b/genplugouts/Xmi2Generator/UmlFragmentCompartment.cpp
@@ -6,7 +6,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 
-void UmlFragmentCompartment::write(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequenceMessage > & msgs)
+void UmlFragmentCompartment::write(FileOut & out, UmlItem * diagram, QList<UmlSequenceMessage *> &msgs)
 {
     UmlFragment * fr = fragment();
 
@@ -16,9 +16,9 @@ void UmlFragmentCompartment::write(FileOut & out, UmlItem * diagram, Q3PtrList<
     fr->write(out, diagram, msgs);
 }
 
-void UmlFragmentCompartment::write(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequenceMessage > & msgs, WrapperStr oper)
+void UmlFragmentCompartment::write(FileOut & out, UmlItem * diagram, QList<UmlSequenceMessage *> &msgs, WrapperStr oper)
 {
-    Q3PtrListIterator<UmlSequenceMessage> it(msgs);
+    QList<UmlSequenceMessage*>::Iterator it = msgs.begin();
     UmlSequenceMessage * m;
 
     if (!oper.isEmpty()) {
@@ -41,7 +41,7 @@ void UmlFragmentCompartment::write(FileOut & out, UmlItem * diagram, Q3PtrList<
 
             txt.stripWhiteSpace();
 
-            if ((txt.at(0) == '[') && (txt.at(txt.length() - 1) == ']'))
+            if ((txt.at(0) == "[") && (txt.at(txt.length() - 1) == "]"))
                 txt = txt.mid(1, txt.length() - 2);
 
             if (oper == "loop") {
@@ -107,7 +107,8 @@ void UmlFragmentCompartment::write(FileOut & out, UmlItem * diagram, Q3PtrList<
         out << "\" setting=\"false\"/>\n";
     }
 
-    while ((m = it.current()) != 0) {
+    while (it != msgs.end()) {
+        m = *it;
         UmlFragmentCompartment * fc = m->fragment();
 
         if (fc == 0)
@@ -156,12 +157,13 @@ void UmlFragmentCompartment::write(FileOut & out, UmlItem * diagram, Q3PtrList<
     }
 }
 
-void UmlFragmentCompartment::bypass(Q3PtrList< UmlSequenceMessage > & msgs)
+void UmlFragmentCompartment::bypass(QList<UmlSequenceMessage *> &msgs)
 {
-    Q3PtrListIterator<UmlSequenceMessage> it(msgs);
+    QList<UmlSequenceMessage*>::Iterator it = msgs.begin();
     UmlSequenceMessage * m;
 
-    while ((m = it.current()) != 0) {
+    while (it != msgs.end()) {
+        m = *it;
         UmlFragmentCompartment * fc = m->fragment();
 
         if (fc == 0)
@@ -186,7 +188,7 @@ void UmlFragmentCompartment::bypass(Q3PtrList< UmlSequenceMessage > & msgs)
                 // not included in compartment or under
                 ++it;
             else
-                msgs.removeRef(m);
+                msgs.removeOne(m);
         }
     }
 }
diff --git a/genplugouts/Xmi2Generator/UmlFragmentCompartment.h b/genplugouts/Xmi2Generator/UmlFragmentCompartment.h
index e8bace2ff..7b37a3cff 100644
--- a/genplugouts/Xmi2Generator/UmlFragmentCompartment.h
+++ b/genplugouts/Xmi2Generator/UmlFragmentCompartment.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseFragmentCompartment.h"
-#include <q3ptrlist.h>
+
 
 
 class FileOut;
@@ -17,15 +17,15 @@ class UmlFragmentCompartment : public UmlBaseFragmentCompartment
 public:
     // called for the first message of a fragment compartment and its parents recursively
 
-    void write(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequenceMessage > & msgs);
+    void write(FileOut & out, UmlItem * diagram, QList< UmlSequenceMessage* > & msgs);
 
     //
 
-    void write(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequenceMessage > & msgs, WrapperStr oper);
+    void write(FileOut & out, UmlItem * diagram, QList< UmlSequenceMessage* > & msgs, WrapperStr oper);
 
     //
 
-    void bypass(Q3PtrList< UmlSequenceMessage > & msgs);
+    void bypass(QList< UmlSequenceMessage* > & msgs);
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlInterruptibleActivityRegion.cpp b/genplugouts/Xmi2Generator/UmlInterruptibleActivityRegion.cpp
index 0ceaf93da..13ad35b3e 100644
--- a/genplugouts/Xmi2Generator/UmlInterruptibleActivityRegion.cpp
+++ b/genplugouts/Xmi2Generator/UmlInterruptibleActivityRegion.cpp
@@ -13,7 +13,7 @@ void UmlInterruptibleActivityRegion::write(FileOut & out)
 
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlItem.cpp b/genplugouts/Xmi2Generator/UmlItem.cpp
index 5ab03d603..c1fdc8c65 100644
--- a/genplugouts/Xmi2Generator/UmlItem.cpp
+++ b/genplugouts/Xmi2Generator/UmlItem.cpp
@@ -8,7 +8,7 @@
 #include "UmlClass.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 UmlItem::~UmlItem()
 {
@@ -21,7 +21,7 @@ void UmlItem::xmi(int, char **)
 
 void UmlItem::write(FileOut & out)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -48,10 +48,10 @@ void UmlItem::write_description_properties(FileOut & out)
     WrapperStr ste = stereotype();
 
     if (_gen_extension) {
-        const Q3Dict<WrapperStr> up = properties();
-        Q3DictIterator<WrapperStr> it(up);
+        const QHash<WrapperStr,WrapperStr*> up = properties();
+        QHashIterator<WrapperStr,WrapperStr*> it(up);
 
-        if (it.current()) {
+        if (it.hasNext()) {
             out.indent();
             out << "<xmi:Extension extender=\"Bouml\">\n";
 
@@ -62,16 +62,16 @@ void UmlItem::write_description_properties(FileOut & out)
                 out << "\"/>\n";
             }
 
-            do {
+            while (it.hasNext()){
+                it.next();
                 out.indent();
                 out << "\t<taggedValue tag=\"";
-                out.quote((const char *)it.currentKey()); //[jasa] ambiguous call
+                out.quote((const char *)it.key()); //[jasa] ambiguous call
                 out << "\" value=\"";
-                out.quote((const char *) * (it.current())); //[jasa] ambiguous call
+                out.quote((const char *) * (it.value())); //[jasa] ambiguous call
                 out << "\"/>\n";
-                ++it;
             }
-            while (it.current());
+
 
             out.indent();
             out << "</xmi:Extension>\n";
@@ -84,7 +84,7 @@ void UmlItem::write_description_properties(FileOut & out)
         }
     }
 
-    if (ste.contains(':') == 1)
+    if (ste.operator QString().count(':') == 1)
         // probably a stereotype part of profile
         _stereotypes[ste].append(this);
 }
@@ -120,12 +120,12 @@ void UmlItem::write_multiplicity(FileOut & out, WrapperStr s, UmlItem * who)
         out.indent();
         out << "<lowerValue xmi:type=\"uml:LiteralString\"";
         out.id_prefix(who, "MULTIPLICITY_L_");
-        out << " value=\"" << min << "\"/>\n";
+        out << " value=\"" << min.operator QString() << "\"/>\n";
 
         out.indent();
         out << "<upperValue xmi:type=\"uml:LiteralString\"";
         out.id_prefix(who, "MULTIPLICITY_U_");
-        out << " value=\"" << max << "\"/>\n";
+        out << " value=\"" << max.operator QString() << "\"/>\n";
     }
 }
 
@@ -192,42 +192,41 @@ void UmlItem::write_default_value(FileOut & out, WrapperStr v, UmlItem * who, in
 
 void UmlItem::write_stereotyped(FileOut & out)
 {
-    QMap<WrapperStr, Q3PtrList<UmlItem> >::Iterator it;
+    QMap<QString, QList<UmlItem*> >::Iterator it;
 
     for (it = _stereotypes.begin(); it != _stereotypes.end(); ++it) {
-        const char * st = it.key();
+        QString st = it.key();
         UmlClass * cl = UmlClass::findStereotype(it.key(), TRUE);
 
         if (cl != 0) {
-            Q3ValueList<WrapperStr> extended;
+            QList<WrapperStr> extended;
 
             cl->get_extended(extended);
 
-            Q3PtrList<UmlItem> & l = it.data();
+            QList<UmlItem*> & l = it.value();
             UmlItem * elt;
 
-            for (elt = l.first(); elt != 0; elt = l.next()) {
+            foreach (elt,l) {
                 out << "\t<" << st;
                 out.id_prefix(elt, "STELT_");
 
-                const Q3Dict<WrapperStr> props = elt->properties();
-                Q3DictIterator<WrapperStr> itp(props);
+                const QHash<WrapperStr,WrapperStr*> props = elt->properties();
+                QHashIterator<WrapperStr,WrapperStr*> itp(props);
 
-                while (itp.current()) {
-                    QString k = itp.currentKey();
+                while (itp.hasNext()) {
+                    itp.next();
+                    QString k = itp.key();
 
-                    if (k.contains(':') == 2) {
+                    if (k.count(':') == 2) {
                         out << " ";
-                        out.quote((const char *)k.mid(k.findRev(':') + 1)); //[jasa] ambiguous call
+                        out.quote(k.mid(k.lastIndexOf(':') + 1)); //[jasa] ambiguous call
                         out << "=\"";
-                        out.quote((const char *)*itp.current());
+                        out.quote((const char *)*itp.value());
                         out << '"';
                     }
-
-                    ++itp;
                 }
 
-                Q3ValueList<WrapperStr>::Iterator iter_extended;
+                QList<WrapperStr>::Iterator iter_extended;
 
                 for (iter_extended = extended.begin();
                      iter_extended != extended.end();
@@ -269,5 +268,5 @@ bool UmlItem::_gen_extension;
 
 bool UmlItem::_gen_eclipse;
 
-QMap<WrapperStr, Q3PtrList<UmlItem> > UmlItem::_stereotypes;
+QMap<QString, QList<UmlItem*> > UmlItem::_stereotypes;
 
diff --git a/genplugouts/Xmi2Generator/UmlItem.h b/genplugouts/Xmi2Generator/UmlItem.h
index eb68e5a42..a6b48c37a 100644
--- a/genplugouts/Xmi2Generator/UmlItem.h
+++ b/genplugouts/Xmi2Generator/UmlItem.h
@@ -6,7 +6,7 @@
 #include "UmlBaseItem.h"
 
 #include "Language.h"
-#include <q3ptrlist.h>
+
 
 class FileOut;
 class FileOut;
@@ -84,7 +84,7 @@ class UmlItem : public UmlBaseItem
 
     static bool _gen_eclipse;
 
-    static QMap<WrapperStr, Q3PtrList<UmlItem> > _stereotypes;
+    static QMap<QString, QList<UmlItem*> > _stereotypes;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlMessage.cpp b/genplugouts/Xmi2Generator/UmlMessage.cpp
index 02a60bbbf..1beff3b61 100644
--- a/genplugouts/Xmi2Generator/UmlMessage.cpp
+++ b/genplugouts/Xmi2Generator/UmlMessage.cpp
@@ -2,18 +2,15 @@
 #include "UmlMessage.h"
 #include "FileOut.h"
 #include "UmlItem.h"
-
-#include <q3asciidict.h>
-
 #include "UmlClassInstanceReference.h"
 
-void UmlMessage::write_connectors(FileOut & out, UmlItem * diagram, const Q3PtrVector<UmlMessage> & msgs)
+void UmlMessage::write_connectors(FileOut & out, UmlItem * diagram, const QVector<UmlMessage*> & msgs)
 {
     unsigned sup = msgs.size();
     unsigned index;
-    Q3AsciiDict<char> connectors;
+    QHash<char*, char*> connectors;
 
-    connectors.setAutoDelete(TRUE);
+    //connectors.setAutoDelete(TRUE);
 
     for (index = 0; index != sup; index += 1) {
         UmlMessage * msg = msgs.at(index);
@@ -24,7 +21,7 @@ void UmlMessage::write_connectors(FileOut & out, UmlItem * diagram, const Q3PtrV
 
         const char * k = msg->from()->connector(msg->to());
 
-        if (connectors.find(k) == 0) {
+        if (!connectors.contains(const_cast<char*>(k))) {
             char * kk = new char[strlen(k) + 1];
 
             strcpy(kk, k);
diff --git a/genplugouts/Xmi2Generator/UmlMessage.h b/genplugouts/Xmi2Generator/UmlMessage.h
index 75486355f..d60fc79f6 100644
--- a/genplugouts/Xmi2Generator/UmlMessage.h
+++ b/genplugouts/Xmi2Generator/UmlMessage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseMessage.h"
-#include <q3ptrvector.h>
+
 
 class FileOut;
 class UmlItem;
@@ -15,7 +15,7 @@ class UmlMessage : public UmlBaseMessage
 public:
     UmlMessage() : itsrank(++next_rank) {}
 
-    static void write_connectors(FileOut & out, UmlItem * diagram, const Q3PtrVector<UmlMessage> & msgs);
+    static void write_connectors(FileOut & out, UmlItem * diagram, const QVector<UmlMessage*> & msgs);
 
 
 protected:
diff --git a/genplugouts/Xmi2Generator/UmlNcRelation.cpp b/genplugouts/Xmi2Generator/UmlNcRelation.cpp
index 120cb2bad..7a6cd051e 100644
--- a/genplugouts/Xmi2Generator/UmlNcRelation.cpp
+++ b/genplugouts/Xmi2Generator/UmlNcRelation.cpp
@@ -24,7 +24,7 @@ void UmlNcRelation::write(FileOut & out)
         }
 
         out.indent();
-        out << "<" << stereotype() << " xmi:type=\"uml:" << t << "\"";
+        out << "<" << stereotype().operator QString() << " xmi:type=\"uml:" << t << "\"";
         out.id(this);
         out.ref(target(), r);
         out << ">\n";
@@ -32,7 +32,7 @@ void UmlNcRelation::write(FileOut & out)
         write_description_properties(out);
         out.indent(-1);
         out.indent();
-        out << "</" << stereotype() << ">\n";
+        out << "</" << stereotype().operator QString() << ">\n";
     }
     else
         write(out, TRUE);
diff --git a/genplugouts/Xmi2Generator/UmlNode.cpp b/genplugouts/Xmi2Generator/UmlNode.cpp
index fcf5455a4..ae27e4ffc 100644
--- a/genplugouts/Xmi2Generator/UmlNode.cpp
+++ b/genplugouts/Xmi2Generator/UmlNode.cpp
@@ -17,7 +17,7 @@ void UmlNode::write(FileOut & out)
 
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlOperation.cpp b/genplugouts/Xmi2Generator/UmlOperation.cpp
index 418676382..afdbd4d13 100644
--- a/genplugouts/Xmi2Generator/UmlOperation.cpp
+++ b/genplugouts/Xmi2Generator/UmlOperation.cpp
@@ -3,14 +3,15 @@
 #include "FileOut.h"
 
 #include <stdlib.h>
-
+#include "../src/misc/mystr.h"
 #include "UmlClass.h"
 #include "CppSettings.h"
 #include "JavaSettings.h"
 #include "UmlPackage.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
+#include <array>
 void UmlOperation::write(FileOut & out)
 {
     WrapperStr decl;
@@ -82,8 +83,8 @@ void UmlOperation::write(FileOut & out)
 
 void UmlOperation::write_exceptions(FileOut & out)
 {
-    const Q3ValueList<UmlTypeSpec> excpts = exceptions();
-    Q3ValueList<UmlTypeSpec>::ConstIterator iter;
+    const QList<UmlTypeSpec> excpts = exceptions();
+    QList<UmlTypeSpec>::ConstIterator iter;
 
     for (iter = excpts.begin(); iter != excpts.end(); ++iter) {
         const UmlTypeSpec & e = *iter;
@@ -211,12 +212,12 @@ void UmlOperation::write_java_returntype(FileOut & out, WrapperStr decl)
 
 void UmlOperation::write_uml_params(FileOut & out)
 {
-    const Q3ValueList<UmlParameter> p = params();
-    Q3ValueList<UmlParameter>::ConstIterator it;
+    const QList<UmlParameter> p = params();
+    QList<UmlParameter>::ConstIterator it;
 
     for (it = p.begin(); it != p.end(); ++it) {
         out.indent();
-        out << "<ownedParameter xmi:type=\"uml:Parameter\" name=\"" << (*it).name
+        out << "<ownedParameter xmi:type=\"uml:Parameter\" name=\"" << (*it).name.operator QString()
             << "\" xmi:id=\"BOUML_op_param_"
             << ++param_id << "\" direction=\"";
 
@@ -261,7 +262,7 @@ void UmlOperation::write_cpp_java_params(FileOut & out, WrapperStr decl)
 
     index1 = 0;
 
-    const Q3ValueList<UmlParameter> p = params();
+    const QList<UmlParameter> p = params();
     WrapperStr sparam;
     WrapperStr kname;
     WrapperStr ktype;
@@ -272,7 +273,7 @@ void UmlOperation::write_cpp_java_params(FileOut & out, WrapperStr decl)
             const UmlParameter & pa = p[rank];
 
             out.indent();
-            out << "<ownedParameter xmi:type=\"uml:Parameter\" name=\"" << pa.name
+            out << "<ownedParameter xmi:type=\"uml:Parameter\" name=\"" << pa.name.operator QString()
                 << "\" xmi:id=\"BOUML_op_param_"
                 << ++param_id << "\" direction =\"";
 
@@ -310,6 +311,17 @@ void UmlOperation::write_cpp_java_params(FileOut & out, WrapperStr decl)
     }
 }
 
+// some really insane code from stackoverflow that allows to shorten lengthy ifs
+template <typename T0, typename T1, std::size_t N>
+bool operator *(const T0& lhs, const std::array<T1, N>& rhs) {
+    return std::find(begin(rhs), end(rhs), lhs) != end(rhs);
+}
+
+template<class T0, class...T> std::array<T0, 1+sizeof...(T)> in(T0 arg0, T...args) {
+    return {{arg0, args...}};
+}
+
+
 bool UmlOperation::get_param(WrapperStr s, int & index, WrapperStr & r, WrapperStr & kname, WrapperStr & ktype, int & rank)
 {
     int index0 = index;
@@ -330,9 +342,10 @@ bool UmlOperation::get_param(WrapperStr s, int & index, WrapperStr & r, WrapperS
 
             break;
         }
-
-        switch (s[index]) {
-        case ',':
+        if(s[index] *in('(', '{', '['))
+            level += 1;
+        else if(s.at(index) == ",")
+        {
             if (level == 0) {
                 r = s.mid(index0, index - index0).stripWhiteSpace();
                 index += 1;
@@ -340,23 +353,11 @@ bool UmlOperation::get_param(WrapperStr s, int & index, WrapperStr & r, WrapperS
                 if (r.isEmpty())
                     return FALSE;
             }
-
-            break;
-
-        case '(':
-        case '{':
-        case '[':
-            level += 1;
-            break;
-
-        case ')':
-        case '}':
-        case ']':
+        }
+        else if(s[index] *in(')', '}', ']'))
+        {
             if (--level < 0)
                 return FALSE;
-
-        default:
-            break;
         }
 
         index += 1;
@@ -401,7 +402,7 @@ const char * UmlOperation::event(bool rec)
 
         n = ++rank;
 
-        SentReceived.insert(this, (char *) n);
+        SentReceived.insert(this, reinterpret_cast<char*>(n));
     }
 
     static char s[24];
@@ -415,8 +416,9 @@ const char * UmlOperation::event(const char * pfix, WrapperStr msg)
     int index0 = 0;
     int index1;
 
-    while ((index1 = msg.find('\n', index0)) != -1) {
-        msg[index1] = " ";
+    while ((index1 = msg.find('\n', index0)) != -1)
+    {
+        msg.replace(index1,1, " ");
         index0 = index1 + 1;
     }
 
@@ -440,61 +442,61 @@ void UmlOperation::write_events(FileOut & out)
 {
     const char * k = (_uml_20) ? "ownedMember" : "packagedElement";
     UmlItem * prj = UmlPackage::getProject();
-    Q3PtrDictIterator<char> it_oper(SentReceived);
+   QHashIterator<UmlOperation*,char*> it_oper(SentReceived);
 
-    while (it_oper.current()) {
+    while (it_oper.hasNext()) {
+        it_oper.next();
         out.indent();
         out << "<" << k << " xmi:type=\"uml:SendOperationEvent\"";
-        out.id_prefix(prj, "SENDOPEREVT", (int)((long) it_oper.current()));
+        out.id_prefix(prj, "SENDOPEREVT", (int)((long) it_oper.value()));
         out << " name=\"";
-        out.quote((const char *)((UmlOperation *)it_oper.currentKey())->name()); //[jasa] ambiguous call
+        out.quote((const char *)((UmlOperation *)it_oper.key())->name()); //[jasa] ambiguous call
         out << '"';
-        out.ref((UmlOperation *)it_oper.currentKey(), "operation");
+        out.ref((UmlOperation *)it_oper.key(), "operation");
         out << "/>\n";
 
         out.indent();
         out << "<" << k << " xmi:type=\"uml:ReceiveOperationEvent\"";
-        out.id_prefix(prj, "RECOPEREVT", (int)((long) it_oper.current()));
+        out.id_prefix(prj, "RECOPEREVT", (int)((long) it_oper.value()));
         out << " name=\"";
-        out.quote((const char *)((UmlOperation *)it_oper.currentKey())->name()); //[jasa] ambiguous call
+        out.quote((const char *)((UmlOperation *)it_oper.key())->name()); //[jasa] ambiguous call
         out << '"';
-        out.ref((UmlOperation *)it_oper.currentKey(), "operation");
+        out.ref((UmlOperation *)it_oper.key(), "operation");
         out << "/>\n";
 
-        ++it_oper;
     }
 
-    Q3AsciiDictIterator<char> it_evt(Events);
+    QHashIterator<WrapperStr,char*> it_evt(Events);
 
-    while (it_evt.current()) {
+    while (it_evt.hasNext()) {
+        it_evt.next();
         out.indent();
 
-        if (it_evt.currentKey()[0] == 'D') {
+        if (it_evt.key()[0] == 'D') {
             out << "<" << k << " xmi:type=\"uml:DestructionEvent\"";
-            out.id_prefix(prj, it_evt.current());
+            out.id_prefix(prj, it_evt.value());
             out << "/>\n";
         }
         else {
             out << "<" << k << " xmi:type=\"uml:ExecutionEvent\"";
-            out.id_prefix(prj, it_evt.current());
+            out.id_prefix(prj, it_evt.value());
 
-            if (*it_evt.currentKey() != 0) {
+            if (*it_evt.key() != 0) {
                 out << " name=\"";
-                out.quote(it_evt.currentKey() + 1);
+                out.quote(it_evt.key() +  QString::number(1));
                 out << "\"/>\n";
             }
             else
                 out << "/>\n";
         }
 
-        free(it_evt.current());
-        ++it_evt;
+        free(it_evt.value());
     }
 }
 
 int UmlOperation::param_id;
 
-Q3PtrDict<char> UmlOperation::SentReceived;
+QHash<UmlOperation*,char*> UmlOperation::SentReceived;
 
-Q3AsciiDict<char> UmlOperation::Events;
+QHash<WrapperStr,char*> UmlOperation::Events;
 
diff --git a/genplugouts/Xmi2Generator/UmlOperation.h b/genplugouts/Xmi2Generator/UmlOperation.h
index 3efea7572..a32de8373 100644
--- a/genplugouts/Xmi2Generator/UmlOperation.h
+++ b/genplugouts/Xmi2Generator/UmlOperation.h
@@ -4,9 +4,6 @@
 
 #include "UmlBaseOperation.h"
 
-#include <q3ptrdict.h>
-#include <q3asciidict.h>
-
 class FileOut;
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
@@ -47,9 +44,9 @@ class UmlOperation : public UmlBaseOperation
 protected:
     static int param_id;
 
-    static Q3PtrDict<char> SentReceived;
+    static QHash<UmlOperation*,char*> SentReceived;
 
-    static Q3AsciiDict<char> Events;
+    static QHash<WrapperStr,char*> Events;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlPackage.cpp b/genplugouts/Xmi2Generator/UmlPackage.cpp
index e9ff454fa..9cb9b630c 100644
--- a/genplugouts/Xmi2Generator/UmlPackage.cpp
+++ b/genplugouts/Xmi2Generator/UmlPackage.cpp
@@ -169,19 +169,17 @@ void UmlPackage::xmi(int argc, char ** argv)
                     utf8 = FALSE;
 
                 FileOut out(&fp, _linefeed, utf8);
-                Q3PtrList<UmlPackage> profiles;
+                QList<UmlPackage*> profiles;
                 UmlPackage * prof;
 
                 search_profiles(profiles);
 
-                out << "\
-<?xml version=\"1.0\" encoding=\"" << encoding << "\"?>\n\
-<xmi:XMI xmi:version=\"2." << ((_uml_20) ? "0" : "1")
+                out << "<?xml version=\"1.0\" encoding=\"" << encoding.operator QString() << "\"?>\n<xmi:XMI xmi:version=\"2." << ((_uml_20) ? "0" : "1")
                     << "\" xmlns:uml=\"http://schema.omg.org/spec/UML/2." << ((_uml_20) ? "0" : "1")
                     << "\" xmlns:xmi=\"http://schema.omg.org/spec/XMI/2." << ((_uml_20) ? "0" : "1")
                     << "\"";
 
-                for (prof = profiles.first(); prof != 0; prof = profiles.next()) {
+                foreach (prof,profiles) {
                     out << " xmlns:";
                     out.quote((const char *)prof->name()); //[jasa] ambiguous call
                     out << "=\"http:///schemas/";
@@ -205,11 +203,11 @@ void UmlPackage::xmi(int argc, char ** argv)
                     out.indent(+1);
                 else {
                     out << "\t<uml:Model xmi:type=\"uml:Model\" xmi:id=\"themodel\" name=\""
-                        << name() << "\">\n";
+                        << name().operator QString() << "\">\n";
                     out.indent(+2);
                 }
 
-                for (prof = profiles.first(); prof != 0; prof = profiles.next()) {
+                foreach (prof,profiles) {
                     out.indent();
                     out << "<profileApplication xmi:type=\"uml:ProfileApplication\"";
                     out.id_prefix(prof, "PRFA_");
@@ -279,15 +277,15 @@ void UmlPackage::write(FileOut & out)
         out << "<elementImport";
         out.id_prefix(this, "MCR_");
 
-        int index = mcr.findRev('#');
+        int index = mcr.operator QString().indexOf('#');
 
         if (index != -1)
-            out << " alias=\"" << mcr.mid(index + 1) << "\">\n";
+            out << " alias=\"" << mcr.mid(index + 1).operator QString() << "\">\n";
         else
             out << ">\n";
 
         out.indent();
-        out << "\t<importedElement xmi:type=\"uml:Class\" href=\"" << mcr << "#1\"/>\n";
+        out << "\t<importedElement xmi:type=\"uml:Class\" href=\"" << mcr.operator QString() << "#1\"/>\n";
         out.indent();
         out << "</elementImport>\n";
     }
@@ -298,12 +296,12 @@ void UmlPackage::write(FileOut & out)
         out.id_prefix(this, "MMR_");
         out << ">\n";
         out.indent();
-        out << "\t<importedPackage xmi:type=\"uml:Model\" href=\"" << mmr << "#1\"/>\n";
+        out << "\t<importedPackage xmi:type=\"uml:Model\" href=\"" << mmr.operator QString() << "#1\"/>\n";
         out.indent();
         out << "</packageImport>\n";
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     if (is_profile) {
@@ -337,22 +335,22 @@ void UmlPackage::write(FileOut & out)
     }
 
     while (! _relations.isEmpty())
-        _relations.take(0)->write(out, FALSE);
+        _relations.takeAt(0)->write(out, FALSE);
 
     while (! _assocs.isEmpty())
-        _assocs.take(0)->write_it(out);
+        _assocs.takeAt(0)->write_it(out);
 
     out.indent(-1);
     out.indent();
     out << "</" << k << ">\n";
 }
 
-void UmlPackage::search_profiles(Q3PtrList<UmlPackage> & l)
+void UmlPackage::search_profiles(QList<UmlPackage*> & l)
 {
     if (stereotype() == "profile")
         l.append(this);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -362,7 +360,7 @@ void UmlPackage::search_profiles(Q3PtrList<UmlPackage> & l)
 
 void UmlPackage::search_class_assoc()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlPackage.h b/genplugouts/Xmi2Generator/UmlPackage.h
index 971e2c738..9f633ef97 100644
--- a/genplugouts/Xmi2Generator/UmlPackage.h
+++ b/genplugouts/Xmi2Generator/UmlPackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlBasePackage.h"
 
-#include <q3ptrlist.h>
+
 
 class FileOut;
 class UmlItem;
@@ -24,7 +24,7 @@ class UmlPackage : public UmlBasePackage
 
 
 private:
-    void search_profiles(Q3PtrList<UmlPackage> & l);
+    void search_profiles(QList<UmlPackage*> & l);
 
 
 public:
@@ -44,9 +44,9 @@ class UmlPackage : public UmlBasePackage
 
 
 protected:
-    Q3PtrList<UmlItem> _relations;
+    QList<UmlItem*> _relations;
 
-    Q3PtrList<UmlUseCaseDiagram> _assocs;
+    QList<UmlUseCaseDiagram*> _assocs;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlPinParameter.cpp b/genplugouts/Xmi2Generator/UmlPinParameter.cpp
index 1366db6bf..ffc1a5f9f 100644
--- a/genplugouts/Xmi2Generator/UmlPinParameter.cpp
+++ b/genplugouts/Xmi2Generator/UmlPinParameter.cpp
@@ -5,7 +5,7 @@
 void UmlPinParameter::solve_output_flows()
 {
     ControlOrData v = (isControlType()) ? IsControl : IsData;
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1) {
diff --git a/genplugouts/Xmi2Generator/UmlPseudoState.cpp b/genplugouts/Xmi2Generator/UmlPseudoState.cpp
index 09b930ebd..72abec9cc 100644
--- a/genplugouts/Xmi2Generator/UmlPseudoState.cpp
+++ b/genplugouts/Xmi2Generator/UmlPseudoState.cpp
@@ -4,7 +4,7 @@
 
 void UmlPseudoState::memo_incoming_trans()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
@@ -40,9 +40,9 @@ void UmlPseudoState::write(FileOut & out)
     write_description_properties(out);
 
     while (! _incoming_trans.isEmpty())
-        _incoming_trans.take(0)->write_in(out);
+        _incoming_trans.takeAt(0)->write_in(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
diff --git a/genplugouts/Xmi2Generator/UmlPseudoState.h b/genplugouts/Xmi2Generator/UmlPseudoState.h
index 1841e4cbd..82bea3e17 100644
--- a/genplugouts/Xmi2Generator/UmlPseudoState.h
+++ b/genplugouts/Xmi2Generator/UmlPseudoState.h
@@ -6,7 +6,7 @@
 
 #include "UmlItem.h"
 #include "UmlStateItem.h"
-#include <q3ptrlist.h>
+
 
 class UmlTransition;
 class FileOut;
@@ -31,7 +31,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 
 
 protected:
-    Q3PtrList<UmlTransition> _incoming_trans;
+    QList<UmlTransition*> _incoming_trans;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlRegion.cpp b/genplugouts/Xmi2Generator/UmlRegion.cpp
index 8348fa632..11174aeb9 100644
--- a/genplugouts/Xmi2Generator/UmlRegion.cpp
+++ b/genplugouts/Xmi2Generator/UmlRegion.cpp
@@ -5,7 +5,7 @@
 
 void UmlRegion::memo_incoming_trans()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
@@ -39,7 +39,7 @@ void UmlRegion::write(FileOut & out)
 
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
diff --git a/genplugouts/Xmi2Generator/UmlRegion.h b/genplugouts/Xmi2Generator/UmlRegion.h
index fa56f9048..494ff1a90 100644
--- a/genplugouts/Xmi2Generator/UmlRegion.h
+++ b/genplugouts/Xmi2Generator/UmlRegion.h
@@ -5,7 +5,7 @@
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
 
-#include <q3ptrlist.h>
+
 
 class UmlTransition;
 class FileOut;
@@ -32,7 +32,7 @@ class UmlRegion : public UmlBaseRegion, public UmlStateItem
 protected:
 #if 0
     // To bypass Eclipse's bug
-    Q3PtrList<UmlTransition> _trans;
+    QList<UmlTransition*> _trans;
 #endif
 
 };
diff --git a/genplugouts/Xmi2Generator/UmlRelation.cpp b/genplugouts/Xmi2Generator/UmlRelation.cpp
index 7b2886505..f3d10fcfb 100644
--- a/genplugouts/Xmi2Generator/UmlRelation.cpp
+++ b/genplugouts/Xmi2Generator/UmlRelation.cpp
@@ -142,7 +142,7 @@ void UmlRelation::write_relation(FileOut & out)
 
     WrapperStr s = name();
     int i1 = s.find("(");
-    int i2 = s.findRev(")");
+    int i2 = s.operator QString().indexOf(")");
 
     if ((i1 != -1) && (i2 != -1) && (i2 > i1) && (s[i1 + 1] != '<')  && (s[i2 - 1] != '>')) {
         s = s.mid(i1 + 1, i2 - i1 - 1);
@@ -262,7 +262,7 @@ void UmlRelation::write_relation_as_attribute(FileOut & out)
     }
 
     out.indent();
-    out << "<ownedAttribute xmi:type=\"uml:Property\" name=\"" << s << '"';
+    out << "<ownedAttribute xmi:type=\"uml:Property\" name=\"" << s.operator QString() << '"';
     out.id(this);
 
     if (base != 0)
@@ -349,7 +349,7 @@ void UmlRelation::write_relation_as_attribute(FileOut & out)
             s = (_uml_20) ? "http://schema.omg.org/spec/UML/2.0/uml.xml"
                 : "http://schema.omg.org/spec/UML/2.1/uml.xml";
 
-        out << " href=\"" << s << '#' << base->name() << '"';
+        out << " href=\"" << s.operator QString() << '#' << base->name().operator QString() << '"';
     }
     else
         out.idref(roleType());
diff --git a/genplugouts/Xmi2Generator/UmlSequenceDiagramDefinition.cpp b/genplugouts/Xmi2Generator/UmlSequenceDiagramDefinition.cpp
index 6fac43ca8..2690cd559 100644
--- a/genplugouts/Xmi2Generator/UmlSequenceDiagramDefinition.cpp
+++ b/genplugouts/Xmi2Generator/UmlSequenceDiagramDefinition.cpp
@@ -10,7 +10,7 @@ UmlSequenceDiagramDefinition::~UmlSequenceDiagramDefinition()
 void UmlSequenceDiagramDefinition::write(FileOut & out, UmlItem * diag)
 {
     UmlMessage::write_connectors(out, diag,
-                                 (const Q3PtrVector<UmlMessage> &) messages());
+                                 (const QVector<UmlMessage*> &) messages());
     UmlClassInstanceReference::write_lifelines(out, diag, instances());
     UmlSequenceMessage::write(out, diag, messages());
 
diff --git a/genplugouts/Xmi2Generator/UmlSequenceMessage.cpp b/genplugouts/Xmi2Generator/UmlSequenceMessage.cpp
index a0cf01730..d9dee191c 100644
--- a/genplugouts/Xmi2Generator/UmlSequenceMessage.cpp
+++ b/genplugouts/Xmi2Generator/UmlSequenceMessage.cpp
@@ -2,39 +2,41 @@
 #include "UmlSequenceMessage.h"
 #include "FileOut.h"
 #include "UmlItem.h"
-
-#include <q3ptrdict.h>
-#include <q3ptrstack.h>
 #include "UmlPackage.h"
 #include "UmlOperation.h"
 #include "UmlFragmentCompartment.h"
 #include "UmlClassInstanceReference.h"
+#include <QStack>
 
 UmlSequenceMessage::UmlSequenceMessage() : reverse(0), used(FALSE)
 {
 }
 
-void UmlSequenceMessage::write(FileOut & out, UmlItem * diagram, const Q3PtrVector< UmlSequenceMessage > & msgs)
+void UmlSequenceMessage::write(FileOut & out, UmlItem * diagram, const QVector< UmlSequenceMessage* > & msgs)
 {
     set_reverses(msgs);
 
-    Q3PtrList<UmlSequenceMessage> l;
+    QList<UmlSequenceMessage*> l;
 
-    msgs.toList(&l);
+    l = msgs.toList();
 
     UmlSequenceMessage * m;
 
-    while ((m = l.getFirst()) != 0) {
-        if (m->fragment() != 0)
-            m->fragment()->write(out, diagram, l);
-        else
-            m->write_fragment(out, diagram, l);
+    //while ((m = l.first()) != 0) {
+    foreach (m,l) {
+        if(m)
+        {
+            if (m->fragment() != 0)
+                m->fragment()->write(out, diagram, l);
+            else
+                m->write_fragment(out, diagram, l);
+        }
     }
 }
 
-void UmlSequenceMessage::write_fragment(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequenceMessage > & msgs)
+void UmlSequenceMessage::write_fragment(FileOut & out, UmlItem * diagram, QList< UmlSequenceMessage* > & msgs)
 {
-    msgs.removeRef(this);
+    msgs.removeOne(this);
 
 #define MSG  "MSG", itsrank
 #define SEND "MSGOCCSPECSEND", itsrank
@@ -151,7 +153,7 @@ void UmlSequenceMessage::write_fragment(FileOut & out, UmlItem * diagram, Q3PtrL
 #undef DEL
 }
 
-void UmlSequenceMessage::write_them(FileOut & out, UmlItem * diagram, const Q3PtrVector< UmlSequenceMessage > & msgs)
+void UmlSequenceMessage::write_them(FileOut & out, UmlItem * diagram, const QVector< UmlSequenceMessage* > & msgs)
 {
     int n = msgs.size();
 
@@ -241,14 +243,14 @@ void UmlSequenceMessage::write_them(FileOut & out, UmlItem * diagram, const Q3Pt
     }
 }
 
-void UmlSequenceMessage::set_reverses(const Q3PtrVector<UmlSequenceMessage> & msgs)
+void UmlSequenceMessage::set_reverses(const QVector<UmlSequenceMessage*> & msgs)
 {
-    Q3PtrDict<Q3PtrStack<UmlSequenceMessage> > sent;
+    QHash<UmlClassInstanceReference *, QStack<UmlSequenceMessage*>* > sent;
     int n = msgs.size();
 
     for (int i = 0; i != n; i += 1) {
         UmlSequenceMessage * m = msgs[i];
-        Q3PtrStack<UmlSequenceMessage> * stack =
+        QStack<UmlSequenceMessage*> * stack =
             (m->from() != 0) ? sent[m->from()] : 0;
 
         switch (m->kind()) {
@@ -262,7 +264,7 @@ void UmlSequenceMessage::set_reverses(const Q3PtrVector<UmlSequenceMessage> & ms
                 stack = sent[m->to()];
 
                 if (stack == 0) {
-                    stack = new Q3PtrStack<UmlSequenceMessage>();
+                    stack = new QStack<UmlSequenceMessage*>();
                     sent.insert(m->to(), stack);
                 }
 
@@ -285,6 +287,6 @@ void UmlSequenceMessage::set_reverses(const Q3PtrVector<UmlSequenceMessage> & ms
         }
     }
 
-    sent.setAutoDelete(TRUE);
+   // sent.setAutoDelete(TRUE);
 }
 
diff --git a/genplugouts/Xmi2Generator/UmlSequenceMessage.h b/genplugouts/Xmi2Generator/UmlSequenceMessage.h
index cfbb71c0e..2d4df55d4 100644
--- a/genplugouts/Xmi2Generator/UmlSequenceMessage.h
+++ b/genplugouts/Xmi2Generator/UmlSequenceMessage.h
@@ -3,8 +3,8 @@
 
 
 #include "UmlBaseSequenceMessage.h"
-#include <q3ptrvector.h>
-#include <q3ptrlist.h>
+
+
 
 class FileOut;
 class UmlItem;
@@ -16,15 +16,15 @@ class UmlSequenceMessage : public UmlBaseSequenceMessage
 public:
     UmlSequenceMessage();
 
-    static void write(FileOut & out, UmlItem * diagram, const Q3PtrVector< UmlSequenceMessage > & msgs);
+    static void write(FileOut & out, UmlItem * diagram, const QVector< UmlSequenceMessage* > & msgs);
 
-    void write_fragment(FileOut & out, UmlItem * diagram, Q3PtrList< UmlSequenceMessage > & msgs);
+    void write_fragment(FileOut & out, UmlItem * diagram, QList< UmlSequenceMessage* > & msgs);
 
-    static void write_them(FileOut & out, UmlItem * diagram, const Q3PtrVector< UmlSequenceMessage > & msgs);
+    static void write_them(FileOut & out, UmlItem * diagram, const QVector< UmlSequenceMessage* > & msgs);
 
 
 private:
-    static void set_reverses(const Q3PtrVector<UmlSequenceMessage> & msgs);
+    static void set_reverses(const QVector<UmlSequenceMessage*> & msgs);
 
     UmlSequenceMessage * reverse;
 
diff --git a/genplugouts/Xmi2Generator/UmlSettings.cpp b/genplugouts/Xmi2Generator/UmlSettings.cpp
index b3c8827ed..f24eb22cc 100644
--- a/genplugouts/Xmi2Generator/UmlSettings.cpp
+++ b/genplugouts/Xmi2Generator/UmlSettings.cpp
@@ -156,29 +156,29 @@ WrapperStr UmlSettings::_attribute_default_description;
 
 WrapperStr UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<WrapperStr,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<WrapperStr,UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<WrapperStr,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -190,7 +190,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -203,7 +203,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -275,17 +275,17 @@ WrapperStr UmlSettings::uml_class_stereotype(const WrapperStr & t, WrapperStr Um
 
 UmlBuiltin * UmlSettings::add_type(const WrapperStr & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         builtins[index] = _builtins[index];
-        _map_builtins.replace(builtins[index].uml, &builtins[index]);
+        _map_builtins.insert(builtins[index].uml, &builtins[index]);
     }
 
     builtins[index].uml = s;
@@ -312,17 +312,17 @@ UmlBuiltin * UmlSettings::add_type(const WrapperStr & s)
 
 UmlStereotype * UmlSettings::add_rel_attr_stereotype(const WrapperStr & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_attribute_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         relation_attribute_stereotypes[index] = _relation_attribute_stereotypes[index];
-        _map_relation_attribute_stereotypes.replace(relation_attribute_stereotypes[index].uml,
+        _map_relation_attribute_stereotypes.insert(relation_attribute_stereotypes[index].uml,
                 &relation_attribute_stereotypes[index]);
     }
 
@@ -347,17 +347,17 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const WrapperStr & s)
 
 UmlStereotype * UmlSettings::add_class_stereotype(const WrapperStr & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         class_stereotypes[index] = _class_stereotypes[index];
-        _map_class_stereotypes.replace(class_stereotypes[index].uml, &class_stereotypes[index]);
+        _map_class_stereotypes.insert(class_stereotypes[index].uml, &class_stereotypes[index]);
     }
 
     class_stereotypes[index].uml = s;
diff --git a/genplugouts/Xmi2Generator/UmlSettings.h b/genplugouts/Xmi2Generator/UmlSettings.h
index 1eaba822e..49140f313 100644
--- a/genplugouts/Xmi2Generator/UmlSettings.h
+++ b/genplugouts/Xmi2Generator/UmlSettings.h
@@ -1,11 +1,11 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
-
-
+#include <QByteArray>
+#include <QHash>
 
 #include "aLanguage.h"
-#include <q3dict.h>
 
+#include "../src/misc/mystr.h"
 struct UmlBuiltin;
 struct UmlStereotype;
 
@@ -100,15 +100,15 @@ class UmlSettings
 
     static WrapperStr _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<WrapperStr,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<WrapperStr,UmlStereotype*> _map_relation_attribute_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<WrapperStr,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
diff --git a/genplugouts/Xmi2Generator/UmlState.cpp b/genplugouts/Xmi2Generator/UmlState.cpp
index d878e35af..1c2e2f2db 100644
--- a/genplugouts/Xmi2Generator/UmlState.cpp
+++ b/genplugouts/Xmi2Generator/UmlState.cpp
@@ -110,9 +110,9 @@ void UmlState::write(FileOut & out)
     }
 
     while (! _incoming_trans.isEmpty())
-        _incoming_trans.take(0)->write_in(out);
+        _incoming_trans.takeAt(0)->write_in(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
     bool need_region = FALSE;
@@ -162,7 +162,7 @@ void UmlState::write(FileOut & out)
 
     // to bypass Eclipse's bug
     while (! _trans.isEmpty())
-        _trans.take(0)->write_it(out);
+        _trans.takeAt(0)->write_it(out);
 
 #endif
 
@@ -175,7 +175,7 @@ void UmlState::write(FileOut & out)
 
 void UmlState::memo_incoming_trans()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
@@ -199,10 +199,10 @@ void UmlState::add_incoming_trans(UmlTransition * tr)
 
 UmlState * UmlState::find(WrapperStr s)
 {
-    QMap<WrapperStr, UmlState *>::Iterator iter = _all.find(s);
+    QMap<QString, UmlState *>::Iterator iter = _all.find(s);
 
     return (iter == _all.end()) ? 0 : *iter;
 }
 
-QMap<WrapperStr, UmlState *> UmlState::_all;
+QMap<QString, UmlState *> UmlState::_all;
 
diff --git a/genplugouts/Xmi2Generator/UmlState.h b/genplugouts/Xmi2Generator/UmlState.h
index 18812f95f..492106abe 100644
--- a/genplugouts/Xmi2Generator/UmlState.h
+++ b/genplugouts/Xmi2Generator/UmlState.h
@@ -5,7 +5,7 @@
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
 
-#include <q3ptrlist.h>
+
 #include <qmap.h>
 
 class FileOut;
@@ -16,7 +16,7 @@ class UmlState : public UmlBaseState, public UmlStateItem
 public:
         //  the constructor, do not call it yourself !!!!!!!!!!
     UmlState(void * id, const WrapperStr & s) : UmlBaseState(id, s) {
-        _all.replace(s, this);
+        _all[s.operator QString()] = this;
     }
 
     virtual void write(FileOut & out);
@@ -39,11 +39,11 @@ class UmlState : public UmlBaseState, public UmlStateItem
 
 
 protected:
-    Q3PtrList<UmlTransition> _incoming_trans;
+    QList<UmlTransition*> _incoming_trans;
 
-    Q3PtrList<UmlTransition> _trans;
+    QList<UmlTransition*> _trans;
 
-    static QMap<WrapperStr, UmlState *> _all;
+    static QMap<QString, UmlState *> _all;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlStateAction.cpp b/genplugouts/Xmi2Generator/UmlStateAction.cpp
index 953249e58..1b68a66b6 100644
--- a/genplugouts/Xmi2Generator/UmlStateAction.cpp
+++ b/genplugouts/Xmi2Generator/UmlStateAction.cpp
@@ -5,7 +5,7 @@
 
 void UmlStateAction::memo_incoming_trans()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     unsigned i;
 
diff --git a/genplugouts/Xmi2Generator/UmlStateAction.h b/genplugouts/Xmi2Generator/UmlStateAction.h
index 854546dfe..b3f53e665 100644
--- a/genplugouts/Xmi2Generator/UmlStateAction.h
+++ b/genplugouts/Xmi2Generator/UmlStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseStateAction.h"
 #include "UmlStateItem.h"
-#include <q3ptrlist.h>
+
 
 class FileOut;
 class UmlTransition;
@@ -24,7 +24,7 @@ class UmlStateAction : public UmlBaseStateAction, public UmlStateItem
 
 
 protected:
-    Q3PtrList<UmlTransition> _incoming_trans;
+    QList<UmlTransition*> _incoming_trans;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/UmlStereotype.h b/genplugouts/Xmi2Generator/UmlStereotype.h
index aaf04086f..ba51c1f3b 100644
--- a/genplugouts/Xmi2Generator/UmlStereotype.h
+++ b/genplugouts/Xmi2Generator/UmlStereotype.h
@@ -3,7 +3,7 @@
 
 
 
-
+#include <QByteArray>
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
diff --git a/genplugouts/Xmi2Generator/UmlUseCase.cpp b/genplugouts/Xmi2Generator/UmlUseCase.cpp
index 8d4c90309..f17628633 100644
--- a/genplugouts/Xmi2Generator/UmlUseCase.cpp
+++ b/genplugouts/Xmi2Generator/UmlUseCase.cpp
@@ -45,7 +45,7 @@ void UmlUseCase::write(FileOut & out)
         }
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/Xmi2Generator/UmlUseCaseDiagram.cpp b/genplugouts/Xmi2Generator/UmlUseCaseDiagram.cpp
index 311bdf561..6bbdda8d6 100644
--- a/genplugouts/Xmi2Generator/UmlUseCaseDiagram.cpp
+++ b/genplugouts/Xmi2Generator/UmlUseCaseDiagram.cpp
@@ -12,7 +12,7 @@ void UmlUseCaseDiagram::write_it(FileOut & out)
 {
     const char * k = ((_uml_20) ? "ownedMember" : "packagedElement");
     UmlUseCaseDiagramDefinition * def = definition();
-    const Q3PtrVector<UmlUseCaseAssociation> & assocs = def->associations();
+    const QVector<UmlUseCaseAssociation*> & assocs = def->associations();
     int n = (int) assocs.size();
 
     for (int rank = 0; rank != n; rank += 1)
diff --git a/genplugouts/Xmi2Generator/UmlUseCaseView.cpp b/genplugouts/Xmi2Generator/UmlUseCaseView.cpp
index 6c8b3c1b6..800534f6a 100644
--- a/genplugouts/Xmi2Generator/UmlUseCaseView.cpp
+++ b/genplugouts/Xmi2Generator/UmlUseCaseView.cpp
@@ -18,7 +18,7 @@ void UmlUseCaseView::write(FileOut & out)
         write_description_properties(out);
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
@@ -26,10 +26,10 @@ void UmlUseCaseView::write(FileOut & out)
 
     if (_gen_views) {
         while (! _relations.isEmpty())
-            _relations.take(0)->write(out, FALSE);
+            _relations.takeAt(0)->write(out, FALSE);
 
         while (! _assocs.isEmpty())
-            _assocs.take(0)->write_it(out);
+            _assocs.takeAt(0)->write_it(out);
 
         out.indent(-1);
         out.indent();
diff --git a/genplugouts/Xmi2Generator/UmlUseCaseView.h b/genplugouts/Xmi2Generator/UmlUseCaseView.h
index 697b6a836..556b1eb0c 100644
--- a/genplugouts/Xmi2Generator/UmlUseCaseView.h
+++ b/genplugouts/Xmi2Generator/UmlUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseUseCaseView.h"
 
-#include <q3ptrlist.h>
+
 
 class FileOut;
 class UmlItem;
@@ -34,9 +34,9 @@ class UmlUseCaseView : public UmlBaseUseCaseView
 
 
 protected:
-    Q3PtrList<UmlItem> _relations;
+    QList<UmlItem*> _relations;
 
-    Q3PtrList<UmlUseCaseDiagram> _assocs;
+    QList<UmlUseCaseDiagram*> _assocs;
 
 };
 
diff --git a/genplugouts/Xmi2Generator/Xmi2Generator.pro b/genplugouts/Xmi2Generator/Xmi2Generator.pro
index d5187f609..cb6d6d242 100644
--- a/genplugouts/Xmi2Generator/Xmi2Generator.pro
+++ b/genplugouts/Xmi2Generator/Xmi2Generator.pro
@@ -1,7 +1,13 @@
 TEMPLATE    = app
 TARGET        = gxmi2
-CONFIG        += debug warn_on qt
-DEFINES        = WITHCPP WITHJAVA WITHIDL WITHPYTHON WITHPHP
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+CONFIG += precompile_header
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES        += WITHCPP WITHJAVA WITHIDL WITHPYTHON WITHPHP
+
+PRECOMPILED_HEADER += ../../src/misc/mystr.h
 HEADERS        = ./UmlBaseClassDiagram.h \
           ./UmlBaseDeepHistoryPseudoState.h \
           ./FlowContainer.h \
@@ -205,7 +211,9 @@ HEADERS        = ./UmlBaseClassDiagram.h \
           ./UmlStateDiagram.h \
           ./UmlBaseNcRelation.h \
           ./UmlBaseJunctionPseudoState.h \
-          ./UmlClassMember.h
+          ./UmlClassMember.h \
+    bbuttongroup.h \
+    hhbox.h
 SOURCES        = ./UmlBaseClassDiagram.cpp \
           ./UmlBaseDeepHistoryPseudoState.cpp \
           ./FlowContainer.cpp \
@@ -410,26 +418,27 @@ SOURCES        = ./UmlBaseClassDiagram.cpp \
           ./UmlStateDiagram.cpp \
           ./UmlBaseNcRelation.cpp \
           ./UmlBaseJunctionPseudoState.cpp \
-          ./UmlClassMember.cpp
+          ./UmlClassMember.cpp \
+          ../../src/misc/mystr.cpp \
+    bbuttongroup.cpp \
+    hhbox.cpp
 
-#The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+DEFINES += TRUE=true FALSE=false
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
+QT += testlib
+UI_DIR = src/ui
+DESTDIR = ../../bin
 
-    MOC_DIR = bin/douml/xmi2/MOC_release
-    OBJECTS_DIR = bin/douml/xmi2/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-Debug{
-    MOC_DIR = bin/douml/xmi2/MOC_Debug
-    OBJECTS_DIR = bin/douml/xmi2/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
diff --git a/genplugouts/Xmi2Generator/bbuttongroup.cpp b/genplugouts/Xmi2Generator/bbuttongroup.cpp
new file mode 100644
index 000000000..4526db928
--- /dev/null
+++ b/genplugouts/Xmi2Generator/bbuttongroup.cpp
@@ -0,0 +1,66 @@
+#include "bbuttongroup.h"
+
+BButtonGroup::BButtonGroup(QWidget *parent) :
+    QGroupBox(parent)
+{
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = Qt::Horizontal;
+    m_hLayout = new QHBoxLayout(this);
+    this->setLayout(m_hLayout);
+    m_hLayout->setSpacing(0);
+    m_hLayout->setMargin(0);
+}
+
+BButtonGroup::BButtonGroup(const QString &title, QWidget *parent):
+    QGroupBox(title, parent)
+{
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = Qt::Horizontal;
+    m_hLayout = new QHBoxLayout(this);
+    this->setLayout(m_hLayout);
+    m_hLayout->setSpacing(0);
+    m_hLayout->setMargin(0);
+}
+
+BButtonGroup::BButtonGroup(int strips, Qt::Orientation orientation, const QString &title, QWidget *parent, QString):
+QGroupBox(title, parent)
+{
+    Q_UNUSED(strips);
+
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = orientation;
+    if(orientation == Qt::Horizontal)
+    {
+        m_hLayout = new QHBoxLayout(this);
+        this->setLayout(m_hLayout);
+        m_hLayout->setSpacing(0);
+        m_hLayout->setMargin(0);
+    }
+    else
+    {
+        m_vLayout = new QHBoxLayout(this);
+        this->setLayout(m_vLayout);
+        m_vLayout->setSpacing(0);
+        m_vLayout->setMargin(0);
+    }
+}
+
+void BButtonGroup::setExclusive(bool isEx)
+{
+    Q_UNUSED(isEx);
+}
+
+void BButtonGroup::addWidget(QWidget *widget)
+{
+    if(m_orientation == Qt::Horizontal)
+    {
+        m_hLayout->addWidget(widget);
+    }
+    else
+    {
+        m_vLayout->addWidget(widget);
+    }
+}
diff --git a/genplugouts/Xmi2Generator/bbuttongroup.h b/genplugouts/Xmi2Generator/bbuttongroup.h
new file mode 100644
index 000000000..e54f93d2e
--- /dev/null
+++ b/genplugouts/Xmi2Generator/bbuttongroup.h
@@ -0,0 +1,26 @@
+#ifndef BBUTTONGROUP_H
+#define BBUTTONGROUP_H
+
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QWidget>
+class BButtonGroup : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit BButtonGroup(QWidget *parent = 0);
+    explicit BButtonGroup(const QString &title, QWidget* parent=0);
+    BButtonGroup( int strips, Qt::Orientation orientation, const QString & title, QWidget * parent = 0, QString = QString());
+    void setExclusive(bool isEx);
+    void addWidget(QWidget* widget);
+    QHBoxLayout *m_hLayout;
+    QHBoxLayout *m_vLayout;
+    Qt::Orientation m_orientation;
+signals:
+
+public slots:
+
+};
+
+#endif // BBUTTONGROUP_H
diff --git a/genplugouts/Xmi2Generator/gridbox.cpp b/genplugouts/Xmi2Generator/gridbox.cpp
new file mode 100644
index 000000000..78233be1d
--- /dev/null
+++ b/genplugouts/Xmi2Generator/gridbox.cpp
@@ -0,0 +1,37 @@
+#include "gridbox.h"
+#include <QGridLayout>
+GridBox::GridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void GridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void GridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void GridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+}
+
+QString GridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/genplugouts/Xmi2Generator/gridbox.h b/genplugouts/Xmi2Generator/gridbox.h
new file mode 100644
index 000000000..64793941d
--- /dev/null
+++ b/genplugouts/Xmi2Generator/gridbox.h
@@ -0,0 +1,26 @@
+#ifndef GRIDBOX_H
+#define GRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class GridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit GridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/genplugouts/Xmi2Generator/hhbox.cpp b/genplugouts/Xmi2Generator/hhbox.cpp
new file mode 100644
index 000000000..95a09b5ea
--- /dev/null
+++ b/genplugouts/Xmi2Generator/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/Xmi2Generator/hhbox.h b/genplugouts/Xmi2Generator/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/genplugouts/Xmi2Generator/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/genplugouts/deploy/CppSettings.cpp b/genplugouts/deploy/CppSettings.cpp
index 946a7c5f0..f946174d1 100644
--- a/genplugouts/deploy/CppSettings.cpp
+++ b/genplugouts/deploy/CppSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationAttributeStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, (const char *)s, (const char *)v); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -175,14 +175,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -194,14 +194,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -213,14 +213,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -232,14 +232,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -352,14 +352,14 @@ bool CppSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -371,14 +371,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -390,14 +390,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -409,14 +409,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -428,22 +428,22 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinIn(Q3CString s)
+QByteArray CppSettings::builtinIn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_in : Q3CString();
+    return (b) ? b->cpp_in : QByteArray();
 }
 
-bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinIn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)type, (const char *)form); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -456,22 +456,22 @@ bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinOut(Q3CString s)
+QByteArray CppSettings::builtinOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_out : Q3CString();
+    return (b) ? b->cpp_out : QByteArray();
 }
 
-bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)type, (const char *)form); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -484,22 +484,22 @@ bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinInOut(Q3CString s)
+QByteArray CppSettings::builtinInOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_inout : Q3CString();
+    return (b) ? b->cpp_inout : QByteArray();
 }
 
-bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinInOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)type, (const char *)form); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -512,22 +512,22 @@ bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinReturn(Q3CString s)
+QByteArray CppSettings::builtinReturn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_return : Q3CString();
+    return (b) ? b->cpp_return : QByteArray();
 }
 
-bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinReturn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)type, (const char *)form); //[rageek] Fix Prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -540,14 +540,14 @@ bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v, ""); //[rageek] Fix Prototype
 
@@ -559,14 +559,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v, ""); //[rageek] Fix Prototype
 
@@ -578,14 +578,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v, ""); //[rageek] Fix Prototype
 
@@ -597,14 +597,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)v, ""); //[rageek] Fix Prototype
 
@@ -616,14 +616,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -635,14 +635,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -654,14 +654,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -673,14 +673,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -692,14 +692,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -711,14 +711,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -730,14 +730,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl(const char * multiplicity)
+const QByteArray & CppSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool CppSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix Prototype
@@ -750,14 +750,14 @@ bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -769,7 +769,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -789,14 +789,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -808,14 +808,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -865,14 +865,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -960,14 +960,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[rageek] Fix Prototype
 
@@ -1038,51 +1038,51 @@ bool CppSettings::set_IsSetParamRef(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl[3/*multiplicity*/];
+QByteArray CppSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -1092,7 +1092,7 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
@@ -1100,13 +1100,13 @@ bool CppSettings::_is_set_param_const;
 
 bool CppSettings::_is_set_param_ref;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
@@ -1118,14 +1118,14 @@ bool CppSettings::_is_force_namespace_gen;
 
 bool CppSettings::_is_generate_javadoc_comment;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray, QByteArray*> CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1151,13 +1151,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/deploy/CppSettings.h b/genplugouts/deploy/CppSettings.h
index 04ed9d3f8..72df641d0 100644
--- a/genplugouts/deploy/CppSettings.h
+++ b/genplugouts/deploy/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(Q3CString s);
+    static QByteArray relationAttributeStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -175,47 +175,47 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinIn(Q3CString s);
+    static QByteArray builtinIn(QByteArray s);
 
     // set the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
@@ -223,13 +223,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinIn(Q3CString type, Q3CString form);
+    static bool set_BuiltinIn(QByteArray type, QByteArray form);
 
     // returns the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinOut(Q3CString s);
+    static QByteArray builtinOut(QByteArray s);
 
     // set the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
@@ -237,13 +237,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinInOut(Q3CString s);
+    static QByteArray builtinInOut(QByteArray s);
 
     // set the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
@@ -251,13 +251,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinInOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinInOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinReturn(Q3CString s);
+    static QByteArray builtinReturn(QByteArray s);
 
     // set the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
@@ -265,36 +265,36 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinReturn(Q3CString type, Q3CString form);
+    static bool set_BuiltinReturn(QByteArray type, QByteArray form);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -302,83 +302,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -387,20 +387,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -424,13 +424,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -476,14 +476,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -524,51 +524,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -583,7 +583,7 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
@@ -591,13 +591,13 @@ class CppSettings : public UmlSettings
 
     static bool _is_set_param_ref;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
@@ -609,7 +609,7 @@ class CppSettings : public UmlSettings
 
     static bool _is_generate_javadoc_comment;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray, QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/deploy/FlowBehavior.h b/genplugouts/deploy/FlowBehavior.h
index 55dde8146..09f17529a 100644
--- a/genplugouts/deploy/FlowBehavior.h
+++ b/genplugouts/deploy/FlowBehavior.h
@@ -2,18 +2,18 @@
 #define _FLOWBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class FlowBehavior
 {
 public:
-    Q3CString weight;
+    QByteArray weight;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString selection;
+    QByteArray selection;
 
-    Q3CString transformation;
+    QByteArray transformation;
 
     void read();
 
diff --git a/genplugouts/deploy/IdlSettings.cpp b/genplugouts/deploy/IdlSettings.cpp
index f108f10a8..3c88b6dcd 100644
--- a/genplugouts/deploy/IdlSettings.cpp
+++ b/genplugouts/deploy/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -175,14 +175,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -194,14 +194,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -213,14 +213,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -232,14 +232,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -251,14 +251,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -270,14 +270,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -289,14 +289,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -308,14 +308,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -327,14 +327,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -346,14 +346,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -365,14 +365,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -385,14 +385,14 @@ bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -405,14 +405,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CStrin
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionItemDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_item_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionItemDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -425,14 +425,14 @@ bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -444,14 +444,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl(const char * multiplicity)
+const QByteArray & IdlSettings::constDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _const_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ConstDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -464,14 +464,14 @@ bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -484,14 +484,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -504,14 +504,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -524,14 +524,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -543,14 +543,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -562,14 +562,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -602,60 +602,60 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_item_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_item_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_const_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray, QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -677,13 +677,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/deploy/IdlSettings.h b/genplugouts/deploy/IdlSettings.h
index d28a0bf7a..1dbcba4f7 100644
--- a/genplugouts/deploy/IdlSettings.h
+++ b/genplugouts/deploy/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype depending on the multiplicity
-    static const Q3CString & valuetypeAttributeDecl(const char * multiplicity);
+    static const QByteArray & valuetypeAttributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an union item depending on the multiplicity
-    static const Q3CString & unionItemDecl(const char * multiplicity);
+    static const QByteArray & unionItemDecl(const char * multiplicity);
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionItemDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute depending on the multiplicity
-    static const Q3CString & constDecl(const char * multiplicity);
+    static const QByteArray & constDecl(const char * multiplicity);
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(const char * multiplicity, Q3CString v);
+    static bool set_ConstDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_attr_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_attr_decl[3/*multiplicity*/];
 
-    static Q3CString _union_item_decl[3/*multiplicity*/];
+    static QByteArray _union_item_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl[3/*multiplicity*/];
+    static QByteArray _const_decl[3/*multiplicity*/];
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray, QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/deploy/JavaSettings.cpp b/genplugouts/deploy/JavaSettings.cpp
index 12f1736dd..e660b3e1c 100644
--- a/genplugouts/deploy/JavaSettings.cpp
+++ b/genplugouts/deploy/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -175,14 +175,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -194,14 +194,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -251,14 +251,14 @@ bool JavaSettings::set_IsForcePackagePrefixGeneration(bool v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -270,14 +270,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -289,14 +289,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternDecl()
+const QByteArray & JavaSettings::enumPatternDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_decl;
 }
 
-bool JavaSettings::set_EnumPatternDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -308,14 +308,14 @@ bool JavaSettings::set_EnumPatternDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumDecl()
+QByteArray JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -327,14 +327,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -346,14 +346,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl(const char * multiplicity)
+const QByteArray & JavaSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -366,14 +366,14 @@ bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemDecl()
+const QByteArray & JavaSettings::enumPatternItemDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_item_decl;
 }
 
-bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -385,14 +385,14 @@ bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemCase()
+const QByteArray & JavaSettings::enumPatternItemCase()
 {
     read_if_needed_();
 
     return _enum_pattern_item_case;
 }
 
-bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
+bool JavaSettings::set_EnumPatternItemCase(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemCaseCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -404,14 +404,14 @@ bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumItemDecl()
+QByteArray JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -423,14 +423,14 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -443,14 +443,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -481,14 +481,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -500,14 +500,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -597,60 +597,60 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_pattern_decl;
+QByteArray JavaSettings::_enum_pattern_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_enum_pattern_item_decl;
+QByteArray JavaSettings::_enum_pattern_item_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_case;
+QByteArray JavaSettings::_enum_pattern_item_case;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
 bool JavaSettings::_is_generate_javadoc_comment;
 
 bool JavaSettings::_is_force_package_gen;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray,QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -672,13 +672,13 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/deploy/JavaSettings.h b/genplugouts/deploy/JavaSettings.h
index 2c0fc5e18..f0dda0e4e 100644
--- a/genplugouts/deploy/JavaSettings.h
+++ b/genplugouts/deploy/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,80 +31,80 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -126,100 +126,100 @@ class JavaSettings : public UmlSettings
     static bool set_IsForcePackagePrefixGeneration(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumPatternDecl();
+    static const QByteArray & enumPatternDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternDecl(Q3CString v);
+    static bool set_EnumPatternDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumPatternItemDecl();
+    static const QByteArray & enumPatternItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternItemDecl(Q3CString v);
+    static bool set_EnumPatternItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumPatternItemCase();
+    static const QByteArray & enumPatternItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumPatternItemCase(Q3CString v);
+    static bool set_EnumPatternItemCase(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -233,23 +233,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -298,53 +298,53 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_pattern_decl;
+    static QByteArray _enum_pattern_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_pattern_item_decl;
+    static QByteArray _enum_pattern_item_decl;
 
-    static Q3CString _enum_pattern_item_case;
+    static QByteArray _enum_pattern_item_case;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
     static bool _is_generate_javadoc_comment;
 
     static bool _is_force_package_gen;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray, QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/deploy/Main.cpp b/genplugouts/deploy/Main.cpp
index 4c70b2f10..646919019 100644
--- a/genplugouts/deploy/Main.cpp
+++ b/genplugouts/deploy/Main.cpp
@@ -10,9 +10,10 @@
 #include "../../src/Logging/QsLogDest.h"
 // the program is called with the socket port number in argument
 
-#ifdef DEBUG
+
 int main(int argc, char ** argv)
 {
+#ifdef DEBUG
     if (argc != 2)
         return 0;
     QsLogging::Logger & logger = QsLogging::Logger::instance();
@@ -27,6 +28,8 @@ int main(int argc, char ** argv)
     logger.addDestination(fileDestination.get());
     //QTest::qSleep(15000);
     QLOG_INFO() << " STARTING DEPLOY";
+#else
+    Q_UNUSED(argc);
 #endif
     if (UmlCom::connect(QString(argv[1]).toUInt())) {
         try {
diff --git a/genplugouts/deploy/PhpSettings.cpp b/genplugouts/deploy/PhpSettings.cpp
index feac88bab..e997e0015 100644
--- a/genplugouts/deploy/PhpSettings.cpp
+++ b/genplugouts/deploy/PhpSettings.cpp
@@ -8,7 +8,7 @@
 //#include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHJAVA
 #include "JavaSettings.h"
 #endif
@@ -24,22 +24,22 @@ bool PhpSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PhpSettings::classStereotype(const Q3CString & s)
+QByteArray PhpSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
 
-bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PhpSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -52,21 +52,21 @@ bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PhpSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::php);
 }
 
-const Q3CString & PhpSettings::rootDir()
+const QByteArray & PhpSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PhpSettings::set_RootDir(Q3CString v)
+bool PhpSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -78,14 +78,14 @@ bool PhpSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceContent()
+const QByteArray & PhpSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PhpSettings::set_SourceContent(Q3CString v)
+bool PhpSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -97,14 +97,14 @@ bool PhpSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceExtension()
+const QByteArray & PhpSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PhpSettings::set_SourceExtension(Q3CString v)
+bool PhpSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -135,14 +135,14 @@ bool PhpSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::classDecl()
+const QByteArray & PhpSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PhpSettings::set_ClassDecl(Q3CString v)
+bool PhpSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -154,14 +154,14 @@ bool PhpSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::externalClassDecl()
+const QByteArray & PhpSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PhpSettings::set_ExternalClassDecl(Q3CString v)
+bool PhpSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -173,14 +173,14 @@ bool PhpSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumDecl()
+QByteArray PhpSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PhpSettings::set_EnumDecl(Q3CString v)
+bool PhpSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -192,14 +192,14 @@ bool PhpSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::interfaceDecl()
+const QByteArray & PhpSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool PhpSettings::set_InterfaceDecl(Q3CString v)
+bool PhpSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -211,14 +211,14 @@ bool PhpSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::attributeDecl()
+const QByteArray & PhpSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool PhpSettings::set_AttributeDecl(Q3CString v)
+bool PhpSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -230,14 +230,14 @@ bool PhpSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumItemDecl()
+QByteArray PhpSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PhpSettings::set_EnumItemDecl(Q3CString v)
+bool PhpSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -249,14 +249,14 @@ bool PhpSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::relationDecl()
+const QByteArray & PhpSettings::relationDecl()
 {
     read_if_needed_();
 
     return _rel_decl;
 }
 
-bool PhpSettings::set_RelationDecl(Q3CString v)
+bool PhpSettings::set_RelationDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRelationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -268,14 +268,14 @@ bool PhpSettings::set_RelationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::operationDef()
+const QByteArray & PhpSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PhpSettings::set_OperationDef(Q3CString v)
+bool PhpSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -315,14 +315,14 @@ bool PhpSettings::set_GetVisibility(aVisibility v)
 #endif
 }
 
-const Q3CString & PhpSettings::getName()
+const QByteArray & PhpSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PhpSettings::set_GetName(Q3CString v)
+bool PhpSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -334,14 +334,14 @@ bool PhpSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::setName()
+const QByteArray & PhpSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PhpSettings::set_SetName(Q3CString v)
+bool PhpSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -421,29 +421,29 @@ bool PhpSettings::set_SetVisibility(aVisibility v)
 
 bool PhpSettings::_defined;
 
-Q3CString PhpSettings::_root;
+QByteArray PhpSettings::_root;
 
-Q3CString PhpSettings::_class_decl;
+QByteArray PhpSettings::_class_decl;
 
-Q3CString PhpSettings::_external_class_decl;
+QByteArray PhpSettings::_external_class_decl;
 
-Q3CString PhpSettings::_enum_decl;
+QByteArray PhpSettings::_enum_decl;
 
-Q3CString PhpSettings::_interface_decl;
+QByteArray PhpSettings::_interface_decl;
 
-Q3CString PhpSettings::_attr_decl;
+QByteArray PhpSettings::_attr_decl;
 
-Q3CString PhpSettings::_enum_item_decl;
+QByteArray PhpSettings::_enum_item_decl;
 
-Q3CString PhpSettings::_rel_decl;
+QByteArray PhpSettings::_rel_decl;
 
-Q3CString PhpSettings::_oper_def;
+QByteArray PhpSettings::_oper_def;
 
 #ifndef WITHJAVA
 aVisibility PhpSettings::_get_visibility;
 #endif
 
-Q3CString PhpSettings::_get_name;
+QByteArray PhpSettings::_get_name;
 
 bool PhpSettings::_is_get_final;
 
@@ -451,15 +451,29 @@ bool PhpSettings::_is_get_final;
 aVisibility PhpSettings::_set_visibility;
 #endif
 
-Q3CString PhpSettings::_set_name;
+QByteArray PhpSettings::_set_name;
 
 bool PhpSettings::_is_set_final;
 
-Q3CString PhpSettings::_src_content;
+QByteArray PhpSettings::_src_content;
 
-Q3CString PhpSettings::_ext;
+QByteArray PhpSettings::_ext;
 
+QByteArray PhpSettings::_dir_regexp;
+
+bool PhpSettings::_dir_regexp_case_sensitive;
+
+QByteArray PhpSettings::_file_regexp;
+
+bool PhpSettings::_file_regexp_case_sensitive;
 bool PhpSettings::_is_generate_javadoc_comment;
+bool PhpSettings::_req_with_path;
+
+bool PhpSettings::_is_relative_path;
+
+bool PhpSettings::_is_root_relative_path;
+
+bool PhpSettings::_is_force_namespace_gen;
 
 void PhpSettings::read_()
 {
@@ -485,18 +499,31 @@ void PhpSettings::read_()
     _rel_decl = UmlCom::read_string();
     _oper_def = UmlCom::read_string();
 #ifndef WITHJAVA
-    _get_visibility =
+    _get_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _get_name = UmlCom::read_string();
     _is_get_final = UmlCom::read_bool();
 #ifndef WITHJAVA
-    _set_visibility =
+    _set_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
     _is_generate_javadoc_comment = UmlCom::read_bool();
+    _req_with_path = UmlCom::read_bool();
+    _is_relative_path = UmlCom::read_bool();
+    _is_root_relative_path = UmlCom::read_bool();
+
+    _dir_regexp = UmlCom::read_string();
+    _dir_regexp_case_sensitive = UmlCom::read_bool();
+
+    _file_regexp = UmlCom::read_string();
+    _file_regexp_case_sensitive = UmlCom::read_bool();
+
+    _is_force_namespace_gen = UmlCom::read_bool();
 }
 
 void PhpSettings::read_if_needed_()
diff --git a/genplugouts/deploy/PhpSettings.h b/genplugouts/deploy/PhpSettings.h
index 2f83561bc..6741edc6c 100644
--- a/genplugouts/deploy/PhpSettings.h
+++ b/genplugouts/deploy/PhpSettings.h
@@ -4,7 +4,7 @@
 #ifdef WITHPHP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
 
@@ -29,41 +29,41 @@ class PhpSettings : public UmlSettings
 
     // returns the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PHP one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PHP code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PHP code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -74,68 +74,68 @@ class PhpSettings : public UmlSettings
     static bool set_IsGenerateJavadocStyleComment(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of an relation
-    static const Q3CString & relationDecl();
+    static const QByteArray & relationDecl();
 
     // set the default definition of an relation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(Q3CString v);
+    static bool set_RelationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -153,23 +153,23 @@ class PhpSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -212,29 +212,29 @@ class PhpSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl;
+    static QByteArray _rel_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
 #ifndef WITHJAVA
     static aVisibility _get_visibility;
 #endif
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
@@ -242,16 +242,32 @@ class PhpSettings : public UmlSettings
     static aVisibility _set_visibility;
 #endif
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
+
+    static QByteArray _ext;
+
+    static QByteArray _dir_regexp;
+
+    static bool _dir_regexp_case_sensitive;
+
+    static QByteArray _file_regexp;
 
-    static Q3CString _ext;
+    static bool _file_regexp_case_sensitive;
 
     static bool _is_generate_javadoc_comment;
 
+    static bool _req_with_path;
+
+    static bool _is_relative_path;
+
+    static bool _is_root_relative_path;
+
+    static bool _is_force_namespace_gen;
+
 
 protected:
     static void read_();
diff --git a/genplugouts/deploy/PythonSettings.cpp b/genplugouts/deploy/PythonSettings.cpp
index 22aa9ef7f..6ee7a500e 100644
--- a/genplugouts/deploy/PythonSettings.cpp
+++ b/genplugouts/deploy/PythonSettings.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool PythonSettings::isPython_2_2()
 {
     read_if_needed_();
@@ -26,7 +26,7 @@ bool PythonSettings::set_IsPython_2_2(bool y)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::indentStep()
+const QByteArray & PythonSettings::indentStep()
 {
     read_if_needed_();
     return _indent_step;
@@ -56,22 +56,22 @@ bool PythonSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PythonSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -84,29 +84,29 @@ bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::classStereotype(const Q3CString & s)
+QByteArray PythonSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -119,32 +119,32 @@ bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::get_import(const Q3CString & s)
+QByteArray PythonSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool PythonSettings::set_Import(Q3CString s, Q3CString v)
+bool PythonSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonImportCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -155,14 +155,14 @@ bool PythonSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::rootDir()
+const QByteArray & PythonSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PythonSettings::set_RootDir(Q3CString v)
+bool PythonSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -174,14 +174,14 @@ bool PythonSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceContent()
+const QByteArray & PythonSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PythonSettings::set_SourceContent(Q3CString v)
+bool PythonSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -193,14 +193,14 @@ bool PythonSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceExtension()
+const QByteArray & PythonSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PythonSettings::set_SourceExtension(Q3CString v)
+bool PythonSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -212,14 +212,14 @@ bool PythonSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::classDecl()
+const QByteArray & PythonSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PythonSettings::set_ClassDecl(Q3CString v)
+bool PythonSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -231,14 +231,14 @@ bool PythonSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::externalClassDecl()
+const QByteArray & PythonSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PythonSettings::set_ExternalClassDecl(Q3CString v)
+bool PythonSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -250,14 +250,14 @@ bool PythonSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumDecl()
+QByteArray PythonSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PythonSettings::set_EnumDecl(Q3CString v)
+bool PythonSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -269,14 +269,14 @@ bool PythonSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::attributeDecl(const char * multiplicity)
+const QByteArray & PythonSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[mult_column(multiplicity)];
 }
 
-bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool PythonSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -289,14 +289,14 @@ bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumItemDecl()
+QByteArray PythonSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PythonSettings::set_EnumItemDecl(Q3CString v)
+bool PythonSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -308,7 +308,7 @@ bool PythonSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -328,14 +328,14 @@ bool PythonSettings::set_RelationDecl(bool by_value, const char * multiplicity,
         return FALSE;
 }
 
-const Q3CString & PythonSettings::operationDef()
+const QByteArray & PythonSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PythonSettings::set_OperationDef(Q3CString v)
+bool PythonSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -347,14 +347,14 @@ bool PythonSettings::set_OperationDef(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::getName()
+const QByteArray & PythonSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PythonSettings::set_GetName(Q3CString v)
+bool PythonSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -366,14 +366,14 @@ bool PythonSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::setName()
+const QByteArray & PythonSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PythonSettings::set_SetName(Q3CString v)
+bool PythonSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -385,7 +385,7 @@ bool PythonSettings::set_SetName(Q3CString v)
         return FALSE;
 }
 
-unsigned PythonSettings::mult_column(const Q3CString & mult)
+unsigned PythonSettings::mult_column(const QByteArray & mult)
 {
     return (mult.isEmpty() || (mult == "1")) ? 0 : 1;
 }
@@ -394,33 +394,33 @@ bool PythonSettings::_defined;
 
 bool PythonSettings::_2_2;
 
-Q3CString PythonSettings::_indent_step;
+QByteArray PythonSettings::_indent_step;
 
-Q3CString PythonSettings::_root;
+QByteArray PythonSettings::_root;
 
-Q3CString PythonSettings::_class_decl;
+QByteArray PythonSettings::_class_decl;
 
-Q3CString PythonSettings::_external_class_decl;
+QByteArray PythonSettings::_external_class_decl;
 
-Q3CString PythonSettings::_enum_decl;
+QByteArray PythonSettings::_enum_decl;
 
-Q3CString PythonSettings::_attr_decl[2/*multiplicity*/];
+QByteArray PythonSettings::_attr_decl[2/*multiplicity*/];
 
-Q3CString PythonSettings::_enum_item_decl;
+QByteArray PythonSettings::_enum_item_decl;
 
-Q3CString PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
+QByteArray PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-Q3CString PythonSettings::_oper_def;
+QByteArray PythonSettings::_oper_def;
 
-Q3CString PythonSettings::_get_name;
+QByteArray PythonSettings::_get_name;
 
-Q3CString PythonSettings::_set_name;
+QByteArray PythonSettings::_set_name;
 
-Q3CString PythonSettings::_src_content;
+QByteArray PythonSettings::_src_content;
 
-Q3CString PythonSettings::_ext;
+QByteArray PythonSettings::_ext;
 
-Q3Dict<Q3CString> PythonSettings::_map_imports;
+QHash<QByteArray, QByteArray*> PythonSettings::_map_imports;
 
 void PythonSettings::read_()
 {
@@ -430,8 +430,8 @@ void PythonSettings::read_()
 
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -447,13 +447,13 @@ void PythonSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/deploy/PythonSettings.h b/genplugouts/deploy/PythonSettings.h
index 5b32a95f4..debc12ac7 100644
--- a/genplugouts/deploy/PythonSettings.h
+++ b/genplugouts/deploy/PythonSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHPYTHON
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PYTHON, configured through
 // the 'Generation settings' dialog.
@@ -26,7 +26,7 @@ class PythonSettings : public UmlSettings
     static bool set_IsPython_2_2(bool y);
 
     // return the  default indent step
-    static const Q3CString & indentStep();
+    static const QByteArray & indentStep();
 
     // set default indent step
     //
@@ -45,109 +45,109 @@ class PythonSettings : public UmlSettings
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Python type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Python type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PYTHON code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PYTHON code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -156,71 +156,71 @@ class PythonSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
 
 private:
     // never called !
     PythonSettings() {};
 
-    static unsigned mult_column(const Q3CString & mult);
+    static unsigned mult_column(const QByteArray & mult);
 
     static bool _defined;
 
     static bool _2_2;
 
-    static Q3CString _indent_step;
+    static QByteArray _indent_step;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _attr_decl[2/*multiplicity*/];
+    static QByteArray _attr_decl[2/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][2/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray, QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/deploy/SlotAttribute.h b/genplugouts/deploy/SlotAttribute.h
index d1c59eabf..bbbe69d0d 100644
--- a/genplugouts/deploy/SlotAttribute.h
+++ b/genplugouts/deploy/SlotAttribute.h
@@ -1,21 +1,18 @@
 #ifndef _SLOTATTRIBUTE_H
 #define _SLOTATTRIBUTE_H
-
-
-#include <q3cstring.h>
-
+#include <QByteArray>
 class UmlAttribute;
 
 struct SlotAttribute {
     UmlAttribute * attribute;
 
-    Q3CString value;
+    QByteArray value;
 
     // because of QValueList use
     SlotAttribute() : attribute(0) {
     }
 
-    SlotAttribute(UmlAttribute * a, Q3CString v) : attribute(a), value(v) {
+    SlotAttribute(UmlAttribute * a, QByteArray v) : attribute(a), value(v) {
     }
 
 };
diff --git a/genplugouts/deploy/StateBehavior.h b/genplugouts/deploy/StateBehavior.h
index 91a42cb82..66ac09c00 100644
--- a/genplugouts/deploy/StateBehavior.h
+++ b/genplugouts/deploy/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/deploy/TransitionBehavior.h b/genplugouts/deploy/TransitionBehavior.h
index 856ede3c0..8714c541d 100644
--- a/genplugouts/deploy/TransitionBehavior.h
+++ b/genplugouts/deploy/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/deploy/UmlAccessVariableValueAction.h b/genplugouts/deploy/UmlAccessVariableValueAction.h
index dc92b3e25..8d4f9ae87 100644
--- a/genplugouts/deploy/UmlAccessVariableValueAction.h
+++ b/genplugouts/deploy/UmlAccessVariableValueAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseAccessVariableValueAction.h"
-#include <q3cstring.h>
+
 
 class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAccessVariableValueAction(void * id, const Q3CString & s) : UmlBaseAccessVariableValueAction(id, s) {
+    UmlAccessVariableValueAction(void * id, const QByteArray & s) : UmlBaseAccessVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivity.h b/genplugouts/deploy/UmlActivity.h
index 8f9886b0e..6f8bd5244 100644
--- a/genplugouts/deploy/UmlActivity.h
+++ b/genplugouts/deploy/UmlActivity.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivity.h"
-#include <q3cstring.h>
+
 
 class UmlActivity : public UmlBaseActivity
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivity(void * id, const Q3CString & s) : UmlBaseActivity(id, s) {
+    UmlActivity(void * id, const QByteArray & s) : UmlBaseActivity(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityAction.h b/genplugouts/deploy/UmlActivityAction.h
index f359c755a..3079e18ba 100644
--- a/genplugouts/deploy/UmlActivityAction.h
+++ b/genplugouts/deploy/UmlActivityAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlActivityAction : public UmlBaseActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityAction(void * id, const Q3CString & s) : UmlBaseActivityAction(id, s) {
+    UmlActivityAction(void * id, const QByteArray & s) : UmlBaseActivityAction(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityActionClasses.h b/genplugouts/deploy/UmlActivityActionClasses.h
index 15677a746..62369cdab 100644
--- a/genplugouts/deploy/UmlActivityActionClasses.h
+++ b/genplugouts/deploy/UmlActivityActionClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityActionClasses.h"
-#include <q3cstring.h>
+
 
 class UmlSendObjectAction : public UmlBaseSendObjectAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendObjectAction(void * id, const Q3CString & s) : UmlBaseSendObjectAction(id, s) {
+    UmlSendObjectAction(void * id, const QByteArray & s) : UmlBaseSendObjectAction(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlUnmarshallAction : public UmlBaseUnmarshallAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlUnmarshallAction(void * id, const Q3CString & s) : UmlBaseUnmarshallAction(id, s) {
+    UmlUnmarshallAction(void * id, const QByteArray & s) : UmlBaseUnmarshallAction(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlSendSignalAction : public UmlBaseSendSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendSignalAction(void * id, const Q3CString & s) : UmlBaseSendSignalAction(id, s) {
+    UmlSendSignalAction(void * id, const QByteArray & s) : UmlBaseSendSignalAction(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlBroadcastSignalAction : public UmlBaseBroadcastSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBroadcastSignalAction(void * id, const Q3CString & s) : UmlBaseBroadcastSignalAction(id, s) {
+    UmlBroadcastSignalAction(void * id, const QByteArray & s) : UmlBaseBroadcastSignalAction(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlValueSpecificationAction : public UmlBaseValueSpecificationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlValueSpecificationAction(void * id, const Q3CString & s) : UmlBaseValueSpecificationAction(id, s) {
+    UmlValueSpecificationAction(void * id, const QByteArray & s) : UmlBaseValueSpecificationAction(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlOpaqueAction : public UmlBaseOpaqueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOpaqueAction(void * id, const Q3CString & s) : UmlBaseOpaqueAction(id, s) {
+    UmlOpaqueAction(void * id, const QByteArray & s) : UmlBaseOpaqueAction(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlAcceptEventAction : public UmlBaseAcceptEventAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptEventAction(void * id, const Q3CString & s) : UmlBaseAcceptEventAction(id, s) {
+    UmlAcceptEventAction(void * id, const QByteArray & s) : UmlBaseAcceptEventAction(id, s) {
     }
 
 };
@@ -72,7 +72,7 @@ class UmlCallOperationAction : public UmlBaseCallOperationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallOperationAction(void * id, const Q3CString & s) : UmlBaseCallOperationAction(id, s) {
+    UmlCallOperationAction(void * id, const QByteArray & s) : UmlBaseCallOperationAction(id, s) {
     }
 
 };
@@ -81,7 +81,7 @@ class UmlCallBehaviorAction : public UmlBaseCallBehaviorAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallBehaviorAction(void * id, const Q3CString & s) : UmlBaseCallBehaviorAction(id, s) {
+    UmlCallBehaviorAction(void * id, const QByteArray & s) : UmlBaseCallBehaviorAction(id, s) {
     }
 
 };
@@ -90,7 +90,7 @@ class UmlClearVariableValueAction : public UmlBaseClearVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClearVariableValueAction(void * id, const Q3CString & s) : UmlBaseClearVariableValueAction(id, s) {
+    UmlClearVariableValueAction(void * id, const QByteArray & s) : UmlBaseClearVariableValueAction(id, s) {
     }
 
 };
@@ -99,7 +99,7 @@ class UmlReadVariableValueAction : public UmlBaseReadVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReadVariableValueAction(void * id, const Q3CString & s) : UmlBaseReadVariableValueAction(id, s) {
+    UmlReadVariableValueAction(void * id, const QByteArray & s) : UmlBaseReadVariableValueAction(id, s) {
     }
 
 };
@@ -108,7 +108,7 @@ class UmlWriteVariableValueAction : public UmlBaseWriteVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlWriteVariableValueAction(void * id, const Q3CString & s) : UmlBaseWriteVariableValueAction(id, s) {
+    UmlWriteVariableValueAction(void * id, const QByteArray & s) : UmlBaseWriteVariableValueAction(id, s) {
     }
 
 };
@@ -117,7 +117,7 @@ class UmlAddVariableValueAction : public UmlBaseAddVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAddVariableValueAction(void * id, const Q3CString & s) : UmlBaseAddVariableValueAction(id, s) {
+    UmlAddVariableValueAction(void * id, const QByteArray & s) : UmlBaseAddVariableValueAction(id, s) {
     }
 
 };
@@ -126,7 +126,7 @@ class UmlRemoveVariableValueAction : public UmlBaseRemoveVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRemoveVariableValueAction(void * id, const Q3CString & s) : UmlBaseRemoveVariableValueAction(id, s) {
+    UmlRemoveVariableValueAction(void * id, const QByteArray & s) : UmlBaseRemoveVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityControlNode.h b/genplugouts/deploy/UmlActivityControlNode.h
index 8ebf04bf7..1396fd3e2 100644
--- a/genplugouts/deploy/UmlActivityControlNode.h
+++ b/genplugouts/deploy/UmlActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNode.h"
-#include <q3cstring.h>
+
 
 class UmlActivityControlNode : public UmlBaseActivityControlNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityControlNode(void * id, const Q3CString & s) : UmlBaseActivityControlNode(id, s) {
+    UmlActivityControlNode(void * id, const QByteArray & s) : UmlBaseActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityControlNodeClasses.h b/genplugouts/deploy/UmlActivityControlNodeClasses.h
index f698adeca..2be0cd946 100644
--- a/genplugouts/deploy/UmlActivityControlNodeClasses.h
+++ b/genplugouts/deploy/UmlActivityControlNodeClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNodeClasses.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode : public UmlBaseInitialActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInitialActivityNode(void * id, const Q3CString & s) : UmlBaseInitialActivityNode(id, s) {
+    UmlInitialActivityNode(void * id, const QByteArray & s) : UmlBaseInitialActivityNode(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlFlowFinalActivityNode : public UmlBaseFlowFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlFlowFinalActivityNode(void * id, const Q3CString & s) : UmlBaseFlowFinalActivityNode(id, s) {
+    UmlFlowFinalActivityNode(void * id, const QByteArray & s) : UmlBaseFlowFinalActivityNode(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlActivityFinalActivityNode : public UmlBaseActivityFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityFinalActivityNode(void * id, const Q3CString & s) : UmlBaseActivityFinalActivityNode(id, s) {
+    UmlActivityFinalActivityNode(void * id, const QByteArray & s) : UmlBaseActivityFinalActivityNode(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlDecisionActivityNode : public UmlBaseDecisionActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDecisionActivityNode(void * id, const Q3CString & s) : UmlBaseDecisionActivityNode(id, s) {
+    UmlDecisionActivityNode(void * id, const QByteArray & s) : UmlBaseDecisionActivityNode(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlMergeActivityNode : public UmlBaseMergeActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlMergeActivityNode(void * id, const Q3CString & s) : UmlBaseMergeActivityNode(id, s) {
+    UmlMergeActivityNode(void * id, const QByteArray & s) : UmlBaseMergeActivityNode(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlForkActivityNode : public UmlBaseForkActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlForkActivityNode(void * id, const Q3CString & s) : UmlBaseForkActivityNode(id, s) {
+    UmlForkActivityNode(void * id, const QByteArray & s) : UmlBaseForkActivityNode(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlJoinActivityNode : public UmlBaseJoinActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlJoinActivityNode(void * id, const Q3CString & s) : UmlBaseJoinActivityNode(id, s) {
+    UmlJoinActivityNode(void * id, const QByteArray & s) : UmlBaseJoinActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityDiagram.h b/genplugouts/deploy/UmlActivityDiagram.h
index 4b48b12f2..b45a0410a 100644
--- a/genplugouts/deploy/UmlActivityDiagram.h
+++ b/genplugouts/deploy/UmlActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseActivityDiagram.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 // This class manages 'activity diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -15,7 +15,7 @@ class UmlActivityDiagram : public UmlBaseActivityDiagram, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityDiagram(void * id, const Q3CString & s) : UmlBaseActivityDiagram(id, s) {
+    UmlActivityDiagram(void * id, const QByteArray & s) : UmlBaseActivityDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityNode.h b/genplugouts/deploy/UmlActivityNode.h
index 8429d2396..770c06359 100644
--- a/genplugouts/deploy/UmlActivityNode.h
+++ b/genplugouts/deploy/UmlActivityNode.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityNode.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityNode : public UmlBaseActivityNode, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityNode(void * id, const Q3CString & s) : UmlBaseActivityNode(id, s) {
+    UmlActivityNode(void * id, const QByteArray & s) : UmlBaseActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityObject.h b/genplugouts/deploy/UmlActivityObject.h
index f75bccd9b..22de36492 100644
--- a/genplugouts/deploy/UmlActivityObject.h
+++ b/genplugouts/deploy/UmlActivityObject.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityObject.h"
-#include <q3cstring.h>
+
 
 class UmlActivityObject : public UmlBaseActivityObject
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityObject(void * id, const Q3CString & s) : UmlBaseActivityObject(id, s) {
+    UmlActivityObject(void * id, const QByteArray & s) : UmlBaseActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityParameter.h b/genplugouts/deploy/UmlActivityParameter.h
index b51b0fec0..57474b452 100644
--- a/genplugouts/deploy/UmlActivityParameter.h
+++ b/genplugouts/deploy/UmlActivityParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityParameter.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter : public UmlBaseActivityParameter
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityParameter(void * id, const Q3CString & s) : UmlBaseActivityParameter(id, s) {
+    UmlActivityParameter(void * id, const QByteArray & s) : UmlBaseActivityParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityPin.h b/genplugouts/deploy/UmlActivityPin.h
index 5d7ae2e0f..a53330fe2 100644
--- a/genplugouts/deploy/UmlActivityPin.h
+++ b/genplugouts/deploy/UmlActivityPin.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityPin.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin : public UmlBaseActivityPin
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPin(void * id, const Q3CString & s) : UmlBaseActivityPin(id, s) {
+    UmlActivityPin(void * id, const QByteArray & s) : UmlBaseActivityPin(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlActivityRegion.h b/genplugouts/deploy/UmlActivityRegion.h
index 420b4bde2..1db9fe05f 100644
--- a/genplugouts/deploy/UmlActivityRegion.h
+++ b/genplugouts/deploy/UmlActivityRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityRegion.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityRegion : public UmlBaseActivityRegion, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityRegion(void * id, const Q3CString & s) : UmlBaseActivityRegion(id, s) {
+    UmlActivityRegion(void * id, const QByteArray & s) : UmlBaseActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlArtifact.h b/genplugouts/deploy/UmlArtifact.h
index 9f6a30622..030e1717b 100644
--- a/genplugouts/deploy/UmlArtifact.h
+++ b/genplugouts/deploy/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+
 
 // This class manages 'artifacts'
 //
@@ -11,7 +11,7 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlAttribute.h b/genplugouts/deploy/UmlAttribute.h
index 19ee0a4c6..427658b45 100644
--- a/genplugouts/deploy/UmlAttribute.h
+++ b/genplugouts/deploy/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseAccessVariableValueAction.h b/genplugouts/deploy/UmlBaseAccessVariableValueAction.h
index 311fefa08..0e2856d02 100644
--- a/genplugouts/deploy/UmlBaseAccessVariableValueAction.h
+++ b/genplugouts/deploy/UmlBaseAccessVariableValueAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlItem;
 
@@ -11,7 +11,7 @@ class UmlBaseAccessVariableValueAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAccessVariableValueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAccessVariableValueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
diff --git a/genplugouts/deploy/UmlBaseActivity.cpp b/genplugouts/deploy/UmlBaseActivity.cpp
index 2f992ddd1..45801f46c 100644
--- a/genplugouts/deploy/UmlBaseActivity.cpp
+++ b/genplugouts/deploy/UmlBaseActivity.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassView.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivity * UmlBaseActivity::create(UmlClassView * parent, const char * s)
 {
@@ -17,7 +17,7 @@ anItemKind UmlBaseActivity::kind()
     return anActivity;
 }
 
-const Q3CString & UmlBaseActivity::preCondition()
+const QByteArray & UmlBaseActivity::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivity::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::postCondition()
+const QByteArray & UmlBaseActivity::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -40,7 +40,7 @@ bool UmlBaseActivity::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivity::cppPreCondition()
+const QByteArray & UmlBaseActivity::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -51,7 +51,7 @@ bool UmlBaseActivity::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::cppPostCondition()
+const QByteArray & UmlBaseActivity::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -64,7 +64,7 @@ bool UmlBaseActivity::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivity::javaPreCondition()
+const QByteArray & UmlBaseActivity::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -75,7 +75,7 @@ bool UmlBaseActivity::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::javaPostCondition()
+const QByteArray & UmlBaseActivity::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/deploy/UmlBaseActivity.h b/genplugouts/deploy/UmlBaseActivity.h
index 570c657c4..3315bf7ad 100644
--- a/genplugouts/deploy/UmlBaseActivity.h
+++ b/genplugouts/deploy/UmlBaseActivity.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivity;
 class UmlClassView;
@@ -26,13 +26,13 @@ class UmlBaseActivity : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivity(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivity(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -40,7 +40,7 @@ class UmlBaseActivity : public UmlItem
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -49,7 +49,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -57,7 +57,7 @@ class UmlBaseActivity : public UmlItem
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -75,7 +75,7 @@ class UmlBaseActivity : public UmlItem
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -117,20 +117,20 @@ class UmlBaseActivity : public UmlItem
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     bool _read_only;
diff --git a/genplugouts/deploy/UmlBaseActivityAction.cpp b/genplugouts/deploy/UmlBaseActivityAction.cpp
index fb47b7b1b..de084771d 100644
--- a/genplugouts/deploy/UmlBaseActivityAction.cpp
+++ b/genplugouts/deploy/UmlBaseActivityAction.cpp
@@ -3,9 +3,9 @@
 #include "UmlBaseActivityAction.h"
 #include "UmlDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseActivityAction::preCondition()
+const QByteArray & UmlBaseActivityAction::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -16,7 +16,7 @@ bool UmlBaseActivityAction::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::postCondition()
+const QByteArray & UmlBaseActivityAction::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivityAction::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityAction::cppPreCondition()
+const QByteArray & UmlBaseActivityAction::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -39,7 +39,7 @@ bool UmlBaseActivityAction::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::cppPostCondition()
+const QByteArray & UmlBaseActivityAction::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivityAction::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityAction::javaPreCondition()
+const QByteArray & UmlBaseActivityAction::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -63,7 +63,7 @@ bool UmlBaseActivityAction::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::javaPostCondition()
+const QByteArray & UmlBaseActivityAction::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/deploy/UmlBaseActivityAction.h b/genplugouts/deploy/UmlBaseActivityAction.h
index 4a06ccffe..a0c197cab 100644
--- a/genplugouts/deploy/UmlBaseActivityAction.h
+++ b/genplugouts/deploy/UmlBaseActivityAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlDiagram;
 
@@ -11,13 +11,13 @@ class UmlBaseActivityAction : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityAction(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityAction(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -25,7 +25,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -34,7 +34,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -42,7 +42,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -52,7 +52,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -60,7 +60,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -86,20 +86,20 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     UmlDiagram * _assoc_diagram;
diff --git a/genplugouts/deploy/UmlBaseActivityActionClasses.cpp b/genplugouts/deploy/UmlBaseActivityActionClasses.cpp
index 5cc2254e5..5151385b9 100644
--- a/genplugouts/deploy/UmlBaseActivityActionClasses.cpp
+++ b/genplugouts/deploy/UmlBaseActivityActionClasses.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlSendObjectAction * UmlBaseSendObjectAction::create(UmlItem * parent, const char * s)
 {
@@ -57,7 +57,7 @@ anItemKind UmlBaseValueSpecificationAction::kind()
     return aValueSpecificationAction;
 }
 
-const Q3CString & UmlBaseValueSpecificationAction::value()
+const QByteArray & UmlBaseValueSpecificationAction::value()
 {
     read_if_needed_();
     return _value;
@@ -69,7 +69,7 @@ bool UmlBaseValueSpecificationAction::set_Value(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseValueSpecificationAction::cppValue()
+const QByteArray & UmlBaseValueSpecificationAction::cppValue()
 {
     read_if_needed_();
     return _cpp_value;
@@ -82,7 +82,7 @@ bool UmlBaseValueSpecificationAction::set_CppValue(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseValueSpecificationAction::javaValue()
+const QByteArray & UmlBaseValueSpecificationAction::javaValue()
 {
     read_if_needed_();
     return _java_value;
@@ -138,7 +138,7 @@ anItemKind UmlBaseOpaqueAction::kind()
     return anOpaqueAction;
 }
 
-const Q3CString & UmlBaseOpaqueAction::behavior()
+const QByteArray & UmlBaseOpaqueAction::behavior()
 {
     read_if_needed_();
     return _behavior;
@@ -150,7 +150,7 @@ bool UmlBaseOpaqueAction::set_Behavior(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOpaqueAction::cppBehavior()
+const QByteArray & UmlBaseOpaqueAction::cppBehavior()
 {
     read_if_needed_();
     return _cpp_behavior;
@@ -163,7 +163,7 @@ bool UmlBaseOpaqueAction::set_CppBehavior(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOpaqueAction::javaBehavior()
+const QByteArray & UmlBaseOpaqueAction::javaBehavior()
 {
     read_if_needed_();
     return _java_behavior;
@@ -241,7 +241,7 @@ bool UmlBaseAcceptEventAction::set_isTimeEvent(bool v)
     return set_it_(_timeevent, v, setTimeEventCmd);
 }
 
-const Q3CString & UmlBaseAcceptEventAction::trigger()
+const QByteArray & UmlBaseAcceptEventAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -253,7 +253,7 @@ bool UmlBaseAcceptEventAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptEventAction::cppTrigger()
+const QByteArray & UmlBaseAcceptEventAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -266,7 +266,7 @@ bool UmlBaseAcceptEventAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptEventAction::javaTrigger()
+const QByteArray & UmlBaseAcceptEventAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
diff --git a/genplugouts/deploy/UmlBaseActivityActionClasses.h b/genplugouts/deploy/UmlBaseActivityActionClasses.h
index 8b10cbf4d..66d16c09d 100644
--- a/genplugouts/deploy/UmlBaseActivityActionClasses.h
+++ b/genplugouts/deploy/UmlBaseActivityActionClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityAction.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlOnSignalAction.h"
 #include "UmlAccessVariableValueAction.h"
 
@@ -41,7 +41,7 @@ class UmlBaseSendObjectAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseSendObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -62,7 +62,7 @@ class UmlBaseUnmarshallAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUnmarshallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseUnmarshallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -83,7 +83,7 @@ class UmlBaseSendSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseSendSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -104,7 +104,7 @@ class UmlBaseBroadcastSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseBroadcastSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseBroadcastSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -125,13 +125,13 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseValueSpecificationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseValueSpecificationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the value
-    const Q3CString & value();
+    const QByteArray & value();
 
     // set the value
     //
@@ -140,7 +140,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the value in C++
-    const Q3CString & cppValue();
+    const QByteArray & cppValue();
 
     // set the value in C++
     //
@@ -150,7 +150,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the value in Java
-    const Q3CString & javaValue();
+    const QByteArray & javaValue();
 
     // set the value in Java
     //
@@ -168,14 +168,14 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 
 private:
-    Q3CString _value;
+    QByteArray _value;
 
 #ifdef WITHCPP
-    Q3CString _cpp_value;
+    QByteArray _cpp_value;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_value;
+    QByteArray _java_value;
 #endif
 
 
@@ -208,13 +208,13 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOpaqueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOpaqueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the behavior
-    const Q3CString & behavior();
+    const QByteArray & behavior();
 
     // set the behavior
     //
@@ -223,7 +223,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the behavior in C++
-    const Q3CString & cppBehavior();
+    const QByteArray & cppBehavior();
 
     // set the behavior in C++
     //
@@ -233,7 +233,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the behavior in Java
-    const Q3CString & javaBehavior();
+    const QByteArray & javaBehavior();
 
     // set the behavior in Java
     //
@@ -251,14 +251,14 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 
 private:
-    Q3CString _behavior;
+    QByteArray _behavior;
 
 #ifdef WITHCPP
-    Q3CString _cpp_behavior;
+    QByteArray _cpp_behavior;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_behavior;
+    QByteArray _java_behavior;
 #endif
 
 
@@ -291,7 +291,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptEventAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptEventAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -313,7 +313,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     bool set_isTimeEvent(bool v);
 
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -322,7 +322,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -332,7 +332,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -354,14 +354,14 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
     bool _timeevent;
 
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
@@ -394,7 +394,7 @@ class UmlBaseCallOperationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallOperationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallOperationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -443,7 +443,7 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallBehaviorAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallBehaviorAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -492,7 +492,7 @@ class UmlBaseClearVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClearVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseClearVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -513,7 +513,7 @@ class UmlBaseReadVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReadVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseReadVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -534,7 +534,7 @@ class UmlBaseWriteVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseWriteVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseWriteVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -555,7 +555,7 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAddVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseAddVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -594,7 +594,7 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRemoveVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseRemoveVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
diff --git a/genplugouts/deploy/UmlBaseActivityControlNode.h b/genplugouts/deploy/UmlBaseActivityControlNode.h
index 9f1c0931a..3d07467c1 100644
--- a/genplugouts/deploy/UmlBaseActivityControlNode.h
+++ b/genplugouts/deploy/UmlBaseActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityControlNode : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityControlNode(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityControlNode(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseActivityControlNodeClasses.h b/genplugouts/deploy/UmlBaseActivityControlNodeClasses.h
index 84dd781f7..1ef579e8c 100644
--- a/genplugouts/deploy/UmlBaseActivityControlNodeClasses.h
+++ b/genplugouts/deploy/UmlBaseActivityControlNodeClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityControlNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialActivityNode;
 class UmlItem;
@@ -31,7 +31,7 @@ class UmlBaseInitialActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseInitialActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -52,7 +52,7 @@ class UmlBaseFlowFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlowFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseFlowFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -73,7 +73,7 @@ class UmlBaseActivityFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseActivityFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -94,7 +94,7 @@ class UmlBaseDecisionActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDecisionActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseDecisionActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -115,7 +115,7 @@ class UmlBaseMergeActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseMergeActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseMergeActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -136,7 +136,7 @@ class UmlBaseForkActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseForkActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -157,7 +157,7 @@ class UmlBaseJoinActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseJoinActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseActivityDiagram.h b/genplugouts/deploy/UmlBaseActivityDiagram.h
index 8ed6ca9d6..67d2ff8af 100644
--- a/genplugouts/deploy/UmlBaseActivityDiagram.h
+++ b/genplugouts/deploy/UmlBaseActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseActivityDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseActivityDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseActivityNode.h b/genplugouts/deploy/UmlBaseActivityNode.h
index 9018d75ce..54536ed90 100644
--- a/genplugouts/deploy/UmlBaseActivityNode.h
+++ b/genplugouts/deploy/UmlBaseActivityNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseActivityNode : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityNode(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityNode(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseActivityObject.cpp b/genplugouts/deploy/UmlBaseActivityObject.cpp
index 65107b90c..9672ec9f4 100644
--- a/genplugouts/deploy/UmlBaseActivityObject.cpp
+++ b/genplugouts/deploy/UmlBaseActivityObject.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityObject * UmlBaseActivityObject::create(UmlItem * parent, const char * s)
 {
@@ -28,7 +28,7 @@ bool UmlBaseActivityObject::set_Type(const UmlTypeSpec & v)
     return set_it_(_type, v, setTypeCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::multiplicity()
+const QByteArray & UmlBaseActivityObject::multiplicity()
 {
     read_if_needed_();
     return _multiplicity;
@@ -39,7 +39,7 @@ bool UmlBaseActivityObject::set_Multiplicity(const char * v)
     return set_it_(_multiplicity, v, setMultiplicityCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::inState()
+const QByteArray & UmlBaseActivityObject::inState()
 {
     read_if_needed_();
     return _in_state;
@@ -50,7 +50,7 @@ bool UmlBaseActivityObject::set_InState(const char * v)
     return set_it_(_in_state, v, setInStateCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::selection()
+const QByteArray & UmlBaseActivityObject::selection()
 {
     read_if_needed_();
     return _selection;
@@ -62,7 +62,7 @@ bool UmlBaseActivityObject::set_Selection(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityObject::cppSelection()
+const QByteArray & UmlBaseActivityObject::cppSelection()
 {
     read_if_needed_();
     return _cpp_selection;
@@ -75,7 +75,7 @@ bool UmlBaseActivityObject::set_CppSelection(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityObject::javaSelection()
+const QByteArray & UmlBaseActivityObject::javaSelection()
 {
     read_if_needed_();
     return _java_selection;
diff --git a/genplugouts/deploy/UmlBaseActivityObject.h b/genplugouts/deploy/UmlBaseActivityObject.h
index a3db42010..ffb8ecc78 100644
--- a/genplugouts/deploy/UmlBaseActivityObject.h
+++ b/genplugouts/deploy/UmlBaseActivityObject.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "anOrdering.h"
 
@@ -28,7 +28,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityObject(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityObject(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
@@ -42,7 +42,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Type(const UmlTypeSpec & v);
 
     // return the multiplicity
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // set the multiplicity
     //
@@ -50,7 +50,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Multiplicity(const char * v);
 
     // return the inState attribute
-    const Q3CString & inState();
+    const QByteArray & inState();
 
     // set the inState attribute
     //
@@ -58,7 +58,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_InState(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -67,7 +67,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -123,18 +123,18 @@ class UmlBaseActivityObject : public UmlActivityNode
 
     UmlTypeSpec _type;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _in_state;
+    QByteArray _in_state;
 
-    Q3CString _selection;
+    QByteArray _selection;
 
 #ifdef WITHCPP
-    Q3CString _cpp_selection;
+    QByteArray _cpp_selection;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_selection;
+    QByteArray _java_selection;
 #endif
 
     anOrdering _ordering : 8;
diff --git a/genplugouts/deploy/UmlBaseActivityParameter.cpp b/genplugouts/deploy/UmlBaseActivityParameter.cpp
index 067b1ba5c..0e5dd560c 100644
--- a/genplugouts/deploy/UmlBaseActivityParameter.cpp
+++ b/genplugouts/deploy/UmlBaseActivityParameter.cpp
@@ -4,7 +4,7 @@
 #include "UmlActivityParameter.h"
 #include "UmlActivity.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityParameter * UmlBaseActivityParameter::create(UmlActivity * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseActivityParameter::kind()
     return anActivityParameter;
 }
 
-const Q3CString & UmlBaseActivityParameter::defaultValue()
+const QByteArray & UmlBaseActivityParameter::defaultValue()
 {
     read_if_needed_();
     return _default_value;
diff --git a/genplugouts/deploy/UmlBaseActivityParameter.h b/genplugouts/deploy/UmlBaseActivityParameter.h
index 1f05aabe8..fcdd9cecc 100644
--- a/genplugouts/deploy/UmlBaseActivityParameter.h
+++ b/genplugouts/deploy/UmlBaseActivityParameter.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityParameter;
 class UmlActivity;
@@ -25,13 +25,13 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityParameter(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityParameter(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 
 public:
     // return the default value
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // set the default value
     //
@@ -48,7 +48,7 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 
 private:
-    Q3CString _default_value;
+    QByteArray _default_value;
 
 
 protected:
diff --git a/genplugouts/deploy/UmlBaseActivityPin.h b/genplugouts/deploy/UmlBaseActivityPin.h
index 52f5d4072..9ef909129 100644
--- a/genplugouts/deploy/UmlBaseActivityPin.h
+++ b/genplugouts/deploy/UmlBaseActivityPin.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlActivityPin;
 class UmlActivityAction;
@@ -25,7 +25,7 @@ class UmlBaseActivityPin : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPin(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityPin(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseActivityRegion.h b/genplugouts/deploy/UmlBaseActivityRegion.h
index 95e516e75..cf3b637c1 100644
--- a/genplugouts/deploy/UmlBaseActivityRegion.h
+++ b/genplugouts/deploy/UmlBaseActivityRegion.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlActivityDiagram;
 
@@ -11,7 +11,7 @@ class UmlBaseActivityRegion : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/deploy/UmlBaseArtifact.cpp b/genplugouts/deploy/UmlBaseArtifact.cpp
index d3707b9e2..a4432fadd 100644
--- a/genplugouts/deploy/UmlBaseArtifact.cpp
+++ b/genplugouts/deploy/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         if (_defined)
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] = _associated[last];
 
             _associated.resize(last);
         }
@@ -166,82 +168,82 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseArtifact::phpSource()
+const QByteArray & UmlBaseArtifact::phpSource()
 {
     read_if_needed_();
 
     return _php_src;
 }
 
-bool UmlBaseArtifact::set_PhpSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PhpSource(const QByteArray & s)
 {
     return set_it_(_php_src, s, setPhpSrcCmd);
 }
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseArtifact::pythonSource()
+const QByteArray & UmlBaseArtifact::pythonSource()
 {
     read_if_needed_();
 
     return _python_src;
 }
 
-bool UmlBaseArtifact::set_PythonSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PythonSource(const QByteArray & s)
 {
     return set_it_(_python_src, s, setPythonSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -282,13 +284,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/deploy/UmlBaseArtifact.h b/genplugouts/deploy/UmlBaseArtifact.h
index 19359a371..bfe0b9a0b 100644
--- a/genplugouts/deploy/UmlBaseArtifact.h
+++ b/genplugouts/deploy/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,60 +83,60 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPHP
     // returns the Php file definition
-    const Q3CString & phpSource();
+    const QByteArray & phpSource();
 
     // to set the Php file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpSource(const Q3CString & s);
+    bool set_PhpSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPYTHON
     // returns the Python file definition
-    const Q3CString & pythonSource();
+    const QByteArray & pythonSource();
 
     // to set the Python file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonSource(const Q3CString & s);
+    bool set_PythonSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -147,30 +147,30 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_src;
+    QByteArray _php_src;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_src;
+    QByteArray _python_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -210,12 +210,12 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
     friend class UmlBaseClass;
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/deploy/UmlBaseAttribute.cpp b/genplugouts/deploy/UmlBaseAttribute.cpp
index 5a9b4b549..ae721c8dd 100644
--- a/genplugouts/deploy/UmlBaseAttribute.cpp
+++ b/genplugouts/deploy/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -98,7 +98,7 @@ bool UmlBaseAttribute::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -122,7 +122,7 @@ bool UmlBaseAttribute::set_Type(const UmlTypeSpec & t)
     return set_it_(_type, t, setTypeCmd);
 }
 
-const Q3CString & UmlBaseAttribute::multiplicity()
+const QByteArray & UmlBaseAttribute::multiplicity()
 {
     read_if_needed_();
 
@@ -215,7 +215,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/deploy/UmlBaseAttribute.h b/genplugouts/deploy/UmlBaseAttribute.h
index 766a99f05..d3094bdf4 100644
--- a/genplugouts/deploy/UmlBaseAttribute.h
+++ b/genplugouts/deploy/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -62,7 +62,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -78,7 +78,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_Type(const UmlTypeSpec & t);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -125,7 +125,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -163,9 +163,9 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient : 1;
 #endif
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -177,13 +177,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -223,7 +223,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/deploy/UmlBaseChoicePseudoState.h b/genplugouts/deploy/UmlBaseChoicePseudoState.h
index fb682dd91..8d15fc093 100644
--- a/genplugouts/deploy/UmlBaseChoicePseudoState.h
+++ b/genplugouts/deploy/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseClass.cpp b/genplugouts/deploy/UmlBaseClass.cpp
index 47469e9e8..18e788ea7 100644
--- a/genplugouts/deploy/UmlBaseClass.cpp
+++ b/genplugouts/deploy/UmlBaseClass.cpp
@@ -11,8 +11,8 @@
 #include "Tools/ApiCmd.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 #include "Logging/QsLog.h"
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
@@ -48,11 +48,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -84,11 +84,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -133,17 +133,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -371,7 +371,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -386,7 +386,7 @@ UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
     return (UmlClass *) UmlBaseItem::read_();
 }
 
-UmlClass * UmlBaseClass::findStereotype(Q3CString s, bool caseSensitive)
+UmlClass * UmlBaseClass::findStereotype(QByteArray s, bool caseSensitive)
 {
     UmlCom::send_cmd(packageGlobalCmd, findStereotypeCmd,
                      (caseSensitive) ? "y" : "n", (const char *) s);
@@ -404,15 +404,15 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -424,9 +424,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray, UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -434,7 +434,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/deploy/UmlBaseClass.h b/genplugouts/deploy/UmlBaseClass.h
index b297e2cf6..ca6bcd04e 100644
--- a/genplugouts/deploy/UmlBaseClass.h
+++ b/genplugouts/deploy/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+
+
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -54,7 +54,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -77,7 +77,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -100,7 +100,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -224,11 +224,11 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // Return the class supporting the stereotype corresponding to
     // the first parameter being 'profile_name:stereotype_name', or 0/null
-    static UmlClass * findStereotype(Q3CString s, bool caseSensitive);
+    static UmlClass * findStereotype(QByteArray s, bool caseSensitive);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -241,11 +241,11 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
 
 private:
-    static Q3Dict<UmlClass> _classes;
+    static QHash<QByteArray, UmlClass*> _classes;
 
     bool _abstract;
 
@@ -292,7 +292,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/deploy/UmlBaseClassDiagram.h b/genplugouts/deploy/UmlBaseClassDiagram.h
index e0990d31f..a3f406b00 100644
--- a/genplugouts/deploy/UmlBaseClassDiagram.h
+++ b/genplugouts/deploy/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseClassInstance.cpp b/genplugouts/deploy/UmlBaseClassInstance.cpp
index 8d23a1d0f..53b16a27b 100644
--- a/genplugouts/deploy/UmlBaseClassInstance.cpp
+++ b/genplugouts/deploy/UmlBaseClassInstance.cpp
@@ -7,7 +7,8 @@
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
+#include <QVector>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -47,7 +48,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
         return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -62,7 +63,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -77,16 +78,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QVector<UmlAttribute *> &result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -97,7 +98,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -107,7 +108,7 @@ bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance
 
 bool UmlBaseClassInstance::remove_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/genplugouts/deploy/UmlBaseClassInstance.h b/genplugouts/deploy/UmlBaseClassInstance.h
index 3dde839de..769970305 100644
--- a/genplugouts/deploy/UmlBaseClassInstance.h
+++ b/genplugouts/deploy/UmlBaseClassInstance.h
@@ -6,9 +6,9 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QList>
+
+
 
 class UmlClassInstance;
 class UmlClass;
@@ -40,17 +40,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QVector<UmlAttribute*> & result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QVector<UmlRelation*> & result);
 
     // Remove the slot if the value is an empty string.
     // Else set the value for the given attribute, replacing it
@@ -87,7 +87,7 @@ class UmlBaseClassInstance : public UmlItem
     virtual void read_uml_();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassInstance(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseClassInstance(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseClassInstanceReference.cpp b/genplugouts/deploy/UmlBaseClassInstanceReference.cpp
index 1223c08e8..c3c0d64a0 100644
--- a/genplugouts/deploy/UmlBaseClassInstanceReference.cpp
+++ b/genplugouts/deploy/UmlBaseClassInstanceReference.cpp
@@ -4,14 +4,14 @@
 #include "UmlClass.h"
 #include "UmlClassInstance.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlClass * UmlBaseClassInstanceReference::type() const
 {
     return (_instance) ? _instance->type() : _class;
 }
 
-const Q3CString & UmlBaseClassInstanceReference::name() const
+const QByteArray & UmlBaseClassInstanceReference::name() const
 {
     return (_instance) ? _instance->name() : _name;
 }
diff --git a/genplugouts/deploy/UmlBaseClassInstanceReference.h b/genplugouts/deploy/UmlBaseClassInstanceReference.h
index f21836362..50bd4f9f4 100644
--- a/genplugouts/deploy/UmlBaseClassInstanceReference.h
+++ b/genplugouts/deploy/UmlBaseClassInstanceReference.h
@@ -1,9 +1,6 @@
 #ifndef _UMLBASECLASSINSTANCEREFERENCE_H
 #define _UMLBASECLASSINSTANCEREFERENCE_H
-
-
-#include <q3cstring.h>
-
+#include <QByteArray>
 class UmlClass;
 class UmlClassInstance;
 
@@ -20,7 +17,7 @@ class UmlBaseClassInstanceReference
     }
 
     // return the name of the instance
-    const Q3CString & name() const;
+    const QByteArray & name() const;
 
 
 private:
@@ -28,7 +25,7 @@ class UmlBaseClassInstanceReference
 
     UmlClassInstance * _instance;
 
-    Q3CString _name;
+    QByteArray _name;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/deploy/UmlBaseClassItem.cpp b/genplugouts/deploy/UmlBaseClassItem.cpp
index fa856e466..3a02e784e 100644
--- a/genplugouts/deploy/UmlBaseClassItem.cpp
+++ b/genplugouts/deploy/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseClassItem::phpDecl()
+const QByteArray & UmlBaseClassItem::phpDecl()
 {
     read_if_needed_();
 
@@ -47,7 +47,7 @@ bool UmlBaseClassItem::set_PhpDecl(const char * s)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseClassItem::pythonDecl()
+const QByteArray & UmlBaseClassItem::pythonDecl()
 {
     read_if_needed_();
 
@@ -61,7 +61,7 @@ bool UmlBaseClassItem::set_PythonDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/deploy/UmlBaseClassItem.h b/genplugouts/deploy/UmlBaseClassItem.h
index 19037f5fe..c3749c6e1 100644
--- a/genplugouts/deploy/UmlBaseClassItem.h
+++ b/genplugouts/deploy/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPHP
     //  return the Php defininition
 
-    const Q3CString & phpDecl();
+    const QByteArray & phpDecl();
 
     //  to set the Php definition
     //
@@ -45,7 +45,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPYTHON
     //  return the Python defininition
 
-    const Q3CString & pythonDecl();
+    const QByteArray & pythonDecl();
 
     //  to set the Python definition
     //
@@ -56,7 +56,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -69,28 +69,28 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_decl;
+    QByteArray _php_decl;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_decl;
+    QByteArray _python_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/deploy/UmlBaseClassMember.cpp b/genplugouts/deploy/UmlBaseClassMember.cpp
index da9a56bb5..47325ddfb 100644
--- a/genplugouts/deploy/UmlBaseClassMember.cpp
+++ b/genplugouts/deploy/UmlBaseClassMember.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlBaseClassMember::isClassMember()
 {
     read_if_needed_();
@@ -70,7 +70,7 @@ bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
 #endif
 
 #ifdef WITHJAVA
-Q3CString UmlBaseClassMember::javaAnnotations()
+QByteArray UmlBaseClassMember::javaAnnotations()
 {
     read_if_needed_();
 
@@ -83,7 +83,7 @@ bool UmlBaseClassMember::set_JavaAnnotations(const char * v)
 }
 #endif
 
-const Q3CString & UmlBaseClassMember::constraint()
+const QByteArray & UmlBaseClassMember::constraint()
 {
     read_if_needed_();
     return _constraint;
diff --git a/genplugouts/deploy/UmlBaseClassMember.h b/genplugouts/deploy/UmlBaseClassMember.h
index f19767bf8..19e4f15ba 100644
--- a/genplugouts/deploy/UmlBaseClassMember.h
+++ b/genplugouts/deploy/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -57,7 +57,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 #ifdef WITHJAVA
     // returns the Java annotations
-    Q3CString javaAnnotations();
+    QByteArray javaAnnotations();
 
     // set the Java annotations
     //
@@ -66,7 +66,7 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
     // return the constraint
-    const Q3CString & constraint();
+    const QByteArray & constraint();
 
     // set the constraint
     //
@@ -86,14 +86,14 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_annotation;
+    QByteArray _java_annotation;
 #endif
 
-    Q3CString _constraint;
+    QByteArray _constraint;
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/deploy/UmlBaseClassView.h b/genplugouts/deploy/UmlBaseClassView.h
index 43fb0714a..2de2d70e7 100644
--- a/genplugouts/deploy/UmlBaseClassView.h
+++ b/genplugouts/deploy/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlView
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseCollaborationDiagram.h b/genplugouts/deploy/UmlBaseCollaborationDiagram.h
index 001de487c..f5f96e840 100644
--- a/genplugouts/deploy/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/deploy/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/deploy/UmlBaseCollaborationDiagramDefinition.cpp b/genplugouts/deploy/UmlBaseCollaborationDiagramDefinition.cpp
index 63b89f7b5..aa78ceb97 100644
--- a/genplugouts/deploy/UmlBaseCollaborationDiagramDefinition.cpp
+++ b/genplugouts/deploy/UmlBaseCollaborationDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseCollaborationDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -15,11 +15,11 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -31,7 +31,7 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         m->read_(instances);
     }
 
-    _messages.setAutoDelete(TRUE);
+   // _messages.setAutoDelete(TRUE);
 }
 
 UmlBaseCollaborationDiagramDefinition::~UmlBaseCollaborationDiagramDefinition()
diff --git a/genplugouts/deploy/UmlBaseCollaborationDiagramDefinition.h b/genplugouts/deploy/UmlBaseCollaborationDiagramDefinition.h
index 7053607ce..6287bf748 100644
--- a/genplugouts/deploy/UmlBaseCollaborationDiagramDefinition.h
+++ b/genplugouts/deploy/UmlBaseCollaborationDiagramDefinition.h
@@ -1,12 +1,12 @@
 #ifndef _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
 #define _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
-
+#include <QVector>
 
 // to avoid compiler warning
 #include "UmlCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
+#include <QVector>
 
-#include <q3ptrvector.h>
 
 class UmlClassInstanceReference;
 class UmlCollaborationMessage;
@@ -16,21 +16,21 @@ class UmlBaseCollaborationDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following their rank
-    const Q3PtrVector<UmlCollaborationMessage> & messages() const {
+    const QVector<UmlCollaborationMessage*> & messages() const {
         return _messages;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlCollaborationMessage> _messages;
+    QVector<UmlCollaborationMessage*> _messages;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/deploy/UmlBaseCollaborationMessage.cpp b/genplugouts/deploy/UmlBaseCollaborationMessage.cpp
index 8ea8e0890..ee0388197 100644
--- a/genplugouts/deploy/UmlBaseCollaborationMessage.cpp
+++ b/genplugouts/deploy/UmlBaseCollaborationMessage.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-void UmlBaseCollaborationMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseCollaborationMessage::read_(const QHash<void *, UmlClassInstanceReference *> &instances)
 {
     UmlBaseMessage::read_(instances);
     _rank = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/deploy/UmlBaseCollaborationMessage.h b/genplugouts/deploy/UmlBaseCollaborationMessage.h
index 276b0801e..5454e8c7d 100644
--- a/genplugouts/deploy/UmlBaseCollaborationMessage.h
+++ b/genplugouts/deploy/UmlBaseCollaborationMessage.h
@@ -2,8 +2,8 @@
 #define _UMLBASECOLLABORATIONMESSAGE_H
 
 
-#include <q3cstring.h>
-#include <q3ptrdict.h>
+
+
 #include "UmlMessage.h"
 
 class UmlClassInstanceReference;
@@ -18,7 +18,7 @@ class UmlBaseCollaborationMessage : public UmlMessage
     }
 
     // return the hierarchical rank of the message
-    const Q3CString & hrank() const {
+    const QByteArray & hrank() const {
         return _hrank;
     }
 
@@ -26,10 +26,10 @@ class UmlBaseCollaborationMessage : public UmlMessage
 private:
     int _rank;
 
-    Q3CString _hrank;
+    QByteArray _hrank;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference *> &instances);
 
     friend class UmlBaseCollaborationDiagramDefinition;
 };
diff --git a/genplugouts/deploy/UmlBaseComponent.cpp b/genplugouts/deploy/UmlBaseComponent.cpp
index 211d911fb..aa2d770b0 100644
--- a/genplugouts/deploy/UmlBaseComponent.cpp
+++ b/genplugouts/deploy/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizingClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizingClasses()
 {
     read_if_needed_();
 
     return _realizing;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realizing, provided, required);
@@ -95,18 +95,18 @@ void UmlBaseComponent::read_uml_()
     _realizing.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realizing.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realizing[index] =  (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/deploy/UmlBaseComponent.h b/genplugouts/deploy/UmlBaseComponent.h
index 209914a57..160f2c481 100644
--- a/genplugouts/deploy/UmlBaseComponent.h
+++ b/genplugouts/deploy/UmlBaseComponent.h
@@ -1,12 +1,9 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
 
-
+#include <QVector>
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
 class UmlComponentView;
@@ -36,18 +33,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realizing classes
-    const Q3PtrVector<UmlClass> & realizingClasses();
+    const QVector<UmlClass*> & realizingClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realizing, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +54,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realizing;
+    QVector<UmlClass*> _realizing;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -70,11 +67,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/deploy/UmlBaseComponentDiagram.h b/genplugouts/deploy/UmlBaseComponentDiagram.h
index 43466da7c..b235e0717 100644
--- a/genplugouts/deploy/UmlBaseComponentDiagram.h
+++ b/genplugouts/deploy/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseComponentView.h b/genplugouts/deploy/UmlBaseComponentView.h
index 0b9d2d0bd..e70c3b9d5 100644
--- a/genplugouts/deploy/UmlBaseComponentView.h
+++ b/genplugouts/deploy/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseDeepHistoryPseudoState.h b/genplugouts/deploy/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..9224eb152 100644
--- a/genplugouts/deploy/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/deploy/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseDeployment.h b/genplugouts/deploy/UmlBaseDeployment.h
index b268e0c17..b16902170 100644
--- a/genplugouts/deploy/UmlBaseDeployment.h
+++ b/genplugouts/deploy/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseDeploymentDiagram.h b/genplugouts/deploy/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..db1cfc67d 100644
--- a/genplugouts/deploy/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/deploy/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseDeploymentView.h b/genplugouts/deploy/UmlBaseDeploymentView.h
index f5213d38a..12b21aefe 100644
--- a/genplugouts/deploy/UmlBaseDeploymentView.h
+++ b/genplugouts/deploy/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseDiagram.cpp b/genplugouts/deploy/UmlBaseDiagram.cpp
index e1ceb269d..d0fb2d705 100644
--- a/genplugouts/deploy/UmlBaseDiagram.cpp
+++ b/genplugouts/deploy/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/deploy/UmlBaseDiagram.h b/genplugouts/deploy/UmlBaseDiagram.h
index 9cf05ff22..19e34654b 100644
--- a/genplugouts/deploy/UmlBaseDiagram.h
+++ b/genplugouts/deploy/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseEntryPointPseudoState.h b/genplugouts/deploy/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..60dd28bb0 100644
--- a/genplugouts/deploy/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/deploy/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseExitPointPseudoState.h b/genplugouts/deploy/UmlBaseExitPointPseudoState.h
index ff2ad12bc..29563f22b 100644
--- a/genplugouts/deploy/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/deploy/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseExpansionNode.h b/genplugouts/deploy/UmlBaseExpansionNode.h
index 41bcbece2..6642afe1b 100644
--- a/genplugouts/deploy/UmlBaseExpansionNode.h
+++ b/genplugouts/deploy/UmlBaseExpansionNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityObject.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode;
 class UmlExpansionRegion;
@@ -25,7 +25,7 @@ class UmlBaseExpansionNode : public UmlActivityObject
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionNode(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBaseExpansionNode(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseExpansionRegion.h b/genplugouts/deploy/UmlBaseExpansionRegion.h
index 54795871e..4240a0570 100644
--- a/genplugouts/deploy/UmlBaseExpansionRegion.h
+++ b/genplugouts/deploy/UmlBaseExpansionRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "anExpansionKind.h"
 
 class UmlExpansionRegion;
@@ -26,7 +26,7 @@ class UmlBaseExpansionRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseExpansionRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 
diff --git a/genplugouts/deploy/UmlBaseExtraClassMember.cpp b/genplugouts/deploy/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/deploy/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/deploy/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/deploy/UmlBaseExtraClassMember.h b/genplugouts/deploy/UmlBaseExtraClassMember.h
index e2b9d4f30..4f07b5583 100644
--- a/genplugouts/deploy/UmlBaseExtraClassMember.h
+++ b/genplugouts/deploy/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/deploy/UmlBaseFinalState.h b/genplugouts/deploy/UmlBaseFinalState.h
index 16e0816cf..2fa133da6 100644
--- a/genplugouts/deploy/UmlBaseFinalState.h
+++ b/genplugouts/deploy/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseFlow.cpp b/genplugouts/deploy/UmlBaseFlow.cpp
index 5da07fbe8..b05e3eb62 100644
--- a/genplugouts/deploy/UmlBaseFlow.cpp
+++ b/genplugouts/deploy/UmlBaseFlow.cpp
@@ -4,7 +4,7 @@
 #include "UmlFlow.h"
 #include "UmlActivityNode.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseFlow::kind()
 {
@@ -29,7 +29,7 @@ UmlActivityNode * UmlBaseFlow::target()
     return _target;
 }
 
-const Q3CString & UmlBaseFlow::weight()
+const QByteArray & UmlBaseFlow::weight()
 {
     read_if_needed_();
     return _uml.weight;
@@ -40,7 +40,7 @@ bool UmlBaseFlow::set_Weight(const char * v)
     return set_it_(_uml.weight, v, setUmlActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::guard()
+const QByteArray & UmlBaseFlow::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -51,7 +51,7 @@ bool UmlBaseFlow::set_Guard(const char * v)
     return set_it_(_uml.guard, v, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::selection()
+const QByteArray & UmlBaseFlow::selection()
 {
     read_if_needed_();
     return _uml.selection;
@@ -62,7 +62,7 @@ bool UmlBaseFlow::set_Selection(const char * v)
     return set_it_(_uml.selection, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::transformation()
+const QByteArray & UmlBaseFlow::transformation()
 {
     read_if_needed_();
     return _uml.transformation;
@@ -74,7 +74,7 @@ bool UmlBaseFlow::set_Transformation(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseFlow::cppWeight()
+const QByteArray & UmlBaseFlow::cppWeight()
 {
     read_if_needed_();
     return _cpp.weight;
@@ -85,7 +85,7 @@ bool UmlBaseFlow::set_CppWeight(const char * v)
     return set_it_(_cpp.weight, v, setCppActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppGuard()
+const QByteArray & UmlBaseFlow::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -96,7 +96,7 @@ bool UmlBaseFlow::set_CppGuard(const char * v)
     return set_it_(_cpp.guard, v, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppSelection()
+const QByteArray & UmlBaseFlow::cppSelection()
 {
     read_if_needed_();
     return _cpp.selection;
@@ -107,7 +107,7 @@ bool UmlBaseFlow::set_CppSelection(const char * v)
     return set_it_(_cpp.selection, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppTransformation()
+const QByteArray & UmlBaseFlow::cppTransformation()
 {
     read_if_needed_();
     return _cpp.transformation;
@@ -120,7 +120,7 @@ bool UmlBaseFlow::set_CppTransformation(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseFlow::javaWeight()
+const QByteArray & UmlBaseFlow::javaWeight()
 {
     read_if_needed_();
     return _java.weight;
@@ -131,7 +131,7 @@ bool UmlBaseFlow::set_JavaWeight(const char * v)
     return set_it_(_java.weight, v, setJavaActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaGuard()
+const QByteArray & UmlBaseFlow::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -142,7 +142,7 @@ bool UmlBaseFlow::set_JavaGuard(const char * v)
     return set_it_(_java.guard, v, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaSelection()
+const QByteArray & UmlBaseFlow::javaSelection()
 {
     read_if_needed_();
     return _java.selection;
@@ -153,7 +153,7 @@ bool UmlBaseFlow::set_JavaSelection(const char * v)
     return set_it_(_java.selection, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaTransformation()
+const QByteArray & UmlBaseFlow::javaTransformation()
 {
     read_if_needed_();
     return _java.transformation;
diff --git a/genplugouts/deploy/UmlBaseFlow.h b/genplugouts/deploy/UmlBaseFlow.h
index b50ce3323..4edb40caf 100644
--- a/genplugouts/deploy/UmlBaseFlow.h
+++ b/genplugouts/deploy/UmlBaseFlow.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "FlowBehavior.h"
 
 class UmlFlow;
@@ -27,7 +27,7 @@ class UmlBaseFlow : public UmlItem
     virtual UmlActivityNode * target();
 
     // return the weight in OCL
-    const Q3CString & weight();
+    const QByteArray & weight();
 
     // set the weight in OCL
     //
@@ -35,7 +35,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Weight(const char * v);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Guard(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Selection(const char * v);
 
     // return the transformation in OCL
-    const Q3CString & transformation();
+    const QByteArray & transformation();
 
     // set the transformation in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHCPP
     // return the weight in C++
-    const Q3CString & cppWeight();
+    const QByteArray & cppWeight();
 
     // set the weight in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppWeight(const char * v);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppGuard(const char * v);
 
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppSelection(const char * v);
 
     // return the transformation in C++
-    const Q3CString & cppTransformation();
+    const QByteArray & cppTransformation();
 
     // set the transformation in C++
     //
@@ -94,7 +94,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHJAVA
     // return the weight in Java
-    const Q3CString & javaWeight();
+    const QByteArray & javaWeight();
 
     // set the weight in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaWeight(const char * v);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -110,7 +110,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaGuard(const char * v);
 
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -118,7 +118,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaSelection(const char * v);
 
     // return the transformation in Java
-    const Q3CString & javaTransformation();
+    const QByteArray & javaTransformation();
 
     // set the transformation in Java
     //
@@ -161,7 +161,7 @@ class UmlBaseFlow : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlow(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseFlow(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseForkPseudoState.h b/genplugouts/deploy/UmlBaseForkPseudoState.h
index 009499bfa..9dfa5025c 100644
--- a/genplugouts/deploy/UmlBaseForkPseudoState.h
+++ b/genplugouts/deploy/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseFormalParameter.h b/genplugouts/deploy/UmlBaseFormalParameter.h
index d8284c71d..aafb2fb40 100644
--- a/genplugouts/deploy/UmlBaseFormalParameter.h
+++ b/genplugouts/deploy/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -34,10 +34,10 @@ class UmlBaseFormalParameter
     };
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/deploy/UmlBaseFragment.cpp b/genplugouts/deploy/UmlBaseFragment.cpp
index 730755358..76a200303 100644
--- a/genplugouts/deploy/UmlBaseFragment.cpp
+++ b/genplugouts/deploy/UmlBaseFragment.cpp
@@ -25,7 +25,7 @@ void UmlBaseFragment::read_()
         fc->read_(this, rank);
     }
 
-    _compartments.setAutoDelete(TRUE);
+    //_compartments.setAutoDelete(TRUE);
     _container = 0;
     _refer = (UmlDiagram *) UmlBaseItem::read_();
     _arguments = UmlCom::read_string();
@@ -38,7 +38,7 @@ int UmlBaseFragment::vcenter_(int rank) const
     return (t + _compartments[rank]->b()) / 2;
 }
 
-void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseFragment::read_covered_(QHash<void*,UmlClassInstanceReference *> &instances)
 {
     unsigned n = UmlCom::read_unsigned();
     unsigned rank;
@@ -46,10 +46,10 @@ void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & insta
     _covered.resize(n);
 
     for (rank = 0; rank != n; rank += 1)
-        _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]);
+        _covered.insert(rank, instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))]);
 }
 
-UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments)
+UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector<UmlFragment *> &fragments)
 {
     UmlFragmentCompartment * r = 0;
     int nf = fragments.count();
@@ -82,7 +82,7 @@ UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, in
     return r;
 }
 
-void UmlBaseFragment::compute_container_(Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseFragment::compute_container_(QVector<UmlFragment *> &fragments)
 {
     int rank = fragments.count();
 
diff --git a/genplugouts/deploy/UmlBaseFragment.h b/genplugouts/deploy/UmlBaseFragment.h
index 932913148..3d6b53c14 100644
--- a/genplugouts/deploy/UmlBaseFragment.h
+++ b/genplugouts/deploy/UmlBaseFragment.h
@@ -1,11 +1,8 @@
 #ifndef _UMLBASEFRAGMENT_H
 #define _UMLBASEFRAGMENT_H
-
-
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3ptrdict.h>
-
+#include <QByteArray>
+#include <QVector>
+#include <QHash>
 class UmlFragmentCompartment;
 class UmlDiagram;
 class UmlClassInstanceReference;
@@ -16,12 +13,12 @@ class UmlBaseFragment
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the compartments, at least one compartment exists
-    const Q3PtrVector<UmlFragmentCompartment> & compartments() const {
+    const QVector<UmlFragmentCompartment*> & compartments() const {
         return _compartments;
     }
 
@@ -39,12 +36,12 @@ class UmlBaseFragment
 
     // return the form corresponding to the arguments
     // and return value of the interaction use
-    Q3CString arguments() const {
+    QByteArray arguments() const {
         return _arguments;
     }
 
     // return the the list of covered instances (life lines)
-    const Q3PtrVector<UmlClassInstanceReference> & covered() const {
+    const QVector<UmlClassInstanceReference*> & covered() const {
         return _covered;
     }
 
@@ -52,9 +49,9 @@ class UmlBaseFragment
 private:
     UmlFragmentCompartment * _container;
 
-    Q3PtrVector<UmlFragmentCompartment> _compartments;
+    QVector<UmlFragmentCompartment*> _compartments;
 
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -66,9 +63,9 @@ class UmlBaseFragment
 
     UmlDiagram * _refer;
 
-    Q3CString _arguments;
+    QByteArray _arguments;
 
-    Q3PtrVector<UmlClassInstanceReference> _covered;
+    QVector<UmlClassInstanceReference*> _covered;
 
     // internal, don't call it
     void read_();
@@ -81,15 +78,15 @@ class UmlBaseFragment
 
     //internal, do NOT use it
 
-    void read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_covered_(QHash<void *, UmlClassInstanceReference *> &instances);
 
     // internal
-    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments);
+    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments);
 
 
 private:
     // internal
-    static void compute_container_(Q3PtrVector<UmlFragment> & fragments);
+    static void compute_container_(QVector<UmlFragment*> & fragments);
 
 
 public:
diff --git a/genplugouts/deploy/UmlBaseFragmentCompartment.cpp b/genplugouts/deploy/UmlBaseFragmentCompartment.cpp
index 2ff876f6a..148f56823 100644
--- a/genplugouts/deploy/UmlBaseFragmentCompartment.cpp
+++ b/genplugouts/deploy/UmlBaseFragmentCompartment.cpp
@@ -3,21 +3,23 @@
 #include "UmlBaseFragmentCompartment.h"
 #include "UmlBaseFragment.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlBaseFragmentCompartment::add_contained_(UmlFragment * x)
 {
-    _contained.resize(_contained.size() + 1);
-    _contained.insert(_contained.size() - 1, x);
+    //_contained.resize(_contained.size() + 1);
+    //_contained.insert(_contained.size() - 1, x);
+    _contained.append(x);
 }
 
-void UmlBaseFragmentCompartment::add_text_(Q3CString x)
+void UmlBaseFragmentCompartment::add_text_(QByteArray x)
 {
-    _texts.resize(_texts.size() + 1);
-    _texts.insert(_texts.size() - 1, strdup(x));
+    //_texts.resize(_texts.size() + 1);
+    //_texts.insert(_texts.size() - 1, strdup(x));
+    _texts.append(strdup(x));
 }
 
-void UmlBaseFragmentCompartment::add_cont_(Q3CString s, int cy)
+void UmlBaseFragmentCompartment::add_cont_(QByteArray s, int cy)
 {
     if (cy < _fragment->vcenter_(_rank))
         _start_continuation = s;
diff --git a/genplugouts/deploy/UmlBaseFragmentCompartment.h b/genplugouts/deploy/UmlBaseFragmentCompartment.h
index 8943ecf60..129b1dc86 100644
--- a/genplugouts/deploy/UmlBaseFragmentCompartment.h
+++ b/genplugouts/deploy/UmlBaseFragmentCompartment.h
@@ -5,8 +5,8 @@
 // to avoid compiler warning
 #include "UmlFragment.h"
 
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+
+
 
 class UmlFragment;
 class UmlBaseFragment;
@@ -27,23 +27,23 @@ class UmlBaseFragmentCompartment
     }
 
     // the texts placed in the compartment
-    const Q3PtrVector<char> & texts() const {
+    const QVector<char*> & texts() const {
         return _texts;
     }
 
     // return the fragments contained in the compartment,
     // may be none
-    const Q3PtrVector<UmlFragment> & contained() const {
+    const QVector<UmlFragment*> & contained() const {
         return _contained;
     }
 
     // return the continuation ('label' case), or an empty string/null
-    Q3CString startContinuation() const {
+    QByteArray startContinuation() const {
         return _start_continuation;
     }
 
     // return the continuation ('goto' case), or an empty string/null
-    Q3CString endContinuation() const {
+    QByteArray endContinuation() const {
         return _end_continuation;
     }
 
@@ -51,27 +51,27 @@ class UmlBaseFragmentCompartment
 private:
     UmlFragment * _fragment;
 
-    Q3PtrVector<UmlFragment> _contained;
+    QVector<UmlFragment*> _contained;
 
     int _rank;
 
-    Q3PtrVector<char> _texts;
+    QVector<char*> _texts;
 
     int _y;
 
-    Q3CString _start_continuation;
+    QByteArray _start_continuation;
 
-    Q3CString _end_continuation;
+    QByteArray _end_continuation;
 
 
 public:
     void add_contained_(UmlFragment * x);
 
-    void add_text_(Q3CString x);
+    void add_text_(QByteArray x);
 
     //internal, do NOT use it
 
-    void add_cont_(Q3CString s, int cy);
+    void add_cont_(QByteArray s, int cy);
 
     int b() const {
         return _y;
diff --git a/genplugouts/deploy/UmlBaseInitialPseudoState.h b/genplugouts/deploy/UmlBaseInitialPseudoState.h
index 88dae1cc6..2f31e4340 100644
--- a/genplugouts/deploy/UmlBaseInitialPseudoState.h
+++ b/genplugouts/deploy/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseInterruptibleActivityRegion.h b/genplugouts/deploy/UmlBaseInterruptibleActivityRegion.h
index 70f988488..de6e56aed 100644
--- a/genplugouts/deploy/UmlBaseInterruptibleActivityRegion.h
+++ b/genplugouts/deploy/UmlBaseInterruptibleActivityRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInterruptibleActivityRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseItem.cpp b/genplugouts/deploy/UmlBaseItem.cpp
index 85cedc915..d87c950c3 100644
--- a/genplugouts/deploy/UmlBaseItem.cpp
+++ b/genplugouts/deploy/UmlBaseItem.cpp
@@ -57,9 +57,9 @@
 #include "UmlActivityControlNodeClasses.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     UmlCom::send_cmd(_identifier, setNameCmd, (const char *)s); //[rageek] Fix prototype
 
@@ -71,14 +71,14 @@ bool UmlBaseItem::set_Name(const Q3CString & s)
         return FALSE;
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
@@ -93,14 +93,14 @@ bool UmlBaseItem::applyStereotype()
     return TRUE;
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -116,7 +116,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -136,11 +136,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -150,7 +150,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -158,10 +158,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -172,7 +172,7 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray *> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -191,7 +191,7 @@ bool UmlBaseItem::moveAfter(const UmlItem * x)
         return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -203,7 +203,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
     return (int) UmlCom::read_unsigned();
@@ -221,11 +221,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -247,7 +247,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -276,17 +276,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -370,9 +370,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -414,7 +414,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -468,7 +468,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -728,20 +728,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/deploy/UmlBaseItem.h b/genplugouts/deploy/UmlBaseItem.h
index 0e3fdba3f..e0f2eef87 100644
--- a/genplugouts/deploy/UmlBaseItem.h
+++ b/genplugouts/deploy/UmlBaseItem.h
@@ -1,16 +1,11 @@
 #ifndef _UMLBASEITEM_H
 #define _UMLBASEITEM_H
-
-
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
 #include "Tools/ApiCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
-
+#include <QByteArray>
+#include <QHash>
 class UmlItem;
 class UmlTypeSpec;
 
@@ -37,21 +32,21 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // If the current stereotype is part of a profile add needed properties.
     // In all cases remove extra properties whose keys contain two ':'.
@@ -60,18 +55,18 @@ class UmlBaseItem
     bool applyStereotype();
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -96,16 +91,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -140,7 +135,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -148,7 +143,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -161,7 +156,7 @@ class UmlBaseItem
     //  The result may contains UmlAttribute, UmlRelations, UmlNcRelations,
     //  UmlOperation (their bodies are not taken into account) , UmlClass
     //  and UmlComponents.
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // return a constant identifier, it is unique within a given
     // kind of element (two classes can't have the same identifiers, but
@@ -187,7 +182,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
 
 private:
@@ -203,21 +198,21 @@ class UmlBaseItem
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
 protected:
@@ -285,7 +280,7 @@ class UmlBaseItem
 
     //internal, do NOT use it
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
 
@@ -298,7 +293,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/deploy/UmlBaseJoinPseudoState.h b/genplugouts/deploy/UmlBaseJoinPseudoState.h
index 31976dfff..c95cfff9c 100644
--- a/genplugouts/deploy/UmlBaseJoinPseudoState.h
+++ b/genplugouts/deploy/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseJunctionPseudoState.h b/genplugouts/deploy/UmlBaseJunctionPseudoState.h
index 9b76d88e7..96cdfe959 100644
--- a/genplugouts/deploy/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/deploy/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseMessage.cpp b/genplugouts/deploy/UmlBaseMessage.cpp
index 77851f8dd..2d220aa8e 100644
--- a/genplugouts/deploy/UmlBaseMessage.cpp
+++ b/genplugouts/deploy/UmlBaseMessage.cpp
@@ -4,13 +4,13 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlOperation.h"
 
-void UmlBaseMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     _operation = (UmlOperation *) UmlBaseItem::read_();
 
     if (_operation == 0) _form = UmlCom::read_string();
 
-    _from = instances[(void *) UmlCom::read_unsigned()];
-    _to = instances[(void *) UmlCom::read_unsigned()];
+    _from = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
+    _to = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
 }
 
diff --git a/genplugouts/deploy/UmlBaseMessage.h b/genplugouts/deploy/UmlBaseMessage.h
index 81fc500c8..8af6c57cc 100644
--- a/genplugouts/deploy/UmlBaseMessage.h
+++ b/genplugouts/deploy/UmlBaseMessage.h
@@ -1,10 +1,7 @@
 #ifndef _UMLBASEMESSAGE_H
 #define _UMLBASEMESSAGE_H
-
-
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-
+#include <QByteArray>
+#include <QHash>
 class UmlClassInstanceReference;
 class UmlOperation;
 
@@ -30,7 +27,7 @@ class UmlBaseMessage
 
     // return message as a string, may be empty/null,
     // exclusive with operation()
-    const Q3CString & form() const {
+    const QByteArray & form() const {
         return _form;
     }
 
@@ -42,10 +39,10 @@ class UmlBaseMessage
 
     UmlOperation * _operation;
 
-    Q3CString _form;
+    QByteArray _form;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances);
 
     friend class UmlBaseSequenceMessage;
     friend class UmlBaseCollaborationMessage;
diff --git a/genplugouts/deploy/UmlBaseNcRelation.h b/genplugouts/deploy/UmlBaseNcRelation.h
index 7418e3406..0ad29c67b 100644
--- a/genplugouts/deploy/UmlBaseNcRelation.h
+++ b/genplugouts/deploy/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/deploy/UmlBaseNode.h b/genplugouts/deploy/UmlBaseNode.h
index 07a980e66..208e951f2 100644
--- a/genplugouts/deploy/UmlBaseNode.h
+++ b/genplugouts/deploy/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/deploy/UmlBaseObjectDiagram.h b/genplugouts/deploy/UmlBaseObjectDiagram.h
index dfe6983ef..720256a2d 100644
--- a/genplugouts/deploy/UmlBaseObjectDiagram.h
+++ b/genplugouts/deploy/UmlBaseObjectDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlObjectDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseObjectDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseObjectDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseObjectDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseOnSignalAction.cpp b/genplugouts/deploy/UmlBaseOnSignalAction.cpp
index 8c887e113..aec5db337 100644
--- a/genplugouts/deploy/UmlBaseOnSignalAction.cpp
+++ b/genplugouts/deploy/UmlBaseOnSignalAction.cpp
@@ -2,9 +2,9 @@
 #include "UmlCom.h"
 #include "UmlBaseOnSignalAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseOnSignalAction::signal()
+const QByteArray & UmlBaseOnSignalAction::signal()
 {
     read_if_needed_();
     return _signal;
@@ -16,7 +16,7 @@ bool UmlBaseOnSignalAction::set_Signal(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOnSignalAction::cppSignal()
+const QByteArray & UmlBaseOnSignalAction::cppSignal()
 {
     read_if_needed_();
     return _cpp_signal;
@@ -29,7 +29,7 @@ bool UmlBaseOnSignalAction::set_CppSignal(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOnSignalAction::javaSignal()
+const QByteArray & UmlBaseOnSignalAction::javaSignal()
 {
     read_if_needed_();
     return _java_signal;
diff --git a/genplugouts/deploy/UmlBaseOnSignalAction.h b/genplugouts/deploy/UmlBaseOnSignalAction.h
index 6ad499b79..0d648e38c 100644
--- a/genplugouts/deploy/UmlBaseOnSignalAction.h
+++ b/genplugouts/deploy/UmlBaseOnSignalAction.h
@@ -3,19 +3,19 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+
 
 class UmlBaseOnSignalAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOnSignalAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOnSignalAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the signal
-    const Q3CString & signal();
+    const QByteArray & signal();
 
     // set the signal
     //
@@ -24,7 +24,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the signal in C++
-    const Q3CString & cppSignal();
+    const QByteArray & cppSignal();
 
     // set the signal in C++
     //
@@ -34,7 +34,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the signal in Java
-    const Q3CString & javaSignal();
+    const QByteArray & javaSignal();
 
     // set the signal in Java
     //
@@ -52,14 +52,14 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 
 private:
-    Q3CString _signal;
+    QByteArray _signal;
 
 #ifdef WITHCPP
-    Q3CString _cpp_signal;
+    QByteArray _cpp_signal;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_signal;
+    QByteArray _java_signal;
 #endif
 
 
diff --git a/genplugouts/deploy/UmlBaseOperation.cpp b/genplugouts/deploy/UmlBaseOperation.cpp
index 8ec4cf6cd..bac6ff440 100644
--- a/genplugouts/deploy/UmlBaseOperation.cpp
+++ b/genplugouts/deploy/UmlBaseOperation.cpp
@@ -9,8 +9,8 @@
 #include "UmlOperation.h"
 //#include "misc/myio.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 #include <QFileInfo>
 #include <QSettings>
 #include "Logging/QsLog.h"
@@ -79,7 +79,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -93,7 +93,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -107,7 +107,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -130,7 +130,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -143,7 +143,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -157,7 +157,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -270,7 +270,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -282,7 +282,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -296,7 +296,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -388,7 +388,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -398,7 +398,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -412,7 +412,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -485,7 +485,7 @@ bool UmlBaseOperation::set_isPhpFinal(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::phpDef()
+const QByteArray & UmlBaseOperation::phpDef()
 {
     return phpDecl();
 }
@@ -495,7 +495,7 @@ bool UmlBaseOperation::set_PhpDef(const char * s)
     return set_PhpDecl(s);
 }
 
-Q3CString UmlBaseOperation::phpBody()
+QByteArray UmlBaseOperation::phpBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, phpBodyCmd);
@@ -509,7 +509,7 @@ bool UmlBaseOperation::set_PhpBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::phpNameSpec()
+const QByteArray & UmlBaseOperation::phpNameSpec()
 {
     read_if_needed_();
 
@@ -563,7 +563,7 @@ bool UmlBaseOperation::set_PhpContextualBodyIndent(bool v)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDef()
+const QByteArray & UmlBaseOperation::pythonDef()
 {
     return pythonDecl();
 }
@@ -573,7 +573,7 @@ bool UmlBaseOperation::set_PythonDef(const char * s)
     return set_PythonDecl(s);
 }
 
-Q3CString UmlBaseOperation::pythonBody()
+QByteArray UmlBaseOperation::pythonBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, pythonBodyCmd);
@@ -587,7 +587,7 @@ bool UmlBaseOperation::set_PythonBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::pythonNameSpec()
+const QByteArray & UmlBaseOperation::pythonNameSpec()
 {
     read_if_needed_();
 
@@ -641,7 +641,7 @@ bool UmlBaseOperation::set_PythonContextualBodyIndent(bool v)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDecorators()
+const QByteArray & UmlBaseOperation::pythonDecorators()
 {
     read_if_needed_();
     return _python_decorators;
@@ -673,7 +673,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
@@ -775,12 +775,9 @@ void UmlBaseOperation::read_uml_()
 }
 static unsigned api_format()
 {
-    QFileInfo info("settings.ini");
-    bool test = info.exists();
-    QSettings settings("settings.ini", QSettings::IniFormat);
-    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
-    int compat = settings.value("Main/compatibility_save").toInt();
-    //int compat = 0;
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int compat = settings.value("Main/compatibility_save", 0).toInt();
     if(compat != 1)
     {
         int fileFormat = settings.value("Main/fileformat").toInt();
diff --git a/genplugouts/deploy/UmlBaseOperation.h b/genplugouts/deploy/UmlBaseOperation.h
index 81dc29b87..e74c7d4b4 100644
--- a/genplugouts/deploy/UmlBaseOperation.h
+++ b/genplugouts/deploy/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -52,7 +52,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -70,7 +70,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -130,7 +130,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -139,9 +139,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -151,7 +151,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -199,7 +199,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -208,9 +208,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -220,7 +220,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -260,7 +260,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Php, notes that it is
     // already made by the inherited PhpDecl operation
-    const Q3CString & phpDef();
+    const QByteArray & phpDef();
 
     // sets the operation's definition in Php, notes that it is
     // already made by the inherited set_PhpDecl operation
@@ -269,9 +269,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PhpDef(const char * s);
 
     // returns the operation's body in Php++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString phpBody();
+    QByteArray phpBody();
 
     // sets the operation's body in Php, useless if the def does not
     // contains ${body}
@@ -281,7 +281,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
-    const Q3CString & phpNameSpec();
+    const QByteArray & phpNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
@@ -313,7 +313,7 @@ class UmlBaseOperation : public UmlClassMember
 #ifdef WITHPYTHON
     // returns the operation's definition in Python, notes that it is
     // already made by the inherited PythonDecl operation
-    const Q3CString & pythonDef();
+    const QByteArray & pythonDef();
 
     // sets the operation's definition in Python, notes that it is
     // already made by the inherited set_PythonDecl operation
@@ -322,9 +322,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PythonDef(const char * s);
 
     // returns the operation's body in Python++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString pythonBody();
+    QByteArray pythonBody();
 
     // sets the operation's body in Python, useless if the def does not
     // contains ${body}
@@ -334,7 +334,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
-    const Q3CString & pythonNameSpec();
+    const QByteArray & pythonNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
@@ -365,7 +365,7 @@ class UmlBaseOperation : public UmlClassMember
 
 #ifdef WITHPYTHON
     // return the  decorators
-    const Q3CString & pythonDecorators();
+    const QByteArray & pythonDecorators();
 
     // set the  decorators
     //
@@ -384,7 +384,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -478,32 +478,32 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_name_spec;
+    QByteArray _php_name_spec;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_name_spec;
+    QByteArray _python_name_spec;
 
-    Q3CString _python_decorators;
+    QByteArray _python_decorators;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -515,7 +515,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
@@ -553,7 +553,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/deploy/UmlBasePackage.cpp b/genplugouts/deploy/UmlBasePackage.cpp
index 0d0f14a38..3fd04b865 100644
--- a/genplugouts/deploy/UmlBasePackage.cpp
+++ b/genplugouts/deploy/UmlBasePackage.cpp
@@ -7,7 +7,7 @@
 //#include "Tools/ApiCmd.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #include "Logging/QsLog.h"
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
@@ -39,43 +39,43 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findCppNamespace(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, _identifier, n);
 
@@ -84,31 +84,31 @@ UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n) const
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findJavaPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, _identifier, n);
 
@@ -117,45 +117,45 @@ UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBasePackage::phpDir()
+const QByteArray & UmlBasePackage::phpDir()
 {
     read_if_needed_();
 
     return _php_dir;
 }
 
-bool UmlBasePackage::set_PhpDir(const Q3CString & s)
+bool UmlBasePackage::set_PhpDir(const QByteArray & s)
 {
     return set_it_(_php_dir, s, setPhpDirCmd);
 }
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBasePackage::pythonDir()
+const QByteArray & UmlBasePackage::pythonDir()
 {
     read_if_needed_();
 
     return _python_dir;
 }
 
-bool UmlBasePackage::set_PythonDir(const Q3CString & s)
+bool UmlBasePackage::set_PythonDir(const QByteArray & s)
 {
     return set_it_(_python_dir, s, setPythonDirCmd);
 }
 
-Q3CString UmlBasePackage::pythonPackage()
+QByteArray UmlBasePackage::pythonPackage()
 {
     read_if_needed_();
 
     return _python_package;
 }
 
-bool UmlBasePackage::set_PythonPackage(const Q3CString & s)
+bool UmlBasePackage::set_PythonPackage(const QByteArray & s)
 {
     return set_it_(_python_package, s, setPythonPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPythonPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findPythonPackageCmd, _identifier, n);
 
@@ -164,31 +164,31 @@ UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findIdlModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findIdlModule(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, _identifier, n);
 
@@ -215,7 +215,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/deploy/UmlBasePackage.h b/genplugouts/deploy/UmlBasePackage.h
index 5e761888b..de75405b3 100644
--- a/genplugouts/deploy/UmlBasePackage.h
+++ b/genplugouts/deploy/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlPackage;
 class UmlDiagram;
@@ -34,125 +34,125 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findCppNamespace(const Q3CString & n) const;
+    UmlPackage * findCppNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findJavaPackage(const Q3CString & n) const;
+    UmlPackage * findJavaPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHPHP
     // returns the path where the PHP files are generated by the
     // PHP generator.
-    const Q3CString & phpDir();
+    const QByteArray & phpDir();
 
     // to set the path where the PHP files are generated by the
     // PHP generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpDir(const Q3CString & s);
+    bool set_PhpDir(const QByteArray & s);
 #endif
 
 #ifdef WITHPYTHON
     // returns the path where the PYTHON files are generated by the
     // PYTHON generator.
-    const Q3CString & pythonDir();
+    const QByteArray & pythonDir();
 
     // to set the path where the PYTHON files are generated by the
     // PYTHON generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonDir(const Q3CString & s);
+    bool set_PythonDir(const QByteArray & s);
 
     //returns the python package name associed to the package
-    Q3CString pythonPackage();
+    QByteArray pythonPackage();
 
     // to set the python package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonPackage(const Q3CString & s);
+    bool set_PythonPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Python package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPythonPackage(const Q3CString & n) const;
+    UmlPackage * findPythonPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findIdlModule(const Q3CString & n) const;
+    UmlPackage * findIdlModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -165,12 +165,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // Force consistency concerning the profiles and their stereotypes
 
@@ -189,35 +189,35 @@ class UmlBasePackage : public UmlItem
     UmlDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHPHP
-    Q3CString _php_dir;
+    QByteArray _php_dir;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_dir;
+    QByteArray _python_dir;
 
-    Q3CString _python_package;
+    QByteArray _python_package;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -258,11 +258,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/deploy/UmlBaseParameter.h b/genplugouts/deploy/UmlBaseParameter.h
index 71202a64d..0fdea9d7f 100644
--- a/genplugouts/deploy/UmlBaseParameter.h
+++ b/genplugouts/deploy/UmlBaseParameter.h
@@ -2,16 +2,16 @@
 #define _UMLBASEPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 #include "aDirection.h"
 
 //  Represent an operation's parameter
 
 struct UmlBaseParameter {
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
     UmlTypeSpec type;
 
diff --git a/genplugouts/deploy/UmlBaseParameterSet.cpp b/genplugouts/deploy/UmlBaseParameterSet.cpp
index 307417d45..2c680249f 100644
--- a/genplugouts/deploy/UmlBaseParameterSet.cpp
+++ b/genplugouts/deploy/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         if (_defined) _pins = v;
@@ -43,6 +43,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/deploy/UmlBaseParameterSet.h b/genplugouts/deploy/UmlBaseParameterSet.h
index 71e77cbfe..866cb7d23 100644
--- a/genplugouts/deploy/UmlBaseParameterSet.h
+++ b/genplugouts/deploy/UmlBaseParameterSet.h
@@ -1,11 +1,8 @@
 #ifndef _UMLBASEPARAMETERSET_H
 #define _UMLBASEPARAMETERSET_H
-
-
+#include <QVector>
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
 
 class UmlActivityParameter;
 class UmlActivityAction;
@@ -27,16 +24,16 @@ class UmlBaseParameterSet : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseParameterSet(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseParameterSet(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +45,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/deploy/UmlBasePinParameter.h b/genplugouts/deploy/UmlBasePinParameter.h
index a68b5c5eb..201f520a7 100644
--- a/genplugouts/deploy/UmlBasePinParameter.h
+++ b/genplugouts/deploy/UmlBasePinParameter.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityObject.h"
-#include <q3cstring.h>
+
 #include "aDirection.h"
 #include "aParameterEffectKind.h"
 
@@ -11,7 +11,7 @@ class UmlBasePinParameter : public UmlActivityObject
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePinParameter(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBasePinParameter(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 
diff --git a/genplugouts/deploy/UmlBaseRegion.h b/genplugouts/deploy/UmlBaseRegion.h
index 58a9f8b78..efd32acb9 100644
--- a/genplugouts/deploy/UmlBaseRegion.h
+++ b/genplugouts/deploy/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseRelation.cpp b/genplugouts/deploy/UmlBaseRelation.cpp
index 3c141d439..860b61402 100644
--- a/genplugouts/deploy/UmlBaseRelation.cpp
+++ b/genplugouts/deploy/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -139,7 +139,7 @@ bool UmlBaseRelation::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -151,7 +151,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -193,7 +193,7 @@ bool UmlBaseRelation::set_Association(const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -205,7 +205,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -337,7 +337,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/deploy/UmlBaseRelation.h b/genplugouts/deploy/UmlBaseRelation.h
index 536a4eee9..ed2d12172 100644
--- a/genplugouts/deploy/UmlBaseRelation.h
+++ b/genplugouts/deploy/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlRelation;
@@ -71,7 +71,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -83,7 +83,7 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
@@ -97,7 +97,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_Association(const UmlTypeSpec & t);
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -105,7 +105,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -168,7 +168,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -215,13 +215,13 @@ class UmlBaseRelation : public UmlClassMember
     bool _idl_truncatable : 1;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlTypeSpec _association;
 
@@ -233,7 +233,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -273,11 +273,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/deploy/UmlBaseSequenceDiagram.h b/genplugouts/deploy/UmlBaseSequenceDiagram.h
index 345c08b13..5f33ab882 100644
--- a/genplugouts/deploy/UmlBaseSequenceDiagram.h
+++ b/genplugouts/deploy/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/deploy/UmlBaseSequenceDiagramDefinition.cpp b/genplugouts/deploy/UmlBaseSequenceDiagramDefinition.cpp
index eb3b1751b..975bbd0c3 100644
--- a/genplugouts/deploy/UmlBaseSequenceDiagramDefinition.cpp
+++ b/genplugouts/deploy/UmlBaseSequenceDiagramDefinition.cpp
@@ -2,7 +2,7 @@
 #include "UmlCom.h"
 #include "UmlBaseSequenceDiagramDefinition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 static void qsort(UmlSequenceMessage ** v, int low, int high)
 {
@@ -40,7 +40,7 @@ static void qsort(UmlSequenceMessage ** v, int low, int high)
 }
 void UmlBaseSequenceDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -54,7 +54,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -64,11 +64,11 @@ void UmlBaseSequenceDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -82,7 +82,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         }
 
         ::qsort(_messages.data(), 0, n - 1);
-        _messages.setAutoDelete(TRUE);
+        //_messages.setAutoDelete(TRUE);
     }
 
     n = _fragments.count();
@@ -92,7 +92,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
 
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
@@ -103,7 +103,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
     }
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/deploy/UmlBaseSequenceDiagramDefinition.h b/genplugouts/deploy/UmlBaseSequenceDiagramDefinition.h
index 6be419e66..f80c8b3f6 100644
--- a/genplugouts/deploy/UmlBaseSequenceDiagramDefinition.h
+++ b/genplugouts/deploy/UmlBaseSequenceDiagramDefinition.h
@@ -8,7 +8,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlSequenceMessage.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlSequenceMessage;
@@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following the sending time
-    const Q3PtrVector<UmlSequenceMessage> & messages() const {
+    const QVector<UmlSequenceMessage*> & messages() const {
         return _messages;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlSequenceMessage> _messages;
+    QVector<UmlSequenceMessage*> _messages;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/deploy/UmlBaseSequenceMessage.cpp b/genplugouts/deploy/UmlBaseSequenceMessage.cpp
index 379ba53a7..6fe9ec8c2 100644
--- a/genplugouts/deploy/UmlBaseSequenceMessage.cpp
+++ b/genplugouts/deploy/UmlBaseSequenceMessage.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlFragment.h"
 
-void UmlBaseSequenceMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseSequenceMessage::read_(const QHash<void*,UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments)
 {
     UmlBaseMessage::read_(instances);
     _kind = (aMessageKind) UmlCom::read_char();
diff --git a/genplugouts/deploy/UmlBaseSequenceMessage.h b/genplugouts/deploy/UmlBaseSequenceMessage.h
index 4eb0b884d..e53b0a32d 100644
--- a/genplugouts/deploy/UmlBaseSequenceMessage.h
+++ b/genplugouts/deploy/UmlBaseSequenceMessage.h
@@ -3,9 +3,9 @@
 
 
 #include "aMessageKind.h"
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-#include <q3ptrvector.h>
+
+
+
 #include "UmlMessage.h"
 
 class UmlFragmentCompartment;
@@ -37,7 +37,7 @@ class UmlBaseSequenceMessage : public UmlMessage
     }
 
     // return the arguments of the operation, may be empty
-    const Q3CString & arguments() const {
+    const QByteArray & arguments() const {
         return _args;
     }
 
@@ -53,10 +53,10 @@ class UmlBaseSequenceMessage : public UmlMessage
 
     int _received_at;
 
-    Q3CString _args;
+    QByteArray _args;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments);
 
     friend class UmlBaseSequenceDiagramDefinition;
 };
diff --git a/genplugouts/deploy/UmlBaseShallowHistoryPseudoState.h b/genplugouts/deploy/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..cb82c3ec1 100644
--- a/genplugouts/deploy/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/deploy/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseState.cpp b/genplugouts/deploy/UmlBaseState.cpp
index 852e4cd4d..5ee20bf0c 100644
--- a/genplugouts/deploy/UmlBaseState.cpp
+++ b/genplugouts/deploy/UmlBaseState.cpp
@@ -4,7 +4,7 @@
 #include "UmlState.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -27,7 +27,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -38,7 +38,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -50,7 +50,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -61,7 +61,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -72,7 +72,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -85,7 +85,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -96,7 +96,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -107,7 +107,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/deploy/UmlBaseState.h b/genplugouts/deploy/UmlBaseState.h
index 97337032a..480d1688a 100644
--- a/genplugouts/deploy/UmlBaseState.h
+++ b/genplugouts/deploy/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "StateBehavior.h"
 
 class UmlState;
@@ -26,13 +26,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -48,7 +48,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -57,7 +57,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -65,7 +65,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -73,7 +73,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -83,7 +83,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -91,7 +91,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -99,7 +99,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/deploy/UmlBaseStateAction.cpp b/genplugouts/deploy/UmlBaseStateAction.cpp
index 32063a1ac..ddae8212d 100644
--- a/genplugouts/deploy/UmlBaseStateAction.cpp
+++ b/genplugouts/deploy/UmlBaseStateAction.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseStateAction.h"
 #include "UmlStateAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlItem * parent)
 {
@@ -15,7 +15,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -27,7 +27,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -40,7 +40,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/deploy/UmlBaseStateAction.h b/genplugouts/deploy/UmlBaseStateAction.h
index 058903e1f..0ddee639e 100644
--- a/genplugouts/deploy/UmlBaseStateAction.h
+++ b/genplugouts/deploy/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateAction;
 
@@ -24,13 +24,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -39,7 +39,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -49,7 +49,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -67,14 +67,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/deploy/UmlBaseStateDiagram.h b/genplugouts/deploy/UmlBaseStateDiagram.h
index ea7e37ee0..d3c5bd101 100644
--- a/genplugouts/deploy/UmlBaseStateDiagram.h
+++ b/genplugouts/deploy/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseSubject.cpp b/genplugouts/deploy/UmlBaseSubject.cpp
index b15d380d3..3c6453182 100644
--- a/genplugouts/deploy/UmlBaseSubject.cpp
+++ b/genplugouts/deploy/UmlBaseSubject.cpp
@@ -12,7 +12,7 @@ void UmlBaseSubject::read_()
     _h = (int) UmlCom::read_unsigned();
 }
 
-UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects)
+UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> &subjects)
 {
     int rank = subjects.count();
 
diff --git a/genplugouts/deploy/UmlBaseSubject.h b/genplugouts/deploy/UmlBaseSubject.h
index da0098ff6..9e1359732 100644
--- a/genplugouts/deploy/UmlBaseSubject.h
+++ b/genplugouts/deploy/UmlBaseSubject.h
@@ -1,10 +1,7 @@
 #ifndef _UMLBASESUBJECT_H
 #define _UMLBASESUBJECT_H
-
-
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-
+#include <QByteArray>
+#include <QVector>
 class UmlSubject;
 
 // this class manages subjects
@@ -12,13 +9,13 @@ class UmlBaseSubject
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -34,7 +31,7 @@ class UmlBaseSubject
 
 public:
     // internal
-    static UmlSubject * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects);
+    static UmlSubject * get_container_(int x, int y, int w, int h, const QVector<UmlSubject *> &subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/deploy/UmlBaseTerminatePseudoState.h b/genplugouts/deploy/UmlBaseTerminatePseudoState.h
index e8553f4be..5328f4055 100644
--- a/genplugouts/deploy/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/deploy/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseTransition.cpp b/genplugouts/deploy/UmlBaseTransition.cpp
index 8fe2570a0..7dec536d7 100644
--- a/genplugouts/deploy/UmlBaseTransition.cpp
+++ b/genplugouts/deploy/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_IsExternal(bool v)
     return set_it_(_is_external, v, setIsCppExternalCmd);
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -61,7 +61,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -95,7 +95,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -130,7 +130,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/deploy/UmlBaseTransition.h b/genplugouts/deploy/UmlBaseTransition.h
index 1c620ff99..db3a1ff7c 100644
--- a/genplugouts/deploy/UmlBaseTransition.h
+++ b/genplugouts/deploy/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -36,7 +36,7 @@ class UmlBaseTransition : public UmlItem
     bool set_IsExternal(bool v);
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -44,7 +44,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -52,7 +52,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -61,7 +61,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -69,7 +69,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -87,7 +87,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -95,7 +95,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -103,7 +103,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
@@ -152,7 +152,7 @@ class UmlBaseTransition : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTransition(void * id, const Q3CString & n) : UmlItem(id, n) {
+    UmlBaseTransition(void * id, const QByteArray & n) : UmlItem(id, n) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBaseTypeSpec.cpp b/genplugouts/deploy/UmlBaseTypeSpec.cpp
index 4070a4a45..cddda026a 100644
--- a/genplugouts/deploy/UmlBaseTypeSpec.cpp
+++ b/genplugouts/deploy/UmlBaseTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlBaseTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseTypeSpec::toString() const
+const QByteArray & UmlBaseTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/deploy/UmlBaseTypeSpec.h b/genplugouts/deploy/UmlBaseTypeSpec.h
index 16fce750a..775ce2e3b 100644
--- a/genplugouts/deploy/UmlBaseTypeSpec.h
+++ b/genplugouts/deploy/UmlBaseTypeSpec.h
@@ -1,9 +1,6 @@
 #ifndef _UMLBASETYPESPEC_H
 #define _UMLBASETYPESPEC_H
-
-
-#include <q3cstring.h>
-
+#include <QByteArray>
 class UmlClass;
 
 // this class memorize a type specification, which may be
@@ -17,10 +14,10 @@ class UmlBaseTypeSpec
     UmlBaseTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     UmlClass * type;
 
diff --git a/genplugouts/deploy/UmlBaseUseCase.cpp b/genplugouts/deploy/UmlBaseUseCase.cpp
index 5e1d6d1b3..c85af9ddc 100644
--- a/genplugouts/deploy/UmlBaseUseCase.cpp
+++ b/genplugouts/deploy/UmlBaseUseCase.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlUseCase * UmlBaseUseCase::create(UmlItem * parent, const char * s)
 {
     return (UmlUseCase *) parent->create_(anUseCase, s);
@@ -35,7 +35,7 @@ bool UmlBaseUseCase::set_AssociatedDiagram(UmlUseCaseDiagram * d)
         return FALSE;
 }
 
-const Q3CString & UmlBaseUseCase::extensionPoints()
+const QByteArray & UmlBaseUseCase::extensionPoints()
 {
     read_if_needed_();
     return _extension_points;
diff --git a/genplugouts/deploy/UmlBaseUseCase.h b/genplugouts/deploy/UmlBaseUseCase.h
index 9bd21249f..c1898a3c8 100644
--- a/genplugouts/deploy/UmlBaseUseCase.h
+++ b/genplugouts/deploy/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -32,7 +32,7 @@ class UmlBaseUseCase : public UmlItem
     bool set_AssociatedDiagram(UmlUseCaseDiagram * d);
 
     // return the extension points
-    const Q3CString & extensionPoints();
+    const QByteArray & extensionPoints();
 
     // set the extension points
     //
@@ -41,7 +41,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
-    Q3CString _extension_points;
+    QByteArray _extension_points;
 
     UmlUseCaseDiagram * _assoc_diagram;
 
@@ -52,7 +52,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseUseCaseAssociation.cpp b/genplugouts/deploy/UmlBaseUseCaseAssociation.cpp
index ebee930a9..6a91c0e5c 100644
--- a/genplugouts/deploy/UmlBaseUseCaseAssociation.cpp
+++ b/genplugouts/deploy/UmlBaseUseCaseAssociation.cpp
@@ -4,9 +4,9 @@
 #include "UmlUseCaseReference.h"
 #include "UmlClass.h"
 
-void UmlBaseUseCaseAssociation::read_(const Q3PtrDict<UmlUseCaseReference> & useCases)
+void UmlBaseUseCaseAssociation::read_(const QHash<void*,UmlUseCaseReference*> & useCases)
 {
-    _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()];
+    _use_case = (UmlUseCaseReference *) useCases[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
     _actor = (UmlClass *) UmlBaseItem::read_();
     _primary = UmlCom::read_bool();
     _name = UmlCom::read_string();
diff --git a/genplugouts/deploy/UmlBaseUseCaseAssociation.h b/genplugouts/deploy/UmlBaseUseCaseAssociation.h
index 9538e6ba7..e93593edf 100644
--- a/genplugouts/deploy/UmlBaseUseCaseAssociation.h
+++ b/genplugouts/deploy/UmlBaseUseCaseAssociation.h
@@ -1,10 +1,7 @@
 #ifndef _UMLBASEUSECASEASSOCIATION_H
 #define _UMLBASEUSECASEASSOCIATION_H
-
-
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-
+#include <QByteArray>
+#include <QHash>
 class UmlUseCaseReference;
 class UmlClass;
 
@@ -13,12 +10,12 @@ class UmlBaseUseCaseAssociation
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the stereotype
-    const Q3CString & stereotype() const {
+    const QByteArray & stereotype() const {
         return _stereotype;
     }
 
@@ -43,14 +40,14 @@ class UmlBaseUseCaseAssociation
 
     UmlClass * _actor;
 
-    Q3CString _name;
+    QByteArray _name;
 
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
     bool _primary;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlUseCaseReference> & useCases);
+    void read_(const QHash<void *, UmlUseCaseReference *> &useCases);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/deploy/UmlBaseUseCaseDiagram.h b/genplugouts/deploy/UmlBaseUseCaseDiagram.h
index 4370e63a4..9467f8f23 100644
--- a/genplugouts/deploy/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/deploy/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/deploy/UmlBaseUseCaseDiagramDefinition.cpp b/genplugouts/deploy/UmlBaseUseCaseDiagramDefinition.cpp
index b8780daf2..ff9acd825 100644
--- a/genplugouts/deploy/UmlBaseUseCaseDiagramDefinition.cpp
+++ b/genplugouts/deploy/UmlBaseUseCaseDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseUseCaseDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlUseCaseReference> ucrefs;
+    QHash<void*,UmlUseCaseReference*> ucrefs;
     unsigned n;
     unsigned rank;
 
@@ -18,7 +18,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -31,7 +31,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         sb->read_();
     }
 
-    _subjects.setAutoDelete(TRUE);
+    //_subjects.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _use_cases.resize(n);
@@ -40,11 +40,11 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         UmlUseCaseReference * uc = new UmlUseCaseReference();
 
         _use_cases.insert(rank, uc);
-        ucrefs.insert((void *) UmlCom::read_unsigned(), uc);
+        ucrefs.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), uc);
         uc->read_(_fragments, _subjects);
     }
 
-    _use_cases.setAutoDelete(TRUE);
+   // _use_cases.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _actors.resize(n);
@@ -62,7 +62,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         r->read_(ucrefs);
     }
 
-    _rels.setAutoDelete(TRUE);
+    //_rels.setAutoDelete(TRUE);
 }
 
 UmlBaseUseCaseDiagramDefinition::~UmlBaseUseCaseDiagramDefinition()
diff --git a/genplugouts/deploy/UmlBaseUseCaseDiagramDefinition.h b/genplugouts/deploy/UmlBaseUseCaseDiagramDefinition.h
index d2cefc68d..364e2f259 100644
--- a/genplugouts/deploy/UmlBaseUseCaseDiagramDefinition.h
+++ b/genplugouts/deploy/UmlBaseUseCaseDiagramDefinition.h
@@ -9,9 +9,7 @@
 #include "UmlFragmentCompartment.h"
 #include "UmlUseCaseReference.h"
 #include "UmlUseCaseAssociation.h"
-
-#include <q3ptrvector.h>
-
+#include <QVector>
 class UmlUseCaseReference;
 class UmlClass;
 class UmlUseCaseAssociation;
@@ -23,41 +21,41 @@ class UmlBaseUseCaseDiagramDefinition
 {
 public:
     // return the use cases present in the diagram
-    const Q3PtrVector<UmlUseCaseReference> & useCases() const {
+    const QVector<UmlUseCaseReference*> & useCases() const {
         return _use_cases;
     }
 
     // return the actors present in the diagram
-    const Q3PtrVector<UmlClass> & actors() const {
+    const QVector<UmlClass*> & actors() const {
         return _actors;
     }
 
     // return the associations between actor and use case present in the diagram
-    const Q3PtrVector<UmlUseCaseAssociation> & associations() const {
+    const QVector<UmlUseCaseAssociation*> & associations() const {
         return _rels;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
     // return the subjects present in the diagram
-    const Q3PtrVector<UmlSubject> & subjects() const {
+    const QVector<UmlSubject*> & subjects() const {
         return _subjects;
     }
 
 
 private:
-    Q3PtrVector<UmlUseCaseReference> _use_cases;
+    QVector<UmlUseCaseReference*> _use_cases;
 
-    Q3PtrVector<UmlClass> _actors;
+    QVector<UmlClass*> _actors;
 
-    Q3PtrVector<UmlUseCaseAssociation> _rels;
+    QVector<UmlUseCaseAssociation*> _rels;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
-    Q3PtrVector<UmlSubject> _subjects;
+    QVector<UmlSubject*> _subjects;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/deploy/UmlBaseUseCaseReference.cpp b/genplugouts/deploy/UmlBaseUseCaseReference.cpp
index c599f87d4..ac41d32fb 100644
--- a/genplugouts/deploy/UmlBaseUseCaseReference.cpp
+++ b/genplugouts/deploy/UmlBaseUseCaseReference.cpp
@@ -6,7 +6,7 @@
 #include "UmlSubject.h"
 #include "UmlFragment.h"
 
-void UmlBaseUseCaseReference::read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects)
+void UmlBaseUseCaseReference::read_(const QVector<UmlFragment *> &fragments, const QVector<UmlSubject *> &subjects)
 {
     _use_case = (UmlUseCase *) UmlBaseItem::read_();
     _x = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/deploy/UmlBaseUseCaseReference.h b/genplugouts/deploy/UmlBaseUseCaseReference.h
index 5e5590920..8331f896f 100644
--- a/genplugouts/deploy/UmlBaseUseCaseReference.h
+++ b/genplugouts/deploy/UmlBaseUseCaseReference.h
@@ -1,9 +1,7 @@
 #ifndef _UMLBASEUSECASEREFERENCE_H
 #define _UMLBASEUSECASEREFERENCE_H
 
-
-#include <q3ptrvector.h>
-
+#include <QVector>
 class UmlUseCase;
 class UmlFragmentCompartment;
 class UmlSubject;
@@ -46,7 +44,7 @@ class UmlBaseUseCaseReference
     int _h;
 
     // internal, don't call it
-    void read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects);
+    void read_(const QVector<UmlFragment*> & fragments, const QVector<UmlSubject*> & subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/deploy/UmlBaseUseCaseView.h b/genplugouts/deploy/UmlBaseUseCaseView.h
index 19d836b64..b5140abd8 100644
--- a/genplugouts/deploy/UmlBaseUseCaseView.h
+++ b/genplugouts/deploy/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseView;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlBaseView.h b/genplugouts/deploy/UmlBaseView.h
index ee8c0dd38..1e346b17b 100644
--- a/genplugouts/deploy/UmlBaseView.h
+++ b/genplugouts/deploy/UmlBaseView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 class UmlBaseView : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseView(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseView(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlBuiltin.h b/genplugouts/deploy/UmlBuiltin.h
index 4f5c16f41..360517a4b 100644
--- a/genplugouts/deploy/UmlBuiltin.h
+++ b/genplugouts/deploy/UmlBuiltin.h
@@ -1,32 +1,32 @@
 #ifndef _UMLBUILTIN_H
 #define _UMLBUILTIN_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/deploy/UmlClass.cpp b/genplugouts/deploy/UmlClass.cpp
index 0f8b8166d..eefa29302 100644
--- a/genplugouts/deploy/UmlClass.cpp
+++ b/genplugouts/deploy/UmlClass.cpp
@@ -11,7 +11,7 @@
 #include "PhpSettings.h"
 #include "PythonSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlClass::deploy(UmlDeploymentView * view)
 {
     int flags = deployable();
@@ -35,9 +35,9 @@ void UmlClass::deploy(UmlDeploymentView * view)
         a->addAssociatedClass(this);
         a->set_CppHeader("");
         a->set_CppSource("");
+        a->set_PhpSource("");
         a->set_JavaSource("");
         a->set_IdlSource("");
-        a->set_PhpSource("");
         a->set_PythonSource("");
     }
 
@@ -46,22 +46,24 @@ void UmlClass::deploy(UmlDeploymentView * view)
         a->set_CppSource(CppSettings::sourceContent());
     }
 
+
     if ((flags & (1 << javaLanguage)) != 0)
         a->set_JavaSource(JavaSettings::sourceContent());
 
     if ((flags & (1 << idlLanguage)) != 0)
         a->set_IdlSource(IdlSettings::sourceContent());
 
-    if ((flags & (1 << phpLanguage)) != 0)
-        a->set_PhpSource(PhpSettings::sourceContent());
 
     if ((flags & (1 << pythonLanguage)) != 0)
         a->set_PythonSource(PythonSettings::sourceContent());
+    //there is an unknown bug with php content. get it after all other languages
+    if ((flags & (1 << phpLanguage)) != 0)
+        a->set_PhpSource(PhpSettings::sourceContent());
 }
 
 int UmlClass::deployable()
 {
-    Q3CString st = stereotype();
+    QByteArray st = stereotype();
 
     if ((st == "metaclass") || (st == "stereotype"))
         return 0;
diff --git a/genplugouts/deploy/UmlClass.h b/genplugouts/deploy/UmlClass.h
index daf0184d7..021c80630 100644
--- a/genplugouts/deploy/UmlClass.h
+++ b/genplugouts/deploy/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 
@@ -14,7 +14,7 @@ class UmlDeploymentView;
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
     virtual void deploy(UmlDeploymentView * view);
 
diff --git a/genplugouts/deploy/UmlClassDiagram.h b/genplugouts/deploy/UmlClassDiagram.h
index 76134392d..ac4781283 100644
--- a/genplugouts/deploy/UmlClassDiagram.h
+++ b/genplugouts/deploy/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlClassInstance.h b/genplugouts/deploy/UmlClassInstance.h
index c0c0e5a90..cb4473236 100644
--- a/genplugouts/deploy/UmlClassInstance.h
+++ b/genplugouts/deploy/UmlClassInstance.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseClassInstance.h"
-#include <q3cstring.h>
+
 
 class UmlClassInstance : public UmlBaseClassInstance
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClassInstance(void * id, const Q3CString & s) : UmlBaseClassInstance(id, s) {
+    UmlClassInstance(void * id, const QByteArray & s) : UmlBaseClassInstance(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlClassItem.h b/genplugouts/deploy/UmlClassItem.h
index bf64f4dbb..7c4a888f7 100644
--- a/genplugouts/deploy/UmlClassItem.h
+++ b/genplugouts/deploy/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlClassMember.h b/genplugouts/deploy/UmlClassMember.h
index 9119443c6..35fdddb52 100644
--- a/genplugouts/deploy/UmlClassMember.h
+++ b/genplugouts/deploy/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlClassView.cpp b/genplugouts/deploy/UmlClassView.cpp
index 440131aaa..33d47c62f 100644
--- a/genplugouts/deploy/UmlClassView.cpp
+++ b/genplugouts/deploy/UmlClassView.cpp
@@ -1,14 +1,14 @@
 
 #include "UmlClassView.h"
-
+#include <QVector>
 #include "UmlDeploymentView.h"
 #include "UmlCom.h"
 void UmlClassView::deploy()
 {
     // deployment needed ?
 
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned i;
+    const QVector<UmlItem*> ch = children();
+    int i;
     bool need = FALSE;
 
     for (i = 0; i != ch.size(); i += 1) {
diff --git a/genplugouts/deploy/UmlClassView.h b/genplugouts/deploy/UmlClassView.h
index 710da89f8..16f9edf5d 100644
--- a/genplugouts/deploy/UmlClassView.h
+++ b/genplugouts/deploy/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class view'
 //
@@ -11,7 +11,7 @@
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
     virtual void deploy();
 
diff --git a/genplugouts/deploy/UmlCollaborationDiagram.h b/genplugouts/deploy/UmlCollaborationDiagram.h
index ab1388561..fc69dea4c 100644
--- a/genplugouts/deploy/UmlCollaborationDiagram.h
+++ b/genplugouts/deploy/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlCom.cpp b/genplugouts/deploy/UmlCom.cpp
index fec65a7b1..e6eb9e79c 100644
--- a/genplugouts/deploy/UmlCom.cpp
+++ b/genplugouts/deploy/UmlCom.cpp
@@ -1,10 +1,9 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
-//Added by qt3to4:
-#include <Q3CString>
-
+#include <QHostAddress>
+#include <QByteArray>
+#include <QTcpSocket>
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
@@ -28,11 +27,13 @@ class FunctionTracer
 #define TRACE_FUNCTION FunctionTracer function_tracer(Q_FUNC_INFO);
 //#define TRACE_FIELD_FUNCTION FunctionTracer function_tracer(Q_FUNC_INFO);
 #define TRACE_FIELD_FUNCTION
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
-
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+#ifdef habip
+    //sock->setAddressReusable(TRUE);
+#endif
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
     buffer_in_end = p_buffer_in = 0;
@@ -45,7 +46,8 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
         // send API version
         write_unsigned(42);
         flush();
@@ -92,11 +94,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -106,11 +108,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -134,14 +136,14 @@ void UmlCom::read_size()
     buffer_in_size = 4;
     buffer_in = new char[buffer_in_size];
 
-    int remainder = 4;
-    int nread;
+    qint64 remainder = 4;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;)
     {
-        while(sock->bytesAvailable() < 4);
-        nread = sock->readBlock(p, 4);
+        while(sock->bytesAvailable() < 4)sock->waitForReadyRead();
+        nread = sock->read(p, 4);
 //        if(nread != 4)
 //            continue;
 
@@ -170,7 +172,7 @@ void UmlCom::read_size()
     buffer_in_end = buffer_in + 4;
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
     QLOG_INFO() << "enter UmlCom::read_buffer(" << len << ")\n";
@@ -184,14 +186,15 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
     QLOG_INFO() << "Allocated address" << (size_t) buffer_in;
     for (;;)
     {
-        while(sock->bytesAvailable() != len);
-        nread = sock->readBlock(p, len);
+        nread = sock->read(p, remainder);
+//        QByteArray arr(p);
+//        QLOG_INFO() << arr;
         p += nread;
 
         QLOG_INFO() << "nread = " + QString::number(nread);
@@ -286,7 +289,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     QLOG_INFO() << p;
@@ -574,8 +577,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -631,10 +634,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -651,10 +654,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -705,7 +708,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -716,7 +719,7 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
@@ -753,7 +756,7 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
@@ -764,16 +767,17 @@ void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
+#ifdef DEBUG_DOUML
     QLOG_INFO() << msg << '\n';
 #endif
 
@@ -783,7 +787,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -794,7 +798,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/deploy/UmlCom.h b/genplugouts/deploy/UmlCom.h
index 2de01e726..8bc8a835e 100644
--- a/genplugouts/deploy/UmlCom.h
+++ b/genplugouts/deploy/UmlCom.h
@@ -1,22 +1,18 @@
 #ifndef _UMLCOM_H
 #define _UMLCOM_H
-
-
-#include <q3socketdevice.h>
-////#include "CmdFamily.h"
-#include "Tools/ApiCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
 
-#include <q3ptrvector.h>
+
+
 #include <qstring.h>
+#include "Tools/ApiCmd.h"
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -77,11 +73,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -91,22 +87,20 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
-
     static void read_size();
-
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -196,8 +190,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -220,10 +214,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
diff --git a/genplugouts/deploy/UmlComponent.h b/genplugouts/deploy/UmlComponent.h
index bb4fdbb25..e8961ed60 100644
--- a/genplugouts/deploy/UmlComponent.h
+++ b/genplugouts/deploy/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlComponentDiagram.h b/genplugouts/deploy/UmlComponentDiagram.h
index 15d707dc2..9afaa7eb4 100644
--- a/genplugouts/deploy/UmlComponentDiagram.h
+++ b/genplugouts/deploy/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlComponentView.h b/genplugouts/deploy/UmlComponentView.h
index 000a74744..cc09cecc6 100644
--- a/genplugouts/deploy/UmlComponentView.h
+++ b/genplugouts/deploy/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlDeploymentDiagram.h b/genplugouts/deploy/UmlDeploymentDiagram.h
index 727d0ffd0..1f0add3d0 100644
--- a/genplugouts/deploy/UmlDeploymentDiagram.h
+++ b/genplugouts/deploy/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlDeploymentView.h b/genplugouts/deploy/UmlDeploymentView.h
index 52e5e627d..1c47fedbf 100644
--- a/genplugouts/deploy/UmlDeploymentView.h
+++ b/genplugouts/deploy/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment view'
 //
@@ -11,7 +11,7 @@
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlDiagram.h b/genplugouts/deploy/UmlDiagram.h
index ffee38e5c..99e0f81e4 100644
--- a/genplugouts/deploy/UmlDiagram.h
+++ b/genplugouts/deploy/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlEntryPointPseudoState.h b/genplugouts/deploy/UmlEntryPointPseudoState.h
index 838a4bf5b..3fd7f6eca 100644
--- a/genplugouts/deploy/UmlEntryPointPseudoState.h
+++ b/genplugouts/deploy/UmlEntryPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlExitPointPseudoState.h b/genplugouts/deploy/UmlExitPointPseudoState.h
index 1a57b8230..e63c68782 100644
--- a/genplugouts/deploy/UmlExitPointPseudoState.h
+++ b/genplugouts/deploy/UmlExitPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlExpansionNode.h b/genplugouts/deploy/UmlExpansionNode.h
index 65d1cff2a..e2dbd5565 100644
--- a/genplugouts/deploy/UmlExpansionNode.h
+++ b/genplugouts/deploy/UmlExpansionNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionNode.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionNode : public UmlBaseExpansionNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionNode(void * id, const Q3CString & s) : UmlBaseExpansionNode(id, s) {
+    UmlExpansionNode(void * id, const QByteArray & s) : UmlBaseExpansionNode(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlExpansionRegion.h b/genplugouts/deploy/UmlExpansionRegion.h
index cfe999374..6d9130ca6 100644
--- a/genplugouts/deploy/UmlExpansionRegion.h
+++ b/genplugouts/deploy/UmlExpansionRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionRegion.h"
-#include <q3cstring.h>
+
 
 class UmlExpansionRegion : public UmlBaseExpansionRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionRegion(void * id, const Q3CString & s) : UmlBaseExpansionRegion(id, s) {
+    UmlExpansionRegion(void * id, const QByteArray & s) : UmlBaseExpansionRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlExtraClassMember.h b/genplugouts/deploy/UmlExtraClassMember.h
index cf0b2bf47..95b851b8d 100644
--- a/genplugouts/deploy/UmlExtraClassMember.h
+++ b/genplugouts/deploy/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlFlow.h b/genplugouts/deploy/UmlFlow.h
index 6e78a8c4b..e31afeb31 100644
--- a/genplugouts/deploy/UmlFlow.h
+++ b/genplugouts/deploy/UmlFlow.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseFlow.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+
 
 class UmlFlow : public UmlBaseFlow, public UmlActivityItem
 {
 public:
-    UmlFlow(void * id, const Q3CString & n) : UmlBaseFlow(id, n) {
+    UmlFlow(void * id, const QByteArray & n) : UmlBaseFlow(id, n) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlInterruptibleActivityRegion.h b/genplugouts/deploy/UmlInterruptibleActivityRegion.h
index 0f78665c1..a696f6b2d 100644
--- a/genplugouts/deploy/UmlInterruptibleActivityRegion.h
+++ b/genplugouts/deploy/UmlInterruptibleActivityRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseInterruptibleActivityRegion.h"
-#include <q3cstring.h>
+
 
 class UmlInterruptibleActivityRegion : public UmlBaseInterruptibleActivityRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlBaseInterruptibleActivityRegion(id, s) {
+    UmlInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlBaseInterruptibleActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlItem.h b/genplugouts/deploy/UmlItem.h
index 0b0a93fb4..299f3d72d 100644
--- a/genplugouts/deploy/UmlItem.h
+++ b/genplugouts/deploy/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 
@@ -14,7 +14,7 @@ class UmlDeploymentView;
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
diff --git a/genplugouts/deploy/UmlNcRelation.h b/genplugouts/deploy/UmlNcRelation.h
index 60032619a..3d73ec633 100644
--- a/genplugouts/deploy/UmlNcRelation.h
+++ b/genplugouts/deploy/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlNode.h b/genplugouts/deploy/UmlNode.h
index 95edbe709..4c72e14fd 100644
--- a/genplugouts/deploy/UmlNode.h
+++ b/genplugouts/deploy/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlObjectDiagram.h b/genplugouts/deploy/UmlObjectDiagram.h
index ba429242a..c194e4613 100644
--- a/genplugouts/deploy/UmlObjectDiagram.h
+++ b/genplugouts/deploy/UmlObjectDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseObjectDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'object diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -14,7 +14,7 @@ class UmlObjectDiagram : public UmlBaseObjectDiagram
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlObjectDiagram(void * id, const Q3CString & s) : UmlBaseObjectDiagram(id, s) {
+    UmlObjectDiagram(void * id, const QByteArray & s) : UmlBaseObjectDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlOnSignalAction.h b/genplugouts/deploy/UmlOnSignalAction.h
index 158c0ddc0..82fd5747f 100644
--- a/genplugouts/deploy/UmlOnSignalAction.h
+++ b/genplugouts/deploy/UmlOnSignalAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseOnSignalAction.h"
-#include <q3cstring.h>
+
 
 class UmlOnSignalAction : public UmlBaseOnSignalAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOnSignalAction(void * id, const Q3CString & s) : UmlBaseOnSignalAction(id, s) {
+    UmlOnSignalAction(void * id, const QByteArray & s) : UmlBaseOnSignalAction(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlOperation.h b/genplugouts/deploy/UmlOperation.h
index eec043152..f4c9e6547 100644
--- a/genplugouts/deploy/UmlOperation.h
+++ b/genplugouts/deploy/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlPackage.h b/genplugouts/deploy/UmlPackage.h
index 84e80d71e..c190ad80c 100644
--- a/genplugouts/deploy/UmlPackage.h
+++ b/genplugouts/deploy/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+
 
 // This class manages a 'package', notes that the project itself is a package
 //
@@ -11,7 +11,7 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlParameterSet.h b/genplugouts/deploy/UmlParameterSet.h
index 55a597fd4..f9927f672 100644
--- a/genplugouts/deploy/UmlParameterSet.h
+++ b/genplugouts/deploy/UmlParameterSet.h
@@ -3,14 +3,14 @@
 
 
 #include "UmlBaseParameterSet.h"
-#include <q3cstring.h>
+
 #include "UmlActivityItem.h"
 
 class UmlParameterSet : public UmlBaseParameterSet, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlParameterSet(void * id, const Q3CString & s) : UmlBaseParameterSet(id, s) {
+    UmlParameterSet(void * id, const QByteArray & s) : UmlBaseParameterSet(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlPinParameter.h b/genplugouts/deploy/UmlPinParameter.h
index d48cb7343..3d3283d6b 100644
--- a/genplugouts/deploy/UmlPinParameter.h
+++ b/genplugouts/deploy/UmlPinParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBasePinParameter.h"
-#include <q3cstring.h>
+
 
 class UmlPinParameter : public UmlBasePinParameter
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPinParameter(void * id, const Q3CString & s) : UmlBasePinParameter(id, s) {
+    UmlPinParameter(void * id, const QByteArray & s) : UmlBasePinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlPseudoState.h b/genplugouts/deploy/UmlPseudoState.h
index 075761ec7..1c350a942 100644
--- a/genplugouts/deploy/UmlPseudoState.h
+++ b/genplugouts/deploy/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlRegion.h b/genplugouts/deploy/UmlRegion.h
index d3f32cb7b..d0ce11dde 100644
--- a/genplugouts/deploy/UmlRegion.h
+++ b/genplugouts/deploy/UmlRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlRelation.h b/genplugouts/deploy/UmlRelation.h
index 6b4358b40..a246cfcfd 100644
--- a/genplugouts/deploy/UmlRelation.h
+++ b/genplugouts/deploy/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'relations' between classes, notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlSequenceDiagram.h b/genplugouts/deploy/UmlSequenceDiagram.h
index d3b3d83fc..a36e34a65 100644
--- a/genplugouts/deploy/UmlSequenceDiagram.h
+++ b/genplugouts/deploy/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlSettings.cpp b/genplugouts/deploy/UmlSettings.cpp
index 28ceb6191..67e2a77a7 100644
--- a/genplugouts/deploy/UmlSettings.cpp
+++ b/genplugouts/deploy/UmlSettings.cpp
@@ -6,15 +6,15 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -26,14 +26,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -45,14 +45,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -64,14 +64,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -83,14 +83,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -146,39 +146,39 @@ aLanguage UmlSettings::_uml_get_name;
 
 aLanguage UmlSettings::_uml_set_name;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -190,7 +190,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -203,7 +203,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -229,18 +229,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -251,7 +251,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_attribute_stereotypes.count();
 
@@ -262,7 +262,7 @@ Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString Um
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -273,19 +273,19 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         builtins[index] = _builtins[index];
-        _map_builtins.replace(builtins[index].uml, &builtins[index]);
+        _map_builtins.insert(builtins[index].uml, &builtins[index]);
     }
 
     builtins[index].uml = s;
@@ -310,19 +310,19 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
     return &_builtins[index];
 }
 
-UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_attr_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_attribute_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         relation_attribute_stereotypes[index] = _relation_attribute_stereotypes[index];
-        _map_relation_attribute_stereotypes.replace(relation_attribute_stereotypes[index].uml,
+        _map_relation_attribute_stereotypes.insert(relation_attribute_stereotypes[index].uml,
                 &relation_attribute_stereotypes[index]);
     }
 
@@ -345,19 +345,19 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
     return &_relation_attribute_stereotypes[index];
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         class_stereotypes[index] = _class_stereotypes[index];
-        _map_class_stereotypes.replace(class_stereotypes[index].uml, &class_stereotypes[index]);
+        _map_class_stereotypes.insert(class_stereotypes[index].uml, &class_stereotypes[index]);
     }
 
     class_stereotypes[index].uml = s;
diff --git a/genplugouts/deploy/UmlSettings.h b/genplugouts/deploy/UmlSettings.h
index c37c13a10..830ab400e 100644
--- a/genplugouts/deploy/UmlSettings.h
+++ b/genplugouts/deploy/UmlSettings.h
@@ -1,10 +1,8 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
-
-
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aLanguage.h"
-#include <q3dict.h>
+#include <QHash>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -20,44 +18,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
     // return the language from which the getter's name rule must be followed at Uml level
     static aLanguage umlGetName();
@@ -90,25 +88,25 @@ class UmlSettings
 
 
 protected:
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_attribute_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -122,31 +120,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_attr_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_attr_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/deploy/UmlState.h b/genplugouts/deploy/UmlState.h
index b8a04be4a..e760bb6b6 100644
--- a/genplugouts/deploy/UmlState.h
+++ b/genplugouts/deploy/UmlState.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlStateDiagram.h b/genplugouts/deploy/UmlStateDiagram.h
index f49b5fb44..c639f9193 100644
--- a/genplugouts/deploy/UmlStateDiagram.h
+++ b/genplugouts/deploy/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlStereotype.h b/genplugouts/deploy/UmlStereotype.h
index 8c5bf56c0..5863e0904 100644
--- a/genplugouts/deploy/UmlStereotype.h
+++ b/genplugouts/deploy/UmlStereotype.h
@@ -1,32 +1,32 @@
 #ifndef _UMLSTEREOTYPE_H
 #define _UMLSTEREOTYPE_H
 
+#include <QByteArray>
 
-#include <q3cstring.h>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHPHP
-    Q3CString php;
+    QByteArray php;
 #endif
 
 #ifdef WITHPHP
-    Q3CString python;
+    QByteArray python;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/deploy/UmlTransition.h b/genplugouts/deploy/UmlTransition.h
index 3edd626c7..59ccc3e65 100644
--- a/genplugouts/deploy/UmlTransition.h
+++ b/genplugouts/deploy/UmlTransition.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlTransition : public UmlBaseTransition, public UmlStateItem
 {
 public:
-    UmlTransition(void * id, const Q3CString & n) : UmlBaseTransition(id, n) {
+    UmlTransition(void * id, const QByteArray & n) : UmlBaseTransition(id, n) {
     }
 
 };
diff --git a/genplugouts/deploy/UmlUseCase.h b/genplugouts/deploy/UmlUseCase.h
index 392773262..c21cc521d 100644
--- a/genplugouts/deploy/UmlUseCase.h
+++ b/genplugouts/deploy/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case'
 //
@@ -11,7 +11,7 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlUseCaseDiagram.h b/genplugouts/deploy/UmlUseCaseDiagram.h
index 132b56d36..bf490aa90 100644
--- a/genplugouts/deploy/UmlUseCaseDiagram.h
+++ b/genplugouts/deploy/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlUseCaseView.h b/genplugouts/deploy/UmlUseCaseView.h
index a715b2f5f..ef475b173 100644
--- a/genplugouts/deploy/UmlUseCaseView.h
+++ b/genplugouts/deploy/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case view'
 //
@@ -11,7 +11,7 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/deploy/UmlView.h b/genplugouts/deploy/UmlView.h
index 418e689ab..2435ce96b 100644
--- a/genplugouts/deploy/UmlView.h
+++ b/genplugouts/deploy/UmlView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseView.h"
-#include <q3cstring.h>
+
 
 class UmlView : public UmlBaseView
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlView(void * id, const Q3CString & s) : UmlBaseView(id, s) {
+    UmlView(void * id, const QByteArray & s) : UmlBaseView(id, s) {
     }
 
 };
diff --git a/genplugouts/deploy/deploy.pro b/genplugouts/deploy/deploy.pro
index 92884cfe8..0878943d3 100644
--- a/genplugouts/deploy/deploy.pro
+++ b/genplugouts/deploy/deploy.pro
@@ -1,8 +1,11 @@
 TEMPLATE	= app
 TARGET		= deplcl
-CONFIG		+= warn_on qt qxt
+CONFIG -= app_bundle
+CONFIG += qt warn_on qxt c++11
+QMAKE_POST_LINK = " "
 QXT += core
-DEFINES		= WITHCPP WITHJAVA WITHPHP WITHPYTHON WITHIDL TRACE BooL=bool
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES		+= WITHCPP WITHJAVA WITHPHP WITHPYTHON WITHIDL TRACE BooL=bool
 HEADERS		= ./UmlBaseExpansionRegion.h \
 		  ./UmlBaseUseCaseDiagramDefinition.h \
 		  ./UmlBaseView.h \
@@ -403,23 +406,19 @@ SOURCES		= ./UmlBaseExpansionRegion.cpp \
     ../../src/Logging/QsLog.cpp \
     ../../src/Logging/QsDebugOutput.cpp
 
-#The following line was inserted by qt3to4
-QT += network  qt3support
+QT += network widgets
+DEFINES += TRUE=true FALSE=false
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/deploy/MOC_release
-    OBJECTS_DIR = bin/douml/deploy/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/deplcl
+    OBJECTS_DIR = $${DESTDIR}/obj_release/deplcl
 }
-
-Debug{
-    MOC_DIR = bin/douml/deploy/MOC_Debug
-    OBJECTS_DIR = bin/douml/deploy/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/deplcl
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/deplcl
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/genplugouts/gpro/ClassGlobalCmd.cpp b/genplugouts/gpro/ClassGlobalCmd.cpp
index ca70c4ecb..2a7a53de1 100644
--- a/genplugouts/gpro/ClassGlobalCmd.cpp
+++ b/genplugouts/gpro/ClassGlobalCmd.cpp
@@ -1,3 +1,3 @@
 
-#include "Tools/ApiCmd.h"
+#include "ClassGlobalCmd.h"
 
diff --git a/genplugouts/gpro/CmdFamily.cpp b/genplugouts/gpro/CmdFamily.cpp
index 35cd7b5e1..ff694ae89 100644
--- a/genplugouts/gpro/CmdFamily.cpp
+++ b/genplugouts/gpro/CmdFamily.cpp
@@ -1,3 +1,3 @@
 
-//#include "CmdFamily.h"
+#include "CmdFamily.h"
 
diff --git a/genplugouts/gpro/CppSettings.cpp b/genplugouts/gpro/CppSettings.cpp
index 8129be122..9ddc36f40 100644
--- a/genplugouts/gpro/CppSettings.cpp
+++ b/genplugouts/gpro/CppSettings.cpp
@@ -5,11 +5,10 @@
 
 #include "UmlCom.h"
 #include "UmlSettings.h"
-#include "Tools/ApiCmd.h"
+#include "CppSettingsCmd.h"
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,21 +21,21 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +48,28 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationStereotype(Q3CString s)
+QByteArray CppSettings::relationStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(cppSettingsCmd, setCppRelationStereotypeCmd, s, v);
+  UmlCom::send_cmd(cppSettingsCmd, setCppRelationStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +82,28 @@ bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +116,31 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +151,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -171,14 +170,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -190,14 +189,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -209,14 +208,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -228,14 +227,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -266,14 +265,14 @@ bool CppSettings::set_IncludeWithPath(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -285,14 +284,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -304,14 +303,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -323,14 +322,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -342,14 +341,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -361,14 +360,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -380,14 +379,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -399,14 +398,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -418,14 +417,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -437,14 +436,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -456,14 +455,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -475,14 +474,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -494,14 +493,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl()
+const QByteArray & CppSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool CppSettings::set_AttributeDecl(Q3CString v)
+bool CppSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -513,14 +512,14 @@ bool CppSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -532,7 +531,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -551,14 +550,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -570,14 +569,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -627,14 +626,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -722,14 +721,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -781,47 +780,47 @@ bool CppSettings::set_IsSetParamConst(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl;
+QByteArray CppSettings::_attr_decl;
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -831,30 +830,30 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
 bool CppSettings::_is_set_param_const;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -879,13 +878,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/gpro/CppSettings.h b/genplugouts/gpro/CppSettings.h
index d1275b4f4..102e4af21 100644
--- a/genplugouts/gpro/CppSettings.h
+++ b/genplugouts/gpro/CppSettings.h
@@ -4,20 +4,20 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
 //
-// This class may be defined as a 'singleton', but I prefer to use static
+// This class may be defined as a 'singleton', but I prefer to use static 
 // members allowing to just write 'CppSettings::member' rather than
 // 'CppSettings::instance()->member' or other long sentence like this.
 class CppSettings : public UmlSettings
 {
-public:
+  public:
     // returns TRUE when the created C++ objects are initialized
     // with the default declaration/definition
     static bool useDefaults();
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(Q3CString s);
+    static QByteArray relationStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
-    // reverse of the RelationStereotype() operation, returns the 'UML'
+    // reverse of the RelationStereotype() operation, returns the 'UML' 
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
-    // reverse of the ClassStereotype() operation, returns the 'UML'
+    // reverse of the ClassStereotype() operation, returns the 'UML' 
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
-    // returns the #include or other form specified in the last
+    // returns the #include or other form specified in the last 
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
-    // set the #include or other form specified in the last
+    // set the #include or other form specified in the last 
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
-    // returns the 'root' directory
-    static Q3CString rootDir();
+    // returns the 'root' directory 
+    static QByteArray rootDir();
 
-    // set the 'root' directory
+    // set the 'root' directory 
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -136,140 +136,140 @@ class CppSettings : public UmlSettings
     // On error : return FALSE in C++, produce a RuntimeException in Java
     static bool set_IncludeWithPath(bool v);
 
-    // returns the default operation 'in' parameter specification
+    // returns the default operation 'in' parameter specification 
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
-    // set the default operation 'in' parameter specification
+    // set the default operation 'in' parameter specification 
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
-    // returns the default operation 'out' parameter specification
+    // returns the default operation 'out' parameter specification 
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
-    // set the default operation 'out' parameter specification
+    // set the default operation 'out' parameter specification 
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
-    // returns the default operation 'inout' parameter specification
+    // returns the default operation 'inout' parameter specification 
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
-    // set the default operation 'inout' parameter specification
+    // set the default operation 'inout' parameter specification 
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
-    // returns the default operation 'in' parameter specification
+    // returns the default operation 'in' parameter specification 
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
-    // set the default operation 'in' parameter specification
+    // set the default operation 'in' parameter specification 
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
-    // returns the default operation 'out' parameter specification
+    // returns the default operation 'out' parameter specification 
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
-    // set the default operation 'out' parameter specification
+    // set the default operation 'out' parameter specification 
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
-    // returns the default operation 'inout' parameter specification
+    // returns the default operation 'inout' parameter specification 
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
-    // set the default operation 'inout' parameter specification
+    // set the default operation 'inout' parameter specification 
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-
-    static bool set_Inout(Q3CString v);
+    
+    static bool set_Inout(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -278,20 +278,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -313,15 +313,15 @@ class CppSettings : public UmlSettings
     // On error : return FALSE in C++, produce a RuntimeException in Java
     static bool set_GetVisibility(aVisibility v);
 
-    // returns the default name of a 'get' operation generated
+    // returns the default name of a 'get' operation generated 
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
-    // set the default name of a 'get' operation generated
+    // set the default name of a 'get' operation generated 
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -365,16 +365,16 @@ class CppSettings : public UmlSettings
     // On error : return FALSE in C++, produce a RuntimeException in Java
     static bool set_SetVisibility(aVisibility v);
 
-    // returns the default name of a 'set' operation generated
+    // returns the default name of a 'set' operation generated 
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
-    // set the default name of a 'set' operation generated
+    // set the default name of a 'set' operation generated 
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -399,53 +399,53 @@ class CppSettings : public UmlSettings
     static bool set_IsSetParamConst(bool v);
 
 
-private:
+  private:
     // never called !
     CppSettings() {};
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -455,26 +455,26 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
     static bool _is_set_param_const;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
-protected:
+  protected:
     static void read_();
 
     static void read_if_needed_();
diff --git a/genplugouts/gpro/CppSettingsCmd.cpp b/genplugouts/gpro/CppSettingsCmd.cpp
index ca70c4ecb..6ee506d7a 100644
--- a/genplugouts/gpro/CppSettingsCmd.cpp
+++ b/genplugouts/gpro/CppSettingsCmd.cpp
@@ -1,3 +1,3 @@
 
-#include "Tools/ApiCmd.h"
+#include "CppSettingsCmd.h"
 
diff --git a/genplugouts/gpro/Dialog.cpp b/genplugouts/gpro/Dialog.cpp
index 394e58e21..06759712b 100644
--- a/genplugouts/gpro/Dialog.cpp
+++ b/genplugouts/gpro/Dialog.cpp
@@ -8,115 +8,122 @@
 #include "SmallPushButton.h"
 
 #include <qlineedit.h>
-#include <Q3TextEdit.h>
+#include <QTextEdit>
 #include <qpushbutton.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qlayout.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
-#include <q3grid.h>
-#include <q3hbox.h>
+#include <gridbox.h>
+#include "hhbox.h"
 #include <qdir.h>
-//Added by qt3to4:
-#include <Q3CString>
-#include <Q3VBoxLayout>
+#include <QByteArray>
+#include <QVBoxLayout>
+#include <QSettings>
 
-Dialog::Dialog(UmlArtifact * art, const Q3CString & path_exe, Q3CString & pro, Q3CString & target, Q3CString & tmplt, Q3CString & config, Q3CString & defines, Q3CString & includepath, Q3CString & dependpath, Q3CString & objectsdir, Q3CString & footer)
-    : QDialog(0, 0, TRUE), _art(art), _pro(pro), _target(target), _tmplt(tmplt),
+Dialog::Dialog(UmlArtifact * art, const QByteArray & path_exe, QByteArray & pro, QByteArray & target, QByteArray & tmplt, QByteArray & config, QByteArray & defines, QByteArray & includepath, QByteArray & dependpath, QByteArray & objectsdir, QByteArray & footer)
+    : QDialog(0), _art(art), _pro(pro), _target(target), _tmplt(tmplt),
       _config(config), _defines(defines), _includepath(includepath), _dependpath(dependpath),
       _objectsdir(objectsdir), _footer(footer)
 {
+    setModal(true);
     QDir d(path_exe);
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3HBox * htab;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    GridBox * grid = new GridBox(2, this);
+    HHBox * htab;
     int index;
 
     vbox->addWidget(grid);
     vbox->setMargin(5);
 
-    new QLabel(".pro file : ", grid);
-    htab = new Q3HBox(grid);
-    edpro = new QLineEdit(htab);
-    edpro->setText(d.absFilePath(pro));
+    grid->addWidget(new QLabel(".pro file : ", grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(edpro = new QLineEdit(htab));
+    edpro->setText(d.absoluteFilePath(pro));
 
-    new QLabel(" ", htab);
-    browsepro = new SmallPushButton("browse", htab);
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(browsepro = new SmallPushButton("browse", htab));
     connect(browsepro, SIGNAL(clicked()), this, SLOT(browse_pro()));
 
-    new QLabel("target : ", grid);
-    htab = new Q3HBox(grid);
-    edtarget = new QLineEdit(htab);
-    edtarget->setText(d.absFilePath(target));
-    new QLabel(" ", htab);
-    browsetarget = new SmallPushButton("browse", htab);
+    grid->addWidget(new QLabel("target : ", grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(edtarget = new QLineEdit(htab));
+    edtarget->setText(d.absoluteFilePath(target));
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(browsetarget = new SmallPushButton("browse", htab));
     connect(browsetarget, SIGNAL(clicked()), this, SLOT(browse_target()));
 
-    new QLabel("template : ", grid);
-    cbtemplate = new Q3ComboBox(TRUE, grid);
+    grid->addWidget(new QLabel("template : ", grid));
+    grid->addWidget(cbtemplate = new QComboBox(grid));
+    cbtemplate->setEditable(true);
 
     static const char * templates[] = { "app", "lib", "subdirs" };
     bool find = FALSE;
 
     for (index = 0; index != sizeof(templates) / sizeof(*templates); index += 1) {
-        cbtemplate->insertItem(templates[index]);
+        cbtemplate->addItem(templates[index]);
 
         if (tmplt == templates[index]) {
-            cbtemplate->setCurrentItem(index);
+            cbtemplate->setCurrentIndex(index);
             find = TRUE;
         }
     }
 
     if (! find) {
-        cbtemplate->insertItem((QString) tmplt);
-        cbtemplate->setCurrentItem(index);
+        cbtemplate->addItem((QString) tmplt);
+        cbtemplate->setCurrentIndex(index);
     }
 
-    new QLabel("config : ", grid);
-    htab = new Q3HBox(grid);
-    cbconf[0] = new Q3ComboBox(FALSE, htab);
-    cbconf[0]->insertItem("debug");
-    cbconf[0]->insertItem("release");
+    grid->addWidget(new QLabel("config : ", grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(cbconf[0] = new QComboBox( htab));
+    cbconf[0]->addItem("debug");
+    cbconf[0]->addItem("release");
 
-    QStringList lcnf =
-        QStringList::split(" ", (const char *) config);
+    QStringList lcnf = QString(config).split(" ");
+        //QStringList::split(" ", (const char *) config);
     QStringList::Iterator it = lcnf.begin();
 
-    cbconf[0]->setCurrentItem((*it++ == "debug") ? 0 : 1);
+    cbconf[0]->setCurrentIndex((*it++ == "debug") ? 0 : 1);
 
-    cbconf[1] = new Q3ComboBox(FALSE, htab);
-    cbconf[1]->insertItem("warn_on");
-    cbconf[1]->insertItem("warn_off");
-    cbconf[1]->setCurrentItem((*it++ == "warn_on") ? 0 : 1);
+    htab->addWidget(cbconf[1] = new QComboBox( htab));
+    cbconf[1]->addItem("warn_on");
+    cbconf[1]->addItem("warn_off");
+    cbconf[1]->setCurrentIndex((*it++ == "warn_on") ? 0 : 1);
 
     QSizePolicy sp = cbconf[0]->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Fixed);
+    sp.setHorizontalPolicy(QSizePolicy::Fixed);
     cbconf[0]->setSizePolicy(sp);
     cbconf[1]->setSizePolicy(sp);
 
-    new QLabel(" qt ", htab);
+    htab->addWidget(new QLabel(" qt ", htab));
     it++;	// qt
 
-    const char * configs[] = {
+    /*const char * configs[] = {
         "", "opengl", "thread", "x11", "windows",
         "console", "dll", "staticlib", 0
-    };
+    };*/
+    QStringList configs;
+    configs<<""<<"opengl"<<"thread"<<"x11"<<"windows"<<
+            "console"<<"dll"<<"staticlib";
 
     for (index = 2;
          index != sizeof(cbconf) / sizeof(*cbconf) - 1;
          index += 1) {
-        cbconf[index] = new Q3ComboBox(TRUE, htab);
+        htab->addWidget(cbconf[index] = new QComboBox( htab));
+        cbconf[index]->setEditable(true);
 
         if (it != lcnf.end())
-            cbconf[index]->insertItem(*it++);
+            cbconf[index]->addItem(*it++);
 
-        cbconf[index]->insertStrList(configs);
-        cbconf[index]->setCurrentItem(0);
+        cbconf[index]->addItems(configs);
+        cbconf[index]->setCurrentIndex(0);
     }
 
-    cbconf[index] = new Q3ComboBox(TRUE, htab);
+    htab->addWidget(cbconf[index] = new QComboBox( htab));
+    cbconf[index]->setEditable(true);
 
     if (it != lcnf.end()) {
         QString s = *it++;
@@ -124,52 +131,54 @@ Dialog::Dialog(UmlArtifact * art, const Q3CString & path_exe, Q3CString & pro, Q
         while (it != lcnf.end())
             s += " " + *it++;
 
-        cbconf[index]->insertItem(s);
+        cbconf[index]->addItem(s);
     }
 
-    cbconf[index]->insertStrList(configs);
-    cbconf[index]->setCurrentItem(0);
+    cbconf[index]->addItems(configs);
+    cbconf[index]->setCurrentIndex(0);
 
 
-    new QLabel("defines : ", grid);
-    eddefines = new QLineEdit(grid);
+    grid->addWidget(new QLabel("defines : ", grid));
+    grid->addWidget(eddefines = new QLineEdit(grid));
     eddefines->setText(defines);
 
     ///may be computed
-    new QLabel("include paths : ", grid);
-    htab = new Q3HBox(grid);
-    edincludepath = new QLineEdit(htab);
+    grid->addWidget(new QLabel("include paths : ", grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(edincludepath = new QLineEdit(htab));
     edincludepath->setText(includepath);
-    new QLabel(" ", htab);
-    computeincludepath = new SmallPushButton("compute", htab);
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(computeincludepath = new SmallPushButton("compute", htab));
     connect(computeincludepath, SIGNAL(clicked()), this, SLOT(compute_includepath()));
 
-    new QLabel("depend paths : ", grid);
-    eddependpath = new QLineEdit(grid);
+    grid->addWidget(new QLabel("depend paths : ", grid));
+    grid->addWidget(eddependpath = new QLineEdit(grid));
     eddependpath->setText(dependpath);
 
-    new QLabel("objects dir : ", grid);
-    htab = new Q3HBox(grid);
-    edobjectsdir = new QLineEdit(htab);
+    grid->addWidget(new QLabel("objects dir : ", grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(edobjectsdir = new QLineEdit(htab));
     edobjectsdir->setText(objectsdir);
-    new QLabel(" ", htab);
-    browseobjectsdir = new SmallPushButton("browse", htab);
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(browseobjectsdir = new SmallPushButton("browse", htab));
     connect(browseobjectsdir, SIGNAL(clicked()), this, SLOT(browse_objectsdir()));
 
-    new QLabel("footer : ", grid);
-    edfooter = new Q3TextEdit(grid);
+    grid->addWidget(new QLabel("footer : ", grid));
+    grid->addWidget(edfooter = new QTextEdit(grid));
     edfooter->setText(footer);
 
-    new QLabel(grid);
-    new QLabel(grid);
-
-    new QLabel(grid);
-    htab = new Q3HBox(grid);
-    new QLabel(htab);
-    QPushButton * ok = new QPushButton("&OK", htab);
-    new QLabel(htab);
-    QPushButton * cancel = new QPushButton("&Cancel", htab);
-    new QLabel(htab);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
+
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * ok ;
+    htab->addWidget(ok = new QPushButton("&OK", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * cancel;
+    htab->addWidget( cancel = new QPushButton("&Cancel", htab));
+    htab->addWidget(new QLabel(htab));
     QSize bs(cancel->sizeHint());
 
     ok->setDefault(TRUE);
@@ -186,66 +195,40 @@ Dialog::Dialog(UmlArtifact * art, const Q3CString & path_exe, Q3CString & pro, Q
 
 void Dialog::polish()
 {
-    QDialog::polish();
-
-    // try to read .doumlrc
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-#ifdef WIN32
-
-    if (fp == 0) {
-        QString hd = getenv("USERPROFILE");
-
-        if (! hd.isEmpty()) {
-            QDir d(hd);
-            QString s2 = d.absFilePath(".doumlrc");
-
-            fp = fopen((const char *) s2, "r");
-        }
-    }
-
-#endif
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        int cx = (r + l) / 2;
-                        int cy = (t + b) / 2;
-
-                        move(x() + cx - (x() + width() / 2),
-                             y() + cy - (y() + height() / 2));
-                    }
-                }
-
-                break;
-            }
-        }
-
-        fclose(fp);
+    QDialog::ensurePolished();
+
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        int cx = (r + l) / 2;
+        int cy = (t + b) / 2;
+
+        move(x() + cx - (x() + width() / 2), y() + cy - (y() + height() / 2));
+      }
     }
 }
 
 void Dialog::accept()
 {
-    _pro = edpro->text();
-    _target = edtarget->text();
-    _objectsdir = edobjectsdir->text();
-    _tmplt = cbtemplate->currentText();
+    _pro = edpro->text().toLatin1();
+    _target = edtarget->text().toLatin1();
+    _objectsdir = edobjectsdir->text().toLatin1();
+    _tmplt = cbtemplate->currentText().toLatin1();
 
     int index;
 
-    _config = cbconf[0]->currentText() + " " + cbconf[1]->currentText() + " qt";
+    _config = QString(cbconf[0]->currentText() + " " + cbconf[1]->currentText() + " qt").toLatin1();
 
     for (index = 2; index != sizeof(cbconf) / sizeof(*cbconf); index += 1) {
         QString s = cbconf[index]->currentText();
@@ -254,19 +237,18 @@ void Dialog::accept()
             _config += " " + s;
     }
 
-    _defines = eddefines->text();
-    _includepath = edincludepath->text();
-    _dependpath = eddependpath->text();
-    _objectsdir = edobjectsdir->text();
-    _footer = edfooter->text();
+    _defines = eddefines->text().toLatin1();
+    _includepath = edincludepath->text().toLatin1();
+    _dependpath = eddependpath->text().toLatin1();
+    _objectsdir = edobjectsdir->text().toLatin1();
+    _footer = edfooter->toPlainText().toLatin1();
 
     QDialog::accept();
 }
 
 void Dialog::browse_pro()
 {
-    QString f = Q3FileDialog::getSaveFileName(edpro->text(), "Pro file (*.pro)", this,
-                0, "specify .pro file");
+    QString f = QFileDialog::getSaveFileName(this, "specify .pro file",edpro->text(), "Pro file (*.pro)");
 
     if (! f.isEmpty())
         edpro->setText(f);
@@ -274,8 +256,7 @@ void Dialog::browse_pro()
 
 void Dialog::browse_target()
 {
-    QString f = Q3FileDialog::getSaveFileName(edtarget->text(), "", this,
-                0, "specify target file");
+    QString f = QFileDialog::getSaveFileName(this, "specify target file",edtarget->text(), "");
 
     if (! f.isEmpty())
         edtarget->setText(f);
@@ -283,16 +264,16 @@ void Dialog::browse_target()
 
 void Dialog::compute_includepath()
 {
-    const Q3PtrVector<UmlArtifact> & arts = _art->associatedArtifacts();
+    const QVector<UmlArtifact*> & arts = _art->associatedArtifacts();
     QFileInfo fi(edpro->text());
-    QString prodir = fi.dirPath(TRUE);
-    unsigned index;
+    QString prodir = fi.path();
+    int index;
     QStringList l;
 
     for (index = 0; index != arts.count(); index += 1) {
         QString s = arts[index]->way(prodir, TRUE);
 
-        if ((s != "./") && (l.findIndex(s) == -1))
+        if ((s != "./") && (l.indexOf(s) == -1))
             l.append(s);
     }
 
@@ -302,8 +283,7 @@ void Dialog::compute_includepath()
 
 void Dialog::browse_objectsdir()
 {
-    QString d = Q3FileDialog::getExistingDirectory(edobjectsdir->text(), this, 0,
-                "select objects dir");
+    QString d = QFileDialog::getExistingDirectory(this, "select objects dir", edobjectsdir->text() );
 
     if (! d.isEmpty()) {
 #ifdef WIN32
diff --git a/genplugouts/gpro/Dialog.h b/genplugouts/gpro/Dialog.h
index 2fe8cdcc7..dc54ef2e1 100644
--- a/genplugouts/gpro/Dialog.h
+++ b/genplugouts/gpro/Dialog.h
@@ -2,7 +2,7 @@
 #define _DIALOG_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 #include "qdialog.h"
 
@@ -10,36 +10,36 @@ class UmlArtifact;
 class SmallPushButton;
 
 class QLineEdit;
-class Q3TextEdit;
+class QTextEdit;
 class QPushButton;
-class Q3ComboBox;
+class QComboBox;
 
 class Dialog : public QDialog
 {
     Q_OBJECT
-public:
-    Dialog(UmlArtifact * art, const Q3CString & path_exe, Q3CString & pro, Q3CString & target, Q3CString & tmplt, Q3CString & config, Q3CString & defines, Q3CString & includepath, Q3CString & dependpath, Q3CString & objectsdir, Q3CString & footer);
+  public:
+    Dialog(UmlArtifact * art, const QByteArray & path_exe, QByteArray & pro, QByteArray & target, QByteArray & tmplt, QByteArray & config, QByteArray & defines, QByteArray & includepath, QByteArray & dependpath, QByteArray & objectsdir, QByteArray & footer);
 
-protected:
+  protected:
     UmlArtifact * _art;
 
-    Q3CString & _pro;
+    QByteArray & _pro;
 
-    Q3CString & _target;
+    QByteArray & _target;
 
-    Q3CString & _tmplt;
+    QByteArray & _tmplt;
 
-    Q3CString & _config;
+    QByteArray & _config;
 
-    Q3CString & _defines;
+    QByteArray & _defines;
 
-    Q3CString & _includepath;
+    QByteArray & _includepath;
 
-    Q3CString & _dependpath;
+    QByteArray & _dependpath;
 
-    Q3CString & _objectsdir;
+    QByteArray & _objectsdir;
 
-    Q3CString & _footer;
+    QByteArray & _footer;
 
     QLineEdit * edpro;
 
@@ -49,9 +49,9 @@ class Dialog : public QDialog
 
     QPushButton * browsetarget;
 
-    Q3ComboBox * cbtemplate;
+    QComboBox * cbtemplate;
 
-    Q3ComboBox * cbconf[5];
+    QComboBox * cbconf[5];
 
     QLineEdit * eddefines;
 
@@ -65,7 +65,7 @@ class Dialog : public QDialog
 
     QPushButton * browseobjectsdir;
 
-    Q3TextEdit * edfooter;
+    QTextEdit * edfooter;
 
 protected slots:
     virtual void polish();
diff --git a/genplugouts/gpro/IdlSettings.cpp b/genplugouts/gpro/IdlSettings.cpp
index 138e605fa..ebdb6681f 100644
--- a/genplugouts/gpro/IdlSettings.cpp
+++ b/genplugouts/gpro/IdlSettings.cpp
@@ -5,11 +5,11 @@
 
 #include "UmlCom.h"
 #include "UmlSettings.h"
-#include "Tools/ApiCmd.h"
+#include "IdlSettingsCmd.h"
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,27 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationStereotypeCmd, s, v);
-
+  UmlCom::send_cmd(idlSettingsCmd, setIdlRelationStereotypeCmd, s, v);
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +82,28 @@ bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +116,31 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +151,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -171,14 +170,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -190,14 +189,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -209,14 +208,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -228,14 +227,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -247,14 +246,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -266,14 +265,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -285,14 +284,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -304,14 +303,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -323,14 +322,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -342,14 +341,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -361,14 +360,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl()
+const QByteArray & IdlSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool IdlSettings::set_AttributeDecl(Q3CString v)
+bool IdlSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -380,14 +379,14 @@ bool IdlSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl()
+const QByteArray & IdlSettings::valuetypeAttributeDecl()
 {
     read_if_needed_();
 
     return _valuetype_attr_decl;
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -399,14 +398,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl()
+const QByteArray & IdlSettings::unionItemDecl()
 {
     read_if_needed_();
 
     return _union_item_decl;
 }
 
-bool IdlSettings::set_UnionItemDecl(Q3CString v)
+bool IdlSettings::set_UnionItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -418,14 +417,14 @@ bool IdlSettings::set_UnionItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -437,14 +436,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl()
+const QByteArray & IdlSettings::constDecl()
 {
     read_if_needed_();
 
     return _const_decl;
 }
 
-bool IdlSettings::set_ConstDecl(Q3CString v)
+bool IdlSettings::set_ConstDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -456,14 +455,14 @@ bool IdlSettings::set_ConstDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
 
@@ -475,14 +474,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
 
@@ -494,14 +493,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
 
@@ -513,14 +512,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -532,14 +531,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -551,14 +550,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -591,60 +590,60 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl;
+QByteArray IdlSettings::_attr_decl;
 
-Q3CString IdlSettings::_valuetype_attr_decl;
+QByteArray IdlSettings::_valuetype_attr_decl;
 
-Q3CString IdlSettings::_union_item_decl;
+QByteArray IdlSettings::_union_item_decl;
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl;
+QByteArray IdlSettings::_const_decl;
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -666,13 +665,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/gpro/IdlSettings.h b/genplugouts/gpro/IdlSettings.h
index 04608fb4d..be820771f 100644
--- a/genplugouts/gpro/IdlSettings.h
+++ b/genplugouts/gpro/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype
-    static const Q3CString & valuetypeAttributeDecl();
+    static const QByteArray & valuetypeAttributeDecl();
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(Q3CString v);
+    static bool set_ValuetypeAttributeDecl(QByteArray v);
 
     // returns the default definition of an union item
-    static const Q3CString & unionItemDecl();
+    static const QByteArray & unionItemDecl();
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(Q3CString v);
+    static bool set_UnionItemDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute
-    static const Q3CString & constDecl();
+    static const QByteArray & constDecl();
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(Q3CString v);
+    static bool set_ConstDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _valuetype_attr_decl;
+    static QByteArray _valuetype_attr_decl;
 
-    static Q3CString _union_item_decl;
+    static QByteArray _union_item_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl;
+    static QByteArray _const_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/gpro/IdlSettingsCmd.cpp b/genplugouts/gpro/IdlSettingsCmd.cpp
index ca70c4ecb..7bdb1d964 100644
--- a/genplugouts/gpro/IdlSettingsCmd.cpp
+++ b/genplugouts/gpro/IdlSettingsCmd.cpp
@@ -1,3 +1,3 @@
 
-#include "Tools/ApiCmd.h"
+#include "IdlSettingsCmd.h"
 
diff --git a/genplugouts/gpro/JavaSettings.cpp b/genplugouts/gpro/JavaSettings.cpp
index d5be1894e..a0abbaee2 100644
--- a/genplugouts/gpro/JavaSettings.cpp
+++ b/genplugouts/gpro/JavaSettings.cpp
@@ -5,11 +5,10 @@
 
 #include "UmlCom.h"
 #include "UmlSettings.h"
-#include "Tools/ApiCmd.h"
+#include "JavaSettingsCmd.h"
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,21 +21,21 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +48,28 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationStereotypeCmd, s, v);
+  UmlCom::send_cmd(javaSettingsCmd, setJavaRelationStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +82,28 @@ bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +116,31 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +151,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -171,14 +170,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -190,14 +189,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -209,14 +208,14 @@ bool JavaSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -228,14 +227,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -247,14 +246,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumDecl()
+const QByteArray & JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -266,14 +265,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -285,14 +284,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl()
+const QByteArray & JavaSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool JavaSettings::set_AttributeDecl(Q3CString v)
+bool JavaSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -304,14 +303,14 @@ bool JavaSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemDecl()
+const QByteArray & JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -323,16 +322,16 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemCase()
+const QByteArray & JavaSettings::enumItemCase()
 {
     read_if_needed_();
 
     return _enum_item_case;
 }
 
-bool JavaSettings::set_EnumItemCase(Q3CString v)
+bool JavaSettings::set_EnumItemCase(QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemCaseCmd, (const char *)v); //[rageek] Fix prototype
+    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
         _enum_item_case = v;
@@ -342,14 +341,14 @@ bool JavaSettings::set_EnumItemCase(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
 
@@ -361,14 +360,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -399,14 +398,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -418,14 +417,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -515,52 +514,52 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl;
+QByteArray JavaSettings::_attr_decl;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_enum_item_case;
+QByteArray JavaSettings::_enum_item_case;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray, QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -581,13 +580,13 @@ void JavaSettings::read_()
     n = UmlCom::read_unsigned();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/gpro/JavaSettings.h b/genplugouts/gpro/JavaSettings.h
index 4de7719ac..01dd835fc 100644
--- a/genplugouts/gpro/JavaSettings.h
+++ b/genplugouts/gpro/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,160 +31,160 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationUmlStereotype(const Q3CString & s);
+    static QByteArray relationUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumItemCase();
+    static const QByteArray & enumItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumItemCase(Q3CString v);
+    static bool set_EnumItemCase(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -198,23 +198,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -263,45 +263,45 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _enum_item_case;
+    static QByteArray _enum_item_case;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/gpro/JavaSettingsCmd.cpp b/genplugouts/gpro/JavaSettingsCmd.cpp
index ca70c4ecb..84f708bbd 100644
--- a/genplugouts/gpro/JavaSettingsCmd.cpp
+++ b/genplugouts/gpro/JavaSettingsCmd.cpp
@@ -1,3 +1,3 @@
 
-#include "Tools/ApiCmd.h"
+#include "JavaSettingsCmd.h"
 
diff --git a/genplugouts/gpro/MiscGlobalCmd.cpp b/genplugouts/gpro/MiscGlobalCmd.cpp
index ca70c4ecb..f81ae0e4d 100644
--- a/genplugouts/gpro/MiscGlobalCmd.cpp
+++ b/genplugouts/gpro/MiscGlobalCmd.cpp
@@ -1,3 +1,3 @@
 
-#include "Tools/ApiCmd.h"
+#include "MiscGlobalCmd.h"
 
diff --git a/genplugouts/gpro/OnInstanceCmd.cpp b/genplugouts/gpro/OnInstanceCmd.cpp
index ca70c4ecb..4d9dc314b 100644
--- a/genplugouts/gpro/OnInstanceCmd.cpp
+++ b/genplugouts/gpro/OnInstanceCmd.cpp
@@ -1,3 +1,3 @@
 
-#include "Tools/ApiCmd.h"
+#include "OnInstanceCmd.h"
 
diff --git a/genplugouts/gpro/OnInstanceCmd.h b/genplugouts/gpro/OnInstanceCmd.h
index 6b984a37c..a97462020 100644
--- a/genplugouts/gpro/OnInstanceCmd.h
+++ b/genplugouts/gpro/OnInstanceCmd.h
@@ -4,178 +4,103 @@
 
 // Internal enum
 enum OnInstanceCmd {
-    parentCmd = 0,
-    childrenCmd  = 1,
-    getDefCmd = 2,
-    getUmlDefCmd  = 3,
-    getCppDefCmd = 4,
-    getJavaDefCmd = 5,
-    getIdlDefCmd = 6,
-    isWritableCmd = 7,
-    supportFileCmd = 8,
-    isOpenCmd =9 ,
-    setOpenCmd =10,
-    assocComponentCmd =11,
-    assocArtifactCmd =12,
-    saveInCmd  =13,
-    formalsCmd  =14,
-    actualsCmd = 15,
-    cppBodyCmd =16,
-    javaBodyCmd =17,
-    applyCmd=18,
-    referencedByCmd=19,
-    sideCmd = 20,
-    attributesCmd = 21,
-    relationsCmd = 22,
-    getPhpDefCmd = 23,
-    phpBodyCmd = 24,
-    getPythonDefCmd = 25,
-    pythonBodyCmd = 26,
-    firstSetCmd = 50, // just a mark
-    createCmd = 51,
-    setCoupleValueCmd = 52,
-    setDescriptionCmd = 53,
-    setNameCmd = 54,
-    setStereotypeCmd = 55,
-    addAssocClassCmd = 56,
-    removeAssocClassCmd  = 57,
-    setAssocClassesCmd  = 58,
-    setAssocDiagramCmd = 59,
-    setAssocViewCmd = 60,
-    addGetOperCmd,
-    addSetOperCmd,
-    setIsClassMemberCmd,
-    setVisibilityCmd,
-    setCppDeclCmd,
-    setCppDefCmd,
-    setJavaDeclCmd,
-    setIdlDeclCmd,
-    setCppVisibilityCmd,
-    setIsReadOnlyCmd,
-    setDefaultValueCmd,
-    setTypeCmd,
-    setIsVolatileCmd,
-    setIsCppMutableCmd,
-    setIsJavaTransientCmd,
-    setIdlCaseCmd,
-    setIsCppInlineCmd,
-    setIsAbstractCmd,
-    setBaseTypeCmd,
-    setIsCppExternalCmd,
-    setIsJavaExternalCmd,
-    setIsIdlExternalCmd,
-    setIsJavaPublicCmd,
-    setIsJavaFinalCmd,
-    setIsIdlLocalCmd,
-    setIsIdlCustomCmd,
-    setSwitchTypeCmd,
-    removeFormalCmd,
-    addFormalCmd,
-    replaceFormalCmd,
-    replaceActualCmd,
-    setCppHCmd,
-    setCppSrcCmd,
-    setJavaSrcCmd,
-    setIdlSrcCmd,
-    addAssocArtifactCmd,
-    removeAssocArtifactCmd,
-    removeAllAssocArtifactsCmd,
-    setReturnTypeCmd,
-    setIsCppConstCmd,
-    setIsCppFriendCmd,
-    setIsCppVirtualCmd,
-    setIsCppDefaultCmd,
-    setIsCppDeleteCmd,
-    setIsCppOverrideCmd,
-    setIsCppFinalCmd,
-    setIsIdlTruncatableCmd,
-    setCppBodyCmd,
-    setCppNameSpecCmd,
-    setJavaFinalCmd,
-    setJavaSynchronizedCmd,
-    setJavaBodyCmd,
-    setJavaNameSpecCmd,
-    setIsIdlOnewayCmd,
-    setIdlNameSpecCmd,
-    addParameterCmd,
-    removeParameterCmd,
-    replaceParameterCmd,
-    addExceptionCmd,
-    removeExceptionCmd,
-    replaceExceptionCmd,
-    setCppSrcDirCmd,
-    setCppHDirCmd,
-    setCppNamespaceCmd,
-    setJavaDirCmd,
-    setJavaPackageCmd,
-    setIdlDirCmd,
-    setIdlModuleCmd,
-    setRoleNameCmd,
-    setMultiplicityCmd,
-    setCppVirtualInheritanceCmd,
-    setMarkedCmd,
-    setUmlEntryBehaviorCmd,
-    setUmlExitBehaviorCmd,
-    setUmlActivityCmd,
-    setCppEntryBehaviorCmd,
-    setCppExitBehaviorCmd,
-    setCppActivityCmd,
-    setJavaEntryBehaviorCmd,
-    setJavaExitBehaviorCmd,
-    setJavaActivityCmd,
-    setUmlTriggerCmd,
-    setUmlGuardCmd,
-    setCppTriggerCmd,
-    setCppGuardCmd,
-    setJavaGuardCmd,
-    setJavaTriggerCmd,
-    setDefCmd,
-    moveAfterCmd,
-    setJavaAnnotationCmd,
-    setRelationAssocClassCmd,
-    setReadOnlyCmd,
-    setSingleExecutionCmd,
-    setUnmarshallCmd,
-    setTimeEventCmd,
-    setFlagCmd,
-    setUniqueCmd,
-    setStreamCmd,
-    setInStateCmd,
-    setOrderingCmd,
-    setCppFrozenCmd,
-    setJavaFrozenCmd,
-    setIdlFrozenCmd,
-    setConstraintCmd,
-    deleteCmd,
-    setAttributeCmd,
-    addRelationCmd,
-    removeRelationCmd,
-    setPhpDeclCmd,
-    setIsPhpExternalCmd,
-    setIsPhpFinalCmd,
-    setPhpSrcCmd,
-    setPhpFinalCmd,
-    setPhpBodyCmd,
-    setPhpNameSpecCmd,
-    setPhpDirCmd,
-    setPhpFrozenCmd,
-    setIsForceBodyGenCmd,
-    setCppContextualBodyIndentCmd,
-    setJavaContextualBodyIndentCmd,
-    setPhpContextualBodyIndentCmd,
-    setPythonDeclCmd,
-    setIsPythonExternalCmd,
-    setPythonSrcCmd,
-    setPythonBodyCmd,
-    setPythonNameSpecCmd,
-    setPythonDirCmd,
-    setPythonFrozenCmd,
-    setIsPython2_2Cmd,
-    setPythonDecoratorsCmd,
-    setPythonPackageCmd,
-    setPythonContextualBodyIndentCmd,
-    applyStereotypeCmd,
-    setDerivedCmd
+  parentCmd,
+  childrenCmd,
+  getDefCmd,
+  getUmlDefCmd,
+  getCppDefCmd,
+  getJavaDefCmd,
+  getIdlDefCmd,
+  isWritableCmd,
+  supportFileCmd,
+  isOpenCmd,
+  setOpenCmd,
+  assocComponentCmd,
+  assocArtifactCmd,
+  saveInCmd,
+  formalsCmd,
+  actualsCmd,
+  cppBodyCmd,
+  javaBodyCmd,
+  applyCmd,
+  firstSetCmd= 50,// just a mark
+  createCmd,
+  setCoupleValueCmd,
+  setDescriptionCmd,
+  setNameCmd,
+  setStereotypeCmd,
+  addAssocClassCmd,
+  removeAssocClassCmd,
+  setAssocClassesCmd,
+  setAssocDiagramCmd,
+  setAssocViewCmd,
+  addGetOperCmd,
+  addSetOperCmd,
+  setIsClassMemberCmd,
+  setVisibilityCmd,
+  setCppDeclCmd,
+  setCppDefCmd,
+  setJavaDeclCmd,
+  setIdlDeclCmd,
+  setCppVisibilityCmd,
+  setIsReadOnlyCmd,
+  setDefaultValueCmd,
+  setTypeCmd,
+  setIsCppVolatileCmd,
+  setIsCppMutableCmd,
+  setIsJavaTransientCmd,
+  setIdlCaseCmd,
+  setIsCppInlineCmd,
+  setIsAbstractCmd,
+  setBaseTypeCmd,
+  setIsCppExternalCmd,
+  setIsJavaExternalCmd,
+  setIsIdlExternalCmd,
+  setIsJavaPublicCmd,
+  setIsJavaFinalCmd,
+  setIsIdlLocalCmd,
+  setIsIdlCustomCmd,
+  setSwitchTypeCmd,
+  removeFormalCmd,
+  addFormalCmd,
+  replaceFormalCmd,
+  replaceActualCmd,
+  setCppHCmd,
+  setCppSrcCmd,
+  setJavaSrcCmd,
+  setIdlSrcCmd,
+  addAssocArtifactCmd,
+  removeAssocArtifactCmd,
+  removeAllAssocArtifactsCmd,
+  setReturnTypeCmd,
+  setIsCppConstCmd,
+  setIsCppFriendCmd,
+  setIsCppVirtualCmd,
+  setIsIdlTruncatableCmd,
+  setCppBodyCmd,
+  setCppNameSpecCmd,
+  setJavaFinalCmd,
+  setJavaSynchronizedCmd,
+  setJavaBodyCmd,
+  setJavaNameSpecCmd,
+  setIsIdlOnewayCmd,
+  setIdlNameSpecCmd,
+  addParameterCmd,
+  removeParameterCmd,
+  replaceParameterCmd,
+  addExceptionCmd,
+  removeExceptionCmd,
+  replaceExceptionCmd,
+  setCppSrcDirCmd,
+  setCppHDirCmd,
+  setCppNamespaceCmd,
+  setJavaDirCmd,
+  setJavaPackageCmd,
+  setIdlDirCmd,
+  setIdlModuleCmd,
+  setRoleNameCmd,
+  setMultiplicityCmd,
+  setCppVirtualInheritanceCmd
 
 };
 #endif
diff --git a/genplugouts/gpro/PackageGlobalCmd.cpp b/genplugouts/gpro/PackageGlobalCmd.cpp
index ca70c4ecb..e65207f55 100644
--- a/genplugouts/gpro/PackageGlobalCmd.cpp
+++ b/genplugouts/gpro/PackageGlobalCmd.cpp
@@ -1,3 +1,3 @@
 
-#include "Tools/ApiCmd.h"
+#include "PackageGlobalCmd.h"
 
diff --git a/genplugouts/gpro/UmlActualParameter.h b/genplugouts/gpro/UmlActualParameter.h
index a66aee3aa..783cdcc94 100644
--- a/genplugouts/gpro/UmlActualParameter.h
+++ b/genplugouts/gpro/UmlActualParameter.h
@@ -9,9 +9,8 @@
 //	class Cl1 : public Cl2<T> ...
 //
 // You can modify it as you want (except the constructor)
-class UmlActualParameter : public UmlBaseActualParameter
-{
-public:
+class UmlActualParameter : public UmlBaseActualParameter {
+  public:
     UmlActualParameter() {};
 
 };
diff --git a/genplugouts/gpro/UmlArtifact.cpp b/genplugouts/gpro/UmlArtifact.cpp
index 616c818e5..6e8c671dd 100644
--- a/genplugouts/gpro/UmlArtifact.cpp
+++ b/genplugouts/gpro/UmlArtifact.cpp
@@ -3,9 +3,8 @@
 
 #include <qdir.h>
 #include <qmessagebox.h>
-#include <q3textstream.h>
-//Added by qt3to4:
-#include <Q3CString>
+#include <qtextstream.h>
+#include <QByteArray>
 
 #include "CppSettings.h"
 #include "UmlPackage.h"
@@ -13,9 +12,9 @@
 #include "UmlClass.h"
 #include "Dialog.h"
 
-static Q3CString root_dir()
+static QByteArray root_dir()
 {
-    static Q3CString RootDir;
+    static QByteArray RootDir;
 
     if (RootDir.isEmpty()) {
         RootDir = CppSettings::rootDir();
@@ -27,9 +26,9 @@ static Q3CString root_dir()
 
         if (QDir::isRelativePath(RootDir)) {
             QFileInfo f(UmlPackage::getProject()->supportFile());
-            QDir d(f.dirPath());
+            QDir d(f.path());
 
-            RootDir = d.filePath(RootDir);
+            RootDir = d.filePath(RootDir).toLatin1();
         }
     }
 
@@ -41,7 +40,7 @@ void UmlArtifact::genpro()
 {
     UmlPackage * pack = (UmlPackage *) parent()->parent();
 
-    Q3CString path;
+    QByteArray path;
 
     if (! propertyValue("genpro path", path)) {
 
@@ -53,7 +52,7 @@ void UmlArtifact::genpro()
             QDir d(root_dir());
 
             d.cd(path);
-            path = d.absPath();
+            path = d.absolutePath().toLatin1();
         }
     }
 
@@ -64,10 +63,10 @@ void UmlArtifact::genpro()
         UmlCom::trace(stereotype() + " : not managed");
 }
 
-void UmlArtifact::gen_app(const Q3CString & path)
+void UmlArtifact::gen_app(const QByteArray & path)
 {
-    Q3CString target;
-    Q3CString pro;
+    QByteArray target;
+    QByteArray pro;
 
     propertyValue("genpro target", target);
     propertyValue("genpro pro", pro);
@@ -92,16 +91,16 @@ void UmlArtifact::gen_app(const Q3CString & path)
 
         QDir d(path);
 
-        pro = d.absFilePath(pro + ".pro");
+        pro = d.absoluteFilePath(pro + ".pro").toLatin1();
     }
 
-    Q3CString tmplt;
-    Q3CString config;
-    Q3CString defines;
-    Q3CString includepath;
-    Q3CString dependpath;
-    Q3CString objectsdir;
-    Q3CString footer;
+    QByteArray tmplt;
+    QByteArray config;
+    QByteArray defines;
+    QByteArray includepath;
+    QByteArray dependpath;
+    QByteArray objectsdir;
+    QByteArray footer;
 
     if (!propertyValue("genpro tmplt", tmplt))
         tmplt = "app";
@@ -111,34 +110,34 @@ void UmlArtifact::gen_app(const Q3CString & path)
 
     if (!propertyValue("genpro defines", defines))
         defines = "WITHCPP WITHJAVA WITHPHP WITHPYTHON WITHIDL";
-    else if (defines.find("WITHPHP") == -1) {
+    else if (defines.indexOf("WITHPHP") == -1) {
         int n = 0;
 
-        if (defines.find("WITHCPP") != -1)
+        if (defines.indexOf("WITHCPP") != -1)
             n += 1;
 
-        if (defines.find("WITHJAVA") != -1)
+        if (defines.indexOf("WITHJAVA") != -1)
             n += 1;
 
-        if (defines.find("WITHIDL") != -1)
+        if (defines.indexOf("WITHIDL") != -1)
             n += 1;
 
         if (n > 1)
             defines += " WITHPHP WITHPYTHON";
     }
-    else if (defines.find("WITHPYTHON") == -1) {
+    else if (defines.indexOf("WITHPYTHON") == -1) {
         int n = 0;
 
-        if (defines.find("WITHCPP") != -1)
+        if (defines.indexOf("WITHCPP") != -1)
             n += 1;
 
-        if (defines.find("WITHJAVA") != -1)
+        if (defines.indexOf("WITHJAVA") != -1)
             n += 1;
 
-        if (defines.find("WITHIDL") != -1)
+        if (defines.indexOf("WITHIDL") != -1)
             n += 1;
 
-        if (defines.find("WITHPHP") != -1)
+        if (defines.indexOf("WITHPHP") != -1)
             n += 1;
 
         if (n > 1)
@@ -173,17 +172,17 @@ void UmlArtifact::gen_app(const Q3CString & path)
         if (! f.open(QIODevice::WriteOnly))
             QMessageBox::critical((QWidget *) 0, "Error", "Cannot open " + QString(pro));
         else {
-            Q3TextStream t(&f);
+            QTextStream t(&f);
             QFileInfo tfi(target);
             QFileInfo pfi(pro);
 
             t << "TEMPLATE\t= " << tmplt << '\n';
             t << "TARGET\t\t= " << tfi.fileName() << '\n';
 
-            if ((target.find('/') != -1) &&
-                (pro.find('/') != -1) &&
-                (tfi.dirPath(TRUE) != pfi.dirPath(TRUE)))
-                t << "DESTDIR\t\t= " << tfi.dirPath(TRUE) << '\n';
+            if ((target.indexOf('/') != -1) &&
+                (pro.indexOf('/') != -1) &&
+                (tfi.path() != pfi.path()))
+                t << "DESTDIR\t\t= " << tfi.path() << '\n';
 
             if (! objectsdir.isEmpty())
                 t << "OBJECTS_DIR\t= " << objectsdir << '\n';
@@ -199,11 +198,11 @@ void UmlArtifact::gen_app(const Q3CString & path)
             if (!defines.isEmpty())
                 t << "DEFINES\t\t= " << defines << '\n';
 
-            QString prodir = pfi.dirPath(TRUE);
-            const Q3PtrVector<UmlArtifact> & arts = associatedArtifacts();
-            unsigned index;
+            QString prodir = pfi.path();
+            const QVector<UmlArtifact*> & arts = associatedArtifacts();
+            int index;
             const char * sep;
-            Q3CString ext;
+            QByteArray ext;
 
             ext = CppSettings::headerExtension();
             sep = "HEADERS\t\t= ";
@@ -275,7 +274,7 @@ QString UmlArtifact::way(QString pro_dir, bool header)
         QDir d(root_dir());
 
         d.cd(dir);
-        dir = d.absPath();
+        dir = d.absolutePath();
     }
 
     if (dir.at(dir.length() - 1) != '/')
@@ -289,14 +288,14 @@ QString UmlArtifact::way(QString pro_dir, bool header)
 
     // bypass common path header
 
-    unsigned index = 0;
-    unsigned i;
+    int index = 0;
+    int i;
     QString s;
 
     for (;;) {
         int i;
 
-        if ((i = pro_dir.find("/", index) + 1) != 0) {
+        if ((i = pro_dir.indexOf("/", index) + 1) != 0) {
             if (pro_dir.left(i) == dir.left(i))
                 index = i;
             else if (dir.length() == index) {
@@ -304,7 +303,7 @@ QString UmlArtifact::way(QString pro_dir, bool header)
                 do
                     s += "../";
 
-                while ((i = pro_dir.find("/", i) + 1) != 0);
+                while ((i = pro_dir.indexOf("/", i) + 1) != 0);
 
                 return s;
             }
@@ -325,7 +324,7 @@ QString UmlArtifact::way(QString pro_dir, bool header)
     // dir.at(index - 1) == pro_dir.at(index - 1) == '/'
     i = index;
 
-    while ((i = pro_dir.find("/", i) + 1) != 0)
+    while ((i = pro_dir.indexOf("/", i) + 1) != 0)
         s += "../";
 
     return s + dir.mid(index);
diff --git a/genplugouts/gpro/UmlArtifact.h b/genplugouts/gpro/UmlArtifact.h
index 31b122f48..120512c7d 100644
--- a/genplugouts/gpro/UmlArtifact.h
+++ b/genplugouts/gpro/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include <qstring.h>
 
 // This class manages 'artifacts'
@@ -12,11 +12,11 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
     virtual void genpro();
 
-    void gen_app(const Q3CString & path);
+    void gen_app(const QByteArray & path);
 
     QString way(QString pro_dir, bool header);
 
diff --git a/genplugouts/gpro/UmlAttribute.h b/genplugouts/gpro/UmlAttribute.h
index 19ee0a4c6..5db8f89fe 100644
--- a/genplugouts/gpro/UmlAttribute.h
+++ b/genplugouts/gpro/UmlAttribute.h
@@ -3,16 +3,15 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
 //
 // You can modify it as you want (except the constructor)
-class UmlAttribute : public UmlBaseAttribute
-{
-public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+class UmlAttribute : public UmlBaseAttribute {
+  public:
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseActualParameter.cpp b/genplugouts/gpro/UmlBaseActualParameter.cpp
index 8f3296885..69ae20ec3 100644
--- a/genplugouts/gpro/UmlBaseActualParameter.cpp
+++ b/genplugouts/gpro/UmlBaseActualParameter.cpp
@@ -3,29 +3,18 @@
 #include "UmlClass.h"
 
 #include "UmlCom.h"
-UmlClass * UmlBaseActualParameter::superClass() const
-{
-    return _superClass;
-}
-
-unsigned UmlBaseActualParameter::rank() const
-{
-    return _rank;
-}
+UmlClass * UmlBaseActualParameter::superClass() const { return _superClass; }
 
+unsigned UmlBaseActualParameter::rank() const { return _rank; }
 
-const UmlTypeSpec & UmlBaseActualParameter::value() const
-{
-    return _value;
-}
 
-void UmlBaseActualParameter::read_()
-{
-    _superClass = (UmlClass *) UmlBaseItem::read_();	// cannot be 0
-    _rank = UmlCom::read_unsigned();
-    _value.type = (UmlClass *) UmlBaseItem::read_();
+const UmlTypeSpec & UmlBaseActualParameter::value() const { return _value; }
 
-    if (_value.type == 0)
-        _value.explicit_type = UmlCom::read_string();
+void UmlBaseActualParameter::read_() {
+  _superClass = (UmlClass *) UmlBaseItem::read_();	// cannot be 0
+  _rank = UmlCom::read_unsigned();
+  _value.type = (UmlClass *) UmlBaseItem::read_();
+  if (_value.type == 0)
+    _value.explicit_type = UmlCom::read_string();
 }
 
diff --git a/genplugouts/gpro/UmlBaseActualParameter.h b/genplugouts/gpro/UmlBaseActualParameter.h
index 136408892..559581319 100644
--- a/genplugouts/gpro/UmlBaseActualParameter.h
+++ b/genplugouts/gpro/UmlBaseActualParameter.h
@@ -9,9 +9,8 @@ class UmlClass;
 // This class manages 'actual parameters' of a template class. For instance T in
 //
 //	class Cl1 : public Cl2<T> ...
-class UmlBaseActualParameter
-{
-public:
+class UmlBaseActualParameter {
+  public:
     UmlBaseActualParameter() {};
 
     // returns the class of the corresponding formal
@@ -23,9 +22,9 @@ class UmlBaseActualParameter
     // returns the actual's value
     const UmlTypeSpec & value() const;
 
-    friend class UmlBaseClass;
+  friend class UmlBaseClass;
 
-protected:
+  protected:
     UmlClass * _superClass;
 
     unsigned _rank;
diff --git a/genplugouts/gpro/UmlBaseArtifact.cpp b/genplugouts/gpro/UmlBaseArtifact.cpp
index 5f11e7a44..e376a7ed5 100644
--- a/genplugouts/gpro/UmlBaseArtifact.cpp
+++ b/genplugouts/gpro/UmlBaseArtifact.cpp
@@ -6,8 +6,7 @@
 #include "UmlClass.h"
 
 #include "UmlCom.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +36,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +50,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +68,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +77,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,7 +88,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd, l);
 
@@ -102,7 +102,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +116,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +134,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +143,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index]  = _associated[last];
 
             _associated.resize(last);
         }
@@ -166,54 +167,54 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -230,6 +231,12 @@ void UmlBaseArtifact::unload(bool rec, bool del)
 #ifdef WITHJAVA
     _java_src = 0;
 #endif
+#ifdef WITHPHP
+    _php_src = 0;
+#endif
+#ifdef WITHPYTHON
+    _python_src = 0;
+#endif
 #ifdef WITHIDL
     _idl_src = 0;
 #endif
@@ -248,13 +255,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
@@ -272,6 +279,19 @@ void UmlBaseArtifact::read_java_()
 }
 #endif
 
+#ifdef WITHPHP
+void UmlBaseArtifact::read_php_()
+{
+    _php_src = UmlCom::read_string();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseArtifact::read_python_()
+{
+    _python_src = UmlCom::read_string();
+}
+#endif
 #ifdef WITHIDL
 void UmlBaseArtifact::read_idl_()
 {
diff --git a/genplugouts/gpro/UmlBaseArtifact.h b/genplugouts/gpro/UmlBaseArtifact.h
index 7e4854ffd..fce67cc2a 100644
--- a/genplugouts/gpro/UmlBaseArtifact.h
+++ b/genplugouts/gpro/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,40 +83,40 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -128,22 +128,29 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
+#ifdef WITHPHP
+    QByteArray _php_src;
+#endif
+
+#ifdef WITHPYTHON
+    QByteArray _python_src;
+#endif
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -158,16 +165,28 @@ class UmlBaseArtifact : public UmlItem
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/gpro/UmlBaseAttribute.cpp b/genplugouts/gpro/UmlBaseAttribute.cpp
index 1273e14af..41585d9eb 100644
--- a/genplugouts/gpro/UmlBaseAttribute.cpp
+++ b/genplugouts/gpro/UmlBaseAttribute.cpp
@@ -5,204 +5,186 @@
 #include "UmlOperation.h"
 
 #include "UmlCom.h"
-//Added by qt3to4:
-#include <Q3CString>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
-    return (UmlAttribute *) parent->create_(anAttribute, s);
+  return (UmlAttribute *) parent->create_(anAttribute, s);
 }
 
-anItemKind UmlBaseAttribute::kind()
-{
-    return anAttribute;
+anItemKind UmlBaseAttribute::kind() {
+  return anAttribute;
 }
 
-bool UmlBaseAttribute::isReadOnly()
-{
-    read_if_needed_();
-
-    return _read_only;
+bool UmlBaseAttribute::isReadOnly() {
+  read_if_needed_();
+  
+  return _read_only;
 }
 
-bool UmlBaseAttribute::set_isReadOnly(bool y)
-{
-    return set_it_(_read_only, y, setIsReadOnlyCmd);
+bool UmlBaseAttribute::set_isReadOnly(bool y) {
+  return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
-{
-    read_if_needed_();
-
-    return _default_value;
+const QByteArray & UmlBaseAttribute::defaultValue() {
+  read_if_needed_();
+  
+  return _default_value;
 }
 
-bool UmlBaseAttribute::set_DefaultValue(const char * s)
-{
-    return set_it_(_default_value, s, setDefaultValueCmd);
+bool UmlBaseAttribute::set_DefaultValue(const char * s) {
+  return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-const UmlTypeSpec & UmlBaseAttribute::type()
-{
-    read_if_needed_();
-
-    return _type;
+const UmlTypeSpec & UmlBaseAttribute::type() {
+  read_if_needed_();
+  
+  return _type;
 }
 
-bool UmlBaseAttribute::set_Type(const UmlTypeSpec & t)
-{
-    return set_it_(_type, t, setTypeCmd);
+bool UmlBaseAttribute::set_Type(const UmlTypeSpec & t) {
+  return set_it_(_type, t, setTypeCmd);
 }
 
-UmlOperation * UmlBaseAttribute::getOperation()
-{
-    read_if_needed_();
-
-    return _get_oper;
+UmlOperation * UmlBaseAttribute::getOperation() {
+  read_if_needed_();
+  
+  return _get_oper;
 }
 
-bool UmlBaseAttribute::addGetOperation()
-{
-    UmlCom::send_cmd(_identifier, addGetOperCmd);
-
-    if (UmlCom::read_bool()) {
-        reread_children_if_needed_();
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseAttribute::addGetOperation() {
+  UmlCom::send_cmd(_identifier, addGetOperCmd);
+  if (UmlCom::read_bool()) {
+    reread_children_if_needed_();
+    return TRUE;
+  }
+ else
+   return FALSE;
 }
 
-UmlOperation * UmlBaseAttribute::setOperation()
-{
-    read_if_needed_();
-
-    return _set_oper;
+UmlOperation * UmlBaseAttribute::setOperation() {
+  read_if_needed_();
+  
+  return _set_oper;
 }
 
-bool UmlBaseAttribute::addSetOperation()
-{
-    UmlCom::send_cmd(_identifier, addSetOperCmd);
-
-    if (UmlCom::read_bool()) {
-        reread_children_if_needed_();
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseAttribute::addSetOperation() {
+  UmlCom::send_cmd(_identifier, addSetOperCmd);
+  if (UmlCom::read_bool()) {
+    reread_children_if_needed_();
+    return TRUE;
+  }
+ else
+   return FALSE;
 }
 
 #ifdef WITHCPP
-bool UmlBaseAttribute::isCppMutable()
-{
-    read_if_needed_();
-
-    return _cpp_mutable;
+bool UmlBaseAttribute::isCppMutable() {
+  read_if_needed_();
+  
+  return _cpp_mutable;
 }
 
-bool UmlBaseAttribute::set_isCppMutable(bool y)
-{
-    return set_it_(_cpp_mutable, y, setIsCppMutableCmd);
+bool UmlBaseAttribute::set_isCppMutable(bool y) {
+  return set_it_(_cpp_mutable, y, setIsCppMutableCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-bool UmlBaseAttribute::isJavaTransient()
-{
-    read_if_needed_();
-
-    return _java_transient;
+bool UmlBaseAttribute::isJavaTransient() {
+  read_if_needed_();
+  
+  return _java_transient;
 }
 
-bool UmlBaseAttribute::set_isJavaTransient(bool y)
-{
-    return set_it_(_java_transient, y, setIsJavaTransientCmd);
+bool UmlBaseAttribute::set_isJavaTransient(bool y) {
+  return set_it_(_java_transient, y, setIsJavaTransientCmd);
 
 }
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
-{
-    read_if_needed_();
-
-    return (_idl_case != 0) ? _idl_case->name() : _idl_explicit_case;
-}
-
-bool UmlBaseAttribute::set_IdlCase(UmlAttribute * a)
-{
-    UmlCom::send_cmd(_identifier, setIdlCaseCmd, a->_identifier, "");
-
-    if (UmlCom::read_bool()) {
-        _idl_case = a;
-        _idl_explicit_case = 0;
-        return TRUE;
-    }
-    else
-        return FALSE;
+QByteArray UmlBaseAttribute::idlCase() {
+  read_if_needed_();
+  
+  return (_idl_case != 0) ? _idl_case->name() : _idl_explicit_case;
 }
 
-bool UmlBaseAttribute::set_IdlCase(const char * s)
-{
-    UmlCom::send_cmd(_identifier, setIdlCaseCmd, (void *) 0, s);
-
-    if (UmlCom::read_bool()) {
-        _idl_case = 0;
-        _idl_explicit_case = s;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseAttribute::set_IdlCase(UmlAttribute * a) {
+  UmlCom::send_cmd(_identifier, setIdlCaseCmd, a->_identifier, "");
+  if (UmlCom::read_bool()) {
+    _idl_case = a;
+    _idl_explicit_case = 0;
+    return TRUE;
+  }
+ else
+   return FALSE;
+}
+
+bool UmlBaseAttribute::set_IdlCase(const char * s) {
+  UmlCom::send_cmd(_identifier, setIdlCaseCmd, (void *) 0, s);
+  if (UmlCom::read_bool()) {
+    _idl_case = 0;
+    _idl_explicit_case = s;
+    return TRUE;
+  }
+ else
+   return FALSE;
 }
 #endif
 
-void UmlBaseAttribute::unload(bool rec, bool del)
-{
-    _type.explicit_type = 0;
-    _default_value = 0;
+void UmlBaseAttribute::unload(bool rec, bool del) {
+  _type.explicit_type = 0;
+  _default_value = 0;
 #ifdef WITHIDL
-    _idl_explicit_case = 0;
+  _idl_explicit_case = 0;
 #endif
-    UmlBaseClassMember::unload(rec, del);
+  UmlBaseClassMember::unload(rec, del);
 }
 
-void UmlBaseAttribute::read_uml_()
-{
-    UmlBaseClassMember::read_uml_();
-    _type.type = (UmlClass *) UmlBaseItem::read_();
-
-    if (_type.type == 0)
-        _type.explicit_type = UmlCom::read_string();
-
-    _default_value = UmlCom::read_string();
-    _read_only = UmlCom::read_bool();
-    _get_oper = (UmlOperation *) UmlBaseItem::read_();
-    _set_oper = (UmlOperation *) UmlBaseItem::read_();
+void UmlBaseAttribute::read_uml_() {
+  UmlBaseClassMember::read_uml_();
+  _type.type = (UmlClass *) UmlBaseItem::read_();
+  if (_type.type == 0)
+    _type.explicit_type = UmlCom::read_string();
+  _default_value = UmlCom::read_string();
+  _read_only = UmlCom::read_bool();
+  _get_oper = (UmlOperation *) UmlBaseItem::read_();
+  _set_oper = (UmlOperation *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
-void UmlBaseAttribute::read_cpp_()
-{
-    UmlBaseClassMember::read_cpp_();
-    _cpp_mutable = UmlCom::read_bool();
+void UmlBaseAttribute::read_cpp_() {
+  UmlBaseClassMember::read_cpp_();
+  _cpp_mutable = UmlCom::read_bool();
 }
 #endif
 
 #ifdef WITHJAVA
-void UmlBaseAttribute::read_java_()
+void UmlBaseAttribute::read_java_() {
+  UmlBaseClassItem::read_java_();
+  _java_transient = UmlCom::read_bool();
+}
+#endif
+
+#ifdef WITHPHP
+void UmlBaseAttribute::read_php_()
 {
-    UmlBaseClassItem::read_java_();
-    _java_transient = UmlCom::read_bool();
+    UmlBaseClassMember::read_php_();
 }
 #endif
 
-#ifdef WITHIDL
-void UmlBaseAttribute::read_idl_()
+#ifdef WITHPYTHON
+void UmlBaseAttribute::read_python_()
 {
-    UmlBaseClassItem::read_idl_();
-    _idl_case = (UmlAttribute *) UmlBaseItem::read_();
+    UmlBaseClassMember::read_python_();
+}
+#endif
 
-    if (_idl_case == 0)
-        _idl_explicit_case = UmlCom::read_string();
+#ifdef WITHIDL
+void UmlBaseAttribute::read_idl_() {
+  UmlBaseClassItem::read_idl_();
+  _idl_case = (UmlAttribute *) UmlBaseItem::read_();
+  if (_idl_case == 0)
+    _idl_explicit_case = UmlCom::read_string();
 }
 #endif
 
diff --git a/genplugouts/gpro/UmlBaseAttribute.h b/genplugouts/gpro/UmlBaseAttribute.h
index 4362fb35e..af29386c4 100644
--- a/genplugouts/gpro/UmlBaseAttribute.h
+++ b/genplugouts/gpro/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -13,9 +13,8 @@ class UmlOperation;
 
 //  Manage the class's attributs
 
-class UmlBaseAttribute : public UmlClassMember
-{
-public:
+class UmlBaseAttribute : public UmlClassMember {
+  public:
     // returns a new attribute named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -30,15 +29,15 @@ class UmlBaseAttribute : public UmlClassMember
     bool isReadOnly();
 
     // to set the 'read only' state of the attribute
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isReadOnly(bool y);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_DefaultValue(const char * s);
 
@@ -46,7 +45,7 @@ class UmlBaseAttribute : public UmlClassMember
     const UmlTypeSpec & type();
 
     // to set the attribute UML type
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_Type(const UmlTypeSpec & t);
 
@@ -54,16 +53,16 @@ class UmlBaseAttribute : public UmlClassMember
     UmlOperation * getOperation();
 
     // to generate an associated 'get' operation
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool addGetOperation();
 
     // returns the 'set' operation of the attribute, or 0 if it does not exist
-
+    
     UmlOperation * setOperation();
 
     // to generate an associated 'set' operation
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool addSetOperation();
 
@@ -81,7 +80,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool isJavaTransient();
 
     // to set the 'transient' state of the attribute
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isJavaTransient(bool y);
 #endif
@@ -89,7 +88,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -109,7 +108,7 @@ class UmlBaseAttribute : public UmlClassMember
     virtual void unload(bool = FALSE, bool = FALSE);
 
 
-private:
+  private:
     bool _read_only;
 
 #ifdef WITHCPP
@@ -119,7 +118,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -131,16 +130,16 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
-public:
+  public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
-protected:
+  protected:
     virtual void read_uml_();
 
 #ifdef WITHCPP
@@ -151,19 +150,32 @@ class UmlBaseAttribute : public UmlClassMember
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
+    //internal, do NOT use it
+
     virtual void read_idl_();
 #endif
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
-{
-    _get_oper = 0;
-    _set_oper = 0;
-
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n) {
+  _get_oper = 0;
+  _set_oper = 0;
+  
 #ifdef WITHIDL
-    _idl_case = 0;
+  _idl_case = 0;
 #endif
 }
 
diff --git a/genplugouts/gpro/UmlBaseClass.cpp b/genplugouts/gpro/UmlBaseClass.cpp
index ef7c37543..d54ff0035 100644
--- a/genplugouts/gpro/UmlBaseClass.cpp
+++ b/genplugouts/gpro/UmlBaseClass.cpp
@@ -7,10 +7,9 @@
 #include "UmlPackage.h"
 
 #include "UmlCom.h"
-#include "Tools/ApiCmd.h"
-//Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include "ClassGlobalCmd.h"
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -45,11 +44,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -81,11 +80,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -283,7 +282,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = classes[n];
@@ -310,9 +309,9 @@ void UmlBaseClass::unload(bool rec, bool del)
 }
 
 //key includes package/class-container
-Q3Dict<UmlClass> UmlBaseClass::classes(1001);
+QHash<QByteArray,UmlClass*> UmlBaseClass::classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -320,7 +319,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     classes.insert(n, (UmlClass *) this);
 
     if ((classes.count() / 2) >= classes.size())
-        classes.resize(classes.size() * 2 - 1);
+        classes.reserve(classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
@@ -354,6 +353,24 @@ void UmlBaseClass::read_java_()
     _java_external = UmlCom::read_bool();
 }
 #endif
+#ifdef WITHPHP
+void UmlBaseClass::read_php_()
+{
+    UmlBaseClassMember::read_php_();
+    ;
+    _php_final = UmlCom::read_bool();
+    _php_external = UmlCom::read_bool();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseClass::read_python_()
+{
+    UmlBaseClassMember::read_python_();
+    _python_2_2 = UmlCom::read_bool();
+    _python_external = UmlCom::read_bool();
+}
+#endif
 
 #ifdef WITHIDL
 void UmlBaseClass::read_idl_()
diff --git a/genplugouts/gpro/UmlBaseClass.h b/genplugouts/gpro/UmlBaseClass.h
index d800dbf98..b89071c64 100644
--- a/genplugouts/gpro/UmlBaseClass.h
+++ b/genplugouts/gpro/UmlBaseClass.h
@@ -5,9 +5,9 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+#include <QByteArray>
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -20,10 +20,9 @@ class UmlArtifact;
 class UmlPackage;
 
 //  Manage the classes
-class UmlBaseClass : public UmlClassMember
-{
-public:
-    // returns a new class named 'name' created under 'parent'
+class UmlBaseClass : public UmlClassMember {
+  public:
+    // returns a new class named 'name' created under 'parent' 
     //
     // In case it cannot be created (the name is already used or
     // invalid, 'parent' cannot contain it etc ...) return 0 in C++
@@ -47,12 +46,12 @@ class UmlBaseClass : public UmlClassMember
     const UmlTypeSpec & baseType();
 
     // to set the type on which the class (in fact a typedef) is based
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java, does not check that the class is (already) a typedef
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -64,18 +63,18 @@ class UmlBaseClass : public UmlClassMember
     //
     //On error return FALSE in C++, produce a RuntimeException in Java,
     //does not check that the class is (already) a typedef
-
+    
     bool addFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // replace the formal at the given rank (0...)
     //
     // On error return FALSE in C++, produce a RuntimeException in Java,
     // does not check that the class is (already) a typedef
-
+    
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -104,7 +103,7 @@ class UmlBaseClass : public UmlClassMember
     bool isCppExternal();
 
     // set if the class is external
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isCppExternal(bool y);
 #endif
@@ -116,7 +115,7 @@ class UmlBaseClass : public UmlClassMember
     bool isJavaExternal();
 
     // set if the class is external
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isJavaExternal(bool y);
 
@@ -124,15 +123,15 @@ class UmlBaseClass : public UmlClassMember
     bool isJavaPublic();
 
     // set if the class is public
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isJavaPublic(bool y);
 
-    // returns TRUE is the class is final
+    // returns TRUE is the class is final   
     bool isJavaFinal();
 
     // set if the class is final
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isJavaFinal(bool y);
 #endif
@@ -177,23 +176,23 @@ class UmlBaseClass : public UmlClassMember
     //returns the class having the name given in argument in case it
     //exist, else 0/null. In case the package is specified, the class must
     //be defined in a sub-level of the package
-
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // to unload the object to free memory, it will be reloaded automatically
-    // if needed. Recursively done for the sub items if 'rec' is TRUE.
+    // if needed. Recursively done for the sub items if 'rec' is TRUE. 
     //
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
     virtual void unload(bool rec = FALSE, bool del = FALSE);
 
-    friend class UmlBaseRelation;
-    friend class UmlBaseArtifact;
+  friend class UmlBaseRelation;
+  friend class UmlBaseArtifact;
 
-private:
+  private:
     //key includes package/class-container
-    static Q3Dict<UmlClass> classes;
+    static QHash<QByteArray,UmlClass*> classes;
 
     bool _abstract;
 
@@ -208,6 +207,17 @@ class UmlBaseClass : public UmlClassMember
 
     bool _java_final : 1;
 #endif
+#ifdef WITHPHP
+    bool _php_external : 1;
+
+    bool _php_final : 1;
+#endif
+
+#ifdef WITHPYTHON
+    bool _python_external : 1;
+
+    bool _python_2_2 : 1;
+#endif
 
 #ifdef WITHIDL
     bool _idl_external : 1;
@@ -216,7 +226,7 @@ class UmlBaseClass : public UmlClassMember
 
     bool _idl_custom : 1;
 #endif
-
+    
 
     UmlTypeSpec _base_type;
 
@@ -228,9 +238,9 @@ class UmlBaseClass : public UmlClassMember
 #endif
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     virtual void read_uml_();
 
@@ -242,6 +252,18 @@ class UmlBaseClass : public UmlClassMember
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
diff --git a/genplugouts/gpro/UmlBaseClassDiagram.cpp b/genplugouts/gpro/UmlBaseClassDiagram.cpp
index 16aa459a2..12d562fa5 100644
--- a/genplugouts/gpro/UmlBaseClassDiagram.cpp
+++ b/genplugouts/gpro/UmlBaseClassDiagram.cpp
@@ -5,11 +5,10 @@
 
 UmlClassDiagram * UmlBaseClassDiagram::create(UmlClassView * parent, const char * s)
 {
-    return (UmlClassDiagram *) parent->create_(aClassDiagram, s);
+  return (UmlClassDiagram *) parent->create_(aClassDiagram, s);
 }
 
-anItemKind UmlBaseClassDiagram::kind()
-{
-    return aClassDiagram;
+anItemKind UmlBaseClassDiagram::kind() {
+  return aClassDiagram;
 }
 
diff --git a/genplugouts/gpro/UmlBaseClassDiagram.h b/genplugouts/gpro/UmlBaseClassDiagram.h
index bed4ce3c0..82b5470a2 100644
--- a/genplugouts/gpro/UmlBaseClassDiagram.h
+++ b/genplugouts/gpro/UmlBaseClassDiagram.h
@@ -4,15 +4,14 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassDiagram;
 class UmlClassView;
 
 // Manage the class diagrams
-class UmlBaseClassDiagram : public UmlDiagram
-{
-public:
+class UmlBaseClassDiagram : public UmlDiagram {
+  public:
     // returns a new class diagram named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -24,9 +23,9 @@ class UmlBaseClassDiagram : public UmlDiagram
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseClassItem.cpp b/genplugouts/gpro/UmlBaseClassItem.cpp
index 345c1a18d..a97c3f341 100644
--- a/genplugouts/gpro/UmlBaseClassItem.cpp
+++ b/genplugouts/gpro/UmlBaseClassItem.cpp
@@ -2,82 +2,90 @@
 #include "UmlBaseClassItem.h"
 
 #include "UmlCom.h"
-//Added by qt3to4:
-#include <Q3CString>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
-{
-    read_if_needed_();
-
-    return _cpp_decl;
+const QByteArray & UmlBaseClassItem::cppDecl() {
+  read_if_needed_();
+  
+  return _cpp_decl;
 }
 
-bool UmlBaseClassItem::set_CppDecl(const char * s)
-{
-    return set_it_(_cpp_decl, s, setCppDeclCmd);
+bool UmlBaseClassItem::set_CppDecl(const char * s) {
+  return set_it_(_cpp_decl, s, setCppDeclCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
-{
-    read_if_needed_();
-
-    return _java_decl;
+const QByteArray & UmlBaseClassItem::javaDecl() {
+  read_if_needed_();
+  
+  return _java_decl;
 }
 
-bool UmlBaseClassItem::set_JavaDecl(const char * s)
-{
-    return set_it_(_java_decl, s, setJavaDeclCmd);
+bool UmlBaseClassItem::set_JavaDecl(const char * s) {
+  return set_it_(_java_decl, s, setJavaDeclCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
-{
-    read_if_needed_();
-
-    return _idl_decl;
+const QByteArray & UmlBaseClassItem::idlDecl() {
+  read_if_needed_();
+  
+  return _idl_decl;
 }
 
-bool UmlBaseClassItem::set_IdlDecl(const char * s)
-{
-    return set_it_(_idl_decl, s, setIdlDeclCmd);
+bool UmlBaseClassItem::set_IdlDecl(const char * s) {
+  return set_it_(_idl_decl, s, setIdlDeclCmd);
 }
 #endif
 
-void UmlBaseClassItem::unload(bool rec, bool del)
-{
+void UmlBaseClassItem::unload(bool rec, bool del) {
 #ifdef WITHCPP
-    _cpp_decl = 0;
+  _cpp_decl = 0;
 #endif
 #ifdef WITHJAVA
-    _java_decl = 0;
+  _java_decl = 0;
+#endif
+#ifdef WITHPHP
+    _php_decl = 0;
+#endif
+#ifdef WITHPYTHON
+    _python_decl = 0;
 #endif
 #ifdef WITHIDL
-    _idl_decl = 0;
+  _idl_decl = 0;
 #endif
-    UmlBaseItem::unload(rec, del);
+  UmlBaseItem::unload(rec, del);
 }
 
 #ifdef WITHCPP
-void UmlBaseClassItem::read_cpp_()
-{
-    _cpp_decl = UmlCom::read_string();
+void UmlBaseClassItem::read_cpp_() {
+  _cpp_decl = UmlCom::read_string();
 }
 #endif
 
 #ifdef WITHJAVA
-void UmlBaseClassItem::read_java_()
+void UmlBaseClassItem::read_java_() {
+  _java_decl = UmlCom::read_string();
+}
+#endif
+
+#ifdef WITHPHP
+void UmlBaseClassItem::read_php_()
 {
-    _java_decl = UmlCom::read_string();
+    _php_decl = UmlCom::read_string();
 }
 #endif
 
-#ifdef WITHIDL
-void UmlBaseClassItem::read_idl_()
+#ifdef WITHPYTHON
+void UmlBaseClassItem::read_python_()
 {
-    _idl_decl = UmlCom::read_string();
+    _python_decl = UmlCom::read_string();
+}
+#endif
+
+#ifdef WITHIDL
+void UmlBaseClassItem::read_idl_() {
+  _idl_decl = UmlCom::read_string();
 }
 #endif
 
diff --git a/genplugouts/gpro/UmlBaseClassItem.h b/genplugouts/gpro/UmlBaseClassItem.h
index 56f510609..e676713dd 100644
--- a/genplugouts/gpro/UmlBaseClassItem.h
+++ b/genplugouts/gpro/UmlBaseClassItem.h
@@ -3,16 +3,15 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of the all the class's items including the class themself
-class UmlBaseClassItem : public UmlItem
-{
-public:
+class UmlBaseClassItem : public UmlItem {
+  public:
 #ifdef WITHCPP
     //  return the C++ declaration
-
-    const Q3CString & cppDecl();
+    
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -22,8 +21,8 @@ class UmlBaseClassItem : public UmlItem
 
 #ifdef WITHJAVA
     //  return the Java defininition
-
-    const Q3CString & javaDecl();
+    
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -33,8 +32,8 @@ class UmlBaseClassItem : public UmlItem
 
 #ifdef WITHIDL
     //  return the IDL declaration
-
-    const Q3CString & idlDecl();
+    
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -44,26 +43,34 @@ class UmlBaseClassItem : public UmlItem
 
     virtual void unload(bool = FALSE, bool = FALSE);
 
-    friend class UmlBaseAttribute;
-    friend class UmlBaseOperation;
-    friend class UmlBaseRelation;
+  friend class UmlBaseAttribute;
+  friend class UmlBaseOperation;
+  friend class UmlBaseRelation;
 
-private:
+  private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
+#endif
+
+#ifdef WITHPHP
+    QByteArray _php_decl;
+#endif
+
+#ifdef WITHPYTHON
+    QByteArray _python_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
-protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+  protected:
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     virtual void read_cpp_();
@@ -73,13 +80,25 @@ class UmlBaseClassItem : public UmlItem
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
-    friend class UmlBaseClassMember;
-    friend class UmlBaseExtraClassMember;
-    friend class UmlBaseClass;
+  friend class UmlBaseClassMember;
+  friend class UmlBaseExtraClassMember;
+  friend class UmlBaseClass;
 };
 
 #endif
diff --git a/genplugouts/gpro/UmlBaseClassMember.cpp b/genplugouts/gpro/UmlBaseClassMember.cpp
index e632c20c6..a3443e536 100644
--- a/genplugouts/gpro/UmlBaseClassMember.cpp
+++ b/genplugouts/gpro/UmlBaseClassMember.cpp
@@ -1,85 +1,74 @@
 
 #include "UmlBaseClassMember.h"
-#include "PackageGlobalCmd.h"
 
 #include "UmlCom.h"
-bool UmlBaseClassMember::isClassMember()
-{
-    read_if_needed_();
-
-    return _class_member;
+bool UmlBaseClassMember::isClassMember() {
+  read_if_needed_();
+  
+  return _class_member;
 }
 
-bool UmlBaseClassMember::set_isClassMember(bool y)
-{
-    return set_it_(_class_member, y, setIsClassMemberCmd);
+bool UmlBaseClassMember::set_isClassMember(bool y) {
+  return set_it_(_class_member, y, setIsClassMemberCmd);
 }
 
-aVisibility UmlBaseClassMember::visibility()
-{
-    read_if_needed_();
-
-    return _visibility;
+aVisibility UmlBaseClassMember::visibility() {
+  read_if_needed_();
+  
+  return _visibility;
 }
 
-bool UmlBaseClassMember::set_Visibility(aVisibility v)
-{
-    aVisibility vi;
-
-    if ((v != DefaultVisibility) && set_it_(vi, v, setVisibilityCmd)) {
-        _visibility = v;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseClassMember::set_Visibility(aVisibility v) {
+  aVisibility vi;
+  
+  if ((v != DefaultVisibility) && set_it_(vi, v, setVisibilityCmd)) {
+    _visibility = v;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
 #ifdef WITHCPP
-aVisibility UmlBaseClassMember::cppVisibility()
-{
-    read_if_needed_();
-
-    return _cpp_visibility;
+aVisibility UmlBaseClassMember::cppVisibility() {
+  read_if_needed_();
+  
+  return _cpp_visibility;
 }
 
-bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
-{
-    aVisibility vi;
-
-    if (set_it_(vi, v, setCppVisibilityCmd)) {
-        _cpp_visibility = v;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseClassMember::set_CppVisibility(aVisibility v) {
+  aVisibility vi;
+  
+  if (set_it_(vi, v, setCppVisibilityCmd)) {
+    _cpp_visibility = v;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
-bool UmlBaseClassMember::isCppVolatile()
-{
-    read_if_needed_();
-
-    return _cpp_volatile;
+bool UmlBaseClassMember::isCppVolatile() {
+  read_if_needed_();
+  
+  return _cpp_volatile;
 }
 
-bool UmlBaseClassMember::set_isCppVolatile(bool y)
-{
-    return set_it_(_cpp_volatile, y, setIsCppVolatileCmd);
+bool UmlBaseClassMember::set_isCppVolatile(bool y) {
+  return set_it_(_cpp_volatile, y, setIsCppVolatileCmd);
 }
 #endif
 
-void UmlBaseClassMember::read_uml_()
-{
-    UmlBaseItem::read_uml_();
-    _class_member = UmlCom::read_bool();
-    _visibility = (aVisibility) UmlCom::read_char();
+void UmlBaseClassMember::read_uml_() {
+  UmlBaseItem::read_uml_();
+  _class_member = UmlCom::read_bool();
+  _visibility = (aVisibility) UmlCom::read_char();
 }
 
 #ifdef WITHCPP
-void UmlBaseClassMember::read_cpp_()
-{
-    UmlBaseClassItem::read_cpp_();
-    _cpp_visibility = (aVisibility) UmlCom::read_char();
-    _cpp_volatile = UmlCom::read_bool();
+void UmlBaseClassMember::read_cpp_() {
+  UmlBaseClassItem::read_cpp_();
+  _cpp_visibility = (aVisibility) UmlCom::read_char();
+  _cpp_volatile = UmlCom::read_bool();
 }
 #endif
 
diff --git a/genplugouts/gpro/UmlBaseClassMember.h b/genplugouts/gpro/UmlBaseClassMember.h
index a31036fc7..79c85fc45 100644
--- a/genplugouts/gpro/UmlBaseClassMember.h
+++ b/genplugouts/gpro/UmlBaseClassMember.h
@@ -1,17 +1,16 @@
 #ifndef _UMLBASECLASSMEMBER_H
 #define _UMLBASECLASSMEMBER_H
 
-#include "Tools/ApiCmd.h"
+
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
 // operation and sub-classes
-class UmlBaseClassMember : public UmlClassItem
-{
-public:
+class UmlBaseClassMember : public UmlClassItem {
+  public:
     // Indicate if the member is a 'class member' (static)
     // Always false in case of a class
     bool isClassMember();
@@ -54,7 +53,7 @@ class UmlBaseClassMember : public UmlClassItem
     bool set_isCppVolatile(bool y);
 #endif
 
-private:
+  private:
     bool _class_member;
 
     aVisibility _visibility : 8;
@@ -66,8 +65,8 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
 
-protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+  protected:
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     void read_uml_();
 
@@ -75,10 +74,10 @@ class UmlBaseClassMember : public UmlClassItem
     virtual void read_cpp_();
 #endif
 
-    friend class UmlBaseOperation;
-    friend class UmlBaseAttribute;
-    friend class UmlBaseRelation;
-    friend class UmlBaseClass;
+  friend class UmlBaseOperation;
+  friend class UmlBaseAttribute;
+  friend class UmlBaseRelation;
+  friend class UmlBaseClass;
 };
 
 #endif
diff --git a/genplugouts/gpro/UmlBaseClassView.cpp b/genplugouts/gpro/UmlBaseClassView.cpp
index 927b09e35..91d5b0026 100644
--- a/genplugouts/gpro/UmlBaseClassView.cpp
+++ b/genplugouts/gpro/UmlBaseClassView.cpp
@@ -7,36 +7,31 @@
 #include "UmlCom.h"
 UmlClassView * UmlBaseClassView::create(UmlPackage * parent, const char * s)
 {
-    return (UmlClassView *) parent->create_(aClassView, s);
+  return (UmlClassView *) parent->create_(aClassView, s);
 }
 
-anItemKind UmlBaseClassView::kind()
-{
-    return aClassView;
+anItemKind UmlBaseClassView::kind() {
+  return aClassView;
 }
 
-UmlDeploymentView * UmlBaseClassView::associatedDeploymentView()
-{
-    read_if_needed_();
-
-    return _assoc_view;
+UmlDeploymentView * UmlBaseClassView::associatedDeploymentView() {
+  read_if_needed_();
+  
+  return _assoc_view;
 }
 
-bool UmlBaseClassView::set_AssociatedDeploymentView(UmlDeploymentView * v)
-{
-    UmlCom::send_cmd(_identifier, setAssocViewCmd, ((UmlBaseItem *) v)->_identifier);
-
-    if (UmlCom::read_bool()) {
-        _assoc_view = v;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseClassView::set_AssociatedDeploymentView(UmlDeploymentView * v) {
+  UmlCom::send_cmd(_identifier, setAssocViewCmd, ((UmlBaseItem *) v)->_identifier);
+  if (UmlCom::read_bool()) {
+    _assoc_view = v;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
-void UmlBaseClassView::read_uml_()
-{
-    _assoc_view = (UmlDeploymentView *) UmlBaseItem::read_();
-    UmlBaseItem::read_uml_();
+void UmlBaseClassView::read_uml_() {
+  _assoc_view = (UmlDeploymentView *) UmlBaseItem::read_();
+  UmlBaseItem::read_uml_();
 }
 
diff --git a/genplugouts/gpro/UmlBaseClassView.h b/genplugouts/gpro/UmlBaseClassView.h
index fb5ed21ec..6cbd38daf 100644
--- a/genplugouts/gpro/UmlBaseClassView.h
+++ b/genplugouts/gpro/UmlBaseClassView.h
@@ -4,16 +4,15 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassView;
 class UmlPackage;
 class UmlDeploymentView;
 
 // Manage the class views
-class UmlBaseClassView : public UmlItem
-{
-public:
+class UmlBaseClassView : public UmlItem {
+  public:
     // returns a new class view named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -30,19 +29,19 @@ class UmlBaseClassView : public UmlItem
     // sets the associated deployment view, arg may be null to unset it
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-
+    
     bool set_AssociatedDeploymentView(UmlDeploymentView * v);
 
 
-private:
+  private:
     UmlDeploymentView * _assoc_view;
 
 
-protected:
+  protected:
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseCollaborationDiagram.cpp b/genplugouts/gpro/UmlBaseCollaborationDiagram.cpp
index e56093ab0..025d08865 100644
--- a/genplugouts/gpro/UmlBaseCollaborationDiagram.cpp
+++ b/genplugouts/gpro/UmlBaseCollaborationDiagram.cpp
@@ -5,11 +5,10 @@
 
 UmlCollaborationDiagram * UmlBaseCollaborationDiagram::create(UmlItem * parent, const char * s)
 {
-    return (UmlCollaborationDiagram *) parent->create_(aCollaborationDiagram, s);
+  return (UmlCollaborationDiagram *) parent->create_(aCollaborationDiagram, s);
 }
 
-anItemKind UmlBaseCollaborationDiagram::kind()
-{
-    return aCollaborationDiagram;
+anItemKind UmlBaseCollaborationDiagram::kind() {
+  return aCollaborationDiagram;
 }
 
diff --git a/genplugouts/gpro/UmlBaseCollaborationDiagram.h b/genplugouts/gpro/UmlBaseCollaborationDiagram.h
index d88e9722f..802ce50a7 100644
--- a/genplugouts/gpro/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/gpro/UmlBaseCollaborationDiagram.h
@@ -4,15 +4,14 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlCollaborationDiagram;
 class UmlItem;
 
 //  Manage the collaboration diagrams
-class UmlBaseCollaborationDiagram : public UmlDiagram
-{
-public:
+class UmlBaseCollaborationDiagram : public UmlDiagram {
+  public:
     // returns a new collaboration diagram named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -24,9 +23,9 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseComponent.cpp b/genplugouts/gpro/UmlBaseComponent.cpp
index 877893a88..98799604e 100644
--- a/genplugouts/gpro/UmlBaseComponent.cpp
+++ b/genplugouts/gpro/UmlBaseComponent.cpp
@@ -7,36 +7,31 @@
 #include "UmlCom.h"
 UmlComponent * UmlBaseComponent::create(UmlComponentView * parent, const char * s)
 {
-    return (UmlComponent *) parent->create_(aComponent, s);
+  return (UmlComponent *) parent->create_(aComponent, s);
 }
 
-anItemKind UmlBaseComponent::kind()
-{
-    return aComponent;
+anItemKind UmlBaseComponent::kind() {
+  return aComponent;
 }
 
-UmlComponentDiagram * UmlBaseComponent::associatedDiagram()
-{
-    read_if_needed_();
-
-    return _assoc_diagram;
+UmlComponentDiagram * UmlBaseComponent::associatedDiagram() {
+  read_if_needed_();
+  
+  return _assoc_diagram;
 }
 
-bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
-{
-    UmlCom::send_cmd(_identifier, setAssocDiagramCmd, ((UmlBaseItem *) d)->_identifier);
-
-    if (UmlCom::read_bool()) {
-        _assoc_diagram = d;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d) {
+  UmlCom::send_cmd(_identifier, setAssocDiagramCmd, ((UmlBaseItem *) d)->_identifier);
+  if (UmlCom::read_bool()) {
+    _assoc_diagram = d;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
-void UmlBaseComponent::read_uml_()
-{
-    _assoc_diagram = (UmlComponentDiagram *) UmlBaseItem::read_();
-    UmlBaseItem::read_uml_();
+void UmlBaseComponent::read_uml_() {
+  _assoc_diagram = (UmlComponentDiagram *) UmlBaseItem::read_();
+  UmlBaseItem::read_uml_();
 }
 
diff --git a/genplugouts/gpro/UmlBaseComponent.h b/genplugouts/gpro/UmlBaseComponent.h
index ec5b6a2e7..a55f1b476 100644
--- a/genplugouts/gpro/UmlBaseComponent.h
+++ b/genplugouts/gpro/UmlBaseComponent.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -12,9 +12,8 @@ class UmlComponentView;
 class UmlComponentDiagram;
 
 //  Manage the components.
-class UmlBaseComponent : public UmlItem
-{
-public:
+class UmlBaseComponent : public UmlItem {
+  public:
     // returns a new component named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -34,21 +33,20 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
 
-private:
+  private:
     UmlComponentDiagram * _assoc_diagram;
 
 
-protected:
+  protected:
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
-{
-    _assoc_diagram = 0;
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n) {
+  _assoc_diagram = 0;
 }
 
 #endif
diff --git a/genplugouts/gpro/UmlBaseComponentDiagram.cpp b/genplugouts/gpro/UmlBaseComponentDiagram.cpp
index 08f885b22..6662172b7 100644
--- a/genplugouts/gpro/UmlBaseComponentDiagram.cpp
+++ b/genplugouts/gpro/UmlBaseComponentDiagram.cpp
@@ -5,11 +5,10 @@
 
 UmlComponentDiagram * UmlBaseComponentDiagram::create(UmlComponentView * parent, const char * s)
 {
-    return (UmlComponentDiagram *) parent->create_(aComponentDiagram, s);
+  return (UmlComponentDiagram *) parent->create_(aComponentDiagram, s);
 }
 
-anItemKind UmlBaseComponentDiagram::kind()
-{
-    return aComponentDiagram;
+anItemKind UmlBaseComponentDiagram::kind() {
+  return aComponentDiagram;
 }
 
diff --git a/genplugouts/gpro/UmlBaseComponentDiagram.h b/genplugouts/gpro/UmlBaseComponentDiagram.h
index 3bafc2f97..d30e09033 100644
--- a/genplugouts/gpro/UmlBaseComponentDiagram.h
+++ b/genplugouts/gpro/UmlBaseComponentDiagram.h
@@ -4,15 +4,14 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentDiagram;
 class UmlComponentView;
 
 //  Manage the component diagrams
-class UmlBaseComponentDiagram : public UmlDiagram
-{
-public:
+class UmlBaseComponentDiagram : public UmlDiagram {
+  public:
     // returns a new component diagram named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -24,9 +23,9 @@ class UmlBaseComponentDiagram : public UmlDiagram
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseComponentView.cpp b/genplugouts/gpro/UmlBaseComponentView.cpp
index d14d273e6..ff7831662 100644
--- a/genplugouts/gpro/UmlBaseComponentView.cpp
+++ b/genplugouts/gpro/UmlBaseComponentView.cpp
@@ -5,11 +5,10 @@
 
 UmlComponentView * UmlBaseComponentView::create(UmlPackage * parent, const char * s)
 {
-    return (UmlComponentView *) parent->create_(aComponentView, s);
+  return (UmlComponentView *) parent->create_(aComponentView, s);
 }
 
-anItemKind UmlBaseComponentView::kind()
-{
-    return aComponentView;
+anItemKind UmlBaseComponentView::kind() {
+  return aComponentView;
 }
 
diff --git a/genplugouts/gpro/UmlBaseComponentView.h b/genplugouts/gpro/UmlBaseComponentView.h
index fdd74c3e9..ae8586be1 100644
--- a/genplugouts/gpro/UmlBaseComponentView.h
+++ b/genplugouts/gpro/UmlBaseComponentView.h
@@ -4,15 +4,14 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentView;
 class UmlPackage;
 
 //  Manage the component views
-class UmlBaseComponentView : public UmlItem
-{
-public:
+class UmlBaseComponentView : public UmlItem {
+  public:
     // returns a new component view named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -24,9 +23,9 @@ class UmlBaseComponentView : public UmlItem
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseDeployment.h b/genplugouts/gpro/UmlBaseDeployment.h
index b268e0c17..c928e9cef 100644
--- a/genplugouts/gpro/UmlBaseDeployment.h
+++ b/genplugouts/gpro/UmlBaseDeployment.h
@@ -3,13 +3,12 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Manage the deployments
-class UmlBaseDeployment : public UmlItem
-{
-protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+class UmlBaseDeployment : public UmlItem {
+  protected:
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n){};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseDeploymentDiagram.cpp b/genplugouts/gpro/UmlBaseDeploymentDiagram.cpp
index e6570d905..61cc6a53b 100644
--- a/genplugouts/gpro/UmlBaseDeploymentDiagram.cpp
+++ b/genplugouts/gpro/UmlBaseDeploymentDiagram.cpp
@@ -5,11 +5,10 @@
 
 UmlDeploymentDiagram * UmlBaseDeploymentDiagram::create(UmlDeploymentView * parent, const char * s)
 {
-    return (UmlDeploymentDiagram *) parent->create_(aDeploymentDiagram, s);
+  return (UmlDeploymentDiagram *) parent->create_(aDeploymentDiagram, s);
 }
 
-anItemKind UmlBaseDeploymentDiagram::kind()
-{
-    return aDeploymentDiagram;
+anItemKind UmlBaseDeploymentDiagram::kind() {
+  return aDeploymentDiagram;
 }
 
diff --git a/genplugouts/gpro/UmlBaseDeploymentDiagram.h b/genplugouts/gpro/UmlBaseDeploymentDiagram.h
index 7dab18bb5..408e17033 100644
--- a/genplugouts/gpro/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/gpro/UmlBaseDeploymentDiagram.h
@@ -4,15 +4,14 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
 
 //  Manage the deployment diagrams
-class UmlBaseDeploymentDiagram : public UmlDiagram
-{
-public:
+class UmlBaseDeploymentDiagram : public UmlDiagram {
+  public:
     // returns a new deployment diagram named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -24,9 +23,9 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseDeploymentView.cpp b/genplugouts/gpro/UmlBaseDeploymentView.cpp
index 1eb7f13c2..9ecd254af 100644
--- a/genplugouts/gpro/UmlBaseDeploymentView.cpp
+++ b/genplugouts/gpro/UmlBaseDeploymentView.cpp
@@ -5,11 +5,10 @@
 
 UmlDeploymentView * UmlBaseDeploymentView::create(UmlPackage * parent, const char * s)
 {
-    return (UmlDeploymentView *) parent->create_(aDeploymentView, s);
+  return (UmlDeploymentView *) parent->create_(aDeploymentView, s);
 }
 
-anItemKind UmlBaseDeploymentView::kind()
-{
-    return aDeploymentView;
+anItemKind UmlBaseDeploymentView::kind() {
+  return aDeploymentView;
 }
 
diff --git a/genplugouts/gpro/UmlBaseDeploymentView.h b/genplugouts/gpro/UmlBaseDeploymentView.h
index 9213870a8..240de1858 100644
--- a/genplugouts/gpro/UmlBaseDeploymentView.h
+++ b/genplugouts/gpro/UmlBaseDeploymentView.h
@@ -4,15 +4,14 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentView;
 class UmlPackage;
 
 //  Manage the deployment views
-class UmlBaseDeploymentView : public UmlItem
-{
-public:
+class UmlBaseDeploymentView : public UmlItem {
+  public:
     // returns a new deployment view named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -24,9 +23,9 @@ class UmlBaseDeploymentView : public UmlItem
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseDiagram.cpp b/genplugouts/gpro/UmlBaseDiagram.cpp
index e1ceb269d..069ec80f8 100644
--- a/genplugouts/gpro/UmlBaseDiagram.cpp
+++ b/genplugouts/gpro/UmlBaseDiagram.cpp
@@ -2,9 +2,8 @@
 #include "UmlBaseDiagram.h"
 
 #include "UmlCom.h"
-//Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/gpro/UmlBaseDiagram.h b/genplugouts/gpro/UmlBaseDiagram.h
index 9cf05ff22..6eef5b936 100644
--- a/genplugouts/gpro/UmlBaseDiagram.h
+++ b/genplugouts/gpro/UmlBaseDiagram.h
@@ -3,12 +3,11 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of all the classes managing the diagrams
-class UmlBaseDiagram : public UmlItem
-{
-public:
+class UmlBaseDiagram : public UmlItem {
+  public:
     // saves the diagram picture in the file whose pathname is given
     // in argument, the produced file is a PNG file.
     // The aspect of the diagram is :
@@ -18,12 +17,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseExtraClassMember.cpp b/genplugouts/gpro/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..904351a2f 100644
--- a/genplugouts/gpro/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/gpro/UmlBaseExtraClassMember.cpp
@@ -4,58 +4,49 @@
 #include "UmlClass.h"
 
 #include "UmlCom.h"
-//Added by qt3to4:
-#include <Q3CString>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
-    return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
+  return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
 }
 
-anItemKind UmlBaseExtraClassMember::kind()
-{
-    return anExtraClassMember;
+anItemKind UmlBaseExtraClassMember::kind() {
+  return anExtraClassMember;
 }
 
 #ifdef WITHCPP
-bool UmlBaseExtraClassMember::isCppInline()
-{
-    read_if_needed_();
-
-    return _cpp_inline;
+bool UmlBaseExtraClassMember::isCppInline() {
+  read_if_needed_();
+    
+  return _cpp_inline;
 }
 
-bool UmlBaseExtraClassMember::set_isCppInline(bool y)
-{
-    return set_it_(_cpp_inline, y, setIsCppInlineCmd);
+bool UmlBaseExtraClassMember::set_isCppInline(bool y) {
+  return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
-{
-    read_if_needed_();
-
-    return _cpp_def;
+const QByteArray & UmlBaseExtraClassMember::cppDef() {
+  read_if_needed_();
+    
+  return _cpp_def;
 }
 
-bool UmlBaseExtraClassMember::set_CppDef(const char * s)
-{
-    return set_it_(_cpp_def, s, setCppDefCmd);
+bool UmlBaseExtraClassMember::set_CppDef(const char * s) {
+  return set_it_(_cpp_def, s, setCppDefCmd);
 }
 #endif
 
-void UmlBaseExtraClassMember::unload(bool rec, bool del)
-{
+void UmlBaseExtraClassMember::unload(bool rec, bool del) {
 #ifdef WITHCPP
-    _cpp_def = 0;
+  _cpp_def = 0;
 #endif
-    UmlBaseClassItem::unload(rec, del);
+  UmlBaseClassItem::unload(rec, del);
 }
 
 #ifdef WITHCPP
-void UmlBaseExtraClassMember::read_cpp_()
-{
-    UmlBaseClassItem::read_cpp_();
-    _cpp_def = UmlCom::read_string();
-    _cpp_inline = UmlCom::read_bool();
+void UmlBaseExtraClassMember::read_cpp_() {
+  UmlBaseClassItem::read_cpp_();
+  _cpp_def = UmlCom::read_string();
+  _cpp_inline = UmlCom::read_bool();
 }
 #endif
 
diff --git a/genplugouts/gpro/UmlBaseExtraClassMember.h b/genplugouts/gpro/UmlBaseExtraClassMember.h
index 39ac1d594..f5c651fea 100644
--- a/genplugouts/gpro/UmlBaseExtraClassMember.h
+++ b/genplugouts/gpro/UmlBaseExtraClassMember.h
@@ -4,16 +4,15 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExtraClassMember;
 class UmlClass;
 
 // Manage the 'extra' class members to produce any code, for instance a C++ pre-processing form or a Java initialization
 
-class UmlBaseExtraClassMember : public UmlClassItem
-{
-public:
+class UmlBaseExtraClassMember : public UmlClassItem {
+  public:
     // returns a new extra class member named 'name'  (the name may be empty)
     // created under the class 'parent'
     //
@@ -27,17 +26,17 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
 #ifdef WITHCPP
     // returns TRUE if the extra member is managed as an inline operation in C++
-
+    
     bool isCppInline();
 
     // to set if the extra member is managed as an inline operation in C++
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isCppInline(bool y);
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -51,17 +50,17 @@ class UmlBaseExtraClassMember : public UmlClassItem
     virtual void unload(bool = FALSE, bool = FALSE);
 
 
-private:
+  private:
 #ifdef WITHCPP
     bool _cpp_inline;
+    
 
-
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     virtual void read_cpp_();
diff --git a/genplugouts/gpro/UmlBaseFormalParameter.cpp b/genplugouts/gpro/UmlBaseFormalParameter.cpp
index ae7979030..5c7996f93 100644
--- a/genplugouts/gpro/UmlBaseFormalParameter.cpp
+++ b/genplugouts/gpro/UmlBaseFormalParameter.cpp
@@ -3,13 +3,11 @@
 
 #include "UmlCom.h"
 #include "UmlBaseItem.h"
-void UmlBaseFormalParameter::read_()
-{
-    _name = UmlCom::read_string();
-    _type = UmlCom::read_string();
-    _default_value.type = (UmlClass *) UmlBaseItem::read_();
-
-    if (_default_value.type == 0)
-        _default_value.explicit_type = UmlCom::read_string();
+void UmlBaseFormalParameter::read_() {
+  _name = UmlCom::read_string();
+  _type = UmlCom::read_string();
+  _default_value.type = (UmlClass *) UmlBaseItem::read_();
+  if (_default_value.type == 0)
+    _default_value.explicit_type = UmlCom::read_string();
 }
 
diff --git a/genplugouts/gpro/UmlBaseFormalParameter.h b/genplugouts/gpro/UmlBaseFormalParameter.h
index c9eabebb7..963a7a7c3 100644
--- a/genplugouts/gpro/UmlBaseFormalParameter.h
+++ b/genplugouts/gpro/UmlBaseFormalParameter.h
@@ -2,39 +2,32 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
-// This class manages 'formal parameters' of a template class. For instance 'T' in
+// This class manages 'formal parameters' of a template class. For instance 'T' in 
 //
 //	template class Cl<class T> ...
-class UmlBaseFormalParameter
-{
-public:
+class UmlBaseFormalParameter {
+  public:
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
-        return _name;
-    };
+    const QByteArray & name() const { return _name; };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
-        return _type;
-    };
+    const QByteArray & type() const { return _type; };
 
     // returns the default actual value
-    const UmlTypeSpec & defaultValue() const {
-        return _default_value;
-    };
+    const UmlTypeSpec & defaultValue() const { return _default_value; };
 
-    friend class UmlBaseClass;
+  friend class UmlBaseClass;
 
-protected:
-    Q3CString _name;
+  protected:
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/gpro/UmlBaseItem.cpp b/genplugouts/gpro/UmlBaseItem.cpp
index f8f328098..fe0865076 100644
--- a/genplugouts/gpro/UmlBaseItem.cpp
+++ b/genplugouts/gpro/UmlBaseItem.cpp
@@ -25,35 +25,34 @@
 #include "UmlDeploymentView.h"
 #include "UmlPackage.h"
 #include "UmlExtraClassMember.h"
-#include "Tools/ApiCmd.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include "MiscGlobalCmd.h"
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     return set_it_(_name, s, setNameCmd);
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -69,7 +68,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -89,11 +88,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -103,7 +102,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -111,10 +110,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -125,14 +124,14 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
     return _dict;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -144,7 +143,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
     return (int) UmlCom::read_unsigned();
@@ -159,7 +158,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -178,48 +177,55 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
     if (!_defined) {
-#ifdef WITHCPP
-# ifdef WITHJAVA
-#  ifdef WITHIDL
+#if defined(WITHCPP) & defined(WITHJAVA) & defined(WITHPHP) & defined(WITHPYTHON) & defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getDefCmd);
         read_uml_();
         read_cpp_();
         read_java_();
+        read_php_();
+        read_python_();
         read_idl_();
-#  else
-        ... WITHIDL must be defined when WITHCPP and WITHJAVA are both defined
-#  endif
-# else
-#  ifdef WITHIDL
-        ... WITHJAVA must be defined when WITHCPP and WITHIDL are both defined
-#  else
+#else
+# if defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getCppDefCmd);
         read_uml_();
         read_cpp_();
-#  endif
-# endif
-#else
-# ifdef WITHJAVA
-#  ifdef WITHIDL
-        ... WITHCPP must be defined when WITHIDL and WITHJAVA are both defined
-#  else
+# else
+#  if !defined(WITHCPP) & defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getJavaDefCmd);
         read_uml_();
         read_java_();
-#  endif
-# else
-#  ifdef WITHIDL
+#  else
+#   if !defined(WITHCPP) & !defined(WITHJAVA) & defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
+        UmlCom::send_cmd(_identifier, getPhpDefCmd);
+        read_uml_();
+        read_php_();
+#   else
+#    if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & defined(WITHPYTHON) & !defined(WITHIDL)
+        UmlCom::send_cmd(_identifier, getPythonDefCmd);
+        read_uml_();
+        read_python_();
+#    else
+#     if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getIdlDefCmd);
         read_uml_();
         read_idl_();
-#  else
+#     else
+#      if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getUmlDefCmd);
         read_uml_();
+#      else
+        ... WITHCPP and WITHJAVA and WITHPHP and WITHPYTHON and WITHIDL must be both defined or undefined
+        ... or only one of them must be defined
+#      endif
+#     endif
+#    endif
+#   endif
 #  endif
 # endif
 #endif
@@ -236,10 +242,7 @@ UmlItem * UmlBaseItem::create_(anItemKind k, const char * s)
 
     if (result != 0) {
         if (_children != 0) {
-            unsigned n = _children->count();
-
-            _children->resize(n + 1);
-            _children->insert(n, result);
+            _children->append(result);
         }
 
         ((UmlBaseItem *) result)->_parent = (UmlItem *) this;
@@ -255,9 +258,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -275,6 +278,18 @@ void UmlBaseItem::read_java_()
 }
 #endif
 
+#ifdef WITHPHP
+void UmlBaseItem::read_php_()
+{
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseItem::read_python_()
+{
+}
+#endif
+
 #ifdef WITHIDL
 void UmlBaseItem::read_idl_()
 {
@@ -284,7 +299,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -338,7 +353,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -375,10 +390,10 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
-    UmlItem * result = _all[id];
+    UmlItem * result = _all.value(id, 0);
 
     if (result == 0) {
         switch (kind) {
@@ -468,20 +483,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/gpro/UmlBaseItem.h b/genplugouts/gpro/UmlBaseItem.h
index 1bf5e2bec..f203476ba 100644
--- a/genplugouts/gpro/UmlBaseItem.h
+++ b/genplugouts/gpro/UmlBaseItem.h
@@ -3,11 +3,11 @@
 
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
-//#include "OnInstanceCmd.h"
+#include <QByteArray>
+#include <QVector>
+
+#include <QHash>
+#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
 
@@ -37,35 +37,35 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Name(const Q3CString & s);
+    bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -90,16 +90,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     //  Returns the absolute path name of the file memoring the Item.
     //  In general an item is saved in a file associated to its package,
@@ -127,7 +127,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -135,7 +135,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -181,21 +181,21 @@ class UmlBaseItem
 
     void * _identifier;
 
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
 protected:
@@ -213,6 +213,17 @@ class UmlBaseItem
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
@@ -227,7 +238,7 @@ class UmlBaseItem
 
     bool set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd);
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     bool set_it_(UmlTypeSpec & r, const UmlTypeSpec & t, OnInstanceCmd cmd);
 
@@ -236,7 +247,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/gpro/UmlBaseNcRelation.cpp b/genplugouts/gpro/UmlBaseNcRelation.cpp
index 0595fb2a5..58d836e84 100644
--- a/genplugouts/gpro/UmlBaseNcRelation.cpp
+++ b/genplugouts/gpro/UmlBaseNcRelation.cpp
@@ -5,40 +5,36 @@
 #include "UmlCom.h"
 UmlNcRelation * UmlBaseNcRelation::create(aRelationKind kind, UmlItem * start, UmlItem * end)
 {
-    UmlCom::send_cmd(start->_identifier, createCmd, aNcRelation,
-                     kind, end->_identifier);
-    UmlNcRelation * result = (UmlNcRelation *) UmlBaseItem::read_();
-
-    if (result != 0)
-        start->reread_children_if_needed_();
-
-    return result;
+  UmlCom::send_cmd(start->_identifier, createCmd, aNcRelation,
+		   kind, end->_identifier);
+  UmlNcRelation * result = (UmlNcRelation *) UmlBaseItem::read_();
+  
+  if (result != 0)
+    start->reread_children_if_needed_();
+  
+  return result;
 }
 
-anItemKind UmlBaseNcRelation::kind()
-{
-    return aNcRelation;
+anItemKind UmlBaseNcRelation::kind() {
+  return aNcRelation;
 }
 
-aRelationKind UmlBaseNcRelation::relationKind()
-{
-    read_if_needed_();
-
-    return _rel_kind;
+aRelationKind UmlBaseNcRelation::relationKind() {
+  read_if_needed_();
+  
+  return _rel_kind;
 }
 
-UmlItem * UmlBaseNcRelation::target()
-{
-    read_if_needed_();
-
-    return _target;
+UmlItem * UmlBaseNcRelation::target() {
+  read_if_needed_();
+  
+  return _target;
 }
 
-void UmlBaseNcRelation::read_uml_()
-{
-    UmlBaseItem::read_uml_();
-    _rel_kind = (aRelationKind) UmlCom::read_char();
-    _target = UmlBaseItem::read_();
+void UmlBaseNcRelation::read_uml_() {
+  UmlBaseItem::read_uml_();
+  _rel_kind = (aRelationKind) UmlCom::read_char();
+  _target = UmlBaseItem::read_();
 
 }
 
diff --git a/genplugouts/gpro/UmlBaseNcRelation.h b/genplugouts/gpro/UmlBaseNcRelation.h
index 8aa58975e..b6f9b885a 100644
--- a/genplugouts/gpro/UmlBaseNcRelation.h
+++ b/genplugouts/gpro/UmlBaseNcRelation.h
@@ -5,15 +5,14 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNcRelation;
 
 // Manage the relations between non class objects, for instances
 // dependency between packages and use case generalization
-class UmlBaseNcRelation : public UmlItem
-{
-public:
+class UmlBaseNcRelation : public UmlItem {
+  public:
     // returns a new non class relation of the given 'kind' from 'start' to 'end'
     //
     // In case it cannot be created ('parent' cannot contain it etc ...)
@@ -31,23 +30,22 @@ class UmlBaseNcRelation : public UmlItem
     UmlItem * target();
 
 
-private:
+  private:
     aRelationKind _rel_kind;
 
     UmlItem * _target;
 
 
-protected:
+  protected:
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
-{
-    _target = 0;
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n) {
+  _target = 0;
 }
 
 #endif
diff --git a/genplugouts/gpro/UmlBaseNode.cpp b/genplugouts/gpro/UmlBaseNode.cpp
index 9955d20cf..4e2177e87 100644
--- a/genplugouts/gpro/UmlBaseNode.cpp
+++ b/genplugouts/gpro/UmlBaseNode.cpp
@@ -6,36 +6,31 @@
 #include "UmlCom.h"
 UmlNode * UmlBaseNode::create(UmlItem * parent, const char * s)
 {
-    return (UmlNode *) parent->create_(aNode, s);
+  return (UmlNode *) parent->create_(aNode, s);
 }
 
-anItemKind UmlBaseNode::kind()
-{
-    return aNode;
+anItemKind UmlBaseNode::kind() {
+  return aNode;
 }
 
-UmlDeploymentDiagram * UmlBaseNode::associatedDiagram()
-{
-    read_if_needed_();
-
-    return _assoc_diagram;
+UmlDeploymentDiagram * UmlBaseNode::associatedDiagram() {
+  read_if_needed_();
+  
+  return _assoc_diagram;
 }
 
-bool UmlBaseNode::set_AssociatedDiagram(UmlDeploymentDiagram * d)
-{
-    UmlCom::send_cmd(_identifier, setAssocDiagramCmd, ((UmlBaseItem *) d)->_identifier);
-
-    if (UmlCom::read_bool()) {
-        _assoc_diagram = d;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseNode::set_AssociatedDiagram(UmlDeploymentDiagram * d) {
+  UmlCom::send_cmd(_identifier, setAssocDiagramCmd, ((UmlBaseItem *) d)->_identifier);
+  if (UmlCom::read_bool()) {
+    _assoc_diagram = d;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
-void UmlBaseNode::read_uml_()
-{
-    _assoc_diagram = (UmlDeploymentDiagram *) UmlBaseItem::read_();
-    UmlBaseItem::read_uml_();
+void UmlBaseNode::read_uml_() {
+  _assoc_diagram = (UmlDeploymentDiagram *) UmlBaseItem::read_();
+  UmlBaseItem::read_uml_();
 }
 
diff --git a/genplugouts/gpro/UmlBaseNode.h b/genplugouts/gpro/UmlBaseNode.h
index 5e62daff2..651034391 100644
--- a/genplugouts/gpro/UmlBaseNode.h
+++ b/genplugouts/gpro/UmlBaseNode.h
@@ -4,15 +4,14 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNode;
 class UmlDeploymentDiagram;
 
 //  Manage the nodes
-class UmlBaseNode : public UmlItem
-{
-public:
+class UmlBaseNode : public UmlItem {
+  public:
     // returns a new node named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -32,13 +31,13 @@ class UmlBaseNode : public UmlItem
     bool set_AssociatedDiagram(UmlDeploymentDiagram * d);
 
 
-private:
+  private:
     UmlDeploymentDiagram * _assoc_diagram;
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     virtual void read_uml_();
 
diff --git a/genplugouts/gpro/UmlBaseOperation.cpp b/genplugouts/gpro/UmlBaseOperation.cpp
index 26096f11c..278813356 100644
--- a/genplugouts/gpro/UmlBaseOperation.cpp
+++ b/genplugouts/gpro/UmlBaseOperation.cpp
@@ -6,9 +6,8 @@
 #include "UmlCom.h"
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
-//Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -54,7 +53,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -68,7 +67,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -82,7 +81,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -105,7 +104,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -118,7 +117,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -132,7 +131,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -245,7 +244,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -257,7 +256,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -271,7 +270,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -323,7 +322,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -333,7 +332,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -347,7 +346,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -380,7 +379,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
@@ -460,10 +459,6 @@ void UmlBaseOperation::read_cpp_()
     _cpp_friend = UmlCom::read_bool();
     _cpp_virtual = UmlCom::read_bool();
   _cpp_inline = UmlCom::read_bool();
-  _cpp_default = UmlCom::read_bool();
-  _cpp_delete = UmlCom::read_bool();
-  _cpp_override = UmlCom::read_bool();
-  _cpp_final = UmlCom::read_bool();
   _cpp_def = UmlCom::read_string();
     _cpp_name_spec = UmlCom::read_string();
 }
@@ -478,6 +473,27 @@ void UmlBaseOperation::read_java_()
     _java_name_spec = UmlCom::read_string();
 }
 #endif
+#ifdef WITHPHP
+void UmlBaseOperation::read_php_()
+{
+    UmlBaseClassMember::read_php_();
+    _php_final = UmlCom::read_bool();
+    _php_name_spec = UmlCom::read_string();
+    _php_get_set_frozen = UmlCom::read_bool();
+    _php_contextual_body_indent = UmlCom::read_bool();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseOperation::read_python_()
+{
+    UmlBaseClassMember::read_python_();
+    _python_decorators = UmlCom::read_string();
+    _python_name_spec = UmlCom::read_string();
+    _python_get_set_frozen = UmlCom::read_bool();
+    _python_contextual_body_indent = UmlCom::read_bool();
+}
+#endif
 
 #ifdef WITHIDL
 void UmlBaseOperation::read_idl_()
diff --git a/genplugouts/gpro/UmlBaseOperation.h b/genplugouts/gpro/UmlBaseOperation.h
index 2c3a51286..5e6c10202 100644
--- a/genplugouts/gpro/UmlBaseOperation.h
+++ b/genplugouts/gpro/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+#include <QByteArray>
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -14,9 +14,8 @@ class UmlClass;
 struct UmlParameter;
 
 //  Manage the class's operations
-class UmlBaseOperation : public UmlClassMember
-{
-public:
+class UmlBaseOperation : public UmlClassMember {
+  public:
     // returns a new operation named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -31,7 +30,7 @@ class UmlBaseOperation : public UmlClassMember
     bool isAbstract();
 
     // to set the 'abstract' flag
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isAbstract(bool y);
 
@@ -39,12 +38,12 @@ class UmlBaseOperation : public UmlClassMember
     const UmlTypeSpec & returnType();
 
     // to set the operation value type
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -62,7 +61,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -92,7 +91,7 @@ class UmlBaseOperation : public UmlClassMember
     bool isCppConst();
 
     // to set if the operation is declared const in C++
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isCppConst(bool y);
 
@@ -100,7 +99,7 @@ class UmlBaseOperation : public UmlClassMember
     bool isCppFriend();
 
     // to set if the operation is a friend in C++
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isCppFriend(bool y);
 
@@ -108,7 +107,7 @@ class UmlBaseOperation : public UmlClassMember
     bool isCppVirtual();
 
     // to set if the operation is declared virtual in C++
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isCppVirtual(bool y);
 
@@ -116,13 +115,13 @@ class UmlBaseOperation : public UmlClassMember
     bool isCppInline();
 
     // to set if the operation is declared inline in C++
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isCppInline(bool y);
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -131,11 +130,11 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
-    // sets the operation's body in C++, useless if the def does not
+    // sets the operation's body in C++, useless if the def does not 
     // contains ${body}
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
@@ -143,11 +142,11 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_CppNameSpec(const char * s);
 #endif
@@ -157,7 +156,7 @@ class UmlBaseOperation : public UmlClassMember
     bool isJavaFinal();
 
     // to set if the operation is declared final in JAVA
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isJavaFinal(bool y);
 
@@ -165,13 +164,13 @@ class UmlBaseOperation : public UmlClassMember
     bool isJavaSynchronized();
 
     // to set if the operation is declared synchronized in JAVA
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isJavaSynchronized(bool y);
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -180,11 +179,11 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
-    // sets the operation's body in Java, useless if the def does not
+    // sets the operation's body in Java, useless if the def does not 
     // contains ${body}
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
@@ -192,11 +191,11 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_JavaNameSpec(const char * s);
 #endif
@@ -212,11 +211,11 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_IdlNameSpec(const char * s);
 #endif
@@ -226,7 +225,7 @@ class UmlBaseOperation : public UmlClassMember
     virtual void unload(bool = FALSE, bool = FALSE);
 
 
-private:
+  private:
     bool _abstract : 1;
 
 #ifdef WITHCPP
@@ -237,39 +236,85 @@ class UmlBaseOperation : public UmlClassMember
     bool _cpp_virtual : 1;
 
     bool _cpp_inline : 1;
-    bool _cpp_default : 1;
-    bool _cpp_delete : 1;
-    bool _cpp_override : 1;
-    bool _cpp_final : 1;
 #endif
+
 #ifdef WITHJAVA
     bool _java_final : 1;
 
     bool _java_synchronized : 1;
 #endif
 
+#ifdef WITHPHP
+    bool _php_final : 1;
+#endif
 #ifdef WITHIDL
     bool _idl_oneway : 1;
 #endif
 
+#ifdef WITHCPP
+    bool _cpp_get_set_frozen : 1;
+#endif
+
+#ifdef WITHJAVA
+    bool _java_get_set_frozen : 1;
+#endif
+
+#ifdef WITHPHP
+    bool _php_get_set_frozen : 1;
+#endif
+
+#ifdef WITHPYTHON
+    bool _python_get_set_frozen : 1;
+#endif
+
+#ifdef WITHIDL
+    bool _idl_get_set_frozen : 1;
+#endif
+
+#ifdef WITHCPP
+    bool _cpp_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHJAVA
+    bool _java_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHPHP
+    bool _php_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHPYTHON
+    bool _python_contextual_body_indent : 1;
+#endif
+
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
+#endif
+
+#ifdef WITHPHP
+    QByteArray _php_name_spec;
+#endif
+
+#ifdef WITHPYTHON
+    QByteArray _python_name_spec;
+
+    QByteArray _python_decorators;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -279,9 +324,9 @@ class UmlBaseOperation : public UmlClassMember
     UmlClassMember * _set_of;
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     virtual void read_uml_();
 
@@ -293,16 +338,27 @@ class UmlBaseOperation : public UmlClassMember
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
-{
-    _get_of = 0;
-    _set_of = 0;
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n) {
+  _get_of = 0;
+  _set_of = 0;
 }
 
 #endif
diff --git a/genplugouts/gpro/UmlBasePackage.cpp b/genplugouts/gpro/UmlBasePackage.cpp
index 7e4bb9e15..a98ad0e29 100644
--- a/genplugouts/gpro/UmlBasePackage.cpp
+++ b/genplugouts/gpro/UmlBasePackage.cpp
@@ -4,203 +4,193 @@
 #include "UmlClassDiagram.h"
 
 #include "UmlCom.h"
-#include "Tools/ApiCmd.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include "PackageGlobalCmd.h"
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
-    return (UmlPackage *) parent->create_(aPackage, name);
+  return (UmlPackage *) parent->create_(aPackage, name);
 }
 
-anItemKind UmlBasePackage::kind()
-{
-    return aPackage;
+anItemKind UmlBasePackage::kind() {
+  return aPackage;
 }
 
-UmlClassDiagram * UmlBasePackage::associatedDiagram()
-{
-    read_if_needed_();
-
-    return _assoc_diagram;
+UmlClassDiagram * UmlBasePackage::associatedDiagram() {
+  read_if_needed_();
+  
+  return _assoc_diagram;
 }
 
-bool UmlBasePackage::set_AssociatedDiagram(UmlClassDiagram * d)
-{
-    UmlCom::send_cmd(_identifier, setAssocDiagramCmd, ((UmlBaseItem *) d)->_identifier);
-
-    if (UmlCom::read_bool()) {
-        _assoc_diagram = d;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBasePackage::set_AssociatedDiagram(UmlClassDiagram * d) {
+  UmlCom::send_cmd(_identifier, setAssocDiagramCmd, ((UmlBaseItem *) d)->_identifier);
+  if (UmlCom::read_bool()) {
+    _assoc_diagram = d;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
-{
-    read_if_needed_();
-
-    return _cpp_src_dir;
+const QByteArray & UmlBasePackage::cppSrcDir() {
+  read_if_needed_();
+  
+  return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
-{
-    return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s) {
+  return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
-{
-    read_if_needed_();
-
-    return _cpp_h_dir;
+const QByteArray & UmlBasePackage::cppHDir() {
+  read_if_needed_();
+  
+  return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
-{
-    return set_it_(_cpp_h_dir, s, setCppHDirCmd);
+bool UmlBasePackage::set_CppHDir(const QByteArray & s) {
+  return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
-{
-    read_if_needed_();
-
-    return _cpp_namespace;
+QByteArray UmlBasePackage::cppNamespace() {
+  read_if_needed_();
+  
+  return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
-{
-    return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s) {
+  return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::getNamespace(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getNamespace(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, (p) ? p->_identifier : 0, n);
-
-    return (UmlPackage *) UmlBaseItem::read_();
+  UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, (p) ? p->_identifier : 0, n);
+  
+  return (UmlPackage *) UmlBaseItem::read_();  
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
-{
-    read_if_needed_();
-
-    return _java_dir;
+const QByteArray & UmlBasePackage::javaDir() {
+  read_if_needed_();
+  
+  return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
-{
-    return set_it_(_java_dir, s, setJavaDirCmd);
+bool UmlBasePackage::set_JavaDir(const QByteArray & s) {
+  return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
-{
-    read_if_needed_();
-
-    return _java_package;
+QByteArray UmlBasePackage::javaPackage() {
+  read_if_needed_();
+  
+  return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
-{
-    return set_it_(_java_package, s, setJavaPackageCmd);
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s) {
+  return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::getPackage(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getPackage(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, (p) ? p->_identifier : 0, n);
-
-    return (UmlPackage *) UmlBaseItem::read_();
+  UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, (p) ? p->_identifier : 0, n);
+  
+  return (UmlPackage *) UmlBaseItem::read_();  
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
-{
-    read_if_needed_();
-
-    return _idl_dir;
+const QByteArray & UmlBasePackage::idlDir() {
+  read_if_needed_();
+  
+  return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
-{
-    return set_it_(_idl_dir, s, setIdlDirCmd);
+bool UmlBasePackage::set_IdlDir(const QByteArray & s) {
+  return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
-{
-    read_if_needed_();
-
-    return _idl_module;
+QByteArray UmlBasePackage::idlModule() {
+  read_if_needed_();
+  
+  return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
-{
-    return set_it_(_idl_module, s, setIdlModuleCmd);
+bool UmlBasePackage::set_IdlModule(const QByteArray & s) {
+  return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::getModule(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getModule(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, (p) ? p->_identifier : 0, n);
-
-    return (UmlPackage *) UmlBaseItem::read_();
+  UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, (p) ? p->_identifier : 0, n);
+  
+  return (UmlPackage *) UmlBaseItem::read_();  
 }
 #endif
 
 UmlBasePackage * UmlBasePackage::getProject()
 {
-    UmlCom::send_cmd(packageGlobalCmd, getProjectCmd);
-
-    return (UmlPackage *) UmlBaseItem::read_();
+  UmlCom::send_cmd(packageGlobalCmd, getProjectCmd);
+  
+  return (UmlPackage *) UmlBaseItem::read_();  
 }
 
-void UmlBasePackage::unload(bool rec, bool del)
-{
-    _assoc_diagram = 0;
+void UmlBasePackage::unload(bool rec, bool del) {
+  _assoc_diagram = 0;
 #ifdef WITHCPP
-    _cpp_src_dir = 0;
-    _cpp_h_dir = 0;
-    _cpp_namespace = 0;
+  _cpp_src_dir = 0;
+  _cpp_h_dir = 0;
+  _cpp_namespace = 0;
 #endif
 #ifdef WITHJAVA
-    _java_dir = 0;
-    _java_package = 0;
+  _java_dir = 0;
+  _java_package = 0;
 #endif
 #ifdef WITHIDL
-    _idl_dir = 0;
-    _idl_module = 0;
+  _idl_dir = 0;
+  _idl_module = 0;
 #endif
-    UmlBaseItem::unload(rec, del);
+  UmlBaseItem::unload(rec, del);
 }
 
-void UmlBasePackage::read_uml_()
-{
-    _assoc_diagram = (UmlClassDiagram *) UmlBaseItem::read_();
-    UmlBaseItem::read_uml_();
+void UmlBasePackage::read_uml_() {
+  _assoc_diagram = (UmlClassDiagram *) UmlBaseItem::read_();
+  UmlBaseItem::read_uml_();
 }
 
 #ifdef WITHCPP
-void UmlBasePackage::read_cpp_()
-{
-    _cpp_src_dir = UmlCom::read_string();
-    _cpp_h_dir = UmlCom::read_string();
-    _cpp_namespace = UmlCom::read_string();
+void UmlBasePackage::read_cpp_() {
+  _cpp_src_dir = UmlCom::read_string();
+  _cpp_h_dir = UmlCom::read_string();
+  _cpp_namespace = UmlCom::read_string();
 }
 #endif
 
 #ifdef WITHJAVA
-void UmlBasePackage::read_java_()
+void UmlBasePackage::read_java_() {
+  _java_dir = UmlCom::read_string();
+  _java_package = UmlCom::read_string();
+}
+#endif
+
+#ifdef WITHPHP
+void UmlBasePackage::read_php_()
 {
-    _java_dir = UmlCom::read_string();
-    _java_package = UmlCom::read_string();
+    _php_dir = UmlCom::read_string();
+    _php_namespace = UmlCom::read_string();
 }
 #endif
 
-#ifdef WITHIDL
-void UmlBasePackage::read_idl_()
+#ifdef WITHPYTHON
+void UmlBasePackage::read_python_()
 {
-    _idl_dir = UmlCom::read_string();
-    _idl_module = UmlCom::read_string();
+    _python_dir = UmlCom::read_string();
+    _python_package = UmlCom::read_string();
+}
+#endif
+#ifdef WITHIDL
+void UmlBasePackage::read_idl_() {
+  _idl_dir = UmlCom::read_string();
+  _idl_module = UmlCom::read_string();
 }
 #endif
 
diff --git a/genplugouts/gpro/UmlBasePackage.h b/genplugouts/gpro/UmlBasePackage.h
index a1d1209e8..ed629b78e 100644
--- a/genplugouts/gpro/UmlBasePackage.h
+++ b/genplugouts/gpro/UmlBasePackage.h
@@ -4,15 +4,14 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPackage;
 class UmlClassDiagram;
 
 //  Manage the packages
-class UmlBasePackage : public UmlItem
-{
-public:
+class UmlBasePackage : public UmlItem {
+  public:
     // returns a new package named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -34,94 +33,94 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns the sub package of 'p' package having the c++ namespace 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getNamespace(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getNamespace(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns the sub package of 'p' package having the java package 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getPackage(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getPackage(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns the sub package of 'p' package having the IDL module 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getModule(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getModule(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
     //  Returns the project
     static UmlBasePackage * getProject();
 
     // to unload the object to free memory, it will be reloaded automatically
-    // if needed. Recursively done for the sub items if 'rec' is TRUE.
+    // if needed. Recursively done for the sub items if 'rec' is TRUE. 
     //
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
@@ -129,34 +128,44 @@ class UmlBasePackage : public UmlItem
     virtual void unload(bool rec = FALSE, bool del = FALSE);
 
 
-private:
+  private:
     UmlClassDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
-
+    
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
-#ifdef WITHIDL
-    Q3CString _idl_dir;
+#ifdef WITHPHP
+    QByteArray _php_dir;
+    QByteArray _php_namespace;
+#endif
+
+#ifdef WITHPYTHON
+    QByteArray _python_dir;
 
-    Q3CString _idl_module;
+    QByteArray _python_package;
 #endif
+#ifdef WITHIDL
+    QByteArray _idl_dir;
 
+    QByteArray _idl_module;
+#endif
+    
 
 
-protected:
+  protected:
     virtual void read_uml_();
 
 #ifdef WITHCPP
@@ -167,18 +176,28 @@ class UmlBasePackage : public UmlItem
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
-{
-    _assoc_diagram = 0;
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n) {
+  _assoc_diagram = 0;
 }
 
 #endif
diff --git a/genplugouts/gpro/UmlBaseRelation.cpp b/genplugouts/gpro/UmlBaseRelation.cpp
index 466ba2582..df0913c9f 100644
--- a/genplugouts/gpro/UmlBaseRelation.cpp
+++ b/genplugouts/gpro/UmlBaseRelation.cpp
@@ -6,324 +6,296 @@
 #include "UmlAttribute.h"
 
 #include "UmlCom.h"
-//Added by qt3to4:
-#include <Q3CString>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
-    UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
-                     kind, end->_identifier);
-    UmlRelation * result = (UmlRelation *) UmlBaseItem::read_();
-
-    if (result != 0) {
-        start->reread_children_if_needed_();
-
-        switch (kind) {
-        case anAssociation:
-        case anAggregation:
-        case anAggregationByValue:
-            // bi-directional
-            end->reread_children_if_needed_();
-            break;
-
-        case aGeneralisation:
-        case aRealization:
-            if (!end->formals().isEmpty())
-                // to update actuals & base_type
-                start->reread_if_needed_();
-
-        default:
-            break;
-        }
+  UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
+		   kind, end->_identifier);
+  UmlRelation * result = (UmlRelation *) UmlBaseItem::read_();
+  
+  if (result != 0) {
+    start->reread_children_if_needed_();
+    
+    switch (kind) {
+    case anAssociation:
+    case anAggregation:
+    case anAggregationByValue:
+      // bi-directional
+      end->reread_children_if_needed_();
+      break;
+    case aGeneralisation:
+    case aRealization:
+      if (!end->formals().isEmpty())
+	// to update actuals & base_type
+	start->reread_if_needed_();
+    default:
+      break;
     }
-
-    return result;
+  }
+  
+  return result;
 }
 
-anItemKind UmlBaseRelation::kind()
-{
-    return aRelation;
+anItemKind UmlBaseRelation::kind() {
+  return aRelation;
 }
 
-aRelationKind UmlBaseRelation::relationKind()
-{
-    read_if_needed_();
-
-    return _rel_kind;
+aRelationKind UmlBaseRelation::relationKind() {
+  read_if_needed_();
+  
+  return _rel_kind;
 }
 
-bool UmlBaseRelation::isReadOnly()
-{
-    read_if_needed_();
-
-    return _read_only;
+bool UmlBaseRelation::isReadOnly() {
+  read_if_needed_();
+  
+  return _read_only;
 }
 
-bool UmlBaseRelation::set_isReadOnly(bool y)
-{
-    return set_it_(_read_only, y, setIsReadOnlyCmd);
+bool UmlBaseRelation::set_isReadOnly(bool y) {
+  return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
-{
-    read_if_needed_();
-
-    return _default_value;
+const QByteArray & UmlBaseRelation::defaultValue() {
+  read_if_needed_();
+  
+  return _default_value;
 }
 
-bool UmlBaseRelation::set_DefaultValue(const char * s)
-{
-    return set_it_(_default_value, s, setDefaultValueCmd);
+bool UmlBaseRelation::set_DefaultValue(const char * s) {
+  return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
-{
-    if (UmlBaseItem::set_Stereotype(s)) {
-        UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
-
-        if (other != 0)
-            other->_stereotype = s;
-
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s) {
+  if (UmlBaseItem::set_Stereotype(s)) {
+    UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
+    
+    if (other != 0)
+      other->_stereotype = s;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
-UmlClass * UmlBaseRelation::roleType()
-{
-    read_if_needed_();
-
-    return _role_type;
+UmlClass * UmlBaseRelation::roleType() {
+  read_if_needed_();
+  
+  return _role_type;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
-{
-    read_if_needed_();
-
-    return _role_name;
+const QByteArray & UmlBaseRelation::roleName() {
+  read_if_needed_();
+  
+  return _role_name;
 }
 
-bool UmlBaseRelation::set_RoleName(const char * s)
-{
-    return set_it_(_role_name, s, setRoleNameCmd);
+bool UmlBaseRelation::set_RoleName(const char * s) {
+  return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
-{
-    read_if_needed_();
-
-    return _multiplicity;
+const QByteArray & UmlBaseRelation::multiplicity() {
+  read_if_needed_();
+  
+  return _multiplicity;
 }
 
-bool UmlBaseRelation::set_Multiplicity(const char * s)
-{
-    return set_it_(_multiplicity, s, setMultiplicityCmd);
+bool UmlBaseRelation::set_Multiplicity(const char * s) {
+  return set_it_(_multiplicity, s, setMultiplicityCmd);
 }
 
-UmlOperation * UmlBaseRelation::getOperation()
-{
-    read_if_needed_();
-
-    return _get_oper;
+UmlOperation * UmlBaseRelation::getOperation() {
+  read_if_needed_();
+  
+  return _get_oper;
 }
 
-bool UmlBaseRelation::addGetOperation()
-{
-    UmlCom::send_cmd(_identifier, addGetOperCmd);
-
-    if (UmlCom::read_bool()) {
-        reread_children_if_needed_();
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseRelation::addGetOperation() {
+  UmlCom::send_cmd(_identifier, addGetOperCmd);
+  if (UmlCom::read_bool()) {
+    reread_children_if_needed_();
+    return TRUE;
+  }
+ else
+   return FALSE;
 }
 
-UmlOperation * UmlBaseRelation::setOperation()
-{
-    read_if_needed_();
-
-    return _set_oper;
+UmlOperation * UmlBaseRelation::setOperation() {
+  read_if_needed_();
+  
+  return _set_oper;
 }
 
-bool UmlBaseRelation::addSetOperation()
-{
-    UmlCom::send_cmd(_identifier, addSetOperCmd);
-
-    if (UmlCom::read_bool()) {
-        reread_children_if_needed_();
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseRelation::addSetOperation() {
+  UmlCom::send_cmd(_identifier, addSetOperCmd);
+  if (UmlCom::read_bool()) {
+    reread_children_if_needed_();
+    return TRUE;
+  }
+ else
+   return FALSE;
 }
 
 #ifdef WITHCPP
-bool UmlBaseRelation::cppVirtualInheritance()
-{
-    read_if_needed_();
-
-    return _cpp_virtual_inheritance;
-}
-
-bool UmlBaseRelation::set_CppVirtualInheritance(bool y)
-{
-    bool b;
-
-    if (set_it_(b, y, setCppVirtualInheritanceCmd)) {
-        _cpp_virtual_inheritance = y;
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-
-bool UmlBaseRelation::isCppMutable()
-{
-    read_if_needed_();
-
-    return _cpp_mutable;
-}
-
-bool UmlBaseRelation::set_isCppMutable(bool y)
-{
-    bool b;
-
-    if (set_it_(b, y, setIsCppMutableCmd)) {
-        _cpp_mutable = y;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseRelation::cppVirtualInheritance() {
+  read_if_needed_();
+  
+  return _cpp_virtual_inheritance;
+}
+
+bool UmlBaseRelation::set_CppVirtualInheritance(bool y) {
+  bool b;
+  
+  if (set_it_(b, y, setCppVirtualInheritanceCmd)) {
+    _cpp_virtual_inheritance = y;
+    return TRUE;
+  }
+  else
+    return FALSE;
+}
+
+bool UmlBaseRelation::isCppMutable() {
+  read_if_needed_();
+  
+  return _cpp_mutable;
+}
+
+bool UmlBaseRelation::set_isCppMutable(bool y) {
+  bool b;
+  
+  if (set_it_(b, y, setIsCppMutableCmd)) {
+    _cpp_mutable = y;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 #endif
 
 #ifdef WITHJAVA
-bool UmlBaseRelation::isJavaTransient()
-{
-    read_if_needed_();
-
-    return _java_transient;
+bool UmlBaseRelation::isJavaTransient() {
+  read_if_needed_();
+  
+  return _java_transient;
 }
 
-bool UmlBaseRelation::set_isJavaTransient(bool y)
-{
-    bool b;
-
-    if (set_it_(b, y, setIsJavaTransientCmd)) {
-        _java_transient = y;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseRelation::set_isJavaTransient(bool y) {
+  bool b;
+  
+  if (set_it_(b, y, setIsJavaTransientCmd)) {
+    _java_transient = y;
+    return TRUE;
+  }
+  else
+    return FALSE;
 
 }
 #endif
 
 #ifdef WITHIDL
-bool UmlBaseRelation::isIdlTruncatableInheritance()
-{
-    read_if_needed_();
-
-    return _idl_truncatable;
-}
-
-bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
-{
-    bool b;
-
-    if (set_it_(b, y, setIsIdlTruncatableCmd)) {
-        _idl_truncatable = y;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseRelation::isIdlTruncatableInheritance() {
+  read_if_needed_();
+  
+  return _idl_truncatable;
 }
 
-Q3CString UmlBaseRelation::idlCase()
-{
-    read_if_needed_();
-
-    return (_idl_case != 0) ? _idl_case->name() : _idl_explicit_case;
+bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y) {
+  bool b;
+  
+  if (set_it_(b, y, setIsIdlTruncatableCmd)) {
+    _idl_truncatable = y;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
-bool UmlBaseRelation::set_IdlCase(UmlAttribute * a)
-{
-    UmlCom::send_cmd(_identifier, setIdlCaseCmd, a->_identifier, "");
-
-    if (UmlCom::read_bool()) {
-        _idl_case = a;
-        _idl_explicit_case = 0;
-        return TRUE;
-    }
-    else
-        return FALSE;
+QByteArray UmlBaseRelation::idlCase() {
+  read_if_needed_();
+  
+  return (_idl_case != 0) ? _idl_case->name() : _idl_explicit_case;
 }
 
-bool UmlBaseRelation::set_IdlCase(const char * s)
-{
-    UmlCom::send_cmd(_identifier, setIdlCaseCmd, (void *) 0, s);
-
-    if (UmlCom::read_bool()) {
-        _idl_case = 0;
-        _idl_explicit_case = s;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseRelation::set_IdlCase(UmlAttribute * a) {
+  UmlCom::send_cmd(_identifier, setIdlCaseCmd, a->_identifier, "");
+  if (UmlCom::read_bool()) {
+    _idl_case = a;
+    _idl_explicit_case = 0;
+    return TRUE;
+  }
+ else
+   return FALSE;
+}
+
+bool UmlBaseRelation::set_IdlCase(const char * s) {
+  UmlCom::send_cmd(_identifier, setIdlCaseCmd, (void *) 0, s);
+  if (UmlCom::read_bool()) {
+    _idl_case = 0;
+    _idl_explicit_case = s;
+    return TRUE;
+  }
+ else
+   return FALSE;
 }
 #endif
 
-void UmlBaseRelation::unload(bool rec, bool del)
-{
-    _role_name = 0;
-    _multiplicity = 0;
-    _default_value = 0;
+void UmlBaseRelation::unload(bool rec, bool del) {
+  _role_name = 0;
+  _multiplicity = 0;
+  _default_value = 0;
 #ifdef WITHIDL
-    _idl_explicit_case = 0;
+  _idl_explicit_case = 0;
 #endif
-    UmlBaseClassMember::unload(rec, del);
+  UmlBaseClassMember::unload(rec, del);
 }
 
-void UmlBaseRelation::read_uml_()
-{
-    UmlBaseClassMember::read_uml_();
-    _rel_kind = (aRelationKind) UmlCom::read_char();
-    _role_type = (UmlClass *) UmlBaseItem::read_();
-    _role_name = UmlCom::read_string();
-    _multiplicity = UmlCom::read_string();
-    _default_value = UmlCom::read_string();
-    _read_only = UmlCom::read_bool();
-    _get_oper = (UmlOperation *) UmlBaseItem::read_();
-    _set_oper = (UmlOperation *) UmlBaseItem::read_();
+void UmlBaseRelation::read_uml_() {
+  UmlBaseClassMember::read_uml_();
+  _rel_kind = (aRelationKind) UmlCom::read_char();
+  _role_type = (UmlClass *) UmlBaseItem::read_();
+  _role_name = UmlCom::read_string();
+  _multiplicity = UmlCom::read_string();
+  _default_value = UmlCom::read_string();
+  _read_only = UmlCom::read_bool();
+  _get_oper = (UmlOperation *) UmlBaseItem::read_();
+  _set_oper = (UmlOperation *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
-void UmlBaseRelation::read_cpp_()
-{
-    UmlBaseClassMember::read_cpp_();
-    _cpp_mutable = UmlCom::read_bool();
-    _cpp_virtual_inheritance = UmlCom::read_bool();
+void UmlBaseRelation::read_cpp_() {
+  UmlBaseClassMember::read_cpp_();
+  _cpp_mutable = UmlCom::read_bool();
+  _cpp_virtual_inheritance = UmlCom::read_bool();
 }
 #endif
 
 #ifdef WITHJAVA
-void UmlBaseRelation::read_java_()
+void UmlBaseRelation::read_java_() {
+  UmlBaseClassItem::read_java_();
+  _java_transient = UmlCom::read_bool();
+}
+#endif
+
+#ifdef WITHPHP
+void UmlBaseRelation::read_php_()
 {
-    UmlBaseClassItem::read_java_();
-    _java_transient = UmlCom::read_bool();
+    UmlBaseClassMember::read_php_();
 }
 #endif
 
-#ifdef WITHIDL
-void UmlBaseRelation::read_idl_()
+#ifdef WITHPYTHON
+void UmlBaseRelation::read_python_()
 {
-    UmlBaseClassItem::read_idl_();
-    _idl_truncatable = UmlCom::read_bool();
-    _idl_case = (UmlAttribute *) UmlBaseItem::read_();
+    UmlBaseClassMember::read_python_();
+}
+#endif
 
-    if (_idl_case == 0)
-        _idl_explicit_case = UmlCom::read_string();
+#ifdef WITHIDL
+void UmlBaseRelation::read_idl_() {
+  UmlBaseClassItem::read_idl_();
+  _idl_truncatable = UmlCom::read_bool();
+  _idl_case = (UmlAttribute *) UmlBaseItem::read_();
+  if (_idl_case == 0)
+    _idl_explicit_case = UmlCom::read_string();
 }
 #endif
 
diff --git a/genplugouts/gpro/UmlBaseRelation.h b/genplugouts/gpro/UmlBaseRelation.h
index d37bf27a0..f808edbf0 100644
--- a/genplugouts/gpro/UmlBaseRelation.h
+++ b/genplugouts/gpro/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlRelation;
 class UmlClass;
@@ -13,9 +13,8 @@ class UmlOperation;
 class UmlAttribute;
 
 // Manage the relations between classes
-class UmlBaseRelation : public UmlClassMember
-{
-public:
+class UmlBaseRelation : public UmlClassMember {
+  public:
     // returns a new relation of the given 'kind' from 'start' to 'end'
     //
     // In case it cannot be created (the name is already used or
@@ -33,41 +32,41 @@ class UmlBaseRelation : public UmlClassMember
     bool isReadOnly();
 
     // to set the 'read only' state of the relation
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isReadOnly(bool y);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_DefaultValue(const char * s);
 
     // to set the stereotype
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_Multiplicity(const char * s);
 
@@ -75,7 +74,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlOperation * getOperation();
 
     // to generate an associated 'get' operation
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool addGetOperation();
 
@@ -83,7 +82,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlOperation * setOperation();
 
     // to generate an associated 'set' operation
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool addSetOperation();
 
@@ -110,7 +109,7 @@ class UmlBaseRelation : public UmlClassMember
     bool isJavaTransient();
 
     // to set the 'transient' state of the relation
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isJavaTransient(bool y);
 #endif
@@ -121,23 +120,23 @@ class UmlBaseRelation : public UmlClassMember
     bool isIdlTruncatableInheritance();
 
     // to set if the inheritance is 'truncatable'
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_isIdlTruncatableInheritance(bool y);
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_IdlCase(UmlAttribute * a);
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     bool set_IdlCase(const char * s);
 #endif
@@ -147,7 +146,7 @@ class UmlBaseRelation : public UmlClassMember
     virtual void unload(bool = FALSE, bool = FALSE);
 
 
-private:
+  private:
     bool _read_only;
 
 #ifdef WITHCPP
@@ -166,13 +165,13 @@ class UmlBaseRelation : public UmlClassMember
 
     aRelationKind _rel_kind : 8;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlOperation * _get_oper;
 
@@ -182,11 +181,11 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
-protected:
+  protected:
     virtual void read_uml_();
 
 #ifdef WITHCPP
@@ -197,22 +196,32 @@ class UmlBaseRelation : public UmlClassMember
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
-{
-    _role_type = 0;
-    _get_oper = 0;
-    _set_oper = 0;
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n) {
+  _role_type = 0;
+  _get_oper = 0;
+  _set_oper = 0;
 #ifdef WITHIDL
-    _idl_case = 0;
+  _idl_case = 0;
 #endif
 }
 
diff --git a/genplugouts/gpro/UmlBaseSequenceDiagram.cpp b/genplugouts/gpro/UmlBaseSequenceDiagram.cpp
index cd25dc0a7..891b1c53b 100644
--- a/genplugouts/gpro/UmlBaseSequenceDiagram.cpp
+++ b/genplugouts/gpro/UmlBaseSequenceDiagram.cpp
@@ -5,11 +5,10 @@
 
 UmlSequenceDiagram * UmlBaseSequenceDiagram::create(UmlItem * parent, const char * s)
 {
-    return (UmlSequenceDiagram *) parent->create_(aSequenceDiagram, s);
+  return (UmlSequenceDiagram *) parent->create_(aSequenceDiagram, s);
 }
 
-anItemKind UmlBaseSequenceDiagram::kind()
-{
-    return aSequenceDiagram;
+anItemKind UmlBaseSequenceDiagram::kind() {
+  return aSequenceDiagram;
 }
 
diff --git a/genplugouts/gpro/UmlBaseSequenceDiagram.h b/genplugouts/gpro/UmlBaseSequenceDiagram.h
index 61f0ef6cc..3b7e24fb3 100644
--- a/genplugouts/gpro/UmlBaseSequenceDiagram.h
+++ b/genplugouts/gpro/UmlBaseSequenceDiagram.h
@@ -4,15 +4,14 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlSequenceDiagram;
 class UmlItem;
 
 // Manage the sequence diagrams
-class UmlBaseSequenceDiagram : public UmlDiagram
-{
-public:
+class UmlBaseSequenceDiagram : public UmlDiagram {
+  public:
     // returns a new sequence diagram named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -24,9 +23,9 @@ class UmlBaseSequenceDiagram : public UmlDiagram
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseUseCase.cpp b/genplugouts/gpro/UmlBaseUseCase.cpp
index 5a3a32ccd..51e94de70 100644
--- a/genplugouts/gpro/UmlBaseUseCase.cpp
+++ b/genplugouts/gpro/UmlBaseUseCase.cpp
@@ -6,36 +6,32 @@
 #include "UmlCom.h"
 UmlUseCase * UmlBaseUseCase::create(UmlItem * parent, const char * s)
 {
-    return (UmlUseCase *) parent->create_(anUseCase, s);
+  return (UmlUseCase *) parent->create_(anUseCase, s);
 }
 
-anItemKind UmlBaseUseCase::kind()
-{
-    return anUseCase;
+anItemKind UmlBaseUseCase::kind() {
+  return anUseCase;
 }
 
-UmlUseCaseDiagram * UmlBaseUseCase::associatedDiagram()
-{
-    read_if_needed_();
-
-    return _assoc_diagram;
+UmlUseCaseDiagram * UmlBaseUseCase::associatedDiagram() {
+  read_if_needed_();
+  
+  return _assoc_diagram;
 }
 
-bool UmlBaseUseCase::set_AssociatedDiagram(UmlUseCaseDiagram * d)
-{
-    UmlCom::send_cmd(_identifier, setAssocDiagramCmd, ((UmlBaseItem *) d)->_identifier);
-
-    if (UmlCom::read_bool()) {
-        _assoc_diagram = d;
-        return TRUE;
-    }
-    else
-        return FALSE;
+bool UmlBaseUseCase::set_AssociatedDiagram(UmlUseCaseDiagram * d) {
+  UmlCom::send_cmd(_identifier, setAssocDiagramCmd, ((UmlBaseItem *) d)->_identifier);
+  if (UmlCom::read_bool()) {
+    _assoc_diagram = d;
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
-void UmlBaseUseCase::read_uml_()
-{
-    _assoc_diagram = (UmlUseCaseDiagram *) UmlBaseItem::read_();
-    UmlBaseItem::read_uml_();
+void UmlBaseUseCase::read_uml_() {
+  _assoc_diagram = (UmlUseCaseDiagram *) UmlBaseItem::read_();
+  UmlBaseItem::read_uml_();
+  _extension_points = UmlCom::read_string();
 }
 
diff --git a/genplugouts/gpro/UmlBaseUseCase.h b/genplugouts/gpro/UmlBaseUseCase.h
index abafd7dca..592e9438a 100644
--- a/genplugouts/gpro/UmlBaseUseCase.h
+++ b/genplugouts/gpro/UmlBaseUseCase.h
@@ -4,15 +4,14 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
 
 // Manage the use cases
-class UmlBaseUseCase : public UmlItem
-{
-public:
+class UmlBaseUseCase : public UmlItem {
+  public:
     // returns a new use case named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -32,15 +31,16 @@ class UmlBaseUseCase : public UmlItem
     bool set_AssociatedDiagram(UmlUseCaseDiagram * d);
 
 
-private:
+  private:
+    QByteArray _extension_points;
     UmlUseCaseDiagram * _assoc_diagram;
 
 
-protected:
+  protected:
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseUseCaseDiagram.cpp b/genplugouts/gpro/UmlBaseUseCaseDiagram.cpp
index 918ab1569..e00d19321 100644
--- a/genplugouts/gpro/UmlBaseUseCaseDiagram.cpp
+++ b/genplugouts/gpro/UmlBaseUseCaseDiagram.cpp
@@ -5,11 +5,10 @@
 
 UmlUseCaseDiagram * UmlBaseUseCaseDiagram::create(UmlItem * parent, const char * s)
 {
-    return (UmlUseCaseDiagram *) parent->create_(anUseCaseDiagram, s);
+  return (UmlUseCaseDiagram *) parent->create_(anUseCaseDiagram, s);
 }
 
-anItemKind UmlBaseUseCaseDiagram::kind()
-{
-    return anUseCaseDiagram;
+anItemKind UmlBaseUseCaseDiagram::kind() {
+  return anUseCaseDiagram;
 }
 
diff --git a/genplugouts/gpro/UmlBaseUseCaseDiagram.h b/genplugouts/gpro/UmlBaseUseCaseDiagram.h
index d838b2baf..bf09f60e3 100644
--- a/genplugouts/gpro/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/gpro/UmlBaseUseCaseDiagram.h
@@ -4,15 +4,14 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseDiagram;
 class UmlItem;
 
 //  Manage the use case diagrams
-class UmlBaseUseCaseDiagram : public UmlDiagram
-{
-public:
+class UmlBaseUseCaseDiagram : public UmlDiagram {
+  public:
     // returns a new use case diagram named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -24,9 +23,9 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBaseUseCaseView.cpp b/genplugouts/gpro/UmlBaseUseCaseView.cpp
index 20ad3fd2e..f4f61b663 100644
--- a/genplugouts/gpro/UmlBaseUseCaseView.cpp
+++ b/genplugouts/gpro/UmlBaseUseCaseView.cpp
@@ -4,11 +4,10 @@
 
 UmlUseCaseView * UmlBaseUseCaseView::create(UmlItem * parent, const char * s)
 {
-    return (UmlUseCaseView *) parent->create_(anUseCaseView, s);
+  return (UmlUseCaseView *) parent->create_(anUseCaseView, s);
 }
 
-anItemKind UmlBaseUseCaseView::kind()
-{
-    return anUseCaseView;
+anItemKind UmlBaseUseCaseView::kind() {
+  return anUseCaseView;
 }
 
diff --git a/genplugouts/gpro/UmlBaseUseCaseView.h b/genplugouts/gpro/UmlBaseUseCaseView.h
index 06849883f..3141829d4 100644
--- a/genplugouts/gpro/UmlBaseUseCaseView.h
+++ b/genplugouts/gpro/UmlBaseUseCaseView.h
@@ -4,14 +4,13 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseView;
 
 //  Manage the use case views
-class UmlBaseUseCaseView : public UmlItem
-{
-public:
+class UmlBaseUseCaseView : public UmlItem {
+  public:
     // returns a new use case view named 'name' created under 'parent'
     //
     // In case it cannot be created (the name is already used or
@@ -23,9 +22,9 @@ class UmlBaseUseCaseView : public UmlItem
     virtual anItemKind kind();
 
 
-protected:
+  protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlBuiltin.h b/genplugouts/gpro/UmlBuiltin.h
index cb965b8ae..8154ac384 100644
--- a/genplugouts/gpro/UmlBuiltin.h
+++ b/genplugouts/gpro/UmlBuiltin.h
@@ -2,29 +2,29 @@
 #define _UMLBUILTIN_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/gpro/UmlClass.h b/genplugouts/gpro/UmlClass.h
index e2b1f8cc3..e9cf49c5b 100644
--- a/genplugouts/gpro/UmlClass.h
+++ b/genplugouts/gpro/UmlClass.h
@@ -3,16 +3,15 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'classes', notes that the class 'ClassItem'
 // is a mother class of the class's children.
 //
 // You can modify it as you want (except the constructor)
-class UmlClass : public UmlBaseClass
-{
-public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+class UmlClass : public UmlBaseClass {
+  public:
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlClassDiagram.h b/genplugouts/gpro/UmlClassDiagram.h
index 76134392d..28bee658c 100644
--- a/genplugouts/gpro/UmlClassDiagram.h
+++ b/genplugouts/gpro/UmlClassDiagram.h
@@ -3,17 +3,16 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
 // management
 //
 // You can modify it as you want (except the constructor)
-class UmlClassDiagram : public UmlBaseClassDiagram
-{
-public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+class UmlClassDiagram : public UmlBaseClassDiagram {
+  public:
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlClassItem.h b/genplugouts/gpro/UmlClassItem.h
index bf64f4dbb..c0313062d 100644
--- a/genplugouts/gpro/UmlClassItem.h
+++ b/genplugouts/gpro/UmlClassItem.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
 // You can modify it as you want (except the constructor)
-class UmlClassItem : public UmlBaseClassItem
-{
-public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+class UmlClassItem : public UmlBaseClassItem {
+  public:
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlClassMember.h b/genplugouts/gpro/UmlClassMember.h
index 9119443c6..4ada33785 100644
--- a/genplugouts/gpro/UmlClassMember.h
+++ b/genplugouts/gpro/UmlClassMember.h
@@ -2,17 +2,17 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassMember.h"
 
-// This class globaly manages class's relations, attributes, operations
+// This class globaly manages class's relations, attributes, operations 
 // and sub-classes
 //
 // You can modify it as you want (except the constructor)
 class UmlClassMember : public UmlBaseClassMember
 {
-public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+  public:
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlClassView.h b/genplugouts/gpro/UmlClassView.h
index a152eff28..9e9df54f5 100644
--- a/genplugouts/gpro/UmlClassView.h
+++ b/genplugouts/gpro/UmlClassView.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'class view'
 //
 // You can modify it as you want (except the constructor)
-class UmlClassView : public UmlBaseClassView
-{
-public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+class UmlClassView : public UmlBaseClassView {
+  public:
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlCollaborationDiagram.h b/genplugouts/gpro/UmlCollaborationDiagram.h
index ab1388561..182a5da82 100644
--- a/genplugouts/gpro/UmlCollaborationDiagram.h
+++ b/genplugouts/gpro/UmlCollaborationDiagram.h
@@ -3,17 +3,16 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
 // management
 //
 // You can modify it as you want (except the constructor)
-class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
-{
-public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram {
+  public:
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlCom.cpp b/genplugouts/gpro/UmlCom.cpp
index 046fdd364..52724d422 100644
--- a/genplugouts/gpro/UmlCom.cpp
+++ b/genplugouts/gpro/UmlCom.cpp
@@ -1,20 +1,21 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 #include "UmlSettings.h"
-#include "Tools/ApiCmd.h"
+#include "MiscGlobalCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +29,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(11);
         flush();
@@ -46,30 +49,30 @@ UmlItem * UmlCom::targetItem()
 
 void UmlCom::trace(const char * s)
 {
-    send_cmd(miscGlobalCmd, traceCmd, s);
+  send_cmd(miscGlobalCmd, traceCmd, s);
 }
 
 void UmlCom::message(const char * s)
 {
-    send_cmd(miscGlobalCmd, messageCmd, s);
+  send_cmd(miscGlobalCmd, messageCmd, s);
 }
 
 void UmlCom::bye()
 {
-    send_cmd(miscGlobalCmd, byeCmd);
+  send_cmd(miscGlobalCmd, byeCmd);
 }
 
 void UmlCom::close()
 {
-    delete sock;
-    sock = 0;
+  delete sock;
+  sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -79,64 +82,64 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
-
-    if ((used + len) >= buffer_out_size) {
-        buffer_out_size = used + len + 1024;
-
-        char * newbuff = new char[buffer_out_size];
-
-        memcpy(newbuff, buffer_out, used);
-        delete [] buffer_out;
-
-        p_buffer_out = (buffer_out = newbuff) + used;
-    }
+  ptrdiff_t used = p_buffer_out - buffer_out;
+  
+  if ((used + len) >= buffer_out_size) {
+    buffer_out_size = used + len + 1024;
+    
+    char * newbuff = new char[buffer_out_size];
+    
+    memcpy(newbuff, buffer_out, used);
+    delete [] buffer_out;
+    
+    p_buffer_out = (buffer_out = newbuff) + used;
+  }
 }
 
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+  //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
-
-    if (p_buffer_in == buffer_in_end) {
-        read_buffer(4);
+  
+  if (p_buffer_in == buffer_in_end) {
+    read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+    qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) +(((unsigned char *) buffer_in)[2] << 8) +((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
-        read_buffer((((unsigned char *) buffer_in)[0] << 24) +
-                    (((unsigned char *) buffer_in)[1] << 16) +
-                    (((unsigned char *) buffer_in)[2] << 8) +
-                    ((unsigned char *) buffer_in)[3]);
-    }
+    read_buffer((((unsigned char *) buffer_in)[0] << 24) +
+		(((unsigned char *) buffer_in)[1] << 16) +
+		(((unsigned char *) buffer_in)[2] << 8) +
+		((unsigned char *) buffer_in)[3]);
+  }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+  //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
-
-    if (buffer_in_size < len) {
-        delete [] buffer_in;
-        buffer_in_size = len + 256;
-        buffer_in = new char[buffer_in_size];
-    }
-
-    int remainder = (int) len;
-    int nread;
-    char * p = buffer_in;
-
+  
+  if (buffer_in_size < len) {
+    delete [] buffer_in;
+    buffer_in_size = len + 256;
+    buffer_in = new char[buffer_in_size];
+  }
+  
+  qint64 remainder = len;
+  qint64 nread;
+  char * p = buffer_in;
+  
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -145,470 +148,463 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+  //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
-
-    p_buffer_in = buffer_in;
-    buffer_in_end = buffer_in + len;
+  
+  p_buffer_in = buffer_in;
+  buffer_in_end = buffer_in + len;
 }
 
 void UmlCom::write_bool(bool b)
 {
-    check_size_out(1);
-
-    *p_buffer_out++ = (b == 0) ? 0 : 1;
+  check_size_out(1);
+  
+  *p_buffer_out++ = (b == 0) ? 0 : 1;
 }
 
 void UmlCom::write_char(char c)
 {
-    check_size_out(1);
-
-    *p_buffer_out++ = c;
+  check_size_out(1);
+  
+  *p_buffer_out++ = c;
 }
 
 void UmlCom::write_unsigned(unsigned int u)
 {
-    check_size_out(4);
-
-    p_buffer_out[0] = u >> 24;
-    p_buffer_out[1] = u >> 16;
-    p_buffer_out[2] = u >> 8;
-    p_buffer_out[3] = u;
-
-    p_buffer_out += 4;
+  check_size_out(4);
+  
+  p_buffer_out[0] = u >> 24;
+  p_buffer_out[1] = u >> 16;
+  p_buffer_out[2] = u >> 8;
+  p_buffer_out[3] = u;
+  
+  p_buffer_out += 4;
 }
 
 void UmlCom::write_id(const void * id)
 {
-    check_size_out(sizeof(void *));
-
-    memcpy(p_buffer_out, &id, sizeof(void *));
-    p_buffer_out += sizeof(void *);
+  check_size_out(sizeof(void *));
+  
+  memcpy(p_buffer_out, &id, sizeof(void *));
+  p_buffer_out += sizeof(void *);
 }
 
 void UmlCom::write_string(const char * p)
 {
-    if (p == 0)
-        p = "";
-
-    unsigned len = strlen(p) + 1;
-
-    check_size_out(len);
-    memcpy(p_buffer_out, p, len);
-    p_buffer_out += len;
+  if (p == 0)
+    p = "";
+  
+  size_t len = strlen(p) + 1;
+  
+  check_size_out(len);
+  memcpy(p_buffer_out, p, len);
+  p_buffer_out += len;
 }
 
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+  qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
-
-    write_char(f);
-    write_char(cmd);
-    flush();
+  
+  write_char(f);
+  write_char(cmd);
+  flush();
 }
 
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ")\n";
+  qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ")\n";
 #endif
-
-    write_char(f);
-    write_char(cmd);
-    write_char(arg);
-    flush();
+  
+  write_char(f);
+  write_char(cmd);
+  write_char(arg);
+  flush();
 }
 
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+  qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
-
-    write_char(f);
-    write_char(cmd);
-    write_id(id);
-    flush();
+  
+  write_char(f);
+  write_char(cmd);
+  write_id(id);
+  flush();
 }
 
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ")\n";
+  qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ")\n";
 #endif
-
-    write_char(f);
-    write_char(cmd);
-    write_string(s);
-    flush();
+  
+  write_char(f);
+  write_char(cmd);
+  write_string(s);
+  flush();
 }
 
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+  qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
-
-    write_char(f);
-    write_char(cmd);
-    write_id(id);
-    write_string(n);
-    flush();
+  
+  write_char(f);
+  write_char(cmd);
+  write_id(id);
+  write_string(n);
+  flush();
 }
 
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ", " << v << ")\n";
+  qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ", " << v << ")\n";
 #endif
-
-    write_char(f);
-    write_char(cmd);
-    write_string(s);
-    write_string(v);
-    flush();
+  
+  write_char(f);
+  write_char(cmd);
+  write_string(s);
+  write_string(v);
+  flush();
 }
 
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << s << ", " << v << ")\n";
+  qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << s << ", " << v << ")\n";
 #endif
-
-    write_char(f);
-    write_char(cmd);
-    write_bool(b);
-    write_string(s);
-    write_string(v);
-    flush();
+  
+  write_char(f);
+  write_char(cmd);
+  write_bool(b);
+  write_string(s);
+  write_string(v);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ")\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ")\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_string(arg);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_string(arg);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_char(arg);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_char(arg);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_unsigned(arg);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_unsigned(arg);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-
-    if (arg.type) {
-        write_id(arg.type->_identifier);
-        write_string("");
-    }
-    else {
-        write_id(0);
-        write_string(arg.explicit_type);
-    }
-
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  if (arg.type) {
+    write_id(arg.type->_identifier);
+    write_string("");
+  }
+  else {
+    write_id(0);
+    write_string(arg.explicit_type);
+  }
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_string(arg1);
-    write_string(arg2);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_string(arg1);
+  write_string(arg2);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_char(arg1);
-    write_string(arg2);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_char(arg1);
+  write_string(arg2);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_char(arg1);
-    write_char(arg2);
-    write_id(id2);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_char(arg1);
+  write_char(arg2);
+  write_id(id2);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_id(id1);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_id(id1);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << arg2 << ")\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << arg2 << ")\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_id(id1);
-    write_string(arg2);
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_id(id1);
+  write_string(arg2);
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_unsigned(arg1);
-
-    if (arg2.type) {
-        write_id(arg2.type->_identifier);
-        write_string("");
-    }
-    else {
-        write_id(0);
-        write_string(arg2.explicit_type);
-    }
-
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_unsigned(arg1);
+  if (arg2.type) {
+    write_id(arg2.type->_identifier);
+    write_string("");
+  }
+  else {
+    write_id(0);
+    write_string(arg2.explicit_type);
+  }
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << ", UmlTypeSpec)\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << ", UmlTypeSpec)\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_unsigned(arg1);
-    write_string(arg2);
-    write_string(arg3);
-
-    if (arg4.type) {
-        write_id(arg4.type->_identifier);
-        write_string("");
-    }
-    else {
-        write_id(0);
-        write_string(arg4.explicit_type);
-    }
-
-    flush();
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_unsigned(arg1);
+  write_string(arg2);
+  write_string(arg3);
+  if (arg4.type) {
+    write_id(arg4.type->_identifier);
+    write_string("");
+  }
+  else {
+    write_id(0);
+    write_string(arg4.explicit_type);
+  }
+  flush();
 }
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << arg4 << ", UmlTypeSpec)\n";
+  qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << arg4 << ", UmlTypeSpec)\n";
 #endif
-
-    write_char(onInstanceCmd);
-    write_id(id);
-    write_char(cmd);
-    write_unsigned(arg1);
-    write_char(arg2);
-    write_string(arg3);
-    write_string(arg4);
-
-    if (arg5.type) {
-        write_id(arg5.type->_identifier);
-        write_string("");
-    }
-    else {
-        write_id(0);
-        write_string(arg5.explicit_type);
-    }
-
-    flush();
-}
-
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l)
+  
+  write_char(onInstanceCmd);
+  write_id(id);
+  write_char(cmd);
+  write_unsigned(arg1);
+  write_char(arg2);
+  write_string(arg3);
+  write_string(arg4);
+  if (arg5.type) {
+    write_id(arg5.type->_identifier);
+    write_string("");
+  }
+  else {
+    write_id(0);
+    write_string(arg5.explicit_type);
+  }
+  flush();
+}
+
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
     write_id(id);
-    write_char(cmd);
-
-    unsigned n = l.count();
-
-    write_unsigned(n);
-
-    for (unsigned i = 0; i != n; i += 1)
-        write_id(((UmlBaseItem *) l[i])->_identifier);
-
-    flush();
+  write_char(cmd);
+  
+  unsigned n = l.count();
+  
+  write_unsigned(n);
+  
+  for (unsigned i = 0; i != n; i += 1)
+    write_id(((UmlBaseItem *) l[i])->_identifier);
+  
+  flush();
 }
 
 void * UmlCom::read_id()
 {
-    read_if_needed();
-
-    void * a;
-
-    // sizeof(void *) must be the same for bouml and
-    // the plug-out, bypass it
-    memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
-    p_buffer_in += sizeof(void *) + 1;
-    return a;
+  read_if_needed();
+  
+  void * a;
+  
+  // sizeof(void *) must be the same for douml and
+  // the plug-out, bypass it
+  memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
+  p_buffer_in += sizeof(void *) + 1;
+  return a;
 }
 
 const char * UmlCom::read_string()
 {
-    read_if_needed();
-
-    unsigned len = strlen(p_buffer_in) + 1;
-
-    p_buffer_in += len;
-
+  read_if_needed();
+  
+  size_t len = strlen(p_buffer_in) + 1;
+  
+  p_buffer_in += len;
+  
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+  //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
-
-    return p_buffer_in - len;
+  
+  return p_buffer_in - len;
 }
 
 bool UmlCom::read_bool()
 {
-    read_if_needed();
-
-    return *p_buffer_in++ != 0;
+  read_if_needed();
+  
+  return *p_buffer_in++ != 0;
 }
 
 char UmlCom::read_char()
 {
-    read_if_needed();
-
-    return *p_buffer_in++;
+  read_if_needed();
+  
+  return *p_buffer_in++;
 }
 
 unsigned int UmlCom::read_unsigned()
 {
-    read_if_needed();
-
-    p_buffer_in += 4;
-
-    return (((unsigned char *) p_buffer_in)[-4] << 24) +
-           (((unsigned char *) p_buffer_in)[-3] << 16) +
-           (((unsigned char *) p_buffer_in)[-2] << 8) +
-           ((unsigned char *) p_buffer_in)[-1];
+  read_if_needed();
+  
+  p_buffer_in += 4;
+  
+  return (((unsigned char *) p_buffer_in)[-4] << 24) +
+    (((unsigned char *) p_buffer_in)[-3] << 16) +
+      (((unsigned char *) p_buffer_in)[-2] << 8) +
+	((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -617,7 +613,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -628,7 +624,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/gpro/UmlCom.h b/genplugouts/gpro/UmlCom.h
index 96ce44b78..636ffa457 100644
--- a/genplugouts/gpro/UmlCom.h
+++ b/genplugouts/gpro/UmlCom.h
@@ -2,27 +2,27 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
-//#include "CmdFamily.h"
-//#include "OnInstanceCmd.h"
+#include <QTcpSocket>
+#include "CmdFamily.h"
+#include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
-#include <q3ptrvector.h>
+#include <QVector>
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 // This class manages the communications
 //
-// This class may be defined as a 'singleton', but I prefer to use static
+// This class may be defined as a 'singleton', but I prefer to use static 
 // members allowing to just write 'UmlCom::member' rather than
 // 'UmlCom::instance()->member' or other long sentence like this.
 //
@@ -39,13 +39,13 @@ class UmlClass;
 // - bye()
 //
 // - close()
-//
+// 
 // you must NOT call the others
 class UmlCom
 {
-public:
+  public:
     // does the connexion
-    //
+    // 
     // On error return FALSE in C++, produce a RuntimeException in Java
     static bool connect(unsigned int port);
     //  returns the item on which the tool is applied
@@ -62,12 +62,12 @@ class UmlCom
     // disconnexion
     static void close();
 
-private:
-    static Q3SocketDevice * sock;
+  private:
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -77,20 +77,20 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
-protected:
-    static void check_size_out(unsigned int len);
+  protected:
+    static void check_size_out(size_t len);
     static void read_if_needed();
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     static void write_bool(bool b);
     static void write_char(char c);
     static void write_unsigned(unsigned int u);
     static void write_id(const void * id);
     static void write_string(const char * p);
 
-public:
+  public:
     // do NOT call the followings yourself !!!!
     static void send_cmd(CmdFamily f, unsigned int cmd);
     static void send_cmd(CmdFamily f, unsigned int cmd, char arg);
@@ -114,7 +114,7 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2);
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4);
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l);
     static void * read_id();
     static const char * read_string();
     static bool read_bool();
@@ -122,8 +122,8 @@ class UmlCom
     static unsigned int read_unsigned();
     // reads the selected items when the tool is called
     // you MUST call it only one time after the connexion
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
-    static void fatal_error(const Q3CString & msg);
+    static void read_item_list(QVector<UmlItem*> & v);
+    static void fatal_error(const QByteArray & msg);
     static void flush();
 };
 
diff --git a/genplugouts/gpro/UmlComponent.cpp b/genplugouts/gpro/UmlComponent.cpp
index 32867b3b4..c27e33c06 100644
--- a/genplugouts/gpro/UmlComponent.cpp
+++ b/genplugouts/gpro/UmlComponent.cpp
@@ -3,7 +3,7 @@
 
 #include <qdir.h>
 #include <qmessagebox.h>
-#include <q3textstream.h>
+#include <qtextstream.h>
 
 #include "CppSettings.h"
 #include "UmlPackage.h"
diff --git a/genplugouts/gpro/UmlComponent.h b/genplugouts/gpro/UmlComponent.h
index bb4fdbb25..202b1a3b5 100644
--- a/genplugouts/gpro/UmlComponent.h
+++ b/genplugouts/gpro/UmlComponent.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'components'
 //
 // You can modify it as you want (except the constructor)
-class UmlComponent : public UmlBaseComponent
-{
-public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+class UmlComponent : public UmlBaseComponent {
+  public:
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlComponentDiagram.h b/genplugouts/gpro/UmlComponentDiagram.h
index 15d707dc2..340566372 100644
--- a/genplugouts/gpro/UmlComponentDiagram.h
+++ b/genplugouts/gpro/UmlComponentDiagram.h
@@ -3,17 +3,16 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
 // management
 //
 // You can modify it as you want (except the constructor)
-class UmlComponentDiagram : public UmlBaseComponentDiagram
-{
-public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+class UmlComponentDiagram : public UmlBaseComponentDiagram {
+  public:
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlComponentView.h b/genplugouts/gpro/UmlComponentView.h
index 000a74744..6914c2589 100644
--- a/genplugouts/gpro/UmlComponentView.h
+++ b/genplugouts/gpro/UmlComponentView.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'component view'
 //
 // You can modify it as you want (except the constructor)
-class UmlComponentView : public UmlBaseComponentView
-{
-public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+class UmlComponentView : public UmlBaseComponentView {
+  public:
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlDeploymentDiagram.h b/genplugouts/gpro/UmlDeploymentDiagram.h
index 727d0ffd0..8258837b8 100644
--- a/genplugouts/gpro/UmlDeploymentDiagram.h
+++ b/genplugouts/gpro/UmlDeploymentDiagram.h
@@ -3,17 +3,16 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
 // management
 //
 // You can modify it as you want (except the constructor)
-class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
-{
-public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram {
+  public:
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlDeploymentView.h b/genplugouts/gpro/UmlDeploymentView.h
index 52e5e627d..544b3af6a 100644
--- a/genplugouts/gpro/UmlDeploymentView.h
+++ b/genplugouts/gpro/UmlDeploymentView.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment view'
 //
 // You can modify it as you want (except the constructor)
-class UmlDeploymentView : public UmlBaseDeploymentView
-{
-public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+class UmlDeploymentView : public UmlBaseDeploymentView {
+  public:
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlDiagram.h b/genplugouts/gpro/UmlDiagram.h
index ffee38e5c..ed2ac13ae 100644
--- a/genplugouts/gpro/UmlDiagram.h
+++ b/genplugouts/gpro/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -11,10 +11,9 @@
 // operation/function etc...
 //
 // You can modify it as you want (except the constructor)
-class UmlDiagram : public UmlBaseDiagram
-{
-public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+class UmlDiagram : public UmlBaseDiagram {
+  public:
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlExtraClassMember.h b/genplugouts/gpro/UmlExtraClassMember.h
index cf0b2bf47..1a32575ae 100644
--- a/genplugouts/gpro/UmlExtraClassMember.h
+++ b/genplugouts/gpro/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -11,10 +11,9 @@
 //
 // You can modify it as you want (except the constructor)
 
-class UmlExtraClassMember : public UmlBaseExtraClassMember
-{
-public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+class UmlExtraClassMember : public UmlBaseExtraClassMember {
+  public:
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlFormalParameter.h b/genplugouts/gpro/UmlFormalParameter.h
index f13fee8a8..aaad552ba 100644
--- a/genplugouts/gpro/UmlFormalParameter.h
+++ b/genplugouts/gpro/UmlFormalParameter.h
@@ -4,14 +4,13 @@
 
 #include "UmlBaseFormalParameter.h"
 
-// This class manages 'formal parameters' of a template class. For instance 'T' in
+// This class manages 'formal parameters' of a template class. For instance 'T' in 
 //
 //	template class Cl<class T> ...
 //
 // You can modify it as you want (except the constructor)
-class UmlFormalParameter : public UmlBaseFormalParameter
-{
-public:
+class UmlFormalParameter : public UmlBaseFormalParameter {
+  public:
     UmlFormalParameter() {};
 
 };
diff --git a/genplugouts/gpro/UmlItem.cpp b/genplugouts/gpro/UmlItem.cpp
index cd31e1f2b..a00ca7129 100644
--- a/genplugouts/gpro/UmlItem.cpp
+++ b/genplugouts/gpro/UmlItem.cpp
@@ -2,12 +2,10 @@
 #include "UmlItem.h"
 
 #include "UmlCom.h"
-UmlItem::~UmlItem()
-{
+ UmlItem::~UmlItem() {
 }
 
-void UmlItem::genpro()
-{
-    UmlCom::trace("must be applied on a component");
+void UmlItem::genpro() {
+  UmlCom::trace("must be applied on a component");
 }
 
diff --git a/genplugouts/gpro/UmlItem.h b/genplugouts/gpro/UmlItem.h
index 6efa1c195..cf1053c05 100644
--- a/genplugouts/gpro/UmlItem.h
+++ b/genplugouts/gpro/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class is a mother class for all the other Uml* classes, this
 // allows to generalize their management, declare virtual operations etc ...
@@ -12,7 +12,7 @@
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
diff --git a/genplugouts/gpro/UmlNcRelation.h b/genplugouts/gpro/UmlNcRelation.h
index 60032619a..2fe675f7d 100644
--- a/genplugouts/gpro/UmlNcRelation.h
+++ b/genplugouts/gpro/UmlNcRelation.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //This class manages 'relations' between non class objects
 //
 // You can modify it as you want (except the constructor)
-class UmlNcRelation : public UmlBaseNcRelation
-{
-public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+class UmlNcRelation : public UmlBaseNcRelation {
+  public:
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlNode.h b/genplugouts/gpro/UmlNode.h
index 95edbe709..4de80edb7 100644
--- a/genplugouts/gpro/UmlNode.h
+++ b/genplugouts/gpro/UmlNode.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'nodes'
 //
 // You can modify it as you want (except the constructor)
-class UmlNode : public UmlBaseNode
-{
-public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+class UmlNode : public UmlBaseNode {
+  public:
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlOperation.h b/genplugouts/gpro/UmlOperation.h
index eec043152..212f8b0e7 100644
--- a/genplugouts/gpro/UmlOperation.h
+++ b/genplugouts/gpro/UmlOperation.h
@@ -3,16 +3,15 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
 //
 // You can modify it as you want (except the constructor)
-class UmlOperation : public UmlBaseOperation
-{
-public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+class UmlOperation : public UmlBaseOperation {
+  public:
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlPackage.h b/genplugouts/gpro/UmlPackage.h
index 84e80d71e..21dd53b80 100644
--- a/genplugouts/gpro/UmlPackage.h
+++ b/genplugouts/gpro/UmlPackage.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages a 'package', notes that the project itself is a package
 //
 // You can modify it as you want (except the constructor)
-class UmlPackage : public UmlBasePackage
-{
-public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+class UmlPackage : public UmlBasePackage {
+  public:
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlParameter.h b/genplugouts/gpro/UmlParameter.h
index ef6f522b0..3c967ad60 100644
--- a/genplugouts/gpro/UmlParameter.h
+++ b/genplugouts/gpro/UmlParameter.h
@@ -4,7 +4,7 @@
 
 #include "aDirection.h"
 #include "UmlTypeSpec.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Represent an operation's parameter
 
@@ -13,9 +13,9 @@ struct UmlParameter {
 
     UmlTypeSpec type;
 
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
 };
 
diff --git a/genplugouts/gpro/UmlRelation.h b/genplugouts/gpro/UmlRelation.h
index 1a8307943..ac56fda43 100644
--- a/genplugouts/gpro/UmlRelation.h
+++ b/genplugouts/gpro/UmlRelation.h
@@ -3,16 +3,15 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'relations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
 //
 // You can modify it as you want (except the constructor)
-class UmlRelation : public UmlBaseRelation
-{
-public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+class UmlRelation : public UmlBaseRelation {
+  public:
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlSequenceDiagram.h b/genplugouts/gpro/UmlSequenceDiagram.h
index d3b3d83fc..1828b116b 100644
--- a/genplugouts/gpro/UmlSequenceDiagram.h
+++ b/genplugouts/gpro/UmlSequenceDiagram.h
@@ -3,17 +3,16 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
 // management
 //
 // You can modify it as you want (except the constructor)
-class UmlSequenceDiagram : public UmlBaseSequenceDiagram
-{
-public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+class UmlSequenceDiagram : public UmlBaseSequenceDiagram {
+  public:
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlSettings.cpp b/genplugouts/gpro/UmlSettings.cpp
index fe3172792..891d9f97a 100644
--- a/genplugouts/gpro/UmlSettings.cpp
+++ b/genplugouts/gpro/UmlSettings.cpp
@@ -2,36 +2,35 @@
 #include "UmlSettings.h"
 
 #include "UmlCom.h"
-#include "Tools/ApiCmd.h"
+#include "UmlSettingsCmd.h"
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlSettings::_defined;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -43,7 +42,7 @@ void UmlSettings::read_()
     _relation_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_stereotypes[index].uml = UmlCom::read_string();
@@ -56,7 +55,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -74,18 +73,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -96,7 +95,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_stereotypes.count();
 
@@ -107,7 +106,7 @@ Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlSter
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -118,15 +117,15 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         builtins[index] = _builtins[index];
@@ -154,15 +153,15 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         relation_stereotypes[index] = _relation_stereotypes[index];
@@ -187,15 +186,15 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         class_stereotypes[index] = _class_stereotypes[index];
diff --git a/genplugouts/gpro/UmlSettings.h b/genplugouts/gpro/UmlSettings.h
index f041fe41d..db1392364 100644
--- a/genplugouts/gpro/UmlSettings.h
+++ b/genplugouts/gpro/UmlSettings.h
@@ -1,9 +1,9 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
+#include <QHash>
 
 
-#include <q3dict.h>
-#include <q3cstring.h>
+#include <QByteArray>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -18,15 +18,15 @@ class UmlSettings
 
     static bool _defined;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_stereotypes;
 
     static UmlStereotype * _relation_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -34,19 +34,19 @@ class UmlSettings
 
     static void read_if_needed_();
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
-    static Q3CString uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
-    static UmlStereotype * add_rel_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_stereotype(const QByteArray & s);
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/gpro/UmlSettingsCmd.cpp b/genplugouts/gpro/UmlSettingsCmd.cpp
index ca70c4ecb..b06af3a2e 100644
--- a/genplugouts/gpro/UmlSettingsCmd.cpp
+++ b/genplugouts/gpro/UmlSettingsCmd.cpp
@@ -1,3 +1,3 @@
 
-#include "Tools/ApiCmd.h"
+#include "UmlSettingsCmd.h"
 
diff --git a/genplugouts/gpro/UmlStereotype.h b/genplugouts/gpro/UmlStereotype.h
index 290517202..e3942fc7a 100644
--- a/genplugouts/gpro/UmlStereotype.h
+++ b/genplugouts/gpro/UmlStereotype.h
@@ -2,23 +2,23 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/gpro/UmlTypeSpec.cpp b/genplugouts/gpro/UmlTypeSpec.cpp
index 4bcfebb95..1d3b3dd37 100644
--- a/genplugouts/gpro/UmlTypeSpec.cpp
+++ b/genplugouts/gpro/UmlTypeSpec.cpp
@@ -1,11 +1,8 @@
 
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
-//Added by qt3to4:
-#include <Q3CString>
 
-const Q3CString & UmlTypeSpec::toString() const
-{
-    return (type) ? type->name() : explicit_type;
+const QByteArray & UmlTypeSpec::toString() const {
+  return (type) ? type->name() : explicit_type;
 }
 
diff --git a/genplugouts/gpro/UmlTypeSpec.h b/genplugouts/gpro/UmlTypeSpec.h
index 1c939ea94..90b32b48d 100644
--- a/genplugouts/gpro/UmlTypeSpec.h
+++ b/genplugouts/gpro/UmlTypeSpec.h
@@ -2,7 +2,7 @@
 #define _UMLTYPESPEC_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 
@@ -15,7 +15,7 @@ class UmlTypeSpec
 {
 public:
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     // if != 0 the class representing the type
     UmlClass * type;
@@ -23,7 +23,7 @@ class UmlTypeSpec
     UmlTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
 };
 
diff --git a/genplugouts/gpro/UmlUseCase.h b/genplugouts/gpro/UmlUseCase.h
index 392773262..8f4f1db01 100644
--- a/genplugouts/gpro/UmlUseCase.h
+++ b/genplugouts/gpro/UmlUseCase.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case'
 //
 // You can modify it as you want (except the constructor)
-class UmlUseCase : public UmlBaseUseCase
-{
-public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+class UmlUseCase : public UmlBaseUseCase {
+  public:
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlUseCaseDiagram.h b/genplugouts/gpro/UmlUseCaseDiagram.h
index 132b56d36..65a85919a 100644
--- a/genplugouts/gpro/UmlUseCaseDiagram.h
+++ b/genplugouts/gpro/UmlUseCaseDiagram.h
@@ -3,17 +3,16 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
 // management
 //
 // You can modify it as you want (except the constructor)
-class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
-{
-public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram {
+  public:
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/UmlUseCaseView.h b/genplugouts/gpro/UmlUseCaseView.h
index a715b2f5f..4d4bc873b 100644
--- a/genplugouts/gpro/UmlUseCaseView.h
+++ b/genplugouts/gpro/UmlUseCaseView.h
@@ -3,15 +3,14 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case view'
 //
 // You can modify it as you want (except the constructor)
-class UmlUseCaseView : public UmlBaseUseCaseView
-{
-public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+class UmlUseCaseView : public UmlBaseUseCaseView {
+  public:
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/gpro/anItemKind.h b/genplugouts/gpro/anItemKind.h
index 7a4eabd0a..d26330665 100644
--- a/genplugouts/gpro/anItemKind.h
+++ b/genplugouts/gpro/anItemKind.h
@@ -1,30 +1,30 @@
 #ifndef _ANITEMKIND_H
 #define _ANITEMKIND_H
 
-#include "Tools/ApiCmd.h"
+
 // the king of any item, returned by UmlBaseItem::Kind()
 enum anItemKind {
-    aRelation,
-    anAttribute,
-    anOperation,
-    anExtraClassMember,
-    aClass,
-    anUseCase,
-    aComponent,
-    aNode,
-    anArtifact,
-    aNcRelation,
-    aClassDiagram,
-    anUseCaseDiagram,
-    aSequenceDiagram,
-    aCollaborationDiagram,
-    aComponentDiagram,
-    aDeploymentDiagram,
-    aClassView,
-    anUseCaseView,
-    aComponentView,
-    aDeploymentView,
-    aPackage
+  aRelation,
+  anAttribute,
+  anOperation,
+  anExtraClassMember,
+  aClass,
+  anUseCase,
+  aComponent,
+  aNode,
+  anArtifact,
+  aNcRelation,
+  aClassDiagram,
+  anUseCaseDiagram,
+  aSequenceDiagram,
+  aCollaborationDiagram,
+  aComponentDiagram,
+  aDeploymentDiagram,
+  aClassView,
+  anUseCaseView,
+  aComponentView,
+  aDeploymentView,
+  aPackage
 
 };
 #endif
diff --git a/genplugouts/gpro/gpro.pro b/genplugouts/gpro/gpro.pro
index 9f8285187..f22302b4d 100644
--- a/genplugouts/gpro/gpro.pro
+++ b/genplugouts/gpro/gpro.pro
@@ -1,185 +1,190 @@
-TEMPLATE    = app
-TARGET        = gpro
-CONFIG        += debug warn_on qt
-DEFINES        = WITHCPP WITHJAVA WITHIDL
-HEADERS        = ./PackageGlobalCmd.h \
-          ./UmlBaseItem.h \
-          ./UmlBaseArtifact.h \
-          ./IdlSettingsCmd.h \
-          ./UmlBaseClassMember.h \
-          ./UmlBasePackage.h \
-          ./UmlSequenceDiagram.h \
-          ./UmlDiagram.h \
-          ./CmdFamily.h \
-          ./UmlNode.h \
-          ./UmlTypeSpec.h \
-          ./UmlParameter.h \
-          ./IdlSettings.h \
-          ./UmlBaseOperation.h \
-          ./UmlNcRelation.h \
-          ./aDirection.h \
-          ./JavaSettings.h \
-          ./UmlClassDiagram.h \
-          ./UmlFormalParameter.h \
-          ./UmlComponentView.h \
-          ./UmlUseCaseView.h \
-          ./UmlBaseActualParameter.h \
-          ./Dialog.h \
-          ./UmlBaseDiagram.h \
-          ./UmlBaseRelation.h \
-          ./UmlSettingsCmd.h \
-          ./UmlBaseUseCaseDiagram.h \
-          ./UmlBuiltin.h \
-          ./UmlBaseClass.h \
-          ./CppSettingsCmd.h \
-          ./UmlClassView.h \
-          ./UmlBaseNode.h \
-          ./UmlBaseComponentDiagram.h \
-          ./aVisibility.h \
-          ./UmlBaseAttribute.h \
-          ./UmlCom.h \
-          ./OnInstanceCmd.h \
-          ./UmlDeploymentView.h \
-          ./UmlCollaborationDiagram.h \
-          ./CppSettings.h \
-          ./UmlUseCaseDiagram.h \
-          ./UmlClassItem.h \
-          ./UmlExtraClassMember.h \
-          ./aRelationKind.h \
-          ./UmlBaseDeploymentDiagram.h \
-          ./UmlStereotype.h \
-          ./UmlBaseDeploymentView.h \
-          ./UmlItem.h \
-          ./UmlOperation.h \
-          ./JavaSettingsCmd.h \
-          ./anItemKind.h \
-          ./UmlBaseClassDiagram.h \
-          ./ClassGlobalCmd.h \
-          ./UmlPackage.h \
-          ./UmlActualParameter.h \
-          ./UmlBaseUseCaseView.h \
-          ./MiscGlobalCmd.h \
-          ./UmlComponentDiagram.h \
-          ./UmlArtifact.h \
-          ./UmlAttribute.h \
-          ./UmlClass.h \
-          ./SmallPushButton.h \
-          ./UmlBaseNcRelation.h \
-          ./UmlComponent.h \
-          ./UmlBaseUseCase.h \
-          ./UmlBaseComponentView.h \
-          ./UmlBaseClassItem.h \
-          ./UmlBaseComponent.h \
-          ./UmlSettings.h \
-          ./UmlBaseFormalParameter.h \
-          ./UmlBaseExtraClassMember.h \
-          ./UmlUseCase.h \
-          ./UmlClassMember.h \
-          ./UmlBaseCollaborationDiagram.h \
-          ./UmlBaseSequenceDiagram.h \
-          ./UmlDeploymentDiagram.h \
-          ./UmlBaseClassView.h \
-          ./UmlBaseDeployment.h \
-          ./UmlRelation.h
-SOURCES        = ./PackageGlobalCmd.cpp \
-          ./UmlBaseItem.cpp \
-          ./UmlBaseArtifact.cpp \
-          ./IdlSettingsCmd.cpp \
-          ./UmlBaseClassMember.cpp \
-          ./UmlBasePackage.cpp \
-          ./UmlSequenceDiagram.cpp \
-          ./UmlDiagram.cpp \
-          ./CmdFamily.cpp \
-          ./UmlNode.cpp \
-          ./UmlTypeSpec.cpp \
-          ./UmlParameter.cpp \
-          ./Main.cpp \
-          ./IdlSettings.cpp \
-          ./UmlBaseOperation.cpp \
-          ./UmlNcRelation.cpp \
-          ./aDirection.cpp \
-          ./JavaSettings.cpp \
-          ./UmlClassDiagram.cpp \
-          ./UmlFormalParameter.cpp \
-          ./UmlComponentView.cpp \
-          ./UmlUseCaseView.cpp \
-          ./UmlBaseActualParameter.cpp \
-          ./Dialog.cpp \
-          ./UmlBaseDiagram.cpp \
-          ./UmlBaseRelation.cpp \
-          ./UmlSettingsCmd.cpp \
-          ./UmlBaseUseCaseDiagram.cpp \
-          ./UmlBuiltin.cpp \
-          ./UmlBaseClass.cpp \
-          ./CppSettingsCmd.cpp \
-          ./UmlClassView.cpp \
-          ./UmlBaseNode.cpp \
-          ./UmlBaseComponentDiagram.cpp \
-          ./aVisibility.cpp \
-          ./UmlBaseAttribute.cpp \
-          ./UmlCom.cpp \
-          ./OnInstanceCmd.cpp \
-          ./UmlDeploymentView.cpp \
-          ./UmlCollaborationDiagram.cpp \
-          ./CppSettings.cpp \
-          ./UmlUseCaseDiagram.cpp \
-          ./UmlClassItem.cpp \
-          ./UmlExtraClassMember.cpp \
-          ./aRelationKind.cpp \
-          ./UmlBaseDeploymentDiagram.cpp \
-          ./UmlStereotype.cpp \
-          ./UmlBaseDeploymentView.cpp \
-          ./UmlItem.cpp \
-          ./UmlOperation.cpp \
-          ./JavaSettingsCmd.cpp \
-          ./anItemKind.cpp \
-          ./UmlBaseClassDiagram.cpp \
-          ./ClassGlobalCmd.cpp \
-          ./UmlPackage.cpp \
-          ./UmlActualParameter.cpp \
-          ./UmlBaseUseCaseView.cpp \
-          ./MiscGlobalCmd.cpp \
-          ./UmlComponentDiagram.cpp \
-          ./UmlArtifact.cpp \
-          ./UmlAttribute.cpp \
-          ./UmlClass.cpp \
-          ./SmallPushButton.cpp \
-          ./UmlBaseNcRelation.cpp \
-          ./UmlComponent.cpp \
-          ./UmlBaseUseCase.cpp \
-          ./UmlBaseComponentView.cpp \
-          ./UmlBaseClassItem.cpp \
-          ./UmlBaseComponent.cpp \
-          ./UmlSettings.cpp \
-          ./UmlBaseFormalParameter.cpp \
-          ./UmlBaseExtraClassMember.cpp \
-          ./UmlUseCase.cpp \
-          ./UmlClassMember.cpp \
-          ./UmlBaseCollaborationDiagram.cpp \
-          ./UmlBaseSequenceDiagram.cpp \
-          ./UmlDeploymentDiagram.cpp \
-          ./UmlBaseClassView.cpp \
-          ./UmlBaseDeployment.cpp \
-          ./UmlRelation.cpp
+TEMPLATE	= app
+TARGET		= gpro
+CONFIG -= app_bundle
+CONFIG        += warn_on qt c++11
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES        += WITHCPP WITHJAVA WITHPHP WITHPYTHON WITHIDL TRUE=true FALSE=false
+HEADERS		= ./PackageGlobalCmd.h \
+		  ./UmlBaseItem.h \
+		  ./UmlBaseArtifact.h \
+		  ./IdlSettingsCmd.h \
+		  ./UmlBaseClassMember.h \
+		  ./UmlBasePackage.h \
+		  ./UmlSequenceDiagram.h \
+		  ./UmlDiagram.h \
+		  ./CmdFamily.h \
+		  ./UmlNode.h \
+		  ./UmlTypeSpec.h \
+		  ./UmlParameter.h \
+		  ./IdlSettings.h \
+		  ./UmlBaseOperation.h \
+		  ./UmlNcRelation.h \
+		  ./aDirection.h \
+		  ./JavaSettings.h \
+		  ./UmlClassDiagram.h \
+		  ./UmlFormalParameter.h \
+		  ./UmlComponentView.h \
+		  ./UmlUseCaseView.h \
+		  ./UmlBaseActualParameter.h \
+		  ./Dialog.h \
+		  ./UmlBaseDiagram.h \
+		  ./UmlBaseRelation.h \
+		  ./UmlSettingsCmd.h \
+		  ./UmlBaseUseCaseDiagram.h \
+		  ./UmlBuiltin.h \
+		  ./UmlBaseClass.h \
+		  ./CppSettingsCmd.h \
+		  ./UmlClassView.h \
+		  ./UmlBaseNode.h \
+		  ./UmlBaseComponentDiagram.h \
+		  ./aVisibility.h \
+		  ./UmlBaseAttribute.h \
+		  ./UmlCom.h \
+		  ./OnInstanceCmd.h \
+		  ./UmlDeploymentView.h \
+		  ./UmlCollaborationDiagram.h \
+		  ./CppSettings.h \
+		  ./UmlUseCaseDiagram.h \
+		  ./UmlClassItem.h \
+		  ./UmlExtraClassMember.h \
+		  ./aRelationKind.h \
+		  ./UmlBaseDeploymentDiagram.h \
+		  ./UmlStereotype.h \
+		  ./UmlBaseDeploymentView.h \
+		  ./UmlItem.h \
+		  ./UmlOperation.h \
+		  ./JavaSettingsCmd.h \
+		  ./anItemKind.h \
+		  ./UmlBaseClassDiagram.h \
+		  ./ClassGlobalCmd.h \
+		  ./UmlPackage.h \
+		  ./UmlActualParameter.h \
+		  ./UmlBaseUseCaseView.h \
+		  ./MiscGlobalCmd.h \
+		  ./UmlComponentDiagram.h \
+		  ./UmlArtifact.h \
+		  ./UmlAttribute.h \
+		  ./UmlClass.h \
+		  ./SmallPushButton.h \
+		  ./UmlBaseNcRelation.h \
+		  ./UmlComponent.h \
+		  ./UmlBaseUseCase.h \
+		  ./UmlBaseComponentView.h \
+		  ./UmlBaseClassItem.h \
+		  ./UmlBaseComponent.h \
+		  ./UmlSettings.h \
+		  ./UmlBaseFormalParameter.h \
+		  ./UmlBaseExtraClassMember.h \
+		  ./UmlUseCase.h \
+		  ./UmlClassMember.h \
+		  ./UmlBaseCollaborationDiagram.h \
+		  ./UmlBaseSequenceDiagram.h \
+		  ./UmlDeploymentDiagram.h \
+		  ./UmlBaseClassView.h \
+		  ./UmlBaseDeployment.h \
+          ./UmlRelation.h \
+    gridbox.h \
+    hhbox.h
+SOURCES		= ./PackageGlobalCmd.cpp \
+		  ./UmlBaseItem.cpp \
+		  ./UmlBaseArtifact.cpp \
+		  ./IdlSettingsCmd.cpp \
+		  ./UmlBaseClassMember.cpp \
+		  ./UmlBasePackage.cpp \
+		  ./UmlSequenceDiagram.cpp \
+		  ./UmlDiagram.cpp \
+		  ./CmdFamily.cpp \
+		  ./UmlNode.cpp \
+		  ./UmlTypeSpec.cpp \
+		  ./UmlParameter.cpp \
+		  ./Main.cpp \
+		  ./IdlSettings.cpp \
+		  ./UmlBaseOperation.cpp \
+		  ./UmlNcRelation.cpp \
+		  ./aDirection.cpp \
+		  ./JavaSettings.cpp \
+		  ./UmlClassDiagram.cpp \
+		  ./UmlFormalParameter.cpp \
+		  ./UmlComponentView.cpp \
+		  ./UmlUseCaseView.cpp \
+		  ./UmlBaseActualParameter.cpp \
+		  ./Dialog.cpp \
+		  ./UmlBaseDiagram.cpp \
+		  ./UmlBaseRelation.cpp \
+		  ./UmlSettingsCmd.cpp \
+		  ./UmlBaseUseCaseDiagram.cpp \
+		  ./UmlBuiltin.cpp \
+		  ./UmlBaseClass.cpp \
+		  ./CppSettingsCmd.cpp \
+		  ./UmlClassView.cpp \
+		  ./UmlBaseNode.cpp \
+		  ./UmlBaseComponentDiagram.cpp \
+		  ./aVisibility.cpp \
+		  ./UmlBaseAttribute.cpp \
+		  ./UmlCom.cpp \
+		  ./OnInstanceCmd.cpp \
+		  ./UmlDeploymentView.cpp \
+		  ./UmlCollaborationDiagram.cpp \
+		  ./CppSettings.cpp \
+		  ./UmlUseCaseDiagram.cpp \
+		  ./UmlClassItem.cpp \
+		  ./UmlExtraClassMember.cpp \
+		  ./aRelationKind.cpp \
+		  ./UmlBaseDeploymentDiagram.cpp \
+		  ./UmlStereotype.cpp \
+		  ./UmlBaseDeploymentView.cpp \
+		  ./UmlItem.cpp \
+		  ./UmlOperation.cpp \
+		  ./JavaSettingsCmd.cpp \
+		  ./anItemKind.cpp \
+		  ./UmlBaseClassDiagram.cpp \
+		  ./ClassGlobalCmd.cpp \
+		  ./UmlPackage.cpp \
+		  ./UmlActualParameter.cpp \
+		  ./UmlBaseUseCaseView.cpp \
+		  ./MiscGlobalCmd.cpp \
+		  ./UmlComponentDiagram.cpp \
+		  ./UmlArtifact.cpp \
+		  ./UmlAttribute.cpp \
+		  ./UmlClass.cpp \
+		  ./SmallPushButton.cpp \
+		  ./UmlBaseNcRelation.cpp \
+		  ./UmlComponent.cpp \
+		  ./UmlBaseUseCase.cpp \
+		  ./UmlBaseComponentView.cpp \
+		  ./UmlBaseClassItem.cpp \
+		  ./UmlBaseComponent.cpp \
+		  ./UmlSettings.cpp \
+		  ./UmlBaseFormalParameter.cpp \
+		  ./UmlBaseExtraClassMember.cpp \
+		  ./UmlUseCase.cpp \
+		  ./UmlClassMember.cpp \
+		  ./UmlBaseCollaborationDiagram.cpp \
+		  ./UmlBaseSequenceDiagram.cpp \
+		  ./UmlDeploymentDiagram.cpp \
+		  ./UmlBaseClassView.cpp \
+		  ./UmlBaseDeployment.cpp \
+          ./UmlRelation.cpp \
+    gridbox.cpp \
+    hhbox.cpp
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network  widgets
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
+QT += testlib
 
+    UI_DIR = src/ui
+    DESTDIR = ../../bin
 
-    MOC_DIR = bin/douml/gpro/MOC_release
-    OBJECTS_DIR = bin/douml/gpro/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-Debug{
-    MOC_DIR = bin/douml/gpro/MOC_Debug
-    OBJECTS_DIR = bin/douml/gpro/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
diff --git a/genplugouts/gpro/gridbox.cpp b/genplugouts/gpro/gridbox.cpp
new file mode 100644
index 000000000..78233be1d
--- /dev/null
+++ b/genplugouts/gpro/gridbox.cpp
@@ -0,0 +1,37 @@
+#include "gridbox.h"
+#include <QGridLayout>
+GridBox::GridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void GridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void GridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void GridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+}
+
+QString GridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/genplugouts/gpro/gridbox.h b/genplugouts/gpro/gridbox.h
new file mode 100644
index 000000000..64793941d
--- /dev/null
+++ b/genplugouts/gpro/gridbox.h
@@ -0,0 +1,26 @@
+#ifndef GRIDBOX_H
+#define GRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class GridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit GridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/genplugouts/gpro/hhbox.cpp b/genplugouts/gpro/hhbox.cpp
new file mode 100644
index 000000000..95a09b5ea
--- /dev/null
+++ b/genplugouts/gpro/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/gpro/hhbox.h b/genplugouts/gpro/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/genplugouts/gpro/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/genplugouts/import_rose/Artifact.cpp b/genplugouts/import_rose/Artifact.cpp
index 7fb654431..42027ddc0 100644
--- a/genplugouts/import_rose/Artifact.cpp
+++ b/genplugouts/import_rose/Artifact.cpp
@@ -2,7 +2,7 @@
 #include <qdir.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #include "CppSettings.h"
 #include "JavaSettings.h"
 #include "IdlSettings.h"
@@ -14,16 +14,16 @@
 #include "File.h"
 #include "UmlPackage.h"
 
-Q3AsciiDict<Artifact> Artifact::all;
+QHash<QByteArray,Artifact*> Artifact::all;
 
-Artifact * Artifact::find(const Q3CString & uid)
+Artifact * Artifact::find(const QByteArray & uid)
 {
     return all[uid];
 }
 
 void Artifact::import_component_view(File & f)
 {
-    Q3CString s;
+    QByteArray s;
 
     f.read(s);
 
@@ -65,11 +65,11 @@ void Artifact::import_component_view(File & f)
             if (f.read(s) != STRING)
                 f.syntaxError(s, "a filename");
 
-            File f2(s, f.name());
+            File f2(s, f.fileName());
 
             if (! f2.open(QIODevice::ReadOnly))
                 UmlCom::trace("<br>cannot open '" + s + "' referenced in "
-                              + Q3CString(f.name().toAscii()));//[jasa] QString to Q3CSting conversion
+                              + QByteArray(f.fileName().toLatin1()));//[jasa] QString to Q3CSting conversion
             else {
                 f2.read("(");
                 f2.read("object");
@@ -93,7 +93,7 @@ void Artifact::import_component_view(File & f)
 void Artifact::import_components(File & f)
 {
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (f.read(s)) {
         case '(':
@@ -139,20 +139,20 @@ void Artifact::import_components(File & f)
 
 void Artifact::import(File & f)
 {
-    Q3CString name;
+    QByteArray name;
 
     if (f.read(name) != STRING)
         f.syntaxError(name, "artifact's name");
 
-    Q3CString s;
+    QByteArray s;
 
     f.read(s);
     f.read(s);
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
     Language lang = None;
 
     while (f.readDefinitionBeginning(s, id, ste, doc, prop) != ')') {
@@ -166,7 +166,7 @@ void Artifact::import(File & f)
 
     if (art == 0) {
         art = new Artifact;
-        all.insert(strdup(id), art);
+        all.insert(id, art);
     }
 
     art->name = name;
@@ -174,17 +174,17 @@ void Artifact::import(File & f)
     art->description = doc;
     art->language = lang;
 
-    Q3CString * v;
+    QByteArray * v;
 
     switch (lang) {
     case Cplusplus:
-        if ((v = prop.find("Traversal/CodeFile")) != 0)
+        if ((v = prop.value("Traversal/CodeFile")) != 0)
             art->cpp_path = *v;
 
         break;
 
     case AnsiCplusplus:
-        if ((v = prop.find("Cplusplus/RevEngRootDirectory")) != 0)
+        if ((v = prop.value("Cplusplus/RevEngRootDirectory")) != 0)
             art->cpp_path = *v;
 
         break;
@@ -193,7 +193,7 @@ void Artifact::import(File & f)
         break;
 
     case Java:
-        if ((v = prop.find("Java/FileName")) != 0)
+        if ((v = prop.value("Java/FileName")) != 0)
             art->java_path = *v;
 
         break;
@@ -203,7 +203,7 @@ void Artifact::import(File & f)
     }
 }
 
-void Artifact::add(UmlPackage * pack, UmlClass * cl, Q3CString & art_path)
+void Artifact::add(UmlPackage * pack, UmlClass * cl, QByteArray & art_path)
 {
     //pack, cl
 
@@ -211,10 +211,10 @@ void Artifact::add(UmlPackage * pack, UmlClass * cl, Q3CString & art_path)
     case Cplusplus:
         // cpp_path is the header pathname
     {
-        int index = cpp_path.findRev('.');
+        int index = cpp_path.lastIndexOf('.');
 
         if (index != -1) {
-            Q3CString s = cpp_path.left(index + 1);
+            QByteArray s = cpp_path.left(index + 1);
 
             add_cpp(pack, cl,
                     s + CppSettings::headerExtension(),
@@ -227,12 +227,12 @@ void Artifact::add(UmlPackage * pack, UmlClass * cl, Q3CString & art_path)
         // cl's header and body files may contains a path part
     {
         QDir d(cpp_path);
-        Q3CString h = cl->file();
-        Q3CString body = cl->bodyFile();
+        QByteArray h = cl->file();
+        QByteArray body = cl->bodyFile();
 
         add_cpp(pack, cl,
-                (h.isEmpty()) ? h : Q3CString(QDir::cleanDirPath(d.filePath(cl->file())).toAscii()),//[jasa] QString to Q3CString conversion
-                (body.isEmpty()) ? body : Q3CString(QDir::cleanDirPath(d.filePath(cl->bodyFile())).toAscii()));//[jasa] QString to Q3CString conversion
+                (h.isEmpty()) ? h : QByteArray(QDir::cleanPath(d.filePath(cl->file())).toLatin1()),//[jasa] QString to QByteArray conversion
+                (body.isEmpty()) ? body : QByteArray(QDir::cleanPath(d.filePath(cl->bodyFile())).toLatin1()));//[jasa] QString to QByteArray conversion
     }
     break;
 
@@ -244,7 +244,7 @@ void Artifact::add(UmlPackage * pack, UmlClass * cl, Q3CString & art_path)
     case Java:
         // java_path is the pathname
     {
-        int index = java_path.findRev('.');
+        int index = java_path.lastIndexOf('.');
 
         if (index != -1)
             add_java(pack, cl, art_path,
@@ -257,19 +257,19 @@ void Artifact::add(UmlPackage * pack, UmlClass * cl, Q3CString & art_path)
     }
 }
 
-void Artifact::add_cpp(UmlPackage * pack, UmlClass * cl, Q3CString h, Q3CString src)
+void Artifact::add_cpp(UmlPackage * pack, UmlClass * cl, QByteArray h, QByteArray src)
 {
-    Q3CString basename;
-    Q3CString hpath;
-    Q3CString srcpath;
+    QByteArray basename;
+    QByteArray hpath;
+    QByteArray srcpath;
 
     if (! h.isEmpty()) {
         h = normalize(h, CppSettings::rootDir());
 
         QFileInfo fi(h);
 
-        basename = fi.baseName();
-        hpath = fi.dirPath();
+        basename = fi.baseName().toLatin1();
+        hpath = fi.path().toLatin1();
     }
 
     if (! src.isEmpty()) {
@@ -278,22 +278,22 @@ void Artifact::add_cpp(UmlPackage * pack, UmlClass * cl, Q3CString h, Q3CString
         QFileInfo fi(src);
 
         if (basename.isEmpty())
-            basename = fi.baseName();
+            basename = fi.baseName().toLatin1();
 
-        srcpath = fi.dirPath();
+        srcpath = fi.path().toLatin1();
     }
 
     if (basename.isEmpty())
         return;
 
-    Q3PtrList<UmlArtifact> artifacts;
+    QList<UmlArtifact*> artifacts;
     UmlArtifact * art;
     UmlPackage * p = 0;	// to avoid compiler warning
 
     pack->subArtifacts(artifacts, basename, name);
 
     // search for an existing artifact
-    for (art = artifacts.first(); art != 0; art = artifacts.next()) {
+    foreach (art,artifacts) {
         p = (UmlPackage *) art->parent()->parent();
 
         if ((hpath.isEmpty() || p->cppHDir().isEmpty() || (hpath == p->cppHDir())) &&
@@ -305,7 +305,7 @@ void Artifact::add_cpp(UmlPackage * pack, UmlClass * cl, Q3CString h, Q3CString
 
     if (art == 0) {
         // no compatible artifact
-        Q3PtrList<UmlDeploymentView> deplviews;
+        QList<UmlDeploymentView*> deplviews;
         UmlDeploymentView * deplview;
         UmlPackage * compatible = 0;
 
@@ -318,7 +318,7 @@ void Artifact::add_cpp(UmlPackage * pack, UmlClass * cl, Q3CString h, Q3CString
                 compatible = pack;
         }
         else {
-            for (deplview = deplviews.first(); deplview != 0; deplview = deplviews.next()) {
+            foreach (deplview,deplviews) {
                 p = (UmlPackage *) deplview->parent();
 
                 if ((hpath.isEmpty() || p->cppHDir().isEmpty() || (hpath == p->cppHDir())) &&
@@ -372,15 +372,15 @@ void Artifact::add_cpp(UmlPackage * pack, UmlClass * cl, Q3CString h, Q3CString
     art->addAssociatedClass(cl);
 }
 
-void Artifact::add_corba(UmlPackage * pack, UmlClass * cl, Q3CString src)
+void Artifact::add_corba(UmlPackage * pack, UmlClass * cl, QByteArray src)
 {
     // src if the filename without path
     QFileInfo fi(src);
-    Q3CString basename;
+    QByteArray basename;
 
-    basename = fi.baseName();
+    basename = fi.baseName().toLatin1();
 
-    Q3PtrList<UmlArtifact> artifacts;
+    QList<UmlArtifact*> artifacts;
     UmlArtifact * art;
     UmlPackage * p;
 
@@ -392,13 +392,13 @@ void Artifact::add_corba(UmlPackage * pack, UmlClass * cl, Q3CString src)
         art = artifacts.first();
     }
     else {
-        Q3PtrList<UmlDeploymentView> deplviews;
+        QList<UmlDeploymentView*> deplviews;
         UmlDeploymentView * deplview;
 
         pack->subDeplViews(deplviews, name);
         art = 0;
 
-        for (deplview = deplviews.first(); deplview != 0; deplview = deplviews.next()) {
+        foreach (deplview, deplviews) {
             if ((art = UmlArtifact::create(deplview, basename)) != 0) {
                 art->set_Stereotype("source");
                 p = (UmlPackage *) deplview->parent();
@@ -423,43 +423,43 @@ void Artifact::add_corba(UmlPackage * pack, UmlClass * cl, Q3CString src)
     art->addAssociatedClass(cl);
 }
 
-void Artifact::add_java(UmlPackage * pack, UmlClass * cl, Q3CString art_path, Q3CString src)
+void Artifact::add_java(UmlPackage * pack, UmlClass * cl, QByteArray art_path, QByteArray src)
 {
-    Q3CString basename;
-    Q3CString srcpath;
+    QByteArray basename;
+    QByteArray srcpath;
 
     src = normalize(src, JavaSettings::rootDir());
 
     QFileInfo fi(src);
 
-    basename = fi.baseName();
-    srcpath = fi.dirPath();
+    basename = fi.baseName().toLatin1();
+    srcpath = fi.path().toLatin1();
 
     // manage java package using the artifact path
     int index;
 
-    if ((index = art_path.find("::")) != -1) {
+    if ((index = art_path.indexOf("::")) != -1) {
         // mandatory : Component View::
         art_path = art_path.mid(index + 2);
 
-        if ((index = art_path.findRev("::")) != -1) {
+        if ((index = art_path.lastIndexOf("::")) != -1) {
             // pack::...::file, remove ::file
             art_path = art_path.left(index);
 
-            while ((index = art_path.findRev("::")) != -1)
+            while ((index = art_path.lastIndexOf("::")) != -1)
                 // :: -> .
                 art_path = art_path.left(index) + "." + art_path.mid(index + 2);
         }
     }
 
-    Q3PtrList<UmlArtifact> artifacts;
+    QList<UmlArtifact*> artifacts;
     UmlArtifact * art;
     UmlPackage * p = 0;	// to avoid compiler warning
 
     pack->subArtifacts(artifacts, basename, "java deployment view");
 
     // search for an existing artifact
-    for (art = artifacts.first(); art != 0; art = artifacts.next()) {
+    foreach (art, artifacts) {
         p = (UmlPackage *) art->parent()->parent();
 
         if ((srcpath.isEmpty() || p->javaDir().isEmpty() || (srcpath == p->javaDir())) &&
@@ -471,7 +471,7 @@ void Artifact::add_java(UmlPackage * pack, UmlClass * cl, Q3CString art_path, Q3
 
     if (art == 0) {
         // no compatible artifact
-        Q3PtrList<UmlDeploymentView> deplviews;
+        QList<UmlDeploymentView*> deplviews;
         UmlDeploymentView * deplview;
         UmlPackage * compatible = 0;
 
@@ -483,7 +483,7 @@ void Artifact::add_java(UmlPackage * pack, UmlClass * cl, Q3CString art_path, Q3
                 compatible = pack;
         }
         else {
-            for (deplview = deplviews.first(); deplview != 0; deplview = deplviews.next()) {
+            foreach (deplview, deplviews) {
                 p = (UmlPackage *) deplview->parent();
 
                 if ((srcpath.isEmpty() || p->javaDir().isEmpty() || (srcpath == p->javaDir())) &&
@@ -531,11 +531,11 @@ void Artifact::add_java(UmlPackage * pack, UmlClass * cl, Q3CString art_path, Q3
     art->addAssociatedClass(cl);
 }
 
-Q3CString Artifact::normalize(Q3CString path, Q3CString root)
+QByteArray Artifact::normalize(QByteArray path, QByteArray root)
 {
     File f(path, "");	// normalize, replace $var
 
-    path = Q3CString(f.name().toAscii());//[jasa] QString to Q3CString conversion
+    path = QByteArray(f.fileName().toLatin1());//[jasa] QString to QByteArray conversion
 
     int rl = root.length();
 
diff --git a/genplugouts/import_rose/Artifact.h b/genplugouts/import_rose/Artifact.h
index 6c7eb6b3f..d94fa15d9 100644
--- a/genplugouts/import_rose/Artifact.h
+++ b/genplugouts/import_rose/Artifact.h
@@ -3,9 +3,8 @@
 
 
 #include "Language.h"
-#include <q3cstring.h>
-#include <q3asciidict.h>
-
+#include <QByteArray>
+#include <QHash>
 class File;
 class UmlPackage;
 class UmlClass;
@@ -15,27 +14,27 @@ class Artifact
 protected:
     Language language;
 
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString stereotype;
+    QByteArray stereotype;
 
-    Q3CString description;
+    QByteArray description;
 
-    Q3CString cpp_path;
+    QByteArray cpp_path;
 
-    Q3CString java_path;
+    QByteArray java_path;
 
-    Q3CString cpp_namespace;
+    QByteArray cpp_namespace;
 
-    Q3CString java_package;
+    QByteArray java_package;
 
-    Q3CString idl_module;
+    QByteArray idl_module;
 
-    static Q3AsciiDict<Artifact> all;
+    static QHash<QByteArray,Artifact*> all;
 
 
 public:
-    static Artifact * find(const Q3CString & uid);
+    static Artifact * find(const QByteArray & uid);
 
     static void import_component_view(File & f);
 
@@ -46,15 +45,15 @@ class Artifact
     //'pack' is the package containing the class view where 'cl' is defined
     //'cl' is not nested in an other class
     //'art_path' is the rose path of the artifact
-    void add(UmlPackage * pack, UmlClass * cl, Q3CString & art_path);
+    void add(UmlPackage * pack, UmlClass * cl, QByteArray & art_path);
 
-    void add_cpp(UmlPackage * pack, UmlClass * cl, Q3CString h, Q3CString src);
+    void add_cpp(UmlPackage * pack, UmlClass * cl, QByteArray h, QByteArray src);
 
-    void add_corba(UmlPackage * pack, UmlClass * cl, Q3CString src);
+    void add_corba(UmlPackage * pack, UmlClass * cl, QByteArray src);
 
-    void add_java(UmlPackage * pack, UmlClass * cl, Q3CString art_path, Q3CString src);
+    void add_java(UmlPackage * pack, UmlClass * cl, QByteArray art_path, QByteArray src);
 
-    Q3CString normalize(Q3CString path, Q3CString root);
+    QByteArray normalize(QByteArray path, QByteArray root);
 
 };
 
diff --git a/genplugouts/import_rose/CppSettings.cpp b/genplugouts/import_rose/CppSettings.cpp
index 8474976cf..19eb9e535 100644
--- a/genplugouts/import_rose/CppSettings.cpp
+++ b/genplugouts/import_rose/CppSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationStereotype(Q3CString s)
+QByteArray CppSettings::relationStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(cppSettingsCmd, setCppRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -171,14 +171,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -190,14 +190,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -209,14 +209,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -228,14 +228,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -266,14 +266,14 @@ bool CppSettings::set_IncludeWithPath(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -285,14 +285,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -304,14 +304,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -323,14 +323,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -342,14 +342,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -361,14 +361,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -380,14 +380,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -399,14 +399,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -418,14 +418,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -437,14 +437,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -456,14 +456,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -475,14 +475,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -494,14 +494,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl()
+const QByteArray & CppSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool CppSettings::set_AttributeDecl(Q3CString v)
+bool CppSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -513,14 +513,14 @@ bool CppSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -532,7 +532,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -551,14 +551,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -570,14 +570,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //ambiguous call
 
@@ -627,14 +627,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -722,14 +722,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -781,47 +781,47 @@ bool CppSettings::set_IsSetParamConst(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl;
+QByteArray CppSettings::_attr_decl;
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -831,30 +831,30 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
 bool CppSettings::_is_set_param_const;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -879,13 +879,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/import_rose/CppSettings.h b/genplugouts/import_rose/CppSettings.h
index d1275b4f4..c30bfd7e7 100644
--- a/genplugouts/import_rose/CppSettings.h
+++ b/genplugouts/import_rose/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(Q3CString s);
+    static QByteArray relationStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -138,62 +138,62 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -201,75 +201,75 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -278,20 +278,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -315,13 +315,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -367,14 +367,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -405,47 +405,47 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -455,23 +455,23 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
     static bool _is_set_param_const;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/import_rose/File.cpp b/genplugouts/import_rose/File.cpp
index fb640e05c..5dd8d8baf 100644
--- a/genplugouts/import_rose/File.cpp
+++ b/genplugouts/import_rose/File.cpp
@@ -3,11 +3,11 @@
 
 #include <stdlib.h>
 #include <qinputdialog.h>
-#include <q3dict.h>
+
 #include <qfileinfo.h>
 #include <qdir.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #include "UmlCom.h"
 
 File::File(QString s, QString here)
@@ -15,63 +15,61 @@ File::File(QString s, QString here)
     for (;;)  {
         int index = 0;
 
-        while ((index = s.find('\\', index)) != -1)
+        while ((index = s.indexOf('\\', index)) != -1)
             s.replace(index++, 1, "/");
 
         int index0;
 
-        if ((index0 = s.find('$')) == -1)
+        if ((index0 = s.indexOf('$')) == -1)
             break;
 
-        if ((index = s.find('/', index0 + 1)) == -1)
+        if ((index = s.indexOf('/', index0 + 1)) == -1)
             index = s.length();
 
-        static Q3Dict<char> alias;
+        static QHash<QString,char*> alias;
 
         QString var = s.left(index);
         const char * val = alias[var];
 
         if (val == 0) {
-            if ((val = getenv(var.mid(1))) == 0) {
-                QString v = QInputDialog::getText("Unknown environment variable",
+            if ((val = getenv(var.mid(1).toLatin1().constData())) == 0) {
+                QString v = QInputDialog::getText(0,"Unknown environment variable",
                                                   var.mid(1) + " : ");
 
                 if (v.isEmpty())
                     throw 0;
 
-                val = strdup((const char *) v);
+                val = strdup((const char *) v.toLatin1().constData());
             }
             else
                 val = strdup(val);
 
-            alias.insert(var, val);
+            alias.insert(QString(var), const_cast<char*>(val));
         }
 
         if (*val == '&') {
             QFileInfo fi(here);
 
-            s.replace(index0, index - index0, fi.dirPath(TRUE));
+            s.replace(index0, index - index0, fi.path());
         }
         else
             s.replace(index0, index - index0, val);
     }
 
-    setName(QDir::cleanDirPath(s));
+    setFileName(QDir::cleanPath(s));
 
     unread_k = -1;
 
 }
 
-bool File::open(int m)
+bool File::open(OpenMode flags)
 {
     line_number = 1;
 
-    //[jasa] Possible QFile problem here.
-    //return QFile::open(m);//[jasa] original line.
-    return QFile::open((QIODevice::OpenModeFlag)m);//[jasa] fix ambiguous enum/int call
+    return QFile::open(flags);
 }
 
-int File::read(Q3CString & s)
+int File::read(QByteArray & s)
 {
     if (unread_k != -1) {
         s = unread_s;
@@ -85,7 +83,11 @@ int File::read(Q3CString & s)
     s = "";
 
     for (;;) {
-        int c = getch();
+        char ch;
+        bool retVal = getChar(&ch);
+        if(!retVal) //possibly end of file
+            ch = -1;
+        int c = ch;
 
         switch (c) {
         case '(':
@@ -121,7 +123,7 @@ int File::read(Q3CString & s)
 
 void File::read(const char * e)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (read(s) == -1)
         eof();
@@ -130,39 +132,52 @@ void File::read(const char * e)
         syntaxError(s, e);
 }
 
-void File::unread(int k, const Q3CString & s)
+void File::unread(int k, const QByteArray & s)
 {
     unread_k = k;
     unread_s = s;
 }
 
-Q3CString File::context()
+QByteArray File::context()
 {
-    Q3CString s;
+    QByteArray s;
 
-    return Q3CString(name().toAscii()) + " line " + s.setNum(line_number);//[jasa] QString to Q3CString conversion
+    return QByteArray(fileName().toLatin1()) + " line " + s.setNum(line_number);//[jasa] QString to QByteArray conversion
 }
 
-int File::readString(Q3CString & s)
+int File::readString(QByteArray & s)
 {
     int c;
+    char ch;
 
-    while ((c = getch()) != '"') {
+    while (1) {
+        getChar(&ch);
+        c = ch;
+        if(c  == '"')
+            break;
         if (c == -1) {
             UmlCom::trace("<br>end of file reading a string in " + context());
             throw 0;
         }
 
-        s += ((c == '\\') ? getch() : c);
+        if(c == '\\')
+        {
+            getChar(&ch);
+            s += ch;
+        }
+        else
+            s += c;
     }
 
     return STRING;
 }
 
-int File::readMLString(Q3CString & s)
+int File::readMLString(QByteArray & s)
 {
     for (;;) {
-        int c = getch();
+        char ch;
+        getChar(&ch);
+        int c = ch;
 
         switch (c) {
         case -1:
@@ -170,10 +185,14 @@ int File::readMLString(Q3CString & s)
 
         case '\n':
             line_number += 1;
-            c = getch();
+            getChar(&ch);
+            c = ch;
 
             if (c == '\r')
-                c = getch();
+            {
+                getChar(&ch);
+                c = ch;
+            }
 
             switch (c) {
             case -1:
@@ -184,7 +203,7 @@ int File::readMLString(Q3CString & s)
                 break;
 
             default:
-                ungetch(c);
+                ungetChar(c);
                 return STRING;
             }
 
@@ -192,22 +211,33 @@ int File::readMLString(Q3CString & s)
             break;
 
         default:
-            s += ((c == '\\') ? getch() : c);
+        {
+            //s += ((c == '\\') ? getch() : c);
+            if(c == '\\')
+            {
+                getChar(&ch);
+                s += ch;
+            }
+            else
+                s += c;
+        }
         }
     }
 }
 
-int File::readAtom(Q3CString & s)
+int File::readAtom(QByteArray & s)
 {
     for (;;) {
-        int c = getch();
+        char ch;
+        getChar(&ch);
+        int c = ch;
 
         switch (c) {
         case '(':
         case ')':
         case '"':
         case '\n':
-            ungetch(c);
+            ungetChar(c);
 
             // no break !
         case -1:
@@ -222,15 +252,15 @@ int File::readAtom(Q3CString & s)
     }
 }
 
-void File::syntaxError(const Q3CString s)
+void File::syntaxError(const QByteArray s)
 {
     UmlCom::trace("<br>syntax error near '" + s + "' in " + context());
     throw 0;
 }
 
-void File::syntaxError(const Q3CString s, const Q3CString e)
+void File::syntaxError(const QByteArray s, const QByteArray e)
 {
-    Q3CString msg = "<br>'" + e + "' expected rather than '" + s + "' in " + context();
+    QByteArray msg = "<br>'" + e + "' expected rather than '" + s + "' in " + context();
 
     UmlCom::trace(msg);
     throw 0;
@@ -239,7 +269,7 @@ void File::syntaxError(const Q3CString s, const Q3CString e)
 void File::skipBlock()
 {
     int lvl = 1;
-    Q3CString s;
+    QByteArray s;
 
     for (;;) {
         switch (read(s)) {
@@ -263,11 +293,11 @@ void File::skipBlock()
 
 void File::skipNextForm()
 {
-    Q3CString s;
+    QByteArray s;
 
     switch (read(s)) {
     case ')':
-        ungetch(')');
+        ungetChar(')');
         break;
 
     case '(':
@@ -282,19 +312,19 @@ void File::skipNextForm()
 
 void File::eof()
 {
-    UmlCom::trace("<br>premature end of file in " + name());
+    UmlCom::trace(QString("<br>premature end of file in " + fileName()).toLatin1().constData());
 }
 
 void File::rewind()
 {
     line_number = 1;
-    at(0);
+    seek(0);
     unread_k = -1;
 }
 
 aVisibility File::readVisibility()
 {
-    Q3CString s;
+    QByteArray s;
 
     if (read(s) == STRING) {
         if (s == "Private")
@@ -313,7 +343,7 @@ aVisibility File::readVisibility()
 
 bool File::readBool()
 {
-    Q3CString s;
+    QByteArray s;
 
     if (read(s) == ATOM) {
         if (s == "TRUE")
@@ -329,7 +359,7 @@ bool File::readBool()
 
 Language File::readLanguage()
 {
-    Q3CString s;
+    QByteArray s;
 
     if (read(s) != STRING)
         syntaxError(s, "a language");
@@ -355,7 +385,7 @@ Language File::readLanguage()
     return None;
 }
 
-int File::readDefinitionBeginning(Q3CString & s, Q3CString & id, Q3CString & ste, Q3CString & doc, Q3Dict<Q3CString> & prop)
+int File::readDefinitionBeginning(QByteArray & s, QByteArray & id, QByteArray & ste, QByteArray & doc, QHash<QByteArray, QByteArray*> & prop)
 {
     for (;;) {
         int k = read(s);
@@ -399,16 +429,16 @@ int File::readDefinitionBeginning(Q3CString & s, Q3CString & id, Q3CString & ste
     }
 }
 
-void File::readProperties(Q3Dict<Q3CString> & d)
+void File::readProperties(QHash<QByteArray, QByteArray*> & d)
 {
-    d.setAutoDelete(TRUE);
+    //d.setAutoDelete(TRUE);
 
     read("(");
     read("list");
     read("Attribute_Set");
 
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (read(s)) {
         case ')':
@@ -424,7 +454,7 @@ void File::readProperties(Q3Dict<Q3CString> & d)
 
             read("name");
             {
-                Q3CString s2;
+                QByteArray s2;
 
                 if (read(s2) != STRING)
                     syntaxError(s2, "the name");
@@ -449,7 +479,7 @@ void File::readProperties(Q3Dict<Q3CString> & d)
                     // no break !
                 case STRING:
                 case ATOM:
-                    d.insert(s, new Q3CString(s2));
+                    d.insert(s, new QByteArray(s2));
                     break;
 
                 default:
diff --git a/genplugouts/import_rose/File.h b/genplugouts/import_rose/File.h
index 825a0c98d..3bf0d1bda 100644
--- a/genplugouts/import_rose/File.h
+++ b/genplugouts/import_rose/File.h
@@ -3,10 +3,10 @@
 
 
 #include <qstring.h>
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "Language.h"
-#include <q3dict.h>
+
 
 #include <qfile.h>
 enum { ATOM = 1, STRING = 2 };
@@ -16,33 +16,33 @@ class File : public QFile
 public:
     File(QString s, QString here);
 
-    bool open(int m);
+    virtual bool open(OpenMode flags) override;
 
     //// read a token in 's', returns its kind
 
-    int read(Q3CString & s);
+    int read(QByteArray & s);
 
     //// e is expected, return TRUE if ok
 
     void read(const char * e);
 
-    void unread(int k, const Q3CString & s);
+    void unread(int k, const QByteArray & s);
 
-    Q3CString context();
+    QByteArray context();
 
 
 protected:
-    int readString(Q3CString & s);
+    int readString(QByteArray & s);
 
-    int readMLString(Q3CString & s);
+    int readMLString(QByteArray & s);
 
-    int readAtom(Q3CString & s);
+    int readAtom(QByteArray & s);
 
 
 public:
-    void syntaxError(const Q3CString s);
+    void syntaxError(const QByteArray s);
 
-    void syntaxError(const Q3CString s, const Q3CString e);
+    void syntaxError(const QByteArray s, const QByteArray e);
 
     //// skip the end of the current block
     //// '(' already read
@@ -62,9 +62,9 @@ class File : public QFile
 
     Language readLanguage();
 
-    int readDefinitionBeginning(Q3CString & s, Q3CString & id, Q3CString & ste, Q3CString & doc, Q3Dict<Q3CString> & prop);
+    int readDefinitionBeginning(QByteArray & s, QByteArray & id, QByteArray & ste, QByteArray & doc, QHash<QByteArray, QByteArray*> & prop);
 
-    void readProperties(Q3Dict<Q3CString> & d);
+    void readProperties(QHash<QByteArray, QByteArray*> & d);
 
 
 protected:
@@ -72,7 +72,7 @@ class File : public QFile
 
     int unread_k;
 
-    Q3CString unread_s;
+    QByteArray unread_s;
 
 };
 
diff --git a/genplugouts/import_rose/IdlSettings.cpp b/genplugouts/import_rose/IdlSettings.cpp
index 5d1141bd4..a8ac9d5c2 100644
--- a/genplugouts/import_rose/IdlSettings.cpp
+++ b/genplugouts/import_rose/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -171,14 +171,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -190,14 +190,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -209,14 +209,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -228,14 +228,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -247,14 +247,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -266,14 +266,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -285,14 +285,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -304,14 +304,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -323,14 +323,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -342,14 +342,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -361,14 +361,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl()
+const QByteArray & IdlSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool IdlSettings::set_AttributeDecl(Q3CString v)
+bool IdlSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -380,14 +380,14 @@ bool IdlSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl()
+const QByteArray & IdlSettings::valuetypeAttributeDecl()
 {
     read_if_needed_();
 
     return _valuetype_attr_decl;
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -399,14 +399,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl()
+const QByteArray & IdlSettings::unionItemDecl()
 {
     read_if_needed_();
 
     return _union_item_decl;
 }
 
-bool IdlSettings::set_UnionItemDecl(Q3CString v)
+bool IdlSettings::set_UnionItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -418,14 +418,14 @@ bool IdlSettings::set_UnionItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -437,14 +437,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl()
+const QByteArray & IdlSettings::constDecl()
 {
     read_if_needed_();
 
     return _const_decl;
 }
 
-bool IdlSettings::set_ConstDecl(Q3CString v)
+bool IdlSettings::set_ConstDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -456,14 +456,14 @@ bool IdlSettings::set_ConstDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
 
@@ -475,14 +475,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
 
@@ -494,14 +494,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
 
@@ -513,14 +513,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -532,14 +532,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -551,14 +551,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -591,60 +591,60 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl;
+QByteArray IdlSettings::_attr_decl;
 
-Q3CString IdlSettings::_valuetype_attr_decl;
+QByteArray IdlSettings::_valuetype_attr_decl;
 
-Q3CString IdlSettings::_union_item_decl;
+QByteArray IdlSettings::_union_item_decl;
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl;
+QByteArray IdlSettings::_const_decl;
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -666,13 +666,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/import_rose/IdlSettings.h b/genplugouts/import_rose/IdlSettings.h
index 04608fb4d..be820771f 100644
--- a/genplugouts/import_rose/IdlSettings.h
+++ b/genplugouts/import_rose/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype
-    static const Q3CString & valuetypeAttributeDecl();
+    static const QByteArray & valuetypeAttributeDecl();
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(Q3CString v);
+    static bool set_ValuetypeAttributeDecl(QByteArray v);
 
     // returns the default definition of an union item
-    static const Q3CString & unionItemDecl();
+    static const QByteArray & unionItemDecl();
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(Q3CString v);
+    static bool set_UnionItemDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute
-    static const Q3CString & constDecl();
+    static const QByteArray & constDecl();
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(Q3CString v);
+    static bool set_ConstDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _valuetype_attr_decl;
+    static QByteArray _valuetype_attr_decl;
 
-    static Q3CString _union_item_decl;
+    static QByteArray _union_item_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl;
+    static QByteArray _const_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/import_rose/JavaSettings.cpp b/genplugouts/import_rose/JavaSettings.cpp
index 1e4024293..4b21cbbba 100644
--- a/genplugouts/import_rose/JavaSettings.cpp
+++ b/genplugouts/import_rose/JavaSettings.cpp
@@ -5,11 +5,11 @@
 
 #include "UmlCom.h"
 #include "UmlSettings.h"
-//#include "Tools/ApiCmd.h"
+#include "Tools/ApiCmd.h"
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -171,14 +171,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -190,14 +190,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -209,14 +209,14 @@ bool JavaSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -228,14 +228,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -247,14 +247,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumDecl()
+const QByteArray & JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -266,14 +266,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -285,14 +285,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl()
+const QByteArray & JavaSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool JavaSettings::set_AttributeDecl(Q3CString v)
+bool JavaSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -304,14 +304,14 @@ bool JavaSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemDecl()
+const QByteArray & JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -323,16 +323,16 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemCase()
+const QByteArray & JavaSettings::enumItemCase()
 {
     read_if_needed_();
 
     return _enum_item_case;
 }
 
-bool JavaSettings::set_EnumItemCase(Q3CString v)
+bool JavaSettings::set_EnumItemCase(QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemCaseCmd, (const char *)v); //[jasa] ambiguous call
+    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
         _enum_item_case = v;
@@ -342,14 +342,14 @@ bool JavaSettings::set_EnumItemCase(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
 
@@ -361,14 +361,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -399,14 +399,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -418,14 +418,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -515,52 +515,52 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl;
+QByteArray JavaSettings::_attr_decl;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_enum_item_case;
+QByteArray JavaSettings::_enum_item_case;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray, QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -581,13 +581,13 @@ void JavaSettings::read_()
     n = UmlCom::read_unsigned();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/import_rose/JavaSettings.h b/genplugouts/import_rose/JavaSettings.h
index 4de7719ac..01dd835fc 100644
--- a/genplugouts/import_rose/JavaSettings.h
+++ b/genplugouts/import_rose/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,160 +31,160 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationUmlStereotype(const Q3CString & s);
+    static QByteArray relationUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumItemCase();
+    static const QByteArray & enumItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumItemCase(Q3CString v);
+    static bool set_EnumItemCase(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -198,23 +198,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -263,45 +263,45 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _enum_item_case;
+    static QByteArray _enum_item_case;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/import_rose/Uc.cpp b/genplugouts/import_rose/Uc.cpp
index 1d702f13b..5baf81164 100644
--- a/genplugouts/import_rose/Uc.cpp
+++ b/genplugouts/import_rose/Uc.cpp
@@ -10,12 +10,13 @@
 #include "UmlSequenceDiagram.h"
 #include "UmlCollaborationDiagram.h"
 #include "UmlCom.h"
+#include "UmlClassDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void Uc::import(File & f)
 {
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (f.read(s)) {
         case -1:
@@ -47,7 +48,7 @@ void Uc::import(File & f)
 void Uc::readObjects(File & f)
 {
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (f.read(s)) {
         case ')':
@@ -72,6 +73,8 @@ void Uc::readObjects(File & f)
             UmlUseCase::import(f, item());
         else if (s == "UseCaseDiagram")
             UmlUseCaseDiagram::import(f, item());
+        /*else if (s == "ClassDiagram")
+            UmlClassDiagram::import(f, item());*/
         else if (s == "InteractionDiagram")
             UmlSequenceDiagram::import(f, item());
         else if (s == "ObjectDiagram")
@@ -87,8 +90,8 @@ void Uc::readObjects(File & f)
         else {
             if ((s != "Association") &&	// actor -----> UC ...
                 (s != "Mechanism"))		// seq/col diagram
-                //UmlCom::trace("<br>" + s + " in " + Q3CString(f.name()) + " NOT MANAGED by UseCaseView::readObject()");//[jasa] original line
-                UmlCom::trace("<br>" + s + " in " + Q3CString(f.name().toAscii()) + " NOT MANAGED by UseCaseView::readObject()");//[jasa] conversion from QString to Q3CString
+                //UmlCom::trace("<br>" + s + " in " + QByteArray(f.name()) + " NOT MANAGED by UseCaseView::readObject()");//[jasa] original line
+                UmlCom::trace("<br>" + s + " in " + QByteArray(f.fileName().toLatin1()) + " NOT MANAGED by UseCaseView::readObject()");//[jasa] conversion from QString to QByteArray
 
             f.skipBlock();
         }
diff --git a/genplugouts/import_rose/Uc.h b/genplugouts/import_rose/Uc.h
index e1a8fa891..9578b116e 100644
--- a/genplugouts/import_rose/Uc.h
+++ b/genplugouts/import_rose/Uc.h
@@ -2,7 +2,7 @@
 #define _UC_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlItem;
 class File;
@@ -14,7 +14,7 @@ class Uc
 
     virtual UmlItem * item() = 0;
 
-    virtual void readObject(File & f, Q3CString s) = 0;
+    virtual void readObject(File & f, QByteArray s) = 0;
 
     void import(File & f);
 
diff --git a/genplugouts/import_rose/UmlActualParameter.cpp b/genplugouts/import_rose/UmlActualParameter.cpp
index bcbf6d318..c6a9dc077 100644
--- a/genplugouts/import_rose/UmlActualParameter.cpp
+++ b/genplugouts/import_rose/UmlActualParameter.cpp
@@ -5,13 +5,13 @@
 
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlActualParameter::import(File & f, UmlTypeSpec & t)
 {
     f.read("object");
     f.read("Parameter");
 
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "actual's name");
diff --git a/genplugouts/import_rose/UmlArtifact.h b/genplugouts/import_rose/UmlArtifact.h
index 39ac95fce..7fc0a61b4 100644
--- a/genplugouts/import_rose/UmlArtifact.h
+++ b/genplugouts/import_rose/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'artifacts'
 //
@@ -11,7 +11,7 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlAttribute.cpp b/genplugouts/import_rose/UmlAttribute.cpp
index 487c68f8d..33598ffa2 100644
--- a/genplugouts/import_rose/UmlAttribute.cpp
+++ b/genplugouts/import_rose/UmlAttribute.cpp
@@ -9,7 +9,7 @@
 #include "JavaSettings.h"
 #include "IdlSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlAttribute::import(File & f)
 {
     if (scanning) {
@@ -17,7 +17,7 @@ void UmlAttribute::import(File & f)
         return;
     }
 
-    Q3CString s;
+    QByteArray s;
     UmlTypeSpec t;
 
     for (;;) {
@@ -86,16 +86,16 @@ void UmlAttribute::import(File & f)
 
 void UmlAttribute::import(File & f, UmlClass * parent)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "attributes's name");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
@@ -157,7 +157,7 @@ void UmlAttribute::import(File & f, UmlClass * parent)
 
 }
 
-void UmlAttribute::importIdlConstant(UmlClass * parent, const Q3CString & id, const Q3CString & s, const Q3CString & doc, Q3Dict<Q3CString> & prop)
+void UmlAttribute::importIdlConstant(UmlClass * parent, const QByteArray & id, const QByteArray & s, const QByteArray & doc, QHash<QByteArray, QByteArray*> & prop)
 {
     UmlAttribute * x;
 
@@ -174,9 +174,9 @@ void UmlAttribute::importIdlConstant(UmlClass * parent, const Q3CString & id, co
 
     x->set_IdlDecl(IdlSettings::constDecl());
 
-    Q3CString * v;
+    QByteArray * v;
 
-    if ((v = prop.find("CORBA/ImplementationType")) != 0) {
+    if ((v = prop.value("CORBA/ImplementationType")) != 0) {
         if (!v->isEmpty()) {
             UmlTypeSpec t;
 
@@ -187,7 +187,7 @@ void UmlAttribute::importIdlConstant(UmlClass * parent, const Q3CString & id, co
         prop.remove("CORBA/ImplementationType");
     }
 
-    if ((v = prop.find("CORBA/ConstValue")) != 0) {
+    if ((v = prop.value("CORBA/ConstValue")) != 0) {
         if (!v->isEmpty()) {
             *v = "= " + *v;
             x->set_DefaultValue(*v);
@@ -199,21 +199,21 @@ void UmlAttribute::importIdlConstant(UmlClass * parent, const Q3CString & id, co
     x->setProperties(prop);
 }
 
-void UmlAttribute::cplusplus(Q3Dict<Q3CString> &)
+void UmlAttribute::cplusplus(QHash<QByteArray, QByteArray*> &)
 {
     set_CppDecl((parent()->stereotype() == "enum")
                 ? CppSettings::enumItemDecl()
                 : CppSettings::attributeDecl());
 }
 
-void UmlAttribute::oracle8(Q3Dict<Q3CString> &)
+void UmlAttribute::oracle8(QHash<QByteArray, QByteArray*> &)
 {
 }
 
-void UmlAttribute::corba(Q3Dict<Q3CString> & prop)
+void UmlAttribute::corba(QHash<QByteArray, QByteArray*> & prop)
 {
-    Q3CString * v;
-    Q3CString decl;
+    QByteArray * v;
+    QByteArray decl;
 
     if (parent()->stereotype() == "union")
         decl = IdlSettings::unionItemDecl();
@@ -222,23 +222,23 @@ void UmlAttribute::corba(Q3Dict<Q3CString> & prop)
     else
         decl = IdlSettings::attributeDecl();
 
-    if ((v = prop.find("CORBA/IsReadOnly")) != 0) {
+    if ((v = prop.value("CORBA/IsReadOnly")) != 0) {
         if (*v == "TRUE")
             set_isReadOnly(TRUE);
 
         prop.remove("CORBA/IsReadOnly");
     }
 
-    if ((v = prop.find("CORBA/CaseSpecifier")) != 0) {
+    if ((v = prop.value("CORBA/CaseSpecifier")) != 0) {
         set_IdlCase(*v);	// !!!!!!!!!!! chercher union attr
         prop.remove("CORBA/CaseSpecifier");
     }
 
-    if ((v = prop.find("CORBA/ArrayDimensions")) != 0) {
+    if ((v = prop.value("CORBA/ArrayDimensions")) != 0) {
         if (!v->isEmpty()) {
             int index;
 
-            if ((index = decl.find("${name}")) != -1)
+            if ((index = decl.indexOf("${name}")) != -1)
                 //decl.insert(index + 7, "[" + *v + "]");//[jasa] original line
                 decl.insert(index + 7, (const char *)("[" + (*v) + "]")); //[jasa] fix ambiguous call
         }
@@ -249,25 +249,25 @@ void UmlAttribute::corba(Q3Dict<Q3CString> & prop)
     set_IdlDecl(decl);
 }
 
-void UmlAttribute::java(Q3Dict<Q3CString> & prop)
+void UmlAttribute::java(QHash<QByteArray, QByteArray*> & prop)
 {
-    Q3CString * v;
+    QByteArray * v;
 
-    if ((v = prop.find("Java/Final")) != 0) {
+    if ((v = prop.value("Java/Final")) != 0) {
         if (*v == "TRUE")
             set_isReadOnly(TRUE);
 
         prop.remove("Java/Final");
     }
 
-    if ((v = prop.find("Java/Transient")) != 0) {
+    if ((v = prop.value("Java/Transient")) != 0) {
         if (*v == "TRUE")
             set_isJavaTransient(TRUE);
 
         prop.remove("Java/Transient");
     }
 
-    if ((v = prop.find("Java/Volatile")) != 0) {
+    if ((v = prop.value("Java/Volatile")) != 0) {
         if (*v == "TRUE")
             set_isVolatile(TRUE);
 
diff --git a/genplugouts/import_rose/UmlAttribute.h b/genplugouts/import_rose/UmlAttribute.h
index b7a41e457..cfb464470 100644
--- a/genplugouts/import_rose/UmlAttribute.h
+++ b/genplugouts/import_rose/UmlAttribute.h
@@ -3,8 +3,8 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QByteArray>
+
 
 class File;
 class UmlClass;
@@ -16,7 +16,7 @@ class UmlClass;
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {
         cpt[kind()] += 1;
     };
 
@@ -28,17 +28,17 @@ class UmlAttribute : public UmlBaseAttribute
 public:
     static void import(File & f, UmlClass * parent);
 
-    static void importIdlConstant(UmlClass * parent, const Q3CString & id, const Q3CString & s, const Q3CString & doc, Q3Dict<Q3CString> & prop);
+    static void importIdlConstant(UmlClass * parent, const QByteArray & id, const QByteArray & s, const QByteArray & doc, QHash<QByteArray, QByteArray*> & prop);
 
 
 private:
-    void cplusplus(Q3Dict<Q3CString> & prop);
+    void cplusplus(QHash<QByteArray, QByteArray*> & prop);
 
-    void oracle8(Q3Dict<Q3CString> & prop);
+    void oracle8(QHash<QByteArray, QByteArray*> & prop);
 
-    void corba(Q3Dict<Q3CString> & prop);
+    void corba(QHash<QByteArray, QByteArray*> & prop);
 
-    void java(Q3Dict<Q3CString> & prop);
+    void java(QHash<QByteArray, QByteArray*> & prop);
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseArtifact.cpp b/genplugouts/import_rose/UmlBaseArtifact.cpp
index 5f11e7a44..29f7ac1f9 100644
--- a/genplugouts/import_rose/UmlBaseArtifact.cpp
+++ b/genplugouts/import_rose/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,7 +89,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd, l);
 
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index]  = _associated[last];
 
             _associated.resize(last);
         }
@@ -166,54 +168,54 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -230,6 +232,12 @@ void UmlBaseArtifact::unload(bool rec, bool del)
 #ifdef WITHJAVA
     _java_src = 0;
 #endif
+#ifdef WITHPHP
+    _php_src = 0;
+#endif
+#ifdef WITHPYTHON
+    _python_src = 0;
+#endif
 #ifdef WITHIDL
     _idl_src = 0;
 #endif
@@ -248,13 +256,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
@@ -272,6 +280,19 @@ void UmlBaseArtifact::read_java_()
 }
 #endif
 
+#ifdef WITHPHP
+void UmlBaseArtifact::read_php_()
+{
+    _php_src = UmlCom::read_string();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseArtifact::read_python_()
+{
+    _python_src = UmlCom::read_string();
+}
+#endif
 #ifdef WITHIDL
 void UmlBaseArtifact::read_idl_()
 {
diff --git a/genplugouts/import_rose/UmlBaseArtifact.h b/genplugouts/import_rose/UmlBaseArtifact.h
index 7e4854ffd..fce67cc2a 100644
--- a/genplugouts/import_rose/UmlBaseArtifact.h
+++ b/genplugouts/import_rose/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,40 +83,40 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -128,22 +128,29 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
+#ifdef WITHPHP
+    QByteArray _php_src;
+#endif
+
+#ifdef WITHPYTHON
+    QByteArray _python_src;
+#endif
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -158,16 +165,28 @@ class UmlBaseArtifact : public UmlItem
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/import_rose/UmlBaseAttribute.cpp b/genplugouts/import_rose/UmlBaseAttribute.cpp
index 1273e14af..cf7af5bdd 100644
--- a/genplugouts/import_rose/UmlBaseAttribute.cpp
+++ b/genplugouts/import_rose/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -29,7 +29,7 @@ bool UmlBaseAttribute::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -121,7 +121,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
@@ -194,6 +194,19 @@ void UmlBaseAttribute::read_java_()
     _java_transient = UmlCom::read_bool();
 }
 #endif
+#ifdef WITHPHP
+void UmlBaseAttribute::read_php_()
+{
+    UmlBaseClassMember::read_php_();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseAttribute::read_python_()
+{
+    UmlBaseClassMember::read_python_();
+}
+#endif
 
 #ifdef WITHIDL
 void UmlBaseAttribute::read_idl_()
diff --git a/genplugouts/import_rose/UmlBaseAttribute.h b/genplugouts/import_rose/UmlBaseAttribute.h
index 4362fb35e..cb0696392 100644
--- a/genplugouts/import_rose/UmlBaseAttribute.h
+++ b/genplugouts/import_rose/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -35,7 +35,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -89,7 +89,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -119,7 +119,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -131,13 +131,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -151,13 +151,24 @@ class UmlBaseAttribute : public UmlClassMember
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/import_rose/UmlBaseClass.cpp b/genplugouts/import_rose/UmlBaseClass.cpp
index f48612ea5..7c2bef3ec 100644
--- a/genplugouts/import_rose/UmlBaseClass.cpp
+++ b/genplugouts/import_rose/UmlBaseClass.cpp
@@ -9,8 +9,8 @@
 #include "UmlCom.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -45,11 +45,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -81,11 +81,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -283,7 +283,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = classes[n];
@@ -310,9 +310,9 @@ void UmlBaseClass::unload(bool rec, bool del)
 }
 
 //key includes package/class-container
-Q3Dict<UmlClass> UmlBaseClass::classes(1001);
+QHash<QByteArray,UmlClass*> UmlBaseClass::classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -320,7 +320,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     classes.insert(n, (UmlClass *) this);
 
     if ((classes.count() / 2) >= classes.size())
-        classes.resize(classes.size() * 2 - 1);
+        classes.reserve(classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
@@ -354,6 +354,24 @@ void UmlBaseClass::read_java_()
     _java_external = UmlCom::read_bool();
 }
 #endif
+#ifdef WITHPHP
+void UmlBaseClass::read_php_()
+{
+    UmlBaseClassMember::read_php_();
+    ;
+    _php_final = UmlCom::read_bool();
+    _php_external = UmlCom::read_bool();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseClass::read_python_()
+{
+    UmlBaseClassMember::read_python_();
+    _python_2_2 = UmlCom::read_bool();
+    _python_external = UmlCom::read_bool();
+}
+#endif
 
 #ifdef WITHIDL
 void UmlBaseClass::read_idl_()
diff --git a/genplugouts/import_rose/UmlBaseClass.h b/genplugouts/import_rose/UmlBaseClass.h
index d800dbf98..f9fa0c52b 100644
--- a/genplugouts/import_rose/UmlBaseClass.h
+++ b/genplugouts/import_rose/UmlBaseClass.h
@@ -5,9 +5,9 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+#include <QByteArray>
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -52,7 +52,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -75,7 +75,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -178,7 +178,7 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified, the class must
     //be defined in a sub-level of the package
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -193,7 +193,7 @@ class UmlBaseClass : public UmlClassMember
 
 private:
     //key includes package/class-container
-    static Q3Dict<UmlClass> classes;
+    static QHash<QByteArray,UmlClass*> classes;
 
     bool _abstract;
 
@@ -208,6 +208,17 @@ class UmlBaseClass : public UmlClassMember
 
     bool _java_final : 1;
 #endif
+#ifdef WITHPHP
+    bool _php_external : 1;
+
+    bool _php_final : 1;
+#endif
+
+#ifdef WITHPYTHON
+    bool _python_external : 1;
+
+    bool _python_2_2 : 1;
+#endif
 
 #ifdef WITHIDL
     bool _idl_external : 1;
@@ -230,7 +241,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     virtual void read_uml_();
 
@@ -242,6 +253,18 @@ class UmlBaseClass : public UmlClassMember
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
diff --git a/genplugouts/import_rose/UmlBaseClassDiagram.cpp b/genplugouts/import_rose/UmlBaseClassDiagram.cpp
index 16aa459a2..9b6c89772 100644
--- a/genplugouts/import_rose/UmlBaseClassDiagram.cpp
+++ b/genplugouts/import_rose/UmlBaseClassDiagram.cpp
@@ -3,7 +3,7 @@
 #include "UmlClassDiagram.h"
 #include "UmlClassView.h"
 
-UmlClassDiagram * UmlBaseClassDiagram::create(UmlClassView * parent, const char * s)
+UmlClassDiagram * UmlBaseClassDiagram::create(UmlItem * parent, const char * s)
 {
     return (UmlClassDiagram *) parent->create_(aClassDiagram, s);
 }
diff --git a/genplugouts/import_rose/UmlBaseClassDiagram.h b/genplugouts/import_rose/UmlBaseClassDiagram.h
index bed4ce3c0..7c99b3fe7 100644
--- a/genplugouts/import_rose/UmlBaseClassDiagram.h
+++ b/genplugouts/import_rose/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -18,7 +18,7 @@ class UmlBaseClassDiagram : public UmlDiagram
     // In case it cannot be created (the name is already used or
     // invalid, 'parent' cannot contain it etc ...) return 0 in C++
     // and produce a RuntimeException in Java
-    static UmlClassDiagram * create(UmlClassView * parent, const char * s);
+    static UmlClassDiagram * create(UmlItem *parent, const char * s);
 
     // returns the kind of the item
     virtual anItemKind kind();
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseClassItem.cpp b/genplugouts/import_rose/UmlBaseClassItem.cpp
index 345c1a18d..19c883cc5 100644
--- a/genplugouts/import_rose/UmlBaseClassItem.cpp
+++ b/genplugouts/import_rose/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
@@ -49,10 +49,16 @@ bool UmlBaseClassItem::set_IdlDecl(const char * s)
 void UmlBaseClassItem::unload(bool rec, bool del)
 {
 #ifdef WITHCPP
-    _cpp_decl = 0;
+  _cpp_decl = 0;
 #endif
 #ifdef WITHJAVA
-    _java_decl = 0;
+  _java_decl = 0;
+#endif
+#ifdef WITHPHP
+    _php_decl = 0;
+#endif
+#ifdef WITHPYTHON
+    _python_decl = 0;
 #endif
 #ifdef WITHIDL
     _idl_decl = 0;
@@ -73,6 +79,19 @@ void UmlBaseClassItem::read_java_()
     _java_decl = UmlCom::read_string();
 }
 #endif
+#ifdef WITHPHP
+void UmlBaseClassItem::read_php_()
+{
+    _php_decl = UmlCom::read_string();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseClassItem::read_python_()
+{
+    _python_decl = UmlCom::read_string();
+}
+#endif
 
 #ifdef WITHIDL
 void UmlBaseClassItem::read_idl_()
diff --git a/genplugouts/import_rose/UmlBaseClassItem.h b/genplugouts/import_rose/UmlBaseClassItem.h
index 56f510609..852dc6f88 100644
--- a/genplugouts/import_rose/UmlBaseClassItem.h
+++ b/genplugouts/import_rose/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -50,20 +50,28 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
+#endif
+
+#ifdef WITHPHP
+    QByteArray _php_decl;
+#endif
+
+#ifdef WITHPYTHON
+    QByteArray _python_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     virtual void read_cpp_();
@@ -73,6 +81,18 @@ class UmlBaseClassItem : public UmlItem
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
diff --git a/genplugouts/import_rose/UmlBaseClassMember.cpp b/genplugouts/import_rose/UmlBaseClassMember.cpp
index 47d81184b..2e02bab7d 100644
--- a/genplugouts/import_rose/UmlBaseClassMember.cpp
+++ b/genplugouts/import_rose/UmlBaseClassMember.cpp
@@ -23,7 +23,7 @@ bool UmlBaseClassMember::isVolatile()
 
 bool UmlBaseClassMember::set_isVolatile(bool y)
 {
-    return set_it_(_volatile, y, setIsCppVolatileCmd);
+    return set_it_(_volatile, y, setIsVolatileCmd);
 }
 
 aVisibility UmlBaseClassMember::visibility()
@@ -82,3 +82,10 @@ void UmlBaseClassMember::read_cpp_()
 }
 #endif
 
+#ifdef WITHJAVA
+void UmlBaseClassMember::read_java_()
+{
+    UmlBaseClassItem::read_java_();
+    _java_annotation = UmlCom::read_string();
+}
+#endif
diff --git a/genplugouts/import_rose/UmlBaseClassMember.h b/genplugouts/import_rose/UmlBaseClassMember.h
index da4fe68ba..b21959e6a 100644
--- a/genplugouts/import_rose/UmlBaseClassMember.h
+++ b/genplugouts/import_rose/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -68,9 +68,12 @@ class UmlBaseClassMember : public UmlClassItem
     aVisibility _cpp_visibility : 8;
 #endif
 
+#ifdef WITHJAVA
+    QByteArray _java_annotation;
+#endif
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     void read_uml_();
 
@@ -78,6 +81,10 @@ class UmlBaseClassMember : public UmlClassItem
     virtual void read_cpp_();
 #endif
 
+#ifdef WITHJAVA
+    virtual void read_java_();
+#endif
+
     friend class UmlBaseOperation;
     friend class UmlBaseAttribute;
     friend class UmlBaseRelation;
diff --git a/genplugouts/import_rose/UmlBaseClassView.h b/genplugouts/import_rose/UmlBaseClassView.h
index fb5ed21ec..72fc5b821 100644
--- a/genplugouts/import_rose/UmlBaseClassView.h
+++ b/genplugouts/import_rose/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassView;
 class UmlPackage;
@@ -42,7 +42,7 @@ class UmlBaseClassView : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseCollaborationDiagram.h b/genplugouts/import_rose/UmlBaseCollaborationDiagram.h
index d88e9722f..6b253fae4 100644
--- a/genplugouts/import_rose/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/import_rose/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseComponent.h b/genplugouts/import_rose/UmlBaseComponent.h
index ec5b6a2e7..b84913ce8 100644
--- a/genplugouts/import_rose/UmlBaseComponent.h
+++ b/genplugouts/import_rose/UmlBaseComponent.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -42,11 +42,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/import_rose/UmlBaseComponentDiagram.h b/genplugouts/import_rose/UmlBaseComponentDiagram.h
index 3bafc2f97..1b0762f7c 100644
--- a/genplugouts/import_rose/UmlBaseComponentDiagram.h
+++ b/genplugouts/import_rose/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseComponentView.h b/genplugouts/import_rose/UmlBaseComponentView.h
index fdd74c3e9..82156ac19 100644
--- a/genplugouts/import_rose/UmlBaseComponentView.h
+++ b/genplugouts/import_rose/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseDeployment.h b/genplugouts/import_rose/UmlBaseDeployment.h
index b268e0c17..63610d5b6 100644
--- a/genplugouts/import_rose/UmlBaseDeployment.h
+++ b/genplugouts/import_rose/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseDeploymentDiagram.h b/genplugouts/import_rose/UmlBaseDeploymentDiagram.h
index 7dab18bb5..60c6754c2 100644
--- a/genplugouts/import_rose/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/import_rose/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseDeploymentView.h b/genplugouts/import_rose/UmlBaseDeploymentView.h
index 9213870a8..6093858e6 100644
--- a/genplugouts/import_rose/UmlBaseDeploymentView.h
+++ b/genplugouts/import_rose/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseDiagram.cpp b/genplugouts/import_rose/UmlBaseDiagram.cpp
index 0a8a2b41a..913051263 100644
--- a/genplugouts/import_rose/UmlBaseDiagram.cpp
+++ b/genplugouts/import_rose/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[jasa] ambiguous call
     return UmlCom::read_bool();
diff --git a/genplugouts/import_rose/UmlBaseDiagram.h b/genplugouts/import_rose/UmlBaseDiagram.h
index 9cf05ff22..824a9f60f 100644
--- a/genplugouts/import_rose/UmlBaseDiagram.h
+++ b/genplugouts/import_rose/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseExtraClassMember.cpp b/genplugouts/import_rose/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/import_rose/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/import_rose/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/import_rose/UmlBaseExtraClassMember.h b/genplugouts/import_rose/UmlBaseExtraClassMember.h
index 39ac1d594..9519fd986 100644
--- a/genplugouts/import_rose/UmlBaseExtraClassMember.h
+++ b/genplugouts/import_rose/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     virtual void read_cpp_();
diff --git a/genplugouts/import_rose/UmlBaseFormalParameter.h b/genplugouts/import_rose/UmlBaseFormalParameter.h
index c9eabebb7..f7e83f337 100644
--- a/genplugouts/import_rose/UmlBaseFormalParameter.h
+++ b/genplugouts/import_rose/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -31,10 +31,10 @@ class UmlBaseFormalParameter
     friend class UmlBaseClass;
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/import_rose/UmlBaseItem.cpp b/genplugouts/import_rose/UmlBaseItem.cpp
index 5d28273e8..2e9259864 100644
--- a/genplugouts/import_rose/UmlBaseItem.cpp
+++ b/genplugouts/import_rose/UmlBaseItem.cpp
@@ -27,33 +27,33 @@
 #include "UmlExtraClassMember.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     return set_it_(_name, s, setNameCmd);
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -69,7 +69,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -89,11 +89,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -103,7 +103,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -111,10 +111,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -125,14 +125,14 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
     return _dict;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -144,7 +144,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[jasa] ambiguous call
     return (int) UmlCom::read_unsigned();
@@ -159,7 +159,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -178,48 +178,55 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
     if (!_defined) {
-#ifdef WITHCPP
-# ifdef WITHJAVA
-#  ifdef WITHIDL
+#if defined(WITHCPP) & defined(WITHJAVA) & defined(WITHPHP) & defined(WITHPYTHON) & defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getDefCmd);
         read_uml_();
         read_cpp_();
         read_java_();
+        read_php_();
+        read_python_();
         read_idl_();
-#  else
-        ... WITHIDL must be defined when WITHCPP and WITHJAVA are both defined
-#  endif
-# else
-#  ifdef WITHIDL
-        ... WITHJAVA must be defined when WITHCPP and WITHIDL are both defined
-#  else
+#else
+# if defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getCppDefCmd);
         read_uml_();
         read_cpp_();
-#  endif
-# endif
-#else
-# ifdef WITHJAVA
-#  ifdef WITHIDL
-        ... WITHCPP must be defined when WITHIDL and WITHJAVA are both defined
-#  else
+# else
+#  if !defined(WITHCPP) & defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getJavaDefCmd);
         read_uml_();
         read_java_();
-#  endif
-# else
-#  ifdef WITHIDL
+#  else
+#   if !defined(WITHCPP) & !defined(WITHJAVA) & defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
+        UmlCom::send_cmd(_identifier, getPhpDefCmd);
+        read_uml_();
+        read_php_();
+#   else
+#    if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & defined(WITHPYTHON) & !defined(WITHIDL)
+        UmlCom::send_cmd(_identifier, getPythonDefCmd);
+        read_uml_();
+        read_python_();
+#    else
+#     if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getIdlDefCmd);
         read_uml_();
         read_idl_();
-#  else
+#     else
+#      if !defined(WITHCPP) & !defined(WITHJAVA) & !defined(WITHPHP) & !defined(WITHPYTHON) & !defined(WITHIDL)
         UmlCom::send_cmd(_identifier, getUmlDefCmd);
         read_uml_();
+#      else
+        ... WITHCPP and WITHJAVA and WITHPHP and WITHPYTHON and WITHIDL must be both defined or undefined
+        ... or only one of them must be defined
+#      endif
+#     endif
+#    endif
+#   endif
 #  endif
 # endif
 #endif
@@ -230,16 +237,20 @@ void UmlBaseItem::read_if_needed_()
 
 UmlItem * UmlBaseItem::create_(anItemKind k, const char * s)
 {
+    //habip read all data if there is
+    QByteArray garbageData = UmlCom::read_all();
+    if(!garbageData.isEmpty())
+    {
+        int garbageCount = garbageData.count();
+        printf("!!!!garbage data:%d\r\n",garbageCount);
+    }
     UmlCom::send_cmd(_identifier, createCmd, k, s);
 
     UmlItem * result = UmlBaseItem::read_();
 
     if (result != 0) {
         if (_children != 0) {
-            unsigned n = _children->count();
-
-            _children->resize(n + 1);
-            _children->insert(n, result);
+            _children->append(result);
         }
 
         ((UmlBaseItem *) result)->_parent = (UmlItem *) this;
@@ -255,9 +266,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -277,6 +288,18 @@ void UmlBaseItem::read_java_()
 }
 #endif
 
+#ifdef WITHPHP
+void UmlBaseItem::read_php_()
+{
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseItem::read_python_()
+{
+}
+#endif
+
 #ifdef WITHIDL
 void UmlBaseItem::read_idl_()
 {
@@ -286,7 +309,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -340,7 +363,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -377,10 +400,10 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
-    UmlItem * result = _all[id];
+    UmlItem * result = _all.value(id, 0);
 
     if (result == 0) {
         switch (kind) {
@@ -470,20 +493,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/import_rose/UmlBaseItem.h b/genplugouts/import_rose/UmlBaseItem.h
index c34935d63..7faccd1dd 100644
--- a/genplugouts/import_rose/UmlBaseItem.h
+++ b/genplugouts/import_rose/UmlBaseItem.h
@@ -3,11 +3,11 @@
 
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
-#include "OnInstanceCmd.h"
+#include <QByteArray>
+#include <QVector>
+#include "Tools/ApiCmd.h"
+#include <QHash>
+//#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
 
@@ -37,35 +37,35 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Name(const Q3CString & s);
+    bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -90,16 +90,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     //  Returns the absolute path name of the file memoring the Item.
     //  In general an item is saved in a file associated to its package,
@@ -127,7 +127,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -135,7 +135,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -183,21 +183,21 @@ class UmlBaseItem
 
     void * _identifier;
 
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
 protected:
@@ -215,6 +215,17 @@ class UmlBaseItem
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
@@ -229,7 +240,7 @@ class UmlBaseItem
 
     bool set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd);
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     bool set_it_(UmlTypeSpec & r, const UmlTypeSpec & t, OnInstanceCmd cmd);
 
@@ -238,7 +249,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/import_rose/UmlBaseNcRelation.h b/genplugouts/import_rose/UmlBaseNcRelation.h
index e46551cc6..4afe76bcd 100644
--- a/genplugouts/import_rose/UmlBaseNcRelation.h
+++ b/genplugouts/import_rose/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNcRelation;
 
@@ -39,11 +39,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/import_rose/UmlBaseNode.h b/genplugouts/import_rose/UmlBaseNode.h
index 5e62daff2..c496bdeb6 100644
--- a/genplugouts/import_rose/UmlBaseNode.h
+++ b/genplugouts/import_rose/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     virtual void read_uml_();
 
diff --git a/genplugouts/import_rose/UmlBaseOperation.cpp b/genplugouts/import_rose/UmlBaseOperation.cpp
index 26096f11c..0f9f557f9 100644
--- a/genplugouts/import_rose/UmlBaseOperation.cpp
+++ b/genplugouts/import_rose/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -54,7 +54,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -68,7 +68,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -82,7 +82,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -105,7 +105,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -118,7 +118,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -132,7 +132,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -245,7 +245,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -257,7 +257,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -271,7 +271,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -323,7 +323,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -333,7 +333,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -347,7 +347,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -380,7 +380,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
@@ -405,6 +405,9 @@ void UmlBaseOperation::unload(bool rec, bool del)
 #ifdef WITHJAVA
     _java_name_spec = 0;
 #endif
+#ifdef WITHPHP
+    _php_name_spec = 0;
+#endif
 #ifdef WITHIDL
     _idl_name_spec = 0;
 #endif
@@ -459,13 +462,15 @@ void UmlBaseOperation::read_cpp_()
     _cpp_const = UmlCom::read_bool();
     _cpp_friend = UmlCom::read_bool();
     _cpp_virtual = UmlCom::read_bool();
-  _cpp_inline = UmlCom::read_bool();
-  _cpp_default = UmlCom::read_bool();
-  _cpp_delete = UmlCom::read_bool();
-  _cpp_override = UmlCom::read_bool();
-  _cpp_final = UmlCom::read_bool();
-  _cpp_def = UmlCom::read_string();
+    _cpp_inline = UmlCom::read_bool();
+    _cpp_default = UmlCom::read_bool();
+    _cpp_delete = UmlCom::read_bool();
+    _cpp_override = UmlCom::read_bool();
+    _cpp_final = UmlCom::read_bool();
+    _cpp_def = UmlCom::read_string();
     _cpp_name_spec = UmlCom::read_string();
+    _cpp_get_set_frozen = UmlCom::read_bool();
+    _cpp_contextual_body_indent = UmlCom::read_bool();
 }
 #endif
 
@@ -476,6 +481,29 @@ void UmlBaseOperation::read_java_()
     _java_final = UmlCom::read_bool();
     _java_synchronized = UmlCom::read_bool();
     _java_name_spec = UmlCom::read_string();
+    _java_get_set_frozen = UmlCom::read_bool();
+    _java_contextual_body_indent = UmlCom::read_bool();
+}
+#endif
+#ifdef WITHPHP
+void UmlBaseOperation::read_php_()
+{
+    UmlBaseClassMember::read_php_();
+    _php_final = UmlCom::read_bool();
+    _php_name_spec = UmlCom::read_string();
+    _php_get_set_frozen = UmlCom::read_bool();
+    _php_contextual_body_indent = UmlCom::read_bool();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseOperation::read_python_()
+{
+    UmlBaseClassMember::read_python_();
+    _python_decorators = UmlCom::read_string();
+    _python_name_spec = UmlCom::read_string();
+    _python_get_set_frozen = UmlCom::read_bool();
+    _python_contextual_body_indent = UmlCom::read_bool();
 }
 #endif
 
@@ -485,6 +513,7 @@ void UmlBaseOperation::read_idl_()
     UmlBaseClassMember::read_idl_();
     _idl_oneway = UmlCom::read_bool();
     _idl_name_spec = UmlCom::read_string();
+    _idl_get_set_frozen = UmlCom::read_bool();
 }
 #endif
 
diff --git a/genplugouts/import_rose/UmlBaseOperation.h b/genplugouts/import_rose/UmlBaseOperation.h
index 2c3a51286..33bd135fd 100644
--- a/genplugouts/import_rose/UmlBaseOperation.h
+++ b/genplugouts/import_rose/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+#include <QByteArray>
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -44,7 +44,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -62,7 +62,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -122,7 +122,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -131,9 +131,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -143,7 +143,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -171,7 +171,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -180,9 +180,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -192,7 +192,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -212,7 +212,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -248,28 +248,77 @@ class UmlBaseOperation : public UmlClassMember
     bool _java_synchronized : 1;
 #endif
 
+#ifdef WITHPHP
+    bool _php_final : 1;
+#endif
 #ifdef WITHIDL
     bool _idl_oneway : 1;
 #endif
 
+#ifdef WITHCPP
+    bool _cpp_get_set_frozen : 1;
+#endif
+
+#ifdef WITHJAVA
+    bool _java_get_set_frozen : 1;
+#endif
+
+#ifdef WITHPHP
+    bool _php_get_set_frozen : 1;
+#endif
+
+#ifdef WITHPYTHON
+    bool _python_get_set_frozen : 1;
+#endif
+
+#ifdef WITHIDL
+    bool _idl_get_set_frozen : 1;
+#endif
+
+#ifdef WITHCPP
+    bool _cpp_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHJAVA
+    bool _java_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHPHP
+    bool _php_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHPYTHON
+    bool _python_contextual_body_indent : 1;
+#endif
+
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
+#endif
+
+#ifdef WITHPHP
+    QByteArray _php_name_spec;
+#endif
+
+#ifdef WITHPYTHON
+    QByteArray _python_name_spec;
+
+    QByteArray _python_decorators;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -281,7 +330,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     virtual void read_uml_();
 
@@ -293,13 +342,25 @@ class UmlBaseOperation : public UmlClassMember
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
+
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/import_rose/UmlBasePackage.cpp b/genplugouts/import_rose/UmlBasePackage.cpp
index 90acf9b82..4cadf0416 100644
--- a/genplugouts/import_rose/UmlBasePackage.cpp
+++ b/genplugouts/import_rose/UmlBasePackage.cpp
@@ -6,7 +6,7 @@
 #include "UmlCom.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -37,111 +37,111 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlClassDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::getNamespace(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getNamespace(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, (p) ? p->_identifier : 0, n);
+    UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, (p) ? p->_identifier : 0, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::getPackage(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getPackage(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, (p) ? p->_identifier : 0, n);
+    UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, (p) ? p->_identifier : 0, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::getModule(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getModule(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, (p) ? p->_identifier : 0, n);
+    UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, (p) ? p->_identifier : 0, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
@@ -195,6 +195,21 @@ void UmlBasePackage::read_java_()
     _java_package = UmlCom::read_string();
 }
 #endif
+#ifdef WITHPHP
+void UmlBasePackage::read_php_()
+{
+    _php_dir = UmlCom::read_string();
+    _php_namespace = UmlCom::read_string();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBasePackage::read_python_()
+{
+    _python_dir = UmlCom::read_string();
+    _python_package = UmlCom::read_string();
+}
+#endif
 
 #ifdef WITHIDL
 void UmlBasePackage::read_idl_()
diff --git a/genplugouts/import_rose/UmlBasePackage.h b/genplugouts/import_rose/UmlBasePackage.h
index a1d1209e8..5386b8814 100644
--- a/genplugouts/import_rose/UmlBasePackage.h
+++ b/genplugouts/import_rose/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPackage;
 class UmlClassDiagram;
@@ -34,87 +34,87 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns the sub package of 'p' package having the c++ namespace 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getNamespace(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getNamespace(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns the sub package of 'p' package having the java package 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getPackage(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getPackage(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns the sub package of 'p' package having the IDL module 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getModule(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getModule(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
     //  Returns the project
@@ -133,25 +133,35 @@ class UmlBasePackage : public UmlItem
     UmlClassDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
+#ifdef WITHPHP
+    QByteArray _php_dir;
+    QByteArray _php_namespace;
+#endif
+
+#ifdef WITHPYTHON
+    QByteArray _python_dir;
+
+    QByteArray _python_package;
+#endif
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -167,16 +177,27 @@ class UmlBasePackage : public UmlItem
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/import_rose/UmlBaseRelation.cpp b/genplugouts/import_rose/UmlBaseRelation.cpp
index 466ba2582..23c77a83e 100644
--- a/genplugouts/import_rose/UmlBaseRelation.cpp
+++ b/genplugouts/import_rose/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -63,7 +63,7 @@ bool UmlBaseRelation::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -75,7 +75,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -96,7 +96,7 @@ UmlClass * UmlBaseRelation::roleType()
     return _role_type;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -108,7 +108,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -240,7 +240,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
@@ -314,6 +314,19 @@ void UmlBaseRelation::read_java_()
     _java_transient = UmlCom::read_bool();
 }
 #endif
+#ifdef WITHPHP
+void UmlBaseRelation::read_php_()
+{
+    UmlBaseClassMember::read_php_();
+}
+#endif
+
+#ifdef WITHPYTHON
+void UmlBaseRelation::read_python_()
+{
+    UmlBaseClassMember::read_python_();
+}
+#endif
 
 #ifdef WITHIDL
 void UmlBaseRelation::read_idl_()
diff --git a/genplugouts/import_rose/UmlBaseRelation.h b/genplugouts/import_rose/UmlBaseRelation.h
index d37bf27a0..26a60d47e 100644
--- a/genplugouts/import_rose/UmlBaseRelation.h
+++ b/genplugouts/import_rose/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlRelation;
 class UmlClass;
@@ -38,7 +38,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -50,13 +50,13 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -64,7 +64,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -127,7 +127,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -166,13 +166,13 @@ class UmlBaseRelation : public UmlClassMember
 
     aRelationKind _rel_kind : 8;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlOperation * _get_oper;
 
@@ -182,7 +182,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -197,16 +197,27 @@ class UmlBaseRelation : public UmlClassMember
     virtual void read_java_();
 #endif
 
+#ifdef WITHPHP
+    //internal, do NOT use it
+
+    virtual void read_php_();
+#endif
+
+#ifdef WITHPYTHON
+    //internal, do NOT use it
+
+    virtual void read_python_();
+#endif
 #ifdef WITHIDL
     virtual void read_idl_();
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/import_rose/UmlBaseSequenceDiagram.h b/genplugouts/import_rose/UmlBaseSequenceDiagram.h
index 61f0ef6cc..44b1bfed3 100644
--- a/genplugouts/import_rose/UmlBaseSequenceDiagram.h
+++ b/genplugouts/import_rose/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseUseCase.cpp b/genplugouts/import_rose/UmlBaseUseCase.cpp
index 5a3a32ccd..c091723cb 100644
--- a/genplugouts/import_rose/UmlBaseUseCase.cpp
+++ b/genplugouts/import_rose/UmlBaseUseCase.cpp
@@ -37,5 +37,6 @@ void UmlBaseUseCase::read_uml_()
 {
     _assoc_diagram = (UmlUseCaseDiagram *) UmlBaseItem::read_();
     UmlBaseItem::read_uml_();
+    _extension_points = UmlCom::read_string();
 }
 
diff --git a/genplugouts/import_rose/UmlBaseUseCase.h b/genplugouts/import_rose/UmlBaseUseCase.h
index abafd7dca..643558fb7 100644
--- a/genplugouts/import_rose/UmlBaseUseCase.h
+++ b/genplugouts/import_rose/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -32,7 +32,9 @@ class UmlBaseUseCase : public UmlItem
     bool set_AssociatedDiagram(UmlUseCaseDiagram * d);
 
 
+
 private:
+    QByteArray _extension_points;
     UmlUseCaseDiagram * _assoc_diagram;
 
 
@@ -40,7 +42,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseUseCaseDiagram.h b/genplugouts/import_rose/UmlBaseUseCaseDiagram.h
index d838b2baf..98952774c 100644
--- a/genplugouts/import_rose/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/import_rose/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBaseUseCaseView.h b/genplugouts/import_rose/UmlBaseUseCaseView.h
index 06849883f..063b0ad08 100644
--- a/genplugouts/import_rose/UmlBaseUseCaseView.h
+++ b/genplugouts/import_rose/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseView;
 
@@ -25,7 +25,7 @@ class UmlBaseUseCaseView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlBuiltin.h b/genplugouts/import_rose/UmlBuiltin.h
index cb965b8ae..8154ac384 100644
--- a/genplugouts/import_rose/UmlBuiltin.h
+++ b/genplugouts/import_rose/UmlBuiltin.h
@@ -2,29 +2,29 @@
 #define _UMLBUILTIN_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/import_rose/UmlClass.cpp b/genplugouts/import_rose/UmlClass.cpp
index eabaccf0f..6b6e0dba2 100644
--- a/genplugouts/import_rose/UmlClass.cpp
+++ b/genplugouts/import_rose/UmlClass.cpp
@@ -14,20 +14,20 @@
 #include "util.h"
 #include "Artifact.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-UmlClass * UmlClass::import(File & f, UmlItem * parent, const Q3CString & knd)
+UmlClass * UmlClass::import(File & f, UmlItem * parent, const QByteArray & knd)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "class's name");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
@@ -65,11 +65,11 @@ UmlClass * UmlClass::import(File & f, UmlItem * parent, const Q3CString & knd)
         if (!ste.isEmpty()) {
             if (ste.left(5) == "CORBA") {
                 if (ste != "CORBAValue")
-                    cl->set_Stereotype(ste.mid(5).lower());
+                    cl->set_Stereotype(ste.mid(5).toLower());
             }
             else
                 cl->set_Stereotype(((ste == "Actor") || (ste == "Interface"))
-                                   ? ste.lower() : ste);
+                                   ? ste.toLower() : ste);
         }
 
         if (!doc.isEmpty())
@@ -83,7 +83,7 @@ UmlClass * UmlClass::import(File & f, UmlItem * parent, const Q3CString & knd)
         throw 0;
     }
 
-    Q3CString art_path;
+    QByteArray art_path;
 
     for (;;) {
         switch (k) {
@@ -164,18 +164,18 @@ UmlClass * UmlClass::import(File & f, UmlItem * parent, const Q3CString & knd)
     }
 }
 
-bool UmlClass::replaceType(UmlTypeSpec & t, Q3CString & target_id, const Q3CString & ts)
+bool UmlClass::replaceType(UmlTypeSpec & t, QByteArray & target_id, const QByteArray & ts)
 {
     UmlClass * cl = (UmlClass *) findItem(target_id, aClass);
     bool result = FALSE;
 
     if (cl != 0) {
         int index = 0;
-        const Q3CString & s = cl->name();
+        const QByteArray & s = cl->name();
         unsigned ln1 = s.length();
         unsigned ln2 = ts.length();
 
-        while ((index = t.explicit_type.find(s, index)) != -1) {
+        while ((index = t.explicit_type.indexOf(s, index)) != -1) {
             if (((index == 0) || isSep(((const char *) t.explicit_type)[index - 1])) &&
                 isSep(((const char *) t.explicit_type)[index + (int) ln1])) {
                 t.explicit_type.replace((unsigned) index, ln1, ts);
@@ -203,7 +203,7 @@ void UmlClass::importAttributes(File & f)
     f.read("class_attribute_list");
 
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (f.read(s)) {
         case -1:
@@ -232,7 +232,7 @@ void UmlClass::importOperations(File & f)
     f.read("Operations");
 
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (f.read(s)) {
         case -1:
@@ -256,7 +256,7 @@ void UmlClass::importOperations(File & f)
 
 void UmlClass::importRelations(File & f)
 {
-    Q3CString s;
+    QByteArray s;
 
     f.read("(");
     f.read("list");
@@ -282,7 +282,7 @@ void UmlClass::importRelations(File & f)
             f.syntaxError(s, "an atom");
 
         aRelationKind rk;
-        Q3CString sr;
+        QByteArray sr;
 
         if (s == "Uses_Relationship") {
             rk = aDependency;
@@ -302,11 +302,11 @@ void UmlClass::importRelations(File & f)
         }
 
         // dependency or generalisation
-        Q3CString id;
-        Q3CString ste;
-        Q3CString doc;
-        Q3Dict<Q3CString> prop;
-        Q3CString s2;
+        QByteArray id;
+        QByteArray ste;
+        QByteArray doc;
+        QHash<QByteArray, QByteArray*> prop;
+        QByteArray s2;
         int k;
 
         do {
@@ -314,7 +314,7 @@ void UmlClass::importRelations(File & f)
         }
         while (id.isEmpty());
 
-        Q3CString target_id;
+        QByteArray target_id;
         aVisibility visibility = PublicVisibility;
         bool virtual_inheritance = FALSE;
         bool a_friend = FALSE;
@@ -399,11 +399,11 @@ void UmlClass::importInstantiate(File & f)
     f.read("object");
     f.read("Instantiation_Relationship");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
@@ -461,7 +461,7 @@ void UmlClass::importActuals(File & f)
     f.read("list");
     f.read("Parameters");
 
-    Q3CString s;
+    QByteArray s;
     unsigned rank = 0;
 
     for (;;) {
@@ -489,7 +489,7 @@ void UmlClass::importFormals(File & f)
     f.read("list");
     f.read("Parameters");
 
-    Q3CString s;
+    QByteArray s;
     unsigned rank = 0;
 
     for (;;) {
@@ -521,7 +521,7 @@ void UmlClass::importClasses(File & f)
     f.read("list");
     f.read("nestedClasses");
 
-    Q3CString s;
+    QByteArray s;
 
     for (;;) {
         switch (f.read(s)) {
@@ -553,7 +553,7 @@ void UmlClass::importClasses(File & f)
     }
 }
 
-void UmlClass::importIdlConstant(UmlItem * parent, const Q3CString & id, const Q3CString & s, const Q3CString & doc, Q3Dict<Q3CString> & prop)
+void UmlClass::importIdlConstant(UmlItem * parent, const QByteArray & id, const QByteArray & s, const QByteArray & doc, QHash<QByteArray, QByteArray*> & prop)
 {
     // use a class to define the constant !
     UmlClass * x;
@@ -571,40 +571,40 @@ void UmlClass::importIdlConstant(UmlItem * parent, const Q3CString & id, const Q
     if (!doc.isEmpty())
         x->set_Description(doc);
 
-    Q3CString type;
-    Q3CString value;
-    Q3CString * v;
+    QByteArray type;
+    QByteArray value;
+    QByteArray * v;
 
-    if ((v = prop.find("CORBA/ImplementationType")) != 0) {
+    if ((v = prop.value("CORBA/ImplementationType")) != 0) {
         type = *v;
         prop.remove("CORBA/ImplementationType");
     }
 
-    if ((v = prop.find("CORBA/ConstValue")) != 0) {
+    if ((v = prop.value("CORBA/ConstValue")) != 0) {
         if (!v->isEmpty())
             value = " = " + *v;
 
         prop.remove("CORBA/ConstValue");
     }
 
-    Q3CString d = IdlSettings::constDecl();
+    QByteArray d = IdlSettings::constDecl();
     int index;
 
-    if ((index = d.find("${type}")) != -1)
+    if ((index = d.indexOf("${type}")) != -1)
         d.replace(index, 7, type);
 
-    if ((index = d.find("${value}")) != -1)
+    if ((index = d.indexOf("${value}")) != -1)
         d.replace(index, 8, value);
 
     x->setProperties(prop);
     x->set_IdlDecl(d);
 }
 
-void UmlClass::cplusplus(Q3Dict<Q3CString> & prop)
+void UmlClass::cplusplus(QHash<QByteArray, QByteArray*> & prop)
 {
     if (!scanning) {
         if (stereotype() == "typedef") {
-            Q3CString * bt = prop.find("Cplusplus/ImplementationType");
+            QByteArray * bt = prop.value("Cplusplus/ImplementationType");
 
             if (bt != 0) {
                 UmlTypeSpec t;
@@ -627,38 +627,38 @@ void UmlClass::cplusplus(Q3Dict<Q3CString> & prop)
         prop.remove("Cplusplus/ImplementationType");
     }
 
-    Q3CString * v;
+    QByteArray * v;
 
-    if ((v = prop.find("Cplusplus/BodySourceFile")) != 0) {
+    if ((v = prop.value("Cplusplus/BodySourceFile")) != 0) {
         _body_file = *v;
         prop.remove("Cplusplus/BodySourceFile");
     }
-    else if ((v = prop.find("Traversal/BodyFile")) != 0) {
+    else if ((v = prop.value("Traversal/BodyFile")) != 0) {
         _body_file = *v;
         prop.remove("Traversal/BodyFile");
     }
 
-    if ((v = prop.find("Cplusplus/HeaderSourceFile")) != 0) {
+    if ((v = prop.value("Cplusplus/HeaderSourceFile")) != 0) {
         _file = *v;
         prop.remove("Cplusplus/HeaderSourceFile");
     }
-    else if ((v = prop.find("Traversal/CodeFile")) != 0) {
+    else if ((v = prop.value("Traversal/CodeFile")) != 0) {
         _file = *v;
         prop.remove("Traversal/CodeFile");
     }
 }
 
-void UmlClass::oracle8(Q3Dict<Q3CString> &)
+void UmlClass::oracle8(QHash<QByteArray, QByteArray*> &)
 {
 }
 
-void UmlClass::corba(Q3Dict<Q3CString> & prop)
+void UmlClass::corba(QHash<QByteArray, QByteArray*> & prop)
 {
     if (!scanning) {
-        Q3CString * v;
+        QByteArray * v;
 
         if (stereotype() == "union") {
-            if ((v = prop.find("CORBA/ImplementationType")) != 0) {
+            if ((v = prop.value("CORBA/ImplementationType")) != 0) {
                 UmlTypeSpec t;
 
                 t.explicit_type = *v;	// !!!!!!!!!!!!
@@ -669,7 +669,7 @@ void UmlClass::corba(Q3Dict<Q3CString> & prop)
             set_IdlDecl(IdlSettings::unionDecl());
         }
         else if (stereotype() == "typedef") {
-            if ((v = prop.find("CORBA/ImplementationType")) != 0) {
+            if ((v = prop.value("CORBA/ImplementationType")) != 0) {
                 UmlTypeSpec t;
 
                 t.explicit_type = *v;	// no quidu
@@ -679,18 +679,18 @@ void UmlClass::corba(Q3Dict<Q3CString> & prop)
 
             QString d = IdlSettings::typedefDecl();
 
-            if ((v = prop.find("CORBA/ArrayDimensions")) != 0) {
+            if ((v = prop.value("CORBA/ArrayDimensions")) != 0) {
                 if (!v->isEmpty()) {
                     int index;
 
-                    if ((index = d.find("${name}")) != -1)
+                    if ((index = d.indexOf("${name}")) != -1)
                         d.insert(index + 7, "[" + *v + "]");
                 }
 
                 prop.remove("CORBA/ArrayDimensions");
             }
 
-            set_IdlDecl(d);
+            set_IdlDecl(d.toLatin1().constData());
         }
         else if (stereotype() == "struct")
             set_IdlDecl(IdlSettings::structDecl());
@@ -705,29 +705,29 @@ void UmlClass::corba(Q3Dict<Q3CString> & prop)
     }
 }
 
-void UmlClass::java(Q3Dict<Q3CString> & prop)
+void UmlClass::java(QHash<QByteArray, QByteArray*> & prop)
 {
     if (!scanning) {
-        Q3CString d = (stereotype() == "interface")
+        QByteArray d = (stereotype() == "interface")
                       ? JavaSettings::interfaceDecl()
                       : JavaSettings::classDecl();
 
-        Q3CString * v;
+        QByteArray * v;
 
-        if ((v = prop.find("Java/Final")) != 0) {
+        if ((v = prop.value("Java/Final")) != 0) {
             if (*v == "TRUE")
                 set_isJavaFinal(TRUE);
 
             prop.remove("Java/Final");
         }
 
-        if ((v = prop.find("Java/Strictfp")) != 0) {
+        if ((v = prop.value("Java/Strictfp")) != 0) {
             if (*v == "TRUE") {
                 int index;
 
-                if ((index = d.find("${public}")) != -1)
+                if ((index = d.indexOf("${public}")) != -1)
                     d.insert((unsigned) index + 9, "strictfp ");
-                else if ((index = d.find("${visibility}")) != -1)
+                else if ((index = d.indexOf("${visibility}")) != -1)
                     d.insert((unsigned) index + 13, "strictfp ");
             }
 
@@ -738,7 +738,7 @@ void UmlClass::java(Q3Dict<Q3CString> & prop)
     }
 }
 
-void UmlClass::assocArtifact(Artifact * c, Q3CString & art_path)
+void UmlClass::assocArtifact(Artifact * c, QByteArray & art_path)
 {
     if ((c != 0) && (parent()->kind() == aClassView))
         c->add((UmlPackage *) parent()->parent(), this, art_path);
diff --git a/genplugouts/import_rose/UmlClass.h b/genplugouts/import_rose/UmlClass.h
index 403dd581e..534cf7561 100644
--- a/genplugouts/import_rose/UmlClass.h
+++ b/genplugouts/import_rose/UmlClass.h
@@ -3,9 +3,9 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "Language.h"
-#include <q3dict.h>
+
 
 class File;
 class UmlItem;
@@ -19,15 +19,15 @@ class Artifact;
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {
         cpt[kind()] += 1;
     };
 
     Language language() const;
 
-    static UmlClass * import(File & f, UmlItem * parent, const Q3CString & knd);
+    static UmlClass * import(File & f, UmlItem * parent, const QByteArray & knd);
 
-    static bool replaceType(UmlTypeSpec & t, Q3CString & target_id, const Q3CString & ts);
+    static bool replaceType(UmlTypeSpec & t, QByteArray & target_id, const QByteArray & ts);
 
 
 private:
@@ -45,31 +45,31 @@ class UmlClass : public UmlBaseClass
 
     void importClasses(File & f);
 
-    static void importIdlConstant(UmlItem * parent, const Q3CString & id, const Q3CString & s, const Q3CString & doc, Q3Dict<Q3CString> & prop);
+    static void importIdlConstant(UmlItem * parent, const QByteArray & id, const QByteArray & s, const QByteArray & doc, QHash<QByteArray, QByteArray*> & prop);
 
-    void cplusplus(Q3Dict<Q3CString> & prop);
+    void cplusplus(QHash<QByteArray, QByteArray*> & prop);
 
-    void oracle8(Q3Dict<Q3CString> & prop);
+    void oracle8(QHash<QByteArray, QByteArray*> & prop);
 
-    void corba(Q3Dict<Q3CString> & prop);
+    void corba(QHash<QByteArray, QByteArray*> & prop);
 
-    void java(Q3Dict<Q3CString> & prop);
+    void java(QHash<QByteArray, QByteArray*> & prop);
 
-    void assocArtifact(Artifact * c, Q3CString & art_path);
+    void assocArtifact(Artifact * c, QByteArray & art_path);
 
 
 public:
-    const Q3CString file() const;
+    const QByteArray file() const;
 
-    const Q3CString bodyFile() const;
+    const QByteArray bodyFile() const;
 
 
 protected:
     Language lang;
 
-    Q3CString _file;
+    QByteArray _file;
 
-    Q3CString _body_file;
+    QByteArray _body_file;
 
 };
 
@@ -78,12 +78,12 @@ inline Language UmlClass::language() const
     return lang;
 }
 
-inline const Q3CString UmlClass::file() const
+inline const QByteArray UmlClass::file() const
 {
     return _file;
 }
 
-inline const Q3CString UmlClass::bodyFile() const
+inline const QByteArray UmlClass::bodyFile() const
 {
     return _body_file;
 }
diff --git a/genplugouts/import_rose/UmlClassDiagram.cpp b/genplugouts/import_rose/UmlClassDiagram.cpp
index 0c3b49f79..3e5037641 100644
--- a/genplugouts/import_rose/UmlClassDiagram.cpp
+++ b/genplugouts/import_rose/UmlClassDiagram.cpp
@@ -5,19 +5,19 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-void UmlClassDiagram::import(File & f, UmlClassView * p)
+#include <QByteArray>
+void UmlClassDiagram::import(File & f, UmlItem * p)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "class diagram's name");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
diff --git a/genplugouts/import_rose/UmlClassDiagram.h b/genplugouts/import_rose/UmlClassDiagram.h
index 3580211af..ad8ae4f78 100644
--- a/genplugouts/import_rose/UmlClassDiagram.h
+++ b/genplugouts/import_rose/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class File;
 class UmlClassView;
@@ -16,11 +16,11 @@ class UmlClassView;
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {
         cpt[kind()] += 1;
     };
 
-    static void import(File & f, UmlClassView * p);
+    static void import(File & f, UmlItem *p);
 
 
 private:
diff --git a/genplugouts/import_rose/UmlClassItem.h b/genplugouts/import_rose/UmlClassItem.h
index bf64f4dbb..c3c29cffc 100644
--- a/genplugouts/import_rose/UmlClassItem.h
+++ b/genplugouts/import_rose/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlClassMember.h b/genplugouts/import_rose/UmlClassMember.h
index 9119443c6..931b95f2f 100644
--- a/genplugouts/import_rose/UmlClassMember.h
+++ b/genplugouts/import_rose/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlClassView.cpp b/genplugouts/import_rose/UmlClassView.cpp
index 0ec44a26e..e22f60ed7 100644
--- a/genplugouts/import_rose/UmlClassView.cpp
+++ b/genplugouts/import_rose/UmlClassView.cpp
@@ -13,8 +13,8 @@
 #include "UmlSequenceDiagram.h"
 #include "UmlCollaborationDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
-UmlClassView::UmlClassView(void * id, const Q3CString & n)  : UmlBaseClassView(id, n)
+#include <QByteArray>
+UmlClassView::UmlClassView(void * id, const QByteArray & n)  : UmlBaseClassView(id, n)
 {
     ucv = 0;
     cpt[kind()] += 1;
@@ -23,16 +23,16 @@ UmlClassView::UmlClassView(void * id, const Q3CString & n)  : UmlBaseClassView(i
 
 void UmlClassView::import(UmlPackage * parent, File & f)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, " class view's name expected");
 
-    Q3CString a;
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
+    QByteArray a;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
 
     for (;;) {
         int k = f.readDefinitionBeginning(a, id, ste, doc, prop);
@@ -44,11 +44,11 @@ void UmlClassView::import(UmlPackage * parent, File & f)
             if (f.read(a) != STRING)
                 f.syntaxError(a, "a filename");
 
-            File f2(a, f.name());
+            File f2(a, f.fileName());
 
             if (! f2.open(QIODevice::ReadOnly))
                 UmlCom::trace("<br>cannot open '" + a + "' referenced in "
-                              + Q3CString(f.name().toAscii()));//[jasa] QString to Q3CString conversion
+                              + QByteArray(f.fileName().toLatin1()));//[jasa] QString to QByteArray conversion
             else {
                 f2.read("(");
                 f2.read("object");
@@ -86,9 +86,9 @@ void UmlClassView::import(UmlPackage * parent, File & f)
                 if (!doc.isEmpty())
                     clv->set_Description(doc);
 
-                Q3CString * nmsp;
+                QByteArray * nmsp;
 
-                if ((nmsp = prop.find("Cplusplus/IsNamespace")) != 0) {
+                if ((nmsp = prop.value("Cplusplus/IsNamespace")) != 0) {
                     if (*nmsp == "TRUE")
                         pack->set_CppNamespace(s);
 
@@ -117,7 +117,7 @@ void UmlClassView::import(UmlPackage * parent, File & f)
 void UmlClassView::import(File & f)
 {
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (f.read(s)) {
         case -1:
@@ -149,7 +149,7 @@ void UmlClassView::import(File & f)
 void UmlClassView::readObjects(File & f)
 {
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (f.read(s)) {
         case ')':
@@ -192,7 +192,7 @@ void UmlClassView::readObjects(File & f)
         }
         else {
             if (s != "Mechanism")
-                UmlCom::trace("<br>" + s + " in " + Q3CString(f.name().toAscii()) + " NOT MANAGED by ClassView::readObject()");//[jasa] QString to Q3CString conversion
+                UmlCom::trace("<br>" + s + " in " + QByteArray(f.fileName().toLatin1()) + " NOT MANAGED by ClassView::readObject()");//[jasa] QString to QByteArray conversion
 
             f.skipBlock();
         }
diff --git a/genplugouts/import_rose/UmlClassView.h b/genplugouts/import_rose/UmlClassView.h
index 4a359f6be..466c61369 100644
--- a/genplugouts/import_rose/UmlClassView.h
+++ b/genplugouts/import_rose/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPackage;
 class File;
@@ -15,7 +15,7 @@ class UmlUseCaseView;
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n);
+    UmlClassView(void * id, const QByteArray & n);
 
     static void import(UmlPackage * parent, File & f);
 
diff --git a/genplugouts/import_rose/UmlCollaborationDiagram.cpp b/genplugouts/import_rose/UmlCollaborationDiagram.cpp
index ba09af8c7..ade7c0036 100644
--- a/genplugouts/import_rose/UmlCollaborationDiagram.cpp
+++ b/genplugouts/import_rose/UmlCollaborationDiagram.cpp
@@ -5,19 +5,19 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlCollaborationDiagram::import(File & f, UmlItem * p)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "collaboration diagram's name");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
diff --git a/genplugouts/import_rose/UmlCollaborationDiagram.h b/genplugouts/import_rose/UmlCollaborationDiagram.h
index 3ba79c9c1..27af3cae0 100644
--- a/genplugouts/import_rose/UmlCollaborationDiagram.h
+++ b/genplugouts/import_rose/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class File;
 class UmlItem;
@@ -16,7 +16,7 @@ class UmlItem;
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlCom.cpp b/genplugouts/import_rose/UmlCom.cpp
index 12ccbb3c2..227f5d572 100644
--- a/genplugouts/import_rose/UmlCom.cpp
+++ b/genplugouts/import_rose/UmlCom.cpp
@@ -1,20 +1,24 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 #include "UmlSettings.h"
+#include <iostream>
+using namespace std;
 //#include "Tools/ApiCmd.h"
+#include <QHostAddress>
+
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +32,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(13);
         flush();
@@ -65,11 +71,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -79,11 +85,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -100,13 +106,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -115,10 +121,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -127,16 +133,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -145,18 +151,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -193,6 +199,8 @@ void UmlCom::write_id(const void * id)
 {
     check_size_out(sizeof(void *));
 
+    if(id == (void *)0x10000)
+        printf("wrong id\r\n");
     memcpy(p_buffer_out, &id, sizeof(void *));
     p_buffer_out += sizeof(void *);
 }
@@ -202,7 +210,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -212,7 +220,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -223,7 +231,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -235,7 +243,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -247,7 +255,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -259,7 +267,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -272,7 +280,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -285,7 +293,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -299,7 +307,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -311,7 +319,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -324,7 +332,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -337,7 +345,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -350,7 +358,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +380,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -386,7 +394,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -400,7 +408,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -415,7 +423,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -428,7 +436,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -442,7 +450,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -465,7 +473,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ", " << ((arg3) ? arg3 : "") << ", " << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ", " << ((arg3) ? arg3 : "") << ", " << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -490,7 +498,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -513,10 +521,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -539,10 +547,17 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
+    if(a == (void *)0x10000)
+    {
+        QByteArray garbage = read_all();
+#ifdef TRACE
+        qDebug() << "what the?\r\n";
+#endif
+    }
     return a;
 }
 
@@ -550,12 +565,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -587,28 +602,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -617,7 +633,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -628,7 +644,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
@@ -645,3 +661,12 @@ void UmlCom::flush()
     }
 }
 
+QByteArray UmlCom::read_all()
+{
+    if (sock != 0)
+    {
+        sock->waitForReadyRead(100);
+        return sock->readAll();
+    }
+    return QByteArray();
+}
diff --git a/genplugouts/import_rose/UmlCom.h b/genplugouts/import_rose/UmlCom.h
index 0758b90e3..0a6b4401e 100644
--- a/genplugouts/import_rose/UmlCom.h
+++ b/genplugouts/import_rose/UmlCom.h
@@ -2,21 +2,22 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
-#include "CmdFamily.h"
-#include "OnInstanceCmd.h"
+#include <QTcpSocket>
+//#include "CmdFamily.h"
+//#include "OnInstanceCmd.h"
+#include "Tools/ApiCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
-#include <q3ptrvector.h>
+#include <QVector>
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -63,11 +64,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -77,19 +78,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -151,7 +152,7 @@ class UmlCom
     //internal, do NOT use it
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l);
     //internal, do NOT use it
     static void * read_id();
     //internal, do NOT use it
@@ -164,13 +165,14 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
+    static QByteArray read_all();
 };
 
 #endif
diff --git a/genplugouts/import_rose/UmlComponent.h b/genplugouts/import_rose/UmlComponent.h
index bb4fdbb25..1768d7a0c 100644
--- a/genplugouts/import_rose/UmlComponent.h
+++ b/genplugouts/import_rose/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlComponentDiagram.h b/genplugouts/import_rose/UmlComponentDiagram.h
index 2d3fea7e4..f944bf9af 100644
--- a/genplugouts/import_rose/UmlComponentDiagram.h
+++ b/genplugouts/import_rose/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlComponentView.h b/genplugouts/import_rose/UmlComponentView.h
index a3389f2b6..ba737e5ab 100644
--- a/genplugouts/import_rose/UmlComponentView.h
+++ b/genplugouts/import_rose/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlDeploymentDiagram.h b/genplugouts/import_rose/UmlDeploymentDiagram.h
index e04be865f..6ecadf56f 100644
--- a/genplugouts/import_rose/UmlDeploymentDiagram.h
+++ b/genplugouts/import_rose/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class File;
 class UmlDeploymentView;
@@ -16,7 +16,7 @@ class UmlDeploymentView;
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlDeploymentView.cpp b/genplugouts/import_rose/UmlDeploymentView.cpp
index 0fce13681..6d0b2d629 100644
--- a/genplugouts/import_rose/UmlDeploymentView.cpp
+++ b/genplugouts/import_rose/UmlDeploymentView.cpp
@@ -7,10 +7,10 @@
 #include "UmlDeploymentDiagram.h"
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlDeploymentView::import(File & f)
 {
-    Q3CString s;
+    QByteArray s;
 
     for (;;) {
         switch (f.read(s)) {
@@ -41,7 +41,7 @@ void UmlDeploymentView::import(File & f)
 void UmlDeploymentView::readObjects(File & f)
 {
     for (;;) {
-        Q3CString s;
+        QByteArray s;
 
         switch (f.read(s)) {
         case ')':
@@ -60,18 +60,18 @@ void UmlDeploymentView::readObjects(File & f)
             f.syntaxError(s, "an atom");
 
         if ((s == "Processor") || (s == "Device"))
-            UmlNode::import(f, this, s.lower());
+            UmlNode::import(f, this, s.toLower());
         else if (s == "Process_Diagram")
             UmlDeploymentDiagram::import(f, this);
         else {
-            //UmlCom::trace("<br>" + s + " in " + Q3CString(f.name()) + " NOT MANAGED by DeploymentView::readObject()");//[jasa] original line
-            UmlCom::trace("<br>" + s + " in " + Q3CString(f.name().toAscii()) + " NOT MANAGED by DeploymentView::readObject()");//[jasa] go from QFile to QString name to const char* for Q3CString constructor
+            //UmlCom::trace("<br>" + s + " in " + QByteArray(f.name()) + " NOT MANAGED by DeploymentView::readObject()");//[jasa] original line
+            UmlCom::trace("<br>" + s + " in " + QByteArray(f.fileName().toLatin1()) + " NOT MANAGED by DeploymentView::readObject()");//[jasa] go from QFile to QString name to const char* for QByteArray constructor
             f.skipBlock();
         }
     }
 }
 
-UmlDeploymentView * UmlDeploymentView::create(UmlPackage * parent, const char * s, Q3CString bn)
+UmlDeploymentView * UmlDeploymentView::create(UmlPackage * parent, const char * s, QByteArray bn)
 {
     UmlDeploymentView * r = UmlBaseDeploymentView::create(parent, s);
 
@@ -83,11 +83,11 @@ UmlDeploymentView * UmlDeploymentView::create(UmlPackage * parent, const char *
 
 void UmlDeploymentView::import(UmlPackage * parent, File & f)
 {
-    Q3CString s;
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
+    QByteArray s;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
     int k;
 
     for (;;) {
@@ -97,11 +97,11 @@ void UmlDeploymentView::import(UmlPackage * parent, File & f)
             if (f.read(s) != STRING)
                 f.syntaxError(s, "a filename");
 
-            File f2(s, f.name());
+            File f2(s, f.fileName());
 
             if (! f2.open(QIODevice::ReadOnly))
                 UmlCom::trace("<br>cannot open '" + s + "' referenced in "
-                              + Q3CString(f.name().toAscii()));//[jasa] QString to Q3CString conversion (.ascii())
+                              + QByteArray(f.fileName().toLatin1()));//[jasa] QString to QByteArray conversion (.ascii())
             else {
                 f2.read("(");
                 f2.read("object");
diff --git a/genplugouts/import_rose/UmlDeploymentView.h b/genplugouts/import_rose/UmlDeploymentView.h
index 9e437a6d3..f20667c5a 100644
--- a/genplugouts/import_rose/UmlDeploymentView.h
+++ b/genplugouts/import_rose/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class File;
 class UmlPackage;
@@ -14,7 +14,7 @@ class UmlPackage;
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {
         cpt[kind()] += 1;
     };
 
@@ -22,21 +22,21 @@ class UmlDeploymentView : public UmlBaseDeploymentView
 
     void readObjects(File & f);
 
-    static UmlDeploymentView * create(UmlPackage * parent, const char * s, Q3CString bn);
+    static UmlDeploymentView * create(UmlPackage * parent, const char * s, QByteArray bn);
 
     static void import(UmlPackage * parent, File & f);
 
 
 protected:
-    Q3CString _base_name;
+    QByteArray _base_name;
 
 
 public:
-    const Q3CString baseName() const;
+    const QByteArray baseName() const;
 
 };
 
-inline const Q3CString UmlDeploymentView::baseName() const
+inline const QByteArray UmlDeploymentView::baseName() const
 {
     return _base_name;
 }
diff --git a/genplugouts/import_rose/UmlDiagram.h b/genplugouts/import_rose/UmlDiagram.h
index ffee38e5c..99f9e2f51 100644
--- a/genplugouts/import_rose/UmlDiagram.h
+++ b/genplugouts/import_rose/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/import_rose/UmlExtraClassMember.h b/genplugouts/import_rose/UmlExtraClassMember.h
index b1b18948c..126aaa6b9 100644
--- a/genplugouts/import_rose/UmlExtraClassMember.h
+++ b/genplugouts/import_rose/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlFormalParameter.cpp b/genplugouts/import_rose/UmlFormalParameter.cpp
index 879d8e9be..15ca8d5ff 100644
--- a/genplugouts/import_rose/UmlFormalParameter.cpp
+++ b/genplugouts/import_rose/UmlFormalParameter.cpp
@@ -2,7 +2,7 @@
 #include "UmlFormalParameter.h"
 #include "File.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlFormalParameter::import(File & f, bool scanning)
 {
@@ -12,7 +12,7 @@ void UmlFormalParameter::import(File & f, bool scanning)
     if (f.read(_name) != STRING)
         f.syntaxError(_name, "formal's name");
 
-    Q3CString s;
+    QByteArray s;
 
     for (;;) {
         switch (f.read(s)) {
diff --git a/genplugouts/import_rose/UmlItem.cpp b/genplugouts/import_rose/UmlItem.cpp
index 4dbea2ad0..59a5e9e77 100644
--- a/genplugouts/import_rose/UmlItem.cpp
+++ b/genplugouts/import_rose/UmlItem.cpp
@@ -4,7 +4,7 @@
 #include "UmlCom.h"
 #include "util.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlItem::~UmlItem()
 {
 }
@@ -13,18 +13,19 @@ void UmlItem::roseImport()
 {
 }
 
-Q3CString UmlItem::fullName()
+QByteArray UmlItem::fullName()
 {
     return parent()->fullName() + "::" + name();
 }
 
-void UmlItem::setProperties(Q3Dict<Q3CString> & d)
+void UmlItem::setProperties(QHash<QByteArray, QByteArray*> & d)
 {
-    Q3DictIterator<Q3CString> it(d);
+    QHashIterator<QByteArray, QByteArray*> it(d);
 
-    while (it.current()) {
-        set_PropertyValue(Q3CString(it.currentKey().toAscii()), *(it.current()));//[jasa] QString to Q3CString conversion
-        ++it;
+    while (it.hasNext()) {
+        it.next();
+        set_PropertyValue(QByteArray(it.key()), *(it.value()));//[jasa] QString to QByteArray conversion
+        //++it;
     }
 
     d.clear();
@@ -32,35 +33,35 @@ void UmlItem::setProperties(Q3Dict<Q3CString> & d)
 
 void UmlItem::newItem(UmlItem * x, const char * id)
 {
-    Q3AsciiDict<UmlItem> & d = all_items[x->kind()];
-
-    if (d[id] != 0) {
-        UmlCom::trace(Q3CString("<br>id '") + id + "' used for several objects");
+    QHash<QString,UmlItem*> & d = all_items[x->kind()];
+    if (d.value(id,0) != 0) {
+        UmlCom::trace(QByteArray("<br>id '") + id + "' used for several objects");
         throw 0;
     }
 
-    d.insert(strdup(id), x);
+    d.insert(id, x);
 
     if (d.size() < (d.count() >> 3))
-        d.resize(d.size() << 4);
+        d.reserve(d.size() << 4);
 
     x->set_PropertyValue("rose/quid", id);
 }
 
 UmlItem * UmlItem::findItem(const char * id, anItemKind k)
 {
-    return all_items[k][id];
+    UmlItem* it = all_items[k].value(id);
+    return it;
 }
 
 void UmlItem::statistic()
 {
-    Q3CString msg = "<br>";
+    QByteArray msg = "<br>";
 
 #define add_nbr(x, str) \
   if (cpt[x] != 0) { \
-    Q3CString s; \
+    QByteArray s; \
     \
-    s.sprintf("%d %s<br>", cpt[x], str); \
+    s= QString("%1 %2<br>").arg(cpt[x]).arg(str).toLatin1(); \
     msg += s; \
   }
 
@@ -90,7 +91,7 @@ void UmlItem::statistic()
 
 bool UmlItem::scanning;
 
-Q3AsciiDict<UmlItem> UmlItem::all_items[aPackage + 1];
+QHash<QString,UmlItem*> UmlItem::all_items[aPackage + 1];
 
 int UmlItem::cpt[128];
 
diff --git a/genplugouts/import_rose/UmlItem.h b/genplugouts/import_rose/UmlItem.h
index 8b0e57dbb..f73abc5a4 100644
--- a/genplugouts/import_rose/UmlItem.h
+++ b/genplugouts/import_rose/UmlItem.h
@@ -3,10 +3,9 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QByteArray>
+
 #include "anItemKind.h"
-#include <q3asciidict.h>
 
 // This class is a mother class for all the other Uml* classes, this
 // allows to generalize their management, declare virtual operations etc ...
@@ -15,15 +14,15 @@
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
     virtual void roseImport();
 
-    virtual Q3CString fullName();
+    virtual QByteArray fullName();
 
-    void setProperties(Q3Dict<Q3CString> & d);
+    void setProperties(QHash<QByteArray, QByteArray*> & d);
 
     static void newItem(UmlItem * x, const char * id);
 
@@ -35,7 +34,7 @@ class UmlItem : public UmlBaseItem
 
 
 protected:
-    static Q3AsciiDict<UmlItem> all_items[aPackage + 1];
+    static QHash<QString,UmlItem*> all_items[aPackage + 1];
 
     static int cpt[128];
 
diff --git a/genplugouts/import_rose/UmlNcRelation.h b/genplugouts/import_rose/UmlNcRelation.h
index cdcdd0239..780e27717 100644
--- a/genplugouts/import_rose/UmlNcRelation.h
+++ b/genplugouts/import_rose/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlNode.cpp b/genplugouts/import_rose/UmlNode.cpp
index d383c678d..6bdebd1d6 100644
--- a/genplugouts/import_rose/UmlNode.cpp
+++ b/genplugouts/import_rose/UmlNode.cpp
@@ -5,19 +5,19 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-void UmlNode::import(File & f, UmlDeploymentView * p, const Q3CString & ste)
+#include <QByteArray>
+void UmlNode::import(File & f, UmlDeploymentView * p, const QByteArray & ste)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, " deployment node's name expected");
 
-    Q3CString s2;
-    Q3CString id;
-    Q3CString dummy_ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
+    QByteArray s2;
+    QByteArray id;
+    QByteArray dummy_ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
     int k;
 
     do {
diff --git a/genplugouts/import_rose/UmlNode.h b/genplugouts/import_rose/UmlNode.h
index 0f5215757..0537ba6b2 100644
--- a/genplugouts/import_rose/UmlNode.h
+++ b/genplugouts/import_rose/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class File;
 class UmlDeploymentView;
@@ -14,11 +14,11 @@ class UmlDeploymentView;
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {
         cpt[kind()] += 1;
     };
 
-    static void import(File & f, UmlDeploymentView * p, const Q3CString & ste);
+    static void import(File & f, UmlDeploymentView * p, const QByteArray & ste);
 
 };
 
diff --git a/genplugouts/import_rose/UmlOperation.cpp b/genplugouts/import_rose/UmlOperation.cpp
index c70e87ef0..a674250ad 100644
--- a/genplugouts/import_rose/UmlOperation.cpp
+++ b/genplugouts/import_rose/UmlOperation.cpp
@@ -5,7 +5,7 @@
 
 #include <qstringlist.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "util.h"
@@ -14,16 +14,16 @@
 #include "IdlSettings.h"
 void UmlOperation::import(File & f, UmlClass * parent)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "operations's name");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
@@ -34,7 +34,7 @@ void UmlOperation::import(File & f, UmlClass * parent)
     UmlOperation * x;
 
     if (scanning) {
-        Q3CString name;
+        QByteArray name;
 
         if (s.left(8) != "operator")
             name = (s.at(0) == '~')
@@ -53,7 +53,7 @@ void UmlOperation::import(File & f, UmlClass * parent)
 
         if (!ste.isEmpty()) {
             bool managed = FALSE;
-            QStringList l = QStringList::split(",", QString(ste));
+            QStringList l = QString(ste).split(",");
 
             for (QStringList::Iterator it = l.begin();
                  it != l.end();
@@ -127,7 +127,7 @@ void UmlOperation::import(File & f)
         return;
     }
 
-    Q3CString s;
+    QByteArray s;
     UmlTypeSpec t;
 
     for (;;) {
@@ -201,10 +201,10 @@ void UmlOperation::import(File & f)
 
 void UmlOperation::importParameters(File & f)
 {
-    Q3CString s;
+    QByteArray s;
     unsigned rank = 0;
     const char * sep = "";
-    Q3CString doc = description();
+    QByteArray doc = description();
 
     for (;;) {
         switch (f.read(s)) {
@@ -226,17 +226,17 @@ void UmlOperation::importParameters(File & f)
         f.read("Parameter");
 
         UmlParameter p;
-        Q3CString ti;
+        QByteArray ti;
 
-        ti.sprintf("${t%u}", rank);
+        ti = QString("${t%1}").arg(rank).toLatin1();
 
         if (f.read(p.name) != STRING)
             f.syntaxError(s, "parameter's name");
 
-        Q3CString id;
-        Q3CString ste;
-        Q3CString p_doc;
-        Q3Dict<Q3CString> prop;
+        QByteArray id;
+        QByteArray ste;
+        QByteArray p_doc;
+        QHash<QByteArray, QByteArray*> prop;
         int k;
 
         for (;;) {
@@ -264,7 +264,7 @@ void UmlOperation::importParameters(File & f)
                         s = s.mid(6);
                     }
                     else {
-                        Q3CString err =
+                        QByteArray err =
                             "<br>'" + s + "' : wrong parameter direction, in " + f.context();
 
                         UmlCom::trace(err);
@@ -291,20 +291,20 @@ void UmlOperation::importParameters(File & f)
                 f.skipNextForm();
         }
 
-        Q3CString d;
+        QByteArray d;
         int index;
 
         switch (((UmlClass *) parent())->language()) {
         case Cplusplus:
         case AnsiCplusplus:
         case VCplusplus:
-            s.sprintf("%s%s ${p%u}", sep, (const char *) ti, rank);
+            s= QString("%1%2 ${p%3}").arg(sep).arg((const char *) ti).arg(rank).toLatin1();
 
-            if ((index = (d = cppDecl()).find("${)}")) != -1)
+            if ((index = (d = cppDecl()).indexOf("${)}")) != -1)
                 //set_CppDecl(d.insert(index, s));//[jasa] original line
                 set_CppDecl(d.insert(index, (const char *)s)); //[jasa] fix ambiguous call
 
-            if ((index = (d = cppDef()).find("${)}")) != -1)
+            if ((index = (d = cppDef()).indexOf("${)}")) != -1)
                 set_CppDef(d.insert(index, (const char *)s)); //[jasa] fix ambiguous call
 
             break;
@@ -313,17 +313,17 @@ void UmlOperation::importParameters(File & f)
             break;
 
         case Corba:
-            if ((index = (d = idlDecl()).find("${)}")) != -1) {
-                s.sprintf("%s${d%u} %s ${p%u}",
-                          sep, rank, (const char *) ti, rank);
+            if ((index = (d = idlDecl()).indexOf("${)}")) != -1) {
+                s = QString("%1${d%2} %3 ${p%4}").arg(
+                          sep).arg(rank).arg((const char *) ti).arg(rank).toLatin1();
                 set_IdlDecl(d.insert(index, (const char *)s)); //[jasa] fix ambiguous call
             }
 
             break;
 
         case Java:
-            if ((index = (d = javaDecl()).find("${)}")) != -1) {
-                s.sprintf("%s%s ${p%u}", sep, (const char *) ti, rank);
+            if ((index = (d = javaDecl()).indexOf("${)}")) != -1) {
+                s = QString("%s%s ${p%u}").arg( sep).arg( (const char *) ti).arg( rank).toLatin1();
                 set_JavaDecl(d.insert(index, (const char *)s)); //[jasa]
             }
 
@@ -340,7 +340,7 @@ void UmlOperation::importParameters(File & f)
 
 void UmlOperation::importExceptions(File & f)
 {
-    Q3CString s;
+    QByteArray s;
     unsigned rank = 0;
 
     if (f.read(s) != STRING)
@@ -348,8 +348,8 @@ void UmlOperation::importExceptions(File & f)
 
     int index = 0;
 
-    while (!(s = s.mid(index).stripWhiteSpace()).isEmpty()) {
-        if ((index = s.find(' ')) == -1)
+    while (!(s = s.mid(index).trimmed()).isEmpty()) {
+        if ((index = s.indexOf(' ')) == -1)
             index = s.length();
 
         UmlTypeSpec t;
@@ -357,10 +357,10 @@ void UmlOperation::importExceptions(File & f)
 
         t.explicit_type = s.left(index);
 
-        if (((index2 = t.explicit_type.find("[")) != -1) &&
+        if (((index2 = t.explicit_type.indexOf("[")) != -1) &&
             (((const char *) t.explicit_type)[t.explicit_type.length() - 1]
              == ']')) {
-            Q3CString target_id =
+            QByteArray target_id =
                 t.explicit_type.mid(index2 + 1,
                                     t.explicit_type.length() - index2 - 2);
             UmlClass * cl = (UmlClass *) UmlItem::findItem(target_id, aClass);
@@ -377,21 +377,21 @@ void UmlOperation::importExceptions(File & f)
     }
 }
 
-void UmlOperation::cplusplus(Q3Dict<Q3CString> &)
+void UmlOperation::cplusplus(QHash<QByteArray, QByteArray*> &)
 {
     set_CppDecl(CppSettings::operationDecl());
     set_CppDef(CppSettings::operationDef());
 }
 
-void UmlOperation::oracle8(Q3Dict<Q3CString> &)
+void UmlOperation::oracle8(QHash<QByteArray, QByteArray*> &)
 {
 }
 
-void UmlOperation::corba(Q3Dict<Q3CString> & prop)
+void UmlOperation::corba(QHash<QByteArray, QByteArray*> & prop)
 {
-    Q3CString * v;
+    QByteArray * v;
 
-    if ((v = prop.find("CORBA/OperationIsOneWay")) != 0) {
+    if ((v = prop.value("CORBA/OperationIsOneWay")) != 0) {
         if (*v == "TRUE")
             set_isIdlOneway(TRUE);
 
@@ -401,42 +401,42 @@ void UmlOperation::corba(Q3Dict<Q3CString> & prop)
     set_IdlDecl(IdlSettings::operationDecl());
 }
 
-void UmlOperation::java(Q3Dict<Q3CString> & prop)
+void UmlOperation::java(QHash<QByteArray, QByteArray*> & prop)
 {
-    Q3CString d = JavaSettings::operationDef();
-    Q3CString * v;
+    QByteArray d = JavaSettings::operationDef();
+    QByteArray * v;
 
-    if ((v = prop.find("Java/Final")) != 0) {
+    if ((v = prop.value("Java/Final")) != 0) {
         if (*v == "TRUE")
             set_isJavaFinal(TRUE);
 
         prop.remove("Java/Final");
     }
 
-    if ((v = prop.find("Java/Synchronized")) != 0) {
+    if ((v = prop.value("Java/Synchronized")) != 0) {
         if (*v == "TRUE")
             set_isJavaSynchronized(TRUE);
 
         prop.remove("Java/Synchronized");
     }
 
-    if ((v = prop.find("Java/Static")) != 0) {
+    if ((v = prop.value("Java/Static")) != 0) {
         if (*v == "TRUE")
             set_isClassMember(TRUE);
 
         prop.remove("Java/Static");
     }
 
-    if ((v = prop.find("Java/Abstract")) != 0) {
+    if ((v = prop.value("Java/Abstract")) != 0) {
         if (*v == "TRUE")
             set_isAbstract(TRUE);
 
         prop.remove("Java/Abstract");
     }
 
-    if ((v = prop.find("Java/Strictfp")) != 0) {
+    if ((v = prop.value("Java/Strictfp")) != 0) {
         if (*v == "TRUE") {
-            int index = d.find("${final}");
+            int index = d.indexOf("${final}");
 
             if (index != -1)
                 d.insert(index, "strictfp ");
diff --git a/genplugouts/import_rose/UmlOperation.h b/genplugouts/import_rose/UmlOperation.h
index 93d5f3be8..729feb1cb 100644
--- a/genplugouts/import_rose/UmlOperation.h
+++ b/genplugouts/import_rose/UmlOperation.h
@@ -3,8 +3,8 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QByteArray>
+
 
 class File;
 class UmlClass;
@@ -16,7 +16,7 @@ class UmlClass;
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {
         cpt[kind()] += 1;
     };
 
@@ -30,13 +30,13 @@ class UmlOperation : public UmlBaseOperation
 
     void importExceptions(File & f);
 
-    void cplusplus(Q3Dict<Q3CString> & prop);
+    void cplusplus(QHash<QByteArray, QByteArray*> & prop);
 
-    void oracle8(Q3Dict<Q3CString> & prop);
+    void oracle8(QHash<QByteArray, QByteArray*> & prop);
 
-    void corba(Q3Dict<Q3CString> & prop);
+    void corba(QHash<QByteArray, QByteArray*> & prop);
 
-    void java(Q3Dict<Q3CString> & prop);
+    void java(QHash<QByteArray, QByteArray*> & prop);
 
 };
 
diff --git a/genplugouts/import_rose/UmlPackage.cpp b/genplugouts/import_rose/UmlPackage.cpp
index 422e77363..51c3cd6c4 100644
--- a/genplugouts/import_rose/UmlPackage.cpp
+++ b/genplugouts/import_rose/UmlPackage.cpp
@@ -2,9 +2,9 @@
 #include "UmlPackage.h"
 #include "UmlArtifact.h"
 
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "File.h"
 #include "UmlCom.h"
@@ -15,13 +15,13 @@
 
 void UmlPackage::roseImport()
 {
-    QString s = Q3FileDialog::getOpenFileName(QString::null, "*.mdl", 0);
+    QString s = QFileDialog::getOpenFileName(0, "" ,QString::null, "*.mdl");
 
     if (!s.isEmpty()) {
         File f(s, "");
 
         if (! f.open(QIODevice::ReadOnly)) {
-            UmlCom::trace("<br>cannot open " + s);
+            UmlCom::trace(QString("<br>cannot open " + s).toLatin1().constData());
             throw 0;
         }
 
@@ -55,19 +55,19 @@ void UmlPackage::roseImport()
     }
 }
 
-Q3CString UmlPackage::fullName()
+QByteArray UmlPackage::fullName()
 {
     return (this == getProject()) ? name() : UmlItem::fullName();
 }
 
-void UmlPackage::subArtifacts(Q3PtrList<UmlArtifact> & l, Q3CString name, Q3CString deplview_name)
+void UmlPackage::subArtifacts(QList<UmlArtifact *> &l, QByteArray name, QByteArray deplview_name)
 {
     UmlDeploymentView * deplview;
 
-    for (deplview = _deplviews.first(); deplview != 0; deplview = _deplviews.next()) {
+    foreach (deplview, _deplviews){
         if (deplview->baseName() == deplview_name) {
-            const Q3PtrVector<UmlItem> ch = deplview->children();
-            unsigned i;
+            const QVector<UmlItem*> ch = deplview->children();
+            int i;
 
             for (i = 0; i != ch.size(); i += 1) {
                 UmlItem * it = ch[i];
@@ -80,16 +80,16 @@ void UmlPackage::subArtifacts(Q3PtrList<UmlArtifact> & l, Q3CString name, Q3CStr
 
 }
 
-void UmlPackage::subDeplViews(Q3PtrList<UmlDeploymentView> & l, Q3CString s)
+void UmlPackage::subDeplViews(QList<UmlDeploymentView *> &l, QByteArray s)
 {
     UmlDeploymentView * deplview;
 
-    for (deplview = _deplviews.first(); deplview != 0; deplview = _deplviews.next())
+    foreach (deplview, _deplviews)
         if (deplview->baseName() == s)
             l.append(deplview);
 }
 
-UmlPackage * UmlPackage::addPackage(Q3CString s)
+UmlPackage * UmlPackage::addPackage(QByteArray s)
 {
     UmlPackage * r;
 
@@ -99,10 +99,10 @@ UmlPackage * UmlPackage::addPackage(Q3CString s)
     return r;
 }
 
-UmlDeploymentView * UmlPackage::addDeplView(Q3CString s, UmlPackage * p)
+UmlDeploymentView * UmlPackage::addDeplView(QByteArray s, UmlPackage * p)
 {
     UmlDeploymentView * dpv;
-    Q3CString bn = s;
+    QByteArray bn = s;
 
     while ((dpv = UmlDeploymentView::create(p, s, bn)) == 0)
         s += '_';
@@ -114,7 +114,7 @@ UmlDeploymentView * UmlPackage::addDeplView(Q3CString s, UmlPackage * p)
 
 bool UmlPackage::import(File & f)
 {
-    Q3CString s;
+    QByteArray s;
 
     switch (f.read(s)) {
     case -1:
diff --git a/genplugouts/import_rose/UmlPackage.h b/genplugouts/import_rose/UmlPackage.h
index 213904fb7..f6aedeb63 100644
--- a/genplugouts/import_rose/UmlPackage.h
+++ b/genplugouts/import_rose/UmlPackage.h
@@ -3,9 +3,9 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
-//#include <q3ptrlist.h> //[rageek] incomplete qt3to4
-#include <q3ptrlist.h>
+#include <QByteArray>
+// //[rageek] incomplete qt3to4
+
 
 #include "UmlDeploymentView.h"
 class UmlArtifact;
@@ -18,21 +18,21 @@ class File;
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {
         cpt[kind()] += 1;
     };
 
     virtual void roseImport();
 
-    virtual Q3CString fullName();
+    virtual QByteArray fullName();
 
-    void subArtifacts(Q3PtrList<UmlArtifact> & l, Q3CString name, Q3CString deplview_name);
+    void subArtifacts(QList<UmlArtifact*> & l, QByteArray name, QByteArray deplview_name);
 
-    void subDeplViews(Q3PtrList<UmlDeploymentView> & l, Q3CString s);
+    void subDeplViews(QList<UmlDeploymentView*> & l, QByteArray s);
 
-    UmlPackage * addPackage(Q3CString s);
+    UmlPackage * addPackage(QByteArray s);
 
-    UmlDeploymentView * addDeplView(Q3CString s, UmlPackage * p);
+    UmlDeploymentView * addDeplView(QByteArray s, UmlPackage * p);
 
 
 private:
@@ -48,7 +48,7 @@ class UmlPackage : public UmlBasePackage
 
 
 protected:
-    Q3PtrList<UmlDeploymentView> _deplviews;
+    QList<UmlDeploymentView*> _deplviews;
 
 };
 
diff --git a/genplugouts/import_rose/UmlParameter.h b/genplugouts/import_rose/UmlParameter.h
index ef6f522b0..3c967ad60 100644
--- a/genplugouts/import_rose/UmlParameter.h
+++ b/genplugouts/import_rose/UmlParameter.h
@@ -4,7 +4,7 @@
 
 #include "aDirection.h"
 #include "UmlTypeSpec.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Represent an operation's parameter
 
@@ -13,9 +13,9 @@ struct UmlParameter {
 
     UmlTypeSpec type;
 
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
 };
 
diff --git a/genplugouts/import_rose/UmlRelation.cpp b/genplugouts/import_rose/UmlRelation.cpp
index 6ddc524c8..bc9d12f46 100644
--- a/genplugouts/import_rose/UmlRelation.cpp
+++ b/genplugouts/import_rose/UmlRelation.cpp
@@ -8,7 +8,7 @@
 #include "JavaSettings.h"
 #include "IdlSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlRelation::Role::import(File & f)
 {
     f.read("(");
@@ -28,8 +28,8 @@ void UmlRelation::Role::import(File & f)
     is_static = FALSE;
     is_byvalue = FALSE;
 
-    Q3CString ste;
-    Q3CString s;
+    QByteArray ste;
+    QByteArray s;
     int k;
 
     do {
@@ -118,7 +118,7 @@ void UmlRelation::import(File & f)
     if (scanning)
         f.skipBlock();
     else {
-        Q3CString s;
+        QByteArray s;
 
         if (f.read(s) != STRING)
             f.syntaxError(s, "relation's name");
@@ -126,11 +126,11 @@ void UmlRelation::import(File & f)
             // unnamed
             s = "";
 
-        Q3CString id;
-        Q3CString ste;
-        Q3CString doc;
-        Q3Dict<Q3CString> prop;
-        Q3CString s2;
+        QByteArray id;
+        QByteArray ste;
+        QByteArray doc;
+        QHash<QByteArray, QByteArray*> prop;
+        QByteArray s2;
         int k;
 
         do {
@@ -175,7 +175,7 @@ void UmlRelation::import(File & f)
         role_2.is_aggregate |= role_2.is_byvalue;
 
         if (bidir && role_2.is_aggregate) {
-            // manage bouml limitation : only role1 may be an aggregate
+            // manage douml limitation : only role1 may be an aggregate
             if (role_1.is_aggregate)
                 bidir = FALSE;
             else {
@@ -209,7 +209,7 @@ void UmlRelation::import(File & f)
 
             if (role2->is_navigable) {
                 if (bidir) {
-                    const Q3PtrVector<UmlItem> ch = role2->target->children();
+                    const QVector<UmlItem*> ch = role2->target->children();
 
                     r = (UmlRelation *) ch.at(ch.count() - 1);
                 }
@@ -301,23 +301,23 @@ void UmlRelation::corba(UmlRelation::Role * role)
 
 void UmlRelation::java(UmlRelation::Role * role)
 {
-    Q3CString * v;
+    QByteArray * v;
 
-    if ((v = role->prop.find("Java/Final")) != 0) {
+    if ((v = role->prop.value("Java/Final")) != 0) {
         if (*v == "TRUE")
             set_isReadOnly(TRUE);
 
         role->prop.remove("Java/Final");
     }
 
-    if ((v = role->prop.find("Java/Transient")) != 0) {
+    if ((v = role->prop.value("Java/Transient")) != 0) {
         if (*v == "TRUE")
             set_isJavaTransient(TRUE);
 
         role->prop.remove("Java/Transient");
     }
 
-    if ((v = role->prop.find("Java/Volatile")) != 0) {
+    if ((v = role->prop.value("Java/Volatile")) != 0) {
         if (*v == "TRUE")
             set_isVolatile(TRUE);
 
diff --git a/genplugouts/import_rose/UmlRelation.h b/genplugouts/import_rose/UmlRelation.h
index d69f5880c..0713ced72 100644
--- a/genplugouts/import_rose/UmlRelation.h
+++ b/genplugouts/import_rose/UmlRelation.h
@@ -2,8 +2,8 @@
 #define _UMLRELATION_H
 
 
-#include <q3dict.h>
-#include <q3cstring.h>
+
+#include <QByteArray>
 #include "aVisibility.h"
 #include "aRelationKind.h"
 #include "UmlBaseRelation.h"
@@ -19,19 +19,19 @@ class UmlRelation : public UmlBaseRelation
 {
 public:
     struct Role {
-        Q3Dict<Q3CString> prop;
+        QHash<QByteArray, QByteArray*> prop;
 
-        Q3CString doc;
+        QByteArray doc;
 
-        Q3CString id;
+        QByteArray id;
 
-        Q3CString name;
+        QByteArray name;
 
         UmlClass * target;
 
-        Q3CString target_id;
+        QByteArray target_id;
 
-        Q3CString cardinality;
+        QByteArray cardinality;
 
         aVisibility visibility;
 
@@ -50,7 +50,7 @@ class UmlRelation : public UmlBaseRelation
     };
 
 
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlSequenceDiagram.cpp b/genplugouts/import_rose/UmlSequenceDiagram.cpp
index 567a77ff5..3857764c6 100644
--- a/genplugouts/import_rose/UmlSequenceDiagram.cpp
+++ b/genplugouts/import_rose/UmlSequenceDiagram.cpp
@@ -5,20 +5,20 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlSequenceDiagram::import(File & f, UmlItem * parent)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "sequence diagram's name");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
diff --git a/genplugouts/import_rose/UmlSequenceDiagram.h b/genplugouts/import_rose/UmlSequenceDiagram.h
index 216550f00..e94dee5e7 100644
--- a/genplugouts/import_rose/UmlSequenceDiagram.h
+++ b/genplugouts/import_rose/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class File;
 class UmlItem;
@@ -16,7 +16,7 @@ class UmlItem;
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlSettings.cpp b/genplugouts/import_rose/UmlSettings.cpp
index 9330c5080..bad37c4d2 100644
--- a/genplugouts/import_rose/UmlSettings.cpp
+++ b/genplugouts/import_rose/UmlSettings.cpp
@@ -2,36 +2,37 @@
 #include "UmlSettings.h"
 
 #include "UmlCom.h"
-//#include "Tools/ApiCmd.h"
+#include "Tools/ApiCmd.h"
+//#include "UmlSettingsCmd.h"
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlSettings::_defined;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -43,7 +44,7 @@ void UmlSettings::read_()
     _relation_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_stereotypes[index].uml = UmlCom::read_string();
@@ -56,7 +57,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -74,18 +75,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -96,7 +97,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_stereotypes.count();
 
@@ -107,7 +108,7 @@ Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlSter
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -118,15 +119,15 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         builtins[index] = _builtins[index];
@@ -154,15 +155,15 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         relation_stereotypes[index] = _relation_stereotypes[index];
@@ -187,15 +188,15 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         class_stereotypes[index] = _class_stereotypes[index];
diff --git a/genplugouts/import_rose/UmlSettings.h b/genplugouts/import_rose/UmlSettings.h
index f041fe41d..db1392364 100644
--- a/genplugouts/import_rose/UmlSettings.h
+++ b/genplugouts/import_rose/UmlSettings.h
@@ -1,9 +1,9 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
+#include <QHash>
 
 
-#include <q3dict.h>
-#include <q3cstring.h>
+#include <QByteArray>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -18,15 +18,15 @@ class UmlSettings
 
     static bool _defined;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_stereotypes;
 
     static UmlStereotype * _relation_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -34,19 +34,19 @@ class UmlSettings
 
     static void read_if_needed_();
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
-    static Q3CString uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
-    static UmlStereotype * add_rel_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_stereotype(const QByteArray & s);
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/import_rose/UmlStereotype.h b/genplugouts/import_rose/UmlStereotype.h
index 290517202..e3942fc7a 100644
--- a/genplugouts/import_rose/UmlStereotype.h
+++ b/genplugouts/import_rose/UmlStereotype.h
@@ -2,23 +2,23 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/import_rose/UmlTypeSpec.cpp b/genplugouts/import_rose/UmlTypeSpec.cpp
index 4bcfebb95..ec194d414 100644
--- a/genplugouts/import_rose/UmlTypeSpec.cpp
+++ b/genplugouts/import_rose/UmlTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlTypeSpec::toString() const
+const QByteArray & UmlTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/import_rose/UmlTypeSpec.h b/genplugouts/import_rose/UmlTypeSpec.h
index 1c939ea94..90b32b48d 100644
--- a/genplugouts/import_rose/UmlTypeSpec.h
+++ b/genplugouts/import_rose/UmlTypeSpec.h
@@ -2,7 +2,7 @@
 #define _UMLTYPESPEC_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 
@@ -15,7 +15,7 @@ class UmlTypeSpec
 {
 public:
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     // if != 0 the class representing the type
     UmlClass * type;
@@ -23,7 +23,7 @@ class UmlTypeSpec
     UmlTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
 };
 
diff --git a/genplugouts/import_rose/UmlUseCase.cpp b/genplugouts/import_rose/UmlUseCase.cpp
index 357669627..5362e4c3f 100644
--- a/genplugouts/import_rose/UmlUseCase.cpp
+++ b/genplugouts/import_rose/UmlUseCase.cpp
@@ -6,14 +6,14 @@
 #include "UmlNcRelation.h"
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlItem * UmlUseCase::item()
 {
     return this;
 }
 
-void UmlUseCase::readObject(File & f, Q3CString s)
+void UmlUseCase::readObject(File & f, QByteArray s)
 {
     if (!UmlItem::scanning &&
         ((s == "superclasses") || (s == "visible_modules"))) {
@@ -52,11 +52,11 @@ void UmlUseCase::readObject(File & f, Q3CString s)
             }
 
             // dependency or generalisation
-            Q3CString id;
-            Q3CString ste;
-            Q3CString doc;
-            Q3Dict<Q3CString> prop;
-            Q3CString s2;
+            QByteArray id;
+            QByteArray ste;
+            QByteArray doc;
+            QHash<QByteArray, QByteArray*> prop;
+            QByteArray s2;
             int k;
 
             do {
@@ -109,16 +109,16 @@ void UmlUseCase::readObject(File & f, Q3CString s)
 
 void UmlUseCase::import(File & f, UmlItem * parent)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "use case's name");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
diff --git a/genplugouts/import_rose/UmlUseCase.h b/genplugouts/import_rose/UmlUseCase.h
index 6df9f9644..5c5fb45dc 100644
--- a/genplugouts/import_rose/UmlUseCase.h
+++ b/genplugouts/import_rose/UmlUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseUseCase.h"
 #include "Uc.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlItem;
 class File;
@@ -15,13 +15,13 @@ class File;
 class UmlUseCase : public UmlBaseUseCase, public Uc
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {
         cpt[kind()] += 1;
     };
 
     virtual UmlItem * item();
 
-    virtual void readObject(File & f, Q3CString s);
+    virtual void readObject(File & f, QByteArray s);
 
     static void import(File & f, UmlItem * parent);
 
diff --git a/genplugouts/import_rose/UmlUseCaseDiagram.cpp b/genplugouts/import_rose/UmlUseCaseDiagram.cpp
index 8dc79cbe0..2acf4e0ff 100644
--- a/genplugouts/import_rose/UmlUseCaseDiagram.cpp
+++ b/genplugouts/import_rose/UmlUseCaseDiagram.cpp
@@ -5,20 +5,20 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlUseCaseDiagram::import(File & f, UmlItem * parent)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, "use case diagram's name");
 
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
-    Q3CString s2;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
+    QByteArray s2;
     int k;
 
     do {
diff --git a/genplugouts/import_rose/UmlUseCaseDiagram.h b/genplugouts/import_rose/UmlUseCaseDiagram.h
index ffdde6343..e87a73852 100644
--- a/genplugouts/import_rose/UmlUseCaseDiagram.h
+++ b/genplugouts/import_rose/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class File;
 class UmlItem;
@@ -16,7 +16,7 @@ class UmlItem;
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {
         cpt[kind()] += 1;
     };
 
diff --git a/genplugouts/import_rose/UmlUseCaseView.cpp b/genplugouts/import_rose/UmlUseCaseView.cpp
index a90e6213f..427dbfcfc 100644
--- a/genplugouts/import_rose/UmlUseCaseView.cpp
+++ b/genplugouts/import_rose/UmlUseCaseView.cpp
@@ -5,29 +5,29 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlItem * UmlUseCaseView::item()
 {
     return this;
 }
 
-void UmlUseCaseView::readObject(File & f, Q3CString)
+void UmlUseCaseView::readObject(File & f, QByteArray)
 {
     f.skipNextForm();
 }
 
 void UmlUseCaseView::import(UmlItem * parent, File & f)
 {
-    Q3CString s;
+    QByteArray s;
 
     if (f.read(s) != STRING)
         f.syntaxError(s, " use case view's name expected");
 
-    Q3CString a;
-    Q3CString id;
-    Q3CString ste;
-    Q3CString doc;
-    Q3Dict<Q3CString> prop;
+    QByteArray a;
+    QByteArray id;
+    QByteArray ste;
+    QByteArray doc;
+    QHash<QByteArray, QByteArray*> prop;
 
     for (;;) {
         int k = f.readDefinitionBeginning(a, id, ste, doc, prop);
@@ -39,11 +39,11 @@ void UmlUseCaseView::import(UmlItem * parent, File & f)
             if (f.read(a) != STRING)
                 f.syntaxError(a, "a filename");
 
-            File f2(a, f.name());
+            File f2(a, f.fileName());
 
             if (! f2.open(QIODevice::ReadOnly))
                 UmlCom::trace("<br>cannot open '" + a + "' referenced in "
-                              + Q3CString(f.name().toAscii()));//[jasa] QString to Q3CString
+                              + QByteArray(f.fileName().toLatin1()));//[jasa] QString to QByteArray
             else {
                 f2.read("(");
                 f2.read("object");
diff --git a/genplugouts/import_rose/UmlUseCaseView.h b/genplugouts/import_rose/UmlUseCaseView.h
index 7edabd7b8..15e9e2c05 100644
--- a/genplugouts/import_rose/UmlUseCaseView.h
+++ b/genplugouts/import_rose/UmlUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseUseCaseView.h"
 #include "Uc.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlItem;
 class File;
@@ -15,13 +15,13 @@ class File;
 class UmlUseCaseView : public UmlBaseUseCaseView, public Uc
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {
         cpt[kind()] += 1;
     };
 
     virtual UmlItem * item();
 
-    virtual void readObject(File & f, Q3CString s);
+    virtual void readObject(File & f, QByteArray s);
 
     //read and create a new use case view, its name is the next token
 
diff --git a/genplugouts/import_rose/rose.pro b/genplugouts/import_rose/import_rose.pro
similarity index 90%
rename from genplugouts/import_rose/rose.pro
rename to genplugouts/import_rose/import_rose.pro
index 9dc93544f..d281fcd00 100644
--- a/genplugouts/import_rose/rose.pro
+++ b/genplugouts/import_rose/import_rose.pro
@@ -1,7 +1,9 @@
 TEMPLATE    = app
 TARGET        = irose
-CONFIG        += debug warn_on qt
-DEFINES        = WITHCPP WITHJAVA WITHIDL
+CONFIG -= app_bundle
+CONFIG        += warn_on qt c++11
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES        += WITHCPP WITHJAVA WITHIDL  WITHPHP WITHPYTHON TRUE=true FALSE=false
 HEADERS        = ./UmlDeploymentView.h \
           ./UmlTypeSpec.h \
           ./UmlBaseArtifact.h \
@@ -160,23 +162,22 @@ SOURCES        = ./UmlDeploymentView.cpp \
           ./UmlExtraClassMember.cpp \
           ./UmlBaseActualParameter.cpp
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network  widgets
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
+QT += testlib
 
+    UI_DIR = src/ui
+    DESTDIR = ../../bin
 
-    MOC_DIR = bin/douml/rose/MOC_release
-    OBJECTS_DIR = bin/douml/rose/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-Debug{
-    MOC_DIR = bin/douml/rose/MOC_Debug
-    OBJECTS_DIR = bin/douml/rose/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
diff --git a/genplugouts/import_rose/util.cpp b/genplugouts/import_rose/util.cpp
index 85b90485a..e528bf7f9 100644
--- a/genplugouts/import_rose/util.cpp
+++ b/genplugouts/import_rose/util.cpp
@@ -1,10 +1,10 @@
-#include "q3cstring.h"
+#include <QByteArray>
 
 #include "util.h"
 
-Q3CString legalName(Q3CString s)
+QByteArray legalName(QByteArray s)
 {
-    for (unsigned index = 0; index != s.length(); index += 1) {
+    for (int index = 0; index != s.length(); index += 1) {
         char c = s.at(index);
 
         if ((c != '_') &&
@@ -19,9 +19,9 @@ Q3CString legalName(Q3CString s)
     return s;
 }
 
-Q3CString replace(Q3CString f, Q3CString k, Q3CString v)
+QByteArray replace(QByteArray f, QByteArray k, QByteArray v)
 {
-    int index = f.find(k);
+    int index = f.indexOf(k);
 
     return (index != -1)
            ? f.replace(index, k.length(), v)
diff --git a/genplugouts/import_rose/util.h b/genplugouts/import_rose/util.h
index 095c8d7cd..6ceaf5ce9 100644
--- a/genplugouts/import_rose/util.h
+++ b/genplugouts/import_rose/util.h
@@ -1,10 +1,10 @@
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifndef UTIL_H
 #define UTIL_H
 
-extern Q3CString legalName(Q3CString);
-extern Q3CString replace(Q3CString f, Q3CString k, Q3CString v);
+extern QByteArray legalName(QByteArray);
+extern QByteArray replace(QByteArray f, QByteArray k, QByteArray v);
 extern bool isSep(int c);
 
 #endif
diff --git a/genplugouts/plugouts.pro b/genplugouts/plugouts.pro
index 0bf5b348a..a767f45fe 100644
--- a/genplugouts/plugouts.pro
+++ b/genplugouts/plugouts.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
-SUBDIRS += BrowserSort CppUtilities Deploy FileControl GlobalChange HtmlDoc UseCaseWizard
+SUBDIRS += BrowserSort CppUtilities deploy FileControl GlobalChange HtmlDoc usecasewizard Xmi2Generator xmi2import\
+ singleton sm gpro uml_projection xmi import_rose
 
 CODECFORTR      = UTF-8
 CODECFORSRC     = UTF-8
diff --git a/genplugouts/singleton/ClassGlobalCmd.h b/genplugouts/singleton/ClassGlobalCmd.h
index cfab423e1..7bb1cbad1 100644
--- a/genplugouts/singleton/ClassGlobalCmd.h
+++ b/genplugouts/singleton/ClassGlobalCmd.h
@@ -3,8 +3,8 @@
 
 
 // Internal enum
-enum ClassGlobalCmd {
+/*enum ClassGlobalCmd {
     findClassCmd
 
-};
+};*/
 #endif
diff --git a/genplugouts/singleton/CmdFamily.h b/genplugouts/singleton/CmdFamily.h
index fffbac960..0889b4acb 100644
--- a/genplugouts/singleton/CmdFamily.h
+++ b/genplugouts/singleton/CmdFamily.h
@@ -3,6 +3,7 @@
 
 
 // Internal enum
+/*
 enum CmdFamily {
     onInstanceCmd,
     classGlobalCmd,
@@ -14,4 +15,5 @@ enum CmdFamily {
     idlSettingsCmd
 
 };
+*/
 #endif
diff --git a/genplugouts/singleton/CppSettings.cpp b/genplugouts/singleton/CppSettings.cpp
index 2be70115c..6f587c5d9 100644
--- a/genplugouts/singleton/CppSettings.cpp
+++ b/genplugouts/singleton/CppSettings.cpp
@@ -10,7 +10,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -23,21 +23,21 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,28 +50,28 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationStereotype(Q3CString s)
+QByteArray CppSettings::relationStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(cppSettingsCmd, setCppRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -84,28 +84,28 @@ bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -118,31 +118,31 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -153,14 +153,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *) v); //[jasa] ambiguous call
 
@@ -172,14 +172,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -191,14 +191,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -210,14 +210,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -229,14 +229,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -267,14 +267,14 @@ bool CppSettings::set_IncludeWithPath(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -286,14 +286,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -305,14 +305,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -324,14 +324,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -343,14 +343,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -362,14 +362,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -381,14 +381,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -400,14 +400,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -419,14 +419,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -438,14 +438,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -457,14 +457,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -476,14 +476,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -495,14 +495,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl()
+const QByteArray & CppSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool CppSettings::set_AttributeDecl(Q3CString v)
+bool CppSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -514,14 +514,14 @@ bool CppSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -533,7 +533,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -552,14 +552,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -571,14 +571,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -628,14 +628,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -723,14 +723,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -782,47 +782,47 @@ bool CppSettings::set_IsSetParamConst(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl;
+QByteArray CppSettings::_attr_decl;
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -832,30 +832,30 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
 bool CppSettings::_is_set_param_const;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -880,13 +880,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/singleton/CppSettings.h b/genplugouts/singleton/CppSettings.h
index d1275b4f4..c30bfd7e7 100644
--- a/genplugouts/singleton/CppSettings.h
+++ b/genplugouts/singleton/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(Q3CString s);
+    static QByteArray relationStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -138,62 +138,62 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -201,75 +201,75 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -278,20 +278,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -315,13 +315,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -367,14 +367,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -405,47 +405,47 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -455,23 +455,23 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
     static bool _is_set_param_const;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/singleton/CppSettingsCmd.h b/genplugouts/singleton/CppSettingsCmd.h
index 3b4031a0b..4e128154b 100644
--- a/genplugouts/singleton/CppSettingsCmd.h
+++ b/genplugouts/singleton/CppSettingsCmd.h
@@ -3,7 +3,7 @@
 
 
 // Internal enum
-enum CppSettingsCmd {
+/*enum CppSettingsCmd {
     getCppSettingsCmd,
     getCppUseDefaultsCmd,
     setCppUseDefaultsCmd,
@@ -45,5 +45,5 @@ enum CppSettingsCmd {
     setCppIsSetInlineCmd,
     setCppIsSetParamConstCmd
 
-};
+};*/
 #endif
diff --git a/genplugouts/singleton/IdlSettings.cpp b/genplugouts/singleton/IdlSettings.cpp
index d396b5e29..999b9f0f6 100644
--- a/genplugouts/singleton/IdlSettings.cpp
+++ b/genplugouts/singleton/IdlSettings.cpp
@@ -10,7 +10,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -23,21 +23,21 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,28 +50,28 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -84,28 +84,28 @@ bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -118,31 +118,31 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -153,14 +153,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, (const char *) v); //[jasa] ambiguous call
 
@@ -172,14 +172,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, (const char *)v); //[jasa[] ambiguous call
 
@@ -191,14 +191,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -210,14 +210,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -229,14 +229,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -248,14 +248,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -267,14 +267,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -286,14 +286,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -305,14 +305,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -324,14 +324,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -343,14 +343,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -362,14 +362,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl()
+const QByteArray & IdlSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool IdlSettings::set_AttributeDecl(Q3CString v)
+bool IdlSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -381,14 +381,14 @@ bool IdlSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl()
+const QByteArray & IdlSettings::valuetypeAttributeDecl()
 {
     read_if_needed_();
 
     return _valuetype_attr_decl;
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -400,14 +400,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl()
+const QByteArray & IdlSettings::unionItemDecl()
 {
     read_if_needed_();
 
     return _union_item_decl;
 }
 
-bool IdlSettings::set_UnionItemDecl(Q3CString v)
+bool IdlSettings::set_UnionItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -419,14 +419,14 @@ bool IdlSettings::set_UnionItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -438,14 +438,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl()
+const QByteArray & IdlSettings::constDecl()
 {
     read_if_needed_();
 
     return _const_decl;
 }
 
-bool IdlSettings::set_ConstDecl(Q3CString v)
+bool IdlSettings::set_ConstDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -457,14 +457,14 @@ bool IdlSettings::set_ConstDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
 
@@ -476,14 +476,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
 
@@ -495,14 +495,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
 
@@ -514,14 +514,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -533,14 +533,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -552,14 +552,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -592,60 +592,60 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl;
+QByteArray IdlSettings::_attr_decl;
 
-Q3CString IdlSettings::_valuetype_attr_decl;
+QByteArray IdlSettings::_valuetype_attr_decl;
 
-Q3CString IdlSettings::_union_item_decl;
+QByteArray IdlSettings::_union_item_decl;
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl;
+QByteArray IdlSettings::_const_decl;
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -667,13 +667,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/singleton/IdlSettings.h b/genplugouts/singleton/IdlSettings.h
index 04608fb4d..be820771f 100644
--- a/genplugouts/singleton/IdlSettings.h
+++ b/genplugouts/singleton/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype
-    static const Q3CString & valuetypeAttributeDecl();
+    static const QByteArray & valuetypeAttributeDecl();
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(Q3CString v);
+    static bool set_ValuetypeAttributeDecl(QByteArray v);
 
     // returns the default definition of an union item
-    static const Q3CString & unionItemDecl();
+    static const QByteArray & unionItemDecl();
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(Q3CString v);
+    static bool set_UnionItemDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute
-    static const Q3CString & constDecl();
+    static const QByteArray & constDecl();
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(Q3CString v);
+    static bool set_ConstDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _valuetype_attr_decl;
+    static QByteArray _valuetype_attr_decl;
 
-    static Q3CString _union_item_decl;
+    static QByteArray _union_item_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl;
+    static QByteArray _const_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/singleton/IdlSettingsCmd.h b/genplugouts/singleton/IdlSettingsCmd.h
index 5eb74f465..96e438b36 100644
--- a/genplugouts/singleton/IdlSettingsCmd.h
+++ b/genplugouts/singleton/IdlSettingsCmd.h
@@ -3,12 +3,12 @@
 
 
 // Internal enum
-enum IdlSettingsCmd {
+/*enum IdlSettingsCmd {
     getIdlSettingsCmd,
     getIdlUseDefaultsCmd,
     setIdlUseDefaultsCmd,
     setIdlTypeCmd,
-    setIdlRelationStereotypeCmd,
+    setIdlRelationAttributeStereotypeCmd,
     setIdlClassStereotypeCmd,
     setIdlIncludeCmd,
     setIdlRootDirCmd,
@@ -35,5 +35,5 @@ enum IdlSettingsCmd {
     setIdlSetNameCmd,
     setIdlIsSetOneWayCmd
 
-};
+};*/
 #endif
diff --git a/genplugouts/singleton/JavaSettings.cpp b/genplugouts/singleton/JavaSettings.cpp
index 5497d7206..cc781cb34 100644
--- a/genplugouts/singleton/JavaSettings.cpp
+++ b/genplugouts/singleton/JavaSettings.cpp
@@ -2,7 +2,8 @@
 
 
 #include "JavaSettings.h"
-#include "JavaSettingsCmd.h"
+//#include "JavaSettingsCmd.h"
+#include "Tools/ApiCmd.h"
 
 #include "UmlCom.h"
 #include "UmlSettings.h"
@@ -10,7 +11,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -23,21 +24,21 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,28 +51,28 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -84,28 +85,28 @@ bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -118,31 +119,31 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -153,14 +154,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -172,14 +173,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -191,14 +192,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -210,14 +211,14 @@ bool JavaSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -229,14 +230,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -248,14 +249,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumDecl()
+const QByteArray & JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -267,14 +268,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -286,14 +287,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl()
+const QByteArray & JavaSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool JavaSettings::set_AttributeDecl(Q3CString v)
+bool JavaSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -305,14 +306,14 @@ bool JavaSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemDecl()
+const QByteArray & JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -324,16 +325,16 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemCase()
+const QByteArray & JavaSettings::enumItemCase()
 {
     read_if_needed_();
 
     return _enum_item_case;
 }
 
-bool JavaSettings::set_EnumItemCase(Q3CString v)
+bool JavaSettings::set_EnumItemCase(QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemCaseCmd, (const char *)v); //[jasa] ambiguous call
+    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[jasa] ambiguous call
 
     if (UmlCom::read_bool()) {
         _enum_item_case = v;
@@ -343,14 +344,14 @@ bool JavaSettings::set_EnumItemCase(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
 
@@ -362,14 +363,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -400,14 +401,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -419,14 +420,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, (const char *)v); //[jasa] ambiguous call
 
@@ -516,52 +517,52 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl;
+QByteArray JavaSettings::_attr_decl;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_enum_item_case;
+QByteArray JavaSettings::_enum_item_case;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray, QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -582,13 +583,13 @@ void JavaSettings::read_()
     n = UmlCom::read_unsigned();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/singleton/JavaSettings.h b/genplugouts/singleton/JavaSettings.h
index 4de7719ac..01dd835fc 100644
--- a/genplugouts/singleton/JavaSettings.h
+++ b/genplugouts/singleton/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,160 +31,160 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationUmlStereotype(const Q3CString & s);
+    static QByteArray relationUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumItemCase();
+    static const QByteArray & enumItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumItemCase(Q3CString v);
+    static bool set_EnumItemCase(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -198,23 +198,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -263,45 +263,45 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _enum_item_case;
+    static QByteArray _enum_item_case;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/singleton/JavaSettingsCmd.h b/genplugouts/singleton/JavaSettingsCmd.h
index 7d66bf1f0..2ec6baf59 100644
--- a/genplugouts/singleton/JavaSettingsCmd.h
+++ b/genplugouts/singleton/JavaSettingsCmd.h
@@ -8,7 +8,7 @@ enum JavaSettingsCmd {
     getJavaUseDefaultsCmd,
     setJavaUseDefaultsCmd,
     setJavaTypeCmd,
-    setJavaRelationStereotypeCmd,
+    setJavaRelationAttributeStereotypeCmd,
     setJavaClassStereotypeCmd,
     setJavaImportCmd,
     setJavaRootdirCmd,
@@ -20,7 +20,7 @@ enum JavaSettingsCmd {
     setJavaInterfaceDeclCmd,
     setJavaAttributeDeclCmd,
     setJavaEnumItemDeclCmd,
-    setJavaEnumItemCaseCmd,
+    setJavaEnumItemDeclCmd,
     setJavaRelationDeclCmd,
     setJavaOperationDefCmd,
     setJavaGetvisibilityCmd,
diff --git a/genplugouts/singleton/MiscGlobalCmd.h b/genplugouts/singleton/MiscGlobalCmd.h
index c85c59463..856e28ceb 100644
--- a/genplugouts/singleton/MiscGlobalCmd.h
+++ b/genplugouts/singleton/MiscGlobalCmd.h
@@ -3,12 +3,12 @@
 
 
 // Internal enum
-enum MiscGlobalCmd {
+/*enum MiscGlobalCmd {
     byeCmd,
     traceCmd,
     messageCmd,
     toolRunningCmd,
     targetCmd
 
-};
+};*/
 #endif
diff --git a/genplugouts/singleton/OnInstanceCmd.h b/genplugouts/singleton/OnInstanceCmd.h
index 6b984a37c..03c07f5ba 100644
--- a/genplugouts/singleton/OnInstanceCmd.h
+++ b/genplugouts/singleton/OnInstanceCmd.h
@@ -3,7 +3,7 @@
 
 
 // Internal enum
-enum OnInstanceCmd {
+/*enum OnInstanceCmd {
     parentCmd = 0,
     childrenCmd  = 1,
     getDefCmd = 2,
@@ -177,5 +177,5 @@ enum OnInstanceCmd {
     applyStereotypeCmd,
     setDerivedCmd
 
-};
+};*/
 #endif
diff --git a/genplugouts/singleton/PackageGlobalCmd.h b/genplugouts/singleton/PackageGlobalCmd.h
index 170f5cc43..1624697c0 100644
--- a/genplugouts/singleton/PackageGlobalCmd.h
+++ b/genplugouts/singleton/PackageGlobalCmd.h
@@ -3,11 +3,11 @@
 
 
 // Internal enum
-enum PackageGlobalCmd {
-    findNamespaceCmd,
-    findPackageCmd,
-    findModuleCmd,
+/*enum PackageGlobalCmd {
+    findCppNamespaceCmd,
+    findJavaPackageCmd,
+    findIdlModuleCmd,
     getProjectCmd
 
-};
+};*/
 #endif
diff --git a/genplugouts/singleton/UmlArtifact.h b/genplugouts/singleton/UmlArtifact.h
index 9f6a30622..0b8b99c1a 100644
--- a/genplugouts/singleton/UmlArtifact.h
+++ b/genplugouts/singleton/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'artifacts'
 //
@@ -11,7 +11,7 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlAttribute.h b/genplugouts/singleton/UmlAttribute.h
index 1096726b3..c9575d942 100644
--- a/genplugouts/singleton/UmlAttribute.h
+++ b/genplugouts/singleton/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
     bool check();
 
diff --git a/genplugouts/singleton/UmlBaseArtifact.cpp b/genplugouts/singleton/UmlBaseArtifact.cpp
index 5f11e7a44..fd42c9121 100644
--- a/genplugouts/singleton/UmlBaseArtifact.cpp
+++ b/genplugouts/singleton/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,7 +89,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd, l);
 
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] =  _associated[last];
 
             _associated.resize(last);
         }
@@ -166,54 +168,54 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -248,13 +250,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] =  (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/singleton/UmlBaseArtifact.h b/genplugouts/singleton/UmlBaseArtifact.h
index 7e4854ffd..151b47e08 100644
--- a/genplugouts/singleton/UmlBaseArtifact.h
+++ b/genplugouts/singleton/UmlBaseArtifact.h
@@ -4,9 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-
+#include <QByteArray>
+#include <QVector>
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
 class UmlDeploymentView;
@@ -37,7 +36,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +55,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,40 +82,40 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -128,22 +127,22 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -163,11 +162,11 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/singleton/UmlBaseAttribute.cpp b/genplugouts/singleton/UmlBaseAttribute.cpp
index 1273e14af..401e44d9b 100644
--- a/genplugouts/singleton/UmlBaseAttribute.cpp
+++ b/genplugouts/singleton/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -29,7 +29,7 @@ bool UmlBaseAttribute::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -121,7 +121,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/singleton/UmlBaseAttribute.h b/genplugouts/singleton/UmlBaseAttribute.h
index 4362fb35e..453997b25 100644
--- a/genplugouts/singleton/UmlBaseAttribute.h
+++ b/genplugouts/singleton/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -35,7 +35,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -89,7 +89,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -119,7 +119,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -131,13 +131,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -157,7 +157,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/singleton/UmlBaseClass.cpp b/genplugouts/singleton/UmlBaseClass.cpp
index 54512944e..ec2bdc4b4 100644
--- a/genplugouts/singleton/UmlBaseClass.cpp
+++ b/genplugouts/singleton/UmlBaseClass.cpp
@@ -10,8 +10,8 @@
 #include "MiscGlobalCmd.h"
 #include "ClassGlobalCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -46,11 +46,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -82,11 +82,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -284,7 +284,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = classes[n];
@@ -310,9 +310,9 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-Q3Dict<UmlClass> UmlBaseClass::classes(1001);
+QHash<QByteArray,UmlClass*> UmlBaseClass::classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -320,7 +320,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     classes.insert(n, (UmlClass *) this);
 
     if ((classes.count() / 2) >= classes.size())
-        classes.resize(classes.size() * 2 - 1);
+        classes.reserve(classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/singleton/UmlBaseClass.h b/genplugouts/singleton/UmlBaseClass.h
index d800dbf98..c1bd14bd7 100644
--- a/genplugouts/singleton/UmlBaseClass.h
+++ b/genplugouts/singleton/UmlBaseClass.h
@@ -5,9 +5,9 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+#include <QByteArray>
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -52,7 +52,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -75,7 +75,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -178,7 +178,7 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified, the class must
     //be defined in a sub-level of the package
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -193,7 +193,7 @@ class UmlBaseClass : public UmlClassMember
 
 private:
     //key includes package/class-container
-    static Q3Dict<UmlClass> classes;
+    static QHash<QByteArray,UmlClass*> classes;
 
     bool _abstract;
 
@@ -230,7 +230,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     virtual void read_uml_();
 
diff --git a/genplugouts/singleton/UmlBaseClassDiagram.h b/genplugouts/singleton/UmlBaseClassDiagram.h
index bed4ce3c0..f534eefac 100644
--- a/genplugouts/singleton/UmlBaseClassDiagram.h
+++ b/genplugouts/singleton/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseClassItem.cpp b/genplugouts/singleton/UmlBaseClassItem.cpp
index 345c1a18d..8babd321f 100644
--- a/genplugouts/singleton/UmlBaseClassItem.cpp
+++ b/genplugouts/singleton/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/singleton/UmlBaseClassItem.h b/genplugouts/singleton/UmlBaseClassItem.h
index 56f510609..d3daa33ae 100644
--- a/genplugouts/singleton/UmlBaseClassItem.h
+++ b/genplugouts/singleton/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -50,20 +50,20 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     virtual void read_cpp_();
diff --git a/genplugouts/singleton/UmlBaseClassMember.cpp b/genplugouts/singleton/UmlBaseClassMember.cpp
index 286672ce1..c2a3c5cfa 100644
--- a/genplugouts/singleton/UmlBaseClassMember.cpp
+++ b/genplugouts/singleton/UmlBaseClassMember.cpp
@@ -63,7 +63,7 @@ bool UmlBaseClassMember::isCppVolatile()
 
 bool UmlBaseClassMember::set_isCppVolatile(bool y)
 {
-    return set_it_(_cpp_volatile, y, setIsCppVolatileCmd);
+    return set_it_(_cpp_volatile, y, setIsVolatileCmd);
 }
 #endif
 
diff --git a/genplugouts/singleton/UmlBaseClassMember.h b/genplugouts/singleton/UmlBaseClassMember.h
index 13421df7f..ef8827073 100644
--- a/genplugouts/singleton/UmlBaseClassMember.h
+++ b/genplugouts/singleton/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -67,7 +67,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     void read_uml_();
 
diff --git a/genplugouts/singleton/UmlBaseClassView.h b/genplugouts/singleton/UmlBaseClassView.h
index fb5ed21ec..72fc5b821 100644
--- a/genplugouts/singleton/UmlBaseClassView.h
+++ b/genplugouts/singleton/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassView;
 class UmlPackage;
@@ -42,7 +42,7 @@ class UmlBaseClassView : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseCollaborationDiagram.h b/genplugouts/singleton/UmlBaseCollaborationDiagram.h
index d88e9722f..6b253fae4 100644
--- a/genplugouts/singleton/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/singleton/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseComponent.h b/genplugouts/singleton/UmlBaseComponent.h
index ec5b6a2e7..b84913ce8 100644
--- a/genplugouts/singleton/UmlBaseComponent.h
+++ b/genplugouts/singleton/UmlBaseComponent.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -42,11 +42,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/singleton/UmlBaseComponentDiagram.h b/genplugouts/singleton/UmlBaseComponentDiagram.h
index 3bafc2f97..1b0762f7c 100644
--- a/genplugouts/singleton/UmlBaseComponentDiagram.h
+++ b/genplugouts/singleton/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseComponentView.h b/genplugouts/singleton/UmlBaseComponentView.h
index fdd74c3e9..82156ac19 100644
--- a/genplugouts/singleton/UmlBaseComponentView.h
+++ b/genplugouts/singleton/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseDeployment.h b/genplugouts/singleton/UmlBaseDeployment.h
index b268e0c17..63610d5b6 100644
--- a/genplugouts/singleton/UmlBaseDeployment.h
+++ b/genplugouts/singleton/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseDeploymentDiagram.h b/genplugouts/singleton/UmlBaseDeploymentDiagram.h
index 7dab18bb5..60c6754c2 100644
--- a/genplugouts/singleton/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/singleton/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseDeploymentView.h b/genplugouts/singleton/UmlBaseDeploymentView.h
index 9213870a8..6093858e6 100644
--- a/genplugouts/singleton/UmlBaseDeploymentView.h
+++ b/genplugouts/singleton/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseDiagram.cpp b/genplugouts/singleton/UmlBaseDiagram.cpp
index 0a8a2b41a..913051263 100644
--- a/genplugouts/singleton/UmlBaseDiagram.cpp
+++ b/genplugouts/singleton/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[jasa] ambiguous call
     return UmlCom::read_bool();
diff --git a/genplugouts/singleton/UmlBaseDiagram.h b/genplugouts/singleton/UmlBaseDiagram.h
index 9cf05ff22..824a9f60f 100644
--- a/genplugouts/singleton/UmlBaseDiagram.h
+++ b/genplugouts/singleton/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseExtraClassMember.cpp b/genplugouts/singleton/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/singleton/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/singleton/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/singleton/UmlBaseExtraClassMember.h b/genplugouts/singleton/UmlBaseExtraClassMember.h
index 39ac1d594..9519fd986 100644
--- a/genplugouts/singleton/UmlBaseExtraClassMember.h
+++ b/genplugouts/singleton/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     virtual void read_cpp_();
diff --git a/genplugouts/singleton/UmlBaseFormalParameter.h b/genplugouts/singleton/UmlBaseFormalParameter.h
index c9eabebb7..f7e83f337 100644
--- a/genplugouts/singleton/UmlBaseFormalParameter.h
+++ b/genplugouts/singleton/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -31,10 +31,10 @@ class UmlBaseFormalParameter
     friend class UmlBaseClass;
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/singleton/UmlBaseItem.cpp b/genplugouts/singleton/UmlBaseItem.cpp
index 171f46ebd..870ec0a27 100644
--- a/genplugouts/singleton/UmlBaseItem.cpp
+++ b/genplugouts/singleton/UmlBaseItem.cpp
@@ -27,33 +27,33 @@
 #include "UmlExtraClassMember.h"
 #include "MiscGlobalCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     return set_it_(_name, s, setNameCmd);
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -69,7 +69,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -89,11 +89,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -103,7 +103,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -111,10 +111,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -125,14 +125,14 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
     return _dict;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -144,7 +144,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[jasa] ambiguous call
     return (int) UmlCom::read_unsigned();
@@ -159,7 +159,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -178,7 +178,7 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -255,9 +255,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -284,7 +284,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -338,7 +338,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -375,7 +375,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -468,20 +468,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/singleton/UmlBaseItem.h b/genplugouts/singleton/UmlBaseItem.h
index 5f998682b..1232afcfc 100644
--- a/genplugouts/singleton/UmlBaseItem.h
+++ b/genplugouts/singleton/UmlBaseItem.h
@@ -3,10 +3,10 @@
 
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+#include <QByteArray>
+#include <QVector>
+#include "Tools/ApiCmd.h"
+#include <QHash>
 #include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
@@ -37,35 +37,35 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Name(const Q3CString & s);
+    bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -90,16 +90,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     //  Returns the absolute path name of the file memoring the Item.
     //  In general an item is saved in a file associated to its package,
@@ -127,7 +127,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -135,7 +135,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -181,21 +181,21 @@ class UmlBaseItem
 
     void * _identifier;
 
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
 protected:
@@ -227,7 +227,7 @@ class UmlBaseItem
 
     bool set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd);
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     bool set_it_(UmlTypeSpec & r, const UmlTypeSpec & t, OnInstanceCmd cmd);
 
@@ -236,7 +236,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/singleton/UmlBaseNcRelation.h b/genplugouts/singleton/UmlBaseNcRelation.h
index 8aa58975e..142f5ff69 100644
--- a/genplugouts/singleton/UmlBaseNcRelation.h
+++ b/genplugouts/singleton/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNcRelation;
 
@@ -41,11 +41,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/singleton/UmlBaseNode.h b/genplugouts/singleton/UmlBaseNode.h
index 5e62daff2..c496bdeb6 100644
--- a/genplugouts/singleton/UmlBaseNode.h
+++ b/genplugouts/singleton/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     virtual void read_uml_();
 
diff --git a/genplugouts/singleton/UmlBaseOperation.cpp b/genplugouts/singleton/UmlBaseOperation.cpp
index 26096f11c..c811bf05a 100644
--- a/genplugouts/singleton/UmlBaseOperation.cpp
+++ b/genplugouts/singleton/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -54,7 +54,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -68,7 +68,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -82,7 +82,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -105,7 +105,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -118,7 +118,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -132,7 +132,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -245,7 +245,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -257,7 +257,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -271,7 +271,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -323,7 +323,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -333,7 +333,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -347,7 +347,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -380,7 +380,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
diff --git a/genplugouts/singleton/UmlBaseOperation.h b/genplugouts/singleton/UmlBaseOperation.h
index 2c3a51286..683c75ae2 100644
--- a/genplugouts/singleton/UmlBaseOperation.h
+++ b/genplugouts/singleton/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+#include <QByteArray>
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -44,7 +44,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -62,7 +62,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -122,7 +122,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -131,9 +131,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -143,7 +143,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -171,7 +171,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -180,9 +180,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -192,7 +192,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -212,7 +212,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -254,22 +254,22 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -281,7 +281,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     virtual void read_uml_();
 
@@ -299,7 +299,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/singleton/UmlBasePackage.cpp b/genplugouts/singleton/UmlBasePackage.cpp
index cfd010859..44db8a9ff 100644
--- a/genplugouts/singleton/UmlBasePackage.cpp
+++ b/genplugouts/singleton/UmlBasePackage.cpp
@@ -7,7 +7,7 @@
 #include "UmlCom.h"
 #include "MiscGlobalCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -38,111 +38,111 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlClassDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::getNamespace(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getNamespace(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, (p) ? p->_identifier : 0, n);
+    UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, (p) ? p->_identifier : 0, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::getPackage(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getPackage(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, (p) ? p->_identifier : 0, n);
+    UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, (p) ? p->_identifier : 0, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::getModule(const Q3CString & n, const UmlBasePackage * p)
+UmlPackage * UmlBasePackage::getModule(const QByteArray & n, const UmlBasePackage * p)
 {
-    UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, (p) ? p->_identifier : 0, n);
+    UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, (p) ? p->_identifier : 0, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
diff --git a/genplugouts/singleton/UmlBasePackage.h b/genplugouts/singleton/UmlBasePackage.h
index a1d1209e8..d2609a4ef 100644
--- a/genplugouts/singleton/UmlBasePackage.h
+++ b/genplugouts/singleton/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPackage;
 class UmlClassDiagram;
@@ -34,87 +34,87 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns the sub package of 'p' package having the c++ namespace 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getNamespace(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getNamespace(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns the sub package of 'p' package having the java package 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getPackage(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getPackage(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns the sub package of 'p' package having the IDL module 'n'
     // (including 'p' itself), else 0
-    static UmlPackage * getModule(const Q3CString & n, const UmlBasePackage * p = 0);
+    static UmlPackage * getModule(const QByteArray & n, const UmlBasePackage * p = 0);
 #endif
 
     //  Returns the project
@@ -133,25 +133,25 @@ class UmlBasePackage : public UmlItem
     UmlClassDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -172,11 +172,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/singleton/UmlBaseRelation.cpp b/genplugouts/singleton/UmlBaseRelation.cpp
index 466ba2582..e17198d39 100644
--- a/genplugouts/singleton/UmlBaseRelation.cpp
+++ b/genplugouts/singleton/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -63,7 +63,7 @@ bool UmlBaseRelation::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -75,7 +75,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -96,7 +96,7 @@ UmlClass * UmlBaseRelation::roleType()
     return _role_type;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -108,7 +108,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -240,7 +240,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/singleton/UmlBaseRelation.h b/genplugouts/singleton/UmlBaseRelation.h
index d37bf27a0..0b7510671 100644
--- a/genplugouts/singleton/UmlBaseRelation.h
+++ b/genplugouts/singleton/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlRelation;
 class UmlClass;
@@ -38,7 +38,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -50,13 +50,13 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -64,7 +64,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -127,7 +127,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -166,13 +166,13 @@ class UmlBaseRelation : public UmlClassMember
 
     aRelationKind _rel_kind : 8;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlOperation * _get_oper;
 
@@ -182,7 +182,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -202,11 +202,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/singleton/UmlBaseSequenceDiagram.h b/genplugouts/singleton/UmlBaseSequenceDiagram.h
index 61f0ef6cc..44b1bfed3 100644
--- a/genplugouts/singleton/UmlBaseSequenceDiagram.h
+++ b/genplugouts/singleton/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseUseCase.cpp b/genplugouts/singleton/UmlBaseUseCase.cpp
index 5a3a32ccd..c091723cb 100644
--- a/genplugouts/singleton/UmlBaseUseCase.cpp
+++ b/genplugouts/singleton/UmlBaseUseCase.cpp
@@ -37,5 +37,6 @@ void UmlBaseUseCase::read_uml_()
 {
     _assoc_diagram = (UmlUseCaseDiagram *) UmlBaseItem::read_();
     UmlBaseItem::read_uml_();
+    _extension_points = UmlCom::read_string();
 }
 
diff --git a/genplugouts/singleton/UmlBaseUseCase.h b/genplugouts/singleton/UmlBaseUseCase.h
index abafd7dca..92696c529 100644
--- a/genplugouts/singleton/UmlBaseUseCase.h
+++ b/genplugouts/singleton/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -33,6 +33,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
+    QByteArray _extension_points;
     UmlUseCaseDiagram * _assoc_diagram;
 
 
@@ -40,7 +41,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseUseCaseDiagram.h b/genplugouts/singleton/UmlBaseUseCaseDiagram.h
index d838b2baf..98952774c 100644
--- a/genplugouts/singleton/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/singleton/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBaseUseCaseView.h b/genplugouts/singleton/UmlBaseUseCaseView.h
index 06849883f..063b0ad08 100644
--- a/genplugouts/singleton/UmlBaseUseCaseView.h
+++ b/genplugouts/singleton/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseView;
 
@@ -25,7 +25,7 @@ class UmlBaseUseCaseView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlBuiltin.h b/genplugouts/singleton/UmlBuiltin.h
index cb965b8ae..8154ac384 100644
--- a/genplugouts/singleton/UmlBuiltin.h
+++ b/genplugouts/singleton/UmlBuiltin.h
@@ -2,29 +2,29 @@
 #define _UMLBUILTIN_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/singleton/UmlClass.cpp b/genplugouts/singleton/UmlClass.cpp
index 3e5e8fe8b..f2846c90a 100644
--- a/genplugouts/singleton/UmlClass.cpp
+++ b/genplugouts/singleton/UmlClass.cpp
@@ -7,11 +7,11 @@
 #include "UmlOperation.h"
 #include "UmlRelation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlClass::singleton()
 {
     // checking
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     int index;
     bool ok = TRUE;
 
@@ -26,7 +26,7 @@ void UmlClass::singleton()
     UmlOperation * op = UmlBaseOperation::create(this, name());
 
     if (op == 0)
-        UmlCom::trace(Q3CString("<font face=helvetica><b>cannot create constructor for <i>")
+        UmlCom::trace(QByteArray("<font face=helvetica><b>cannot create constructor for <i>")
                       + name() + "</i></b></font><br><hr><br>");
     else {
         op->set_Visibility(PrivateVisibility);
@@ -36,14 +36,14 @@ void UmlClass::singleton()
         op = UmlBaseOperation::create(this, "instance");
 
         if (op == 0)
-            UmlCom::trace(Q3CString("<font face=helvetica><b>cannot create operation <i>instance</i> for <i>")
+            UmlCom::trace(QByteArray("<font face=helvetica><b>cannot create operation <i>instance</i> for <i>")
                           + name() + "</i></b></font><br><hr><br>");
         else {
             op->set_Visibility(PublicVisibility);
             op->set_isClassMember(TRUE);
 
             UmlTypeSpec t;
-            Q3CString s;
+            QByteArray s;
 
             t.type = this;
             op->set_ReturnType(t);
@@ -52,7 +52,7 @@ void UmlClass::singleton()
 
             s = CppSettings::operationDecl();
 
-            if ((index = s.find("${type}")) != -1) {
+            if ((index = s.indexOf("${type}")) != -1) {
                 s.insert(index + 7, " *");
                 op->set_CppDecl(s);
             }
@@ -63,14 +63,14 @@ void UmlClass::singleton()
 
             s = CppSettings::operationDef();
 
-            if (((s.find("${body}")) != -1) && ((index = s.find("${type}")) != -1))
+            if (((s.indexOf("${body}")) != -1) && ((index = s.indexOf("${type}")) != -1))
                 s.insert(index + 7, " *");
             else {
                 UmlCom::trace("<font face=helvetica><b>strange default cpp operation definition: no <i>${type}</i> or <i>${body}</i></b></font><br><hr><br>");
                 s = "${inline}${type} * ${class}::${name}${(}${)}${const}${volatile}${staticnl}{\n${body}}\n";
             }
 
-            s.replace(s.findRev("${body}"),	// cannot be -1 !
+            s.replace(s.lastIndexOf("${body}"),	// cannot be -1 !
                       7,
                       "  return (the == 0) ? the = new ${type}() : the;\n");
             op->set_CppDef(s);
@@ -79,7 +79,7 @@ void UmlClass::singleton()
 
             s = JavaSettings::operationDef();
 
-            if ((index = s.findRev("${body}")) != -1)
+            if ((index = s.lastIndexOf("${body}")) != -1)
                 op->set_JavaDecl(s.replace(index, 7,
                                            "  return (the == null) ? the = new ${type}() : the;\n"));
             else {
@@ -107,7 +107,7 @@ return (the == null) ? the = new ${type}() : the;\n\
                 UmlBaseRelation::create(aDirectionalAssociation, this, this);
 
             if (rel == 0) {
-                UmlCom::trace(Q3CString("<font face=helvetica><b>cannot create relation <i>the</i> for <i>")
+                UmlCom::trace(QByteArray("<font face=helvetica><b>cannot create relation <i>the</i> for <i>")
                               + name() + "</i></b></font><br><hr><br>");
 
                 if (stereotype_changed)
diff --git a/genplugouts/singleton/UmlClass.h b/genplugouts/singleton/UmlClass.h
index 84242defb..cdc156c6c 100644
--- a/genplugouts/singleton/UmlClass.h
+++ b/genplugouts/singleton/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'classes', notes that the class 'ClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
     virtual void singleton();
 
diff --git a/genplugouts/singleton/UmlClassDiagram.h b/genplugouts/singleton/UmlClassDiagram.h
index 76134392d..d9d822da0 100644
--- a/genplugouts/singleton/UmlClassDiagram.h
+++ b/genplugouts/singleton/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlClassItem.h b/genplugouts/singleton/UmlClassItem.h
index b355feeaf..948b7f6be 100644
--- a/genplugouts/singleton/UmlClassItem.h
+++ b/genplugouts/singleton/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
     bool check();
 
diff --git a/genplugouts/singleton/UmlClassMember.h b/genplugouts/singleton/UmlClassMember.h
index 9119443c6..931b95f2f 100644
--- a/genplugouts/singleton/UmlClassMember.h
+++ b/genplugouts/singleton/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlClassView.h b/genplugouts/singleton/UmlClassView.h
index a152eff28..b1fc4464d 100644
--- a/genplugouts/singleton/UmlClassView.h
+++ b/genplugouts/singleton/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'class view'
 //
@@ -11,7 +11,7 @@
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlCollaborationDiagram.h b/genplugouts/singleton/UmlCollaborationDiagram.h
index ab1388561..32ba50ccf 100644
--- a/genplugouts/singleton/UmlCollaborationDiagram.h
+++ b/genplugouts/singleton/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlCom.cpp b/genplugouts/singleton/UmlCom.cpp
index 1c0903184..8683aab90 100644
--- a/genplugouts/singleton/UmlCom.cpp
+++ b/genplugouts/singleton/UmlCom.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
@@ -12,10 +12,11 @@
 #include "UmlSettings.h"
 #include "MiscGlobalCmd.h"
 #include "MiscGlobalCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -29,7 +30,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(11);
         flush();
@@ -66,11 +69,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -80,11 +83,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -101,13 +104,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -116,10 +119,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -128,16 +131,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -146,18 +149,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -203,7 +206,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -213,7 +216,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -224,7 +227,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ")\n";
 #endif
 
     write_char(f);
@@ -236,7 +239,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -248,7 +251,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ")\n";
 #endif
 
     write_char(f);
@@ -260,7 +263,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -273,7 +276,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ", " << v << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << s << ", " << v << ")\n";
 #endif
 
     write_char(f);
@@ -286,7 +289,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << s << ", " << v << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << s << ", " << v << ")\n";
 #endif
 
     write_char(f);
@@ -300,7 +303,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -312,7 +315,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -325,7 +328,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -338,7 +341,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -351,7 +354,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -373,7 +376,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -387,7 +390,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -401,7 +404,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -416,7 +419,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -429,7 +432,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << arg2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << arg2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -443,7 +446,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -466,7 +469,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -491,7 +494,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << arg4 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << arg3 << ", " << arg4 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -514,10 +517,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -540,7 +543,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -551,12 +554,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -588,28 +591,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -618,7 +622,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -629,7 +633,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/singleton/UmlCom.h b/genplugouts/singleton/UmlCom.h
index fa79040e7..c8b86f112 100644
--- a/genplugouts/singleton/UmlCom.h
+++ b/genplugouts/singleton/UmlCom.h
@@ -2,21 +2,21 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 #include "CmdFamily.h"
 #include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
-
-#include <q3ptrvector.h>
+#include <QByteArray>
+#include "Tools/ApiCmd.h"
+#include <QVector>
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -63,11 +63,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -77,13 +77,13 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     static void read_if_needed();
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     static void write_bool(bool b);
     static void write_char(char c);
     static void write_unsigned(unsigned int u);
@@ -114,7 +114,7 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2);
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4);
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l);
     static void * read_id();
     static const char * read_string();
     static bool read_bool();
@@ -122,8 +122,8 @@ class UmlCom
     static unsigned int read_unsigned();
     // reads the selected items when the tool is called
     // you MUST call it only one time after the connexion
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
-    static void fatal_error(const Q3CString & msg);
+    static void read_item_list(QVector<UmlItem*> & v);
+    static void fatal_error(const QByteArray & msg);
     static void flush();
 };
 
diff --git a/genplugouts/singleton/UmlComponent.h b/genplugouts/singleton/UmlComponent.h
index bb4fdbb25..1768d7a0c 100644
--- a/genplugouts/singleton/UmlComponent.h
+++ b/genplugouts/singleton/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlComponentDiagram.h b/genplugouts/singleton/UmlComponentDiagram.h
index 15d707dc2..ea106add4 100644
--- a/genplugouts/singleton/UmlComponentDiagram.h
+++ b/genplugouts/singleton/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlComponentView.h b/genplugouts/singleton/UmlComponentView.h
index 000a74744..04c241863 100644
--- a/genplugouts/singleton/UmlComponentView.h
+++ b/genplugouts/singleton/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlDeploymentDiagram.h b/genplugouts/singleton/UmlDeploymentDiagram.h
index 727d0ffd0..9963ec87d 100644
--- a/genplugouts/singleton/UmlDeploymentDiagram.h
+++ b/genplugouts/singleton/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlDeploymentView.h b/genplugouts/singleton/UmlDeploymentView.h
index 52e5e627d..1ac54c38f 100644
--- a/genplugouts/singleton/UmlDeploymentView.h
+++ b/genplugouts/singleton/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment view'
 //
@@ -11,7 +11,7 @@
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlDiagram.h b/genplugouts/singleton/UmlDiagram.h
index ffee38e5c..99f9e2f51 100644
--- a/genplugouts/singleton/UmlDiagram.h
+++ b/genplugouts/singleton/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlExtraClassMember.h b/genplugouts/singleton/UmlExtraClassMember.h
index cf0b2bf47..261aa6257 100644
--- a/genplugouts/singleton/UmlExtraClassMember.h
+++ b/genplugouts/singleton/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlItem.h b/genplugouts/singleton/UmlItem.h
index f184f206c..4077b4f42 100644
--- a/genplugouts/singleton/UmlItem.h
+++ b/genplugouts/singleton/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class is a mother class for all the other Uml* classes, this
 // allows to generalize their management, declare virtual operations etc ...
@@ -12,7 +12,7 @@
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
diff --git a/genplugouts/singleton/UmlNcRelation.h b/genplugouts/singleton/UmlNcRelation.h
index 60032619a..f424f7f0e 100644
--- a/genplugouts/singleton/UmlNcRelation.h
+++ b/genplugouts/singleton/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlNode.h b/genplugouts/singleton/UmlNode.h
index 95edbe709..0a77484c4 100644
--- a/genplugouts/singleton/UmlNode.h
+++ b/genplugouts/singleton/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlOperation.h b/genplugouts/singleton/UmlOperation.h
index 211d17ec1..ce949dffd 100644
--- a/genplugouts/singleton/UmlOperation.h
+++ b/genplugouts/singleton/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
     bool check();
 
diff --git a/genplugouts/singleton/UmlPackage.h b/genplugouts/singleton/UmlPackage.h
index 84e80d71e..34b2e2103 100644
--- a/genplugouts/singleton/UmlPackage.h
+++ b/genplugouts/singleton/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages a 'package', notes that the project itself is a package
 //
@@ -11,7 +11,7 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlParameter.h b/genplugouts/singleton/UmlParameter.h
index ef6f522b0..3c967ad60 100644
--- a/genplugouts/singleton/UmlParameter.h
+++ b/genplugouts/singleton/UmlParameter.h
@@ -4,7 +4,7 @@
 
 #include "aDirection.h"
 #include "UmlTypeSpec.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Represent an operation's parameter
 
@@ -13,9 +13,9 @@ struct UmlParameter {
 
     UmlTypeSpec type;
 
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
 };
 
diff --git a/genplugouts/singleton/UmlRelation.h b/genplugouts/singleton/UmlRelation.h
index 02b8c5134..25a2bf42b 100644
--- a/genplugouts/singleton/UmlRelation.h
+++ b/genplugouts/singleton/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'relations' between classes, notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
     bool check();
 
diff --git a/genplugouts/singleton/UmlSequenceDiagram.h b/genplugouts/singleton/UmlSequenceDiagram.h
index d3b3d83fc..a1bbcc966 100644
--- a/genplugouts/singleton/UmlSequenceDiagram.h
+++ b/genplugouts/singleton/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlSettings.cpp b/genplugouts/singleton/UmlSettings.cpp
index 50dbfe354..92d4e3da2 100644
--- a/genplugouts/singleton/UmlSettings.cpp
+++ b/genplugouts/singleton/UmlSettings.cpp
@@ -7,32 +7,32 @@
 #include "UmlStereotype.h"
 #include "UmlSettingsCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlSettings::_defined;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -44,7 +44,7 @@ void UmlSettings::read_()
     _relation_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_stereotypes[index].uml = UmlCom::read_string();
@@ -57,7 +57,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -75,18 +75,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -97,7 +97,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_stereotypes.count();
 
@@ -108,7 +108,7 @@ Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlSter
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -119,15 +119,15 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         builtins[index] = _builtins[index];
@@ -155,15 +155,15 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         relation_stereotypes[index] = _relation_stereotypes[index];
@@ -188,15 +188,15 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         class_stereotypes[index] = _class_stereotypes[index];
diff --git a/genplugouts/singleton/UmlSettings.h b/genplugouts/singleton/UmlSettings.h
index f041fe41d..c82a095ab 100644
--- a/genplugouts/singleton/UmlSettings.h
+++ b/genplugouts/singleton/UmlSettings.h
@@ -1,9 +1,9 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
 
+#include <QHash>
 
-#include <q3dict.h>
-#include <q3cstring.h>
+#include <QByteArray>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -18,15 +18,15 @@ class UmlSettings
 
     static bool _defined;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_stereotypes;
 
     static UmlStereotype * _relation_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -34,19 +34,19 @@ class UmlSettings
 
     static void read_if_needed_();
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
-    static Q3CString uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
-    static UmlStereotype * add_rel_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_stereotype(const QByteArray & s);
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/singleton/UmlSettingsCmd.h b/genplugouts/singleton/UmlSettingsCmd.h
index 553af1bbb..052b3f715 100644
--- a/genplugouts/singleton/UmlSettingsCmd.h
+++ b/genplugouts/singleton/UmlSettingsCmd.h
@@ -3,8 +3,8 @@
 
 
 // Internal enum
-enum UmlSettingsCmd {
+/*enum UmlSettingsCmd {
     getUmlSettingsCmd
 
-};
+};*/
 #endif
diff --git a/genplugouts/singleton/UmlStereotype.h b/genplugouts/singleton/UmlStereotype.h
index 290517202..e3942fc7a 100644
--- a/genplugouts/singleton/UmlStereotype.h
+++ b/genplugouts/singleton/UmlStereotype.h
@@ -2,23 +2,23 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/singleton/UmlTypeSpec.cpp b/genplugouts/singleton/UmlTypeSpec.cpp
index 4bcfebb95..ec194d414 100644
--- a/genplugouts/singleton/UmlTypeSpec.cpp
+++ b/genplugouts/singleton/UmlTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlTypeSpec::toString() const
+const QByteArray & UmlTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/singleton/UmlTypeSpec.h b/genplugouts/singleton/UmlTypeSpec.h
index 1c939ea94..90b32b48d 100644
--- a/genplugouts/singleton/UmlTypeSpec.h
+++ b/genplugouts/singleton/UmlTypeSpec.h
@@ -2,7 +2,7 @@
 #define _UMLTYPESPEC_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 
@@ -15,7 +15,7 @@ class UmlTypeSpec
 {
 public:
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     // if != 0 the class representing the type
     UmlClass * type;
@@ -23,7 +23,7 @@ class UmlTypeSpec
     UmlTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
 };
 
diff --git a/genplugouts/singleton/UmlUseCase.h b/genplugouts/singleton/UmlUseCase.h
index 392773262..9947e8b05 100644
--- a/genplugouts/singleton/UmlUseCase.h
+++ b/genplugouts/singleton/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case'
 //
@@ -11,7 +11,7 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlUseCaseDiagram.h b/genplugouts/singleton/UmlUseCaseDiagram.h
index 132b56d36..41f841a09 100644
--- a/genplugouts/singleton/UmlUseCaseDiagram.h
+++ b/genplugouts/singleton/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/UmlUseCaseView.h b/genplugouts/singleton/UmlUseCaseView.h
index a715b2f5f..cd5416397 100644
--- a/genplugouts/singleton/UmlUseCaseView.h
+++ b/genplugouts/singleton/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case view'
 //
@@ -11,7 +11,7 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/singleton/singleton.pro b/genplugouts/singleton/singleton.pro
index 6ed42a496..8b4191bf5 100644
--- a/genplugouts/singleton/singleton.pro
+++ b/genplugouts/singleton/singleton.pro
@@ -1,7 +1,9 @@
 TEMPLATE	= app
 TARGET		= singleton
-CONFIG		+= debug warn_on qt
-DEFINES		= WITHCPP WITHJAVA WITHIDL
+CONFIG -= app_bundle
+CONFIG		+= warn_on qt c++11
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES		+= WITHCPP WITHJAVA WITHIDL FALSE=false TRUE=true
 HEADERS		= ./UmlBaseOperation.h \
 		  ./JavaSettings.h \
 		  ./UmlBaseClassView.h \
@@ -152,23 +154,23 @@ SOURCES		= ./UmlBaseOperation.cpp \
 		  ./UmlBaseDeploymentDiagram.cpp \
 		  ./PackageGlobalCmd.cpp
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+#qt3support
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
+QT += testlib
 
+    UI_DIR = src/ui
+    DESTDIR = ../../bin
 
-    MOC_DIR = bin/douml/singleton/MOC_release
-    OBJECTS_DIR = bin/douml/singleton/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-Debug{
-    MOC_DIR = bin/douml/singleton/MOC_Debug
-    OBJECTS_DIR = bin/douml/singleton/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
diff --git a/genplugouts/sm/CppSettings.cpp b/genplugouts/sm/CppSettings.cpp
index e577bc53d..446a7b991 100644
--- a/genplugouts/sm/CppSettings.cpp
+++ b/genplugouts/sm/CppSettings.cpp
@@ -10,7 +10,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -23,21 +23,21 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,28 +50,28 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationAttributeStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -84,28 +84,28 @@ bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -118,31 +118,31 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -153,14 +153,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -172,14 +172,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -191,14 +191,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -210,14 +210,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -229,14 +229,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -349,14 +349,14 @@ bool CppSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -368,14 +368,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -387,14 +387,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -406,14 +406,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -425,14 +425,14 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -444,14 +444,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -463,14 +463,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -482,14 +482,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -501,14 +501,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -520,14 +520,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -539,14 +539,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -558,14 +558,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -577,14 +577,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -596,14 +596,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -615,14 +615,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl(const char * multiplicity)
+const QByteArray & CppSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool CppSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, multiplicity, v);
 
@@ -634,14 +634,14 @@ bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -653,7 +653,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -672,14 +672,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -691,14 +691,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -748,14 +748,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -843,14 +843,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -921,51 +921,51 @@ bool CppSettings::set_IsSetParamRef(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl[3/*multiplicity*/];
+QByteArray CppSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -975,7 +975,7 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
@@ -983,13 +983,13 @@ bool CppSettings::_is_set_param_const;
 
 bool CppSettings::_is_set_param_ref;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
@@ -1001,14 +1001,14 @@ bool CppSettings::_is_force_namespace_gen;
 
 bool CppSettings::_is_generate_javadoc_comment;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1034,13 +1034,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/sm/CppSettings.h b/genplugouts/sm/CppSettings.h
index 0b3bea582..1beb0ed68 100644
--- a/genplugouts/sm/CppSettings.h
+++ b/genplugouts/sm/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(Q3CString s);
+    static QByteArray relationAttributeStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -175,70 +175,70 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -246,83 +246,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -331,20 +331,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -368,13 +368,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -420,14 +420,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -468,51 +468,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -522,7 +522,7 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
@@ -530,13 +530,13 @@ class CppSettings : public UmlSettings
 
     static bool _is_set_param_ref;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
@@ -548,7 +548,7 @@ class CppSettings : public UmlSettings
 
     static bool _is_generate_javadoc_comment;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/sm/FlowBehavior.h b/genplugouts/sm/FlowBehavior.h
index 55dde8146..2b1d6fab9 100644
--- a/genplugouts/sm/FlowBehavior.h
+++ b/genplugouts/sm/FlowBehavior.h
@@ -2,18 +2,18 @@
 #define _FLOWBEHAVIOR_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FlowBehavior
 {
 public:
-    Q3CString weight;
+    QByteArray weight;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString selection;
+    QByteArray selection;
 
-    Q3CString transformation;
+    QByteArray transformation;
 
     void read();
 
diff --git a/genplugouts/sm/IdlSettings.cpp b/genplugouts/sm/IdlSettings.cpp
index 85acf945a..9c8e2691e 100644
--- a/genplugouts/sm/IdlSettings.cpp
+++ b/genplugouts/sm/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -83,28 +83,28 @@ bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, v);
 
@@ -171,14 +171,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, v);
 
@@ -190,14 +190,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, v);
 
@@ -209,14 +209,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, v);
 
@@ -228,14 +228,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, v);
 
@@ -247,14 +247,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, v);
 
@@ -266,14 +266,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, v);
 
@@ -285,14 +285,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, v);
 
@@ -304,14 +304,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, v);
 
@@ -323,14 +323,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, v);
 
@@ -342,14 +342,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, v);
 
@@ -361,14 +361,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, multiplicity, v);
 
@@ -380,14 +380,14 @@ bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, multiplicity, v);
 
@@ -399,14 +399,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CStrin
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionItemDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_item_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionItemDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, multiplicity, v);
 
@@ -418,14 +418,14 @@ bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, v);
 
@@ -437,14 +437,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl(const char * multiplicity)
+const QByteArray & IdlSettings::constDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _const_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ConstDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, multiplicity, v);
 
@@ -456,14 +456,14 @@ bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
 
@@ -475,14 +475,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
 
@@ -494,14 +494,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
 
@@ -513,14 +513,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, v);
 
@@ -532,14 +532,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, v);
 
@@ -551,14 +551,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, v);
 
@@ -591,53 +591,53 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_item_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_item_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_const_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
@@ -666,13 +666,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/sm/IdlSettings.h b/genplugouts/sm/IdlSettings.h
index d28a0bf7a..7754bce8d 100644
--- a/genplugouts/sm/IdlSettings.h
+++ b/genplugouts/sm/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype depending on the multiplicity
-    static const Q3CString & valuetypeAttributeDecl(const char * multiplicity);
+    static const QByteArray & valuetypeAttributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an union item depending on the multiplicity
-    static const Q3CString & unionItemDecl(const char * multiplicity);
+    static const QByteArray & unionItemDecl(const char * multiplicity);
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionItemDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute depending on the multiplicity
-    static const Q3CString & constDecl(const char * multiplicity);
+    static const QByteArray & constDecl(const char * multiplicity);
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(const char * multiplicity, Q3CString v);
+    static bool set_ConstDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_attr_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_attr_decl[3/*multiplicity*/];
 
-    static Q3CString _union_item_decl[3/*multiplicity*/];
+    static QByteArray _union_item_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl[3/*multiplicity*/];
+    static QByteArray _const_decl[3/*multiplicity*/];
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/sm/JavaSettings.cpp b/genplugouts/sm/JavaSettings.cpp
index 637212460..a393456a5 100644
--- a/genplugouts/sm/JavaSettings.cpp
+++ b/genplugouts/sm/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -83,28 +83,28 @@ bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, v);
 
@@ -171,14 +171,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, v);
 
@@ -190,14 +190,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, v);
 
@@ -228,14 +228,14 @@ bool JavaSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, v);
 
@@ -247,14 +247,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, v);
 
@@ -266,14 +266,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternDecl()
+const QByteArray & JavaSettings::enumPatternDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_decl;
 }
 
-bool JavaSettings::set_EnumPatternDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternDeclCmd, v);
 
@@ -285,14 +285,14 @@ bool JavaSettings::set_EnumPatternDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumDecl()
+QByteArray JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, v);
 
@@ -304,14 +304,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, v);
 
@@ -323,14 +323,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl(const char * multiplicity)
+const QByteArray & JavaSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, multiplicity, v);
 
@@ -342,14 +342,14 @@ bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemDecl()
+const QByteArray & JavaSettings::enumPatternItemDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_item_decl;
 }
 
-bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemDeclCmd, v);
 
@@ -361,14 +361,14 @@ bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemCase()
+const QByteArray & JavaSettings::enumPatternItemCase()
 {
     read_if_needed_();
 
     return _enum_pattern_item_case;
 }
 
-bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
+bool JavaSettings::set_EnumPatternItemCase(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemCaseCmd, v);
 
@@ -380,14 +380,14 @@ bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumItemDecl()
+QByteArray JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, v);
 
@@ -399,14 +399,14 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
 
@@ -418,14 +418,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, v);
 
@@ -456,14 +456,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, v);
 
@@ -475,14 +475,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, v);
 
@@ -572,51 +572,51 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_pattern_decl;
+QByteArray JavaSettings::_enum_pattern_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_enum_pattern_item_decl;
+QByteArray JavaSettings::_enum_pattern_item_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_case;
+QByteArray JavaSettings::_enum_pattern_item_case;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
 bool JavaSettings::_is_generate_javadoc_comment;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray, QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
@@ -648,10 +648,10 @@ void JavaSettings::read_()
         _map_imports.resize(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/sm/JavaSettings.h b/genplugouts/sm/JavaSettings.h
index 29fea9953..0c363b095 100644
--- a/genplugouts/sm/JavaSettings.h
+++ b/genplugouts/sm/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,80 +31,80 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -115,100 +115,100 @@ class JavaSettings : public UmlSettings
     static bool set_IsGenerateJavadocStyleComment(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumPatternDecl();
+    static const QByteArray & enumPatternDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternDecl(Q3CString v);
+    static bool set_EnumPatternDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumPatternItemDecl();
+    static const QByteArray & enumPatternItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternItemDecl(Q3CString v);
+    static bool set_EnumPatternItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumPatternItemCase();
+    static const QByteArray & enumPatternItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumPatternItemCase(Q3CString v);
+    static bool set_EnumPatternItemCase(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -222,23 +222,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -287,51 +287,51 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_pattern_decl;
+    static QByteArray _enum_pattern_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_pattern_item_decl;
+    static QByteArray _enum_pattern_item_decl;
 
-    static Q3CString _enum_pattern_item_case;
+    static QByteArray _enum_pattern_item_case;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
     static bool _is_generate_javadoc_comment;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/sm/PackageGlobalCmd.h b/genplugouts/sm/PackageGlobalCmd.h
index 76a30534b..0eed58b55 100644
--- a/genplugouts/sm/PackageGlobalCmd.h
+++ b/genplugouts/sm/PackageGlobalCmd.h
@@ -4,9 +4,9 @@
 
 // Internal enum
 enum PackageGlobalCmd {
-    findNamespaceCmd,
-    findPackageCmd,
-    findModuleCmd,
+    findCppNamespaceCmd,
+    findJavaPackageCmd,
+    findIdlModuleCmd,
     getProjectCmd,
     isProjectModifiedCmd,
     saveProjectCmd
diff --git a/genplugouts/sm/PhpSettings.cpp b/genplugouts/sm/PhpSettings.cpp
index c2931e45f..ca64f0c50 100644
--- a/genplugouts/sm/PhpSettings.cpp
+++ b/genplugouts/sm/PhpSettings.cpp
@@ -8,7 +8,7 @@
 //#include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHJAVA
 #include "JavaSettings.h"
 #endif
@@ -24,21 +24,21 @@ bool PhpSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PhpSettings::classStereotype(const Q3CString & s)
+QByteArray PhpSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
 
-bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PhpSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -51,14 +51,14 @@ bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::rootDir()
+const QByteArray & PhpSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PhpSettings::set_RootDir(Q3CString v)
+bool PhpSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRootdirCmd, v);
 
@@ -70,14 +70,14 @@ bool PhpSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceContent()
+const QByteArray & PhpSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PhpSettings::set_SourceContent(Q3CString v)
+bool PhpSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceContentCmd, v);
 
@@ -89,14 +89,14 @@ bool PhpSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceExtension()
+const QByteArray & PhpSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PhpSettings::set_SourceExtension(Q3CString v)
+bool PhpSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceExtensionCmd, v);
 
@@ -108,14 +108,14 @@ bool PhpSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::classDecl()
+const QByteArray & PhpSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PhpSettings::set_ClassDecl(Q3CString v)
+bool PhpSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassDeclCmd, v);
 
@@ -127,14 +127,14 @@ bool PhpSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::externalClassDecl()
+const QByteArray & PhpSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PhpSettings::set_ExternalClassDecl(Q3CString v)
+bool PhpSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpExternalClassDeclCmd, v);
 
@@ -146,14 +146,14 @@ bool PhpSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumDecl()
+QByteArray PhpSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PhpSettings::set_EnumDecl(Q3CString v)
+bool PhpSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumDeclCmd, v);
 
@@ -165,14 +165,14 @@ bool PhpSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::interfaceDecl()
+const QByteArray & PhpSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool PhpSettings::set_InterfaceDecl(Q3CString v)
+bool PhpSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpInterfaceDeclCmd, v);
 
@@ -184,14 +184,14 @@ bool PhpSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::attributeDecl()
+const QByteArray & PhpSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool PhpSettings::set_AttributeDecl(Q3CString v)
+bool PhpSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpAttributeDeclCmd, v);
 
@@ -203,14 +203,14 @@ bool PhpSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumItemDecl()
+QByteArray PhpSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PhpSettings::set_EnumItemDecl(Q3CString v)
+bool PhpSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumItemDeclCmd, v);
 
@@ -222,14 +222,14 @@ bool PhpSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::relationDecl()
+const QByteArray & PhpSettings::relationDecl()
 {
     read_if_needed_();
 
     return _rel_decl;
 }
 
-bool PhpSettings::set_RelationDecl(Q3CString v)
+bool PhpSettings::set_RelationDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRelationDeclCmd, v);
 
@@ -241,14 +241,14 @@ bool PhpSettings::set_RelationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::operationDef()
+const QByteArray & PhpSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PhpSettings::set_OperationDef(Q3CString v)
+bool PhpSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpOperationDefCmd, v);
 
@@ -288,14 +288,14 @@ bool PhpSettings::set_GetVisibility(aVisibility v)
 #endif
 }
 
-const Q3CString & PhpSettings::getName()
+const QByteArray & PhpSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PhpSettings::set_GetName(Q3CString v)
+bool PhpSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpGetNameCmd, v);
 
@@ -307,14 +307,14 @@ bool PhpSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::setName()
+const QByteArray & PhpSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PhpSettings::set_SetName(Q3CString v)
+bool PhpSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSetNameCmd, v);
 
@@ -394,29 +394,29 @@ bool PhpSettings::set_SetVisibility(aVisibility v)
 
 bool PhpSettings::_defined;
 
-Q3CString PhpSettings::_root;
+QByteArray PhpSettings::_root;
 
-Q3CString PhpSettings::_class_decl;
+QByteArray PhpSettings::_class_decl;
 
-Q3CString PhpSettings::_external_class_decl;
+QByteArray PhpSettings::_external_class_decl;
 
-Q3CString PhpSettings::_enum_decl;
+QByteArray PhpSettings::_enum_decl;
 
-Q3CString PhpSettings::_interface_decl;
+QByteArray PhpSettings::_interface_decl;
 
-Q3CString PhpSettings::_attr_decl;
+QByteArray PhpSettings::_attr_decl;
 
-Q3CString PhpSettings::_enum_item_decl;
+QByteArray PhpSettings::_enum_item_decl;
 
-Q3CString PhpSettings::_rel_decl;
+QByteArray PhpSettings::_rel_decl;
 
-Q3CString PhpSettings::_oper_def;
+QByteArray PhpSettings::_oper_def;
 
 #ifndef WITHJAVA
 aVisibility PhpSettings::_get_visibility;
 #endif
 
-Q3CString PhpSettings::_get_name;
+QByteArray PhpSettings::_get_name;
 
 bool PhpSettings::_is_get_final;
 
@@ -424,13 +424,30 @@ bool PhpSettings::_is_get_final;
 aVisibility PhpSettings::_set_visibility;
 #endif
 
-Q3CString PhpSettings::_set_name;
+QByteArray PhpSettings::_set_name;
 
 bool PhpSettings::_is_set_final;
 
-Q3CString PhpSettings::_src_content;
+QByteArray PhpSettings::_src_content;
 
-Q3CString PhpSettings::_ext;
+QByteArray PhpSettings::_ext;
+WrapperStr PhpSettings::_dir_regexp;
+
+bool PhpSettings::_dir_regexp_case_sensitive;
+
+WrapperStr PhpSettings::_file_regexp;
+
+bool PhpSettings::_file_regexp_case_sensitive;
+
+bool PhpSettings::_is_generate_javadoc_comment;
+
+bool PhpSettings::_req_with_path;
+
+bool PhpSettings::_is_relative_path;
+
+bool PhpSettings::_is_root_relative_path;
+
+bool PhpSettings::_is_force_namespace_gen;
 
 void PhpSettings::read_()
 {
@@ -467,6 +484,18 @@ void PhpSettings::read_()
         (aVisibility) UmlCom::read_char();
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
+    _is_generate_javadoc_comment = UmlCom::read_bool();
+    _req_with_path = UmlCom::read_bool();
+    _is_relative_path = UmlCom::read_bool();
+    _is_root_relative_path = UmlCom::read_bool();
+
+    _dir_regexp = UmlCom::read_string();
+    _dir_regexp_case_sensitive = UmlCom::read_bool();
+
+    _file_regexp = UmlCom::read_string();
+    _file_regexp_case_sensitive = UmlCom::read_bool();
+
+    _is_force_namespace_gen = UmlCom::read_bool();
 }
 
 void PhpSettings::read_if_needed_()
diff --git a/genplugouts/sm/PhpSettings.h b/genplugouts/sm/PhpSettings.h
index 04cd6b2d8..0c545cf04 100644
--- a/genplugouts/sm/PhpSettings.h
+++ b/genplugouts/sm/PhpSettings.h
@@ -4,7 +4,7 @@
 #ifdef WITHPHP
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
 
@@ -29,101 +29,101 @@ class PhpSettings : public UmlSettings
 
     // returns the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PHP code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PHP code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of an relation
-    static const Q3CString & relationDecl();
+    static const QByteArray & relationDecl();
 
     // set the default definition of an relation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(Q3CString v);
+    static bool set_RelationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -141,23 +141,23 @@ class PhpSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -200,29 +200,29 @@ class PhpSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl;
+    static QByteArray _rel_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
 #ifndef WITHJAVA
     static aVisibility _get_visibility;
 #endif
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
@@ -230,13 +230,30 @@ class PhpSettings : public UmlSettings
     static aVisibility _set_visibility;
 #endif
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
+    static WrapperStr _dir_regexp;
+
+    static bool _dir_regexp_case_sensitive;
+
+    static WrapperStr _file_regexp;
+
+    static bool _file_regexp_case_sensitive;
+
+    static bool _is_generate_javadoc_comment;
+
+    static bool _req_with_path;
+
+    static bool _is_relative_path;
+
+    static bool _is_root_relative_path;
+
+    static bool _is_force_namespace_gen;
 
 
 protected:
diff --git a/genplugouts/sm/SlotAttribute.h b/genplugouts/sm/SlotAttribute.h
index d1c59eabf..e03a17c21 100644
--- a/genplugouts/sm/SlotAttribute.h
+++ b/genplugouts/sm/SlotAttribute.h
@@ -2,20 +2,20 @@
 #define _SLOTATTRIBUTE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlAttribute;
 
 struct SlotAttribute {
     UmlAttribute * attribute;
 
-    Q3CString value;
+    QByteArray value;
 
     // because of QValueList use
     SlotAttribute() : attribute(0) {
     }
 
-    SlotAttribute(UmlAttribute * a, Q3CString v) : attribute(a), value(v) {
+    SlotAttribute(UmlAttribute * a, QByteArray v) : attribute(a), value(v) {
     }
 
 };
diff --git a/genplugouts/sm/StateBehavior.h b/genplugouts/sm/StateBehavior.h
index 91a42cb82..e15ee5334 100644
--- a/genplugouts/sm/StateBehavior.h
+++ b/genplugouts/sm/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/sm/TransitionBehavior.h b/genplugouts/sm/TransitionBehavior.h
index 856ede3c0..9128520bc 100644
--- a/genplugouts/sm/TransitionBehavior.h
+++ b/genplugouts/sm/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/sm/UmlAccessVariableValueAction.h b/genplugouts/sm/UmlAccessVariableValueAction.h
index dc92b3e25..76bec1aca 100644
--- a/genplugouts/sm/UmlAccessVariableValueAction.h
+++ b/genplugouts/sm/UmlAccessVariableValueAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseAccessVariableValueAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAccessVariableValueAction(void * id, const Q3CString & s) : UmlBaseAccessVariableValueAction(id, s) {
+    UmlAccessVariableValueAction(void * id, const QByteArray & s) : UmlBaseAccessVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivity.h b/genplugouts/sm/UmlActivity.h
index 8f9886b0e..608ff16e1 100644
--- a/genplugouts/sm/UmlActivity.h
+++ b/genplugouts/sm/UmlActivity.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivity.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivity : public UmlBaseActivity
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivity(void * id, const Q3CString & s) : UmlBaseActivity(id, s) {
+    UmlActivity(void * id, const QByteArray & s) : UmlBaseActivity(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityAction.h b/genplugouts/sm/UmlActivityAction.h
index f359c755a..439dd8be5 100644
--- a/genplugouts/sm/UmlActivityAction.h
+++ b/genplugouts/sm/UmlActivityAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityAction : public UmlBaseActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityAction(void * id, const Q3CString & s) : UmlBaseActivityAction(id, s) {
+    UmlActivityAction(void * id, const QByteArray & s) : UmlBaseActivityAction(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityActionClasses.h b/genplugouts/sm/UmlActivityActionClasses.h
index 15677a746..614ec1928 100644
--- a/genplugouts/sm/UmlActivityActionClasses.h
+++ b/genplugouts/sm/UmlActivityActionClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityActionClasses.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlSendObjectAction : public UmlBaseSendObjectAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendObjectAction(void * id, const Q3CString & s) : UmlBaseSendObjectAction(id, s) {
+    UmlSendObjectAction(void * id, const QByteArray & s) : UmlBaseSendObjectAction(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlUnmarshallAction : public UmlBaseUnmarshallAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlUnmarshallAction(void * id, const Q3CString & s) : UmlBaseUnmarshallAction(id, s) {
+    UmlUnmarshallAction(void * id, const QByteArray & s) : UmlBaseUnmarshallAction(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlSendSignalAction : public UmlBaseSendSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendSignalAction(void * id, const Q3CString & s) : UmlBaseSendSignalAction(id, s) {
+    UmlSendSignalAction(void * id, const QByteArray & s) : UmlBaseSendSignalAction(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlBroadcastSignalAction : public UmlBaseBroadcastSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBroadcastSignalAction(void * id, const Q3CString & s) : UmlBaseBroadcastSignalAction(id, s) {
+    UmlBroadcastSignalAction(void * id, const QByteArray & s) : UmlBaseBroadcastSignalAction(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlValueSpecificationAction : public UmlBaseValueSpecificationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlValueSpecificationAction(void * id, const Q3CString & s) : UmlBaseValueSpecificationAction(id, s) {
+    UmlValueSpecificationAction(void * id, const QByteArray & s) : UmlBaseValueSpecificationAction(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlOpaqueAction : public UmlBaseOpaqueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOpaqueAction(void * id, const Q3CString & s) : UmlBaseOpaqueAction(id, s) {
+    UmlOpaqueAction(void * id, const QByteArray & s) : UmlBaseOpaqueAction(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlAcceptEventAction : public UmlBaseAcceptEventAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptEventAction(void * id, const Q3CString & s) : UmlBaseAcceptEventAction(id, s) {
+    UmlAcceptEventAction(void * id, const QByteArray & s) : UmlBaseAcceptEventAction(id, s) {
     }
 
 };
@@ -72,7 +72,7 @@ class UmlCallOperationAction : public UmlBaseCallOperationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallOperationAction(void * id, const Q3CString & s) : UmlBaseCallOperationAction(id, s) {
+    UmlCallOperationAction(void * id, const QByteArray & s) : UmlBaseCallOperationAction(id, s) {
     }
 
 };
@@ -81,7 +81,7 @@ class UmlCallBehaviorAction : public UmlBaseCallBehaviorAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallBehaviorAction(void * id, const Q3CString & s) : UmlBaseCallBehaviorAction(id, s) {
+    UmlCallBehaviorAction(void * id, const QByteArray & s) : UmlBaseCallBehaviorAction(id, s) {
     }
 
 };
@@ -90,7 +90,7 @@ class UmlClearVariableValueAction : public UmlBaseClearVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClearVariableValueAction(void * id, const Q3CString & s) : UmlBaseClearVariableValueAction(id, s) {
+    UmlClearVariableValueAction(void * id, const QByteArray & s) : UmlBaseClearVariableValueAction(id, s) {
     }
 
 };
@@ -99,7 +99,7 @@ class UmlReadVariableValueAction : public UmlBaseReadVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReadVariableValueAction(void * id, const Q3CString & s) : UmlBaseReadVariableValueAction(id, s) {
+    UmlReadVariableValueAction(void * id, const QByteArray & s) : UmlBaseReadVariableValueAction(id, s) {
     }
 
 };
@@ -108,7 +108,7 @@ class UmlWriteVariableValueAction : public UmlBaseWriteVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlWriteVariableValueAction(void * id, const Q3CString & s) : UmlBaseWriteVariableValueAction(id, s) {
+    UmlWriteVariableValueAction(void * id, const QByteArray & s) : UmlBaseWriteVariableValueAction(id, s) {
     }
 
 };
@@ -117,7 +117,7 @@ class UmlAddVariableValueAction : public UmlBaseAddVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAddVariableValueAction(void * id, const Q3CString & s) : UmlBaseAddVariableValueAction(id, s) {
+    UmlAddVariableValueAction(void * id, const QByteArray & s) : UmlBaseAddVariableValueAction(id, s) {
     }
 
 };
@@ -126,7 +126,7 @@ class UmlRemoveVariableValueAction : public UmlBaseRemoveVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRemoveVariableValueAction(void * id, const Q3CString & s) : UmlBaseRemoveVariableValueAction(id, s) {
+    UmlRemoveVariableValueAction(void * id, const QByteArray & s) : UmlBaseRemoveVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityControlNode.h b/genplugouts/sm/UmlActivityControlNode.h
index 8ebf04bf7..6bf483bf4 100644
--- a/genplugouts/sm/UmlActivityControlNode.h
+++ b/genplugouts/sm/UmlActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityControlNode : public UmlBaseActivityControlNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityControlNode(void * id, const Q3CString & s) : UmlBaseActivityControlNode(id, s) {
+    UmlActivityControlNode(void * id, const QByteArray & s) : UmlBaseActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityControlNodeClasses.h b/genplugouts/sm/UmlActivityControlNodeClasses.h
index f698adeca..5c57c3cfa 100644
--- a/genplugouts/sm/UmlActivityControlNodeClasses.h
+++ b/genplugouts/sm/UmlActivityControlNodeClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNodeClasses.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInitialActivityNode : public UmlBaseInitialActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInitialActivityNode(void * id, const Q3CString & s) : UmlBaseInitialActivityNode(id, s) {
+    UmlInitialActivityNode(void * id, const QByteArray & s) : UmlBaseInitialActivityNode(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlFlowFinalActivityNode : public UmlBaseFlowFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlFlowFinalActivityNode(void * id, const Q3CString & s) : UmlBaseFlowFinalActivityNode(id, s) {
+    UmlFlowFinalActivityNode(void * id, const QByteArray & s) : UmlBaseFlowFinalActivityNode(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlActivityFinalActivityNode : public UmlBaseActivityFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityFinalActivityNode(void * id, const Q3CString & s) : UmlBaseActivityFinalActivityNode(id, s) {
+    UmlActivityFinalActivityNode(void * id, const QByteArray & s) : UmlBaseActivityFinalActivityNode(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlDecisionActivityNode : public UmlBaseDecisionActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDecisionActivityNode(void * id, const Q3CString & s) : UmlBaseDecisionActivityNode(id, s) {
+    UmlDecisionActivityNode(void * id, const QByteArray & s) : UmlBaseDecisionActivityNode(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlMergeActivityNode : public UmlBaseMergeActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlMergeActivityNode(void * id, const Q3CString & s) : UmlBaseMergeActivityNode(id, s) {
+    UmlMergeActivityNode(void * id, const QByteArray & s) : UmlBaseMergeActivityNode(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlForkActivityNode : public UmlBaseForkActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlForkActivityNode(void * id, const Q3CString & s) : UmlBaseForkActivityNode(id, s) {
+    UmlForkActivityNode(void * id, const QByteArray & s) : UmlBaseForkActivityNode(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlJoinActivityNode : public UmlBaseJoinActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlJoinActivityNode(void * id, const Q3CString & s) : UmlBaseJoinActivityNode(id, s) {
+    UmlJoinActivityNode(void * id, const QByteArray & s) : UmlBaseJoinActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityDiagram.h b/genplugouts/sm/UmlActivityDiagram.h
index 4b48b12f2..bc5b4637b 100644
--- a/genplugouts/sm/UmlActivityDiagram.h
+++ b/genplugouts/sm/UmlActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseActivityDiagram.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'activity diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -15,7 +15,7 @@ class UmlActivityDiagram : public UmlBaseActivityDiagram, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityDiagram(void * id, const Q3CString & s) : UmlBaseActivityDiagram(id, s) {
+    UmlActivityDiagram(void * id, const QByteArray & s) : UmlBaseActivityDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityNode.h b/genplugouts/sm/UmlActivityNode.h
index 8429d2396..ecbbfd7ad 100644
--- a/genplugouts/sm/UmlActivityNode.h
+++ b/genplugouts/sm/UmlActivityNode.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityNode.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityNode : public UmlBaseActivityNode, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityNode(void * id, const Q3CString & s) : UmlBaseActivityNode(id, s) {
+    UmlActivityNode(void * id, const QByteArray & s) : UmlBaseActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityObject.h b/genplugouts/sm/UmlActivityObject.h
index f75bccd9b..7fbf6bdc2 100644
--- a/genplugouts/sm/UmlActivityObject.h
+++ b/genplugouts/sm/UmlActivityObject.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityObject.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityObject : public UmlBaseActivityObject
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityObject(void * id, const Q3CString & s) : UmlBaseActivityObject(id, s) {
+    UmlActivityObject(void * id, const QByteArray & s) : UmlBaseActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityParameter.h b/genplugouts/sm/UmlActivityParameter.h
index b51b0fec0..22aea5c57 100644
--- a/genplugouts/sm/UmlActivityParameter.h
+++ b/genplugouts/sm/UmlActivityParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityParameter.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityParameter : public UmlBaseActivityParameter
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityParameter(void * id, const Q3CString & s) : UmlBaseActivityParameter(id, s) {
+    UmlActivityParameter(void * id, const QByteArray & s) : UmlBaseActivityParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityPin.h b/genplugouts/sm/UmlActivityPin.h
index 5d7ae2e0f..7ae4f6b98 100644
--- a/genplugouts/sm/UmlActivityPin.h
+++ b/genplugouts/sm/UmlActivityPin.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityPin.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityPin : public UmlBaseActivityPin
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPin(void * id, const Q3CString & s) : UmlBaseActivityPin(id, s) {
+    UmlActivityPin(void * id, const QByteArray & s) : UmlBaseActivityPin(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlActivityRegion.h b/genplugouts/sm/UmlActivityRegion.h
index 420b4bde2..1c41f659b 100644
--- a/genplugouts/sm/UmlActivityRegion.h
+++ b/genplugouts/sm/UmlActivityRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityRegion.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityRegion : public UmlBaseActivityRegion, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityRegion(void * id, const Q3CString & s) : UmlBaseActivityRegion(id, s) {
+    UmlActivityRegion(void * id, const QByteArray & s) : UmlBaseActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlArtifact.h b/genplugouts/sm/UmlArtifact.h
index 9f6a30622..0b8b99c1a 100644
--- a/genplugouts/sm/UmlArtifact.h
+++ b/genplugouts/sm/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'artifacts'
 //
@@ -11,7 +11,7 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlAttribute.h b/genplugouts/sm/UmlAttribute.h
index 19ee0a4c6..8e5cdee6d 100644
--- a/genplugouts/sm/UmlAttribute.h
+++ b/genplugouts/sm/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseAccessVariableValueAction.h b/genplugouts/sm/UmlBaseAccessVariableValueAction.h
index 311fefa08..cc16b289e 100644
--- a/genplugouts/sm/UmlBaseAccessVariableValueAction.h
+++ b/genplugouts/sm/UmlBaseAccessVariableValueAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlItem;
 
@@ -11,7 +11,7 @@ class UmlBaseAccessVariableValueAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAccessVariableValueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAccessVariableValueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
diff --git a/genplugouts/sm/UmlBaseActivity.cpp b/genplugouts/sm/UmlBaseActivity.cpp
index 2f992ddd1..45801f46c 100644
--- a/genplugouts/sm/UmlBaseActivity.cpp
+++ b/genplugouts/sm/UmlBaseActivity.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassView.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivity * UmlBaseActivity::create(UmlClassView * parent, const char * s)
 {
@@ -17,7 +17,7 @@ anItemKind UmlBaseActivity::kind()
     return anActivity;
 }
 
-const Q3CString & UmlBaseActivity::preCondition()
+const QByteArray & UmlBaseActivity::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivity::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::postCondition()
+const QByteArray & UmlBaseActivity::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -40,7 +40,7 @@ bool UmlBaseActivity::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivity::cppPreCondition()
+const QByteArray & UmlBaseActivity::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -51,7 +51,7 @@ bool UmlBaseActivity::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::cppPostCondition()
+const QByteArray & UmlBaseActivity::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -64,7 +64,7 @@ bool UmlBaseActivity::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivity::javaPreCondition()
+const QByteArray & UmlBaseActivity::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -75,7 +75,7 @@ bool UmlBaseActivity::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::javaPostCondition()
+const QByteArray & UmlBaseActivity::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/sm/UmlBaseActivity.h b/genplugouts/sm/UmlBaseActivity.h
index a0eca47eb..2ec5d35a5 100644
--- a/genplugouts/sm/UmlBaseActivity.h
+++ b/genplugouts/sm/UmlBaseActivity.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivity;
 class UmlClassView;
@@ -26,13 +26,13 @@ class UmlBaseActivity : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivity(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivity(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -40,7 +40,7 @@ class UmlBaseActivity : public UmlItem
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -49,7 +49,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -57,7 +57,7 @@ class UmlBaseActivity : public UmlItem
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -75,7 +75,7 @@ class UmlBaseActivity : public UmlItem
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -117,20 +117,20 @@ class UmlBaseActivity : public UmlItem
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     bool _read_only;
diff --git a/genplugouts/sm/UmlBaseActivityAction.cpp b/genplugouts/sm/UmlBaseActivityAction.cpp
index fb47b7b1b..de084771d 100644
--- a/genplugouts/sm/UmlBaseActivityAction.cpp
+++ b/genplugouts/sm/UmlBaseActivityAction.cpp
@@ -3,9 +3,9 @@
 #include "UmlBaseActivityAction.h"
 #include "UmlDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseActivityAction::preCondition()
+const QByteArray & UmlBaseActivityAction::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -16,7 +16,7 @@ bool UmlBaseActivityAction::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::postCondition()
+const QByteArray & UmlBaseActivityAction::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivityAction::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityAction::cppPreCondition()
+const QByteArray & UmlBaseActivityAction::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -39,7 +39,7 @@ bool UmlBaseActivityAction::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::cppPostCondition()
+const QByteArray & UmlBaseActivityAction::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivityAction::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityAction::javaPreCondition()
+const QByteArray & UmlBaseActivityAction::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -63,7 +63,7 @@ bool UmlBaseActivityAction::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::javaPostCondition()
+const QByteArray & UmlBaseActivityAction::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/sm/UmlBaseActivityAction.h b/genplugouts/sm/UmlBaseActivityAction.h
index 4a06ccffe..c99847f5d 100644
--- a/genplugouts/sm/UmlBaseActivityAction.h
+++ b/genplugouts/sm/UmlBaseActivityAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDiagram;
 
@@ -11,13 +11,13 @@ class UmlBaseActivityAction : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityAction(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityAction(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -25,7 +25,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -34,7 +34,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -42,7 +42,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -52,7 +52,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -60,7 +60,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -86,20 +86,20 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     UmlDiagram * _assoc_diagram;
diff --git a/genplugouts/sm/UmlBaseActivityActionClasses.cpp b/genplugouts/sm/UmlBaseActivityActionClasses.cpp
index adeceb749..eba28a614 100644
--- a/genplugouts/sm/UmlBaseActivityActionClasses.cpp
+++ b/genplugouts/sm/UmlBaseActivityActionClasses.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlSendObjectAction * UmlBaseSendObjectAction::create(UmlItem * parent, const char * s)
 {
@@ -57,7 +57,7 @@ anItemKind UmlBaseValueSpecificationAction::kind()
     return aValueSpecificationAction;
 }
 
-const Q3CString & UmlBaseValueSpecificationAction::value()
+const QByteArray & UmlBaseValueSpecificationAction::value()
 {
     read_if_needed_();
     return _value;
@@ -69,7 +69,7 @@ bool UmlBaseValueSpecificationAction::set_Value(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseValueSpecificationAction::cppValue()
+const QByteArray & UmlBaseValueSpecificationAction::cppValue()
 {
     read_if_needed_();
     return _cpp_value;
@@ -82,7 +82,7 @@ bool UmlBaseValueSpecificationAction::set_CppValue(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseValueSpecificationAction::javaValue()
+const QByteArray & UmlBaseValueSpecificationAction::javaValue()
 {
     read_if_needed_();
     return _java_value;
@@ -138,7 +138,7 @@ anItemKind UmlBaseOpaqueAction::kind()
     return anOpaqueAction;
 }
 
-const Q3CString & UmlBaseOpaqueAction::behavior()
+const QByteArray & UmlBaseOpaqueAction::behavior()
 {
     read_if_needed_();
     return _behavior;
@@ -150,7 +150,7 @@ bool UmlBaseOpaqueAction::set_Behavior(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOpaqueAction::cppBehavior()
+const QByteArray & UmlBaseOpaqueAction::cppBehavior()
 {
     read_if_needed_();
     return _cpp_behavior;
@@ -163,7 +163,7 @@ bool UmlBaseOpaqueAction::set_CppBehavior(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOpaqueAction::javaBehavior()
+const QByteArray & UmlBaseOpaqueAction::javaBehavior()
 {
     read_if_needed_();
     return _java_behavior;
@@ -241,7 +241,7 @@ bool UmlBaseAcceptEventAction::set_isTimeEvent(bool v)
     return set_it_(_timeevent, v, setTimeEventCmd);
 }
 
-const Q3CString & UmlBaseAcceptEventAction::trigger()
+const QByteArray & UmlBaseAcceptEventAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -253,7 +253,7 @@ bool UmlBaseAcceptEventAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptEventAction::cppTrigger()
+const QByteArray & UmlBaseAcceptEventAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -266,7 +266,7 @@ bool UmlBaseAcceptEventAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptEventAction::javaTrigger()
+const QByteArray & UmlBaseAcceptEventAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
diff --git a/genplugouts/sm/UmlBaseActivityActionClasses.h b/genplugouts/sm/UmlBaseActivityActionClasses.h
index 1a3b14b5f..04cbed9c9 100644
--- a/genplugouts/sm/UmlBaseActivityActionClasses.h
+++ b/genplugouts/sm/UmlBaseActivityActionClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityAction.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlOnSignalAction.h"
 #include "UmlAccessVariableValueAction.h"
 
@@ -41,7 +41,7 @@ class UmlBaseSendObjectAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseSendObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -62,7 +62,7 @@ class UmlBaseUnmarshallAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUnmarshallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseUnmarshallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -83,7 +83,7 @@ class UmlBaseSendSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseSendSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -104,7 +104,7 @@ class UmlBaseBroadcastSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseBroadcastSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseBroadcastSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -125,13 +125,13 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseValueSpecificationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseValueSpecificationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the value
-    const Q3CString & value();
+    const QByteArray & value();
 
     // set the value
     //
@@ -140,7 +140,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the value in C++
-    const Q3CString & cppValue();
+    const QByteArray & cppValue();
 
     // set the value in C++
     //
@@ -150,7 +150,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the value in Java
-    const Q3CString & javaValue();
+    const QByteArray & javaValue();
 
     // set the value in Java
     //
@@ -168,14 +168,14 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 
 private:
-    Q3CString _value;
+    QByteArray _value;
 
 #ifdef WITHCPP
-    Q3CString _cpp_value;
+    QByteArray _cpp_value;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_value;
+    QByteArray _java_value;
 #endif
 
 
@@ -208,13 +208,13 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOpaqueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOpaqueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the behavior
-    const Q3CString & behavior();
+    const QByteArray & behavior();
 
     // set the behavior
     //
@@ -223,7 +223,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the behavior in C++
-    const Q3CString & cppBehavior();
+    const QByteArray & cppBehavior();
 
     // set the behavior in C++
     //
@@ -233,7 +233,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the behavior in Java
-    const Q3CString & javaBehavior();
+    const QByteArray & javaBehavior();
 
     // set the behavior in Java
     //
@@ -251,14 +251,14 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 
 private:
-    Q3CString _behavior;
+    QByteArray _behavior;
 
 #ifdef WITHCPP
-    Q3CString _cpp_behavior;
+    QByteArray _cpp_behavior;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_behavior;
+    QByteArray _java_behavior;
 #endif
 
 
@@ -291,7 +291,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptEventAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptEventAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -313,7 +313,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     bool set_isTimeEvent(bool v);
 
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -322,7 +322,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -332,7 +332,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -354,14 +354,14 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
     bool _timeevent;
 
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
@@ -394,7 +394,7 @@ class UmlBaseCallOperationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallOperationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallOperationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -443,7 +443,7 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallBehaviorAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallBehaviorAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -492,7 +492,7 @@ class UmlBaseClearVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClearVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseClearVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -513,7 +513,7 @@ class UmlBaseReadVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReadVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseReadVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -534,7 +534,7 @@ class UmlBaseWriteVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseWriteVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseWriteVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -555,7 +555,7 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAddVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseAddVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -594,7 +594,7 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRemoveVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseRemoveVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
diff --git a/genplugouts/sm/UmlBaseActivityControlNode.h b/genplugouts/sm/UmlBaseActivityControlNode.h
index 9f1c0931a..0ec7fa02f 100644
--- a/genplugouts/sm/UmlBaseActivityControlNode.h
+++ b/genplugouts/sm/UmlBaseActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlBaseActivityControlNode : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityControlNode(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityControlNode(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseActivityControlNodeClasses.h b/genplugouts/sm/UmlBaseActivityControlNodeClasses.h
index 84dd781f7..958ea92b5 100644
--- a/genplugouts/sm/UmlBaseActivityControlNodeClasses.h
+++ b/genplugouts/sm/UmlBaseActivityControlNodeClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityControlNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInitialActivityNode;
 class UmlItem;
@@ -31,7 +31,7 @@ class UmlBaseInitialActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseInitialActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -52,7 +52,7 @@ class UmlBaseFlowFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlowFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseFlowFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -73,7 +73,7 @@ class UmlBaseActivityFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseActivityFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -94,7 +94,7 @@ class UmlBaseDecisionActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDecisionActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseDecisionActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -115,7 +115,7 @@ class UmlBaseMergeActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseMergeActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseMergeActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -136,7 +136,7 @@ class UmlBaseForkActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseForkActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -157,7 +157,7 @@ class UmlBaseJoinActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseJoinActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseActivityDiagram.h b/genplugouts/sm/UmlBaseActivityDiagram.h
index 8ed6ca9d6..82d855ad3 100644
--- a/genplugouts/sm/UmlBaseActivityDiagram.h
+++ b/genplugouts/sm/UmlBaseActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseActivityDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseActivityDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseActivityNode.h b/genplugouts/sm/UmlBaseActivityNode.h
index 9018d75ce..9fdc756bb 100644
--- a/genplugouts/sm/UmlBaseActivityNode.h
+++ b/genplugouts/sm/UmlBaseActivityNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlBaseActivityNode : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityNode(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityNode(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseActivityObject.cpp b/genplugouts/sm/UmlBaseActivityObject.cpp
index 748e7c22b..f96d4a344 100644
--- a/genplugouts/sm/UmlBaseActivityObject.cpp
+++ b/genplugouts/sm/UmlBaseActivityObject.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityObject * UmlBaseActivityObject::create(UmlItem * parent, const char * s)
 {
@@ -28,7 +28,7 @@ bool UmlBaseActivityObject::set_Type(const UmlTypeSpec & v)
     return set_it_(_type, v, setTypeCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::multiplicity()
+const QByteArray & UmlBaseActivityObject::multiplicity()
 {
     read_if_needed_();
     return _multiplicity;
@@ -39,7 +39,7 @@ bool UmlBaseActivityObject::set_Multiplicity(const char * v)
     return set_it_(_multiplicity, v, setMultiplicityCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::inState()
+const QByteArray & UmlBaseActivityObject::inState()
 {
     read_if_needed_();
     return _in_state;
@@ -50,7 +50,7 @@ bool UmlBaseActivityObject::set_InState(const char * v)
     return set_it_(_in_state, v, setInStateCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::selection()
+const QByteArray & UmlBaseActivityObject::selection()
 {
     read_if_needed_();
     return _selection;
@@ -62,7 +62,7 @@ bool UmlBaseActivityObject::set_Selection(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityObject::cppSelection()
+const QByteArray & UmlBaseActivityObject::cppSelection()
 {
     read_if_needed_();
     return _cpp_selection;
@@ -75,7 +75,7 @@ bool UmlBaseActivityObject::set_CppSelection(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityObject::javaSelection()
+const QByteArray & UmlBaseActivityObject::javaSelection()
 {
     read_if_needed_();
     return _java_selection;
diff --git a/genplugouts/sm/UmlBaseActivityObject.h b/genplugouts/sm/UmlBaseActivityObject.h
index 5c1938905..688ceb75e 100644
--- a/genplugouts/sm/UmlBaseActivityObject.h
+++ b/genplugouts/sm/UmlBaseActivityObject.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 #include "anOrdering.h"
 
@@ -28,7 +28,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityObject(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityObject(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
@@ -42,7 +42,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Type(const UmlTypeSpec & v);
 
     // return the multiplicity
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // set the multiplicity
     //
@@ -50,7 +50,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Multiplicity(const char * v);
 
     // return the inState attribute
-    const Q3CString & inState();
+    const QByteArray & inState();
 
     // set the inState attribute
     //
@@ -58,7 +58,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_InState(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -67,7 +67,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -123,18 +123,18 @@ class UmlBaseActivityObject : public UmlActivityNode
 
     UmlTypeSpec _type;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _in_state;
+    QByteArray _in_state;
 
-    Q3CString _selection;
+    QByteArray _selection;
 
 #ifdef WITHCPP
-    Q3CString _cpp_selection;
+    QByteArray _cpp_selection;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_selection;
+    QByteArray _java_selection;
 #endif
 
     anOrdering _ordering : 8;
diff --git a/genplugouts/sm/UmlBaseActivityParameter.cpp b/genplugouts/sm/UmlBaseActivityParameter.cpp
index 067b1ba5c..0e5dd560c 100644
--- a/genplugouts/sm/UmlBaseActivityParameter.cpp
+++ b/genplugouts/sm/UmlBaseActivityParameter.cpp
@@ -4,7 +4,7 @@
 #include "UmlActivityParameter.h"
 #include "UmlActivity.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityParameter * UmlBaseActivityParameter::create(UmlActivity * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseActivityParameter::kind()
     return anActivityParameter;
 }
 
-const Q3CString & UmlBaseActivityParameter::defaultValue()
+const QByteArray & UmlBaseActivityParameter::defaultValue()
 {
     read_if_needed_();
     return _default_value;
diff --git a/genplugouts/sm/UmlBaseActivityParameter.h b/genplugouts/sm/UmlBaseActivityParameter.h
index 1f05aabe8..32bd82a1d 100644
--- a/genplugouts/sm/UmlBaseActivityParameter.h
+++ b/genplugouts/sm/UmlBaseActivityParameter.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityParameter;
 class UmlActivity;
@@ -25,13 +25,13 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityParameter(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityParameter(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 
 public:
     // return the default value
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // set the default value
     //
@@ -48,7 +48,7 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 
 private:
-    Q3CString _default_value;
+    QByteArray _default_value;
 
 
 protected:
diff --git a/genplugouts/sm/UmlBaseActivityPin.h b/genplugouts/sm/UmlBaseActivityPin.h
index 52f5d4072..115c45d19 100644
--- a/genplugouts/sm/UmlBaseActivityPin.h
+++ b/genplugouts/sm/UmlBaseActivityPin.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityPin;
 class UmlActivityAction;
@@ -25,7 +25,7 @@ class UmlBaseActivityPin : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPin(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityPin(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseActivityRegion.h b/genplugouts/sm/UmlBaseActivityRegion.h
index 95e516e75..c2cd0302d 100644
--- a/genplugouts/sm/UmlBaseActivityRegion.h
+++ b/genplugouts/sm/UmlBaseActivityRegion.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityDiagram;
 
@@ -11,7 +11,7 @@ class UmlBaseActivityRegion : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/sm/UmlBaseArtifact.cpp b/genplugouts/sm/UmlBaseArtifact.cpp
index 2cca2e72e..48ad523a2 100644
--- a/genplugouts/sm/UmlBaseArtifact.cpp
+++ b/genplugouts/sm/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         if (_defined)
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] =  _associated[last];
 
             _associated.resize(last);
         }
@@ -166,68 +168,68 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseArtifact::phpSource()
+const QByteArray & UmlBaseArtifact::phpSource()
 {
     read_if_needed_();
 
     return _php_src;
 }
 
-bool UmlBaseArtifact::set_PhpSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PhpSource(const QByteArray & s)
 {
     return set_it_(_php_src, s, setPhpSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -265,13 +267,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] =  (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/sm/UmlBaseArtifact.h b/genplugouts/sm/UmlBaseArtifact.h
index 1a56e3765..92abf3a75 100644
--- a/genplugouts/sm/UmlBaseArtifact.h
+++ b/genplugouts/sm/UmlBaseArtifact.h
@@ -4,8 +4,9 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+#include <QByteArray>
+#include <QVector>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +38,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +57,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,50 +84,50 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPHP
     // returns the Php file definition
-    const Q3CString & phpSource();
+    const QByteArray & phpSource();
 
     // to set the Php file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpSource(const Q3CString & s);
+    bool set_PhpSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -138,26 +139,26 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_src;
+    QByteArray _php_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -191,11 +192,11 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/sm/UmlBaseAttribute.cpp b/genplugouts/sm/UmlBaseAttribute.cpp
index e8ad3ab1d..dc3087f9f 100644
--- a/genplugouts/sm/UmlBaseAttribute.cpp
+++ b/genplugouts/sm/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -29,7 +29,7 @@ bool UmlBaseAttribute::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -53,7 +53,7 @@ bool UmlBaseAttribute::set_Type(const UmlTypeSpec & t)
     return set_it_(_type, t, setTypeCmd);
 }
 
-const Q3CString & UmlBaseAttribute::multiplicity()
+const QByteArray & UmlBaseAttribute::multiplicity()
 {
     read_if_needed_();
 
@@ -133,7 +133,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/sm/UmlBaseAttribute.h b/genplugouts/sm/UmlBaseAttribute.h
index fd7e8598b..8704908af 100644
--- a/genplugouts/sm/UmlBaseAttribute.h
+++ b/genplugouts/sm/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -35,7 +35,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -51,7 +51,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_Type(const UmlTypeSpec & t);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -97,7 +97,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -122,7 +122,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 
 public:
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
 
 private:
@@ -133,7 +133,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -145,13 +145,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -185,7 +185,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/sm/UmlBaseChoicePseudoState.h b/genplugouts/sm/UmlBaseChoicePseudoState.h
index fb682dd91..b4a00bbc9 100644
--- a/genplugouts/sm/UmlBaseChoicePseudoState.h
+++ b/genplugouts/sm/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseClass.cpp b/genplugouts/sm/UmlBaseClass.cpp
index e1b357045..40bf44f9f 100644
--- a/genplugouts/sm/UmlBaseClass.cpp
+++ b/genplugouts/sm/UmlBaseClass.cpp
@@ -12,8 +12,8 @@
 #include "ClassGlobalCmd.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -48,11 +48,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -84,11 +84,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -133,17 +133,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -332,7 +332,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -358,15 +358,15 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -378,9 +378,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray, UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -388,7 +388,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/sm/UmlBaseClass.h b/genplugouts/sm/UmlBaseClass.h
index a5e04eb32..48e27af8c 100644
--- a/genplugouts/sm/UmlBaseClass.h
+++ b/genplugouts/sm/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+#include <QVector>
+#include <QByteArray>
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -54,7 +54,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -77,7 +77,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -100,7 +100,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -204,7 +204,7 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -217,13 +217,13 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     friend class UmlBaseRelation;
     friend class UmlBaseArtifact;
 
 private:
-    static Q3Dict<UmlClass> _classes;
+    static QHash<QByteArray,UmlClass*> _classes;
 
     bool _abstract;
 
@@ -264,7 +264,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/sm/UmlBaseClassDiagram.h b/genplugouts/sm/UmlBaseClassDiagram.h
index e0990d31f..70fcdff9d 100644
--- a/genplugouts/sm/UmlBaseClassDiagram.h
+++ b/genplugouts/sm/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseClassInstance.cpp b/genplugouts/sm/UmlBaseClassInstance.cpp
index 772b8fe6b..4c185c3fb 100644
--- a/genplugouts/sm/UmlBaseClassInstance.cpp
+++ b/genplugouts/sm/UmlBaseClassInstance.cpp
@@ -7,7 +7,7 @@
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -46,7 +46,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
     else     return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -61,7 +61,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -76,16 +76,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QVector<UmlAttribute *> &result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -96,7 +96,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -106,7 +106,7 @@ bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance
 
 bool UmlBaseClassInstance::remove_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/genplugouts/sm/UmlBaseClassInstance.h b/genplugouts/sm/UmlBaseClassInstance.h
index 3dde839de..ddf201b9b 100644
--- a/genplugouts/sm/UmlBaseClassInstance.h
+++ b/genplugouts/sm/UmlBaseClassInstance.h
@@ -6,9 +6,9 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QList>
+#include <QVector>
+#include <QByteArray>
 
 class UmlClassInstance;
 class UmlClass;
@@ -40,17 +40,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QVector<UmlAttribute *> & result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result);
 
     // Remove the slot if the value is an empty string.
     // Else set the value for the given attribute, replacing it
@@ -87,7 +87,7 @@ class UmlBaseClassInstance : public UmlItem
     virtual void read_uml_();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassInstance(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseClassInstance(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseClassItem.cpp b/genplugouts/sm/UmlBaseClassItem.cpp
index 020f477ee..4b2822582 100644
--- a/genplugouts/sm/UmlBaseClassItem.cpp
+++ b/genplugouts/sm/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseClassItem::phpDecl()
+const QByteArray & UmlBaseClassItem::phpDecl()
 {
     read_if_needed_();
 
@@ -47,7 +47,7 @@ bool UmlBaseClassItem::set_PhpDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/sm/UmlBaseClassItem.h b/genplugouts/sm/UmlBaseClassItem.h
index 8cbf6f63c..3af201905 100644
--- a/genplugouts/sm/UmlBaseClassItem.h
+++ b/genplugouts/sm/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPHP
     //  return the Php defininition
 
-    const Q3CString & phpDecl();
+    const QByteArray & phpDecl();
 
     //  to set the Php definition
     //
@@ -45,7 +45,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -61,24 +61,24 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_decl;
+    QByteArray _php_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/sm/UmlBaseClassMember.cpp b/genplugouts/sm/UmlBaseClassMember.cpp
index da9a56bb5..47325ddfb 100644
--- a/genplugouts/sm/UmlBaseClassMember.cpp
+++ b/genplugouts/sm/UmlBaseClassMember.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlBaseClassMember::isClassMember()
 {
     read_if_needed_();
@@ -70,7 +70,7 @@ bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
 #endif
 
 #ifdef WITHJAVA
-Q3CString UmlBaseClassMember::javaAnnotations()
+QByteArray UmlBaseClassMember::javaAnnotations()
 {
     read_if_needed_();
 
@@ -83,7 +83,7 @@ bool UmlBaseClassMember::set_JavaAnnotations(const char * v)
 }
 #endif
 
-const Q3CString & UmlBaseClassMember::constraint()
+const QByteArray & UmlBaseClassMember::constraint()
 {
     read_if_needed_();
     return _constraint;
diff --git a/genplugouts/sm/UmlBaseClassMember.h b/genplugouts/sm/UmlBaseClassMember.h
index 26531efd5..5f0f402b4 100644
--- a/genplugouts/sm/UmlBaseClassMember.h
+++ b/genplugouts/sm/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -57,7 +57,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 #ifdef WITHJAVA
     // returns the Java annotations
-    Q3CString javaAnnotations();
+    QByteArray javaAnnotations();
 
     // set the Java annotations
     //
@@ -66,7 +66,7 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
     // return the constraint
-    const Q3CString & constraint();
+    const QByteArray & constraint();
 
     // set the constraint
     //
@@ -87,7 +87,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
@@ -110,10 +110,10 @@ class UmlBaseClassMember : public UmlClassItem
 
 private:
 #ifdef WITHJAVA
-    Q3CString _java_annotation;
+    QByteArray _java_annotation;
 #endif
 
-    Q3CString _constraint;
+    QByteArray _constraint;
 
 };
 
diff --git a/genplugouts/sm/UmlBaseClassView.h b/genplugouts/sm/UmlBaseClassView.h
index 43fb0714a..02d8c4092 100644
--- a/genplugouts/sm/UmlBaseClassView.h
+++ b/genplugouts/sm/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlView
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseCollaborationDiagram.h b/genplugouts/sm/UmlBaseCollaborationDiagram.h
index 0a49b41e6..1a1df124d 100644
--- a/genplugouts/sm/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/sm/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseComponent.cpp b/genplugouts/sm/UmlBaseComponent.cpp
index 0fe6d1aed..fa399b975 100644
--- a/genplugouts/sm/UmlBaseComponent.cpp
+++ b/genplugouts/sm/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizedClasses()
 {
     read_if_needed_();
 
     return _realized;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realized, provided, required);
@@ -96,18 +96,18 @@ void UmlBaseComponent::read_uml_()
     _realized.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realized.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realized[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/sm/UmlBaseComponent.h b/genplugouts/sm/UmlBaseComponent.h
index 8b0bbc531..ed356fab3 100644
--- a/genplugouts/sm/UmlBaseComponent.h
+++ b/genplugouts/sm/UmlBaseComponent.h
@@ -1,11 +1,10 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -36,18 +35,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realized classes
-    const Q3PtrVector<UmlClass> & realizedClasses();
+    const QVector<UmlClass*> & realizedClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realized, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +56,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realized;
+    QVector<UmlClass*> _realized;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -70,11 +69,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/sm/UmlBaseComponentDiagram.h b/genplugouts/sm/UmlBaseComponentDiagram.h
index 43466da7c..c5ed8d29d 100644
--- a/genplugouts/sm/UmlBaseComponentDiagram.h
+++ b/genplugouts/sm/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseComponentView.h b/genplugouts/sm/UmlBaseComponentView.h
index 0b9d2d0bd..d074347f7 100644
--- a/genplugouts/sm/UmlBaseComponentView.h
+++ b/genplugouts/sm/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseDeepHistoryPseudoState.h b/genplugouts/sm/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..c23d5ec0a 100644
--- a/genplugouts/sm/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/sm/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseDeployment.h b/genplugouts/sm/UmlBaseDeployment.h
index b268e0c17..63610d5b6 100644
--- a/genplugouts/sm/UmlBaseDeployment.h
+++ b/genplugouts/sm/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseDeploymentDiagram.h b/genplugouts/sm/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..d8e4e7a67 100644
--- a/genplugouts/sm/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/sm/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseDeploymentView.h b/genplugouts/sm/UmlBaseDeploymentView.h
index f5213d38a..11fe6d475 100644
--- a/genplugouts/sm/UmlBaseDeploymentView.h
+++ b/genplugouts/sm/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseDiagram.cpp b/genplugouts/sm/UmlBaseDiagram.cpp
index e1ceb269d..d0fb2d705 100644
--- a/genplugouts/sm/UmlBaseDiagram.cpp
+++ b/genplugouts/sm/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/sm/UmlBaseDiagram.h b/genplugouts/sm/UmlBaseDiagram.h
index 9cf05ff22..824a9f60f 100644
--- a/genplugouts/sm/UmlBaseDiagram.h
+++ b/genplugouts/sm/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseEntryPointPseudoState.h b/genplugouts/sm/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..573ac64d4 100644
--- a/genplugouts/sm/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/sm/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseExitPointPseudoState.h b/genplugouts/sm/UmlBaseExitPointPseudoState.h
index ff2ad12bc..0b8304951 100644
--- a/genplugouts/sm/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/sm/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseExpansionNode.h b/genplugouts/sm/UmlBaseExpansionNode.h
index 41bcbece2..dd338c129 100644
--- a/genplugouts/sm/UmlBaseExpansionNode.h
+++ b/genplugouts/sm/UmlBaseExpansionNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityObject.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExpansionNode;
 class UmlExpansionRegion;
@@ -25,7 +25,7 @@ class UmlBaseExpansionNode : public UmlActivityObject
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionNode(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBaseExpansionNode(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseExpansionRegion.h b/genplugouts/sm/UmlBaseExpansionRegion.h
index 913b4ec4a..a89b8f471 100644
--- a/genplugouts/sm/UmlBaseExpansionRegion.h
+++ b/genplugouts/sm/UmlBaseExpansionRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "anExpansionKind.h"
 
 class UmlExpansionRegion;
@@ -26,7 +26,7 @@ class UmlBaseExpansionRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseExpansionRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 
diff --git a/genplugouts/sm/UmlBaseExtraClassMember.cpp b/genplugouts/sm/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/sm/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/sm/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/sm/UmlBaseExtraClassMember.h b/genplugouts/sm/UmlBaseExtraClassMember.h
index e2b9d4f30..fbe19e1bf 100644
--- a/genplugouts/sm/UmlBaseExtraClassMember.h
+++ b/genplugouts/sm/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/sm/UmlBaseFinalState.h b/genplugouts/sm/UmlBaseFinalState.h
index 16e0816cf..5150aa9e6 100644
--- a/genplugouts/sm/UmlBaseFinalState.h
+++ b/genplugouts/sm/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseFlow.cpp b/genplugouts/sm/UmlBaseFlow.cpp
index 5da07fbe8..b05e3eb62 100644
--- a/genplugouts/sm/UmlBaseFlow.cpp
+++ b/genplugouts/sm/UmlBaseFlow.cpp
@@ -4,7 +4,7 @@
 #include "UmlFlow.h"
 #include "UmlActivityNode.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseFlow::kind()
 {
@@ -29,7 +29,7 @@ UmlActivityNode * UmlBaseFlow::target()
     return _target;
 }
 
-const Q3CString & UmlBaseFlow::weight()
+const QByteArray & UmlBaseFlow::weight()
 {
     read_if_needed_();
     return _uml.weight;
@@ -40,7 +40,7 @@ bool UmlBaseFlow::set_Weight(const char * v)
     return set_it_(_uml.weight, v, setUmlActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::guard()
+const QByteArray & UmlBaseFlow::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -51,7 +51,7 @@ bool UmlBaseFlow::set_Guard(const char * v)
     return set_it_(_uml.guard, v, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::selection()
+const QByteArray & UmlBaseFlow::selection()
 {
     read_if_needed_();
     return _uml.selection;
@@ -62,7 +62,7 @@ bool UmlBaseFlow::set_Selection(const char * v)
     return set_it_(_uml.selection, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::transformation()
+const QByteArray & UmlBaseFlow::transformation()
 {
     read_if_needed_();
     return _uml.transformation;
@@ -74,7 +74,7 @@ bool UmlBaseFlow::set_Transformation(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseFlow::cppWeight()
+const QByteArray & UmlBaseFlow::cppWeight()
 {
     read_if_needed_();
     return _cpp.weight;
@@ -85,7 +85,7 @@ bool UmlBaseFlow::set_CppWeight(const char * v)
     return set_it_(_cpp.weight, v, setCppActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppGuard()
+const QByteArray & UmlBaseFlow::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -96,7 +96,7 @@ bool UmlBaseFlow::set_CppGuard(const char * v)
     return set_it_(_cpp.guard, v, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppSelection()
+const QByteArray & UmlBaseFlow::cppSelection()
 {
     read_if_needed_();
     return _cpp.selection;
@@ -107,7 +107,7 @@ bool UmlBaseFlow::set_CppSelection(const char * v)
     return set_it_(_cpp.selection, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppTransformation()
+const QByteArray & UmlBaseFlow::cppTransformation()
 {
     read_if_needed_();
     return _cpp.transformation;
@@ -120,7 +120,7 @@ bool UmlBaseFlow::set_CppTransformation(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseFlow::javaWeight()
+const QByteArray & UmlBaseFlow::javaWeight()
 {
     read_if_needed_();
     return _java.weight;
@@ -131,7 +131,7 @@ bool UmlBaseFlow::set_JavaWeight(const char * v)
     return set_it_(_java.weight, v, setJavaActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaGuard()
+const QByteArray & UmlBaseFlow::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -142,7 +142,7 @@ bool UmlBaseFlow::set_JavaGuard(const char * v)
     return set_it_(_java.guard, v, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaSelection()
+const QByteArray & UmlBaseFlow::javaSelection()
 {
     read_if_needed_();
     return _java.selection;
@@ -153,7 +153,7 @@ bool UmlBaseFlow::set_JavaSelection(const char * v)
     return set_it_(_java.selection, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaTransformation()
+const QByteArray & UmlBaseFlow::javaTransformation()
 {
     read_if_needed_();
     return _java.transformation;
diff --git a/genplugouts/sm/UmlBaseFlow.h b/genplugouts/sm/UmlBaseFlow.h
index b50ce3323..a9ff6db60 100644
--- a/genplugouts/sm/UmlBaseFlow.h
+++ b/genplugouts/sm/UmlBaseFlow.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "FlowBehavior.h"
 
 class UmlFlow;
@@ -27,7 +27,7 @@ class UmlBaseFlow : public UmlItem
     virtual UmlActivityNode * target();
 
     // return the weight in OCL
-    const Q3CString & weight();
+    const QByteArray & weight();
 
     // set the weight in OCL
     //
@@ -35,7 +35,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Weight(const char * v);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Guard(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Selection(const char * v);
 
     // return the transformation in OCL
-    const Q3CString & transformation();
+    const QByteArray & transformation();
 
     // set the transformation in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHCPP
     // return the weight in C++
-    const Q3CString & cppWeight();
+    const QByteArray & cppWeight();
 
     // set the weight in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppWeight(const char * v);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppGuard(const char * v);
 
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppSelection(const char * v);
 
     // return the transformation in C++
-    const Q3CString & cppTransformation();
+    const QByteArray & cppTransformation();
 
     // set the transformation in C++
     //
@@ -94,7 +94,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHJAVA
     // return the weight in Java
-    const Q3CString & javaWeight();
+    const QByteArray & javaWeight();
 
     // set the weight in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaWeight(const char * v);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -110,7 +110,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaGuard(const char * v);
 
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -118,7 +118,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaSelection(const char * v);
 
     // return the transformation in Java
-    const Q3CString & javaTransformation();
+    const QByteArray & javaTransformation();
 
     // set the transformation in Java
     //
@@ -161,7 +161,7 @@ class UmlBaseFlow : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlow(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseFlow(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseForkPseudoState.h b/genplugouts/sm/UmlBaseForkPseudoState.h
index 009499bfa..d5b0eba99 100644
--- a/genplugouts/sm/UmlBaseForkPseudoState.h
+++ b/genplugouts/sm/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseFormalParameter.h b/genplugouts/sm/UmlBaseFormalParameter.h
index 84867aec4..176f53aab 100644
--- a/genplugouts/sm/UmlBaseFormalParameter.h
+++ b/genplugouts/sm/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -35,10 +35,10 @@ class UmlBaseFormalParameter
     friend class UmlBaseClass;
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/sm/UmlBaseInitialPseudoState.h b/genplugouts/sm/UmlBaseInitialPseudoState.h
index 88dae1cc6..84c2904dd 100644
--- a/genplugouts/sm/UmlBaseInitialPseudoState.h
+++ b/genplugouts/sm/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseInterruptibleActivityRegion.h b/genplugouts/sm/UmlBaseInterruptibleActivityRegion.h
index 70f988488..92a7d4564 100644
--- a/genplugouts/sm/UmlBaseInterruptibleActivityRegion.h
+++ b/genplugouts/sm/UmlBaseInterruptibleActivityRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInterruptibleActivityRegion;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInterruptibleActivityRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseItem.cpp b/genplugouts/sm/UmlBaseItem.cpp
index 61b4a71df..588ab165e 100644
--- a/genplugouts/sm/UmlBaseItem.cpp
+++ b/genplugouts/sm/UmlBaseItem.cpp
@@ -58,9 +58,9 @@
 #include "UmlActivityControlNodeClasses.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     UmlCom::send_cmd(_identifier, setNameCmd, (const char *)s); //[rageek] Fix prototype
 
@@ -72,26 +72,26 @@ bool UmlBaseItem::set_Name(const Q3CString & s)
         return FALSE;
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -107,7 +107,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -127,11 +127,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -141,7 +141,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -149,10 +149,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -163,7 +163,7 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -182,7 +182,7 @@ bool UmlBaseItem::moveAfter(const UmlItem * x)
         return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -194,7 +194,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
     return (int) UmlCom::read_unsigned();
@@ -212,11 +212,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -238,7 +238,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -267,17 +267,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -329,16 +329,21 @@ void UmlBaseItem::read_if_needed_()
 
 UmlItem * UmlBaseItem::create_(anItemKind k, const char * s)
 {
+    //habip read all data if there is
+    QByteArray garbageData = UmlCom::read_all();
+    if(!garbageData.isEmpty())
+    {
+        int garbageCount = garbageData.count();
+        Q_UNUSED(garbageCount);
+        printf("!!!!garbage data\r\n");
+    }
     UmlCom::send_cmd(_identifier, createCmd, k, s);
 
     UmlItem * result = UmlBaseItem::read_();
 
     if (result != 0) {
         if (_children != 0) {
-            unsigned n = _children->count();
-
-            _children->resize(n + 1);
-            _children->insert(n, result);
+            _children->append(result);
         }
 
         ((UmlBaseItem *) result)->_parent = (UmlItem *) this;
@@ -354,9 +359,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -392,7 +397,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -446,7 +451,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -483,7 +488,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -705,20 +710,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/sm/UmlBaseItem.h b/genplugouts/sm/UmlBaseItem.h
index 1f7c75d69..38642816d 100644
--- a/genplugouts/sm/UmlBaseItem.h
+++ b/genplugouts/sm/UmlBaseItem.h
@@ -3,10 +3,10 @@
 
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+#include <QByteArray>
+#include <QVector>
+
+#include <QHash>
 #include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
@@ -37,35 +37,35 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -90,16 +90,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -134,7 +134,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -142,7 +142,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -156,7 +156,7 @@ class UmlBaseItem
     //  item), UmlNcRelations (their target is the current item) or
     //  UmlComponents (the associated component of the current item when it is
     //  a UmlClass, a non source component associated with the current one).
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // return a constant identifier, it is unique within a given
     // kind of element (two classes can't have the same identifiers, but
@@ -182,7 +182,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
     friend class UmlBaseClassItem;
     friend class UmlBaseAttribute;
@@ -226,21 +226,21 @@ class UmlBaseItem
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
 protected:
@@ -302,7 +302,7 @@ class UmlBaseItem
 
     //internal, do NOT use it
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
 
@@ -315,7 +315,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/sm/UmlBaseJoinPseudoState.h b/genplugouts/sm/UmlBaseJoinPseudoState.h
index 31976dfff..966ec680f 100644
--- a/genplugouts/sm/UmlBaseJoinPseudoState.h
+++ b/genplugouts/sm/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseJunctionPseudoState.h b/genplugouts/sm/UmlBaseJunctionPseudoState.h
index 9b76d88e7..9517f4922 100644
--- a/genplugouts/sm/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/sm/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseNcRelation.h b/genplugouts/sm/UmlBaseNcRelation.h
index 7418e3406..75625ecdc 100644
--- a/genplugouts/sm/UmlBaseNcRelation.h
+++ b/genplugouts/sm/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/sm/UmlBaseNode.h b/genplugouts/sm/UmlBaseNode.h
index 07a980e66..f033d57b6 100644
--- a/genplugouts/sm/UmlBaseNode.h
+++ b/genplugouts/sm/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/sm/UmlBaseObjectDiagram.h b/genplugouts/sm/UmlBaseObjectDiagram.h
index dfe6983ef..7cc404a4b 100644
--- a/genplugouts/sm/UmlBaseObjectDiagram.h
+++ b/genplugouts/sm/UmlBaseObjectDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlObjectDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseObjectDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseObjectDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseObjectDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseOnSignalAction.cpp b/genplugouts/sm/UmlBaseOnSignalAction.cpp
index 8c887e113..aec5db337 100644
--- a/genplugouts/sm/UmlBaseOnSignalAction.cpp
+++ b/genplugouts/sm/UmlBaseOnSignalAction.cpp
@@ -2,9 +2,9 @@
 #include "UmlCom.h"
 #include "UmlBaseOnSignalAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseOnSignalAction::signal()
+const QByteArray & UmlBaseOnSignalAction::signal()
 {
     read_if_needed_();
     return _signal;
@@ -16,7 +16,7 @@ bool UmlBaseOnSignalAction::set_Signal(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOnSignalAction::cppSignal()
+const QByteArray & UmlBaseOnSignalAction::cppSignal()
 {
     read_if_needed_();
     return _cpp_signal;
@@ -29,7 +29,7 @@ bool UmlBaseOnSignalAction::set_CppSignal(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOnSignalAction::javaSignal()
+const QByteArray & UmlBaseOnSignalAction::javaSignal()
 {
     read_if_needed_();
     return _java_signal;
diff --git a/genplugouts/sm/UmlBaseOnSignalAction.h b/genplugouts/sm/UmlBaseOnSignalAction.h
index 6ad499b79..bd7be38ca 100644
--- a/genplugouts/sm/UmlBaseOnSignalAction.h
+++ b/genplugouts/sm/UmlBaseOnSignalAction.h
@@ -3,19 +3,19 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlBaseOnSignalAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOnSignalAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOnSignalAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the signal
-    const Q3CString & signal();
+    const QByteArray & signal();
 
     // set the signal
     //
@@ -24,7 +24,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the signal in C++
-    const Q3CString & cppSignal();
+    const QByteArray & cppSignal();
 
     // set the signal in C++
     //
@@ -34,7 +34,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the signal in Java
-    const Q3CString & javaSignal();
+    const QByteArray & javaSignal();
 
     // set the signal in Java
     //
@@ -52,14 +52,14 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 
 private:
-    Q3CString _signal;
+    QByteArray _signal;
 
 #ifdef WITHCPP
-    Q3CString _cpp_signal;
+    QByteArray _cpp_signal;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_signal;
+    QByteArray _java_signal;
 #endif
 
 
diff --git a/genplugouts/sm/UmlBaseOperation.cpp b/genplugouts/sm/UmlBaseOperation.cpp
index 9bcbcaf27..d10b6b370 100644
--- a/genplugouts/sm/UmlBaseOperation.cpp
+++ b/genplugouts/sm/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -72,7 +72,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -86,7 +86,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -100,7 +100,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -123,7 +123,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -136,7 +136,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -150,7 +150,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -263,7 +263,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -275,7 +275,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -289,7 +289,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -321,6 +321,25 @@ bool UmlBaseOperation::set_CppGetSetFrozen(bool v)
         return FALSE;
 }
 #endif
+#ifdef WITHCPP
+bool UmlBaseOperation::cppContextualBodyIndent()
+{
+    read_if_needed_();
+    return _cpp_contextual_body_indent;
+}
+
+bool UmlBaseOperation::set_CppContextualBodyIndent(bool v)
+{
+    bool vv;
+
+    if (set_it_(vv, v, setCppContextualBodyIndentCmd)) {
+        _cpp_contextual_body_indent = v;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+#endif
 
 #ifdef WITHJAVA
 bool UmlBaseOperation::isJavaFinal()
@@ -361,7 +380,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -371,7 +390,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -385,7 +404,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -438,7 +457,7 @@ bool UmlBaseOperation::set_isPhpFinal(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::phpDef()
+const QByteArray & UmlBaseOperation::phpDef()
 {
     return phpDecl();
 }
@@ -448,7 +467,7 @@ bool UmlBaseOperation::set_PhpDef(const char * s)
     return set_PhpDecl(s);
 }
 
-Q3CString UmlBaseOperation::phpBody()
+QByteArray UmlBaseOperation::phpBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, phpBodyCmd);
@@ -462,7 +481,7 @@ bool UmlBaseOperation::set_PhpBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::phpNameSpec()
+const QByteArray & UmlBaseOperation::phpNameSpec()
 {
     read_if_needed_();
 
@@ -515,7 +534,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
@@ -627,6 +646,7 @@ void UmlBaseOperation::read_cpp_()
   _cpp_def = UmlCom::read_string();
     _cpp_name_spec = UmlCom::read_string();
     _cpp_get_set_frozen = UmlCom::read_bool();
+    _cpp_contextual_body_indent = UmlCom::read_bool();
 }
 #endif
 
diff --git a/genplugouts/sm/UmlBaseOperation.h b/genplugouts/sm/UmlBaseOperation.h
index 56a2689b5..64b633d0d 100644
--- a/genplugouts/sm/UmlBaseOperation.h
+++ b/genplugouts/sm/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+#include <QByteArray>
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -52,7 +52,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -70,7 +70,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -130,7 +130,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -139,9 +139,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -151,7 +151,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -170,6 +170,16 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppGetSetFrozen(bool v);
 #endif
 
+#ifdef WITHCPP
+    // indicate if the indent of the C++ body is contextual or absolute
+    bool cppContextualBodyIndent();
+
+    // set if the indent of the C++ body is contextual or absolute
+    //
+    // On error return FALSE in C++, produce a RuntimeException in Java
+    bool set_CppContextualBodyIndent(bool v);
+#endif
+
 #ifdef WITHJAVA
     // returns TRUE if the operation is declared final in JAVA
     bool isJavaFinal();
@@ -189,7 +199,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -198,9 +208,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -210,7 +220,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -240,7 +250,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Php, notes that it is
     // already made by the inherited PhpDecl operation
-    const Q3CString & phpDef();
+    const QByteArray & phpDef();
 
     // sets the operation's definition in Php, notes that it is
     // already made by the inherited set_PhpDecl operation
@@ -249,9 +259,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PhpDef(const char * s);
 
     // returns the operation's body in Php++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString phpBody();
+    QByteArray phpBody();
 
     // sets the operation's body in Php, useless if the def does not
     // contains ${body}
@@ -261,7 +271,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
-    const Q3CString & phpNameSpec();
+    const QByteArray & phpNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
@@ -291,7 +301,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -359,32 +369,48 @@ class UmlBaseOperation : public UmlClassMember
     bool _php_get_set_frozen : 1;
 #endif
 
-#ifdef WITHCPP
+#ifdef WITHIDL
     bool _idl_get_set_frozen : 1;
 #endif
 
+#ifdef WITHCPP
+    bool _cpp_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHJAVA
+    bool _java_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHPHP
+    bool _php_contextual_body_indent : 1;
+#endif
+
+#ifdef WITHPYTHON
+    bool _python_contextual_body_indent : 1;
+#endif
+
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_name_spec;
+    QByteArray _php_name_spec;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -396,7 +422,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
@@ -428,7 +454,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/sm/UmlBasePackage.cpp b/genplugouts/sm/UmlBasePackage.cpp
index 43497346a..f7d68ae2a 100644
--- a/genplugouts/sm/UmlBasePackage.cpp
+++ b/genplugouts/sm/UmlBasePackage.cpp
@@ -9,7 +9,7 @@
 #include "PackageGlobalCmd.h"
 ////#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -40,125 +40,125 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findNamespace(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPackage(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBasePackage::phpDir()
+const QByteArray & UmlBasePackage::phpDir()
 {
     read_if_needed_();
 
     return _php_dir;
 }
 
-bool UmlBasePackage::set_PhpDir(const Q3CString & s)
+bool UmlBasePackage::set_PhpDir(const QByteArray & s)
 {
     return set_it_(_php_dir, s, setPhpDirCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findModule(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
@@ -183,7 +183,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/sm/UmlBasePackage.h b/genplugouts/sm/UmlBasePackage.h
index 615b96228..1da8b6984 100644
--- a/genplugouts/sm/UmlBasePackage.h
+++ b/genplugouts/sm/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPackage;
 class UmlDiagram;
@@ -34,100 +34,100 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findNamespace(const Q3CString & n) const;
+    UmlPackage * findNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPackage(const Q3CString & n) const;
+    UmlPackage * findPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHPHP
     // returns the path where the PHP files are generated by the
     // PHP generator.
-    const Q3CString & phpDir();
+    const QByteArray & phpDir();
 
     // to set the path where the PHP files are generated by the
     // PHP generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpDir(const Q3CString & s);
+    bool set_PhpDir(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findModule(const Q3CString & n) const;
+    UmlPackage * findModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -140,12 +140,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -160,29 +160,29 @@ class UmlBasePackage : public UmlItem
     UmlDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHPHP
-    Q3CString _php_dir;
+    QByteArray _php_dir;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -217,11 +217,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/sm/UmlBaseParameter.h b/genplugouts/sm/UmlBaseParameter.h
index 71202a64d..0b04b0218 100644
--- a/genplugouts/sm/UmlBaseParameter.h
+++ b/genplugouts/sm/UmlBaseParameter.h
@@ -2,16 +2,16 @@
 #define _UMLBASEPARAMETER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 #include "aDirection.h"
 
 //  Represent an operation's parameter
 
 struct UmlBaseParameter {
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
     UmlTypeSpec type;
 
diff --git a/genplugouts/sm/UmlBaseParameterSet.cpp b/genplugouts/sm/UmlBaseParameterSet.cpp
index 307417d45..2c680249f 100644
--- a/genplugouts/sm/UmlBaseParameterSet.cpp
+++ b/genplugouts/sm/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         if (_defined) _pins = v;
@@ -43,6 +43,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/sm/UmlBaseParameterSet.h b/genplugouts/sm/UmlBaseParameterSet.h
index 71e77cbfe..3c4d756f9 100644
--- a/genplugouts/sm/UmlBaseParameterSet.h
+++ b/genplugouts/sm/UmlBaseParameterSet.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
+#include <QByteArray>
+#include <QVector>
 
 class UmlActivityParameter;
 class UmlActivityAction;
@@ -27,16 +27,16 @@ class UmlBaseParameterSet : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseParameterSet(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseParameterSet(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +48,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/sm/UmlBasePinParameter.h b/genplugouts/sm/UmlBasePinParameter.h
index d629b7122..f4fc7aadf 100644
--- a/genplugouts/sm/UmlBasePinParameter.h
+++ b/genplugouts/sm/UmlBasePinParameter.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityObject.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aDirection.h"
 #include "aParameterEffectKind.h"
 
@@ -11,7 +11,7 @@ class UmlBasePinParameter : public UmlActivityObject
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePinParameter(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBasePinParameter(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 
diff --git a/genplugouts/sm/UmlBaseRegion.h b/genplugouts/sm/UmlBaseRegion.h
index 58a9f8b78..9133a76f5 100644
--- a/genplugouts/sm/UmlBaseRegion.h
+++ b/genplugouts/sm/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseRelation.cpp b/genplugouts/sm/UmlBaseRelation.cpp
index ddeab35f8..d3815f7c7 100644
--- a/genplugouts/sm/UmlBaseRelation.cpp
+++ b/genplugouts/sm/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -70,7 +70,7 @@ bool UmlBaseRelation::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -82,7 +82,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -124,7 +124,7 @@ bool UmlBaseRelation::set_Association(const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -136,7 +136,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -268,7 +268,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/sm/UmlBaseRelation.h b/genplugouts/sm/UmlBaseRelation.h
index f181f68da..324761e10 100644
--- a/genplugouts/sm/UmlBaseRelation.h
+++ b/genplugouts/sm/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlRelation;
@@ -44,7 +44,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -56,7 +56,7 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
@@ -70,7 +70,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_Association(const UmlTypeSpec & t);
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -78,7 +78,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -141,7 +141,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -180,13 +180,13 @@ class UmlBaseRelation : public UmlClassMember
 
     aRelationKind _rel_kind : 8;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlTypeSpec _association;
 
@@ -198,7 +198,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -232,11 +232,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/sm/UmlBaseSequenceDiagram.h b/genplugouts/sm/UmlBaseSequenceDiagram.h
index 2025fab49..30b9e14c7 100644
--- a/genplugouts/sm/UmlBaseSequenceDiagram.h
+++ b/genplugouts/sm/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseShallowHistoryPseudoState.h b/genplugouts/sm/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..64dbcd9c1 100644
--- a/genplugouts/sm/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/sm/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseState.cpp b/genplugouts/sm/UmlBaseState.cpp
index c47523cff..05370f44f 100644
--- a/genplugouts/sm/UmlBaseState.cpp
+++ b/genplugouts/sm/UmlBaseState.cpp
@@ -4,7 +4,7 @@
 #include "UmlState.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -27,7 +27,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -38,7 +38,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -50,7 +50,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -61,7 +61,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -72,7 +72,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -85,7 +85,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -96,7 +96,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -107,7 +107,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/sm/UmlBaseState.h b/genplugouts/sm/UmlBaseState.h
index efc98a1af..f2592b9c0 100644
--- a/genplugouts/sm/UmlBaseState.h
+++ b/genplugouts/sm/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "StateBehavior.h"
 
 class UmlState;
@@ -26,13 +26,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -48,7 +48,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -57,7 +57,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -65,7 +65,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -73,7 +73,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -83,7 +83,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -91,7 +91,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -99,7 +99,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/sm/UmlBaseStateAction.cpp b/genplugouts/sm/UmlBaseStateAction.cpp
index 1f080b00e..1879387b9 100644
--- a/genplugouts/sm/UmlBaseStateAction.cpp
+++ b/genplugouts/sm/UmlBaseStateAction.cpp
@@ -4,7 +4,7 @@
 #include "UmlStateAction.h"
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlState * parent)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -28,7 +28,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -41,7 +41,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/sm/UmlBaseStateAction.h b/genplugouts/sm/UmlBaseStateAction.h
index 0432258b3..a18444c54 100644
--- a/genplugouts/sm/UmlBaseStateAction.h
+++ b/genplugouts/sm/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateAction;
 class UmlState;
@@ -25,13 +25,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -50,7 +50,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -68,14 +68,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/sm/UmlBaseStateDiagram.h b/genplugouts/sm/UmlBaseStateDiagram.h
index ea7e37ee0..f165c5fdf 100644
--- a/genplugouts/sm/UmlBaseStateDiagram.h
+++ b/genplugouts/sm/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseTerminatePseudoState.h b/genplugouts/sm/UmlBaseTerminatePseudoState.h
index e8553f4be..5959ed022 100644
--- a/genplugouts/sm/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/sm/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseTransition.cpp b/genplugouts/sm/UmlBaseTransition.cpp
index 8fe2570a0..7dec536d7 100644
--- a/genplugouts/sm/UmlBaseTransition.cpp
+++ b/genplugouts/sm/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_IsExternal(bool v)
     return set_it_(_is_external, v, setIsCppExternalCmd);
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -61,7 +61,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -95,7 +95,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -130,7 +130,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/sm/UmlBaseTransition.h b/genplugouts/sm/UmlBaseTransition.h
index cab4fd850..2f8f977be 100644
--- a/genplugouts/sm/UmlBaseTransition.h
+++ b/genplugouts/sm/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -35,7 +35,7 @@ class UmlBaseTransition : public UmlItem
     bool set_IsExternal(bool v);
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -86,7 +86,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -94,7 +94,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
@@ -151,7 +151,7 @@ class UmlBaseTransition : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTransition(void * id, const Q3CString & n) : UmlItem(id, n) {
+    UmlBaseTransition(void * id, const QByteArray & n) : UmlItem(id, n) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBaseTypeSpec.cpp b/genplugouts/sm/UmlBaseTypeSpec.cpp
index 4070a4a45..cddda026a 100644
--- a/genplugouts/sm/UmlBaseTypeSpec.cpp
+++ b/genplugouts/sm/UmlBaseTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlBaseTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseTypeSpec::toString() const
+const QByteArray & UmlBaseTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/sm/UmlBaseTypeSpec.h b/genplugouts/sm/UmlBaseTypeSpec.h
index 16fce750a..da515699f 100644
--- a/genplugouts/sm/UmlBaseTypeSpec.h
+++ b/genplugouts/sm/UmlBaseTypeSpec.h
@@ -2,7 +2,7 @@
 #define _UMLBASETYPESPEC_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 
@@ -17,10 +17,10 @@ class UmlBaseTypeSpec
     UmlBaseTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     UmlClass * type;
 
diff --git a/genplugouts/sm/UmlBaseUseCase.cpp b/genplugouts/sm/UmlBaseUseCase.cpp
index 5e1d6d1b3..c85af9ddc 100644
--- a/genplugouts/sm/UmlBaseUseCase.cpp
+++ b/genplugouts/sm/UmlBaseUseCase.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlUseCase * UmlBaseUseCase::create(UmlItem * parent, const char * s)
 {
     return (UmlUseCase *) parent->create_(anUseCase, s);
@@ -35,7 +35,7 @@ bool UmlBaseUseCase::set_AssociatedDiagram(UmlUseCaseDiagram * d)
         return FALSE;
 }
 
-const Q3CString & UmlBaseUseCase::extensionPoints()
+const QByteArray & UmlBaseUseCase::extensionPoints()
 {
     read_if_needed_();
     return _extension_points;
diff --git a/genplugouts/sm/UmlBaseUseCase.h b/genplugouts/sm/UmlBaseUseCase.h
index 9bd21249f..d642c7915 100644
--- a/genplugouts/sm/UmlBaseUseCase.h
+++ b/genplugouts/sm/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -32,7 +32,7 @@ class UmlBaseUseCase : public UmlItem
     bool set_AssociatedDiagram(UmlUseCaseDiagram * d);
 
     // return the extension points
-    const Q3CString & extensionPoints();
+    const QByteArray & extensionPoints();
 
     // set the extension points
     //
@@ -41,7 +41,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
-    Q3CString _extension_points;
+    QByteArray _extension_points;
 
     UmlUseCaseDiagram * _assoc_diagram;
 
@@ -52,7 +52,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseUseCaseDiagram.h b/genplugouts/sm/UmlBaseUseCaseDiagram.h
index fd2481e49..7f01e89e0 100644
--- a/genplugouts/sm/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/sm/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseUseCaseView.h b/genplugouts/sm/UmlBaseUseCaseView.h
index 19d836b64..790548691 100644
--- a/genplugouts/sm/UmlBaseUseCaseView.h
+++ b/genplugouts/sm/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseView;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlBaseView.h b/genplugouts/sm/UmlBaseView.h
index ee8c0dd38..70e9ba7b1 100644
--- a/genplugouts/sm/UmlBaseView.h
+++ b/genplugouts/sm/UmlBaseView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlBaseView : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseView(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseView(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlBuiltin.h b/genplugouts/sm/UmlBuiltin.h
index 4f5c16f41..79815c251 100644
--- a/genplugouts/sm/UmlBuiltin.h
+++ b/genplugouts/sm/UmlBuiltin.h
@@ -2,31 +2,31 @@
 #define _UMLBUILTIN_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/sm/UmlChoicePseudoState.cpp b/genplugouts/sm/UmlChoicePseudoState.cpp
index 1cada3392..402eb408e 100644
--- a/genplugouts/sm/UmlChoicePseudoState.cpp
+++ b/genplugouts/sm/UmlChoicePseudoState.cpp
@@ -5,13 +5,13 @@
 
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlChoicePseudoState::generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent)
+void UmlChoicePseudoState::generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent)
 {
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3PtrList<UmlTransition> trs;
-    unsigned index;
+    const QVector<UmlItem*> ch = children();
+    QList<UmlTransition*> trs;
+    int index;
 
     for (index = 0; index != ch.count(); index += 1)
         if (ch[index]->kind() == aTransition)
diff --git a/genplugouts/sm/UmlChoicePseudoState.h b/genplugouts/sm/UmlChoicePseudoState.h
index d17dc124e..026591ee1 100644
--- a/genplugouts/sm/UmlChoicePseudoState.h
+++ b/genplugouts/sm/UmlChoicePseudoState.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseChoicePseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlState;
@@ -16,7 +16,7 @@ class UmlChoicePseudoState : public UmlBaseChoicePseudoState
     }
 
     //  is the target of a transition
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
 };
 
diff --git a/genplugouts/sm/UmlClass.cpp b/genplugouts/sm/UmlClass.cpp
index 5bbd5a4bd..a685cc92f 100644
--- a/genplugouts/sm/UmlClass.cpp
+++ b/genplugouts/sm/UmlClass.cpp
@@ -8,7 +8,7 @@
 #include "UmlDeploymentView.h"
 #include "UmlArtifact.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlClass::defaultDef()
 {
@@ -18,7 +18,7 @@ void UmlClass::defaultDef()
     setUsed();
 }
 
-UmlOperation * UmlClass::trigger(Q3CString s, UmlClass * machine, UmlClass * anystate)
+UmlOperation * UmlClass::trigger(QByteArray s, UmlClass * machine, UmlClass * anystate)
 {
     UmlOperation * tr;
     bool completion = (s == "_completion");
@@ -28,7 +28,7 @@ UmlOperation * UmlClass::trigger(Q3CString s, UmlClass * machine, UmlClass * any
         // the trigger for the user
 
         if (((tr = (UmlOperation *) machine->getChild(anOperation, s)) == 0) &&
-            ((tr = UmlBaseOperation::create(machine, s)) == 0)) {
+                ((tr = UmlBaseOperation::create(machine, s)) == 0)) {
             UmlCom::trace("Error : can't create operation '" + s + "' in class '"
                           + machine->name() + "'<br>");
             throw 0;
@@ -40,101 +40,101 @@ UmlOperation * UmlClass::trigger(Q3CString s, UmlClass * machine, UmlClass * any
 
             if (!create)
                 tr->set_CppBody("\
-  if (_current_state != 0) {\n\
-#ifdef VERBOSE_STATE_MACHINE\n\
-    puts(\"DEBUG : fire trigger " + s + "\");\n\
-#endif\n\
-    _current_state->" + s + "(*this);\n\
-  }\n\
-  return (_current_state != 0);\n");
-
-                                tr->managed();
-                                tr->setComment("the operation you call to signal the event " + s);
-                            }
+                                if (_current_state != 0) {\n\
+                                           #ifdef VERBOSE_STATE_MACHINE\n\
+                                               puts(\"DEBUG : fire trigger " + s + "\");\n\
+                                           #endif\n\
+                                               _current_state->" + s + "(*this);\n\
+                                }\n\
+                                               return (_current_state != 0);\n");
+
+                                                           tr->managed();
+                                                           tr->setComment("the operation you call to signal the event " + s);
+                                }
                                 else
                                 tr->setUsed();
 
-                                // the bypass trigger at the anystate level
-
-                                if (((tr = (UmlOperation *) anystate->getChild(anOperation, s)) == 0) &&
-                                ((tr = UmlBaseOperation::create(anystate, s)) == 0)) {
-                            UmlCom::trace("Error : can't create operation '" + s + "' in class '"
-                                + anystate->name() + "'<br>");
-                                throw 0;
-                            }
-
-                                if (! tr->isManaged()) {
-                                tr->defaultDef();
-                                tr->set_isCppVirtual(TRUE);
-                                tr->setType("void", "${type}");
-
-                                if (tr->params().isEmpty())
-                                tr->addParam(0, InputOutputDirection, "stm", machine);
-
-                                if (create)
-                                tr->setParams("${t0} &");
-                                else {
-                                tr->setParams("${t0} & ${p0}");
-                                // the trigger is not managed, gives it at the upper level
-                                tr->set_CppBody("  " + anystate->name() + " * st = _upper(stm);\n\n"
-                                "  if (st != 0)\n"
-                                "    st->" + s + "(stm);\n"
-                                "#ifdef VERBOSE_STATE_MACHINE\n"
-                                "  else\n"
-                                "    puts(\"DEBUG : transition " + s + " not expected\");\n"
-                                "#endif\n");
-                                tr->setComment("the current state doesn't manage the event "
-                                + s + ", give it to the upper state");
-                            }
-
-                                tr->managed();
-                            }
-                                else
-                                tr->setUsed();
-                            }
-
-                                // the trigger for the class
-
-                                if (((tr = (UmlOperation *) getChild(anOperation, s)) == 0) &&
-                                ((tr = UmlBaseOperation::create(this, s)) == 0)) {
-                            UmlCom::trace("Error : can't create operation '" + s + "' in class '"
-                                + name() + "'<br>");
-                                throw 0;
-                            }
-
-                                tr->defaultDef();
-                                tr->set_isCppVirtual(TRUE);
-
-                                if (tr->params().isEmpty())
-                                tr->addParam(0, InputOutputDirection, "stm", machine);
-
-                                tr->setParams("${t0} & ${p0}");
-
-                                if (completion)
-                                tr->setType("bool", "${type}");
-                                else {
-                                tr->setType("void", "${type}");
-                                tr->setComment("to manage the event " + s);
-                            }
-
-                                return tr;
-                            }
-
-                                void UmlClass::addDestructor()
-                                {
-                                Q3CString s = "~" + name();
-                                UmlOperation * destr = (UmlOperation *) getChild(anOperation, s);
-
-                                if (destr == 0) {
-                                if ((destr = UmlBaseOperation::create(this, s)) == 0) {
-                                UmlCom::trace("Error : can't create destructor in class '"
-                                + name() + "'<br>");
-                                return;
-                            }
-                            }
-
-                                destr->defaultDef();
-                                destr->setType("", "");
-                                destr->set_isCppVirtual(TRUE);
-                            }
+                        // the bypass trigger at the anystate level
+
+                        if (((tr = (UmlOperation *) anystate->getChild(anOperation, s)) == 0) &&
+                            ((tr = UmlBaseOperation::create(anystate, s)) == 0)) {
+                    UmlCom::trace("Error : can't create operation '" + s + "' in class '"
+                                  + anystate->name() + "'<br>");
+                    throw 0;
+                }
+
+                    if (! tr->isManaged()) {
+                        tr->defaultDef();
+                        tr->set_isCppVirtual(TRUE);
+                        tr->setType("void", "${type}");
+
+                        if (tr->params().isEmpty())
+                            tr->addParam(0, InputOutputDirection, "stm", machine);
+
+                        if (create)
+                            tr->setParams("${t0} &");
+                        else {
+                            tr->setParams("${t0} & ${p0}");
+                            // the trigger is not managed, gives it at the upper level
+                            tr->set_CppBody("  " + anystate->name() + " * st = _upper(stm);\n\n"
+                                                                      "  if (st != 0)\n"
+                                                                      "    st->" + s + "(stm);\n"
+                                                                                       "#ifdef VERBOSE_STATE_MACHINE\n"
+                                                                                       "  else\n"
+                                                                                       "    puts(\"DEBUG : transition " + s + " not expected\");\n"
+                                                                                                                              "#endif\n");
+                            tr->setComment("the current state doesn't manage the event "
+                                           + s + ", give it to the upper state");
+                        }
+
+                        tr->managed();
+                    }
+                    else
+                        tr->setUsed();
+        }
+
+        // the trigger for the class
+
+        if (((tr = (UmlOperation *) getChild(anOperation, s)) == 0) &&
+                ((tr = UmlBaseOperation::create(this, s)) == 0)) {
+            UmlCom::trace("Error : can't create operation '" + s + "' in class '"
+                          + name() + "'<br>");
+            throw 0;
+        }
+
+        tr->defaultDef();
+        tr->set_isCppVirtual(TRUE);
+
+        if (tr->params().isEmpty())
+            tr->addParam(0, InputOutputDirection, "stm", machine);
+
+        tr->setParams("${t0} & ${p0}");
+
+        if (completion)
+            tr->setType("bool", "${type}");
+        else {
+            tr->setType("void", "${type}");
+            tr->setComment("to manage the event " + s);
+        }
+
+        return tr;
+    }
+
+    void UmlClass::addDestructor()
+    {
+        QByteArray s = "~" + name();
+        UmlOperation * destr = (UmlOperation *) getChild(anOperation, s);
+
+        if (destr == 0) {
+            if ((destr = UmlBaseOperation::create(this, s)) == 0) {
+                UmlCom::trace("Error : can't create destructor in class '"
+                              + name() + "'<br>");
+                return;
+            }
+        }
+
+        destr->defaultDef();
+        destr->setType("", "");
+        destr->set_isCppVirtual(TRUE);
+    }
 
diff --git a/genplugouts/sm/UmlClass.h b/genplugouts/sm/UmlClass.h
index 37fdce913..3fa0e662d 100644
--- a/genplugouts/sm/UmlClass.h
+++ b/genplugouts/sm/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlOperation;
 
@@ -14,7 +14,7 @@ class UmlOperation;
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
     //  set default C++/Java definition if needed
     //  set it usefull
@@ -22,7 +22,7 @@ class UmlClass : public UmlBaseClass
 
     //  add a trigger, returns the one for the class
     //  Don't return on error
-    UmlOperation * trigger(Q3CString s, UmlClass * machine, UmlClass * anystate);
+    UmlOperation * trigger(QByteArray s, UmlClass * machine, UmlClass * anystate);
 
     //add a virtual destructor if needed
     //initial definition is empty
diff --git a/genplugouts/sm/UmlClassDiagram.h b/genplugouts/sm/UmlClassDiagram.h
index 76134392d..d9d822da0 100644
--- a/genplugouts/sm/UmlClassDiagram.h
+++ b/genplugouts/sm/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlClassInstance.h b/genplugouts/sm/UmlClassInstance.h
index c0c0e5a90..40d385682 100644
--- a/genplugouts/sm/UmlClassInstance.h
+++ b/genplugouts/sm/UmlClassInstance.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseClassInstance.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassInstance : public UmlBaseClassInstance
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClassInstance(void * id, const Q3CString & s) : UmlBaseClassInstance(id, s) {
+    UmlClassInstance(void * id, const QByteArray & s) : UmlBaseClassInstance(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlClassItem.h b/genplugouts/sm/UmlClassItem.h
index bf64f4dbb..c3c29cffc 100644
--- a/genplugouts/sm/UmlClassItem.h
+++ b/genplugouts/sm/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlClassMember.cpp b/genplugouts/sm/UmlClassMember.cpp
index 7763368fb..e1c9e24fa 100644
--- a/genplugouts/sm/UmlClassMember.cpp
+++ b/genplugouts/sm/UmlClassMember.cpp
@@ -1,11 +1,11 @@
 
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlClassMember::setComment(Q3CString s)
+void UmlClassMember::setComment(QByteArray s)
 {
-    set_Description(((cppDecl().find("${description}") != -1) ? "// " : " ")
+    set_Description(((cppDecl().indexOf("${description}") != -1) ? "// " : " ")
                     + s);
 
 }
diff --git a/genplugouts/sm/UmlClassMember.h b/genplugouts/sm/UmlClassMember.h
index 33c22e2fa..3556eaedc 100644
--- a/genplugouts/sm/UmlClassMember.h
+++ b/genplugouts/sm/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,10 +12,10 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
     //  set the description, depending on the  or  keyword
-    virtual void setComment(Q3CString s);
+    virtual void setComment(QByteArray s);
 
 };
 
diff --git a/genplugouts/sm/UmlClassView.h b/genplugouts/sm/UmlClassView.h
index a152eff28..b1fc4464d 100644
--- a/genplugouts/sm/UmlClassView.h
+++ b/genplugouts/sm/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'class view'
 //
@@ -11,7 +11,7 @@
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlCollaborationDiagram.h b/genplugouts/sm/UmlCollaborationDiagram.h
index ab1388561..32ba50ccf 100644
--- a/genplugouts/sm/UmlCollaborationDiagram.h
+++ b/genplugouts/sm/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlCom.cpp b/genplugouts/sm/UmlCom.cpp
index 1bea45750..bc8b3c830 100644
--- a/genplugouts/sm/UmlCom.cpp
+++ b/genplugouts/sm/UmlCom.cpp
@@ -2,20 +2,23 @@
 #include "UmlCom.h"
 #include "MiscGlobalCmd.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 #include "UmlSettings.h"
+#include <iostream>
+using namespace std;
 //#include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -29,7 +32,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(35);
         flush();
@@ -76,11 +81,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -90,11 +95,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -111,13 +116,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -126,10 +131,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -138,36 +143,48 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
             else
+            {
+#ifdef TRACE
+                qDebug() << "UmlCom::read_buffer ERROR, already x" << p - buffer_in
+                         << " remainder " << remainder << '\n';
+#endif
+                fatal_error("UmlCom read errorx");
                 nread = 0;
+            }
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
-        if ((remainder -= nread) == 0)
+        if ((remainder -= nread) == 0) {
             break;
+        } else {
+#ifdef TRACE
+            qDebug() << "can not read all";
+#endif
+        }
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -204,6 +221,8 @@ void UmlCom::write_id(const void * id)
 {
     check_size_out(sizeof(void *));
 
+    if(id == (void *)0x10000)
+        printf("wrong id\r\n");
     memcpy(p_buffer_out, &id, sizeof(void *));
     p_buffer_out += sizeof(void *);
 }
@@ -213,7 +232,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -223,7 +242,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -234,7 +253,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -246,7 +265,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -258,7 +277,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -270,7 +289,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -283,7 +302,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -296,7 +315,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -310,7 +329,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -322,7 +341,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -335,7 +354,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -348,7 +367,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -361,7 +380,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -383,7 +402,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -397,7 +416,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -411,7 +430,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -426,7 +445,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -439,7 +458,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -453,7 +472,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -475,8 +494,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+#ifdef TRACE
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#endif
 #endif
 
     write_char(onInstanceCmd);
@@ -509,7 +530,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -532,10 +553,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -552,10 +573,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -589,7 +610,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -606,10 +627,17 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
+    if(a == (void *)0x10000)
+    {
+        QByteArray garbage = read_all();
+#ifdef TRACE
+        qDebug() << "what the?\r\n";
+#endif
+    }
     return a;
 }
 
@@ -617,12 +645,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -654,28 +682,31 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+#ifdef TRACE
+    qDebug() << msg << '\n';
+#endif
 #endif
 
     throw 0;
@@ -684,7 +715,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -695,7 +726,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
@@ -707,8 +738,20 @@ void UmlCom::flush()
                 return;
             }
             else
+            {
                 p_buffer_out += sent;
+            }
         }
     }
 }
 
+QByteArray UmlCom::read_all()
+{
+    if (sock != 0)
+    {
+        sock->waitForReadyRead(100);
+        return sock->readAll();
+    }
+    return QByteArray();
+}
+
diff --git a/genplugouts/sm/UmlCom.h b/genplugouts/sm/UmlCom.h
index bdca9371d..eebc822f9 100644
--- a/genplugouts/sm/UmlCom.h
+++ b/genplugouts/sm/UmlCom.h
@@ -2,21 +2,21 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 #include "CmdFamily.h"
 #include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
-#include <q3ptrvector.h>
+#include <QVector>
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -77,11 +77,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -91,19 +91,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -185,8 +185,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -209,13 +209,16 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
+
+    //to read all remainin garbage data in socket
+    static QByteArray read_all();
 };
 
 #endif
diff --git a/genplugouts/sm/UmlComponent.h b/genplugouts/sm/UmlComponent.h
index bb4fdbb25..1768d7a0c 100644
--- a/genplugouts/sm/UmlComponent.h
+++ b/genplugouts/sm/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlComponentDiagram.h b/genplugouts/sm/UmlComponentDiagram.h
index 15d707dc2..ea106add4 100644
--- a/genplugouts/sm/UmlComponentDiagram.h
+++ b/genplugouts/sm/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlComponentView.h b/genplugouts/sm/UmlComponentView.h
index 000a74744..04c241863 100644
--- a/genplugouts/sm/UmlComponentView.h
+++ b/genplugouts/sm/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlDeploymentDiagram.h b/genplugouts/sm/UmlDeploymentDiagram.h
index 727d0ffd0..9963ec87d 100644
--- a/genplugouts/sm/UmlDeploymentDiagram.h
+++ b/genplugouts/sm/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlDeploymentView.h b/genplugouts/sm/UmlDeploymentView.h
index 52e5e627d..1ac54c38f 100644
--- a/genplugouts/sm/UmlDeploymentView.h
+++ b/genplugouts/sm/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment view'
 //
@@ -11,7 +11,7 @@
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlDiagram.h b/genplugouts/sm/UmlDiagram.h
index ffee38e5c..99f9e2f51 100644
--- a/genplugouts/sm/UmlDiagram.h
+++ b/genplugouts/sm/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlEntryPointPseudoState.cpp b/genplugouts/sm/UmlEntryPointPseudoState.cpp
index 8b20201b4..cb0235325 100644
--- a/genplugouts/sm/UmlEntryPointPseudoState.cpp
+++ b/genplugouts/sm/UmlEntryPointPseudoState.cpp
@@ -6,11 +6,11 @@
 #include "UmlCom.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
-void UmlEntryPointPseudoState::generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent)
+#include <QByteArray>
+void UmlEntryPointPseudoState::generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent)
 {
     // check transition number
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
     switch (ch.count()) {
     case 0:
diff --git a/genplugouts/sm/UmlEntryPointPseudoState.h b/genplugouts/sm/UmlEntryPointPseudoState.h
index 5a160e613..f97e1243e 100644
--- a/genplugouts/sm/UmlEntryPointPseudoState.h
+++ b/genplugouts/sm/UmlEntryPointPseudoState.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlState;
@@ -12,10 +12,10 @@ class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
 };
 
diff --git a/genplugouts/sm/UmlExitPointPseudoState.cpp b/genplugouts/sm/UmlExitPointPseudoState.cpp
index e340eccdf..6273581f6 100644
--- a/genplugouts/sm/UmlExitPointPseudoState.cpp
+++ b/genplugouts/sm/UmlExitPointPseudoState.cpp
@@ -7,12 +7,12 @@
 #include "UmlOperation.h"
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlExitPointPseudoState::init(UmlClass *, Q3CString, Q3CString, UmlState *)
+void UmlExitPointPseudoState::init(UmlClass *, QByteArray, QByteArray, UmlState *)
 {
     // check transition number
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
     switch (ch.count()) {
     case 0:
@@ -36,7 +36,9 @@ void UmlExitPointPseudoState::generate(UmlClass * machine, UmlClass * anystate,
 {
     // adds the operation _exit<n>() to share this pseudo state a priori shared
     if (_oper.isEmpty())
-        _oper.sprintf("_exit%d", ++_rank);
+    {
+        _oper.append(QString("_exit%1").arg(++_rank));
+    }
 
     UmlClass * cl = state->assocClass();
     UmlOperation * ex;
@@ -54,14 +56,14 @@ void UmlExitPointPseudoState::generate(UmlClass * machine, UmlClass * anystate,
     ex->addParam(0, InputOutputDirection, "stm", machine);
     ex->setParams("${t0} & ${p0}");
 
-    Q3CString body;
+    QByteArray body;
 
     // the exit behavior is made entering in the exit pseudo state
     if (! state->cppExitBehavior().isEmpty())
         body = "  _doexit(stm);\n";
 
     // transition number <= 1 already checked by init()
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
     if (ch.count() != 0) {
         if (!((UmlTransition *) ch[0])->cppGuard().isEmpty()) {
@@ -75,11 +77,11 @@ void UmlExitPointPseudoState::generate(UmlClass * machine, UmlClass * anystate,
     ex->set_CppBody(body);
 }
 
-void UmlExitPointPseudoState::generate(UmlClass *, UmlClass *, UmlState *, Q3CString & body, Q3CString indent)
+void UmlExitPointPseudoState::generate(UmlClass *, UmlClass *, UmlState *, QByteArray & body, QByteArray indent)
 {
     // generate a call to _exit<n>() because it is a priori shared
     if (_oper.isEmpty())
-        _oper.sprintf("_exit%d", ++_rank);
+        _oper.append(QString("_exit%1").arg(++_rank));
 
     // note : only a state may contain an exit point, a region can't
     body += indent + "stm" + ((UmlState *) parent())->path()
diff --git a/genplugouts/sm/UmlExitPointPseudoState.h b/genplugouts/sm/UmlExitPointPseudoState.h
index f729b79ae..e0e06a9fe 100644
--- a/genplugouts/sm/UmlExitPointPseudoState.h
+++ b/genplugouts/sm/UmlExitPointPseudoState.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlState;
@@ -12,10 +12,10 @@ class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
-    virtual void init(UmlClass * mother, Q3CString path, Q3CString pretty_path, UmlState * state);
+    virtual void init(UmlClass * mother, QByteArray path, QByteArray pretty_path, UmlState * state);
 
     //  generate code for this pseudo state
 
@@ -23,13 +23,13 @@ class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 
     //  is the target of a transition
 
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
 
 protected:
     //  the name of the operation implementing the exit point
 
-    Q3CString _oper;
+    QByteArray _oper;
 
     //  to have different name for the operation implementing the exit point
 
diff --git a/genplugouts/sm/UmlExpansionNode.h b/genplugouts/sm/UmlExpansionNode.h
index 65d1cff2a..be12134a8 100644
--- a/genplugouts/sm/UmlExpansionNode.h
+++ b/genplugouts/sm/UmlExpansionNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExpansionNode : public UmlBaseExpansionNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionNode(void * id, const Q3CString & s) : UmlBaseExpansionNode(id, s) {
+    UmlExpansionNode(void * id, const QByteArray & s) : UmlBaseExpansionNode(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlExpansionRegion.h b/genplugouts/sm/UmlExpansionRegion.h
index cfe999374..edf28b418 100644
--- a/genplugouts/sm/UmlExpansionRegion.h
+++ b/genplugouts/sm/UmlExpansionRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionRegion.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExpansionRegion : public UmlBaseExpansionRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionRegion(void * id, const Q3CString & s) : UmlBaseExpansionRegion(id, s) {
+    UmlExpansionRegion(void * id, const QByteArray & s) : UmlBaseExpansionRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlExtraClassMember.h b/genplugouts/sm/UmlExtraClassMember.h
index cf0b2bf47..261aa6257 100644
--- a/genplugouts/sm/UmlExtraClassMember.h
+++ b/genplugouts/sm/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlFinalState.cpp b/genplugouts/sm/UmlFinalState.cpp
index 973e4c638..0b5790e8d 100644
--- a/genplugouts/sm/UmlFinalState.cpp
+++ b/genplugouts/sm/UmlFinalState.cpp
@@ -7,9 +7,9 @@
 #include "UmlOperation.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlFinalState::generate(UmlClass *, UmlClass *, UmlState *, Q3CString & body, Q3CString indent)
+void UmlFinalState::generate(UmlClass *, UmlClass *, UmlState *, QByteArray & body, QByteArray indent)
 {
     if (parent()->kind() != aRegion)
         body += indent + "stm._final();\n";
diff --git a/genplugouts/sm/UmlFinalState.h b/genplugouts/sm/UmlFinalState.h
index 79b690f2c..8b1eeb97f 100644
--- a/genplugouts/sm/UmlFinalState.h
+++ b/genplugouts/sm/UmlFinalState.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseFinalState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlState;
@@ -17,7 +17,7 @@ class UmlFinalState : public UmlBaseFinalState
 
     //  is the target of a transition
 
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
 };
 
diff --git a/genplugouts/sm/UmlFlow.h b/genplugouts/sm/UmlFlow.h
index 6e78a8c4b..9d6930629 100644
--- a/genplugouts/sm/UmlFlow.h
+++ b/genplugouts/sm/UmlFlow.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseFlow.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlFlow : public UmlBaseFlow, public UmlActivityItem
 {
 public:
-    UmlFlow(void * id, const Q3CString & n) : UmlBaseFlow(id, n) {
+    UmlFlow(void * id, const QByteArray & n) : UmlBaseFlow(id, n) {
     }
 
 };
diff --git a/genplugouts/sm/UmlInitialPseudoState.cpp b/genplugouts/sm/UmlInitialPseudoState.cpp
index 28c761ace..3378a8133 100644
--- a/genplugouts/sm/UmlInitialPseudoState.cpp
+++ b/genplugouts/sm/UmlInitialPseudoState.cpp
@@ -13,7 +13,7 @@ void UmlInitialPseudoState::generate(UmlClass * machine, UmlClass * anystate, Um
 
     state->hasInitial();
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
     if (ch.count() != 1) {
         UmlCom::trace("Error : 'initial' pseudo state must have one and only one transition<br>");
diff --git a/genplugouts/sm/UmlInterruptibleActivityRegion.h b/genplugouts/sm/UmlInterruptibleActivityRegion.h
index 0f78665c1..9fb668795 100644
--- a/genplugouts/sm/UmlInterruptibleActivityRegion.h
+++ b/genplugouts/sm/UmlInterruptibleActivityRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseInterruptibleActivityRegion.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInterruptibleActivityRegion : public UmlBaseInterruptibleActivityRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlBaseInterruptibleActivityRegion(id, s) {
+    UmlInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlBaseInterruptibleActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlItem.cpp b/genplugouts/sm/UmlItem.cpp
index ef983df93..c5e330189 100644
--- a/genplugouts/sm/UmlItem.cpp
+++ b/genplugouts/sm/UmlItem.cpp
@@ -6,16 +6,16 @@
 #include "UmlCom.h"
 #include "UmlRelation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlItem::~UmlItem()
 {
 }
 
-UmlItem * UmlItem::getChild(anItemKind k, Q3CString s)
+UmlItem * UmlItem::getChild(anItemKind k, QByteArray s)
 {
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned index;
+    const QVector<UmlItem*> ch = children();
+    int index;
 
     if (k == aRelation) {
         for (index = 0; index != ch.count(); index += 1)
@@ -32,9 +32,9 @@ UmlItem * UmlItem::getChild(anItemKind k, Q3CString s)
     return 0;
 }
 
-Q3CString UmlItem::quotedName()
+QByteArray UmlItem::quotedName()
 {
-    Q3CString r;
+    QByteArray r;
     const char * s = name();
 
     for (;;) {
@@ -53,7 +53,7 @@ Q3CString UmlItem::quotedName()
 
 }
 
-void UmlItem::init(UmlClass *, Q3CString, Q3CString, UmlState *)
+void UmlItem::init(UmlClass *, QByteArray, QByteArray, UmlState *)
 {
 }
 
@@ -66,22 +66,22 @@ void UmlItem::generate(UmlClass *, UmlClass *, UmlState *)
 {
 }
 
-void UmlItem::generate(UmlClass *, UmlClass *, UmlState *, Q3CString &, Q3CString)
+void UmlItem::generate(UmlClass *, UmlClass *, UmlState *, QByteArray &, QByteArray)
 {
 }
 
-void UmlItem::setComment(Q3CString)
+void UmlItem::setComment(QByteArray)
 {
 }
 
 void UmlItem::setUseless()
 {
-    Q3CString dummy;
+    QByteArray dummy;
 
     if (propertyValue("STM generated", dummy))
         set_PropertyValue("STM generated", "0");
 
-    const Q3PtrVector<UmlItem> v = children();
+    const QVector<UmlItem*> v = children();
 
     for (unsigned index = v.count(); index != 0; index -= 1)
         v[index - 1]->setUseless();
@@ -94,13 +94,13 @@ void UmlItem::setUsed()
 
 void UmlItem::deleteUseless()
 {
-    Q3CString v;
+    QByteArray v;
 
     if (propertyValue("STM generated", v) && (v == "0"))
         // useless
         deleteIt();
     else {
-        const Q3PtrVector<UmlItem> v = children();
+        const QVector<UmlItem*> v = children();
 
         for (unsigned index = v.count(); index != 0; index -= 1)
             v[index - 1]->deleteUseless();
diff --git a/genplugouts/sm/UmlItem.h b/genplugouts/sm/UmlItem.h
index 2f4af95a0..99d86d99e 100644
--- a/genplugouts/sm/UmlItem.h
+++ b/genplugouts/sm/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "anItemKind.h"
 
 class UmlClass;
@@ -16,19 +16,19 @@ class UmlState;
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
-    UmlItem * getChild(anItemKind k, Q3CString s);
+    UmlItem * getChild(anItemKind k, QByteArray s);
 
     //  return name modified to only contains a-ZA-Z0-9_
 
-    Q3CString quotedName();
+    QByteArray quotedName();
 
     //  initialization, does nothing at this level
 
-    virtual void init(UmlClass * mother, Q3CString path, Q3CString pretty_path, UmlState * state);
+    virtual void init(UmlClass * mother, QByteArray path, QByteArray pretty_path, UmlState * state);
 
     //  program entry point, correspond to a wrong Tools configuration
 
@@ -40,11 +40,11 @@ class UmlItem : public UmlBaseItem
 
     //  if the target of a transition, can't be called
 
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
     //  does nothing at this level
 
-    virtual void setComment(Q3CString s);
+    virtual void setComment(QByteArray s);
 
     // if the element was produced by a previous use of the plug-out mark it useless to may delete it at end
     // iterate on children
diff --git a/genplugouts/sm/UmlJunctionPseudoState.cpp b/genplugouts/sm/UmlJunctionPseudoState.cpp
index 6ecfd44db..60bff5a85 100644
--- a/genplugouts/sm/UmlJunctionPseudoState.cpp
+++ b/genplugouts/sm/UmlJunctionPseudoState.cpp
@@ -7,13 +7,16 @@
 #include "UmlTransition.h"
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlJunctionPseudoState::generate(UmlClass * machine, UmlClass * anystate, UmlState * state)
 {
     // create an operation because a priori shared
     if (_oper.isEmpty())
-        _oper.sprintf("_junction%d", ++_rank);
+    {
+        //_oper.sprintf("_junction%d", ++_rank);
+        _oper.append(QString("_junction%1").arg(++_rank));
+    }
 
     UmlClass * cl = state->assocClass();
     UmlOperation * junction;
@@ -31,10 +34,10 @@ void UmlJunctionPseudoState::generate(UmlClass * machine, UmlClass * anystate, U
     junction->addParam(0, InputOutputDirection, "stm", machine);
     junction->setParams("${t0} & ${p0}");
 
-    Q3CString body;
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3PtrList<UmlTransition> trs;
-    unsigned index;
+    QByteArray body;
+    const QVector<UmlItem*> ch = children();
+    QList<UmlTransition*> trs;
+    int index;
 
     for (index = 0; index != ch.count(); index += 1)
         if (ch[index]->kind() == aTransition)
@@ -46,10 +49,13 @@ void UmlJunctionPseudoState::generate(UmlClass * machine, UmlClass * anystate, U
     junction->set_CppBody(body);
 }
 
-void UmlJunctionPseudoState::generate(UmlClass *, UmlClass *, UmlState * state, Q3CString & body, Q3CString indent)
+void UmlJunctionPseudoState::generate(UmlClass *, UmlClass *, UmlState * state, QByteArray & body, QByteArray indent)
 {
     if (_oper.isEmpty())
-        _oper.sprintf("_junction%d", ++_rank);
+    {
+        //_oper.sprintf("_junction%d", ++_rank);
+        _oper.append(QString("_junction%1").arg(++_rank));
+    }
 
     body += indent + "stm" + state->path() + "." + _oper + "(stm);\n";
 }
diff --git a/genplugouts/sm/UmlJunctionPseudoState.h b/genplugouts/sm/UmlJunctionPseudoState.h
index 993647a19..b168cca95 100644
--- a/genplugouts/sm/UmlJunctionPseudoState.h
+++ b/genplugouts/sm/UmlJunctionPseudoState.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseJunctionPseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlState;
@@ -21,13 +21,13 @@ class UmlJunctionPseudoState : public UmlBaseJunctionPseudoState
 
     //  is the target of a transition
 
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
 
 protected:
     //  the name of the operation implementing the junction
 
-    Q3CString _oper;
+    QByteArray _oper;
 
     //  to have different name for the operation implementing the junction
 
diff --git a/genplugouts/sm/UmlNcRelation.h b/genplugouts/sm/UmlNcRelation.h
index 60032619a..f424f7f0e 100644
--- a/genplugouts/sm/UmlNcRelation.h
+++ b/genplugouts/sm/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlNode.h b/genplugouts/sm/UmlNode.h
index 95edbe709..0a77484c4 100644
--- a/genplugouts/sm/UmlNode.h
+++ b/genplugouts/sm/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlObjectDiagram.h b/genplugouts/sm/UmlObjectDiagram.h
index ba429242a..296d8a51d 100644
--- a/genplugouts/sm/UmlObjectDiagram.h
+++ b/genplugouts/sm/UmlObjectDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseObjectDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'object diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -14,7 +14,7 @@ class UmlObjectDiagram : public UmlBaseObjectDiagram
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlObjectDiagram(void * id, const Q3CString & s) : UmlBaseObjectDiagram(id, s) {
+    UmlObjectDiagram(void * id, const QByteArray & s) : UmlBaseObjectDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlOnSignalAction.h b/genplugouts/sm/UmlOnSignalAction.h
index 158c0ddc0..af11416da 100644
--- a/genplugouts/sm/UmlOnSignalAction.h
+++ b/genplugouts/sm/UmlOnSignalAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseOnSignalAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlOnSignalAction : public UmlBaseOnSignalAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOnSignalAction(void * id, const Q3CString & s) : UmlBaseOnSignalAction(id, s) {
+    UmlOnSignalAction(void * id, const QByteArray & s) : UmlBaseOnSignalAction(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlOperation.cpp b/genplugouts/sm/UmlOperation.cpp
index 93153389b..170edff04 100644
--- a/genplugouts/sm/UmlOperation.cpp
+++ b/genplugouts/sm/UmlOperation.cpp
@@ -4,7 +4,7 @@
 
 #include "CppSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlOperation::defaultDef()
 {
@@ -26,16 +26,16 @@ void UmlOperation::setType(const char * type, const char * s)
     t.explicit_type = type;
     set_ReturnType(t);
 
-    static const Q3CString sep = " \t\n\r";
-    Q3CString d;
+    static const QByteArray sep = " \t\n\r";
+    QByteArray d;
     int typeindex;
     int nameindex;
 
     d = cppDecl();
 
-    if (((typeindex = d.find("${type}")) != -1) &&
-        ((nameindex = d.find(" ${name}", typeindex + 7)) != -1)) {
-        while (sep.find(d[nameindex - 1]) != -1)
+    if (((typeindex = d.indexOf("${type}")) != -1) &&
+        ((nameindex = d.indexOf(" ${name}", typeindex + 7)) != -1)) {
+        while (sep.indexOf(d[nameindex - 1]) != -1)
             nameindex -= 1;
 
         d.replace(typeindex, nameindex - typeindex, s);
@@ -45,9 +45,9 @@ void UmlOperation::setType(const char * type, const char * s)
     if (! isAbstract()) {
         d = cppDef();
 
-        if (((typeindex = d.find("${type}")) != -1) &&
-            ((nameindex = d.find(" ${class}", typeindex + 7)) != -1)) {
-            while (sep.find(d[nameindex - 1]) != -1)
+        if (((typeindex = d.indexOf("${type}")) != -1) &&
+            ((nameindex = d.indexOf(" ${class}", typeindex + 7)) != -1)) {
+            while (sep.indexOf(d[nameindex - 1]) != -1)
                 nameindex -= 1;
 
             d.replace(typeindex, nameindex - typeindex, s);
@@ -63,16 +63,16 @@ void UmlOperation::setType(UmlClass * type, const char * s)
     t.type = type;
     set_ReturnType(t);
 
-    static const Q3CString sep = " \t\n\r";
-    Q3CString d;
+    static const QByteArray sep = " \t\n\r";
+    QByteArray d;
     int typeindex;
     int nameindex;
 
     d = cppDecl();
 
-    if (((typeindex = d.find("${type}")) != -1) &&
-        ((nameindex = d.find("${name}", typeindex + 7)) != -1)) {
-        while (sep.find(d[nameindex - 1]) != -1)
+    if (((typeindex = d.indexOf("${type}")) != -1) &&
+        ((nameindex = d.indexOf("${name}", typeindex + 7)) != -1)) {
+        while (sep.indexOf(d[nameindex - 1]) != -1)
             nameindex -= 1;
 
         d.replace(typeindex, nameindex - typeindex, s);
@@ -82,9 +82,9 @@ void UmlOperation::setType(UmlClass * type, const char * s)
     if (! isAbstract()) {
         d = cppDef();
 
-        if (((typeindex = d.find("${type}")) != -1) &&
-            ((nameindex = d.find("${class}", typeindex + 7)) != -1)) {
-            while (sep.find(d[nameindex - 1]) != -1)
+        if (((typeindex = d.indexOf("${type}")) != -1) &&
+            ((nameindex = d.indexOf("${class}", typeindex + 7)) != -1)) {
+            while (sep.indexOf(d[nameindex - 1]) != -1)
                 nameindex -= 1;
 
             d.replace(typeindex, nameindex - typeindex, s);
@@ -101,7 +101,7 @@ void UmlOperation::addParam(int rank, aDirection dir, const char * name, UmlClas
     p.type.type = type;
     p.name = name;
 
-    if (params().count() <= (unsigned) rank)
+    if (params().count() <= rank)
         addParameter(rank, p);
     else
         replaceParameter(rank, p);
@@ -109,22 +109,22 @@ void UmlOperation::addParam(int rank, aDirection dir, const char * name, UmlClas
 
 void UmlOperation::setParams(const char * s)
 {
-    Q3CString d;
+    QByteArray d;
     int index;
 
     d = cppDecl();
 
-    if (((index = d.find("${(}")) != -1) &&
+    if (((index = d.indexOf("${(}")) != -1) &&
         (d.mid(index + 4, 4) == "${)}")) {
-        d.insert(d.find("${(}") + 4, s);
+        d.insert(d.indexOf("${(}") + 4, s);
         set_CppDecl(d);
     }
 
     d = cppDef();
 
-    if (((index = d.find("${(}")) != -1) &&
+    if (((index = d.indexOf("${(}")) != -1) &&
         (d.mid(index + 4, 4) == "${)}")) {
-        d.insert(d.find("${(}") + 4, s);
+        d.insert(d.indexOf("${(}") + 4, s);
         set_CppDef(d);
     }
 }
diff --git a/genplugouts/sm/UmlOperation.h b/genplugouts/sm/UmlOperation.h
index a1bdf3426..8783fd7ea 100644
--- a/genplugouts/sm/UmlOperation.h
+++ b/genplugouts/sm/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aDirection.h"
 
 class UmlClass;
@@ -15,7 +15,7 @@ class UmlClass;
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n), _managed(FALSE) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n), _managed(FALSE) {};
 
     //  set the default C++/Java definition
     //  set it usefull
diff --git a/genplugouts/sm/UmlPackage.h b/genplugouts/sm/UmlPackage.h
index 84e80d71e..34b2e2103 100644
--- a/genplugouts/sm/UmlPackage.h
+++ b/genplugouts/sm/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages a 'package', notes that the project itself is a package
 //
@@ -11,7 +11,7 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlParameterSet.h b/genplugouts/sm/UmlParameterSet.h
index 55a597fd4..c25101f0b 100644
--- a/genplugouts/sm/UmlParameterSet.h
+++ b/genplugouts/sm/UmlParameterSet.h
@@ -3,14 +3,14 @@
 
 
 #include "UmlBaseParameterSet.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlActivityItem.h"
 
 class UmlParameterSet : public UmlBaseParameterSet, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlParameterSet(void * id, const Q3CString & s) : UmlBaseParameterSet(id, s) {
+    UmlParameterSet(void * id, const QByteArray & s) : UmlBaseParameterSet(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlPinParameter.h b/genplugouts/sm/UmlPinParameter.h
index d48cb7343..7e207745d 100644
--- a/genplugouts/sm/UmlPinParameter.h
+++ b/genplugouts/sm/UmlPinParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBasePinParameter.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPinParameter : public UmlBasePinParameter
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPinParameter(void * id, const Q3CString & s) : UmlBasePinParameter(id, s) {
+    UmlPinParameter(void * id, const QByteArray & s) : UmlBasePinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlPseudoState.h b/genplugouts/sm/UmlPseudoState.h
index 075761ec7..0b07e1811 100644
--- a/genplugouts/sm/UmlPseudoState.h
+++ b/genplugouts/sm/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlRegion.cpp b/genplugouts/sm/UmlRegion.cpp
index b14ac5eeb..56c4a4849 100644
--- a/genplugouts/sm/UmlRegion.cpp
+++ b/genplugouts/sm/UmlRegion.cpp
@@ -4,12 +4,12 @@
 
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlRegion::init(UmlClass * mother, Q3CString path, Q3CString pretty_path, UmlState *)
+void UmlRegion::init(UmlClass * mother, QByteArray path, QByteArray pretty_path, UmlState *)
 {
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned index;
+    const QVector<UmlItem*> ch = children();
+    int index;
 
     pretty_path = pretty_path + "." + name();
 
diff --git a/genplugouts/sm/UmlRegion.h b/genplugouts/sm/UmlRegion.h
index 83bd704fc..232c29d05 100644
--- a/genplugouts/sm/UmlRegion.h
+++ b/genplugouts/sm/UmlRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlState;
@@ -13,12 +13,12 @@ class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
     //  initialization before generation
 
-    virtual void init(UmlClass * mother, Q3CString path, Q3CString pretty_path, UmlState * state);
+    virtual void init(UmlClass * mother, QByteArray path, QByteArray pretty_path, UmlState * state);
 
 };
 
diff --git a/genplugouts/sm/UmlRelation.h b/genplugouts/sm/UmlRelation.h
index 6b4358b40..13854d199 100644
--- a/genplugouts/sm/UmlRelation.h
+++ b/genplugouts/sm/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'relations' between classes, notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlSequenceDiagram.h b/genplugouts/sm/UmlSequenceDiagram.h
index d3b3d83fc..a1bbcc966 100644
--- a/genplugouts/sm/UmlSequenceDiagram.h
+++ b/genplugouts/sm/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlSettings.cpp b/genplugouts/sm/UmlSettings.cpp
index 908be6e35..ae8ce2e03 100644
--- a/genplugouts/sm/UmlSettings.cpp
+++ b/genplugouts/sm/UmlSettings.cpp
@@ -7,15 +7,15 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -27,14 +27,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -46,14 +46,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -65,14 +65,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -84,14 +84,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -147,39 +147,39 @@ aLanguage UmlSettings::_uml_get_name;
 
 aLanguage UmlSettings::_uml_set_name;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -191,7 +191,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -204,7 +204,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -230,18 +230,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -252,7 +252,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_attribute_stereotypes.count();
 
@@ -263,7 +263,7 @@ Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString Um
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -274,15 +274,15 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         builtins[index] = _builtins[index];
@@ -310,15 +310,15 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_attr_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         relation_stereotypes[index] = _relation_attribute_stereotypes[index];
@@ -343,15 +343,15 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         class_stereotypes[index] = _class_stereotypes[index];
diff --git a/genplugouts/sm/UmlSettings.h b/genplugouts/sm/UmlSettings.h
index c37c13a10..0ae054582 100644
--- a/genplugouts/sm/UmlSettings.h
+++ b/genplugouts/sm/UmlSettings.h
@@ -1,10 +1,10 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
+#include <QHash>
 
-
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aLanguage.h"
-#include <q3dict.h>
+
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -20,44 +20,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
     // return the language from which the getter's name rule must be followed at Uml level
     static aLanguage umlGetName();
@@ -90,25 +90,25 @@ class UmlSettings
 
 
 protected:
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_attribute_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -122,31 +122,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_attr_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_attr_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/sm/UmlState.cpp b/genplugouts/sm/UmlState.cpp
index e6e60cae7..367a65c43 100644
--- a/genplugouts/sm/UmlState.cpp
+++ b/genplugouts/sm/UmlState.cpp
@@ -10,12 +10,12 @@
 #include "UmlRegion.h"
 #include "UmlAttribute.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 bool UmlState::isLeaf()
 {
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned index;
+    const QVector<UmlItem*> ch = children();
+    int index;
 
     for (index = 0; index != ch.count(); index += 1) {
         switch (ch[index]->kind()) {
@@ -54,11 +54,11 @@ bool UmlState::inside(UmlState * other)
     }
 }
 
-void UmlState::init(UmlClass * mother, Q3CString path, Q3CString pretty_path, UmlState *)
+void UmlState::init(UmlClass * mother, QByteArray path, QByteArray pretty_path, UmlState *)
 {
     // create if needed the class implementing the state
 
-    Q3CString qn = quotedName() + "_State";
+    QByteArray qn = quotedName() + "_State";
 
     if ((_class = (UmlClass *) mother->getChild(aClass, qn)) == 0) {
         if ((_class = UmlBaseClass::create(mother, qn)) == 0) {
@@ -69,7 +69,7 @@ void UmlState::init(UmlClass * mother, Q3CString path, Q3CString pretty_path, Um
     }
 
     // place the class at the beginning
-    const Q3PtrVector<UmlItem> v = mother->children();
+    const QVector<UmlItem*> v = mother->children();
 
     _class->moveAfter(((v.count() == 0) || (v[0]->kind() != aClass))
                       ? (UmlItem *) 0
@@ -86,7 +86,7 @@ void UmlState::init(UmlClass * mother, Q3CString path, Q3CString pretty_path, Um
     // create if needed the attribute memorizing the class instance
     // implementing the state
 
-    qn = "_" + qn.lower();		// _xyz_state
+    qn = "_" + qn.toLower();		// _xyz_state
 
     UmlAttribute * var;
 
@@ -112,8 +112,8 @@ void UmlState::init(UmlClass * mother, Q3CString path, Q3CString pretty_path, Um
 
     // goes down
 
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned index;
+    const QVector<UmlItem*> ch = children();
+    int index;
 
     for (index = 0; index != ch.count(); index += 1)
         ch[index]->init(_class, _path, _pretty_path, this);
@@ -143,7 +143,7 @@ void UmlState::generate()
     case aClassView: {
         // a class having the normalized name of the state machine
         // implements it in the class view of the state machine
-        Q3CString qn = quotedName();
+        QByteArray qn = quotedName();
         UmlClass * machine = (UmlClass *) parent()->getChild(aClass, qn);
 
         if ((machine == 0) &&
@@ -364,8 +364,8 @@ return (_current_state != 0);\n");
 void UmlState::generate(UmlClass * machine, UmlClass * anystate, UmlState *)
 {
     // inherits anystate
-    const Q3PtrVector<UmlItem> clch = _class->children();
-    unsigned index;
+    const QVector<UmlItem*> clch = _class->children();
+    int index;
 
     for (index = 0; index != clch.count(); index += 1)
         if ((clch[index]->kind() == aRelation) &&
@@ -387,14 +387,14 @@ void UmlState::generate(UmlClass * machine, UmlClass * anystate, UmlState *)
 
     // generate children
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
     for (index = 0; index != ch.count(); index += 1)
         ch[index]->generate(machine, anystate, this);
 
     // additional operations
 
-    Q3CString s;
+    QByteArray s;
 
     s = cppEntryBehavior();
 
@@ -402,7 +402,7 @@ void UmlState::generate(UmlClass * machine, UmlClass * anystate, UmlState *)
         (_has_completion || !s.isEmpty())) {
         // add a 'create' to do the entry behavior / completion
         UmlOperation * create = _class->trigger("create", machine, anystate);
-        Q3CString body;
+        QByteArray body;
 
         if (!s.isEmpty())
             body = "\t_doentry(stm);\n";
@@ -512,7 +512,7 @@ void UmlState::generate(UmlClass * machine, UmlClass * anystate, UmlState *)
     upper->setType(anystate, "${type} *");
     upper->addParam(0, InputOutputDirection, "stm", machine);
 
-    int dot = _path.findRev('.');
+    int dot = _path.indexOf('.');
 
     if (dot == 0) {
         upper->setParams("${t0} &");
@@ -524,7 +524,7 @@ void UmlState::generate(UmlClass * machine, UmlClass * anystate, UmlState *)
     }
 
     // adds friend declaration
-    const Q3PtrVector<UmlItem> stmch = machine->children();
+    const QVector<UmlItem*> stmch = machine->children();
 
     for (index = 0; index != stmch.count(); index += 1) {
         if ((stmch[index]->kind() == aRelation) &&
diff --git a/genplugouts/sm/UmlState.h b/genplugouts/sm/UmlState.h
index 3b6e2db49..015ed88c6 100644
--- a/genplugouts/sm/UmlState.h
+++ b/genplugouts/sm/UmlState.h
@@ -4,14 +4,14 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlClass.h"
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s)
+    UmlState(void * id, const QByteArray & s)
         : UmlBaseState(id, s), _has_initial(FALSE), _has_completion(FALSE), _class(0) {
     }
 
@@ -27,15 +27,15 @@ class UmlState : public UmlBaseState, public UmlStateItem
 
     //  the path to the instance of the class managing the state
 
-    Q3CString path() const;
+    QByteArray path() const;
 
     //  the path of the state to be produced in debug trace
-    Q3CString prettyPath() const;
+    QByteArray prettyPath() const;
 
     bool inside(UmlState * other);
 
     //  perform initializations before generation
-    virtual void init(UmlClass * mother, Q3CString path, Q3CString pretty_path, UmlState * state);
+    virtual void init(UmlClass * mother, QByteArray path, QByteArray pretty_path, UmlState * state);
 
     //  to indicate that the state has a completion
 
@@ -64,11 +64,11 @@ class UmlState : public UmlBaseState, public UmlStateItem
 
     //  the path from the machine up to the class instance associated
     //  to the state.
-    Q3CString _path;
+    QByteArray _path;
 
     //  the path from the machine up to the class instance associated
     //  to the state.
-    Q3CString _pretty_path;
+    QByteArray _pretty_path;
 
 };
 
@@ -77,12 +77,12 @@ inline UmlClass * UmlState::assocClass() const
     return _class;
 }
 
-inline Q3CString UmlState::path() const
+inline QByteArray UmlState::path() const
 {
     return _path;
 }
 
-inline Q3CString UmlState::prettyPath() const
+inline QByteArray UmlState::prettyPath() const
 {
     return _pretty_path;
 }
diff --git a/genplugouts/sm/UmlStateAction.cpp b/genplugouts/sm/UmlStateAction.cpp
index 84269ad7a..f33cf9f0c 100644
--- a/genplugouts/sm/UmlStateAction.cpp
+++ b/genplugouts/sm/UmlStateAction.cpp
@@ -6,13 +6,13 @@
 #include "UmlCom.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlStateAction::generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent)
+void UmlStateAction::generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent)
 {
     body += indent + cppExpression() + '\n';
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
     if (ch.count() != 1) {
         UmlCom::trace("Error : 'action' pseudo state must have one and only one transition<br>");
diff --git a/genplugouts/sm/UmlStateAction.h b/genplugouts/sm/UmlStateAction.h
index 4ac6325f6..de5238092 100644
--- a/genplugouts/sm/UmlStateAction.h
+++ b/genplugouts/sm/UmlStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseStateAction.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlState;
@@ -17,7 +17,7 @@ class UmlStateAction : public UmlBaseStateAction, public UmlStateItem
     }
 
     //  is the target of a transition
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
 };
 
diff --git a/genplugouts/sm/UmlStateDiagram.h b/genplugouts/sm/UmlStateDiagram.h
index f49b5fb44..9c04bb0ad 100644
--- a/genplugouts/sm/UmlStateDiagram.h
+++ b/genplugouts/sm/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/UmlStereotype.h b/genplugouts/sm/UmlStereotype.h
index 8379bea8c..9bf25bf22 100644
--- a/genplugouts/sm/UmlStereotype.h
+++ b/genplugouts/sm/UmlStereotype.h
@@ -2,27 +2,27 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHPHP
-    Q3CString php;
+    QByteArray php;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/sm/UmlTerminatePseudoState.cpp b/genplugouts/sm/UmlTerminatePseudoState.cpp
index ed90969f3..51969ab28 100644
--- a/genplugouts/sm/UmlTerminatePseudoState.cpp
+++ b/genplugouts/sm/UmlTerminatePseudoState.cpp
@@ -3,9 +3,9 @@
 #include "UmlClass.h"
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-void UmlTerminatePseudoState::generate(UmlClass *, UmlClass *, UmlState *, Q3CString & body, Q3CString indent)
+void UmlTerminatePseudoState::generate(UmlClass *, UmlClass *, UmlState *, QByteArray & body, QByteArray indent)
 {
     body += indent + "stm._final();\n";
 }
diff --git a/genplugouts/sm/UmlTerminatePseudoState.h b/genplugouts/sm/UmlTerminatePseudoState.h
index 454ae4d5d..f876653dc 100644
--- a/genplugouts/sm/UmlTerminatePseudoState.h
+++ b/genplugouts/sm/UmlTerminatePseudoState.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseTerminatePseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlState;
@@ -15,7 +15,7 @@ class UmlTerminatePseudoState : public UmlBaseTerminatePseudoState
     UmlTerminatePseudoState(void * id) : UmlBaseTerminatePseudoState(id, "") {
     }
 
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
 };
 
diff --git a/genplugouts/sm/UmlTransition.cpp b/genplugouts/sm/UmlTransition.cpp
index 0a5b4bc0b..a77088708 100644
--- a/genplugouts/sm/UmlTransition.cpp
+++ b/genplugouts/sm/UmlTransition.cpp
@@ -2,18 +2,18 @@
 #include "UmlTransition.h"
 #include "UmlClass.h"
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlState.h"
 #include "UmlOperation.h"
 
-Q3CString UmlTransition::triggerName()
+QByteArray UmlTransition::triggerName()
 {
     // get & check trigger's name
-    Q3CString s = cppTrigger();
+    QByteArray s = cppTrigger();
 
     if (s.isEmpty()) {
         switch (parent()->kind()) {
@@ -64,7 +64,7 @@ Q3CString UmlTransition::triggerName()
     return s;
 }
 
-void UmlTransition::init(UmlClass *, Q3CString, Q3CString, UmlState * state)
+void UmlTransition::init(UmlClass *, QByteArray, QByteArray, UmlState * state)
 {
     if (triggerName() == "_completion")
         state->setHasCompletion();
@@ -75,12 +75,12 @@ void UmlTransition::generate(UmlClass * machine, UmlClass * anystate, UmlState *
     if (_already_managed)
         return;
 
-    Q3CString s = triggerName();
+    QByteArray s = triggerName();
 
     // group transitions having the same trigger
-    const Q3PtrVector<UmlItem> ch = parent()->children();
-    unsigned index = ch.findRef(this);
-    Q3PtrList<UmlTransition> trs;
+    const QVector<UmlItem*> ch = parent()->children();
+    int index = ch.indexOf(this);
+    QList<UmlTransition*> trs;
     UmlTransition * tr_no_guard = 0;
 
     if (cppGuard().isEmpty())
@@ -112,7 +112,7 @@ void UmlTransition::generate(UmlClass * machine, UmlClass * anystate, UmlState *
     // made the trigger
 
     UmlOperation * trg = state->assocClass()->trigger(s, machine, anystate);
-    Q3CString body;
+    QByteArray body;
 
     if (s == "create") {
         // manage entry
@@ -136,36 +136,36 @@ void UmlTransition::generate(UmlClass * machine, UmlClass * anystate, UmlState *
     trg->set_CppBody(body);
 }
 
-void UmlTransition::generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent)
+void UmlTransition::generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent)
 {
     if (!cppTrigger().isEmpty()) {
         UmlCom::trace("Error : transition from a pseudo state can't have trigger<br>");
         throw 0;
     }
 
-    Q3PtrList<UmlTransition> l;
+    QList<UmlTransition*> l;
 
     l.append(this);
     generate(l, machine, anystate, state, body, indent, FALSE);
 }
 
-void UmlTransition::generate(Q3PtrList<UmlTransition> trs, UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent, bool completion)
+void UmlTransition::generate(QList<UmlTransition*> trs, UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent, bool completion)
 {
     UmlTransition * tr;
     bool guard = FALSE;
 
-    for (tr = trs.first(); tr != 0; tr = trs.next()) {
+    foreach (tr, trs) {
         body += indent;
 
         if (!tr->cppGuard().isEmpty()) {
             // manage guard
-            body += ((tr == trs.getFirst()) ? "if (" : "else if (")
+            body += ((tr == trs.first()) ? "if (" : "else if (")
                     + tr->cppGuard() + ") {\n";
             guard = TRUE;
         }
         else
             // no gard : it is the last transition, may be the first
-            body += ((tr == trs.getFirst()) ? "{\n" : "else {\n");
+            body += ((tr == trs.first()) ? "{\n" : "else {\n");
 
         // the target state
         UmlItem * tg = tr->target();
@@ -226,7 +226,7 @@ void UmlTransition::generate(Q3PtrList<UmlTransition> trs, UmlClass * machine, U
         }
         else if (tr->target()->kind() != aTerminatePseudoState) {
             if (tg != common) {
-                Q3CString enter;
+                QByteArray enter;
                 UmlState * tg_parent;
 
                 // the enter behavior of the target state will be managed
diff --git a/genplugouts/sm/UmlTransition.h b/genplugouts/sm/UmlTransition.h
index 8ddd40b81..2b9c0d941 100644
--- a/genplugouts/sm/UmlTransition.h
+++ b/genplugouts/sm/UmlTransition.h
@@ -4,8 +4,8 @@
 
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
-#include <q3ptrlist.h>
+#include <QByteArray>
+
 
 class UmlClass;
 class UmlState;
@@ -13,16 +13,16 @@ class UmlState;
 class UmlTransition : public UmlBaseTransition, public UmlStateItem
 {
 public:
-    UmlTransition(void * id, const Q3CString & n) : UmlBaseTransition(id, n), _already_managed(FALSE) {
+    UmlTransition(void * id, const QByteArray & n) : UmlBaseTransition(id, n), _already_managed(FALSE) {
     }
 
     //  return the name of the trigger
 
-    Q3CString triggerName();
+    QByteArray triggerName();
 
     //  initialization before generation
 
-    virtual void init(UmlClass * mother, Q3CString path, Q3CString pretty_path, UmlState * state);
+    virtual void init(UmlClass * mother, QByteArray path, QByteArray pretty_path, UmlState * state);
 
     //   manage transition from a state or an initial pseudo state
 
@@ -30,11 +30,11 @@ class UmlTransition : public UmlBaseTransition, public UmlStateItem
 
     //  manage transition from a pseudo state
 
-    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent);
+    virtual void generate(UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent);
 
     //  generate all the transition in trs, for a state, junction or choice
 
-    static void generate(Q3PtrList<UmlTransition> trs, UmlClass * machine, UmlClass * anystate, UmlState * state, Q3CString & body, Q3CString indent, bool completion);
+    static void generate(QList<UmlTransition*> trs, UmlClass * machine, UmlClass * anystate, UmlState * state, QByteArray & body, QByteArray indent, bool completion);
 
 
 protected:
diff --git a/genplugouts/sm/UmlUseCase.h b/genplugouts/sm/UmlUseCase.h
index 392773262..9947e8b05 100644
--- a/genplugouts/sm/UmlUseCase.h
+++ b/genplugouts/sm/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case'
 //
@@ -11,7 +11,7 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlUseCaseDiagram.h b/genplugouts/sm/UmlUseCaseDiagram.h
index 132b56d36..41f841a09 100644
--- a/genplugouts/sm/UmlUseCaseDiagram.h
+++ b/genplugouts/sm/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlUseCaseView.h b/genplugouts/sm/UmlUseCaseView.h
index a715b2f5f..cd5416397 100644
--- a/genplugouts/sm/UmlUseCaseView.h
+++ b/genplugouts/sm/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case view'
 //
@@ -11,7 +11,7 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/sm/UmlView.h b/genplugouts/sm/UmlView.h
index 418e689ab..7caf8c290 100644
--- a/genplugouts/sm/UmlView.h
+++ b/genplugouts/sm/UmlView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlView : public UmlBaseView
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlView(void * id, const Q3CString & s) : UmlBaseView(id, s) {
+    UmlView(void * id, const QByteArray & s) : UmlBaseView(id, s) {
     }
 
 };
diff --git a/genplugouts/sm/gridbox.cpp b/genplugouts/sm/gridbox.cpp
new file mode 100644
index 000000000..78233be1d
--- /dev/null
+++ b/genplugouts/sm/gridbox.cpp
@@ -0,0 +1,37 @@
+#include "gridbox.h"
+#include <QGridLayout>
+GridBox::GridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void GridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void GridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void GridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+}
+
+QString GridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/genplugouts/sm/gridbox.h b/genplugouts/sm/gridbox.h
new file mode 100644
index 000000000..64793941d
--- /dev/null
+++ b/genplugouts/sm/gridbox.h
@@ -0,0 +1,26 @@
+#ifndef GRIDBOX_H
+#define GRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class GridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit GridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/genplugouts/sm/hhbox.cpp b/genplugouts/sm/hhbox.cpp
new file mode 100644
index 000000000..95a09b5ea
--- /dev/null
+++ b/genplugouts/sm/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/sm/hhbox.h b/genplugouts/sm/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/genplugouts/sm/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/genplugouts/sm/SmGenerator.pro b/genplugouts/sm/sm.pro
similarity index 94%
rename from genplugouts/sm/SmGenerator.pro
rename to genplugouts/sm/sm.pro
index f1ef5dac4..2ada3a639 100644
--- a/genplugouts/sm/SmGenerator.pro
+++ b/genplugouts/sm/sm.pro
@@ -1,7 +1,9 @@
 TEMPLATE	= app
 TARGET		= stmgen
-CONFIG		+= debug warn_on qt
-DEFINES		= WITHCPP
+CONFIG -= app_bundle
+CONFIG		+= warn_on qt c++11
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES		+= WITHCPP FALSE=false TRUE=true TRACE
 HEADERS		= ./UmlBaseRelation.h \
 		  ./UmlStateAction.h \
 		  ./anExpansionKind.h \
@@ -343,23 +345,24 @@ SOURCES		= ./UmlBaseRelation.cpp \
 		  ./UmlExpansionNode.cpp
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network  widgets
+#qt3support
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
+QT += testlib
 
+DESTDIR = ../../bin
 
-    MOC_DIR = bin/douml/sm/MOC_release
-    OBJECTS_DIR = bin/douml/sm/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-Debug{
-    MOC_DIR = bin/douml/sm/MOC_Debug
-    OBJECTS_DIR = bin/douml/sm/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
 
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/genplugouts/tabdialogwrapper.cpp b/genplugouts/tabdialogwrapper.cpp
new file mode 100644
index 000000000..785524515
--- /dev/null
+++ b/genplugouts/tabdialogwrapper.cpp
@@ -0,0 +1,80 @@
+#include "tabdialog.h"
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+TabDialog::TabDialog(QWidget *parent, const char *name, bool modal, Qt::WidgetAttribute f) :
+    QDialog(parent/*, f*/),
+    m_okButton(NULL), m_cancelButton(NULL), m_helpButton(NULL)
+{
+    if(f != Qt::WA_Disabled)
+        setAttribute(f);
+    setWindowTitle(name);
+    setModal(modal);
+    m_tabWidget = new QTabWidget(this);
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    this->setLayout(layout);
+
+    m_buttonLayout = new QHBoxLayout();
+    layout->addWidget(m_tabWidget);
+    layout->addLayout(m_buttonLayout);
+
+
+}
+
+void TabDialog::addTab(QWidget *tabWidget, QString name)
+{
+    m_tabWidget->addTab(tabWidget, name);
+}
+void TabDialog::insertTab(QWidget *tabWidget, QString name, int index)
+{
+    m_tabWidget->addTab(tabWidget, name);
+    m_tabWidget->insertTab(index, tabWidget,name);
+}
+
+void TabDialog::setTabEnabled(QWidget *w, bool isEnabled)
+{
+    m_tabWidget->setTabEnabled(m_tabWidget->indexOf(w), isEnabled);
+}
+void TabDialog::removePage(QWidget *page)
+{
+    m_tabWidget->removeTab(m_tabWidget->indexOf(page));
+}
+
+void TabDialog::setOkButton(QString name)
+{
+    if(m_okButton)
+        return;
+    m_okButton = new QPushButton(name,this);
+    connect(m_okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    m_buttonLayout->addWidget(m_okButton);
+}
+
+void TabDialog::setCancelButton(QString name)
+{
+    if(m_cancelButton)
+        return;
+    m_cancelButton = new QPushButton(name,this);
+    connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+    m_buttonLayout->addWidget(m_cancelButton);
+}
+
+void TabDialog::setHelpButton(QString name)
+{
+    if(m_helpButton)
+        return;
+    m_helpButton = new QPushButton(name,this);
+    connect(m_helpButton, SIGNAL(clicked()), this, SIGNAL(helpButtonPressed()));
+    m_buttonLayout->addWidget(m_helpButton);
+
+}
+
+void TabDialog::showPage(QWidget *page)
+{
+    m_tabWidget->setCornerWidget(page);
+}
+
+void TabDialog::setCaption(QString cap)
+{
+    setWindowTitle(cap);
+}
+
diff --git a/genplugouts/tabdialogwrapper.h b/genplugouts/tabdialogwrapper.h
new file mode 100644
index 000000000..5c1990923
--- /dev/null
+++ b/genplugouts/tabdialogwrapper.h
@@ -0,0 +1,41 @@
+#ifndef TABDIALOG_H
+#define TABDIALOG_H
+
+#include <QDialog>
+#include <QTabWidget>
+#include "QScrollArea"
+class QHBoxLayout;
+class TabDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit TabDialog(QWidget * parent = 0, const char * name = 0, bool modal = false, Qt::WidgetAttribute f = Qt::WA_Disabled);
+    void addTab(QWidget* tabWidget, QString name);
+    void removePage(QWidget* page);
+    void setOkButton(QString name);
+    void setCancelButton(QString name);
+    void setHelpButton(QString name);
+    void showPage(QWidget* page);
+    void setCaption(QString cap);
+    bool hasOkButton( ) {return (m_okButton != NULL);}
+
+    void insertTab(QWidget *tabWidget, QString name, int index);
+
+    QTabBar *tabBar(){ return m_tabWidget->tabBar();}
+
+    void setTabEnabled(QWidget *w, bool isEnabled);
+signals:
+    void helpButtonPressed();
+public slots:
+private:
+protected:
+    QTabWidget* m_tabWidget;
+    QPushButton *m_okButton;
+    QPushButton *m_cancelButton;
+    QPushButton *m_helpButton;
+    QHBoxLayout *m_buttonLayout;
+    QScrollArea m_scrollArea;
+
+};
+
+#endif // TABDIALOG_H
diff --git a/genplugouts/uml_projection/CppSettings.cpp b/genplugouts/uml_projection/CppSettings.cpp
index 900b66475..b6dd233b1 100644
--- a/genplugouts/uml_projection/CppSettings.cpp
+++ b/genplugouts/uml_projection/CppSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationAttributeStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool CppSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -175,14 +175,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -194,14 +194,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -213,14 +213,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -232,14 +232,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -352,14 +352,14 @@ bool CppSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -371,14 +371,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -390,14 +390,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -409,14 +409,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -428,22 +428,22 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinIn(Q3CString s)
+QByteArray CppSettings::builtinIn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_in : Q3CString("");
+    return (b) ? b->cpp_in : QByteArray("");
 }
 
-bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinIn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -456,22 +456,22 @@ bool CppSettings::set_BuiltinIn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinOut(Q3CString s)
+QByteArray CppSettings::builtinOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_out : Q3CString("");
+    return (b) ? b->cpp_out : QByteArray("");
 }
 
-bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -484,22 +484,22 @@ bool CppSettings::set_BuiltinOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinInOut(Q3CString s)
+QByteArray CppSettings::builtinInOut(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_inout : Q3CString();
+    return (b) ? b->cpp_inout : QByteArray();
 }
 
-bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinInOut(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -512,22 +512,22 @@ bool CppSettings::set_BuiltinInOut(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-Q3CString CppSettings::builtinReturn(Q3CString s)
+QByteArray CppSettings::builtinReturn(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_return : Q3CString("");
+    return (b) ? b->cpp_return : QByteArray("");
 }
 
-bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
+bool CppSettings::set_BuiltinReturn(QByteArray type, QByteArray form)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -540,14 +540,14 @@ bool CppSettings::set_BuiltinReturn(Q3CString type, Q3CString form)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v, ""); //[rageek] Fix prototype
 
@@ -559,14 +559,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v, ""); //[rageek] Fix prototype
 
@@ -578,14 +578,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v, ""); //[rageek] Fix prototype
 
@@ -597,14 +597,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)v, ""); //[rageek] Fix prototype
 
@@ -616,14 +616,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -635,14 +635,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -654,14 +654,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -673,14 +673,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -692,14 +692,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -711,14 +711,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -730,14 +730,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl(const char * multiplicity)
+const QByteArray & CppSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool CppSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -750,14 +750,14 @@ bool CppSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -769,7 +769,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -789,14 +789,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -808,14 +808,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -865,14 +865,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -960,14 +960,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -1038,51 +1038,51 @@ bool CppSettings::set_IsSetParamRef(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl[3/*multiplicity*/];
+QByteArray CppSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -1092,7 +1092,7 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
@@ -1100,13 +1100,13 @@ bool CppSettings::_is_set_param_const;
 
 bool CppSettings::_is_set_param_ref;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
@@ -1118,14 +1118,14 @@ bool CppSettings::_is_force_namespace_gen;
 
 bool CppSettings::_is_generate_javadoc_comment;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1151,13 +1151,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
@@ -1222,13 +1222,13 @@ void CppSettings::read_if_needed_()
     }
 }
 
-Q3CString CppSettings::builtinInout(Q3CString s)
+QByteArray CppSettings::builtinInout(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
-    return (b) ? b->cpp_inout : Q3CString("");
+    return (b) ? b->cpp_inout : QByteArray("");
 }
 
 
diff --git a/genplugouts/uml_projection/CppSettings.h b/genplugouts/uml_projection/CppSettings.h
index 62df07955..d5e2daecc 100644
--- a/genplugouts/uml_projection/CppSettings.h
+++ b/genplugouts/uml_projection/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(Q3CString s);
+    static QByteArray relationAttributeStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -175,46 +175,46 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static Q3CString builtinIn(Q3CString s);
+    static QByteArray builtinIn(QByteArray s);
 
     // set the default operation 'in' parameter specification
     // in case its type is specified in the first 'Generation
@@ -222,12 +222,12 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinIn(Q3CString type, Q3CString form);
+    static bool set_BuiltinIn(QByteArray type, QByteArray form);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static Q3CString builtinOut(Q3CString s);
+    static QByteArray builtinOut(QByteArray s);
 
     // set the default operation 'out' parameter specification
     // in case its type is specified in the first 'Generation
@@ -235,13 +235,13 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinOut(QByteArray type, QByteArray form);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
     // settings' tab, else an empty string/null
 
-    static Q3CString builtinInOut(Q3CString s);
+    static QByteArray builtinInOut(QByteArray s);
 
     // set the default operation 'inout' parameter specification
     // in case its type is specified in the first 'Generation
@@ -249,10 +249,10 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinInOut(Q3CString type, Q3CString form);
+    static bool set_BuiltinInOut(QByteArray type, QByteArray form);
 
     // return the default operation value type form
-    static Q3CString builtinReturn(Q3CString s);
+    static QByteArray builtinReturn(QByteArray s);
 
     // set the default operation 'return' parameter specification
     // in case its type is specified in the first 'Generation
@@ -260,36 +260,36 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_BuiltinReturn(Q3CString type, Q3CString form);
+    static bool set_BuiltinReturn(QByteArray type, QByteArray form);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -297,83 +297,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -382,20 +382,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -419,13 +419,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -471,14 +471,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -519,51 +519,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -573,7 +573,7 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
@@ -581,13 +581,13 @@ class CppSettings : public UmlSettings
 
     static bool _is_set_param_ref;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
@@ -599,7 +599,7 @@ class CppSettings : public UmlSettings
 
     static bool _is_generate_javadoc_comment;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
@@ -616,7 +616,7 @@ class CppSettings : public UmlSettings
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static Q3CString builtinInout(Q3CString s);
+    static QByteArray builtinInout(QByteArray s);
 
 };
 
diff --git a/genplugouts/uml_projection/Dialog.cpp b/genplugouts/uml_projection/Dialog.cpp
index 4bb6caa4c..9ab7af00d 100644
--- a/genplugouts/uml_projection/Dialog.cpp
+++ b/genplugouts/uml_projection/Dialog.cpp
@@ -8,48 +8,56 @@
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3hbox.h>
+#include <hhbox.h>
 #include <qcheckbox.h>
 #include <qdir.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
+#include <QSettings>
 
-Dialog::Dialog(BooL & rec, char & lang) : QDialog(0, 0, TRUE), _rec(rec), _lang(lang)
+Dialog::Dialog(BooL & rec, char & lang) : QDialog(0), _rec(rec), _lang(lang)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBox * htab;
+    setModal(true);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    HHBox * htab;
 
     vbox->setMargin(5);
 
     // recursive checkbox
     if (rec) {
-        htab = new Q3HBox(this);
+        htab = new HHBox(this);
         htab->setMargin(5);
         vbox->addWidget(htab);
 
-        rec_cb = new QCheckBox("Do recursively", htab);
+        htab->addWidget(rec_cb = new QCheckBox("Do recursively", htab));
     }
     else
         rec_cb = 0;
 
     // langs + cancel buttons
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    QPushButton * cpp = new QPushButton("&C++", htab);
-    new QLabel(htab);
-    QPushButton * java = new QPushButton("&Java", htab);
-    new QLabel(htab);
-    QPushButton * idl = new QPushButton("&Idl", htab);
-    new QLabel(htab);
-    QPushButton * php = new QPushButton("P&hp", htab);
-    new QLabel(htab);
-    QPushButton * python = new QPushButton("P&ython", htab);
-    new QLabel(htab);
-    QPushButton * cancel = new QPushButton("&Cancel", htab);
-    new QLabel(htab);
+    QPushButton * cpp;
+    htab->addWidget(cpp = new QPushButton("&C++", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * java;
+    htab->addWidget(java = new QPushButton("&Java", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * idl;
+    htab->addWidget(idl = new QPushButton("&Idl", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * php;
+    htab->addWidget(php = new QPushButton("P&hp", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * python;
+    htab->addWidget(python = new QPushButton("P&ython", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * cancel;
+    htab->addWidget(cancel = new QPushButton("&Cancel", htab));
+    htab->addWidget(new QLabel(htab));
     QSize bs(cancel->sizeHint());
 
     cpp->setFixedSize(bs);
@@ -64,65 +72,39 @@ Dialog::Dialog(BooL & rec, char & lang) : QDialog(0, 0, TRUE), _rec(rec), _lang(
 
     // help
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel(htab);
-    new QLabel("Warning : reset the declarations/definitions to\n"
-               "their default value from the 'generation settings'", htab);
-    new QLabel(htab);
+    htab->addWidget(new QLabel(htab));
+    htab->addWidget(new QLabel("Warning : reset the declarations/definitions to\n"
+               "their default value from the 'generation settings'", htab));
+    htab->addWidget(new QLabel(htab));
 }
 
 void Dialog::polish()
 {
-    QDialog::polish();
-
-    // try to read .doumlrc
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-#ifdef WIN32
-
-    if (fp == 0) {
-        QString hd = getenv("USERPROFILE");
-
-        if (! hd.isEmpty()) {
-            QDir d(hd);
-            QString s2 = d.absFilePath(".doumlrc");
-
-            fp = fopen((const char *) s2, "r");
-        }
-    }
-
-#endif
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        int cx = (r + l) / 2;
-                        int cy = (t + b) / 2;
-
-                        move(x() + cx - (x() + width() / 2),
-                             y() + cy - (y() + height() / 2));
-                    }
-                }
-
-                break;
-            }
-        }
-
-        fclose(fp);
+    QDialog::ensurePolished();
+
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        int cx = (r + l) / 2;
+        int cy = (t + b) / 2;
+
+        move(x() + cx - (x() + width() / 2), y() + cy - (y() + height() / 2));
+      }
     }
 }
 
diff --git a/genplugouts/uml_projection/FlowBehavior.h b/genplugouts/uml_projection/FlowBehavior.h
index 55dde8146..2b1d6fab9 100644
--- a/genplugouts/uml_projection/FlowBehavior.h
+++ b/genplugouts/uml_projection/FlowBehavior.h
@@ -2,18 +2,18 @@
 #define _FLOWBEHAVIOR_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FlowBehavior
 {
 public:
-    Q3CString weight;
+    QByteArray weight;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString selection;
+    QByteArray selection;
 
-    Q3CString transformation;
+    QByteArray transformation;
 
     void read();
 
diff --git a/genplugouts/uml_projection/IdlSettings.cpp b/genplugouts/uml_projection/IdlSettings.cpp
index 3e4faf5f1..f25964241 100644
--- a/genplugouts/uml_projection/IdlSettings.cpp
+++ b/genplugouts/uml_projection/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool IdlSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationAttributeUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationAttributeUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : "valuetype";
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -175,14 +175,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -194,14 +194,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -213,14 +213,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -232,14 +232,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -251,14 +251,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -270,14 +270,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -289,14 +289,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -308,14 +308,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -327,14 +327,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -346,14 +346,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -365,14 +365,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -385,14 +385,14 @@ bool IdlSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeAttributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -405,14 +405,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(const char * multiplicity, Q3CStrin
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionItemDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_item_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionItemDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -425,14 +425,14 @@ bool IdlSettings::set_UnionItemDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -444,14 +444,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl(const char * multiplicity)
+const QByteArray & IdlSettings::constDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _const_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ConstDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -464,14 +464,14 @@ bool IdlSettings::set_ConstDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -484,14 +484,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -504,14 +504,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -524,14 +524,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -543,14 +543,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -562,14 +562,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -602,60 +602,60 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_attr_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_item_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_item_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_const_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -677,13 +677,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/uml_projection/IdlSettings.h b/genplugouts/uml_projection/IdlSettings.h
index d28a0bf7a..7754bce8d 100644
--- a/genplugouts/uml_projection/IdlSettings.h
+++ b/genplugouts/uml_projection/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationAttributeUmlStereotype(Q3CString s);
+    static QByteArray relationAttributeUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype depending on the multiplicity
-    static const Q3CString & valuetypeAttributeDecl(const char * multiplicity);
+    static const QByteArray & valuetypeAttributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeAttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an union item depending on the multiplicity
-    static const Q3CString & unionItemDecl(const char * multiplicity);
+    static const QByteArray & unionItemDecl(const char * multiplicity);
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionItemDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute depending on the multiplicity
-    static const Q3CString & constDecl(const char * multiplicity);
+    static const QByteArray & constDecl(const char * multiplicity);
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(const char * multiplicity, Q3CString v);
+    static bool set_ConstDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_attr_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_attr_decl[3/*multiplicity*/];
 
-    static Q3CString _union_item_decl[3/*multiplicity*/];
+    static QByteArray _union_item_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl[3/*multiplicity*/];
+    static QByteArray _const_decl[3/*multiplicity*/];
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/uml_projection/JavaSettings.cpp b/genplugouts/uml_projection/JavaSettings.cpp
index 12f1736dd..17b76fb46 100644
--- a/genplugouts/uml_projection/JavaSettings.cpp
+++ b/genplugouts/uml_projection/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,22 +22,22 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,29 +50,29 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -85,29 +85,29 @@ bool JavaSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -120,32 +120,32 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -156,14 +156,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -175,14 +175,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -194,14 +194,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -251,14 +251,14 @@ bool JavaSettings::set_IsForcePackagePrefixGeneration(bool v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -270,14 +270,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -289,14 +289,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternDecl()
+const QByteArray & JavaSettings::enumPatternDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_decl;
 }
 
-bool JavaSettings::set_EnumPatternDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -308,14 +308,14 @@ bool JavaSettings::set_EnumPatternDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumDecl()
+QByteArray JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -327,14 +327,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -346,14 +346,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl(const char * multiplicity)
+const QByteArray & JavaSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -366,14 +366,14 @@ bool JavaSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemDecl()
+const QByteArray & JavaSettings::enumPatternItemDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_item_decl;
 }
 
-bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -385,14 +385,14 @@ bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemCase()
+const QByteArray & JavaSettings::enumPatternItemCase()
 {
     read_if_needed_();
 
     return _enum_pattern_item_case;
 }
 
-bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
+bool JavaSettings::set_EnumPatternItemCase(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemCaseCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -404,14 +404,14 @@ bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumItemDecl()
+QByteArray JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -423,14 +423,14 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -443,14 +443,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -481,14 +481,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -500,14 +500,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -597,60 +597,60 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_pattern_decl;
+QByteArray JavaSettings::_enum_pattern_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_attr_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_enum_pattern_item_decl;
+QByteArray JavaSettings::_enum_pattern_item_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_case;
+QByteArray JavaSettings::_enum_pattern_item_case;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
 bool JavaSettings::_is_generate_javadoc_comment;
 
 bool JavaSettings::_is_force_package_gen;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray, QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -672,13 +672,13 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/uml_projection/JavaSettings.h b/genplugouts/uml_projection/JavaSettings.h
index 2c0fc5e18..3f9ab665a 100644
--- a/genplugouts/uml_projection/JavaSettings.h
+++ b/genplugouts/uml_projection/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,80 +31,80 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -126,100 +126,100 @@ class JavaSettings : public UmlSettings
     static bool set_IsForcePackagePrefixGeneration(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumPatternDecl();
+    static const QByteArray & enumPatternDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternDecl(Q3CString v);
+    static bool set_EnumPatternDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumPatternItemDecl();
+    static const QByteArray & enumPatternItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternItemDecl(Q3CString v);
+    static bool set_EnumPatternItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumPatternItemCase();
+    static const QByteArray & enumPatternItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumPatternItemCase(Q3CString v);
+    static bool set_EnumPatternItemCase(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -233,23 +233,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -298,53 +298,53 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_pattern_decl;
+    static QByteArray _enum_pattern_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl[3/*multiplicity*/];
+    static QByteArray _attr_decl[3/*multiplicity*/];
 
-    static Q3CString _enum_pattern_item_decl;
+    static QByteArray _enum_pattern_item_decl;
 
-    static Q3CString _enum_pattern_item_case;
+    static QByteArray _enum_pattern_item_case;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
     static bool _is_generate_javadoc_comment;
 
     static bool _is_force_package_gen;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/uml_projection/PhpSettings.cpp b/genplugouts/uml_projection/PhpSettings.cpp
index 1fca18c76..bd78380f4 100644
--- a/genplugouts/uml_projection/PhpSettings.cpp
+++ b/genplugouts/uml_projection/PhpSettings.cpp
@@ -8,7 +8,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHJAVA
 #include "JavaSettings.h"
 #endif
@@ -24,22 +24,22 @@ bool PhpSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PhpSettings::classStereotype(const Q3CString & s)
+QByteArray PhpSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
 
-bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PhpSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -52,21 +52,21 @@ bool PhpSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PhpSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::php);
 }
 
-const Q3CString & PhpSettings::rootDir()
+const QByteArray & PhpSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PhpSettings::set_RootDir(Q3CString v)
+bool PhpSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -78,14 +78,14 @@ bool PhpSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceContent()
+const QByteArray & PhpSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PhpSettings::set_SourceContent(Q3CString v)
+bool PhpSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -97,14 +97,14 @@ bool PhpSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::sourceExtension()
+const QByteArray & PhpSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PhpSettings::set_SourceExtension(Q3CString v)
+bool PhpSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -135,14 +135,14 @@ bool PhpSettings::set_IsGenerateJavadocStyleComment(bool v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::classDecl()
+const QByteArray & PhpSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PhpSettings::set_ClassDecl(Q3CString v)
+bool PhpSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -154,14 +154,14 @@ bool PhpSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::externalClassDecl()
+const QByteArray & PhpSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PhpSettings::set_ExternalClassDecl(Q3CString v)
+bool PhpSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -173,14 +173,14 @@ bool PhpSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumDecl()
+QByteArray PhpSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PhpSettings::set_EnumDecl(Q3CString v)
+bool PhpSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -192,14 +192,14 @@ bool PhpSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::interfaceDecl()
+const QByteArray & PhpSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool PhpSettings::set_InterfaceDecl(Q3CString v)
+bool PhpSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -211,14 +211,14 @@ bool PhpSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::attributeDecl()
+const QByteArray & PhpSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool PhpSettings::set_AttributeDecl(Q3CString v)
+bool PhpSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -230,14 +230,14 @@ bool PhpSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PhpSettings::enumItemDecl()
+QByteArray PhpSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PhpSettings::set_EnumItemDecl(Q3CString v)
+bool PhpSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -249,14 +249,14 @@ bool PhpSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::relationDecl()
+const QByteArray & PhpSettings::relationDecl()
 {
     read_if_needed_();
 
     return _rel_decl;
 }
 
-bool PhpSettings::set_RelationDecl(Q3CString v)
+bool PhpSettings::set_RelationDecl(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpRelationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -268,14 +268,14 @@ bool PhpSettings::set_RelationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::operationDef()
+const QByteArray & PhpSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PhpSettings::set_OperationDef(Q3CString v)
+bool PhpSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -315,14 +315,14 @@ bool PhpSettings::set_GetVisibility(aVisibility v)
 #endif
 }
 
-const Q3CString & PhpSettings::getName()
+const QByteArray & PhpSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PhpSettings::set_GetName(Q3CString v)
+bool PhpSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -334,14 +334,14 @@ bool PhpSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PhpSettings::setName()
+const QByteArray & PhpSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PhpSettings::set_SetName(Q3CString v)
+bool PhpSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(phpSettingsCmd, setPhpSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -421,29 +421,29 @@ bool PhpSettings::set_SetVisibility(aVisibility v)
 
 bool PhpSettings::_defined;
 
-Q3CString PhpSettings::_root;
+QByteArray PhpSettings::_root;
 
-Q3CString PhpSettings::_class_decl;
+QByteArray PhpSettings::_class_decl;
 
-Q3CString PhpSettings::_external_class_decl;
+QByteArray PhpSettings::_external_class_decl;
 
-Q3CString PhpSettings::_enum_decl;
+QByteArray PhpSettings::_enum_decl;
 
-Q3CString PhpSettings::_interface_decl;
+QByteArray PhpSettings::_interface_decl;
 
-Q3CString PhpSettings::_attr_decl;
+QByteArray PhpSettings::_attr_decl;
 
-Q3CString PhpSettings::_enum_item_decl;
+QByteArray PhpSettings::_enum_item_decl;
 
-Q3CString PhpSettings::_rel_decl;
+QByteArray PhpSettings::_rel_decl;
 
-Q3CString PhpSettings::_oper_def;
+QByteArray PhpSettings::_oper_def;
 
 #ifndef WITHJAVA
 aVisibility PhpSettings::_get_visibility;
 #endif
 
-Q3CString PhpSettings::_get_name;
+QByteArray PhpSettings::_get_name;
 
 bool PhpSettings::_is_get_final;
 
@@ -451,16 +451,31 @@ bool PhpSettings::_is_get_final;
 aVisibility PhpSettings::_set_visibility;
 #endif
 
-Q3CString PhpSettings::_set_name;
+QByteArray PhpSettings::_set_name;
 
 bool PhpSettings::_is_set_final;
 
-Q3CString PhpSettings::_src_content;
+QByteArray PhpSettings::_src_content;
 
-Q3CString PhpSettings::_ext;
+QByteArray PhpSettings::_ext;
 
+QByteArray PhpSettings::_dir_regexp;
+
+bool PhpSettings::_dir_regexp_case_sensitive;
+
+QByteArray PhpSettings::_file_regexp;
+
+bool PhpSettings::_file_regexp_case_sensitive;
 bool PhpSettings::_is_generate_javadoc_comment;
 
+bool PhpSettings::_req_with_path;
+
+bool PhpSettings::_is_relative_path;
+
+bool PhpSettings::_is_root_relative_path;
+
+bool PhpSettings::_is_force_namespace_gen;
+
 void PhpSettings::read_()
 {
     _root = UmlCom::read_string();
@@ -485,18 +500,31 @@ void PhpSettings::read_()
     _rel_decl = UmlCom::read_string();
     _oper_def = UmlCom::read_string();
 #ifndef WITHJAVA
-    _get_visibility =
+    _get_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _get_name = UmlCom::read_string();
     _is_get_final = UmlCom::read_bool();
 #ifndef WITHJAVA
-    _set_visibility =
+    _set_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
     _is_generate_javadoc_comment = UmlCom::read_bool();
+    _req_with_path = UmlCom::read_bool();
+    _is_relative_path = UmlCom::read_bool();
+    _is_root_relative_path = UmlCom::read_bool();
+
+    _dir_regexp = UmlCom::read_string();
+    _dir_regexp_case_sensitive = UmlCom::read_bool();
+
+    _file_regexp = UmlCom::read_string();
+    _file_regexp_case_sensitive = UmlCom::read_bool();
+
+    _is_force_namespace_gen = UmlCom::read_bool();
 }
 
 void PhpSettings::read_if_needed_()
diff --git a/genplugouts/uml_projection/PhpSettings.h b/genplugouts/uml_projection/PhpSettings.h
index 2f83561bc..112fdf955 100644
--- a/genplugouts/uml_projection/PhpSettings.h
+++ b/genplugouts/uml_projection/PhpSettings.h
@@ -4,7 +4,7 @@
 #ifdef WITHPHP
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
 
@@ -29,41 +29,41 @@ class PhpSettings : public UmlSettings
 
     // returns the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PHP stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PHP one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PHP code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PHP code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // return if  generate Javadoc style comment
     static bool isGenerateJavadocStyleComment();
@@ -74,68 +74,68 @@ class PhpSettings : public UmlSettings
     static bool set_IsGenerateJavadocStyleComment(bool v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of an relation
-    static const Q3CString & relationDecl();
+    static const QByteArray & relationDecl();
 
     // set the default definition of an relation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(Q3CString v);
+    static bool set_RelationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -153,23 +153,23 @@ class PhpSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -212,29 +212,29 @@ class PhpSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl;
+    static QByteArray _rel_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
 #ifndef WITHJAVA
     static aVisibility _get_visibility;
 #endif
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
@@ -242,16 +242,31 @@ class PhpSettings : public UmlSettings
     static aVisibility _set_visibility;
 #endif
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
+    static QByteArray _dir_regexp;
+
+    static bool _dir_regexp_case_sensitive;
+
+    static QByteArray _file_regexp;
+
+    static bool _file_regexp_case_sensitive;
     static bool _is_generate_javadoc_comment;
 
+    static bool _req_with_path;
+
+    static bool _is_relative_path;
+
+    static bool _is_root_relative_path;
+
+    static bool _is_force_namespace_gen;
+
 
 protected:
     static void read_();
diff --git a/genplugouts/uml_projection/PythonSettings.cpp b/genplugouts/uml_projection/PythonSettings.cpp
index 22aa9ef7f..6ee7a500e 100644
--- a/genplugouts/uml_projection/PythonSettings.cpp
+++ b/genplugouts/uml_projection/PythonSettings.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool PythonSettings::isPython_2_2()
 {
     read_if_needed_();
@@ -26,7 +26,7 @@ bool PythonSettings::set_IsPython_2_2(bool y)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::indentStep()
+const QByteArray & PythonSettings::indentStep()
 {
     read_if_needed_();
     return _indent_step;
@@ -56,22 +56,22 @@ bool PythonSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString PythonSettings::relationAttributeStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_RelationAttributeStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -84,29 +84,29 @@ bool PythonSettings::set_RelationAttributeStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::relationAttributeUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::relationAttributeUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_attr_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::classStereotype(const Q3CString & s)
+QByteArray PythonSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
 
-bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool PythonSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -119,32 +119,32 @@ bool PythonSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::classUmlStereotype(const Q3CString & s)
+QByteArray PythonSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::python);
 }
 
-Q3CString PythonSettings::get_import(const Q3CString & s)
+QByteArray PythonSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool PythonSettings::set_Import(Q3CString s, Q3CString v)
+bool PythonSettings::set_Import(QByteArray s, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonImportCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -155,14 +155,14 @@ bool PythonSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::rootDir()
+const QByteArray & PythonSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool PythonSettings::set_RootDir(Q3CString v)
+bool PythonSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -174,14 +174,14 @@ bool PythonSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceContent()
+const QByteArray & PythonSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool PythonSettings::set_SourceContent(Q3CString v)
+bool PythonSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -193,14 +193,14 @@ bool PythonSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::sourceExtension()
+const QByteArray & PythonSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool PythonSettings::set_SourceExtension(Q3CString v)
+bool PythonSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -212,14 +212,14 @@ bool PythonSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::classDecl()
+const QByteArray & PythonSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool PythonSettings::set_ClassDecl(Q3CString v)
+bool PythonSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -231,14 +231,14 @@ bool PythonSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::externalClassDecl()
+const QByteArray & PythonSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool PythonSettings::set_ExternalClassDecl(Q3CString v)
+bool PythonSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -250,14 +250,14 @@ bool PythonSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumDecl()
+QByteArray PythonSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool PythonSettings::set_EnumDecl(Q3CString v)
+bool PythonSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -269,14 +269,14 @@ bool PythonSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::attributeDecl(const char * multiplicity)
+const QByteArray & PythonSettings::attributeDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _attr_decl[mult_column(multiplicity)];
 }
 
-bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
+bool PythonSettings::set_AttributeDecl(const char * multiplicity, QByteArray v)
 {
     read_if_needed_();
     UmlCom::send_cmd(pythonSettingsCmd, setPythonAttributeDeclCmd, multiplicity, (const char *)v); //[rageek] Fix prototype
@@ -289,14 +289,14 @@ bool PythonSettings::set_AttributeDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-Q3CString PythonSettings::enumItemDecl()
+QByteArray PythonSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool PythonSettings::set_EnumItemDecl(Q3CString v)
+bool PythonSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -308,7 +308,7 @@ bool PythonSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & PythonSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -328,14 +328,14 @@ bool PythonSettings::set_RelationDecl(bool by_value, const char * multiplicity,
         return FALSE;
 }
 
-const Q3CString & PythonSettings::operationDef()
+const QByteArray & PythonSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool PythonSettings::set_OperationDef(Q3CString v)
+bool PythonSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -347,14 +347,14 @@ bool PythonSettings::set_OperationDef(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::getName()
+const QByteArray & PythonSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool PythonSettings::set_GetName(Q3CString v)
+bool PythonSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -366,14 +366,14 @@ bool PythonSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & PythonSettings::setName()
+const QByteArray & PythonSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool PythonSettings::set_SetName(Q3CString v)
+bool PythonSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(pythonSettingsCmd, setPythonSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -385,7 +385,7 @@ bool PythonSettings::set_SetName(Q3CString v)
         return FALSE;
 }
 
-unsigned PythonSettings::mult_column(const Q3CString & mult)
+unsigned PythonSettings::mult_column(const QByteArray & mult)
 {
     return (mult.isEmpty() || (mult == "1")) ? 0 : 1;
 }
@@ -394,33 +394,33 @@ bool PythonSettings::_defined;
 
 bool PythonSettings::_2_2;
 
-Q3CString PythonSettings::_indent_step;
+QByteArray PythonSettings::_indent_step;
 
-Q3CString PythonSettings::_root;
+QByteArray PythonSettings::_root;
 
-Q3CString PythonSettings::_class_decl;
+QByteArray PythonSettings::_class_decl;
 
-Q3CString PythonSettings::_external_class_decl;
+QByteArray PythonSettings::_external_class_decl;
 
-Q3CString PythonSettings::_enum_decl;
+QByteArray PythonSettings::_enum_decl;
 
-Q3CString PythonSettings::_attr_decl[2/*multiplicity*/];
+QByteArray PythonSettings::_attr_decl[2/*multiplicity*/];
 
-Q3CString PythonSettings::_enum_item_decl;
+QByteArray PythonSettings::_enum_item_decl;
 
-Q3CString PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
+QByteArray PythonSettings::_rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-Q3CString PythonSettings::_oper_def;
+QByteArray PythonSettings::_oper_def;
 
-Q3CString PythonSettings::_get_name;
+QByteArray PythonSettings::_get_name;
 
-Q3CString PythonSettings::_set_name;
+QByteArray PythonSettings::_set_name;
 
-Q3CString PythonSettings::_src_content;
+QByteArray PythonSettings::_src_content;
 
-Q3CString PythonSettings::_ext;
+QByteArray PythonSettings::_ext;
 
-Q3Dict<Q3CString> PythonSettings::_map_imports;
+QHash<QByteArray, QByteArray*> PythonSettings::_map_imports;
 
 void PythonSettings::read_()
 {
@@ -430,8 +430,8 @@ void PythonSettings::read_()
 
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -447,13 +447,13 @@ void PythonSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/uml_projection/PythonSettings.h b/genplugouts/uml_projection/PythonSettings.h
index 5b32a95f4..da5e54dcf 100644
--- a/genplugouts/uml_projection/PythonSettings.h
+++ b/genplugouts/uml_projection/PythonSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHPYTHON
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PYTHON, configured through
 // the 'Generation settings' dialog.
@@ -26,7 +26,7 @@ class PythonSettings : public UmlSettings
     static bool set_IsPython_2_2(bool y);
 
     // return the  default indent step
-    static const Q3CString & indentStep();
+    static const QByteArray & indentStep();
 
     // set default indent step
     //
@@ -45,109 +45,109 @@ class PythonSettings : public UmlSettings
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationAttributeStereotype(const Q3CString & s);
+    static QByteArray relationAttributeStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationAttributeStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationAttributeStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationAttributeStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString relationAttributeUmlStereotype(const Q3CString & s);
+    static QByteArray relationAttributeUmlStereotype(const QByteArray & s);
 
     // returns the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the PYTHON stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the PYTHON one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Python type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Python type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the PYTHON code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the PYTHON code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute depending on the multiplicity
-    static const Q3CString & attributeDecl(const char * multiplicity);
+    static const QByteArray & attributeDecl(const char * multiplicity);
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(const char * multiplicity, Q3CString v);
+    static bool set_AttributeDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -156,71 +156,71 @@ class PythonSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
 
 private:
     // never called !
     PythonSettings() {};
 
-    static unsigned mult_column(const Q3CString & mult);
+    static unsigned mult_column(const QByteArray & mult);
 
     static bool _defined;
 
     static bool _2_2;
 
-    static Q3CString _indent_step;
+    static QByteArray _indent_step;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _attr_decl[2/*multiplicity*/];
+    static QByteArray _attr_decl[2/*multiplicity*/];
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][2/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][2/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/uml_projection/SlotAttribute.h b/genplugouts/uml_projection/SlotAttribute.h
index d1c59eabf..e03a17c21 100644
--- a/genplugouts/uml_projection/SlotAttribute.h
+++ b/genplugouts/uml_projection/SlotAttribute.h
@@ -2,20 +2,20 @@
 #define _SLOTATTRIBUTE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlAttribute;
 
 struct SlotAttribute {
     UmlAttribute * attribute;
 
-    Q3CString value;
+    QByteArray value;
 
     // because of QValueList use
     SlotAttribute() : attribute(0) {
     }
 
-    SlotAttribute(UmlAttribute * a, Q3CString v) : attribute(a), value(v) {
+    SlotAttribute(UmlAttribute * a, QByteArray v) : attribute(a), value(v) {
     }
 
 };
diff --git a/genplugouts/uml_projection/StateBehavior.h b/genplugouts/uml_projection/StateBehavior.h
index 91a42cb82..e15ee5334 100644
--- a/genplugouts/uml_projection/StateBehavior.h
+++ b/genplugouts/uml_projection/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/uml_projection/TransitionBehavior.h b/genplugouts/uml_projection/TransitionBehavior.h
index 856ede3c0..9128520bc 100644
--- a/genplugouts/uml_projection/TransitionBehavior.h
+++ b/genplugouts/uml_projection/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/uml_projection/UmlAccessVariableValueAction.h b/genplugouts/uml_projection/UmlAccessVariableValueAction.h
index dc92b3e25..76bec1aca 100644
--- a/genplugouts/uml_projection/UmlAccessVariableValueAction.h
+++ b/genplugouts/uml_projection/UmlAccessVariableValueAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseAccessVariableValueAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAccessVariableValueAction(void * id, const Q3CString & s) : UmlBaseAccessVariableValueAction(id, s) {
+    UmlAccessVariableValueAction(void * id, const QByteArray & s) : UmlBaseAccessVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivity.h b/genplugouts/uml_projection/UmlActivity.h
index 8f9886b0e..608ff16e1 100644
--- a/genplugouts/uml_projection/UmlActivity.h
+++ b/genplugouts/uml_projection/UmlActivity.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivity.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivity : public UmlBaseActivity
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivity(void * id, const Q3CString & s) : UmlBaseActivity(id, s) {
+    UmlActivity(void * id, const QByteArray & s) : UmlBaseActivity(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityAction.h b/genplugouts/uml_projection/UmlActivityAction.h
index f359c755a..439dd8be5 100644
--- a/genplugouts/uml_projection/UmlActivityAction.h
+++ b/genplugouts/uml_projection/UmlActivityAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityAction : public UmlBaseActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityAction(void * id, const Q3CString & s) : UmlBaseActivityAction(id, s) {
+    UmlActivityAction(void * id, const QByteArray & s) : UmlBaseActivityAction(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityActionClasses.h b/genplugouts/uml_projection/UmlActivityActionClasses.h
index 15677a746..614ec1928 100644
--- a/genplugouts/uml_projection/UmlActivityActionClasses.h
+++ b/genplugouts/uml_projection/UmlActivityActionClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityActionClasses.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlSendObjectAction : public UmlBaseSendObjectAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendObjectAction(void * id, const Q3CString & s) : UmlBaseSendObjectAction(id, s) {
+    UmlSendObjectAction(void * id, const QByteArray & s) : UmlBaseSendObjectAction(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlUnmarshallAction : public UmlBaseUnmarshallAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlUnmarshallAction(void * id, const Q3CString & s) : UmlBaseUnmarshallAction(id, s) {
+    UmlUnmarshallAction(void * id, const QByteArray & s) : UmlBaseUnmarshallAction(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlSendSignalAction : public UmlBaseSendSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlSendSignalAction(void * id, const Q3CString & s) : UmlBaseSendSignalAction(id, s) {
+    UmlSendSignalAction(void * id, const QByteArray & s) : UmlBaseSendSignalAction(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlBroadcastSignalAction : public UmlBaseBroadcastSignalAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBroadcastSignalAction(void * id, const Q3CString & s) : UmlBaseBroadcastSignalAction(id, s) {
+    UmlBroadcastSignalAction(void * id, const QByteArray & s) : UmlBaseBroadcastSignalAction(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlValueSpecificationAction : public UmlBaseValueSpecificationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlValueSpecificationAction(void * id, const Q3CString & s) : UmlBaseValueSpecificationAction(id, s) {
+    UmlValueSpecificationAction(void * id, const QByteArray & s) : UmlBaseValueSpecificationAction(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlOpaqueAction : public UmlBaseOpaqueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOpaqueAction(void * id, const Q3CString & s) : UmlBaseOpaqueAction(id, s) {
+    UmlOpaqueAction(void * id, const QByteArray & s) : UmlBaseOpaqueAction(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlAcceptEventAction : public UmlBaseAcceptEventAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAcceptEventAction(void * id, const Q3CString & s) : UmlBaseAcceptEventAction(id, s) {
+    UmlAcceptEventAction(void * id, const QByteArray & s) : UmlBaseAcceptEventAction(id, s) {
     }
 
 };
@@ -72,7 +72,7 @@ class UmlCallOperationAction : public UmlBaseCallOperationAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallOperationAction(void * id, const Q3CString & s) : UmlBaseCallOperationAction(id, s) {
+    UmlCallOperationAction(void * id, const QByteArray & s) : UmlBaseCallOperationAction(id, s) {
     }
 
 };
@@ -81,7 +81,7 @@ class UmlCallBehaviorAction : public UmlBaseCallBehaviorAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlCallBehaviorAction(void * id, const Q3CString & s) : UmlBaseCallBehaviorAction(id, s) {
+    UmlCallBehaviorAction(void * id, const QByteArray & s) : UmlBaseCallBehaviorAction(id, s) {
     }
 
 };
@@ -90,7 +90,7 @@ class UmlClearVariableValueAction : public UmlBaseClearVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClearVariableValueAction(void * id, const Q3CString & s) : UmlBaseClearVariableValueAction(id, s) {
+    UmlClearVariableValueAction(void * id, const QByteArray & s) : UmlBaseClearVariableValueAction(id, s) {
     }
 
 };
@@ -99,7 +99,7 @@ class UmlReadVariableValueAction : public UmlBaseReadVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlReadVariableValueAction(void * id, const Q3CString & s) : UmlBaseReadVariableValueAction(id, s) {
+    UmlReadVariableValueAction(void * id, const QByteArray & s) : UmlBaseReadVariableValueAction(id, s) {
     }
 
 };
@@ -108,7 +108,7 @@ class UmlWriteVariableValueAction : public UmlBaseWriteVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlWriteVariableValueAction(void * id, const Q3CString & s) : UmlBaseWriteVariableValueAction(id, s) {
+    UmlWriteVariableValueAction(void * id, const QByteArray & s) : UmlBaseWriteVariableValueAction(id, s) {
     }
 
 };
@@ -117,7 +117,7 @@ class UmlAddVariableValueAction : public UmlBaseAddVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlAddVariableValueAction(void * id, const Q3CString & s) : UmlBaseAddVariableValueAction(id, s) {
+    UmlAddVariableValueAction(void * id, const QByteArray & s) : UmlBaseAddVariableValueAction(id, s) {
     }
 
 };
@@ -126,7 +126,7 @@ class UmlRemoveVariableValueAction : public UmlBaseRemoveVariableValueAction
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRemoveVariableValueAction(void * id, const Q3CString & s) : UmlBaseRemoveVariableValueAction(id, s) {
+    UmlRemoveVariableValueAction(void * id, const QByteArray & s) : UmlBaseRemoveVariableValueAction(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityControlNode.h b/genplugouts/uml_projection/UmlActivityControlNode.h
index 8ebf04bf7..6bf483bf4 100644
--- a/genplugouts/uml_projection/UmlActivityControlNode.h
+++ b/genplugouts/uml_projection/UmlActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityControlNode : public UmlBaseActivityControlNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityControlNode(void * id, const Q3CString & s) : UmlBaseActivityControlNode(id, s) {
+    UmlActivityControlNode(void * id, const QByteArray & s) : UmlBaseActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityControlNodeClasses.h b/genplugouts/uml_projection/UmlActivityControlNodeClasses.h
index f698adeca..5c57c3cfa 100644
--- a/genplugouts/uml_projection/UmlActivityControlNodeClasses.h
+++ b/genplugouts/uml_projection/UmlActivityControlNodeClasses.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityControlNodeClasses.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInitialActivityNode : public UmlBaseInitialActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInitialActivityNode(void * id, const Q3CString & s) : UmlBaseInitialActivityNode(id, s) {
+    UmlInitialActivityNode(void * id, const QByteArray & s) : UmlBaseInitialActivityNode(id, s) {
     }
 
 };
@@ -18,7 +18,7 @@ class UmlFlowFinalActivityNode : public UmlBaseFlowFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlFlowFinalActivityNode(void * id, const Q3CString & s) : UmlBaseFlowFinalActivityNode(id, s) {
+    UmlFlowFinalActivityNode(void * id, const QByteArray & s) : UmlBaseFlowFinalActivityNode(id, s) {
     }
 
 };
@@ -27,7 +27,7 @@ class UmlActivityFinalActivityNode : public UmlBaseActivityFinalActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityFinalActivityNode(void * id, const Q3CString & s) : UmlBaseActivityFinalActivityNode(id, s) {
+    UmlActivityFinalActivityNode(void * id, const QByteArray & s) : UmlBaseActivityFinalActivityNode(id, s) {
     }
 
 };
@@ -36,7 +36,7 @@ class UmlDecisionActivityNode : public UmlBaseDecisionActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlDecisionActivityNode(void * id, const Q3CString & s) : UmlBaseDecisionActivityNode(id, s) {
+    UmlDecisionActivityNode(void * id, const QByteArray & s) : UmlBaseDecisionActivityNode(id, s) {
     }
 
 };
@@ -45,7 +45,7 @@ class UmlMergeActivityNode : public UmlBaseMergeActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlMergeActivityNode(void * id, const Q3CString & s) : UmlBaseMergeActivityNode(id, s) {
+    UmlMergeActivityNode(void * id, const QByteArray & s) : UmlBaseMergeActivityNode(id, s) {
     }
 
 };
@@ -54,7 +54,7 @@ class UmlForkActivityNode : public UmlBaseForkActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlForkActivityNode(void * id, const Q3CString & s) : UmlBaseForkActivityNode(id, s) {
+    UmlForkActivityNode(void * id, const QByteArray & s) : UmlBaseForkActivityNode(id, s) {
     }
 
 };
@@ -63,7 +63,7 @@ class UmlJoinActivityNode : public UmlBaseJoinActivityNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlJoinActivityNode(void * id, const Q3CString & s) : UmlBaseJoinActivityNode(id, s) {
+    UmlJoinActivityNode(void * id, const QByteArray & s) : UmlBaseJoinActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityDiagram.h b/genplugouts/uml_projection/UmlActivityDiagram.h
index 4b48b12f2..bc5b4637b 100644
--- a/genplugouts/uml_projection/UmlActivityDiagram.h
+++ b/genplugouts/uml_projection/UmlActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseActivityDiagram.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'activity diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -15,7 +15,7 @@ class UmlActivityDiagram : public UmlBaseActivityDiagram, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityDiagram(void * id, const Q3CString & s) : UmlBaseActivityDiagram(id, s) {
+    UmlActivityDiagram(void * id, const QByteArray & s) : UmlBaseActivityDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityNode.h b/genplugouts/uml_projection/UmlActivityNode.h
index 8429d2396..ecbbfd7ad 100644
--- a/genplugouts/uml_projection/UmlActivityNode.h
+++ b/genplugouts/uml_projection/UmlActivityNode.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityNode.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityNode : public UmlBaseActivityNode, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityNode(void * id, const Q3CString & s) : UmlBaseActivityNode(id, s) {
+    UmlActivityNode(void * id, const QByteArray & s) : UmlBaseActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityObject.h b/genplugouts/uml_projection/UmlActivityObject.h
index f75bccd9b..7fbf6bdc2 100644
--- a/genplugouts/uml_projection/UmlActivityObject.h
+++ b/genplugouts/uml_projection/UmlActivityObject.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityObject.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityObject : public UmlBaseActivityObject
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityObject(void * id, const Q3CString & s) : UmlBaseActivityObject(id, s) {
+    UmlActivityObject(void * id, const QByteArray & s) : UmlBaseActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityParameter.h b/genplugouts/uml_projection/UmlActivityParameter.h
index b51b0fec0..22aea5c57 100644
--- a/genplugouts/uml_projection/UmlActivityParameter.h
+++ b/genplugouts/uml_projection/UmlActivityParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityParameter.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityParameter : public UmlBaseActivityParameter
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityParameter(void * id, const Q3CString & s) : UmlBaseActivityParameter(id, s) {
+    UmlActivityParameter(void * id, const QByteArray & s) : UmlBaseActivityParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityPin.h b/genplugouts/uml_projection/UmlActivityPin.h
index 5d7ae2e0f..7ae4f6b98 100644
--- a/genplugouts/uml_projection/UmlActivityPin.h
+++ b/genplugouts/uml_projection/UmlActivityPin.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseActivityPin.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityPin : public UmlBaseActivityPin
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityPin(void * id, const Q3CString & s) : UmlBaseActivityPin(id, s) {
+    UmlActivityPin(void * id, const QByteArray & s) : UmlBaseActivityPin(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlActivityRegion.h b/genplugouts/uml_projection/UmlActivityRegion.h
index 420b4bde2..1c41f659b 100644
--- a/genplugouts/uml_projection/UmlActivityRegion.h
+++ b/genplugouts/uml_projection/UmlActivityRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseActivityRegion.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityRegion : public UmlBaseActivityRegion, public UmlActivityItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlActivityRegion(void * id, const Q3CString & s) : UmlBaseActivityRegion(id, s) {
+    UmlActivityRegion(void * id, const QByteArray & s) : UmlBaseActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlArtifact.h b/genplugouts/uml_projection/UmlArtifact.h
index 9f6a30622..0b8b99c1a 100644
--- a/genplugouts/uml_projection/UmlArtifact.h
+++ b/genplugouts/uml_projection/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'artifacts'
 //
@@ -11,7 +11,7 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlAttribute.cpp b/genplugouts/uml_projection/UmlAttribute.cpp
index 7afdd98d9..7ece6969a 100644
--- a/genplugouts/uml_projection/UmlAttribute.cpp
+++ b/genplugouts/uml_projection/UmlAttribute.cpp
@@ -7,10 +7,10 @@
 #include "PhpSettings.h"
 #include "PythonSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlAttribute::uml2cpp(bool)
 {
-    Q3CString st = CppSettings::classStereotype(parent()->stereotype());
+    QByteArray st = CppSettings::classStereotype(parent()->stereotype());
 
     if ((st == "typedef") || (st == "ignored"))
         set_CppDecl("");
@@ -24,7 +24,7 @@ void UmlAttribute::uml2cpp(bool)
 
 void UmlAttribute::uml2java(bool)
 {
-    Q3CString st = JavaSettings::classStereotype(parent()->stereotype());
+    QByteArray st = JavaSettings::classStereotype(parent()->stereotype());
 
     if (st == "enum_pattern")
         set_JavaDecl(JavaSettings::enumPatternItemDecl());
@@ -38,7 +38,7 @@ void UmlAttribute::uml2java(bool)
 
 void UmlAttribute::uml2idl(bool)
 {
-    Q3CString st = IdlSettings::classStereotype(parent()->stereotype());
+    QByteArray st = IdlSettings::classStereotype(parent()->stereotype());
 
     if (st == "enum")
         set_IdlDecl(IdlSettings::enumItemDecl());
@@ -54,7 +54,7 @@ void UmlAttribute::uml2idl(bool)
 
 void UmlAttribute::uml2php(bool)
 {
-    Q3CString st = PhpSettings::classStereotype(parent()->stereotype());
+    QByteArray st = PhpSettings::classStereotype(parent()->stereotype());
 
     if (st == "enum")
         set_PhpDecl(PhpSettings::enumItemDecl());
@@ -66,7 +66,7 @@ void UmlAttribute::uml2php(bool)
 
 void UmlAttribute::uml2python(bool)
 {
-    Q3CString st = PythonSettings::classStereotype(parent()->stereotype());
+    QByteArray st = PythonSettings::classStereotype(parent()->stereotype());
 
     if (st == "enum")
         set_PythonDecl(PythonSettings::enumItemDecl());
diff --git a/genplugouts/uml_projection/UmlAttribute.h b/genplugouts/uml_projection/UmlAttribute.h
index 3ce931604..7c76e35e6 100644
--- a/genplugouts/uml_projection/UmlAttribute.h
+++ b/genplugouts/uml_projection/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
     virtual void uml2cpp(bool rec);
 
diff --git a/genplugouts/uml_projection/UmlBaseAccessVariableValueAction.h b/genplugouts/uml_projection/UmlBaseAccessVariableValueAction.h
index 311fefa08..cc16b289e 100644
--- a/genplugouts/uml_projection/UmlBaseAccessVariableValueAction.h
+++ b/genplugouts/uml_projection/UmlBaseAccessVariableValueAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlItem;
 
@@ -11,7 +11,7 @@ class UmlBaseAccessVariableValueAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAccessVariableValueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAccessVariableValueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
diff --git a/genplugouts/uml_projection/UmlBaseActivity.cpp b/genplugouts/uml_projection/UmlBaseActivity.cpp
index 2f992ddd1..45801f46c 100644
--- a/genplugouts/uml_projection/UmlBaseActivity.cpp
+++ b/genplugouts/uml_projection/UmlBaseActivity.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassView.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivity * UmlBaseActivity::create(UmlClassView * parent, const char * s)
 {
@@ -17,7 +17,7 @@ anItemKind UmlBaseActivity::kind()
     return anActivity;
 }
 
-const Q3CString & UmlBaseActivity::preCondition()
+const QByteArray & UmlBaseActivity::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivity::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::postCondition()
+const QByteArray & UmlBaseActivity::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -40,7 +40,7 @@ bool UmlBaseActivity::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivity::cppPreCondition()
+const QByteArray & UmlBaseActivity::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -51,7 +51,7 @@ bool UmlBaseActivity::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::cppPostCondition()
+const QByteArray & UmlBaseActivity::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -64,7 +64,7 @@ bool UmlBaseActivity::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivity::javaPreCondition()
+const QByteArray & UmlBaseActivity::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -75,7 +75,7 @@ bool UmlBaseActivity::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivity::javaPostCondition()
+const QByteArray & UmlBaseActivity::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/uml_projection/UmlBaseActivity.h b/genplugouts/uml_projection/UmlBaseActivity.h
index a0eca47eb..2ec5d35a5 100644
--- a/genplugouts/uml_projection/UmlBaseActivity.h
+++ b/genplugouts/uml_projection/UmlBaseActivity.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivity;
 class UmlClassView;
@@ -26,13 +26,13 @@ class UmlBaseActivity : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivity(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivity(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -40,7 +40,7 @@ class UmlBaseActivity : public UmlItem
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -49,7 +49,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -57,7 +57,7 @@ class UmlBaseActivity : public UmlItem
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseActivity : public UmlItem
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -75,7 +75,7 @@ class UmlBaseActivity : public UmlItem
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -117,20 +117,20 @@ class UmlBaseActivity : public UmlItem
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     bool _read_only;
diff --git a/genplugouts/uml_projection/UmlBaseActivityAction.cpp b/genplugouts/uml_projection/UmlBaseActivityAction.cpp
index fb47b7b1b..de084771d 100644
--- a/genplugouts/uml_projection/UmlBaseActivityAction.cpp
+++ b/genplugouts/uml_projection/UmlBaseActivityAction.cpp
@@ -3,9 +3,9 @@
 #include "UmlBaseActivityAction.h"
 #include "UmlDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseActivityAction::preCondition()
+const QByteArray & UmlBaseActivityAction::preCondition()
 {
     read_if_needed_();
     return _pre_condition;
@@ -16,7 +16,7 @@ bool UmlBaseActivityAction::set_PreCondition(const char * v)
     return set_it_(_pre_condition, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::postCondition()
+const QByteArray & UmlBaseActivityAction::postCondition()
 {
     read_if_needed_();
     return _post_condition;
@@ -28,7 +28,7 @@ bool UmlBaseActivityAction::set_PostCondition(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityAction::cppPreCondition()
+const QByteArray & UmlBaseActivityAction::cppPreCondition()
 {
     read_if_needed_();
     return _cpp_pre_condition;
@@ -39,7 +39,7 @@ bool UmlBaseActivityAction::set_CppPreCondition(const char * v)
     return set_it_(_cpp_pre_condition, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::cppPostCondition()
+const QByteArray & UmlBaseActivityAction::cppPostCondition()
 {
     read_if_needed_();
     return _cpp_post_condition;
@@ -52,7 +52,7 @@ bool UmlBaseActivityAction::set_CppPostCondition(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityAction::javaPreCondition()
+const QByteArray & UmlBaseActivityAction::javaPreCondition()
 {
     read_if_needed_();
     return _java_pre_condition;
@@ -63,7 +63,7 @@ bool UmlBaseActivityAction::set_JavaPreCondition(const char * v)
     return set_it_(_java_pre_condition, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseActivityAction::javaPostCondition()
+const QByteArray & UmlBaseActivityAction::javaPostCondition()
 {
     read_if_needed_();
     return _java_post_condition;
diff --git a/genplugouts/uml_projection/UmlBaseActivityAction.h b/genplugouts/uml_projection/UmlBaseActivityAction.h
index 4a06ccffe..c99847f5d 100644
--- a/genplugouts/uml_projection/UmlBaseActivityAction.h
+++ b/genplugouts/uml_projection/UmlBaseActivityAction.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDiagram;
 
@@ -11,13 +11,13 @@ class UmlBaseActivityAction : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityAction(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityAction(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
 public:
     // return the pre condition
-    const Q3CString & preCondition();
+    const QByteArray & preCondition();
 
     // set the pre condition
     //
@@ -25,7 +25,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_PreCondition(const char * v);
 
     // return the post condition
-    const Q3CString & postCondition();
+    const QByteArray & postCondition();
 
     // set the post condition
     //
@@ -34,7 +34,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the pre condition in C++
-    const Q3CString & cppPreCondition();
+    const QByteArray & cppPreCondition();
 
     // set the pre condition in C++
     //
@@ -42,7 +42,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_CppPreCondition(const char * v);
 
     // return the post condition in C++
-    const Q3CString & cppPostCondition();
+    const QByteArray & cppPostCondition();
 
     // set the post condition in C++
     //
@@ -52,7 +52,7 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the pre condition in Java
-    const Q3CString & javaPreCondition();
+    const QByteArray & javaPreCondition();
 
     // set the pre condition in Java
     //
@@ -60,7 +60,7 @@ class UmlBaseActivityAction : public UmlActivityNode
     bool set_JavaPreCondition(const char * v);
 
     // return the post condition in Java
-    const Q3CString & javaPostCondition();
+    const QByteArray & javaPostCondition();
 
     // set the post condition in Java
     //
@@ -86,20 +86,20 @@ class UmlBaseActivityAction : public UmlActivityNode
 
 
 private:
-    Q3CString _pre_condition;
+    QByteArray _pre_condition;
 
-    Q3CString _post_condition;
+    QByteArray _post_condition;
 
 #ifdef WITHCPP
-    Q3CString _cpp_pre_condition;
+    QByteArray _cpp_pre_condition;
 
-    Q3CString _cpp_post_condition;
+    QByteArray _cpp_post_condition;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_pre_condition;
+    QByteArray _java_pre_condition;
 
-    Q3CString _java_post_condition;
+    QByteArray _java_post_condition;
 #endif
 
     UmlDiagram * _assoc_diagram;
diff --git a/genplugouts/uml_projection/UmlBaseActivityActionClasses.cpp b/genplugouts/uml_projection/UmlBaseActivityActionClasses.cpp
index adeceb749..eba28a614 100644
--- a/genplugouts/uml_projection/UmlBaseActivityActionClasses.cpp
+++ b/genplugouts/uml_projection/UmlBaseActivityActionClasses.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlOperation.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlSendObjectAction * UmlBaseSendObjectAction::create(UmlItem * parent, const char * s)
 {
@@ -57,7 +57,7 @@ anItemKind UmlBaseValueSpecificationAction::kind()
     return aValueSpecificationAction;
 }
 
-const Q3CString & UmlBaseValueSpecificationAction::value()
+const QByteArray & UmlBaseValueSpecificationAction::value()
 {
     read_if_needed_();
     return _value;
@@ -69,7 +69,7 @@ bool UmlBaseValueSpecificationAction::set_Value(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseValueSpecificationAction::cppValue()
+const QByteArray & UmlBaseValueSpecificationAction::cppValue()
 {
     read_if_needed_();
     return _cpp_value;
@@ -82,7 +82,7 @@ bool UmlBaseValueSpecificationAction::set_CppValue(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseValueSpecificationAction::javaValue()
+const QByteArray & UmlBaseValueSpecificationAction::javaValue()
 {
     read_if_needed_();
     return _java_value;
@@ -138,7 +138,7 @@ anItemKind UmlBaseOpaqueAction::kind()
     return anOpaqueAction;
 }
 
-const Q3CString & UmlBaseOpaqueAction::behavior()
+const QByteArray & UmlBaseOpaqueAction::behavior()
 {
     read_if_needed_();
     return _behavior;
@@ -150,7 +150,7 @@ bool UmlBaseOpaqueAction::set_Behavior(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOpaqueAction::cppBehavior()
+const QByteArray & UmlBaseOpaqueAction::cppBehavior()
 {
     read_if_needed_();
     return _cpp_behavior;
@@ -163,7 +163,7 @@ bool UmlBaseOpaqueAction::set_CppBehavior(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOpaqueAction::javaBehavior()
+const QByteArray & UmlBaseOpaqueAction::javaBehavior()
 {
     read_if_needed_();
     return _java_behavior;
@@ -241,7 +241,7 @@ bool UmlBaseAcceptEventAction::set_isTimeEvent(bool v)
     return set_it_(_timeevent, v, setTimeEventCmd);
 }
 
-const Q3CString & UmlBaseAcceptEventAction::trigger()
+const QByteArray & UmlBaseAcceptEventAction::trigger()
 {
     read_if_needed_();
     return _trigger;
@@ -253,7 +253,7 @@ bool UmlBaseAcceptEventAction::set_Trigger(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseAcceptEventAction::cppTrigger()
+const QByteArray & UmlBaseAcceptEventAction::cppTrigger()
 {
     read_if_needed_();
     return _cpp_trigger;
@@ -266,7 +266,7 @@ bool UmlBaseAcceptEventAction::set_CppTrigger(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseAcceptEventAction::javaTrigger()
+const QByteArray & UmlBaseAcceptEventAction::javaTrigger()
 {
     read_if_needed_();
     return _java_trigger;
diff --git a/genplugouts/uml_projection/UmlBaseActivityActionClasses.h b/genplugouts/uml_projection/UmlBaseActivityActionClasses.h
index 1a3b14b5f..04cbed9c9 100644
--- a/genplugouts/uml_projection/UmlBaseActivityActionClasses.h
+++ b/genplugouts/uml_projection/UmlBaseActivityActionClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityAction.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlOnSignalAction.h"
 #include "UmlAccessVariableValueAction.h"
 
@@ -41,7 +41,7 @@ class UmlBaseSendObjectAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendObjectAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseSendObjectAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -62,7 +62,7 @@ class UmlBaseUnmarshallAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUnmarshallAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseUnmarshallAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 };
@@ -83,7 +83,7 @@ class UmlBaseSendSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSendSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseSendSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -104,7 +104,7 @@ class UmlBaseBroadcastSignalAction : public UmlOnSignalAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseBroadcastSignalAction(void * id, const Q3CString & s) : UmlOnSignalAction(id, s) {
+    UmlBaseBroadcastSignalAction(void * id, const QByteArray & s) : UmlOnSignalAction(id, s) {
     }
 
 };
@@ -125,13 +125,13 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseValueSpecificationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseValueSpecificationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the value
-    const Q3CString & value();
+    const QByteArray & value();
 
     // set the value
     //
@@ -140,7 +140,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the value in C++
-    const Q3CString & cppValue();
+    const QByteArray & cppValue();
 
     // set the value in C++
     //
@@ -150,7 +150,7 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the value in Java
-    const Q3CString & javaValue();
+    const QByteArray & javaValue();
 
     // set the value in Java
     //
@@ -168,14 +168,14 @@ class UmlBaseValueSpecificationAction : public UmlActivityAction
 
 
 private:
-    Q3CString _value;
+    QByteArray _value;
 
 #ifdef WITHCPP
-    Q3CString _cpp_value;
+    QByteArray _cpp_value;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_value;
+    QByteArray _java_value;
 #endif
 
 
@@ -208,13 +208,13 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOpaqueAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOpaqueAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the behavior
-    const Q3CString & behavior();
+    const QByteArray & behavior();
 
     // set the behavior
     //
@@ -223,7 +223,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the behavior in C++
-    const Q3CString & cppBehavior();
+    const QByteArray & cppBehavior();
 
     // set the behavior in C++
     //
@@ -233,7 +233,7 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the behavior in Java
-    const Q3CString & javaBehavior();
+    const QByteArray & javaBehavior();
 
     // set the behavior in Java
     //
@@ -251,14 +251,14 @@ class UmlBaseOpaqueAction : public UmlActivityAction
 
 
 private:
-    Q3CString _behavior;
+    QByteArray _behavior;
 
 #ifdef WITHCPP
-    Q3CString _cpp_behavior;
+    QByteArray _cpp_behavior;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_behavior;
+    QByteArray _java_behavior;
 #endif
 
 
@@ -291,7 +291,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAcceptEventAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseAcceptEventAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -313,7 +313,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
     bool set_isTimeEvent(bool v);
 
     // return the trigger
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger
     //
@@ -322,7 +322,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -332,7 +332,7 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -354,14 +354,14 @@ class UmlBaseAcceptEventAction : public UmlActivityAction
 
     bool _timeevent;
 
-    Q3CString _trigger;
+    QByteArray _trigger;
 
 #ifdef WITHCPP
-    Q3CString _cpp_trigger;
+    QByteArray _cpp_trigger;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_trigger;
+    QByteArray _java_trigger;
 #endif
 
 
@@ -394,7 +394,7 @@ class UmlBaseCallOperationAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallOperationAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallOperationAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -443,7 +443,7 @@ class UmlBaseCallBehaviorAction : public UmlActivityAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCallBehaviorAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseCallBehaviorAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
@@ -492,7 +492,7 @@ class UmlBaseClearVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClearVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseClearVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -513,7 +513,7 @@ class UmlBaseReadVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseReadVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseReadVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -534,7 +534,7 @@ class UmlBaseWriteVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseWriteVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseWriteVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 };
@@ -555,7 +555,7 @@ class UmlBaseAddVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAddVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseAddVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
@@ -594,7 +594,7 @@ class UmlBaseRemoveVariableValueAction : public UmlAccessVariableValueAction
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRemoveVariableValueAction(void * id, const Q3CString & s) : UmlAccessVariableValueAction(id, s) {
+    UmlBaseRemoveVariableValueAction(void * id, const QByteArray & s) : UmlAccessVariableValueAction(id, s) {
     }
 
 
diff --git a/genplugouts/uml_projection/UmlBaseActivityControlNode.h b/genplugouts/uml_projection/UmlBaseActivityControlNode.h
index 9f1c0931a..0ec7fa02f 100644
--- a/genplugouts/uml_projection/UmlBaseActivityControlNode.h
+++ b/genplugouts/uml_projection/UmlBaseActivityControlNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlActivityNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlBaseActivityControlNode : public UmlActivityNode
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityControlNode(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityControlNode(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseActivityControlNodeClasses.h b/genplugouts/uml_projection/UmlBaseActivityControlNodeClasses.h
index 84dd781f7..958ea92b5 100644
--- a/genplugouts/uml_projection/UmlBaseActivityControlNodeClasses.h
+++ b/genplugouts/uml_projection/UmlBaseActivityControlNodeClasses.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityControlNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInitialActivityNode;
 class UmlItem;
@@ -31,7 +31,7 @@ class UmlBaseInitialActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseInitialActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -52,7 +52,7 @@ class UmlBaseFlowFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlowFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseFlowFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -73,7 +73,7 @@ class UmlBaseActivityFinalActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityFinalActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseActivityFinalActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -94,7 +94,7 @@ class UmlBaseDecisionActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDecisionActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseDecisionActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -115,7 +115,7 @@ class UmlBaseMergeActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseMergeActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseMergeActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -136,7 +136,7 @@ class UmlBaseForkActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseForkActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
@@ -157,7 +157,7 @@ class UmlBaseJoinActivityNode : public UmlActivityControlNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinActivityNode(void * id, const Q3CString & s) : UmlActivityControlNode(id, s) {
+    UmlBaseJoinActivityNode(void * id, const QByteArray & s) : UmlActivityControlNode(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseActivityDiagram.h b/genplugouts/uml_projection/UmlBaseActivityDiagram.h
index 8ed6ca9d6..82d855ad3 100644
--- a/genplugouts/uml_projection/UmlBaseActivityDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseActivityDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseActivityDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseActivityDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseActivityNode.h b/genplugouts/uml_projection/UmlBaseActivityNode.h
index 9018d75ce..9fdc756bb 100644
--- a/genplugouts/uml_projection/UmlBaseActivityNode.h
+++ b/genplugouts/uml_projection/UmlBaseActivityNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlBaseActivityNode : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityNode(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityNode(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseActivityObject.cpp b/genplugouts/uml_projection/UmlBaseActivityObject.cpp
index 748e7c22b..f96d4a344 100644
--- a/genplugouts/uml_projection/UmlBaseActivityObject.cpp
+++ b/genplugouts/uml_projection/UmlBaseActivityObject.cpp
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "UmlActivityDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityObject * UmlBaseActivityObject::create(UmlItem * parent, const char * s)
 {
@@ -28,7 +28,7 @@ bool UmlBaseActivityObject::set_Type(const UmlTypeSpec & v)
     return set_it_(_type, v, setTypeCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::multiplicity()
+const QByteArray & UmlBaseActivityObject::multiplicity()
 {
     read_if_needed_();
     return _multiplicity;
@@ -39,7 +39,7 @@ bool UmlBaseActivityObject::set_Multiplicity(const char * v)
     return set_it_(_multiplicity, v, setMultiplicityCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::inState()
+const QByteArray & UmlBaseActivityObject::inState()
 {
     read_if_needed_();
     return _in_state;
@@ -50,7 +50,7 @@ bool UmlBaseActivityObject::set_InState(const char * v)
     return set_it_(_in_state, v, setInStateCmd);
 }
 
-const Q3CString & UmlBaseActivityObject::selection()
+const QByteArray & UmlBaseActivityObject::selection()
 {
     read_if_needed_();
     return _selection;
@@ -62,7 +62,7 @@ bool UmlBaseActivityObject::set_Selection(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseActivityObject::cppSelection()
+const QByteArray & UmlBaseActivityObject::cppSelection()
 {
     read_if_needed_();
     return _cpp_selection;
@@ -75,7 +75,7 @@ bool UmlBaseActivityObject::set_CppSelection(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseActivityObject::javaSelection()
+const QByteArray & UmlBaseActivityObject::javaSelection()
 {
     read_if_needed_();
     return _java_selection;
diff --git a/genplugouts/uml_projection/UmlBaseActivityObject.h b/genplugouts/uml_projection/UmlBaseActivityObject.h
index 5c1938905..688ceb75e 100644
--- a/genplugouts/uml_projection/UmlBaseActivityObject.h
+++ b/genplugouts/uml_projection/UmlBaseActivityObject.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityNode.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 #include "anOrdering.h"
 
@@ -28,7 +28,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityObject(void * id, const Q3CString & s) : UmlActivityNode(id, s) {
+    UmlBaseActivityObject(void * id, const QByteArray & s) : UmlActivityNode(id, s) {
     }
 
 
@@ -42,7 +42,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Type(const UmlTypeSpec & v);
 
     // return the multiplicity
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // set the multiplicity
     //
@@ -50,7 +50,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_Multiplicity(const char * v);
 
     // return the inState attribute
-    const Q3CString & inState();
+    const QByteArray & inState();
 
     // set the inState attribute
     //
@@ -58,7 +58,7 @@ class UmlBaseActivityObject : public UmlActivityNode
     bool set_InState(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -67,7 +67,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHCPP
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseActivityObject : public UmlActivityNode
 
 #ifdef WITHJAVA
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -123,18 +123,18 @@ class UmlBaseActivityObject : public UmlActivityNode
 
     UmlTypeSpec _type;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _in_state;
+    QByteArray _in_state;
 
-    Q3CString _selection;
+    QByteArray _selection;
 
 #ifdef WITHCPP
-    Q3CString _cpp_selection;
+    QByteArray _cpp_selection;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_selection;
+    QByteArray _java_selection;
 #endif
 
     anOrdering _ordering : 8;
diff --git a/genplugouts/uml_projection/UmlBaseActivityParameter.cpp b/genplugouts/uml_projection/UmlBaseActivityParameter.cpp
index 067b1ba5c..0e5dd560c 100644
--- a/genplugouts/uml_projection/UmlBaseActivityParameter.cpp
+++ b/genplugouts/uml_projection/UmlBaseActivityParameter.cpp
@@ -4,7 +4,7 @@
 #include "UmlActivityParameter.h"
 #include "UmlActivity.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlActivityParameter * UmlBaseActivityParameter::create(UmlActivity * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseActivityParameter::kind()
     return anActivityParameter;
 }
 
-const Q3CString & UmlBaseActivityParameter::defaultValue()
+const QByteArray & UmlBaseActivityParameter::defaultValue()
 {
     read_if_needed_();
     return _default_value;
diff --git a/genplugouts/uml_projection/UmlBaseActivityParameter.h b/genplugouts/uml_projection/UmlBaseActivityParameter.h
index 1f05aabe8..32bd82a1d 100644
--- a/genplugouts/uml_projection/UmlBaseActivityParameter.h
+++ b/genplugouts/uml_projection/UmlBaseActivityParameter.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityParameter;
 class UmlActivity;
@@ -25,13 +25,13 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityParameter(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityParameter(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 
 public:
     // return the default value
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // set the default value
     //
@@ -48,7 +48,7 @@ class UmlBaseActivityParameter : public UmlPinParameter
 
 
 private:
-    Q3CString _default_value;
+    QByteArray _default_value;
 
 
 protected:
diff --git a/genplugouts/uml_projection/UmlBaseActivityPin.h b/genplugouts/uml_projection/UmlBaseActivityPin.h
index 52f5d4072..115c45d19 100644
--- a/genplugouts/uml_projection/UmlBaseActivityPin.h
+++ b/genplugouts/uml_projection/UmlBaseActivityPin.h
@@ -4,7 +4,7 @@
 
 #include "UmlPinParameter.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityPin;
 class UmlActivityAction;
@@ -25,7 +25,7 @@ class UmlBaseActivityPin : public UmlPinParameter
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityPin(void * id, const Q3CString & s) : UmlPinParameter(id, s) {
+    UmlBaseActivityPin(void * id, const QByteArray & s) : UmlPinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseActivityRegion.h b/genplugouts/uml_projection/UmlBaseActivityRegion.h
index 95e516e75..c2cd0302d 100644
--- a/genplugouts/uml_projection/UmlBaseActivityRegion.h
+++ b/genplugouts/uml_projection/UmlBaseActivityRegion.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlActivityDiagram;
 
@@ -11,7 +11,7 @@ class UmlBaseActivityRegion : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseActivityRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseActivityRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
diff --git a/genplugouts/uml_projection/UmlBaseArtifact.cpp b/genplugouts/uml_projection/UmlBaseArtifact.cpp
index d3707b9e2..62825c213 100644
--- a/genplugouts/uml_projection/UmlBaseArtifact.cpp
+++ b/genplugouts/uml_projection/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         if (_defined)
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] =  _associated[last];
 
             _associated.resize(last);
         }
@@ -166,82 +168,82 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseArtifact::phpSource()
+const QByteArray & UmlBaseArtifact::phpSource()
 {
     read_if_needed_();
 
     return _php_src;
 }
 
-bool UmlBaseArtifact::set_PhpSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PhpSource(const QByteArray & s)
 {
     return set_it_(_php_src, s, setPhpSrcCmd);
 }
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseArtifact::pythonSource()
+const QByteArray & UmlBaseArtifact::pythonSource()
 {
     read_if_needed_();
 
     return _python_src;
 }
 
-bool UmlBaseArtifact::set_PythonSource(const Q3CString & s)
+bool UmlBaseArtifact::set_PythonSource(const QByteArray & s)
 {
     return set_it_(_python_src, s, setPythonSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -282,13 +284,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/uml_projection/UmlBaseArtifact.h b/genplugouts/uml_projection/UmlBaseArtifact.h
index 19359a371..068c3fd04 100644
--- a/genplugouts/uml_projection/UmlBaseArtifact.h
+++ b/genplugouts/uml_projection/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,60 +83,60 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPHP
     // returns the Php file definition
-    const Q3CString & phpSource();
+    const QByteArray & phpSource();
 
     // to set the Php file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpSource(const Q3CString & s);
+    bool set_PhpSource(const QByteArray & s);
 #endif
 
 #ifdef WITHPYTHON
     // returns the Python file definition
-    const Q3CString & pythonSource();
+    const QByteArray & pythonSource();
 
     // to set the Python file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonSource(const Q3CString & s);
+    bool set_PythonSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -147,30 +147,30 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_src;
+    QByteArray _php_src;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_src;
+    QByteArray _python_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -210,12 +210,12 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
     friend class UmlBaseClass;
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/uml_projection/UmlBaseAttribute.cpp b/genplugouts/uml_projection/UmlBaseAttribute.cpp
index 5a9b4b549..ae721c8dd 100644
--- a/genplugouts/uml_projection/UmlBaseAttribute.cpp
+++ b/genplugouts/uml_projection/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -98,7 +98,7 @@ bool UmlBaseAttribute::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -122,7 +122,7 @@ bool UmlBaseAttribute::set_Type(const UmlTypeSpec & t)
     return set_it_(_type, t, setTypeCmd);
 }
 
-const Q3CString & UmlBaseAttribute::multiplicity()
+const QByteArray & UmlBaseAttribute::multiplicity()
 {
     read_if_needed_();
 
@@ -215,7 +215,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/uml_projection/UmlBaseAttribute.h b/genplugouts/uml_projection/UmlBaseAttribute.h
index 766a99f05..2c5b26c61 100644
--- a/genplugouts/uml_projection/UmlBaseAttribute.h
+++ b/genplugouts/uml_projection/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -62,7 +62,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -78,7 +78,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_Type(const UmlTypeSpec & t);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -125,7 +125,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -163,9 +163,9 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient : 1;
 #endif
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -177,13 +177,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -223,7 +223,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/uml_projection/UmlBaseChoicePseudoState.h b/genplugouts/uml_projection/UmlBaseChoicePseudoState.h
index fb682dd91..b4a00bbc9 100644
--- a/genplugouts/uml_projection/UmlBaseChoicePseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseClass.cpp b/genplugouts/uml_projection/UmlBaseClass.cpp
index c990e9924..7138b41ee 100644
--- a/genplugouts/uml_projection/UmlBaseClass.cpp
+++ b/genplugouts/uml_projection/UmlBaseClass.cpp
@@ -11,8 +11,8 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -47,11 +47,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -83,11 +83,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -132,17 +132,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -370,7 +370,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -385,7 +385,7 @@ UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
     return (UmlClass *) UmlBaseItem::read_();
 }
 
-UmlClass * UmlBaseClass::findStereotype(Q3CString s, bool caseSensitive)
+UmlClass * UmlBaseClass::findStereotype(QByteArray s, bool caseSensitive)
 {
     UmlCom::send_cmd(packageGlobalCmd, findStereotypeCmd,
                      (caseSensitive) ? "y" : "n", (const char *) s);
@@ -403,15 +403,15 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -423,9 +423,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray, UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -433,7 +433,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/uml_projection/UmlBaseClass.h b/genplugouts/uml_projection/UmlBaseClass.h
index b297e2cf6..7a243bdbf 100644
--- a/genplugouts/uml_projection/UmlBaseClass.h
+++ b/genplugouts/uml_projection/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+#include <QVector>
+#include <QByteArray>
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -54,7 +54,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -77,7 +77,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -100,7 +100,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -224,11 +224,11 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // Return the class supporting the stereotype corresponding to
     // the first parameter being 'profile_name:stereotype_name', or 0/null
-    static UmlClass * findStereotype(Q3CString s, bool caseSensitive);
+    static UmlClass * findStereotype(QByteArray s, bool caseSensitive);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -241,11 +241,11 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
 
 private:
-    static Q3Dict<UmlClass> _classes;
+    static QHash<QByteArray,UmlClass*> _classes;
 
     bool _abstract;
 
@@ -292,7 +292,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/uml_projection/UmlBaseClassDiagram.h b/genplugouts/uml_projection/UmlBaseClassDiagram.h
index e0990d31f..70fcdff9d 100644
--- a/genplugouts/uml_projection/UmlBaseClassDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseClassInstance.cpp b/genplugouts/uml_projection/UmlBaseClassInstance.cpp
index 772b8fe6b..4c185c3fb 100644
--- a/genplugouts/uml_projection/UmlBaseClassInstance.cpp
+++ b/genplugouts/uml_projection/UmlBaseClassInstance.cpp
@@ -7,7 +7,7 @@
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -46,7 +46,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
     else     return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -61,7 +61,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -76,16 +76,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QVector<UmlAttribute *> &result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -96,7 +96,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -106,7 +106,7 @@ bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance
 
 bool UmlBaseClassInstance::remove_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/genplugouts/uml_projection/UmlBaseClassInstance.h b/genplugouts/uml_projection/UmlBaseClassInstance.h
index 660cbb785..9de2a04fe 100644
--- a/genplugouts/uml_projection/UmlBaseClassInstance.h
+++ b/genplugouts/uml_projection/UmlBaseClassInstance.h
@@ -6,9 +6,9 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QList>
+#include <QVector>
+#include <QByteArray>
 
 class UmlClassInstance;
 class UmlClass;
@@ -40,17 +40,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QVector<UmlAttribute *> & result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result);
 
     // Remove the slot if the value is null.
     // Else set the value for the given attribute, replacing it
@@ -87,7 +87,7 @@ class UmlBaseClassInstance : public UmlItem
     virtual void read_uml_();
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassInstance(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseClassInstance(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseClassInstanceReference.cpp b/genplugouts/uml_projection/UmlBaseClassInstanceReference.cpp
index 1223c08e8..c3c0d64a0 100644
--- a/genplugouts/uml_projection/UmlBaseClassInstanceReference.cpp
+++ b/genplugouts/uml_projection/UmlBaseClassInstanceReference.cpp
@@ -4,14 +4,14 @@
 #include "UmlClass.h"
 #include "UmlClassInstance.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlClass * UmlBaseClassInstanceReference::type() const
 {
     return (_instance) ? _instance->type() : _class;
 }
 
-const Q3CString & UmlBaseClassInstanceReference::name() const
+const QByteArray & UmlBaseClassInstanceReference::name() const
 {
     return (_instance) ? _instance->name() : _name;
 }
diff --git a/genplugouts/uml_projection/UmlBaseClassInstanceReference.h b/genplugouts/uml_projection/UmlBaseClassInstanceReference.h
index f21836362..12b7e8818 100644
--- a/genplugouts/uml_projection/UmlBaseClassInstanceReference.h
+++ b/genplugouts/uml_projection/UmlBaseClassInstanceReference.h
@@ -2,7 +2,7 @@
 #define _UMLBASECLASSINSTANCEREFERENCE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 class UmlClassInstance;
@@ -20,7 +20,7 @@ class UmlBaseClassInstanceReference
     }
 
     // return the name of the instance
-    const Q3CString & name() const;
+    const QByteArray & name() const;
 
 
 private:
@@ -28,7 +28,7 @@ class UmlBaseClassInstanceReference
 
     UmlClassInstance * _instance;
 
-    Q3CString _name;
+    QByteArray _name;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/uml_projection/UmlBaseClassItem.cpp b/genplugouts/uml_projection/UmlBaseClassItem.cpp
index fa856e466..3a02e784e 100644
--- a/genplugouts/uml_projection/UmlBaseClassItem.cpp
+++ b/genplugouts/uml_projection/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBaseClassItem::phpDecl()
+const QByteArray & UmlBaseClassItem::phpDecl()
 {
     read_if_needed_();
 
@@ -47,7 +47,7 @@ bool UmlBaseClassItem::set_PhpDecl(const char * s)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseClassItem::pythonDecl()
+const QByteArray & UmlBaseClassItem::pythonDecl()
 {
     read_if_needed_();
 
@@ -61,7 +61,7 @@ bool UmlBaseClassItem::set_PythonDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/uml_projection/UmlBaseClassItem.h b/genplugouts/uml_projection/UmlBaseClassItem.h
index 19037f5fe..a530be24a 100644
--- a/genplugouts/uml_projection/UmlBaseClassItem.h
+++ b/genplugouts/uml_projection/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPHP
     //  return the Php defininition
 
-    const Q3CString & phpDecl();
+    const QByteArray & phpDecl();
 
     //  to set the Php definition
     //
@@ -45,7 +45,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHPYTHON
     //  return the Python defininition
 
-    const Q3CString & pythonDecl();
+    const QByteArray & pythonDecl();
 
     //  to set the Python definition
     //
@@ -56,7 +56,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -69,28 +69,28 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_decl;
+    QByteArray _php_decl;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_decl;
+    QByteArray _python_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/uml_projection/UmlBaseClassMember.cpp b/genplugouts/uml_projection/UmlBaseClassMember.cpp
index da9a56bb5..47325ddfb 100644
--- a/genplugouts/uml_projection/UmlBaseClassMember.cpp
+++ b/genplugouts/uml_projection/UmlBaseClassMember.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlBaseClassMember::isClassMember()
 {
     read_if_needed_();
@@ -70,7 +70,7 @@ bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
 #endif
 
 #ifdef WITHJAVA
-Q3CString UmlBaseClassMember::javaAnnotations()
+QByteArray UmlBaseClassMember::javaAnnotations()
 {
     read_if_needed_();
 
@@ -83,7 +83,7 @@ bool UmlBaseClassMember::set_JavaAnnotations(const char * v)
 }
 #endif
 
-const Q3CString & UmlBaseClassMember::constraint()
+const QByteArray & UmlBaseClassMember::constraint()
 {
     read_if_needed_();
     return _constraint;
diff --git a/genplugouts/uml_projection/UmlBaseClassMember.h b/genplugouts/uml_projection/UmlBaseClassMember.h
index f19767bf8..649ebe7c8 100644
--- a/genplugouts/uml_projection/UmlBaseClassMember.h
+++ b/genplugouts/uml_projection/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -57,7 +57,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 #ifdef WITHJAVA
     // returns the Java annotations
-    Q3CString javaAnnotations();
+    QByteArray javaAnnotations();
 
     // set the Java annotations
     //
@@ -66,7 +66,7 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
     // return the constraint
-    const Q3CString & constraint();
+    const QByteArray & constraint();
 
     // set the constraint
     //
@@ -86,14 +86,14 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_annotation;
+    QByteArray _java_annotation;
 #endif
 
-    Q3CString _constraint;
+    QByteArray _constraint;
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/uml_projection/UmlBaseClassView.h b/genplugouts/uml_projection/UmlBaseClassView.h
index 43fb0714a..02d8c4092 100644
--- a/genplugouts/uml_projection/UmlBaseClassView.h
+++ b/genplugouts/uml_projection/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlView
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseCollaborationDiagram.h b/genplugouts/uml_projection/UmlBaseCollaborationDiagram.h
index 001de487c..3fe6be8cc 100644
--- a/genplugouts/uml_projection/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/uml_projection/UmlBaseCollaborationDiagramDefinition.cpp b/genplugouts/uml_projection/UmlBaseCollaborationDiagramDefinition.cpp
index 63b89f7b5..177cc8c00 100644
--- a/genplugouts/uml_projection/UmlBaseCollaborationDiagramDefinition.cpp
+++ b/genplugouts/uml_projection/UmlBaseCollaborationDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseCollaborationDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -15,11 +15,11 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -31,7 +31,7 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         m->read_(instances);
     }
 
-    _messages.setAutoDelete(TRUE);
+    //_messages.setAutoDelete(TRUE);
 }
 
 UmlBaseCollaborationDiagramDefinition::~UmlBaseCollaborationDiagramDefinition()
diff --git a/genplugouts/uml_projection/UmlBaseCollaborationDiagramDefinition.h b/genplugouts/uml_projection/UmlBaseCollaborationDiagramDefinition.h
index 7053607ce..683f25289 100644
--- a/genplugouts/uml_projection/UmlBaseCollaborationDiagramDefinition.h
+++ b/genplugouts/uml_projection/UmlBaseCollaborationDiagramDefinition.h
@@ -1,13 +1,11 @@
 #ifndef _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
 #define _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
-
+#include <QVector>
 
 // to avoid compiler warning
 #include "UmlCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-#include <q3ptrvector.h>
-
 class UmlClassInstanceReference;
 class UmlCollaborationMessage;
 
@@ -16,21 +14,21 @@ class UmlBaseCollaborationDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following their rank
-    const Q3PtrVector<UmlCollaborationMessage> & messages() const {
+    const QVector<UmlCollaborationMessage*> & messages() const {
         return _messages;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlCollaborationMessage> _messages;
+    QVector<UmlCollaborationMessage*> _messages;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/uml_projection/UmlBaseCollaborationMessage.cpp b/genplugouts/uml_projection/UmlBaseCollaborationMessage.cpp
index 8ea8e0890..12a94d5de 100644
--- a/genplugouts/uml_projection/UmlBaseCollaborationMessage.cpp
+++ b/genplugouts/uml_projection/UmlBaseCollaborationMessage.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-void UmlBaseCollaborationMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseCollaborationMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     UmlBaseMessage::read_(instances);
     _rank = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/uml_projection/UmlBaseCollaborationMessage.h b/genplugouts/uml_projection/UmlBaseCollaborationMessage.h
index 276b0801e..3f1d9665d 100644
--- a/genplugouts/uml_projection/UmlBaseCollaborationMessage.h
+++ b/genplugouts/uml_projection/UmlBaseCollaborationMessage.h
@@ -2,8 +2,8 @@
 #define _UMLBASECOLLABORATIONMESSAGE_H
 
 
-#include <q3cstring.h>
-#include <q3ptrdict.h>
+#include <QByteArray>
+#include <QHash>
 #include "UmlMessage.h"
 
 class UmlClassInstanceReference;
@@ -18,7 +18,7 @@ class UmlBaseCollaborationMessage : public UmlMessage
     }
 
     // return the hierarchical rank of the message
-    const Q3CString & hrank() const {
+    const QByteArray & hrank() const {
         return _hrank;
     }
 
@@ -26,10 +26,10 @@ class UmlBaseCollaborationMessage : public UmlMessage
 private:
     int _rank;
 
-    Q3CString _hrank;
+    QByteArray _hrank;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseCollaborationDiagramDefinition;
 };
diff --git a/genplugouts/uml_projection/UmlBaseComponent.cpp b/genplugouts/uml_projection/UmlBaseComponent.cpp
index 211d911fb..aa2d770b0 100644
--- a/genplugouts/uml_projection/UmlBaseComponent.cpp
+++ b/genplugouts/uml_projection/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizingClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizingClasses()
 {
     read_if_needed_();
 
     return _realizing;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realizing, provided, required);
@@ -95,18 +95,18 @@ void UmlBaseComponent::read_uml_()
     _realizing.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realizing.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realizing[index] =  (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/uml_projection/UmlBaseComponent.h b/genplugouts/uml_projection/UmlBaseComponent.h
index 209914a57..15b9e535f 100644
--- a/genplugouts/uml_projection/UmlBaseComponent.h
+++ b/genplugouts/uml_projection/UmlBaseComponent.h
@@ -1,11 +1,10 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -36,18 +35,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realizing classes
-    const Q3PtrVector<UmlClass> & realizingClasses();
+    const QVector<UmlClass*> & realizingClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realizing, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +56,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realizing;
+    QVector<UmlClass*> _realizing;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -70,11 +69,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/uml_projection/UmlBaseComponentDiagram.h b/genplugouts/uml_projection/UmlBaseComponentDiagram.h
index 43466da7c..c5ed8d29d 100644
--- a/genplugouts/uml_projection/UmlBaseComponentDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseComponentView.h b/genplugouts/uml_projection/UmlBaseComponentView.h
index 0b9d2d0bd..d074347f7 100644
--- a/genplugouts/uml_projection/UmlBaseComponentView.h
+++ b/genplugouts/uml_projection/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseDeepHistoryPseudoState.h b/genplugouts/uml_projection/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..c23d5ec0a 100644
--- a/genplugouts/uml_projection/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseDeployment.h b/genplugouts/uml_projection/UmlBaseDeployment.h
index b268e0c17..63610d5b6 100644
--- a/genplugouts/uml_projection/UmlBaseDeployment.h
+++ b/genplugouts/uml_projection/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseDeploymentDiagram.h b/genplugouts/uml_projection/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..d8e4e7a67 100644
--- a/genplugouts/uml_projection/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseDeploymentView.h b/genplugouts/uml_projection/UmlBaseDeploymentView.h
index f5213d38a..11fe6d475 100644
--- a/genplugouts/uml_projection/UmlBaseDeploymentView.h
+++ b/genplugouts/uml_projection/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseDiagram.cpp b/genplugouts/uml_projection/UmlBaseDiagram.cpp
index e1ceb269d..d0fb2d705 100644
--- a/genplugouts/uml_projection/UmlBaseDiagram.cpp
+++ b/genplugouts/uml_projection/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/uml_projection/UmlBaseDiagram.h b/genplugouts/uml_projection/UmlBaseDiagram.h
index 9cf05ff22..824a9f60f 100644
--- a/genplugouts/uml_projection/UmlBaseDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseEntryPointPseudoState.h b/genplugouts/uml_projection/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..573ac64d4 100644
--- a/genplugouts/uml_projection/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseExitPointPseudoState.h b/genplugouts/uml_projection/UmlBaseExitPointPseudoState.h
index ff2ad12bc..0b8304951 100644
--- a/genplugouts/uml_projection/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseExpansionNode.h b/genplugouts/uml_projection/UmlBaseExpansionNode.h
index 41bcbece2..dd338c129 100644
--- a/genplugouts/uml_projection/UmlBaseExpansionNode.h
+++ b/genplugouts/uml_projection/UmlBaseExpansionNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityObject.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExpansionNode;
 class UmlExpansionRegion;
@@ -25,7 +25,7 @@ class UmlBaseExpansionNode : public UmlActivityObject
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionNode(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBaseExpansionNode(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseExpansionRegion.h b/genplugouts/uml_projection/UmlBaseExpansionRegion.h
index 913b4ec4a..a89b8f471 100644
--- a/genplugouts/uml_projection/UmlBaseExpansionRegion.h
+++ b/genplugouts/uml_projection/UmlBaseExpansionRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "anExpansionKind.h"
 
 class UmlExpansionRegion;
@@ -26,7 +26,7 @@ class UmlBaseExpansionRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExpansionRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseExpansionRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 
diff --git a/genplugouts/uml_projection/UmlBaseExtraClassMember.cpp b/genplugouts/uml_projection/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/uml_projection/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/uml_projection/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/uml_projection/UmlBaseExtraClassMember.h b/genplugouts/uml_projection/UmlBaseExtraClassMember.h
index e2b9d4f30..fbe19e1bf 100644
--- a/genplugouts/uml_projection/UmlBaseExtraClassMember.h
+++ b/genplugouts/uml_projection/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/uml_projection/UmlBaseFinalState.h b/genplugouts/uml_projection/UmlBaseFinalState.h
index 16e0816cf..5150aa9e6 100644
--- a/genplugouts/uml_projection/UmlBaseFinalState.h
+++ b/genplugouts/uml_projection/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseFlow.cpp b/genplugouts/uml_projection/UmlBaseFlow.cpp
index 5da07fbe8..b05e3eb62 100644
--- a/genplugouts/uml_projection/UmlBaseFlow.cpp
+++ b/genplugouts/uml_projection/UmlBaseFlow.cpp
@@ -4,7 +4,7 @@
 #include "UmlFlow.h"
 #include "UmlActivityNode.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseFlow::kind()
 {
@@ -29,7 +29,7 @@ UmlActivityNode * UmlBaseFlow::target()
     return _target;
 }
 
-const Q3CString & UmlBaseFlow::weight()
+const QByteArray & UmlBaseFlow::weight()
 {
     read_if_needed_();
     return _uml.weight;
@@ -40,7 +40,7 @@ bool UmlBaseFlow::set_Weight(const char * v)
     return set_it_(_uml.weight, v, setUmlActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::guard()
+const QByteArray & UmlBaseFlow::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -51,7 +51,7 @@ bool UmlBaseFlow::set_Guard(const char * v)
     return set_it_(_uml.guard, v, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::selection()
+const QByteArray & UmlBaseFlow::selection()
 {
     read_if_needed_();
     return _uml.selection;
@@ -62,7 +62,7 @@ bool UmlBaseFlow::set_Selection(const char * v)
     return set_it_(_uml.selection, v, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::transformation()
+const QByteArray & UmlBaseFlow::transformation()
 {
     read_if_needed_();
     return _uml.transformation;
@@ -74,7 +74,7 @@ bool UmlBaseFlow::set_Transformation(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseFlow::cppWeight()
+const QByteArray & UmlBaseFlow::cppWeight()
 {
     read_if_needed_();
     return _cpp.weight;
@@ -85,7 +85,7 @@ bool UmlBaseFlow::set_CppWeight(const char * v)
     return set_it_(_cpp.weight, v, setCppActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppGuard()
+const QByteArray & UmlBaseFlow::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -96,7 +96,7 @@ bool UmlBaseFlow::set_CppGuard(const char * v)
     return set_it_(_cpp.guard, v, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppSelection()
+const QByteArray & UmlBaseFlow::cppSelection()
 {
     read_if_needed_();
     return _cpp.selection;
@@ -107,7 +107,7 @@ bool UmlBaseFlow::set_CppSelection(const char * v)
     return set_it_(_cpp.selection, v, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::cppTransformation()
+const QByteArray & UmlBaseFlow::cppTransformation()
 {
     read_if_needed_();
     return _cpp.transformation;
@@ -120,7 +120,7 @@ bool UmlBaseFlow::set_CppTransformation(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseFlow::javaWeight()
+const QByteArray & UmlBaseFlow::javaWeight()
 {
     read_if_needed_();
     return _java.weight;
@@ -131,7 +131,7 @@ bool UmlBaseFlow::set_JavaWeight(const char * v)
     return set_it_(_java.weight, v, setJavaActivityCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaGuard()
+const QByteArray & UmlBaseFlow::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -142,7 +142,7 @@ bool UmlBaseFlow::set_JavaGuard(const char * v)
     return set_it_(_java.guard, v, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaSelection()
+const QByteArray & UmlBaseFlow::javaSelection()
 {
     read_if_needed_();
     return _java.selection;
@@ -153,7 +153,7 @@ bool UmlBaseFlow::set_JavaSelection(const char * v)
     return set_it_(_java.selection, v, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseFlow::javaTransformation()
+const QByteArray & UmlBaseFlow::javaTransformation()
 {
     read_if_needed_();
     return _java.transformation;
diff --git a/genplugouts/uml_projection/UmlBaseFlow.h b/genplugouts/uml_projection/UmlBaseFlow.h
index b50ce3323..a9ff6db60 100644
--- a/genplugouts/uml_projection/UmlBaseFlow.h
+++ b/genplugouts/uml_projection/UmlBaseFlow.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "FlowBehavior.h"
 
 class UmlFlow;
@@ -27,7 +27,7 @@ class UmlBaseFlow : public UmlItem
     virtual UmlActivityNode * target();
 
     // return the weight in OCL
-    const Q3CString & weight();
+    const QByteArray & weight();
 
     // set the weight in OCL
     //
@@ -35,7 +35,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Weight(const char * v);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Guard(const char * v);
 
     // return the selection in OCL
-    const Q3CString & selection();
+    const QByteArray & selection();
 
     // set the selection in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseFlow : public UmlItem
     bool set_Selection(const char * v);
 
     // return the transformation in OCL
-    const Q3CString & transformation();
+    const QByteArray & transformation();
 
     // set the transformation in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHCPP
     // return the weight in C++
-    const Q3CString & cppWeight();
+    const QByteArray & cppWeight();
 
     // set the weight in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppWeight(const char * v);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppGuard(const char * v);
 
     // return the selection in C++
-    const Q3CString & cppSelection();
+    const QByteArray & cppSelection();
 
     // set the selection in C++
     //
@@ -84,7 +84,7 @@ class UmlBaseFlow : public UmlItem
     bool set_CppSelection(const char * v);
 
     // return the transformation in C++
-    const Q3CString & cppTransformation();
+    const QByteArray & cppTransformation();
 
     // set the transformation in C++
     //
@@ -94,7 +94,7 @@ class UmlBaseFlow : public UmlItem
 
 #ifdef WITHJAVA
     // return the weight in Java
-    const Q3CString & javaWeight();
+    const QByteArray & javaWeight();
 
     // set the weight in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaWeight(const char * v);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -110,7 +110,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaGuard(const char * v);
 
     // return the selection in Java
-    const Q3CString & javaSelection();
+    const QByteArray & javaSelection();
 
     // set the selection in Java
     //
@@ -118,7 +118,7 @@ class UmlBaseFlow : public UmlItem
     bool set_JavaSelection(const char * v);
 
     // return the transformation in Java
-    const Q3CString & javaTransformation();
+    const QByteArray & javaTransformation();
 
     // set the transformation in Java
     //
@@ -161,7 +161,7 @@ class UmlBaseFlow : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFlow(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseFlow(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseForkPseudoState.h b/genplugouts/uml_projection/UmlBaseForkPseudoState.h
index 009499bfa..d5b0eba99 100644
--- a/genplugouts/uml_projection/UmlBaseForkPseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseFormalParameter.h b/genplugouts/uml_projection/UmlBaseFormalParameter.h
index d8284c71d..928200796 100644
--- a/genplugouts/uml_projection/UmlBaseFormalParameter.h
+++ b/genplugouts/uml_projection/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -34,10 +34,10 @@ class UmlBaseFormalParameter
     };
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/uml_projection/UmlBaseFragment.cpp b/genplugouts/uml_projection/UmlBaseFragment.cpp
index 730755358..a7677fa18 100644
--- a/genplugouts/uml_projection/UmlBaseFragment.cpp
+++ b/genplugouts/uml_projection/UmlBaseFragment.cpp
@@ -25,7 +25,7 @@ void UmlBaseFragment::read_()
         fc->read_(this, rank);
     }
 
-    _compartments.setAutoDelete(TRUE);
+    //_compartments.setAutoDelete(TRUE);
     _container = 0;
     _refer = (UmlDiagram *) UmlBaseItem::read_();
     _arguments = UmlCom::read_string();
@@ -38,18 +38,18 @@ int UmlBaseFragment::vcenter_(int rank) const
     return (t + _compartments[rank]->b()) / 2;
 }
 
-void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseFragment::read_covered_(QHash<void*,UmlClassInstanceReference*> & instances)
 {
-    unsigned n = UmlCom::read_unsigned();
-    unsigned rank;
+    int n = UmlCom::read_unsigned();
+    int rank;
 
     _covered.resize(n);
 
     for (rank = 0; rank != n; rank += 1)
-        _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]);
+        _covered.insert(rank, instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))]);
 }
 
-UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments)
+UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments)
 {
     UmlFragmentCompartment * r = 0;
     int nf = fragments.count();
@@ -82,7 +82,7 @@ UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, in
     return r;
 }
 
-void UmlBaseFragment::compute_container_(Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseFragment::compute_container_(QVector<UmlFragment*> & fragments)
 {
     int rank = fragments.count();
 
diff --git a/genplugouts/uml_projection/UmlBaseFragment.h b/genplugouts/uml_projection/UmlBaseFragment.h
index 932913148..599054aa3 100644
--- a/genplugouts/uml_projection/UmlBaseFragment.h
+++ b/genplugouts/uml_projection/UmlBaseFragment.h
@@ -1,10 +1,8 @@
 #ifndef _UMLBASEFRAGMENT_H
 #define _UMLBASEFRAGMENT_H
-
-
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3ptrdict.h>
+#include <QByteArray>
+#include <QVector>
+#include <QHash>
 
 class UmlFragmentCompartment;
 class UmlDiagram;
@@ -16,12 +14,12 @@ class UmlBaseFragment
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the compartments, at least one compartment exists
-    const Q3PtrVector<UmlFragmentCompartment> & compartments() const {
+    const QVector<UmlFragmentCompartment*> & compartments() const {
         return _compartments;
     }
 
@@ -39,12 +37,12 @@ class UmlBaseFragment
 
     // return the form corresponding to the arguments
     // and return value of the interaction use
-    Q3CString arguments() const {
+    QByteArray arguments() const {
         return _arguments;
     }
 
     // return the the list of covered instances (life lines)
-    const Q3PtrVector<UmlClassInstanceReference> & covered() const {
+    const QVector<UmlClassInstanceReference*> & covered() const {
         return _covered;
     }
 
@@ -52,9 +50,9 @@ class UmlBaseFragment
 private:
     UmlFragmentCompartment * _container;
 
-    Q3PtrVector<UmlFragmentCompartment> _compartments;
+    QVector<UmlFragmentCompartment*> _compartments;
 
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -66,9 +64,9 @@ class UmlBaseFragment
 
     UmlDiagram * _refer;
 
-    Q3CString _arguments;
+    QByteArray _arguments;
 
-    Q3PtrVector<UmlClassInstanceReference> _covered;
+    QVector<UmlClassInstanceReference*> _covered;
 
     // internal, don't call it
     void read_();
@@ -81,15 +79,15 @@ class UmlBaseFragment
 
     //internal, do NOT use it
 
-    void read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_covered_(QHash<void*,UmlClassInstanceReference*> & instances);
 
     // internal
-    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments);
+    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments);
 
 
 private:
     // internal
-    static void compute_container_(Q3PtrVector<UmlFragment> & fragments);
+    static void compute_container_(QVector<UmlFragment*> & fragments);
 
 
 public:
diff --git a/genplugouts/uml_projection/UmlBaseFragmentCompartment.cpp b/genplugouts/uml_projection/UmlBaseFragmentCompartment.cpp
index 2ff876f6a..148f56823 100644
--- a/genplugouts/uml_projection/UmlBaseFragmentCompartment.cpp
+++ b/genplugouts/uml_projection/UmlBaseFragmentCompartment.cpp
@@ -3,21 +3,23 @@
 #include "UmlBaseFragmentCompartment.h"
 #include "UmlBaseFragment.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 void UmlBaseFragmentCompartment::add_contained_(UmlFragment * x)
 {
-    _contained.resize(_contained.size() + 1);
-    _contained.insert(_contained.size() - 1, x);
+    //_contained.resize(_contained.size() + 1);
+    //_contained.insert(_contained.size() - 1, x);
+    _contained.append(x);
 }
 
-void UmlBaseFragmentCompartment::add_text_(Q3CString x)
+void UmlBaseFragmentCompartment::add_text_(QByteArray x)
 {
-    _texts.resize(_texts.size() + 1);
-    _texts.insert(_texts.size() - 1, strdup(x));
+    //_texts.resize(_texts.size() + 1);
+    //_texts.insert(_texts.size() - 1, strdup(x));
+    _texts.append(strdup(x));
 }
 
-void UmlBaseFragmentCompartment::add_cont_(Q3CString s, int cy)
+void UmlBaseFragmentCompartment::add_cont_(QByteArray s, int cy)
 {
     if (cy < _fragment->vcenter_(_rank))
         _start_continuation = s;
diff --git a/genplugouts/uml_projection/UmlBaseFragmentCompartment.h b/genplugouts/uml_projection/UmlBaseFragmentCompartment.h
index 8943ecf60..44f670632 100644
--- a/genplugouts/uml_projection/UmlBaseFragmentCompartment.h
+++ b/genplugouts/uml_projection/UmlBaseFragmentCompartment.h
@@ -5,8 +5,8 @@
 // to avoid compiler warning
 #include "UmlFragment.h"
 
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+#include <QByteArray>
 
 class UmlFragment;
 class UmlBaseFragment;
@@ -27,23 +27,23 @@ class UmlBaseFragmentCompartment
     }
 
     // the texts placed in the compartment
-    const Q3PtrVector<char> & texts() const {
+    const QVector<char*> & texts() const {
         return _texts;
     }
 
     // return the fragments contained in the compartment,
     // may be none
-    const Q3PtrVector<UmlFragment> & contained() const {
+    const QVector<UmlFragment*> & contained() const {
         return _contained;
     }
 
     // return the continuation ('label' case), or an empty string/null
-    Q3CString startContinuation() const {
+    QByteArray startContinuation() const {
         return _start_continuation;
     }
 
     // return the continuation ('goto' case), or an empty string/null
-    Q3CString endContinuation() const {
+    QByteArray endContinuation() const {
         return _end_continuation;
     }
 
@@ -51,27 +51,27 @@ class UmlBaseFragmentCompartment
 private:
     UmlFragment * _fragment;
 
-    Q3PtrVector<UmlFragment> _contained;
+    QVector<UmlFragment*> _contained;
 
     int _rank;
 
-    Q3PtrVector<char> _texts;
+    QVector<char*> _texts;
 
     int _y;
 
-    Q3CString _start_continuation;
+    QByteArray _start_continuation;
 
-    Q3CString _end_continuation;
+    QByteArray _end_continuation;
 
 
 public:
     void add_contained_(UmlFragment * x);
 
-    void add_text_(Q3CString x);
+    void add_text_(QByteArray x);
 
     //internal, do NOT use it
 
-    void add_cont_(Q3CString s, int cy);
+    void add_cont_(QByteArray s, int cy);
 
     int b() const {
         return _y;
diff --git a/genplugouts/uml_projection/UmlBaseInitialPseudoState.h b/genplugouts/uml_projection/UmlBaseInitialPseudoState.h
index 88dae1cc6..84c2904dd 100644
--- a/genplugouts/uml_projection/UmlBaseInitialPseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseInterruptibleActivityRegion.h b/genplugouts/uml_projection/UmlBaseInterruptibleActivityRegion.h
index 70f988488..92a7d4564 100644
--- a/genplugouts/uml_projection/UmlBaseInterruptibleActivityRegion.h
+++ b/genplugouts/uml_projection/UmlBaseInterruptibleActivityRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlActivityRegion.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInterruptibleActivityRegion;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInterruptibleActivityRegion : public UmlActivityRegion
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlActivityRegion(id, s) {
+    UmlBaseInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseItem.cpp b/genplugouts/uml_projection/UmlBaseItem.cpp
index 89ad1390b..648f39de9 100644
--- a/genplugouts/uml_projection/UmlBaseItem.cpp
+++ b/genplugouts/uml_projection/UmlBaseItem.cpp
@@ -57,9 +57,9 @@
 #include "UmlActivityControlNodeClasses.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     UmlCom::send_cmd(_identifier, setNameCmd, (const char *)s); //[rageek] Fix prototype
 
@@ -71,14 +71,14 @@ bool UmlBaseItem::set_Name(const Q3CString & s)
         return FALSE;
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
@@ -93,14 +93,14 @@ bool UmlBaseItem::applyStereotype()
     return TRUE;
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -116,7 +116,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -136,11 +136,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -150,7 +150,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -158,10 +158,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -172,7 +172,7 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -191,7 +191,7 @@ bool UmlBaseItem::moveAfter(const UmlItem * x)
         return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -203,7 +203,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
     return (int) UmlCom::read_unsigned();
@@ -221,11 +221,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -247,7 +247,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -276,17 +276,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -370,9 +370,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -414,7 +414,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -468,7 +468,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -505,10 +505,10 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
-    UmlItem * result = _all[id];
+    UmlItem * result = _all.value(id, 0);
 
     if (result == 0) {
         switch (kind) {
@@ -727,20 +727,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/uml_projection/UmlBaseItem.h b/genplugouts/uml_projection/UmlBaseItem.h
index 67b03808c..df0735da6 100644
--- a/genplugouts/uml_projection/UmlBaseItem.h
+++ b/genplugouts/uml_projection/UmlBaseItem.h
@@ -3,10 +3,10 @@
 
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+#include <QByteArray>
+#include <QVector>
+
+#include <QHash>
 //#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
@@ -37,21 +37,21 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // If the current stereotype is part of a profile add needed properties.
     // In all cases remove extra properties whose keys contain two ':'.
@@ -60,18 +60,18 @@ class UmlBaseItem
     bool applyStereotype();
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -96,16 +96,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -140,7 +140,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -148,7 +148,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -161,7 +161,7 @@ class UmlBaseItem
     //  The result may contains UmlAttribute, UmlRelations, UmlNcRelations,
     //  UmlOperation (their bodies are not taken into account) , UmlClass
     //  and UmlComponents.
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // return a constant identifier, it is unique within a given
     // kind of element (two classes can't have the same identifiers, but
@@ -187,7 +187,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
 
 private:
@@ -203,21 +203,21 @@ class UmlBaseItem
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
 protected:
@@ -285,7 +285,7 @@ class UmlBaseItem
 
     //internal, do NOT use it
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
 
@@ -298,7 +298,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/uml_projection/UmlBaseJoinPseudoState.h b/genplugouts/uml_projection/UmlBaseJoinPseudoState.h
index 31976dfff..966ec680f 100644
--- a/genplugouts/uml_projection/UmlBaseJoinPseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseJunctionPseudoState.h b/genplugouts/uml_projection/UmlBaseJunctionPseudoState.h
index 9b76d88e7..9517f4922 100644
--- a/genplugouts/uml_projection/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseMessage.cpp b/genplugouts/uml_projection/UmlBaseMessage.cpp
index 77851f8dd..2d220aa8e 100644
--- a/genplugouts/uml_projection/UmlBaseMessage.cpp
+++ b/genplugouts/uml_projection/UmlBaseMessage.cpp
@@ -4,13 +4,13 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlOperation.h"
 
-void UmlBaseMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     _operation = (UmlOperation *) UmlBaseItem::read_();
 
     if (_operation == 0) _form = UmlCom::read_string();
 
-    _from = instances[(void *) UmlCom::read_unsigned()];
-    _to = instances[(void *) UmlCom::read_unsigned()];
+    _from = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
+    _to = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
 }
 
diff --git a/genplugouts/uml_projection/UmlBaseMessage.h b/genplugouts/uml_projection/UmlBaseMessage.h
index 81fc500c8..cc3a364ab 100644
--- a/genplugouts/uml_projection/UmlBaseMessage.h
+++ b/genplugouts/uml_projection/UmlBaseMessage.h
@@ -1,9 +1,8 @@
 #ifndef _UMLBASEMESSAGE_H
 #define _UMLBASEMESSAGE_H
 
-
-#include <q3cstring.h>
-#include <q3ptrdict.h>
+#include <QHash>
+#include <QByteArray>
 
 class UmlClassInstanceReference;
 class UmlOperation;
@@ -30,7 +29,7 @@ class UmlBaseMessage
 
     // return message as a string, may be empty/null,
     // exclusive with operation()
-    const Q3CString & form() const {
+    const QByteArray & form() const {
         return _form;
     }
 
@@ -42,10 +41,10 @@ class UmlBaseMessage
 
     UmlOperation * _operation;
 
-    Q3CString _form;
+    QByteArray _form;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseSequenceMessage;
     friend class UmlBaseCollaborationMessage;
diff --git a/genplugouts/uml_projection/UmlBaseNcRelation.h b/genplugouts/uml_projection/UmlBaseNcRelation.h
index 7418e3406..75625ecdc 100644
--- a/genplugouts/uml_projection/UmlBaseNcRelation.h
+++ b/genplugouts/uml_projection/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/uml_projection/UmlBaseNode.h b/genplugouts/uml_projection/UmlBaseNode.h
index 07a980e66..f033d57b6 100644
--- a/genplugouts/uml_projection/UmlBaseNode.h
+++ b/genplugouts/uml_projection/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/uml_projection/UmlBaseObjectDiagram.h b/genplugouts/uml_projection/UmlBaseObjectDiagram.h
index dfe6983ef..7cc404a4b 100644
--- a/genplugouts/uml_projection/UmlBaseObjectDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseObjectDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlObjectDiagram;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseObjectDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseObjectDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseObjectDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseOnSignalAction.cpp b/genplugouts/uml_projection/UmlBaseOnSignalAction.cpp
index 8c887e113..aec5db337 100644
--- a/genplugouts/uml_projection/UmlBaseOnSignalAction.cpp
+++ b/genplugouts/uml_projection/UmlBaseOnSignalAction.cpp
@@ -2,9 +2,9 @@
 #include "UmlCom.h"
 #include "UmlBaseOnSignalAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseOnSignalAction::signal()
+const QByteArray & UmlBaseOnSignalAction::signal()
 {
     read_if_needed_();
     return _signal;
@@ -16,7 +16,7 @@ bool UmlBaseOnSignalAction::set_Signal(const char * v)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseOnSignalAction::cppSignal()
+const QByteArray & UmlBaseOnSignalAction::cppSignal()
 {
     read_if_needed_();
     return _cpp_signal;
@@ -29,7 +29,7 @@ bool UmlBaseOnSignalAction::set_CppSignal(const char * v)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseOnSignalAction::javaSignal()
+const QByteArray & UmlBaseOnSignalAction::javaSignal()
 {
     read_if_needed_();
     return _java_signal;
diff --git a/genplugouts/uml_projection/UmlBaseOnSignalAction.h b/genplugouts/uml_projection/UmlBaseOnSignalAction.h
index 6ad499b79..bd7be38ca 100644
--- a/genplugouts/uml_projection/UmlBaseOnSignalAction.h
+++ b/genplugouts/uml_projection/UmlBaseOnSignalAction.h
@@ -3,19 +3,19 @@
 
 
 #include "UmlActivityAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlBaseOnSignalAction : public UmlActivityAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOnSignalAction(void * id, const Q3CString & s) : UmlActivityAction(id, s) {
+    UmlBaseOnSignalAction(void * id, const QByteArray & s) : UmlActivityAction(id, s) {
     }
 
 
 public:
     // return the signal
-    const Q3CString & signal();
+    const QByteArray & signal();
 
     // set the signal
     //
@@ -24,7 +24,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHCPP
     // return the signal in C++
-    const Q3CString & cppSignal();
+    const QByteArray & cppSignal();
 
     // set the signal in C++
     //
@@ -34,7 +34,7 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 #ifdef WITHJAVA
     // return the signal in Java
-    const Q3CString & javaSignal();
+    const QByteArray & javaSignal();
 
     // set the signal in Java
     //
@@ -52,14 +52,14 @@ class UmlBaseOnSignalAction : public UmlActivityAction
 
 
 private:
-    Q3CString _signal;
+    QByteArray _signal;
 
 #ifdef WITHCPP
-    Q3CString _cpp_signal;
+    QByteArray _cpp_signal;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_signal;
+    QByteArray _java_signal;
 #endif
 
 
diff --git a/genplugouts/uml_projection/UmlBaseOperation.cpp b/genplugouts/uml_projection/UmlBaseOperation.cpp
index dc2247fab..1d2b61490 100644
--- a/genplugouts/uml_projection/UmlBaseOperation.cpp
+++ b/genplugouts/uml_projection/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -72,7 +72,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -86,7 +86,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -100,7 +100,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -123,7 +123,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -136,7 +136,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -150,7 +150,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -263,7 +263,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -275,7 +275,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -289,7 +289,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -381,7 +381,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -391,7 +391,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -405,7 +405,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -478,7 +478,7 @@ bool UmlBaseOperation::set_isPhpFinal(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::phpDef()
+const QByteArray & UmlBaseOperation::phpDef()
 {
     return phpDecl();
 }
@@ -488,7 +488,7 @@ bool UmlBaseOperation::set_PhpDef(const char * s)
     return set_PhpDecl(s);
 }
 
-Q3CString UmlBaseOperation::phpBody()
+QByteArray UmlBaseOperation::phpBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, phpBodyCmd);
@@ -502,7 +502,7 @@ bool UmlBaseOperation::set_PhpBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::phpNameSpec()
+const QByteArray & UmlBaseOperation::phpNameSpec()
 {
     read_if_needed_();
 
@@ -556,7 +556,7 @@ bool UmlBaseOperation::set_PhpContextualBodyIndent(bool v)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDef()
+const QByteArray & UmlBaseOperation::pythonDef()
 {
     return pythonDecl();
 }
@@ -566,7 +566,7 @@ bool UmlBaseOperation::set_PythonDef(const char * s)
     return set_PythonDecl(s);
 }
 
-Q3CString UmlBaseOperation::pythonBody()
+QByteArray UmlBaseOperation::pythonBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, pythonBodyCmd);
@@ -580,7 +580,7 @@ bool UmlBaseOperation::set_PythonBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::pythonNameSpec()
+const QByteArray & UmlBaseOperation::pythonNameSpec()
 {
     read_if_needed_();
 
@@ -634,7 +634,7 @@ bool UmlBaseOperation::set_PythonContextualBodyIndent(bool v)
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBaseOperation::pythonDecorators()
+const QByteArray & UmlBaseOperation::pythonDecorators()
 {
     read_if_needed_();
     return _python_decorators;
@@ -666,7 +666,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
diff --git a/genplugouts/uml_projection/UmlBaseOperation.h b/genplugouts/uml_projection/UmlBaseOperation.h
index 1a64e384f..b569f3a7e 100644
--- a/genplugouts/uml_projection/UmlBaseOperation.h
+++ b/genplugouts/uml_projection/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+#include <QByteArray>
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -52,7 +52,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -70,7 +70,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -130,7 +130,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -139,9 +139,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -151,7 +151,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -199,7 +199,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -208,9 +208,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -220,7 +220,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -260,7 +260,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Php, notes that it is
     // already made by the inherited PhpDecl operation
-    const Q3CString & phpDef();
+    const QByteArray & phpDef();
 
     // sets the operation's definition in Php, notes that it is
     // already made by the inherited set_PhpDecl operation
@@ -269,9 +269,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PhpDef(const char * s);
 
     // returns the operation's body in Php++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString phpBody();
+    QByteArray phpBody();
 
     // sets the operation's body in Php, useless if the def does not
     // contains ${body}
@@ -281,7 +281,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
-    const Q3CString & phpNameSpec();
+    const QByteArray & phpNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PHP name must be generated
@@ -313,7 +313,7 @@ class UmlBaseOperation : public UmlClassMember
 #ifdef WITHPYTHON
     // returns the operation's definition in Python, notes that it is
     // already made by the inherited PythonDecl operation
-    const Q3CString & pythonDef();
+    const QByteArray & pythonDef();
 
     // sets the operation's definition in Python, notes that it is
     // already made by the inherited set_PythonDecl operation
@@ -322,9 +322,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PythonDef(const char * s);
 
     // returns the operation's body in Python++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString pythonBody();
+    QByteArray pythonBody();
 
     // sets the operation's body in Python, useless if the def does not
     // contains ${body}
@@ -334,7 +334,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
-    const Q3CString & pythonNameSpec();
+    const QByteArray & pythonNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's PYTHON name must be generated
@@ -365,7 +365,7 @@ class UmlBaseOperation : public UmlClassMember
 
 #ifdef WITHPYTHON
     // return the  decorators
-    const Q3CString & pythonDecorators();
+    const QByteArray & pythonDecorators();
 
     // set the  decorators
     //
@@ -384,7 +384,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -478,32 +478,32 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHPHP
-    Q3CString _php_name_spec;
+    QByteArray _php_name_spec;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_name_spec;
+    QByteArray _python_name_spec;
 
-    Q3CString _python_decorators;
+    QByteArray _python_decorators;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -515,7 +515,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
@@ -553,7 +553,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/uml_projection/UmlBasePackage.cpp b/genplugouts/uml_projection/UmlBasePackage.cpp
index dcef8ed04..f685f1840 100644
--- a/genplugouts/uml_projection/UmlBasePackage.cpp
+++ b/genplugouts/uml_projection/UmlBasePackage.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -38,43 +38,43 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findCppNamespace(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, _identifier, n);
 
@@ -83,31 +83,31 @@ UmlPackage * UmlBasePackage::findCppNamespace(const Q3CString & n) const
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findJavaPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, _identifier, n);
 
@@ -116,45 +116,63 @@ UmlPackage * UmlBasePackage::findJavaPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHPHP
-const Q3CString & UmlBasePackage::phpDir()
+const QByteArray & UmlBasePackage::phpDir()
 {
     read_if_needed_();
 
     return _php_dir;
 }
 
-bool UmlBasePackage::set_PhpDir(const Q3CString & s)
+bool UmlBasePackage::set_PhpDir(const QByteArray & s)
 {
     return set_it_(_php_dir, s, setPhpDirCmd);
 }
+const QByteArray & UmlBasePackage::phpNamespace()
+{
+    read_if_needed_();
+
+    return _php_namespace;
+}
+
+bool UmlBasePackage::set_PhpNamespace(const QByteArray & v)
+{
+    return set_it_(_php_namespace, v, setPhpNamespaceCmd);
+}
+
+UmlPackage * UmlBasePackage::findPhpNamespace(const QByteArray & n)
+{
+    UmlCom::send_cmd(packageGlobalCmd, findPhpNamespaceCmd, _identifier, n);
+
+    return (UmlPackage *) UmlBaseItem::read_();
+}
 #endif
 
 #ifdef WITHPYTHON
-const Q3CString & UmlBasePackage::pythonDir()
+const QByteArray & UmlBasePackage::pythonDir()
 {
     read_if_needed_();
 
     return _python_dir;
 }
 
-bool UmlBasePackage::set_PythonDir(const Q3CString & s)
+bool UmlBasePackage::set_PythonDir(const QByteArray & s)
 {
     return set_it_(_python_dir, s, setPythonDirCmd);
 }
 
-Q3CString UmlBasePackage::pythonPackage()
+QByteArray UmlBasePackage::pythonPackage()
 {
     read_if_needed_();
 
     return _python_package;
 }
 
-bool UmlBasePackage::set_PythonPackage(const Q3CString & s)
+bool UmlBasePackage::set_PythonPackage(const QByteArray & s)
 {
     return set_it_(_python_package, s, setPythonPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPythonPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findPythonPackageCmd, _identifier, n);
 
@@ -163,31 +181,31 @@ UmlPackage * UmlBasePackage::findPythonPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findIdlModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findIdlModule(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, _identifier, n);
 
@@ -214,7 +232,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
@@ -277,6 +295,7 @@ void UmlBasePackage::read_java_()
 void UmlBasePackage::read_php_()
 {
     _php_dir = UmlCom::read_string();
+    _php_namespace = UmlCom::read_string();
 }
 #endif
 
diff --git a/genplugouts/uml_projection/UmlBasePackage.h b/genplugouts/uml_projection/UmlBasePackage.h
index 5e761888b..3583976f1 100644
--- a/genplugouts/uml_projection/UmlBasePackage.h
+++ b/genplugouts/uml_projection/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPackage;
 class UmlDiagram;
@@ -34,125 +34,138 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findCppNamespace(const Q3CString & n) const;
+    UmlPackage * findCppNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findJavaPackage(const Q3CString & n) const;
+    UmlPackage * findJavaPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHPHP
     // returns the path where the PHP files are generated by the
     // PHP generator.
-    const Q3CString & phpDir();
+    const QByteArray & phpDir();
 
     // to set the path where the PHP files are generated by the
     // PHP generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PhpDir(const Q3CString & s);
+    bool set_PhpDir(const QByteArray & s);
+    // return the namespace name associed to the package
+
+    const QByteArray & phpNamespace();
+
+    // the namespace name associed to the package.
+    //
+    // On error : return FALSE in C++, produce a RuntimeException in Java
+    bool set_PhpNamespace(const QByteArray & v);
+
+    // returns a sub package of the current one having the php namespace 'n'
+    // (including the current one), else 0/null
+
+    UmlPackage * findPhpNamespace(const QByteArray & n);
 #endif
 
 #ifdef WITHPYTHON
     // returns the path where the PYTHON files are generated by the
     // PYTHON generator.
-    const Q3CString & pythonDir();
+    const QByteArray & pythonDir();
 
     // to set the path where the PYTHON files are generated by the
     // PYTHON generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonDir(const Q3CString & s);
+    bool set_PythonDir(const QByteArray & s);
 
     //returns the python package name associed to the package
-    Q3CString pythonPackage();
+    QByteArray pythonPackage();
 
     // to set the python package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PythonPackage(const Q3CString & s);
+    bool set_PythonPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Python package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPythonPackage(const Q3CString & n) const;
+    UmlPackage * findPythonPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findIdlModule(const Q3CString & n) const;
+    UmlPackage * findIdlModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -165,12 +178,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // Force consistency concerning the profiles and their stereotypes
 
@@ -189,35 +202,36 @@ class UmlBasePackage : public UmlItem
     UmlDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHPHP
-    Q3CString _php_dir;
+    QByteArray _php_dir;
+    QByteArray _php_namespace;
 #endif
 
 #ifdef WITHPYTHON
-    Q3CString _python_dir;
+    QByteArray _python_dir;
 
-    Q3CString _python_package;
+    QByteArray _python_package;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -258,11 +272,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/uml_projection/UmlBaseParameter.h b/genplugouts/uml_projection/UmlBaseParameter.h
index 71202a64d..0b04b0218 100644
--- a/genplugouts/uml_projection/UmlBaseParameter.h
+++ b/genplugouts/uml_projection/UmlBaseParameter.h
@@ -2,16 +2,16 @@
 #define _UMLBASEPARAMETER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 #include "aDirection.h"
 
 //  Represent an operation's parameter
 
 struct UmlBaseParameter {
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
     UmlTypeSpec type;
 
diff --git a/genplugouts/uml_projection/UmlBaseParameterSet.cpp b/genplugouts/uml_projection/UmlBaseParameterSet.cpp
index 307417d45..2c680249f 100644
--- a/genplugouts/uml_projection/UmlBaseParameterSet.cpp
+++ b/genplugouts/uml_projection/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         if (_defined) _pins = v;
@@ -43,6 +43,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/uml_projection/UmlBaseParameterSet.h b/genplugouts/uml_projection/UmlBaseParameterSet.h
index 71e77cbfe..3c4d756f9 100644
--- a/genplugouts/uml_projection/UmlBaseParameterSet.h
+++ b/genplugouts/uml_projection/UmlBaseParameterSet.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
+#include <QByteArray>
+#include <QVector>
 
 class UmlActivityParameter;
 class UmlActivityAction;
@@ -27,16 +27,16 @@ class UmlBaseParameterSet : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseParameterSet(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseParameterSet(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +48,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/uml_projection/UmlBasePinParameter.h b/genplugouts/uml_projection/UmlBasePinParameter.h
index d629b7122..f4fc7aadf 100644
--- a/genplugouts/uml_projection/UmlBasePinParameter.h
+++ b/genplugouts/uml_projection/UmlBasePinParameter.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlActivityObject.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aDirection.h"
 #include "aParameterEffectKind.h"
 
@@ -11,7 +11,7 @@ class UmlBasePinParameter : public UmlActivityObject
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePinParameter(void * id, const Q3CString & s) : UmlActivityObject(id, s) {
+    UmlBasePinParameter(void * id, const QByteArray & s) : UmlActivityObject(id, s) {
     }
 
 
diff --git a/genplugouts/uml_projection/UmlBaseRegion.h b/genplugouts/uml_projection/UmlBaseRegion.h
index 58a9f8b78..9133a76f5 100644
--- a/genplugouts/uml_projection/UmlBaseRegion.h
+++ b/genplugouts/uml_projection/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseRelation.cpp b/genplugouts/uml_projection/UmlBaseRelation.cpp
index 3c141d439..860b61402 100644
--- a/genplugouts/uml_projection/UmlBaseRelation.cpp
+++ b/genplugouts/uml_projection/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -139,7 +139,7 @@ bool UmlBaseRelation::set_isUnique(bool v)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -151,7 +151,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -193,7 +193,7 @@ bool UmlBaseRelation::set_Association(const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -205,7 +205,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -337,7 +337,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/uml_projection/UmlBaseRelation.h b/genplugouts/uml_projection/UmlBaseRelation.h
index 536a4eee9..c00337822 100644
--- a/genplugouts/uml_projection/UmlBaseRelation.h
+++ b/genplugouts/uml_projection/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlRelation;
@@ -71,7 +71,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isUnique(bool v);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -83,7 +83,7 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
@@ -97,7 +97,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_Association(const UmlTypeSpec & t);
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -105,7 +105,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -168,7 +168,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -215,13 +215,13 @@ class UmlBaseRelation : public UmlClassMember
     bool _idl_truncatable : 1;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlTypeSpec _association;
 
@@ -233,7 +233,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -273,11 +273,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/uml_projection/UmlBaseSequenceDiagram.h b/genplugouts/uml_projection/UmlBaseSequenceDiagram.h
index 345c08b13..5b56aa0dd 100644
--- a/genplugouts/uml_projection/UmlBaseSequenceDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/uml_projection/UmlBaseSequenceDiagramDefinition.cpp b/genplugouts/uml_projection/UmlBaseSequenceDiagramDefinition.cpp
index eb3b1751b..975bbd0c3 100644
--- a/genplugouts/uml_projection/UmlBaseSequenceDiagramDefinition.cpp
+++ b/genplugouts/uml_projection/UmlBaseSequenceDiagramDefinition.cpp
@@ -2,7 +2,7 @@
 #include "UmlCom.h"
 #include "UmlBaseSequenceDiagramDefinition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 static void qsort(UmlSequenceMessage ** v, int low, int high)
 {
@@ -40,7 +40,7 @@ static void qsort(UmlSequenceMessage ** v, int low, int high)
 }
 void UmlBaseSequenceDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -54,7 +54,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -64,11 +64,11 @@ void UmlBaseSequenceDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -82,7 +82,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         }
 
         ::qsort(_messages.data(), 0, n - 1);
-        _messages.setAutoDelete(TRUE);
+        //_messages.setAutoDelete(TRUE);
     }
 
     n = _fragments.count();
@@ -92,7 +92,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
 
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
@@ -103,7 +103,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
     }
 
     while (UmlCom::read_bool()) {
-        Q3CString s = UmlCom::read_string();
+        QByteArray s = UmlCom::read_string();
         int x = (int) UmlCom::read_unsigned();
         int y = (int) UmlCom::read_unsigned();
         int w = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/uml_projection/UmlBaseSequenceDiagramDefinition.h b/genplugouts/uml_projection/UmlBaseSequenceDiagramDefinition.h
index 6be419e66..b6a0b5065 100644
--- a/genplugouts/uml_projection/UmlBaseSequenceDiagramDefinition.h
+++ b/genplugouts/uml_projection/UmlBaseSequenceDiagramDefinition.h
@@ -8,7 +8,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlSequenceMessage.h"
 
-#include <q3ptrvector.h>
+#include <QVector>
 
 class UmlClassInstanceReference;
 class UmlSequenceMessage;
@@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following the sending time
-    const Q3PtrVector<UmlSequenceMessage> & messages() const {
+    const QVector<UmlSequenceMessage*> & messages() const {
         return _messages;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlSequenceMessage> _messages;
+    QVector<UmlSequenceMessage*> _messages;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/uml_projection/UmlBaseSequenceMessage.cpp b/genplugouts/uml_projection/UmlBaseSequenceMessage.cpp
index 379ba53a7..459327d24 100644
--- a/genplugouts/uml_projection/UmlBaseSequenceMessage.cpp
+++ b/genplugouts/uml_projection/UmlBaseSequenceMessage.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlFragment.h"
 
-void UmlBaseSequenceMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseSequenceMessage::read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments)
 {
     UmlBaseMessage::read_(instances);
     _kind = (aMessageKind) UmlCom::read_char();
diff --git a/genplugouts/uml_projection/UmlBaseSequenceMessage.h b/genplugouts/uml_projection/UmlBaseSequenceMessage.h
index 4eb0b884d..d6145a45d 100644
--- a/genplugouts/uml_projection/UmlBaseSequenceMessage.h
+++ b/genplugouts/uml_projection/UmlBaseSequenceMessage.h
@@ -3,9 +3,9 @@
 
 
 #include "aMessageKind.h"
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-#include <q3ptrvector.h>
+#include <QByteArray>
+#include <QHash>
+#include <QVector>
 #include "UmlMessage.h"
 
 class UmlFragmentCompartment;
@@ -37,7 +37,7 @@ class UmlBaseSequenceMessage : public UmlMessage
     }
 
     // return the arguments of the operation, may be empty
-    const Q3CString & arguments() const {
+    const QByteArray & arguments() const {
         return _args;
     }
 
@@ -53,10 +53,10 @@ class UmlBaseSequenceMessage : public UmlMessage
 
     int _received_at;
 
-    Q3CString _args;
+    QByteArray _args;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments);
 
     friend class UmlBaseSequenceDiagramDefinition;
 };
diff --git a/genplugouts/uml_projection/UmlBaseShallowHistoryPseudoState.h b/genplugouts/uml_projection/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..64dbcd9c1 100644
--- a/genplugouts/uml_projection/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseState.cpp b/genplugouts/uml_projection/UmlBaseState.cpp
index fbdec19f6..5437698d7 100644
--- a/genplugouts/uml_projection/UmlBaseState.cpp
+++ b/genplugouts/uml_projection/UmlBaseState.cpp
@@ -4,7 +4,7 @@
 #include "UmlState.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -27,7 +27,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -38,7 +38,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -50,7 +50,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -61,7 +61,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -72,7 +72,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -85,7 +85,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -96,7 +96,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -107,7 +107,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/uml_projection/UmlBaseState.h b/genplugouts/uml_projection/UmlBaseState.h
index 97337032a..dd2e055ce 100644
--- a/genplugouts/uml_projection/UmlBaseState.h
+++ b/genplugouts/uml_projection/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "StateBehavior.h"
 
 class UmlState;
@@ -26,13 +26,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -48,7 +48,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -57,7 +57,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -65,7 +65,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -73,7 +73,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -83,7 +83,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -91,7 +91,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -99,7 +99,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/uml_projection/UmlBaseStateAction.cpp b/genplugouts/uml_projection/UmlBaseStateAction.cpp
index 32063a1ac..ddae8212d 100644
--- a/genplugouts/uml_projection/UmlBaseStateAction.cpp
+++ b/genplugouts/uml_projection/UmlBaseStateAction.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseStateAction.h"
 #include "UmlStateAction.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlItem * parent)
 {
@@ -15,7 +15,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -27,7 +27,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -40,7 +40,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/uml_projection/UmlBaseStateAction.h b/genplugouts/uml_projection/UmlBaseStateAction.h
index 058903e1f..d448874d0 100644
--- a/genplugouts/uml_projection/UmlBaseStateAction.h
+++ b/genplugouts/uml_projection/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateAction;
 
@@ -24,13 +24,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -39,7 +39,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -49,7 +49,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -67,14 +67,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/uml_projection/UmlBaseStateDiagram.h b/genplugouts/uml_projection/UmlBaseStateDiagram.h
index ea7e37ee0..f165c5fdf 100644
--- a/genplugouts/uml_projection/UmlBaseStateDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseSubject.cpp b/genplugouts/uml_projection/UmlBaseSubject.cpp
index b15d380d3..f55c74c8a 100644
--- a/genplugouts/uml_projection/UmlBaseSubject.cpp
+++ b/genplugouts/uml_projection/UmlBaseSubject.cpp
@@ -12,7 +12,7 @@ void UmlBaseSubject::read_()
     _h = (int) UmlCom::read_unsigned();
 }
 
-UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects)
+UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects)
 {
     int rank = subjects.count();
 
diff --git a/genplugouts/uml_projection/UmlBaseSubject.h b/genplugouts/uml_projection/UmlBaseSubject.h
index da0098ff6..786d38e4f 100644
--- a/genplugouts/uml_projection/UmlBaseSubject.h
+++ b/genplugouts/uml_projection/UmlBaseSubject.h
@@ -2,8 +2,8 @@
 #define _UMLBASESUBJECT_H
 
 
-#include <q3cstring.h>
-#include <q3ptrvector.h>
+#include <QByteArray>
+#include <QVector>
 
 class UmlSubject;
 
@@ -12,13 +12,13 @@ class UmlBaseSubject
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
 
 private:
-    Q3CString _name;
+    QByteArray _name;
 
     int _x;
 
@@ -34,7 +34,7 @@ class UmlBaseSubject
 
 public:
     // internal
-    static UmlSubject * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects);
+    static UmlSubject * get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/uml_projection/UmlBaseTerminatePseudoState.h b/genplugouts/uml_projection/UmlBaseTerminatePseudoState.h
index e8553f4be..5959ed022 100644
--- a/genplugouts/uml_projection/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/uml_projection/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseTransition.cpp b/genplugouts/uml_projection/UmlBaseTransition.cpp
index 8fe2570a0..7dec536d7 100644
--- a/genplugouts/uml_projection/UmlBaseTransition.cpp
+++ b/genplugouts/uml_projection/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_IsExternal(bool v)
     return set_it_(_is_external, v, setIsCppExternalCmd);
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -61,7 +61,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -95,7 +95,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -130,7 +130,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/uml_projection/UmlBaseTransition.h b/genplugouts/uml_projection/UmlBaseTransition.h
index cab4fd850..2f8f977be 100644
--- a/genplugouts/uml_projection/UmlBaseTransition.h
+++ b/genplugouts/uml_projection/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -35,7 +35,7 @@ class UmlBaseTransition : public UmlItem
     bool set_IsExternal(bool v);
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -43,7 +43,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -60,7 +60,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -68,7 +68,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -76,7 +76,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -86,7 +86,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -94,7 +94,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -102,7 +102,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
@@ -151,7 +151,7 @@ class UmlBaseTransition : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTransition(void * id, const Q3CString & n) : UmlItem(id, n) {
+    UmlBaseTransition(void * id, const QByteArray & n) : UmlItem(id, n) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBaseTypeSpec.cpp b/genplugouts/uml_projection/UmlBaseTypeSpec.cpp
index 4070a4a45..cddda026a 100644
--- a/genplugouts/uml_projection/UmlBaseTypeSpec.cpp
+++ b/genplugouts/uml_projection/UmlBaseTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlBaseTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlBaseTypeSpec::toString() const
+const QByteArray & UmlBaseTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/uml_projection/UmlBaseTypeSpec.h b/genplugouts/uml_projection/UmlBaseTypeSpec.h
index 16fce750a..da515699f 100644
--- a/genplugouts/uml_projection/UmlBaseTypeSpec.h
+++ b/genplugouts/uml_projection/UmlBaseTypeSpec.h
@@ -2,7 +2,7 @@
 #define _UMLBASETYPESPEC_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 
@@ -17,10 +17,10 @@ class UmlBaseTypeSpec
     UmlBaseTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     UmlClass * type;
 
diff --git a/genplugouts/uml_projection/UmlBaseUseCase.cpp b/genplugouts/uml_projection/UmlBaseUseCase.cpp
index 5e1d6d1b3..c85af9ddc 100644
--- a/genplugouts/uml_projection/UmlBaseUseCase.cpp
+++ b/genplugouts/uml_projection/UmlBaseUseCase.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlUseCase * UmlBaseUseCase::create(UmlItem * parent, const char * s)
 {
     return (UmlUseCase *) parent->create_(anUseCase, s);
@@ -35,7 +35,7 @@ bool UmlBaseUseCase::set_AssociatedDiagram(UmlUseCaseDiagram * d)
         return FALSE;
 }
 
-const Q3CString & UmlBaseUseCase::extensionPoints()
+const QByteArray & UmlBaseUseCase::extensionPoints()
 {
     read_if_needed_();
     return _extension_points;
diff --git a/genplugouts/uml_projection/UmlBaseUseCase.h b/genplugouts/uml_projection/UmlBaseUseCase.h
index 9bd21249f..d642c7915 100644
--- a/genplugouts/uml_projection/UmlBaseUseCase.h
+++ b/genplugouts/uml_projection/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -32,7 +32,7 @@ class UmlBaseUseCase : public UmlItem
     bool set_AssociatedDiagram(UmlUseCaseDiagram * d);
 
     // return the extension points
-    const Q3CString & extensionPoints();
+    const QByteArray & extensionPoints();
 
     // set the extension points
     //
@@ -41,7 +41,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
-    Q3CString _extension_points;
+    QByteArray _extension_points;
 
     UmlUseCaseDiagram * _assoc_diagram;
 
@@ -52,7 +52,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseUseCaseAssociation.cpp b/genplugouts/uml_projection/UmlBaseUseCaseAssociation.cpp
index ebee930a9..6a91c0e5c 100644
--- a/genplugouts/uml_projection/UmlBaseUseCaseAssociation.cpp
+++ b/genplugouts/uml_projection/UmlBaseUseCaseAssociation.cpp
@@ -4,9 +4,9 @@
 #include "UmlUseCaseReference.h"
 #include "UmlClass.h"
 
-void UmlBaseUseCaseAssociation::read_(const Q3PtrDict<UmlUseCaseReference> & useCases)
+void UmlBaseUseCaseAssociation::read_(const QHash<void*,UmlUseCaseReference*> & useCases)
 {
-    _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()];
+    _use_case = (UmlUseCaseReference *) useCases[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
     _actor = (UmlClass *) UmlBaseItem::read_();
     _primary = UmlCom::read_bool();
     _name = UmlCom::read_string();
diff --git a/genplugouts/uml_projection/UmlBaseUseCaseAssociation.h b/genplugouts/uml_projection/UmlBaseUseCaseAssociation.h
index 9538e6ba7..4e2e74db2 100644
--- a/genplugouts/uml_projection/UmlBaseUseCaseAssociation.h
+++ b/genplugouts/uml_projection/UmlBaseUseCaseAssociation.h
@@ -1,10 +1,7 @@
 #ifndef _UMLBASEUSECASEASSOCIATION_H
 #define _UMLBASEUSECASEASSOCIATION_H
-
-
-#include <q3cstring.h>
-#include <q3ptrdict.h>
-
+#include <QByteArray>
+#include <QHash>
 class UmlUseCaseReference;
 class UmlClass;
 
@@ -13,12 +10,12 @@ class UmlBaseUseCaseAssociation
 {
 public:
     // return the name
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     }
 
     // return the stereotype
-    const Q3CString & stereotype() const {
+    const QByteArray & stereotype() const {
         return _stereotype;
     }
 
@@ -43,14 +40,14 @@ class UmlBaseUseCaseAssociation
 
     UmlClass * _actor;
 
-    Q3CString _name;
+    QByteArray _name;
 
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
     bool _primary;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlUseCaseReference> & useCases);
+    void read_(const QHash<void*,UmlUseCaseReference*> & useCases);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/uml_projection/UmlBaseUseCaseDiagram.h b/genplugouts/uml_projection/UmlBaseUseCaseDiagram.h
index 4370e63a4..68cd4630d 100644
--- a/genplugouts/uml_projection/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/uml_projection/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -27,7 +27,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n), _def(0) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n), _def(0) {};
 
 
 public:
diff --git a/genplugouts/uml_projection/UmlBaseUseCaseDiagramDefinition.cpp b/genplugouts/uml_projection/UmlBaseUseCaseDiagramDefinition.cpp
index b8780daf2..00a1ebe8a 100644
--- a/genplugouts/uml_projection/UmlBaseUseCaseDiagramDefinition.cpp
+++ b/genplugouts/uml_projection/UmlBaseUseCaseDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseUseCaseDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlUseCaseReference> ucrefs;
+    QHash<void*,UmlUseCaseReference*> ucrefs;
     unsigned n;
     unsigned rank;
 
@@ -18,7 +18,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -31,7 +31,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         sb->read_();
     }
 
-    _subjects.setAutoDelete(TRUE);
+    //_subjects.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _use_cases.resize(n);
@@ -40,11 +40,11 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         UmlUseCaseReference * uc = new UmlUseCaseReference();
 
         _use_cases.insert(rank, uc);
-        ucrefs.insert((void *) UmlCom::read_unsigned(), uc);
+        ucrefs.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), uc);
         uc->read_(_fragments, _subjects);
     }
 
-    _use_cases.setAutoDelete(TRUE);
+    //_use_cases.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _actors.resize(n);
@@ -62,7 +62,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         r->read_(ucrefs);
     }
 
-    _rels.setAutoDelete(TRUE);
+    //_rels.setAutoDelete(TRUE);
 }
 
 UmlBaseUseCaseDiagramDefinition::~UmlBaseUseCaseDiagramDefinition()
diff --git a/genplugouts/uml_projection/UmlBaseUseCaseDiagramDefinition.h b/genplugouts/uml_projection/UmlBaseUseCaseDiagramDefinition.h
index d2cefc68d..2e570f7ed 100644
--- a/genplugouts/uml_projection/UmlBaseUseCaseDiagramDefinition.h
+++ b/genplugouts/uml_projection/UmlBaseUseCaseDiagramDefinition.h
@@ -10,7 +10,7 @@
 #include "UmlUseCaseReference.h"
 #include "UmlUseCaseAssociation.h"
 
-#include <q3ptrvector.h>
+#include <QVector>
 
 class UmlUseCaseReference;
 class UmlClass;
@@ -23,41 +23,41 @@ class UmlBaseUseCaseDiagramDefinition
 {
 public:
     // return the use cases present in the diagram
-    const Q3PtrVector<UmlUseCaseReference> & useCases() const {
+    const QVector<UmlUseCaseReference*> & useCases() const {
         return _use_cases;
     }
 
     // return the actors present in the diagram
-    const Q3PtrVector<UmlClass> & actors() const {
+    const QVector<UmlClass*> & actors() const {
         return _actors;
     }
 
     // return the associations between actor and use case present in the diagram
-    const Q3PtrVector<UmlUseCaseAssociation> & associations() const {
+    const QVector<UmlUseCaseAssociation*> & associations() const {
         return _rels;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
     // return the subjects present in the diagram
-    const Q3PtrVector<UmlSubject> & subjects() const {
+    const QVector<UmlSubject*> & subjects() const {
         return _subjects;
     }
 
 
 private:
-    Q3PtrVector<UmlUseCaseReference> _use_cases;
+    QVector<UmlUseCaseReference*> _use_cases;
 
-    Q3PtrVector<UmlClass> _actors;
+    QVector<UmlClass*> _actors;
 
-    Q3PtrVector<UmlUseCaseAssociation> _rels;
+    QVector<UmlUseCaseAssociation*> _rels;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
-    Q3PtrVector<UmlSubject> _subjects;
+    QVector<UmlSubject*> _subjects;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/uml_projection/UmlBaseUseCaseReference.cpp b/genplugouts/uml_projection/UmlBaseUseCaseReference.cpp
index c599f87d4..d20f93f30 100644
--- a/genplugouts/uml_projection/UmlBaseUseCaseReference.cpp
+++ b/genplugouts/uml_projection/UmlBaseUseCaseReference.cpp
@@ -6,7 +6,7 @@
 #include "UmlSubject.h"
 #include "UmlFragment.h"
 
-void UmlBaseUseCaseReference::read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects)
+void UmlBaseUseCaseReference::read_(const QVector<UmlFragment *> & fragments, const QVector<UmlSubject *> & subjects)
 {
     _use_case = (UmlUseCase *) UmlBaseItem::read_();
     _x = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/uml_projection/UmlBaseUseCaseReference.h b/genplugouts/uml_projection/UmlBaseUseCaseReference.h
index 5e5590920..61fa627dd 100644
--- a/genplugouts/uml_projection/UmlBaseUseCaseReference.h
+++ b/genplugouts/uml_projection/UmlBaseUseCaseReference.h
@@ -2,7 +2,7 @@
 #define _UMLBASEUSECASEREFERENCE_H
 
 
-#include <q3ptrvector.h>
+#include <QVector>
 
 class UmlUseCase;
 class UmlFragmentCompartment;
@@ -46,7 +46,7 @@ class UmlBaseUseCaseReference
     int _h;
 
     // internal, don't call it
-    void read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects);
+    void read_(const QVector<UmlFragment *> &fragments, const QVector<UmlSubject *> &subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/uml_projection/UmlBaseUseCaseView.h b/genplugouts/uml_projection/UmlBaseUseCaseView.h
index 19d836b64..790548691 100644
--- a/genplugouts/uml_projection/UmlBaseUseCaseView.h
+++ b/genplugouts/uml_projection/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlView.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseView;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseView : public UmlView
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlView(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlView(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlBaseView.h b/genplugouts/uml_projection/UmlBaseView.h
index ee8c0dd38..70e9ba7b1 100644
--- a/genplugouts/uml_projection/UmlBaseView.h
+++ b/genplugouts/uml_projection/UmlBaseView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlBaseView : public UmlItem
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseView(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseView(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlBuiltin.h b/genplugouts/uml_projection/UmlBuiltin.h
index 4f5c16f41..79815c251 100644
--- a/genplugouts/uml_projection/UmlBuiltin.h
+++ b/genplugouts/uml_projection/UmlBuiltin.h
@@ -2,31 +2,31 @@
 #define _UMLBUILTIN_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/uml_projection/UmlClass.cpp b/genplugouts/uml_projection/UmlClass.cpp
index 6eb0823d6..d77d0b252 100644
--- a/genplugouts/uml_projection/UmlClass.cpp
+++ b/genplugouts/uml_projection/UmlClass.cpp
@@ -11,13 +11,13 @@
 #include "UmlDeploymentView.h"
 #include "UmlArtifact.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlClass::uml2cpp(bool rec)
 {
     if (isCppExternal())
         set_CppDecl(CppSettings::externalClassDecl());
     else {
-        Q3CString st = CppSettings::classStereotype(stereotype());
+        QByteArray st = CppSettings::classStereotype(stereotype());
         UmlItem * pack = parent()->parent();
 
         while (pack->kind() != aPackage)
@@ -46,7 +46,7 @@ void UmlClass::uml2cpp(bool rec)
             set_CppDecl(CppSettings::classDecl());
 
         if (rec) {
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             unsigned n = ch.size();
 
             for (unsigned i = 0; i != n; i += 1)
@@ -68,7 +68,7 @@ void UmlClass::uml2java(bool rec)
     if (isJavaExternal())
         set_JavaDecl(JavaSettings::externalClassDecl());
     else {
-        Q3CString st = JavaSettings::classStereotype(stereotype());
+        QByteArray st = JavaSettings::classStereotype(stereotype());
         UmlItem * pack = parent()->parent();
 
         while (pack->kind() != aPackage)
@@ -88,8 +88,8 @@ void UmlClass::uml2java(bool rec)
         else if (st == "interface")
             set_JavaDecl(JavaSettings::interfaceDecl());
         else if (st == "@interface") {
-            Q3CString s = JavaSettings::interfaceDecl();
-            int index = s.find("interface");
+            QByteArray s = JavaSettings::interfaceDecl();
+            int index = s.indexOf("interface");
 
             if (index != -1)
                 s.insert(index, '@');
@@ -104,7 +104,7 @@ void UmlClass::uml2java(bool rec)
             set_JavaDecl(JavaSettings::classDecl());
 
         if (rec) {
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             unsigned n = ch.size();
 
             for (unsigned i = 0; i != n; i += 1)
@@ -122,7 +122,7 @@ void UmlClass::uml2idl(bool rec)
     if (isIdlExternal())
         set_IdlDecl(IdlSettings::externalClassDecl());
     else {
-        Q3CString st = IdlSettings::classStereotype(stereotype());
+        QByteArray st = IdlSettings::classStereotype(stereotype());
         UmlItem * pack = parent()->parent();
 
         while (pack->kind() != aPackage)
@@ -155,7 +155,7 @@ void UmlClass::uml2idl(bool rec)
             set_IdlDecl(IdlSettings::valuetypeDecl());
 
         if (rec) {
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             unsigned n = ch.size();
 
             for (unsigned i = 0; i != n; i += 1)
@@ -173,7 +173,7 @@ void UmlClass::uml2php(bool rec)
     if (isPhpExternal())
         set_PhpDecl(PhpSettings::externalClassDecl());
     else {
-        Q3CString st = PhpSettings::classStereotype(stereotype());
+        QByteArray st = PhpSettings::classStereotype(stereotype());
         UmlItem * pack = parent()->parent();
 
         while (pack->kind() != aPackage)
@@ -199,7 +199,7 @@ void UmlClass::uml2php(bool rec)
             set_PhpDecl(PhpSettings::classDecl());
 
         if (rec) {
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             unsigned n = ch.size();
 
             for (unsigned i = 0; i != n; i += 1)
@@ -217,7 +217,7 @@ void UmlClass::uml2python(bool rec)
     if (isPythonExternal())
         set_PythonDecl(PythonSettings::externalClassDecl());
     else {
-        Q3CString st = PythonSettings::classStereotype(stereotype());
+        QByteArray st = PythonSettings::classStereotype(stereotype());
         UmlItem * pack = parent()->parent();
 
         while (pack->kind() != aPackage)
@@ -241,7 +241,7 @@ void UmlClass::uml2python(bool rec)
             set_PythonDecl(PythonSettings::classDecl());
 
         if (rec) {
-            const Q3PtrVector<UmlItem> ch = children();
+            const QVector<UmlItem*> ch = children();
             unsigned n = ch.size();
 
             for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/uml_projection/UmlClass.h b/genplugouts/uml_projection/UmlClass.h
index ac3974b1f..3f1db2f27 100644
--- a/genplugouts/uml_projection/UmlClass.h
+++ b/genplugouts/uml_projection/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlArtifact;
 
@@ -14,7 +14,7 @@ class UmlArtifact;
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
     virtual void uml2cpp(bool rec);
 
diff --git a/genplugouts/uml_projection/UmlClassDiagram.h b/genplugouts/uml_projection/UmlClassDiagram.h
index 76134392d..d9d822da0 100644
--- a/genplugouts/uml_projection/UmlClassDiagram.h
+++ b/genplugouts/uml_projection/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlClassInstance.h b/genplugouts/uml_projection/UmlClassInstance.h
index c0c0e5a90..40d385682 100644
--- a/genplugouts/uml_projection/UmlClassInstance.h
+++ b/genplugouts/uml_projection/UmlClassInstance.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseClassInstance.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassInstance : public UmlBaseClassInstance
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlClassInstance(void * id, const Q3CString & s) : UmlBaseClassInstance(id, s) {
+    UmlClassInstance(void * id, const QByteArray & s) : UmlBaseClassInstance(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlClassItem.h b/genplugouts/uml_projection/UmlClassItem.h
index bf64f4dbb..c3c29cffc 100644
--- a/genplugouts/uml_projection/UmlClassItem.h
+++ b/genplugouts/uml_projection/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlClassMember.h b/genplugouts/uml_projection/UmlClassMember.h
index 9119443c6..931b95f2f 100644
--- a/genplugouts/uml_projection/UmlClassMember.h
+++ b/genplugouts/uml_projection/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlClassView.cpp b/genplugouts/uml_projection/UmlClassView.cpp
index ea4135dc4..9c80b32c3 100644
--- a/genplugouts/uml_projection/UmlClassView.cpp
+++ b/genplugouts/uml_projection/UmlClassView.cpp
@@ -6,18 +6,21 @@
 void UmlClassView::uml2cpp(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
-        for (unsigned i = 0; i != n; i += 1)
-            ch[i]->uml2cpp(rec);
+        for (unsigned i = 0; i < n; i += 1)
+        {
+            UmlItem* it = ch[i];
+            it->uml2cpp(rec);
+        }
     }
 }
 
 void UmlClassView::uml2java(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -28,7 +31,7 @@ void UmlClassView::uml2java(bool rec)
 void UmlClassView::uml2idl(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -39,7 +42,7 @@ void UmlClassView::uml2idl(bool rec)
 void UmlClassView::uml2php(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -50,7 +53,7 @@ void UmlClassView::uml2php(bool rec)
 void UmlClassView::uml2python(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/uml_projection/UmlClassView.h b/genplugouts/uml_projection/UmlClassView.h
index 57cb9b93f..c1d8fb157 100644
--- a/genplugouts/uml_projection/UmlClassView.h
+++ b/genplugouts/uml_projection/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentView;
 
@@ -13,7 +13,7 @@ class UmlDeploymentView;
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
     virtual void uml2cpp(bool rec);
 
diff --git a/genplugouts/uml_projection/UmlCollaborationDiagram.h b/genplugouts/uml_projection/UmlCollaborationDiagram.h
index ab1388561..32ba50ccf 100644
--- a/genplugouts/uml_projection/UmlCollaborationDiagram.h
+++ b/genplugouts/uml_projection/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlCom.cpp b/genplugouts/uml_projection/UmlCom.cpp
index 35d409bee..809316374 100644
--- a/genplugouts/uml_projection/UmlCom.cpp
+++ b/genplugouts/uml_projection/UmlCom.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
@@ -11,10 +11,11 @@
 #include "UmlClass.h"
 #include "UmlSettings.h"
 #include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +29,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(42);
         flush();
@@ -75,11 +78,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -89,11 +92,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -110,13 +113,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -125,10 +128,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -137,16 +140,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -155,18 +158,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -212,7 +215,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -222,7 +225,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -233,7 +236,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
 #endif
 
     write_char(f);
@@ -246,7 +249,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -258,7 +261,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
 #endif
 
     write_char(f);
@@ -270,7 +273,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -282,7 +285,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -294,7 +297,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -307,7 +310,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -320,7 +323,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -334,7 +337,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -346,7 +349,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -359,7 +362,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +375,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -385,7 +388,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -407,7 +410,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -421,7 +424,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -435,7 +438,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -450,7 +453,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -463,7 +466,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -477,7 +480,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -499,8 +502,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -533,7 +536,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -556,10 +559,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -576,10 +579,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -613,7 +616,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -630,7 +633,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -641,12 +644,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -678,28 +681,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -708,7 +712,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -719,7 +723,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/uml_projection/UmlCom.h b/genplugouts/uml_projection/UmlCom.h
index ecdb8d127..08376a788 100644
--- a/genplugouts/uml_projection/UmlCom.h
+++ b/genplugouts/uml_projection/UmlCom.h
@@ -2,21 +2,21 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //#include "CmdFamily.h"
 //#include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
-#include <q3ptrvector.h>
+#include <QVector>
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -77,11 +77,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -91,19 +91,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -193,8 +193,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -217,10 +217,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
diff --git a/genplugouts/uml_projection/UmlComponent.h b/genplugouts/uml_projection/UmlComponent.h
index bb4fdbb25..1768d7a0c 100644
--- a/genplugouts/uml_projection/UmlComponent.h
+++ b/genplugouts/uml_projection/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlComponentDiagram.h b/genplugouts/uml_projection/UmlComponentDiagram.h
index 15d707dc2..ea106add4 100644
--- a/genplugouts/uml_projection/UmlComponentDiagram.h
+++ b/genplugouts/uml_projection/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlComponentView.h b/genplugouts/uml_projection/UmlComponentView.h
index 000a74744..04c241863 100644
--- a/genplugouts/uml_projection/UmlComponentView.h
+++ b/genplugouts/uml_projection/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlDeploymentDiagram.h b/genplugouts/uml_projection/UmlDeploymentDiagram.h
index 727d0ffd0..9963ec87d 100644
--- a/genplugouts/uml_projection/UmlDeploymentDiagram.h
+++ b/genplugouts/uml_projection/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlDeploymentView.h b/genplugouts/uml_projection/UmlDeploymentView.h
index 52e5e627d..1ac54c38f 100644
--- a/genplugouts/uml_projection/UmlDeploymentView.h
+++ b/genplugouts/uml_projection/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment view'
 //
@@ -11,7 +11,7 @@
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlDiagram.h b/genplugouts/uml_projection/UmlDiagram.h
index ffee38e5c..99f9e2f51 100644
--- a/genplugouts/uml_projection/UmlDiagram.h
+++ b/genplugouts/uml_projection/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlEntryPointPseudoState.h b/genplugouts/uml_projection/UmlEntryPointPseudoState.h
index 838a4bf5b..6de612bd1 100644
--- a/genplugouts/uml_projection/UmlEntryPointPseudoState.h
+++ b/genplugouts/uml_projection/UmlEntryPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlExitPointPseudoState.h b/genplugouts/uml_projection/UmlExitPointPseudoState.h
index 1a57b8230..368a7bc8b 100644
--- a/genplugouts/uml_projection/UmlExitPointPseudoState.h
+++ b/genplugouts/uml_projection/UmlExitPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlExpansionNode.h b/genplugouts/uml_projection/UmlExpansionNode.h
index 65d1cff2a..be12134a8 100644
--- a/genplugouts/uml_projection/UmlExpansionNode.h
+++ b/genplugouts/uml_projection/UmlExpansionNode.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExpansionNode : public UmlBaseExpansionNode
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionNode(void * id, const Q3CString & s) : UmlBaseExpansionNode(id, s) {
+    UmlExpansionNode(void * id, const QByteArray & s) : UmlBaseExpansionNode(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlExpansionRegion.h b/genplugouts/uml_projection/UmlExpansionRegion.h
index cfe999374..edf28b418 100644
--- a/genplugouts/uml_projection/UmlExpansionRegion.h
+++ b/genplugouts/uml_projection/UmlExpansionRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExpansionRegion.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExpansionRegion : public UmlBaseExpansionRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExpansionRegion(void * id, const Q3CString & s) : UmlBaseExpansionRegion(id, s) {
+    UmlExpansionRegion(void * id, const QByteArray & s) : UmlBaseExpansionRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlExtraClassMember.h b/genplugouts/uml_projection/UmlExtraClassMember.h
index cf0b2bf47..261aa6257 100644
--- a/genplugouts/uml_projection/UmlExtraClassMember.h
+++ b/genplugouts/uml_projection/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlFlow.h b/genplugouts/uml_projection/UmlFlow.h
index 6e78a8c4b..9d6930629 100644
--- a/genplugouts/uml_projection/UmlFlow.h
+++ b/genplugouts/uml_projection/UmlFlow.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseFlow.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlFlow : public UmlBaseFlow, public UmlActivityItem
 {
 public:
-    UmlFlow(void * id, const Q3CString & n) : UmlBaseFlow(id, n) {
+    UmlFlow(void * id, const QByteArray & n) : UmlBaseFlow(id, n) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlInterruptibleActivityRegion.h b/genplugouts/uml_projection/UmlInterruptibleActivityRegion.h
index 0f78665c1..9fb668795 100644
--- a/genplugouts/uml_projection/UmlInterruptibleActivityRegion.h
+++ b/genplugouts/uml_projection/UmlInterruptibleActivityRegion.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseInterruptibleActivityRegion.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInterruptibleActivityRegion : public UmlBaseInterruptibleActivityRegion
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlInterruptibleActivityRegion(void * id, const Q3CString & s) : UmlBaseInterruptibleActivityRegion(id, s) {
+    UmlInterruptibleActivityRegion(void * id, const QByteArray & s) : UmlBaseInterruptibleActivityRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlItem.h b/genplugouts/uml_projection/UmlItem.h
index d2c5918bf..abbed5f24 100644
--- a/genplugouts/uml_projection/UmlItem.h
+++ b/genplugouts/uml_projection/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class is a mother class for all the other Uml* classes, this
 // allows to generalize their management, declare virtual operations etc ...
@@ -12,7 +12,7 @@
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
diff --git a/genplugouts/uml_projection/UmlNcRelation.h b/genplugouts/uml_projection/UmlNcRelation.h
index 60032619a..f424f7f0e 100644
--- a/genplugouts/uml_projection/UmlNcRelation.h
+++ b/genplugouts/uml_projection/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlNode.h b/genplugouts/uml_projection/UmlNode.h
index 95edbe709..0a77484c4 100644
--- a/genplugouts/uml_projection/UmlNode.h
+++ b/genplugouts/uml_projection/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlObjectDiagram.h b/genplugouts/uml_projection/UmlObjectDiagram.h
index ba429242a..296d8a51d 100644
--- a/genplugouts/uml_projection/UmlObjectDiagram.h
+++ b/genplugouts/uml_projection/UmlObjectDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseObjectDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'object diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -14,7 +14,7 @@ class UmlObjectDiagram : public UmlBaseObjectDiagram
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlObjectDiagram(void * id, const Q3CString & s) : UmlBaseObjectDiagram(id, s) {
+    UmlObjectDiagram(void * id, const QByteArray & s) : UmlBaseObjectDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlOnSignalAction.h b/genplugouts/uml_projection/UmlOnSignalAction.h
index 158c0ddc0..af11416da 100644
--- a/genplugouts/uml_projection/UmlOnSignalAction.h
+++ b/genplugouts/uml_projection/UmlOnSignalAction.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseOnSignalAction.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlOnSignalAction : public UmlBaseOnSignalAction
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlOnSignalAction(void * id, const Q3CString & s) : UmlBaseOnSignalAction(id, s) {
+    UmlOnSignalAction(void * id, const QByteArray & s) : UmlBaseOnSignalAction(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlOperation.cpp b/genplugouts/uml_projection/UmlOperation.cpp
index 62b4e5815..cd0e0376f 100644
--- a/genplugouts/uml_projection/UmlOperation.cpp
+++ b/genplugouts/uml_projection/UmlOperation.cpp
@@ -9,11 +9,11 @@
 #include "PhpSettings.h"
 #include "PythonSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 void UmlOperation::uml2cpp(bool)
 {
-    Q3CString st = CppSettings::classStereotype(parent()->stereotype());
+    QByteArray st = CppSettings::classStereotype(parent()->stereotype());
 
     if ((st == "enum") || (st == "typedef") || (st == "ignored")) {
         set_CppDecl("");
@@ -24,13 +24,13 @@ void UmlOperation::uml2cpp(bool)
     if (getOf() || setOf())
         return;
 
-    Q3CString decl = CppSettings::operationDef();
-    Q3CString def = CppSettings::operationDef();
-    const Q3ValueList<UmlParameter> p = params();
-    Q3CString sparams;
+    QByteArray decl = CppSettings::operationDef();
+    QByteArray def = CppSettings::operationDef();
+    const QList<UmlParameter> p = params();
+    QByteArray sparams;
 
     if (!p.isEmpty()) {
-        Q3ValueList<UmlParameter>::ConstIterator it;
+        QList<UmlParameter>::ConstIterator it;
         unsigned rank;
         const char * sep = "";
 
@@ -39,7 +39,7 @@ void UmlOperation::uml2cpp(bool)
     }
 
     UmlTypeSpec t = returnType();
-    Q3CString returntypeform;
+    QByteArray returntypeform;
 
     if ((name() != parent()->name()) &&
         (name() != "~" + parent()->name())) {
@@ -55,11 +55,11 @@ void UmlOperation::uml2cpp(bool)
             returntypeform = CppSettings::Return();
     }
 
-    Q3CString d;
+    QByteArray d;
 
     d = CppSettings::operationDecl();
-    d.insert(d.find("${)}"), (const char *)sparams); //[rageek] ambiguous
-    d.replace(d.find("${type}"), 7, returntypeform);
+    d.insert(d.indexOf("${)}"), (const char *)sparams); //[rageek] ambiguous
+    d.replace(d.indexOf("${type}"), 7, returntypeform);
     set_CppDecl(d);
 
     if (isAbstract())
@@ -68,21 +68,21 @@ void UmlOperation::uml2cpp(bool)
         int index1 = 0;
         int index2;
 
-        while ((index2 = sparams.find("${v", index1)) != -1) {
-            sparams.remove(index2, sparams.find('}', index2 + 3) - index2 + 1);
+        while ((index2 = sparams.indexOf("${v", index1)) != -1) {
+            sparams.remove(index2, sparams.indexOf('}', index2 + 3) - index2 + 1);
             index1 = index2;
         }
 
         d = CppSettings::operationDef();
-        d.insert(d.find("${)}"), (const char *)sparams); //[rageek] ambiguous
-        d.replace(d.find("${type}"), 7, returntypeform);
+        d.insert(d.indexOf("${)}"), (const char *)sparams); //[rageek] ambiguous
+        d.replace(d.indexOf("${type}"), 7, returntypeform);
         set_CppDef(d);
     }
 }
 
 void UmlOperation::uml2java(bool)
 {
-    Q3CString st = JavaSettings::classStereotype(parent()->stereotype());
+    QByteArray st = JavaSettings::classStereotype(parent()->stereotype());
 
     if ((st == "enum") || (st == "ignored")) {
         set_JavaDef("");
@@ -92,12 +92,12 @@ void UmlOperation::uml2java(bool)
     if (getOf() || setOf())
         return;
 
-    Q3CString def = JavaSettings::operationDef();
+    QByteArray def = JavaSettings::operationDef();
     unsigned nparams = params().count();
 
     if (nparams != 0) {
         const char * sep = "";
-        Q3CString sparams;
+        QByteArray sparams;
         unsigned rank;
 
         for (rank = 0; rank != nparams; rank += 1) {
@@ -108,11 +108,11 @@ void UmlOperation::uml2java(bool)
             sep = ", ";
         }
 
-        def.insert(def.find("${)}"), (const char *)sparams); //[rageek] ambiguous
+        def.insert(def.indexOf("${)}"), (const char *)sparams); //[rageek] ambiguous
     }
 
     if (name() == parent()->name())
-        def.remove(def.find("${type}"), 7);
+        def.remove(def.indexOf("${type}"), 7);
     else {
         UmlTypeSpec t = returnType();
 
@@ -129,7 +129,7 @@ void UmlOperation::uml2java(bool)
 
 void UmlOperation::uml2idl(bool)
 {
-    Q3CString st = IdlSettings::classStereotype(parent()->stereotype());
+    QByteArray st = IdlSettings::classStereotype(parent()->stereotype());
 
     if ((st == "enum") || (st == "typedef") || (st == "ignored")) {
         set_IdlDecl("");
@@ -139,12 +139,12 @@ void UmlOperation::uml2idl(bool)
     if (getOf() || setOf())
         return;
 
-    Q3CString def = IdlSettings::operationDecl();
+    QByteArray def = IdlSettings::operationDecl();
     unsigned nparams = params().count();
 
     if (nparams != 0) {
         const char * sep = "";
-        Q3CString sparams;
+        QByteArray sparams;
         unsigned rank;
 
         for (rank = 0; rank != nparams; rank += 1) {
@@ -155,7 +155,7 @@ void UmlOperation::uml2idl(bool)
             sep = ", ";
         }
 
-        def.insert(def.find("${)}"), (const char *)sparams); //[rageek] ambiguous
+        def.insert(def.indexOf("${)}"), (const char *)sparams); //[rageek] ambiguous
     }
 
     set_IdlDecl(def);
@@ -171,7 +171,7 @@ void UmlOperation::uml2idl(bool)
 
 void UmlOperation::uml2php(bool)
 {
-    Q3CString st = PhpSettings::classStereotype(parent()->stereotype());
+    QByteArray st = PhpSettings::classStereotype(parent()->stereotype());
 
     if ((st == "enum") || (st == "ignored")) {
         set_PhpDef("");
@@ -181,12 +181,12 @@ void UmlOperation::uml2php(bool)
     if (getOf() || setOf())
         return;
 
-    Q3CString def = PhpSettings::operationDef();
+    QByteArray def = PhpSettings::operationDef();
 
     if ((name() == parent()->name()) ||
         (name() == "__construct") ||
         (name() == "__destruct")) {
-        int index = def.find("${static}");
+        int index = def.indexOf("${static}");
 
         if (index != -1)
             def.remove(index, 9);
@@ -194,7 +194,7 @@ void UmlOperation::uml2php(bool)
 
     if (isAbstract() ||
         (PhpSettings::classStereotype(parent()->stereotype()) == "interface")) {
-        int index = def.find("${)}");
+        int index = def.indexOf("${)}");
 
         if (index != -1)
             def = def.left(index + 4) + ";";
@@ -204,7 +204,7 @@ void UmlOperation::uml2php(bool)
 
     if (nparams != 0) {
         const char * sep = "";
-        Q3CString sparams;
+        QByteArray sparams;
         unsigned rank;
 
         for (rank = 0; rank != nparams; rank += 1) {
@@ -215,7 +215,7 @@ void UmlOperation::uml2php(bool)
             sep = ", ";
         }
 
-        def.insert(def.find("${)}"), (const char *)sparams); //[rageek] ambiguous
+        def.insert(def.indexOf("${)}"), (const char *)sparams); //[rageek] ambiguous
     }
 
     set_PhpDef(def);
@@ -231,7 +231,7 @@ void UmlOperation::uml2php(bool)
 
 void UmlOperation::uml2python(bool)
 {
-    Q3CString st = PythonSettings::classStereotype(parent()->stereotype());
+    QByteArray st = PythonSettings::classStereotype(parent()->stereotype());
 
     if ((st == "enum") || (st == "ignored")) {
         set_PythonDef("");
@@ -241,12 +241,12 @@ void UmlOperation::uml2python(bool)
     if (getOf() || setOf())
         return;
 
-    Q3CString def = PythonSettings::operationDef();
+    QByteArray def = PythonSettings::operationDef();
     unsigned nparams = params().count();
 
     if (nparams != 0) {
         const char * sep = "";
-        Q3CString sparams;
+        QByteArray sparams;
         unsigned rank;
 
         for (rank = 0; rank != nparams; rank += 1) {
@@ -257,7 +257,7 @@ void UmlOperation::uml2python(bool)
             sep = ", ";
         }
 
-        def.insert(def.find("${)}"), (const char *)sparams); //[rageek] ambiguous
+        def.insert(def.indexOf("${)}"), (const char *)sparams); //[rageek] ambiguous
     }
 
     set_PythonDef(def);
diff --git a/genplugouts/uml_projection/UmlOperation.h b/genplugouts/uml_projection/UmlOperation.h
index 9830b2dc6..4d58e9b2c 100644
--- a/genplugouts/uml_projection/UmlOperation.h
+++ b/genplugouts/uml_projection/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
     virtual void uml2cpp(bool rec);
 
diff --git a/genplugouts/uml_projection/UmlPackage.cpp b/genplugouts/uml_projection/UmlPackage.cpp
index 7b49701a3..ba8690733 100644
--- a/genplugouts/uml_projection/UmlPackage.cpp
+++ b/genplugouts/uml_projection/UmlPackage.cpp
@@ -4,7 +4,7 @@
 void UmlPackage::uml2cpp(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -15,7 +15,7 @@ void UmlPackage::uml2cpp(bool rec)
 void UmlPackage::uml2java(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -26,7 +26,7 @@ void UmlPackage::uml2java(bool rec)
 void UmlPackage::uml2idl(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -37,7 +37,7 @@ void UmlPackage::uml2idl(bool rec)
 void UmlPackage::uml2php(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -48,7 +48,7 @@ void UmlPackage::uml2php(bool rec)
 void UmlPackage::uml2python(bool rec)
 {
     if (rec) {
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
 
         for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/uml_projection/UmlPackage.h b/genplugouts/uml_projection/UmlPackage.h
index 14e90cf14..14c663465 100644
--- a/genplugouts/uml_projection/UmlPackage.h
+++ b/genplugouts/uml_projection/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages a 'package', notes that the project itself is a package
 //
@@ -11,7 +11,7 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
     virtual void uml2cpp(bool rec);
 
diff --git a/genplugouts/uml_projection/UmlParameter.cpp b/genplugouts/uml_projection/UmlParameter.cpp
index 037fa8af0..fe7ee274e 100644
--- a/genplugouts/uml_projection/UmlParameter.cpp
+++ b/genplugouts/uml_projection/UmlParameter.cpp
@@ -4,10 +4,11 @@
 #include "UmlClass.h"
 #include "CppSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlParameter::cpp(unsigned rank) const
+#include <QByteArray>
+#include <QString>
+QByteArray UmlParameter::cpp(unsigned rank) const
 {
-    Q3CString s;
+    QByteArray s;
     int index;
 
     if ((type.type != 0) &&
@@ -56,16 +57,16 @@ Q3CString UmlParameter::cpp(unsigned rank) const
         }
     }
 
-    if ((index = s.find("${type}")) != -1) {
-        Q3CString t;
+    if ((index = s.indexOf("${type}")) != -1) {
+        QByteArray t;
 
-        t.sprintf("${t%u}", rank);
+        t = QString("${t%1}").arg(rank).toLatin1();
         s.replace(index, 7, t);
     }
 
-    Q3CString p;
+    QByteArray p;
 
-    p.sprintf(" ${p%u}${v%u}", rank, rank);
+    p = QString(" ${p%u}${v%u}").arg(rank).arg( rank).toLatin1();
     return s + p;
 }
 
diff --git a/genplugouts/uml_projection/UmlParameter.h b/genplugouts/uml_projection/UmlParameter.h
index cfa824559..9a3f14925 100644
--- a/genplugouts/uml_projection/UmlParameter.h
+++ b/genplugouts/uml_projection/UmlParameter.h
@@ -3,12 +3,12 @@
 
 
 #include "UmlBaseParameter.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Represent an operation's parameter
 
 struct UmlParameter : public UmlBaseParameter {
-    Q3CString cpp(unsigned rank) const;
+    QByteArray cpp(unsigned rank) const;
 
 };
 
diff --git a/genplugouts/uml_projection/UmlParameterSet.h b/genplugouts/uml_projection/UmlParameterSet.h
index 5f1a47c7e..b94e490ec 100644
--- a/genplugouts/uml_projection/UmlParameterSet.h
+++ b/genplugouts/uml_projection/UmlParameterSet.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseParameterSet.h"
 #include "UmlActivityItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlParameterSet : public UmlBaseParameterSet, public UmlActivityItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlParameterSet(void * id, const Q3CString & s) : UmlBaseParameterSet(id, s) {
+    UmlParameterSet(void * id, const QByteArray & s) : UmlBaseParameterSet(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlPinParameter.h b/genplugouts/uml_projection/UmlPinParameter.h
index d48cb7343..7e207745d 100644
--- a/genplugouts/uml_projection/UmlPinParameter.h
+++ b/genplugouts/uml_projection/UmlPinParameter.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBasePinParameter.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPinParameter : public UmlBasePinParameter
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPinParameter(void * id, const Q3CString & s) : UmlBasePinParameter(id, s) {
+    UmlPinParameter(void * id, const QByteArray & s) : UmlBasePinParameter(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlPseudoState.h b/genplugouts/uml_projection/UmlPseudoState.h
index 075761ec7..0b07e1811 100644
--- a/genplugouts/uml_projection/UmlPseudoState.h
+++ b/genplugouts/uml_projection/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlRegion.h b/genplugouts/uml_projection/UmlRegion.h
index d3f32cb7b..07eeb82db 100644
--- a/genplugouts/uml_projection/UmlRegion.h
+++ b/genplugouts/uml_projection/UmlRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlRelation.cpp b/genplugouts/uml_projection/UmlRelation.cpp
index 6fc967c3a..cc2e80014 100644
--- a/genplugouts/uml_projection/UmlRelation.cpp
+++ b/genplugouts/uml_projection/UmlRelation.cpp
@@ -8,7 +8,7 @@
 #include "PhpSettings.h"
 #include "PythonSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlRelation::uml2cpp(bool)
 {
     bool composition = FALSE;
@@ -35,10 +35,10 @@ void UmlRelation::uml2cpp(bool)
 
         // no break
     default: {
-        Q3CString st = CppSettings::classStereotype(parent()->stereotype());
+        QByteArray st = CppSettings::classStereotype(parent()->stereotype());
 
         set_CppDecl(((st == "enum") || (st == "typedef") || (st == "ignored"))
-                    ? Q3CString("")
+                    ? QByteArray("")
                     : CppSettings::relationDecl(composition, multiplicity()));
     }
     }
@@ -56,10 +56,10 @@ void UmlRelation::uml2java(bool)
         break;
 
     default: {
-        Q3CString st = JavaSettings::classStereotype(parent()->stereotype());
+        QByteArray st = JavaSettings::classStereotype(parent()->stereotype());
 
         set_JavaDecl(((st == "enum") || (st == "ignored"))
-                     ? Q3CString("")
+                     ? QByteArray("")
                      : JavaSettings::relationDecl(multiplicity()));
     }
     }
@@ -75,7 +75,7 @@ void UmlRelation::uml2idl(bool)
         break;
 
     default: {
-        Q3CString st = IdlSettings::classStereotype(parent()->stereotype());
+        QByteArray st = IdlSettings::classStereotype(parent()->stereotype());
 
         if ((st == "enum") || (st == "typedef") || (st == "ignored"))
             set_IdlDecl("");
@@ -99,7 +99,7 @@ void UmlRelation::uml2php(bool)
         break;
 
     default: {
-        Q3CString st = PhpSettings::classStereotype(parent()->stereotype());
+        QByteArray st = PhpSettings::classStereotype(parent()->stereotype());
 
         if ((st == "enum") || (st == "ignored"))
             set_PhpDecl("");
@@ -126,7 +126,7 @@ void UmlRelation::uml2Python(bool)
 
         // no break
     default: {
-        Q3CString st = PythonSettings::classStereotype(parent()->stereotype());
+        QByteArray st = PythonSettings::classStereotype(parent()->stereotype());
 
         if ((st == "enum") || (st == "ignored"))
             set_PythonDecl("");
diff --git a/genplugouts/uml_projection/UmlRelation.h b/genplugouts/uml_projection/UmlRelation.h
index e35d9c7ae..8c89f9b67 100644
--- a/genplugouts/uml_projection/UmlRelation.h
+++ b/genplugouts/uml_projection/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'relations' between classes, notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
     virtual void uml2cpp(bool rec);
 
diff --git a/genplugouts/uml_projection/UmlSequenceDiagram.h b/genplugouts/uml_projection/UmlSequenceDiagram.h
index d3b3d83fc..a1bbcc966 100644
--- a/genplugouts/uml_projection/UmlSequenceDiagram.h
+++ b/genplugouts/uml_projection/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlSettings.cpp b/genplugouts/uml_projection/UmlSettings.cpp
index a883d1744..b5397c9cb 100644
--- a/genplugouts/uml_projection/UmlSettings.cpp
+++ b/genplugouts/uml_projection/UmlSettings.cpp
@@ -6,15 +6,15 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -26,14 +26,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -45,14 +45,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -64,14 +64,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -83,14 +83,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -146,39 +146,39 @@ aLanguage UmlSettings::_uml_get_name;
 
 aLanguage UmlSettings::_uml_set_name;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -190,7 +190,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -203,7 +203,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -229,18 +229,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -251,7 +251,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_attribute_stereotypes.count();
 
@@ -262,7 +262,7 @@ Q3CString UmlSettings::uml_rel_attr_stereotype(const Q3CString & t, Q3CString Um
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -273,19 +273,19 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         builtins[index] = _builtins[index];
-        _map_builtins.replace(builtins[index].uml, &builtins[index]);
+        _map_builtins.insert(builtins[index].uml, &builtins[index]);
     }
 
     builtins[index].uml = s;
@@ -310,19 +310,19 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
     return &_builtins[index];
 }
 
-UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_attr_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_attribute_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         relation_attribute_stereotypes[index] = _relation_attribute_stereotypes[index];
-        _map_relation_attribute_stereotypes.replace(relation_attribute_stereotypes[index].uml,
+        _map_relation_attribute_stereotypes.insert(relation_attribute_stereotypes[index].uml,
                 &relation_attribute_stereotypes[index]);
     }
 
@@ -345,19 +345,19 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s)
     return &_relation_attribute_stereotypes[index];
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         class_stereotypes[index] = _class_stereotypes[index];
-        _map_class_stereotypes.replace(class_stereotypes[index].uml, &class_stereotypes[index]);
+        _map_class_stereotypes.insert(class_stereotypes[index].uml, &class_stereotypes[index]);
     }
 
     class_stereotypes[index].uml = s;
diff --git a/genplugouts/uml_projection/UmlSettings.h b/genplugouts/uml_projection/UmlSettings.h
index c37c13a10..0ae054582 100644
--- a/genplugouts/uml_projection/UmlSettings.h
+++ b/genplugouts/uml_projection/UmlSettings.h
@@ -1,10 +1,10 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
+#include <QHash>
 
-
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aLanguage.h"
-#include <q3dict.h>
+
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -20,44 +20,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
     // return the language from which the getter's name rule must be followed at Uml level
     static aLanguage umlGetName();
@@ -90,25 +90,25 @@ class UmlSettings
 
 
 protected:
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_attribute_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -122,31 +122,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_attr_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_attr_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_attr_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_attr_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/uml_projection/UmlState.h b/genplugouts/uml_projection/UmlState.h
index b8a04be4a..bc64d6a3c 100644
--- a/genplugouts/uml_projection/UmlState.h
+++ b/genplugouts/uml_projection/UmlState.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlStateDiagram.h b/genplugouts/uml_projection/UmlStateDiagram.h
index f49b5fb44..9c04bb0ad 100644
--- a/genplugouts/uml_projection/UmlStateDiagram.h
+++ b/genplugouts/uml_projection/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlStereotype.h b/genplugouts/uml_projection/UmlStereotype.h
index 8c5bf56c0..739de66df 100644
--- a/genplugouts/uml_projection/UmlStereotype.h
+++ b/genplugouts/uml_projection/UmlStereotype.h
@@ -2,31 +2,31 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHPHP
-    Q3CString php;
+    QByteArray php;
 #endif
 
 #ifdef WITHPHP
-    Q3CString python;
+    QByteArray python;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/uml_projection/UmlTransition.h b/genplugouts/uml_projection/UmlTransition.h
index 3edd626c7..da689b55d 100644
--- a/genplugouts/uml_projection/UmlTransition.h
+++ b/genplugouts/uml_projection/UmlTransition.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlTransition : public UmlBaseTransition, public UmlStateItem
 {
 public:
-    UmlTransition(void * id, const Q3CString & n) : UmlBaseTransition(id, n) {
+    UmlTransition(void * id, const QByteArray & n) : UmlBaseTransition(id, n) {
     }
 
 };
diff --git a/genplugouts/uml_projection/UmlUseCase.h b/genplugouts/uml_projection/UmlUseCase.h
index 392773262..9947e8b05 100644
--- a/genplugouts/uml_projection/UmlUseCase.h
+++ b/genplugouts/uml_projection/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case'
 //
@@ -11,7 +11,7 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlUseCaseDiagram.h b/genplugouts/uml_projection/UmlUseCaseDiagram.h
index 132b56d36..41f841a09 100644
--- a/genplugouts/uml_projection/UmlUseCaseDiagram.h
+++ b/genplugouts/uml_projection/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlUseCaseView.h b/genplugouts/uml_projection/UmlUseCaseView.h
index a715b2f5f..cd5416397 100644
--- a/genplugouts/uml_projection/UmlUseCaseView.h
+++ b/genplugouts/uml_projection/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case view'
 //
@@ -11,7 +11,7 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/uml_projection/UmlView.h b/genplugouts/uml_projection/UmlView.h
index 418e689ab..7caf8c290 100644
--- a/genplugouts/uml_projection/UmlView.h
+++ b/genplugouts/uml_projection/UmlView.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlView : public UmlBaseView
 {
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlView(void * id, const Q3CString & s) : UmlBaseView(id, s) {
+    UmlView(void * id, const QByteArray & s) : UmlBaseView(id, s) {
     }
 
 };
diff --git a/genplugouts/uml_projection/hhbox.cpp b/genplugouts/uml_projection/hhbox.cpp
new file mode 100644
index 000000000..95a09b5ea
--- /dev/null
+++ b/genplugouts/uml_projection/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/uml_projection/hhbox.h b/genplugouts/uml_projection/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/genplugouts/uml_projection/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/genplugouts/uml_projection/uml_projection.pro b/genplugouts/uml_projection/uml_projection.pro
index 9973d8ee2..57674b52d 100644
--- a/genplugouts/uml_projection/uml_projection.pro
+++ b/genplugouts/uml_projection/uml_projection.pro
@@ -1,7 +1,9 @@
 TEMPLATE	= app
 TARGET		= uml_proj
-CONFIG		+= debug warn_on qt
-DEFINES		= WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON BooL=bool
+CONFIG -= app_bundle
+CONFIG		+= warn_on qt c++11
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES		+= WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON BooL=bool FALSE=false  TRUE=true
 HEADERS		= ./UmlBaseExpansionNode.h \
 		  ./UmlChoicePseudoState.h \
 		  ./UmlActivityNode.h \
@@ -198,7 +200,8 @@ HEADERS		= ./UmlBaseExpansionNode.h \
 		  ./MiscGlobalCmd.h \
 		  ./UmlBaseJunctionPseudoState.h \
 		  ./UmlBaseClassDiagram.h \
-		  ./StateBehavior.h
+		  ./StateBehavior.h \
+    hhbox.h
 SOURCES		= ./UmlBaseExpansionNode.cpp \
 		  ./UmlChoicePseudoState.cpp \
 		  ./UmlActivityNode.cpp \
@@ -396,26 +399,26 @@ SOURCES		= ./UmlBaseExpansionNode.cpp \
 		  ./MiscGlobalCmd.cpp \
 		  ./UmlBaseJunctionPseudoState.cpp \
 		  ./UmlBaseClassDiagram.cpp \
-		  ./StateBehavior.cpp
+		  ./StateBehavior.cpp \
+    hhbox.cpp
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network  widgets
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
+QT += testlib
 
+    UI_DIR = src/ui
+    DESTDIR = ../../bin
 
-    MOC_DIR = bin/douml/uml_proj/MOC_release
-    OBJECTS_DIR = bin/douml/uml_proj/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-Debug{
-    MOC_DIR = bin/douml/uml_proj/MOC_Debug
-    OBJECTS_DIR = bin/douml/uml_proj/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
diff --git a/genplugouts/usecasewizard/CppSettings.cpp b/genplugouts/usecasewizard/CppSettings.cpp
index 0d3a68867..8db9037c8 100644
--- a/genplugouts/usecasewizard/CppSettings.cpp
+++ b/genplugouts/usecasewizard/CppSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationStereotype(Q3CString s)
+QByteArray CppSettings::relationStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, v);
 
@@ -171,14 +171,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, v);
 
@@ -190,14 +190,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, v);
 
@@ -209,14 +209,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, v);
 
@@ -228,14 +228,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, v);
 
@@ -266,14 +266,14 @@ bool CppSettings::set_IncludeWithPath(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, v);
 
@@ -285,14 +285,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, v);
 
@@ -304,14 +304,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, v);
 
@@ -323,14 +323,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, v);
 
@@ -342,14 +342,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, v);
 
@@ -361,14 +361,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, v);
 
@@ -380,14 +380,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, v);
 
@@ -399,14 +399,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, v);
 
@@ -418,14 +418,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, v);
 
@@ -437,14 +437,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, v);
 
@@ -456,14 +456,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, v);
 
@@ -475,14 +475,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, v);
 
@@ -494,14 +494,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl()
+const QByteArray & CppSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool CppSettings::set_AttributeDecl(Q3CString v)
+bool CppSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, v);
 
@@ -513,14 +513,14 @@ bool CppSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, v);
 
@@ -532,7 +532,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -551,14 +551,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, v);
 
@@ -570,14 +570,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, v);
 
@@ -627,14 +627,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, v);
 
@@ -722,14 +722,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, v);
 
@@ -781,47 +781,47 @@ bool CppSettings::set_IsSetParamConst(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl;
+QByteArray CppSettings::_attr_decl;
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -831,23 +831,23 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
 bool CppSettings::_is_set_param_const;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
@@ -879,13 +879,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/usecasewizard/CppSettings.h b/genplugouts/usecasewizard/CppSettings.h
index ae9533232..fe0981dbc 100644
--- a/genplugouts/usecasewizard/CppSettings.h
+++ b/genplugouts/usecasewizard/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(Q3CString s);
+    static QByteArray relationStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -138,62 +138,62 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -201,75 +201,75 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -278,20 +278,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -315,13 +315,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -367,14 +367,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -405,47 +405,47 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -455,23 +455,23 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
     static bool _is_set_param_const;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/usecasewizard/IdlSettings.cpp b/genplugouts/usecasewizard/IdlSettings.cpp
index 65f2ae619..d5b25b151 100644
--- a/genplugouts/usecasewizard/IdlSettings.cpp
+++ b/genplugouts/usecasewizard/IdlSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, v);
 
@@ -171,14 +171,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, v);
 
@@ -190,14 +190,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, v);
 
@@ -209,14 +209,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, v);
 
@@ -228,14 +228,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, v);
 
@@ -247,14 +247,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, v);
 
@@ -266,14 +266,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, v);
 
@@ -285,14 +285,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, v);
 
@@ -304,14 +304,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, v);
 
@@ -323,14 +323,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, v);
 
@@ -342,14 +342,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, v);
 
@@ -361,14 +361,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl()
+const QByteArray & IdlSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool IdlSettings::set_AttributeDecl(Q3CString v)
+bool IdlSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, v);
 
@@ -380,14 +380,14 @@ bool IdlSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl()
+const QByteArray & IdlSettings::valuetypeAttributeDecl()
 {
     read_if_needed_();
 
     return _valuetype_attr_decl;
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, v);
 
@@ -399,14 +399,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl()
+const QByteArray & IdlSettings::unionItemDecl()
 {
     read_if_needed_();
 
     return _union_item_decl;
 }
 
-bool IdlSettings::set_UnionItemDecl(Q3CString v)
+bool IdlSettings::set_UnionItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, v);
 
@@ -418,14 +418,14 @@ bool IdlSettings::set_UnionItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, v);
 
@@ -437,14 +437,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl()
+const QByteArray & IdlSettings::constDecl()
 {
     read_if_needed_();
 
     return _const_decl;
 }
 
-bool IdlSettings::set_ConstDecl(Q3CString v)
+bool IdlSettings::set_ConstDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, v);
 
@@ -456,14 +456,14 @@ bool IdlSettings::set_ConstDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
 
@@ -475,14 +475,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
 
@@ -494,14 +494,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
 
@@ -513,14 +513,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, v);
 
@@ -532,14 +532,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, v);
 
@@ -551,14 +551,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, v);
 
@@ -591,53 +591,53 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl;
+QByteArray IdlSettings::_attr_decl;
 
-Q3CString IdlSettings::_valuetype_attr_decl;
+QByteArray IdlSettings::_valuetype_attr_decl;
 
-Q3CString IdlSettings::_union_item_decl;
+QByteArray IdlSettings::_union_item_decl;
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl;
+QByteArray IdlSettings::_const_decl;
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
@@ -666,13 +666,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/usecasewizard/IdlSettings.h b/genplugouts/usecasewizard/IdlSettings.h
index aa23439f0..8ccc92056 100644
--- a/genplugouts/usecasewizard/IdlSettings.h
+++ b/genplugouts/usecasewizard/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype
-    static const Q3CString & valuetypeAttributeDecl();
+    static const QByteArray & valuetypeAttributeDecl();
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(Q3CString v);
+    static bool set_ValuetypeAttributeDecl(QByteArray v);
 
     // returns the default definition of an union item
-    static const Q3CString & unionItemDecl();
+    static const QByteArray & unionItemDecl();
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(Q3CString v);
+    static bool set_UnionItemDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute
-    static const Q3CString & constDecl();
+    static const QByteArray & constDecl();
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(Q3CString v);
+    static bool set_ConstDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _valuetype_attr_decl;
+    static QByteArray _valuetype_attr_decl;
 
-    static Q3CString _union_item_decl;
+    static QByteArray _union_item_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl;
+    static QByteArray _const_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/usecasewizard/IdlSettingsCmd.h b/genplugouts/usecasewizard/IdlSettingsCmd.h
index 5eb74f465..07cbf12b6 100644
--- a/genplugouts/usecasewizard/IdlSettingsCmd.h
+++ b/genplugouts/usecasewizard/IdlSettingsCmd.h
@@ -8,7 +8,7 @@ enum IdlSettingsCmd {
     getIdlUseDefaultsCmd,
     setIdlUseDefaultsCmd,
     setIdlTypeCmd,
-    setIdlRelationStereotypeCmd,
+    setIdlRelationAttributeStereotypeCmd,
     setIdlClassStereotypeCmd,
     setIdlIncludeCmd,
     setIdlRootDirCmd,
diff --git a/genplugouts/usecasewizard/JavaSettings.cpp b/genplugouts/usecasewizard/JavaSettings.cpp
index 104029d1e..715db5516 100644
--- a/genplugouts/usecasewizard/JavaSettings.cpp
+++ b/genplugouts/usecasewizard/JavaSettings.cpp
@@ -9,7 +9,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -22,21 +22,21 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -49,28 +49,28 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationStereotypeCmd, s, v);
+    UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -83,28 +83,28 @@ bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -117,31 +117,31 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -152,14 +152,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, v);
 
@@ -171,14 +171,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, v);
 
@@ -190,14 +190,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, v);
 
@@ -209,14 +209,14 @@ bool JavaSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, v);
 
@@ -228,14 +228,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, v);
 
@@ -247,14 +247,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumDecl()
+const QByteArray & JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, v);
 
@@ -266,14 +266,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, v);
 
@@ -285,14 +285,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl()
+const QByteArray & JavaSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool JavaSettings::set_AttributeDecl(Q3CString v)
+bool JavaSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, v);
 
@@ -304,14 +304,14 @@ bool JavaSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemDecl()
+const QByteArray & JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, v);
 
@@ -323,16 +323,16 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumItemCase()
+const QByteArray & JavaSettings::enumItemCase()
 {
     read_if_needed_();
 
     return _enum_item_case;
 }
 
-bool JavaSettings::set_EnumItemCase(Q3CString v)
+bool JavaSettings::set_EnumItemCase(QByteArray v)
 {
-    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemCaseCmd, v);
+    UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, v);
 
     if (UmlCom::read_bool()) {
         _enum_item_case = v;
@@ -342,14 +342,14 @@ bool JavaSettings::set_EnumItemCase(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
 
@@ -361,14 +361,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, v);
 
@@ -399,14 +399,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, v);
 
@@ -418,14 +418,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, v);
 
@@ -515,45 +515,45 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl;
+QByteArray JavaSettings::_attr_decl;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_enum_item_case;
+QByteArray JavaSettings::_enum_item_case;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray,QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
@@ -581,13 +581,13 @@ void JavaSettings::read_()
     n = UmlCom::read_unsigned();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/usecasewizard/JavaSettings.h b/genplugouts/usecasewizard/JavaSettings.h
index 166820623..220a7de82 100644
--- a/genplugouts/usecasewizard/JavaSettings.h
+++ b/genplugouts/usecasewizard/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,160 +31,160 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationUmlStereotype(const Q3CString & s);
+    static QByteArray relationUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumItemCase();
+    static const QByteArray & enumItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumItemCase(Q3CString v);
+    static bool set_EnumItemCase(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -198,23 +198,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -263,45 +263,45 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _enum_item_case;
+    static QByteArray _enum_item_case;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/usecasewizard/JavaSettingsCmd.h b/genplugouts/usecasewizard/JavaSettingsCmd.h
index 7d66bf1f0..2ec6baf59 100644
--- a/genplugouts/usecasewizard/JavaSettingsCmd.h
+++ b/genplugouts/usecasewizard/JavaSettingsCmd.h
@@ -8,7 +8,7 @@ enum JavaSettingsCmd {
     getJavaUseDefaultsCmd,
     setJavaUseDefaultsCmd,
     setJavaTypeCmd,
-    setJavaRelationStereotypeCmd,
+    setJavaRelationAttributeStereotypeCmd,
     setJavaClassStereotypeCmd,
     setJavaImportCmd,
     setJavaRootdirCmd,
@@ -20,7 +20,7 @@ enum JavaSettingsCmd {
     setJavaInterfaceDeclCmd,
     setJavaAttributeDeclCmd,
     setJavaEnumItemDeclCmd,
-    setJavaEnumItemCaseCmd,
+    setJavaEnumItemDeclCmd,
     setJavaRelationDeclCmd,
     setJavaOperationDefCmd,
     setJavaGetvisibilityCmd,
diff --git a/genplugouts/usecasewizard/PackageGlobalCmd.h b/genplugouts/usecasewizard/PackageGlobalCmd.h
index 76a30534b..0eed58b55 100644
--- a/genplugouts/usecasewizard/PackageGlobalCmd.h
+++ b/genplugouts/usecasewizard/PackageGlobalCmd.h
@@ -4,9 +4,9 @@
 
 // Internal enum
 enum PackageGlobalCmd {
-    findNamespaceCmd,
-    findPackageCmd,
-    findModuleCmd,
+    findCppNamespaceCmd,
+    findJavaPackageCmd,
+    findIdlModuleCmd,
     getProjectCmd,
     isProjectModifiedCmd,
     saveProjectCmd
diff --git a/genplugouts/usecasewizard/StateBehavior.h b/genplugouts/usecasewizard/StateBehavior.h
index 91a42cb82..66ac09c00 100644
--- a/genplugouts/usecasewizard/StateBehavior.h
+++ b/genplugouts/usecasewizard/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/usecasewizard/TabDialog.cpp b/genplugouts/usecasewizard/TabDialog.cpp
index c27ab1805..6d6eb32b7 100644
--- a/genplugouts/usecasewizard/TabDialog.cpp
+++ b/genplugouts/usecasewizard/TabDialog.cpp
@@ -5,24 +5,22 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <q3vbox.h>
+#include "vvbox.h"
 #include <qlabel.h>
-#include <Q3TextEdit.h>
-#include <q3groupbox.h>
+#include <QTextEdit>
+#include <gridbox.h>
 #include <qtextcodec.h>
 #include <qdir.h>
-//Added by qt3to4:
-#include <Q3CString>
-
+#include <QSettings>
+#include <QByteArray>
 #include "UmlCom.h"
-
 #include "TabDialog.h"
 #include "UmlUseCase.h"
 
 const struct {
     const char * lbl;
     const char * key;
-    Q3TextEdit * (TabDialog::* a);
+    QTextEdit * (TabDialog::* a);
 } Tabs[] = {
     {
         "The summary of the use case '",
@@ -50,93 +48,62 @@ const struct {
     }
 };
 
-TabDialog::TabDialog(UmlUseCase * u) : Q3TabDialog(0, ""), uc(u)
+TabDialog::TabDialog(UmlUseCase * u) : TabDialogWrapper(0, ""), uc(u)
 {
-    setCaption(Q3CString("Properties of the use case '") + u->name() + "'");
+    setCaption(QByteArray("Properties of the use case '") + u->name() + "'");
 
     setCancelButton();
 
-    QString cs;
-
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-#ifdef WIN32
-
-    if (fp == 0) {
-        QString hd = getenv("USERPROFILE");
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
 
-        if (! hd.isEmpty()) {
-            QDir d(hd);
-            QString s2 = d.absFilePath(".doumlrc");
-
-            fp = fopen((const char *) s2, "r");
-        }
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        desktopCenter.setX((r + l) / 2);
+        desktopCenter.setY((t + b) / 2);
+      }
     }
 
-#endif
-
-    if (fp == 0)
-        cs = getenv("BOUML_CHARSET");
-    else {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            if (!strncmp(line, "CHARSET ", 8)) {
-                int len = strlen(line);
-
-                if (len != 0) {
-                    if (line[len - 1] == '\n')
-                        line[--len] = 0;
-
-                    if ((len != 0) && (line[len - 1] == '\r'))
-                        line[len - 1] = 0;
-                }
-
-                cs = line + 8;
-            }
-            else if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        desktopCenter.setX((r + l) / 2);
-                        desktopCenter.setY((t + b) / 2);
-                    }
-                }
-            }
-        }
-
-        fclose(fp);
-    }
+    QString cs = settings.value("Main/encoding", "UTF-8").toString();
 
     Codec = 0;
 
-    if (!cs.isEmpty() && ((Codec = QTextCodec::codecForName(cs)) == 0)) {
-        Q3VBox * vbox = new Q3VBox(this);
+    QLabel* lbl;
+    GridBox* grid;
+    if (!cs.isEmpty() && ((Codec = QTextCodec::codecForName(cs.toLatin1())) == 0)) {
+        VVBox * vbox = new VVBox(this);
 
         vbox->setMargin(5);
-        (new QLabel("ERROR : No codec for '" + cs + "'", vbox))
+        (lbl = new QLabel("ERROR : No codec for '" + cs + "'", vbox))
         ->setAlignment(Qt::AlignCenter);
+        vbox->addWidget(lbl);
 
         addTab(vbox, "Use case wizard");
         setOkButton(QString::null);
     }
     else {
+        setOkButton();
         for (unsigned i = 0; i != sizeof(Tabs) / sizeof(*Tabs); i += 1) {
-            Q3VBox * vbox = new Q3VBox(this);
+            VVBox * vbox = new VVBox(this);
 
             vbox->setMargin(5);
-            (new QLabel(Q3CString(Tabs[i].lbl) + u->name() + "'",
-                        new Q3GroupBox(1, Qt::Horizontal, vbox)))
+            (lbl = new QLabel(QByteArray(Tabs[i].lbl) + u->name() + "'",
+                        grid = new GridBox(1, vbox)))
             ->setAlignment(Qt::AlignCenter);
-            this->*(Tabs[i]).a = new Q3TextEdit(vbox);
+            vbox->addWidget(grid);
+            grid->addWidget(lbl);
+            vbox->addWidget(this->*(Tabs[i]).a = new QTextEdit(vbox));
 
-            Q3CString v;
+            QByteArray v;
 
             if (u->propertyValue(Tabs[i].key, v))
                 (this->*(Tabs[i]).a)->setText(toUnicode(v));
@@ -148,7 +115,7 @@ TabDialog::TabDialog(UmlUseCase * u) : Q3TabDialog(0, ""), uc(u)
 
 void TabDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialogWrapper::ensurePolished();
 
     if (! desktopCenter.isNull())
         move(x() + desktopCenter.x() - (x() + width() / 2),
@@ -158,16 +125,16 @@ void TabDialog::polish()
 void TabDialog::accept()
 {
     for (unsigned i = 0; i != sizeof(Tabs) / sizeof(*Tabs); i += 1)
-        uc->set_PropertyValue(Tabs[i].key, fromUnicode((this->*(Tabs[i]).a)->text()));
+        uc->set_PropertyValue(Tabs[i].key, fromUnicode((this->*(Tabs[i]).a)->toPlainText()));
 
     UmlCom::bye();
-    Q3TabDialog::accept();
+    TabDialogWrapper::accept();
 }
 
 void TabDialog::reject()
 {
     UmlCom::bye();
-    Q3TabDialog::reject();
+    TabDialogWrapper::reject();
 }
 
 QString TabDialog::toUnicode(const char * str)
@@ -187,7 +154,7 @@ void TabDialog::latinize(QString & s)
     while (i != 0) {
         QChar c = s.at(--i);
 
-        if (c.latin1() == 0) {
+        if (c.toLatin1() == 0) {
             if (c.unicode() == 8217)
                 // special case for the pseudo ' returned by microsoft editors
                 c = '\'';
@@ -199,13 +166,13 @@ void TabDialog::latinize(QString & s)
     }
 }
 
-Q3CString TabDialog::fromUnicode(const QString & s)
+QByteArray TabDialog::fromUnicode(const QString & s)
 {
     if (Codec == 0) {
         QString str = s;
 
         latinize(str);
-        return Q3CString((const char *)str);
+        return QByteArray(str.toLatin1());
     }
     else if (s.isEmpty())
         return "";
diff --git a/genplugouts/usecasewizard/TabDialog.h b/genplugouts/usecasewizard/TabDialog.h
index 2c0e208ce..fd07c3319 100644
--- a/genplugouts/usecasewizard/TabDialog.h
+++ b/genplugouts/usecasewizard/TabDialog.h
@@ -2,43 +2,34 @@
 #define _TABDIALOG_H
 
 
-#include <q3tabdialog.h>
+#include "tabdialogwrapper.h"
 #include <qstring.h>
-#include <q3cstring.h>
 
-class Q3TextEdit;
+
+class QTextEdit;
 class UmlUseCase;
 
 //Only for C++
 //don't colapse the C++ & Java definition in only one class because this is too artificial
-//note : the stereotype doesn't have special meaning for Bouml, I use it just to inform
-class TabDialog : public Q3TabDialog
+//note : the stereotype doesn't have special meaning for DoUML, I use it just to inform
+class TabDialog : public TabDialogWrapper
 {
     Q_OBJECT
 
 public:
     TabDialog(UmlUseCase * u);
 
-
 protected:
     UmlUseCase * uc;
-
     QTextCodec * Codec;
 
-
 public:
-    Q3TextEdit * summary;
-
-    Q3TextEdit * context;
-
-    Q3TextEdit * precond;
-
-    Q3TextEdit * description;
-
-    Q3TextEdit * postcond;
-
-    Q3TextEdit * exceptions;
-
+    QTextEdit * summary;
+    QTextEdit * context;
+    QTextEdit * precond;
+    QTextEdit * description;
+    QTextEdit * postcond;
+    QTextEdit * exceptions;
 
 protected:
     QPoint desktopCenter;
@@ -46,20 +37,14 @@ class TabDialog : public Q3TabDialog
 protected slots:
     virtual void polish();
 
-
 public:
-    void accept();
-
-    void reject();
-
+    virtual void accept() override;
+    virtual void reject() override;
 
 private:
     QString toUnicode(const char * str);
-
     void latinize(QString & s);
-
-    Q3CString fromUnicode(const QString & s);
-
+    QByteArray fromUnicode(const QString & s);
 };
 
 #endif
diff --git a/genplugouts/usecasewizard/TransitionBehavior.h b/genplugouts/usecasewizard/TransitionBehavior.h
index 856ede3c0..8714c541d 100644
--- a/genplugouts/usecasewizard/TransitionBehavior.h
+++ b/genplugouts/usecasewizard/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/usecasewizard/UmlArtifact.h b/genplugouts/usecasewizard/UmlArtifact.h
index 9f6a30622..030e1717b 100644
--- a/genplugouts/usecasewizard/UmlArtifact.h
+++ b/genplugouts/usecasewizard/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+
 
 // This class manages 'artifacts'
 //
@@ -11,7 +11,7 @@
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlAttribute.h b/genplugouts/usecasewizard/UmlAttribute.h
index 19ee0a4c6..427658b45 100644
--- a/genplugouts/usecasewizard/UmlAttribute.h
+++ b/genplugouts/usecasewizard/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+
 
 // This class manages 'attribute', notes that the class 'UmlClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseArtifact.cpp b/genplugouts/usecasewizard/UmlBaseArtifact.cpp
index 5f11e7a44..fd42c9121 100644
--- a/genplugouts/usecasewizard/UmlBaseArtifact.cpp
+++ b/genplugouts/usecasewizard/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,7 +89,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd, l);
 
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] =  _associated[last];
 
             _associated.resize(last);
         }
@@ -166,54 +168,54 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -248,13 +250,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] =  (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/usecasewizard/UmlBaseArtifact.h b/genplugouts/usecasewizard/UmlBaseArtifact.h
index d2c5a7fba..fcbf691a0 100644
--- a/genplugouts/usecasewizard/UmlBaseArtifact.h
+++ b/genplugouts/usecasewizard/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,40 +83,40 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -128,22 +128,22 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -171,11 +171,11 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/usecasewizard/UmlBaseAttribute.cpp b/genplugouts/usecasewizard/UmlBaseAttribute.cpp
index 1273e14af..401e44d9b 100644
--- a/genplugouts/usecasewizard/UmlBaseAttribute.cpp
+++ b/genplugouts/usecasewizard/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -29,7 +29,7 @@ bool UmlBaseAttribute::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -121,7 +121,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/usecasewizard/UmlBaseAttribute.h b/genplugouts/usecasewizard/UmlBaseAttribute.h
index 3ce2c69c1..0fc286acc 100644
--- a/genplugouts/usecasewizard/UmlBaseAttribute.h
+++ b/genplugouts/usecasewizard/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -35,7 +35,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -89,7 +89,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -119,7 +119,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -131,13 +131,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -165,7 +165,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/usecasewizard/UmlBaseChoicePseudoState.h b/genplugouts/usecasewizard/UmlBaseChoicePseudoState.h
index fb682dd91..8d15fc093 100644
--- a/genplugouts/usecasewizard/UmlBaseChoicePseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseClass.cpp b/genplugouts/usecasewizard/UmlBaseClass.cpp
index a1f25958f..f225c7730 100644
--- a/genplugouts/usecasewizard/UmlBaseClass.cpp
+++ b/genplugouts/usecasewizard/UmlBaseClass.cpp
@@ -10,8 +10,8 @@
 #include "UmlCom.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -46,11 +46,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -82,11 +82,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -291,7 +291,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -317,9 +317,9 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray, UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -327,7 +327,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/usecasewizard/UmlBaseClass.h b/genplugouts/usecasewizard/UmlBaseClass.h
index 93d44317d..7ce1fd023 100644
--- a/genplugouts/usecasewizard/UmlBaseClass.h
+++ b/genplugouts/usecasewizard/UmlBaseClass.h
@@ -5,9 +5,9 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -53,7 +53,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -76,7 +76,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -184,7 +184,7 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -198,7 +198,8 @@ class UmlBaseClass : public UmlClassMember
     friend class UmlBaseArtifact;
 
 private:
-    static Q3Dict<UmlClass> _classes;
+        static QHash<QByteArray, UmlClass*> _classes;
+
 
     bool _abstract;
 
@@ -235,7 +236,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/usecasewizard/UmlBaseClassDiagram.h b/genplugouts/usecasewizard/UmlBaseClassDiagram.h
index e0990d31f..a3f406b00 100644
--- a/genplugouts/usecasewizard/UmlBaseClassDiagram.h
+++ b/genplugouts/usecasewizard/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseClassItem.cpp b/genplugouts/usecasewizard/UmlBaseClassItem.cpp
index 345c1a18d..8babd321f 100644
--- a/genplugouts/usecasewizard/UmlBaseClassItem.cpp
+++ b/genplugouts/usecasewizard/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/usecasewizard/UmlBaseClassItem.h b/genplugouts/usecasewizard/UmlBaseClassItem.h
index 2569d9776..c5348dadc 100644
--- a/genplugouts/usecasewizard/UmlBaseClassItem.h
+++ b/genplugouts/usecasewizard/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -50,20 +50,20 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/usecasewizard/UmlBaseClassMember.h b/genplugouts/usecasewizard/UmlBaseClassMember.h
index a412a7048..fd8e96992 100644
--- a/genplugouts/usecasewizard/UmlBaseClassMember.h
+++ b/genplugouts/usecasewizard/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -69,7 +69,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/usecasewizard/UmlBaseClassView.h b/genplugouts/usecasewizard/UmlBaseClassView.h
index 5687a666f..cec17090f 100644
--- a/genplugouts/usecasewizard/UmlBaseClassView.h
+++ b/genplugouts/usecasewizard/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseCollaborationDiagram.h b/genplugouts/usecasewizard/UmlBaseCollaborationDiagram.h
index 0a49b41e6..39c8eb5db 100644
--- a/genplugouts/usecasewizard/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/usecasewizard/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseComponent.cpp b/genplugouts/usecasewizard/UmlBaseComponent.cpp
index 0fe6d1aed..fa399b975 100644
--- a/genplugouts/usecasewizard/UmlBaseComponent.cpp
+++ b/genplugouts/usecasewizard/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizedClasses()
 {
     read_if_needed_();
 
     return _realized;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realized, provided, required);
@@ -96,18 +96,18 @@ void UmlBaseComponent::read_uml_()
     _realized.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realized.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realized[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/usecasewizard/UmlBaseComponent.h b/genplugouts/usecasewizard/UmlBaseComponent.h
index 8b0bbc531..2b7c2e2ef 100644
--- a/genplugouts/usecasewizard/UmlBaseComponent.h
+++ b/genplugouts/usecasewizard/UmlBaseComponent.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+
+
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -36,18 +36,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realized classes
-    const Q3PtrVector<UmlClass> & realizedClasses();
+    const QVector<UmlClass*> & realizedClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realized, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +57,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realized;
+    QVector<UmlClass*> _realized;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -70,11 +70,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/usecasewizard/UmlBaseComponentDiagram.h b/genplugouts/usecasewizard/UmlBaseComponentDiagram.h
index 43466da7c..b235e0717 100644
--- a/genplugouts/usecasewizard/UmlBaseComponentDiagram.h
+++ b/genplugouts/usecasewizard/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseComponentView.h b/genplugouts/usecasewizard/UmlBaseComponentView.h
index 0cb5c0769..a8ff514fb 100644
--- a/genplugouts/usecasewizard/UmlBaseComponentView.h
+++ b/genplugouts/usecasewizard/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseDeepHistoryPseudoState.h b/genplugouts/usecasewizard/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..9224eb152 100644
--- a/genplugouts/usecasewizard/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseDeployment.h b/genplugouts/usecasewizard/UmlBaseDeployment.h
index b268e0c17..b16902170 100644
--- a/genplugouts/usecasewizard/UmlBaseDeployment.h
+++ b/genplugouts/usecasewizard/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseDeploymentDiagram.h b/genplugouts/usecasewizard/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..db1cfc67d 100644
--- a/genplugouts/usecasewizard/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/usecasewizard/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseDeploymentView.h b/genplugouts/usecasewizard/UmlBaseDeploymentView.h
index 08c540330..df550cb1b 100644
--- a/genplugouts/usecasewizard/UmlBaseDeploymentView.h
+++ b/genplugouts/usecasewizard/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseDiagram.cpp b/genplugouts/usecasewizard/UmlBaseDiagram.cpp
index e1ceb269d..d0fb2d705 100644
--- a/genplugouts/usecasewizard/UmlBaseDiagram.cpp
+++ b/genplugouts/usecasewizard/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/usecasewizard/UmlBaseDiagram.h b/genplugouts/usecasewizard/UmlBaseDiagram.h
index 9cf05ff22..19e34654b 100644
--- a/genplugouts/usecasewizard/UmlBaseDiagram.h
+++ b/genplugouts/usecasewizard/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseEntryPointPseudoState.h b/genplugouts/usecasewizard/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..60dd28bb0 100644
--- a/genplugouts/usecasewizard/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseExitPointPseudoState.h b/genplugouts/usecasewizard/UmlBaseExitPointPseudoState.h
index ff2ad12bc..29563f22b 100644
--- a/genplugouts/usecasewizard/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseExtraClassMember.cpp b/genplugouts/usecasewizard/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/usecasewizard/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/usecasewizard/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/usecasewizard/UmlBaseExtraClassMember.h b/genplugouts/usecasewizard/UmlBaseExtraClassMember.h
index e2b9d4f30..4f07b5583 100644
--- a/genplugouts/usecasewizard/UmlBaseExtraClassMember.h
+++ b/genplugouts/usecasewizard/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/usecasewizard/UmlBaseFinalState.h b/genplugouts/usecasewizard/UmlBaseFinalState.h
index 16e0816cf..2fa133da6 100644
--- a/genplugouts/usecasewizard/UmlBaseFinalState.h
+++ b/genplugouts/usecasewizard/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseForkPseudoState.h b/genplugouts/usecasewizard/UmlBaseForkPseudoState.h
index 009499bfa..9dfa5025c 100644
--- a/genplugouts/usecasewizard/UmlBaseForkPseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseFormalParameter.h b/genplugouts/usecasewizard/UmlBaseFormalParameter.h
index 4d2f3428f..c58ead471 100644
--- a/genplugouts/usecasewizard/UmlBaseFormalParameter.h
+++ b/genplugouts/usecasewizard/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -31,10 +31,10 @@ class UmlBaseFormalParameter
     friend class UmlBaseClass;
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/usecasewizard/UmlBaseInitialPseudoState.h b/genplugouts/usecasewizard/UmlBaseInitialPseudoState.h
index 88dae1cc6..2f31e4340 100644
--- a/genplugouts/usecasewizard/UmlBaseInitialPseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseItem.cpp b/genplugouts/usecasewizard/UmlBaseItem.cpp
index c9d97551b..f3eb43988 100644
--- a/genplugouts/usecasewizard/UmlBaseItem.cpp
+++ b/genplugouts/usecasewizard/UmlBaseItem.cpp
@@ -43,33 +43,33 @@
 #include "UmlJoinPseudoState.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     return set_it_(_name, s, setNameCmd);
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -85,7 +85,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -105,11 +105,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -119,7 +119,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -127,10 +127,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -141,14 +141,14 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
     return _dict;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -160,7 +160,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
     return (int) UmlCom::read_unsigned();
@@ -178,11 +178,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -197,7 +197,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -216,17 +216,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -303,9 +303,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -334,7 +334,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -388,7 +388,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -425,7 +425,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -545,20 +545,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/usecasewizard/UmlBaseItem.h b/genplugouts/usecasewizard/UmlBaseItem.h
index a552b7da6..30b0dcc25 100644
--- a/genplugouts/usecasewizard/UmlBaseItem.h
+++ b/genplugouts/usecasewizard/UmlBaseItem.h
@@ -1,15 +1,16 @@
 #ifndef _UMLBASEITEM_H
 #define _UMLBASEITEM_H
-
+#include <QByteArray>
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+
+
+
+
 //#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
+#include <QHash>
 
 class UmlItem;
 class UmlTypeSpec;
@@ -37,35 +38,35 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Name(const Q3CString & s);
+    bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -90,16 +91,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     //  Returns the absolute path name of the file memoring the Item.
     //  In general an item is saved in a file associated to its package,
@@ -127,7 +128,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -135,7 +136,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -149,7 +150,7 @@ class UmlBaseItem
     //  item), UmlNcRelations (their target is the current item) or
     //  UmlComponents (the associated component of the current item when it is
     //  a UmlClass, a non source component associated with the current one).
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -162,7 +163,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
     friend class UmlBaseClassItem;
     friend class UmlBaseAttribute;
@@ -200,21 +201,23 @@ class UmlBaseItem
 
     void * _identifier;
 
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
+
+        QHash<QByteArray, QByteArray*> _dict;
+
 
-    Q3Dict<Q3CString> _dict;
+        static QHash<void*,UmlItem*> _all;
 
-    static Q3PtrDict<UmlItem> _all;
 
 
 protected:
@@ -270,7 +273,7 @@ class UmlBaseItem
 
     //internal, do NOT use it
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
 
@@ -283,7 +286,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/usecasewizard/UmlBaseJoinPseudoState.h b/genplugouts/usecasewizard/UmlBaseJoinPseudoState.h
index 31976dfff..c95cfff9c 100644
--- a/genplugouts/usecasewizard/UmlBaseJoinPseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseJunctionPseudoState.h b/genplugouts/usecasewizard/UmlBaseJunctionPseudoState.h
index 9b76d88e7..96cdfe959 100644
--- a/genplugouts/usecasewizard/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseNcRelation.h b/genplugouts/usecasewizard/UmlBaseNcRelation.h
index 7418e3406..0ad29c67b 100644
--- a/genplugouts/usecasewizard/UmlBaseNcRelation.h
+++ b/genplugouts/usecasewizard/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/usecasewizard/UmlBaseNode.h b/genplugouts/usecasewizard/UmlBaseNode.h
index 07a980e66..208e951f2 100644
--- a/genplugouts/usecasewizard/UmlBaseNode.h
+++ b/genplugouts/usecasewizard/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/usecasewizard/UmlBaseOperation.cpp b/genplugouts/usecasewizard/UmlBaseOperation.cpp
index 26096f11c..c811bf05a 100644
--- a/genplugouts/usecasewizard/UmlBaseOperation.cpp
+++ b/genplugouts/usecasewizard/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -54,7 +54,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -68,7 +68,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -82,7 +82,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -105,7 +105,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -118,7 +118,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -132,7 +132,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -245,7 +245,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -257,7 +257,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -271,7 +271,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -323,7 +323,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -333,7 +333,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -347,7 +347,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -380,7 +380,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
diff --git a/genplugouts/usecasewizard/UmlBaseOperation.h b/genplugouts/usecasewizard/UmlBaseOperation.h
index a17e88a74..d4ce85ea5 100644
--- a/genplugouts/usecasewizard/UmlBaseOperation.h
+++ b/genplugouts/usecasewizard/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -44,7 +44,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -62,7 +62,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -122,7 +122,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -131,9 +131,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -143,7 +143,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -171,7 +171,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -180,9 +180,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -192,7 +192,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -212,7 +212,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -254,22 +254,22 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -281,7 +281,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
@@ -307,7 +307,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/usecasewizard/UmlBasePackage.cpp b/genplugouts/usecasewizard/UmlBasePackage.cpp
index 35028fb7b..f065ea964 100644
--- a/genplugouts/usecasewizard/UmlBasePackage.cpp
+++ b/genplugouts/usecasewizard/UmlBasePackage.cpp
@@ -7,7 +7,7 @@
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -38,111 +38,111 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlClassDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findNamespace(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findCppNamespaceCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPackage(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findJavaPackageCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findModule(const QByteArray & n) const
 {
-    UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, _identifier, n);
+    UmlCom::send_cmd(packageGlobalCmd, findIdlModuleCmd, _identifier, n);
 
     return (UmlPackage *) UmlBaseItem::read_();
 }
@@ -167,7 +167,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/usecasewizard/UmlBasePackage.h b/genplugouts/usecasewizard/UmlBasePackage.h
index 1be1520e5..e8ff11749 100644
--- a/genplugouts/usecasewizard/UmlBasePackage.h
+++ b/genplugouts/usecasewizard/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlPackage;
 class UmlClassDiagram;
@@ -34,87 +34,87 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findNamespace(const Q3CString & n) const;
+    UmlPackage * findNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPackage(const Q3CString & n) const;
+    UmlPackage * findPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findModule(const Q3CString & n) const;
+    UmlPackage * findModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -127,12 +127,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -147,25 +147,25 @@ class UmlBasePackage : public UmlItem
     UmlClassDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -194,11 +194,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/usecasewizard/UmlBaseRegion.h b/genplugouts/usecasewizard/UmlBaseRegion.h
index 58a9f8b78..efd32acb9 100644
--- a/genplugouts/usecasewizard/UmlBaseRegion.h
+++ b/genplugouts/usecasewizard/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseRelation.cpp b/genplugouts/usecasewizard/UmlBaseRelation.cpp
index 466ba2582..e17198d39 100644
--- a/genplugouts/usecasewizard/UmlBaseRelation.cpp
+++ b/genplugouts/usecasewizard/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -63,7 +63,7 @@ bool UmlBaseRelation::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -75,7 +75,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -96,7 +96,7 @@ UmlClass * UmlBaseRelation::roleType()
     return _role_type;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -108,7 +108,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -240,7 +240,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/usecasewizard/UmlBaseRelation.h b/genplugouts/usecasewizard/UmlBaseRelation.h
index 718dec6e5..316a72476 100644
--- a/genplugouts/usecasewizard/UmlBaseRelation.h
+++ b/genplugouts/usecasewizard/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlRelation;
 class UmlClass;
@@ -38,7 +38,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -50,13 +50,13 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -64,7 +64,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -127,7 +127,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -166,13 +166,13 @@ class UmlBaseRelation : public UmlClassMember
 
     aRelationKind _rel_kind : 8;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlOperation * _get_oper;
 
@@ -182,7 +182,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -210,11 +210,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/usecasewizard/UmlBaseSequenceDiagram.h b/genplugouts/usecasewizard/UmlBaseSequenceDiagram.h
index 2025fab49..b2e83e1af 100644
--- a/genplugouts/usecasewizard/UmlBaseSequenceDiagram.h
+++ b/genplugouts/usecasewizard/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseShallowHistoryPseudoState.h b/genplugouts/usecasewizard/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..cb82c3ec1 100644
--- a/genplugouts/usecasewizard/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseState.cpp b/genplugouts/usecasewizard/UmlBaseState.cpp
index 50ccddcf5..6d396996c 100644
--- a/genplugouts/usecasewizard/UmlBaseState.cpp
+++ b/genplugouts/usecasewizard/UmlBaseState.cpp
@@ -3,7 +3,7 @@
 #include "UmlState.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -15,7 +15,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -26,7 +26,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -37,7 +37,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -49,7 +49,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -60,7 +60,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -71,7 +71,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -84,7 +84,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -95,7 +95,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -106,7 +106,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/usecasewizard/UmlBaseState.h b/genplugouts/usecasewizard/UmlBaseState.h
index efc98a1af..bb578e0ab 100644
--- a/genplugouts/usecasewizard/UmlBaseState.h
+++ b/genplugouts/usecasewizard/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "StateBehavior.h"
 
 class UmlState;
@@ -26,13 +26,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -48,7 +48,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -57,7 +57,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -65,7 +65,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -73,7 +73,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -83,7 +83,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -91,7 +91,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -99,7 +99,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/usecasewizard/UmlBaseStateAction.cpp b/genplugouts/usecasewizard/UmlBaseStateAction.cpp
index 1f080b00e..1879387b9 100644
--- a/genplugouts/usecasewizard/UmlBaseStateAction.cpp
+++ b/genplugouts/usecasewizard/UmlBaseStateAction.cpp
@@ -4,7 +4,7 @@
 #include "UmlStateAction.h"
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlState * parent)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -28,7 +28,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -41,7 +41,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/usecasewizard/UmlBaseStateAction.h b/genplugouts/usecasewizard/UmlBaseStateAction.h
index 0432258b3..9c74adf3f 100644
--- a/genplugouts/usecasewizard/UmlBaseStateAction.h
+++ b/genplugouts/usecasewizard/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateAction;
 class UmlState;
@@ -25,13 +25,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -50,7 +50,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -68,14 +68,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/usecasewizard/UmlBaseStateDiagram.h b/genplugouts/usecasewizard/UmlBaseStateDiagram.h
index ea7e37ee0..d3c5bd101 100644
--- a/genplugouts/usecasewizard/UmlBaseStateDiagram.h
+++ b/genplugouts/usecasewizard/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseTerminatePseudoState.h b/genplugouts/usecasewizard/UmlBaseTerminatePseudoState.h
index e8553f4be..5328f4055 100644
--- a/genplugouts/usecasewizard/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/usecasewizard/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlBaseTransition.cpp b/genplugouts/usecasewizard/UmlBaseTransition.cpp
index 3516921f8..f9dd2341f 100644
--- a/genplugouts/usecasewizard/UmlBaseTransition.cpp
+++ b/genplugouts/usecasewizard/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -28,7 +28,7 @@ UmlItem * UmlBaseTransition::target()
     return _target;
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -62,7 +62,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -97,7 +97,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/usecasewizard/UmlBaseTransition.h b/genplugouts/usecasewizard/UmlBaseTransition.h
index efa1cdff6..9392e56c6 100644
--- a/genplugouts/usecasewizard/UmlBaseTransition.h
+++ b/genplugouts/usecasewizard/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -26,7 +26,7 @@ class UmlBaseTransition : public UmlItem
     virtual UmlItem * target();
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -34,7 +34,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -42,7 +42,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -59,7 +59,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -85,7 +85,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -93,7 +93,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/usecasewizard/UmlBaseUseCase.cpp b/genplugouts/usecasewizard/UmlBaseUseCase.cpp
index 5a3a32ccd..c091723cb 100644
--- a/genplugouts/usecasewizard/UmlBaseUseCase.cpp
+++ b/genplugouts/usecasewizard/UmlBaseUseCase.cpp
@@ -37,5 +37,6 @@ void UmlBaseUseCase::read_uml_()
 {
     _assoc_diagram = (UmlUseCaseDiagram *) UmlBaseItem::read_();
     UmlBaseItem::read_uml_();
+    _extension_points = UmlCom::read_string();
 }
 
diff --git a/genplugouts/usecasewizard/UmlBaseUseCase.h b/genplugouts/usecasewizard/UmlBaseUseCase.h
index 1bdef8f61..cc8fdbe8c 100644
--- a/genplugouts/usecasewizard/UmlBaseUseCase.h
+++ b/genplugouts/usecasewizard/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -33,6 +33,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
+    QByteArray _extension_points;
     UmlUseCaseDiagram * _assoc_diagram;
 
 
@@ -42,7 +43,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseUseCaseDiagram.h b/genplugouts/usecasewizard/UmlBaseUseCaseDiagram.h
index fd2481e49..f2a8dfb95 100644
--- a/genplugouts/usecasewizard/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/usecasewizard/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBaseUseCaseView.h b/genplugouts/usecasewizard/UmlBaseUseCaseView.h
index e289a3543..17498b275 100644
--- a/genplugouts/usecasewizard/UmlBaseUseCaseView.h
+++ b/genplugouts/usecasewizard/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+
 
 class UmlUseCaseView;
 
@@ -25,7 +25,7 @@ class UmlBaseUseCaseView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlBuiltin.h b/genplugouts/usecasewizard/UmlBuiltin.h
index cb965b8ae..8154ac384 100644
--- a/genplugouts/usecasewizard/UmlBuiltin.h
+++ b/genplugouts/usecasewizard/UmlBuiltin.h
@@ -2,29 +2,29 @@
 #define _UMLBUILTIN_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/usecasewizard/UmlClass.h b/genplugouts/usecasewizard/UmlClass.h
index e2b1f8cc3..13ffc5ac6 100644
--- a/genplugouts/usecasewizard/UmlClass.h
+++ b/genplugouts/usecasewizard/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+
 
 // This class manages 'classes', notes that the class 'ClassItem'
 // is a mother class of the class's children.
@@ -12,7 +12,7 @@
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlClassDiagram.h b/genplugouts/usecasewizard/UmlClassDiagram.h
index 76134392d..ac4781283 100644
--- a/genplugouts/usecasewizard/UmlClassDiagram.h
+++ b/genplugouts/usecasewizard/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlClassItem.h b/genplugouts/usecasewizard/UmlClassItem.h
index bf64f4dbb..7c4a888f7 100644
--- a/genplugouts/usecasewizard/UmlClassItem.h
+++ b/genplugouts/usecasewizard/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlClassMember.h b/genplugouts/usecasewizard/UmlClassMember.h
index 9119443c6..35fdddb52 100644
--- a/genplugouts/usecasewizard/UmlClassMember.h
+++ b/genplugouts/usecasewizard/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+
 #include "UmlBaseClassMember.h"
 
 // This class globaly manages class's relations, attributes, operations
@@ -12,7 +12,7 @@
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlClassView.h b/genplugouts/usecasewizard/UmlClassView.h
index a152eff28..3b6eb53ed 100644
--- a/genplugouts/usecasewizard/UmlClassView.h
+++ b/genplugouts/usecasewizard/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'class view'
 //
@@ -11,7 +11,7 @@
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlCollaborationDiagram.h b/genplugouts/usecasewizard/UmlCollaborationDiagram.h
index ab1388561..fc69dea4c 100644
--- a/genplugouts/usecasewizard/UmlCollaborationDiagram.h
+++ b/genplugouts/usecasewizard/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlCom.cpp b/genplugouts/usecasewizard/UmlCom.cpp
index d4837a63a..24efbb33c 100644
--- a/genplugouts/usecasewizard/UmlCom.cpp
+++ b/genplugouts/usecasewizard/UmlCom.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
@@ -11,10 +11,11 @@
 #include "UmlClass.h"
 #include "UmlSettings.h"
 #include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +29,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(15);
         flush();
@@ -65,11 +68,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -79,11 +82,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -100,13 +103,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -115,10 +118,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -127,16 +130,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -145,18 +148,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -202,7 +205,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -212,7 +215,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -223,7 +226,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -235,7 +238,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -247,7 +250,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -259,7 +262,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -272,7 +275,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -285,7 +288,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -299,7 +302,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -311,7 +314,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -324,7 +327,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -337,7 +340,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -350,7 +353,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +375,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -386,7 +389,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -400,7 +403,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -415,7 +418,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -428,7 +431,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -442,7 +445,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -465,7 +468,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ", " << ((arg3) ? arg3 : "") << ", " << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ", " << ((arg3) ? arg3 : "") << ", " << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -490,7 +493,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -513,10 +516,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -533,10 +536,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -570,7 +573,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -587,7 +590,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -598,12 +601,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -635,28 +638,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -665,7 +669,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -676,7 +680,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/usecasewizard/UmlCom.h b/genplugouts/usecasewizard/UmlCom.h
index fd29272d0..07dbb2687 100644
--- a/genplugouts/usecasewizard/UmlCom.h
+++ b/genplugouts/usecasewizard/UmlCom.h
@@ -2,21 +2,21 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //#include "CmdFamily.h"
 //#include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
 
-#include <q3ptrvector.h>
+
+
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -63,11 +63,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -77,19 +77,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -171,8 +171,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -195,10 +195,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
diff --git a/genplugouts/usecasewizard/UmlComponent.h b/genplugouts/usecasewizard/UmlComponent.h
index bb4fdbb25..e8961ed60 100644
--- a/genplugouts/usecasewizard/UmlComponent.h
+++ b/genplugouts/usecasewizard/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+
 
 // This class manages 'components'
 //
@@ -11,7 +11,7 @@
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlComponentDiagram.h b/genplugouts/usecasewizard/UmlComponentDiagram.h
index 15d707dc2..9afaa7eb4 100644
--- a/genplugouts/usecasewizard/UmlComponentDiagram.h
+++ b/genplugouts/usecasewizard/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlComponentView.h b/genplugouts/usecasewizard/UmlComponentView.h
index 000a74744..cc09cecc6 100644
--- a/genplugouts/usecasewizard/UmlComponentView.h
+++ b/genplugouts/usecasewizard/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'component view'
 //
@@ -11,7 +11,7 @@
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlDeploymentDiagram.h b/genplugouts/usecasewizard/UmlDeploymentDiagram.h
index 727d0ffd0..1f0add3d0 100644
--- a/genplugouts/usecasewizard/UmlDeploymentDiagram.h
+++ b/genplugouts/usecasewizard/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlDeploymentView.h b/genplugouts/usecasewizard/UmlDeploymentView.h
index 52e5e627d..1c47fedbf 100644
--- a/genplugouts/usecasewizard/UmlDeploymentView.h
+++ b/genplugouts/usecasewizard/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'deployment view'
 //
@@ -11,7 +11,7 @@
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlDiagram.h b/genplugouts/usecasewizard/UmlDiagram.h
index ffee38e5c..99e0f81e4 100644
--- a/genplugouts/usecasewizard/UmlDiagram.h
+++ b/genplugouts/usecasewizard/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlEntryPointPseudoState.h b/genplugouts/usecasewizard/UmlEntryPointPseudoState.h
index 838a4bf5b..3fd7f6eca 100644
--- a/genplugouts/usecasewizard/UmlEntryPointPseudoState.h
+++ b/genplugouts/usecasewizard/UmlEntryPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlExitPointPseudoState.h b/genplugouts/usecasewizard/UmlExitPointPseudoState.h
index 1a57b8230..e63c68782 100644
--- a/genplugouts/usecasewizard/UmlExitPointPseudoState.h
+++ b/genplugouts/usecasewizard/UmlExitPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlExtraClassMember.h b/genplugouts/usecasewizard/UmlExtraClassMember.h
index cf0b2bf47..95b851b8d 100644
--- a/genplugouts/usecasewizard/UmlExtraClassMember.h
+++ b/genplugouts/usecasewizard/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlItem.h b/genplugouts/usecasewizard/UmlItem.h
index b47a5cd6a..15132dcfd 100644
--- a/genplugouts/usecasewizard/UmlItem.h
+++ b/genplugouts/usecasewizard/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+
 
 // This class is a mother class for all the other Uml* classes, this
 // allows to generalize their management, declare virtual operations etc ...
@@ -12,7 +12,7 @@
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n) : UmlBaseItem(id, n) {};
+    UmlItem(void * id, const QByteArray & n) : UmlBaseItem(id, n) {};
 
     virtual ~UmlItem();
 
diff --git a/genplugouts/usecasewizard/UmlNcRelation.h b/genplugouts/usecasewizard/UmlNcRelation.h
index 60032619a..3d73ec633 100644
--- a/genplugouts/usecasewizard/UmlNcRelation.h
+++ b/genplugouts/usecasewizard/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+
 
 //This class manages 'relations' between non class objects
 //
@@ -11,7 +11,7 @@
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlNode.h b/genplugouts/usecasewizard/UmlNode.h
index 95edbe709..4c72e14fd 100644
--- a/genplugouts/usecasewizard/UmlNode.h
+++ b/genplugouts/usecasewizard/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+
 
 // This class manages 'nodes'
 //
@@ -11,7 +11,7 @@
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlOperation.h b/genplugouts/usecasewizard/UmlOperation.h
index eec043152..f4c9e6547 100644
--- a/genplugouts/usecasewizard/UmlOperation.h
+++ b/genplugouts/usecasewizard/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'operations', notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlPackage.h b/genplugouts/usecasewizard/UmlPackage.h
index 84e80d71e..c190ad80c 100644
--- a/genplugouts/usecasewizard/UmlPackage.h
+++ b/genplugouts/usecasewizard/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+
 
 // This class manages a 'package', notes that the project itself is a package
 //
@@ -11,7 +11,7 @@
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlParameter.h b/genplugouts/usecasewizard/UmlParameter.h
index ef6f522b0..3c967ad60 100644
--- a/genplugouts/usecasewizard/UmlParameter.h
+++ b/genplugouts/usecasewizard/UmlParameter.h
@@ -4,7 +4,7 @@
 
 #include "aDirection.h"
 #include "UmlTypeSpec.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Represent an operation's parameter
 
@@ -13,9 +13,9 @@ struct UmlParameter {
 
     UmlTypeSpec type;
 
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlPseudoState.h b/genplugouts/usecasewizard/UmlPseudoState.h
index 075761ec7..1c350a942 100644
--- a/genplugouts/usecasewizard/UmlPseudoState.h
+++ b/genplugouts/usecasewizard/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlRegion.h b/genplugouts/usecasewizard/UmlRegion.h
index d3f32cb7b..d0ce11dde 100644
--- a/genplugouts/usecasewizard/UmlRegion.h
+++ b/genplugouts/usecasewizard/UmlRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlRelation.h b/genplugouts/usecasewizard/UmlRelation.h
index 6b4358b40..a246cfcfd 100644
--- a/genplugouts/usecasewizard/UmlRelation.h
+++ b/genplugouts/usecasewizard/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+
 
 // This class manages 'relations' between classes, notes that the class 'UmlClassItem'
 // is a mother class of all the class's children.
@@ -12,7 +12,7 @@
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlSequenceDiagram.h b/genplugouts/usecasewizard/UmlSequenceDiagram.h
index d3b3d83fc..a36e34a65 100644
--- a/genplugouts/usecasewizard/UmlSequenceDiagram.h
+++ b/genplugouts/usecasewizard/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlSettings.cpp b/genplugouts/usecasewizard/UmlSettings.cpp
index fe3172792..23aa61bf7 100644
--- a/genplugouts/usecasewizard/UmlSettings.cpp
+++ b/genplugouts/usecasewizard/UmlSettings.cpp
@@ -6,32 +6,32 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlSettings::_defined;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -43,7 +43,7 @@ void UmlSettings::read_()
     _relation_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_stereotypes[index].uml = UmlCom::read_string();
@@ -56,7 +56,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -74,18 +74,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -96,7 +96,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_stereotypes.count();
 
@@ -107,7 +107,7 @@ Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlSter
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -118,15 +118,15 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         builtins[index] = _builtins[index];
@@ -154,15 +154,15 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         relation_stereotypes[index] = _relation_stereotypes[index];
@@ -187,15 +187,15 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         class_stereotypes[index] = _class_stereotypes[index];
diff --git a/genplugouts/usecasewizard/UmlSettings.h b/genplugouts/usecasewizard/UmlSettings.h
index baeb490e7..4cbad99a2 100644
--- a/genplugouts/usecasewizard/UmlSettings.h
+++ b/genplugouts/usecasewizard/UmlSettings.h
@@ -1,9 +1,9 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
+#include <QByteArray>
+#include <QHash>
 
 
-#include <q3dict.h>
-#include <q3cstring.h>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -18,15 +18,15 @@ class UmlSettings
 
     static bool _defined;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_stereotypes;
 
     static UmlStereotype * _relation_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -40,31 +40,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlState.h b/genplugouts/usecasewizard/UmlState.h
index b8a04be4a..e760bb6b6 100644
--- a/genplugouts/usecasewizard/UmlState.h
+++ b/genplugouts/usecasewizard/UmlState.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlStateDiagram.h b/genplugouts/usecasewizard/UmlStateDiagram.h
index f49b5fb44..c639f9193 100644
--- a/genplugouts/usecasewizard/UmlStateDiagram.h
+++ b/genplugouts/usecasewizard/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/usecasewizard/UmlStereotype.h b/genplugouts/usecasewizard/UmlStereotype.h
index 290517202..5c84a3962 100644
--- a/genplugouts/usecasewizard/UmlStereotype.h
+++ b/genplugouts/usecasewizard/UmlStereotype.h
@@ -2,23 +2,23 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
 
+#include <QByteArray>
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/usecasewizard/UmlTypeSpec.cpp b/genplugouts/usecasewizard/UmlTypeSpec.cpp
index 4bcfebb95..ec194d414 100644
--- a/genplugouts/usecasewizard/UmlTypeSpec.cpp
+++ b/genplugouts/usecasewizard/UmlTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlTypeSpec::toString() const
+const QByteArray & UmlTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/usecasewizard/UmlTypeSpec.h b/genplugouts/usecasewizard/UmlTypeSpec.h
index 1c939ea94..e6ec4b176 100644
--- a/genplugouts/usecasewizard/UmlTypeSpec.h
+++ b/genplugouts/usecasewizard/UmlTypeSpec.h
@@ -1,8 +1,8 @@
 #ifndef _UMLTYPESPEC_H
 #define _UMLTYPESPEC_H
+#include <QByteArray>
 
 
-#include <q3cstring.h>
 
 class UmlClass;
 
@@ -15,7 +15,7 @@ class UmlTypeSpec
 {
 public:
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     // if != 0 the class representing the type
     UmlClass * type;
@@ -23,7 +23,7 @@ class UmlTypeSpec
     UmlTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlUseCase.cpp b/genplugouts/usecasewizard/UmlUseCase.cpp
index 53d35b1ed..e599618de 100644
--- a/genplugouts/usecasewizard/UmlUseCase.cpp
+++ b/genplugouts/usecasewizard/UmlUseCase.cpp
@@ -16,7 +16,7 @@ void UmlUseCase::wizard()
     TabDialog tabdialog(this);
 
     tabdialog.resize(600, 300);
-    a.setMainWidget(&tabdialog);
+    //a.setMainWidget(&tabdialog);
     tabdialog.show();
 
     a.exec();
diff --git a/genplugouts/usecasewizard/UmlUseCase.h b/genplugouts/usecasewizard/UmlUseCase.h
index fae3ee5c4..fb46f5c2d 100644
--- a/genplugouts/usecasewizard/UmlUseCase.h
+++ b/genplugouts/usecasewizard/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case'
 //
@@ -11,7 +11,7 @@
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
     virtual void wizard();
 
diff --git a/genplugouts/usecasewizard/UmlUseCaseDiagram.h b/genplugouts/usecasewizard/UmlUseCaseDiagram.h
index 132b56d36..bf490aa90 100644
--- a/genplugouts/usecasewizard/UmlUseCaseDiagram.h
+++ b/genplugouts/usecasewizard/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/UmlUseCaseView.h b/genplugouts/usecasewizard/UmlUseCaseView.h
index a715b2f5f..ef475b173 100644
--- a/genplugouts/usecasewizard/UmlUseCaseView.h
+++ b/genplugouts/usecasewizard/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+
 
 // This class manages 'use case view'
 //
@@ -11,7 +11,7 @@
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
 };
 
diff --git a/genplugouts/usecasewizard/gridbox.cpp b/genplugouts/usecasewizard/gridbox.cpp
new file mode 100644
index 000000000..78233be1d
--- /dev/null
+++ b/genplugouts/usecasewizard/gridbox.cpp
@@ -0,0 +1,37 @@
+#include "gridbox.h"
+#include <QGridLayout>
+GridBox::GridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void GridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void GridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void GridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+}
+
+QString GridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/genplugouts/usecasewizard/gridbox.h b/genplugouts/usecasewizard/gridbox.h
new file mode 100644
index 000000000..64793941d
--- /dev/null
+++ b/genplugouts/usecasewizard/gridbox.h
@@ -0,0 +1,26 @@
+#ifndef GRIDBOX_H
+#define GRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class GridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit GridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/genplugouts/usecasewizard/tabdialogwrapper.cpp b/genplugouts/usecasewizard/tabdialogwrapper.cpp
new file mode 100644
index 000000000..f0269750b
--- /dev/null
+++ b/genplugouts/usecasewizard/tabdialogwrapper.cpp
@@ -0,0 +1,80 @@
+#include "tabdialogwrapper.h"
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+TabDialogWrapper::TabDialogWrapper(QWidget *parent, const char *name, bool modal, Qt::WidgetAttribute f) :
+    QDialog(parent/*, f*/),
+    m_okButton(NULL), m_cancelButton(NULL), m_helpButton(NULL)
+{
+    if(f != Qt::WA_Disabled)
+        setAttribute(f);
+    setWindowTitle(name);
+    setModal(modal);
+    m_tabWidget = new QTabWidget(this);
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    this->setLayout(layout);
+
+    m_buttonLayout = new QHBoxLayout();
+    layout->addWidget(m_tabWidget);
+    layout->addLayout(m_buttonLayout);
+
+
+}
+
+void TabDialogWrapper::addTab(QWidget *tabWidget, QString name)
+{
+    m_tabWidget->addTab(tabWidget, name);
+}
+void TabDialogWrapper::insertTab(QWidget *tabWidget, QString name, int index)
+{
+    m_tabWidget->addTab(tabWidget, name);
+    m_tabWidget->insertTab(index, tabWidget,name);
+}
+
+void TabDialogWrapper::setTabEnabled(QWidget *w, bool isEnabled)
+{
+    m_tabWidget->setTabEnabled(m_tabWidget->indexOf(w), isEnabled);
+}
+void TabDialogWrapper::removePage(QWidget *page)
+{
+    m_tabWidget->removeTab(m_tabWidget->indexOf(page));
+}
+
+void TabDialogWrapper::setOkButton(QString name)
+{
+    if(m_okButton)
+        return;
+    m_okButton = new QPushButton(name,this);
+    connect(m_okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    m_buttonLayout->addWidget(m_okButton);
+}
+
+void TabDialogWrapper::setCancelButton(QString name)
+{
+    if(m_cancelButton)
+        return;
+    m_cancelButton = new QPushButton(name,this);
+    connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+    m_buttonLayout->addWidget(m_cancelButton);
+}
+
+void TabDialogWrapper::setHelpButton(QString name)
+{
+    if(m_helpButton)
+        return;
+    m_helpButton = new QPushButton(name,this);
+    connect(m_helpButton, SIGNAL(clicked()), this, SIGNAL(helpButtonPressed()));
+    m_buttonLayout->addWidget(m_helpButton);
+
+}
+
+void TabDialogWrapper::showPage(QWidget *page)
+{
+    m_tabWidget->setCornerWidget(page);
+}
+
+void TabDialogWrapper::setCaption(QString cap)
+{
+    setWindowTitle(cap);
+}
+
diff --git a/genplugouts/usecasewizard/tabdialogwrapper.h b/genplugouts/usecasewizard/tabdialogwrapper.h
new file mode 100644
index 000000000..d10d36ded
--- /dev/null
+++ b/genplugouts/usecasewizard/tabdialogwrapper.h
@@ -0,0 +1,41 @@
+#ifndef TABDIALOGWRAPPER_H
+#define TABDIALOGWRAPPER_H
+
+#include <QDialog>
+#include <QTabWidget>
+#include "QScrollArea"
+class QHBoxLayout;
+class TabDialogWrapper : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit TabDialogWrapper(QWidget * parent = 0, const char * name = 0, bool modal = false, Qt::WidgetAttribute f = Qt::WA_Disabled);
+    void addTab(QWidget* tabWidget, QString name);
+    void removePage(QWidget* page);
+    void setOkButton(QString name = "Ok");
+    void setCancelButton(QString name = "Cancel");
+    void setHelpButton(QString name = "Help");
+    void showPage(QWidget* page);
+    void setCaption(QString cap);
+    bool hasOkButton( ) {return (m_okButton != NULL);}
+
+    void insertTab(QWidget *tabWidget, QString name, int index);
+
+    QTabBar *tabBar(){ return m_tabWidget->tabBar();}
+
+    void setTabEnabled(QWidget *w, bool isEnabled);
+signals:
+    void helpButtonPressed();
+public slots:
+private:
+protected:
+    QTabWidget* m_tabWidget;
+    QPushButton *m_okButton;
+    QPushButton *m_cancelButton;
+    QPushButton *m_helpButton;
+    QHBoxLayout *m_buttonLayout;
+    QScrollArea m_scrollArea;
+
+};
+
+#endif // TABDIALOG_H
diff --git a/genplugouts/usecasewizard/usecasewizard.pro b/genplugouts/usecasewizard/usecasewizard.pro
index ca37c3361..ac7d7bf52 100644
--- a/genplugouts/usecasewizard/usecasewizard.pro
+++ b/genplugouts/usecasewizard/usecasewizard.pro
@@ -1,6 +1,9 @@
 TEMPLATE	= app
 TARGET		= usecasewizard
-CONFIG		+=  warn_on qt
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 HEADERS		= ./UmlFinalState.h \
 		  ./UmlBaseCollaborationDiagram.h \
 		  ./UmlBaseClassView.h \
@@ -112,7 +115,10 @@ HEADERS		= ./UmlFinalState.h \
 		  ./UmlBaseShallowHistoryPseudoState.h \
 		  ./UmlBaseDeepHistoryPseudoState.h \
 		  ./UmlBaseDeployment.h \
-		  ./UmlExtraClassMember.h
+		  ./UmlExtraClassMember.h \
+    vvbox.h \
+    gridbox.h \
+    tabdialogwrapper.h
 SOURCES		= ./UmlFinalState.cpp \
 		  ./UmlBaseCollaborationDiagram.cpp \
 		  ./UmlBaseClassView.cpp \
@@ -225,25 +231,24 @@ SOURCES		= ./UmlFinalState.cpp \
 		  ./UmlBaseShallowHistoryPseudoState.cpp \
 		  ./UmlBaseDeepHistoryPseudoState.cpp \
 		  ./UmlBaseDeployment.cpp \
-		  ./UmlExtraClassMember.cpp
-#The following line was inserted by qt3to4
-QT += network  qt3support 
+		  ./UmlExtraClassMember.cpp \
+    vvbox.cpp \
+    gridbox.cpp \
+    tabdialogwrapper.cpp
+QT += network widgets
+DEFINES += TRUE=true FALSE=false
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/use_case/MOC_release
-    OBJECTS_DIR = bin/douml/use_case/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
-
-Debug{
-    MOC_DIR = bin/douml/use_case/MOC_Debug
-    OBJECTS_DIR = bin/douml/use_case/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/genplugouts/usecasewizard/vvbox.cpp b/genplugouts/usecasewizard/vvbox.cpp
new file mode 100644
index 000000000..288eb93ac
--- /dev/null
+++ b/genplugouts/usecasewizard/vvbox.cpp
@@ -0,0 +1,26 @@
+#include "vvbox.h"
+
+VVBox::VVBox(QWidget *parent) :
+    QWidget(parent)
+{
+    m_layout = new QVBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+}
+
+void VVBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+bool VVBox::setStretchFactor(QWidget *w, int stretch)
+{
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+void VVBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/usecasewizard/vvbox.h b/genplugouts/usecasewizard/vvbox.h
new file mode 100644
index 000000000..7f27f2ea8
--- /dev/null
+++ b/genplugouts/usecasewizard/vvbox.h
@@ -0,0 +1,22 @@
+#ifndef VVBOX_H
+#define VVBOX_H
+
+#include <QWidget>
+#include <QVBoxLayout>
+class VVBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit VVBox(QWidget *parent = 0);
+    void addWidget(QWidget* widget);
+
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+signals:
+
+public slots:
+private:
+    QVBoxLayout *m_layout;
+};
+
+#endif // VVBOX_H
diff --git a/genplugouts/xmi/CppSettings.cpp b/genplugouts/xmi/CppSettings.cpp
index 7fd94842a..4ef3e8648 100644
--- a/genplugouts/xmi/CppSettings.cpp
+++ b/genplugouts/xmi/CppSettings.cpp
@@ -10,7 +10,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool CppSettings::useDefaults()
 {
     UmlCom::send_cmd(cppSettingsCmd, getCppUseDefaultsCmd);
@@ -23,21 +23,21 @@ bool CppSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString CppSettings::type(Q3CString s)
+QByteArray CppSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_Type(Q3CString s, Q3CString v)
+bool CppSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,28 +50,28 @@ bool CppSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::umlType(Q3CString s)
+QByteArray CppSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::cpp);
 }
 
-Q3CString CppSettings::relationStereotype(Q3CString s)
+QByteArray CppSettings::relationStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -84,28 +84,28 @@ bool CppSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::relationUmlStereotype(Q3CString s)
+QByteArray CppSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::classStereotype(Q3CString s)
+QByteArray CppSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
 
-bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool CppSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -118,31 +118,31 @@ bool CppSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::classUmlStereotype(Q3CString s)
+QByteArray CppSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::cpp);
 }
 
-Q3CString CppSettings::include(Q3CString s)
+QByteArray CppSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool CppSettings::set_Include(Q3CString s, Q3CString v)
+bool CppSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -153,14 +153,14 @@ bool CppSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::rootDir()
+QByteArray CppSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool CppSettings::set_RootDir(Q3CString v)
+bool CppSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -172,14 +172,14 @@ bool CppSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerContent()
+QByteArray CppSettings::headerContent()
 {
     read_if_needed_();
 
     return _h_content;
 }
 
-bool CppSettings::set_HeaderContent(Q3CString v)
+bool CppSettings::set_HeaderContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -191,14 +191,14 @@ bool CppSettings::set_HeaderContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceContent()
+QByteArray CppSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool CppSettings::set_SourceContent(Q3CString v)
+bool CppSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -210,14 +210,14 @@ bool CppSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::headerExtension()
+QByteArray CppSettings::headerExtension()
 {
     read_if_needed_();
 
     return _h_ext;
 }
 
-bool CppSettings::set_HeaderExtension(Q3CString v)
+bool CppSettings::set_HeaderExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppHeaderExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -229,14 +229,14 @@ bool CppSettings::set_HeaderExtension(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::sourceExtension()
+QByteArray CppSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _src_ext;
 }
 
-bool CppSettings::set_SourceExtension(Q3CString v)
+bool CppSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -267,14 +267,14 @@ bool CppSettings::set_IncludeWithPath(bool v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumIn()
+const QByteArray & CppSettings::enumIn()
 {
     read_if_needed_();
 
     return _enum_in;
 }
 
-bool CppSettings::set_EnumIn(Q3CString v)
+bool CppSettings::set_EnumIn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -286,14 +286,14 @@ bool CppSettings::set_EnumIn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumOut()
+const QByteArray & CppSettings::enumOut()
 {
     read_if_needed_();
 
     return _enum_out;
 }
 
-bool CppSettings::set_EnumOut(Q3CString v)
+bool CppSettings::set_EnumOut(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -305,14 +305,14 @@ bool CppSettings::set_EnumOut(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumInout()
+const QByteArray & CppSettings::enumInout()
 {
     read_if_needed_();
 
     return _enum_inout;
 }
 
-bool CppSettings::set_EnumInout(Q3CString v)
+bool CppSettings::set_EnumInout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumInOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -324,14 +324,14 @@ bool CppSettings::set_EnumInout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::enumReturn()
+QByteArray CppSettings::enumReturn()
 {
     read_if_needed_();
 
     return _enum_return;
 }
 
-bool CppSettings::set_EnumReturn(Q3CString v)
+bool CppSettings::set_EnumReturn(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumReturnCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -343,14 +343,14 @@ bool CppSettings::set_EnumReturn(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::in()
+const QByteArray & CppSettings::in()
 {
     read_if_needed_();
 
     return _in;
 }
 
-bool CppSettings::set_In(Q3CString v)
+bool CppSettings::set_In(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -362,14 +362,14 @@ bool CppSettings::set_In(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::out()
+const QByteArray & CppSettings::out()
 {
     read_if_needed_();
 
     return _out;
 }
 
-bool CppSettings::set_Out(Q3CString v)
+bool CppSettings::set_Out(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -381,14 +381,14 @@ bool CppSettings::set_Out(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::inout()
+const QByteArray & CppSettings::inout()
 {
     read_if_needed_();
 
     return _inout;
 }
 
-bool CppSettings::set_Inout(Q3CString v)
+bool CppSettings::set_Inout(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -400,14 +400,14 @@ bool CppSettings::set_Inout(Q3CString v)
         return FALSE;
 }
 
-Q3CString CppSettings::Return()
+QByteArray CppSettings::Return()
 {
     read_if_needed_();
 
     return _return;
 }
 
-bool CppSettings::set_Return(Q3CString v)
+bool CppSettings::set_Return(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -419,14 +419,14 @@ bool CppSettings::set_Return(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::classDecl()
+const QByteArray & CppSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool CppSettings::set_ClassDecl(Q3CString v)
+bool CppSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -438,14 +438,14 @@ bool CppSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::externalClassDecl()
+const QByteArray & CppSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool CppSettings::set_ExternalClassDecl(Q3CString v)
+bool CppSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -457,14 +457,14 @@ bool CppSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::structDecl()
+const QByteArray & CppSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool CppSettings::set_StructDecl(Q3CString v)
+bool CppSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -476,14 +476,14 @@ bool CppSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::unionDecl()
+const QByteArray & CppSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool CppSettings::set_UnionDecl(Q3CString v)
+bool CppSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -495,14 +495,14 @@ bool CppSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumDecl()
+const QByteArray & CppSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool CppSettings::set_EnumDecl(Q3CString v)
+bool CppSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -514,14 +514,14 @@ bool CppSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::typedefDecl()
+const QByteArray & CppSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool CppSettings::set_TypedefDecl(Q3CString v)
+bool CppSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -533,14 +533,14 @@ bool CppSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::attributeDecl()
+const QByteArray & CppSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool CppSettings::set_AttributeDecl(Q3CString v)
+bool CppSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -552,14 +552,14 @@ bool CppSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::enumItemDecl()
+const QByteArray & CppSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool CppSettings::set_EnumItemDecl(Q3CString v)
+bool CppSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -571,7 +571,7 @@ bool CppSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::relationDecl(bool by_value, const char * multiplicity)
+const QByteArray & CppSettings::relationDecl(bool by_value, const char * multiplicity)
 {
     read_if_needed_();
 
@@ -590,14 +590,14 @@ bool CppSettings::set_RelationDecl(bool by_value, const char * multiplicity, con
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDecl()
+const QByteArray & CppSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool CppSettings::set_OperationDecl(Q3CString v)
+bool CppSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -609,14 +609,14 @@ bool CppSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::operationDef()
+const QByteArray & CppSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool CppSettings::set_OperationDef(Q3CString v)
+bool CppSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -666,14 +666,14 @@ bool CppSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::getName()
+const QByteArray & CppSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool CppSettings::set_GetName(Q3CString v)
+bool CppSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -761,14 +761,14 @@ bool CppSettings::set_SetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & CppSettings::setName()
+const QByteArray & CppSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool CppSettings::set_SetName(Q3CString v)
+bool CppSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(cppSettingsCmd, setCppSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -820,51 +820,51 @@ bool CppSettings::set_IsSetParamConst(bool v)
 
 bool CppSettings::_defined;
 
-Q3CString CppSettings::_root;
+QByteArray CppSettings::_root;
 
-Q3CString CppSettings::_in;
+QByteArray CppSettings::_in;
 
-Q3CString CppSettings::_out;
+QByteArray CppSettings::_out;
 
-Q3CString CppSettings::_inout;
+QByteArray CppSettings::_inout;
 
-Q3CString CppSettings::_return;
+QByteArray CppSettings::_return;
 
-Q3CString CppSettings::_enum_in;
+QByteArray CppSettings::_enum_in;
 
-Q3CString CppSettings::_enum_out;
+QByteArray CppSettings::_enum_out;
 
-Q3CString CppSettings::_enum_inout;
+QByteArray CppSettings::_enum_inout;
 
-Q3CString CppSettings::_enum_return;
+QByteArray CppSettings::_enum_return;
 
-Q3CString CppSettings::_class_decl;
+QByteArray CppSettings::_class_decl;
 
-Q3CString CppSettings::_external_class_decl;
+QByteArray CppSettings::_external_class_decl;
 
-Q3CString CppSettings::_struct_decl;
+QByteArray CppSettings::_struct_decl;
 
-Q3CString CppSettings::_union_decl;
+QByteArray CppSettings::_union_decl;
 
-Q3CString CppSettings::_enum_decl;
+QByteArray CppSettings::_enum_decl;
 
-Q3CString CppSettings::_typedef_decl;
+QByteArray CppSettings::_typedef_decl;
 
-Q3CString CppSettings::_attr_decl;
+QByteArray CppSettings::_attr_decl;
 
-Q3CString CppSettings::_enum_item_decl;
+QByteArray CppSettings::_enum_item_decl;
 
-Q3CString CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
+QByteArray CppSettings::_rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-Q3CString CppSettings::_oper_decl;
+QByteArray CppSettings::_oper_decl;
 
-Q3CString CppSettings::_oper_def;
+QByteArray CppSettings::_oper_def;
 
 bool CppSettings::_force_oper_throw;
 
 aVisibility CppSettings::_get_visibility;
 
-Q3CString CppSettings::_get_name;
+QByteArray CppSettings::_get_name;
 
 bool CppSettings::_is_get_inline;
 
@@ -874,30 +874,30 @@ bool CppSettings::_is_get_value_const;
 
 aVisibility CppSettings::_set_visibility;
 
-Q3CString CppSettings::_set_name;
+QByteArray CppSettings::_set_name;
 
 bool CppSettings::_is_set_inline;
 
 bool CppSettings::_is_set_param_const;
 
-Q3CString CppSettings::_h_content;
+QByteArray CppSettings::_h_content;
 
-Q3CString CppSettings::_src_content;
+QByteArray CppSettings::_src_content;
 
-Q3CString CppSettings::_h_ext;
+QByteArray CppSettings::_h_ext;
 
-Q3CString CppSettings::_src_ext;
+QByteArray CppSettings::_src_ext;
 
 bool CppSettings::_incl_with_path;
 
-Q3Dict<Q3CString> CppSettings::_map_includes;
+QHash<QByteArray,QByteArray*>  CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -923,13 +923,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/genplugouts/xmi/CppSettings.h b/genplugouts/xmi/CppSettings.h
index 24507102f..c45c291be 100644
--- a/genplugouts/xmi/CppSettings.h
+++ b/genplugouts/xmi/CppSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHCPP
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -31,100 +31,100 @@ class CppSettings : public UmlSettings
     // returns the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the C++ type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the C++ type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(Q3CString s);
+    static QByteArray relationStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the C++ stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the C++ one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the C++ type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static Q3CString rootDir();
+    static QByteArray rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default header file content
-    static Q3CString headerContent();
+    static QByteArray headerContent();
 
     // set the default header file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderContent(Q3CString v);
+    static bool set_HeaderContent(QByteArray v);
 
     // returns the default source file content
-    static Q3CString sourceContent();
+    static QByteArray sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the header files produced by the
     // C++ code generator
-    static Q3CString headerExtension();
+    static QByteArray headerExtension();
 
     // set the extension of the header files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_HeaderExtension(Q3CString v);
+    static bool set_HeaderExtension(QByteArray v);
 
     // returns the extension of the source files produced by the
     // C++ code generator
-    static Q3CString sourceExtension();
+    static QByteArray sourceExtension();
 
     // set the extension of the source files produced by the
     // C++ code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // indicates to the code generator if the #include may specify
     // the path of just the file's name
@@ -138,70 +138,70 @@ class CppSettings : public UmlSettings
 
     // returns the default operation 'in' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumIn();
+    static const QByteArray & enumIn();
 
     // set the default operation 'in' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumIn(Q3CString v);
+    static bool set_EnumIn(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumOut();
+    static const QByteArray & enumOut();
 
     // set the default operation 'out' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumOut(Q3CString v);
+    static bool set_EnumOut(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is an enum
-    static const Q3CString & enumInout();
+    static const QByteArray & enumInout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumInout(Q3CString v);
+    static bool set_EnumInout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString enumReturn();
+    static QByteArray enumReturn();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumReturn(Q3CString v);
+    static bool set_EnumReturn(QByteArray v);
 
     // returns the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & in();
+    static const QByteArray & in();
 
     // set the default operation 'in' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_In(Q3CString v);
+    static bool set_In(QByteArray v);
 
     // returns the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & out();
+    static const QByteArray & out();
 
     // set the default operation 'out' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Out(Q3CString v);
+    static bool set_Out(QByteArray v);
 
     // returns the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
     // first 'Generation settings' tab
-    static const Q3CString & inout();
+    static const QByteArray & inout();
 
     // set the default operation 'inout' parameter specification
     // in case its type is not an enum or a type specified in the
@@ -209,83 +209,83 @@ class CppSettings : public UmlSettings
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_Inout(Q3CString v);
+    static bool set_Inout(QByteArray v);
 
     // return the default operation value type form
-    static Q3CString Return();
+    static QByteArray Return();
 
     // set the default operation value type form
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Return(Q3CString v);
+    static bool set_Return(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
-    static const Q3CString & relationDecl(bool by_value, const char * multiplicity);
+    static const QByteArray & relationDecl(bool by_value, const char * multiplicity);
 
     // set the default definition of a relation depending on it is an
     // aggregation by value or not and the multiplicity, given in argument.
@@ -294,20 +294,20 @@ class CppSettings : public UmlSettings
     static bool set_RelationDecl(bool by_value, const char * multiplicity, const char * v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // return TRUE if the operations profile must contain 'throw()'
     // when the operations does not have exception
@@ -331,13 +331,13 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns if a 'get' operation generated through the attribute
     // and relation 'add get operation' menu is inline by default
@@ -383,14 +383,14 @@ class CppSettings : public UmlSettings
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is inline by default
@@ -421,51 +421,51 @@ class CppSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _in;
+    static QByteArray _in;
 
-    static Q3CString _out;
+    static QByteArray _out;
 
-    static Q3CString _inout;
+    static QByteArray _inout;
 
-    static Q3CString _return;
+    static QByteArray _return;
 
-    static Q3CString _enum_in;
+    static QByteArray _enum_in;
 
-    static Q3CString _enum_out;
+    static QByteArray _enum_out;
 
-    static Q3CString _enum_inout;
+    static QByteArray _enum_inout;
 
-    static Q3CString _enum_return;
+    static QByteArray _enum_return;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[2/*relation kind*/][3/*multiplicity*/];
+    static QByteArray _rel_decl[2/*relation kind*/][3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static bool _force_oper_throw;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_inline;
 
@@ -475,23 +475,23 @@ class CppSettings : public UmlSettings
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_inline;
 
     static bool _is_set_param_const;
 
-    static Q3CString _h_content;
+    static QByteArray _h_content;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _h_ext;
+    static QByteArray _h_ext;
 
-    static Q3CString _src_ext;
+    static QByteArray _src_ext;
 
     static bool _incl_with_path;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/xmi/Dialog.cpp b/genplugouts/xmi/Dialog.cpp
index b4146a885..5138aa657 100644
--- a/genplugouts/xmi/Dialog.cpp
+++ b/genplugouts/xmi/Dialog.cpp
@@ -6,112 +6,115 @@
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
-#include <q3hbox.h>
+#include <hhbox.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
-#include <q3buttongroup.h>
+#include <bbuttongroup.h>
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3VBoxLayout>
+#include <QByteArray>
+#include <QVBoxLayout>
 
 #include "SmallPushButton.h"
 
-Dialog::Dialog(Q3CString & path, Q3CString & encoding, Q3CString & genview, int & taggedvalue, Language & lang)
-    : QDialog(0, 0, TRUE), _path(path), _encoding(encoding), _genview(genview), _taggedvalue(taggedvalue), _lang(lang)
+Dialog::Dialog(QByteArray & path, QByteArray & encoding, QByteArray & genview, int & taggedvalue, Language & lang)
+    : QDialog(0), _path(path), _encoding(encoding), _genview(genview), _taggedvalue(taggedvalue), _lang(lang)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBox * htab;
-
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    HHBox * htab;
+    setModal(true);
     vbox->setMargin(5);
 
     // get xmi pathname
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel("generated \nXMI file : ", htab);
+    htab->addWidget(new QLabel("generated \nXMI file : ", htab));
 
-    ed = new QLineEdit(htab);
+    htab->addWidget(ed = new QLineEdit(htab));
     ed->setText(_path);
 
-    new QLabel(" ", htab);
+    htab->addWidget(new QLabel(" ", htab));
 
-    SmallPushButton * br = new SmallPushButton("browse", htab);
+    SmallPushButton * br;
+    htab->addWidget(br = new SmallPushButton("browse", htab));
 
     connect(br, SIGNAL(clicked()), this, SLOT(browse()));
 
     // to choose encoding
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel("Encoding : ", htab);
+    htab->addWidget(new QLabel("Encoding : ", htab));
 
     QString charset = getenv("BOUML_CHARSET");
     int index = 0;
 
-    while ((index = charset.find('_')) != -1) {
+    while ((index = charset.indexOf('_')) != -1) {
         charset[index] = '-';
         index += 1;
     }
 
-    encoding_cb = new QComboBox(TRUE, htab);
-    encoding_cb->insertItem(QString(_encoding));
+    htab->addWidget(encoding_cb = new QComboBox(htab));
+    encoding_cb->setEditable(true);
+    encoding_cb->addItem(QString(_encoding));
 
-    if (!charset.isEmpty() && (_encoding != (const char *) charset))
-        encoding_cb->insertItem(charset);
+    if (!charset.isEmpty() && (_encoding != charset.toLatin1()))
+        encoding_cb->addItem(charset);
 
 #ifdef WIN32
 
     if ((_encoding != "windows-1252") && (charset != "windows-1252"))
-        encoding_cb->insertItem("windows-1252");
+        encoding_cb->addItem("windows-1252");
 
     if ((_encoding != "ISO-8859-1") && (charset != "ISO-8859-1"))
-        encoding_cb->insertItem("ISO-8859-1");
+        encoding_cb->addItem("ISO-8859-1");
 
 #else
 
     if ((_encoding != "ISO-8859-1") && (charset != "ISO-8859-1"))
-        encoding_cb->insertItem("ISO-8859-1");
+        encoding_cb->addItem("ISO-8859-1");
 
     if ((_encoding != "windows-1252") && (charset != "windows-1252"))
-        encoding_cb->insertItem("windows-1252");
+        encoding_cb->addItem("windows-1252");
 
 #endif
 
     // generate view checkbox
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    gen_cb = new QCheckBox("Generate views as package", htab);
+    htab->addWidget(gen_cb = new QCheckBox("Generate views as package", htab));
 
     if (_genview == "yes")
         gen_cb->setChecked(TRUE);
 
     // tagged value generation mode
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    Q3ButtonGroup * bg =
-        new Q3ButtonGroup(3, Qt::Vertical, "Tagged values generation", htab);
+    BButtonGroup * bg;
+    htab->addWidget(bg=
+        new BButtonGroup(3, Qt::Vertical, "Tagged values generation", htab));
 
-    tg_0 = new QRadioButton("Not generated", bg);
-    tg_1 = new QRadioButton("<UML:TaggedValue tag=\"..\" value=\"..\"/>", bg);
-    tg_2 = new QRadioButton("<UML:TaggedValue>\n"
+    bg->addWidget(tg_0 = new QRadioButton("Not generated", bg));
+    bg->addWidget(tg_1 = new QRadioButton("<UML:TaggedValue tag=\"..\" value=\"..\"/>", bg));
+    bg->addWidget(tg_2 = new QRadioButton("<UML:TaggedValue>\n"
                             "    <Uml:TaggedValue.tag>..</Uml:TaggedValue.tag>\n"
                             "    <Uml:TaggedValue.value>..</Uml:TaggedValue.value>\n"
                             "</UML:TaggedValue>",
-                            bg);
+                            bg));
 
     switch (taggedvalue) {
     case 1:
@@ -129,19 +132,23 @@ Dialog::Dialog(Q3CString & path, Q3CString & encoding, Q3CString & genview, int
 
     // uml , c++, java, cancel buttons
 
-    htab = new Q3HBox(this);
+    htab = new HHBox(this);
     htab->setMargin(5);
     vbox->addWidget(htab);
 
-    new QLabel(htab);
-    QPushButton * uml = new QPushButton("&Uml", htab);
-    new QLabel(htab);
-    QPushButton * cpp = new QPushButton("&C++", htab);
-    new QLabel(htab);
-    QPushButton * java = new QPushButton("&Java", htab);
-    new QLabel(htab);
-    QPushButton * cancel = new QPushButton("&Cancel", htab);
-    new QLabel(htab);
+    htab->addWidget(new QLabel(htab));
+    QPushButton * uml;
+    htab->addWidget(uml = new QPushButton("&Uml", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * cpp;
+    htab->addWidget(cpp = new QPushButton("&C++", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * java;
+    htab->addWidget(java = new QPushButton("&Java", htab));
+    htab->addWidget(new QLabel(htab));
+    QPushButton * cancel;
+    htab->addWidget(cancel = new QPushButton("&Cancel", htab));
+    htab->addWidget(new QLabel(htab));
     QSize bs(cancel->sizeHint());
 
     uml->setFixedSize(bs);
@@ -156,10 +163,10 @@ Dialog::Dialog(Q3CString & path, Q3CString & encoding, Q3CString & genview, int
 
 void Dialog::browse()
 {
-    QString s = Q3FileDialog::getSaveFileName(_path, "*.xmi", 0);
+    QString s = QFileDialog::getSaveFileName(0, "",_path, "*.xmi");
 
     if (! s.isEmpty()) {
-        if (s.right(4).lower() != ".xmi")
+        if (s.right(4).toLower() != ".xmi")
             ed->setText(s + ".xmi");
         else
             ed->setText(s);
@@ -187,8 +194,8 @@ void Dialog::accept_java()
 
 void Dialog::accept()
 {
-    _path = ed->text();
-    _encoding = encoding_cb->currentText();
+    _path = ed->text().toLatin1();
+    _encoding = encoding_cb->currentText().toLatin1();
     _genview = (gen_cb->isChecked()) ? "yes" : "no";
 
     if (tg_0->isChecked())
diff --git a/genplugouts/xmi/Dialog.h b/genplugouts/xmi/Dialog.h
index 086bbb422..b3d80a36f 100644
--- a/genplugouts/xmi/Dialog.h
+++ b/genplugouts/xmi/Dialog.h
@@ -2,7 +2,7 @@
 #define _DIALOG_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "Language.h"
 
 #include <qdialog.h>
@@ -17,15 +17,15 @@ class Dialog : public QDialog
 {
     Q_OBJECT
 public:
-    Dialog(Q3CString & path, Q3CString & encoding, Q3CString & genview, int & taggedvalue, Language & lang);
+    Dialog(QByteArray & path, QByteArray & encoding, QByteArray & genview, int & taggedvalue, Language & lang);
 
 
 protected:
-    Q3CString & _path;
+    QByteArray & _path;
 
-    Q3CString & _encoding;
+    QByteArray & _encoding;
 
-    Q3CString & _genview;
+    QByteArray & _genview;
 
     int & _taggedvalue;
 
diff --git a/genplugouts/xmi/FileOut.cpp b/genplugouts/xmi/FileOut.cpp
index 0b5749d6f..729df25fe 100644
--- a/genplugouts/xmi/FileOut.cpp
+++ b/genplugouts/xmi/FileOut.cpp
@@ -2,17 +2,17 @@
 #include "FileOut.h"
 #include "UmlItem.h"
 
-#include <q3textstream.h>
+#include <qtextstream.h>
 #include <qfile.h>
 //Added by qt3to4:
-#include <Q3CString>
-FileOut::FileOut(QFile * fp) : Q3TextStream(fp), _indent(0)
+#include <QByteArray>
+FileOut::FileOut(QFile * fp) : QTextStream(fp), _indent(0)
 {
 }
 
 void FileOut::indent()
 {
-    Q3TextStream & ts = *this;
+    QTextStream & ts = *this;
 
     for (int n = _indent; n > 0; n -= 1)
         ts << '\t';
@@ -20,63 +20,63 @@ void FileOut::indent()
 
 void FileOut::id(const UmlItem * x)
 {
-    ((Q3TextStream &) *this) << " xmi.id=\"BOUML_" << ((void *) x) << '"';
+    ((QTextStream &) *this) << " xmi.id=\"BOUML_" << ((void *) x) << '"';
 
 }
 
 void FileOut::idref(const UmlItem * x)
 {
-    ((Q3TextStream &) *this) << " xmi.idref=\"BOUML_" << ((void *) x) << '"';
+    ((QTextStream &) *this) << " xmi.idref=\"BOUML_" << ((void *) x) << '"';
 
 }
 
-void FileOut::idref(Q3CString s, const UmlItem * x)
+void FileOut::idref(QByteArray s, const UmlItem * x)
 {
     QString keys;
     {
-        Q3TextStream keyst(&keys, QIODevice::WriteOnly);
+        QTextStream keyst(&keys, QIODevice::WriteOnly);
 
         keyst << ((void *) x) << "_" << s;
     }
 
-    QMap<Q3CString, int>::ConstIterator it =
-        _modifiedtypes.find((const char *) keys);
+    QMap<QByteArray, int>::ConstIterator it =
+        _modifiedtypes.find((const char *) keys.toLatin1().constData());
 
     if (it == _modifiedtypes.end())
-        it = _modifiedtypes.insert((const char *) keys, _modifiedtypes.count());
+        it = _modifiedtypes.insert((const char *) keys.toLatin1().constData(), _modifiedtypes.count());
 
-    ((Q3TextStream &) *this) << " xmi.idref=\"BOUML_basedontype_"
-                             << it.data() << '"';
+    ((QTextStream &) *this) << " xmi.idref=\"BOUML_basedontype_"
+                             << it.value() << '"';
 
 }
 
 void FileOut::ref(const UmlItem * x)
 {
-    ((Q3TextStream &) *this) << "BOUML_" << ((void *) x);
+    ((QTextStream &) *this) << "BOUML_" << ((void *) x);
 }
 
-void FileOut::idref_datatype(const Q3CString & t)
+void FileOut::idref_datatype(const QByteArray & t)
 {
-    QMap<Q3CString, int>::ConstIterator it = _datatypes.find(t);
+    QMap<QByteArray, int>::ConstIterator it = _datatypes.find(t);
 
     if (it == _datatypes.end())
         it = _datatypes.insert(t, _datatypes.count());
 
-    ((Q3TextStream &) *this) << " xmi.idref=\"BOUML_datatype_"
-                             << it.data() << '"';
+    ((QTextStream &) *this) << " xmi.idref=\"BOUML_datatype_"
+                             << it.value() << '"';
 
 }
 
 void FileOut::define_datatypes(int taggedvalue_mode)
 {
-    QMap<Q3CString, int>::ConstIterator it;
+    QMap<QByteArray, int>::ConstIterator it;
 
     for (it = _datatypes.begin();
          it != _datatypes.end();
          ++it) {
         indent();
         (*this) << "<UML:DataType xmi.id=\"BOUML_datatype_"
-                << it.data() << "\" name = \"";
+                << it.value() << "\" name = \"";
         quote(it.key());
         (*this) << "\" visibility=\"private\" isRoot=\"false\" isLeaf=\"false\" isAbstract=\"false\"/>\n";
     }
@@ -84,12 +84,12 @@ void FileOut::define_datatypes(int taggedvalue_mode)
     for (it = _modifiedtypes.begin();
          it != _modifiedtypes.end();
          ++it) {
-        Q3CString k = it.key();
-        int index = k.find('_');
+        QByteArray k = it.key();
+        int index = k.indexOf('_');
 
         indent();
         (*this) << "<UML:DataType xmi.id=\"BOUML_basedontype_"
-                << it.data() << "\" name = \"";
+                << it.value() << "\" name = \"";
         quote(k.mid(index + 1));
         (*this) << "\" visibility=\"private\" isRoot=\"false\" isLeaf=\"false\" isAbstract=\"false\">\n";
 
diff --git a/genplugouts/xmi/FileOut.h b/genplugouts/xmi/FileOut.h
index 5ba3451ae..d7439414b 100644
--- a/genplugouts/xmi/FileOut.h
+++ b/genplugouts/xmi/FileOut.h
@@ -2,15 +2,15 @@
 #define _FILEOUT_H
 
 
-#include <q3textstream.h>
+#include <qtextstream.h>
 #include <qmap.h>
-#include <q3cstring.h>
+#include <QByteArray>
 
 class QFile;
 class UmlItem;
 
 //QTextOStream + usefull operations
-class FileOut : public Q3TextStream
+class FileOut : public QTextStream
 {
 public:
     FileOut(QFile * fp);
@@ -25,11 +25,11 @@ class FileOut : public Q3TextStream
 
     void idref(const UmlItem * x);
 
-    void idref(Q3CString s, const UmlItem * x);
+    void idref(QByteArray s, const UmlItem * x);
 
     void ref(const UmlItem * x);
 
-    void idref_datatype(const Q3CString & t);
+    void idref_datatype(const QByteArray & t);
 
     void define_datatypes(int taggedvalue_mode);
 
@@ -39,9 +39,9 @@ class FileOut : public Q3TextStream
 protected:
     int _indent;
 
-    QMap<Q3CString, int> _datatypes;
+    QMap<QByteArray, int> _datatypes;
 
-    QMap<Q3CString, int> _modifiedtypes;
+    QMap<QByteArray, int> _modifiedtypes;
 
 };
 
diff --git a/genplugouts/xmi/IdlSettings.cpp b/genplugouts/xmi/IdlSettings.cpp
index b7158a61e..6f4e9428c 100644
--- a/genplugouts/xmi/IdlSettings.cpp
+++ b/genplugouts/xmi/IdlSettings.cpp
@@ -10,7 +10,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool IdlSettings::useDefaults()
 {
     UmlCom::send_cmd(idlSettingsCmd, getIdlUseDefaultsCmd);
@@ -23,21 +23,21 @@ bool IdlSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString IdlSettings::type(Q3CString s)
+QByteArray IdlSettings::type(QByteArray s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_Type(Q3CString s, Q3CString v)
+bool IdlSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,28 +50,28 @@ bool IdlSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::umlType(Q3CString s)
+QByteArray IdlSettings::umlType(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::idl);
 }
 
-Q3CString IdlSettings::relationStereotype(const Q3CString & s)
+QByteArray IdlSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -84,28 +84,28 @@ bool IdlSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::relationUmlStereotype(Q3CString s)
+QByteArray IdlSettings::relationUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::classStereotype(Q3CString s)
+QByteArray IdlSettings::classStereotype(QByteArray s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
 
-bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool IdlSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -118,31 +118,31 @@ bool IdlSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString IdlSettings::classUmlStereotype(Q3CString s)
+QByteArray IdlSettings::classUmlStereotype(QByteArray s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::idl);
 }
 
-Q3CString IdlSettings::include(Q3CString s)
+QByteArray IdlSettings::include(QByteArray s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_includes[s];
+    QByteArray * r = _map_includes[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool IdlSettings::set_Include(Q3CString s, Q3CString v)
+bool IdlSettings::set_Include(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_includes.take(s);
+        QByteArray * r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new Q3CString(v));
+            _map_includes.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -153,14 +153,14 @@ bool IdlSettings::set_Include(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::rootDir()
+const QByteArray & IdlSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool IdlSettings::set_RootDir(Q3CString v)
+bool IdlSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRootDirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -172,14 +172,14 @@ bool IdlSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceContent()
+const QByteArray & IdlSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool IdlSettings::set_SourceContent(Q3CString v)
+bool IdlSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -191,14 +191,14 @@ bool IdlSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::sourceExtension()
+const QByteArray & IdlSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool IdlSettings::set_SourceExtension(Q3CString v)
+bool IdlSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -210,14 +210,14 @@ bool IdlSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::interfaceDecl()
+const QByteArray & IdlSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool IdlSettings::set_InterfaceDecl(Q3CString v)
+bool IdlSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -229,14 +229,14 @@ bool IdlSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeDecl()
+const QByteArray & IdlSettings::valuetypeDecl()
 {
     read_if_needed_();
 
     return _valuetype_decl;
 }
 
-bool IdlSettings::set_ValuetypeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -248,14 +248,14 @@ bool IdlSettings::set_ValuetypeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::externalClassDecl()
+const QByteArray & IdlSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool IdlSettings::set_ExternalClassDecl(Q3CString v)
+bool IdlSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -267,14 +267,14 @@ bool IdlSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::structDecl()
+const QByteArray & IdlSettings::structDecl()
 {
     read_if_needed_();
 
     return _struct_decl;
 }
 
-bool IdlSettings::set_StructDecl(Q3CString v)
+bool IdlSettings::set_StructDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlStructDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -286,14 +286,14 @@ bool IdlSettings::set_StructDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::typedefDecl()
+const QByteArray & IdlSettings::typedefDecl()
 {
     read_if_needed_();
 
     return _typedef_decl;
 }
 
-bool IdlSettings::set_TypedefDecl(Q3CString v)
+bool IdlSettings::set_TypedefDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypedefDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -305,14 +305,14 @@ bool IdlSettings::set_TypedefDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::exceptionDecl()
+const QByteArray & IdlSettings::exceptionDecl()
 {
     read_if_needed_();
 
     return _exception_decl;
 }
 
-bool IdlSettings::set_ExceptionDecl(Q3CString v)
+bool IdlSettings::set_ExceptionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlExceptionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -324,14 +324,14 @@ bool IdlSettings::set_ExceptionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionDecl()
+const QByteArray & IdlSettings::unionDecl()
 {
     read_if_needed_();
 
     return _union_decl;
 }
 
-bool IdlSettings::set_UnionDecl(Q3CString v)
+bool IdlSettings::set_UnionDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -343,14 +343,14 @@ bool IdlSettings::set_UnionDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumDecl()
+const QByteArray & IdlSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool IdlSettings::set_EnumDecl(Q3CString v)
+bool IdlSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -362,14 +362,14 @@ bool IdlSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::attributeDecl()
+const QByteArray & IdlSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool IdlSettings::set_AttributeDecl(Q3CString v)
+bool IdlSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -381,14 +381,14 @@ bool IdlSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeAttributeDecl()
+const QByteArray & IdlSettings::valuetypeAttributeDecl()
 {
     read_if_needed_();
 
     return _valuetype_attr_decl;
 }
 
-bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
+bool IdlSettings::set_ValuetypeAttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -400,14 +400,14 @@ bool IdlSettings::set_ValuetypeAttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionItemDecl()
+const QByteArray & IdlSettings::unionItemDecl()
 {
     read_if_needed_();
 
     return _union_item_decl;
 }
 
-bool IdlSettings::set_UnionItemDecl(Q3CString v)
+bool IdlSettings::set_UnionItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -419,14 +419,14 @@ bool IdlSettings::set_UnionItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::enumItemDecl()
+const QByteArray & IdlSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool IdlSettings::set_EnumItemDecl(Q3CString v)
+bool IdlSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -438,14 +438,14 @@ bool IdlSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::constDecl()
+const QByteArray & IdlSettings::constDecl()
 {
     read_if_needed_();
 
     return _const_decl;
 }
 
-bool IdlSettings::set_ConstDecl(Q3CString v)
+bool IdlSettings::set_ConstDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlConstDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -457,14 +457,14 @@ bool IdlSettings::set_ConstDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::relationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationDeclCmd, multiplicity, v);
 
@@ -476,14 +476,14 @@ bool IdlSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::valuetypeRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _valuetype_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlValuetypeRelationDeclCmd, multiplicity, v);
 
@@ -495,14 +495,14 @@ bool IdlSettings::set_ValuetypeRelationDecl(const char * multiplicity, Q3CString
         return FALSE;
 }
 
-const Q3CString & IdlSettings::unionRelationDecl(const char * multiplicity)
+const QByteArray & IdlSettings::unionRelationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _union_rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
+bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlUnionRelationDeclCmd, multiplicity, v);
 
@@ -514,14 +514,14 @@ bool IdlSettings::set_UnionRelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::operationDecl()
+const QByteArray & IdlSettings::operationDecl()
 {
     read_if_needed_();
 
     return _oper_decl;
 }
 
-bool IdlSettings::set_OperationDecl(Q3CString v)
+bool IdlSettings::set_OperationDecl(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlOperationDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -533,14 +533,14 @@ bool IdlSettings::set_OperationDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::getName()
+const QByteArray & IdlSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool IdlSettings::set_GetName(Q3CString v)
+bool IdlSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -552,14 +552,14 @@ bool IdlSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & IdlSettings::setName()
+const QByteArray & IdlSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool IdlSettings::set_SetName(Q3CString v)
+bool IdlSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(idlSettingsCmd, setIdlSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -592,60 +592,60 @@ bool IdlSettings::set_IsSetOneway(bool v)
 
 bool IdlSettings::_defined;
 
-Q3CString IdlSettings::_root;
+QByteArray IdlSettings::_root;
 
-Q3CString IdlSettings::_interface_decl;
+QByteArray IdlSettings::_interface_decl;
 
-Q3CString IdlSettings::_valuetype_decl;
+QByteArray IdlSettings::_valuetype_decl;
 
-Q3CString IdlSettings::_struct_decl;
+QByteArray IdlSettings::_struct_decl;
 
-Q3CString IdlSettings::_typedef_decl;
+QByteArray IdlSettings::_typedef_decl;
 
-Q3CString IdlSettings::_exception_decl;
+QByteArray IdlSettings::_exception_decl;
 
-Q3CString IdlSettings::_union_decl;
+QByteArray IdlSettings::_union_decl;
 
-Q3CString IdlSettings::_enum_decl;
+QByteArray IdlSettings::_enum_decl;
 
-Q3CString IdlSettings::_external_class_decl;
+QByteArray IdlSettings::_external_class_decl;
 
-Q3CString IdlSettings::_attr_decl;
+QByteArray IdlSettings::_attr_decl;
 
-Q3CString IdlSettings::_valuetype_attr_decl;
+QByteArray IdlSettings::_valuetype_attr_decl;
 
-Q3CString IdlSettings::_union_item_decl;
+QByteArray IdlSettings::_union_item_decl;
 
-Q3CString IdlSettings::_enum_item_decl;
+QByteArray IdlSettings::_enum_item_decl;
 
-Q3CString IdlSettings::_const_decl;
+QByteArray IdlSettings::_const_decl;
 
-Q3CString IdlSettings::_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_valuetype_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_union_rel_decl[3/*multiplicity*/];
+QByteArray IdlSettings::_union_rel_decl[3/*multiplicity*/];
 
-Q3CString IdlSettings::_oper_decl;
+QByteArray IdlSettings::_oper_decl;
 
-Q3CString IdlSettings::_get_name;
+QByteArray IdlSettings::_get_name;
 
-Q3CString IdlSettings::_set_name;
+QByteArray IdlSettings::_set_name;
 
 bool IdlSettings::_is_set_oneway;
 
-Q3CString IdlSettings::_src_content;
+QByteArray IdlSettings::_src_content;
 
-Q3CString IdlSettings::_ext;
+QByteArray IdlSettings::_ext;
 
-Q3Dict<Q3CString> IdlSettings::_map_includes;
+QHash<QByteArray,QByteArray*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -667,13 +667,13 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_includes.insert(t, new Q3CString(i));
+        _map_includes.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/xmi/IdlSettings.h b/genplugouts/xmi/IdlSettings.h
index aa23439f0..0912b3311 100644
--- a/genplugouts/xmi/IdlSettings.h
+++ b/genplugouts/xmi/IdlSettings.h
@@ -4,9 +4,9 @@
 #ifdef WITHIDL
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -31,244 +31,244 @@ class IdlSettings : public UmlSettings
     // returns the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(Q3CString s);
+    static QByteArray type(QByteArray s);
 
     // set the IDL type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the IDL type given in argument
-    static Q3CString umlType(Q3CString s);
+    static QByteArray umlType(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString relationUmlStereotype(Q3CString s);
+    static QByteArray relationUmlStereotype(QByteArray s);
 
     // returns the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(Q3CString s);
+    static QByteArray classStereotype(QByteArray s);
 
     // set the IDL stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the IDL one given in argument
-    static Q3CString classUmlStereotype(Q3CString s);
+    static QByteArray classUmlStereotype(QByteArray s);
 
     // returns the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
-    static Q3CString include(Q3CString s);
+    static QByteArray include(QByteArray s);
 
     // set the #include or other form specified in the last
     // 'Generation settings' tab for the Idl type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Include(Q3CString s, Q3CString v);
+    static bool set_Include(QByteArray s, QByteArray v);
 
     // returns the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     // set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the files produced by the Idl code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the files produced by the Idl code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of a valuetype
-    static const Q3CString & valuetypeDecl();
+    static const QByteArray & valuetypeDecl();
 
     // set the default definition of a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeDecl(Q3CString v);
+    static bool set_ValuetypeDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of a struct
-    static const Q3CString & structDecl();
+    static const QByteArray & structDecl();
 
     // set the default definition of a struct
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_StructDecl(Q3CString v);
+    static bool set_StructDecl(QByteArray v);
 
     // returns the default definition of a typedef
-    static const Q3CString & typedefDecl();
+    static const QByteArray & typedefDecl();
 
     // set the default definition of a typedef
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_TypedefDecl(Q3CString v);
+    static bool set_TypedefDecl(QByteArray v);
 
     // returns the default definition of an exception
-    static const Q3CString & exceptionDecl();
+    static const QByteArray & exceptionDecl();
 
     // set the default definition of an exception
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExceptionDecl(Q3CString v);
+    static bool set_ExceptionDecl(QByteArray v);
 
     // returns the default definition of an union
-    static const Q3CString & unionDecl();
+    static const QByteArray & unionDecl();
 
     // set the default definition of an union
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionDecl(Q3CString v);
+    static bool set_UnionDecl(QByteArray v);
 
     // returns the default definition of an enum
-    static const Q3CString & enumDecl();
+    static const QByteArray & enumDecl();
 
     // set the default definition of an enum
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an attribute
     // placed in a valuetype
-    static const Q3CString & valuetypeAttributeDecl();
+    static const QByteArray & valuetypeAttributeDecl();
 
     // set the default definition of an attribute
     // placed in a valuetype
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeAttributeDecl(Q3CString v);
+    static bool set_ValuetypeAttributeDecl(QByteArray v);
 
     // returns the default definition of an union item
-    static const Q3CString & unionItemDecl();
+    static const QByteArray & unionItemDecl();
 
     // set the default definition of an union item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionItemDecl(Q3CString v);
+    static bool set_UnionItemDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumItemDecl();
+    static const QByteArray & enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a constant attribute
-    static const Q3CString & constDecl();
+    static const QByteArray & constDecl();
 
     // set the default definition of a constant attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ConstDecl(Q3CString v);
+    static bool set_ConstDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
-    static const Q3CString & valuetypeRelationDecl(const char * multiplicity);
+    static const QByteArray & valuetypeRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in a valuetype
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ValuetypeRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_ValuetypeRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of a relation in an union
     // depending on the multiplicity given in argument.
-    static const Q3CString & unionRelationDecl(const char * multiplicity);
+    static const QByteArray & unionRelationDecl(const char * multiplicity);
 
     // set the default definition of a relation in an union
     // depending on the multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_UnionRelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_UnionRelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default declaration of an operation
-    static const Q3CString & operationDecl();
+    static const QByteArray & operationDecl();
 
     // set the default declaration of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDecl(Q3CString v);
+    static bool set_OperationDecl(QByteArray v);
 
     // returns the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated through
     // the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     // returns if a 'set' operation generated through the attribute
     // and relation 'add set operation' menu is oneway by default
@@ -287,53 +287,53 @@ class IdlSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _valuetype_decl;
+    static QByteArray _valuetype_decl;
 
-    static Q3CString _struct_decl;
+    static QByteArray _struct_decl;
 
-    static Q3CString _typedef_decl;
+    static QByteArray _typedef_decl;
 
-    static Q3CString _exception_decl;
+    static QByteArray _exception_decl;
 
-    static Q3CString _union_decl;
+    static QByteArray _union_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _valuetype_attr_decl;
+    static QByteArray _valuetype_attr_decl;
 
-    static Q3CString _union_item_decl;
+    static QByteArray _union_item_decl;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _const_decl;
+    static QByteArray _const_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _valuetype_rel_decl[3/*multiplicity*/];
+    static QByteArray _valuetype_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _union_rel_decl[3/*multiplicity*/];
+    static QByteArray _union_rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_decl;
+    static QByteArray _oper_decl;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_oneway;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_includes;
+    static QHash<QByteArray,QByteArray*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/xmi/JavaSettings.cpp b/genplugouts/xmi/JavaSettings.cpp
index 1ccab191c..a82658c1c 100644
--- a/genplugouts/xmi/JavaSettings.cpp
+++ b/genplugouts/xmi/JavaSettings.cpp
@@ -10,7 +10,7 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool JavaSettings::useDefaults()
 {
     UmlCom::send_cmd(javaSettingsCmd, getJavaUseDefaultsCmd);
@@ -23,21 +23,21 @@ bool JavaSettings::set_UseDefaults(bool y)
     return UmlCom::read_bool();
 }
 
-Q3CString JavaSettings::type(const Q3CString & s)
+QByteArray JavaSettings::type(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_Type(Q3CString s, Q3CString v)
+bool JavaSettings::set_Type(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -50,28 +50,28 @@ bool JavaSettings::set_Type(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::umlType(const Q3CString & s)
+QByteArray JavaSettings::umlType(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_type(s, &UmlBuiltin::java);
 }
 
-Q3CString JavaSettings::relationStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_RelationStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_stereotype(s);
@@ -84,28 +84,28 @@ bool JavaSettings::set_RelationStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::relationUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::relationUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_rel_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::classStereotype(const Q3CString & s)
+QByteArray JavaSettings::classStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
 
-bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
+bool JavaSettings::set_ClassStereotype(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -118,31 +118,31 @@ bool JavaSettings::set_ClassStereotype(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::classUmlStereotype(const Q3CString & s)
+QByteArray JavaSettings::classUmlStereotype(const QByteArray & s)
 {
     read_if_needed_();
 
     return UmlSettings::uml_class_stereotype(s, &UmlStereotype::java);
 }
 
-Q3CString JavaSettings::get_import(const Q3CString & s)
+QByteArray JavaSettings::get_import(const QByteArray & s)
 {
     read_if_needed_();
 
-    Q3CString * r = _map_imports[s];
+    QByteArray * r = _map_imports[s];
 
-    return (r) ? *r : Q3CString(0);
+    return (r) ? *r : QByteArray(0);
 }
 
-bool JavaSettings::set_Import(Q3CString s, Q3CString v)
+bool JavaSettings::set_Import(QByteArray s, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaImportCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        Q3CString * r = _map_imports.take(s);
+        QByteArray * r = _map_imports.take(s);
 
         if (!v.isEmpty())
-            _map_imports.insert(s, new Q3CString(v));
+            _map_imports.insert(s, new QByteArray(v));
 
         if (r)
             delete r;
@@ -153,14 +153,14 @@ bool JavaSettings::set_Import(Q3CString s, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::rootDir()
+const QByteArray & JavaSettings::rootDir()
 {
     read_if_needed_();
 
     return _root;
 }
 
-bool JavaSettings::set_RootDir(Q3CString v)
+bool JavaSettings::set_RootDir(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRootdirCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -172,14 +172,14 @@ bool JavaSettings::set_RootDir(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceContent()
+const QByteArray & JavaSettings::sourceContent()
 {
     read_if_needed_();
 
     return _src_content;
 }
 
-bool JavaSettings::set_SourceContent(Q3CString v)
+bool JavaSettings::set_SourceContent(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceContentCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -191,14 +191,14 @@ bool JavaSettings::set_SourceContent(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::sourceExtension()
+const QByteArray & JavaSettings::sourceExtension()
 {
     read_if_needed_();
 
     return _ext;
 }
 
-bool JavaSettings::set_SourceExtension(Q3CString v)
+bool JavaSettings::set_SourceExtension(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSourceExtensionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -210,14 +210,14 @@ bool JavaSettings::set_SourceExtension(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::classDecl()
+const QByteArray & JavaSettings::classDecl()
 {
     read_if_needed_();
 
     return _class_decl;
 }
 
-bool JavaSettings::set_ClassDecl(Q3CString v)
+bool JavaSettings::set_ClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -229,14 +229,14 @@ bool JavaSettings::set_ClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::externalClassDecl()
+const QByteArray & JavaSettings::externalClassDecl()
 {
     read_if_needed_();
 
     return _external_class_decl;
 }
 
-bool JavaSettings::set_ExternalClassDecl(Q3CString v)
+bool JavaSettings::set_ExternalClassDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaExternalClassDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -248,14 +248,14 @@ bool JavaSettings::set_ExternalClassDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternDecl()
+const QByteArray & JavaSettings::enumPatternDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_decl;
 }
 
-bool JavaSettings::set_EnumPatternDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -267,14 +267,14 @@ bool JavaSettings::set_EnumPatternDecl(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumDecl()
+QByteArray JavaSettings::enumDecl()
 {
     read_if_needed_();
 
     return _enum_decl;
 }
 
-bool JavaSettings::set_EnumDecl(Q3CString v)
+bool JavaSettings::set_EnumDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -286,14 +286,14 @@ bool JavaSettings::set_EnumDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::interfaceDecl()
+const QByteArray & JavaSettings::interfaceDecl()
 {
     read_if_needed_();
 
     return _interface_decl;
 }
 
-bool JavaSettings::set_InterfaceDecl(Q3CString v)
+bool JavaSettings::set_InterfaceDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaInterfaceDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -305,14 +305,14 @@ bool JavaSettings::set_InterfaceDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::attributeDecl()
+const QByteArray & JavaSettings::attributeDecl()
 {
     read_if_needed_();
 
     return _attr_decl;
 }
 
-bool JavaSettings::set_AttributeDecl(Q3CString v)
+bool JavaSettings::set_AttributeDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaAttributeDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -324,14 +324,14 @@ bool JavaSettings::set_AttributeDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemDecl()
+const QByteArray & JavaSettings::enumPatternItemDecl()
 {
     read_if_needed_();
 
     return _enum_pattern_item_decl;
 }
 
-bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
+bool JavaSettings::set_EnumPatternItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -343,14 +343,14 @@ bool JavaSettings::set_EnumPatternItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::enumPatternItemCase()
+const QByteArray & JavaSettings::enumPatternItemCase()
 {
     read_if_needed_();
 
     return _enum_pattern_item_case;
 }
 
-bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
+bool JavaSettings::set_EnumPatternItemCase(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumPatternItemCaseCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -362,14 +362,14 @@ bool JavaSettings::set_EnumPatternItemCase(Q3CString v)
         return FALSE;
 }
 
-Q3CString JavaSettings::enumItemDecl()
+QByteArray JavaSettings::enumItemDecl()
 {
     read_if_needed_();
 
     return _enum_item_decl;
 }
 
-bool JavaSettings::set_EnumItemDecl(Q3CString v)
+bool JavaSettings::set_EnumItemDecl(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaEnumItemDeclCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -381,14 +381,14 @@ bool JavaSettings::set_EnumItemDecl(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::relationDecl(const char * multiplicity)
+const QByteArray & JavaSettings::relationDecl(const char * multiplicity)
 {
     read_if_needed_();
 
     return _rel_decl[UmlSettings::multiplicity_column(multiplicity)];
 }
 
-bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
+bool JavaSettings::set_RelationDecl(const char * multiplicity, QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationDeclCmd, multiplicity, v);
 
@@ -400,14 +400,14 @@ bool JavaSettings::set_RelationDecl(const char * multiplicity, Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::operationDef()
+const QByteArray & JavaSettings::operationDef()
 {
     read_if_needed_();
 
     return _oper_def;
 }
 
-bool JavaSettings::set_OperationDef(Q3CString v)
+bool JavaSettings::set_OperationDef(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaOperationDefCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -438,14 +438,14 @@ bool JavaSettings::set_GetVisibility(aVisibility v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::getName()
+const QByteArray & JavaSettings::getName()
 {
     read_if_needed_();
 
     return _get_name;
 }
 
-bool JavaSettings::set_GetName(Q3CString v)
+bool JavaSettings::set_GetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaGetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -457,14 +457,14 @@ bool JavaSettings::set_GetName(Q3CString v)
         return FALSE;
 }
 
-const Q3CString & JavaSettings::setName()
+const QByteArray & JavaSettings::setName()
 {
     read_if_needed_();
 
     return _set_name;
 }
 
-bool JavaSettings::set_SetName(Q3CString v)
+bool JavaSettings::set_SetName(QByteArray v)
 {
     UmlCom::send_cmd(javaSettingsCmd, setJavaSetNameCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -554,56 +554,56 @@ bool JavaSettings::set_IsSetParamFinal(bool v)
 
 bool JavaSettings::_defined;
 
-Q3CString JavaSettings::_root;
+QByteArray JavaSettings::_root;
 
-Q3CString JavaSettings::_class_decl;
+QByteArray JavaSettings::_class_decl;
 
-Q3CString JavaSettings::_external_class_decl;
+QByteArray JavaSettings::_external_class_decl;
 
-Q3CString JavaSettings::_enum_pattern_decl;
+QByteArray JavaSettings::_enum_pattern_decl;
 
-Q3CString JavaSettings::_enum_decl;
+QByteArray JavaSettings::_enum_decl;
 
-Q3CString JavaSettings::_interface_decl;
+QByteArray JavaSettings::_interface_decl;
 
-Q3CString JavaSettings::_attr_decl;
+QByteArray JavaSettings::_attr_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_decl;
+QByteArray JavaSettings::_enum_pattern_item_decl;
 
-Q3CString JavaSettings::_enum_pattern_item_case;
+QByteArray JavaSettings::_enum_pattern_item_case;
 
-Q3CString JavaSettings::_enum_item_decl;
+QByteArray JavaSettings::_enum_item_decl;
 
-Q3CString JavaSettings::_rel_decl[3/*multiplicity*/];
+QByteArray JavaSettings::_rel_decl[3/*multiplicity*/];
 
-Q3CString JavaSettings::_oper_def;
+QByteArray JavaSettings::_oper_def;
 
 aVisibility JavaSettings::_get_visibility;
 
-Q3CString JavaSettings::_get_name;
+QByteArray JavaSettings::_get_name;
 
 bool JavaSettings::_is_get_final;
 
 aVisibility JavaSettings::_set_visibility;
 
-Q3CString JavaSettings::_set_name;
+QByteArray JavaSettings::_set_name;
 
 bool JavaSettings::_is_set_final;
 
 bool JavaSettings::_is_set_param_final;
 
-Q3CString JavaSettings::_src_content;
+QByteArray JavaSettings::_src_content;
 
-Q3CString JavaSettings::_ext;
+QByteArray JavaSettings::_ext;
 
-Q3Dict<Q3CString> JavaSettings::_map_imports;
+QHash<QByteArray, QByteArray*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -625,13 +625,13 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
-        Q3CString t = UmlCom::read_string();
-        Q3CString i = UmlCom::read_string();
+        QByteArray t = UmlCom::read_string();
+        QByteArray i = UmlCom::read_string();
 
-        _map_imports.insert(t, new Q3CString(i));
+        _map_imports.insert(t, new QByteArray(i));
     }
 
     _src_content = UmlCom::read_string();
diff --git a/genplugouts/xmi/JavaSettings.h b/genplugouts/xmi/JavaSettings.h
index 3a8f9e19d..44c1d6d45 100644
--- a/genplugouts/xmi/JavaSettings.h
+++ b/genplugouts/xmi/JavaSettings.h
@@ -4,10 +4,10 @@
 #ifdef WITHJAVA
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -31,176 +31,176 @@ class JavaSettings : public UmlSettings
     // returns the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
-    static Q3CString type(const Q3CString & s);
+    static QByteArray type(const QByteArray & s);
 
     // set the JAVA type corresponding to the 'UML' type given in
     // argument, as it is configured in the first 'Generation settings'
     // dialog's tab
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Type(Q3CString s, Q3CString v);
+    static bool set_Type(QByteArray s, QByteArray v);
 
     // reverse of the Type() operation, returns the 'UML' type corresponding
     // to the JAVA type given in argument
-    static Q3CString umlType(const Q3CString & s);
+    static QByteArray umlType(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString relationStereotype(const Q3CString & s);
+    static QByteArray relationStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationStereotype(Q3CString s, Q3CString v);
+    static bool set_RelationStereotype(QByteArray s, QByteArray v);
 
     // reverse of the RelationStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString relationUmlStereotype(const Q3CString & s);
+    static QByteArray relationUmlStereotype(const QByteArray & s);
 
     // returns the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
-    static Q3CString classStereotype(const Q3CString & s);
+    static QByteArray classStereotype(const QByteArray & s);
 
     // set the JAVA stereotype corresponding to the 'UML' stereotype given
     // in argument
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassStereotype(Q3CString s, Q3CString v);
+    static bool set_ClassStereotype(QByteArray s, QByteArray v);
 
     // reverse of the ClassStereotype() operation, returns the 'UML'
     // stereotype corresponding to the JAVA one given in argument
-    static Q3CString classUmlStereotype(const Q3CString & s);
+    static QByteArray classUmlStereotype(const QByteArray & s);
 
     //returns the import or other form specified in the last
     //'Generation settings' tab for the Java type given in argument.
-    static Q3CString get_import(const Q3CString & s);
+    static QByteArray get_import(const QByteArray & s);
 
     //  set the import or other form specified in the last
     //  'Generation settings' tab for the Java type given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_Import(Q3CString s, Q3CString v);
+    static bool set_Import(QByteArray s, QByteArray v);
 
     //  return the 'root' directory
-    static const Q3CString & rootDir();
+    static const QByteArray & rootDir();
 
     //  set the 'root' directory
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RootDir(Q3CString v);
+    static bool set_RootDir(QByteArray v);
 
     // returns the default source file content
-    static const Q3CString & sourceContent();
+    static const QByteArray & sourceContent();
 
     // set the default source file content
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceContent(Q3CString v);
+    static bool set_SourceContent(QByteArray v);
 
     // returns the extension of the file produced by the JAVA code generator
-    static const Q3CString & sourceExtension();
+    static const QByteArray & sourceExtension();
 
     // set the extension of the file produced by the JAVA code generator
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SourceExtension(Q3CString v);
+    static bool set_SourceExtension(QByteArray v);
 
     // returns the default definition of a class
-    static const Q3CString & classDecl();
+    static const QByteArray & classDecl();
 
     // set the default definition of a class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDecl(Q3CString v);
+    static bool set_ClassDecl(QByteArray v);
 
     // returns the default specification for an 'external' class
-    static const Q3CString & externalClassDecl();
+    static const QByteArray & externalClassDecl();
 
     // set the default specification for an 'external' class
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ExternalClassDecl(Q3CString v);
+    static bool set_ExternalClassDecl(QByteArray v);
 
     // returns the default definition of an enumeration implemented
     // through an abstract class having constant attributes
-    static const Q3CString & enumPatternDecl();
+    static const QByteArray & enumPatternDecl();
 
     // set the default definition of an enumeration implemented
     // through an abstract class having constant attributes
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternDecl(Q3CString v);
+    static bool set_EnumPatternDecl(QByteArray v);
 
     // returns the default definition of an enumeration
-    static Q3CString enumDecl();
+    static QByteArray enumDecl();
 
     // set the default definition of an enumeration
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumDecl(Q3CString v);
+    static bool set_EnumDecl(QByteArray v);
 
     // returns the default definition of an interface
-    static const Q3CString & interfaceDecl();
+    static const QByteArray & interfaceDecl();
 
     // set the default definition of an interface
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_InterfaceDecl(Q3CString v);
+    static bool set_InterfaceDecl(QByteArray v);
 
     // returns the default definition of an attribute
-    static const Q3CString & attributeDecl();
+    static const QByteArray & attributeDecl();
 
     // set the default definition of an attribute
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDecl(Q3CString v);
+    static bool set_AttributeDecl(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static const Q3CString & enumPatternItemDecl();
+    static const QByteArray & enumPatternItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumPatternItemDecl(Q3CString v);
+    static bool set_EnumPatternItemDecl(QByteArray v);
 
     //Returns the 'case' form produced in the fromInt operation
     //for each enumeration item
 
-    static const Q3CString & enumPatternItemCase();
+    static const QByteArray & enumPatternItemCase();
 
     //  set the 'case' form produced in the fromInt operation
     //  for each enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
 
-    static bool set_EnumPatternItemCase(Q3CString v);
+    static bool set_EnumPatternItemCase(QByteArray v);
 
     // returns the default definition of an enumeration item
-    static Q3CString enumItemDecl();
+    static QByteArray enumItemDecl();
 
     // set the default definition of an enumeration item
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_EnumItemDecl(Q3CString v);
+    static bool set_EnumItemDecl(QByteArray v);
 
     // returns the default definition of a relation depending on the
     // multiplicity given in argument.
-    static const Q3CString & relationDecl(const char * multiplicity);
+    static const QByteArray & relationDecl(const char * multiplicity);
 
     // set the default definition of a relation depending on the
     // multiplicity given in argument.
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDecl(const char * multiplicity, Q3CString v);
+    static bool set_RelationDecl(const char * multiplicity, QByteArray v);
 
     // returns the default definition of an operation
-    static const Q3CString & operationDef();
+    static const QByteArray & operationDef();
 
     // set the default definition of an operation
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDef(Q3CString v);
+    static bool set_OperationDef(QByteArray v);
 
     // returns the default visibility of a 'get' operation generated
     // through the attribute and relation 'add get operation'
@@ -214,23 +214,23 @@ class JavaSettings : public UmlSettings
 
     // returns the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
-    static const Q3CString & getName();
+    static const QByteArray & getName();
 
     // set the default name of a 'get' operation generated
     // through the attribute and relation 'add get operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_GetName(Q3CString v);
+    static bool set_GetName(QByteArray v);
 
     // returns the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
-    static const Q3CString & setName();
+    static const QByteArray & setName();
 
     // set the default name of a 'set' operation generated
     // through the attribute and relation 'add set operation' menu
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_SetName(Q3CString v);
+    static bool set_SetName(QByteArray v);
 
     //  return if a 'get' operation generated through the attribute
     //  and relation 'add get operation' menu is final by default
@@ -279,49 +279,49 @@ class JavaSettings : public UmlSettings
 
     static bool _defined;
 
-    static Q3CString _root;
+    static QByteArray _root;
 
-    static Q3CString _class_decl;
+    static QByteArray _class_decl;
 
-    static Q3CString _external_class_decl;
+    static QByteArray _external_class_decl;
 
-    static Q3CString _enum_pattern_decl;
+    static QByteArray _enum_pattern_decl;
 
-    static Q3CString _enum_decl;
+    static QByteArray _enum_decl;
 
-    static Q3CString _interface_decl;
+    static QByteArray _interface_decl;
 
-    static Q3CString _attr_decl;
+    static QByteArray _attr_decl;
 
-    static Q3CString _enum_pattern_item_decl;
+    static QByteArray _enum_pattern_item_decl;
 
-    static Q3CString _enum_pattern_item_case;
+    static QByteArray _enum_pattern_item_case;
 
-    static Q3CString _enum_item_decl;
+    static QByteArray _enum_item_decl;
 
-    static Q3CString _rel_decl[3/*multiplicity*/];
+    static QByteArray _rel_decl[3/*multiplicity*/];
 
-    static Q3CString _oper_def;
+    static QByteArray _oper_def;
 
     static aVisibility _get_visibility;
 
-    static Q3CString _get_name;
+    static QByteArray _get_name;
 
     static bool _is_get_final;
 
     static aVisibility _set_visibility;
 
-    static Q3CString _set_name;
+    static QByteArray _set_name;
 
     static bool _is_set_final;
 
     static bool _is_set_param_final;
 
-    static Q3CString _src_content;
+    static QByteArray _src_content;
 
-    static Q3CString _ext;
+    static QByteArray _ext;
 
-    static Q3Dict<Q3CString> _map_imports;
+    static QHash<QByteArray,QByteArray*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/xmi/StateBehavior.h b/genplugouts/xmi/StateBehavior.h
index 91a42cb82..e15ee5334 100644
--- a/genplugouts/xmi/StateBehavior.h
+++ b/genplugouts/xmi/StateBehavior.h
@@ -2,16 +2,16 @@
 #define _STATEBEHAVIOR_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class StateBehavior
 {
 public:
-    Q3CString on_entry;
+    QByteArray on_entry;
 
-    Q3CString on_exit;
+    QByteArray on_exit;
 
-    Q3CString do_activity;
+    QByteArray do_activity;
 
     void read();
 
diff --git a/genplugouts/xmi/TransitionBehavior.h b/genplugouts/xmi/TransitionBehavior.h
index 856ede3c0..9128520bc 100644
--- a/genplugouts/xmi/TransitionBehavior.h
+++ b/genplugouts/xmi/TransitionBehavior.h
@@ -2,16 +2,16 @@
 #define _TRANSITIONBEHAVIOR_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class TransitionBehavior
 {
 public:
-    Q3CString trigger;
+    QByteArray trigger;
 
-    Q3CString guard;
+    QByteArray guard;
 
-    Q3CString activity;
+    QByteArray activity;
 
     void read();
 
diff --git a/genplugouts/xmi/UmlArtifact.h b/genplugouts/xmi/UmlArtifact.h
index 4a8ad55f2..e6db8f7e1 100644
--- a/genplugouts/xmi/UmlArtifact.h
+++ b/genplugouts/xmi/UmlArtifact.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseArtifact.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlArtifact : public UmlBaseArtifact
 {
 public:
-    UmlArtifact(void * id, const Q3CString & n) : UmlBaseArtifact(id, n) {};
+    UmlArtifact(void * id, const QByteArray & n) : UmlBaseArtifact(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlAttribute.cpp b/genplugouts/xmi/UmlAttribute.cpp
index 1fa1411fc..655ddd75a 100644
--- a/genplugouts/xmi/UmlAttribute.cpp
+++ b/genplugouts/xmi/UmlAttribute.cpp
@@ -6,7 +6,7 @@
 #include "CppSettings.h"
 #include "JavaSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlAttribute::write_if_needed(FileOut & out)
 {
     switch (_lang) {
@@ -49,7 +49,7 @@ bool UmlAttribute::write_if_needed(FileOut & out)
         break;
 
     default: // Java
-        if (javaDecl().find("${visibility}") != -1)
+        if (javaDecl().indexOf("${visibility}") != -1)
             write_visibility(out, visibility());
 
         break;
@@ -105,29 +105,29 @@ bool UmlAttribute::write_if_needed(FileOut & out)
 void UmlAttribute::write_cpp_type(FileOut & out)
 {
     // note : doesn't manage function/operation pointer
-    Q3CString s = cppDecl();
+    QByteArray s = cppDecl();
     int index;
 
     remove_comments(s);
 
     // remove keywords not linked to the type
-    if ((index = s.find("${static}")) != -1)
+    if ((index = s.indexOf("${static}")) != -1)
         s.replace(index, 9, " ");
 
-    if ((index = s.find("${mutable}")) != -1)
+    if ((index = s.indexOf("${mutable}")) != -1)
         s.replace(index, 10, (isCppMutable()) ? "mutable " : "");
 
-    if ((index = s.find("${volatile}")) != -1)
+    if ((index = s.indexOf("${volatile}")) != -1)
         s.replace(index, 11, (isVolatile()) ? "volatile " : "");
 
-    if ((index = s.find("${value}")) != -1)
+    if ((index = s.indexOf("${value}")) != -1)
         s.replace(index, 8, " ");
 
-    if ((index = s.find("${h_value}")) != -1)
+    if ((index = s.indexOf("${h_value}")) != -1)
         s.replace(index, 10, " ");
 
     // replace keywords linked to the type
-    if ((index = s.find("${const}")) != -1)
+    if ((index = s.indexOf("${const}")) != -1)
         s.replace(index, 8, isReadOnly() ? "const" : "");
 
     UmlTypeSpec t = type();
@@ -140,31 +140,31 @@ void UmlAttribute::write_cpp_type(FileOut & out)
 
 void UmlAttribute::write_java_type(FileOut & out)
 {
-    Q3CString s = javaDecl();
+    QByteArray s = javaDecl();
     int index;
 
     remove_comments(s);
 
     // remove keywords not linked to the type
-    if ((index = s.find("${visibility}")) != -1)
+    if ((index = s.indexOf("${visibility}")) != -1)
         s.replace(index, 13, " ");
 
-    if ((index = s.find("${static}")) != -1)
+    if ((index = s.indexOf("${static}")) != -1)
         s.replace(index, 9, " ");
 
-    if ((index = s.find("${final}")) != -1)
+    if ((index = s.indexOf("${final}")) != -1)
         s.replace(index, 8, " ");
 
-    if ((index = s.find("${transient}")) != -1)
+    if ((index = s.indexOf("${transient}")) != -1)
         s.replace(index, 12, " ");
 
-    if ((index = s.find("${volatile}")) != -1)
+    if ((index = s.indexOf("${volatile}")) != -1)
         s.replace(index, 11, " ");
 
-    if ((index = s.find("${value}")) != -1)
+    if ((index = s.indexOf("${value}")) != -1)
         s.replace(index, 8, " ");
 
-    if ((index = s.find("${@}")) != -1)
+    if ((index = s.indexOf("${@}")) != -1)
         s.replace(index, 4, " ");
 
     UmlTypeSpec t = type();
diff --git a/genplugouts/xmi/UmlAttribute.h b/genplugouts/xmi/UmlAttribute.h
index 331fc9b4c..df38c7592 100644
--- a/genplugouts/xmi/UmlAttribute.h
+++ b/genplugouts/xmi/UmlAttribute.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseAttribute.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -14,7 +14,7 @@ class FileOut;
 class UmlAttribute : public UmlBaseAttribute
 {
 public:
-    UmlAttribute(void * id, const Q3CString & n) :  UmlBaseAttribute(id, n) {};
+    UmlAttribute(void * id, const QByteArray & n) :  UmlBaseAttribute(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlBaseArtifact.cpp b/genplugouts/xmi/UmlBaseArtifact.cpp
index 5f11e7a44..693e24aa7 100644
--- a/genplugouts/xmi/UmlBaseArtifact.cpp
+++ b/genplugouts/xmi/UmlBaseArtifact.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlArtifact * UmlBaseArtifact::create(UmlDeploymentView * parent, const char * s)
 {
     return (UmlArtifact *) parent->create_(anArtifact, s);
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.reserve(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,7 +89,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd, l);
 
@@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +117,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,7 +135,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -142,7 +144,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] =  _associated[last];
 
             _associated.resize(last);
         }
@@ -166,54 +168,54 @@ bool UmlBaseArtifact::removeAllAssociatedArtifacts()
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseArtifact::cppHeader()
+const QByteArray & UmlBaseArtifact::cppHeader()
 {
     read_if_needed_();
 
     return _cpp_h;
 }
 
-bool UmlBaseArtifact::set_CppHeader(const Q3CString & s)
+bool UmlBaseArtifact::set_CppHeader(const QByteArray & s)
 {
     return set_it_(_cpp_h, s, setCppHCmd);
 }
 
-const Q3CString & UmlBaseArtifact::cppSource()
+const QByteArray & UmlBaseArtifact::cppSource()
 {
     read_if_needed_();
 
     return _cpp_src;
 }
 
-bool UmlBaseArtifact::set_CppSource(const Q3CString & s)
+bool UmlBaseArtifact::set_CppSource(const QByteArray & s)
 {
     return set_it_(_cpp_src, s, setCppSrcCmd);
 }
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseArtifact::javaSource()
+const QByteArray & UmlBaseArtifact::javaSource()
 {
     read_if_needed_();
 
     return _java_src;
 }
 
-bool UmlBaseArtifact::set_JavaSource(const Q3CString & s)
+bool UmlBaseArtifact::set_JavaSource(const QByteArray & s)
 {
     return set_it_(_java_src, s, setJavaSrcCmd);
 }
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseArtifact::idlSource()
+const QByteArray & UmlBaseArtifact::idlSource()
 {
     read_if_needed_();
 
     return _idl_src;
 }
 
-bool UmlBaseArtifact::set_IdlSource(const Q3CString & s)
+bool UmlBaseArtifact::set_IdlSource(const QByteArray & s)
 {
     return set_it_(_idl_src, s, setIdlSrcCmd);
 }
@@ -248,13 +250,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/xmi/UmlBaseArtifact.h b/genplugouts/xmi/UmlBaseArtifact.h
index d2c5a7fba..146457c71 100644
--- a/genplugouts/xmi/UmlBaseArtifact.h
+++ b/genplugouts/xmi/UmlBaseArtifact.h
@@ -4,8 +4,8 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QVector>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlArtifact;
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -83,40 +83,40 @@ class UmlBaseArtifact : public UmlItem
 
 #ifdef WITHCPP
     // returns the C++ header file definition
-    const Q3CString & cppHeader();
+    const QByteArray & cppHeader();
 
     // to set the C++ header file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHeader(const Q3CString & s);
+    bool set_CppHeader(const QByteArray & s);
 
     // returns the C++ source file definition
-    const Q3CString & cppSource();
+    const QByteArray & cppSource();
 
     // to set the C++ source file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSource(const Q3CString & s);
+    bool set_CppSource(const QByteArray & s);
 #endif
 
 #ifdef WITHJAVA
     // returns the Java file definition
-    const Q3CString & javaSource();
+    const QByteArray & javaSource();
 
     // to set the Java file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaSource(const Q3CString & s);
+    bool set_JavaSource(const QByteArray & s);
 #endif
 
 #ifdef WITHIDL
     // returns the Idl file definition
-    const Q3CString & idlSource();
+    const QByteArray & idlSource();
 
     // to set the Idl file definition
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlSource(const Q3CString & s);
+    bool set_IdlSource(const QByteArray & s);
 #endif
 
     // to unload the object to free memory, it will be reloaded
@@ -128,22 +128,22 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
-    Q3CString _cpp_h;
+    QByteArray _cpp_h;
 
-    Q3CString _cpp_src;
+    QByteArray _cpp_src;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_src;
+    QByteArray _java_src;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_src;
+    QByteArray _idl_src;
 #endif
 
 
@@ -171,11 +171,11 @@ class UmlBaseArtifact : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseArtifact(void * id, const Q3CString & n);
+    UmlBaseArtifact(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseArtifact::UmlBaseArtifact(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseArtifact::UmlBaseArtifact(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/xmi/UmlBaseAttribute.cpp b/genplugouts/xmi/UmlBaseAttribute.cpp
index f5a6d51bd..b6700e578 100644
--- a/genplugouts/xmi/UmlBaseAttribute.cpp
+++ b/genplugouts/xmi/UmlBaseAttribute.cpp
@@ -6,7 +6,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlAttribute * UmlBaseAttribute::create(UmlClass * parent, const char * s)
 {
     return (UmlAttribute *) parent->create_(anAttribute, s);
@@ -29,7 +29,7 @@ bool UmlBaseAttribute::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseAttribute::defaultValue()
+const QByteArray & UmlBaseAttribute::defaultValue()
 {
     read_if_needed_();
 
@@ -121,7 +121,7 @@ bool UmlBaseAttribute::set_isJavaTransient(bool y)
 #endif
 
 #ifdef WITHIDL
-Q3CString UmlBaseAttribute::idlCase()
+QByteArray UmlBaseAttribute::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/xmi/UmlBaseAttribute.h b/genplugouts/xmi/UmlBaseAttribute.h
index 3ce2c69c1..ed2bc92c9 100644
--- a/genplugouts/xmi/UmlBaseAttribute.h
+++ b/genplugouts/xmi/UmlBaseAttribute.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassMember.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlAttribute;
@@ -35,7 +35,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default attribute value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default attribute value ("" allowed)
     //
@@ -89,7 +89,7 @@ class UmlBaseAttribute : public UmlClassMember
 #ifdef WITHIDL
     // in case the attribute is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the attribute is not (already) known as
     // an IDL union's member
@@ -119,7 +119,7 @@ class UmlBaseAttribute : public UmlClassMember
     bool _java_transient;
 #endif
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlTypeSpec _type;
 
@@ -131,13 +131,13 @@ class UmlBaseAttribute : public UmlClassMember
     // exclusive with idl_explicit_case
     UmlAttribute * _idl_case;
 
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
 public:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseAttribute(void * id, const Q3CString & n);
+    UmlBaseAttribute(void * id, const QByteArray & n);
 
 
 protected:
@@ -165,7 +165,7 @@ class UmlBaseAttribute : public UmlClassMember
 
 };
 
-inline UmlBaseAttribute::UmlBaseAttribute(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseAttribute::UmlBaseAttribute(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_oper = 0;
     _set_oper = 0;
diff --git a/genplugouts/xmi/UmlBaseChoicePseudoState.h b/genplugouts/xmi/UmlBaseChoicePseudoState.h
index fb682dd91..b4a00bbc9 100644
--- a/genplugouts/xmi/UmlBaseChoicePseudoState.h
+++ b/genplugouts/xmi/UmlBaseChoicePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlChoicePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseChoicePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseChoicePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseChoicePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseClass.cpp b/genplugouts/xmi/UmlBaseClass.cpp
index 316d57cc4..836ec1f2e 100644
--- a/genplugouts/xmi/UmlBaseClass.cpp
+++ b/genplugouts/xmi/UmlBaseClass.cpp
@@ -11,8 +11,8 @@
 #include "UmlCom.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -47,11 +47,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -83,11 +83,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -132,17 +132,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -300,7 +300,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 }
 #endif
 
-UmlClass * UmlBaseClass::get(const Q3CString & n, const UmlPackage * p)
+UmlClass * UmlBaseClass::get(const QByteArray & n, const UmlPackage * p)
 {
     if (p == 0) {
         UmlClass * x = _classes[n];
@@ -326,15 +326,15 @@ void UmlBaseClass::unload(bool rec, bool del)
     UmlBaseClassItem::unload(rec, del);
 }
 
-bool UmlBaseClass::set_Name(const Q3CString & s)
+bool UmlBaseClass::set_Name(const QByteArray & s)
 {
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
-    Q3CString destr = "~" + name();
+    const QVector<UmlItem*> ch = children();
+    QByteArray destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -346,9 +346,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QByteArray, UmlClass*> UmlBaseClass::_classes;
 
-UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
+UmlBaseClass::UmlBaseClass(void * id, const QByteArray & n)
     : UmlClassMember(id, n)
 {
     _assoc_diagram = 0;
@@ -356,7 +356,7 @@ UmlBaseClass::UmlBaseClass(void * id, const Q3CString & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/xmi/UmlBaseClass.h b/genplugouts/xmi/UmlBaseClass.h
index 062977b1c..80f47a401 100644
--- a/genplugouts/xmi/UmlBaseClass.h
+++ b/genplugouts/xmi/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
-#include <q3cstring.h>
-#include <q3dict.h>
+#include <QList>
+#include <QVector>
+#include <QByteArray>
+
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -54,7 +54,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -77,7 +77,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -100,7 +100,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -184,7 +184,7 @@ class UmlBaseClass : public UmlClassMember
     //exist, else 0/null. In case the package is specified (not 0/null),
     //the returned class will be defined in a sub-level of the package.
 
-    static UmlClass * get(const Q3CString & n, const UmlPackage * p);
+    static UmlClass * get(const QByteArray & n, const UmlPackage * p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -197,13 +197,13 @@ class UmlBaseClass : public UmlClassMember
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     friend class UmlBaseRelation;
     friend class UmlBaseArtifact;
 
 private:
-    static Q3Dict<UmlClass> _classes;
+    static QHash<QByteArray,UmlClass*> _classes;
 
     bool _abstract;
 
@@ -240,7 +240,7 @@ class UmlBaseClass : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClass(void * id, const Q3CString & n);
+    UmlBaseClass(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
diff --git a/genplugouts/xmi/UmlBaseClassDiagram.h b/genplugouts/xmi/UmlBaseClassDiagram.h
index e0990d31f..70fcdff9d 100644
--- a/genplugouts/xmi/UmlBaseClassDiagram.h
+++ b/genplugouts/xmi/UmlBaseClassDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassDiagram;
 class UmlClassView;
@@ -26,7 +26,7 @@ class UmlBaseClassDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseClassDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseClassItem.cpp b/genplugouts/xmi/UmlBaseClassItem.cpp
index 345c1a18d..8babd321f 100644
--- a/genplugouts/xmi/UmlBaseClassItem.cpp
+++ b/genplugouts/xmi/UmlBaseClassItem.cpp
@@ -3,9 +3,9 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #ifdef WITHCPP
-const Q3CString & UmlBaseClassItem::cppDecl()
+const QByteArray & UmlBaseClassItem::cppDecl()
 {
     read_if_needed_();
 
@@ -19,7 +19,7 @@ bool UmlBaseClassItem::set_CppDecl(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseClassItem::javaDecl()
+const QByteArray & UmlBaseClassItem::javaDecl()
 {
     read_if_needed_();
 
@@ -33,7 +33,7 @@ bool UmlBaseClassItem::set_JavaDecl(const char * s)
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBaseClassItem::idlDecl()
+const QByteArray & UmlBaseClassItem::idlDecl()
 {
     read_if_needed_();
 
diff --git a/genplugouts/xmi/UmlBaseClassItem.h b/genplugouts/xmi/UmlBaseClassItem.h
index 2569d9776..2933da389 100644
--- a/genplugouts/xmi/UmlBaseClassItem.h
+++ b/genplugouts/xmi/UmlBaseClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of the all the class's items including the class themself
 class UmlBaseClassItem : public UmlItem
@@ -12,7 +12,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHCPP
     //  return the C++ declaration
 
-    const Q3CString & cppDecl();
+    const QByteArray & cppDecl();
 
     //  to set the C++ declaration
     //
@@ -23,7 +23,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHJAVA
     //  return the Java defininition
 
-    const Q3CString & javaDecl();
+    const QByteArray & javaDecl();
 
     //  to set the Java definition
     //
@@ -34,7 +34,7 @@ class UmlBaseClassItem : public UmlItem
 #ifdef WITHIDL
     //  return the IDL declaration
 
-    const Q3CString & idlDecl();
+    const QByteArray & idlDecl();
 
     //  set the IDL declaration
     //
@@ -50,20 +50,20 @@ class UmlBaseClassItem : public UmlItem
 
 private:
 #ifdef WITHCPP
-    Q3CString _cpp_decl;
+    QByteArray _cpp_decl;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_decl;
+    QByteArray _java_decl;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_decl;
+    QByteArray _idl_decl;
 #endif
 
 
 protected:
-    UmlBaseClassItem(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassItem(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/xmi/UmlBaseClassMember.cpp b/genplugouts/xmi/UmlBaseClassMember.cpp
index eafbf7355..ab0696da4 100644
--- a/genplugouts/xmi/UmlBaseClassMember.cpp
+++ b/genplugouts/xmi/UmlBaseClassMember.cpp
@@ -3,7 +3,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlBaseClassMember::isClassMember()
 {
     read_if_needed_();
@@ -70,7 +70,7 @@ bool UmlBaseClassMember::set_CppVisibility(aVisibility v)
 #endif
 
 #ifdef WITHJAVA
-Q3CString UmlBaseClassMember::javaAnnotations()
+QByteArray UmlBaseClassMember::javaAnnotations()
 {
     read_if_needed_();
 
diff --git a/genplugouts/xmi/UmlBaseClassMember.h b/genplugouts/xmi/UmlBaseClassMember.h
index 495f42de5..ac4b409da 100644
--- a/genplugouts/xmi/UmlBaseClassMember.h
+++ b/genplugouts/xmi/UmlBaseClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "aVisibility.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassItem.h"
 
 // This class manages 'true' class's items : attributes, relation,
@@ -57,7 +57,7 @@ class UmlBaseClassMember : public UmlClassItem
 
 #ifdef WITHJAVA
     // returns the Java annotations
-    Q3CString javaAnnotations();
+    QByteArray javaAnnotations();
 
     // set the Java annotations
     //
@@ -78,12 +78,12 @@ class UmlBaseClassMember : public UmlClassItem
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_annotation;
+    QByteArray _java_annotation;
 #endif
 
 
 protected:
-    UmlBaseClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/xmi/UmlBaseClassView.h b/genplugouts/xmi/UmlBaseClassView.h
index 5687a666f..f8a7c9194 100644
--- a/genplugouts/xmi/UmlBaseClassView.h
+++ b/genplugouts/xmi/UmlBaseClassView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClassView;
 class UmlPackage;
@@ -44,7 +44,7 @@ class UmlBaseClassView : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseClassView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseClassView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseCollaborationDiagram.h b/genplugouts/xmi/UmlBaseCollaborationDiagram.h
index 0a49b41e6..1a1df124d 100644
--- a/genplugouts/xmi/UmlBaseCollaborationDiagram.h
+++ b/genplugouts/xmi/UmlBaseCollaborationDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlCollaborationDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseCollaborationDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseCollaborationDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseCollaborationDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseComponent.cpp b/genplugouts/xmi/UmlBaseComponent.cpp
index 0fe6d1aed..fa399b975 100644
--- a/genplugouts/xmi/UmlBaseComponent.cpp
+++ b/genplugouts/xmi/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizedClasses()
 {
     read_if_needed_();
 
     return _realized;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realized, provided, required);
@@ -96,18 +96,18 @@ void UmlBaseComponent::read_uml_()
     _realized.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realized.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realized[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/xmi/UmlBaseComponent.h b/genplugouts/xmi/UmlBaseComponent.h
index 8b0bbc531..ed356fab3 100644
--- a/genplugouts/xmi/UmlBaseComponent.h
+++ b/genplugouts/xmi/UmlBaseComponent.h
@@ -1,11 +1,10 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
-#include <q3cstring.h>
+#include <QByteArray>
 
 #include "UmlClass.h"	// to avoid destructor problem
 class UmlComponent;
@@ -36,18 +35,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realized classes
-    const Q3PtrVector<UmlClass> & realizedClasses();
+    const QVector<UmlClass*> & realizedClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realized, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realized, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realized, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +56,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realized;
+    QVector<UmlClass*> _realized;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
@@ -70,11 +69,11 @@ class UmlBaseComponent : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponent(void * id, const Q3CString & n);
+    UmlBaseComponent(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseComponent::UmlBaseComponent(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseComponent::UmlBaseComponent(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/xmi/UmlBaseComponentDiagram.h b/genplugouts/xmi/UmlBaseComponentDiagram.h
index 43466da7c..c5ed8d29d 100644
--- a/genplugouts/xmi/UmlBaseComponentDiagram.h
+++ b/genplugouts/xmi/UmlBaseComponentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentDiagram;
 class UmlComponentView;
@@ -26,7 +26,7 @@ class UmlBaseComponentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseComponentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseComponentView.h b/genplugouts/xmi/UmlBaseComponentView.h
index 0cb5c0769..fe78460b3 100644
--- a/genplugouts/xmi/UmlBaseComponentView.h
+++ b/genplugouts/xmi/UmlBaseComponentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlComponentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseComponentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseComponentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseComponentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseDeepHistoryPseudoState.h b/genplugouts/xmi/UmlBaseDeepHistoryPseudoState.h
index 0ac36e22d..c23d5ec0a 100644
--- a/genplugouts/xmi/UmlBaseDeepHistoryPseudoState.h
+++ b/genplugouts/xmi/UmlBaseDeepHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeepHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseDeepHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeepHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseDeepHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseDeployment.h b/genplugouts/xmi/UmlBaseDeployment.h
index b268e0c17..63610d5b6 100644
--- a/genplugouts/xmi/UmlBaseDeployment.h
+++ b/genplugouts/xmi/UmlBaseDeployment.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Manage the deployments
 class UmlBaseDeployment : public UmlItem
 {
 protected:
-    UmlBaseDeployment(void * id, Q3CString n) : UmlItem(id, n) {};
+    UmlBaseDeployment(void * id, QByteArray n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseDeploymentDiagram.h b/genplugouts/xmi/UmlBaseDeploymentDiagram.h
index 8f2aacbd5..d8e4e7a67 100644
--- a/genplugouts/xmi/UmlBaseDeploymentDiagram.h
+++ b/genplugouts/xmi/UmlBaseDeploymentDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentDiagram;
 class UmlDeploymentView;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseDeploymentDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseDeploymentView.h b/genplugouts/xmi/UmlBaseDeploymentView.h
index 08c540330..a3c3c79d3 100644
--- a/genplugouts/xmi/UmlBaseDeploymentView.h
+++ b/genplugouts/xmi/UmlBaseDeploymentView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlDeploymentView;
 class UmlPackage;
@@ -26,7 +26,7 @@ class UmlBaseDeploymentView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDeploymentView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDeploymentView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseDiagram.cpp b/genplugouts/xmi/UmlBaseDiagram.cpp
index e1ceb269d..d0fb2d705 100644
--- a/genplugouts/xmi/UmlBaseDiagram.cpp
+++ b/genplugouts/xmi/UmlBaseDiagram.cpp
@@ -3,8 +3,8 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
-bool UmlBaseDiagram::saveIn(const Q3CString & s) const
+#include <QByteArray>
+bool UmlBaseDiagram::saveIn(const QByteArray & s) const
 {
     UmlCom::send_cmd(_identifier, saveInCmd, (const char *)s); //[rageek] Fix prototype
     return UmlCom::read_bool();
diff --git a/genplugouts/xmi/UmlBaseDiagram.h b/genplugouts/xmi/UmlBaseDiagram.h
index 9cf05ff22..824a9f60f 100644
--- a/genplugouts/xmi/UmlBaseDiagram.h
+++ b/genplugouts/xmi/UmlBaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Mother class of all the classes managing the diagrams
 class UmlBaseDiagram : public UmlItem
@@ -18,12 +18,12 @@ class UmlBaseDiagram : public UmlItem
     // - else the default diagram aspect, which is probably not as you want
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool saveIn(const Q3CString & s) const;
+    bool saveIn(const QByteArray & s) const;
 
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseDiagram(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseDiagram(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseEntryPointPseudoState.h b/genplugouts/xmi/UmlBaseEntryPointPseudoState.h
index dbfd3ef1a..573ac64d4 100644
--- a/genplugouts/xmi/UmlBaseEntryPointPseudoState.h
+++ b/genplugouts/xmi/UmlBaseEntryPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlEntryPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseEntryPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseEntryPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseEntryPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseExitPointPseudoState.h b/genplugouts/xmi/UmlBaseExitPointPseudoState.h
index ff2ad12bc..0b8304951 100644
--- a/genplugouts/xmi/UmlBaseExitPointPseudoState.h
+++ b/genplugouts/xmi/UmlBaseExitPointPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExitPointPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseExitPointPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExitPointPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseExitPointPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseExtraClassMember.cpp b/genplugouts/xmi/UmlBaseExtraClassMember.cpp
index 2bb66cd9e..2dd2228c3 100644
--- a/genplugouts/xmi/UmlBaseExtraClassMember.cpp
+++ b/genplugouts/xmi/UmlBaseExtraClassMember.cpp
@@ -5,7 +5,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlExtraClassMember * UmlBaseExtraClassMember::create(UmlClass * parent, const char * name)
 {
     return (UmlExtraClassMember *) parent->create_(anExtraClassMember, name);
@@ -29,7 +29,7 @@ bool UmlBaseExtraClassMember::set_isCppInline(bool y)
     return set_it_(_cpp_inline, y, setIsCppInlineCmd);
 }
 
-const Q3CString & UmlBaseExtraClassMember::cppDef()
+const QByteArray & UmlBaseExtraClassMember::cppDef()
 {
     read_if_needed_();
 
diff --git a/genplugouts/xmi/UmlBaseExtraClassMember.h b/genplugouts/xmi/UmlBaseExtraClassMember.h
index e2b9d4f30..fbe19e1bf 100644
--- a/genplugouts/xmi/UmlBaseExtraClassMember.h
+++ b/genplugouts/xmi/UmlBaseExtraClassMember.h
@@ -4,7 +4,7 @@
 
 #include "UmlClassItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExtraClassMember;
 class UmlClass;
@@ -37,7 +37,7 @@ class UmlBaseExtraClassMember : public UmlClassItem
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -56,12 +56,12 @@ class UmlBaseExtraClassMember : public UmlClassItem
     bool _cpp_inline;
 
 
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 #endif
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseExtraClassMember(void * id, const Q3CString & n) : UmlClassItem(id, n) {};
+    UmlBaseExtraClassMember(void * id, const QByteArray & n) : UmlClassItem(id, n) {};
 
 #ifdef WITHCPP
     //internal, do NOT use it
diff --git a/genplugouts/xmi/UmlBaseFinalState.h b/genplugouts/xmi/UmlBaseFinalState.h
index 16e0816cf..5150aa9e6 100644
--- a/genplugouts/xmi/UmlBaseFinalState.h
+++ b/genplugouts/xmi/UmlBaseFinalState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlFinalState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseFinalState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseFinalState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseFinalState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseForkPseudoState.h b/genplugouts/xmi/UmlBaseForkPseudoState.h
index 009499bfa..d5b0eba99 100644
--- a/genplugouts/xmi/UmlBaseForkPseudoState.h
+++ b/genplugouts/xmi/UmlBaseForkPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlForkPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseForkPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseForkPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseForkPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseFormalParameter.h b/genplugouts/xmi/UmlBaseFormalParameter.h
index 84867aec4..176f53aab 100644
--- a/genplugouts/xmi/UmlBaseFormalParameter.h
+++ b/genplugouts/xmi/UmlBaseFormalParameter.h
@@ -2,7 +2,7 @@
 #define _UMLBASEFORMALPARAMETER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -14,12 +14,12 @@ class UmlBaseFormalParameter
     UmlBaseFormalParameter() {};
 
     // returns the name of the formal
-    const Q3CString & name() const {
+    const QByteArray & name() const {
         return _name;
     };
 
     // returns the type of a formal, probably "class"
-    const Q3CString & type() const {
+    const QByteArray & type() const {
         return _type;
     };
 
@@ -35,10 +35,10 @@ class UmlBaseFormalParameter
     friend class UmlBaseClass;
 
 protected:
-    Q3CString _name;
+    QByteArray _name;
 
     // "class" ...
-    Q3CString _type;
+    QByteArray _type;
 
     UmlTypeSpec _default_value;
 
diff --git a/genplugouts/xmi/UmlBaseInitialPseudoState.h b/genplugouts/xmi/UmlBaseInitialPseudoState.h
index 88dae1cc6..84c2904dd 100644
--- a/genplugouts/xmi/UmlBaseInitialPseudoState.h
+++ b/genplugouts/xmi/UmlBaseInitialPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlInitialPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseInitialPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseInitialPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseInitialPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseItem.cpp b/genplugouts/xmi/UmlBaseItem.cpp
index d467b6262..f51ced9bc 100644
--- a/genplugouts/xmi/UmlBaseItem.cpp
+++ b/genplugouts/xmi/UmlBaseItem.cpp
@@ -43,33 +43,33 @@
 #include "UmlJoinPseudoState.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-bool UmlBaseItem::set_Name(const Q3CString & s)
+bool UmlBaseItem::set_Name(const QByteArray & s)
 {
     return set_it_(_name, s, setNameCmd);
 }
 
-const Q3CString & UmlBaseItem::stereotype()
+const QByteArray & UmlBaseItem::stereotype()
 {
     read_if_needed_();
 
     return _stereotype;
 }
 
-bool UmlBaseItem::set_Stereotype(const Q3CString & s)
+bool UmlBaseItem::set_Stereotype(const QByteArray & s)
 {
     return set_it_(_stereotype, s, setStereotypeCmd);
 }
 
-const Q3CString & UmlBaseItem::description()
+const QByteArray & UmlBaseItem::description()
 {
     read_if_needed_();
 
     return _description;
 }
 
-bool UmlBaseItem::set_Description(const Q3CString & s)
+bool UmlBaseItem::set_Description(const QByteArray & s)
 {
     return set_it_(_description, s, setDescriptionCmd);
 }
@@ -85,7 +85,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -105,11 +105,11 @@ bool UmlBaseItem::set_childrenVisible(bool y)
     return UmlCom::read_bool();
 }
 
-bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
+bool UmlBaseItem::propertyValue(const QByteArray & k, QByteArray & v)
 {
     read_if_needed_();
 
-    Q3CString * s = _dict[k];
+    QByteArray * s = _dict[k];
 
     if (s == 0)
         return FALSE;
@@ -119,7 +119,7 @@ bool UmlBaseItem::propertyValue(const Q3CString & k, Q3CString & v)
 
 }
 
-bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
+bool UmlBaseItem::set_PropertyValue(const QByteArray & k, const QByteArray & v)
 {
     read_if_needed_();
 
@@ -127,10 +127,10 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            Q3CString * s = _dict[k];
+            QByteArray * s = _dict[k];
 
             if (s == 0)
-                _dict.insert(k, new Q3CString(v));
+                _dict.insert(k, new QByteArray(v));
             else
                 *s = v;
         }
@@ -141,7 +141,7 @@ bool UmlBaseItem::set_PropertyValue(const Q3CString & k, const Q3CString & v)
         return FALSE;
 }
 
-const Q3Dict<Q3CString> UmlBaseItem::properties()
+const QHash<QByteArray, QByteArray*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -160,7 +160,7 @@ bool UmlBaseItem::moveAfter(const UmlItem * x)
         return FALSE;
 }
 
-Q3CString UmlBaseItem::supportFile()
+QByteArray UmlBaseItem::supportFile()
 {
     UmlCom::send_cmd(_identifier, supportFileCmd);
     return UmlCom::read_string();
@@ -172,7 +172,7 @@ bool UmlBaseItem::isWritable()
     return UmlCom::read_bool();
 }
 
-int UmlBaseItem::apply(Q3CString cmd)
+int UmlBaseItem::apply(QByteArray cmd)
 {
     UmlCom::send_cmd(_identifier, applyCmd, (const char *)cmd); //[rageek] Fix prototype
     return (int) UmlCom::read_unsigned();
@@ -190,11 +190,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -209,7 +209,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -228,17 +228,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -315,9 +315,9 @@ void UmlBaseItem::read_uml_()
     unsigned n = UmlCom::read_unsigned();
 
     while (n--) {
-        Q3CString k = UmlCom::read_string();
+        QByteArray k = UmlCom::read_string();
 
-        _dict.insert(k, new Q3CString(UmlCom::read_string()));
+        _dict.insert(k, new QByteArray(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -346,7 +346,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -400,7 +400,7 @@ bool UmlBaseItem::set_it_(aDirection & r, aDirection v, OnInstanceCmd cmd)
         return FALSE;
 }
 
-bool UmlBaseItem::set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd)
+bool UmlBaseItem::set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd)
 {
     UmlCom::send_cmd(_identifier, cmd, v);
 
@@ -437,7 +437,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -557,20 +557,20 @@ UmlItem * UmlBaseItem::read_()
 
         default:
             UmlCom::bye();
-            UmlCom::fatal_error(Q3CString("unknown item type ") + Q3CString().setNum(kind));
+            UmlCom::fatal_error(QByteArray("unknown item type ") + QByteArray().setNum(kind));
         }
     }
 
     return result;
 }
 
-UmlBaseItem::UmlBaseItem(void * id, const Q3CString & n)
+UmlBaseItem::UmlBaseItem(void * id, const QByteArray & n)
     : _defined(FALSE), _identifier(id), _name(n), _parent(0), _children(0)
 {
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/xmi/UmlBaseItem.h b/genplugouts/xmi/UmlBaseItem.h
index 90761df4b..6b0b94122 100644
--- a/genplugouts/xmi/UmlBaseItem.h
+++ b/genplugouts/xmi/UmlBaseItem.h
@@ -3,10 +3,10 @@
 
 
 #include "anItemKind.h"
-#include <q3cstring.h>
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+#include <QByteArray>
+#include <QVector>
+
+#include <QHash>
 #include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
@@ -37,35 +37,35 @@ class UmlBaseItem
     virtual anItemKind kind() = 0;
 
     // returns the name
-    const Q3CString & name() {
+    const QByteArray & name() {
         return _name;
     };
 
     // to set the name
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Name(const Q3CString & s);
+    virtual bool set_Name(const QByteArray & s);
 
     // returns the stereotype
-    const Q3CString & stereotype();
+    const QByteArray & stereotype();
 
     // to set the stereotype
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the description
-    const Q3CString & description();
+    const QByteArray & description();
 
     // to set the description
     //  On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_Description(const Q3CString & s);
+    bool set_Description(const QByteArray & s);
 
     // returns the parent (0/null if it is applied on the project itself),
     // to go all over the browser tree
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -90,16 +90,16 @@ class UmlBaseItem
     //
     // These properties may be edited through the object dialog last tab
     // named 'user'
-    bool propertyValue(const Q3CString & k, Q3CString & v);
+    bool propertyValue(const QByteArray & k, QByteArray & v);
 
     // to set (may be insert a new) the value 'v' associated to the key 'k'
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_PropertyValue(const Q3CString & k, const Q3CString & v);
+    bool set_PropertyValue(const QByteArray & k, const QByteArray & v);
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<Q3CString> properties();
+    const QHash<QByteArray, QByteArray*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -134,7 +134,7 @@ class UmlBaseItem
     //    external type and edited through the last Idl tab of the
     //    'Generation Settings' dialog is saved in the file 'idl_includes'
     //
-    Q3CString supportFile();
+    QByteArray supportFile();
 
     // return TRUE in case the item may be modified, i.e. it is not
     // an API base 'plug-out' class and the corresponding file(s) are not
@@ -142,7 +142,7 @@ class UmlBaseItem
     bool isWritable();
 
     //  Apply asynchronously the tool on the item, returns an identifier to call isToolDone()
-    int apply(Q3CString cmd);
+    int apply(QByteArray cmd);
 
     //return TRUE in case the item is marked
     bool isMarked();
@@ -156,7 +156,7 @@ class UmlBaseItem
     //  item), UmlNcRelations (their target is the current item) or
     //  UmlComponents (the associated component of the current item when it is
     //  a UmlClass, a non source component associated with the current one).
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -169,7 +169,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
     friend class UmlBaseClassItem;
     friend class UmlBaseAttribute;
@@ -207,21 +207,21 @@ class UmlBaseItem
 
     void * _identifier;
 
-    Q3CString _name;
+    QByteArray _name;
 
     //  Note : protected in Java for internal reason, but do NOT
     //  access to this field yourself !
-    Q3CString _stereotype;
+    QByteArray _stereotype;
 
-    Q3CString _description;
+    QByteArray _description;
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<Q3CString> _dict;
+    QHash<QByteArray, QByteArray*> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*,UmlItem*> _all;
 
 
 protected:
@@ -277,7 +277,7 @@ class UmlBaseItem
 
     //internal, do NOT use it
 
-    bool set_it_(Q3CString & r, const char * v, OnInstanceCmd cmd);
+    bool set_it_(QByteArray & r, const char * v, OnInstanceCmd cmd);
 
     //internal, do NOT use it
 
@@ -290,7 +290,7 @@ class UmlBaseItem
 
 public:
     // the constructor, do not call it yourself !
-    UmlBaseItem(void * id, const Q3CString & n);
+    UmlBaseItem(void * id, const QByteArray & n);
 
     // the destructor, do not delete objects yourself !!!!!!!!!!
     virtual ~UmlBaseItem();
diff --git a/genplugouts/xmi/UmlBaseJoinPseudoState.h b/genplugouts/xmi/UmlBaseJoinPseudoState.h
index 31976dfff..966ec680f 100644
--- a/genplugouts/xmi/UmlBaseJoinPseudoState.h
+++ b/genplugouts/xmi/UmlBaseJoinPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlJoinPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJoinPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJoinPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJoinPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseJunctionPseudoState.h b/genplugouts/xmi/UmlBaseJunctionPseudoState.h
index 9b76d88e7..9517f4922 100644
--- a/genplugouts/xmi/UmlBaseJunctionPseudoState.h
+++ b/genplugouts/xmi/UmlBaseJunctionPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlJunctionPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseJunctionPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseJunctionPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseJunctionPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseNcRelation.h b/genplugouts/xmi/UmlBaseNcRelation.h
index 7418e3406..75625ecdc 100644
--- a/genplugouts/xmi/UmlBaseNcRelation.h
+++ b/genplugouts/xmi/UmlBaseNcRelation.h
@@ -5,7 +5,7 @@
 #include "UmlItem.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNcRelation;
 
@@ -43,11 +43,11 @@ class UmlBaseNcRelation : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNcRelation(void * id, const Q3CString & n);
+    UmlBaseNcRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBaseNcRelation::UmlBaseNcRelation(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _target = 0;
 }
diff --git a/genplugouts/xmi/UmlBaseNode.h b/genplugouts/xmi/UmlBaseNode.h
index 07a980e66..f033d57b6 100644
--- a/genplugouts/xmi/UmlBaseNode.h
+++ b/genplugouts/xmi/UmlBaseNode.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlNode;
 class UmlDeploymentDiagram;
@@ -38,7 +38,7 @@ class UmlBaseNode : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseNode(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseNode(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
     //internal, do NOT use it
 
diff --git a/genplugouts/xmi/UmlBaseOperation.cpp b/genplugouts/xmi/UmlBaseOperation.cpp
index 26096f11c..c811bf05a 100644
--- a/genplugouts/xmi/UmlBaseOperation.cpp
+++ b/genplugouts/xmi/UmlBaseOperation.cpp
@@ -7,8 +7,8 @@
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -54,7 +54,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -68,7 +68,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -82,7 +82,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -105,7 +105,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -118,7 +118,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -132,7 +132,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -245,7 +245,7 @@ bool UmlBaseOperation::set_isCppInline(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::cppDef()
+const QByteArray & UmlBaseOperation::cppDef()
 {
     read_if_needed_();
 
@@ -257,7 +257,7 @@ bool UmlBaseOperation::set_CppDef(const char * s)
     return set_it_(_cpp_def, s, setCppDefCmd);
 }
 
-Q3CString UmlBaseOperation::cppBody()
+QByteArray UmlBaseOperation::cppBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, cppBodyCmd);
@@ -271,7 +271,7 @@ bool UmlBaseOperation::set_CppBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::cppNameSpec()
+const QByteArray & UmlBaseOperation::cppNameSpec()
 {
     read_if_needed_();
 
@@ -323,7 +323,7 @@ bool UmlBaseOperation::set_isJavaSynchronized(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::javaDef()
+const QByteArray & UmlBaseOperation::javaDef()
 {
     return javaDecl();
 }
@@ -333,7 +333,7 @@ bool UmlBaseOperation::set_JavaDef(const char * s)
     return set_JavaDecl(s);
 }
 
-Q3CString UmlBaseOperation::javaBody()
+QByteArray UmlBaseOperation::javaBody()
 {
     // not memorized in the instance for memory size reason
     UmlCom::send_cmd(_identifier, javaBodyCmd);
@@ -347,7 +347,7 @@ bool UmlBaseOperation::set_JavaBody(const char * s)
     return UmlCom::read_bool();
 }
 
-const Q3CString & UmlBaseOperation::javaNameSpec()
+const QByteArray & UmlBaseOperation::javaNameSpec()
 {
     read_if_needed_();
 
@@ -380,7 +380,7 @@ bool UmlBaseOperation::set_isIdlOneway(bool y)
         return FALSE;
 }
 
-const Q3CString & UmlBaseOperation::idlNameSpec()
+const QByteArray & UmlBaseOperation::idlNameSpec()
 {
     read_if_needed_();
 
diff --git a/genplugouts/xmi/UmlBaseOperation.h b/genplugouts/xmi/UmlBaseOperation.h
index a17e88a74..449d2679b 100644
--- a/genplugouts/xmi/UmlBaseOperation.h
+++ b/genplugouts/xmi/UmlBaseOperation.h
@@ -5,8 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3cstring.h>
+#include <QList>
+#include <QByteArray>
 
 #include "UmlParameter.h"
 class UmlOperation;
@@ -44,7 +44,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -62,7 +62,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -122,7 +122,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in C++, notes that the declaration
     // is returned by the inherited ClassItemBase::CppDecl() operation
-    const Q3CString & cppDef();
+    const QByteArray & cppDef();
 
     // sets the operation's definition in C++, notes that the declaration
     // is set through the inherited ClassItemBase::set_CppDecl() operation
@@ -131,9 +131,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString cppBody();
+    QByteArray cppBody();
 
     // sets the operation's body in C++, useless if the def does not
     // contains ${body}
@@ -143,7 +143,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
-    const Q3CString & cppNameSpec();
+    const QByteArray & cppNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's C++ name must be generated
@@ -171,7 +171,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // returns the operation's definition in Java, notes that it is
     // already made by the inherited JavaDecl operation
-    const Q3CString & javaDef();
+    const QByteArray & javaDef();
 
     // sets the operation's definition in Java, notes that it is
     // already made by the inherited set_JavaDecl operation
@@ -180,9 +180,9 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
-    Q3CString javaBody();
+    QByteArray javaBody();
 
     // sets the operation's body in Java, useless if the def does not
     // contains ${body}
@@ -192,7 +192,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
-    const Q3CString & javaNameSpec();
+    const QByteArray & javaNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's JAVA name must be generated
@@ -212,7 +212,7 @@ class UmlBaseOperation : public UmlClassMember
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
-    const Q3CString & idlNameSpec();
+    const QByteArray & idlNameSpec();
 
     // in case the operation is a 'get' or 'set' operation, returns how
     // the operation's IDL name must be generated
@@ -254,22 +254,22 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
-    Q3CString _cpp_def;
+    QByteArray _cpp_def;
 
-    Q3CString _cpp_name_spec;
+    QByteArray _cpp_name_spec;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java_name_spec;
+    QByteArray _java_name_spec;
 #endif
 
 #ifdef WITHIDL
-    Q3CString _idl_name_spec;
+    QByteArray _idl_name_spec;
 #endif
 
     // exclusive with set_of
@@ -281,7 +281,7 @@ class UmlBaseOperation : public UmlClassMember
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseOperation(void * id, const Q3CString & n);
+    UmlBaseOperation(void * id, const QByteArray & n);
 
     //internal, do NOT use it
 
@@ -307,7 +307,7 @@ class UmlBaseOperation : public UmlClassMember
 
 };
 
-inline UmlBaseOperation::UmlBaseOperation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseOperation::UmlBaseOperation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _get_of = 0;
     _set_of = 0;
diff --git a/genplugouts/xmi/UmlBasePackage.cpp b/genplugouts/xmi/UmlBasePackage.cpp
index 713456b14..69ea5657c 100644
--- a/genplugouts/xmi/UmlBasePackage.cpp
+++ b/genplugouts/xmi/UmlBasePackage.cpp
@@ -8,7 +8,7 @@
 //#include "Tools/ApiCmd.h"
 //#include "Tools/ApiCmd.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
     return (UmlPackage *) parent->create_(aPackage, name);
@@ -39,43 +39,43 @@ bool UmlBasePackage::set_AssociatedDiagram(UmlDiagram * d)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBasePackage::cppSrcDir()
+const QByteArray & UmlBasePackage::cppSrcDir()
 {
     read_if_needed_();
 
     return _cpp_src_dir;
 }
 
-bool UmlBasePackage::set_CppSrcDir(const Q3CString & s)
+bool UmlBasePackage::set_CppSrcDir(const QByteArray & s)
 {
     return set_it_(_cpp_src_dir, s, setCppSrcDirCmd);
 }
 
-const Q3CString & UmlBasePackage::cppHDir()
+const QByteArray & UmlBasePackage::cppHDir()
 {
     read_if_needed_();
 
     return _cpp_h_dir;
 }
 
-bool UmlBasePackage::set_CppHDir(const Q3CString & s)
+bool UmlBasePackage::set_CppHDir(const QByteArray & s)
 {
     return set_it_(_cpp_h_dir, s, setCppHDirCmd);
 }
 
-Q3CString UmlBasePackage::cppNamespace()
+QByteArray UmlBasePackage::cppNamespace()
 {
     read_if_needed_();
 
     return _cpp_namespace;
 }
 
-bool UmlBasePackage::set_CppNamespace(const Q3CString & s)
+bool UmlBasePackage::set_CppNamespace(const QByteArray & s)
 {
     return set_it_(_cpp_namespace, s, setCppNamespaceCmd);
 }
 
-UmlPackage * UmlBasePackage::findNamespace(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findNamespace(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findNamespaceCmd, _identifier, n);
 
@@ -84,31 +84,31 @@ UmlPackage * UmlBasePackage::findNamespace(const Q3CString & n) const
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBasePackage::javaDir()
+const QByteArray & UmlBasePackage::javaDir()
 {
     read_if_needed_();
 
     return _java_dir;
 }
 
-bool UmlBasePackage::set_JavaDir(const Q3CString & s)
+bool UmlBasePackage::set_JavaDir(const QByteArray & s)
 {
     return set_it_(_java_dir, s, setJavaDirCmd);
 }
 
-Q3CString UmlBasePackage::javaPackage()
+QByteArray UmlBasePackage::javaPackage()
 {
     read_if_needed_();
 
     return _java_package;
 }
 
-bool UmlBasePackage::set_JavaPackage(const Q3CString & s)
+bool UmlBasePackage::set_JavaPackage(const QByteArray & s)
 {
     return set_it_(_java_package, s, setJavaPackageCmd);
 }
 
-UmlPackage * UmlBasePackage::findPackage(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findPackage(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findPackageCmd, _identifier, n);
 
@@ -117,31 +117,31 @@ UmlPackage * UmlBasePackage::findPackage(const Q3CString & n) const
 #endif
 
 #ifdef WITHIDL
-const Q3CString & UmlBasePackage::idlDir()
+const QByteArray & UmlBasePackage::idlDir()
 {
     read_if_needed_();
 
     return _idl_dir;
 }
 
-bool UmlBasePackage::set_IdlDir(const Q3CString & s)
+bool UmlBasePackage::set_IdlDir(const QByteArray & s)
 {
     return set_it_(_idl_dir, s, setIdlDirCmd);
 }
 
-Q3CString UmlBasePackage::idlModule()
+QByteArray UmlBasePackage::idlModule()
 {
     read_if_needed_();
 
     return _idl_module;
 }
 
-bool UmlBasePackage::set_IdlModule(const Q3CString & s)
+bool UmlBasePackage::set_IdlModule(const QByteArray & s)
 {
     return set_it_(_idl_module, s, setIdlModuleCmd);
 }
 
-UmlPackage * UmlBasePackage::findModule(const Q3CString & n) const
+UmlPackage * UmlBasePackage::findModule(const QByteArray & n) const
 {
     UmlCom::send_cmd(packageGlobalCmd, findModuleCmd, _identifier, n);
 
@@ -168,7 +168,7 @@ void UmlBasePackage::saveProject()
     UmlCom::send_cmd(packageGlobalCmd, saveProjectCmd);
 }
 
-void UmlBasePackage::loadProject(Q3CString p)
+void UmlBasePackage::loadProject(QByteArray p)
 {
     UmlCom::send_cmd(miscGlobalCmd, loadCmd, (const char *) p);
 }
diff --git a/genplugouts/xmi/UmlBasePackage.h b/genplugouts/xmi/UmlBasePackage.h
index 25983d22b..e66008ce4 100644
--- a/genplugouts/xmi/UmlBasePackage.h
+++ b/genplugouts/xmi/UmlBasePackage.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlPackage;
 class UmlDiagram;
@@ -34,87 +34,87 @@ class UmlBasePackage : public UmlItem
 #ifdef WITHCPP
     // returns the path where the C++ source files are generated by the
     // c++ generator.
-    const Q3CString & cppSrcDir();
+    const QByteArray & cppSrcDir();
 
     // to set the path where the C++ source files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppSrcDir(const Q3CString & s);
+    bool set_CppSrcDir(const QByteArray & s);
 
     // returns the path where the C++ header files are generated by the
     // C++ generator.
-    const Q3CString & cppHDir();
+    const QByteArray & cppHDir();
 
     // to set the path where the C++ header files are generated by the
     // C++ generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppHDir(const Q3CString & s);
+    bool set_CppHDir(const QByteArray & s);
 
     //returns the namespace name associed to the package
-    Q3CString cppNamespace();
+    QByteArray cppNamespace();
 
     //to set the namespace name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_CppNamespace(const Q3CString & s);
+    bool set_CppNamespace(const QByteArray & s);
 
     // returns a sub package of the current one having the c++ namespace 'n'
     // (including the current one), else 0/null
-    UmlPackage * findNamespace(const Q3CString & n) const;
+    UmlPackage * findNamespace(const QByteArray & n) const;
 #endif
 
 #ifdef WITHJAVA
     // returns the path where the JAVA files are generated by the
     // JAVA generator.
-    const Q3CString & javaDir();
+    const QByteArray & javaDir();
 
     // to set the path where the JAVA files are generated by the
     // JAVA generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaDir(const Q3CString & s);
+    bool set_JavaDir(const QByteArray & s);
 
     //returns the java package name associed to the package
-    Q3CString javaPackage();
+    QByteArray javaPackage();
 
     // to set the java package name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_JavaPackage(const Q3CString & s);
+    bool set_JavaPackage(const QByteArray & s);
 
     // returns a sub package of the current one having the Java package 'n'
     // (including the current one), else 0/null
-    UmlPackage * findPackage(const Q3CString & n) const;
+    UmlPackage * findPackage(const QByteArray & n) const;
 #endif
 
 #ifdef WITHIDL
     // returns the path where the IDL files are generated by the
     // IDL generator.
-    const Q3CString & idlDir();
+    const QByteArray & idlDir();
 
     // to set the path where the IDL files are generated by the
     // IDL generator, may be relative even the 'root' path is not
     // (already) an absolute path
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlDir(const Q3CString & s);
+    bool set_IdlDir(const QByteArray & s);
 
     //returns the module name associed to the package
-    Q3CString idlModule();
+    QByteArray idlModule();
 
     // to set the module name associed to the package.
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_IdlModule(const Q3CString & s);
+    bool set_IdlModule(const QByteArray & s);
 
     // returns a sub package of the current one having the IDL module 'n'
     // (including the current one), else 0/null
-    UmlPackage * findModule(const Q3CString & n) const;
+    UmlPackage * findModule(const QByteArray & n) const;
 #endif
 
     //  Returns the project
@@ -127,12 +127,12 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
 
-    static void loadProject(Q3CString p);
+    static void loadProject(QByteArray p);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -147,25 +147,25 @@ class UmlBasePackage : public UmlItem
     UmlDiagram * _assoc_diagram;
 
 #ifdef WITHCPP
-    Q3CString _cpp_src_dir;
+    QByteArray _cpp_src_dir;
 
-    Q3CString _cpp_h_dir;
+    QByteArray _cpp_h_dir;
 
-    Q3CString _cpp_namespace;
+    QByteArray _cpp_namespace;
 #endif
 
 
 #ifdef WITHJAVA
-    Q3CString _java_dir;
+    QByteArray _java_dir;
 
-    Q3CString _java_package;
+    QByteArray _java_package;
 #endif
 
 
 #ifdef WITHIDL
-    Q3CString _idl_dir;
+    QByteArray _idl_dir;
 
-    Q3CString _idl_module;
+    QByteArray _idl_module;
 #endif
 
 
@@ -194,11 +194,11 @@ class UmlBasePackage : public UmlItem
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBasePackage(void * id, const Q3CString & n);
+    UmlBasePackage(void * id, const QByteArray & n);
 
 };
 
-inline UmlBasePackage::UmlBasePackage(void * id, const Q3CString & n) : UmlItem(id, n)
+inline UmlBasePackage::UmlBasePackage(void * id, const QByteArray & n) : UmlItem(id, n)
 {
     _assoc_diagram = 0;
 }
diff --git a/genplugouts/xmi/UmlBaseRegion.h b/genplugouts/xmi/UmlBaseRegion.h
index 58a9f8b78..9133a76f5 100644
--- a/genplugouts/xmi/UmlBaseRegion.h
+++ b/genplugouts/xmi/UmlBaseRegion.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlRegion;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseRegion : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRegion(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseRegion(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseRelation.cpp b/genplugouts/xmi/UmlBaseRelation.cpp
index d635eaa27..4ad62f168 100644
--- a/genplugouts/xmi/UmlBaseRelation.cpp
+++ b/genplugouts/xmi/UmlBaseRelation.cpp
@@ -7,7 +7,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlRelation * UmlBaseRelation::create(aRelationKind kind, UmlClass * start, UmlClass * end)
 {
     UmlCom::send_cmd(start->_identifier, createCmd, aRelation,
@@ -70,7 +70,7 @@ bool UmlBaseRelation::set_isReadOnly(bool y)
     return set_it_(_read_only, y, setIsReadOnlyCmd);
 }
 
-const Q3CString & UmlBaseRelation::defaultValue()
+const QByteArray & UmlBaseRelation::defaultValue()
 {
     read_if_needed_();
 
@@ -82,7 +82,7 @@ bool UmlBaseRelation::set_DefaultValue(const char * s)
     return set_it_(_default_value, s, setDefaultValueCmd);
 }
 
-bool UmlBaseRelation::set_Stereotype(const Q3CString & s)
+bool UmlBaseRelation::set_Stereotype(const QByteArray & s)
 {
     if (UmlBaseItem::set_Stereotype(s)) {
         UmlBaseRelation * other = (UmlBaseRelation *) UmlBaseItem::read_();
@@ -124,7 +124,7 @@ bool UmlBaseRelation::set_Association(const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3CString & UmlBaseRelation::roleName()
+const QByteArray & UmlBaseRelation::roleName()
 {
     read_if_needed_();
 
@@ -136,7 +136,7 @@ bool UmlBaseRelation::set_RoleName(const char * s)
     return set_it_(_role_name, s, setRoleNameCmd);
 }
 
-const Q3CString & UmlBaseRelation::multiplicity()
+const QByteArray & UmlBaseRelation::multiplicity()
 {
     read_if_needed_();
 
@@ -268,7 +268,7 @@ bool UmlBaseRelation::set_isIdlTruncatableInheritance(bool y)
         return FALSE;
 }
 
-Q3CString UmlBaseRelation::idlCase()
+QByteArray UmlBaseRelation::idlCase()
 {
     read_if_needed_();
 
diff --git a/genplugouts/xmi/UmlBaseRelation.h b/genplugouts/xmi/UmlBaseRelation.h
index ce0fd509a..8bf1122a4 100644
--- a/genplugouts/xmi/UmlBaseRelation.h
+++ b/genplugouts/xmi/UmlBaseRelation.h
@@ -5,7 +5,7 @@
 #include "UmlClassMember.h"
 #include "aRelationKind.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlTypeSpec.h"
 
 class UmlRelation;
@@ -44,7 +44,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_isReadOnly(bool y);
 
     // returns the default relation value, may be an empty string
-    const Q3CString & defaultValue();
+    const QByteArray & defaultValue();
 
     // to set the default relation value ("" allowed)
     //
@@ -56,7 +56,7 @@ class UmlBaseRelation : public UmlClassMember
     // On error return FALSE in C++, produce a RuntimeException in Java
     // redefined in case the relation is bidirectional to set the stereotype
     // of the relation corresponding to the other direction
-    virtual bool set_Stereotype(const Q3CString & s);
+    virtual bool set_Stereotype(const QByteArray & s);
 
     // returns the 'end' class (the 'start' class is the parent of the relation) no set !
     UmlClass * roleType();
@@ -70,7 +70,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_Association(const UmlTypeSpec & t);
 
     // returns the name of the role
-    const Q3CString & roleName();
+    const QByteArray & roleName();
 
     // to set the name of the role
     //
@@ -78,7 +78,7 @@ class UmlBaseRelation : public UmlClassMember
     bool set_RoleName(const char * s);
 
     // returns the multiplicity (may be an empty string)
-    const Q3CString & multiplicity();
+    const QByteArray & multiplicity();
 
     // to set the multiplicity
     //
@@ -141,7 +141,7 @@ class UmlBaseRelation : public UmlClassMember
 
     // in case the relation is an IDL union's member returns the
     // corresponding 'case', an empty string in case it is not specified
-    Q3CString idlCase();
+    QByteArray idlCase();
 
     // to set the 'case' even the relation is not (already) known as
     // an IDL union's member
@@ -180,13 +180,13 @@ class UmlBaseRelation : public UmlClassMember
 
     aRelationKind _rel_kind : 8;
 
-    Q3CString _default_value;
+    QByteArray _default_value;
 
     UmlClass * _role_type;
 
-    Q3CString _role_name;
+    QByteArray _role_name;
 
-    Q3CString _multiplicity;
+    QByteArray _multiplicity;
 
     UmlTypeSpec _association;
 
@@ -198,7 +198,7 @@ class UmlBaseRelation : public UmlClassMember
     UmlAttribute * _idl_case;
 
 #ifdef WITHIDL
-    Q3CString _idl_explicit_case;
+    QByteArray _idl_explicit_case;
 #endif
 
 
@@ -226,11 +226,11 @@ class UmlBaseRelation : public UmlClassMember
 #endif
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseRelation(void * id, const Q3CString & n);
+    UmlBaseRelation(void * id, const QByteArray & n);
 
 };
 
-inline UmlBaseRelation::UmlBaseRelation(void * id, const Q3CString & n) : UmlClassMember(id, n)
+inline UmlBaseRelation::UmlBaseRelation(void * id, const QByteArray & n) : UmlClassMember(id, n)
 {
     _role_type = 0;
     _get_oper = 0;
diff --git a/genplugouts/xmi/UmlBaseSequenceDiagram.h b/genplugouts/xmi/UmlBaseSequenceDiagram.h
index 2025fab49..30b9e14c7 100644
--- a/genplugouts/xmi/UmlBaseSequenceDiagram.h
+++ b/genplugouts/xmi/UmlBaseSequenceDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlSequenceDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseSequenceDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseSequenceDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseSequenceDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseShallowHistoryPseudoState.h b/genplugouts/xmi/UmlBaseShallowHistoryPseudoState.h
index 92bf0ce18..64dbcd9c1 100644
--- a/genplugouts/xmi/UmlBaseShallowHistoryPseudoState.h
+++ b/genplugouts/xmi/UmlBaseShallowHistoryPseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlShallowHistoryPseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseShallowHistoryPseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseShallowHistoryPseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseShallowHistoryPseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseState.cpp b/genplugouts/xmi/UmlBaseState.cpp
index 50ccddcf5..6d396996c 100644
--- a/genplugouts/xmi/UmlBaseState.cpp
+++ b/genplugouts/xmi/UmlBaseState.cpp
@@ -3,7 +3,7 @@
 #include "UmlState.h"
 #include "UmlStateDiagram.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlState * UmlBaseState::create(UmlItem * parent, const char * s)
 {
@@ -15,7 +15,7 @@ anItemKind UmlBaseState::kind()
     return aState;
 }
 
-const Q3CString & UmlBaseState::entryBehavior()
+const QByteArray & UmlBaseState::entryBehavior()
 {
     read_if_needed_();
     return _uml.on_entry;
@@ -26,7 +26,7 @@ bool UmlBaseState::set_EntryBehavior(const char * s)
     return set_it_(_uml.on_entry, s, setUmlEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::exitBehavior()
+const QByteArray & UmlBaseState::exitBehavior()
 {
     read_if_needed_();
     return _uml.on_exit;
@@ -37,7 +37,7 @@ bool UmlBaseState::set_ExitBehavior(const char * s)
     return set_it_(_uml.on_exit, s, setUmlExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::doActivity()
+const QByteArray & UmlBaseState::doActivity()
 {
     read_if_needed_();
     return _uml.do_activity;
@@ -49,7 +49,7 @@ bool UmlBaseState::set_DoActivity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseState::cppEntryBehavior()
+const QByteArray & UmlBaseState::cppEntryBehavior()
 {
     read_if_needed_();
     return _cpp.on_entry;
@@ -60,7 +60,7 @@ bool UmlBaseState::set_CppEntryBehavior(const char * s)
     return set_it_(_cpp.on_entry, s, setCppEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppExitBehavior()
+const QByteArray & UmlBaseState::cppExitBehavior()
 {
     read_if_needed_();
     return _cpp.on_exit;
@@ -71,7 +71,7 @@ bool UmlBaseState::set_CppExitBehavior(const char * s)
     return set_it_(_cpp.on_exit, s, setCppExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::cppDoActivity()
+const QByteArray & UmlBaseState::cppDoActivity()
 {
     read_if_needed_();
     return _cpp.do_activity;
@@ -84,7 +84,7 @@ bool UmlBaseState::set_CppDoActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseState::javaEntryBehavior()
+const QByteArray & UmlBaseState::javaEntryBehavior()
 {
     read_if_needed_();
     return _java.on_entry;
@@ -95,7 +95,7 @@ bool UmlBaseState::set_JavaEntryBehavior(const char * s)
     return set_it_(_java.on_entry, s, setJavaEntryBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaExitBehavior()
+const QByteArray & UmlBaseState::javaExitBehavior()
 {
     read_if_needed_();
     return _java.on_exit;
@@ -106,7 +106,7 @@ bool UmlBaseState::set_JavaExitBehavior(const char * s)
     return set_it_(_java.on_exit, s, setJavaExitBehaviorCmd);
 }
 
-const Q3CString & UmlBaseState::javaDoActivity()
+const QByteArray & UmlBaseState::javaDoActivity()
 {
     read_if_needed_();
     return _java.do_activity;
diff --git a/genplugouts/xmi/UmlBaseState.h b/genplugouts/xmi/UmlBaseState.h
index efc98a1af..f2592b9c0 100644
--- a/genplugouts/xmi/UmlBaseState.h
+++ b/genplugouts/xmi/UmlBaseState.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "StateBehavior.h"
 
 class UmlState;
@@ -26,13 +26,13 @@ class UmlBaseState : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the entry behavior in OCL
-    const Q3CString & entryBehavior();
+    const QByteArray & entryBehavior();
 
     // set the entry behavior in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseState : public UmlItem
     bool set_EntryBehavior(const char * s);
 
     // return the exit behavior in OCL
-    const Q3CString & exitBehavior();
+    const QByteArray & exitBehavior();
 
     // set the exit behavior in OCL
     //
@@ -48,7 +48,7 @@ class UmlBaseState : public UmlItem
     bool set_ExitBehavior(const char * s);
 
     // return the activity in OCL
-    const Q3CString & doActivity();
+    const QByteArray & doActivity();
 
     // set the activity in OCL
     //
@@ -57,7 +57,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHCPP
     // return the entry behavior in C++
-    const Q3CString & cppEntryBehavior();
+    const QByteArray & cppEntryBehavior();
 
     // set the entry behavior in C++
     //
@@ -65,7 +65,7 @@ class UmlBaseState : public UmlItem
     bool set_CppEntryBehavior(const char * s);
 
     // return the exit behavior in C++
-    const Q3CString & cppExitBehavior();
+    const QByteArray & cppExitBehavior();
 
     // set the exit behavior in C++
     //
@@ -73,7 +73,7 @@ class UmlBaseState : public UmlItem
     bool set_CppExitBehavior(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppDoActivity();
+    const QByteArray & cppDoActivity();
 
     // set the activity in C++
     //
@@ -83,7 +83,7 @@ class UmlBaseState : public UmlItem
 
 #ifdef WITHJAVA
     // return the entry behavior in Java
-    const Q3CString & javaEntryBehavior();
+    const QByteArray & javaEntryBehavior();
 
     // set the entry behavior in Java
     //
@@ -91,7 +91,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaEntryBehavior(const char * s);
 
     // return the exit behavior in Java
-    const Q3CString & javaExitBehavior();
+    const QByteArray & javaExitBehavior();
 
     // set the exit behavior in Java
     //
@@ -99,7 +99,7 @@ class UmlBaseState : public UmlItem
     bool set_JavaExitBehavior(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaDoActivity();
+    const QByteArray & javaDoActivity();
 
     // set the activity in Java
     //
diff --git a/genplugouts/xmi/UmlBaseStateAction.cpp b/genplugouts/xmi/UmlBaseStateAction.cpp
index 1f080b00e..1879387b9 100644
--- a/genplugouts/xmi/UmlBaseStateAction.cpp
+++ b/genplugouts/xmi/UmlBaseStateAction.cpp
@@ -4,7 +4,7 @@
 #include "UmlStateAction.h"
 #include "UmlState.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 UmlStateAction * UmlBaseStateAction::create(UmlState * parent)
 {
@@ -16,7 +16,7 @@ anItemKind UmlBaseStateAction::kind()
     return aStateAction;
 }
 
-const Q3CString & UmlBaseStateAction::expression()
+const QByteArray & UmlBaseStateAction::expression()
 {
     read_if_needed_();
     return _uml;
@@ -28,7 +28,7 @@ bool UmlBaseStateAction::set_Expression(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseStateAction::cppExpression()
+const QByteArray & UmlBaseStateAction::cppExpression()
 {
     read_if_needed_();
     return _cpp;
@@ -41,7 +41,7 @@ bool UmlBaseStateAction::set_CppExpression(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseStateAction::javaExpression()
+const QByteArray & UmlBaseStateAction::javaExpression()
 {
     read_if_needed_();
     return _java;
diff --git a/genplugouts/xmi/UmlBaseStateAction.h b/genplugouts/xmi/UmlBaseStateAction.h
index 0432258b3..a18444c54 100644
--- a/genplugouts/xmi/UmlBaseStateAction.h
+++ b/genplugouts/xmi/UmlBaseStateAction.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateAction;
 class UmlState;
@@ -25,13 +25,13 @@ class UmlBaseStateAction : public UmlItem
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateAction(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlBaseStateAction(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 
 public:
     // return the expression in OCL
-    const Q3CString & expression();
+    const QByteArray & expression();
 
     // set the expression in OCL
     //
@@ -40,7 +40,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHCPP
     // return the expression in C++
-    const Q3CString & cppExpression();
+    const QByteArray & cppExpression();
 
     // set the expression in C++
     //
@@ -50,7 +50,7 @@ class UmlBaseStateAction : public UmlItem
 
 #ifdef WITHJAVA
     // return the expression in Java
-    const Q3CString & javaExpression();
+    const QByteArray & javaExpression();
 
     // set the expression in Java
     //
@@ -68,14 +68,14 @@ class UmlBaseStateAction : public UmlItem
 
 
 private:
-    Q3CString _uml;
+    QByteArray _uml;
 
 #ifdef WITHCPP
-    Q3CString _cpp;
+    QByteArray _cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString _java;
+    QByteArray _java;
 #endif
 
 
diff --git a/genplugouts/xmi/UmlBaseStateDiagram.h b/genplugouts/xmi/UmlBaseStateDiagram.h
index ea7e37ee0..f165c5fdf 100644
--- a/genplugouts/xmi/UmlBaseStateDiagram.h
+++ b/genplugouts/xmi/UmlBaseStateDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateDiagram;
 class UmlState;
@@ -25,7 +25,7 @@ class UmlBaseStateDiagram : public UmlDiagram
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseStateDiagram(void * id, const Q3CString & s) : UmlDiagram(id, s) {
+    UmlBaseStateDiagram(void * id, const QByteArray & s) : UmlDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseTerminatePseudoState.h b/genplugouts/xmi/UmlBaseTerminatePseudoState.h
index e8553f4be..5959ed022 100644
--- a/genplugouts/xmi/UmlBaseTerminatePseudoState.h
+++ b/genplugouts/xmi/UmlBaseTerminatePseudoState.h
@@ -4,7 +4,7 @@
 
 #include "UmlPseudoState.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlTerminatePseudoState;
 class UmlItem;
@@ -25,7 +25,7 @@ class UmlBaseTerminatePseudoState : public UmlPseudoState
 
 protected:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTerminatePseudoState(void * id, const Q3CString & s) : UmlPseudoState(id, s) {
+    UmlBaseTerminatePseudoState(void * id, const QByteArray & s) : UmlPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseTransition.cpp b/genplugouts/xmi/UmlBaseTransition.cpp
index 3516921f8..f9dd2341f 100644
--- a/genplugouts/xmi/UmlBaseTransition.cpp
+++ b/genplugouts/xmi/UmlBaseTransition.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlTransition.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 anItemKind UmlBaseTransition::kind()
 {
@@ -28,7 +28,7 @@ UmlItem * UmlBaseTransition::target()
     return _target;
 }
 
-const Q3CString & UmlBaseTransition::trigger()
+const QByteArray & UmlBaseTransition::trigger()
 {
     read_if_needed_();
     return _uml.trigger;
@@ -39,7 +39,7 @@ bool UmlBaseTransition::set_Trigger(const char * s)
     return set_it_(_uml.trigger, s, setUmlTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::guard()
+const QByteArray & UmlBaseTransition::guard()
 {
     read_if_needed_();
     return _uml.guard;
@@ -50,7 +50,7 @@ bool UmlBaseTransition::set_Guard(const char * s)
     return set_it_(_uml.guard, s, setUmlGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::activity()
+const QByteArray & UmlBaseTransition::activity()
 {
     read_if_needed_();
     return _uml.activity;
@@ -62,7 +62,7 @@ bool UmlBaseTransition::set_Activity(const char * s)
 }
 
 #ifdef WITHCPP
-const Q3CString & UmlBaseTransition::cppTrigger()
+const QByteArray & UmlBaseTransition::cppTrigger()
 {
     read_if_needed_();
     return _cpp.trigger;
@@ -73,7 +73,7 @@ bool UmlBaseTransition::set_CppTrigger(const char * s)
     return set_it_(_cpp.trigger, s, setCppTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppGuard()
+const QByteArray & UmlBaseTransition::cppGuard()
 {
     read_if_needed_();
     return _cpp.guard;
@@ -84,7 +84,7 @@ bool UmlBaseTransition::set_CppGuard(const char * s)
     return set_it_(_cpp.guard, s, setCppGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::cppActivity()
+const QByteArray & UmlBaseTransition::cppActivity()
 {
     read_if_needed_();
     return _cpp.activity;
@@ -97,7 +97,7 @@ bool UmlBaseTransition::set_CppActivity(const char * s)
 #endif
 
 #ifdef WITHJAVA
-const Q3CString & UmlBaseTransition::javaTrigger()
+const QByteArray & UmlBaseTransition::javaTrigger()
 {
     read_if_needed_();
     return _java.trigger;
@@ -108,7 +108,7 @@ bool UmlBaseTransition::set_JavaTrigger(const char * s)
     return set_it_(_java.trigger, s, setJavaTriggerCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaGuard()
+const QByteArray & UmlBaseTransition::javaGuard()
 {
     read_if_needed_();
     return _java.guard;
@@ -119,7 +119,7 @@ bool UmlBaseTransition::set_JavaGuard(const char * s)
     return set_it_(_java.guard, s, setJavaGuardCmd);
 }
 
-const Q3CString & UmlBaseTransition::javaActivity()
+const QByteArray & UmlBaseTransition::javaActivity()
 {
     read_if_needed_();
     return _java.activity;
diff --git a/genplugouts/xmi/UmlBaseTransition.h b/genplugouts/xmi/UmlBaseTransition.h
index 6b1e4b8c1..0254d7c75 100644
--- a/genplugouts/xmi/UmlBaseTransition.h
+++ b/genplugouts/xmi/UmlBaseTransition.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "TransitionBehavior.h"
 
 class UmlTransition;
@@ -26,7 +26,7 @@ class UmlBaseTransition : public UmlItem
     virtual UmlItem * target();
 
     // return the trigger in OCL
-    const Q3CString & trigger();
+    const QByteArray & trigger();
 
     // set the trigger in OCL
     //
@@ -34,7 +34,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Trigger(const char * s);
 
     // return the guard in OCL
-    const Q3CString & guard();
+    const QByteArray & guard();
 
     // set the guard in OCL
     //
@@ -42,7 +42,7 @@ class UmlBaseTransition : public UmlItem
     bool set_Guard(const char * s);
 
     // return the activity in OCL
-    const Q3CString & activity();
+    const QByteArray & activity();
 
     // set the activity in OCL
     //
@@ -51,7 +51,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHCPP
     // return the trigger in C++
-    const Q3CString & cppTrigger();
+    const QByteArray & cppTrigger();
 
     // set the trigger in C++
     //
@@ -59,7 +59,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppTrigger(const char * s);
 
     // return the guard in C++
-    const Q3CString & cppGuard();
+    const QByteArray & cppGuard();
 
     // set the guard in C++
     //
@@ -67,7 +67,7 @@ class UmlBaseTransition : public UmlItem
     bool set_CppGuard(const char * s);
 
     // return the activity in C++
-    const Q3CString & cppActivity();
+    const QByteArray & cppActivity();
 
     // set the activity in C++
     //
@@ -77,7 +77,7 @@ class UmlBaseTransition : public UmlItem
 
 #ifdef WITHJAVA
     // return the trigger in Java
-    const Q3CString & javaTrigger();
+    const QByteArray & javaTrigger();
 
     // set the trigger in Java
     //
@@ -85,7 +85,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaTrigger(const char * s);
 
     // return the guard in Java
-    const Q3CString & javaGuard();
+    const QByteArray & javaGuard();
 
     // set the guard in Java
     //
@@ -93,7 +93,7 @@ class UmlBaseTransition : public UmlItem
     bool set_JavaGuard(const char * s);
 
     // return the activity in Java
-    const Q3CString & javaActivity();
+    const QByteArray & javaActivity();
 
     // set the activity in Java
     //
@@ -136,7 +136,7 @@ class UmlBaseTransition : public UmlItem
 #endif
 
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseTransition(void * id, const Q3CString n) : UmlItem(id, n) {
+    UmlBaseTransition(void * id, const QByteArray n) : UmlItem(id, n) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlBaseUseCase.cpp b/genplugouts/xmi/UmlBaseUseCase.cpp
index 5a3a32ccd..c091723cb 100644
--- a/genplugouts/xmi/UmlBaseUseCase.cpp
+++ b/genplugouts/xmi/UmlBaseUseCase.cpp
@@ -37,5 +37,6 @@ void UmlBaseUseCase::read_uml_()
 {
     _assoc_diagram = (UmlUseCaseDiagram *) UmlBaseItem::read_();
     UmlBaseItem::read_uml_();
+    _extension_points = UmlCom::read_string();
 }
 
diff --git a/genplugouts/xmi/UmlBaseUseCase.h b/genplugouts/xmi/UmlBaseUseCase.h
index 1bdef8f61..bd4ea1a80 100644
--- a/genplugouts/xmi/UmlBaseUseCase.h
+++ b/genplugouts/xmi/UmlBaseUseCase.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCase;
 class UmlUseCaseDiagram;
@@ -33,6 +33,7 @@ class UmlBaseUseCase : public UmlItem
 
 
 private:
+    QByteArray _extension_points;
     UmlUseCaseDiagram * _assoc_diagram;
 
 
@@ -42,7 +43,7 @@ class UmlBaseUseCase : public UmlItem
     virtual void read_uml_();
 
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCase(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCase(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseUseCaseDiagram.h b/genplugouts/xmi/UmlBaseUseCaseDiagram.h
index fd2481e49..7f01e89e0 100644
--- a/genplugouts/xmi/UmlBaseUseCaseDiagram.h
+++ b/genplugouts/xmi/UmlBaseUseCaseDiagram.h
@@ -4,7 +4,7 @@
 
 #include "UmlDiagram.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseDiagram;
 class UmlItem;
@@ -26,7 +26,7 @@ class UmlBaseUseCaseDiagram : public UmlDiagram
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseDiagram(void * id, const Q3CString & n) : UmlDiagram(id, n) {};
+    UmlBaseUseCaseDiagram(void * id, const QByteArray & n) : UmlDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBaseUseCaseView.h b/genplugouts/xmi/UmlBaseUseCaseView.h
index e289a3543..8513d018d 100644
--- a/genplugouts/xmi/UmlBaseUseCaseView.h
+++ b/genplugouts/xmi/UmlBaseUseCaseView.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlUseCaseView;
 
@@ -25,7 +25,7 @@ class UmlBaseUseCaseView : public UmlItem
 
 protected:
     // the constructor, do not call it yourself !!!!!!!!!!
-    UmlBaseUseCaseView(void * id, const Q3CString & n) : UmlItem(id, n) {};
+    UmlBaseUseCaseView(void * id, const QByteArray & n) : UmlItem(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlBuiltin.h b/genplugouts/xmi/UmlBuiltin.h
index 4f5c16f41..79815c251 100644
--- a/genplugouts/xmi/UmlBuiltin.h
+++ b/genplugouts/xmi/UmlBuiltin.h
@@ -2,31 +2,31 @@
 #define _UMLBUILTIN_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to memorize the types defined through the first 'generation settings' tab
 
 struct UmlBuiltin {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 
-    Q3CString cpp_in;
+    QByteArray cpp_in;
 
-    Q3CString cpp_out;
+    QByteArray cpp_out;
 
-    Q3CString cpp_inout;
+    QByteArray cpp_inout;
 #endif
 
-    Q3CString cpp_return;
+    QByteArray cpp_return;
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/xmi/UmlClass.cpp b/genplugouts/xmi/UmlClass.cpp
index 193f7d4fd..99967458f 100644
--- a/genplugouts/xmi/UmlClass.cpp
+++ b/genplugouts/xmi/UmlClass.cpp
@@ -74,7 +74,7 @@ bool UmlClass::write_if_needed(FileOut & out)
         write_annotation(out);
         write_description_properties(out);
 
-        const Q3PtrVector<UmlItem> ch = children();
+        const QVector<UmlItem*> ch = children();
         unsigned n = ch.size();
         bool used = FALSE;
         bool haveRel = FALSE;
@@ -134,7 +134,7 @@ void UmlClass::write_actor(FileOut & out)
     out.indent();
     out << "</UML:Actor>\n";
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/xmi/UmlClass.h b/genplugouts/xmi/UmlClass.h
index 9993ec8de..6649172ad 100644
--- a/genplugouts/xmi/UmlClass.h
+++ b/genplugouts/xmi/UmlClass.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClass.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -15,7 +15,7 @@ class FileOut;
 class UmlClass : public UmlBaseClass
 {
 public:
-    UmlClass(void * id, const Q3CString & n) : UmlBaseClass(id, n) {};
+    UmlClass(void * id, const QByteArray & n) : UmlBaseClass(id, n) {};
 
     virtual void ref(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlClassDiagram.h b/genplugouts/xmi/UmlClassDiagram.h
index 76134392d..d9d822da0 100644
--- a/genplugouts/xmi/UmlClassDiagram.h
+++ b/genplugouts/xmi/UmlClassDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'class diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlClassDiagram : public UmlBaseClassDiagram
 {
 public:
-    UmlClassDiagram(void * id, const Q3CString & n) : UmlBaseClassDiagram(id, n) {};
+    UmlClassDiagram(void * id, const QByteArray & n) : UmlBaseClassDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlClassItem.h b/genplugouts/xmi/UmlClassItem.h
index bf64f4dbb..c3c29cffc 100644
--- a/genplugouts/xmi/UmlClassItem.h
+++ b/genplugouts/xmi/UmlClassItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class globaly manages class's children including UmlClassExtraMember
 //
@@ -11,7 +11,7 @@
 class UmlClassItem : public UmlBaseClassItem
 {
 public:
-    UmlClassItem(void * id, const Q3CString & n) : UmlBaseClassItem(id, n) {};
+    UmlClassItem(void * id, const QByteArray & n) : UmlBaseClassItem(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlClassMember.cpp b/genplugouts/xmi/UmlClassMember.cpp
index 19cc22dd6..6bc7bceb8 100644
--- a/genplugouts/xmi/UmlClassMember.cpp
+++ b/genplugouts/xmi/UmlClassMember.cpp
@@ -2,10 +2,8 @@
 #include "UmlClassMember.h"
 #include "FileOut.h"
 #include "UmlTypeSpec.h"
-
 #include "UmlClass.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 void UmlClassMember::write_scope(FileOut & out, const char * who)
 {
     out << " "
@@ -61,7 +59,7 @@ void UmlClassMember::write_visibility(FileOut & out, aVisibility v)
 void UmlClassMember::write_annotation(FileOut & out)
 {
     if (_lang == Java) {
-        Q3CString a = javaAnnotations();
+        QByteArray a = javaAnnotations();
 
         if (!a.isEmpty()) {
             switch (_taggedvalue_mode) {
@@ -92,9 +90,9 @@ void UmlClassMember::write_annotation(FileOut & out)
     }
 }
 
-Q3CString UmlClassMember::true_name(Q3CString decl)
+QByteArray UmlClassMember::true_name(QByteArray decl)
 {
-    int index = decl.find("${name}", 0); //[rageek] Removed CS=FALSE param - rethink this, case sensitive
+    int index = decl.indexOf("${name}", 0); //[rageek] Removed CS=FALSE param - rethink this, case sensitive
 
     if (index == -1)
         // too complicated, return the Uml one
@@ -110,16 +108,16 @@ Q3CString UmlClassMember::true_name(Q3CString decl)
     while (identChar(decl[sup]))
         sup += 1;
 
-    Q3CString r = decl.mid(begin, index - begin);
-    Q3CString k = decl.mid(index + 2, 4);
+    QByteArray r = decl.mid(begin, index - begin);
+    QByteArray k = decl.mid(index + 2, 4);
 
     if (k == "name")
         r += name();
     else if (k == "Name")
-        r += name().left(1).upper() + name().mid(1);
+        r += name().left(1).toUpper() + name().mid(1);
     else
         // NAME
-        r += name().upper();
+        r += name().toUpper();
 
     r += decl.mid(index + 7, sup - index - 7);
 
@@ -134,14 +132,14 @@ bool UmlClassMember::identChar(char c)
             (c == '_'));
 }
 
-void UmlClassMember::write_type(FileOut & out, const UmlTypeSpec & t, Q3CString s, const char * k_name, const char * k_type)
+void UmlClassMember::write_type(FileOut & out, const UmlTypeSpec & t, QByteArray s, const char * k_name, const char * k_type)
 {
-    s = s.simplifyWhiteSpace();
+    s = s.simplified();
 
     int index;
 
     // remove k_name and all after it except []
-    if (k_name && *k_name && ((index = s.find(k_name, 0)) != -1)) {//[rageek] Removed CS=FALSE - rethink this, case sensitive
+    if (k_name && *k_name && ((index = s.indexOf(k_name, 0)) != -1)) {//[rageek] Removed CS=FALSE - rethink this, case sensitive
         //remove name
         s.remove(index, strlen(k_name));
 
@@ -156,7 +154,7 @@ void UmlClassMember::write_type(FileOut & out, const UmlTypeSpec & t, Q3CString
 
             int index2;
 
-            if ((index2 = s.find(index, ']')) == -1)
+            if ((index2 = s.indexOf(index, ']')) == -1)
                 break;
 
             index = index2 + 1;
@@ -164,12 +162,12 @@ void UmlClassMember::write_type(FileOut & out, const UmlTypeSpec & t, Q3CString
 
         s.resize(index);
     }
-    else if ((index = s.find('=')) != -1) {
+    else if ((index = s.indexOf('=')) != -1) {
         s.resize(index);
-        s = s.simplifyWhiteSpace();
+        s = s.simplified();
     }
 
-    if (k_type && *k_type && ((index = s.find(k_type)) == -1))
+    if (k_type && *k_type && ((index = s.indexOf(k_type)) == -1))
         out.idref_datatype(s);
     else if (s != k_type) {
         // have modifiers
@@ -186,17 +184,17 @@ void UmlClassMember::write_type(FileOut & out, const UmlTypeSpec & t, Q3CString
         out.idref_datatype(t.explicit_type);
 }
 
-void UmlClassMember::remove_comments(Q3CString & s)
+void UmlClassMember::remove_comments(QByteArray & s)
 {
     int index;
 
-    if ((index = s.find("${comment}")) != -1)
+    if ((index = s.indexOf("${comment}")) != -1)
         s.replace(index, 10, " ");
 
     index = 0;
 
-    while ((index = s.find('#', index)) != -1) {
-        int index2 = s.find('\n', index + 1);
+    while ((index = s.indexOf('#', index)) != -1) {
+        int index2 = s.indexOf('\n', index + 1);
 
         if (index2 == -1) {
             s.resize(index);
@@ -208,8 +206,8 @@ void UmlClassMember::remove_comments(Q3CString & s)
 
     index = 0;
 
-    while ((index = s.find("//", index)) != -1) {
-        int index2 = s.find('\n', index + 2);
+    while ((index = s.indexOf("//", index)) != -1) {
+        int index2 = s.indexOf('\n', index + 2);
 
         if (index2 == -1) {
             s.resize(index);
@@ -221,8 +219,8 @@ void UmlClassMember::remove_comments(Q3CString & s)
 
     index = 0;
 
-    while ((index = s.find("/*", index)) != -1) {
-        int index2 = s.find("*/", index + 2);
+    while ((index = s.indexOf("/*", index)) != -1) {
+        int index2 = s.indexOf("*/", index + 2);
 
         if (index2 == -1) {
             s.resize(index);
@@ -232,6 +230,6 @@ void UmlClassMember::remove_comments(Q3CString & s)
         s.replace(index, index2 + 2 - index, " ");
     }
 
-    s = s.simplifyWhiteSpace();
+    s = s.simplified();
 }
 
diff --git a/genplugouts/xmi/UmlClassMember.h b/genplugouts/xmi/UmlClassMember.h
index 196d6354f..a4474b5ff 100644
--- a/genplugouts/xmi/UmlClassMember.h
+++ b/genplugouts/xmi/UmlClassMember.h
@@ -2,7 +2,7 @@
 #define _UMLCLASSMEMBER_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlBaseClassMember.h"
 #include "aVisibility.h"
 
@@ -16,7 +16,7 @@ class UmlTypeSpec;
 class UmlClassMember : public UmlBaseClassMember
 {
 public:
-    UmlClassMember(void * id, const Q3CString & n) : UmlBaseClassMember(id, n) {};
+    UmlClassMember(void * id, const QByteArray & n) : UmlBaseClassMember(id, n) {};
 
     void write_scope(FileOut & out, const char * who = "owner");
 
@@ -28,7 +28,7 @@ class UmlClassMember : public UmlBaseClassMember
 
     //  return the true name of the item
 
-    Q3CString true_name(Q3CString decl);
+    QByteArray true_name(QByteArray decl);
 
     static bool identChar(char c);
 
@@ -36,9 +36,9 @@ class UmlClassMember : public UmlBaseClassMember
     //Have to remove the name and type keywords given in argument,
     //and to remove the initial value.
     //t.type != 0 or t.explicit_type != ""
-    static void write_type(FileOut & out, const UmlTypeSpec & t, Q3CString s, const char * k_name, const char * k_type);
+    static void write_type(FileOut & out, const UmlTypeSpec & t, QByteArray s, const char * k_name, const char * k_type);
 
-    static void remove_comments(Q3CString & s);
+    static void remove_comments(QByteArray & s);
 
 };
 
diff --git a/genplugouts/xmi/UmlClassView.cpp b/genplugouts/xmi/UmlClassView.cpp
index 1e5586e44..7a0c9b81b 100644
--- a/genplugouts/xmi/UmlClassView.cpp
+++ b/genplugouts/xmi/UmlClassView.cpp
@@ -4,7 +4,7 @@
 
 bool UmlClassView::write_if_needed(FileOut & out)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     bool used = FALSE;
 
diff --git a/genplugouts/xmi/UmlClassView.h b/genplugouts/xmi/UmlClassView.h
index 772899d06..33d5347f3 100644
--- a/genplugouts/xmi/UmlClassView.h
+++ b/genplugouts/xmi/UmlClassView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseClassView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlClassView : public UmlBaseClassView
 {
 public:
-    UmlClassView(void * id, const Q3CString & n) : UmlBaseClassView(id, n) {};
+    UmlClassView(void * id, const QByteArray & n) : UmlBaseClassView(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlCollaborationDiagram.h b/genplugouts/xmi/UmlCollaborationDiagram.h
index ab1388561..32ba50ccf 100644
--- a/genplugouts/xmi/UmlCollaborationDiagram.h
+++ b/genplugouts/xmi/UmlCollaborationDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseCollaborationDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlCollaborationDiagram : public UmlBaseCollaborationDiagram
 {
 public:
-    UmlCollaborationDiagram(void * id, const Q3CString & n) : UmlBaseCollaborationDiagram(id, n) {};
+    UmlCollaborationDiagram(void * id, const QByteArray & n) : UmlBaseCollaborationDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlCom.cpp b/genplugouts/xmi/UmlCom.cpp
index 30414e6fb..f4b1f0851 100644
--- a/genplugouts/xmi/UmlCom.cpp
+++ b/genplugouts/xmi/UmlCom.cpp
@@ -1,9 +1,9 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "UmlItem.h"
@@ -12,10 +12,11 @@
 #include "UmlClass.h"
 #include "UmlSettings.h"
 //#include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -29,7 +30,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(23);
         flush();
@@ -66,11 +69,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -80,11 +83,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -101,13 +104,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -116,10 +119,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -128,16 +131,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -146,18 +149,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -203,7 +206,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -213,7 +216,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -224,7 +227,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -236,7 +239,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -248,7 +251,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -260,7 +263,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -273,7 +276,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -286,7 +289,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -300,7 +303,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -312,7 +315,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -325,7 +328,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -338,7 +341,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -351,7 +354,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -373,7 +376,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -387,7 +390,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -401,7 +404,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -416,7 +419,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -429,7 +432,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -443,7 +446,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -465,8 +468,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -499,7 +502,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -522,10 +525,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -542,10 +545,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -579,7 +582,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -596,7 +599,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -607,12 +610,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -644,28 +647,28 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
-void UmlCom::fatal_error(const Q3CString &
-#ifdef DEBUG_BOUML
+void UmlCom::fatal_error(const QByteArray &
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -674,7 +677,7 @@ void UmlCom::fatal_error(const Q3CString &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -685,7 +688,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/xmi/UmlCom.h b/genplugouts/xmi/UmlCom.h
index 6acb8dcb3..3d959b340 100644
--- a/genplugouts/xmi/UmlCom.h
+++ b/genplugouts/xmi/UmlCom.h
@@ -2,21 +2,21 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 #include "CmdFamily.h"
 #include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
-#include <q3ptrvector.h>
+#include <QVector>
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -63,11 +63,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -77,19 +77,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -171,8 +171,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -195,10 +195,10 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
-    static void fatal_error(const Q3CString & msg);
+    static void fatal_error(const QByteArray & msg);
     //internal, do NOT use it
 
     static void flush();
diff --git a/genplugouts/xmi/UmlComponent.cpp b/genplugouts/xmi/UmlComponent.cpp
index 50bcda91b..d109d9cb6 100644
--- a/genplugouts/xmi/UmlComponent.cpp
+++ b/genplugouts/xmi/UmlComponent.cpp
@@ -26,7 +26,7 @@ bool UmlComponent::write_if_needed(FileOut & out)
     out.indent();
     out << "</UML:Component>\n";
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/xmi/UmlComponent.h b/genplugouts/xmi/UmlComponent.h
index 81cf79bfc..ba87b337b 100644
--- a/genplugouts/xmi/UmlComponent.h
+++ b/genplugouts/xmi/UmlComponent.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponent.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlComponent : public UmlBaseComponent
 {
 public:
-    UmlComponent(void * id, const Q3CString & n) : UmlBaseComponent(id, n) {};
+    UmlComponent(void * id, const QByteArray & n) : UmlBaseComponent(id, n) {};
 
     virtual void ref(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlComponentDiagram.h b/genplugouts/xmi/UmlComponentDiagram.h
index 15d707dc2..ea106add4 100644
--- a/genplugouts/xmi/UmlComponentDiagram.h
+++ b/genplugouts/xmi/UmlComponentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlComponentDiagram : public UmlBaseComponentDiagram
 {
 public:
-    UmlComponentDiagram(void * id, const Q3CString & n) : UmlBaseComponentDiagram(id, n) {};
+    UmlComponentDiagram(void * id, const QByteArray & n) : UmlBaseComponentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlComponentView.cpp b/genplugouts/xmi/UmlComponentView.cpp
index 1ecdef362..67cd06012 100644
--- a/genplugouts/xmi/UmlComponentView.cpp
+++ b/genplugouts/xmi/UmlComponentView.cpp
@@ -4,7 +4,7 @@
 
 bool UmlComponentView::write_if_needed(FileOut & out)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     bool used = FALSE;
 
diff --git a/genplugouts/xmi/UmlComponentView.h b/genplugouts/xmi/UmlComponentView.h
index 04f5884e8..76d00d4c3 100644
--- a/genplugouts/xmi/UmlComponentView.h
+++ b/genplugouts/xmi/UmlComponentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseComponentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlComponentView : public UmlBaseComponentView
 {
 public:
-    UmlComponentView(void * id, const Q3CString & n) : UmlBaseComponentView(id, n) {};
+    UmlComponentView(void * id, const QByteArray & n) : UmlBaseComponentView(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlDeploymentDiagram.h b/genplugouts/xmi/UmlDeploymentDiagram.h
index 727d0ffd0..9963ec87d 100644
--- a/genplugouts/xmi/UmlDeploymentDiagram.h
+++ b/genplugouts/xmi/UmlDeploymentDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlDeploymentDiagram : public UmlBaseDeploymentDiagram
 {
 public:
-    UmlDeploymentDiagram(void * id, const Q3CString & n) : UmlBaseDeploymentDiagram(id, n) {};
+    UmlDeploymentDiagram(void * id, const QByteArray & n) : UmlBaseDeploymentDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlDeploymentView.cpp b/genplugouts/xmi/UmlDeploymentView.cpp
index b73ba668e..462c7d150 100644
--- a/genplugouts/xmi/UmlDeploymentView.cpp
+++ b/genplugouts/xmi/UmlDeploymentView.cpp
@@ -4,7 +4,7 @@
 
 bool UmlDeploymentView::write_if_needed(FileOut & out)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     bool used = FALSE;
 
diff --git a/genplugouts/xmi/UmlDeploymentView.h b/genplugouts/xmi/UmlDeploymentView.h
index f29e4ae81..f0b4992da 100644
--- a/genplugouts/xmi/UmlDeploymentView.h
+++ b/genplugouts/xmi/UmlDeploymentView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDeploymentView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlDeploymentView : public UmlBaseDeploymentView
 {
 public:
-    UmlDeploymentView(void * id, const Q3CString & n) : UmlBaseDeploymentView(id, n) {};
+    UmlDeploymentView(void * id, const QByteArray & n) : UmlBaseDeploymentView(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlDiagram.h b/genplugouts/xmi/UmlDiagram.h
index ffee38e5c..99f9e2f51 100644
--- a/genplugouts/xmi/UmlDiagram.h
+++ b/genplugouts/xmi/UmlDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, mainly defined fot C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -14,7 +14,7 @@
 class UmlDiagram : public UmlBaseDiagram
 {
 public:
-    UmlDiagram(void * id, const Q3CString & n) : UmlBaseDiagram(id, n) {};
+    UmlDiagram(void * id, const QByteArray & n) : UmlBaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlEntryPointPseudoState.h b/genplugouts/xmi/UmlEntryPointPseudoState.h
index 838a4bf5b..6de612bd1 100644
--- a/genplugouts/xmi/UmlEntryPointPseudoState.h
+++ b/genplugouts/xmi/UmlEntryPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseEntryPointPseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlEntryPointPseudoState : public UmlBaseEntryPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlEntryPointPseudoState(void * id, const Q3CString & s) : UmlBaseEntryPointPseudoState(id, s) {
+    UmlEntryPointPseudoState(void * id, const QByteArray & s) : UmlBaseEntryPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlExitPointPseudoState.h b/genplugouts/xmi/UmlExitPointPseudoState.h
index 1a57b8230..368a7bc8b 100644
--- a/genplugouts/xmi/UmlExitPointPseudoState.h
+++ b/genplugouts/xmi/UmlExitPointPseudoState.h
@@ -3,13 +3,13 @@
 
 
 #include "UmlBaseExitPointPseudoState.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlExitPointPseudoState : public UmlBaseExitPointPseudoState
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlExitPointPseudoState(void * id, const Q3CString & s) : UmlBaseExitPointPseudoState(id, s) {
+    UmlExitPointPseudoState(void * id, const QByteArray & s) : UmlBaseExitPointPseudoState(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlExtraClassMember.h b/genplugouts/xmi/UmlExtraClassMember.h
index cf0b2bf47..261aa6257 100644
--- a/genplugouts/xmi/UmlExtraClassMember.h
+++ b/genplugouts/xmi/UmlExtraClassMember.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseExtraClassMember.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class allows to manage extra class member, It allows to insert
 // C++ pre-processor directive (even they may be placed in the other member
@@ -14,7 +14,7 @@
 class UmlExtraClassMember : public UmlBaseExtraClassMember
 {
 public:
-    UmlExtraClassMember(void * id, const Q3CString & n) : UmlBaseExtraClassMember(id, n) {};
+    UmlExtraClassMember(void * id, const QByteArray & n) : UmlBaseExtraClassMember(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlItem.cpp b/genplugouts/xmi/UmlItem.cpp
index 55de21a4b..0e67378b8 100644
--- a/genplugouts/xmi/UmlItem.cpp
+++ b/genplugouts/xmi/UmlItem.cpp
@@ -4,7 +4,7 @@
 
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 UmlItem::~UmlItem()
 {
 }
@@ -16,7 +16,7 @@ void UmlItem::xmi(int, char **)
 
 bool UmlItem::write_if_needed(FileOut & out)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     bool used = FALSE;
 
@@ -100,34 +100,35 @@ void UmlItem::write_description_properties(FileOut & out)
             out << "</UML:ModelElement.taggedValue>\n";
         }
 
-        const Q3Dict<Q3CString> up = properties();
-        Q3DictIterator<Q3CString> it(up);
+        const QHash<QByteArray, QByteArray*> up = properties();
+        QHashIterator<QByteArray, QByteArray*> it(up);
 
-        while (it.current()) {
+        while (it.hasNext()) {
+            it.next();
             out.indent();
             out << "<UML:ModelElement.taggedValue>\n";
             out.indent();
 
             if (_taggedvalue_mode == 1) {
                 out << "\t<UML:TaggedValue tag=\"";
-                out.quote(it.currentKey());
+                out.quote(it.key());
                 out << "\" value=\"";
-                out.quote(*(it.current()));
+                out.quote(*(it.value()));
                 out << "\"/>\n";
             }
             else {
                 out << "\t<UML:TaggedValue.tag>";
-                out.quote(it.currentKey());
+                out.quote(it.key());
                 out << "</UML:TaggedValue.tag>\n";
                 out.indent();
                 out << "\t<UML:TaggedValue.value>";
-                out.quote(*(it.current()));
+                out.quote(*(it.value()));
                 out << "</UML:TaggedValue.value>\n";
             }
 
             out.indent();
             out << "</UML:ModelElement.taggedValue>\n";
-            ++it;
+//            ++it;
         }
     }
 }
diff --git a/genplugouts/xmi/UmlItem.h b/genplugouts/xmi/UmlItem.h
index 03c1b7723..4bc4baf97 100644
--- a/genplugouts/xmi/UmlItem.h
+++ b/genplugouts/xmi/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "Language.h"
 
 class FileOut;
@@ -16,7 +16,7 @@ class FileOut;
 class UmlItem : public UmlBaseItem
 {
 public:
-    UmlItem(void * id, const Q3CString & n)
+    UmlItem(void * id, const QByteArray & n)
         : UmlBaseItem(id, n), _written(FALSE) {};
 
     virtual ~UmlItem();
diff --git a/genplugouts/xmi/UmlNcRelation.h b/genplugouts/xmi/UmlNcRelation.h
index c5c3367ae..f8d2c405a 100644
--- a/genplugouts/xmi/UmlNcRelation.h
+++ b/genplugouts/xmi/UmlNcRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNcRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlNcRelation : public UmlBaseNcRelation
 {
 public:
-    UmlNcRelation(void * id, const Q3CString & n) : UmlBaseNcRelation(id, n) {};
+    UmlNcRelation(void * id, const QByteArray & n) : UmlBaseNcRelation(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlNode.cpp b/genplugouts/xmi/UmlNode.cpp
index ff76b4067..d91ae026d 100644
--- a/genplugouts/xmi/UmlNode.cpp
+++ b/genplugouts/xmi/UmlNode.cpp
@@ -19,7 +19,7 @@ bool UmlNode::write_if_needed(FileOut & out)
     out.indent();
     out << "</UML:Node>\n";
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned i = 0; i != n; i += 1)
diff --git a/genplugouts/xmi/UmlNode.h b/genplugouts/xmi/UmlNode.h
index a20f074fb..87865a6a8 100644
--- a/genplugouts/xmi/UmlNode.h
+++ b/genplugouts/xmi/UmlNode.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseNode.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlNode : public UmlBaseNode
 {
 public:
-    UmlNode(void * id, const Q3CString & n) : UmlBaseNode(id, n) {};
+    UmlNode(void * id, const QByteArray & n) : UmlBaseNode(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlOperation.cpp b/genplugouts/xmi/UmlOperation.cpp
index 068af8062..cd01dfd72 100644
--- a/genplugouts/xmi/UmlOperation.cpp
+++ b/genplugouts/xmi/UmlOperation.cpp
@@ -8,11 +8,11 @@
 #include "CppSettings.h"
 #include "JavaSettings.h"
 //Added by qt3to4:
-#include <Q3CString>
-#include <Q3ValueList>
+#include <QByteArray>
+#include <QList>
 bool UmlOperation::write_if_needed(FileOut & out)
 {
-    Q3CString decl;
+    QByteArray decl;
 
     switch (_lang) {
     case Uml:
@@ -64,7 +64,7 @@ bool UmlOperation::write_if_needed(FileOut & out)
         break;
 
     default: // Java
-        if (javaDecl().find("${visibility}") != -1)
+        if (javaDecl().indexOf("${visibility}") != -1)
             write_visibility(out, visibility());
 
         break;
@@ -105,7 +105,7 @@ bool UmlOperation::write_if_needed(FileOut & out)
     return TRUE;
 }
 
-void UmlOperation::write_return_type(FileOut & out, Q3CString decl)
+void UmlOperation::write_return_type(FileOut & out, QByteArray decl)
 {
     const UmlTypeSpec & t = returnType();
     static int return_rank = 0;
@@ -144,25 +144,25 @@ void UmlOperation::write_return_type(FileOut & out, Q3CString decl)
     }
 }
 
-void UmlOperation::write_cpp_returntype(FileOut & out, Q3CString decl)
+void UmlOperation::write_cpp_returntype(FileOut & out, QByteArray decl)
 {
     // doesn't manage function pointer
     // manage keywords
     int index;
 
-    if ((index = decl.find("${static}")) != -1)
+    if ((index = decl.indexOf("${static}")) != -1)
         decl.remove(index, 9);
 
-    if ((index = decl.find("${friend}")) != -1)
+    if ((index = decl.indexOf("${friend}")) != -1)
         decl.remove(index, 9);
 
-    if ((index = decl.find("${virtual}")) != -1)
+    if ((index = decl.indexOf("${virtual}")) != -1)
         decl.remove(index, 10);
 
-    if ((index = decl.find("${inline}")) != -1)
+    if ((index = decl.indexOf("${inline}")) != -1)
         decl.remove(index, 9);
 
-    if ((index = decl.find("${(}")) == -1)
+    if ((index = decl.indexOf("${(}")) == -1)
         decl = "${type} ${name}";
     else
         decl.truncate(index);
@@ -174,30 +174,30 @@ void UmlOperation::write_cpp_returntype(FileOut & out, Q3CString decl)
         write_type(out, t, decl, "${name}", "${type}");
 }
 
-void UmlOperation::write_java_returntype(FileOut & out, Q3CString decl)
+void UmlOperation::write_java_returntype(FileOut & out, QByteArray decl)
 {
 // manage keywords
     int index;
 
-    if ((index = decl.find("${visibility}")) != -1)
+    if ((index = decl.indexOf("${visibility}")) != -1)
         decl.remove(index, 13);
 
-    if ((index = decl.find("${final}")) != -1)
+    if ((index = decl.indexOf("${final}")) != -1)
         decl.remove(index, 8);
 
-    if ((index = decl.find("${static}")) != -1)
+    if ((index = decl.indexOf("${static}")) != -1)
         decl.remove(index, 9);
 
-    if ((index = decl.find("${abstract}")) != -1)
+    if ((index = decl.indexOf("${abstract}")) != -1)
         decl.remove(index, 11);
 
-    if ((index = decl.find("${synchronized}")) != -1)
+    if ((index = decl.indexOf("${synchronized}")) != -1)
         decl.remove(index, 15);
 
-    if ((index = decl.find("${@}")) != -1)
+    if ((index = decl.indexOf("${@}")) != -1)
         decl.remove(index, 4);
 
-    if ((index = decl.find("${(}")) == -1)
+    if ((index = decl.indexOf("${(}")) == -1)
         decl = "${type} ${name}";
     else
         decl.truncate(index);
@@ -211,8 +211,8 @@ void UmlOperation::write_java_returntype(FileOut & out, Q3CString decl)
 
 void UmlOperation::write_uml_params(FileOut & out)
 {
-    const Q3ValueList<UmlParameter> p = params();
-    Q3ValueList<UmlParameter>::ConstIterator it;
+    const QList<UmlParameter> p = params();
+    QList<UmlParameter>::ConstIterator it;
 
     for (it = p.begin(); it != p.end(); ++it) {
         out.indent();
@@ -261,14 +261,14 @@ void UmlOperation::write_uml_params(FileOut & out)
     }
 }
 
-void UmlOperation::write_cpp_java_params(FileOut & out, Q3CString decl)
+void UmlOperation::write_cpp_java_params(FileOut & out, QByteArray decl)
 {
-    int index1 = decl.find("${(}");
+    int index1 = decl.indexOf("${(}");
 
     if (index1 == -1)
         return;
 
-    int index2 = decl.find("${)}", index1 + 4);
+    int index2 = decl.indexOf("${)}", index1 + 4);
 
     if (index2 == -1)
         return;
@@ -277,10 +277,10 @@ void UmlOperation::write_cpp_java_params(FileOut & out, Q3CString decl)
 
     index1 = 0;
 
-    const Q3ValueList<UmlParameter> p = params();
-    Q3CString sparam;
-    Q3CString kname;
-    Q3CString ktype;
+    const QList<UmlParameter> p = params();
+    QByteArray sparam;
+    QByteArray kname;
+    QByteArray ktype;
     int rank;
 
     if ((name() == "unload") && (parent()->name() == "UmlBasePackage"))
@@ -330,7 +330,7 @@ void UmlOperation::write_cpp_java_params(FileOut & out, Q3CString decl)
     }
 }
 
-bool UmlOperation::get_param(Q3CString s, int & index, Q3CString & r, Q3CString & kname, Q3CString & ktype, int & rank)
+bool UmlOperation::get_param(QByteArray s, int & index, QByteArray & r, QByteArray & kname, QByteArray & ktype, int & rank)
 {
     int index0 = index;
     int level = 0;
@@ -344,14 +344,14 @@ bool UmlOperation::get_param(Q3CString s, int & index, Q3CString & r, Q3CString
             if (level != 0)
                 return FALSE;
 
-            r = s.mid(index0, index - index0).stripWhiteSpace();
+            r = s.mid(index0, index - index0).trimmed();
 
             if (r.isEmpty())
                 return FALSE;
 
         case ',':
             if (level == 0) {
-                r = s.mid(index0, index - index0).stripWhiteSpace();
+                r = s.mid(index0, index - index0).trimmed();
                 index += 1;
 
                 if (r.isEmpty())
@@ -382,16 +382,16 @@ bool UmlOperation::get_param(Q3CString s, int & index, Q3CString & r, Q3CString
 
     rank = -1;
 
-    if (((index1 = r.find("${p")) != -1) &&
-        ((index2 = r.find("}", index1 + 3)) != -1)) {
+    if (((index1 = r.indexOf("${p")) != -1) &&
+        ((index2 = r.indexOf("}", index1 + 3)) != -1)) {
         kname = r.mid(index1, index2 - index1 + 1);
         rank = atoi(((const char *) r) + index1 + 3);
     }
     else
         kname = "";
 
-    if (((index1 = r.find("${t")) != -1) &&
-        ((index2 = r.find("}", index1 + 3)) != -1)) {
+    if (((index1 = r.indexOf("${t")) != -1) &&
+        ((index2 = r.indexOf("}", index1 + 3)) != -1)) {
         ktype = r.mid(index1, index2 - index1 + 1);
 
         if (rank == -1)
diff --git a/genplugouts/xmi/UmlOperation.h b/genplugouts/xmi/UmlOperation.h
index 868b90f61..38718a93f 100644
--- a/genplugouts/xmi/UmlOperation.h
+++ b/genplugouts/xmi/UmlOperation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseOperation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -14,21 +14,21 @@ class FileOut;
 class UmlOperation : public UmlBaseOperation
 {
 public:
-    UmlOperation(void * id, const Q3CString & n) : UmlBaseOperation(id, n) {};
+    UmlOperation(void * id, const QByteArray & n) : UmlBaseOperation(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
-    void write_return_type(FileOut & out, Q3CString decl);
+    void write_return_type(FileOut & out, QByteArray decl);
 
-    void write_cpp_returntype(FileOut & out, Q3CString decl);
+    void write_cpp_returntype(FileOut & out, QByteArray decl);
 
-    void write_java_returntype(FileOut & out, Q3CString decl);
+    void write_java_returntype(FileOut & out, QByteArray decl);
 
     void write_uml_params(FileOut & out);
 
-    void write_cpp_java_params(FileOut & out, Q3CString decl);
+    void write_cpp_java_params(FileOut & out, QByteArray decl);
 
-    bool get_param(Q3CString s, int & index, Q3CString & r, Q3CString & kname, Q3CString & ktype, int & rank);
+    bool get_param(QByteArray s, int & index, QByteArray & r, QByteArray & kname, QByteArray & ktype, int & rank);
 
 
 protected:
diff --git a/genplugouts/xmi/UmlPackage.cpp b/genplugouts/xmi/UmlPackage.cpp
index 76e7c5367..d64c2d9bd 100644
--- a/genplugouts/xmi/UmlPackage.cpp
+++ b/genplugouts/xmi/UmlPackage.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <qfile.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 #include "UmlCom.h"
 #include "Dialog.h"
@@ -20,10 +20,10 @@ void UmlPackage::xmi(int argc, char ** argv)
     // the project
 
     bool noarg = (argc == 0);
-    Q3CString path;
-    Q3CString genviews;
-    Q3CString encoding;
-    Q3CString taggedvalue;
+    QByteArray path;
+    QByteArray genviews;
+    QByteArray encoding;
+    QByteArray taggedvalue;
 
     if (noarg) {
         propertyValue("gxmi path", path);
@@ -134,7 +134,7 @@ void UmlPackage::xmi(int argc, char ** argv)
 
                 // write children
 
-                const Q3PtrVector<UmlItem> ch = children();
+                const QVector<UmlItem*> ch = children();
                 unsigned n = ch.size();
 
                 for (unsigned i = 0; i != n; i += 1)
@@ -182,7 +182,7 @@ bool UmlPackage::write_if_needed(FileOut & out)
     write_stereotype(out);
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     bool used = FALSE;
 
diff --git a/genplugouts/xmi/UmlPackage.h b/genplugouts/xmi/UmlPackage.h
index b6ac383e9..dfad4dcaa 100644
--- a/genplugouts/xmi/UmlPackage.h
+++ b/genplugouts/xmi/UmlPackage.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBasePackage.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlPackage : public UmlBasePackage
 {
 public:
-    UmlPackage(void * id, const Q3CString & n) : UmlBasePackage(id, n) {};
+    UmlPackage(void * id, const QByteArray & n) : UmlBasePackage(id, n) {};
 
     virtual void xmi(int argc, char ** argv);
 
diff --git a/genplugouts/xmi/UmlParameter.h b/genplugouts/xmi/UmlParameter.h
index ef6f522b0..3c967ad60 100644
--- a/genplugouts/xmi/UmlParameter.h
+++ b/genplugouts/xmi/UmlParameter.h
@@ -4,7 +4,7 @@
 
 #include "aDirection.h"
 #include "UmlTypeSpec.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Represent an operation's parameter
 
@@ -13,9 +13,9 @@ struct UmlParameter {
 
     UmlTypeSpec type;
 
-    Q3CString name;
+    QByteArray name;
 
-    Q3CString default_value;
+    QByteArray default_value;
 
 };
 
diff --git a/genplugouts/xmi/UmlPseudoState.h b/genplugouts/xmi/UmlPseudoState.h
index 075761ec7..0b07e1811 100644
--- a/genplugouts/xmi/UmlPseudoState.h
+++ b/genplugouts/xmi/UmlPseudoState.h
@@ -2,7 +2,7 @@
 #define _UMLPSEUDOSTATE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 #include "UmlItem.h"
 #include "UmlStateItem.h"
 
@@ -10,7 +10,7 @@ class UmlPseudoState : public UmlStateItem, public UmlItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlPseudoState(void * id, const Q3CString & s) : UmlItem(id, s) {
+    UmlPseudoState(void * id, const QByteArray & s) : UmlItem(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlRegion.h b/genplugouts/xmi/UmlRegion.h
index d3f32cb7b..07eeb82db 100644
--- a/genplugouts/xmi/UmlRegion.h
+++ b/genplugouts/xmi/UmlRegion.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseRegion.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlRegion : public UmlBaseRegion, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlRegion(void * id, const Q3CString & s) : UmlBaseRegion(id, s) {
+    UmlRegion(void * id, const QByteArray & s) : UmlBaseRegion(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlRelation.cpp b/genplugouts/xmi/UmlRelation.cpp
index 352719872..4706f554a 100644
--- a/genplugouts/xmi/UmlRelation.cpp
+++ b/genplugouts/xmi/UmlRelation.cpp
@@ -4,7 +4,7 @@
 
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 bool UmlRelation::write_if_needed(FileOut & out)
 {
     // class already generated
@@ -178,16 +178,16 @@ void UmlRelation::write_relation(FileOut & out, aRelationKind k)
     out << "\">\n";
 
     if (!multiplicity().isEmpty()) {
-        Q3CString min;
-        Q3CString max;
-        int index = multiplicity().find("..");
+        QByteArray min;
+        QByteArray max;
+        int index = multiplicity().indexOf("..");
 
         if (index != -1) {
-            min = multiplicity().left(index).stripWhiteSpace();
-            max = multiplicity().mid(index + 2).stripWhiteSpace();
+            min = multiplicity().left(index).trimmed();
+            max = multiplicity().mid(index + 2).trimmed();
         }
         else
-            min = max = multiplicity().stripWhiteSpace();
+            min = max = multiplicity().trimmed();
 
         if (min == "*")
             min = "0";
diff --git a/genplugouts/xmi/UmlRelation.h b/genplugouts/xmi/UmlRelation.h
index 5ce3f47fe..504d5b4cc 100644
--- a/genplugouts/xmi/UmlRelation.h
+++ b/genplugouts/xmi/UmlRelation.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseRelation.h"
-#include <q3cstring.h>
+#include <QByteArray>
 #include "aRelationKind.h"
 
 class FileOut;
@@ -15,7 +15,7 @@ class FileOut;
 class UmlRelation : public UmlBaseRelation
 {
 public:
-    UmlRelation(void * id, const Q3CString & n) : UmlBaseRelation(id, n) {};
+    UmlRelation(void * id, const QByteArray & n) : UmlBaseRelation(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlSequenceDiagram.h b/genplugouts/xmi/UmlSequenceDiagram.h
index d3b3d83fc..a1bbcc966 100644
--- a/genplugouts/xmi/UmlSequenceDiagram.h
+++ b/genplugouts/xmi/UmlSequenceDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseSequenceDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlSequenceDiagram : public UmlBaseSequenceDiagram
 {
 public:
-    UmlSequenceDiagram(void * id, const Q3CString & n) : UmlBaseSequenceDiagram(id, n) {};
+    UmlSequenceDiagram(void * id, const QByteArray & n) : UmlBaseSequenceDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlSettings.cpp b/genplugouts/xmi/UmlSettings.cpp
index 8f3ac5954..7a556b85b 100644
--- a/genplugouts/xmi/UmlSettings.cpp
+++ b/genplugouts/xmi/UmlSettings.cpp
@@ -7,15 +7,15 @@
 #include "UmlBuiltin.h"
 #include "UmlStereotype.h"
 //Added by qt3to4:
-#include <Q3CString>
-Q3CString UmlSettings::artifactDescription()
+#include <QByteArray>
+QByteArray UmlSettings::artifactDescription()
 {
     read_if_needed_();
 
     return _artifact_default_description;
 }
 
-bool UmlSettings::set_ArtifactDescription(Q3CString v)
+bool UmlSettings::set_ArtifactDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultArtifactDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -27,14 +27,14 @@ bool UmlSettings::set_ArtifactDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::classDescription()
+QByteArray UmlSettings::classDescription()
 {
     read_if_needed_();
 
     return _class_default_description;
 }
 
-bool UmlSettings::set_ClassDescription(Q3CString v)
+bool UmlSettings::set_ClassDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultClassDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -46,14 +46,14 @@ bool UmlSettings::set_ClassDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::operationDescription()
+QByteArray UmlSettings::operationDescription()
 {
     read_if_needed_();
 
     return _operation_default_description;
 }
 
-bool UmlSettings::set_OperationDescription(Q3CString v)
+bool UmlSettings::set_OperationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultOperationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -65,14 +65,14 @@ bool UmlSettings::set_OperationDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::attributeDescription()
+QByteArray UmlSettings::attributeDescription()
 {
     read_if_needed_();
 
     return _attribute_default_description;
 }
 
-bool UmlSettings::set_AttributeDescription(Q3CString v)
+bool UmlSettings::set_AttributeDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultAttributeDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -84,14 +84,14 @@ bool UmlSettings::set_AttributeDescription(Q3CString v)
         return FALSE;
 }
 
-Q3CString UmlSettings::relationDescription()
+QByteArray UmlSettings::relationDescription()
 {
     read_if_needed_();
 
     return _relation_default_description;
 }
 
-bool UmlSettings::set_RelationDescription(Q3CString v)
+bool UmlSettings::set_RelationDescription(QByteArray v)
 {
     UmlCom::send_cmd(umlSettingsCmd, setDefaultRelationDescriptionCmd, (const char *)v); //[rageek] Fix prototype
 
@@ -105,39 +105,39 @@ bool UmlSettings::set_RelationDescription(Q3CString v)
 
 bool UmlSettings::_defined;
 
-Q3CString UmlSettings::_artifact_default_description;
+QByteArray UmlSettings::_artifact_default_description;
 
-Q3CString UmlSettings::_class_default_description;
+QByteArray UmlSettings::_class_default_description;
 
-Q3CString UmlSettings::_operation_default_description;
+QByteArray UmlSettings::_operation_default_description;
 
-Q3CString UmlSettings::_attribute_default_description;
+QByteArray UmlSettings::_attribute_default_description;
 
-Q3CString UmlSettings::_relation_default_description;
+QByteArray UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QByteArray,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_relation_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QByteArray,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -149,7 +149,7 @@ void UmlSettings::read_()
     _relation_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_stereotypes[index].uml = UmlCom::read_string();
@@ -162,7 +162,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -186,18 +186,18 @@ void UmlSettings::read_if_needed_()
     }
 }
 
-unsigned UmlSettings::multiplicity_column(const Q3CString & mult)
+unsigned UmlSettings::multiplicity_column(const QByteArray & mult)
 {
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
 }
 
-Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
+QByteArray UmlSettings::uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f)
 {
     unsigned index = _map_builtins.count();
 
@@ -208,7 +208,7 @@ Q3CString UmlSettings::uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f)
     return 0;
 }
 
-Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_relation_stereotypes.count();
 
@@ -219,7 +219,7 @@ Q3CString UmlSettings::uml_rel_stereotype(const Q3CString & t, Q3CString UmlSter
     return 0;
 }
 
-Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f)
+QByteArray UmlSettings::uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f)
 {
     unsigned index = _map_class_stereotypes.count();
 
@@ -230,15 +230,15 @@ Q3CString UmlSettings::uml_class_stereotype(const Q3CString & t, Q3CString UmlSt
     return 0;
 }
 
-UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
+UmlBuiltin * UmlSettings::add_type(const QByteArray & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         builtins[index] = _builtins[index];
@@ -266,15 +266,15 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_rel_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_relation_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_stereotypes.size())
-        _map_relation_stereotypes.resize(_map_relation_stereotypes.size() * 2 - 1);
+        _map_relation_stereotypes.reserve(_map_relation_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         relation_stereotypes[index] = _relation_stereotypes[index];
@@ -299,15 +299,15 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s)
 
 }
 
-UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s)
+UmlStereotype * UmlSettings::add_class_stereotype(const QByteArray & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1)
         class_stereotypes[index] = _class_stereotypes[index];
diff --git a/genplugouts/xmi/UmlSettings.h b/genplugouts/xmi/UmlSettings.h
index 57d228d02..5fe3c15c0 100644
--- a/genplugouts/xmi/UmlSettings.h
+++ b/genplugouts/xmi/UmlSettings.h
@@ -1,9 +1,9 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
 
+#include <QHash>
+#include <QByteArray>
 
-#include <q3cstring.h>
-#include <q3dict.h>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -19,44 +19,44 @@ class UmlSettings
 {
 public:
     // return the default description
-    static Q3CString artifactDescription();
+    static QByteArray artifactDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ArtifactDescription(Q3CString v);
+    static bool set_ArtifactDescription(QByteArray v);
 
     // return the default description
-    static Q3CString classDescription();
+    static QByteArray classDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_ClassDescription(Q3CString v);
+    static bool set_ClassDescription(QByteArray v);
 
     // return the default description
-    static Q3CString operationDescription();
+    static QByteArray operationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_OperationDescription(Q3CString v);
+    static bool set_OperationDescription(QByteArray v);
 
     // return the default description
-    static Q3CString attributeDescription();
+    static QByteArray attributeDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_AttributeDescription(Q3CString v);
+    static bool set_AttributeDescription(QByteArray v);
 
     // return the default description
-    static Q3CString relationDescription();
+    static QByteArray relationDescription();
 
     // set the default description
     //
     // On error : return FALSE in C++, produce a RuntimeException in Java
-    static bool set_RelationDescription(Q3CString v);
+    static bool set_RelationDescription(QByteArray v);
 
 
 protected:
@@ -65,25 +65,25 @@ class UmlSettings
 
     static bool _defined;
 
-    static Q3CString _artifact_default_description;
+    static QByteArray _artifact_default_description;
 
-    static Q3CString _class_default_description;
+    static QByteArray _class_default_description;
 
-    static Q3CString _operation_default_description;
+    static QByteArray _operation_default_description;
 
-    static Q3CString _attribute_default_description;
+    static QByteArray _attribute_default_description;
 
-    static Q3CString _relation_default_description;
+    static QByteArray _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QByteArray,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_relation_stereotypes;
 
     static UmlStereotype * _relation_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QByteArray,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
@@ -97,31 +97,31 @@ class UmlSettings
 
     //internal, do NOT use it
 
-    static unsigned multiplicity_column(const Q3CString & mult);
+    static unsigned multiplicity_column(const QByteArray & mult);
 
     //internal, do NOT use it
 
-    static Q3CString uml_type(const Q3CString & t, Q3CString UmlBuiltin::* f);
+    static QByteArray uml_type(const QByteArray & t, QByteArray UmlBuiltin::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_rel_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_rel_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static Q3CString uml_class_stereotype(const Q3CString & t, Q3CString UmlStereotype::* f);
+    static QByteArray uml_class_stereotype(const QByteArray & t, QByteArray UmlStereotype::* f);
 
     //internal, do NOT use it
 
-    static UmlBuiltin * add_type(const Q3CString & s);
+    static UmlBuiltin * add_type(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_rel_stereotype(const Q3CString & s);
+    static UmlStereotype * add_rel_stereotype(const QByteArray & s);
 
     //internal, do NOT use it
 
-    static UmlStereotype * add_class_stereotype(const Q3CString & s);
+    static UmlStereotype * add_class_stereotype(const QByteArray & s);
 
 };
 
diff --git a/genplugouts/xmi/UmlState.h b/genplugouts/xmi/UmlState.h
index e14988f79..470093908 100644
--- a/genplugouts/xmi/UmlState.h
+++ b/genplugouts/xmi/UmlState.h
@@ -4,7 +4,7 @@
 
 #include "UmlBaseState.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -12,7 +12,7 @@ class UmlState : public UmlBaseState, public UmlStateItem
 {
 public:
         //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlState(void * id, const Q3CString & s) : UmlBaseState(id, s) {
+    UmlState(void * id, const QByteArray & s) : UmlBaseState(id, s) {
     }
 
     virtual bool write_if_needed(FileOut & out);
diff --git a/genplugouts/xmi/UmlStateDiagram.h b/genplugouts/xmi/UmlStateDiagram.h
index f49b5fb44..9c04bb0ad 100644
--- a/genplugouts/xmi/UmlStateDiagram.h
+++ b/genplugouts/xmi/UmlStateDiagram.h
@@ -4,13 +4,13 @@
 
 #include "UmlBaseStateDiagram.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlStateDiagram : public UmlBaseStateDiagram, public UmlStateItem
 {
 public:
     //  the constructor, do not call it yourself !!!!!!!!!!
-    UmlStateDiagram(void * id, const Q3CString & s) : UmlBaseStateDiagram(id, s) {
+    UmlStateDiagram(void * id, const QByteArray & s) : UmlBaseStateDiagram(id, s) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlStereotype.h b/genplugouts/xmi/UmlStereotype.h
index 290517202..e3942fc7a 100644
--- a/genplugouts/xmi/UmlStereotype.h
+++ b/genplugouts/xmi/UmlStereotype.h
@@ -2,23 +2,23 @@
 #define _UMLSTEREOTYPE_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 //  Internal class used to know how what code is produced for a stereotype in each language
 
 struct UmlStereotype {
-    Q3CString uml;
+    QByteArray uml;
 
 #ifdef WITHCPP
-    Q3CString cpp;
+    QByteArray cpp;
 #endif
 
 #ifdef WITHJAVA
-    Q3CString java;
+    QByteArray java;
 #endif
 
 #ifdef WITHIDL
-    Q3CString idl;
+    QByteArray idl;
 #endif
 
 };
diff --git a/genplugouts/xmi/UmlTransition.h b/genplugouts/xmi/UmlTransition.h
index 3edd626c7..da689b55d 100644
--- a/genplugouts/xmi/UmlTransition.h
+++ b/genplugouts/xmi/UmlTransition.h
@@ -4,12 +4,12 @@
 
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlTransition : public UmlBaseTransition, public UmlStateItem
 {
 public:
-    UmlTransition(void * id, const Q3CString & n) : UmlBaseTransition(id, n) {
+    UmlTransition(void * id, const QByteArray & n) : UmlBaseTransition(id, n) {
     }
 
 };
diff --git a/genplugouts/xmi/UmlTypeSpec.cpp b/genplugouts/xmi/UmlTypeSpec.cpp
index 4bcfebb95..ec194d414 100644
--- a/genplugouts/xmi/UmlTypeSpec.cpp
+++ b/genplugouts/xmi/UmlTypeSpec.cpp
@@ -2,9 +2,9 @@
 #include "UmlTypeSpec.h"
 #include "UmlClass.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
-const Q3CString & UmlTypeSpec::toString() const
+const QByteArray & UmlTypeSpec::toString() const
 {
     return (type) ? type->name() : explicit_type;
 }
diff --git a/genplugouts/xmi/UmlTypeSpec.h b/genplugouts/xmi/UmlTypeSpec.h
index 1c939ea94..90b32b48d 100644
--- a/genplugouts/xmi/UmlTypeSpec.h
+++ b/genplugouts/xmi/UmlTypeSpec.h
@@ -2,7 +2,7 @@
 #define _UMLTYPESPEC_H
 
 
-#include <q3cstring.h>
+#include <QByteArray>
 
 class UmlClass;
 
@@ -15,7 +15,7 @@ class UmlTypeSpec
 {
 public:
     // significant in case type == 0
-    Q3CString explicit_type;
+    QByteArray explicit_type;
 
     // if != 0 the class representing the type
     UmlClass * type;
@@ -23,7 +23,7 @@ class UmlTypeSpec
     UmlTypeSpec() : type(0) {};
 
     // returns the type as a string in all cases
-    const Q3CString & toString() const;
+    const QByteArray & toString() const;
 
 };
 
diff --git a/genplugouts/xmi/UmlUseCase.cpp b/genplugouts/xmi/UmlUseCase.cpp
index fcbb0b726..b49783a27 100644
--- a/genplugouts/xmi/UmlUseCase.cpp
+++ b/genplugouts/xmi/UmlUseCase.cpp
@@ -24,7 +24,7 @@ bool UmlUseCase::write_if_needed(FileOut & out)
     write_stereotype(out);
     write_description_properties(out);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     bool used = FALSE;
     bool haveRel = FALSE;
diff --git a/genplugouts/xmi/UmlUseCase.h b/genplugouts/xmi/UmlUseCase.h
index f52e3c478..6327bb399 100644
--- a/genplugouts/xmi/UmlUseCase.h
+++ b/genplugouts/xmi/UmlUseCase.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCase.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlUseCase : public UmlBaseUseCase
 {
 public:
-    UmlUseCase(void * id, const Q3CString & n) : UmlBaseUseCase(id, n) {};
+    UmlUseCase(void * id, const QByteArray & n) : UmlBaseUseCase(id, n) {};
 
     virtual void ref(FileOut & out);
 
diff --git a/genplugouts/xmi/UmlUseCaseDiagram.h b/genplugouts/xmi/UmlUseCaseDiagram.h
index 132b56d36..41f841a09 100644
--- a/genplugouts/xmi/UmlUseCaseDiagram.h
+++ b/genplugouts/xmi/UmlUseCaseDiagram.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseDiagram.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 // This class manages 'use case diagrams', notes that the class 'UmlDiagram'
 // is a mother class of all the diagrams, allowing to generalize their
@@ -13,7 +13,7 @@
 class UmlUseCaseDiagram : public UmlBaseUseCaseDiagram
 {
 public:
-    UmlUseCaseDiagram(void * id, const Q3CString & n) : UmlBaseUseCaseDiagram(id, n) {};
+    UmlUseCaseDiagram(void * id, const QByteArray & n) : UmlBaseUseCaseDiagram(id, n) {};
 
 };
 
diff --git a/genplugouts/xmi/UmlUseCaseView.cpp b/genplugouts/xmi/UmlUseCaseView.cpp
index 622febe18..91e28fb08 100644
--- a/genplugouts/xmi/UmlUseCaseView.cpp
+++ b/genplugouts/xmi/UmlUseCaseView.cpp
@@ -4,7 +4,7 @@
 
 bool UmlUseCaseView::write_if_needed(FileOut & out)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     bool used = FALSE;
 
diff --git a/genplugouts/xmi/UmlUseCaseView.h b/genplugouts/xmi/UmlUseCaseView.h
index 87d7b03c5..34a5c4377 100644
--- a/genplugouts/xmi/UmlUseCaseView.h
+++ b/genplugouts/xmi/UmlUseCaseView.h
@@ -3,7 +3,7 @@
 
 
 #include "UmlBaseUseCaseView.h"
-#include <q3cstring.h>
+#include <QByteArray>
 
 class FileOut;
 
@@ -13,7 +13,7 @@ class FileOut;
 class UmlUseCaseView : public UmlBaseUseCaseView
 {
 public:
-    UmlUseCaseView(void * id, const Q3CString & n) : UmlBaseUseCaseView(id, n) {};
+    UmlUseCaseView(void * id, const QByteArray & n) : UmlBaseUseCaseView(id, n) {};
 
     virtual bool write_if_needed(FileOut & out);
 
diff --git a/genplugouts/xmi/bbuttongroup.cpp b/genplugouts/xmi/bbuttongroup.cpp
new file mode 100644
index 000000000..e5bd43c4b
--- /dev/null
+++ b/genplugouts/xmi/bbuttongroup.cpp
@@ -0,0 +1,66 @@
+#include "bbuttongroup.h"
+
+BButtonGroup::BButtonGroup(QWidget *parent) :
+    QGroupBox(parent)
+{
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = Qt::Horizontal;
+    m_hLayout = new QHBoxLayout(this);
+    this->setLayout(m_hLayout);
+    m_hLayout->setSpacing(0);
+    m_hLayout->setMargin(0);
+}
+
+BButtonGroup::BButtonGroup(const QString &title, QWidget *parent):
+    QGroupBox(title, parent)
+{
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = Qt::Horizontal;
+    m_hLayout = new QHBoxLayout(this);
+    this->setLayout(m_hLayout);
+    m_hLayout->setSpacing(0);
+    m_hLayout->setMargin(0);
+}
+
+BButtonGroup::BButtonGroup(int strips, Qt::Orientation orientation, const QString &title, QWidget *parent, QString):
+QGroupBox(title, parent)
+{
+    Q_UNUSED(strips);
+    
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = orientation;
+    if(orientation == Qt::Horizontal)
+    {
+        m_hLayout = new QHBoxLayout(this);
+        this->setLayout(m_hLayout);
+        m_hLayout->setSpacing(0);
+        m_hLayout->setMargin(0);
+    }
+    else
+    {
+        m_vLayout = new QHBoxLayout(this);
+        this->setLayout(m_vLayout);
+        m_vLayout->setSpacing(0);
+        m_vLayout->setMargin(0);
+    }
+}
+
+void BButtonGroup::setExclusive(bool isEx)
+{
+    Q_UNUSED(isEx);
+}
+
+void BButtonGroup::addWidget(QWidget *widget)
+{
+    if(m_orientation == Qt::Horizontal)
+    {
+        m_hLayout->addWidget(widget);
+    }
+    else
+    {
+        m_vLayout->addWidget(widget);
+    }
+}
diff --git a/genplugouts/xmi/bbuttongroup.h b/genplugouts/xmi/bbuttongroup.h
new file mode 100644
index 000000000..e54f93d2e
--- /dev/null
+++ b/genplugouts/xmi/bbuttongroup.h
@@ -0,0 +1,26 @@
+#ifndef BBUTTONGROUP_H
+#define BBUTTONGROUP_H
+
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QWidget>
+class BButtonGroup : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit BButtonGroup(QWidget *parent = 0);
+    explicit BButtonGroup(const QString &title, QWidget* parent=0);
+    BButtonGroup( int strips, Qt::Orientation orientation, const QString & title, QWidget * parent = 0, QString = QString());
+    void setExclusive(bool isEx);
+    void addWidget(QWidget* widget);
+    QHBoxLayout *m_hLayout;
+    QHBoxLayout *m_vLayout;
+    Qt::Orientation m_orientation;
+signals:
+
+public slots:
+
+};
+
+#endif // BBUTTONGROUP_H
diff --git a/genplugouts/xmi/hhbox.cpp b/genplugouts/xmi/hhbox.cpp
new file mode 100644
index 000000000..95a09b5ea
--- /dev/null
+++ b/genplugouts/xmi/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/genplugouts/xmi/hhbox.h b/genplugouts/xmi/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/genplugouts/xmi/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/genplugouts/xmi/xmi.pro b/genplugouts/xmi/xmi.pro
index 077739d60..de04a0d1e 100644
--- a/genplugouts/xmi/xmi.pro
+++ b/genplugouts/xmi/xmi.pro
@@ -1,7 +1,9 @@
 TEMPLATE    = app
 TARGET        = gxmi
-CONFIG        += debug warn_on qt
-DEFINES        = WITHCPP WITHJAVA WITHIDL
+CONFIG -= app_bundle
+CONFIG        += warn_on qt c++11
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES       += WITHCPP WITHJAVA WITHIDL TRUE=true FALSE=false
 HEADERS        = ./UmlBaseFinalState.h \
           ./UmlBaseAttribute.h \
           ./UmlEntryPointPseudoState.h \
@@ -116,7 +118,9 @@ HEADERS        = ./UmlBaseFinalState.h \
           ./UmlBaseItem.h \
           ./Dialog.h \
           ./UmlBasePackage.h \
-          ./UmlOperation.h
+          ./UmlOperation.h \
+    bbuttongroup.h \
+    hhbox.h
 SOURCES        = ./UmlBaseFinalState.cpp \
           ./UmlBaseAttribute.cpp \
           ./UmlEntryPointPseudoState.cpp \
@@ -232,25 +236,26 @@ SOURCES        = ./UmlBaseFinalState.cpp \
           ./UmlBaseItem.cpp \
           ./Dialog.cpp \
           ./UmlBasePackage.cpp \
-          ./UmlOperation.cpp
+          ./UmlOperation.cpp \
+    bbuttongroup.cpp \
+    hhbox.cpp
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network  widgets
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
+QT += testlib
 
+    UI_DIR = src/ui
+    DESTDIR = ../../bin
 
-    MOC_DIR = bin/douml/xmi/MOC_release
-    OBJECTS_DIR = bin/douml/xmi/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-Debug{
-    MOC_DIR = bin/douml/xmi/MOC_Debug
-    OBJECTS_DIR = bin/douml/xmi/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
diff --git a/genplugouts/xmi2import/Association.cpp b/genplugouts/xmi2import/Association.cpp
index 440142560..d84491a4b 100644
--- a/genplugouts/xmi2import/Association.cpp
+++ b/genplugouts/xmi2import/Association.cpp
@@ -114,7 +114,7 @@ void Association::import(FileIn & in, Token & token)
 
 Association & Association::get(WrapperStr id, WrapperStr s)
 {
-    QMap<WrapperStr, Association>::Iterator it = All.find(id);
+    QMap<QString, Association>::Iterator it = All.find(id);
 
     if (it == All.end()) {
         Association a;
@@ -131,7 +131,7 @@ Association & Association::get(WrapperStr id, WrapperStr s)
 
 void Association::solveThem()
 {
-    QMap<WrapperStr, Association>::Iterator it;
+    QMap<QString, Association>::Iterator it;
 
     for (it = All.begin(); it != All.end(); ++it)
         (*it).solve(it.key());
@@ -139,7 +139,7 @@ void Association::solveThem()
     All.clear();
 }
 
-QMap<WrapperStr, Association> Association::All;
+QMap<QString, Association> Association::All;
 
 void Association::solve(WrapperStr id)
 {
@@ -160,7 +160,7 @@ void Association::solve(WrapperStr id)
 
         Role & a = roles[rank];
         Role & b = roles[1 - rank];
-        QMap<WrapperStr, UmlItem *>::Iterator it;
+        QMap<QString, UmlItem *>::Iterator it;
 
         if ((it = UmlItem::All.find(a.idref)) == UmlItem::All.end()) {
             if (!FileIn::isBypassedId(a.idref))
diff --git a/genplugouts/xmi2import/Association.h b/genplugouts/xmi2import/Association.h
index bdf260d50..ea53180ec 100644
--- a/genplugouts/xmi2import/Association.h
+++ b/genplugouts/xmi2import/Association.h
@@ -72,7 +72,7 @@ class Association
 
     Role roles[2];
 
-    static QMap<WrapperStr, Association> All;
+    static QMap<QString, Association> All;
 
     bool is_class_association;
 
diff --git a/genplugouts/xmi2import/Binding.cpp b/genplugouts/xmi2import/Binding.cpp
index 60db03d5b..e26b94c04 100644
--- a/genplugouts/xmi2import/Binding.cpp
+++ b/genplugouts/xmi2import/Binding.cpp
@@ -9,7 +9,7 @@
 #include "misc/mystr.h"
 void Binding::import(FileIn & in, Token & token, UmlClass * where)
 {
-    Q3PtrList<Binding> l;
+    QList<Binding*> l;
     WrapperStr boundid = token.valueOf("boundelement");
     WrapperStr signatureid = token.valueOf("signature");
 
@@ -83,7 +83,7 @@ void Binding::import(FileIn & in, Token & token, UmlClass * where)
             boundid = where->id();
 
         do {
-            Binding * b = l.take(0);
+            Binding * b = l.takeAt(0);
 
             b->boundId = boundid;
             b->signatureId = signatureid;
@@ -96,9 +96,9 @@ void Binding::import(FileIn & in, Token & token, UmlClass * where)
 void Binding::solveThem()
 {
     while (! All.isEmpty()) {
-        Binding * b = All.take(0);
+        Binding * b = All.takeAt(0);
 
-        QMap<WrapperStr, UmlItem *>::Iterator it = UmlItem::All.find(b->boundId);
+        QMap<QString, UmlItem *>::Iterator it = UmlItem::All.find(b->boundId);
         UmlClass * tmpl = UmlClass::signature(b->signatureId);
 
         if (it == UmlItem::All.end()) {
@@ -148,5 +148,5 @@ void Binding::solveThem()
 
 }
 
-Q3PtrList<Binding> Binding::All;
+QList<Binding*> Binding::All;
 
diff --git a/genplugouts/xmi2import/Binding.h b/genplugouts/xmi2import/Binding.h
index f02e28c99..999b6ccde 100644
--- a/genplugouts/xmi2import/Binding.h
+++ b/genplugouts/xmi2import/Binding.h
@@ -2,9 +2,9 @@
 #define _BINDING_H
 
 
-#include <q3ptrlist.h>
 
 
+#include <QList>
 class FileIn;
 class Token;
 class UmlClass;
@@ -20,7 +20,7 @@ class Binding
 
 
 protected:
-    static Q3PtrList<Binding> All;
+    static QList<Binding*> All;
 
     //xmiId of the class having the binbing
     WrapperStr boundId;
diff --git a/genplugouts/xmi2import/ClassInstance.cpp b/genplugouts/xmi2import/ClassInstance.cpp
index ef69098cc..b164b2023 100644
--- a/genplugouts/xmi2import/ClassInstance.cpp
+++ b/genplugouts/xmi2import/ClassInstance.cpp
@@ -10,7 +10,7 @@
 #include "UmlCom.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 void ClassInstance::init()
 {
     UmlItem::declareFct("ownedmember", "uml:InstanceSpecification", &importIt);
@@ -62,10 +62,10 @@ void ClassInstance::solveThem()
     // an other to set the value of a relation
 
     ClassInstance * cli;
-    Q3PtrList<UmlClassInstance> insts;
+    QList<UmlClassInstance*> insts;
 
-    for (cli = All.first(); cli != 0; cli = All.next()) {
-        QMap<WrapperStr, UmlItem *>::Iterator it;
+    foreach (cli, All) {
+        QMap<QString, UmlItem *>::Iterator it;
 
         it = UmlItem::All.find(cli->classifierId);
 
@@ -92,17 +92,17 @@ void ClassInstance::solveThem()
     // set attribute ans relation values
 
     while (! All.isEmpty()) {
-        QMap<WrapperStr, UmlItem *>::Iterator it;
+        QMap<QString, UmlItem *>::Iterator it;
 
-        cli = All.take(0);
+        cli = All.takeAt(0);
 
         it = UmlItem::All.find(cli->id);
 
         if (it != UmlItem::All.end()) {
             // class instance ok
             UmlClassInstance * inst = (UmlClassInstance *) *it;
-            Q3ValueList<Slot> & l = cli->bindings;
-            Q3ValueList<Slot>::Iterator itsl;
+            QList<Slot> & l = cli->bindings;
+            QList<Slot>::Iterator itsl;
 
             for (itsl = l.begin(); itsl != l.end(); ++itsl) {
                 Slot & slot = *itsl;
@@ -151,7 +151,7 @@ void ClassInstance::solveThem()
     }
 }
 
-Q3PtrList<ClassInstance> ClassInstance::All;
+QList<ClassInstance*> ClassInstance::All;
 
 void ClassInstance::Slot::importIt(FileIn & in, Token & token)
 {
diff --git a/genplugouts/xmi2import/ClassInstance.h b/genplugouts/xmi2import/ClassInstance.h
index 857e0adaf..3fa137741 100644
--- a/genplugouts/xmi2import/ClassInstance.h
+++ b/genplugouts/xmi2import/ClassInstance.h
@@ -1,11 +1,6 @@
 #ifndef _CLASSINSTANCE_H
 #define _CLASSINSTANCE_H
-
-
-#include <q3ptrlist.h>
-
-#include <q3valuelist.h>
-
+#include <QList>
 class FileIn;
 class Token;
 class UmlItem;
@@ -22,7 +17,7 @@ class ClassInstance
 
 
 protected:
-    static Q3PtrList<ClassInstance> All;
+    static QList<ClassInstance*> All;
 
     struct Slot {
         //import the activity node starting by 'tk' inside 'where'
@@ -37,7 +32,7 @@ class ClassInstance
     };
 
 
-    Q3ValueList<Slot> bindings;
+    QList<Slot> bindings;
 
     WrapperStr id;
 
diff --git a/genplugouts/xmi2import/CppSettings.cpp b/genplugouts/xmi2import/CppSettings.cpp
index c586b3e66..54be56019 100644
--- a/genplugouts/xmi2import/CppSettings.cpp
+++ b/genplugouts/xmi2import/CppSettings.cpp
@@ -26,7 +26,7 @@ WrapperStr CppSettings::type(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -37,7 +37,7 @@ bool CppSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -61,7 +61,7 @@ WrapperStr CppSettings::relationAttributeStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -72,7 +72,7 @@ bool CppSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -96,7 +96,7 @@ WrapperStr CppSettings::classStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -107,7 +107,7 @@ bool CppSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -524,7 +524,7 @@ WrapperStr CppSettings::builtinIn(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_in : WrapperStr();
 }
@@ -535,7 +535,7 @@ bool CppSettings::set_BuiltinIn(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -552,7 +552,7 @@ WrapperStr CppSettings::builtinOut(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_out : WrapperStr();
 }
@@ -563,7 +563,7 @@ bool CppSettings::set_BuiltinOut(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -580,7 +580,7 @@ WrapperStr CppSettings::builtinInOut(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_inout : WrapperStr();
 }
@@ -591,7 +591,7 @@ bool CppSettings::set_BuiltinInOut(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -608,7 +608,7 @@ WrapperStr CppSettings::builtinReturn(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_return : WrapperStr();
 }
@@ -619,7 +619,7 @@ bool CppSettings::set_BuiltinReturn(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, (const char *)type, (const char *)form); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -1222,14 +1222,14 @@ bool CppSettings::_is_inline_force_header_in_h;
 
 WrapperStr CppSettings::_visibility_indent;
 
-Q3Dict<WrapperStr> CppSettings::_map_includes;
+QHash<WrapperStr,WrapperStr*> CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1255,7 +1255,7 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/genplugouts/xmi2import/CppSettings.h b/genplugouts/xmi2import/CppSettings.h
index 684c6bcff..29dd0f3ca 100644
--- a/genplugouts/xmi2import/CppSettings.h
+++ b/genplugouts/xmi2import/CppSettings.h
@@ -7,7 +7,7 @@
 
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -662,7 +662,7 @@ class CppSettings : public UmlSettings
 
     static WrapperStr _visibility_indent;
 
-    static Q3Dict<WrapperStr> _map_includes;
+    static QHash<WrapperStr,WrapperStr*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/xmi2import/FileIn.cpp b/genplugouts/xmi2import/FileIn.cpp
index 6b49343ef..4c0f2195f 100644
--- a/genplugouts/xmi2import/FileIn.cpp
+++ b/genplugouts/xmi2import/FileIn.cpp
@@ -6,7 +6,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 FileIn::FileIn(const QString & path, FILE * fp)
-    : _path((const char *)path), _fp(fp), _utf8(false), _linenum(1), _length(1024)  //[rageek] ambiguous, cast *
+    : _path(path), _fp(fp), _utf8(false), _linenum(1), _length(1024)  //[rageek] ambiguous, cast *
 {
     _buffer = new char[_length];
 
@@ -186,7 +186,7 @@ const char * FileIn::readWord(bool any, BooL & str)
 
         if (c == '\n')
             _linenum += 1;
-        else if ((c != " ") && (c != '\t') && (c != '\r'))
+        else if ((c != ' ') && (c != '\t') && (c != '\r'))
             break;
     }
 
@@ -229,7 +229,7 @@ void FileIn::finish(WrapperStr what)
             WrapperStr s = tk.xmiId();
 
             if (! s.isEmpty())
-                BypassedIds.insert(QString(s), "");
+                BypassedIds.insert(s);
 
             if (! tk.closed())
                 finish(tk.what());
@@ -239,32 +239,32 @@ void FileIn::finish(WrapperStr what)
 
 void FileIn::bypass(Token & tk)
 {
-    static Q3Dict<char> bypassed;
+    static QSet<QString> bypassed;
 
     WrapperStr s = tk.xmiType();
 
     if (s.isEmpty()) {
-        QString k = QString(tk.what());
+        QString k = tk.what();
 
-        if (bypassed[k] == 0) {
+        if (!bypassed.contains(k)) {
             warning("bypass &lt;" + tk.what() + "...&gt; (other cases not signaled)");
-            bypassed.insert(k, "");
+            bypassed.insert(k);
         }
     }
     else {
-        QString k = QString(tk.what()) + " " + QString(s);
+        QString k = tk.what() + " " + s;
 
-        if (bypassed[k] == 0) {
+        if (!bypassed.contains(k)) {
             warning("bypass &lt;" + tk.what() +
                     " xmi:type=\"" + s + "\"...&gt; (other cases not signaled)");
-            bypassed.insert(k, "");
+            bypassed.insert(k);
         }
     }
 
     s = tk.xmiId();
 
     if (! s.isEmpty())
-        BypassedIds.insert(QString(s), "");
+        BypassedIds.insert(s);
 
     if (! tk.closed())
         finish(tk.what());
@@ -276,7 +276,7 @@ void FileIn::bypassedId(Token & tk)
     WrapperStr s = tk.xmiId();
 
     if (! s.isEmpty())
-        BypassedIds.insert(QString(s), "");
+        BypassedIds.insert(s);
 
 }
 
@@ -300,7 +300,7 @@ void FileIn::warning(WrapperStr s)
 
 }
 
-Q3Dict<char> FileIn::BypassedIds;
+QSet<WrapperStr> FileIn::BypassedIds;
 
 const char * FileIn::read_word(int c, bool any)
 {
@@ -476,13 +476,13 @@ char FileIn::read_special_char()
 
         s[index] = 0; // check on index useless
 
-        QMap<WrapperStr, char>::ConstIterator iter = _special_chars.find(s);
+        QMap<QString, char>::ConstIterator iter = _special_chars.find(s);
 
         if (iter == _special_chars.end())
             // doesn't return
             error("not a valid special character");
 
-        return iter.data();
+        return iter.value();
     }
 }
 
diff --git a/genplugouts/xmi2import/FileIn.h b/genplugouts/xmi2import/FileIn.h
index 4135dec76..f508f4977 100644
--- a/genplugouts/xmi2import/FileIn.h
+++ b/genplugouts/xmi2import/FileIn.h
@@ -1,11 +1,8 @@
 #ifndef _FILEIN_H
 #define _FILEIN_H
-
-
+#include <QHash>
+#include "misc/mystr.h"
 #include <qstring.h>
-
-#include <q3dict.h>
-
 #include <stdio.h>
 #include <qmap.h>
 class Token;
@@ -54,8 +51,8 @@ class FileIn
         return _path;
     }
 
-    static bool isBypassedId(WrapperStr id) {
-        return BypassedIds[QString(id)] != 0;
+    static bool isBypassedId(const WrapperStr& id) {
+        return BypassedIds.contains(id);
     }
 
 
@@ -72,9 +69,9 @@ class FileIn
 
     char * _buffer;
 
-    QMap<WrapperStr, char> _special_chars;
+    QMap<QString, char> _special_chars;
 
-    static Q3Dict<char> BypassedIds;
+    static QSet<WrapperStr> BypassedIds;
 
 
 private:
diff --git a/genplugouts/xmi2import/IdlSettings.cpp b/genplugouts/xmi2import/IdlSettings.cpp
index e0bc775db..9aaa343fe 100644
--- a/genplugouts/xmi2import/IdlSettings.cpp
+++ b/genplugouts/xmi2import/IdlSettings.cpp
@@ -26,7 +26,7 @@ WrapperStr IdlSettings::type(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->idl : s;
 }
@@ -37,7 +37,7 @@ bool IdlSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -61,7 +61,7 @@ WrapperStr IdlSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
@@ -72,7 +72,7 @@ bool IdlSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -96,7 +96,7 @@ WrapperStr IdlSettings::classStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->idl : s;
 }
@@ -107,7 +107,7 @@ bool IdlSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -648,14 +648,14 @@ WrapperStr IdlSettings::_src_content;
 
 WrapperStr IdlSettings::_ext;
 
-Q3Dict<WrapperStr> IdlSettings::_map_includes;
+QHash<WrapperStr,WrapperStr*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -677,7 +677,7 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/genplugouts/xmi2import/IdlSettings.h b/genplugouts/xmi2import/IdlSettings.h
index c6129e855..a14462373 100644
--- a/genplugouts/xmi2import/IdlSettings.h
+++ b/genplugouts/xmi2import/IdlSettings.h
@@ -6,7 +6,7 @@
 
 
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
@@ -333,7 +333,7 @@ class IdlSettings : public UmlSettings
 
     static WrapperStr _ext;
 
-    static Q3Dict<WrapperStr> _map_includes;
+    static QHash<WrapperStr,WrapperStr*> _map_includes;
 
 
 protected:
diff --git a/genplugouts/xmi2import/JavaSettings.cpp b/genplugouts/xmi2import/JavaSettings.cpp
index b2ba379c0..f9bd0d94d 100644
--- a/genplugouts/xmi2import/JavaSettings.cpp
+++ b/genplugouts/xmi2import/JavaSettings.cpp
@@ -26,7 +26,7 @@ WrapperStr JavaSettings::type(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
@@ -37,7 +37,7 @@ bool JavaSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -61,7 +61,7 @@ WrapperStr JavaSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
@@ -72,7 +72,7 @@ bool JavaSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -96,7 +96,7 @@ WrapperStr JavaSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
@@ -107,7 +107,7 @@ bool JavaSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -705,14 +705,14 @@ bool JavaSettings::_is_generate_javadoc_comment;
 
 bool JavaSettings::_is_force_package_gen;
 
-Q3Dict<WrapperStr> JavaSettings::_map_imports;
+QHash<WrapperStr,WrapperStr*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -734,7 +734,7 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/genplugouts/xmi2import/JavaSettings.h b/genplugouts/xmi2import/JavaSettings.h
index 47407d950..87ab80849 100644
--- a/genplugouts/xmi2import/JavaSettings.h
+++ b/genplugouts/xmi2import/JavaSettings.h
@@ -7,7 +7,7 @@
 
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -378,7 +378,7 @@ class JavaSettings : public UmlSettings
 
     static bool _is_force_package_gen;
 
-    static Q3Dict<WrapperStr> _map_imports;
+    static QHash<WrapperStr,WrapperStr*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/xmi2import/Manifestation.cpp b/genplugouts/xmi2import/Manifestation.cpp
index bd5746a33..0d7101523 100644
--- a/genplugouts/xmi2import/Manifestation.cpp
+++ b/genplugouts/xmi2import/Manifestation.cpp
@@ -5,7 +5,7 @@
 #include "Token.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 void Manifestation::import(FileIn & in, Token & token, UmlArtifact * artifact)
 {
@@ -45,7 +45,7 @@ void Manifestation::import(FileIn & in, Token & token, UmlArtifact * artifact)
 
 void Manifestation::solveThem()
 {
-    Q3ValueList<Manifestation>::Iterator it;
+    QList<Manifestation>::Iterator it;
 
     for (it = All.begin(); it != All.end(); ++it)
         (*it).artifact->solveManifestation((*it).name, (*it).utilized);
@@ -53,5 +53,5 @@ void Manifestation::solveThem()
     All.clear();
 }
 
-Q3ValueList<Manifestation> Manifestation::All;
+QList<Manifestation> Manifestation::All;
 
diff --git a/genplugouts/xmi2import/Manifestation.h b/genplugouts/xmi2import/Manifestation.h
index 96fd6d753..0402e1ec6 100644
--- a/genplugouts/xmi2import/Manifestation.h
+++ b/genplugouts/xmi2import/Manifestation.h
@@ -3,7 +3,7 @@
 
 
 
-#include <q3valuelist.h>
+#include <QList>
 
 class UmlArtifact;
 class FileIn;
@@ -29,7 +29,7 @@ class Manifestation
 
     WrapperStr utilized;
 
-    static Q3ValueList<Manifestation> All;
+    static QList<Manifestation> All;
 
 };
 
diff --git a/genplugouts/xmi2import/PhpSettings.cpp b/genplugouts/xmi2import/PhpSettings.cpp
index 884f3df52..5f2bfabda 100644
--- a/genplugouts/xmi2import/PhpSettings.cpp
+++ b/genplugouts/xmi2import/PhpSettings.cpp
@@ -28,7 +28,7 @@ WrapperStr PhpSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
@@ -39,7 +39,7 @@ bool PhpSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -637,15 +637,17 @@ void PhpSettings::read_()
     _rel_decl = UmlCom::read_string();
     _oper_def = UmlCom::read_string();
 #ifndef WITHJAVA
-    _get_visibility =
+    _get_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _get_name = UmlCom::read_string();
     _is_get_final = UmlCom::read_bool();
 #ifndef WITHJAVA
-    _set_visibility =
+    _set_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
     _is_generate_javadoc_comment = UmlCom::read_bool();
diff --git a/genplugouts/xmi2import/PythonSettings.cpp b/genplugouts/xmi2import/PythonSettings.cpp
index 78fe82c8f..ad14f7ebf 100644
--- a/genplugouts/xmi2import/PythonSettings.cpp
+++ b/genplugouts/xmi2import/PythonSettings.cpp
@@ -79,7 +79,7 @@ WrapperStr PythonSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
@@ -90,7 +90,7 @@ bool PythonSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRelationAttributeStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -114,7 +114,7 @@ WrapperStr PythonSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
@@ -125,7 +125,7 @@ bool PythonSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassStereotypeCmd, (const char *)s, (const char *)v); //[rageek] Fix prototype
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -462,7 +462,7 @@ WrapperStr PythonSettings::_src_content;
 
 WrapperStr PythonSettings::_ext;
 
-Q3Dict<WrapperStr> PythonSettings::_map_imports;
+QHash<WrapperStr,WrapperStr*> PythonSettings::_map_imports;
 
 void PythonSettings::read_()
 {
@@ -472,8 +472,8 @@ void PythonSettings::read_()
 
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -489,7 +489,7 @@ void PythonSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/genplugouts/xmi2import/PythonSettings.h b/genplugouts/xmi2import/PythonSettings.h
index cf04fdcf6..45a8af862 100644
--- a/genplugouts/xmi2import/PythonSettings.h
+++ b/genplugouts/xmi2import/PythonSettings.h
@@ -6,7 +6,7 @@
 
 
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PYTHON, configured through
 // the 'Generation settings' dialog.
@@ -248,7 +248,7 @@ class PythonSettings : public UmlSettings
 
     static WrapperStr _ext;
 
-    static Q3Dict<WrapperStr> _map_imports;
+    static QHash<WrapperStr,WrapperStr*> _map_imports;
 
 
 protected:
diff --git a/genplugouts/xmi2import/SlotAttribute.h b/genplugouts/xmi2import/SlotAttribute.h
index ad9d95f95..23176a5f9 100644
--- a/genplugouts/xmi2import/SlotAttribute.h
+++ b/genplugouts/xmi2import/SlotAttribute.h
@@ -1,6 +1,6 @@
 #ifndef _SLOTATTRIBUTE_H
 #define _SLOTATTRIBUTE_H
-
+#include <QByteArray>
 
 
 
diff --git a/genplugouts/xmi2import/Token.cpp b/genplugouts/xmi2import/Token.cpp
index 2d9f18d86..3f76fec12 100644
--- a/genplugouts/xmi2import/Token.cpp
+++ b/genplugouts/xmi2import/Token.cpp
@@ -3,7 +3,7 @@
 #include "FileIn.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 void Token::read(FileIn & in, bool any)
 {
@@ -117,7 +117,7 @@ bool Token::close(const char * what) const
 
 const WrapperStr & Token::valueOf(WrapperStr key) const
 {
-    Q3ValueList<Couple>::ConstIterator iter;
+    QList<Couple>::ConstIterator iter;
 
     for (iter = _couples.begin(); iter != _couples.end(); ++iter)
         if ((*iter).key == key)
@@ -130,7 +130,7 @@ const WrapperStr & Token::valueOf(WrapperStr key) const
 
 bool Token::valueOf(WrapperStr key, WrapperStr & v) const
 {
-    Q3ValueList<Couple>::ConstIterator iter;
+    QList<Couple>::ConstIterator iter;
 
     for (iter = _couples.begin(); iter != _couples.end(); ++iter) {
         if ((*iter).key == key) {
diff --git a/genplugouts/xmi2import/Token.h b/genplugouts/xmi2import/Token.h
index 020ad2d39..3673e69f9 100644
--- a/genplugouts/xmi2import/Token.h
+++ b/genplugouts/xmi2import/Token.h
@@ -3,7 +3,7 @@
 
 
 
-#include <q3valuelist.h>
+#include <QList>
 
 class FileIn;
 
@@ -53,7 +53,7 @@ class Token
 
 
 protected:
-    Q3ValueList<Couple> _couples;
+    QList<Couple> _couples;
 
     //the work after < with out the / if it is </what>
     WrapperStr _what;
diff --git a/genplugouts/xmi2import/UmlAccessVariableValueAction.cpp b/genplugouts/xmi2import/UmlAccessVariableValueAction.cpp
index 209a3c636..c0556cdbb 100644
--- a/genplugouts/xmi2import/UmlAccessVariableValueAction.cpp
+++ b/genplugouts/xmi2import/UmlAccessVariableValueAction.cpp
@@ -34,7 +34,7 @@ void UmlAccessVariableValueAction::import_it(FileIn & in, Token & token)
 
 void UmlAccessVariableValueAction::setVariable(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end())
         Unresolved::addRef(this, idref);
@@ -52,7 +52,7 @@ void UmlAccessVariableValueAction::setVariable(WrapperStr idref)
 
 void UmlAccessVariableValueAction::solve(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
diff --git a/genplugouts/xmi2import/UmlActivity.cpp b/genplugouts/xmi2import/UmlActivity.cpp
index dfec4a469..08197b5c9 100644
--- a/genplugouts/xmi2import/UmlActivity.cpp
+++ b/genplugouts/xmi2import/UmlActivity.cpp
@@ -60,7 +60,7 @@ UmlItem * UmlActivity::container(anItemKind kind, Token & token, FileIn & in)
 
 void UmlActivity::solve(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
@@ -164,7 +164,7 @@ void UmlActivity::importIt(FileIn & in, Token & token, UmlItem * where)
         }
 
         if (! spec.isEmpty()) {
-            QMap<WrapperStr, UmlItem *>::Iterator it = All.find(spec);
+            QMap<QString, UmlItem *>::Iterator it = All.find(spec);
 
             if (it == All.end())
                 Unresolved::addRef(a, spec);
@@ -211,7 +211,7 @@ void UmlActivity::readParameter(FileIn & in, Token & token)
     // ActivityParameterNode definition, search for it
     UmlActivityParameter * param = 0;
     WrapperStr s = token.valueOf("name");
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned int n = ch.size();
     int i;
 
@@ -243,7 +243,7 @@ void UmlActivity::readParameterNode(FileIn & in, Token & token)
     // ActivityParameter definition, search for it
     UmlActivityParameter * param = 0;
     WrapperStr s = token.valueOf("name");
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned int n = ch.size();
     int i;
 
diff --git a/genplugouts/xmi2import/UmlActivityActionClasses.cpp b/genplugouts/xmi2import/UmlActivityActionClasses.cpp
index d4699af18..cad69ded9 100644
--- a/genplugouts/xmi2import/UmlActivityActionClasses.cpp
+++ b/genplugouts/xmi2import/UmlActivityActionClasses.cpp
@@ -299,7 +299,7 @@ void UmlCallOperationAction::importIt(FileIn & in, Token & token, UmlItem * wher
 
 void UmlCallOperationAction::setOperation(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end())
         Unresolved::addRef(this, idref);
@@ -309,7 +309,7 @@ void UmlCallOperationAction::setOperation(WrapperStr idref)
 
 void UmlCallOperationAction::solve(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
@@ -364,7 +364,7 @@ void UmlCallBehaviorAction::importIt(FileIn & in, Token & token, UmlItem * where
 
 void UmlCallBehaviorAction::setBehavior(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end())
         Unresolved::addRef(this, idref);
@@ -383,7 +383,7 @@ void UmlCallBehaviorAction::setBehavior(WrapperStr idref)
 
 void UmlCallBehaviorAction::solve(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
@@ -688,7 +688,7 @@ void UmlCreateObjectAction::importIt(FileIn & in, Token & token, UmlItem * where
         }
 
         if (!s.isEmpty()) {
-            QMap<WrapperStr, UmlItem *>::Iterator it = All.find(s);
+            QMap<QString, UmlItem *>::Iterator it = All.find(s);
 
             if (it == All.end())
                 Unresolved::addRef(a, s);
@@ -700,7 +700,7 @@ void UmlCreateObjectAction::importIt(FileIn & in, Token & token, UmlItem * where
 
 void UmlCreateObjectAction::solve(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it != All.end())
         set_Classifier((*it)->name());
@@ -826,7 +826,7 @@ void UmlReduceAction::importIt(FileIn & in, Token & token, UmlItem * where)
         }
 
         if (!s.isEmpty()) {
-            QMap<WrapperStr, UmlItem *>::Iterator it = All.find(s);
+            QMap<QString, UmlItem *>::Iterator it = All.find(s);
 
             if (it == All.end())
                 Unresolved::addRef(a, s);
@@ -847,7 +847,7 @@ void UmlReduceAction::importIt(FileIn & in, Token & token, UmlItem * where)
 
 void UmlReduceAction::solve(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it != All.end()) {
         switch ((*it)->kind()) {
diff --git a/genplugouts/xmi2import/UmlActivityObject.cpp b/genplugouts/xmi2import/UmlActivityObject.cpp
index dfb69520b..a31d4c73c 100644
--- a/genplugouts/xmi2import/UmlActivityObject.cpp
+++ b/genplugouts/xmi2import/UmlActivityObject.cpp
@@ -108,7 +108,7 @@ void UmlActivityObject::setInState(WrapperStr s)
     if (FromBouml && (s.left(8) != "BOUML_0x"))
         set_InState(s);
     else {
-        QMap<WrapperStr, UmlItem *>::Iterator it = All.find(s);
+        QMap<QString, UmlItem *>::Iterator it = All.find(s);
 
         if (it != All.end()) {
             if ((*it)->kind() == aState)
@@ -219,7 +219,7 @@ void UmlActivityObject::solve(int context, WrapperStr idref)
     case 1:
         // state
     {
-        QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+        QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
         if (it != All.end()) {
             if ((*it)->kind() == aState)
diff --git a/genplugouts/xmi2import/UmlActivityPartition.cpp b/genplugouts/xmi2import/UmlActivityPartition.cpp
index aec8fb593..815bb5f66 100644
--- a/genplugouts/xmi2import/UmlActivityPartition.cpp
+++ b/genplugouts/xmi2import/UmlActivityPartition.cpp
@@ -21,7 +21,7 @@ UmlItem * UmlActivityPartition::container(anItemKind kind, Token & token, FileIn
 
 void UmlActivityPartition::solve(WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
@@ -79,7 +79,7 @@ void UmlActivityPartition::importIt(FileIn & in, Token & token, UmlItem * where)
         }
 
         if (! idref.isEmpty()) {
-            QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+            QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
             if (it == All.end())
                 Unresolved::addRef(r, idref);
diff --git a/genplugouts/xmi2import/UmlArtifact.cpp b/genplugouts/xmi2import/UmlArtifact.cpp
index 88f790bd9..b61d13f06 100644
--- a/genplugouts/xmi2import/UmlArtifact.cpp
+++ b/genplugouts/xmi2import/UmlArtifact.cpp
@@ -11,7 +11,7 @@
 #include "misc/mystr.h"
 void UmlArtifact::solveManifestation(WrapperStr s, WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
diff --git a/genplugouts/xmi2import/UmlBaseArtifact.cpp b/genplugouts/xmi2import/UmlBaseArtifact.cpp
index afa7cc344..7ed0a2776 100644
--- a/genplugouts/xmi2import/UmlBaseArtifact.cpp
+++ b/genplugouts/xmi2import/UmlBaseArtifact.cpp
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass*> & UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,9 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            //_assoc_classes.resize(_assoc_classes.size() + 1);
+            //_assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,7 +69,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -77,7 +78,7 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
             unsigned last = _assoc_classes.size() - 1;
 
             if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
+                _assoc_classes[index] = _assoc_classes[last];
 
             _assoc_classes.resize(last);
         }
@@ -88,9 +89,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         // tests != to bypass Qt 2.3 bug
@@ -103,7 +104,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -117,8 +118,9 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            //_associated.resize(_associated.size() + 1);
+            //_associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -134,7 +136,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
@@ -143,7 +145,7 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
             unsigned last = _associated.size() - 1;
 
             if (index != last)
-                _associated.insert(index, _associated[last]);
+                _associated[index] = _associated[last];
 
             _associated.resize(last);
         }
@@ -283,13 +285,13 @@ void UmlBaseArtifact::read_uml_()
     _assoc_classes.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _assoc_classes[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _associated.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated[index] = (UmlArtifact *) UmlBaseItem::read_();
 }
 
 #ifdef WITHCPP
diff --git a/genplugouts/xmi2import/UmlBaseArtifact.h b/genplugouts/xmi2import/UmlBaseArtifact.h
index f13c0890a..6db980ba6 100644
--- a/genplugouts/xmi2import/UmlBaseArtifact.h
+++ b/genplugouts/xmi2import/UmlBaseArtifact.h
@@ -4,7 +4,7 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
+#include <QVector>
 
 
 #include "UmlClass.h"	// to avoid destructor problem
@@ -37,7 +37,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +56,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact*> & associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -147,9 +147,9 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
     WrapperStr _cpp_h;
diff --git a/genplugouts/xmi2import/UmlBaseClass.cpp b/genplugouts/xmi2import/UmlBaseClass.cpp
index 3b66d7ca7..623bed6f4 100644
--- a/genplugouts/xmi2import/UmlBaseClass.cpp
+++ b/genplugouts/xmi2import/UmlBaseClass.cpp
@@ -12,7 +12,7 @@
 #include "Tools/ApiCmd.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -65,11 +65,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -101,11 +101,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -150,17 +150,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent*> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
     result.resize(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result[index] = (UmlComponent *) UmlBaseItem::read_();
 
     return result;
 }
@@ -391,7 +391,7 @@ bool UmlBaseClass::set_isIdlCustom(bool y)
 UmlClass * UmlBaseClass::get(const WrapperStr & n, const UmlPackage * p)
 {
     if (p == 0) {
-        UmlClass * x = _classes[n];
+        UmlClass * x = _classes.value(n);
 
         if (x != 0)
             return x;
@@ -426,10 +426,10 @@ bool UmlBaseClass::set_Name(const WrapperStr & s)
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     WrapperStr destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -441,7 +441,7 @@ bool UmlBaseClass::set_Name(const WrapperStr & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<WrapperStr, UmlClass*> UmlBaseClass::_classes;
 
 UmlBaseClass::UmlBaseClass(void * id, const WrapperStr & n)
     : UmlClassMember(id, n)
@@ -451,7 +451,7 @@ UmlBaseClass::UmlBaseClass(void * id, const WrapperStr & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/genplugouts/xmi2import/UmlBaseClass.h b/genplugouts/xmi2import/UmlBaseClass.h
index d02e1bf17..6f41894d8 100644
--- a/genplugouts/xmi2import/UmlBaseClass.h
+++ b/genplugouts/xmi2import/UmlBaseClass.h
@@ -5,10 +5,10 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
+#include <QList>
+#include <QHash>
+
 
-#include <q3dict.h>
 
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
@@ -62,7 +62,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -85,7 +85,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -108,7 +108,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent*> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -253,7 +253,8 @@ class UmlBaseClass : public UmlClassMember
 
 
 private:
-    static Q3Dict<UmlClass> _classes;
+        static QHash<WrapperStr, UmlClass*> _classes;
+
 
     bool _abstract;
 
diff --git a/genplugouts/xmi2import/UmlBaseClassInstance.cpp b/genplugouts/xmi2import/UmlBaseClassInstance.cpp
index 09237f3fb..f4faf3790 100644
--- a/genplugouts/xmi2import/UmlBaseClassInstance.cpp
+++ b/genplugouts/xmi2import/UmlBaseClassInstance.cpp
@@ -7,7 +7,7 @@
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -46,7 +46,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
     else     return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -61,7 +61,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -76,16 +76,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QVector<UmlAttribute *> &result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -96,7 +96,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -106,7 +106,7 @@ bool UmlBaseClassInstance::add_Relation(UmlRelation * relation, UmlClassInstance
 
 bool UmlBaseClassInstance::remove_Relation(UmlRelation * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v(2);
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/genplugouts/xmi2import/UmlBaseClassInstance.h b/genplugouts/xmi2import/UmlBaseClassInstance.h
index f944a8bf6..213113526 100644
--- a/genplugouts/xmi2import/UmlBaseClassInstance.h
+++ b/genplugouts/xmi2import/UmlBaseClassInstance.h
@@ -6,8 +6,8 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
+#include <QList>
+
 
 
 class UmlClassInstance;
@@ -40,17 +40,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QVector<UmlAttribute *> & result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QVector<UmlRelation *> &result);
 
     // Remove the slot if the value is an empty string.
     // Else set the value for the given attribute, replacing it
diff --git a/genplugouts/xmi2import/UmlBaseClassInstanceReference.h b/genplugouts/xmi2import/UmlBaseClassInstanceReference.h
index a9e14281e..a655ca40f 100644
--- a/genplugouts/xmi2import/UmlBaseClassInstanceReference.h
+++ b/genplugouts/xmi2import/UmlBaseClassInstanceReference.h
@@ -1,6 +1,6 @@
 #ifndef _UMLBASECLASSINSTANCEREFERENCE_H
 #define _UMLBASECLASSINSTANCEREFERENCE_H
-
+#include <QByteArray>
 
 
 
diff --git a/genplugouts/xmi2import/UmlBaseCollaborationDiagramDefinition.cpp b/genplugouts/xmi2import/UmlBaseCollaborationDiagramDefinition.cpp
index 63b89f7b5..177cc8c00 100644
--- a/genplugouts/xmi2import/UmlBaseCollaborationDiagramDefinition.cpp
+++ b/genplugouts/xmi2import/UmlBaseCollaborationDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseCollaborationDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -15,11 +15,11 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -31,7 +31,7 @@ void UmlBaseCollaborationDiagramDefinition::read_()
         m->read_(instances);
     }
 
-    _messages.setAutoDelete(TRUE);
+    //_messages.setAutoDelete(TRUE);
 }
 
 UmlBaseCollaborationDiagramDefinition::~UmlBaseCollaborationDiagramDefinition()
diff --git a/genplugouts/xmi2import/UmlBaseCollaborationDiagramDefinition.h b/genplugouts/xmi2import/UmlBaseCollaborationDiagramDefinition.h
index 7053607ce..905cc6dc5 100644
--- a/genplugouts/xmi2import/UmlBaseCollaborationDiagramDefinition.h
+++ b/genplugouts/xmi2import/UmlBaseCollaborationDiagramDefinition.h
@@ -1,12 +1,12 @@
 #ifndef _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
 #define _UMLBASECOLLABORATIONDIAGRAMDEFINITION_H
-
+#include <QVector>
 
 // to avoid compiler warning
 #include "UmlCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlCollaborationMessage;
@@ -16,21 +16,21 @@ class UmlBaseCollaborationDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following their rank
-    const Q3PtrVector<UmlCollaborationMessage> & messages() const {
+    const QVector<UmlCollaborationMessage*> & messages() const {
         return _messages;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlCollaborationMessage> _messages;
+    QVector<UmlCollaborationMessage*> _messages;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/xmi2import/UmlBaseCollaborationMessage.cpp b/genplugouts/xmi2import/UmlBaseCollaborationMessage.cpp
index 8ea8e0890..12a94d5de 100644
--- a/genplugouts/xmi2import/UmlBaseCollaborationMessage.cpp
+++ b/genplugouts/xmi2import/UmlBaseCollaborationMessage.cpp
@@ -3,7 +3,7 @@
 #include "UmlBaseCollaborationMessage.h"
 #include "UmlClassInstanceReference.h"
 
-void UmlBaseCollaborationMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseCollaborationMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     UmlBaseMessage::read_(instances);
     _rank = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/xmi2import/UmlBaseCollaborationMessage.h b/genplugouts/xmi2import/UmlBaseCollaborationMessage.h
index 90932c4db..4e8e871e1 100644
--- a/genplugouts/xmi2import/UmlBaseCollaborationMessage.h
+++ b/genplugouts/xmi2import/UmlBaseCollaborationMessage.h
@@ -3,7 +3,7 @@
 
 
 
-#include <q3ptrdict.h>
+
 #include "UmlMessage.h"
 
 class UmlClassInstanceReference;
@@ -29,7 +29,7 @@ class UmlBaseCollaborationMessage : public UmlMessage
     WrapperStr _hrank;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseCollaborationDiagramDefinition;
 };
diff --git a/genplugouts/xmi2import/UmlBaseComponent.cpp b/genplugouts/xmi2import/UmlBaseComponent.cpp
index 427c8d71f..abc5de755 100644
--- a/genplugouts/xmi2import/UmlBaseComponent.cpp
+++ b/genplugouts/xmi2import/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizingClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizingClasses()
 {
     read_if_needed_();
 
     return _realizing;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass*> & UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realizing, provided, required);
@@ -98,18 +98,18 @@ void UmlBaseComponent::read_uml_()
     _realizing.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _realizing.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realizing[index] =  (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _provided.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided[index] = (UmlClass *) UmlBaseItem::read_();
 
     n = UmlCom::read_unsigned();
     _required.resize(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required[index] = (UmlClass *) UmlBaseItem::read_();
 }
 
diff --git a/genplugouts/xmi2import/UmlBaseComponent.h b/genplugouts/xmi2import/UmlBaseComponent.h
index 5cb67ef38..1b588dd46 100644
--- a/genplugouts/xmi2import/UmlBaseComponent.h
+++ b/genplugouts/xmi2import/UmlBaseComponent.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASECOMPONENT_H
 #define _UMLBASECOMPONENT_H
-
+#include <QVector>
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
+
 
 
 #include "UmlClass.h"	// to avoid destructor problem
@@ -36,18 +36,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realizing classes
-    const Q3PtrVector<UmlClass> & realizingClasses();
+    const QVector<UmlClass*> & realizingClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass*> & requiredClasses();
 
     // set the realizing, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +57,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realizing;
+    QVector<UmlClass*> _realizing;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
diff --git a/genplugouts/xmi2import/UmlBaseFragment.cpp b/genplugouts/xmi2import/UmlBaseFragment.cpp
index 730755358..44fdee6e6 100644
--- a/genplugouts/xmi2import/UmlBaseFragment.cpp
+++ b/genplugouts/xmi2import/UmlBaseFragment.cpp
@@ -25,7 +25,7 @@ void UmlBaseFragment::read_()
         fc->read_(this, rank);
     }
 
-    _compartments.setAutoDelete(TRUE);
+    //_compartments.setAutoDelete(TRUE);
     _container = 0;
     _refer = (UmlDiagram *) UmlBaseItem::read_();
     _arguments = UmlCom::read_string();
@@ -38,7 +38,7 @@ int UmlBaseFragment::vcenter_(int rank) const
     return (t + _compartments[rank]->b()) / 2;
 }
 
-void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseFragment::read_covered_(QHash<void*,UmlClassInstanceReference*> & instances)
 {
     unsigned n = UmlCom::read_unsigned();
     unsigned rank;
@@ -46,10 +46,10 @@ void UmlBaseFragment::read_covered_(Q3PtrDict<UmlClassInstanceReference> & insta
     _covered.resize(n);
 
     for (rank = 0; rank != n; rank += 1)
-        _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]);
+        _covered.insert(rank, instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))]);
 }
 
-UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments)
+UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments)
 {
     UmlFragmentCompartment * r = 0;
     int nf = fragments.count();
@@ -82,7 +82,7 @@ UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, in
     return r;
 }
 
-void UmlBaseFragment::compute_container_(Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseFragment::compute_container_(QVector<UmlFragment*> & fragments)
 {
     int rank = fragments.count();
 
diff --git a/genplugouts/xmi2import/UmlBaseFragment.h b/genplugouts/xmi2import/UmlBaseFragment.h
index e1f2b8406..80888155c 100644
--- a/genplugouts/xmi2import/UmlBaseFragment.h
+++ b/genplugouts/xmi2import/UmlBaseFragment.h
@@ -1,11 +1,10 @@
 #ifndef _UMLBASEFRAGMENT_H
 #define _UMLBASEFRAGMENT_H
+#include <QByteArray>
+#include <QHash>
+#include <QVector>
 
 
-
-#include <q3ptrvector.h>
-#include <q3ptrdict.h>
-
 class UmlFragmentCompartment;
 class UmlDiagram;
 class UmlClassInstanceReference;
@@ -21,7 +20,7 @@ class UmlBaseFragment
     }
 
     // return the compartments, at least one compartment exists
-    const Q3PtrVector<UmlFragmentCompartment> & compartments() const {
+    const QVector<UmlFragmentCompartment*> & compartments() const {
         return _compartments;
     }
 
@@ -44,7 +43,7 @@ class UmlBaseFragment
     }
 
     // return the the list of covered instances (life lines)
-    const Q3PtrVector<UmlClassInstanceReference> & covered() const {
+    const QVector<UmlClassInstanceReference*> & covered() const {
         return _covered;
     }
 
@@ -52,7 +51,7 @@ class UmlBaseFragment
 private:
     UmlFragmentCompartment * _container;
 
-    Q3PtrVector<UmlFragmentCompartment> _compartments;
+    QVector<UmlFragmentCompartment*> _compartments;
 
     WrapperStr _name;
 
@@ -68,7 +67,7 @@ class UmlBaseFragment
 
     WrapperStr _arguments;
 
-    Q3PtrVector<UmlClassInstanceReference> _covered;
+    QVector<UmlClassInstanceReference*> _covered;
 
     // internal, don't call it
     void read_();
@@ -81,15 +80,15 @@ class UmlBaseFragment
 
     //internal, do NOT use it
 
-    void read_covered_(Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_covered_(QHash<void*,UmlClassInstanceReference*> & instances);
 
     // internal
-    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlFragment> & fragments);
+    static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector<UmlFragment*> & fragments);
 
 
 private:
     // internal
-    static void compute_container_(Q3PtrVector<UmlFragment> & fragments);
+    static void compute_container_(QVector<UmlFragment*> & fragments);
 
 
 public:
diff --git a/genplugouts/xmi2import/UmlBaseFragmentCompartment.cpp b/genplugouts/xmi2import/UmlBaseFragmentCompartment.cpp
index bcfa492e8..86cf42efb 100644
--- a/genplugouts/xmi2import/UmlBaseFragmentCompartment.cpp
+++ b/genplugouts/xmi2import/UmlBaseFragmentCompartment.cpp
@@ -7,8 +7,9 @@
 
 void UmlBaseFragmentCompartment::add_contained_(UmlFragment * x)
 {
-    _contained.resize(_contained.size() + 1);
-    _contained.insert(_contained.size() - 1, x);
+    //_contained.resize(_contained.size() + 1);
+    //_contained.insert(_contained.size() - 1, x);
+    _contained.append(x);
 }
 
 void UmlBaseFragmentCompartment::add_text_(WrapperStr x)
diff --git a/genplugouts/xmi2import/UmlBaseFragmentCompartment.h b/genplugouts/xmi2import/UmlBaseFragmentCompartment.h
index 1316c4f7e..f7c70716d 100644
--- a/genplugouts/xmi2import/UmlBaseFragmentCompartment.h
+++ b/genplugouts/xmi2import/UmlBaseFragmentCompartment.h
@@ -5,7 +5,7 @@
 // to avoid compiler warning
 #include "UmlFragment.h"
 
-#include <q3ptrvector.h>
+
 
 
 class UmlFragment;
@@ -27,13 +27,13 @@ class UmlBaseFragmentCompartment
     }
 
     // the texts placed in the compartment
-    const Q3PtrVector<char> & texts() const {
+    const QVector<char*> & texts() const {
         return _texts;
     }
 
     // return the fragments contained in the compartment,
     // may be none
-    const Q3PtrVector<UmlFragment> & contained() const {
+    const QVector<UmlFragment*> & contained() const {
         return _contained;
     }
 
@@ -51,11 +51,11 @@ class UmlBaseFragmentCompartment
 private:
     UmlFragment * _fragment;
 
-    Q3PtrVector<UmlFragment> _contained;
+    QVector<UmlFragment*> _contained;
 
     int _rank;
 
-    Q3PtrVector<char> _texts;
+    QVector<char*> _texts;
 
     int _y;
 
diff --git a/genplugouts/xmi2import/UmlBaseItem.cpp b/genplugouts/xmi2import/UmlBaseItem.cpp
index 062b8a9ab..4c2a84b5e 100644
--- a/genplugouts/xmi2import/UmlBaseItem.cpp
+++ b/genplugouts/xmi2import/UmlBaseItem.cpp
@@ -117,7 +117,7 @@ UmlItem * UmlBaseItem::parent()
     return _parent;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::children()
+const QVector<UmlItem*> UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -173,7 +173,7 @@ bool UmlBaseItem::set_PropertyValue(const WrapperStr & k, const WrapperStr & v)
         return FALSE;
 }
 
-const Q3Dict<WrapperStr> UmlBaseItem::properties()
+const QHash<WrapperStr,WrapperStr*> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -222,11 +222,11 @@ bool UmlBaseItem::set_isMarked(bool y)
     return set_it_(_marked, y, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -248,7 +248,7 @@ void UmlBaseItem::unload(bool rec, bool del)
 
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
                 _children->at(chindex)->unload(TRUE, del);
 
                 if (del)
@@ -277,17 +277,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*,UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -415,7 +415,7 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
@@ -506,7 +506,7 @@ UmlItem * UmlBaseItem::read_()
     const char * name = UmlCom::read_string();
 
 #ifndef WIN32
-    //cout << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
+    //qDebug() << "UmlBaseItem::read id " << id << " kind " << kind << " name " << name << '\n';
 #endif
 
     UmlItem * result = _all[id];
@@ -762,7 +762,7 @@ UmlBaseItem::UmlBaseItem(void * id, const WrapperStr & n)
     _all.insert(id, (UmlItem *) this);
 
     if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+        _all.reserve(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
diff --git a/genplugouts/xmi2import/UmlBaseItem.h b/genplugouts/xmi2import/UmlBaseItem.h
index 0d17d19d0..1ca06bf5f 100644
--- a/genplugouts/xmi2import/UmlBaseItem.h
+++ b/genplugouts/xmi2import/UmlBaseItem.h
@@ -1,12 +1,12 @@
 #ifndef _UMLBASEITEM_H
 #define _UMLBASEITEM_H
-
+#include <QByteArray>
 
 #include "anItemKind.h"
 
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+
+
+
 //#include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
@@ -71,7 +71,7 @@ class UmlBaseItem
     UmlItem * parent();
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
-    const Q3PtrVector<UmlItem> children();
+    const QVector<UmlItem*> children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -105,7 +105,7 @@ class UmlBaseItem
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<WrapperStr> properties();
+    const QHash<WrapperStr,WrapperStr*> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -161,7 +161,7 @@ class UmlBaseItem
     //  The result may contains UmlAttribute, UmlRelations, UmlNcRelations,
     //  UmlOperation (their bodies are not taken into account) , UmlClass
     //  and UmlComponents.
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // return a constant identifier, it is unique within a given
     // kind of element (two classes can't have the same identifiers, but
@@ -187,7 +187,7 @@ class UmlBaseItem
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
 
 private:
@@ -213,11 +213,12 @@ class UmlBaseItem
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
+
+    QHash<WrapperStr,WrapperStr*> _dict;
 
-    Q3Dict<WrapperStr> _dict;
+        static QHash<void*,UmlItem*> _all;
 
-    static Q3PtrDict<UmlItem> _all;
 
 
 protected:
diff --git a/genplugouts/xmi2import/UmlBaseMessage.cpp b/genplugouts/xmi2import/UmlBaseMessage.cpp
index 77851f8dd..2d220aa8e 100644
--- a/genplugouts/xmi2import/UmlBaseMessage.cpp
+++ b/genplugouts/xmi2import/UmlBaseMessage.cpp
@@ -4,13 +4,13 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlOperation.h"
 
-void UmlBaseMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances)
+void UmlBaseMessage::read_(const QHash<void*, UmlClassInstanceReference*> & instances)
 {
     _operation = (UmlOperation *) UmlBaseItem::read_();
 
     if (_operation == 0) _form = UmlCom::read_string();
 
-    _from = instances[(void *) UmlCom::read_unsigned()];
-    _to = instances[(void *) UmlCom::read_unsigned()];
+    _from = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
+    _to = instances[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
 }
 
diff --git a/genplugouts/xmi2import/UmlBaseMessage.h b/genplugouts/xmi2import/UmlBaseMessage.h
index f823cff1a..2669bf4ec 100644
--- a/genplugouts/xmi2import/UmlBaseMessage.h
+++ b/genplugouts/xmi2import/UmlBaseMessage.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASEMESSAGE_H
 #define _UMLBASEMESSAGE_H
+#include <QByteArray>
+#include <QHash>
 
 
 
-#include <q3ptrdict.h>
-
 class UmlClassInstanceReference;
 class UmlOperation;
 
@@ -45,7 +45,7 @@ class UmlBaseMessage
     WrapperStr _form;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances);
+    void read_(const QHash<void*, UmlClassInstanceReference*> & instances);
 
     friend class UmlBaseSequenceMessage;
     friend class UmlBaseCollaborationMessage;
diff --git a/genplugouts/xmi2import/UmlBaseOperation.cpp b/genplugouts/xmi2import/UmlBaseOperation.cpp
index aba86ce60..9c661fc91 100644
--- a/genplugouts/xmi2import/UmlBaseOperation.cpp
+++ b/genplugouts/xmi2import/UmlBaseOperation.cpp
@@ -9,7 +9,7 @@
 #include "UmlClassMember.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 UmlOperation * UmlBaseOperation::create(UmlClass * parent, const char * s)
 {
     return (UmlOperation *) parent->create_(anOperation, s);
@@ -73,7 +73,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -87,7 +87,12 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+        {
+            if(_params.count() > 0)
+                _params.insert(_params.begin() + rank, p);
+            else
+                _params.insert(_params.begin(), p);
+        }
 
         return TRUE;
     }
@@ -101,7 +106,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -124,7 +129,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -137,7 +142,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(_exceptions.begin() + rank, t);
 
         return TRUE;
     }
@@ -151,7 +156,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
@@ -173,9 +178,9 @@ bool UmlBaseOperation::replaceException(unsigned rank, const UmlTypeSpec & t)
         return FALSE;
 }
 
-const Q3PtrVector<UmlItem> UmlBaseOperation::methods() const
+const QVector<UmlItem*> UmlBaseOperation::methods() const
 {
-    Q3PtrVector<UmlItem> l;
+    QVector<UmlItem*> l;
 
     UmlCom::send_cmd(_identifier, sideCmd);
     UmlCom::read_item_list(l);
diff --git a/genplugouts/xmi2import/UmlBaseOperation.h b/genplugouts/xmi2import/UmlBaseOperation.h
index f9065dd8b..385c00acb 100644
--- a/genplugouts/xmi2import/UmlBaseOperation.h
+++ b/genplugouts/xmi2import/UmlBaseOperation.h
@@ -5,8 +5,9 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
+//#include <QList>
+#include <QList>
+
 
 
 #include "UmlParameter.h"
@@ -54,7 +55,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -72,7 +73,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -90,7 +91,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceException(unsigned rank, const UmlTypeSpec & t);
 
     // return the behaviors (state and activities) implementing the operation
-    const Q3PtrVector<UmlItem> methods() const;
+    const QVector<UmlItem*> methods() const;
 
     // in case the operation is a 'get' operation, returns the associated
     // attribute or relation
@@ -144,7 +145,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_CppDef(const char * s);
 
     // returns the operation's body in C++, useless if the def does not
-    // contains ${body}. Note that the body is get each time from BOUML
+    // contains ${body}. Note that the body is get each time from DOUML
     // for memory size reason
     WrapperStr cppBody();
 
@@ -213,7 +214,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_JavaDef(const char * s);
 
     // returns the operation's body in Java++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
     WrapperStr javaBody();
 
@@ -274,7 +275,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PhpDef(const char * s);
 
     // returns the operation's body in Php++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
     WrapperStr phpBody();
 
@@ -327,7 +328,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_PythonDef(const char * s);
 
     // returns the operation's body in Python++, useless if the def does
-    // not contains ${body} Note that the body is get each time from BOUML
+    // not contains ${body} Note that the body is get each time from DOUML
     // for memory size reason
     WrapperStr pythonBody();
 
@@ -483,9 +484,9 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
     WrapperStr _cpp_def;
diff --git a/genplugouts/xmi2import/UmlBasePackage.h b/genplugouts/xmi2import/UmlBasePackage.h
index 1c1d7a691..a261ab953 100644
--- a/genplugouts/xmi2import/UmlBasePackage.h
+++ b/genplugouts/xmi2import/UmlBasePackage.h
@@ -185,7 +185,7 @@ class UmlBasePackage : public UmlItem
     //save the project if needed
     static void saveProject();
 
-    //Does nothing in case an edition is on going under BOUML. Else :
+    //Does nothing in case an edition is on going under DOUML. Else :
     //close the current project (in case it is not saved the last modifications are lost),
     //load the specified one, and all the communications with the plug-outs including the
     //current one are closed.
diff --git a/genplugouts/xmi2import/UmlBaseParameterSet.cpp b/genplugouts/xmi2import/UmlBaseParameterSet.cpp
index a2e4a1756..7eb8a3931 100644
--- a/genplugouts/xmi2import/UmlBaseParameterSet.cpp
+++ b/genplugouts/xmi2import/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin*> & UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         // tests != to bypass Qt 2.3 bug
@@ -44,6 +44,6 @@ void UmlBaseParameterSet::unload(bool rec, bool del)
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/genplugouts/xmi2import/UmlBaseParameterSet.h b/genplugouts/xmi2import/UmlBaseParameterSet.h
index 5c394e83d..ba220d375 100644
--- a/genplugouts/xmi2import/UmlBaseParameterSet.h
+++ b/genplugouts/xmi2import/UmlBaseParameterSet.h
@@ -1,11 +1,11 @@
 #ifndef _UMLBASEPARAMETERSET_H
 #define _UMLBASEPARAMETERSET_H
 
-
+#include <QVector>
 #include "UmlItem.h"
 #include "anItemKind.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlActivityParameter;
 class UmlActivityAction;
@@ -33,10 +33,10 @@ class UmlBaseParameterSet : public UmlItem
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin*> & pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +48,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/genplugouts/xmi2import/UmlBaseSequenceDiagramDefinition.cpp b/genplugouts/xmi2import/UmlBaseSequenceDiagramDefinition.cpp
index b68c0aaa1..8a23781fa 100644
--- a/genplugouts/xmi2import/UmlBaseSequenceDiagramDefinition.cpp
+++ b/genplugouts/xmi2import/UmlBaseSequenceDiagramDefinition.cpp
@@ -40,7 +40,7 @@ static void qsort(UmlSequenceMessage ** v, int low, int high)
 }
 void UmlBaseSequenceDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlClassInstanceReference> instances;
+    QHash<void*,UmlClassInstanceReference*> instances;
     unsigned n;
     unsigned rank;
 
@@ -54,7 +54,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -64,11 +64,11 @@ void UmlBaseSequenceDiagramDefinition::read_()
         UmlClassInstanceReference * i = new UmlClassInstanceReference();
 
         _instances.insert(rank, i);
-        instances.insert((void *) UmlCom::read_unsigned(), i);
+        instances.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), i);
         i->read_();
     }
 
-    _instances.setAutoDelete(TRUE);
+    //_instances.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _messages.resize(n);
@@ -82,7 +82,7 @@ void UmlBaseSequenceDiagramDefinition::read_()
         }
 
         ::qsort(_messages.data(), 0, n - 1);
-        _messages.setAutoDelete(TRUE);
+        //_messages.setAutoDelete(TRUE);
     }
 
     n = _fragments.count();
diff --git a/genplugouts/xmi2import/UmlBaseSequenceDiagramDefinition.h b/genplugouts/xmi2import/UmlBaseSequenceDiagramDefinition.h
index 6be419e66..f80c8b3f6 100644
--- a/genplugouts/xmi2import/UmlBaseSequenceDiagramDefinition.h
+++ b/genplugouts/xmi2import/UmlBaseSequenceDiagramDefinition.h
@@ -8,7 +8,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlSequenceMessage.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlClassInstanceReference;
 class UmlSequenceMessage;
@@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition
 {
 public:
     // return the instances present in the diagram
-    const Q3PtrVector<UmlClassInstanceReference> & instances() const {
+    const QVector<UmlClassInstanceReference*> & instances() const {
         return _instances;
     }
 
     // return the messages present in the diagram,
     // ordonned following the sending time
-    const Q3PtrVector<UmlSequenceMessage> & messages() const {
+    const QVector<UmlSequenceMessage*> & messages() const {
         return _messages;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
 
 private:
-    Q3PtrVector<UmlClassInstanceReference> _instances;
+    QVector<UmlClassInstanceReference*> _instances;
 
-    Q3PtrVector<UmlSequenceMessage> _messages;
+    QVector<UmlSequenceMessage*> _messages;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/xmi2import/UmlBaseSequenceMessage.cpp b/genplugouts/xmi2import/UmlBaseSequenceMessage.cpp
index 1dd8efeae..4e3878bce 100644
--- a/genplugouts/xmi2import/UmlBaseSequenceMessage.cpp
+++ b/genplugouts/xmi2import/UmlBaseSequenceMessage.cpp
@@ -5,7 +5,7 @@
 #include "UmlClassInstanceReference.h"
 #include "UmlFragment.h"
 
-void UmlBaseSequenceMessage::read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments)
+void UmlBaseSequenceMessage::read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments)
 {
     UmlBaseMessage::read_(instances);
     _kind = (aMessageKind) UmlCom::read_char();
diff --git a/genplugouts/xmi2import/UmlBaseSequenceMessage.h b/genplugouts/xmi2import/UmlBaseSequenceMessage.h
index 6fc2ccbe9..8f2b50b80 100644
--- a/genplugouts/xmi2import/UmlBaseSequenceMessage.h
+++ b/genplugouts/xmi2import/UmlBaseSequenceMessage.h
@@ -4,8 +4,8 @@
 
 #include "aMessageKind.h"
 
-#include <q3ptrdict.h>
-#include <q3ptrvector.h>
+
+
 #include "UmlMessage.h"
 
 class UmlFragmentCompartment;
@@ -63,7 +63,7 @@ class UmlBaseSequenceMessage : public UmlMessage
     WrapperStr _stereotype;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlClassInstanceReference> & instances, const Q3PtrVector<UmlFragment> & fragments);
+    void read_(const QHash<void *, UmlClassInstanceReference *> &instances, const QVector<UmlFragment *> &fragments);
 
     friend class UmlBaseSequenceDiagramDefinition;
 };
diff --git a/genplugouts/xmi2import/UmlBaseSubject.cpp b/genplugouts/xmi2import/UmlBaseSubject.cpp
index b15d380d3..f55c74c8a 100644
--- a/genplugouts/xmi2import/UmlBaseSubject.cpp
+++ b/genplugouts/xmi2import/UmlBaseSubject.cpp
@@ -12,7 +12,7 @@ void UmlBaseSubject::read_()
     _h = (int) UmlCom::read_unsigned();
 }
 
-UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects)
+UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects)
 {
     int rank = subjects.count();
 
diff --git a/genplugouts/xmi2import/UmlBaseSubject.h b/genplugouts/xmi2import/UmlBaseSubject.h
index e34a953be..9120dec4c 100644
--- a/genplugouts/xmi2import/UmlBaseSubject.h
+++ b/genplugouts/xmi2import/UmlBaseSubject.h
@@ -1,9 +1,9 @@
 #ifndef _UMLBASESUBJECT_H
 #define _UMLBASESUBJECT_H
+#include <QByteArray>
 
 
 
-#include <q3ptrvector.h>
 
 class UmlSubject;
 
@@ -34,7 +34,7 @@ class UmlBaseSubject
 
 public:
     // internal
-    static UmlSubject * get_container_(int x, int y, int w, int h, const Q3PtrVector<UmlSubject> & subjects);
+    static UmlSubject * get_container_(int x, int y, int w, int h, const QVector<UmlSubject*> & subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/xmi2import/UmlBaseTypeSpec.h b/genplugouts/xmi2import/UmlBaseTypeSpec.h
index aecc28abe..1f6ccbe0e 100644
--- a/genplugouts/xmi2import/UmlBaseTypeSpec.h
+++ b/genplugouts/xmi2import/UmlBaseTypeSpec.h
@@ -1,6 +1,6 @@
 #ifndef _UMLBASETYPESPEC_H
 #define _UMLBASETYPESPEC_H
-
+#include <QByteArray>
 
 
 
diff --git a/genplugouts/xmi2import/UmlBaseUseCaseAssociation.cpp b/genplugouts/xmi2import/UmlBaseUseCaseAssociation.cpp
index ebee930a9..6a91c0e5c 100644
--- a/genplugouts/xmi2import/UmlBaseUseCaseAssociation.cpp
+++ b/genplugouts/xmi2import/UmlBaseUseCaseAssociation.cpp
@@ -4,9 +4,9 @@
 #include "UmlUseCaseReference.h"
 #include "UmlClass.h"
 
-void UmlBaseUseCaseAssociation::read_(const Q3PtrDict<UmlUseCaseReference> & useCases)
+void UmlBaseUseCaseAssociation::read_(const QHash<void*,UmlUseCaseReference*> & useCases)
 {
-    _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()];
+    _use_case = (UmlUseCaseReference *) useCases[reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned()))];
     _actor = (UmlClass *) UmlBaseItem::read_();
     _primary = UmlCom::read_bool();
     _name = UmlCom::read_string();
diff --git a/genplugouts/xmi2import/UmlBaseUseCaseAssociation.h b/genplugouts/xmi2import/UmlBaseUseCaseAssociation.h
index 5dfad9e70..25c361996 100644
--- a/genplugouts/xmi2import/UmlBaseUseCaseAssociation.h
+++ b/genplugouts/xmi2import/UmlBaseUseCaseAssociation.h
@@ -1,10 +1,10 @@
 #ifndef _UMLBASEUSECASEASSOCIATION_H
 #define _UMLBASEUSECASEASSOCIATION_H
+#include <QByteArray>
+#include <QHash>
 
 
 
-#include <q3ptrdict.h>
-
 class UmlUseCaseReference;
 class UmlClass;
 
@@ -50,7 +50,7 @@ class UmlBaseUseCaseAssociation
     bool _primary;
 
     // internal, don't call it
-    void read_(const Q3PtrDict<UmlUseCaseReference> & useCases);
+    void read_(const QHash<void*,UmlUseCaseReference*> & useCases);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/xmi2import/UmlBaseUseCaseDiagramDefinition.cpp b/genplugouts/xmi2import/UmlBaseUseCaseDiagramDefinition.cpp
index b8780daf2..00a1ebe8a 100644
--- a/genplugouts/xmi2import/UmlBaseUseCaseDiagramDefinition.cpp
+++ b/genplugouts/xmi2import/UmlBaseUseCaseDiagramDefinition.cpp
@@ -4,7 +4,7 @@
 
 void UmlBaseUseCaseDiagramDefinition::read_()
 {
-    Q3PtrDict<UmlUseCaseReference> ucrefs;
+    QHash<void*,UmlUseCaseReference*> ucrefs;
     unsigned n;
     unsigned rank;
 
@@ -18,7 +18,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         f->read_();
     }
 
-    _fragments.setAutoDelete(TRUE);
+    //_fragments.setAutoDelete(TRUE);
     UmlBaseFragment::compute_container_(_fragments);
 
     n = UmlCom::read_unsigned();
@@ -31,7 +31,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         sb->read_();
     }
 
-    _subjects.setAutoDelete(TRUE);
+    //_subjects.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _use_cases.resize(n);
@@ -40,11 +40,11 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         UmlUseCaseReference * uc = new UmlUseCaseReference();
 
         _use_cases.insert(rank, uc);
-        ucrefs.insert((void *) UmlCom::read_unsigned(), uc);
+        ucrefs.insert(reinterpret_cast<void*>(uintptr_t(UmlCom::read_unsigned())), uc);
         uc->read_(_fragments, _subjects);
     }
 
-    _use_cases.setAutoDelete(TRUE);
+    //_use_cases.setAutoDelete(TRUE);
 
     n = UmlCom::read_unsigned();
     _actors.resize(n);
@@ -62,7 +62,7 @@ void UmlBaseUseCaseDiagramDefinition::read_()
         r->read_(ucrefs);
     }
 
-    _rels.setAutoDelete(TRUE);
+    //_rels.setAutoDelete(TRUE);
 }
 
 UmlBaseUseCaseDiagramDefinition::~UmlBaseUseCaseDiagramDefinition()
diff --git a/genplugouts/xmi2import/UmlBaseUseCaseDiagramDefinition.h b/genplugouts/xmi2import/UmlBaseUseCaseDiagramDefinition.h
index d2cefc68d..fe556d93b 100644
--- a/genplugouts/xmi2import/UmlBaseUseCaseDiagramDefinition.h
+++ b/genplugouts/xmi2import/UmlBaseUseCaseDiagramDefinition.h
@@ -10,7 +10,7 @@
 #include "UmlUseCaseReference.h"
 #include "UmlUseCaseAssociation.h"
 
-#include <q3ptrvector.h>
+
 
 class UmlUseCaseReference;
 class UmlClass;
@@ -23,41 +23,41 @@ class UmlBaseUseCaseDiagramDefinition
 {
 public:
     // return the use cases present in the diagram
-    const Q3PtrVector<UmlUseCaseReference> & useCases() const {
+    const QVector<UmlUseCaseReference*> & useCases() const {
         return _use_cases;
     }
 
     // return the actors present in the diagram
-    const Q3PtrVector<UmlClass> & actors() const {
+    const QVector<UmlClass*> & actors() const {
         return _actors;
     }
 
     // return the associations between actor and use case present in the diagram
-    const Q3PtrVector<UmlUseCaseAssociation> & associations() const {
+    const QVector<UmlUseCaseAssociation*> & associations() const {
         return _rels;
     }
 
     // return the fragments present in the diagram
-    const Q3PtrVector<UmlFragment> & fragments() const {
+    const QVector<UmlFragment*> & fragments() const {
         return _fragments;
     }
 
     // return the subjects present in the diagram
-    const Q3PtrVector<UmlSubject> & subjects() const {
+    const QVector<UmlSubject*> & subjects() const {
         return _subjects;
     }
 
 
 private:
-    Q3PtrVector<UmlUseCaseReference> _use_cases;
+    QVector<UmlUseCaseReference*> _use_cases;
 
-    Q3PtrVector<UmlClass> _actors;
+    QVector<UmlClass*> _actors;
 
-    Q3PtrVector<UmlUseCaseAssociation> _rels;
+    QVector<UmlUseCaseAssociation*> _rels;
 
-    Q3PtrVector<UmlFragment> _fragments;
+    QVector<UmlFragment*> _fragments;
 
-    Q3PtrVector<UmlSubject> _subjects;
+    QVector<UmlSubject*> _subjects;
 
     // internal, don't call it
     void read_();
diff --git a/genplugouts/xmi2import/UmlBaseUseCaseReference.cpp b/genplugouts/xmi2import/UmlBaseUseCaseReference.cpp
index c599f87d4..d20f93f30 100644
--- a/genplugouts/xmi2import/UmlBaseUseCaseReference.cpp
+++ b/genplugouts/xmi2import/UmlBaseUseCaseReference.cpp
@@ -6,7 +6,7 @@
 #include "UmlSubject.h"
 #include "UmlFragment.h"
 
-void UmlBaseUseCaseReference::read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects)
+void UmlBaseUseCaseReference::read_(const QVector<UmlFragment *> & fragments, const QVector<UmlSubject *> & subjects)
 {
     _use_case = (UmlUseCase *) UmlBaseItem::read_();
     _x = (int) UmlCom::read_unsigned();
diff --git a/genplugouts/xmi2import/UmlBaseUseCaseReference.h b/genplugouts/xmi2import/UmlBaseUseCaseReference.h
index 5e5590920..94970ae09 100644
--- a/genplugouts/xmi2import/UmlBaseUseCaseReference.h
+++ b/genplugouts/xmi2import/UmlBaseUseCaseReference.h
@@ -1,8 +1,8 @@
 #ifndef _UMLBASEUSECASEREFERENCE_H
 #define _UMLBASEUSECASEREFERENCE_H
 
+#include <QVector>
 
-#include <q3ptrvector.h>
 
 class UmlUseCase;
 class UmlFragmentCompartment;
@@ -46,7 +46,7 @@ class UmlBaseUseCaseReference
     int _h;
 
     // internal, don't call it
-    void read_(const Q3PtrVector<UmlFragment> & fragments, const Q3PtrVector<UmlSubject> & subjects);
+    void read_(const QVector<UmlFragment *> &fragments, const QVector<UmlSubject *> &subjects);
 
     friend class UmlBaseUseCaseDiagramDefinition;
 };
diff --git a/genplugouts/xmi2import/UmlBuiltin.h b/genplugouts/xmi2import/UmlBuiltin.h
index 20ec5ac49..1b48f6633 100644
--- a/genplugouts/xmi2import/UmlBuiltin.h
+++ b/genplugouts/xmi2import/UmlBuiltin.h
@@ -1,5 +1,6 @@
 #ifndef _UMLBUILTIN_H
 #define _UMLBUILTIN_H
+#include <QByteArray>
 
 
 
diff --git a/genplugouts/xmi2import/UmlClass.cpp b/genplugouts/xmi2import/UmlClass.cpp
index 09f68a532..85836423d 100644
--- a/genplugouts/xmi2import/UmlClass.cpp
+++ b/genplugouts/xmi2import/UmlClass.cpp
@@ -18,7 +18,7 @@
 #include "UmlPackage.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 UmlItem * UmlClass::container(anItemKind kind, Token & token, FileIn & in)
 {
@@ -248,7 +248,7 @@ void UmlClass::generalizeDependRealize(UmlItem * target, FileIn & in, int contex
 
 void UmlClass::solveGeneralizationDependencyRealization(int context, WrapperStr idref, WrapperStr label, WrapperStr constraint)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it != All.end()) {
         static const struct {
@@ -288,16 +288,16 @@ void UmlClass::solveGeneralizationDependencyRealization(int context, WrapperStr
 
 UmlClass * UmlClass::signature(WrapperStr id)
 {
-    QMap<WrapperStr, UmlClass *>::Iterator iter = signatures.find(id);
+    QMap<QString, UmlClass *>::Iterator iter = signatures.find(id);
 
     return (iter == signatures.end()) ? 0 : *iter;
 }
 
 int UmlClass::formalRank(WrapperStr id)
 {
-    int r = formalsId.findIndex(id);
+    int r = formalsId.indexOf(id);
 
-    if ((r == -1) && !FileIn::isBypassedId(r))
+    if ((r == -1) && !FileIn::isBypassedId(QString::number(r)))
         UmlCom::trace("unknown template formal reference '" + id + "'<br>");
 
     return r;
@@ -305,7 +305,7 @@ int UmlClass::formalRank(WrapperStr id)
 
 bool UmlClass::bind(UmlClass * tmpl)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned int n = ch.size();
     int i;
 
@@ -358,9 +358,9 @@ void UmlClass::extend(WrapperStr mcl)
 
     mcl = mcl.mid(index + 1);
 
-    static Q3PtrList<UmlClass> metaclasses;
+    static QList<UmlClass*> metaclasses;
 
-    Q3PtrListIterator<UmlClass> it(metaclasses);
+    QList<UmlClass*>::Iterator it = metaclasses.begin();
     UmlClass * metacl = UmlClass::get(mcl, 0);
     WrapperStr s;
 
@@ -374,7 +374,7 @@ void UmlClass::extend(WrapperStr mcl)
         metacl = 0;
 
         if (dflt) {
-            for (; (metacl = it.current()) != 0; ++it) {
+            for (; (metacl = *it) != 0; ++it) {
                 if (!strcmp(mcl, metacl->name()) &&
                     (!metacl->propertyValue("metaclassPath", s) ||
                      (s == defltpath0) ||
@@ -383,7 +383,7 @@ void UmlClass::extend(WrapperStr mcl)
             }
         }
         else {
-            for (; (metacl = it.current()) != 0; ++it) {
+            for (; (metacl = *it) != 0; ++it) {
                 if (!strcmp(mcl, metacl->name()) &&
                     metacl->propertyValue("metaclassPath", s) &&
                     (path == s))
@@ -400,10 +400,10 @@ void UmlClass::extend(WrapperStr mcl)
     UmlRelation::create(aDirectionalAssociation, this, metacl);
 }
 
-bool UmlClass::isAppliedStereotype(Token & tk, WrapperStr & prof_st, Q3ValueList<WrapperStr> & base_v)
+bool UmlClass::isAppliedStereotype(Token & tk, WrapperStr & prof_st, QList<WrapperStr> & base_v)
 {
-    static Q3Dict<WrapperStr> stereotypes;
-    static Q3Dict<Q3ValueList<WrapperStr> > bases;
+    static QHash<WrapperStr,WrapperStr*> stereotypes;
+    static QHash<WrapperStr,QList<WrapperStr>* > bases;
 
     WrapperStr s = tk.what();
     WrapperStr * st = stereotypes[s];
@@ -424,7 +424,7 @@ bool UmlClass::isAppliedStereotype(Token & tk, WrapperStr & prof_st, Q3ValueList
             UmlClass * cl = findStereotype(s, FALSE);
 
             if (cl != 0) {
-                const Q3PtrVector<UmlItem> ch = cl->children();
+                const QVector<UmlItem*> ch = cl->children();
                 unsigned n = ch.size();
 
                 for (unsigned i = 0; i != n; i += 1) {
@@ -441,7 +441,7 @@ bool UmlClass::isAppliedStereotype(Token & tk, WrapperStr & prof_st, Q3ValueList
 
                 prof_st = cl->parent()->parent()->name() + ":" + cl->name();
                 stereotypes.insert(s, new WrapperStr(prof_st));
-                bases.insert(s, new Q3ValueList<WrapperStr>(base_v));
+                bases.insert(s, new QList<WrapperStr>(base_v));
                 return TRUE;
             }
         }
@@ -539,7 +539,7 @@ void UmlClass::readFormal(FileIn & in, Token & token)
 UmlClass * UmlClass::addMetaclass(WrapperStr mclname, const char * mclpath)
 {
     UmlPackage * pack = (UmlPackage *) parent()->parent();	// is a package
-    const Q3PtrVector<UmlItem> ch = pack->children();
+    const QVector<UmlItem*> ch = pack->children();
     unsigned n = ch.size();
     UmlClass * r = 0;
 
@@ -575,5 +575,5 @@ int UmlClass::NumberOf;
 int UmlClass::NumberOfStereotype;
 
 //associate the class owning the template signature with the signature id
-QMap<WrapperStr, UmlClass *> UmlClass::signatures;
+QMap<QString, UmlClass *> UmlClass::signatures;
 
diff --git a/genplugouts/xmi2import/UmlClass.h b/genplugouts/xmi2import/UmlClass.h
index 4a8a6f222..d9356985f 100644
--- a/genplugouts/xmi2import/UmlClass.h
+++ b/genplugouts/xmi2import/UmlClass.h
@@ -5,7 +5,7 @@
 #include "UmlBaseClass.h"
 
 #include "anItemKind.h"
-#include <q3valuelist.h>
+#include <QList>
 #include <qmap.h>
 
 class UmlItem;
@@ -73,7 +73,7 @@ class UmlClass : public UmlBaseClass
 
     //if the token is a stereotype application give prof:st and the names of the attribute
     //specifying the element on which the stereotype is applied and return TRUE
-    static bool isAppliedStereotype(Token & tk, WrapperStr & prof_st, Q3ValueList<WrapperStr> & base_v);
+    static bool isAppliedStereotype(Token & tk, WrapperStr & prof_st, QList<WrapperStr> & base_v);
 
     static bool isPrimitiveType(Token & token, UmlTypeSpec & ts);
 
@@ -90,10 +90,10 @@ class UmlClass : public UmlBaseClass
     static int NumberOfStereotype;
 
     //xmiId of the formals following formals order
-    Q3ValueList<WrapperStr> formalsId;
+    QList<WrapperStr> formalsId;
 
     //associate the class owning the template signature with the signature id
-    static QMap<WrapperStr, UmlClass *> signatures;
+    static QMap<QString, UmlClass *> signatures;
 
 };
 
diff --git a/genplugouts/xmi2import/UmlCom.cpp b/genplugouts/xmi2import/UmlCom.cpp
index df80c4d37..02029c3a4 100644
--- a/genplugouts/xmi2import/UmlCom.cpp
+++ b/genplugouts/xmi2import/UmlCom.cpp
@@ -1,7 +1,7 @@
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //Added by qt3to4:
 #include "misc/mystr.h"
 
@@ -11,10 +11,11 @@
 #include "UmlClass.h"
 #include "UmlSettings.h"
 #include "Tools/ApiCmd.h"
+#include <QHostAddress>
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+    //sock->setAddressReusable(TRUE);
 
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
@@ -28,7 +29,9 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
+
         // send API version
         write_unsigned(55);
         flush();
@@ -75,11 +78,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -89,11 +92,11 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -110,13 +113,13 @@ void UmlCom::check_size_out(unsigned int len)
 void UmlCom::read_if_needed()
 {
 #ifdef TRACE
-    //cout << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
+    //qDebug() << "UmlCom::read_if_needed " << buffer_in_end - p_buffer_in << '\n';
 #endif
 
     if (p_buffer_in == buffer_in_end) {
         read_buffer(4);
 #ifdef TRACE
-        cout << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
+        qDebug() << "UmlCom::read " << ((((unsigned char *) buffer_in)[0] << 24) + (((unsigned char *) buffer_in)[1] << 16) + (((unsigned char *) buffer_in)[2] << 8) + ((unsigned char *) buffer_in)[3]) << " bytes\n";
 #endif
         read_buffer((((unsigned char *) buffer_in)[0] << 24) +
                     (((unsigned char *) buffer_in)[1] << 16) +
@@ -125,10 +128,10 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
-    //cout << "enter UmlCom::read_buffer(" << len << ")\n";
+    //qDebug() << "enter UmlCom::read_buffer(" << len << ")\n";
 #endif
 
     if (buffer_in_size < len) {
@@ -137,16 +140,16 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
-                cout << "UmlCom::read_buffer ERROR, already " << p - buffer_in
-                     << " remainder " << remainder << '\n';
+                qDebug() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
+                         << " remainder " << remainder << '\n';
 #endif
                 fatal_error("UmlCom read error");
             }
@@ -155,18 +158,18 @@ void UmlCom::read_buffer(unsigned int len)
         }
 
 #ifdef TRACE
-        //cout << "UmlCom a lu " << nread << '\n';
+        //qDebug() << "UmlCom a lu " << nread << '\n';
 #endif
 
         if ((remainder -= nread) == 0)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
-    //cout << "exit UmlCom::read_buffer()\n";
+    //qDebug() << "exit UmlCom::read_buffer()\n";
 #endif
 
     p_buffer_in = buffer_in;
@@ -212,7 +215,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -222,7 +225,7 @@ void UmlCom::write_string(const char * p)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ")\n";
 #endif
 
     write_char(f);
@@ -233,7 +236,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << b << ")\n";
 #endif
 
     write_char(f);
@@ -246,7 +249,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, bool b)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << (int) arg << ")\n";
 #endif
 
     write_char(f);
@@ -258,7 +261,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, char arg)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << arg << ", dummy)\n";
 #endif
 
     write_char(f);
@@ -270,7 +273,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, int arg, const char *)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ")\n";
 #endif
 
     write_char(f);
@@ -282,7 +285,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ")\n";
 #endif
 
     write_char(f);
@@ -294,7 +297,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << id << ", " << ((n) ? n : "") << ")\n";
 #endif
 
     write_char(f);
@@ -307,7 +310,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, void * id, const char * n)
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -320,7 +323,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, const char * s, const char
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, const char * v)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd((CmdFamily) " << f << ", " << cmd << ", " << b << ", " << ((s) ? s : "") << ", " << ((v) ? v : "") << ")\n";
 #endif
 
     write_char(f);
@@ -334,7 +337,7 @@ void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, bool b, const char * s, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -346,7 +349,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg) ? arg : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -359,7 +362,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((int) arg) << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -372,7 +375,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, char arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << '\n';
 #endif
 
     write_char(onInstanceCmd);
@@ -385,7 +388,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & arg)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -407,7 +410,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const UmlTypeSpec & ar
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << ((arg1) ? arg1 : "") << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -421,7 +424,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const char * arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -435,7 +438,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, const
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRelationKind arg2, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << arg2 << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -450,7 +453,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg1, aRela
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -463,7 +466,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1)
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, const char * arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", id1, " << ((arg2) ? arg2 : "") << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -477,7 +480,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const void * id1, cons
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const UmlTypeSpec & arg2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -499,8 +502,8 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, const char * arg2, const char * arg3, const UmlTypeSpec & arg4, const UmlTypeSpec & arg5)
 {
-#ifdef DEBUGBOUML
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << \", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
+#ifdef DEBUG_DOUML
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << "\", \"" << arg2 << "\", \"" << arg3 << "\", " << ", UmlTypeSpec, UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -533,7 +536,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, con
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg1 << ", " << (int) arg2 << ", " << ((arg3) ? arg3 : "") << ", " << ((arg4) ? arg4 : "") << ", UmlTypeSpec)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -556,10 +559,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -576,10 +579,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlI
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -613,7 +616,7 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlC
 void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, anItemKind arg, const void * id2)
 {
 #ifdef TRACE
-    cout << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
+    qDebug() << "UmlCom::send_cmd(id, " << cmd << ", " << arg << ", " << id2 << ")\n";
 #endif
 
     write_char(onInstanceCmd);
@@ -630,7 +633,7 @@ void * UmlCom::read_id()
 
     void * a;
 
-    // sizeof(void *) must be the same for bouml and
+    // sizeof(void *) must be the same for douml and
     // the plug-out, bypass it
     memcpy((char *) &a, p_buffer_in + 1, sizeof(void *));
     p_buffer_in += sizeof(void *) + 1;
@@ -641,12 +644,12 @@ const char * UmlCom::read_string()
 {
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
 
     p_buffer_in += len;
 
 #ifdef TRACE
-    //cout << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
+    //qDebug() << "UmlCom::read_string : \"" << p_buffer_in - len << "\"\n";
 #endif
 
     return p_buffer_in - len;
@@ -678,28 +681,29 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     unsigned n = read_unsigned();
 
     v.resize(n);
 
 #ifdef TRACE
-    //cout << "UmlCom::read_item_list " << n << " items\n";
+    //qDebug() << "UmlCom::read_item_list " << n << " items\n";
 #endif
 
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        //v.insert(index, UmlBaseItem::read_());
+        v[index] = UmlBaseItem::read_();
 }
 
 void UmlCom::fatal_error(const WrapperStr &
-#ifdef DEBUG_BOUML
+#ifdef DEBUG_DOUML
                          msg
 #endif
                         )
 {
-#ifdef DEBUG_BOUML
-    cout << msg << '\n';
+#ifdef DEBUG_DOUML
+    qDebug() << msg << '\n';
 #endif
 
     throw 0;
@@ -708,7 +712,7 @@ void UmlCom::fatal_error(const WrapperStr &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
         buffer_out[1] = len >> 16;
@@ -719,7 +723,7 @@ void UmlCom::flush()
         p_buffer_out = buffer_out;
 
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
diff --git a/genplugouts/xmi2import/UmlCom.h b/genplugouts/xmi2import/UmlCom.h
index 2fb51078c..b29cf4ffa 100644
--- a/genplugouts/xmi2import/UmlCom.h
+++ b/genplugouts/xmi2import/UmlCom.h
@@ -2,21 +2,21 @@
 #define _UMLCOM_H
 
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 //#include "CmdFamily.h"
 //#include "OnInstanceCmd.h"
 #include "anItemKind.h"
 #include "aRelationKind.h"
 
 
-#include <q3ptrvector.h>
+
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -77,11 +77,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -91,19 +91,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -193,8 +193,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3);
 
     //internal, do NOT use it
 
@@ -217,7 +217,7 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
     static void fatal_error(const WrapperStr & msg);
diff --git a/genplugouts/xmi2import/UmlComponent.cpp b/genplugouts/xmi2import/UmlComponent.cpp
index 2f33ac486..6471387c8 100644
--- a/genplugouts/xmi2import/UmlComponent.cpp
+++ b/genplugouts/xmi2import/UmlComponent.cpp
@@ -57,14 +57,14 @@ void UmlComponent::manageInterface(Token & token, FileIn & in)
 {
     WrapperStr idref = token.valueOf("supplier");
 
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
     int c = ((const char *) token.what())[0];
 
     if (it != All.end()) {
         if ((*it)->kind() == aClass) {
             if (c == 'i') {
                 // provided
-                Q3PtrVector<UmlClass> provided = providedClasses();
+                QVector<UmlClass*> provided = providedClasses();
                 unsigned sz = provided.size();
 
                 provided.resize(sz + 1);
@@ -73,7 +73,7 @@ void UmlComponent::manageInterface(Token & token, FileIn & in)
             }
             else {
                 // realization
-                Q3PtrVector<UmlClass> realizing = realizingClasses();
+                QVector<UmlClass*> realizing = realizingClasses();
                 unsigned sz = realizing.size();
 
                 realizing.resize(sz + 1);
@@ -102,13 +102,13 @@ UmlItem * UmlComponent::container(anItemKind kind, Token & token, FileIn & in)
 
 void UmlComponent::solve(int context, WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it != All.end()) {
         if ((*it)->kind() == aClass) {
             if (context == 'i') {
                 // provided
-                Q3PtrVector<UmlClass> provided = providedClasses();
+                QVector<UmlClass*> provided = providedClasses();
                 unsigned sz = provided.size();
 
                 provided.resize(sz + 1);
@@ -117,7 +117,7 @@ void UmlComponent::solve(int context, WrapperStr idref)
             }
             else {
                 // realization
-                Q3PtrVector<UmlClass> realizing = realizingClasses();
+                QVector<UmlClass*> realizing = realizingClasses();
                 unsigned sz = realizing.size();
 
                 realizing.resize(sz + 1);
@@ -134,7 +134,7 @@ void UmlComponent::generalizeDependRealize(UmlItem * target, FileIn & in, int co
 {
     if ((context == 3) && (target->kind() == aClass)) {
         // usage indicate a required interface
-        Q3PtrVector<UmlClass> required = requiredClasses();
+        QVector<UmlClass*> required = requiredClasses();
         unsigned sz = required.size();
 
         required.resize(sz + 1);
@@ -147,13 +147,13 @@ void UmlComponent::generalizeDependRealize(UmlItem * target, FileIn & in, int co
 
 void UmlComponent::solveGeneralizationDependencyRealization(int context, WrapperStr idref, WrapperStr label, WrapperStr constraint)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it;
+    QMap<QString, UmlItem *>::Iterator it;
 
     if ((context == 3) &&
         ((it = All.find(idref)) != All.end()) &&
         ((*it)->kind() == aClass)) {
         // usage indicate resuired interface
-        Q3PtrVector<UmlClass> required = requiredClasses();
+        QVector<UmlClass*> required = requiredClasses();
         unsigned sz = required.size();
 
         required.resize(sz + 1);
diff --git a/genplugouts/xmi2import/UmlEntryPointPseudoState.cpp b/genplugouts/xmi2import/UmlEntryPointPseudoState.cpp
index 919bda3ab..7af81671e 100644
--- a/genplugouts/xmi2import/UmlEntryPointPseudoState.cpp
+++ b/genplugouts/xmi2import/UmlEntryPointPseudoState.cpp
@@ -8,7 +8,7 @@
 void UmlEntryPointPseudoState::solve(WrapperStr idref)
 {
     // note : parent state already resolved => is a state reference
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
diff --git a/genplugouts/xmi2import/UmlExitPointPseudoState.cpp b/genplugouts/xmi2import/UmlExitPointPseudoState.cpp
index 207e0bfd2..72072a194 100644
--- a/genplugouts/xmi2import/UmlExitPointPseudoState.cpp
+++ b/genplugouts/xmi2import/UmlExitPointPseudoState.cpp
@@ -8,7 +8,7 @@
 void UmlExitPointPseudoState::solve(WrapperStr idref)
 {
     // note : parent state already resolved => is a state reference
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
diff --git a/genplugouts/xmi2import/UmlFlow.cpp b/genplugouts/xmi2import/UmlFlow.cpp
index 1d13e5526..c898ad9fe 100644
--- a/genplugouts/xmi2import/UmlFlow.cpp
+++ b/genplugouts/xmi2import/UmlFlow.cpp
@@ -8,7 +8,7 @@
 #include "UmlActivityNode.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 void UmlFlow::init()
 {
     declareFct("edge", "uml:ObjectFlow", &importIt);
@@ -22,13 +22,13 @@ void UmlFlow::init()
 
 void UmlFlow::solveThem()
 {
-    Q3ValueList<Flow>::Iterator iter;
+    QList<Flow>::Iterator iter;
 
     for (iter = All.begin(); iter != All.end(); ++iter) {
         Flow & flow = *iter;
 
-        QMap<WrapperStr, UmlItem *>::Iterator isrc = UmlItem::All.find(flow.source);
-        QMap<WrapperStr, UmlItem *>::Iterator itgt = UmlItem::All.find(flow.target);
+        QMap<QString, UmlItem *>::Iterator isrc = UmlItem::All.find(flow.source);
+        QMap<QString, UmlItem *>::Iterator itgt = UmlItem::All.find(flow.target);
 
         if ((isrc == UmlItem::All.end()) &&
             ((isrc = Outgoings.find(flow.id)) == Outgoings.end())) {
@@ -103,7 +103,7 @@ void UmlFlow::solveThem()
 
 void UmlFlow::importIt(FileIn & in, Token & token, UmlItem *)
 {
-    Flow & flow = *(All.append(Flow()));
+    Flow flow;
     WrapperStr s;
 
     flow.id = token.xmiId();
@@ -166,7 +166,8 @@ void UmlFlow::importIt(FileIn & in, Token & token, UmlItem *)
                 in.finish(s);
         }
     }
+    All.append(flow);
 }
 
-Q3ValueList<UmlFlow::Flow> UmlFlow::All;
+QList<UmlFlow::Flow> UmlFlow::All;
 
diff --git a/genplugouts/xmi2import/UmlFlow.h b/genplugouts/xmi2import/UmlFlow.h
index 43cbeee08..416c53280 100644
--- a/genplugouts/xmi2import/UmlFlow.h
+++ b/genplugouts/xmi2import/UmlFlow.h
@@ -5,7 +5,7 @@
 #include "UmlBaseFlow.h"
 #include "UmlActivityItem.h"
 
-#include <q3valuelist.h>
+#include <QList>
 
 class FileIn;
 class Token;
@@ -48,7 +48,7 @@ class UmlFlow : public UmlBaseFlow, public UmlActivityItem
 
 
 protected:
-    static Q3ValueList<Flow> All;
+    static QList<Flow> All;
 
 };
 
diff --git a/genplugouts/xmi2import/UmlItem.cpp b/genplugouts/xmi2import/UmlItem.cpp
index 4920537ac..c2eb063f0 100644
--- a/genplugouts/xmi2import/UmlItem.cpp
+++ b/genplugouts/xmi2import/UmlItem.cpp
@@ -8,7 +8,7 @@
 #include "UmlNcRelation.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 void Unresolved::addGeneralization(UmlItem * e, WrapperStr & id, WrapperStr cstr)
 {
@@ -20,13 +20,13 @@ void Unresolved::addRef(UmlItem * e, WrapperStr & id)
     Refs.append(Unresolved(e, id, ""));
 }
 
-Q3ValueList<Unresolved> Unresolved::Generalizations;
+QList<Unresolved> Unresolved::Generalizations;
 
-Q3ValueList<Unresolved> Unresolved::Refs;
+QList<Unresolved> Unresolved::Refs;
 
 void Unresolved::solveThem()
 {
-    Q3ValueList<Unresolved>::Iterator it;
+    QList<Unresolved>::Iterator it;
 
     for (it = Refs.begin(); it != Refs.end(); ++it)
         (*it).element->solve((*it).idref);
@@ -46,7 +46,7 @@ void UnresolvedWithContext::add(UmlItem * e, WrapperStr id, int c)
 
 void UnresolvedWithContext::solveThem()
 {
-    Q3ValueList<UnresolvedWithContext>::Iterator it;
+    QList<UnresolvedWithContext>::Iterator it;
 
     for (it = All.begin(); it != All.end(); ++it)
         (*it).element->solve((*it).context, (*it).idref);
@@ -54,7 +54,7 @@ void UnresolvedWithContext::solveThem()
     All.clear();
 }
 
-Q3ValueList<UnresolvedWithContext> UnresolvedWithContext::All;
+QList<UnresolvedWithContext> UnresolvedWithContext::All;
 
 void UnresolvedRelation::add(int ctx, WrapperStr idFrom, WrapperStr idTo, WrapperStr label, WrapperStr constraint)
 {
@@ -65,14 +65,14 @@ UnresolvedRelation::UnresolvedRelation()
 {
 }
 
-Q3ValueList<UnresolvedRelation> UnresolvedRelation::All;
+QList<UnresolvedRelation> UnresolvedRelation::All;
 
 void UnresolvedRelation::solveThem()
 {
-    Q3ValueList<UnresolvedRelation>::Iterator it;
+    QList<UnresolvedRelation>::Iterator it;
 
     for (it = All.begin(); it != All.end(); ++it) {
-        QMap<WrapperStr, UmlItem *>::Iterator from = UmlItem::All.find((*it).from);
+        QMap<QString, UmlItem *>::Iterator from = UmlItem::All.find((*it).from);
 
         if (from != UmlItem::All.end())
             (*from)->solveGeneralizationDependencyRealization((*it).context, (*it).to, (*it).name, (*it).constraint);
@@ -94,7 +94,7 @@ void UmlItem::import(QString)
 
 void UmlItem::addItem(WrapperStr id, FileIn & in)
 {
-    QMap<WrapperStr, UmlItem *>::ConstIterator iter = All.find(id);
+    QMap<QString, UmlItem *>::ConstIterator iter = All.find(id);
 
     if (iter != All.end())
         in.error("xmi:id '" + id + "' used twice");
@@ -152,7 +152,7 @@ void UmlItem::generalizeDependRealize(UmlItem * target, FileIn & in, int context
 
 void UmlItem::solveGeneralizationDependencyRealization(int context, WrapperStr idref, WrapperStr label, WrapperStr)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it != All.end()) {
         static const struct {
@@ -252,7 +252,7 @@ void UmlItem::loadFromProfile()
     if (propertyValue("xmiId", id) && (All.find(id) == All.end()))
         All.insert(id, this);
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
 
     for (unsigned u = 0; u != n; u += 1)
@@ -261,7 +261,7 @@ void UmlItem::loadFromProfile()
 
 bool UmlItem::getType(WrapperStr idref, UmlTypeSpec & type)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     type.type = 0;
     type.explicit_type = "";
@@ -275,7 +275,7 @@ bool UmlItem::getType(WrapperStr idref, UmlTypeSpec & type)
             return FALSE;
     }
     else {
-        QMap<WrapperStr, UmlTypeSpec>::Iterator itp = PrimitiveTypes.find(idref);
+        QMap<QString, UmlTypeSpec>::Iterator itp = PrimitiveTypes.find(idref);
 
         if (itp != PrimitiveTypes.end()) {
             type = *itp;
@@ -498,7 +498,7 @@ void UmlItem::importGeneralization(FileIn & in, Token & token, UmlItem * where)
     }
 
     if (!id.isEmpty()) {
-        QMap<WrapperStr, UmlItem *>::ConstIterator iter = All.find(id);
+        QMap<QString, UmlItem *>::ConstIterator iter = All.find(id);
 
         if (iter != All.end())
             where->generalizeDependRealize(*iter, in, 0, "", constraint);
@@ -545,8 +545,8 @@ void UmlItem::importDependency(FileIn & in, Token & token, UmlItem * where)
             // Borland Together 2006 for Eclipse
             supplier = where->id();
 
-        QMap<WrapperStr, UmlItem *>::ConstIterator from = All.find(client);
-        QMap<WrapperStr, UmlItem *>::ConstIterator to = All.find(supplier);
+        QMap<QString, UmlItem *>::ConstIterator from = All.find(client);
+        QMap<QString, UmlItem *>::ConstIterator to = All.find(supplier);
 
         if ((from != All.end()) && (to != All.end()))
             (*from)->generalizeDependRealize(*to, in, kind, label, constraint);
@@ -590,8 +590,8 @@ void UmlItem::importRealization(FileIn & in, Token & token, UmlItem * where)
             // Borland Together 2006 for Eclipse
             supplier = where->id();
 
-        QMap<WrapperStr, UmlItem *>::ConstIterator from = All.find(client);
-        QMap<WrapperStr, UmlItem *>::ConstIterator to = All.find(supplier);
+        QMap<QString, UmlItem *>::ConstIterator from = All.find(client);
+        QMap<QString, UmlItem *>::ConstIterator to = All.find(supplier);
 
         if ((from != All.end()) && (to != All.end()))
             (*from)->generalizeDependRealize(*to, in, 2, label, constraint);
@@ -626,7 +626,7 @@ WrapperStr UmlItem::legalName(WrapperStr s)
     unsigned n = s.length();
 
     for (index = 0; index != n; index += 1) {
-        char c = s.at(index);
+        char c = s.operator QString().toLocal8Bit()[index];
 
         if (!(((c >= 'a') && (c <= 'z')) ||
               ((c >= 'A') && (c <= 'Z')) ||
@@ -682,13 +682,13 @@ bool UmlItem::FromBouml;
 
 bool UmlItem::FromEclipse;
 
-QMap<WrapperStr, UmlItem *> UmlItem::All;
+QMap<QString, UmlItem *> UmlItem::All;
 
-QMap<WrapperStr, PFunc> UmlItem::Functions;
+QMap<QString, PFunc> UmlItem::Functions;
 
-QMap<WrapperStr, UmlTypeSpec> UmlItem::PrimitiveTypes;
+QMap<QString, UmlTypeSpec> UmlItem::PrimitiveTypes;
 
-QMap<WrapperStr, UmlItem *> UmlItem::Incomings;
+QMap<QString, UmlItem *> UmlItem::Incomings;
 
-QMap<WrapperStr, UmlItem *> UmlItem::Outgoings;
+QMap<QString, UmlItem *> UmlItem::Outgoings;
 
diff --git a/genplugouts/xmi2import/UmlItem.h b/genplugouts/xmi2import/UmlItem.h
index 1b95bf55a..e5f0fd1c2 100644
--- a/genplugouts/xmi2import/UmlItem.h
+++ b/genplugouts/xmi2import/UmlItem.h
@@ -3,7 +3,7 @@
 
 
 
-#include <q3valuelist.h>
+#include <QList>
 #include "UmlBaseItem.h"
 #include <qstring.h>
 #include "anItemKind.h"
@@ -37,9 +37,9 @@ class Unresolved
 
     WrapperStr constraint;
 
-    static Q3ValueList<Unresolved> Generalizations;
+    static QList<Unresolved> Generalizations;
 
-    static Q3ValueList<Unresolved> Refs;
+    static QList<Unresolved> Refs;
 
 
 public:
@@ -68,7 +68,7 @@ class UnresolvedWithContext
 
     int context;
 
-    static Q3ValueList<UnresolvedWithContext> All;
+    static QList<UnresolvedWithContext> All;
 
 };
 
@@ -95,7 +95,7 @@ class UnresolvedRelation
 
     WrapperStr constraint;
 
-    static Q3ValueList<UnresolvedRelation> All;
+    static QList<UnresolvedRelation> All;
 
 
 public:
@@ -225,17 +225,17 @@ class UmlItem : public UmlBaseItem
 
 
 public:
-    static QMap<WrapperStr, UmlItem *> All;
+    static QMap<QString, UmlItem *> All;
 
 
 protected:
-    static QMap<WrapperStr, PFunc> Functions;
+    static QMap<QString, PFunc> Functions;
 
-    static QMap<WrapperStr, UmlTypeSpec> PrimitiveTypes;
+    static QMap<QString, UmlTypeSpec> PrimitiveTypes;
 
-    static QMap<WrapperStr, UmlItem *> Incomings;
+    static QMap<QString, UmlItem *> Incomings;
 
-    static QMap<WrapperStr, UmlItem *> Outgoings;
+    static QMap<QString, UmlItem *> Outgoings;
 
 
 private:
diff --git a/genplugouts/xmi2import/UmlOperation.cpp b/genplugouts/xmi2import/UmlOperation.cpp
index dd9593d1e..8d84e4f81 100644
--- a/genplugouts/xmi2import/UmlOperation.cpp
+++ b/genplugouts/xmi2import/UmlOperation.cpp
@@ -56,8 +56,7 @@ void UmlOperation::importIt(FileIn & in, Token & token, UmlItem * where)
 
             if (s == "raisedexception")
                 op->addException(token, in);
-            else if ((s == "ownedparameter") ||
-                     (s == "returnresult")) // andromda emf
+            else if ((s == "ownedparameter") || (s == "returnresult")) // andromda emf
                 op->addParameter(token, in);
             else if (s == "ownedrule")
                 op->set_Constraint(UmlItem::readConstraint(in, token));
diff --git a/genplugouts/xmi2import/UmlPackage.cpp b/genplugouts/xmi2import/UmlPackage.cpp
index 38ae5c705..1b36dac02 100644
--- a/genplugouts/xmi2import/UmlPackage.cpp
+++ b/genplugouts/xmi2import/UmlPackage.cpp
@@ -13,11 +13,11 @@
 #include <unistd.h>
 #endif
 
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qapplication.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 #include "UmlCom.h"
 #include "FileIn.h"
@@ -41,18 +41,18 @@ void UmlPackage::import(QString path)
     bool manual = path.isEmpty();
 
     if (manual)
-        path = Q3FileDialog::getOpenFileName(QString::null, QString::null, 0, 0, "open xmi/xml file");
+        path = QFileDialog::getOpenFileName(0,"open xmi/xml file",QString::null, QString::null);
 
     if (! path.isEmpty()) {
         // note : QTextStream(FILE *) bugged under windows
-        FILE * fp = fopen(path, "rb");
+        FILE * fp = fopen(path.toLatin1().constData(), "rb");
 
         if (fp == 0)
-            UmlCom::trace("cannot open " + path);
+            UmlCom::trace(QString("cannot open " + path).toLatin1().constData());
         else {
             QString s = "import " + path + "<br>";
 
-            UmlCom::trace(s);
+            UmlCom::trace(s.toLatin1().constData());
 
             FileIn in(path, fp);
 
@@ -122,7 +122,7 @@ void UmlPackage::importHeader(FileIn & in)
 
         // read all before stereotype use
         WrapperStr prof_st;
-        Q3ValueList<WrapperStr> base_v;
+        QList<WrapperStr> base_v;
 
         while ((void) in.read(), !tk.close("xmi:xmi")) {
             if (UmlClass::isAppliedStereotype(tk, prof_st, base_v))
@@ -338,12 +338,12 @@ void UmlPackage::init()
 void UmlPackage::applyStereotype(FileIn & in, Token & token)
 {
     WrapperStr prof_st;
-    Q3ValueList<WrapperStr> base_v;
+    QList<WrapperStr> base_v;
     WrapperStr s;
 
     if (UmlClass::isAppliedStereotype(token, prof_st, base_v)) {
         WrapperStr s;
-        Q3ValueList<WrapperStr>::Iterator it_ext;
+        QList<WrapperStr>::Iterator it_ext;
 
         for (it_ext = base_v.begin(); it_ext != base_v.end(); ++it_ext) {
             WrapperStr s2;
@@ -369,13 +369,13 @@ void UmlPackage::applyStereotype(FileIn & in, Token & token)
                 elt->set_Stereotype(prof_st);
                 elt->UmlItem::applyStereotype();	// set properties
 
-                Q3Dict<WrapperStr> props = elt->properties();
-                Q3DictIterator<WrapperStr> it(props);
+                QHash<WrapperStr,WrapperStr*> props = elt->properties();
+                QHash<WrapperStr,WrapperStr*>::Iterator it = props.begin();
 
-                while (it.current()) {
-                    WrapperStr k = it.currentKey().latin1();
+                while (it != props.end()) {
+                    WrapperStr k = *(*it);
 
-                    if (token.valueOf(k.mid(k.findRev(':') + 1).lower(), s))
+                    if (token.valueOf(k.mid(k.operator QString().indexOf(':') + 1).lower(), s))
                         elt->set_PropertyValue(k, s);
 
                     ++it;
@@ -398,18 +398,18 @@ UmlPackage * UmlPackage::importProfile(FileIn & in, WrapperStr href)
 
         if (index != -1) {
             WrapperStr id = href.mid(index + 1);
-            QMap<WrapperStr, UmlItem *>::Iterator it = All.find(id);
+            QMap<QString, UmlItem *>::Iterator it = All.find(id);
 
             if (it == All.end()) {
                 UmlPackage * pf = getProject()->findProfile(id);
 
                 if (pf == 0) {
                     QFileInfo fi(in.path());
-                    QDir d(fi.dir(TRUE));
-                    QString fn = d.absFilePath(href.left(index));
+                    QDir d(fi.dir());
+                    QString fn = d.absoluteFilePath(href.left(index));
 
                     if (QFile::exists(fn)) {
-                        WrapperStr cmd = qApp->argv()[0] + WrapperStr(" ") + WrapperStr((const char *)fn); //[rageek] ambiguous, cast
+                        WrapperStr cmd = qApp->arguments()[0] + WrapperStr(" ") + WrapperStr(fn); //[rageek] ambiguous, cast
                         int pid = UmlCom::targetItem()->apply(cmd);
 
                         while (isToolRunning(pid)) {
@@ -469,7 +469,7 @@ void UmlPackage::packageImport(FileIn & in, Token & tk)
                     UmlPackage * pf = 0;
 
                     if (!s.isEmpty()) {
-                        QMap<WrapperStr, UmlItem *>::Iterator it = All.find(s);
+                        QMap<QString, UmlItem *>::Iterator it = All.find(s);
 
                         if (it == All.end())
                             UnresolvedRelation::add(4, this->id(), s, "", "");
@@ -531,7 +531,7 @@ UmlPackage * UmlPackage::findProfile(WrapperStr xmiId)
             return this;
     }
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned n = ch.size();
     UmlPackage * r;
 
diff --git a/genplugouts/xmi2import/UmlSettings.cpp b/genplugouts/xmi2import/UmlSettings.cpp
index 732cf49d3..e5cd40a26 100644
--- a/genplugouts/xmi2import/UmlSettings.cpp
+++ b/genplugouts/xmi2import/UmlSettings.cpp
@@ -156,29 +156,29 @@ WrapperStr UmlSettings::_attribute_default_description;
 
 WrapperStr UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<WrapperStr,UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<WrapperStr,UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<WrapperStr,UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -190,7 +190,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -203,7 +203,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -275,17 +275,17 @@ WrapperStr UmlSettings::uml_class_stereotype(const WrapperStr & t, WrapperStr Um
 
 UmlBuiltin * UmlSettings::add_type(const WrapperStr & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         builtins[index] = _builtins[index];
-        _map_builtins.replace(builtins[index].uml, &builtins[index]);
+        _map_builtins.insert(builtins[index].uml, &builtins[index]);
     }
 
     builtins[index].uml = s;
@@ -312,17 +312,17 @@ UmlBuiltin * UmlSettings::add_type(const WrapperStr & s)
 
 UmlStereotype * UmlSettings::add_rel_attr_stereotype(const WrapperStr & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_attribute_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         relation_attribute_stereotypes[index] = _relation_attribute_stereotypes[index];
-        _map_relation_attribute_stereotypes.replace(relation_attribute_stereotypes[index].uml,
+        _map_relation_attribute_stereotypes.insert(relation_attribute_stereotypes[index].uml,
                 &relation_attribute_stereotypes[index]);
     }
 
@@ -347,17 +347,17 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const WrapperStr & s)
 
 UmlStereotype * UmlSettings::add_class_stereotype(const WrapperStr & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         class_stereotypes[index] = _class_stereotypes[index];
-        _map_class_stereotypes.replace(class_stereotypes[index].uml, &class_stereotypes[index]);
+        _map_class_stereotypes.insert(class_stereotypes[index].uml, &class_stereotypes[index]);
     }
 
     class_stereotypes[index].uml = s;
diff --git a/genplugouts/xmi2import/UmlSettings.h b/genplugouts/xmi2import/UmlSettings.h
index 1eaba822e..38ac9ca5e 100644
--- a/genplugouts/xmi2import/UmlSettings.h
+++ b/genplugouts/xmi2import/UmlSettings.h
@@ -1,10 +1,10 @@
 #ifndef _UMLSETTINGS_H
 #define _UMLSETTINGS_H
-
-
+#include <QByteArray>
+#include <QHash>
 
 #include "aLanguage.h"
-#include <q3dict.h>
+#include "misc/mystr.h"
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -100,15 +100,15 @@ class UmlSettings
 
     static WrapperStr _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<WrapperStr,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<WrapperStr,UmlStereotype*> _map_relation_attribute_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<WrapperStr,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
diff --git a/genplugouts/xmi2import/UmlState.cpp b/genplugouts/xmi2import/UmlState.cpp
index 846942c7d..61cd5e65c 100644
--- a/genplugouts/xmi2import/UmlState.cpp
+++ b/genplugouts/xmi2import/UmlState.cpp
@@ -92,7 +92,7 @@ void UmlState::importActivity(FileIn & in, Token & token)
 
 void UmlState::solve(int context, WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
@@ -194,7 +194,7 @@ void UmlState::importIt(FileIn & in, Token & token, UmlItem * where)
             st->set_Stereotype("machine");
 
         if (! ref.isEmpty()) {
-            QMap<WrapperStr, UmlItem *>::Iterator it = All.find(ref);
+            QMap<QString, UmlItem *>::Iterator it = All.find(ref);
 
             if (it == All.end())
                 UnresolvedWithContext::add(st, ref, 4);
@@ -203,7 +203,7 @@ void UmlState::importIt(FileIn & in, Token & token, UmlItem * where)
         }
 
         if (! spec.isEmpty()) {
-            QMap<WrapperStr, UmlItem *>::Iterator it = All.find(spec);
+            QMap<QString, UmlItem *>::Iterator it = All.find(spec);
 
             if (it == All.end())
                 UnresolvedWithContext::add(st, spec, 3);
diff --git a/genplugouts/xmi2import/UmlTransition.cpp b/genplugouts/xmi2import/UmlTransition.cpp
index 49b704c06..ff7b2a1e9 100644
--- a/genplugouts/xmi2import/UmlTransition.cpp
+++ b/genplugouts/xmi2import/UmlTransition.cpp
@@ -8,7 +8,7 @@
 #include "Trigger.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 void UmlTransition::init()
 {
     declareFct("transition", "uml:Transition", &importIt);
@@ -19,13 +19,13 @@ void UmlTransition::init()
 
 void UmlTransition::solveThem()
 {
-    Q3ValueList<Transition>::Iterator iter;
+    QList<Transition>::Iterator iter;
 
     for (iter = All.begin(); iter != All.end(); ++iter) {
         Transition & transition = *iter;
 
-        QMap<WrapperStr, UmlItem *>::Iterator isrc = UmlItem::All.find(transition.source);
-        QMap<WrapperStr, UmlItem *>::Iterator itgt = UmlItem::All.find(transition.target);
+        QMap<QString, UmlItem *>::Iterator isrc = UmlItem::All.find(transition.source);
+        QMap<QString, UmlItem *>::Iterator itgt = UmlItem::All.find(transition.target);
 
         if ((isrc == UmlItem::All.end()) /*&&
 	((isrc = Outgoings.find(transition.id)) == Outgoings.end())*/) {
@@ -78,7 +78,7 @@ void UmlTransition::solveThem()
 
 void UmlTransition::importIt(FileIn & in, Token & token, UmlItem *)
 {
-    Transition & transition = *(All.append(Transition()));
+    Transition  transition;
     WrapperStr s;
 
     transition.id = token.xmiId();
@@ -151,7 +151,8 @@ void UmlTransition::importIt(FileIn & in, Token & token, UmlItem *)
                 in.finish(s);
         }
     }
+    All.append(transition);
 }
 
-Q3ValueList<UmlTransition::Transition> UmlTransition::All;
+QList<UmlTransition::Transition> UmlTransition::All;
 
diff --git a/genplugouts/xmi2import/UmlTransition.h b/genplugouts/xmi2import/UmlTransition.h
index 908daac7e..a1545f9ae 100644
--- a/genplugouts/xmi2import/UmlTransition.h
+++ b/genplugouts/xmi2import/UmlTransition.h
@@ -5,7 +5,7 @@
 #include "UmlBaseTransition.h"
 #include "UmlStateItem.h"
 
-#include <q3valuelist.h>
+#include <QList>
 
 class FileIn;
 class Token;
@@ -48,7 +48,7 @@ class UmlTransition : public UmlBaseTransition, public UmlStateItem
 
 
 protected:
-    static Q3ValueList<Transition> All;
+    static QList<Transition> All;
 
 };
 
diff --git a/genplugouts/xmi2import/UmlUseCase.cpp b/genplugouts/xmi2import/UmlUseCase.cpp
index 6af1d2bc9..6ff143cc3 100644
--- a/genplugouts/xmi2import/UmlUseCase.cpp
+++ b/genplugouts/xmi2import/UmlUseCase.cpp
@@ -26,7 +26,7 @@ UmlItem * UmlUseCase::container(anItemKind kind, Token & token, FileIn & in)
 
 void UmlUseCase::solve(int context, WrapperStr idref)
 {
-    QMap<WrapperStr, UmlItem *>::Iterator it = All.find(idref);
+    QMap<QString, UmlItem *>::Iterator it = All.find(idref);
 
     if (it == All.end()) {
         if (!FileIn::isBypassedId(idref))
@@ -99,7 +99,7 @@ void UmlUseCase::importExtendInclude(FileIn & in, Token & token, UmlItem * where
         if (other.isEmpty())
             in.warning((extend) ? "extendedCase is missing" : "addition is missing");
         else {
-            QMap<WrapperStr, UmlItem *>::Iterator it = All.find(other);
+            QMap<QString, UmlItem *>::Iterator it = All.find(other);
 
             if (it != All.end())
                 where->solve(extend, other);
diff --git a/genplugouts/xmi2import/xmi2import.pro b/genplugouts/xmi2import/xmi2import.pro
index e0837891e..9fa11ab35 100644
--- a/genplugouts/xmi2import/xmi2import.pro
+++ b/genplugouts/xmi2import/xmi2import.pro
@@ -1,7 +1,12 @@
 TEMPLATE    = app
 TARGET        = ixmi2
-CONFIG        += debug warn_on qt
-DEFINES        = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON BooL=bool
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES        += WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON BooL=bool
+PRECOMPILED_HEADER += ../../src/misc/mystr.h
+CONFIG += precompile_header
 HEADERS        = ./UmlActivityPartition.h \
           ./UmlBaseNode.h \
           ./UmlPackage.h \
@@ -414,26 +419,25 @@ SOURCES        = ./UmlActivityPartition.cpp \
           ./UmlUseCaseView.cpp \
           ./UmlBaseActivityActionClasses.cpp \
           ./UmlBaseClassItem.cpp \
-          ./UmlClass.cpp
+          ./UmlClass.cpp \
+        ../../src/misc/mystr.cpp
 
-#The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+DEFINES += TRUE=true FALSE=false
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
+QT += testlib
+UI_DIR = src/ui
+DESTDIR = ../../bin
 
-
-    MOC_DIR = bin/douml/xmi2import/MOC_release
-    OBJECTS_DIR = bin/douml/xmi2import/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-Debug{
-    MOC_DIR = bin/douml/xmi2import/MOC_Debug
-    OBJECTS_DIR = bin/douml/xmi2import/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
diff --git a/main.cpp b/main.cpp
deleted file mode 100644
index 922f46b01..000000000
--- a/main.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-// *************************************************************************
-//
-// Copyright 2004-2010 Bruno PAGES  .
-//
-// This file is part of the BOUML Uml Toolkit.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License Version 3.0 as published by
-// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
-//  packaging of this file.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License Version 3.0 for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// e-mail : bouml@free.fr
-// home   : http://bouml.free.fr
-//
-// *************************************************************************
-
-
-
-
-
-#include <qapplication.h>
-//Added by qt3to4:
-#include <Q3CString>
-
-#include "UmlWindow.h"
-#include "UmlPixmap.h"
-#include "UmlGlobal.h"
-#include "UmlDesktop.h"
-#include "ToolCom.h"
-#include "BrowserView.h"
-#include "BrowserPackage.h"
-#include "Shortcut.h"
-#include "DialogUtil.h"
-#include "mu.h"
-#include "err.h"
-#include "EnvDialog.h"
-#include "../Logging/QsLogDest.h"
-#include "../Logging/QsLog.h"
-
-
-
-#include "translate.h"
-
-bool ExitOnError = FALSE;
-QApplication * theApp;
-
-//
-
-int main(int argc, char ** argv)
-{
-    ExitOnError = FALSE;
-
-
-
-    QsLogging::Logger & logger = QsLogging::Logger::instance();
-    logger.setLoggingLevel(QsLogging::TraceLevel);
-    QDir dir;
-    dir.setPath(qApp->applicationDirPath());
-    dir.remove(QString("cpp_generator") + QString(".log"));
-    const QString sLogPath(QDir(qApp->applicationDirPath()).filePath(QString("douml") + QString(".log")));
-    QsLogging::DestinationPtr fileDestination(QsLogging::DestinationFactory::MakeFileDestination(sLogPath));
-    QsLogging::DestinationPtr debugDestination(QsLogging::DestinationFactory::MakeDebugOutputDestination());
-    logger.addDestination(debugDestination.get());
-    logger.addDestination(fileDestination.get());
-    QLOG_INFO() << "Starting the log";
-
-    theApp = new QApplication(argc, argv);
-
-    UmlDesktop::init();
-
-    // note : bool conv_env = !QDir::home().exists(".doumlrc") doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-    bool conv_env = (fp == 0);
-
-
-    if (conv_env)
-        EnvDialog::edit(TRUE);
-    else
-        fclose(fp);
-
-    read_doumlrc();	// for virtual desktop
-    init_pixmaps();
-    init_font();
-    Shortcut::init(conv_env);
-
-    bool exec = FALSE;
-    bool no_gui = FALSE;
-
-    if (argc > 3) {
-        if (!strcmp(argv[2], "-execnogui"))
-            exec = no_gui = TRUE;
-        else
-            exec = !strcmp(argv[2], "-exec");
-    }
-
-    UmlWindow * uw = new UmlWindow(exec);
-
-    if (no_gui)
-        UmlDesktop::set_nogui();
-    else
-        uw->show();
-
-    if (argc > 1) {
-        try {
-            if ((argc == 3) &&
-                !strcmp(argv[2], "-root") &&
-                (msg_critical(TR("DO NOT CONFIRM"),
-                              TR("Root mode protection\n\n"
-                                 "This mode allows me to develop BOUML\n\n"
-                                 "do NOT confirm to avoid a disaster !!!\n\n"
-                                 "confirm ?"),
-                              QMessageBox::Yes, QMessageBox::No)
-                 == QMessageBox::Yes)) {
-                set_user_id(0);
-                set_editor(getenv("BOUML_EDITOR")); // no environment file
-                argc = 1;
-            }
-
-            uw->load_it(argv[1]);
-        }
-        catch (...) {
-            // cannot read a file
-            return -1;
-        }
-    }
-
-    theApp->connect(theApp, SIGNAL(lastWindowClosed()), theApp, SLOT(quit()));
-
-    try {
-        if (argc > 2) {
-            if (exec) {
-                bool with_exit = FALSE;
-
-                if (!strcmp(argv[argc - 1], "-exit")) {
-                    with_exit = TRUE;
-                    argc -= 1;
-                }
-
-                Q3CString cmd = argv[3];
-                Q3CString space = " ";
-                int index;
-
-                for (index = 4; index != argc; index += 1)
-                    cmd += space + Q3CString(argv[index]);
-
-                ToolCom::run((const char *) cmd, BrowserView::get_project(), with_exit);
-            }
-            else
-                msg_warning(TR("Error"), TR("Bouml was called with wrong parameters, ignore them"));
-        }
-
-
-        ExitOnError = TRUE;
-        theApp->exec();
-    }
-    catch (...) {
-        ;
-    }
-
-    return exit_value();
-}
diff --git a/plugouts/FileControl/cpp_includes b/plugouts/FileControl/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/FileControl/cpp_includes
+++ b/plugouts/FileControl/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/GlobalChange/cpp_includes b/plugouts/GlobalChange/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/GlobalChange/cpp_includes
+++ b/plugouts/GlobalChange/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/cpp_utilities/128002 b/plugouts/cpp_utilities/128002
index 0fff90513..65554c716 100644
--- a/plugouts/cpp_utilities/128002
+++ b/plugouts/cpp_utilities/128002
@@ -1,7 +1,7 @@
 format 75
 "IHM" // IHM
-  revision 4
-  modified_by 2 "pages4"
+  revision 5
+  modified_by 2 "C:/Users/habip"
   // class settings
   //class diagram settings
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
@@ -26,6 +26,47 @@ format 75
   package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
   show_infonote default drawing_language default show_stereotype_properties default
   
+  deploymentview 128002 "Deployment view"
+    //deployment diagram settings
+    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+    artifact 132738 "ConstrDestrCopyDialog"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+#include \"qdialog.h\"
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+#ifdef WIN32
+#include <stdlib.h>
+#endif
+${includes}
+#include <QList>
+#include <qhgroupbox.h> 
+#include <qpushbutton.h>
+#include <qlayout.h>
+#include <qlabel.h>
+#include <qhbox.h>
+#include <qvbox.h> 
+#include <qdir.h>
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 132738 // ConstrDestrCopyDialog
+	class_ref 159106 // typedef1
+      end
+    end
+  end
+
   classview 128002 "Class view"
     //class diagram settings
     draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
@@ -45,7 +86,7 @@ format 75
     associated_deployment_view deploymentview_ref 128002 // Deployment view
     class 132738 "ConstrDestrCopyDialog"
       visibility package 
-      cpp_decl "${comment}${template}class ${name} : public QDialog {
+      cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
 ${inlines}
@@ -70,8 +111,9 @@ ${members}}
       end
 
       operation 144386 "ConstrDestrCopyDialog"
-	public explicit_return_type ""
+	preserve_cpp_body_indent public explicit_return_type ""
 	nparams 7
+	
 	  param inout name "cl" type class_ref 7169 // UmlClass
 	  param in name "have_constructor" explicit_type "bool"
 	  param in name "have_destructor" explicit_type "bool"
@@ -79,15 +121,11 @@ ${members}}
 	  param in name "have_const_copy" explicit_type "bool"
 	  param in name "have_assignment" explicit_type "bool"
 	  param in name "have_const_assignment" explicit_type "bool"
-	cpp_decl "    ${comment}${name}${(}${t0} * ${p0}, ${t1} ${p1}, ${t2} ${p2},
-                      ${t3} ${p3}, ${t4} ${p4},
-                      ${t5} ${p5}, ${t6} ${p6}${)}${volatile};
-"
-	cpp_def "${inline}${class}::${name}${(}${t0} * ${p0}, ${t1} ${p1},
-                                  ${t2} ${p2}, ${t3} ${p3},
-                                  ${t4} ${p4}, ${t5} ${p5},
-                                  ${t6} ${p6}${)}${volatile}
-   : QDialog(0, 0, TRUE), target(cl) {
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, ${t1} ${p1}${v1}, ${t2} ${p2}${v2}, ${t3} ${p3}${v3}, ${t4} ${p4}${v4}, ${t5} ${p5}${v5}, ${t6} ${p6}${v6}${)}${volatile}${throw};
+"
+	cpp_def "${inline}${class}::${name}${(}${t0} * ${p0}, ${t1} ${p1}, ${t2} ${p2}, ${t3} ${p3}, ${t4} ${p4}, ${t5} ${p5}, ${t6} ${p6}${)}
+    : QDialog(0), target(cl)
+${throw}{
 ${body}}
 "
 	java_def "  ${comment}${visibility}${final}${synchronized}${name}${(}${)}${throws} {
@@ -109,11 +147,12 @@ ${body}}
       end
 
       operation 247682 "polish"
-	cpp_virtual protected explicit_return_type "void"
+	preserve_cpp_body_indent protected explicit_return_type "void"
 	nparams 0
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
 "
-	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}{
+	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
 ${body}}
 "
 	
@@ -123,11 +162,12 @@ ${body}}
       end
 
       operation 144514 "accept"
-	public explicit_return_type "void"
+	preserve_cpp_body_indent public explicit_return_type "void"
 	nparams 0
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
 "
-	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}{
+	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
 ${body}}
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
@@ -138,16 +178,33 @@ ${body}}
 	
       end
 
-      attribute 128002 "target"
-	protected type class_ref 7169 // UmlClass
-	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+      extra_member 134658 "Q_OBJECT"
+	
+	cpp "  Q_OBJECT" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      extra_member 134786 "slots"
+	
+	cpp "  public slots:" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      classrelation 174594 // target (<unidirectional association>)
+	relation 174594 ---> name "<unidirectional association>"
+	  a role_name "target" protected
+	    comment "the class on which the plug-out is applied
 "
-	java_decl "  ${comment}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
 "
-	php_decl ""
-	python_decl ""
-	idl_decl ""
-	comment "the class on which the plug-out is applied"
+	    classrelation_ref 174594 // target (<unidirectional association>)
+	  b parent class_ref 7169 // UmlClass
       end
 
       attribute 128130 "add_constr"
@@ -248,46 +305,26 @@ ${body}}
 	idl_decl ""
 	comment "checkbox to add operator = (const param)"
       end
-    end
-  end
 
-  deploymentview 128002 "Deployment view"
-    //deployment diagram settings
-    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
-    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
-    artifact 132738 "ConstrDestrCopyDialog"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+      classrelation 174466 // (<generalisation>)
+	relation 174466 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 174466 // (<generalisation>)
+	  b parent class_ref 159106 // typedef1
+      end
+    end
 
-${comment}
-${includes}
-#include \"qdialog.h\"
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+    class 159106 "typedef1"
+      visibility package stereotype "typedef" explicit_base_type "QDialog"
+      cpp_decl "${comment}typedef ${type} ${name};
 "
-      cpp_src "${comment}
-#ifdef WIN32
-#include <stdlib.h>
-#endif
-${includes}
-#include <qlist.h>
-#include <qhgroupbox.h> 
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qhbox.h>
-#include <qvbox.h> 
-#include <qdir.h>
-${namespace_start}
-${members}
-${namespace_end}"
-      associated_classes
-	class_ref 132738 // ConstrDestrCopyDialog
-      end
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
     end
   end
 end
diff --git a/plugouts/cpp_utilities/129.diagram b/plugouts/cpp_utilities/129.diagram
index c2c46fa1e..2e3107211 100644
--- a/plugouts/cpp_utilities/129.diagram
+++ b/plugouts/cpp_utilities/129.diagram
@@ -1,92 +1,95 @@
-format 10
+format 75
 
-note 128 "Do not modify the blue classes"
-  xyzwh 19 19 2000 109 76
-classcanvas 256 class_ref 3200 // UmlBaseItem
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
-  color blue
-  xyz 245 17 2000
-classcanvas 384 class_ref 8833 // UmlItem
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
-  xyz 263 90 2000
-classcanvas 512 class_ref 9217 // UmlPackage
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
-  xyz 29 200 2000
-classcanvas 640 class_ref 9985 // UmlUseCaseView
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
-  xyz 64 324 2000
-classcanvas 768 class_ref 8449 // UmlDeploymentView
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
-  xyz 443 193 2000
-classcanvas 896 class_ref 8065 // UmlComponentView
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
-  xyz 390 319 2000
-classcanvas 1024 class_ref 7681 // UmlClassView
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
-  xyz 243 275 2000
-classcanvas 1152 class_ref 4352 // UmlBaseUseCaseView
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
+classcanvas 1664 class_ref 3584 // UmlBasePackage
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
   color blue
-  xyz 50 255 2000
-classcanvas 1280 class_ref 2688 // UmlBaseDeploymentView
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
+  xyz 16 134 0
+end
+classcanvas 1536 class_ref 1920 // UmlBaseClassView
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
   color blue
-  xyz 426 126 2000
+  xyz 228 202 0
+end
 classcanvas 1408 class_ref 2432 // UmlBaseComponentView
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
   color blue
-  xyz 375 251 2000
-classcanvas 1536 class_ref 1920 // UmlBaseClassView
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
+  xyz 375 251 0
+end
+classcanvas 1280 class_ref 2688 // UmlBaseDeploymentView
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
   color blue
-  xyz 228 202 2000
-classcanvas 1664 class_ref 3584 // UmlBasePackage
-  draw_all_relations default hide_attributes default hide_operations default show_full_members_definition default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default
+  xyz 426 126 0
+end
+classcanvas 1152 class_ref 4352 // UmlBaseUseCaseView
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
   color blue
-  xyz 16 134 2000
-relationcanvas 1792 relation_ref 16641 // <generalisation>
-  from ref 384 z 1000 to ref 256
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-relationcanvas 1920 relation_ref 17025 // <generalisation>
-  from ref 512 z 1000 to ref 1664
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-relationcanvas 2048 relation_ref 17793 // <generalisation>
-  from ref 640 z 1000 to ref 1152
+  xyz 50 255 0
+end
+classcanvas 1024 class_ref 7681 // UmlClassView
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
+  xyz 243 275 0
+end
+classcanvas 896 class_ref 8065 // UmlComponentView
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
+  xyz 390 319 0
+end
+classcanvas 768 class_ref 8449 // UmlDeploymentView
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
+  xyz 443 193 0
+end
+classcanvas 640 class_ref 9985 // UmlUseCaseView
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
+  xyz 64 324 0
+end
+classcanvas 512 class_ref 9217 // UmlPackage
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
+  xyz 29 200 0
+end
+classcanvas 384 class_ref 8833 // UmlItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
+  xyz 263 90 0
+end
+classcanvas 256 class_ref 3200 // UmlBaseItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers no show_relation_visibility no show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 245 17 0
+end
+note 128 "\"Do"
+  xyzwh 19 19 0 109 76
+relationcanvas 3968 relation_ref 15489 // <generalisation>
+  from ref 1024 z 1000 to ref 1536
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
-relationcanvas 2176 relation_ref 16257 // <generalisation>
-  from ref 768 z 1000 to ref 1280
+end
+relationcanvas 3328 relation_ref 11264 // <generalisation>
+  from ref 1664 z 1000 to ref 384
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
+end
 relationcanvas 2304 relation_ref 15873 // <generalisation>
   from ref 896 z 1000 to ref 1408
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
-relationcanvas 3200 relation_ref 6144 // <generalisation>
-  from ref 1280 z 1000 to ref 384
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-relationcanvas 3328 relation_ref 11264 // <generalisation>
-  from ref 1664 z 1000 to ref 384
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-relationcanvas 3456 relation_ref 4736 // <generalisation>
-  from ref 1536 z 1000 to ref 384
+end
+relationcanvas 2176 relation_ref 16257 // <generalisation>
+  from ref 768 z 1000 to ref 1280
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
-relationcanvas 3584 relation_ref 13184 // <generalisation>
-  from ref 1152 z 1000 to ref 384
+end
+relationcanvas 2048 relation_ref 17793 // <generalisation>
+  from ref 640 z 1000 to ref 1152
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
-relationcanvas 3712 relation_ref 5888 // <generalisation>
-  from ref 1408 z 1000 to ref 384
+end
+relationcanvas 1920 relation_ref 17025 // <generalisation>
+  from ref 512 z 1000 to ref 1664
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
-relationcanvas 3968 relation_ref 15489 // <generalisation>
-  from ref 1024 z 1000 to ref 1536
+end
+relationcanvas 1792 relation_ref 16641 // <generalisation>
+  from ref 384 z 1000 to ref 256
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
+end
 preferred_whz 642 427 1
-end
\ No newline at end of file
+end
diff --git a/plugouts/cpp_utilities/132738.bodies b/plugouts/cpp_utilities/132738.bodies
index 680610925..c2852937d 100644
--- a/plugouts/cpp_utilities/132738.bodies
+++ b/plugouts/cpp_utilities/132738.bodies
@@ -1,228 +1,222 @@
 class ConstrDestrCopyDialog
 !!!144386.cpp!!!	ConstrDestrCopyDialog(inout cl : UmlClass, in have_constructor : bool, in have_destructor : bool, in have_copy : bool, in have_const_copy : bool, in have_assignment : bool, in have_const_assignment : bool)
-  QVBoxLayout * vbox = new QVBoxLayout(this);
-  QHGroupBox * g;
-  QList<QLabel> labels;
-  QLabel * lbl;
-
-  vbox->setSpacing(5);
-  vbox->setMargin(5);
-  
-  lbl = new QLabel(QString("<big><b>C++ utilities for the class <i><tt>") + 
-		   (const char *) cl->name() + "</tt></i></b></big>",
-		   this);
-  lbl->setAlignment(AlignCenter);
-  vbox->addWidget(lbl);
-
-  // constructor
-  
-  g = new QHGroupBox(this);
-  vbox->addWidget(g);
-  
-  labels.append(new QLabel((have_constructor)
-			   ? "the class already have contructor  "
-			   : "the class doesn't have contructor  ",
-			   g));
-  
-  QHBox * h = new QHBox(g);
-    
-  add_constr = new QCheckBox("add constructor", h);
-  constr_explicit = new QCheckBox("explicit", h);
-  
-  // destructor
-  
-  if (! have_destructor) {
-    g = new QHGroupBox(this);
+    setModal(true);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    GridBox * g;
+    QList<QLabel*> labels;
+    QLabel * lbl;
+
+    vbox->setSpacing(5);
+    vbox->setMargin(5);
+
+    lbl = new QLabel(QString("<big><b>C++ utilities for the class <i><tt>") +
+                     (const char *) cl->name() + "</tt></i></b></big>",
+                     this);
+    lbl->setAlignment(Qt::AlignCenter);
+    vbox->addWidget(lbl);
+
+    // constructor
+
+    g = new GridBox(2, this);
     vbox->addWidget(g);
-  
-    labels.append(new QLabel("the class doesn't have destructor  ",
-			     g));
-    
-    h = new QHBox(g);
-    
-    add_destr = new QCheckBox("add destructor", h);
-    virtual_destr = new QCheckBox("virtual", h);
-  }
-  else
-    add_destr = 0;
-  
-  // copy contructor
-
-  if (have_copy) {
-    add_copy = 0;
-    if (!have_const_copy) {
-      g = new QHGroupBox(this);
-      vbox->addWidget(g);
-      
-      labels.append(new QLabel("the class doesn't have copy contructor  \nwith const argument  ",
-			       g));
-      add_const_copy = new QCheckBox("add copy constructor\nwith const argument",
-				     g);
+
+    labels.append(lbl = new QLabel((have_constructor)
+                             ? "the class already have contructor  "
+                             : "the class doesn't have contructor  ",
+                             g));
+    g->addWidget(lbl);
+
+    HHBox * h;
+    g->addWidget(h = new HHBox(g));
+
+    h->addWidget(add_constr = new QCheckBox("add constructor", h));
+    h->addWidget(constr_explicit = new QCheckBox("explicit", h));
+
+    // destructor
+
+    if (! have_destructor) {
+        g = new GridBox(2,this);
+        vbox->addWidget(g);
+
+        labels.append(lbl = new QLabel("the class doesn't have destructor  ",
+                                 g));
+        g->addWidget(lbl);
+
+        h = new HHBox(g);
+        g->addWidget(h);
+
+        h->addWidget(add_destr = new QCheckBox("add destructor", h));
+        h->addWidget(virtual_destr = new QCheckBox("virtual", h));
     }
     else
-      add_const_copy = 0;
-  }
-  else if (!have_const_copy) {
-    g = new QHGroupBox(this);
-    vbox->addWidget(g);
-    
-    labels.append(new QLabel("the class doesn't have copy contructor  ",
-			     g));
-    
-    QVBox * v = new QVBox(g);
-    
-    add_const_copy = new QCheckBox("add copy constructor\nwith const argument",
-				   v);      
-    add_copy = new QCheckBox("add copy constructor\nwith non const argument",
-			     v);
-  }
-  else {
-    g = new QHGroupBox(this);
-    vbox->addWidget(g);
-    
-    labels.append(new QLabel("the class doesn't have copy contructor  \nwith non const argument  ",
-			     g));
-    add_copy = new QCheckBox("add copy constructor\nwith non const argument",
-			     g);
-    add_const_copy = 0;
-  }
-
-  // assignment
-
-  if (have_assignment) {
-    add_assign = 0;
-    if (!have_const_assignment) {
-      g = new QHGroupBox(this);
-      vbox->addWidget(g);
-    
-      labels.append(new QLabel("the class doesn't have assignment\noperator with const argument  ",
-			       g));
-      add_const_assign = new QCheckBox("add assignment\nwith const argument",
-				       g);
+        add_destr = 0;
+
+    // copy contructor
+
+    if (have_copy) {
+        add_copy = 0;
+
+        if (!have_const_copy) {
+            g = new GridBox(2, this);
+            vbox->addWidget(g);
+
+            labels.append(lbl = new QLabel("the class doesn't have copy contructor  \nwith const argument  ",
+                                     g));
+            g->addWidget(lbl);
+            g->addWidget(add_const_copy = new QCheckBox("add copy constructor\nwith const argument",
+                                           g));
+        }
+        else
+            add_const_copy = 0;
     }
-    else
-      add_const_assign = 0;
-  }
-  else if (!have_const_assignment) {
-    g = new QHGroupBox(this);
-    vbox->addWidget(g);
-    
-    labels.append(new QLabel("the class doesn't have assignment operator  ", g));
-    
-    QVBox * v = new QVBox(g);
-    
-    add_const_assign = new QCheckBox("add assignment\nwith const argument",
-				     v);      
-    add_assign = new QCheckBox("add assignment\nwith non const argument",
-			       v);
-  }
-  else {
-    g = new QHGroupBox(this);
-    vbox->addWidget(g);
-    
-    labels.append(new QLabel("the class doesn't have assignment operator  \nwith non const argument  ",
-			     g));
-    add_assign = new QCheckBox("add assignment\nwith non const argument",
-			       g);
-    add_const_assign = 0;
-  }
-
-  // use the same width for all the labels on the first column
-
-  QSize sz(labels.first()->sizeHint());
-  
-  while ((lbl = labels.next()) != 0) {
-    if (lbl->sizeHint().width() > sz.width())
-      sz.setWidth(lbl->sizeHint().width());
-  }
-
-  for (lbl = labels.first(); lbl != 0; lbl = labels.next()) {
-    sz.setHeight(lbl->sizeHint().height());
-    lbl->setFixedSize(sz);
-  }
-    
-  // ok & cancel buttons
-  
-  QHBox * hbox = new QHBox(this);
-  
-  vbox->addWidget(hbox);
-  
-  QPushButton * ok = new QPushButton("&OK", hbox);
-  QPushButton * cancel = new QPushButton("&Cancel", hbox);
-
-  QSize bs(cancel->sizeHint());
-  
-  ok->setDefault(TRUE);
-  
-  ok->setFixedSize(bs);
-  cancel->setFixedSize(bs);
-  
-  connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
-  connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
-!!!144514.cpp!!!	accept() : void
-  if (add_constr->isChecked())
-    target->addContructor(constr_explicit->isChecked());
-    
-  if ((add_destr != 0) && add_destr->isChecked())
-    target->addDestructor(virtual_destr->isChecked());
+    else if (!have_const_copy) {
+        g = new GridBox(2, this);
+        vbox->addWidget(g);
 
-  if ((add_copy != 0) && add_copy->isChecked())
-    target->addCopy(FALSE);
+        labels.append(lbl = new QLabel("the class doesn't have copy contructor  ",
+                                 g));
+        g->addWidget(lbl);
 
-  if ((add_const_copy != 0) && add_const_copy->isChecked())
-    target->addCopy(TRUE);
+        VVBox * v = new VVBox(g);
+        g->addWidget(v);
+        v->addWidget(add_const_copy = new QCheckBox("add copy constructor\nwith const argument",
+                                       v));
+        v->addWidget(add_copy = new QCheckBox("add copy constructor\nwith non const argument",
+                                 v));
+    }
+    else {
+        g = new GridBox(2,this);
+        vbox->addWidget(g);
 
-    if ((add_assign != 0) && add_assign->isChecked())
-    target->addAssign(FALSE);
+        labels.append(lbl = new QLabel("the class doesn't have copy contructor  \nwith non const argument  ",
+                                 g));
+        g->addWidget(lbl);
+        g->addWidget(add_copy = new QCheckBox("add copy constructor\nwith non const argument",
+                                 g));
+        add_const_copy = 0;
+    }
 
-  if ((add_const_assign != 0) && add_const_assign->isChecked())
-    target->addAssign(TRUE);
-    
-  QDialog::accept();
-!!!247682.cpp!!!	polish() : void
-  QDialog::polish();
-  
-  // try to read .doumlrc
-  // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-  // if the path contains non latin1 characters, for instance cyrillic !
-  QString s = QDir::home().absFilePath(".doumlrc");
-  FILE * fp = fopen((const char *) s, "r");
-
-#ifdef WIN32
-  if (fp == 0) {
-    QString hd = getenv("USERPROFILE");
-    
-    if (! hd.isEmpty()) {
-      QDir d(hd);
-      QString s2 = d.absFilePath(".doumlrc");
-      
-      fp = fopen((const char *) s2, "r");
+    // assignment
+
+    if (have_assignment) {
+        add_assign = 0;
+
+        if (!have_const_assignment) {
+            g = new GridBox(2, this);
+            vbox->addWidget(g);
+
+            labels.append(lbl = new QLabel("the class doesn't have assignment\noperator with const argument  ",
+                                     g));
+            g->addWidget(lbl);
+            g->addWidget(add_const_assign = new QCheckBox("add assignment\nwith const argument",
+                                             g));
+        }
+        else
+            add_const_assign = 0;
+    }
+    else if (!have_const_assignment) {
+        g = new GridBox(2, this);
+        vbox->addWidget(g);
+
+        labels.append(lbl = new QLabel("the class doesn't have assignment operator  ", g));
+
+        g->addWidget(lbl);
+        VVBox * v = new VVBox(g);
+        g->addWidget(v);
+
+        v->addWidget(add_const_assign = new QCheckBox("add assignment\nwith const argument",
+                                         v));
+        v->addWidget(add_assign = new QCheckBox("add assignment\nwith non const argument",
+                                   v));
+    }
+    else {
+        g = new GridBox(2,this);
+        vbox->addWidget(g);
+
+        labels.append(lbl = new QLabel("the class doesn't have assignment operator  \nwith non const argument  ",
+                                 g));
+        g->addWidget(lbl);
+        g->addWidget(add_assign = new QCheckBox("add assignment\nwith non const argument",
+                                   g));
+        add_const_assign = 0;
     }
-  }
-#endif
-  
-  if (fp != 0) {
-    char line[512];
-      
-    while (fgets(line, sizeof(line) - 1, fp) != 0) {
-      if (!strncmp(line, "DESKTOP ", 8)) {
-	int l, t, r, b;
-	
-	if (sscanf(line+8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-	  if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-	      !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-	      !((r <= l) || (b <= t))) {
-	    int cx = (r + l) /2;
-	    int cy = (t + b) / 2;
-	    
-	    move(x() + cx - (x() + width() / 2), 
-		 y() + cy - (y() + height() / 2));
-	  }
-	}
-	  
-	break;
+
+    // use the same width for all the labels on the first column
+
+    QSize sz(labels.first()->sizeHint());
+
+    foreach (lbl,labels) {
+        if (lbl->sizeHint().width() > sz.width())
+            sz.setWidth(lbl->sizeHint().width());
+    }
+
+    foreach (lbl,labels) {
+        sz.setHeight(lbl->sizeHint().height());
+        lbl->setFixedSize(sz);
+    }
+
+    // ok & cancel buttons
+
+    HHBox * hbox = new HHBox(this);
+
+    vbox->addWidget(hbox);
+
+    QPushButton * ok = new QPushButton("&OK", hbox);
+    QPushButton * cancel = new QPushButton("&Cancel", hbox);
+    hbox->addWidget(ok);
+    hbox->addWidget(cancel);
+
+    QSize bs(cancel->sizeHint());
+
+    ok->setDefault(TRUE);
+
+    ok->setFixedSize(bs);
+    cancel->setFixedSize(bs);
+
+    connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
+!!!247682.cpp!!!	polish() : void
+    QDialog::ensurePolished();
+
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        int cx = (r + l) / 2;
+        int cy = (t + b) / 2;
+
+        move(x() + cx - (x() + width() / 2), y() + cy - (y() + height() / 2));
       }
     }
-    
-    fclose(fp);
-  }
+!!!144514.cpp!!!	accept() : void
+    QLOG_INFO() << "Adding constructor";
+    if (add_constr->isChecked())
+        target->addContructor(constr_explicit->isChecked());
+    QLOG_INFO() << "Adding destructor";
+    if ((add_destr != 0) && add_destr->isChecked())
+        target->addDestructor(virtual_destr->isChecked());
+    QLOG_INFO() << "Adding copy constructor";
+    if ((add_copy != 0) && add_copy->isChecked())
+        target->addCopy(FALSE);
+    QLOG_INFO() << "Adding const copy constructor";
+    if ((add_const_copy != 0) && add_const_copy->isChecked())
+        target->addCopy(TRUE);
+    QLOG_INFO() << "Adding assign operator";
+    if ((add_assign != 0) && add_assign->isChecked())
+        target->addAssign(FALSE);
+    QLOG_INFO() << "Adding const assign operator";
+    if ((add_const_assign != 0) && add_const_assign->isChecked())
+        target->addAssign(TRUE);
+
+    QLOG_INFO() << "Accepting";
+    QDialog::accept();
diff --git a/plugouts/cpp_utilities/135682 b/plugouts/cpp_utilities/135682
new file mode 100644
index 000000000..299fb5299
--- /dev/null
+++ b/plugouts/cpp_utilities/135682
@@ -0,0 +1,900 @@
+format 75
+"Logging" // Logging
+  revision 1
+  modified_by 2 "C:/Users/habip"
+  // class settings
+  //class diagram settings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  //use case diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default
+  //sequence diagram settings
+  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+  //collaboration diagram settings
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
+  //object diagram settings
+   write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+  //component diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  //deployment diagram settings
+  package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  //state diagram settings
+  package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+  show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+  //activity diagram settings
+  package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+  show_infonote default drawing_language default show_stereotype_properties default
+  
+  cpp_h_dir "Logging/"
+  cpp_src_dir "Logging/"
+  cpp_namespace "QsLogging"
+  classview 135810 "Logging"
+    //class diagram settings
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+    //state diagram settings
+    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+    show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+    //class settings
+    //activity diagram settings
+    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+    show_infonote default drawing_language default show_stereotype_properties default
+    class 158210 "QsDebugOutput"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 256002 "output"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "message" explicit_type "QString"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+    end
+
+    class 158338 "Level"
+      visibility package stereotype "enum"
+      cpp_decl "${comment}enum ${name} {
+${items}
+};
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      attribute 137218 "HaltingLevel"
+	public type class_ref 158338 // Level
+	init_value " 0"
+	cpp_decl "  ${name}${value},${comment}"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 137346 "TrivialLevel"
+	public type class_ref 158338 // Level
+	cpp_decl "  ${name}${value},${comment}"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 137474 "TraceLevel"
+	public type class_ref 158338 // Level
+	cpp_decl "  ${name}${value},${comment}"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 137602 "DebugLevel"
+	public type class_ref 158338 // Level
+	cpp_decl "  ${name}${value},${comment}"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 137730 "InfoLevel"
+	public type class_ref 158338 // Level
+	cpp_decl "  ${name}${value},${comment}"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 137858 "WarnLevel"
+	public type class_ref 158338 // Level
+	cpp_decl "  ${name}${value},${comment}"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 137986 "ErrorLevel"
+	public type class_ref 158338 // Level
+	cpp_decl "  ${name}${value},${comment}"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 138114 "FatalLevel"
+	public type class_ref 158338 // Level
+	cpp_decl "  ${name}${value},${comment}"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+    end
+
+    class 158466 "Destination"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 257794 "~Destination"
+	cpp_inline public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${virtual}${name}${(}${)}${volatile}${throw} {};
+"
+	
+	
+	
+	
+      end
+
+      operation 257922 "write"
+	abstract public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "message" explicit_type "QString"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+    end
+
+    class 158594 "DestinationList"
+      visibility package stereotype "typedef" base_type class_ref 158466 // Destination
+      cpp_decl "${comment}typedef QList<${type}*> ${name};
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 175490 // (<dependency>)
+	relation 175490 -_-> name "<dependency>"
+	  a default
+	    cpp default "#include in source"
+	    classrelation_ref 175490 // (<dependency>)
+	  b parent class_ref 158466 // Destination
+      end
+
+      classrelation 176258 // (<dependency>)
+	relation 176258 -_-> name "<dependency>"
+	  a default
+	    cpp default "#include in source"
+	    classrelation_ref 176258 // (<dependency>)
+	  b parent class_ref 158466 // Destination
+      end
+    end
+
+    class 158722 "LoggerImpl"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 258562 "LoggerImpl"
+	cpp_inline public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${name}${(}${)}${volatile}${throw} :
+        level(InfoLevel) {
+
+    };
+"
+	
+	
+	
+	
+      end
+
+      attribute 138754 "logMutex"
+	public explicit_type "QMutex"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      classrelation 175618 // level (<directional composition>)
+	relation 175618 *--> name "<directional composition>"
+	  a role_name "level" public
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	    classrelation_ref 175618 // level (<directional composition>)
+	  b parent class_ref 158338 // Level
+      end
+
+      classrelation 175746 // destList (<directional composition>)
+	relation 175746 *--> name "<directional composition>"
+	  a role_name "destList" public
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	    classrelation_ref 175746 // destList (<directional composition>)
+	  b parent class_ref 158594 // DestinationList
+      end
+    end
+
+    class 158850 "FileDestination"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      comment "! file message sink"
+      classrelation 175874 // (<generalisation>)
+	relation 175874 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 175874 // (<generalisation>)
+	  b parent class_ref 158466 // Destination
+      end
+
+      attribute 138882 "mFile"
+	private explicit_type "QFile"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 139010 "mOutputStream"
+	private explicit_type "QTextStream"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      operation 258690 "FileDestination"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 1
+	
+	  param in name "filePath" explicit_type "QString"
+	cpp_decl "    ${comment}${inline}${name}${(}const ${t0} & ${p0}${v0}${)}${volatile}${throw};
+"
+	cpp_def "${inline}${class}::${name}${(}const ${t0} & ${p0}${)}${throw}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 258818 "write"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "message" explicit_type "QString"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+    end
+
+    class 158978 "DebugOutputDestination"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      comment "! debugger sink"
+      classrelation 176002 // (<generalisation>)
+	relation 176002 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 176002 // (<generalisation>)
+	  b parent class_ref 158466 // Destination
+      end
+
+      operation 258946 "write"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "message" explicit_type "QString"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+    end
+
+    class 159874 "Logger"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 256130 "instance"
+	cpp_inline public return_type class_ref 159874 // Logger
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} & ${name}${(}${)}${const}${volatile}${throw}${abstract} {
+        static Logger staticLog;
+        return staticLog;
+    };
+"
+	
+	
+	
+	
+      end
+
+      operation 256258 "addDestination"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "destination" type class_ref 158466 // Destination
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} * ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+	comment "! Adds a log message destination. Don't add null destinations."
+      end
+
+      operation 256386 "setLoggingLevel"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "newLevel" type class_ref 158338 // Level
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+	comment "! Logging at a level < 'newLevel' will be ignored"
+      end
+
+      operation 256514 "loggingLevel"
+	preserve_cpp_body_indent const public return_type class_ref 158338 // Level
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+	comment "! The default level is INFO"
+      end
+
+      operation 257154 "Logger"
+	preserve_cpp_body_indent private explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${name}${(}${)}${volatile}${throw};
+"
+	cpp_def "${inline}${class}::${name}${(}${)} :
+    d(new LoggerImpl)
+${throw}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 257282 "Logger"
+	private explicit_return_type ""
+	nparams 1
+	
+	  param in name "" type class_ref 159874 // Logger
+	cpp_decl "    ${comment}${inline}${name}${(}const ${t0} & ${p0}${v0}${)}${volatile}${throw};
+"
+	cpp_def "${inline}${class}::${name}${(}const ${t0} & ${p0}${)}${throw}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 257410 "operator ="
+	private return_type class_ref 159874 // Logger
+	nparams 1
+	
+	  param in name "" type class_ref 159874 // Logger
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} & ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} & ${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 257538 "~Logger"
+	preserve_cpp_body_indent private explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${virtual}${name}${(}${)}${volatile}${throw};
+"
+	cpp_def "${inline}${class}::${name}${(}${)}${throw}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 257666 "write"
+	preserve_cpp_body_indent private explicit_return_type "void"
+	nparams 1
+	
+	  param in name "message" explicit_type "QString"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "//! sends the message to all the destinations
+
+${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      class 160002 "Helper"
+	visibility package 
+	cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+	java_decl ""
+	php_decl ""
+	python_2_2 python_decl ""
+	idl_decl ""
+	explicit_switch_type ""
+	
+	operation 256642 "Helper"
+	  cpp_inline public explicit_return_type ""
+	  nparams 1
+	  
+	    param in name "logLevel" type class_ref 158338 // Level
+	  cpp_decl "    ${comment}${inline}${name}${(}${t0} ${p0}${v0}${)}${volatile}${throw} :
+            level(logLevel),
+            qtDebug(&buffer) {};
+"
+	  
+	  
+	  
+	  
+	end
+
+	operation 256770 "~Helper"
+	  preserve_cpp_body_indent public explicit_return_type ""
+	  nparams 0
+	  
+	  cpp_decl "    ${comment}${inline}${virtual}${name}${(}${)}${volatile}${throw};
+"
+	  cpp_def "${inline}${class}::${name}${(}${)}${throw}{
+${body}}
+"
+	  
+	  
+	  
+	  
+	end
+
+	operation 256898 "stream"
+	  cpp_inline public explicit_return_type "QDebug"
+	  nparams 0
+	  
+	  cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} & ${name}${(}${)}${const}${volatile}${throw}${abstract} {
+            return qtDebug;
+        };
+"
+	  
+	  
+	  
+	  
+	end
+
+	operation 257026 "writeToLog"
+	  preserve_cpp_body_indent private explicit_return_type "void"
+	  nparams 0
+	  
+	  cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+	  cpp_def "//! creates the complete log message and passes it to the logger
+
+${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	  
+	  
+	  
+	  
+	end
+
+	classrelation 175106 // level (<directional composition>)
+	  relation 175106 *--> name "<directional composition>"
+	    a role_name "level" private
+	      cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	      classrelation_ref 175106 // level (<directional composition>)
+	    b parent class_ref 158338 // Level
+	end
+
+	attribute 138242 "buffer"
+	  private explicit_type "QString"
+	  cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	  java_decl ""
+	  php_decl ""
+	  python_decl ""
+	  idl_decl ""
+	end
+
+	attribute 138370 "qtDebug"
+	  private explicit_type "QDebug"
+	  cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	  java_decl ""
+	  php_decl ""
+	  python_decl ""
+	  idl_decl ""
+	end
+      end
+
+      classrelation 175234 // d (<unidirectional association>)
+	relation 175234 ---> name "<unidirectional association>"
+	  a role_name "d" private
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+	    classrelation_ref 175234 // d (<unidirectional association>)
+	  b parent class_ref 158722 // LoggerImpl
+      end
+    end
+
+    class 160130 "DestinationPtr"
+      visibility package stereotype "typedef" base_type class_ref 158466 // Destination
+      cpp_decl "${comment}typedef std::auto_ptr<${type}> ${name};
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 175362 // (<dependency>)
+	relation 175362 -_-> name "<dependency>"
+	  a default
+	    cpp default "#include in source"
+	    classrelation_ref 175362 // (<dependency>)
+	  b parent class_ref 158466 // Destination
+      end
+
+      classrelation 176130 // (<dependency>)
+	relation 176130 -_-> name "<dependency>"
+	  a default
+	    cpp default "#include in source"
+	    classrelation_ref 176130 // (<dependency>)
+	  b parent class_ref 158466 // Destination
+      end
+    end
+
+    class 160258 "DestinationFactory"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      comment "! Creates logging destinations/sinks. The caller will have ownership of
+! the newly created destinations."
+      operation 258050 "MakeFileDestination"
+	preserve_cpp_body_indent public return_type class_ref 160130 // DestinationPtr
+	nparams 1
+	
+	  param in name "filePath" explicit_type "QString"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 258178 "MakeDebugOutputDestination"
+	preserve_cpp_body_indent public return_type class_ref 160130 // DestinationPtr
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+    end
+  end
+
+  package_ref 135810 // Logging
+
+  deploymentview 135938 "Logging"
+    //deployment diagram settings
+    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+    artifact 151938 "QsLog"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 158338 // Level
+	class_ref 159874 // Logger
+      end
+    end
+
+    artifact 152066 "QsLogDest"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 158466 // Destination
+	class_ref 160130 // DestinationPtr
+	class_ref 160258 // DestinationFactory
+      end
+    end
+
+    artifact 152450 "DestinationList"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 158594 // DestinationList
+      end
+    end
+
+    artifact 152578 "LoggerImpl"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 158722 // LoggerImpl
+      end
+    end
+
+    artifact 152706 "FileDestination"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 158850 // FileDestination
+      end
+    end
+
+    artifact 152834 "DebugOutputDestination"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 158978 // DebugOutputDestination
+      end
+    end
+  end
+end
diff --git a/plugouts/cpp_utilities/135810 b/plugouts/cpp_utilities/135810
new file mode 100644
index 000000000..b39e9f541
--- /dev/null
+++ b/plugouts/cpp_utilities/135810
@@ -0,0 +1,58 @@
+format 75
+"Logging" // Logging::Logging
+  revision 1
+  modified_by 2 "C:/Users/habip"
+  // class settings
+  //class diagram settings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  //use case diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default
+  //sequence diagram settings
+  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+  //collaboration diagram settings
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
+  //object diagram settings
+   write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+  //component diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  //deployment diagram settings
+  package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  //state diagram settings
+  package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+  show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+  //activity diagram settings
+  package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+  show_infonote default drawing_language default show_stereotype_properties default
+  
+  cpp_h_dir "Logging/"
+  cpp_src_dir "Logging/"
+  deploymentview 135810 "Logging"
+    //deployment diagram settings
+    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+    artifact 151810 "QsDebugOutput"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 158210 // QsDebugOutput
+      end
+    end
+  end
+end
diff --git a/plugouts/cpp_utilities/158210.bodies b/plugouts/cpp_utilities/158210.bodies
new file mode 100644
index 000000000..9d4b5c378
--- /dev/null
+++ b/plugouts/cpp_utilities/158210.bodies
@@ -0,0 +1,4 @@
+class QsDebugOutput
+!!!256002.cpp!!!	output(in message : QString) : void
+    fprintf(stderr, "%s\n", qPrintable(message));
+    fflush(stderr);
diff --git a/plugouts/cpp_utilities/158850.bodies b/plugouts/cpp_utilities/158850.bodies
new file mode 100644
index 000000000..344f7b23e
--- /dev/null
+++ b/plugouts/cpp_utilities/158850.bodies
@@ -0,0 +1,8 @@
+class FileDestination
+!!!258690.cpp!!!	FileDestination(in filePath : QString)
+    mFile.setFileName(filePath);
+    mFile.open(QFile::WriteOnly | QFile::Text);
+    mOutputStream.setDevice(&mFile);
+!!!258818.cpp!!!	write(in message : QString) : void
+    mOutputStream << message << endl;
+    mOutputStream.flush();
diff --git a/plugouts/cpp_utilities/158978.bodies b/plugouts/cpp_utilities/158978.bodies
new file mode 100644
index 000000000..a248a457c
--- /dev/null
+++ b/plugouts/cpp_utilities/158978.bodies
@@ -0,0 +1,3 @@
+class DebugOutputDestination
+!!!258946.cpp!!!	write(in message : QString) : void
+    QsDebugOutput::output(message);
diff --git a/plugouts/cpp_utilities/159234.bodies b/plugouts/cpp_utilities/159234.bodies
new file mode 100644
index 000000000..b3ffe4ff0
--- /dev/null
+++ b/plugouts/cpp_utilities/159234.bodies
@@ -0,0 +1,26 @@
+class GridBox
+!!!254210.cpp!!!	GridBox(in n : int, inout parent : QWidget = 0, in name : QString = QString())
+
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(0);
+    setMargin(0);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+!!!254338.cpp!!!	setMargin(in mar : int) : void
+
+    m_layout->setMargin(mar);
+!!!254466.cpp!!!	setSpacing(in spacing : int) : void
+
+    m_layout->setSpacing(spacing);
+!!!254594.cpp!!!	addWidget(inout widget : QWidget) : void
+
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+!!!254722.cpp!!!	name(in name : QString = QString()) : QString
+
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
diff --git a/plugouts/cpp_utilities/159490.bodies b/plugouts/cpp_utilities/159490.bodies
new file mode 100644
index 000000000..65b0f9b74
--- /dev/null
+++ b/plugouts/cpp_utilities/159490.bodies
@@ -0,0 +1,20 @@
+class HHBox
+!!!254850.cpp!!!	HHBox(inout parent : QWidget = 0, in name : QString = QString())
+
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+    setObjectName(name);
+!!!254978.cpp!!!	addWidget(inout widget : QWidget) : void
+
+    m_layout->addWidget(widget);
+!!!255106.cpp!!!	setStretchFactor(inout w : QWidget, in stretch : int) : bool
+
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+!!!255234.cpp!!!	setMargin(in margin : int) : void
+
+    m_layout->setMargin(margin);
diff --git a/plugouts/cpp_utilities/159746.bodies b/plugouts/cpp_utilities/159746.bodies
new file mode 100644
index 000000000..360795398
--- /dev/null
+++ b/plugouts/cpp_utilities/159746.bodies
@@ -0,0 +1,18 @@
+class VVBox
+!!!255490.cpp!!!	VVBox(inout parent : QWidget = 0)
+
+    m_layout = new QVBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+!!!255618.cpp!!!	addWidget(inout widget : QWidget) : void
+
+    m_layout->addWidget(widget);
+!!!255746.cpp!!!	setStretchFactor(inout w : QWidget, in stretch : int) : bool
+
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+!!!255874.cpp!!!	setMargin(in margin : int) : void
+
+    m_layout->setMargin(margin);
diff --git a/plugouts/cpp_utilities/159874.bodies b/plugouts/cpp_utilities/159874.bodies
new file mode 100644
index 000000000..550fe8e51
--- /dev/null
+++ b/plugouts/cpp_utilities/159874.bodies
@@ -0,0 +1,20 @@
+class Logger
+!!!256258.cpp!!!	addDestination(inout destination : Destination) : void
+    assert(destination);
+    d->destList.push_back(destination);
+!!!256386.cpp!!!	setLoggingLevel(in newLevel : Level) : void
+    d->level = newLevel;
+!!!256514.cpp!!!	loggingLevel() : Level
+    return d->level;
+!!!257538.cpp!!!	~Logger()
+    delete d;
+!!!257666.cpp!!!	write(in message : QString) : void
+    for (DestinationList::iterator it = d->destList.begin(),
+         endIt = d->destList.end(); it != endIt; ++it) {
+        if (!(*it)) {
+            assert(!"null log destination");
+            continue;
+        }
+
+        (*it)->write(message);
+    }
diff --git a/plugouts/cpp_utilities/160002.bodies b/plugouts/cpp_utilities/160002.bodies
new file mode 100644
index 000000000..ed616f386
--- /dev/null
+++ b/plugouts/cpp_utilities/160002.bodies
@@ -0,0 +1,22 @@
+class Helper
+!!!256770.cpp!!!	~Helper()
+    try {
+        writeToLog();
+    }
+    catch (std::exception & e) {
+        // you shouldn't throw exceptions from a sink
+        Q_UNUSED(e);
+        assert(!"exception in logger helper destructor");
+        throw;
+    }
+!!!257026.cpp!!!	writeToLog() : void
+    const char * const levelName = LevelToText(level);
+    const QString completeMessage(QString("%1 %2 %3")
+                                  .arg(levelName, 5)
+                                  .arg(QDateTime::currentDateTime().toString(fmtDateTime))
+                                  .arg(buffer)
+                                 );
+
+    Logger & logger = Logger::instance();
+    QMutexLocker lock(&logger.d->logMutex);
+    logger.write(completeMessage);
diff --git a/plugouts/cpp_utilities/160258.bodies b/plugouts/cpp_utilities/160258.bodies
new file mode 100644
index 000000000..7bdfad010
--- /dev/null
+++ b/plugouts/cpp_utilities/160258.bodies
@@ -0,0 +1,5 @@
+class DestinationFactory
+!!!258050.cpp!!!	MakeFileDestination(in filePath : QString) : DestinationPtr
+    return DestinationPtr(new FileDestination(filePath));
+!!!258178.cpp!!!	MakeDebugOutputDestination() : DestinationPtr
+    return DestinationPtr(new DebugOutputDestination);
diff --git a/plugouts/cpp_utilities/2.session b/plugouts/cpp_utilities/2.session
new file mode 100644
index 000000000..aff04b18a
--- /dev/null
+++ b/plugouts/cpp_utilities/2.session
@@ -0,0 +1,651 @@
+window_sizes 1280 753 416 860 533 140
+diagrams
+  classdiagram_ref 129 // Package and Views classes inheritance diagram
+    860 533 100 4 0 0
+end
+show_stereotypes
+marked
+  artifact_ref 140674 // UmlTypeSpec
+  artifact_ref 6785 // UmlActualParameter
+  artifact_ref 6913 // UmlClassItem
+  artifact_ref 7041 // UmlFormalParameter
+  artifact_ref 7169 // UmlAttribute
+  artifact_ref 7297 // UmlClass
+  artifact_ref 7425 // UmlClassDiagram
+  artifact_ref 7553 // UmlClassMember
+  artifact_ref 7681 // UmlClassView
+  artifact_ref 7809 // UmlCollaborationDiagram
+  artifact_ref 7937 // UmlArtifact
+  artifact_ref 128002 // UmlComponent
+  artifact_ref 8065 // UmlComponentDiagram
+  artifact_ref 8321 // UmlDeploymentDiagram
+  artifact_ref 8449 // UmlDeploymentView
+  artifact_ref 8577 // UmlDiagram
+  artifact_ref 8705 // UmlExtraClassMember
+  artifact_ref 8833 // UmlItem
+  artifact_ref 8961 // UmlNode
+  artifact_ref 9089 // UmlOperation
+  artifact_ref 140418 // UmlParameter
+  artifact_ref 9217 // UmlPackage
+  artifact_ref 9345 // UmlRelation
+  artifact_ref 9473 // UmlNcRelation
+  artifact_ref 9601 // UmlSequenceDiagram
+  artifact_ref 9729 // UmlUseCase
+  artifact_ref 9857 // UmlUseCaseDiagram
+  artifact_ref 9985 // UmlUseCaseView
+  artifact_ref 8193 // UmlComponentView
+  artifact_ref 128130 // UmlStateItem
+  artifact_ref 128386 // UmlState
+  artifact_ref 128642 // UmlStateDiagram
+  artifact_ref 129026 // UmlTransition
+  artifact_ref 129410 // UmlRegion
+  artifact_ref 129666 // UmlStateAction
+  artifact_ref 129794 // UmlPseudoState
+  artifact_ref 130050 // UmlInitialPseudoState
+  artifact_ref 130306 // UmlEntryPointPseudoState
+  artifact_ref 130562 // UmlFinalState
+  artifact_ref 130818 // UmlTerminatePseudoState
+  artifact_ref 131074 // UmlExitPointPseudoState
+  artifact_ref 131330 // UmlDeepHistoryPseudoState
+  artifact_ref 131586 // UmlShallowHistoryPseudoState
+  artifact_ref 131842 // UmlJunctionPseudoState
+  artifact_ref 132098 // UmlChoicePseudoState
+  artifact_ref 132354 // UmlForkPseudoState
+  artifact_ref 132610 // UmlJoinPseudoState
+  artifact_ref 134018 // UmlObjectDiagram
+  artifact_ref 134146 // UmlActivityItem
+  artifact_ref 134402 // UmlActivity
+  artifact_ref 134658 // UmlActivityDiagram
+  artifact_ref 134914 // UmlActivityNode
+  artifact_ref 135170 // UmlFlow
+  artifact_ref 135554 // UmlActivityRegion
+  artifact_ref 135810 // UmlExpansionRegion
+  artifact_ref 136194 // UmlInterruptibleActivityRegion
+  artifact_ref 136450 // UmlActivityAction
+  artifact_ref 136706 // UmlActivityActionClasses
+  artifact_ref 136962 // UmlOnSignalAction
+  artifact_ref 137218 // UmlAccessVariableValueAction
+  artifact_ref 137474 // UmlActivityControlNode
+  artifact_ref 137730 // UmlActivityControlNodeClasses
+  artifact_ref 137986 // UmlActivityObject
+  artifact_ref 138370 // UmlExpansionNode
+  artifact_ref 138626 // UmlPinParameter
+  artifact_ref 139010 // UmlActivityPin
+  artifact_ref 139266 // UmlActivityParameter
+  artifact_ref 139522 // UmlParameterSet
+  artifact_ref 139906 // UmlClassInstance
+  artifact_ref 140930 // UmlView
+  artifact_ref 144898 // UmlActivityPartition
+  class_ref 6785 // UmlActualParameter
+  classrelation_ref 14593 // (<generalisation>)
+  operation_ref 76801 // UmlActualParameter
+  class_ref 6913 // UmlFormalParameter
+  classrelation_ref 14721 // (<generalisation>)
+  operation_ref 76929 // UmlFormalParameter
+  class_ref 7041 // UmlAttribute
+  classrelation_ref 14849 // (<generalisation>)
+  operation_ref 77057 // UmlAttribute
+  class_ref 7169 // UmlClass
+  classrelation_ref 14977 // (<generalisation>)
+  operation_ref 77185 // UmlClass
+  operation_ref 144258 // utilities
+  operation_ref 144642 // addContructor
+  operation_ref 144770 // addDestructor
+  operation_ref 144898 // addCopy
+  operation_ref 145026 // addAssign
+  class_ref 7297 // UmlClassDiagram
+  classrelation_ref 15105 // (<generalisation>)
+  operation_ref 77313 // UmlClassDiagram
+  class_ref 134018 // UmlObjectDiagram
+  classrelation_ref 137986 // (<generalisation>)
+  operation_ref 149890 // UmlObjectDiagram
+  class_ref 7425 // UmlClassItem
+  classrelation_ref 15233 // (<generalisation>)
+  operation_ref 77441 // UmlClassItem
+  class_ref 7553 // UmlClassMember
+  classrelation_ref 15361 // (<generalisation>)
+  operation_ref 77569 // UmlClassMember
+  class_ref 7681 // UmlClassView
+  classrelation_ref 15489 // (<generalisation>)
+  operation_ref 77697 // UmlClassView
+  class_ref 7809 // UmlCollaborationDiagram
+  classrelation_ref 15617 // (<generalisation>)
+  operation_ref 77825 // UmlCollaborationDiagram
+  class_ref 7937 // UmlComponentDiagram
+  classrelation_ref 15745 // (<generalisation>)
+  operation_ref 77953 // UmlComponentDiagram
+  class_ref 8065 // UmlComponentView
+  classrelation_ref 15873 // (<generalisation>)
+  operation_ref 78081 // UmlComponentView
+  class_ref 8193 // UmlArtifact
+  classrelation_ref 16001 // (<generalisation>)
+  operation_ref 78209 // UmlArtifact
+  class_ref 128002 // UmlComponent
+  classrelation_ref 128130 // (<generalisation>)
+  operation_ref 128002 // UmlComponent
+  class_ref 8321 // UmlDeploymentDiagram
+  classrelation_ref 16129 // (<generalisation>)
+  operation_ref 78337 // UmlDeploymentDiagram
+  class_ref 8449 // UmlDeploymentView
+  classrelation_ref 16257 // (<generalisation>)
+  operation_ref 78465 // UmlDeploymentView
+  class_ref 8577 // UmlDiagram
+  classrelation_ref 16385 // (<generalisation>)
+  operation_ref 78593 // UmlDiagram
+  class_ref 8705 // UmlExtraClassMember
+  classrelation_ref 16513 // (<generalisation>)
+  operation_ref 78721 // UmlExtraClassMember
+  class_ref 8833 // UmlItem
+  classrelation_ref 16641 // (<generalisation>)
+  operation_ref 78849 // UmlItem
+  operation_ref 78977 // ~UmlItem
+  operation_ref 144130 // utilities
+  class_ref 8961 // UmlNode
+  classrelation_ref 16769 // (<generalisation>)
+  operation_ref 79105 // UmlNode
+  class_ref 9089 // UmlOperation
+  classrelation_ref 16897 // (<generalisation>)
+  operation_ref 79233 // UmlOperation
+  class_ref 145282 // UmlParameter
+  classrelation_ref 157058 // (<generalisation>)
+  class_ref 9217 // UmlPackage
+  classrelation_ref 17025 // (<generalisation>)
+  operation_ref 79361 // UmlPackage
+  class_ref 9345 // UmlRelation
+  classrelation_ref 17153 // (<generalisation>)
+  operation_ref 79489 // UmlRelation
+  class_ref 9473 // UmlNcRelation
+  classrelation_ref 17281 // (<generalisation>)
+  operation_ref 79617 // UmlNcRelation
+  class_ref 9601 // UmlSequenceDiagram
+  classrelation_ref 17409 // (<generalisation>)
+  operation_ref 79745 // UmlSequenceDiagram
+  class_ref 9729 // UmlUseCase
+  classrelation_ref 17537 // (<generalisation>)
+  operation_ref 79873 // UmlUseCase
+  class_ref 9857 // UmlUseCaseDiagram
+  classrelation_ref 17665 // (<generalisation>)
+  operation_ref 80001 // UmlUseCaseDiagram
+  class_ref 9985 // UmlUseCaseView
+  classrelation_ref 17793 // (<generalisation>)
+  operation_ref 80129 // UmlUseCaseView
+  class_ref 145538 // UmlTypeSpec
+  classrelation_ref 157314 // (<generalisation>)
+  class_ref 128386 // UmlState
+  operation_ref 128514 // UmlState
+  classrelation_ref 128514 // (<generalisation>)
+  classrelation_ref 128642 // (<generalisation>)
+  class_ref 128642 // UmlStateDiagram
+  operation_ref 129026 // UmlStateDiagram
+  classrelation_ref 129026 // (<generalisation>)
+  classrelation_ref 129154 // (<generalisation>)
+  class_ref 134658 // UmlActivityDiagram
+  operation_ref 152962 // UmlActivityDiagram
+  classrelation_ref 138754 // (<generalisation>)
+  classrelation_ref 138882 // (<generalisation>)
+  class_ref 129026 // UmlTransition
+  operation_ref 135938 // UmlTransition
+  classrelation_ref 130050 // (<generalisation>)
+  classrelation_ref 130178 // (<generalisation>)
+  class_ref 129410 // UmlRegion
+  operation_ref 136450 // UmlRegion
+  classrelation_ref 131074 // (<generalisation>)
+  classrelation_ref 131202 // (<generalisation>)
+  class_ref 129666 // UmlStateAction
+  operation_ref 136578 // UmlStateAction
+  classrelation_ref 131586 // (<generalisation>)
+  classrelation_ref 131714 // (<generalisation>)
+  class_ref 129794 // UmlPseudoState
+  classrelation_ref 131842 // (<generalisation>)
+  classrelation_ref 131970 // (<generalisation>)
+  operation_ref 138370 // UmlPseudoState
+  class_ref 130050 // UmlInitialPseudoState
+  classrelation_ref 132354 // (<generalisation>)
+  operation_ref 138882 // UmlInitialPseudoState
+  class_ref 130306 // UmlEntryPointPseudoState
+  classrelation_ref 132738 // (<generalisation>)
+  operation_ref 139394 // UmlEntryPointPseudoState
+  class_ref 130562 // UmlFinalState
+  classrelation_ref 133122 // (<generalisation>)
+  operation_ref 139906 // UmlFinalState
+  class_ref 130818 // UmlTerminatePseudoState
+  classrelation_ref 133506 // (<generalisation>)
+  operation_ref 140418 // UmlTerminatePseudoState
+  class_ref 131074 // UmlExitPointPseudoState
+  classrelation_ref 133890 // (<generalisation>)
+  operation_ref 140930 // UmlExitPointPseudoState
+  class_ref 131330 // UmlDeepHistoryPseudoState
+  classrelation_ref 134274 // (<generalisation>)
+  operation_ref 141442 // UmlDeepHistoryPseudoState
+  class_ref 131586 // UmlShallowHistoryPseudoState
+  classrelation_ref 134658 // (<generalisation>)
+  operation_ref 141954 // UmlShallowHistoryPseudoState
+  class_ref 131842 // UmlJunctionPseudoState
+  classrelation_ref 135042 // (<generalisation>)
+  operation_ref 142466 // UmlJunctionPseudoState
+  class_ref 132098 // UmlChoicePseudoState
+  classrelation_ref 135426 // (<generalisation>)
+  operation_ref 142978 // UmlChoicePseudoState
+  class_ref 132354 // UmlForkPseudoState
+  classrelation_ref 135810 // (<generalisation>)
+  operation_ref 143490 // UmlForkPseudoState
+  class_ref 132610 // UmlJoinPseudoState
+  classrelation_ref 136194 // (<generalisation>)
+  operation_ref 144002 // UmlJoinPseudoState
+  class_ref 134146 // UmlActivityItem
+  class_ref 134402 // UmlActivity
+  classrelation_ref 138370 // (<generalisation>)
+  operation_ref 150402 // UmlActivity
+  class_ref 134914 // UmlActivityNode
+  operation_ref 153986 // UmlActivityNode
+  classrelation_ref 139394 // (<generalisation>)
+  classrelation_ref 139522 // (<generalisation>)
+  class_ref 135170 // UmlFlow
+  operation_ref 158466 // UmlFlow
+  classrelation_ref 139906 // (<generalisation>)
+  classrelation_ref 140034 // (<generalisation>)
+  class_ref 135554 // UmlActivityRegion
+  operation_ref 158722 // UmlActivityRegion
+  classrelation_ref 140930 // (<generalisation>)
+  classrelation_ref 141058 // (<generalisation>)
+  class_ref 135810 // UmlExpansionRegion
+  classrelation_ref 141570 // (<generalisation>)
+  operation_ref 159618 // UmlExpansionRegion
+  class_ref 136194 // UmlInterruptibleActivityRegion
+  classrelation_ref 142082 // (<generalisation>)
+  operation_ref 160770 // UmlInterruptibleActivityRegion
+  class_ref 136450 // UmlActivityAction
+  classrelation_ref 142466 // (<generalisation>)
+  operation_ref 161026 // UmlActivityAction
+  class_ref 136706 // UmlSendObjectAction
+  classrelation_ref 142978 // (<generalisation>)
+  operation_ref 163842 // UmlSendObjectAction
+  class_ref 136962 // UmlUnmarshallAction
+  classrelation_ref 143362 // (<generalisation>)
+  operation_ref 164354 // UmlUnmarshallAction
+  class_ref 137218 // UmlOnSignalAction
+  classrelation_ref 143746 // (<generalisation>)
+  operation_ref 164610 // UmlOnSignalAction
+  class_ref 137474 // UmlSendSignalAction
+  classrelation_ref 144130 // (<generalisation>)
+  operation_ref 166402 // UmlSendSignalAction
+  class_ref 137730 // UmlBroadcastSignalAction
+  classrelation_ref 144514 // (<generalisation>)
+  operation_ref 166914 // UmlBroadcastSignalAction
+  class_ref 137986 // UmlValueSpecificationAction
+  classrelation_ref 144898 // (<generalisation>)
+  operation_ref 167426 // UmlValueSpecificationAction
+  class_ref 138242 // UmlOpaqueAction
+  classrelation_ref 145282 // (<generalisation>)
+  operation_ref 169218 // UmlOpaqueAction
+  class_ref 138498 // UmlAcceptEventAction
+  classrelation_ref 145666 // (<generalisation>)
+  operation_ref 171010 // UmlAcceptEventAction
+  class_ref 138754 // UmlCallOperationAction
+  classrelation_ref 146050 // (<generalisation>)
+  operation_ref 173314 // UmlCallOperationAction
+  class_ref 139010 // UmlCallBehaviorAction
+  classrelation_ref 146562 // (<generalisation>)
+  operation_ref 174466 // UmlCallBehaviorAction
+  class_ref 139266 // UmlAccessVariableValueAction
+  classrelation_ref 147074 // (<generalisation>)
+  operation_ref 175362 // UmlAccessVariableValueAction
+  class_ref 139522 // UmlClearVariableValueAction
+  classrelation_ref 147586 // (<generalisation>)
+  operation_ref 176258 // UmlClearVariableValueAction
+  class_ref 139778 // UmlReadVariableValueAction
+  classrelation_ref 147970 // (<generalisation>)
+  operation_ref 176770 // UmlReadVariableValueAction
+  class_ref 140034 // UmlWriteVariableValueAction
+  classrelation_ref 148354 // (<generalisation>)
+  operation_ref 177282 // UmlWriteVariableValueAction
+  class_ref 140290 // UmlAddVariableValueAction
+  classrelation_ref 148738 // (<generalisation>)
+  operation_ref 177794 // UmlAddVariableValueAction
+  class_ref 140546 // UmlRemoveVariableValueAction
+  classrelation_ref 149122 // (<generalisation>)
+  operation_ref 178690 // UmlRemoveVariableValueAction
+  class_ref 150018 // UmlAcceptCallAction
+  classrelation_ref 165634 // (<generalisation>)
+  operation_ref 234370 // UmlAcceptCallAction
+  class_ref 150274 // UmlReplyAction
+  classrelation_ref 166018 // (<generalisation>)
+  operation_ref 236162 // UmlReplyAction
+  class_ref 150530 // UmlCreateObjectAction
+  classrelation_ref 166402 // (<generalisation>)
+  operation_ref 237954 // UmlCreateObjectAction
+  class_ref 150786 // UmlDestroyObjectAction
+  classrelation_ref 166786 // (<generalisation>)
+  operation_ref 238978 // UmlDestroyObjectAction
+  class_ref 151042 // UmlTestIdentityAction
+  classrelation_ref 167170 // (<generalisation>)
+  operation_ref 240130 // UmlTestIdentityAction
+  class_ref 151298 // UmlRaiseExceptionAction
+  classrelation_ref 167554 // (<generalisation>)
+  operation_ref 240642 // UmlRaiseExceptionAction
+  class_ref 151554 // UmlReduceAction
+  classrelation_ref 167938 // (<generalisation>)
+  operation_ref 241154 // UmlReduceAction
+  class_ref 140802 // UmlActivityControlNode
+  classrelation_ref 149506 // (<generalisation>)
+  operation_ref 179330 // UmlActivityControlNode
+  class_ref 141058 // UmlInitialActivityNode
+  classrelation_ref 149890 // (<generalisation>)
+  operation_ref 179842 // UmlInitialActivityNode
+  class_ref 141314 // UmlFlowFinalActivityNode
+  classrelation_ref 150274 // (<generalisation>)
+  operation_ref 180354 // UmlFlowFinalActivityNode
+  class_ref 141570 // UmlActivityFinalActivityNode
+  classrelation_ref 150658 // (<generalisation>)
+  operation_ref 180866 // UmlActivityFinalActivityNode
+  class_ref 141826 // UmlDecisionActivityNode
+  classrelation_ref 151042 // (<generalisation>)
+  operation_ref 181378 // UmlDecisionActivityNode
+  class_ref 142082 // UmlMergeActivityNode
+  classrelation_ref 151426 // (<generalisation>)
+  operation_ref 181890 // UmlMergeActivityNode
+  class_ref 142338 // UmlForkActivityNode
+  classrelation_ref 151810 // (<generalisation>)
+  operation_ref 182402 // UmlForkActivityNode
+  class_ref 142594 // UmlJoinActivityNode
+  classrelation_ref 152194 // (<generalisation>)
+  operation_ref 182914 // UmlJoinActivityNode
+  class_ref 142850 // UmlActivityObject
+  classrelation_ref 152578 // (<generalisation>)
+  operation_ref 183426 // UmlActivityObject
+  class_ref 143234 // UmlExpansionNode
+  classrelation_ref 153346 // (<generalisation>)
+  operation_ref 186754 // UmlExpansionNode
+  class_ref 143490 // UmlPinParameter
+  classrelation_ref 153730 // (<generalisation>)
+  operation_ref 187010 // UmlPinParameter
+  class_ref 143874 // UmlActivityPin
+  classrelation_ref 154370 // (<generalisation>)
+  operation_ref 188674 // UmlActivityPin
+  operation_ref 255362 // ~UmlActivityPin
+  class_ref 144130 // UmlActivityParameter
+  classrelation_ref 154754 // (<generalisation>)
+  operation_ref 189186 // UmlActivityParameter
+  class_ref 128130 // UmlStateItem
+  class_ref 149762 // UmlActivityPartition
+  operation_ref 232706 // UmlActivityPartition
+  classrelation_ref 164866 // (<generalisation>)
+  classrelation_ref 164994 // (<generalisation>)
+  class_ref 144770 // UmlClassInstance
+  classrelation_ref 156034 // (<generalisation>)
+  operation_ref 194946 // UmlClassInstance
+  class_ref 145794 // UmlView
+  classrelation_ref 157698 // (<generalisation>)
+  operation_ref 197506 // UmlView
+  class_ref 144386 // UmlParameterSet
+  classrelation_ref 155138 // (<generalisation>)
+  classrelation_ref 155394 // (<generalisation>)
+  operation_ref 190210 // UmlParameterSet
+  artifact_ref 141442 // UmlFragmentCompartment
+  artifact_ref 141826 // UmlSubject
+  artifact_ref 142082 // UmlUseCaseReference
+  artifact_ref 142338 // UmlUseCaseAssociation
+  artifact_ref 142594 // UmlClassInstanceReference
+  artifact_ref 142850 // UmlMessage
+  artifact_ref 143106 // UmlSequenceMessage
+  artifact_ref 143490 // UmlCollaborationMessage
+  artifact_ref 143746 // UmlUseCaseDiagramDefinition
+  artifact_ref 144002 // UmlSequenceDiagramDefinition
+  artifact_ref 144258 // UmlCollaborationDiagramDefinition
+  artifact_ref 141314 // UmlFragment
+  class_ref 146306 // UmlFragmentCompartment
+  classrelation_ref 159362 // (<generalisation>)
+  class_ref 146690 // UmlSubject
+  classrelation_ref 159490 // (<generalisation>)
+  class_ref 146946 // UmlUseCaseReference
+  classrelation_ref 160002 // (<generalisation>)
+  class_ref 147202 // UmlUseCaseAssociation
+  classrelation_ref 160386 // (<generalisation>)
+  class_ref 147458 // UmlClassInstanceReference
+  classrelation_ref 160770 // (<generalisation>)
+  class_ref 147714 // UmlMessage
+  classrelation_ref 161282 // (<generalisation>)
+  class_ref 147970 // UmlSequenceMessage
+  classrelation_ref 161794 // (<generalisation>)
+  class_ref 148354 // UmlCollaborationMessage
+  classrelation_ref 162050 // (<generalisation>)
+  class_ref 148610 // UmlUseCaseDiagramDefinition
+  classrelation_ref 162946 // (<generalisation>)
+  class_ref 148866 // UmlSequenceDiagramDefinition
+  classrelation_ref 163586 // (<generalisation>)
+  class_ref 149122 // UmlCollaborationDiagramDefinition
+  classrelation_ref 164098 // (<generalisation>)
+  class_ref 146178 // UmlFragment
+  classrelation_ref 159234 // (<generalisation>)
+  artifact_ref 132738 // ConstrDestrCopyDialog
+  class_ref 132738 // ConstrDestrCopyDialog
+  extra_member_ref 128130 // Q_OBJECT
+  operation_ref 144386 // ConstrDestrCopyDialog
+  extra_member_ref 128002 // slots
+  operation_ref 247682 // polish
+  operation_ref 144514 // accept
+  extra_member_ref 134658 // Q_OBJECT
+  extra_member_ref 134786 // slots
+  classrelation_ref 174594 // target (<unidirectional association>)
+  attribute_ref 128130 // add_constr
+  attribute_ref 130050 // constr_explicit
+  attribute_ref 128258 // add_destr
+  attribute_ref 128386 // virtual_destr
+  attribute_ref 128514 // add_copy
+  attribute_ref 128642 // add_const_copy
+  attribute_ref 128770 // add_assign
+  attribute_ref 128898 // add_const_assign
+  classrelation_ref 174466 // (<generalisation>)
+  class_ref 159106 // typedef1
+  class_ref 158082 // FunctionTracer
+  operation_ref 258306 // FunctionTracer
+  operation_ref 258434 // ~FunctionTracer
+  attribute_ref 138498 // traceString
+  attribute_ref 138626 // logLevel
+  class_ref 159234 // GridBox
+  classrelation_ref 174722 // (<generalisation>)
+  extra_member_ref 134914 // Q_OBJECT
+  operation_ref 254210 // GridBox
+  operation_ref 254338 // setMargin
+  operation_ref 254466 // setSpacing
+  operation_ref 254594 // addWidget
+  operation_ref 254722 // name
+  extra_member_ref 135042 // signals
+  extra_member_ref 135170 // slots
+  attribute_ref 136578 // m_layout
+  attribute_ref 136706 // m_numCols
+  attribute_ref 136834 // currentIndex
+  class_ref 159362 // typedef2
+  class_ref 159490 // HHBox
+  classrelation_ref 174850 // (<generalisation>)
+  extra_member_ref 135298 // Q_OBJECT
+  operation_ref 254850 // HHBox
+  operation_ref 254978 // addWidget
+  operation_ref 255106 // setStretchFactor
+  operation_ref 255234 // setMargin
+  extra_member_ref 135426 // signals
+  extra_member_ref 135554 // slots
+  attribute_ref 136962 // m_layout
+  class_ref 159618 // typedef3
+  class_ref 159746 // VVBox
+  classrelation_ref 174978 // (<generalisation>)
+  extra_member_ref 135682 // Q_OBJECT
+  operation_ref 255490 // VVBox
+  operation_ref 255618 // addWidget
+  operation_ref 255746 // setStretchFactor
+  operation_ref 255874 // setMargin
+  extra_member_ref 135810 // signals
+  extra_member_ref 135938 // slots
+  attribute_ref 137090 // m_layout
+  artifact_ref 151810 // QsDebugOutput
+  artifact_ref 151938 // QsLog
+  artifact_ref 152066 // QsLogDest
+  artifact_ref 152450 // DestinationList
+  artifact_ref 152578 // LoggerImpl
+  artifact_ref 152706 // FileDestination
+  artifact_ref 152834 // DebugOutputDestination
+  artifact_ref 151426 // gridbox
+  artifact_ref 151554 // hhbox
+  artifact_ref 151682 // vvbox
+  artifact_ref 152194 // FunctionTracer
+  artifact_ref 152322 // main
+end
+selected deploymentview_ref 135682 // cpp_utilities
+open
+  deploymentview_ref 256 // API BASE Deployment view
+  class_ref 256 // aRelationKind
+  class_ref 384 // aDirection
+  class_ref 512 // aVisibility
+  class_ref 640 // anItemKind
+  class_ref 896 // UmlBaseActualParameter
+  class_ref 1024 // UmlBaseFormalParameter
+  class_ref 145408 // UmlBaseTypeSpec
+  class_ref 1280 // UmlBaseAttribute
+  class_ref 1408 // UmlBaseClass
+  class_ref 1536 // UmlBaseClassItem
+  class_ref 1664 // UmlBaseClassDiagram
+  class_ref 133888 // UmlBaseObjectDiagram
+  class_ref 1792 // UmlBaseClassMember
+  class_ref 1920 // UmlBaseClassView
+  class_ref 2048 // UmlBaseArtifact
+  class_ref 6528 // UmlBaseComponent
+  class_ref 2176 // UmlBaseCollaborationDiagram
+  class_ref 2304 // UmlBaseComponentDiagram
+  class_ref 2432 // UmlBaseComponentView
+  class_ref 2560 // UmlBaseDeploymentDiagram
+  class_ref 2688 // UmlBaseDeploymentView
+  class_ref 2816 // UmlBaseDeployment
+  class_ref 2944 // UmlBaseDiagram
+  class_ref 3072 // UmlBaseExtraClassMember
+  class_ref 3200 // UmlBaseItem
+  class_ref 3328 // UmlBaseNode
+  class_ref 3456 // UmlBaseOperation
+  class_ref 145152 // UmlBaseParameter
+  class_ref 3584 // UmlBasePackage
+  class_ref 3712 // UmlBaseRelation
+  class_ref 3840 // UmlBaseNcRelation
+  class_ref 3968 // UmlBaseSequenceDiagram
+  class_ref 4096 // UmlBaseUseCase
+  class_ref 4224 // UmlBaseUseCaseDiagram
+  class_ref 4352 // UmlBaseUseCaseView
+  class_ref 128256 // UmlBaseState
+  class_ref 128512 // UmlBaseStateDiagram
+  class_ref 128768 // StateBehavior
+  class_ref 134528 // UmlBaseActivityDiagram
+  class_ref 129152 // TransitionBehavior
+  class_ref 128896 // UmlBaseTransition
+  class_ref 129280 // UmlBaseRegion
+  class_ref 129536 // UmlBaseStateAction
+  class_ref 129920 // UmlBaseInitialPseudoState
+  class_ref 130176 // UmlBaseEntryPointPseudoState
+  class_ref 130432 // UmlBaseFinalState
+  class_ref 130688 // UmlBaseTerminatePseudoState
+  class_ref 130944 // UmlBaseExitPointPseudoState
+  class_ref 131200 // UmlBaseDeepHistoryPseudoState
+  class_ref 131456 // UmlBaseShallowHistoryPseudoState
+  class_ref 131712 // UmlBaseJunctionPseudoState
+  class_ref 131968 // UmlBaseChoicePseudoState
+  class_ref 132224 // UmlBaseForkPseudoState
+  class_ref 132480 // UmlBaseJoinPseudoState
+  class_ref 4480 // UmlBuiltin
+  class_ref 4608 // UmlStereotype
+  class_ref 134272 // UmlBaseActivity
+  class_ref 134784 // UmlBaseActivityNode
+  class_ref 135296 // FlowBehavior
+  class_ref 135040 // UmlBaseFlow
+  class_ref 135424 // UmlBaseActivityRegion
+  class_ref 135936 // anExpansionKind
+  class_ref 135680 // UmlBaseExpansionRegion
+  class_ref 136064 // UmlBaseInterruptibleActivityRegion
+  class_ref 136320 // UmlBaseActivityAction
+  class_ref 136576 // UmlBaseSendObjectAction
+  class_ref 136832 // UmlBaseUnmarshallAction
+  class_ref 137088 // UmlBaseOnSignalAction
+  class_ref 137344 // UmlBaseSendSignalAction
+  class_ref 137600 // UmlBaseBroadcastSignalAction
+  class_ref 137856 // UmlBaseValueSpecificationAction
+  class_ref 138112 // UmlBaseOpaqueAction
+  class_ref 138368 // UmlBaseAcceptEventAction
+  class_ref 138624 // UmlBaseCallOperationAction
+  class_ref 138880 // UmlBaseCallBehaviorAction
+  class_ref 139136 // UmlBaseAccessVariableValueAction
+  class_ref 139392 // UmlBaseClearVariableValueAction
+  class_ref 139648 // UmlBaseReadVariableValueAction
+  class_ref 139904 // UmlBaseWriteVariableValueAction
+  class_ref 140160 // UmlBaseAddVariableValueAction
+  class_ref 140416 // UmlBaseRemoveVariableValueAction
+  class_ref 149888 // UmlBaseAcceptCallAction
+  class_ref 150144 // UmlBaseReplyAction
+  class_ref 150400 // UmlBaseCreateObjectAction
+  class_ref 150656 // UmlBaseDestroyObjectAction
+  class_ref 150912 // UmlBaseTestIdentityAction
+  class_ref 151168 // UmlBaseRaiseExceptionAction
+  class_ref 151424 // UmlBaseReduceAction
+  class_ref 140672 // UmlBaseActivityControlNode
+  class_ref 140928 // UmlBaseInitialActivityNode
+  class_ref 141184 // UmlBaseFlowFinalActivityNode
+  class_ref 141440 // UmlBaseActivityFinalActivityNode
+  class_ref 141696 // UmlBaseDecisionActivityNode
+  class_ref 141952 // UmlBaseMergeActivityNode
+  class_ref 142208 // UmlBaseForkActivityNode
+  class_ref 142464 // UmlBaseJoinActivityNode
+  class_ref 142976 // anOrdering
+  class_ref 142720 // UmlBaseActivityObject
+  class_ref 143104 // UmlBaseExpansionNode
+  class_ref 143616 // aParameterEffectKind
+  class_ref 143360 // UmlBasePinParameter
+  class_ref 143744 // UmlBaseActivityPin
+  class_ref 144000 // UmlBaseActivityParameter
+  class_ref 144256 // UmlBaseParameterSet
+  class_ref 149632 // UmlBaseActivityPartition
+  class_ref 144896 // SlotAttribute
+  class_ref 145024 // SlotRelation
+  class_ref 144640 // UmlBaseClassInstance
+  class_ref 145664 // UmlBaseView
+  deploymentview_ref 384 // Settings Deployment view
+  class_ref 4736 // CppSettings
+  class_ref 4864 // IdlSettings
+  class_ref 4992 // JavaSettings
+  class_ref 145920 // PhpSettings
+  class_ref 5120 // UmlSettings
+  class_ref 144512 // aLanguage
+  class_ref 149376 // PythonSettings
+  deploymentview_ref 512 // Com Deployment view
+  class_ref 5248 // UmlCom
+  class_ref 5376 // CmdFamily
+  class_ref 5632 // OnInstanceCmd
+  class_ref 5504 // MiscGlobalCmd
+  class_ref 5760 // ClassGlobalCmd
+  class_ref 5888 // PackageGlobalCmd
+  class_ref 6016 // UmlSettingsCmd
+  class_ref 6144 // CppSettingsCmd
+  class_ref 6272 // JavaSettingsCmd
+  class_ref 146048 // PhpSettingsCmd
+  class_ref 149504 // PythonSettingsCmd
+  class_ref 6400 // IdlSettingsCmd
+  deploymentview_ref 129280 // Diagram Deployment view
+  class_ref 146432 // UmlBaseFragment
+  class_ref 146560 // UmlBaseFragmentCompartment
+  class_ref 146816 // UmlBaseSubject
+  class_ref 147072 // UmlBaseUseCaseReference
+  class_ref 147328 // UmlBaseUseCaseAssociation
+  class_ref 147584 // UmlBaseClassInstanceReference
+  class_ref 147840 // UmlBaseMessage
+  class_ref 148096 // aMessageKind
+  class_ref 148224 // UmlBaseSequenceMessage
+  class_ref 148480 // UmlBaseCollaborationMessage
+  class_ref 148736 // UmlBaseUseCaseDiagramDefinition
+  class_ref 148992 // UmlBaseSequenceDiagramDefinition
+  class_ref 149248 // UmlBaseCollaborationDiagramDefinition
+  deploymentview_ref 641 // API USER Deployment view
+  classview_ref 769 // API USER class view
+  deploymentview_ref 129154 // Diagram Deployment view
+  classview_ref 129154 // Diagram Class view
+  deploymentview_ref 128002 // Deployment view
+  classview_ref 128002 // Class view
+  classview_ref 135682 // cpp_utilities
+  deploymentview_ref 135810 // Logging
+  deploymentview_ref 135938 // Logging
+  deploymentview_ref 135682 // cpp_utilities
+end
+end
diff --git a/plugouts/cpp_utilities/42.session b/plugouts/cpp_utilities/42.session
index f47cc1b5f..eed891f27 100644
--- a/plugouts/cpp_utilities/42.session
+++ b/plugouts/cpp_utilities/42.session
@@ -1,8 +1,23 @@
 window_sizes 1680 988 393 1282 501 405
+diagrams
+  classdiagram_ref 128002 // State (1)
+    114 98 100 4 0 0
+  classdiagram_ref 128130 // State (2)
+    114 98 100 4 0 0
+  classdiagram_ref 128258 // State (3)
+    114 98 100 4 0 0
+  classdiagram_ref 385 // Diagrams classes inheritance diagram
+    114 98 100 4 0 0
+  active  sequencediagram_ref 513 // Typical Execution
+    1282 501 100 4 0 0
+end
 show_stereotypes
-selected class_ref 132738 // ConstrDestrCopyDialog
+selected class_ref 131842 // UmlJunctionPseudoState
 open
+  classview_ref 641 // Diagrams
   classview_ref 769 // API USER class view
-  classview_ref 128002 // Class view
+  classview_ref 129154 // Diagram Class view
+  deploymentview_ref 129154 // Diagram Deployment view
+  artifact_ref 132738 // ConstrDestrCopyDialog
 end
 end
diff --git a/plugouts/cpp_utilities/641 b/plugouts/cpp_utilities/641
index 0f909e329..254f94830 100644
--- a/plugouts/cpp_utilities/641
+++ b/plugouts/cpp_utilities/641
@@ -1,7 +1,7 @@
 format 75
 "API USER" // API USER
-  revision 5
-  modified_by 2 "pages4"
+  revision 6
+  modified_by 2 "C:/Users/habip"
   // class settings
   //class diagram settings
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
@@ -109,2086 +109,2262 @@ ${members}}
     end
   end
 
-  classview 769 "API USER class view"
-    //class diagram settings
-    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-    //collaboration diagram settings
-    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
-    //object diagram settings
-     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
-    //sequence diagram settings
-    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
-    //state diagram settings
-    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
-    show_activities default region_horizontally default drawing_language default show_stereotype_properties default
-    //class settings
-    //activity diagram settings
-    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
-    show_infonote default drawing_language default show_stereotype_properties default
-    associated_deployment_view deploymentview_ref 641 // API USER Deployment view
-    comment "'your' API classes, modify them !"
-    class 145538 "UmlTypeSpec"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " this class memorize a type specification, which may be
+  deploymentview 641 "API USER Deployment view"
+    //deployment diagram settings
+    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+    comment "'your' API artifacts modify them !
 
- - a class reference
+Do not forget to modify Main !"
+    artifact 140674 "UmlTypeSpec"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
- - an explicit type"
-      classrelation 157314 // <generalisation>
-	relation 157314 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 157314 // <generalisation>
-	  b parent class_ref 145408 // UmlBaseTypeSpec
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 145538 // UmlTypeSpec
       end
     end
 
-    class 6785 "UmlActualParameter"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 6657 "Main"
+      stereotype "source"
+      cpp_src "#include <qapplication.h>
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'actual parameters' of a template class. For instance T in
+#include \"UmlCom.h\"
+#include \"UmlItem.h\"
 
-	class Cl1 : public Cl2<T> ...
+// the program is called with the socket port number in argument
 
- You can modify it as you want (except the constructor)"
-      classrelation 14593 // <generalisation>
-	relation 14593 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 14593 // <generalisation>
-	  b parent class_ref 896 // UmlBaseActualParameter
-      end
+int main(int argc, char ** argv)
+{
+  if (argc != 2)
+    return 0;
+  
+  QApplication a(argc, argv);
+  
+  if (UmlCom::connect(QString(argv[1]).toUInt())) {
+    UmlCom::trace(\"<b>Class utilities</b> release 1.1.2<hr>\");
 
-      operation 76801 "UmlActualParameter"
-	cpp_inline public explicit_return_type ""
-	nparams 0
-	cpp_decl "    ${comment}${name}${(}${)} {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${)}${throws}{
-${body}}
+    try {
+      UmlCom::targetItem()->utilities();
+    }
+    catch (...) {
+    }
+
+    // must be called to cleanly inform that all is done
+    UmlCom::bye();
+  }
+  
+  UmlCom::close();
+  return 0;
+}
 "
-	
-	
-	
+      associated_classes
       end
-    end
-
-    class 6913 "UmlFormalParameter"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+      comment "  The main function, you have to modify at least the line containing
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'formal parameters' of a template class. For instance 'T' in 
+  UmlCom::targetItem()->???();
 
-	template class Cl<class T> ...
+  it if you want your program does something !"
+    end
 
- You can modify it as you want (except the constructor)"
-      classrelation 14721 // <generalisation>
-	relation 14721 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 14721 // <generalisation>
-	  b parent class_ref 1024 // UmlBaseFormalParameter
-      end
+    artifact 6785 "UmlActualParameter"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 76929 "UmlFormalParameter"
-	cpp_inline public explicit_return_type ""
-	nparams 0
-	cpp_decl "    ${comment}${name}${(}${)} {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${)}${throws}{
-${body}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 6785 // UmlActualParameter
       end
     end
 
-    class 7041 "UmlAttribute"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'attribute', notes that the class 'UmlClassItem'
- is a mother class of the class's children.
-
- You can modify it as you want (except the constructor)"
-      classrelation 14849 // <generalisation>
-	relation 14849 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 14849 // <generalisation>
-	  b parent class_ref 1280 // UmlBaseAttribute
-      end
+    artifact 6913 "UmlClassItem"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 77057 "UmlAttribute"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} :  UmlBaseAttribute(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 7425 // UmlClassItem
       end
     end
 
-    class 7169 "UmlClass"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 7041 "UmlFormalParameter"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'classes', notes that the class 'ClassItem'
- is a mother class of the class's children.
-
- You can modify it as you want (except the constructor)"
-      classrelation 14977 // <generalisation>
-	relation 14977 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 14977 // <generalisation>
-	  b parent class_ref 1408 // UmlBaseClass
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 6913 // UmlFormalParameter
       end
+    end
 
-      operation 77185 "UmlClass"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseClass(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
-"
-	
-	
-	
-      end
+    artifact 7169 "UmlAttribute"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 144258 "utilities"
-	cpp_virtual public explicit_return_type "void"
-	nparams 0
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
-"
-	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}{
-${body}}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
-${body}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "virtual operation doing 'something'
-
-here allows to add contructor / destructor / copy constructor / operator="
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 7041 // UmlAttribute
       end
+    end
 
-      operation 144642 "addContructor"
-	public explicit_return_type "void"
-	nparams 1
-	  param in name "expl" explicit_type "bool"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)}${const}${volatile}${abstract};
-"
-	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}{
-${body}}
-"
-	
-	
-	
-	
-	comment "add a constructor to the class
-"
-      end
+    artifact 7297 "UmlClass"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 144770 "addDestructor"
-	public explicit_return_type "void"
-	nparams 1
-	  param in name "virt" explicit_type "bool"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)}${const}${volatile}${abstract};
-"
-	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}{
-${body}}
-"
-	
-	
-	
-	
-	comment "add a destructor to the class
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      end
+      cpp_src "${comment}
+${includes}
+#include \"ConstrDestrCopyDialog.h\"
+#include \"UmlParameter.h\"
+#include \"UmlOperation.h\"
+#include \"CppSettings.h\"
+#include \"UmlCom.h\"
 
-      operation 144898 "addCopy"
-	public explicit_return_type "void"
-	nparams 1
-	  param in name "cte" explicit_type "bool"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)}${const}${volatile}${abstract};
-"
-	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}{
-${body}}
-"
-	
-	
-	
-	
-	comment "add a copy constructor to the class"
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 7169 // UmlClass
       end
+    end
 
-      operation 145026 "addAssign"
-	public explicit_return_type "void"
-	nparams 1
-	  param in name "cte" explicit_type "bool"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)}${const}${volatile}${abstract};
-"
-	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}{
-${body}}
+    artifact 7425 "UmlClassDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	
-	comment "add operator= to the class"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 7297 // UmlClassDiagram
       end
     end
 
-    class 7297 "UmlClassDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 7553 "UmlClassMember"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'class diagrams', notes that the class 'UmlDiagram'
- is a mother class of all the diagrams, allowing to generalize their
- management
-
- You can modify it as you want (except the constructor)"
-      classrelation 15105 // <generalisation>
-	relation 15105 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 15105 // <generalisation>
-	  b parent class_ref 1664 // UmlBaseClassDiagram
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 7553 // UmlClassMember
       end
+    end
 
-      operation 77313 "UmlClassDiagram"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseClassDiagram(id, n) {};
+    artifact 7681 "UmlClassView"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }"
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 7681 // UmlClassView
       end
     end
 
-    class 134018 "UmlObjectDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 7809 "UmlCollaborationDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'object diagrams', notes that the class 'UmlDiagram'
- is a mother class of all the diagrams, allowing to generalize their
- management
-
- You can modify it as you want (except the constructor)"
-      classrelation 137986 // <generalisation>
-	relation 137986 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 137986 // <generalisation>
-	  b parent class_ref 133888 // UmlBaseObjectDiagram
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 7809 // UmlCollaborationDiagram
       end
+    end
 
-      operation 149890 "UmlObjectDiagram"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseObjectDiagram(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+    artifact 7937 "UmlArtifact"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 8193 // UmlArtifact
       end
     end
 
-    class 7425 "UmlClassItem"
-      abstract visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 128002 "UmlComponent"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class globaly manages class's children including UmlClassExtraMember
-
- You can modify it as you want (except the constructor)"
-      classrelation 15233 // <generalisation>
-	relation 15233 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 15233 // <generalisation>
-	  b parent class_ref 1536 // UmlBaseClassItem
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 128002 // UmlComponent
       end
+    end
 
-      operation 77441 "UmlClassItem"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseClassItem(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 8065 "UmlComponentDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 7937 // UmlComponentDiagram
       end
     end
 
-    class 7553 "UmlClassMember"
-      abstract visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class globaly manages class's relations, attributes, operations 
- and sub-classes
+    artifact 8321 "UmlDeploymentDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
- You can modify it as you want (except the constructor)"
-      operation 77569 "UmlClassMember"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseClassMember(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-      end
-
-      classrelation 15361 // <generalisation>
-	relation 15361 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 15361 // <generalisation>
-	  b parent class_ref 1792 // UmlBaseClassMember
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 8321 // UmlDeploymentDiagram
       end
     end
 
-    class 7681 "UmlClassView"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 8449 "UmlDeploymentView"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'class view'
-
- You can modify it as you want (except the constructor)"
-      classrelation 15489 // <generalisation>
-	relation 15489 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 15489 // <generalisation>
-	  b parent class_ref 1920 // UmlBaseClassView
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 8449 // UmlDeploymentView
       end
+    end
 
-      operation 77697 "UmlClassView"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseClassView(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 8577 "UmlDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 8577 // UmlDiagram
       end
     end
 
-    class 7809 "UmlCollaborationDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
- is a mother class of all the diagrams, allowing to generalize their
- management
-
- You can modify it as you want (except the constructor)"
-      classrelation 15617 // <generalisation>
-	relation 15617 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 15617 // <generalisation>
-	  b parent class_ref 2176 // UmlBaseCollaborationDiagram
-      end
+    artifact 8705 "UmlExtraClassMember"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 77825 "UmlCollaborationDiagram"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseCollaborationDiagram(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 8705 // UmlExtraClassMember
       end
     end
 
-    class 7937 "UmlComponentDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
- is a mother class of all the diagrams, allowing to generalize their
- management
-
- You can modify it as you want (except the constructor)"
-      classrelation 15745 // <generalisation>
-	relation 15745 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 15745 // <generalisation>
-	  b parent class_ref 2304 // UmlBaseComponentDiagram
-      end
+    artifact 8833 "UmlItem"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 77953 "UmlComponentDiagram"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseComponentDiagram(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+#include \"UmlCom.h\"
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 8833 // UmlItem
       end
     end
 
-    class 8065 "UmlComponentView"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 8961 "UmlNode"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'component view'
-
- You can modify it as you want (except the constructor)"
-      classrelation 15873 // <generalisation>
-	relation 15873 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 15873 // <generalisation>
-	  b parent class_ref 2432 // UmlBaseComponentView
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 8961 // UmlNode
       end
+    end
 
-      operation 78081 "UmlComponentView"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseComponentView(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 9089 "UmlOperation"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 9089 // UmlOperation
       end
     end
 
-    class 8193 "UmlArtifact"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 140418 "UmlParameter"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'artifacts'
-
- You can modify it as you want (except the constructor)"
-      classrelation 16001 // <generalisation>
-	relation 16001 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 16001 // <generalisation>
-	  b parent class_ref 2048 // UmlBaseArtifact
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 145282 // UmlParameter
       end
+    end
 
-      operation 78209 "UmlArtifact"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseArtifact(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 9217 "UmlPackage"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 9217 // UmlPackage
       end
     end
 
-    class 128002 "UmlComponent"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 9345 "UmlRelation"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'components'
-
- You can modify it as you want (except the constructor)"
-      classrelation 128130 // <generalisation>
-	relation 128130 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 128130 // <generalisation>
-	  b parent class_ref 6528 // UmlBaseComponent
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 9345 // UmlRelation
       end
+    end
 
-      operation 128002 "UmlComponent"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseComponent(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 9473 "UmlNcRelation"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 9473 // UmlNcRelation
       end
     end
 
-    class 8321 "UmlDeploymentDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 9601 "UmlSequenceDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
- is a mother class of all the diagrams, allowing to generalize their
- management
-
- You can modify it as you want (except the constructor)"
-      classrelation 16129 // <generalisation>
-	relation 16129 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 16129 // <generalisation>
-	  b parent class_ref 2560 // UmlBaseDeploymentDiagram
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 9601 // UmlSequenceDiagram
       end
+    end
 
-      operation 78337 "UmlDeploymentDiagram"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseDeploymentDiagram(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 9729 "UmlUseCase"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 9729 // UmlUseCase
       end
     end
 
-    class 8449 "UmlDeploymentView"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 9857 "UmlUseCaseDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'deployment view'
-
- You can modify it as you want (except the constructor)"
-      classrelation 16257 // <generalisation>
-	relation 16257 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 16257 // <generalisation>
-	  b parent class_ref 2688 // UmlBaseDeploymentView
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 9857 // UmlUseCaseDiagram
       end
+    end
 
-      operation 78465 "UmlDeploymentView"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseDeploymentView(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 9985 "UmlUseCaseView"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 9985 // UmlUseCaseView
       end
     end
 
-    class 8577 "UmlDiagram"
-      abstract visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 8193 "UmlComponentView"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class allows to manage extra class member, mainly defined fot C++
- it allows to insert C++ pre-processor directive (even they may be placed
- in the other member definition/declaration), to declare friend
- operation/function etc...
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 8065 // UmlComponentView
+      end
+    end
 
- You can modify it as you want (except the constructor)"
-      classrelation 16385 // <generalisation>
-	relation 16385 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 16385 // <generalisation>
-	  b parent class_ref 2944 // UmlBaseDiagram
-      end
+    artifact 128130 "UmlStateItem"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 78593 "UmlDiagram"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseDiagram(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 128130 // UmlStateItem
       end
     end
 
-    class 8705 "UmlExtraClassMember"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class allows to manage extra class member, It allows to insert
- C++ pre-processor directive (even they may be placed in the other member
- definition/declaration), etc ...
+    artifact 128386 "UmlState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
- You can modify it as you want (except the constructor)
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      classrelation 16513 // <generalisation>
-	relation 16513 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 16513 // <generalisation>
-	  b parent class_ref 3072 // UmlBaseExtraClassMember
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 128386 // UmlState
       end
+    end
 
-      operation 78721 "UmlExtraClassMember"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseExtraClassMember(${p0}, ${p1}) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws} { super(id, n); }
+    artifact 128642 "UmlStateDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 128642 // UmlStateDiagram
       end
     end
 
-    class 8833 "UmlItem"
-      abstract visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 129026 "UmlTransition"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class is a mother class for all the other Uml* classes, this
- allows to generalize their management, declare virtual operations etc ...
-
- You can modify it as you want (except the constructor)"
-      classrelation 16641 // <generalisation>
-	relation 16641 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 16641 // <generalisation>
-	  b parent class_ref 3200 // UmlBaseItem
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 129026 // UmlTransition
       end
+    end
 
-      operation 78849 "UmlItem"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseItem(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 129410 "UmlRegion"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 129410 // UmlRegion
       end
+    end
 
-      operation 78977 "~UmlItem"
-	cpp_virtual public explicit_return_type ""
-	nparams 0
-	cpp_decl "    ${comment}${virtual}${name}${(}${)};
-"
-	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${staticnl}{
-${body}}
+    artifact 129666 "UmlStateAction"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 129666 // UmlStateAction
       end
+    end
 
-      operation 144130 "utilities"
-	cpp_virtual public explicit_return_type "void"
-	nparams 0
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
-"
-	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}{
-${body}}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
-${body}}
-"
-	
-	
-	
-	comment "virtual operation doing 'something' depending on the target
+    artifact 129794 "UmlPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-does nothing by default
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 129794 // UmlPseudoState
       end
     end
 
-    class 8961 "UmlNode"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 130050 "UmlInitialPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'nodes'
-
- You can modify it as you want (except the constructor)"
-      classrelation 16769 // <generalisation>
-	relation 16769 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 16769 // <generalisation>
-	  b parent class_ref 3328 // UmlBaseNode
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 130050 // UmlInitialPseudoState
       end
+    end
 
-      operation 79105 "UmlNode"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseNode(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 130306 "UmlEntryPointPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 130306 // UmlEntryPointPseudoState
       end
     end
 
-    class 9089 "UmlOperation"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 130562 "UmlFinalState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'operations', notes that the class 'UmlClassItem'
- is a mother class of all the class's children.
-
- You can modify it as you want (except the constructor)"
-      classrelation 16897 // <generalisation>
-	relation 16897 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 16897 // <generalisation>
-	  b parent class_ref 3456 // UmlBaseOperation
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 130562 // UmlFinalState
       end
+    end
 
-      operation 79233 "UmlOperation"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseOperation(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 130818 "UmlTerminatePseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 130818 // UmlTerminatePseudoState
       end
     end
 
-    class 145282 "UmlParameter"
-      visibility package stereotype "struct"
-      cpp_decl "${comment}${template}struct ${name}${inherit} {
-${members}};
+    artifact 131074 "UmlExitPointPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      final java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment "  Represent an operation's parameter
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      classrelation 157058 // <generalisation>
-	relation 157058 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 157058 // <generalisation>
-	  b parent class_ref 145152 // UmlBaseParameter
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 131074 // UmlExitPointPseudoState
       end
     end
 
-    class 9217 "UmlPackage"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 131330 "UmlDeepHistoryPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages a 'package', notes that the project itself is a package
-
- You can modify it as you want (except the constructor)"
-      classrelation 17025 // <generalisation>
-	relation 17025 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 17025 // <generalisation>
-	  b parent class_ref 3584 // UmlBasePackage
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 131330 // UmlDeepHistoryPseudoState
       end
+    end
 
-      operation 79361 "UmlPackage"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBasePackage(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 131586 "UmlShallowHistoryPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 131586 // UmlShallowHistoryPseudoState
       end
     end
 
-    class 9345 "UmlRelation"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'relations' between classes, notes that the class 'UmlClassItem'
- is a mother class of all the class's children.
-
- You can modify it as you want (except the constructor)"
-      classrelation 17153 // <generalisation>
-	relation 17153 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 17153 // <generalisation>
-	  b parent class_ref 3712 // UmlBaseRelation
-      end
+    artifact 131842 "UmlJunctionPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 79489 "UmlRelation"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseRelation(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 131842 // UmlJunctionPseudoState
       end
     end
 
-    class 9473 "UmlNcRelation"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment "This class manages 'relations' between non class objects
-
- You can modify it as you want (except the constructor)"
-      classrelation 17281 // <generalisation>
-	relation 17281 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 17281 // <generalisation>
-	  b parent class_ref 3840 // UmlBaseNcRelation
-      end
+    artifact 132098 "UmlChoicePseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 79617 "UmlNcRelation"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseNcRelation(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 132098 // UmlChoicePseudoState
       end
     end
 
-    class 9601 "UmlSequenceDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 132354 "UmlForkPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
- is a mother class of all the diagrams, allowing to generalize their
- management
-
- You can modify it as you want (except the constructor)"
-      classrelation 17409 // <generalisation>
-	relation 17409 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 17409 // <generalisation>
-	  b parent class_ref 3968 // UmlBaseSequenceDiagram
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 132354 // UmlForkPseudoState
       end
+    end
 
-      operation 79745 "UmlSequenceDiagram"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseSequenceDiagram(id, n) {};
+    artifact 132610 "UmlJoinPseudoState"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }"
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 132610 // UmlJoinPseudoState
       end
     end
 
-    class 9729 "UmlUseCase"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 134018 "UmlObjectDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'use case'
-
- You can modify it as you want (except the constructor)"
-      classrelation 17537 // <generalisation>
-	relation 17537 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 17537 // <generalisation>
-	  b parent class_ref 4096 // UmlBaseUseCase
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 134018 // UmlObjectDiagram
       end
+    end
 
-      operation 79873 "UmlUseCase"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseUseCase(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 134146 "UmlActivityItem"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 134146 // UmlActivityItem
       end
     end
 
-    class 9857 "UmlUseCaseDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 134402 "UmlActivity"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'use case diagrams', notes that the class 'UmlDiagram'
- is a mother class of all the diagrams, allowing to generalize their
- management
-
- You can modify it as you want (except the constructor)"
-      classrelation 17665 // <generalisation>
-	relation 17665 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 17665 // <generalisation>
-	  b parent class_ref 4224 // UmlBaseUseCaseDiagram
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 134402 // UmlActivity
       end
+    end
 
-      operation 80001 "UmlUseCaseDiagram"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseUseCaseDiagram(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 134658 "UmlActivityDiagram"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 134658 // UmlActivityDiagram
       end
     end
 
-    class 9985 "UmlUseCaseView"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 134914 "UmlActivityNode"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}};
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'use case view'
-
- You can modify it as you want (except the constructor)"
-      classrelation 17793 // <generalisation>
-	relation 17793 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 17793 // <generalisation>
-	  b parent class_ref 4352 // UmlBaseUseCaseView
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 134914 // UmlActivityNode
       end
+    end
 
-      operation 80129 "UmlUseCaseView"
-	cpp_inline public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseUseCaseView(id, n) {};
-"
-	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+    artifact 135170 "UmlFlow"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 135170 // UmlFlow
       end
     end
 
-    class 128130 "UmlStateItem"
-      visibility package stereotype "interface"
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 135554 "UmlActivityRegion"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}interface ${name}${extends} {
-${members}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 135554 // UmlActivityRegion
+      end
     end
 
-    class 128386 "UmlState"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 135810 "UmlExpansionRegion"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 128514 // <generalisation>
-	relation 128514 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 128514 // <generalisation>
-	  b parent class_ref 128256 // UmlBaseState
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 135810 // UmlExpansionRegion
       end
+    end
 
-      classrelation 128642 // <generalisation>
-	relation 128642 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 128642 // <generalisation>
-	  b parent class_ref 128130 // UmlStateItem
-      end
+    artifact 136194 "UmlInterruptibleActivityRegion"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 128514 "UmlState"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseState(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 136194 // UmlInterruptibleActivityRegion
       end
     end
 
-    class 128642 "UmlStateDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 136450 "UmlActivityAction"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 129026 // <generalisation>
-	relation 129026 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 129026 // <generalisation>
-	  b parent class_ref 128512 // UmlBaseStateDiagram
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 136450 // UmlActivityAction
       end
+    end
 
-      classrelation 129154 // <generalisation>
-	relation 129154 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 129154 // <generalisation>
-	  b parent class_ref 128130 // UmlStateItem
-      end
+    artifact 136706 "UmlActivityActionClasses"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 129026 "UmlStateDiagram"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseStateDiagram(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 136706 // UmlSendObjectAction
+	class_ref 136962 // UmlUnmarshallAction
+	class_ref 137474 // UmlSendSignalAction
+	class_ref 137730 // UmlBroadcastSignalAction
+	class_ref 137986 // UmlValueSpecificationAction
+	class_ref 138242 // UmlOpaqueAction
+	class_ref 138498 // UmlAcceptEventAction
+	class_ref 138754 // UmlCallOperationAction
+	class_ref 139010 // UmlCallBehaviorAction
+	class_ref 139522 // UmlClearVariableValueAction
+	class_ref 139778 // UmlReadVariableValueAction
+	class_ref 140034 // UmlWriteVariableValueAction
+	class_ref 140290 // UmlAddVariableValueAction
+	class_ref 140546 // UmlRemoveVariableValueAction
+	class_ref 150018 // UmlAcceptCallAction
+	class_ref 150274 // UmlReplyAction
+	class_ref 150530 // UmlCreateObjectAction
+	class_ref 150786 // UmlDestroyObjectAction
+	class_ref 151042 // UmlTestIdentityAction
+	class_ref 151298 // UmlRaiseExceptionAction
+	class_ref 151554 // UmlReduceAction
       end
     end
 
-    class 134658 "UmlActivityDiagram"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 136962 "UmlOnSignalAction"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      comment " This class manages 'activity diagrams', notes that the class 'UmlDiagram'
- is a mother class of all the diagrams, allowing to generalize their
- management
-
- You can modify it as you want (except the constructor)"
-      classrelation 138754 // <generalisation>
-	relation 138754 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 138754 // <generalisation>
-	  b parent class_ref 134528 // UmlBaseActivityDiagram
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 137218 // UmlOnSignalAction
       end
+    end
 
-      classrelation 138882 // <generalisation>
-	relation 138882 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 138882 // <generalisation>
-	  b parent class_ref 134146 // UmlActivityItem
-      end
+    artifact 137218 "UmlAccessVariableValueAction"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 152962 "UmlActivityDiagram"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityDiagram(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 139266 // UmlAccessVariableValueAction
       end
     end
 
-    class 129026 "UmlTransition"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 137474 "UmlActivityControlNode"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 130050 // <generalisation>
-	relation 130050 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 130050 // <generalisation>
-	  b parent class_ref 128896 // UmlBaseTransition
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 140802 // UmlActivityControlNode
       end
+    end
 
-      classrelation 130178 // <generalisation>
-	relation 130178 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 130178 // <generalisation>
-	  b parent class_ref 128130 // UmlStateItem
-      end
+    artifact 137730 "UmlActivityControlNodeClasses"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 135938 "UmlTransition"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseTransition(id) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id);
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 141058 // UmlInitialActivityNode
+	class_ref 141314 // UmlFlowFinalActivityNode
+	class_ref 141570 // UmlActivityFinalActivityNode
+	class_ref 141826 // UmlDecisionActivityNode
+	class_ref 142082 // UmlMergeActivityNode
+	class_ref 142338 // UmlForkActivityNode
+	class_ref 142594 // UmlJoinActivityNode
       end
     end
 
-    class 129410 "UmlRegion"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 137986 "UmlActivityObject"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 131074 // <generalisation>
-	relation 131074 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 131074 // <generalisation>
-	  b parent class_ref 129280 // UmlBaseRegion
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 142850 // UmlActivityObject
       end
+    end
 
-      classrelation 131202 // <generalisation>
-	relation 131202 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 131202 // <generalisation>
-	  b parent class_ref 128130 // UmlStateItem
-      end
+    artifact 138370 "UmlExpansionNode"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 136450 "UmlRegion"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseRegion(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 143234 // UmlExpansionNode
       end
     end
 
-    class 129666 "UmlStateAction"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 138626 "UmlPinParameter"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 131586 // <generalisation>
-	relation 131586 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 131586 // <generalisation>
-	  b parent class_ref 129536 // UmlBaseStateAction
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 143490 // UmlPinParameter
       end
+    end
 
-      classrelation 131714 // <generalisation>
-	relation 131714 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 131714 // <generalisation>
-	  b parent class_ref 128130 // UmlStateItem
-      end
+    artifact 139010 "UmlActivityPin"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 136578 "UmlStateAction"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseStateAction(id, \"\") {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 143874 // UmlActivityPin
       end
     end
 
-    class 129794 "UmlPseudoState"
-      abstract visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 139266 "UmlActivityParameter"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      operation 138370 "UmlPseudoState"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlItem(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 144130 // UmlActivityParameter
       end
+    end
 
-      classrelation 131842 // <generalisation>
-	relation 131842 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 131842 // <generalisation>
-	  b parent class_ref 128130 // UmlStateItem
-      end
+    artifact 139522 "UmlParameterSet"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      classrelation 131970 // <generalisation>
-	relation 131970 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 131970 // <generalisation>
-	  b parent class_ref 8833 // UmlItem
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 144386 // UmlParameterSet
       end
     end
 
-    class 130050 "UmlInitialPseudoState"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
+    artifact 139906 "UmlClassInstance"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 132354 // <generalisation>
-	relation 132354 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 132354 // <generalisation>
-	  b parent class_ref 129920 // UmlBaseInitialPseudoState
-      end
-
-      operation 138882 "UmlInitialPseudoState"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseInitialPseudoState(id, \"\") {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
-"
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
-      end
-    end
-
-    class 130306 "UmlEntryPointPseudoState"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 132738 // <generalisation>
-	relation 132738 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 132738 // <generalisation>
-	  b parent class_ref 130176 // UmlBaseEntryPointPseudoState
-      end
-
-      operation 139394 "UmlEntryPointPseudoState"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseEntryPointPseudoState(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
-"
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
-      end
-    end
-
-    class 130562 "UmlFinalState"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 133122 // <generalisation>
-	relation 133122 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 133122 // <generalisation>
-	  b parent class_ref 130432 // UmlBaseFinalState
-      end
-
-      operation 139906 "UmlFinalState"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseFinalState(id, \"\") {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
-"
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
-      end
-    end
-
-    class 130818 "UmlTerminatePseudoState"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 133506 // <generalisation>
-	relation 133506 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 133506 // <generalisation>
-	  b parent class_ref 130688 // UmlBaseTerminatePseudoState
-      end
-
-      operation 140418 "UmlTerminatePseudoState"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseTerminatePseudoState(id, \"\") {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
-"
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 144770 // UmlClassInstance
       end
     end
 
-    class 131074 "UmlExitPointPseudoState"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 133890 // <generalisation>
-	relation 133890 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 133890 // <generalisation>
-	  b parent class_ref 130944 // UmlBaseExitPointPseudoState
-      end
+    artifact 140930 "UmlView"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 140930 "UmlExitPointPseudoState"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseExitPointPseudoState(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 145794 // UmlView
       end
     end
 
-    class 131330 "UmlDeepHistoryPseudoState"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 134274 // <generalisation>
-	relation 134274 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 134274 // <generalisation>
-	  b parent class_ref 131200 // UmlBaseDeepHistoryPseudoState
-      end
+    artifact 144898 "UmlActivityPartition"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
 
-      operation 141442 "UmlDeepHistoryPseudoState"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseDeepHistoryPseudoState(id, \"\") {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
 "
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      java_src "${comment}
+${package}
+${definition}"
+      associated_classes
+	class_ref 149762 // UmlActivityPartition
       end
     end
 
-    class 131586 "UmlShallowHistoryPseudoState"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
-
-${inlines}
-"
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
-"
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
+    artifact 6529 "executable"
+      stereotype "executable"
+      associated_artifacts
+	artifact_ref 134528 // UmlBaseActivityDiagram
+	artifact_ref 4736 // CppSettings
+	artifact_ref 7297 // UmlClass
+	artifact_ref 138370 // UmlExpansionNode
+	artifact_ref 139392 // UmlBaseParameterSet
+	artifact_ref 130688 // UmlBaseTerminatePseudoState
+	artifact_ref 132480 // UmlBaseJoinPseudoState
+	artifact_ref 136064 // UmlBaseInterruptibleActivityRegion
+	artifact_ref 140288 // UmlBaseParameter
+	artifact_ref 144128 // UmlBaseSequenceDiagramDefinition
+	artifact_ref 140930 // UmlView
+	artifact_ref 134658 // UmlActivityDiagram
+	artifact_ref 128512 // UmlBaseStateDiagram
+	artifact_ref 9729 // UmlUseCase
+	artifact_ref 139136 // UmlBaseActivityParameter
+	artifact_ref 1024 // UmlBaseClassDiagram
+	artifact_ref 144898 // UmlActivityPartition
+	artifact_ref 133888 // UmlBaseObjectDiagram
+	artifact_ref 8961 // UmlNode
+	artifact_ref 139522 // UmlParameterSet
+	artifact_ref 1792 // UmlBaseComponentView
+	artifact_ref 134914 // UmlActivityNode
+	artifact_ref 128642 // UmlStateDiagram
+	artifact_ref 131586 // UmlShallowHistoryPseudoState
+	artifact_ref 256 // UmlBaseActualParameter
+	artifact_ref 137088 // UmlBaseAccessVariableValueAction
+	artifact_ref 6913 // UmlClassItem
+	artifact_ref 135810 // UmlExpansionRegion
+	artifact_ref 130050 // UmlInitialPseudoState
+	artifact_ref 142338 // UmlUseCaseAssociation
+	artifact_ref 130176 // UmlBaseEntryPointPseudoState
+	artifact_ref 1664 // UmlBaseComponentDiagram
+	artifact_ref 7041 // UmlFormalParameter
+	artifact_ref 142464 // UmlBaseUseCaseAssociation
+	artifact_ref 135680 // UmlBaseExpansionRegion
+	artifact_ref 5632 // OnInstanceCmd
+	artifact_ref 137986 // UmlActivityObject
+	artifact_ref 4992 // JavaSettings
+	artifact_ref 3712 // UmlBaseUseCaseView
+	artifact_ref 131968 // UmlBaseChoicePseudoState
+	artifact_ref 896 // UmlBaseClass
+	artifact_ref 138752 // aParameterEffectKind
+	artifact_ref 139648 // aLanguage
+	artifact_ref 144768 // UmlBaseActivityPartition
+	artifact_ref 9985 // UmlUseCaseView
+	artifact_ref 137730 // UmlActivityControlNodeClasses
+	artifact_ref 135424 // UmlBaseActivityRegion
+	artifact_ref 132610 // UmlJoinPseudoState
+	artifact_ref 2560 // UmlBaseItem
+	artifact_ref 139906 // UmlClassInstance
+	artifact_ref 7809 // UmlCollaborationDiagram
+	artifact_ref 136576 // UmlBaseActivityActionClasses
+	artifact_ref 3584 // UmlBaseUseCaseDiagram
+	artifact_ref 144640 // PythonSettingsCmd
+	artifact_ref 131712 // UmlBaseJunctionPseudoState
+	artifact_ref 129666 // UmlStateAction
+	artifact_ref 4224 // anItemKind
+	artifact_ref 5248 // UmlCom
+	artifact_ref 1536 // UmlBaseArtifact
+	artifact_ref 129026 // UmlTransition
+	artifact_ref 3328 // UmlBaseSequenceDiagram
+	artifact_ref 141952 // UmlBaseSubject
+	artifact_ref 129280 // UmlBaseRegion
+	artifact_ref 5120 // UmlSettings
+	artifact_ref 136320 // UmlBaseActivityAction
+	artifact_ref 130562 // UmlFinalState
+	artifact_ref 130306 // UmlEntryPointPseudoState
+	artifact_ref 140544 // UmlBaseTypeSpec
+	artifact_ref 130818 // UmlTerminatePseudoState
+	artifact_ref 2304 // UmlBaseDiagram
+	artifact_ref 140160 // SlotRelation
+	artifact_ref 7425 // UmlClassDiagram
+	artifact_ref 134146 // UmlActivityItem
+	artifact_ref 141696 // UmlBaseFragmentCompartment
+	artifact_ref 143746 // UmlUseCaseDiagramDefinition
+	artifact_ref 7681 // UmlClassView
+	artifact_ref 135040 // UmlBaseFlow
+	artifact_ref 138112 // anOrdering
+	artifact_ref 5376 // CmdFamily
+	artifact_ref 141314 // UmlFragment
+	artifact_ref 9217 // UmlPackage
+	artifact_ref 139266 // UmlActivityParameter
+	artifact_ref 131200 // UmlBaseDeepHistoryPseudoState
+	artifact_ref 384 // UmlBaseClassItem
+	artifact_ref 136194 // UmlInterruptibleActivityRegion
+	artifact_ref 2176 // UmlBaseDeploymentView
+	artifact_ref 141568 // UmlBaseFragment
+	artifact_ref 140032 // SlotAttribute
+	artifact_ref 143360 // UmlBaseSequenceMessage
+	artifact_ref 3968 // aDirection
+	artifact_ref 8065 // UmlComponentDiagram
+	artifact_ref 6144 // CppSettingsCmd
+	artifact_ref 144258 // UmlCollaborationDiagramDefinition
+	artifact_ref 128896 // UmlBaseTransition
+	artifact_ref 141056 // PhpSettings
+	artifact_ref 141442 // UmlFragmentCompartment
+	artifact_ref 131330 // UmlDeepHistoryPseudoState
+	artifact_ref 138626 // UmlPinParameter
+	artifact_ref 3840 // aRelationKind
+	artifact_ref 2944 // UmlBasePackage
+	artifact_ref 142594 // UmlClassInstanceReference
+	artifact_ref 144384 // UmlBaseCollaborationDiagramDefinition
+	artifact_ref 512 // UmlBaseFormalParameter
+	artifact_ref 137600 // UmlBaseActivityControlNodeClasses
+	artifact_ref 136450 // UmlActivityAction
+	artifact_ref 128768 // StateBehavior
+	artifact_ref 128130 // UmlStateItem
+	artifact_ref 1152 // UmlBaseClassMember
+	artifact_ref 136962 // UmlOnSignalAction
+	artifact_ref 1920 // UmlBaseDeployment
+	artifact_ref 135554 // UmlActivityRegion
+	artifact_ref 142976 // UmlBaseMessage
+	artifact_ref 131842 // UmlJunctionPseudoState
+	artifact_ref 5888 // PackageGlobalCmd
+	artifact_ref 132098 // UmlChoicePseudoState
+	artifact_ref 8193 // UmlComponentView
+	artifact_ref 134272 // UmlBaseActivity
+	artifact_ref 137344 // UmlBaseActivityControlNode
+	artifact_ref 144002 // UmlSequenceDiagramDefinition
+	artifact_ref 134402 // UmlActivity
+	artifact_ref 140674 // UmlTypeSpec
+	artifact_ref 135170 // UmlFlow
+	artifact_ref 130432 // UmlBaseFinalState
+	artifact_ref 6785 // UmlActualParameter
+	artifact_ref 142720 // UmlBaseClassInstanceReference
+	artifact_ref 132224 // UmlBaseForkPseudoState
+	artifact_ref 7169 // UmlAttribute
+	artifact_ref 135936 // anExpansionKind
+	artifact_ref 2816 // UmlBaseOperation
+	artifact_ref 5760 // ClassGlobalCmd
+	artifact_ref 8577 // UmlDiagram
+	artifact_ref 143872 // UmlBaseUseCaseDiagramDefinition
+	artifact_ref 132354 // UmlForkPseudoState
+	artifact_ref 140418 // UmlParameter
+	artifact_ref 128256 // UmlBaseState
+	artifact_ref 132738 // ConstrDestrCopyDialog
+	artifact_ref 138880 // UmlBaseActivityPin
+	artifact_ref 4608 // UmlStereotype
+	artifact_ref 9345 // UmlRelation
+	artifact_ref 129794 // UmlPseudoState
+	artifact_ref 2688 // UmlBaseNode
+	artifact_ref 143616 // UmlBaseCollaborationMessage
+	artifact_ref 141826 // UmlSubject
+	artifact_ref 136832 // UmlBaseOnSignalAction
+	artifact_ref 9089 // UmlOperation
+	artifact_ref 6400 // IdlSettingsCmd
+	artifact_ref 7553 // UmlClassMember
+	artifact_ref 128002 // UmlComponent
+	artifact_ref 129920 // UmlBaseInitialPseudoState
+	artifact_ref 4480 // UmlBuiltin
+	artifact_ref 6528 // UmlBaseComponent
+	artifact_ref 142208 // UmlBaseUseCaseReference
+	artifact_ref 137218 // UmlAccessVariableValueAction
+	artifact_ref 5504 // MiscGlobalCmd
+	artifact_ref 142850 // UmlMessage
+	artifact_ref 4864 // IdlSettings
+	artifact_ref 768 // UmlBaseAttribute
+	artifact_ref 9473 // UmlNcRelation
+	artifact_ref 138496 // UmlBasePinParameter
+	artifact_ref 129536 // UmlBaseStateAction
+	artifact_ref 140800 // UmlBaseView
+	artifact_ref 137474 // UmlActivityControlNode
+	artifact_ref 128386 // UmlState
+	artifact_ref 135296 // FlowBehavior
+	artifact_ref 129410 // UmlRegion
+	artifact_ref 2432 // UmlBaseExtraClassMember
+	artifact_ref 138240 // UmlBaseExpansionNode
+	artifact_ref 3456 // UmlBaseUseCase
+	artifact_ref 131456 // UmlBaseShallowHistoryPseudoState
+	artifact_ref 141184 // PhpSettingsCmd
+	artifact_ref 7937 // UmlArtifact
+	artifact_ref 4096 // aVisibility
+	artifact_ref 136706 // UmlActivityActionClasses
+	artifact_ref 1408 // UmlBaseCollaborationDiagram
+	artifact_ref 3200 // UmlBaseNcRelation
+	artifact_ref 6657 // Main
+	artifact_ref 129152 // TransitionBehavior
+	artifact_ref 144512 // PythonSettings
+	artifact_ref 142082 // UmlUseCaseReference
+	artifact_ref 6272 // JavaSettingsCmd
+	artifact_ref 8833 // UmlItem
+	artifact_ref 9857 // UmlUseCaseDiagram
+	artifact_ref 131074 // UmlExitPointPseudoState
+	artifact_ref 134018 // UmlObjectDiagram
+	artifact_ref 3072 // UmlBaseRelation
+	artifact_ref 8449 // UmlDeploymentView
+	artifact_ref 134784 // UmlBaseActivityNode
+	artifact_ref 137856 // UmlBaseActivityObject
+	artifact_ref 8321 // UmlDeploymentDiagram
+	artifact_ref 143106 // UmlSequenceMessage
+	artifact_ref 1280 // UmlBaseClassView
+	artifact_ref 130944 // UmlBaseExitPointPseudoState
+	artifact_ref 8705 // UmlExtraClassMember
+	artifact_ref 9601 // UmlSequenceDiagram
+	artifact_ref 143232 // aMessageKind
+	artifact_ref 143490 // UmlCollaborationMessage
+	artifact_ref 2048 // UmlBaseDeploymentDiagram
+	artifact_ref 139776 // UmlBaseClassInstance
+	artifact_ref 6016 // UmlSettingsCmd
+	artifact_ref 139010 // UmlActivityPin
+      end
+      ncouples 10
+      key "genpro pro" value "/tmp/cpp_utilities/cpp_utilities.pro"
+      key "genpro path" value "/tmp/utilities/cpp/"
+      key "genpro target" value "/tmp/cpp_utilities/cpp_util"
+      key "genpro tmplt" value "app"
+      key "genpro config" value "debug warn_on qt"
+      key "genpro defines" value "WITHCPP"
+      key "genpro includepath" value ""
+      key "genpro dependpath" value ""
+      key "genpro objectsdir" value ""
+      key "genpro footer" value ""
+      comment "  Reference all the components used to made a C++ executable,
+  used by 'genpro' to produce a .pro file allowing to produce a Makefile
+  with 'tmake' or 'qmake'"
+    end
+  end
+
+  classview 769 "API USER class view"
+    //class diagram settings
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+    //state diagram settings
+    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+    show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+    //class settings
+    //activity diagram settings
+    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+    show_infonote default drawing_language default show_stereotype_properties default
+    associated_deployment_view deploymentview_ref 641 // API USER Deployment view
+    comment "'your' API classes, modify them !"
+    class 6785 "UmlActualParameter"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}};
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
       explicit_switch_type ""
       
-      classrelation 134658 // <generalisation>
-	relation 134658 ---|>
+      comment " This class manages 'actual parameters' of a template class. For instance T in
+
+	class Cl1 : public Cl2<T> ...
+
+ You can modify it as you want (except the constructor)"
+      classrelation 14593 // (<generalisation>)
+	relation 14593 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 14593 // (<generalisation>)
+	  b parent class_ref 896 // UmlBaseActualParameter
+      end
+
+      operation 76801 "UmlActualParameter"
+	cpp_inline public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${name}${(}${)}${volatile}${throw} {};
+"
+	java_def "  ${comment}${visibility}${final}${name}${(}${)}${throws}{
+${body}}
+"
+	
+	
+	
+      end
+    end
+
+    class 6913 "UmlFormalParameter"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}};
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      comment " This class manages 'formal parameters' of a template class. For instance 'T' in
+
+	template class Cl<class T> ...
+
+ You can modify it as you want (except the constructor)"
+      classrelation 14721 // (<generalisation>)
+	relation 14721 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 134658 // <generalisation>
-	  b parent class_ref 131456 // UmlBaseShallowHistoryPseudoState
+	    classrelation_ref 14721 // (<generalisation>)
+	  b parent class_ref 1024 // UmlBaseFormalParameter
       end
 
-      operation 141954 "UmlShallowHistoryPseudoState"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseShallowHistoryPseudoState(id, \"\") {
-}
+      operation 76929 "UmlFormalParameter"
+	cpp_inline public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${name}${(}${)}${volatile}${throw} {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${)}${throws}{
+${body}}
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 131842 "UmlJunctionPseudoState"
+    class 7041 "UmlAttribute"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2196,41 +2372,43 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 135042 // <generalisation>
-	relation 135042 ---|>
+      comment " This class manages 'attribute', notes that the class 'UmlClassItem'
+ is a mother class of the class's children.
+
+ You can modify it as you want (except the constructor)"
+      classrelation 14849 // (<generalisation>)
+	relation 14849 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 135042 // <generalisation>
-	  b parent class_ref 131712 // UmlBaseJunctionPseudoState
+	    classrelation_ref 14849 // (<generalisation>)
+	  b parent class_ref 1280 // UmlBaseAttribute
       end
 
-      operation 142466 "UmlJunctionPseudoState"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseJunctionPseudoState(id, \"\") {
-}
+      operation 77057 "UmlAttribute"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} :  UmlBaseAttribute(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 132098 "UmlChoicePseudoState"
+    class 7169 "UmlClass"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2238,41 +2416,133 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 135426 // <generalisation>
-	relation 135426 ---|>
+      comment " This class manages 'classes', notes that the class 'ClassItem'
+ is a mother class of the class's children.
+
+ You can modify it as you want (except the constructor)"
+      classrelation 14977 // (<generalisation>)
+	relation 14977 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 135426 // <generalisation>
-	  b parent class_ref 131968 // UmlBaseChoicePseudoState
+	    classrelation_ref 14977 // (<generalisation>)
+	  b parent class_ref 1408 // UmlBaseClass
       end
 
-      operation 142978 "UmlChoicePseudoState"
-	public explicit_return_type ""
+      operation 77185 "UmlClass"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseClass(id, n) {};
+"
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+"
+	
+	
+	
+      end
+
+      operation 144258 "utilities"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+${body}}
+"
+	
+	
+	
+	comment "virtual operation doing 'something'
+
+here allows to add contructor / destructor / copy constructor / operator="
+      end
+
+      operation 144642 "addContructor"
+	preserve_cpp_body_indent public explicit_return_type "void"
 	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseChoicePseudoState(id, \"\") {
-}
+	
+	  param in name "expl" explicit_type "bool"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+	
+	comment "add a constructor to the class
+"
+      end
+
+      operation 144770 "addDestructor"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "virt" explicit_type "bool"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+	comment "add a destructor to the class
+"
+      end
+
+      operation 144898 "addCopy"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "cte" explicit_type "bool"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+	comment "add a copy constructor to the class"
+      end
+
+      operation 145026 "addAssign"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "cte" explicit_type "bool"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+	comment "add operator= to the class"
       end
     end
 
-    class 132354 "UmlForkPseudoState"
+    class 7297 "UmlClassDiagram"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2280,41 +2550,43 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 135810 // <generalisation>
-	relation 135810 ---|>
+      comment " This class manages 'class diagrams', notes that the class 'UmlDiagram'
+ is a mother class of all the diagrams, allowing to generalize their
+ management
+
+ You can modify it as you want (except the constructor)"
+      classrelation 15105 // (<generalisation>)
+	relation 15105 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 135810 // <generalisation>
-	  b parent class_ref 132224 // UmlBaseForkPseudoState
+	    classrelation_ref 15105 // (<generalisation>)
+	  b parent class_ref 1664 // UmlBaseClassDiagram
       end
 
-      operation 143490 "UmlForkPseudoState"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseForkPseudoState(id, \"\") {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
-}
+      operation 77313 "UmlClassDiagram"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseClassDiagram(id, n) {};
 "
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }"
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 132610 "UmlJoinPseudoState"
+    class 134018 "UmlObjectDiagram"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2329,24 +2601,31 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 136194 // <generalisation>
-	relation 136194 ---|>
+      comment " This class manages 'object diagrams', notes that the class 'UmlDiagram'
+ is a mother class of all the diagrams, allowing to generalize their
+ management
+
+ You can modify it as you want (except the constructor)"
+      classrelation 137986 // (<generalisation>)
+	relation 137986 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 136194 // <generalisation>
-	  b parent class_ref 132480 // UmlBaseJoinPseudoState
+	    classrelation_ref 137986 // (<generalisation>)
+	  b parent class_ref 133888 // UmlBaseObjectDiagram
       end
 
-      operation 144002 "UmlJoinPseudoState"
-	public explicit_return_type ""
-	nparams 1
-	  param in name "id" explicit_type "item_id"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}${)} : UmlBaseJoinPseudoState(id, \"\") {
-}
+      operation 149890 "UmlObjectDiagram"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseObjectDiagram(id, s) {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
-  super(id, \"\");
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
 }
 "
 	
@@ -2356,25 +2635,51 @@ ${members}}
       end
     end
 
-    class 134146 "UmlActivityItem"
-      visibility package stereotype "interface"
+    class 7425 "UmlClassItem"
+      abstract visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
 ${inlines}
 "
-      java_decl "${comment}${public}interface ${name}${extends} {
-${members}}
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
+      comment " This class globaly manages class's children including UmlClassExtraMember
+
+ You can modify it as you want (except the constructor)"
+      classrelation 15233 // (<generalisation>)
+	relation 15233 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 15233 // (<generalisation>)
+	  b parent class_ref 1536 // UmlBaseClassItem
+      end
+
+      operation 77441 "UmlClassItem"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseClassItem(id, n) {};
+"
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
+"
+	
+	
+	
+      end
     end
 
-    class 134402 "UmlActivity"
-      visibility package 
+    class 7553 "UmlClassMember"
+      abstract visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
@@ -2388,87 +2693,79 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 138370 // <generalisation>
-	relation 138370 ---|>
+      comment " This class globaly manages class's relations, attributes, operations
+ and sub-classes
+
+ You can modify it as you want (except the constructor)"
+      classrelation 15361 // (<generalisation>)
+	relation 15361 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 138370 // <generalisation>
-	  b parent class_ref 134272 // UmlBaseActivity
+	    classrelation_ref 15361 // (<generalisation>)
+	  b parent class_ref 1792 // UmlBaseClassMember
       end
 
-      operation 150402 "UmlActivity"
-	public explicit_return_type ""
+      operation 77569 "UmlClassMember"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivity(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseClassMember(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 134914 "UmlActivityNode"
-      abstract visibility package 
+    class 7681 "UmlClassView"
+      visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 139394 // <generalisation>
-	relation 139394 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 139394 // <generalisation>
-	  b parent class_ref 134784 // UmlBaseActivityNode
-      end
+      comment " This class manages 'class view'
 
-      classrelation 139522 // <generalisation>
-	relation 139522 ---|>
+ You can modify it as you want (except the constructor)"
+      classrelation 15489 // (<generalisation>)
+	relation 15489 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 139522 // <generalisation>
-	  b parent class_ref 134146 // UmlActivityItem
+	    classrelation_ref 15489 // (<generalisation>)
+	  b parent class_ref 1920 // UmlBaseClassView
       end
 
-      operation 153986 "UmlActivityNode"
-	protected explicit_return_type ""
+      operation 77697 "UmlClassView"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityNode(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseClassView(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 135170 "UmlFlow"
+    class 7809 "UmlCollaborationDiagram"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2476,42 +2773,36 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 139906 // <generalisation>
-	relation 139906 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 139906 // <generalisation>
-	  b parent class_ref 135040 // UmlBaseFlow
-      end
+      comment " This class manages 'collaboration diagrams', notes that the class 'UmlDiagram'
+ is a mother class of all the diagrams, allowing to generalize their
+ management
 
-      classrelation 140034 // <generalisation>
-	relation 140034 ---|>
+ You can modify it as you want (except the constructor)"
+      classrelation 15617 // (<generalisation>)
+	relation 15617 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 140034 // <generalisation>
-	  b parent class_ref 134146 // UmlActivityItem
+	    classrelation_ref 15617 // (<generalisation>)
+	  b parent class_ref 2176 // UmlBaseCollaborationDiagram
       end
 
-      operation 158466 "UmlFlow"
-	public explicit_return_type ""
+      operation 77825 "UmlCollaborationDiagram"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "n" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseFlow(id, n) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseCollaborationDiagram(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, n);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
@@ -2519,59 +2810,52 @@ ${members}}
       end
     end
 
-    class 135554 "UmlActivityRegion"
-      abstract visibility package 
+    class 7937 "UmlComponentDiagram"
+      visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 140930 // <generalisation>
-	relation 140930 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 140930 // <generalisation>
-	  b parent class_ref 135424 // UmlBaseActivityRegion
-      end
+      comment " This class manages 'ccomponent diagrams', notes that the class 'UmlDiagram'
+ is a mother class of all the diagrams, allowing to generalize their
+ management
 
-      classrelation 141058 // <generalisation>
-	relation 141058 ---|>
+ You can modify it as you want (except the constructor)"
+      classrelation 15745 // (<generalisation>)
+	relation 15745 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 141058 // <generalisation>
-	  b parent class_ref 134146 // UmlActivityItem
+	    classrelation_ref 15745 // (<generalisation>)
+	  b parent class_ref 2304 // UmlBaseComponentDiagram
       end
 
-      operation 158722 "UmlActivityRegion"
-	protected explicit_return_type ""
+      operation 77953 "UmlComponentDiagram"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityRegion(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseComponentDiagram(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 135810 "UmlExpansionRegion"
+    class 8065 "UmlComponentView"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2579,42 +2863,42 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 141570 // <generalisation>
-	relation 141570 ---|>
+      comment " This class manages 'component view'
+
+ You can modify it as you want (except the constructor)"
+      classrelation 15873 // (<generalisation>)
+	relation 15873 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 141570 // <generalisation>
-	  b parent class_ref 135680 // UmlBaseExpansionRegion
+	    classrelation_ref 15873 // (<generalisation>)
+	  b parent class_ref 2432 // UmlBaseComponentView
       end
 
-      operation 159618 "UmlExpansionRegion"
-	public explicit_return_type ""
+      operation 78081 "UmlComponentView"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseExpansionRegion(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseComponentView(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 136194 "UmlInterruptibleActivityRegion"
+    class 8193 "UmlArtifact"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2622,85 +2906,85 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 142082 // <generalisation>
-	relation 142082 ---|>
+      comment " This class manages 'artifacts'
+
+ You can modify it as you want (except the constructor)"
+      classrelation 16001 // (<generalisation>)
+	relation 16001 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 142082 // <generalisation>
-	  b parent class_ref 136064 // UmlBaseInterruptibleActivityRegion
+	    classrelation_ref 16001 // (<generalisation>)
+	  b parent class_ref 2048 // UmlBaseArtifact
       end
 
-      operation 160770 "UmlInterruptibleActivityRegion"
-	public explicit_return_type ""
+      operation 78209 "UmlArtifact"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseInterruptibleActivityRegion(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseArtifact(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 136450 "UmlActivityAction"
-      abstract visibility package 
+    class 128002 "UmlComponent"
+      visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 142466 // <generalisation>
-	relation 142466 ---|>
+      comment " This class manages 'components'
+
+ You can modify it as you want (except the constructor)"
+      classrelation 128130 // (<generalisation>)
+	relation 128130 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 142466 // <generalisation>
-	  b parent class_ref 136320 // UmlBaseActivityAction
+	    classrelation_ref 128130 // (<generalisation>)
+	  b parent class_ref 6528 // UmlBaseComponent
       end
 
-      operation 161026 "UmlActivityAction"
-	protected explicit_return_type ""
+      operation 128002 "UmlComponent"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseComponent(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 136706 "UmlSendObjectAction"
+    class 8321 "UmlDeploymentDiagram"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2708,42 +2992,44 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 142978 // <generalisation>
-	relation 142978 ---|>
+      comment " This class manages 'deployment diagrams', notes that the class 'UmlDiagram'
+ is a mother class of all the diagrams, allowing to generalize their
+ management
+
+ You can modify it as you want (except the constructor)"
+      classrelation 16129 // (<generalisation>)
+	relation 16129 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 142978 // <generalisation>
-	  b parent class_ref 136576 // UmlBaseSendObjectAction
+	    classrelation_ref 16129 // (<generalisation>)
+	  b parent class_ref 2560 // UmlBaseDeploymentDiagram
       end
 
-      operation 163842 "UmlSendObjectAction"
-	public explicit_return_type ""
+      operation 78337 "UmlDeploymentDiagram"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseSendObjectAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseDeploymentDiagram(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 136962 "UmlUnmarshallAction"
+    class 8449 "UmlDeploymentView"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2751,42 +3037,42 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 143362 // <generalisation>
-	relation 143362 ---|>
+      comment " This class manages 'deployment view'
+
+ You can modify it as you want (except the constructor)"
+      classrelation 16257 // (<generalisation>)
+	relation 16257 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 143362 // <generalisation>
-	  b parent class_ref 136832 // UmlBaseUnmarshallAction
+	    classrelation_ref 16257 // (<generalisation>)
+	  b parent class_ref 2688 // UmlBaseDeploymentView
       end
 
-      operation 164354 "UmlUnmarshallAction"
-	public explicit_return_type ""
+      operation 78465 "UmlDeploymentView"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseUnmarshallAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseDeploymentView(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 137218 "UmlOnSignalAction"
+    class 8577 "UmlDiagram"
       abstract visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2794,42 +3080,45 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 143746 // <generalisation>
-	relation 143746 ---|>
+      comment " This class allows to manage extra class member, mainly defined fot C++
+ it allows to insert C++ pre-processor directive (even they may be placed
+ in the other member definition/declaration), to declare friend
+ operation/function etc...
+
+ You can modify it as you want (except the constructor)"
+      classrelation 16385 // (<generalisation>)
+	relation 16385 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 143746 // <generalisation>
-	  b parent class_ref 137088 // UmlBaseOnSignalAction
+	    classrelation_ref 16385 // (<generalisation>)
+	  b parent class_ref 2944 // UmlBaseDiagram
       end
 
-      operation 164610 "UmlOnSignalAction"
-	protected explicit_return_type ""
+      operation 78593 "UmlDiagram"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseOnSignalAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseDiagram(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 137474 "UmlSendSignalAction"
+    class 8705 "UmlExtraClassMember"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2844,121 +3133,118 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 144130 // <generalisation>
-	relation 144130 ---|>
+      comment " This class allows to manage extra class member, It allows to insert
+ C++ pre-processor directive (even they may be placed in the other member
+ definition/declaration), etc ...
+
+ You can modify it as you want (except the constructor)
+"
+      classrelation 16513 // (<generalisation>)
+	relation 16513 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 144130 // <generalisation>
-	  b parent class_ref 137344 // UmlBaseSendSignalAction
+	    classrelation_ref 16513 // (<generalisation>)
+	  b parent class_ref 3072 // UmlBaseExtraClassMember
       end
 
-      operation 166402 "UmlSendSignalAction"
-	public explicit_return_type ""
+      operation 78721 "UmlExtraClassMember"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseSendSignalAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseExtraClassMember(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws} { super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 137730 "UmlBroadcastSignalAction"
-      visibility package 
+    class 8833 "UmlItem"
+      abstract visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 144514 // <generalisation>
-	relation 144514 ---|>
+      comment " This class is a mother class for all the other Uml* classes, this
+ allows to generalize their management, declare virtual operations etc ...
+
+ You can modify it as you want (except the constructor)"
+      classrelation 16641 // (<generalisation>)
+	relation 16641 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 144514 // <generalisation>
-	  b parent class_ref 137600 // UmlBaseBroadcastSignalAction
+	    classrelation_ref 16641 // (<generalisation>)
+	  b parent class_ref 3200 // UmlBaseItem
       end
 
-      operation 166914 "UmlBroadcastSignalAction"
-	public explicit_return_type ""
+      operation 78849 "UmlItem"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseBroadcastSignalAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseItem(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
-    end
-
-    class 137986 "UmlValueSpecificationAction"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
-${members}};
 
-${inlines}
+      operation 78977 "~UmlItem"
+	public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${virtual}${name}${(}${)}${volatile}${throw};
 "
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+	cpp_def "${inline}${class}::${name}${(}${)}${throw}{
+${body}}
 "
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 144898 // <generalisation>
-	relation 144898 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 144898 // <generalisation>
-	  b parent class_ref 137856 // UmlBaseValueSpecificationAction
+	
+	
+	
+	
       end
 
-      operation 167426 "UmlValueSpecificationAction"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseValueSpecificationAction(id, s) {
-}
+      operation 144130 "utilities"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	cpp_def "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+${body}}
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+	comment "virtual operation doing 'something' depending on the target
+
+does nothing by default
+"
       end
     end
 
-    class 138242 "UmlOpaqueAction"
+    class 8961 "UmlNode"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -2966,42 +3252,42 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 145282 // <generalisation>
-	relation 145282 ---|>
+      comment " This class manages 'nodes'
+
+ You can modify it as you want (except the constructor)"
+      classrelation 16769 // (<generalisation>)
+	relation 16769 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 145282 // <generalisation>
-	  b parent class_ref 138112 // UmlBaseOpaqueAction
+	    classrelation_ref 16769 // (<generalisation>)
+	  b parent class_ref 3328 // UmlBaseNode
       end
 
-      operation 169218 "UmlOpaqueAction"
-	public explicit_return_type ""
+      operation 79105 "UmlNode"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseOpaqueAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseNode(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 138498 "UmlAcceptEventAction"
+    class 9089 "UmlOperation"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3009,85 +3295,70 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 145666 // <generalisation>
-	relation 145666 ---|>
+      comment " This class manages 'operations', notes that the class 'UmlClassItem'
+ is a mother class of all the class's children.
+
+ You can modify it as you want (except the constructor)"
+      classrelation 16897 // (<generalisation>)
+	relation 16897 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 145666 // <generalisation>
-	  b parent class_ref 138368 // UmlBaseAcceptEventAction
+	    classrelation_ref 16897 // (<generalisation>)
+	  b parent class_ref 3456 // UmlBaseOperation
       end
 
-      operation 171010 "UmlAcceptEventAction"
-	public explicit_return_type ""
+      operation 79233 "UmlOperation"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseAcceptEventAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseOperation(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 138754 "UmlCallOperationAction"
-      visibility package 
-      cpp_decl "${comment}${template}class ${name}${inherit} {
+    class 145282 "UmlParameter"
+      visibility package stereotype "struct"
+      cpp_decl "${comment}${template}struct ${name}${inherit} {
 ${members}};
 
 ${inlines}
 "
-      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+      final java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 146050 // <generalisation>
-	relation 146050 ---|>
+      comment "  Represent an operation's parameter
+"
+      classrelation 157058 // (<generalisation>)
+	relation 157058 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 146050 // <generalisation>
-	  b parent class_ref 138624 // UmlBaseCallOperationAction
-      end
-
-      operation 173314 "UmlCallOperationAction"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseCallOperationAction(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
-"
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+	    classrelation_ref 157058 // (<generalisation>)
+	  b parent class_ref 145152 // UmlBaseParameter
       end
     end
 
-    class 139010 "UmlCallBehaviorAction"
+    class 9217 "UmlPackage"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3095,85 +3366,86 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 146562 // <generalisation>
-	relation 146562 ---|>
+      comment " This class manages a 'package', notes that the project itself is a package
+
+ You can modify it as you want (except the constructor)"
+      classrelation 17025 // (<generalisation>)
+	relation 17025 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 146562 // <generalisation>
-	  b parent class_ref 138880 // UmlBaseCallBehaviorAction
+	    classrelation_ref 17025 // (<generalisation>)
+	  b parent class_ref 3584 // UmlBasePackage
       end
 
-      operation 174466 "UmlCallBehaviorAction"
-	public explicit_return_type ""
+      operation 79361 "UmlPackage"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseCallBehaviorAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBasePackage(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 139266 "UmlAccessVariableValueAction"
-      abstract visibility package 
+    class 9345 "UmlRelation"
+      visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 147074 // <generalisation>
-	relation 147074 ---|>
+      comment " This class manages 'relations' between classes, notes that the class 'UmlClassItem'
+ is a mother class of all the class's children.
+
+ You can modify it as you want (except the constructor)"
+      classrelation 17153 // (<generalisation>)
+	relation 17153 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 147074 // <generalisation>
-	  b parent class_ref 139136 // UmlBaseAccessVariableValueAction
+	    classrelation_ref 17153 // (<generalisation>)
+	  b parent class_ref 3712 // UmlBaseRelation
       end
 
-      operation 175362 "UmlAccessVariableValueAction"
-	protected explicit_return_type ""
+      operation 79489 "UmlRelation"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseAccessVariableValueAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseRelation(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 139522 "UmlClearVariableValueAction"
+    class 9473 "UmlNcRelation"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3181,42 +3453,42 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 147586 // <generalisation>
-	relation 147586 ---|>
+      comment "This class manages 'relations' between non class objects
+
+ You can modify it as you want (except the constructor)"
+      classrelation 17281 // (<generalisation>)
+	relation 17281 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 147586 // <generalisation>
-	  b parent class_ref 139392 // UmlBaseClearVariableValueAction
+	    classrelation_ref 17281 // (<generalisation>)
+	  b parent class_ref 3840 // UmlBaseNcRelation
       end
 
-      operation 176258 "UmlClearVariableValueAction"
-	public explicit_return_type ""
+      operation 79617 "UmlNcRelation"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseClearVariableValueAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseNcRelation(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 139778 "UmlReadVariableValueAction"
+    class 9601 "UmlSequenceDiagram"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3224,42 +3496,43 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 147970 // <generalisation>
-	relation 147970 ---|>
+      comment " This class manages 'sequence diagrams', notes that the class 'UmlDiagram'
+ is a mother class of all the diagrams, allowing to generalize their
+ management
+
+ You can modify it as you want (except the constructor)"
+      classrelation 17409 // (<generalisation>)
+	relation 17409 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 147970 // <generalisation>
-	  b parent class_ref 139648 // UmlBaseReadVariableValueAction
+	    classrelation_ref 17409 // (<generalisation>)
+	  b parent class_ref 3968 // UmlBaseSequenceDiagram
       end
 
-      operation 176770 "UmlReadVariableValueAction"
-	public explicit_return_type ""
+      operation 79745 "UmlSequenceDiagram"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseReadVariableValueAction(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseSequenceDiagram(id, n) {};
 "
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }"
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 140034 "UmlWriteVariableValueAction"
+    class 9729 "UmlUseCase"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3267,42 +3540,42 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 148354 // <generalisation>
-	relation 148354 ---|>
+      comment " This class manages 'use case'
+
+ You can modify it as you want (except the constructor)"
+      classrelation 17537 // (<generalisation>)
+	relation 17537 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 148354 // <generalisation>
-	  b parent class_ref 139904 // UmlBaseWriteVariableValueAction
+	    classrelation_ref 17537 // (<generalisation>)
+	  b parent class_ref 4096 // UmlBaseUseCase
       end
 
-      operation 177282 "UmlWriteVariableValueAction"
-	public explicit_return_type ""
+      operation 79873 "UmlUseCase"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseWriteVariableValueAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseUseCase(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 140290 "UmlAddVariableValueAction"
+    class 9857 "UmlUseCaseDiagram"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3310,42 +3583,44 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 148738 // <generalisation>
-	relation 148738 ---|>
+      comment " This class manages 'use case diagrams', notes that the class 'UmlDiagram'
+ is a mother class of all the diagrams, allowing to generalize their
+ management
+
+ You can modify it as you want (except the constructor)"
+      classrelation 17665 // (<generalisation>)
+	relation 17665 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 148738 // <generalisation>
-	  b parent class_ref 140160 // UmlBaseAddVariableValueAction
+	    classrelation_ref 17665 // (<generalisation>)
+	  b parent class_ref 4224 // UmlBaseUseCaseDiagram
       end
 
-      operation 177794 "UmlAddVariableValueAction"
-	public explicit_return_type ""
+      operation 80001 "UmlUseCaseDiagram"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseAddVariableValueAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseUseCaseDiagram(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 140546 "UmlRemoveVariableValueAction"
+    class 9985 "UmlUseCaseView"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3353,42 +3628,42 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 149122 // <generalisation>
-	relation 149122 ---|>
+      comment " This class manages 'use case view'
+
+ You can modify it as you want (except the constructor)"
+      classrelation 17793 // (<generalisation>)
+	relation 17793 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 149122 // <generalisation>
-	  b parent class_ref 140416 // UmlBaseRemoveVariableValueAction
+	    classrelation_ref 17793 // (<generalisation>)
+	  b parent class_ref 4352 // UmlBaseUseCaseView
       end
 
-      operation 178690 "UmlRemoveVariableValueAction"
-	public explicit_return_type ""
+      operation 80129 "UmlUseCaseView"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseRemoveVariableValueAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseUseCaseView(id, n) {};
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
+	java_def "  ${comment}${visibility}${final}${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}{ super(id, n); }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    class 150018 "UmlAcceptCallAction"
+    class 145538 "UmlTypeSpec"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3396,42 +3671,29 @@ ${members}};
 ${inlines}
 "
       java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
-${members}}
+${members}};
 "
       php_decl ""
       python_2_2 python_decl ""
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 165634 // <generalisation>
-	relation 165634 ---|>
+      comment " this class memorize a type specification, which may be
+
+ - a class reference
+
+ - an explicit type"
+      classrelation 157314 // (<generalisation>)
+	relation 157314 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 165634 // <generalisation>
-	  b parent class_ref 149888 // UmlBaseAcceptCallAction
-      end
-
-      operation 234370 "UmlAcceptCallAction"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseAcceptCallAction(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
-"
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+	    classrelation_ref 157314 // (<generalisation>)
+	  b parent class_ref 145408 // UmlBaseTypeSpec
       end
     end
 
-    class 150274 "UmlReplyAction"
+    class 128386 "UmlState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3446,22 +3708,14 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 166018 // <generalisation>
-	relation 166018 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 166018 // <generalisation>
-	  b parent class_ref 150144 // UmlBaseReplyAction
-      end
-
-      operation 236162 "UmlReplyAction"
-	public explicit_return_type ""
+      operation 128514 "UmlState"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseReplyAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseState(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -3472,9 +3726,27 @@ ${members}}
 	
 	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
+
+      classrelation 128514 // (<generalisation>)
+	relation 128514 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 128514 // (<generalisation>)
+	  b parent class_ref 128256 // UmlBaseState
+      end
+
+      classrelation 128642 // (<generalisation>)
+	relation 128642 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 128642 // (<generalisation>)
+	  b parent class_ref 128130 // UmlStateItem
+      end
     end
 
-    class 150530 "UmlCreateObjectAction"
+    class 128642 "UmlStateDiagram"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3489,22 +3761,14 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 166402 // <generalisation>
-	relation 166402 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 166402 // <generalisation>
-	  b parent class_ref 150400 // UmlBaseCreateObjectAction
-      end
-
-      operation 237954 "UmlCreateObjectAction"
-	public explicit_return_type ""
+      operation 129026 "UmlStateDiagram"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseCreateObjectAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseStateDiagram(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -3515,9 +3779,27 @@ ${members}}
 	
 	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
+
+      classrelation 129026 // (<generalisation>)
+	relation 129026 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 129026 // (<generalisation>)
+	  b parent class_ref 128512 // UmlBaseStateDiagram
+      end
+
+      classrelation 129154 // (<generalisation>)
+	relation 129154 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 129154 // (<generalisation>)
+	  b parent class_ref 128130 // UmlStateItem
+      end
     end
 
-    class 150786 "UmlDestroyObjectAction"
+    class 134658 "UmlActivityDiagram"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3532,22 +3814,19 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 166786 // <generalisation>
-	relation 166786 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 166786 // <generalisation>
-	  b parent class_ref 150656 // UmlBaseDestroyObjectAction
-      end
+      comment " This class manages 'activity diagrams', notes that the class 'UmlDiagram'
+ is a mother class of all the diagrams, allowing to generalize their
+ management
 
-      operation 238978 "UmlDestroyObjectAction"
-	public explicit_return_type ""
+ You can modify it as you want (except the constructor)"
+      operation 152962 "UmlActivityDiagram"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseDestroyObjectAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityDiagram(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -3558,9 +3837,27 @@ ${members}}
 	
 	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
+
+      classrelation 138754 // (<generalisation>)
+	relation 138754 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 138754 // (<generalisation>)
+	  b parent class_ref 134528 // UmlBaseActivityDiagram
+      end
+
+      classrelation 138882 // (<generalisation>)
+	relation 138882 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 138882 // (<generalisation>)
+	  b parent class_ref 134146 // UmlActivityItem
+      end
     end
 
-    class 151042 "UmlTestIdentityAction"
+    class 129026 "UmlTransition"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3575,35 +3872,43 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 167170 // <generalisation>
-	relation 167170 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 167170 // <generalisation>
-	  b parent class_ref 150912 // UmlBaseTestIdentityAction
-      end
-
-      operation 240130 "UmlTestIdentityAction"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseTestIdentityAction(id, s) {
-}
+      operation 135938 "UmlTransition"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseTransition(id) {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id);
 }
 "
 	
 	
 	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      end
+
+      classrelation 130050 // (<generalisation>)
+	relation 130050 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 130050 // (<generalisation>)
+	  b parent class_ref 128896 // UmlBaseTransition
+      end
+
+      classrelation 130178 // (<generalisation>)
+	relation 130178 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 130178 // (<generalisation>)
+	  b parent class_ref 128130 // UmlStateItem
       end
     end
 
-    class 151298 "UmlRaiseExceptionAction"
+    class 129410 "UmlRegion"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3618,22 +3923,14 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 167554 // <generalisation>
-	relation 167554 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 167554 // <generalisation>
-	  b parent class_ref 151168 // UmlBaseRaiseExceptionAction
-      end
-
-      operation 240642 "UmlRaiseExceptionAction"
-	public explicit_return_type ""
+      operation 136450 "UmlRegion"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseRaiseExceptionAction(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseRegion(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -3644,9 +3941,27 @@ ${members}}
 	
 	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
+
+      classrelation 131074 // (<generalisation>)
+	relation 131074 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 131074 // (<generalisation>)
+	  b parent class_ref 129280 // UmlBaseRegion
+      end
+
+      classrelation 131202 // (<generalisation>)
+	relation 131202 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 131202 // (<generalisation>)
+	  b parent class_ref 128130 // UmlStateItem
+      end
     end
 
-    class 151554 "UmlReduceAction"
+    class 129666 "UmlStateAction"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3661,25 +3976,16 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 167938 // <generalisation>
-	relation 167938 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 167938 // <generalisation>
-	  b parent class_ref 151424 // UmlBaseReduceAction
-      end
-
-      operation 241154 "UmlReduceAction"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseReduceAction(id, s) {
-}
+      operation 136578 "UmlStateAction"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseStateAction(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -3687,9 +3993,27 @@ ${members}}
 	
 	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
+
+      classrelation 131586 // (<generalisation>)
+	relation 131586 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 131586 // (<generalisation>)
+	  b parent class_ref 129536 // UmlBaseStateAction
+      end
+
+      classrelation 131714 // (<generalisation>)
+	relation 131714 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 131714 // (<generalisation>)
+	  b parent class_ref 128130 // UmlStateItem
+      end
     end
 
-    class 140802 "UmlActivityControlNode"
+    class 129794 "UmlPseudoState"
       abstract visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3704,22 +4028,32 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 149506 // <generalisation>
-	relation 149506 ---|>
+      classrelation 131842 // (<generalisation>)
+	relation 131842 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 149506 // <generalisation>
-	  b parent class_ref 140672 // UmlBaseActivityControlNode
+	    classrelation_ref 131842 // (<generalisation>)
+	  b parent class_ref 128130 // UmlStateItem
       end
 
-      operation 179330 "UmlActivityControlNode"
-	protected explicit_return_type ""
+      classrelation 131970 // (<generalisation>)
+	relation 131970 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 131970 // (<generalisation>)
+	  b parent class_ref 8833 // UmlItem
+      end
+
+      operation 138370 "UmlPseudoState"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityControlNode(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlItem(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -3732,7 +4066,7 @@ ${members}}
       end
     end
 
-    class 141058 "UmlInitialActivityNode"
+    class 130050 "UmlInitialPseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3747,25 +4081,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 149890 // <generalisation>
-	relation 149890 ---|>
+      classrelation 132354 // (<generalisation>)
+	relation 132354 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 149890 // <generalisation>
-	  b parent class_ref 140928 // UmlBaseInitialActivityNode
+	    classrelation_ref 132354 // (<generalisation>)
+	  b parent class_ref 129920 // UmlBaseInitialPseudoState
       end
 
-      operation 179842 "UmlInitialActivityNode"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseInitialActivityNode(id, s) {
-}
+      operation 138882 "UmlInitialPseudoState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseInitialPseudoState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -3775,7 +4109,7 @@ ${members}}
       end
     end
 
-    class 141314 "UmlFlowFinalActivityNode"
+    class 130306 "UmlEntryPointPseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3790,22 +4124,23 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 150274 // <generalisation>
-	relation 150274 ---|>
+      classrelation 132738 // (<generalisation>)
+	relation 132738 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 150274 // <generalisation>
-	  b parent class_ref 141184 // UmlBaseFlowFinalActivityNode
+	    classrelation_ref 132738 // (<generalisation>)
+	  b parent class_ref 130176 // UmlBaseEntryPointPseudoState
       end
 
-      operation 180354 "UmlFlowFinalActivityNode"
-	public explicit_return_type ""
+      operation 139394 "UmlEntryPointPseudoState"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseFlowFinalActivityNode(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseEntryPointPseudoState(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -3818,7 +4153,7 @@ ${members}}
       end
     end
 
-    class 141570 "UmlActivityFinalActivityNode"
+    class 130562 "UmlFinalState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3833,25 +4168,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 150658 // <generalisation>
-	relation 150658 ---|>
+      classrelation 133122 // (<generalisation>)
+	relation 133122 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 150658 // <generalisation>
-	  b parent class_ref 141440 // UmlBaseActivityFinalActivityNode
+	    classrelation_ref 133122 // (<generalisation>)
+	  b parent class_ref 130432 // UmlBaseFinalState
       end
 
-      operation 180866 "UmlActivityFinalActivityNode"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityFinalActivityNode(id, s) {
-}
+      operation 139906 "UmlFinalState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseFinalState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -3861,7 +4196,7 @@ ${members}}
       end
     end
 
-    class 141826 "UmlDecisionActivityNode"
+    class 130818 "UmlTerminatePseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3876,25 +4211,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 151042 // <generalisation>
-	relation 151042 ---|>
+      classrelation 133506 // (<generalisation>)
+	relation 133506 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 151042 // <generalisation>
-	  b parent class_ref 141696 // UmlBaseDecisionActivityNode
+	    classrelation_ref 133506 // (<generalisation>)
+	  b parent class_ref 130688 // UmlBaseTerminatePseudoState
       end
 
-      operation 181378 "UmlDecisionActivityNode"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseDecisionActivityNode(id, s) {
-}
+      operation 140418 "UmlTerminatePseudoState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseTerminatePseudoState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -3904,7 +4239,7 @@ ${members}}
       end
     end
 
-    class 142082 "UmlMergeActivityNode"
+    class 131074 "UmlExitPointPseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3919,22 +4254,23 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 151426 // <generalisation>
-	relation 151426 ---|>
+      classrelation 133890 // (<generalisation>)
+	relation 133890 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 151426 // <generalisation>
-	  b parent class_ref 141952 // UmlBaseMergeActivityNode
+	    classrelation_ref 133890 // (<generalisation>)
+	  b parent class_ref 130944 // UmlBaseExitPointPseudoState
       end
 
-      operation 181890 "UmlMergeActivityNode"
-	public explicit_return_type ""
+      operation 140930 "UmlExitPointPseudoState"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseMergeActivityNode(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseExitPointPseudoState(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -3947,7 +4283,7 @@ ${members}}
       end
     end
 
-    class 142338 "UmlForkActivityNode"
+    class 131330 "UmlDeepHistoryPseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -3962,25 +4298,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 151810 // <generalisation>
-	relation 151810 ---|>
+      classrelation 134274 // (<generalisation>)
+	relation 134274 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 151810 // <generalisation>
-	  b parent class_ref 142208 // UmlBaseForkActivityNode
+	    classrelation_ref 134274 // (<generalisation>)
+	  b parent class_ref 131200 // UmlBaseDeepHistoryPseudoState
       end
 
-      operation 182402 "UmlForkActivityNode"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseForkActivityNode(id, s) {
-}
+      operation 141442 "UmlDeepHistoryPseudoState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseDeepHistoryPseudoState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -3990,7 +4326,7 @@ ${members}}
       end
     end
 
-    class 142594 "UmlJoinActivityNode"
+    class 131586 "UmlShallowHistoryPseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -4005,25 +4341,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 152194 // <generalisation>
-	relation 152194 ---|>
+      classrelation 134658 // (<generalisation>)
+	relation 134658 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 152194 // <generalisation>
-	  b parent class_ref 142464 // UmlBaseJoinActivityNode
+	    classrelation_ref 134658 // (<generalisation>)
+	  b parent class_ref 131456 // UmlBaseShallowHistoryPseudoState
       end
 
-      operation 182914 "UmlJoinActivityNode"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseJoinActivityNode(id, s) {
-}
+      operation 141954 "UmlShallowHistoryPseudoState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseShallowHistoryPseudoState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -4033,7 +4369,7 @@ ${members}}
       end
     end
 
-    class 142850 "UmlActivityObject"
+    class 131842 "UmlJunctionPseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -4048,25 +4384,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 152578 // <generalisation>
-	relation 152578 ---|>
+      classrelation 135042 // (<generalisation>)
+	relation 135042 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 152578 // <generalisation>
-	  b parent class_ref 142720 // UmlBaseActivityObject
+	    classrelation_ref 135042 // (<generalisation>)
+	  b parent class_ref 131712 // UmlBaseJunctionPseudoState
       end
 
-      operation 183426 "UmlActivityObject"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityObject(id, s) {
-}
+      operation 142466 "UmlJunctionPseudoState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseJunctionPseudoState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -4076,7 +4412,7 @@ ${members}}
       end
     end
 
-    class 143234 "UmlExpansionNode"
+    class 132098 "UmlChoicePseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -4091,25 +4427,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 153346 // <generalisation>
-	relation 153346 ---|>
+      classrelation 135426 // (<generalisation>)
+	relation 135426 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 153346 // <generalisation>
-	  b parent class_ref 143104 // UmlBaseExpansionNode
+	    classrelation_ref 135426 // (<generalisation>)
+	  b parent class_ref 131968 // UmlBaseChoicePseudoState
       end
 
-      operation 186754 "UmlExpansionNode"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseExpansionNode(id, s) {
-}
+      operation 142978 "UmlChoicePseudoState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseChoicePseudoState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -4119,8 +4455,8 @@ ${members}}
       end
     end
 
-    class 143490 "UmlPinParameter"
-      abstract visibility package 
+    class 132354 "UmlForkPseudoState"
+      visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
@@ -4134,25 +4470,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 153730 // <generalisation>
-	relation 153730 ---|>
+      classrelation 135810 // (<generalisation>)
+	relation 135810 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 153730 // <generalisation>
-	  b parent class_ref 143360 // UmlBasePinParameter
+	    classrelation_ref 135810 // (<generalisation>)
+	  b parent class_ref 132224 // UmlBaseForkPseudoState
       end
 
-      operation 187010 "UmlPinParameter"
-	protected explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBasePinParameter(id, s) {
-}
+      operation 143490 "UmlForkPseudoState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseForkPseudoState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -4162,7 +4498,7 @@ ${members}}
       end
     end
 
-    class 143874 "UmlActivityPin"
+    class 132610 "UmlJoinPseudoState"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -4177,25 +4513,25 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 154370 // <generalisation>
-	relation 154370 ---|>
+      classrelation 136194 // (<generalisation>)
+	relation 136194 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 154370 // <generalisation>
-	  b parent class_ref 143744 // UmlBaseActivityPin
+	    classrelation_ref 136194 // (<generalisation>)
+	  b parent class_ref 132480 // UmlBaseJoinPseudoState
       end
 
-      operation 188674 "UmlActivityPin"
-	public explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityPin(id, s) {
-}
+      operation 144002 "UmlJoinPseudoState"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "id" explicit_type "void"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw} : UmlBaseJoinPseudoState(id, \"\") {
+    };
 "
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  super(id, \"\");
 }
 "
 	
@@ -4205,7 +4541,24 @@ ${members}}
       end
     end
 
-    class 144130 "UmlActivityParameter"
+    class 134146 "UmlActivityItem"
+      visibility package stereotype "interface"
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl "${comment}${public}interface ${name}${extends} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+    end
+
+    class 134402 "UmlActivity"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -4220,22 +4573,23 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 154754 // <generalisation>
-	relation 154754 ---|>
+      classrelation 138370 // (<generalisation>)
+	relation 138370 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 154754 // <generalisation>
-	  b parent class_ref 144000 // UmlBaseActivityParameter
+	    classrelation_ref 138370 // (<generalisation>)
+	  b parent class_ref 134272 // UmlBaseActivity
       end
 
-      operation 189186 "UmlActivityParameter"
-	public explicit_return_type ""
+      operation 150402 "UmlActivity"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityParameter(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivity(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -4248,8 +4602,8 @@ ${members}}
       end
     end
 
-    class 144386 "UmlParameterSet"
-      visibility package 
+    class 134914 "UmlActivityNode"
+      abstract visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
@@ -4263,22 +4617,14 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 155138 // <generalisation>
-	relation 155138 ---|>
-	  a public
-	    cpp default "${type}"
-	    java "${type}"
-	    classrelation_ref 155138 // <generalisation>
-	  b parent class_ref 144256 // UmlBaseParameterSet
-      end
-
-      operation 190210 "UmlParameterSet"
-	public explicit_return_type ""
+      operation 153986 "UmlActivityNode"
+	cpp_inline protected explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseParameterSet(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityNode(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -4290,17 +4636,26 @@ ${members}}
 	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
 
-      classrelation 155394 // <generalisation>
-	relation 155394 ---|>
+      classrelation 139394 // (<generalisation>)
+	relation 139394 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 139394 // (<generalisation>)
+	  b parent class_ref 134784 // UmlBaseActivityNode
+      end
+
+      classrelation 139522 // (<generalisation>)
+	relation 139522 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 155394 // <generalisation>
+	    classrelation_ref 139522 // (<generalisation>)
 	  b parent class_ref 134146 // UmlActivityItem
       end
     end
 
-    class 149762 "UmlActivityPartition"
+    class 135170 "UmlFlow"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -4315,31 +4670,66 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 164866 // <generalisation>
-	relation 164866 ---|>
+      operation 158466 "UmlFlow"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "n" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseFlow(id, n) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, n);
+}
+"
+	
+	
+	
+      end
+
+      classrelation 139906 // (<generalisation>)
+	relation 139906 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 164866 // <generalisation>
-	  b parent class_ref 149632 // UmlBaseActivityPartition
+	    classrelation_ref 139906 // (<generalisation>)
+	  b parent class_ref 135040 // UmlBaseFlow
       end
 
-      classrelation 164994 // <generalisation>
-	relation 164994 ---|>
+      classrelation 140034 // (<generalisation>)
+	relation 140034 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 164994 // <generalisation>
+	    classrelation_ref 140034 // (<generalisation>)
 	  b parent class_ref 134146 // UmlActivityItem
       end
+    end
 
-      operation 232706 "UmlActivityPartition"
-	public explicit_return_type ""
+    class 135554 "UmlActivityRegion"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 158722 "UmlActivityRegion"
+	cpp_inline protected explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseActivityPartition(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityRegion(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -4350,9 +4740,27 @@ ${members}}
 	
 	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
+
+      classrelation 140930 // (<generalisation>)
+	relation 140930 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 140930 // (<generalisation>)
+	  b parent class_ref 135424 // UmlBaseActivityRegion
+      end
+
+      classrelation 141058 // (<generalisation>)
+	relation 141058 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 141058 // (<generalisation>)
+	  b parent class_ref 134146 // UmlActivityItem
+      end
     end
 
-    class 144770 "UmlClassInstance"
+    class 135810 "UmlExpansionRegion"
       visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
@@ -4367,22 +4775,23 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 156034 // <generalisation>
-	relation 156034 ---|>
+      classrelation 141570 // (<generalisation>)
+	relation 141570 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 156034 // <generalisation>
-	  b parent class_ref 144640 // UmlBaseClassInstance
+	    classrelation_ref 141570 // (<generalisation>)
+	  b parent class_ref 135680 // UmlBaseExpansionRegion
       end
 
-      operation 194946 "UmlClassInstance"
-	public explicit_return_type ""
+      operation 159618 "UmlExpansionRegion"
+	cpp_inline public explicit_return_type ""
 	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseClassInstance(id, s) {
-}
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseExpansionRegion(id, s) {
+    };
 "
 	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
   super(id, s);
@@ -4395,8 +4804,8 @@ ${members}}
       end
     end
 
-    class 145794 "UmlView"
-      abstract visibility package 
+    class 136194 "UmlInterruptibleActivityRegion"
+      visibility package 
       cpp_decl "${comment}${template}class ${name}${inherit} {
 ${members}};
 
@@ -4410,2180 +4819,1883 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 157698 // <generalisation>
-	relation 157698 ---|>
+      classrelation 142082 // (<generalisation>)
+	relation 142082 ---|> name "<generalisation>"
 	  a public
 	    cpp default "${type}"
 	    java "${type}"
-	    classrelation_ref 157698 // <generalisation>
-	  b parent class_ref 145664 // UmlBaseView
-      end
-
-      operation 197506 "UmlView"
-	protected explicit_return_type ""
-	nparams 2
-	  param in name "id" explicit_type "item_id"
-	  param in name "s" explicit_type "string"
-	cpp_decl "    ${comment}${static}${virtual}${type} ${name}${(}${t0} ${p0}, const ${t1} & ${p1}${)} : UmlBaseView(id, s) {
-}
-"
-	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
-  super(id, s);
-}
-"
-	
-	
-	
-	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+	    classrelation_ref 142082 // (<generalisation>)
+	  b parent class_ref 136064 // UmlBaseInterruptibleActivityRegion
       end
-    end
-  end
-
-  deploymentview 641 "API USER Deployment view"
-    //deployment diagram settings
-    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
-    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
-    comment "'your' API artifacts modify them !
 
-Do not forget to modify Main !"
-    artifact 140674 "UmlTypeSpec"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
-
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
-"
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 145538 // UmlTypeSpec
+      operation 160770 "UmlInterruptibleActivityRegion"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseInterruptibleActivityRegion(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 6529 "executable"
-      stereotype "executable"
-      associated_artifacts
-	artifact_ref 2048 // UmlBaseDeploymentDiagram
-	artifact_ref 9217 // UmlPackage
-	artifact_ref 2304 // UmlBaseDiagram
-	artifact_ref 7809 // UmlCollaborationDiagram
-	artifact_ref 137088 // UmlBaseAccessVariableValueAction
-	artifact_ref 137600 // UmlBaseActivityControlNodeClasses
-	artifact_ref 5248 // UmlCom
-	artifact_ref 5504 // MiscGlobalCmd
-	artifact_ref 135936 // anExpansionKind
-	artifact_ref 1280 // UmlBaseClassView
-	artifact_ref 141826 // UmlSubject
-	artifact_ref 5888 // PackageGlobalCmd
-	artifact_ref 140418 // UmlParameter
-	artifact_ref 140930 // UmlView
-	artifact_ref 6016 // UmlSettingsCmd
-	artifact_ref 131330 // UmlDeepHistoryPseudoState
-	artifact_ref 131074 // UmlExitPointPseudoState
-	artifact_ref 130176 // UmlBaseEntryPointPseudoState
-	artifact_ref 141568 // UmlBaseFragment
-	artifact_ref 138752 // aParameterEffectKind
-	artifact_ref 6528 // UmlBaseComponent
-	artifact_ref 136832 // UmlBaseOnSignalAction
-	artifact_ref 896 // UmlBaseClass
-	artifact_ref 7937 // UmlArtifact
-	artifact_ref 129666 // UmlStateAction
-	artifact_ref 6144 // CppSettingsCmd
-	artifact_ref 131712 // UmlBaseJunctionPseudoState
-	artifact_ref 7553 // UmlClassMember
-	artifact_ref 1152 // UmlBaseClassMember
-	artifact_ref 130050 // UmlInitialPseudoState
-	artifact_ref 144898 // UmlActivityPartition
-	artifact_ref 131456 // UmlBaseShallowHistoryPseudoState
-	artifact_ref 140800 // UmlBaseView
-	artifact_ref 140032 // SlotAttribute
-	artifact_ref 136962 // UmlOnSignalAction
-	artifact_ref 4864 // IdlSettings
-	artifact_ref 2816 // UmlBaseOperation
-	artifact_ref 8705 // UmlExtraClassMember
-	artifact_ref 128896 // UmlBaseTransition
-	artifact_ref 141696 // UmlBaseFragmentCompartment
-	artifact_ref 8065 // UmlComponentDiagram
-	artifact_ref 136320 // UmlBaseActivityAction
-	artifact_ref 128768 // StateBehavior
-	artifact_ref 144384 // UmlBaseCollaborationDiagramDefinition
-	artifact_ref 143746 // UmlUseCaseDiagramDefinition
-	artifact_ref 6913 // UmlClassItem
-	artifact_ref 2432 // UmlBaseExtraClassMember
-	artifact_ref 129536 // UmlBaseStateAction
-	artifact_ref 131200 // UmlBaseDeepHistoryPseudoState
-	artifact_ref 128256 // UmlBaseState
-	artifact_ref 135424 // UmlBaseActivityRegion
-	artifact_ref 1792 // UmlBaseComponentView
-	artifact_ref 132738 // ConstrDestrCopyDialog
-	artifact_ref 138112 // anOrdering
-	artifact_ref 6272 // JavaSettingsCmd
-	artifact_ref 3584 // UmlBaseUseCaseDiagram
-	artifact_ref 142208 // UmlBaseUseCaseReference
-	artifact_ref 4480 // UmlBuiltin
-	artifact_ref 5120 // UmlSettings
-	artifact_ref 768 // UmlBaseAttribute
-	artifact_ref 139522 // UmlParameterSet
-	artifact_ref 131842 // UmlJunctionPseudoState
-	artifact_ref 139392 // UmlBaseParameterSet
-	artifact_ref 143490 // UmlCollaborationMessage
-	artifact_ref 139136 // UmlBaseActivityParameter
-	artifact_ref 2560 // UmlBaseItem
-	artifact_ref 142976 // UmlBaseMessage
-	artifact_ref 5376 // CmdFamily
-	artifact_ref 137344 // UmlBaseActivityControlNode
-	artifact_ref 134018 // UmlObjectDiagram
-	artifact_ref 144768 // UmlBaseActivityPartition
-	artifact_ref 132480 // UmlBaseJoinPseudoState
-	artifact_ref 142720 // UmlBaseClassInstanceReference
-	artifact_ref 134146 // UmlActivityItem
-	artifact_ref 138880 // UmlBaseActivityPin
-	artifact_ref 137474 // UmlActivityControlNode
-	artifact_ref 143872 // UmlBaseUseCaseDiagramDefinition
-	artifact_ref 2176 // UmlBaseDeploymentView
-	artifact_ref 141952 // UmlBaseSubject
-	artifact_ref 9985 // UmlUseCaseView
-	artifact_ref 142338 // UmlUseCaseAssociation
-	artifact_ref 4736 // CppSettings
-	artifact_ref 141056 // PhpSettings
-	artifact_ref 6785 // UmlActualParameter
-	artifact_ref 3072 // UmlBaseRelation
-	artifact_ref 128642 // UmlStateDiagram
-	artifact_ref 132098 // UmlChoicePseudoState
-	artifact_ref 142594 // UmlClassInstanceReference
-	artifact_ref 8449 // UmlDeploymentView
-	artifact_ref 7681 // UmlClassView
-	artifact_ref 256 // UmlBaseActualParameter
-	artifact_ref 135040 // UmlBaseFlow
-	artifact_ref 128386 // UmlState
-	artifact_ref 137218 // UmlAccessVariableValueAction
-	artifact_ref 3840 // aRelationKind
-	artifact_ref 131968 // UmlBaseChoicePseudoState
-	artifact_ref 7041 // UmlFormalParameter
-	artifact_ref 7169 // UmlAttribute
-	artifact_ref 142464 // UmlBaseUseCaseAssociation
-	artifact_ref 134658 // UmlActivityDiagram
-	artifact_ref 3328 // UmlBaseSequenceDiagram
-	artifact_ref 7297 // UmlClass
-	artifact_ref 139648 // aLanguage
-	artifact_ref 129152 // TransitionBehavior
-	artifact_ref 141442 // UmlFragmentCompartment
-	artifact_ref 129920 // UmlBaseInitialPseudoState
-	artifact_ref 3712 // UmlBaseUseCaseView
-	artifact_ref 142082 // UmlUseCaseReference
-	artifact_ref 140160 // SlotRelation
-	artifact_ref 130688 // UmlBaseTerminatePseudoState
-	artifact_ref 130562 // UmlFinalState
-	artifact_ref 135680 // UmlBaseExpansionRegion
-	artifact_ref 139906 // UmlClassInstance
-	artifact_ref 135296 // FlowBehavior
-	artifact_ref 133888 // UmlBaseObjectDiagram
-	artifact_ref 9089 // UmlOperation
-	artifact_ref 136576 // UmlBaseActivityActionClasses
-	artifact_ref 141184 // PhpSettingsCmd
-	artifact_ref 131586 // UmlShallowHistoryPseudoState
-	artifact_ref 144002 // UmlSequenceDiagramDefinition
-	artifact_ref 144640 // PythonSettingsCmd
-	artifact_ref 136450 // UmlActivityAction
-	artifact_ref 8833 // UmlItem
-	artifact_ref 130818 // UmlTerminatePseudoState
-	artifact_ref 9473 // UmlNcRelation
-	artifact_ref 128002 // UmlComponent
-	artifact_ref 144512 // PythonSettings
-	artifact_ref 129280 // UmlBaseRegion
-	artifact_ref 1920 // UmlBaseDeployment
-	artifact_ref 1536 // UmlBaseArtifact
-	artifact_ref 144128 // UmlBaseSequenceDiagramDefinition
-	artifact_ref 138240 // UmlBaseExpansionNode
-	artifact_ref 137856 // UmlBaseActivityObject
-	artifact_ref 135810 // UmlExpansionRegion
-	artifact_ref 135170 // UmlFlow
-	artifact_ref 130432 // UmlBaseFinalState
-	artifact_ref 138370 // UmlExpansionNode
-	artifact_ref 5632 // OnInstanceCmd
-	artifact_ref 143106 // UmlSequenceMessage
-	artifact_ref 140288 // UmlBaseParameter
-	artifact_ref 139266 // UmlActivityParameter
-	artifact_ref 136706 // UmlActivityActionClasses
-	artifact_ref 129026 // UmlTransition
-	artifact_ref 137730 // UmlActivityControlNodeClasses
-	artifact_ref 384 // UmlBaseClassItem
-	artifact_ref 9345 // UmlRelation
-	artifact_ref 4096 // aVisibility
-	artifact_ref 8961 // UmlNode
-	artifact_ref 135554 // UmlActivityRegion
-	artifact_ref 130944 // UmlBaseExitPointPseudoState
-	artifact_ref 143616 // UmlBaseCollaborationMessage
-	artifact_ref 138626 // UmlPinParameter
-	artifact_ref 9857 // UmlUseCaseDiagram
-	artifact_ref 4992 // JavaSettings
-	artifact_ref 7425 // UmlClassDiagram
-	artifact_ref 140544 // UmlBaseTypeSpec
-	artifact_ref 8577 // UmlDiagram
-	artifact_ref 8193 // UmlComponentView
-	artifact_ref 139010 // UmlActivityPin
-	artifact_ref 2688 // UmlBaseNode
-	artifact_ref 144258 // UmlCollaborationDiagramDefinition
-	artifact_ref 512 // UmlBaseFormalParameter
-	artifact_ref 6657 // Main
-	artifact_ref 129410 // UmlRegion
-	artifact_ref 3200 // UmlBaseNcRelation
-	artifact_ref 143360 // UmlBaseSequenceMessage
-	artifact_ref 128512 // UmlBaseStateDiagram
-	artifact_ref 132610 // UmlJoinPseudoState
-	artifact_ref 129794 // UmlPseudoState
-	artifact_ref 143232 // aMessageKind
-	artifact_ref 3968 // aDirection
-	artifact_ref 2944 // UmlBasePackage
-	artifact_ref 134914 // UmlActivityNode
-	artifact_ref 9729 // UmlUseCase
-	artifact_ref 1408 // UmlBaseCollaborationDiagram
-	artifact_ref 128130 // UmlStateItem
-	artifact_ref 5760 // ClassGlobalCmd
-	artifact_ref 139776 // UmlBaseClassInstance
-	artifact_ref 8321 // UmlDeploymentDiagram
-	artifact_ref 141314 // UmlFragment
-	artifact_ref 130306 // UmlEntryPointPseudoState
-	artifact_ref 134784 // UmlBaseActivityNode
-	artifact_ref 142850 // UmlMessage
-	artifact_ref 137986 // UmlActivityObject
-	artifact_ref 134528 // UmlBaseActivityDiagram
-	artifact_ref 4608 // UmlStereotype
-	artifact_ref 3456 // UmlBaseUseCase
-	artifact_ref 136064 // UmlBaseInterruptibleActivityRegion
-	artifact_ref 132354 // UmlForkPseudoState
-	artifact_ref 134402 // UmlActivity
-	artifact_ref 132224 // UmlBaseForkPseudoState
-	artifact_ref 9601 // UmlSequenceDiagram
-	artifact_ref 138496 // UmlBasePinParameter
-	artifact_ref 136194 // UmlInterruptibleActivityRegion
-	artifact_ref 1664 // UmlBaseComponentDiagram
-	artifact_ref 134272 // UmlBaseActivity
-	artifact_ref 1024 // UmlBaseClassDiagram
-	artifact_ref 4224 // anItemKind
-	artifact_ref 6400 // IdlSettingsCmd
-	artifact_ref 140674 // UmlTypeSpec
+    class 136450 "UmlActivityAction"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 142466 // (<generalisation>)
+	relation 142466 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 142466 // (<generalisation>)
+	  b parent class_ref 136320 // UmlBaseActivityAction
+      end
+
+      operation 161026 "UmlActivityAction"
+	cpp_inline protected explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityAction(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
-      ncouples 10
-      key "genpro pro" value "/tmp/cpp_utilities/cpp_utilities.pro"
-      key "genpro path" value "/tmp/utilities/cpp/"
-      key "genpro target" value "/tmp/cpp_utilities/cpp_util"
-      key "genpro tmplt" value "app"
-      key "genpro config" value "debug warn_on qt"
-      key "genpro defines" value "WITHCPP"
-      key "genpro includepath" value ""
-      key "genpro dependpath" value ""
-      key "genpro objectsdir" value ""
-      key "genpro footer" value ""
-      comment "  Reference all the components used to made a C++ executable,
-  used by 'genpro' to produce a .pro file allowing to produce a Makefile
-  with 'tmake' or 'qmake'"
     end
 
-    artifact 6657 "Main"
-      stereotype "source"
-      cpp_src "#include <qapplication.h>
+    class 136706 "UmlSendObjectAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-#include \"UmlCom.h\"
-#include \"UmlItem.h\"
+${inlines}
+"
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 142978 // (<generalisation>)
+	relation 142978 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 142978 // (<generalisation>)
+	  b parent class_ref 136576 // UmlBaseSendObjectAction
+      end
 
-// the program is called with the socket port number in argument
+      operation 163842 "UmlSendObjectAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseSendObjectAction(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      end
+    end
 
-int main(int argc, char ** argv)
-{
-  if (argc != 2)
-    return 0;
-  
-  QApplication a(argc, argv);
-  
-  if (UmlCom::connect(QString(argv[1]).toUInt())) {
-    UmlCom::trace(\"<b>Class utilities</b> release 1.1.2<hr>\");
+    class 136962 "UmlUnmarshallAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-    try {
-      UmlCom::targetItem()->utilities();
-    }
-    catch (...) {
-    }
+${inlines}
+"
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 143362 // (<generalisation>)
+	relation 143362 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 143362 // (<generalisation>)
+	  b parent class_ref 136832 // UmlBaseUnmarshallAction
+      end
 
-    // must be called to cleanly inform that all is done
-    UmlCom::bye();
-  }
-  
-  UmlCom::close();
-  return 0;
+      operation 164354 "UmlUnmarshallAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseUnmarshallAction(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
 }
 "
-      associated_classes
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
-      comment "  The main function, you have to modify at least the line containing
-
-  UmlCom::targetItem()->???();
-
-  it if you want your program does something !"
     end
 
-    artifact 6785 "UmlActualParameter"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 137218 "UmlOnSignalAction"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 6785 // UmlActualParameter
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 143746 // (<generalisation>)
+	relation 143746 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 143746 // (<generalisation>)
+	  b parent class_ref 137088 // UmlBaseOnSignalAction
+      end
+
+      operation 164610 "UmlOnSignalAction"
+	cpp_inline protected explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseOnSignalAction(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 6913 "UmlClassItem"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 137474 "UmlSendSignalAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 7425 // UmlClassItem
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 144130 // (<generalisation>)
+	relation 144130 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 144130 // (<generalisation>)
+	  b parent class_ref 137344 // UmlBaseSendSignalAction
+      end
+
+      operation 166402 "UmlSendSignalAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseSendSignalAction(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 7041 "UmlFormalParameter"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 137730 "UmlBroadcastSignalAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 6913 // UmlFormalParameter
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 144514 // (<generalisation>)
+	relation 144514 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 144514 // (<generalisation>)
+	  b parent class_ref 137600 // UmlBaseBroadcastSignalAction
+      end
+
+      operation 166914 "UmlBroadcastSignalAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseBroadcastSignalAction(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 7169 "UmlAttribute"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 137986 "UmlValueSpecificationAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 7041 // UmlAttribute
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 144898 // (<generalisation>)
+	relation 144898 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 144898 // (<generalisation>)
+	  b parent class_ref 137856 // UmlBaseValueSpecificationAction
+      end
+
+      operation 167426 "UmlValueSpecificationAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseValueSpecificationAction(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 7297 "UmlClass"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 138242 "UmlOpaqueAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-#include \"ConstrDestrCopyDialog.h\"
-#include \"UmlParameter.h\"
-#include \"UmlOperation.h\"
-#include \"CppSettings.h\"
-#include \"UmlCom.h\"
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 145282 // (<generalisation>)
+	relation 145282 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 145282 // (<generalisation>)
+	  b parent class_ref 138112 // UmlBaseOpaqueAction
+      end
 
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 7169 // UmlClass
+      operation 169218 "UmlOpaqueAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseOpaqueAction(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 7425 "UmlClassDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 138498 "UmlAcceptEventAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 7297 // UmlClassDiagram
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 145666 // (<generalisation>)
+	relation 145666 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 145666 // (<generalisation>)
+	  b parent class_ref 138368 // UmlBaseAcceptEventAction
       end
-    end
-
-    artifact 7553 "UmlClassMember"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 171010 "UmlAcceptEventAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseAcceptEventAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 7553 // UmlClassMember
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 7681 "UmlClassView"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 138754 "UmlCallOperationAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 7681 // UmlClassView
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 146050 // (<generalisation>)
+	relation 146050 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 146050 // (<generalisation>)
+	  b parent class_ref 138624 // UmlBaseCallOperationAction
       end
-    end
-
-    artifact 7809 "UmlCollaborationDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 173314 "UmlCallOperationAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseCallOperationAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 7809 // UmlCollaborationDiagram
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 7937 "UmlArtifact"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 139010 "UmlCallBehaviorAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 8193 // UmlArtifact
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 146562 // (<generalisation>)
+	relation 146562 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 146562 // (<generalisation>)
+	  b parent class_ref 138880 // UmlBaseCallBehaviorAction
       end
-    end
-
-    artifact 128002 "UmlComponent"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 174466 "UmlCallBehaviorAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseCallBehaviorAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 128002 // UmlComponent
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 8065 "UmlComponentDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 139266 "UmlAccessVariableValueAction"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 7937 // UmlComponentDiagram
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 147074 // (<generalisation>)
+	relation 147074 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 147074 // (<generalisation>)
+	  b parent class_ref 139136 // UmlBaseAccessVariableValueAction
       end
-    end
-
-    artifact 8321 "UmlDeploymentDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 175362 "UmlAccessVariableValueAction"
+	cpp_inline protected explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseAccessVariableValueAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 8321 // UmlDeploymentDiagram
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 8449 "UmlDeploymentView"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 139522 "UmlClearVariableValueAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 8449 // UmlDeploymentView
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 147586 // (<generalisation>)
+	relation 147586 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 147586 // (<generalisation>)
+	  b parent class_ref 139392 // UmlBaseClearVariableValueAction
       end
-    end
-
-    artifact 8577 "UmlDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 176258 "UmlClearVariableValueAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseClearVariableValueAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 8577 // UmlDiagram
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 8705 "UmlExtraClassMember"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 139778 "UmlReadVariableValueAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 8705 // UmlExtraClassMember
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 147970 // (<generalisation>)
+	relation 147970 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 147970 // (<generalisation>)
+	  b parent class_ref 139648 // UmlBaseReadVariableValueAction
       end
-    end
-
-    artifact 8833 "UmlItem"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 176770 "UmlReadVariableValueAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseReadVariableValueAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-#include \"UmlCom.h\"
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 8833 // UmlItem
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 8961 "UmlNode"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 140034 "UmlWriteVariableValueAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 8961 // UmlNode
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 148354 // (<generalisation>)
+	relation 148354 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 148354 // (<generalisation>)
+	  b parent class_ref 139904 // UmlBaseWriteVariableValueAction
       end
-    end
 
-    artifact 9089 "UmlOperation"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
-
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 177282 "UmlWriteVariableValueAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseWriteVariableValueAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 9089 // UmlOperation
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 140418 "UmlParameter"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 140290 "UmlAddVariableValueAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 145282 // UmlParameter
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 148738 // (<generalisation>)
+	relation 148738 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 148738 // (<generalisation>)
+	  b parent class_ref 140160 // UmlBaseAddVariableValueAction
       end
-    end
-
-    artifact 9217 "UmlPackage"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 177794 "UmlAddVariableValueAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseAddVariableValueAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 9217 // UmlPackage
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 9345 "UmlRelation"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 140546 "UmlRemoveVariableValueAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 9345 // UmlRelation
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 149122 // (<generalisation>)
+	relation 149122 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 149122 // (<generalisation>)
+	  b parent class_ref 140416 // UmlBaseRemoveVariableValueAction
       end
-    end
-
-    artifact 9473 "UmlNcRelation"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 178690 "UmlRemoveVariableValueAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseRemoveVariableValueAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 9473 // UmlNcRelation
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 9601 "UmlSequenceDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 150018 "UmlAcceptCallAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 9601 // UmlSequenceDiagram
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 165634 // (<generalisation>)
+	relation 165634 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 165634 // (<generalisation>)
+	  b parent class_ref 149888 // UmlBaseAcceptCallAction
       end
-    end
-
-    artifact 9729 "UmlUseCase"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 234370 "UmlAcceptCallAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseAcceptCallAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 9729 // UmlUseCase
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 9857 "UmlUseCaseDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 150274 "UmlReplyAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 9857 // UmlUseCaseDiagram
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 166018 // (<generalisation>)
+	relation 166018 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 166018 // (<generalisation>)
+	  b parent class_ref 150144 // UmlBaseReplyAction
       end
-    end
-
-    artifact 9985 "UmlUseCaseView"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 236162 "UmlReplyAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseReplyAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 9985 // UmlUseCaseView
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 8193 "UmlComponentView"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 150530 "UmlCreateObjectAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 8065 // UmlComponentView
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 166402 // (<generalisation>)
+	relation 166402 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 166402 // (<generalisation>)
+	  b parent class_ref 150400 // UmlBaseCreateObjectAction
       end
-    end
-
-    artifact 128130 "UmlStateItem"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 237954 "UmlCreateObjectAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseCreateObjectAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 128130 // UmlStateItem
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 128386 "UmlState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 150786 "UmlDestroyObjectAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 128386 // UmlState
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 166786 // (<generalisation>)
+	relation 166786 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 166786 // (<generalisation>)
+	  b parent class_ref 150656 // UmlBaseDestroyObjectAction
       end
-    end
-
-    artifact 128642 "UmlStateDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 238978 "UmlDestroyObjectAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseDestroyObjectAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 128642 // UmlStateDiagram
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 129026 "UmlTransition"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 151042 "UmlTestIdentityAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 129026 // UmlTransition
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 167170 // (<generalisation>)
+	relation 167170 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 167170 // (<generalisation>)
+	  b parent class_ref 150912 // UmlBaseTestIdentityAction
       end
-    end
-
-    artifact 129410 "UmlRegion"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 240130 "UmlTestIdentityAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseTestIdentityAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 129410 // UmlRegion
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 129666 "UmlStateAction"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 151298 "UmlRaiseExceptionAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 129666 // UmlStateAction
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 167554 // (<generalisation>)
+	relation 167554 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 167554 // (<generalisation>)
+	  b parent class_ref 151168 // UmlBaseRaiseExceptionAction
       end
-    end
 
-    artifact 129794 "UmlPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
-
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 240642 "UmlRaiseExceptionAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseRaiseExceptionAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 129794 // UmlPseudoState
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 130050 "UmlInitialPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 151554 "UmlReduceAction"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 130050 // UmlInitialPseudoState
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 167938 // (<generalisation>)
+	relation 167938 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 167938 // (<generalisation>)
+	  b parent class_ref 151424 // UmlBaseReduceAction
       end
-    end
-
-    artifact 130306 "UmlEntryPointPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 241154 "UmlReduceAction"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseReduceAction(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 130306 // UmlEntryPointPseudoState
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 130562 "UmlFinalState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 140802 "UmlActivityControlNode"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 130562 // UmlFinalState
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 149506 // (<generalisation>)
+	relation 149506 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 149506 // (<generalisation>)
+	  b parent class_ref 140672 // UmlBaseActivityControlNode
       end
-    end
-
-    artifact 130818 "UmlTerminatePseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 179330 "UmlActivityControlNode"
+	cpp_inline protected explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityControlNode(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 130818 // UmlTerminatePseudoState
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 131074 "UmlExitPointPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 141058 "UmlInitialActivityNode"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 131074 // UmlExitPointPseudoState
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 149890 // (<generalisation>)
+	relation 149890 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 149890 // (<generalisation>)
+	  b parent class_ref 140928 // UmlBaseInitialActivityNode
       end
-    end
-
-    artifact 131330 "UmlDeepHistoryPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 179842 "UmlInitialActivityNode"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseInitialActivityNode(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 131330 // UmlDeepHistoryPseudoState
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 131586 "UmlShallowHistoryPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 141314 "UmlFlowFinalActivityNode"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 131586 // UmlShallowHistoryPseudoState
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 150274 // (<generalisation>)
+	relation 150274 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 150274 // (<generalisation>)
+	  b parent class_ref 141184 // UmlBaseFlowFinalActivityNode
       end
-    end
-
-    artifact 131842 "UmlJunctionPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 180354 "UmlFlowFinalActivityNode"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseFlowFinalActivityNode(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 131842 // UmlJunctionPseudoState
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 132098 "UmlChoicePseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 141570 "UmlActivityFinalActivityNode"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 132098 // UmlChoicePseudoState
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 150658 // (<generalisation>)
+	relation 150658 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 150658 // (<generalisation>)
+	  b parent class_ref 141440 // UmlBaseActivityFinalActivityNode
       end
-    end
-
-    artifact 132354 "UmlForkPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 180866 "UmlActivityFinalActivityNode"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityFinalActivityNode(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 132354 // UmlForkPseudoState
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 132610 "UmlJoinPseudoState"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 141826 "UmlDecisionActivityNode"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 132610 // UmlJoinPseudoState
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 151042 // (<generalisation>)
+	relation 151042 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 151042 // (<generalisation>)
+	  b parent class_ref 141696 // UmlBaseDecisionActivityNode
       end
-    end
-
-    artifact 134018 "UmlObjectDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 181378 "UmlDecisionActivityNode"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseDecisionActivityNode(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 134018 // UmlObjectDiagram
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 134146 "UmlActivityItem"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 142082 "UmlMergeActivityNode"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 134146 // UmlActivityItem
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 151426 // (<generalisation>)
+	relation 151426 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 151426 // (<generalisation>)
+	  b parent class_ref 141952 // UmlBaseMergeActivityNode
       end
-    end
-
-    artifact 134402 "UmlActivity"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 181890 "UmlMergeActivityNode"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseMergeActivityNode(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 134402 // UmlActivity
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 134658 "UmlActivityDiagram"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 142338 "UmlForkActivityNode"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 134658 // UmlActivityDiagram
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 151810 // (<generalisation>)
+	relation 151810 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 151810 // (<generalisation>)
+	  b parent class_ref 142208 // UmlBaseForkActivityNode
       end
-    end
-
-    artifact 134914 "UmlActivityNode"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 182402 "UmlForkActivityNode"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseForkActivityNode(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 134914 // UmlActivityNode
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 135170 "UmlFlow"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 142594 "UmlJoinActivityNode"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 135170 // UmlFlow
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 152194 // (<generalisation>)
+	relation 152194 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 152194 // (<generalisation>)
+	  b parent class_ref 142464 // UmlBaseJoinActivityNode
       end
-    end
 
-    artifact 135554 "UmlActivityRegion"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
-
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 182914 "UmlJoinActivityNode"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseJoinActivityNode(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 135554 // UmlActivityRegion
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 135810 "UmlExpansionRegion"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 142850 "UmlActivityObject"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 135810 // UmlExpansionRegion
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 152578 // (<generalisation>)
+	relation 152578 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 152578 // (<generalisation>)
+	  b parent class_ref 142720 // UmlBaseActivityObject
       end
-    end
-
-    artifact 136194 "UmlInterruptibleActivityRegion"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 183426 "UmlActivityObject"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityObject(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 136194 // UmlInterruptibleActivityRegion
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 136450 "UmlActivityAction"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 143234 "UmlExpansionNode"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 136450 // UmlActivityAction
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 153346 // (<generalisation>)
+	relation 153346 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 153346 // (<generalisation>)
+	  b parent class_ref 143104 // UmlBaseExpansionNode
+      end
+
+      operation 186754 "UmlExpansionNode"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseExpansionNode(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 136706 "UmlActivityActionClasses"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 143490 "UmlPinParameter"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 136706 // UmlSendObjectAction
-	class_ref 136962 // UmlUnmarshallAction
-	class_ref 137474 // UmlSendSignalAction
-	class_ref 137730 // UmlBroadcastSignalAction
-	class_ref 137986 // UmlValueSpecificationAction
-	class_ref 138242 // UmlOpaqueAction
-	class_ref 138498 // UmlAcceptEventAction
-	class_ref 138754 // UmlCallOperationAction
-	class_ref 139010 // UmlCallBehaviorAction
-	class_ref 139522 // UmlClearVariableValueAction
-	class_ref 139778 // UmlReadVariableValueAction
-	class_ref 140034 // UmlWriteVariableValueAction
-	class_ref 140290 // UmlAddVariableValueAction
-	class_ref 140546 // UmlRemoveVariableValueAction
-	class_ref 150018 // UmlAcceptCallAction
-	class_ref 150274 // UmlReplyAction
-	class_ref 150530 // UmlCreateObjectAction
-	class_ref 150786 // UmlDestroyObjectAction
-	class_ref 151042 // UmlTestIdentityAction
-	class_ref 151298 // UmlRaiseExceptionAction
-	class_ref 151554 // UmlReduceAction
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 153730 // (<generalisation>)
+	relation 153730 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 153730 // (<generalisation>)
+	  b parent class_ref 143360 // UmlBasePinParameter
       end
-    end
-
-    artifact 136962 "UmlOnSignalAction"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 187010 "UmlPinParameter"
+	cpp_inline protected explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBasePinParameter(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 137218 // UmlOnSignalAction
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 137218 "UmlAccessVariableValueAction"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 143874 "UmlActivityPin"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 139266 // UmlAccessVariableValueAction
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 154370 // (<generalisation>)
+	relation 154370 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 154370 // (<generalisation>)
+	  b parent class_ref 143744 // UmlBaseActivityPin
       end
-    end
 
-    artifact 137474 "UmlActivityControlNode"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+      operation 188674 "UmlActivityPin"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityPin(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
+      end
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 255362 "~UmlActivityPin"
+	cpp_inline public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${virtual}${name}${(}${)}${volatile}${throw} {};
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 140802 // UmlActivityControlNode
+	
+	
+	
+	
       end
     end
 
-    artifact 137730 "UmlActivityControlNodeClasses"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 144130 "UmlActivityParameter"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 141058 // UmlInitialActivityNode
-	class_ref 141314 // UmlFlowFinalActivityNode
-	class_ref 141570 // UmlActivityFinalActivityNode
-	class_ref 141826 // UmlDecisionActivityNode
-	class_ref 142082 // UmlMergeActivityNode
-	class_ref 142338 // UmlForkActivityNode
-	class_ref 142594 // UmlJoinActivityNode
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 154754 // (<generalisation>)
+	relation 154754 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 154754 // (<generalisation>)
+	  b parent class_ref 144000 // UmlBaseActivityParameter
+      end
+
+      operation 189186 "UmlActivityParameter"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityParameter(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 137986 "UmlActivityObject"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 128130 "UmlStateItem"
+      visibility package stereotype "interface"
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 142850 // UmlActivityObject
-      end
+      java_decl "${comment}${public}interface ${name}${extends} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
     end
 
-    artifact 138370 "UmlExpansionNode"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 149762 "UmlActivityPartition"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 143234 // UmlExpansionNode
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 232706 "UmlActivityPartition"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseActivityPartition(id, s) {
+    };
+"
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
-    end
 
-    artifact 138626 "UmlPinParameter"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+      classrelation 164866 // (<generalisation>)
+	relation 164866 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 164866 // (<generalisation>)
+	  b parent class_ref 149632 // UmlBaseActivityPartition
+      end
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
-"
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 143490 // UmlPinParameter
+      classrelation 164994 // (<generalisation>)
+	relation 164994 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 164994 // (<generalisation>)
+	  b parent class_ref 134146 // UmlActivityItem
       end
     end
 
-    artifact 139010 "UmlActivityPin"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 144770 "UmlClassInstance"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 143874 // UmlActivityPin
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 156034 // (<generalisation>)
+	relation 156034 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 156034 // (<generalisation>)
+	  b parent class_ref 144640 // UmlBaseClassInstance
       end
-    end
-
-    artifact 139266 "UmlActivityParameter"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 194946 "UmlClassInstance"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseClassInstance(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 144130 // UmlActivityParameter
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 139522 "UmlParameterSet"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 145794 "UmlView"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 144386 // UmlParameterSet
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 157698 // (<generalisation>)
+	relation 157698 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 157698 // (<generalisation>)
+	  b parent class_ref 145664 // UmlBaseView
       end
-    end
-
-    artifact 139906 "UmlClassInstance"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 197506 "UmlView"
+	cpp_inline protected explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseView(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 144770 // UmlClassInstance
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
 
-    artifact 140930 "UmlView"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+    class 144386 "UmlParameterSet"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+${inlines}
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 145794 // UmlView
+      java_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 155138 // (<generalisation>)
+	relation 155138 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 155138 // (<generalisation>)
+	  b parent class_ref 144256 // UmlBaseParameterSet
       end
-    end
 
-    artifact 144898 "UmlActivityPartition"
-      stereotype "source"
-      cpp_h "#ifndef _${NAME}_H
-#define _${NAME}_H
+      classrelation 155394 // (<generalisation>)
+	relation 155394 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 155394 // (<generalisation>)
+	  b parent class_ref 134146 // UmlActivityItem
+      end
 
-${comment}
-${includes}
-${declarations}
-${namespace_start}
-${definition}
-${namespace_end}
-#endif
+      operation 190210 "UmlParameterSet"
+	cpp_inline public explicit_return_type ""
+	nparams 2
+	
+	  param in name "id" explicit_type "void"
+	  param in name "s" explicit_type "QByteArray"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}${)}${volatile}${throw} : UmlBaseParameterSet(id, s) {
+    };
 "
-      cpp_src "${comment}
-${includes}
-${namespace_start}
-${members}
-${namespace_end}"
-      java_src "${comment}
-${package}
-${definition}"
-      associated_classes
-	class_ref 149762 // UmlActivityPartition
+	java_def "  ${comment}${visibility}${final}${static}${abstract}${synchronized} ${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${throws}${staticnl}{
+  super(id, s);
+}
+"
+	
+	
+	
+	comment "  the constructor, do not call it yourself !!!!!!!!!!"
       end
     end
   end
diff --git a/plugouts/cpp_utilities/7169.bodies b/plugouts/cpp_utilities/7169.bodies
index 19b27f043..d693d7bd3 100644
--- a/plugouts/cpp_utilities/7169.bodies
+++ b/plugouts/cpp_utilities/7169.bodies
@@ -1,205 +1,245 @@
 class UmlClass
 !!!144258.cpp!!!	utilities() : void
-  const QVector<UmlItem> ch = children();
-  bool have_constructor = FALSE;
-  bool have_destructor = FALSE;
-  QCString destr = "~" + name();
-  bool have_copy = FALSE;
-  bool have_const_copy = FALSE;
-  bool have_assignment = FALSE;
-  bool have_const_assignment = FALSE;
-  
-  for (unsigned i = 0; i != ch.size(); i += 1) {
-    if (ch[i]->kind() == anOperation) {
-      QCString s = ch[i]->name();
-      
-      if (s == name()) {
-	// may be a constructor or a copy constructor
-	const QValueList<UmlParameter> params = 
-	  ((UmlOperation *) ch[i])->params();
-	
-	if (params.count() == 1) {
-	  const UmlParameter & param = *(params.at(0));
-	  
-	  if (param.type.type == this) {
-	    if (param.dir == InputDirection)
-	      have_const_copy = TRUE;
-	    else
-	      have_copy = TRUE;
-	  }
-	  else
-	    have_constructor = TRUE;
-	}
-	else
-	  have_constructor = TRUE;
-      }
-      else if (s == destr)
-	have_destructor = TRUE;
-      else if (s == "operator=") {
-	const QValueList<UmlParameter> params = 
-	  ((UmlOperation *) ch[i])->params();
-	
-	if (params.count() == 1) {
-	  if ((*(params.at(0))).dir == InputDirection)
-	    have_const_assignment = TRUE;
-	  else
-	    have_assignment = TRUE;
-	}
-      }
+    TRACE_FUNCTION;
+    const QVector<UmlItem*> ch = children();
+    bool have_constructor = FALSE;
+    bool have_destructor = FALSE;
+    QByteArray destr = "~" + name();
+    bool have_copy = FALSE;
+    bool have_const_copy = FALSE;
+    bool have_assignment = FALSE;
+    bool have_const_assignment = FALSE;
+
+    for (unsigned i = 0; i != ch.size(); i += 1) {
+        if (ch[i]->kind() == anOperation) { //[rageek] literal comparison
+            QByteArray s = ch[i]->name(); //[rageek]
+
+
+            if (s == name()) {
+                // may be a constructor or a copy constructor
+                const QList<UmlParameter> params = ((UmlOperation *) ch[i])->params();
+
+                if (params.count() == 1) {
+                    const UmlParameter & param = (params.at(0));
+
+                    if (param.type.type == this) {
+                        if (param.dir == InputDirection)
+                            have_const_copy = TRUE;
+                        else
+                            have_copy = TRUE;
+                    }
+                    else
+                        have_constructor = TRUE;
+                }
+                else
+                    have_constructor = TRUE;
+            }
+            else if (s == destr)
+                have_destructor = TRUE;
+            else if (s == "operator=") {
+                const QList<UmlParameter> params =
+                    ((UmlOperation *) ch[i])->params();
+
+                if (params.count() == 1) {
+                    if (((params.at(0))).dir == InputDirection)
+                        have_const_assignment = TRUE;
+                    else
+                        have_assignment = TRUE;
+                }
+            }
+        }
     }
-  }
 
-  ConstrDestrCopyDialog d(this, have_constructor, have_destructor,
-			  have_copy, have_const_copy, 
-			  have_assignment, have_const_assignment);
-  
-  d.exec();
+    ConstrDestrCopyDialog d(this, have_constructor, have_destructor,
+                            have_copy, have_const_copy,
+                            have_assignment, have_const_assignment);
+
+    d.exec();
 
 
 !!!144642.cpp!!!	addContructor(in expl : bool) : void
-  UmlOperation * op = UmlOperation::create(this, name());
-  
-  if (op == 0)
-    UmlCom::trace("can't add contructor");
-  else {
-    QCString s;
-    int index;
-    
-    // remove the useless "${type} " mainly to remove the space
-    
-    s = op->cppDecl();
-    if (s.isEmpty())
-      s = CppSettings::operationDecl();
-    if ((index = s.find("${type} ")) != -1)
-      s.remove(index, 8);
-    if (expl && ((index = s.find("${name}")) != -1))
-      s.insert(index, "explicit ");
-    op->set_CppDecl(s);
-    
-    s = op->cppDef();
-    if (s.isEmpty())
-      s = CppSettings::operationDef();
-    if ((index = s.find("${type} ")) != -1)
-      s.remove(index, 8);
-    op->set_CppDef(s);
-  }
-!!!144770.cpp!!!	addDestructor(in virt : bool) : void
-  UmlOperation * op = UmlOperation::create(this, "~" + name());
-  
-  if (op == 0)
-    UmlCom::trace("can't add destructor");
-  else {
-    if (virt)
-      op->set_isCppVirtual(TRUE);
-    
-    QCString s;
-    int index;
-    
-    // remove the useless "${type} " mainly to remove the space
-    
-    s = op->cppDecl();
-    if (s.isEmpty())
-      s = CppSettings::operationDecl();
-    if ((index = s.find("${type} ")) != -1) {
-      s.remove(index, 8);
-      op->set_CppDecl(s);
+    TRACE_FUNCTION;
+    QLOG_INFO() << "1.1.1";
+    UmlOperation * op = UmlOperation::create(this, name());
+    QLOG_INFO() << "1.1.2";
+    if (op == 0)
+        UmlCom::trace("can't add contructor");
+    else {
+        QLOG_INFO() << "1.1.3";
+        QByteArray s;
+        int index;
+
+        // remove the useless "${type} " mainly to remove the space
+
+        s = op->cppDecl();
+        QLOG_INFO() << s;
+        QLOG_INFO() << "1.1.4";
+        if (s.isEmpty())
+            s = CppSettings::operationDecl();
+        QLOG_INFO() << s;
+        QLOG_INFO() << "1.1.5";
+        if ((index = s.indexOf("${type} ")) != -1)
+            s.remove(index, 8);
+        QLOG_INFO() << s;
+        QLOG_INFO() << "1.1.6";
+        if (expl && ((index = s.indexOf("${name}")) != -1))
+            s.insert(index, "explicit ");
+        QLOG_INFO() << s;
+        QLOG_INFO() << "1.1.7";
+        op->set_CppDecl(s);
+        QLOG_INFO() << s;
+        QLOG_INFO() << "1.1.8";
+        s = op->cppDef();
+        QLOG_INFO() << s;
+        QLOG_INFO() << "1.1.81";
+        if (s.isEmpty())
+            s = CppSettings::operationDef();
+        QLOG_INFO() << "1.1.9";
+        if ((index = s.indexOf("${type} ")) != -1)
+            s.remove(index, 8);
+        QLOG_INFO() << "1.1.10";
+        op->set_CppDef(s);
     }
-    
-    s = op->cppDef();
-    if (s.isEmpty())
-      s = CppSettings::operationDef();
-    if ((index = s.find("${type} ")) != -1) {
-      s.remove(index, 8);
-      op->set_CppDef(s);
+!!!144770.cpp!!!	addDestructor(in virt : bool) : void
+    TRACE_FUNCTION;
+    UmlOperation * op = UmlOperation::create(this, "~" + name());
+
+    if (op == 0)
+        UmlCom::trace("can't add destructor");
+    else {
+        if (virt)
+            op->set_isCppVirtual(TRUE);
+
+        QByteArray s;
+        int index;
+
+        // remove the useless "${type} " mainly to remove the space
+
+        s = op->cppDecl();
+
+        if (s.isEmpty())
+            s = CppSettings::operationDecl();
+
+        if ((index = s.indexOf("${type} ")) != -1) {
+            s.remove(index, 8);
+            op->set_CppDecl(s);
+        }
+
+        s = op->cppDef();
+
+        if (s.isEmpty())
+            s = CppSettings::operationDef();
+
+        if ((index = s.indexOf("${type} ")) != -1) {
+            s.remove(index, 8);
+            op->set_CppDef(s);
+        }
     }
-  }
 !!!144898.cpp!!!	addCopy(in cte : bool) : void
-  UmlOperation * op = UmlOperation::create(this, name());
-  
-  if (op == 0)
-    UmlCom::trace("can't add copy contructor");
-  else {
-    // to see that it is a copy constructor
-    op->set_Stereotype("copy");
-    
-    // add 'source' parameter
-    
-    UmlParameter param;
-    
-    param.name = "source";
-    param.dir = (cte) ? InputDirection : InputOutputDirection;
-    param.type.type = this;
-    
-    op->addParameter(0, param);
-    
-    // add the parameter profile, and 
-    // remove the useless "${type} " mainly to remove the space
-    
-    QCString p = (cte) ? "const ${t0} & ${p0}" : "${t0} & ${p0}";
-    QCString s;
-    int index;
-    
-    s = op->cppDecl();
-    if (s.isEmpty())
-      s = CppSettings::operationDecl();
-    if ((index = s.find("${(}")) != -1)
-      s.insert(index + 4, p);
-    if ((index = s.find("${type} ")) != -1)
-      s.remove(index, 8);
-    op->set_CppDecl(s);
-    
-    s = op->cppDef();
-    if (s.isEmpty())
-      s = CppSettings::operationDef();
-    if ((index = s.find("${(}")) != -1)
-      s.insert(index + 4, p);
-    if ((index = s.find("${type} ")) != -1)
-      s.remove(index, 8);
-    op->set_CppDef(s);
-  }
+    TRACE_FUNCTION;
+    UmlOperation * op = UmlOperation::create(this, name());
+
+    if (op == 0)
+        UmlCom::trace("can't add copy contructor");
+    else {
+        // to see that it is a copy constructor
+        op->set_Stereotype("copy");
+
+        // add 'source' parameter
+
+        UmlParameter param;
+
+        param.name = "source";
+        param.dir = (cte) ? InputDirection : InputOutputDirection;
+        param.type.type = this;
+
+        op->addParameter(0, param);
+
+        // add the parameter profile, and
+        // remove the useless "${type} " mainly to remove the space
+
+        QByteArray p = (cte) ? "const ${t0} & ${p0}" : "${t0} & ${p0}";
+        QByteArray s;
+        int index;
+
+        s = op->cppDecl();
+
+        if (s.isEmpty())
+            s = CppSettings::operationDecl();
+
+        if ((index = s.indexOf("${(}")) != -1)
+            s.insert(index + 4, (const char *)p); //[rageek] cast because QByteArray
+
+        if ((index = s.indexOf("${type} ")) != -1)
+            s.remove(index, 8);
+
+        op->set_CppDecl(s);
+
+        s = op->cppDef();
+
+        if (s.isEmpty())
+            s = CppSettings::operationDef();
+
+        if ((index = s.indexOf("${(}")) != -1)
+            s.insert(index + 4, (const char *)p); //[rageek] cast because QByteArray
+
+        if ((index = s.indexOf("${type} ")) != -1)
+            s.remove(index, 8);
+
+        op->set_CppDef(s);
+    }
 !!!145026.cpp!!!	addAssign(in cte : bool) : void
-  UmlOperation * op = UmlOperation::create(this, "operator=");
-  
-  if (op == 0)
-    UmlCom::trace("can't add assignment contructor");
-  else {
-    // add 'source' parameter
-    
-    UmlParameter param;
-    
-    param.name = "source";
-    param.dir = (cte) ? InputDirection : InputOutputDirection;
-    param.type.type = this;
-    
-    op->addParameter(0, param);
-    
-    // set return type, add the parameter profile
-    
-    UmlTypeSpec t;
-    
-    t.type = this;
-    
-    op->set_ReturnType(t);
-    
-    QCString p = (cte) ? "const ${t0} & ${p0}" : "${t0} & ${p0}";
-    QCString s;
-    int index;
-    
-    s = op->cppDecl();
-    if (s.isEmpty())
-      s = CppSettings::operationDecl();
-    if ((index = s.find("${(}")) != -1)
-      s.insert(index + 4, p);
-    if ((index = s.find("${type}")) != -1)
-      s.insert(index + 7, " &");
-    op->set_CppDecl(s);
-    
-    s = op->cppDef();
-    if (s.isEmpty())
-      s = CppSettings::operationDef();
-    if ((index = s.find("${(}")) != -1)
-      s.insert(index + 4, p);
-    if ((index = s.find("${type}")) != -1)
-      s.insert(index + 7, " &");
-    op->set_CppDef(s);
-  }
+    TRACE_FUNCTION;
+    UmlOperation * op = UmlOperation::create(this, "operator=");
+
+    if (op == 0)
+        UmlCom::trace("can't add assignment contructor");
+    else {
+        // add 'source' parameter
+
+        UmlParameter param;
+
+        param.name = "source";
+        param.dir = (cte) ? InputDirection : InputOutputDirection;
+        param.type.type = this;
+
+        op->addParameter(0, param);
+
+        // set return type, add the parameter profile
+
+        UmlTypeSpec t;
+
+        t.type = this;
+
+        op->set_ReturnType(t);
+
+        QByteArray p = (cte) ? "const ${t0} & ${p0}" : "${t0} & ${p0}";
+        QByteArray s;
+        int index;
+
+        s = op->cppDecl();
+
+        if (s.isEmpty())
+            s = CppSettings::operationDecl();
+
+        if ((index = s.indexOf("${(}")) != -1)
+            s.insert(index + 4, (const char *)p); //[rageek] cast because QByteArray
+
+        if ((index = s.indexOf("${type}")) != -1)
+            s.insert(index + 7, " &");
+
+        op->set_CppDecl(s);
+
+        s = op->cppDef();
+
+        if (s.isEmpty())
+            s = CppSettings::operationDef();
+
+        if ((index = s.indexOf("${(}")) != -1)
+            s.insert(index + 4, (const char *)p); //[rageek] cast because QByteArray
+
+        if ((index = s.indexOf("${type}")) != -1)
+            s.insert(index + 7, " &");
+
+        op->set_CppDef(s);
+    }
diff --git a/plugouts/cpp_utilities/8833.bodies b/plugouts/cpp_utilities/8833.bodies
index 087844232..4f32bc4bf 100644
--- a/plugouts/cpp_utilities/8833.bodies
+++ b/plugouts/cpp_utilities/8833.bodies
@@ -1,5 +1,5 @@
 class UmlItem
-!!!144130.cpp!!!	utilities()
-  UmlCom::trace("<font face=helvetica><b>Must be applied on a <i>class</i></b></font><br><hr><br>");
-!!!144130.java!!!	utilities()
+!!!144130.cpp!!!	utilities() : void
+    UmlCom::trace("<font face=helvetica><b>Must be applied on a <i>class</i></b></font><br><hr><br>");
+!!!144130.java!!!	utilities() : void
   UmlCom.trace("<font face=helvetica><b>Must be applied on a <i>class</i></b></font><br><hr><br>");
diff --git a/plugouts/cpp_utilities/cpp_includes b/plugouts/cpp_utilities/cpp_includes
index 41d21264e..020094f50 100644
--- a/plugouts/cpp_utilities/cpp_includes
+++ b/plugouts/cpp_utilities/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/cpp_utilities/cpp_utilities.prj b/plugouts/cpp_utilities/cpp_utilities.prj
index c262e781c..540d40338 100644
--- a/plugouts/cpp_utilities/cpp_utilities.prj
+++ b/plugouts/cpp_utilities/cpp_utilities.prj
@@ -1,7 +1,7 @@
-format 66
+format 75
 "cpp_utilities"
-  revision 1
-  modified_by 2 "bruno"
+  revision 2
+  modified_by 2 "C:/Users/habip"
   cpp_root_dir "/tmp/cpp_utilities/"
 
 
@@ -9,13 +9,13 @@ format 66
   // class settings
   default_attribute_visibility protected default_relation_visibility protected default_operation_visibility public
   //class diagram settings
-  draw_all_relations yes hide_attributes no hide_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_infonote no shadow yes show_stereotype_properties no
+  draw_all_relations yes hide_attributes no hide_operations no hide_getset_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_relation_visibility no show_infonote no shadow yes show_stereotype_properties no
   //use case diagram settings
   package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes class_drawing_mode actor shadow yes show_stereotype_properties no
   //sequence diagram settings
-  show_full_operations_definition no write_horizontally no class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no
+  show_full_operations_definition no write_horizontally no class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no show_class_context_mode no show_msg_context_mode no
   //collaboration diagram settings
-  show_full_operations_definition no show_hierarchical_rank no write_horizontally no drawing_language uml package_name_in_tab no show_context no draw_all_relations yes shadow yes show_stereotype_properties no
+  show_full_operations_definition no show_hierarchical_rank no write_horizontally no drawing_language uml package_name_in_tab no show_context no show_msg_context no draw_all_relations yes shadow yes show_stereotype_properties no
   //object diagram settings
    write_horizontally yes package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes show_stereotype_properties no
   //component diagram settings
@@ -35,6 +35,8 @@ format 66
   font_size 10
   diagram_format A4
 
+  image_root_dir ""
+
   mark_for_import
   
   ncouples 1
@@ -44,4 +46,680 @@ format 66
   package_ref 641 // API USER
 
   package_ref 128002 // IHM
+
+  classview 135682 "cpp_utilities"
+    //class diagram settings
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+    //state diagram settings
+    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+    show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+    //class settings
+    //activity diagram settings
+    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+    show_infonote default drawing_language default show_stereotype_properties default
+    class 158082 "FunctionTracer"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 258306 "FunctionTracer"
+	cpp_inline public explicit_return_type ""
+	nparams 1
+	
+	  param in name "val" explicit_type "QString"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} ${p0}${v0}${)}${volatile}${throw} :traceString(val){QLOG_INFO() << \"Entered function \" + traceString;};
+"
+	
+	
+	
+	
+	comment "    FunctionTracer(QString val):traceString(val){qxtLog->debug(QString(\"   \").repeated(logLevel) + \"Entered function \" + traceString); logLevel++;}
+    ~FunctionTracer(){qxtLog->debug(QString(\"   \").repeated(logLevel) + \"Left    function \" + traceString);logLevel--;}"
+      end
+
+      operation 258434 "~FunctionTracer"
+	cpp_inline public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${comment}${inline}${virtual}${name}${(}${)}${volatile}${throw} {QLOG_INFO() <<  \"Left    function \" + traceString;};
+"
+	
+	
+	
+	
+      end
+
+      attribute 138498 "traceString"
+	public explicit_type "QString"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 138626 "logLevel"
+	public explicit_type "int"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+    end
+
+    class 159234 "GridBox"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 174722 // (<generalisation>)
+	relation 174722 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 174722 // (<generalisation>)
+	  b parent class_ref 159362 // typedef2
+      end
+
+      extra_member 134914 "Q_OBJECT"
+	
+	cpp "  Q_OBJECT" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 254210 "GridBox"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 3
+	
+	  param in name "n" explicit_type "int"
+	  param inout name "parent" explicit_type "QWidget"
+	    defaultvalue "0"
+	  param in name "name" explicit_type "QString"
+	    defaultvalue "QString()"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} ${p0}${v0}, ${t1} * ${p1}${v1}, ${t2} ${p2}${v2}${)}${volatile}${throw};
+"
+	cpp_def "${inline}${class}::${name}${(}${t0} ${p0}, ${t1} * ${p1}, ${t2} ${p2}${)} :
+    QGroupBox(name, parent)
+${throw}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 254338 "setMargin"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "mar" explicit_type "int"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 254466 "setSpacing"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "spacing" explicit_type "int"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 254594 "addWidget"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "widget" explicit_type "QWidget"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} * ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 254722 "name"
+	preserve_cpp_body_indent public explicit_return_type "QString"
+	nparams 1
+	
+	  param in name "name" explicit_type "QString"
+	    defaultvalue "QString()"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      extra_member 135042 "signals"
+	
+	cpp "  signals:" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      extra_member 135170 "slots"
+	
+	cpp "  public slots:" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      attribute 136578 "m_layout"
+	private explicit_type "QGridLayout"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 136706 "m_numCols"
+	private explicit_type "int"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 136834 "currentIndex"
+	private explicit_type "int"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+    end
+
+    class 159362 "typedef2"
+      visibility package stereotype "typedef" explicit_base_type "QGroupBox"
+      cpp_decl "${comment}typedef ${type} ${name};
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+    end
+
+    class 159490 "HHBox"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 174850 // (<generalisation>)
+	relation 174850 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 174850 // (<generalisation>)
+	  b parent class_ref 159618 // typedef3
+      end
+
+      extra_member 135298 "Q_OBJECT"
+	
+	cpp "  Q_OBJECT" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 254850 "HHBox"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 2
+	
+	  param inout name "parent" explicit_type "QWidget"
+	    defaultvalue "0"
+	  param in name "name" explicit_type "QString"
+	    defaultvalue "QString()"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}, ${t1} ${p1}${v1}${)}${volatile}${throw};
+"
+	cpp_def "${inline}${class}::${name}${(}${t0} * ${p0}, ${t1} ${p1}${)} :
+    QWidget(parent)
+${throw}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 254978 "addWidget"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "widget" explicit_type "QWidget"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} * ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 255106 "setStretchFactor"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 2
+	
+	  param inout name "w" explicit_type "QWidget"
+	  param in name "stretch" explicit_type "int"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} * ${p0}, ${t1} ${p1}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 255234 "setMargin"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "margin" explicit_type "int"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      extra_member 135426 "signals"
+	
+	cpp "  signals:" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      extra_member 135554 "slots"
+	
+	cpp "  public slots:" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      attribute 136962 "m_layout"
+	private explicit_type "QHBoxLayout"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+    end
+
+    class 159618 "typedef3"
+      visibility package stereotype "typedef" explicit_base_type "QWidget"
+      cpp_decl "${comment}typedef ${type} ${name};
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+    end
+
+    class 159746 "VVBox"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 174978 // (<generalisation>)
+	relation 174978 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 174978 // (<generalisation>)
+	  b parent class_ref 159618 // typedef3
+      end
+
+      extra_member 135682 "Q_OBJECT"
+	
+	cpp "  Q_OBJECT" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 255490 "VVBox"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 1
+	
+	  param inout name "parent" explicit_type "QWidget"
+	    defaultvalue "0"
+	cpp_decl "    ${comment}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile}${throw};
+"
+	cpp_def "${inline}${class}::${name}${(}${t0} * ${p0}${)} :
+    QWidget(parent)
+${throw}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 255618 "addWidget"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "widget" explicit_type "QWidget"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} * ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 255746 "setStretchFactor"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 2
+	
+	  param inout name "w" explicit_type "QWidget"
+	  param in name "stretch" explicit_type "int"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} * ${p0}, ${t1} ${p1}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 255874 "setMargin"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "margin" explicit_type "int"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${throw}${staticnl}{
+${body}}
+"
+	
+	
+	
+	
+      end
+
+      extra_member 135810 "signals"
+	
+	cpp "  signals:" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      extra_member 135938 "slots"
+	
+	cpp "  public slots:" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      attribute 137090 "m_layout"
+	private explicit_type "QVBoxLayout"
+	cpp_decl "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+    end
+  end
+
+  package_ref 135682 // Logging
+
+  deploymentview 135682 "cpp_utilities"
+    //deployment diagram settings
+    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+    artifact 151426 "gridbox"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 159362 // typedef2
+	class_ref 159234 // GridBox
+      end
+    end
+
+    artifact 151554 "hhbox"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 159618 // typedef3
+	class_ref 159490 // HHBox
+      end
+    end
+
+    artifact 151682 "vvbox"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 159746 // VVBox
+      end
+    end
+
+    artifact 152194 "FunctionTracer"
+      stereotype "source"
+      cpp_h "#ifndef _${NAME}_H
+#define _${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 158082 // FunctionTracer
+      end
+    end
+
+    artifact 152322 "main"
+      stereotype "source"
+      cpp_src "// the program is called with the socket port number in argument
+
+int main(int argc, char ** argv)
+{
+#ifdef DEBUG
+    QsLogging::Logger & logger = QsLogging::Logger::instance();
+    logger.setLoggingLevel(QsLogging::TraceLevel);
+    QDir dir;
+    dir.setPath(qApp->applicationDirPath());
+    dir.remove(QString(\"cpp_uyils\") + QString(\".log\"));
+    const QString sLogPath(QDir(qApp->applicationDirPath()).filePath(QString(\"cpp_utils\") + QString(\".log\")));
+    QsLogging::DestinationPtr fileDestination(QsLogging::DestinationFactory::MakeFileDestination(sLogPath));
+    QsLogging::DestinationPtr debugDestination(QsLogging::DestinationFactory::MakeDebugOutputDestination());
+    logger.addDestination(debugDestination.get());
+    logger.addDestination(fileDestination.get());
+    QLOG_INFO() << \"Starting the log\";
+#endif
+    if (argc != 2)
+        return 0;
+    QApplication a(argc, argv);
+    QLOG_INFO()  << \"Attempting to connect\";
+    if (UmlCom::connect(QString(argv[1]).toUInt()))
+    {
+        QLOG_INFO() << \"<b>Class utilities</b> release 1.1.2<hr>\";
+        UmlCom::trace(\"<b>Class utilities</b> release 1.1.2<hr>\");
+
+        try {
+            QLOG_INFO() << 1;
+            UmlCom::targetItem()->utilities();
+            QLOG_INFO() << 2;
+        }
+        catch (...) {
+            QLOG_INFO() << 3;
+        }
+
+        // must be called to cleanly inform that all is done
+        UmlCom::bye();
+    }
+
+    UmlCom::close();
+    return 0;
+}
+"
+      associated_classes
+      end
+    end
+  end
+preserve_bodies
+
 end
diff --git a/plugouts/cpp_utilities/generation_settings b/plugouts/cpp_utilities/generation_settings
index 83bd85864..3b40ed640 100644
--- a/plugouts/cpp_utilities/generation_settings
+++ b/plugouts/cpp_utilities/generation_settings
@@ -110,12 +110,12 @@ ${items}
 " // multiplicity [..]
   cpp_get "get_${name}" inline const value_const public
   cpp_set "set_${name}" public
-  cpp_default_operation_declaration "    ${comment}${static}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+  cpp_default_operation_declaration "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
 "
   cpp_default_operation_definition "${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}{
 ${body}}
 "
-  java_default_src_content "${comment}
+  cpp_indent_visibility "  "java_default_src_content "${comment}
 ${package}
 ${definition}"
   java_default_class_decl "${comment}${public}${final}${abstract}class ${name}${extends}${implements} {
diff --git a/plugouts/cpp_utilities/stereotypes b/plugouts/cpp_utilities/stereotypes
index c2101fa32..f3632e476 100644
--- a/plugouts/cpp_utilities/stereotypes
+++ b/plugouts/cpp_utilities/stereotypes
@@ -47,6 +47,7 @@
   deploymentview_stereotypes  0
   classdiagram_stereotypes  0
   seqdiagram_stereotypes  0
+  msg_stereotypes  0
   coldiagram_stereotypes  0
   usecasediagram_stereotypes  0
   statediagram_stereotypes  0
diff --git a/plugouts/deploy/cpp_includes b/plugouts/deploy/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/deploy/cpp_includes
+++ b/plugouts/deploy/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/empty/cpp_includes b/plugouts/empty/cpp_includes
index 04a79c772..918f020fc 100644
--- a/plugouts/empty/cpp_includes
+++ b/plugouts/empty/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/genpro/cpp_includes b/plugouts/genpro/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/genpro/cpp_includes
+++ b/plugouts/genpro/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/html/cpp_includes b/plugouts/html/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/html/cpp_includes
+++ b/plugouts/html/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/rose/cpp_includes b/plugouts/rose/cpp_includes
index e22479b80..60831871b 100644
--- a/plugouts/rose/cpp_includes
+++ b/plugouts/rose/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/singleton/cpp_includes b/plugouts/singleton/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/singleton/cpp_includes
+++ b/plugouts/singleton/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/sm_generator/641 b/plugouts/sm_generator/641
index a4b540320..b231d1cdd 100644
--- a/plugouts/sm_generator/641
+++ b/plugouts/sm_generator/641
@@ -6240,7 +6240,7 @@ ${namespace_end}
 "
       cpp_src "${comment}
 ${includes}
-#include <qlist.h>
+#include <QList>
 
 #include \"UmlCom.h\"
 #include \"UmlState.h\"
diff --git a/plugouts/sm_generator/cpp_includes b/plugouts/sm_generator/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/sm_generator/cpp_includes
+++ b/plugouts/sm_generator/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/sort/cpp_includes b/plugouts/sort/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/sort/cpp_includes
+++ b/plugouts/sort/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/uml_projection/cpp_includes b/plugouts/uml_projection/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/uml_projection/cpp_includes
+++ b/plugouts/uml_projection/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/usecase_wizard/cpp_includes b/plugouts/usecase_wizard/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/usecase_wizard/cpp_includes
+++ b/plugouts/usecase_wizard/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/xmi/cpp_includes b/plugouts/xmi/cpp_includes
index e081d575c..b1b852106 100644
--- a/plugouts/xmi/cpp_includes
+++ b/plugouts/xmi/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/xmi2/cpp_includes b/plugouts/xmi2/cpp_includes
index 04a79c772..918f020fc 100644
--- a/plugouts/xmi2/cpp_includes
+++ b/plugouts/xmi2/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/plugouts/xmi2import/cpp_includes b/plugouts/xmi2import/cpp_includes
index 7e811a483..bf144f510 100644
--- a/plugouts/xmi2import/cpp_includes
+++ b/plugouts/xmi2import/cpp_includes
@@ -1,7 +1,7 @@
 // "a type" "needed cpp_includes"
 "QVector" "#include <qvector.h>"
 
-"QList" "#include <qlist.h>"
+"QList" "#include <QList>"
 
 "QValueList" "#include <qvaluelist.h>"
 
diff --git a/src/CppGenerator/CppGenerator.pro b/src/CppGenerator/CppGenerator.pro
index 25944a070..c6be29a39 100644
--- a/src/CppGenerator/CppGenerator.pro
+++ b/src/CppGenerator/CppGenerator.pro
@@ -1,14 +1,37 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
-SOURCES          = UmlClassItem.cpp CppRefType.cpp UmlAttribute.cpp \
-        UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \
-        UmlExtraClassMember.cpp UmlArtifact.cpp \
-        UmlClassView.cpp UmlCollaborationDiagram.cpp UmlComponent.cpp \
-        UmlComponentDiagram.cpp UmlComponentView.cpp \
-        UmlDeploymentDiagram.cpp UmlDeploymentView.cpp UmlDiagram.cpp \
-        UmlItem.cpp UmlNode.cpp UmlOperation.cpp UmlPackage.cpp \
-        UmlRelation.cpp UmlNcRelation.cpp UmlSequenceDiagram.cpp UmlUseCase.cpp \
-        UmlUseCaseDiagram.cpp UmlUseCaseView.cpp main.cpp util.cpp \
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
+SOURCES          = \
+        UmlClassItem.cpp\
+        CppRefType.cpp\
+        UmlAttribute.cpp \
+        UmlClass.cpp\
+        UmlClassDiagram.cpp\
+        UmlClassMember.cpp \
+        UmlExtraClassMember.cpp\
+        UmlArtifact.cpp \
+        UmlClassView.cpp\
+        UmlCollaborationDiagram.cpp\
+        UmlComponent.cpp \
+        UmlComponentDiagram.cpp\
+        UmlComponentView.cpp \
+        UmlDeploymentDiagram.cpp\
+        UmlDeploymentView.cpp\
+        UmlDiagram.cpp \
+        UmlItem.cpp\
+        UmlNode.cpp\
+        UmlOperation.cpp\
+        UmlPackage.cpp \
+        UmlRelation.cpp\
+        UmlNcRelation.cpp\
+        UmlSequenceDiagram.cpp\
+        UmlUseCase.cpp \
+        UmlUseCaseDiagram.cpp\
+        UmlUseCaseView.cpp\
+        main.cpp\
+        util.cpp \
         UmlChoicePseudoState.cpp UmlDeepHistoryPseudoState.cpp \
         UmlEntryPointPseudoState.cpp UmlExitPointPseudoState.cpp \
         UmlFinalState.cpp UmlForkPseudoState.cpp \
@@ -39,22 +62,35 @@ SOURCES          = UmlClassItem.cpp CppRefType.cpp UmlAttribute.cpp \
         UmlTypeSpec.cpp \
         UmlInterruptibleActivityRegion.cpp \
         UmlClassInstance.cpp \
-        ../Tools/UmlBaseClassItem.cpp ../Tools/CppSettings.cpp \
+        ../Tools/UmlBaseClassItem.cpp\
+        ../Tools/CppSettings.cpp \
         ../Tools/IdlSettings.cpp ../Tools/JavaSettings.cpp \
         ../Tools/UmlBaseArtifact.cpp \
-        ../Tools/UmlBaseAttribute.cpp ../Tools/UmlBaseClass.cpp \
-        ../Tools/UmlBaseClassDiagram.cpp ../Tools/UmlBaseClassMember.cpp \
-        ../Tools/UmlBaseExtraClassMember.cpp ../Tools/UmlBaseClassView.cpp \
-        ../Tools/UmlBaseCollaborationDiagram.cpp ../Tools/UmlBaseComponent.cpp \
-        ../Tools/UmlBaseComponentDiagram.cpp ../Tools/UmlBaseComponentView.cpp \
-        ../Tools/UmlBaseDeploymentDiagram.cpp ../Tools/UmlBaseDeploymentView.cpp \
-        ../Tools/UmlBaseDiagram.cpp ../Tools/UmlBaseItem.cpp \
-        ../Tools/UmlBaseNode.cpp ../Tools/UmlBaseOperation.cpp \
-        ../Tools/UmlBasePackage.cpp ../Tools/UmlBaseRelation.cpp \
+        ../Tools/UmlBaseAttribute.cpp\
+        ../Tools/UmlBaseClass.cpp \
+        ../Tools/UmlBaseClassDiagram.cpp\
+         ../Tools/UmlBaseClassMember.cpp \
+        ../Tools/UmlBaseExtraClassMember.cpp\
+        ../Tools/UmlBaseClassView.cpp \
+        ../Tools/UmlBaseCollaborationDiagram.cpp\
+        ../Tools/UmlBaseComponent.cpp \
+        ../Tools/UmlBaseComponentDiagram.cpp\
+        ../Tools/UmlBaseComponentView.cpp \
+        ../Tools/UmlBaseDeploymentDiagram.cpp\
+        ../Tools/UmlBaseDeploymentView.cpp \
+        ../Tools/UmlBaseDiagram.cpp\
+        ../Tools/UmlBaseItem.cpp \
+        ../Tools/UmlBaseNode.cpp\
+        ../Tools/UmlBaseOperation.cpp \
+        ../Tools/UmlBasePackage.cpp\
+        ../Tools/UmlBaseRelation.cpp \
         ../Tools/UmlBaseNcRelation.cpp \
-        ../Tools/UmlBaseSequenceDiagram.cpp ../Tools/UmlBaseUseCase.cpp \
-        ../Tools/UmlBaseUseCaseDiagram.cpp ../Tools/UmlBaseUseCaseView.cpp \
-        ../Tools/UmlCom.cpp ../Tools/UmlSettings.cpp \
+        ../Tools/UmlBaseSequenceDiagram.cpp\
+        ../Tools/UmlBaseUseCase.cpp \
+        ../Tools/UmlBaseUseCaseDiagram.cpp\
+        ../Tools/UmlBaseUseCaseView.cpp \
+        ../Tools/UmlCom.cpp\
+        ../Tools/UmlSettings.cpp \
         ../Tools/UmlBaseChoicePseudoState.cpp ../Tools/UmlBaseDeepHistoryPseudoState.cpp \
         ../Tools/UmlBaseEntryPointPseudoState.cpp ../Tools/UmlBaseExitPointPseudoState.cpp \
         ../Tools/UmlBaseFinalState.cpp ../Tools/UmlBaseForkPseudoState.cpp \
@@ -92,34 +128,39 @@ SOURCES          = UmlClassItem.cpp CppRefType.cpp UmlAttribute.cpp \
         ../Tools/UmlBaseClassInstance.cpp \
         ../misc/mystr.cpp \
         ../misc/codec.cpp \
-    Logging/QsLogDest.cpp \
-    Logging/QsLog.cpp \
-    Logging/QsDebugOutput.cpp
+        Logging/QsLogDest.cpp \
+        Logging/QsLog.cpp \
+        Logging/QsDebugOutput.cpp
 
         
 TARGET          = cpp_generator
-DEFINES          = WITHCPP BooL=bool TRACE
-INCLUDEPATH   = ../Tools ../CppGenerator ../
+DEFINES          += WITHCPP BooL=bool TRUE=true FALSE=false
+INCLUDEPATH   += ../Tools ../CppGenerator ../
+#DEFINES += _RUN_PLUGOUT_EXTERNAL_
 
 
 #The following line was inserted by qt3to4
-QT += network  qt3support testlib console
-QMAKE_CXXFLAGS += -std=gnu++11
-Release{
-    MOC_DIR = ../../bin/MOC_release/gen/
-    OBJECTS_DIR = ../../bin/Obj_release/gen
-}
+QT += network  testlib
+#QT += qt3support
 
-Debug{
-    MOC_DIR = ../../bin/MOC_debug/gen/
-    OBJECTS_DIR = ../../bin/Obj_debug/gen
 
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/cpp_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_release/cpp_generator
+}
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/cpp_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/cpp_generator
 }
 
-    DESTDIR = ../../bin
+
 
 HEADERS += \
     Logging/QsLogDest.h \
     Logging/QsLog.h \
     Logging/QsDebugOutput.h \
-    ../misc/codec.h
+    ../misc/codec.h\
+    UmlClassMember.h
diff --git a/src/CppGenerator/CppRefType.cpp b/src/CppGenerator/CppRefType.cpp
index e4194720d..e57e06a36 100644
--- a/src/CppGenerator/CppRefType.cpp
+++ b/src/CppGenerator/CppRefType.cpp
@@ -36,10 +36,10 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+////
 
 // not in case of a dependency => external class in h
-bool CppRefType::add(const UmlTypeSpec & t, Q3PtrList<CppRefType> & l,
+bool CppRefType::add(const UmlTypeSpec & t, QList<CppRefType *> & l,
                      bool incl)
 {
     return (t.type)
@@ -47,10 +47,9 @@ bool CppRefType::add(const UmlTypeSpec & t, Q3PtrList<CppRefType> & l,
            : add(t.explicit_type, l, incl);
 }
 
-bool CppRefType::add(UmlClass * cl, Q3PtrList<CppRefType> & l,
+bool CppRefType::add(UmlClass * cl, QList<CppRefType *> & l,
                      bool incl, bool hight)
 {
-    CppRefType * ref;
     WrapperStr t = cl->name();
     Weight w;
 
@@ -69,12 +68,11 @@ bool CppRefType::add(UmlClass * cl, Q3PtrList<CppRefType> & l,
     else
         w = (hight) ? High : Low;
 
-    for (ref = l.first(); ref; ref = l.next()) {
+    foreach (CppRefType *ref, l) {
         // don't use ref->type.toString() because of synonymous
         // in several namespaces
-        if ((ref->type.type != 0)
-            ? (ref->type.type == cl)
-            : (ref->type.explicit_type == t)) {
+        if ((ref->type.type != 0) ? (ref->type.type == cl) : (ref->type.explicit_type == t))
+        {
             if (w > ref->weight)
                 ref->included = incl;
 
@@ -86,12 +84,12 @@ bool CppRefType::add(UmlClass * cl, Q3PtrList<CppRefType> & l,
     return TRUE;
 }
 
-bool CppRefType::add(const WrapperStr & t, Q3PtrList<CppRefType> & l, bool incl)
+bool CppRefType::add(const WrapperStr & t, QList<CppRefType *> & l, bool incl)
 {
     if (t.isEmpty())
         return FALSE;
 
-    static Q3Dict<char> cpp_builtin_types;
+    static QHash<QString,const char*> cpp_builtin_types;
 
     if (cpp_builtin_types.count() == 0) {
         cpp_builtin_types.insert("unsigned", " ");
@@ -109,10 +107,9 @@ bool CppRefType::add(const WrapperStr & t, Q3PtrList<CppRefType> & l, bool incl)
     if (cpp_builtin_types[t] != 0)
         return TRUE;
 
-    CppRefType * ref;
     Weight w = (incl) ? Medium : Low;
 
-    for (ref = l.first(); ref; ref = l.next()) {
+    foreach (CppRefType *ref, l) {
         if (ref->type.toString() == t) {
             if (w > ref->weight)
                 ref->included = incl;
@@ -125,37 +122,38 @@ bool CppRefType::add(const WrapperStr & t, Q3PtrList<CppRefType> & l, bool incl)
     return TRUE;
 }
 
-void CppRefType::remove(const WrapperStr & t, Q3PtrList<CppRefType> & l)
+void CppRefType::remove(const WrapperStr & t, QList<CppRefType *> & l)
 {
-    Q3PtrListIterator<CppRefType> it(l);
+    QMutableListIterator<CppRefType *> it(l);
 
-    for (; it.current(); ++it) {
-        if ((*it)->type.explicit_type == t) {
-            delete *it;
-            l.remove(it);
+    while (it.hasNext()) {
+        CppRefType *ref = it.next();
+        if (ref->type.explicit_type == t) {
+            delete ref;
+            it.remove();
             return;
         }
     }
 }
 
-void CppRefType::remove(UmlClass * cl, Q3PtrList<CppRefType> & l)
+void CppRefType::remove(UmlClass * cl, QList<CppRefType *> & l)
 {
-    Q3PtrListIterator<CppRefType> it(l);
+    QMutableListIterator<CppRefType *> it(l);
 
-    for (; it.current(); ++it) {
-        if ((*it)->type.type == cl) {
-            l.remove(it);
+    while (it.hasNext()) {
+        CppRefType *ref = it.next();
+        if (ref->type.type == cl) {
+            it.remove();
             return;
         }
     }
 }
 
-void CppRefType::force_ref(UmlClass * cl, Q3PtrList<CppRefType> & l)
+void CppRefType::force_ref(UmlClass * cl, QList<CppRefType *> & l)
 {
-    CppRefType * ref;
     WrapperStr t = cl->name();
 
-    for (ref = l.first(); ref; ref = l.next()) {
+    foreach (CppRefType *ref, l) {
         // don't use ref->type.toString() because of synonymous
         // in several namespaces
         if ((ref->type.type != 0)
@@ -167,7 +165,7 @@ void CppRefType::force_ref(UmlClass * cl, Q3PtrList<CppRefType> & l)
     }
 }
 
-void CppRefType::compute(Q3PtrList<CppRefType> & dependencies,
+void CppRefType::compute(QList<CppRefType *> & dependencies,
                          const WrapperStr & hdef, const WrapperStr & srcdef,
                          WrapperStr & h_incl,  WrapperStr & decl, WrapperStr & src_incl,
                          UmlArtifact * who)
@@ -200,13 +198,12 @@ void CppRefType::compute(Q3PtrList<CppRefType> & dependencies,
     h_incl = "";	// to not be WrapperStr::null
     decl = "";	// to not be WrapperStr::null
 
-    CppRefType * ref;
-
-    for (ref = dependencies.first(); ref != 0; ref = dependencies.next()) {
+    foreach (CppRefType *ref, dependencies) {
         UmlClass * cl = (ref->type.type)
                         ? ref->type.type
                         : UmlBaseClass::get(ref->type.explicit_type, 0);
         bool included = ref->included;
+
         WrapperStr hform;	// form in header
         WrapperStr srcform;	// form in source
 
@@ -219,7 +216,9 @@ void CppRefType::compute(Q3PtrList<CppRefType> & dependencies,
                 // doesn't know what it is
                 continue;
         }
-        else if (cl->isCppExternal()) {
+        else if (cl->isCppExternal())
+        {
+            QString className = cl->name();
             hform = cl->cppDecl();
 
             int index;
@@ -236,9 +235,9 @@ void CppRefType::compute(Q3PtrList<CppRefType> & dependencies,
                 else if ((index = hform.find("${Name}")) != -1)
                     hform.replace(index, 7, capitalize(cl->name()));
                 else if ((index = hform.find("${NAME}")) != -1)
-                    hform.replace(index, 7, cl->name().upper());
+                    hform.replace(index, 7, cl->name().upper().toLatin1().constData());
                 else if ((index = hform.find("${nAME}")) != -1)
-                    hform.replace(index, 7, cl->name().lower());
+                    hform.replace(index, 7, cl->name().lower().toLatin1().constData());
                 else
                     break;
             }
@@ -246,6 +245,7 @@ void CppRefType::compute(Q3PtrList<CppRefType> & dependencies,
             srcform = hform;
         }
         else {
+            QString className = cl->name();
             WrapperStr st = cl->cpp_stereotype();
 
             if ((st == "enum") || (st == "typedef"))
diff --git a/src/CppGenerator/CppRefType.h b/src/CppGenerator/CppRefType.h
index 4f772436c..35d8072db 100644
--- a/src/CppGenerator/CppRefType.h
+++ b/src/CppGenerator/CppRefType.h
@@ -28,11 +28,11 @@
 #ifndef CPPREFTYPE_H
 #define CPPREFTYPE_H
 
-#include <q3ptrlist.h>
+//
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3PtrList>
+//
 
 #include "UmlTypeSpec.h"
 
@@ -44,13 +44,13 @@ class CppRefType
 public:
     enum Weight { Low, Medium, High, Strong };
 
-    static bool add(UmlClass *, Q3PtrList<CppRefType> &, bool incl, bool hight = FALSE);
-    static bool add(const WrapperStr &, Q3PtrList<CppRefType> &, bool incl);
-    static bool add(const UmlTypeSpec & t, Q3PtrList<CppRefType> & l, bool incl);
-    static void remove(UmlClass *, Q3PtrList<CppRefType> & l);
-    static void remove(const WrapperStr &, Q3PtrList<CppRefType> & l);
-    static void force_ref(UmlClass * cl, Q3PtrList<CppRefType> & l);
-    static void compute(Q3PtrList<CppRefType> & dependencies,
+    static bool add(UmlClass *, QList<CppRefType *> &, bool incl, bool hight = FALSE);
+    static bool add(const WrapperStr &, QList<CppRefType *> &, bool incl);
+    static bool add(const UmlTypeSpec & t, QList<CppRefType *> & l, bool incl);
+    static void remove(UmlClass *, QList<CppRefType *> & l);
+    static void remove(const WrapperStr &, QList<CppRefType *> & l);
+    static void force_ref(UmlClass * cl, QList<CppRefType *> & l);
+    static void compute(QList<CppRefType *> & dependencies,
                         const WrapperStr & hdef, const WrapperStr & srcdef,
                         WrapperStr & h_incl,  WrapperStr & decl, WrapperStr & src_incl,
                         UmlArtifact * who);
diff --git a/src/CppGenerator/UmlArtifact.cpp b/src/CppGenerator/UmlArtifact.cpp
index 0d323c504..662469396 100644
--- a/src/CppGenerator/UmlArtifact.cpp
+++ b/src/CppGenerator/UmlArtifact.cpp
@@ -32,7 +32,7 @@
 #include "misc/mystr.h"
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
+////
 
 #include "UmlArtifact.h"
 #include "UmlPackage.h"
@@ -80,7 +80,8 @@ void UmlArtifact::generate()
         WrapperStr src_path = pack->source_path(name);
         WrapperStr nasp_start;
         WrapperStr nasp_end;
-        const char * cnasp = pack->cppNamespace();
+        WrapperStr cnaspstr = pack->cppNamespace();
+        const char * cnasp = cnaspstr;
         WrapperStr nasp = ((cnasp[0] == ':') && (cnasp[1] == ':'))
                          ? cnasp + 2 : cnasp;
 
@@ -128,7 +129,7 @@ void UmlArtifact::generate()
         }
 
         // get bodies if preserve
-        const Q3PtrVector<UmlClass> & cls = associatedClasses();
+        const QVector<UmlClass*> & cls = associatedClasses();
 
         if (preserve())
             UmlOperation::read_bodies(h_path, src_path);
@@ -136,7 +137,7 @@ void UmlArtifact::generate()
         // compute dependencies
 
         bool all_in_h = (hdef.find("${all_includes}") != -1);
-        Q3PtrList<CppRefType> dependencies;
+        QList<CppRefType *> dependencies;
         unsigned n = cls.count();
         unsigned index;
 
@@ -185,9 +186,6 @@ void UmlArtifact::generate()
                     manage_alias(p, f_h);
                 else if (*p != '$')
                 {
-                    QTextCodec* codec = QTextCodec::codecForLocale();
-                    //f_h << codec->fromUnicode(*p,1);
-                    //p++;
                     f_h << toLocale(p);
                 }
                 else if (!strncmp(p, "${comment}", 10))
@@ -286,7 +284,7 @@ void UmlArtifact::generate()
                     p += 13;
 
                     for (index = 0; index != n; index += 1)
-                        cls[index]->generate_decl(f_h, current_indent(p, hdef.operator QString()));
+                        cls[index]->generate_decl(f_h, current_indent(p, hdef.operator QString().toLatin1().constData()));
 
                     if (*p == '\n')
                         p += 1;
@@ -320,7 +318,7 @@ void UmlArtifact::generate()
                     QTextStream out(&file);
                     out.setCodec(QTextCodec::codecForLocale());
                     QString temp(*headerFile.data());
-                    out << codec->toUnicode(temp);
+                    out << codec->toUnicode(temp.toLatin1().constData());
                     //out << *headerFile.data();
                     out.flush();
                 }
diff --git a/src/CppGenerator/UmlAttribute.cpp b/src/CppGenerator/UmlAttribute.cpp
index f4ac9b3d6..b6ce7f927 100644
--- a/src/CppGenerator/UmlAttribute.cpp
+++ b/src/CppGenerator/UmlAttribute.cpp
@@ -30,7 +30,7 @@
 #include "misc/mystr.h"
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
+////
 
 #include "UmlAttribute.h"
 #include "UmlSettings.h"
@@ -40,7 +40,7 @@
 #include "util.h"
 #include "misc/codec.h"
 
-void UmlAttribute::compute_dependency(Q3PtrList<CppRefType> & dependency,
+void UmlAttribute::compute_dependency(QList<CppRefType *> & dependency,
                                       const WrapperStr & cl_stereotype,
                                       bool all_in_h)
 {
@@ -174,7 +174,7 @@ void UmlAttribute::generate_decl(aVisibility & current_visibility, QTextStream &
 
             p += (p[2] == 'h') ? 10 : 8;
 
-            if (!defaultValue().isEmpty()) {
+            if (!defaultValue().isEmpty() && !isClassMember()) {
                 if (need_equal(pb, defaultValue()))
                     f_h << " = ";
 
diff --git a/src/CppGenerator/UmlAttribute.h b/src/CppGenerator/UmlAttribute.h
index f425a870a..3a4c9f58a 100644
--- a/src/CppGenerator/UmlAttribute.h
+++ b/src/CppGenerator/UmlAttribute.h
@@ -1,7 +1,6 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3PtrList>
 // *************************************************************************
 //
 // Copyright 2004-2010 Bruno PAGES  .
@@ -42,7 +41,7 @@ class UmlAttribute : public UmlBaseAttribute
     UmlAttribute(void * id, const WrapperStr & n)
         :  UmlBaseAttribute(id, n) {};
 
-    virtual void compute_dependency(Q3PtrList<CppRefType> & dependency,
+    virtual void compute_dependency(QList<CppRefType *> & dependency,
                                     const WrapperStr & cl_stereotype,
                                     bool all_in_h);
     virtual void generate_decl(aVisibility & current_visibility, QTextStream & f_h,
diff --git a/src/CppGenerator/UmlClass.cpp b/src/CppGenerator/UmlClass.cpp
index 47dfa4bba..04f96750f 100644
--- a/src/CppGenerator/UmlClass.cpp
+++ b/src/CppGenerator/UmlClass.cpp
@@ -29,12 +29,10 @@
 #include <QTextStream>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
-#include <Q3CString>
-
+////
 #include "UmlClass.h"
 #include "UmlPackage.h"
 #include "UmlRelation.h"
@@ -51,8 +49,8 @@
 // the eventual class list where we are, used by write() to not generate
 // parent classes and template in the class declaration of the class
 
-Q3PtrList<UmlClass> UmlClass::context;
-Q3ValueList<UmlActualParameter> UmlClass::noactuals;
+QList<UmlClass *> UmlClass::context;
+QList<UmlActualParameter> UmlClass::noactuals;
 
 WrapperStr UmlClass::cpp_stereotype()
 {
@@ -84,7 +82,7 @@ void UmlClass::generate()
     }
 }
 
-void UmlClass::compute_dependencies(Q3PtrList<CppRefType> & dependencies,
+void UmlClass::compute_dependencies(QList<CppRefType *> & dependencies,
                                     bool all_in_h)
 {
     const WrapperStr dummy;
@@ -92,21 +90,21 @@ void UmlClass::compute_dependencies(Q3PtrList<CppRefType> & dependencies,
     compute_dependency(dependencies, dummy, all_in_h);
 }
 
-void UmlClass::compute_dependency(Q3PtrList<CppRefType> & dependencies,
+void UmlClass::compute_dependency(QList<CppRefType *> & dependencies,
                                   const WrapperStr &, bool all_in_h)
 {
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     const WrapperStr stereotype = cpp_stereotype();
     bool a_typedef = (stereotype == "typedef");
     bool an_enum = (stereotype == "enum");
-    const Q3ValueList<UmlFormalParameter> formals = this->formals();
-    const Q3ValueList<UmlActualParameter> actuals = this->actuals();
+    const QList<UmlFormalParameter> formals = this->formals();
+    const QList<UmlActualParameter> actuals = this->actuals();
 
     if (!formals.isEmpty())
         // template class, force depend in h
         all_in_h = TRUE;
 
-    for (unsigned index = 0; index != ch.size(); index += 1) {
+    for (int index = 0; index != ch.size(); index += 1) {
         if (ch[index]->kind() != aNcRelation) {
             UmlClassItem * it = (UmlClassItem *) ch[index];
 
@@ -126,12 +124,12 @@ void UmlClass::compute_dependency(Q3PtrList<CppRefType> & dependencies,
         incr_warning();
     }
     else {
-        Q3ValueList<UmlFormalParameter>::ConstIterator itf;
+        QList<UmlFormalParameter>::ConstIterator itf;
 
         for (itf = formals.begin(); itf != formals.end(); ++itf)
             CppRefType::remove((*itf).name(), dependencies);
 
-        Q3ValueList<UmlActualParameter>::ConstIterator ita;
+        QList<UmlActualParameter>::ConstIterator ita;
 
         for (ita = actuals.begin(); ita != actuals.end(); ++ita)
             UmlClassMember::compute_dependency(dependencies, "${type}",
@@ -165,7 +163,7 @@ void UmlClass::generate_decl(QTextStream & f_h, WrapperStr indent)
     context.append(this);
 
     bool removed = FALSE;
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     const unsigned sup = ch.size();
     QLOG_INFO() << "children.size() is: " << sup;
     const WrapperStr & stereotype = cpp_stereotype();
@@ -173,8 +171,8 @@ void UmlClass::generate_decl(QTextStream & f_h, WrapperStr indent)
 
     bool an_enum = (stereotype == "enum");
     QLOG_INFO() << "the class is an enum: " << an_enum;
-    const Q3ValueList<UmlFormalParameter> formals = this->formals();
-    const Q3ValueList<UmlActualParameter> actuals = this->actuals();
+    const QList<UmlFormalParameter> formals = this->formals();
+    const QList<UmlActualParameter> actuals = this->actuals();
     unsigned index;
     const char * p = cppDecl();
     const char * pp = 0;
@@ -236,7 +234,7 @@ void UmlClass::generate_decl(QTextStream & f_h, WrapperStr indent)
                 UmlClass * cl = baseType().type;
 
                 if ((cl != 0) && !actuals.isEmpty()) {
-                    Q3ValueList<UmlActualParameter>::ConstIterator ita;
+                    QList<UmlActualParameter>::ConstIterator ita;
                     BooL need_space = FALSE;
 
                     for (ita = actuals.begin(); ita != actuals.end(); ++ita)
@@ -301,7 +299,7 @@ void UmlClass::generate_decl(QTextStream & f_h, WrapperStr indent)
                 const char * sep2 = "<";
                 BooL need_space = FALSE;
 
-                Q3ValueList<UmlFormalParameter>::ConstIterator itf;
+                QList<UmlFormalParameter>::ConstIterator itf;
 
                 for (itf = formals.begin(); itf != formals.end(); ++itf)
                     (*itf).generate(f_h, sep, sep2, need_space);
@@ -409,7 +407,7 @@ void UmlClass::generate_decl(aVisibility & current_visibility, QTextStream & f_h
 void UmlClass::generate_def(QTextStream & f, WrapperStr indent, bool h)
 {
     if (! cppDecl().isEmpty()) {
-        Q3PtrVector<UmlItem> ch = children();
+        QVector<UmlItem*> ch = children();
         WrapperStr templates;
         WrapperStr cl_names;
         WrapperStr templates_tmplop;
@@ -417,7 +415,7 @@ void UmlClass::generate_def(QTextStream & f, WrapperStr indent, bool h)
 
         spec(templates, cl_names, templates_tmplop, cl_names_tmplop);
 
-        for (unsigned index = 0; index != ch.size(); index += 1)
+        for (int index = 0; index != ch.size(); index += 1)
             if (ch[index]->kind() != aNcRelation)
                 ((UmlClassItem *) ch[index])
                 ->generate_def(f, indent, h, templates, cl_names,
@@ -444,9 +442,9 @@ void UmlClass::generate_def(QTextStream & f, WrapperStr indent, bool h,
         cl_names_tmplop = cl_names + "::" + name()/* true_name */;
         cl_names = cl_names_tmplop + template2;
 
-        Q3PtrVector<UmlItem> ch = children();
+        QVector<UmlItem*> ch = children();
 
-        for (unsigned index = 0; index != ch.size(); index += 1)
+        for (int index = 0; index != ch.size(); index += 1)
             if (ch[index]->kind() != aNcRelation)
                 ((UmlClassItem *) ch[index])
                 ->generate_def(f, indent, h, templates, cl_names,
@@ -457,10 +455,10 @@ void UmlClass::generate_def(QTextStream & f, WrapperStr indent, bool h,
 void UmlClass::get_template_prefixes(WrapperStr & template1,
                                      WrapperStr & template2)
 {
-    Q3ValueList<UmlFormalParameter> formals = this->formals();
+    QList<UmlFormalParameter> formals = this->formals();
 
     if (!formals.isEmpty()) {
-        Q3ValueList<UmlFormalParameter>::ConstIterator it;
+        QList<UmlFormalParameter>::ConstIterator it;
         const char * sep1 = "template<";
         const char * sep2 = "<";
 
@@ -561,11 +559,11 @@ void UmlClass::write(QTextStream & f, const UmlTypeSpec & t,
 }
 
 void UmlClass::write(QTextStream & f, bool with_formals, BooL * is_template,
-                     const Q3ValueList<UmlActualParameter> & actuals)
+                     const QList<UmlActualParameter> & actuals)
 {
-    if (context.findRef(this) == -1) {
+    if (! context.contains(this)) {
         if (parent()->kind() == aClass) {
-            if (context.findRef((UmlClass *) parent()) == -1) {
+            if (! context.contains((UmlClass *) parent())) {
                 // parent cannot have formals, but may have actuals
                 ((UmlClass *) parent())->write(f, FALSE, 0, actuals);
                 f << "::";
@@ -598,9 +596,9 @@ void UmlClass::write(QTextStream & f, bool with_formals, BooL * is_template,
         else if ((index = s.find("${Name}")) != -1)
             s.replace(index, 7, capitalize(name()));
         else if ((index = s.find("${NAME}")) != -1)
-            s.replace(index, 7, name().upper());
+            s.replace(index, 7, name().upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            s.replace(index, 7, name().lower());
+            s.replace(index, 7, name().lower().toLatin1().constData());
     }
     else
         s = name();	// true_name
@@ -615,11 +613,11 @@ void UmlClass::write(QTextStream & f, bool with_formals, BooL * is_template,
         *is_template = FALSE;
 
     if (with_formals) {
-        Q3ValueList<UmlFormalParameter> formals = this->formals();
+        QList<UmlFormalParameter> formals = this->formals();
 
         if (! formals.isEmpty()) {
             const char * sep = "<";
-            Q3ValueList<UmlFormalParameter>::ConstIterator it;
+            QList<UmlFormalParameter>::ConstIterator it;
 
             for (it = formals.begin(); it != formals.end(); ++it) {
                 f << sep << (*it).name();
@@ -633,7 +631,7 @@ void UmlClass::write(QTextStream & f, bool with_formals, BooL * is_template,
         }
     }
     else if (!actuals.isEmpty()) {
-        Q3ValueList<UmlActualParameter>::ConstIterator ita;
+        QList<UmlActualParameter>::ConstIterator ita;
         BooL need_space = FALSE;
         bool used = FALSE;
 
diff --git a/src/CppGenerator/UmlClass.h b/src/CppGenerator/UmlClass.h
index 699dadd1a..ce0eda243 100644
--- a/src/CppGenerator/UmlClass.h
+++ b/src/CppGenerator/UmlClass.h
@@ -28,14 +28,10 @@
 #ifndef UMLCLASS_H
 #define UMLCLASS_H
 
-#include <q3dict.h>
-#include <q3ptrlist.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3ValueList>
-#include <Q3PtrList>
-
+#include <QList>
 #include "UmlBaseClass.h"
 #include "UmlTypeSpec.h"
 #include "UmlFormalParameter.h"
@@ -52,9 +48,9 @@ class UmlClass : public UmlBaseClass
 private:
     bool managed;
 
-    static Q3PtrList<UmlClass> context;
+    static QList<UmlClass *> context;
 
-    static Q3ValueList<UmlActualParameter> noactuals;
+    static QList<UmlActualParameter> noactuals;
 
 public:
     UmlClass(void * id, const WrapperStr & n)
@@ -62,9 +58,9 @@ class UmlClass : public UmlBaseClass
 
     WrapperStr cpp_stereotype();
 
-    void compute_dependencies(Q3PtrList<CppRefType> &, bool all_in_h);
+    void compute_dependencies(QList<CppRefType *> &, bool all_in_h);
 
-    virtual void compute_dependency(Q3PtrList<CppRefType> & dependency,
+    virtual void compute_dependency(QList<CppRefType *> & dependency,
                                     const WrapperStr & cl_stereotype,
                                     bool all_in_h);
     virtual void generate_decl(aVisibility & current_visibility,
@@ -88,7 +84,7 @@ class UmlClass : public UmlBaseClass
 
     void write(QTextStream &, bool with_formals = TRUE,
                BooL * is_template = 0,
-               const Q3ValueList<UmlActualParameter> & actuals = noactuals);
+               const QList<UmlActualParameter> & actuals = noactuals);
     static void write(QTextStream &, const UmlTypeSpec &,
                       bool with_formals = TRUE,
                       BooL * is_template = 0);
diff --git a/src/CppGenerator/UmlClassItem.h b/src/CppGenerator/UmlClassItem.h
index 76eb40457..8e7772a80 100644
--- a/src/CppGenerator/UmlClassItem.h
+++ b/src/CppGenerator/UmlClassItem.h
@@ -28,11 +28,11 @@
 #ifndef UMLCLASSITEM_H
 #define UMLCLASSITEM_H
 
-#include <q3ptrlist.h>
+//
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3PtrList>
+//
 
 #include "UmlBaseClassItem.h"
 
@@ -47,7 +47,7 @@ class UmlClassItem : public UmlBaseClassItem
         : UmlBaseClassItem(id, n) {
     };
 
-    virtual void compute_dependency(Q3PtrList<CppRefType> & dependency,
+    virtual void compute_dependency(QList<CppRefType *> & dependency,
                                     const WrapperStr & cl_stereotype,
                                     bool all_in_h) = 0;
 
diff --git a/src/CppGenerator/UmlClassMember.cpp b/src/CppGenerator/UmlClassMember.cpp
index 35528ccf0..9bc1223f3 100644
--- a/src/CppGenerator/UmlClassMember.cpp
+++ b/src/CppGenerator/UmlClassMember.cpp
@@ -30,7 +30,7 @@
 #include "misc/mystr.h"
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
+////
 
 #include "UmlClassMember.h"
 
@@ -153,7 +153,7 @@ void UmlClassMember::remove_arrays(WrapperStr & s)
 // Between template < and > I suppose that a type is not included
 // because I cannot know how the type is used and I do not want to
 // produce circular #include
-bool UmlClassMember::compute_dependency(Q3PtrList<CppRefType> & dependencies,
+bool UmlClassMember::compute_dependency(QList<CppRefType *> & dependencies,
                                         WrapperStr decl, const UmlTypeSpec & t,
                                         bool force_incl)
 {
@@ -232,7 +232,8 @@ bool UmlClassMember::compute_dependency(Q3PtrList<CppRefType> & dependencies,
                     ((c >= '0') && (c <= '9')))
                     p += 1;
                 else {
-                    ts.explicit_type.truncate(p - p2);
+                    ts.explicit_type = ts.explicit_type.left(p - p2);
+                    //ts.explicit_type.truncate(p - p2);
                     break;
                 }
             }
diff --git a/src/CppGenerator/UmlClassMember.h b/src/CppGenerator/UmlClassMember.h
index 416f48103..f9e004bd4 100644
--- a/src/CppGenerator/UmlClassMember.h
+++ b/src/CppGenerator/UmlClassMember.h
@@ -32,7 +32,6 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3PtrList>
 
 // This class globaly manages class's operations, relations, attributes
 // and sub-classes
@@ -47,7 +46,7 @@ class UmlClassMember : public UmlBaseClassMember
     static void remove_comments(WrapperStr & s);
     static void remove_arrays(WrapperStr & s);
     static void remove_preprocessor(WrapperStr & s);
-    static bool compute_dependency(Q3PtrList<CppRefType> & dependency,
+    static bool compute_dependency(QList<CppRefType *> & dependency,
                                    WrapperStr decl, const UmlTypeSpec &,
                                    bool force_incl = FALSE);
 
diff --git a/src/CppGenerator/UmlClassView.cpp b/src/CppGenerator/UmlClassView.cpp
index abe804ded..c0b1747e8 100644
--- a/src/CppGenerator/UmlClassView.cpp
+++ b/src/CppGenerator/UmlClassView.cpp
@@ -29,9 +29,9 @@
 
 void UmlClassView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/CppGenerator/UmlDeploymentView.cpp b/src/CppGenerator/UmlDeploymentView.cpp
index c34ceb554..87d719f8e 100644
--- a/src/CppGenerator/UmlDeploymentView.cpp
+++ b/src/CppGenerator/UmlDeploymentView.cpp
@@ -29,8 +29,8 @@
 
 void UmlDeploymentView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
diff --git a/src/CppGenerator/UmlExtraClassMember.cpp b/src/CppGenerator/UmlExtraClassMember.cpp
index dbf96f6ce..92b1f0371 100644
--- a/src/CppGenerator/UmlExtraClassMember.cpp
+++ b/src/CppGenerator/UmlExtraClassMember.cpp
@@ -30,12 +30,12 @@
 #include "misc/mystr.h"
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
+////
 
 #include "UmlExtraClassMember.h"
 #include "UmlClass.h"
 
-void UmlExtraClassMember::compute_dependency(Q3PtrList<CppRefType> &,
+void UmlExtraClassMember::compute_dependency(QList<CppRefType *> &,
         const WrapperStr &,
         bool)
 {
diff --git a/src/CppGenerator/UmlExtraClassMember.h b/src/CppGenerator/UmlExtraClassMember.h
index 2c647079a..0ee07cbcc 100644
--- a/src/CppGenerator/UmlExtraClassMember.h
+++ b/src/CppGenerator/UmlExtraClassMember.h
@@ -32,7 +32,6 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3PtrList>
 
 // This class allows to manage extra class member, mainly defined for C++
 // it allows to insert C++ pre-processor directive (even they may be placed
@@ -46,7 +45,7 @@ class UmlExtraClassMember : public UmlBaseExtraClassMember
     UmlExtraClassMember(void * id, const WrapperStr & n)
         : UmlBaseExtraClassMember(id, n) {};
 
-    virtual void compute_dependency(Q3PtrList<CppRefType> & dependency,
+    virtual void compute_dependency(QList<CppRefType *> & dependency,
                                     const WrapperStr & cl_stereotype,
                                     bool all_in_h);
     virtual void generate_decl(aVisibility & current_visibility,
diff --git a/src/CppGenerator/UmlItem.cpp b/src/CppGenerator/UmlItem.cpp
index e4f6bf834..a39d6b6af 100644
--- a/src/CppGenerator/UmlItem.cpp
+++ b/src/CppGenerator/UmlItem.cpp
@@ -26,11 +26,8 @@
 // *************************************************************************
 
 #include <QTextStream>
-//Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3CString>
-
 #include "UmlItem.h"
 #include "misc/codec.h"
 
@@ -41,7 +38,7 @@ UmlItem::~UmlItem()
 bool UmlItem::manage_comment(const char *& p, const char *& pp,
                              bool javadoc)
 {
-    static QString the_comment;
+    static QByteArray the_comment;
 
     p += 10;
 
@@ -154,7 +151,7 @@ void UmlItem::manage_alias(const char *& p, QTextStream & ts)
     const char * pclosed;
 
     if ((p[1] == '{') && ((pclosed = strchr(p + 2, '}')) != 0)) {
-        Q3CString key_(p + 2, pclosed - p - 1);
+        QByteArray key_(p + 2, pclosed - p - 1);
         WrapperStr key = key_;
         WrapperStr value;
         UmlItem * node = this;
diff --git a/src/CppGenerator/UmlOperation.cpp b/src/CppGenerator/UmlOperation.cpp
index c1812c983..92098af79 100644
--- a/src/CppGenerator/UmlOperation.cpp
+++ b/src/CppGenerator/UmlOperation.cpp
@@ -30,15 +30,11 @@
 #include <QTextStream>
 #include <qfile.h>
 #include <qfileinfo.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
-//Added by qt3to4:
-#include <Q3PtrList>
 #include <functional>
 #include <QSettings>
-
 #include "UmlOperation.h"
 #include "UmlSettings.h"
 #include "CppSettings.h"
@@ -49,10 +45,11 @@
 #include "util.h"
 #include "Logging/QsLog.h"
 
-// to manage preserved bodies, the key is the id under bouml
+// to manage preserved bodies, the key is the id under douml
+// or bouml in compatibility save mode
 QHash<long, WrapperStr> UmlOperation::bodies;
-const char * BodyPrefix = "// Bouml preserved body begin ";
-const char * BodyPrefix2 = "// Douml preserved body begin ";
+static const char * BodyPrefix = "// Bouml preserved body begin ";
+static const char * BodyPrefix2 = "// Douml preserved body begin ";
 static const char * BodyPostfix = "// Bouml preserved body end ";
 static const char * BodyPostfix2 = "// Douml preserved body end ";
 const int BodyPrefixLength = 30;
@@ -61,7 +58,7 @@ const int BodyPostfixLength = 28;
 // Between template < and > I suppose that a type is not included
 // because I cannot know how the type is used and I do not want to
 // produce circular #include
-void UmlOperation::compute_dependency(Q3PtrList<CppRefType> & dependencies,
+void UmlOperation::compute_dependency(QList<CppRefType *> & dependencies,
                                       const WrapperStr & cl_stereotype,
                                       bool all_in_h)
 {
@@ -153,7 +150,7 @@ void UmlOperation::compute_dependency(Q3PtrList<CppRefType> & dependencies,
     int template_level = 0;
     const char * p = decl;
     const char * dontsubstituteuntil = 0;
-    const Q3ValueList<UmlParameter> & params = this->params();
+    const QList<UmlParameter> & params = this->params();
     UmlTypeSpec ts;
 
     for (;;) {
@@ -188,7 +185,7 @@ void UmlOperation::compute_dependency(Q3PtrList<CppRefType> & dependencies,
             else if (sscanf(p, "${t%u}", (unsigned *) &index) == 1) {
                 p = strchr(p, '}') + 1;
 
-                if (((unsigned) index) < params.count()) {
+                if ((index) < params.count()) {
                     // else error signaled later
                     ts = params[index].type;
 
@@ -207,8 +204,8 @@ void UmlOperation::compute_dependency(Q3PtrList<CppRefType> & dependencies,
                 p = strchr(p, '}') + 1;
             else if (!strncmp(p, "${throw}", 8)) {
                 p += 8;
-                const Q3ValueList<UmlTypeSpec> exc = exceptions();
-                Q3ValueList<UmlTypeSpec>::ConstIterator it;
+                const QList<UmlTypeSpec> exc = exceptions();
+                QList<UmlTypeSpec>::ConstIterator it;
 
                 for (it = exc.begin(); it != exc.end(); ++it)
                     UmlClassMember::compute_dependency(dependencies, "${type}", *it, TRUE);
@@ -250,7 +247,7 @@ void UmlOperation::compute_dependency(Q3PtrList<CppRefType> & dependencies,
                     ((c >= '0') && (c <= '9')))
                     p += 1;
                 else {
-                    ts.explicit_type.truncate(p - p2);
+                    ts.explicit_type = ts.explicit_type.left(p - p2);
                     break;
                 }
             }
@@ -302,15 +299,14 @@ void UmlOperation::compute_dependency(Q3PtrList<CppRefType> & dependencies,
                 p += 1;
             }
         }
-
         CppRefType::add(ts, dependencies, incl || all_in_h);
     }
 }
 
-static bool generate_type(const Q3ValueList<UmlParameter> & params,
+static bool generate_type(const QList<UmlParameter> & params,
                           unsigned rank, QTextStream & f_h)
 {
-    if (rank >= params.count())
+    if ((int)rank >= params.count())
         return FALSE;
 
     UmlClass::write(f_h, params[rank].type);
@@ -318,20 +314,20 @@ static bool generate_type(const Q3ValueList<UmlParameter> & params,
     return TRUE;
 }
 
-static bool generate_var(const Q3ValueList<UmlParameter> & params,
+static bool generate_var(const QList<UmlParameter> & params,
                          unsigned rank, QTextStream & f_h)
 {
-    if (rank >= params.count())
+    if ((int)rank >= params.count())
         return FALSE;
 
     f_h << params[rank].name;
     return TRUE;
 }
 
-static bool generate_init(const Q3ValueList<UmlParameter> & params,
+static bool generate_init(const QList<UmlParameter> & params,
                           unsigned rank, QTextStream & f_h)
 {
-    if (rank >= params.count())
+    if ((int)rank >= params.count())
         return FALSE;
 
     if (! params[rank].default_value.isEmpty())
@@ -371,9 +367,9 @@ WrapperStr UmlOperation::compute_name()
         else if ((index = get_set_spec.find("${Name}")) != -1)
             get_set_spec.replace(index, 7, capitalize(s));
         else if ((index = s.find("${NAME}")) != -1)
-            get_set_spec.replace(index, 7, s.upper());
+            get_set_spec.replace(index, 7, s.upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            get_set_spec.replace(index, 7, s.lower());
+            get_set_spec.replace(index, 7, s.lower().toLatin1().constData());
 
         return get_set_spec;
     }
@@ -387,7 +383,7 @@ bool CompareAgainstTag(QString & currentTag, QString tagToCompare, const char *
     currentTag = tagToCompare;
     tagToCompare = "${" + tagToCompare + "}";
 
-    if (!strncmp(p, tagToCompare, tagToCompare.length()))
+    if (!strncmp(p, tagToCompare.toLatin1().constData(), tagToCompare.length()))
         return true;
 
     return false;
@@ -417,7 +413,7 @@ void UmlOperation::generate_decl(aVisibility & current_visibility, QTextStream &
 
         const char * p = cppDecl();
         const char * pp = 0;
-        const Q3ValueList<UmlParameter> & params = this->params();
+        const QList<UmlParameter> & params = this->params();
         unsigned rank;
 
         while ((*p == ' ') || (*p == '\t'))
@@ -539,13 +535,13 @@ void UmlOperation::generate_decl(aVisibility & current_visibility, QTextStream &
                 p += currentTag.length() + 3;
 
                 if (isCppDefault())
-                    f_h << " " + currentTag;
+                    f_h << " = " + currentTag;
             }
             else if (compareTagToBuffer("delete")) {
                 p += currentTag.length() + 3;
 
                 if (isCppDelete())
-                    f_h << " " + currentTag;
+                    f_h << " = " + currentTag;
             }
             else if (compareTagToBuffer("override")) {
                 p += currentTag.length() + 3;
@@ -599,12 +595,12 @@ void UmlOperation::generate_decl(aVisibility & current_visibility, QTextStream &
 
 void UmlOperation::generate_throw(QTextStream & f)
 {
-    const Q3ValueList<UmlTypeSpec> exc = exceptions();
+    const QList<UmlTypeSpec> exc = exceptions();
     if(exc.count() == 0)
         return;
 
     if (!exc.isEmpty()) {
-        Q3ValueList<UmlTypeSpec>::ConstIterator it;
+        QList<UmlTypeSpec>::ConstIterator it;
         const char * sep = " throw(";
 
         for (it = exc.begin(); it != exc.end(); ++it) {
@@ -625,6 +621,10 @@ const char * UmlOperation::generate_body(QTextStream & fs,
         WrapperStr indent,
         const char * p)
 {
+
+    if(isAbstract())
+        return p + 7;
+
     fs.setCodec(QTextCodec::codecForLocale());
     const char * body = 0;
     WrapperStr modeler_body;
@@ -654,15 +654,17 @@ const char * UmlOperation::generate_body(QTextStream & fs,
     while (*p != '$')
         indent += toLocale(p);
 
-    QSettings settings("settings.ini", QSettings::IniFormat);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
     settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
     int compat = settings.value("Main/compatibility_save").toInt();
 
+
     const char* actualPrefix = compat ? BodyPrefix : BodyPrefix2;
     if (preserve() && !isBodyGenerationForced())
         fs << indent << actualPrefix << s_id << '\n';
 
-    if ((body != 0) && (*body != 0)) {
+    if ((body != 0) && (*body != 0))
+    {
         // output body
         if (indent.isEmpty() || no_indent) {
             fs << toLocaleFull(body);
@@ -707,7 +709,7 @@ const char * UmlOperation::generate_body(QTextStream & fs,
         if (add_nl)
             fs << '\n';
 
-        QSettings settings("settings.ini", QSettings::IniFormat);
+        QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
         settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
         int compat = settings.value("Main/compatibility_save").toInt();
 
@@ -755,7 +757,7 @@ void UmlOperation::generate_def(QTextStream & fs, WrapperStr indent, bool h,
             ? h : !h) {
             const char * p = cppDef();
             const char * pp = 0;
-            const Q3ValueList<UmlParameter> & params = this->params();
+            const QList<UmlParameter> & params = this->params();
             unsigned rank;
             const char * body_indent = strstr(p, "${body}");
             bool template_oper = is_template_operation();
@@ -929,10 +931,10 @@ static char * read_file(const char * filename)
 
     if (fp.open(QIODevice::ReadOnly)) {
         QFileInfo fi(fp);
-        int size = fi.size();
+        qint64 size = fi.size();
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) == -1) {
+        if (fp.read(s, size) == -1) {
             delete [] s;
             return 0;
         }
diff --git a/src/CppGenerator/UmlOperation.h b/src/CppGenerator/UmlOperation.h
index 5c527f0f6..f5f60cae8 100644
--- a/src/CppGenerator/UmlOperation.h
+++ b/src/CppGenerator/UmlOperation.h
@@ -27,13 +27,9 @@
 
 #ifndef UMLOPERATION_H
 #define UMLOPERATION_H
-
-#include <q3intdict.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3PtrList>
-
 #include "UmlBaseOperation.h"
 
 class QTextStream;
@@ -47,7 +43,7 @@ class UmlOperation : public UmlBaseOperation
     UmlOperation(void * id, const WrapperStr & n)
         : UmlBaseOperation(id, n) {};
 
-    virtual void compute_dependency(Q3PtrList<CppRefType> & dependency,
+    virtual void compute_dependency(QList<CppRefType *> & dependency,
                                     const WrapperStr & cl_stereotype,
                                     bool all_in_h);
     virtual void generate_decl(aVisibility & current_visibility, QTextStream & f_h,
diff --git a/src/CppGenerator/UmlPackage.cpp b/src/CppGenerator/UmlPackage.cpp
index ec46fb477..3966b06e0 100644
--- a/src/CppGenerator/UmlPackage.cpp
+++ b/src/CppGenerator/UmlPackage.cpp
@@ -50,7 +50,7 @@ static void create_directory(WrapperStr s)
             s.replace(index++, 1, "/");
     }
 
-    s = QDir::cleanDirPath(s) + "/";
+    s = QDir::cleanPath(s) + "/";
     index = s.find("/");
 
     int index2;
@@ -80,8 +80,10 @@ static WrapperStr relative_path(const QDir & destdir, WrapperStr relto)
     QDir fromdir(relto);
     /*WrapperStr from = WrapperStr(fromdir.absPath());
     WrapperStr to = WrapperStr(destdir.absPath());*/
-    const char * cfrom = fromdir.absolutePath().toAscii().constData();
-    const char * cto = destdir.absolutePath().toAscii().constData();
+    QByteArray fromBa = fromdir.absolutePath().toLatin1();
+    QByteArray toBa = destdir.absolutePath().toLatin1();
+    const char * cfrom = fromBa.constData();
+    const char * cto = toBa.constData();
     int lastsep = -1;
     int index = 0;
 
@@ -150,7 +152,7 @@ WrapperStr UmlPackage::rootDir()
         if (!RootDir.isEmpty() && // empty -> error
             QDir::isRelativePath(RootDir)) {
             QFileInfo f(getProject()->supportFile());
-            QDir d(f.dirPath());
+            QDir d(f.path());
 
             RootDir = d.filePath(RootDir);
         }
@@ -204,8 +206,9 @@ WrapperStr UmlPackage::source_path(const WrapperStr & f, WrapperStr relto)
     if (! d.exists())
         create_directory(dir.src);	// don't return on error
 
+    QByteArray temp = d.filePath(f).toLatin1();
     WrapperStr df = (dir.src_absolute || relto.isEmpty())
-                   ? WrapperStr(d.filePath(f).toAscii().constData())
+                   ? WrapperStr(temp.constData())
                    : relative_path(d, relto) + f;
 
     return df + WrapperStr(".") + CppSettings::sourceExtension();
@@ -242,9 +245,10 @@ WrapperStr UmlPackage::header_path(const WrapperStr & f, WrapperStr relto)
 
     if (! d.exists())
         create_directory(dir.h);	// don't return on error
+    QByteArray temp = d.filePath(f).toLatin1();
 
     WrapperStr df = (dir.h_absolute || relto.isEmpty())
-                   ? WrapperStr(d.filePath(f).toAscii().constData())
+                   ? WrapperStr(temp.constData())
                    : relative_path(d, relto) + f;
 
     return df + WrapperStr(".") + CppSettings::headerExtension();
@@ -259,9 +263,9 @@ WrapperStr UmlPackage::text_path(const WrapperStr & f, WrapperStr relto)
 
 void UmlPackage::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/CppGenerator/UmlRelation.cpp b/src/CppGenerator/UmlRelation.cpp
index f8c175885..77f765eb7 100644
--- a/src/CppGenerator/UmlRelation.cpp
+++ b/src/CppGenerator/UmlRelation.cpp
@@ -26,13 +26,9 @@
 // *************************************************************************
 
 #include <QTextStream>
-//Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3ValueList>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <QList>
 #include "UmlRelation.h"
 #include "UmlClass.h"
 #include "UmlSettings.h"
@@ -41,7 +37,7 @@
 #include "UmlCom.h"
 #include "util.h"
 
-void UmlRelation::compute_dependency(Q3PtrList<CppRefType> & dependencies,
+void UmlRelation::compute_dependency(QList<CppRefType *> & dependencies,
                                      const WrapperStr & cl_stereotype,
                                      bool all_in_h)
 {
@@ -112,7 +108,7 @@ void UmlRelation::compute_dependency(Q3PtrList<CppRefType> & dependencies,
 }
 
 void UmlRelation::generate_inherit(const char *& sep, QTextStream & f_h,
-                                   const Q3ValueList<UmlActualParameter> & actuals,
+                                   const QList<UmlActualParameter> & actuals,
                                    const WrapperStr & cl_stereotype)
 {
     switch (relationKind()) {
@@ -192,11 +188,11 @@ void UmlRelation::generate_decl(aVisibility & current_visibility, QTextStream &
     switch (relationKind()) {
     case aDependency:
         if (stereotype() == "friend") {
-            Q3ValueList<UmlFormalParameter> formals = roleType()->formals();
+            QList<UmlFormalParameter> formals = roleType()->formals();
 
             if (! formals.isEmpty()) {
                 const char * sep = "  template <";
-                Q3ValueList<UmlFormalParameter>::ConstIterator it;
+                QList<UmlFormalParameter>::ConstIterator it;
 
                 for (it = formals.begin(); it != formals.end(); ++it) {
                     f_h << sep << (*it).type() << ' ' << (*it).name();
diff --git a/src/CppGenerator/UmlRelation.h b/src/CppGenerator/UmlRelation.h
index 646023842..e0b84bcbc 100644
--- a/src/CppGenerator/UmlRelation.h
+++ b/src/CppGenerator/UmlRelation.h
@@ -28,12 +28,10 @@
 #ifndef UMLRELATION_H
 #define UMLRELATION_H
 
-#include <q3valuelist.h>
+#include <QList>
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3PtrList>
-
 #include "UmlBaseRelation.h"
 
 class QTextStream;
@@ -46,11 +44,11 @@ class UmlRelation : public UmlBaseRelation
         : UmlBaseRelation(id, n) {
     };
 
-    virtual void compute_dependency(Q3PtrList<CppRefType> & dependency,
+    virtual void compute_dependency(QList<CppRefType *> & dependency,
                                     const WrapperStr & cl_stereotype,
                                     bool all_in_h);
     void generate_inherit(const char *& sep, QTextStream & f_h,
-                          const Q3ValueList<UmlActualParameter> & actuals,
+                          const QList<UmlActualParameter> & actuals,
                           const WrapperStr & cl_stereotype);
     virtual void generate_decl(aVisibility & current_visibility, QTextStream & f_h,
                                const WrapperStr & cl_stereotype, WrapperStr indent,
diff --git a/src/CppGenerator/main.cpp b/src/CppGenerator/main.cpp
index 3fdae8ded..c0c8194e5 100644
--- a/src/CppGenerator/main.cpp
+++ b/src/CppGenerator/main.cpp
@@ -24,17 +24,17 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "util.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <QApplication>
+#include <QCoreApplication>
 #include <QDir>
 #include <QSettings>
 #include "Logging/QsLog.h"
 #include "Logging/QsLogDest.h"
+#include <QTest>
 int main(int argc, char ** argv)
 {
 #ifdef DEBUG
@@ -49,17 +49,18 @@ int main(int argc, char ** argv)
     logger.addDestination(debugDestination.get());
     logger.addDestination(fileDestination.get());
 
-    QSettings settings("settings.ini", QSettings::IniFormat);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
     settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
     QString locale = settings.value("Main/encoding").toString();
-    QTextCodec* codec = QTextCodec::codecForName(locale);
+    QTextCodec* codec = QTextCodec::codecForName(locale.toLatin1().constData());
     QTextCodec::setCodecForLocale(codec);
 
-
     QLOG_INFO() << " STARTING CPP_GENERATOR";
+
 #endif
+    //QTest::qSleep(7000);
     int port_index;
-
+#ifndef _RUN_PLUGOUT_EXTERNAL_
     if (argc == 2) {
         port_index = 1;
         QLOG_INFO() << "Got two arguments from Douml as argv";
@@ -67,7 +68,6 @@ int main(int argc, char ** argv)
     }
     else if (argc == 3) {
         QLOG_INFO() << "Got three arguments from Douml as argv";
-
         if (argv[1][1] == 'v') {
             QLOG_INFO() << "Using verbose mode";
             set_verbose();
@@ -76,7 +76,6 @@ int main(int argc, char ** argv)
             QLOG_INFO() << "Using preserve mode";
             set_preserve();
         }
-
         QLOG_INFO() << "Using second port index mode";
         port_index = 2;
     }
@@ -93,11 +92,13 @@ int main(int argc, char ** argv)
         QLOG_INFO() << "Got too little or too much arguments from Douml, exiting";
         return 0;
     }
-
-
-
     if (UmlCom::connect(QString(argv[port_index]).toUInt())) {
+#else
+    port_index = 1;
+    if (UmlCom::connect(5000)) {
+#endif
         try {
+
             UmlCom::trace("<b>C++ generator</b> release 2.18<br>");
             UmlCom::traceAutoRaise(FALSE);
             UmlCom::targetItem()->generate();
@@ -107,7 +108,7 @@ int main(int argc, char ** argv)
             s = "<hr><font face=helvetica>Generation done : %1 warnings, %2 errors</font><br>";
             s=s.arg(QString::number(n_warnings())).arg(QString::number(n_errors()));
 
-            UmlCom::trace(s);
+            UmlCom::trace(s.toLatin1().constData());
 
             UmlCom::showTrace();
             UmlCom::message("");
diff --git a/src/CppGenerator/util.cpp b/src/CppGenerator/util.cpp
index d4e77211f..c4d9a16bf 100644
--- a/src/CppGenerator/util.cpp
+++ b/src/CppGenerator/util.cpp
@@ -1,183 +1,183 @@
-// *************************************************************************
-//
-// Copyright 2004-2010 Bruno PAGES  .
-// Copyright 2012-2013 Nikolai Marchenko.
-// Copyright 2012-2013 Leonardo Guilherme.
-//
-// This file is part of the DOUML Uml Toolkit.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License Version 3.0 as published by
-// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
-//  packaging of this file.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License Version 3.0 for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// e-mail : doumleditor@gmail.com
-// home   : http://sourceforge.net/projects/douml
-//
-// *************************************************************************
-
-#include <qstring.h>
-//Added by qt3to4:
-#include "misc/mystr.h"
-
-#include "util.h"
-#include "UmlCom.h"
-
-WrapperStr capitalize(const WrapperStr & s)
-{
-    return (s.isEmpty())
-           ? s
-           : s.left(1).upper() + s.mid(1);
-}
-
-QString capitalize(const QString & s)
-{
-    return (s.isEmpty())
-           ? s
-           : s.left(1).upper() + s.mid(1);
-}
-
-WrapperStr current_indent(const char * p, const char * begin)
-{
-    QString indent = "";	// to not be WrapperStr::null
-
-    while ((p != begin) && ((p[-1] == ' ') || (p[-1] == '\t')))
-        indent.prepend(*--p);
-
-    return WrapperStr(indent.toAscii().constData());
-}
-
-const char * name_spec(const char * spec)
-{
-    const char * p = strstr(spec, "${name}");
-
-    if (p == 0)
-        return 0;
-
-    while (p != spec) {
-        char c = p[-1];
-
-        if (((c >= 'a') && (c <= 'z')) ||
-            ((c >= 'A') && (c <= 'Z')) ||
-            ((c >= '0') && (c <= '9')) ||
-            (c == '_'))
-            p -= 1;
-        else
-            return p;
-    }
-
-    return p;
-}
-
-bool need_equal(const char * p, const char * v)
-{
-    for (;;) {
-        switch (*v++) {
-        case 0:
-        case '=':
-        case '(':
-            return FALSE;
-
-        case ' ':
-        case '\t':
-        case '\n':
-        case '\r':
-            break;
-
-        default:
-            for (;;) {
-                switch (*--p) {
-                case '=':
-                    return FALSE;
-
-                case ' ':
-                case '\t':
-                case '\n':
-                case '\r':
-                    break;
-
-                default:
-                    return TRUE;
-                }
-            }
-        }
-    }
-}
-
-//
-
-static WrapperStr TraceHeader;
-static bool Verbose = FALSE;
-static bool Preserve = FALSE;
-
-void set_verbose()
-{
-    Verbose = TRUE;
-}
-
-bool verbose()
-{
-    return Verbose;
-}
-
-void set_preserve()
-{
-    Preserve = TRUE;
-}
-
-bool preserve()
-{
-    return Preserve;
-}
-
-void set_trace_header(WrapperStr s)
-{
-    TraceHeader = s;
-}
-
-WrapperStr get_trace_header()
-{
-    return TraceHeader;
-}
-
-void write_trace_header()
-{
-    if (!Verbose && !TraceHeader.isEmpty()) {
-        UmlCom::trace("<hr>" + TraceHeader);
-        TraceHeader = "";
-    }
-}
-
-//
-
-static int NErrors;
-static int NWarnings;
-
-void incr_error()
-{
-    NErrors += 1;
-}
-
-void incr_warning()
-{
-    NWarnings += 1;
-}
-
-int n_errors()
-{
-    return NErrors;
-}
-
-int n_warnings()
-{
-    return NWarnings;
-}
+// *************************************************************************
+//
+// Copyright 2004-2010 Bruno PAGES  .
+// Copyright 2012-2013 Nikolai Marchenko.
+// Copyright 2012-2013 Leonardo Guilherme.
+//
+// This file is part of the DOUML Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+// home   : http://sourceforge.net/projects/douml
+//
+// *************************************************************************
+
+#include <qstring.h>
+//Added by qt3to4:
+#include "misc/mystr.h"
+
+#include "util.h"
+#include "UmlCom.h"
+
+WrapperStr capitalize(const WrapperStr & s)
+{
+    return (s.isEmpty())
+           ? s
+           : s.left(1).upper() + s.mid(1);
+}
+
+QString capitalize(const QString & s)
+{
+    return (s.isEmpty())
+           ? s
+           : s.left(1).toUpper() + s.mid(1);
+}
+
+WrapperStr current_indent(const char * p, const char * begin)
+{
+    QString indent = "";	// to not be WrapperStr::null
+
+    while ((p != begin) && ((p[-1] == ' ') || (p[-1] == '\t')))
+        indent.prepend(*--p);
+    QByteArray temp = indent.toLatin1();
+    return WrapperStr(temp.constData());
+}
+
+const char * name_spec(const char * spec)
+{
+    const char * p = strstr(spec, "${name}");
+
+    if (p == 0)
+        return 0;
+
+    while (p != spec) {
+        char c = p[-1];
+
+        if (((c >= 'a') && (c <= 'z')) ||
+            ((c >= 'A') && (c <= 'Z')) ||
+            ((c >= '0') && (c <= '9')) ||
+            (c == '_'))
+            p -= 1;
+        else
+            return p;
+    }
+
+    return p;
+}
+
+bool need_equal(const char * p, const char * v)
+{
+    for (;;) {
+        switch (*v++) {
+        case 0:
+        case '=':
+        case '(':
+            return false;
+
+        case ' ':
+        case '\t':
+        case '\n':
+        case '\r':
+            break;
+
+        default:
+            for (;;) {
+                switch (*--p) {
+                case '=':
+                    return false;
+
+                case ' ':
+                case '\t':
+                case '\n':
+                case '\r':
+                    break;
+
+                default:
+                    return true;
+                }
+            }
+        }
+    }
+}
+
+//
+
+static WrapperStr TraceHeader;
+static bool Verbose = false;
+static bool Preserve = false;
+
+void set_verbose()
+{
+    Verbose = true;
+}
+
+bool verbose()
+{
+    return Verbose;
+}
+
+void set_preserve()
+{
+    Preserve = true;
+}
+
+bool preserve()
+{
+    return Preserve;
+}
+
+void set_trace_header(WrapperStr s)
+{
+    TraceHeader = s;
+}
+
+WrapperStr get_trace_header()
+{
+    return TraceHeader;
+}
+
+void write_trace_header()
+{
+    if (!Verbose && !TraceHeader.isEmpty()) {
+        UmlCom::trace("<hr>" + TraceHeader);
+        TraceHeader = "";
+    }
+}
+
+//
+
+static int NErrors;
+static int NWarnings;
+
+void incr_error()
+{
+    NErrors += 1;
+}
+
+void incr_warning()
+{
+    NWarnings += 1;
+}
+
+int n_errors()
+{
+    return NErrors;
+}
+
+int n_warnings()
+{
+    return NWarnings;
+}
diff --git a/src/CppGenerator/util.h b/src/CppGenerator/util.h
index 07330db2e..644a6a3d8 100644
--- a/src/CppGenerator/util.h
+++ b/src/CppGenerator/util.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef _UTIL_H
-#define _UTIL_h
+#define _UTIL_H
 
 #include "misc/mystr.h"
 #include "misc/codec.h"
@@ -47,4 +47,5 @@ extern void incr_error();
 extern void incr_warning();
 extern int n_errors();
 extern int n_warnings();
+
 #endif
diff --git a/src/CppReverse/BrowserNode.h b/src/CppReverse/BrowserNode.h
index ead051dd0..0e3c7a41f 100644
--- a/src/CppReverse/BrowserNode.h
+++ b/src/CppReverse/BrowserNode.h
@@ -29,11 +29,7 @@
 #define BROWSERNODE_H
 
 #include "TreeItem.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrCollection>
-#include <Q3PtrList>
-
 #ifndef REVERSE
 class BrowserView;
 #endif
@@ -69,9 +65,9 @@ class BrowserNode : public TreeItem
 
 // a sortable list of BrowserNode
 
-#include <q3ptrlist.h>
 
-class BrowserNodeList : public Q3PtrList<BrowserNode>
+
+class BrowserNodeList : public QList<BrowserNode *>
 {
 public:
     void search(BrowserNode * bn, int k, const QString & s, bool cs);
diff --git a/src/CppReverse/Class.cpp b/src/CppReverse/Class.cpp
index e06b8a8bf..a62cd355c 100644
--- a/src/CppReverse/Class.cpp
+++ b/src/CppReverse/Class.cpp
@@ -28,10 +28,10 @@
 #ifdef DEBUG_DOUML
 #include <iostream>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 using namespace std;
 #endif
@@ -45,6 +45,7 @@ using namespace std;
 #include "UmlOperation.h"
 #include "UmlAttribute.h"
 #include "CppSettings.h"
+#include <functional>
 #include "UmlExtraClassMember.h"
 #include "Lex.h"
 #include "UmlCom.h"
@@ -91,18 +92,22 @@ Class::~Class()
 }
 
 Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
-                       const Q3ValueList<FormalParameterList> & tmplts,
+                       const QList<FormalParameterList> & tmplts,
                        const WrapperStr & path, WrapperStr name
 #ifdef ROUNDTRIP
-                       , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                       , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
-                      )
+                      ,WrapperStr ignoredToken)
 {
     bool from_typedef = !name.isEmpty();
     WrapperStr comment = Lex::get_comments();
     WrapperStr description = Lex::get_description();
     WrapperStr q_modifier;
-
+    Lex::simplify_comment(comment);
+    if(CppSettings::isGenerateJavadocStyleComment())
+    {
+        comment = Lex::remove_javadoc_star_signs_from_comment(comment);
+    }
     if (!from_typedef)
         if ((name = Lex::read_word()).isEmpty())
             return 0;
@@ -115,6 +120,12 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
         if ((name = Lex::read_word()).isEmpty())
             return 0;
     }
+    if (!ignoredToken.isEmpty() && name == ignoredToken) {
+        q_modifier = name + " ";
+
+        if ((name = Lex::read_word()).isEmpty())
+            return 0;
+    }
 
     WrapperStr s;
 
@@ -156,20 +167,23 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
         // bypass all the class
         // note : user can't ask for update a nested class
         char c;
-
+        //if body not hit yet
+        if(s != "{")
+        {
         while ((c = Lex::read_word_bis(TRUE, FALSE)) != '{') {
             if (c == 0) {
                 Lex::premature_eof();
                 throw 0;
             }
         }
+        }
 
         UmlOperation::skip_body(1);
         return cl;
     }
 
     bool roundtrip = FALSE;
-    Q3PtrList<UmlItem> expected_order;
+    QList<UmlItem *> expected_order;
 #else
     UmlClass * cl_uml = 0;
 #endif
@@ -243,7 +257,7 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
                     cl->set_updated();
                 }
             }
-            else if (nequal(cl_uml->description(), Lex::simplify_comment(comment))) {
+            else if (nequal(cl_uml->description(), comment)) {
                 // comment simplified
                 cl_uml->set_Description(comment);
                 cl->set_updated();
@@ -281,7 +295,7 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
                     d = CppSettings::classDecl();
 
                 cl_uml->set_Description((d.find("${description}") != -1)
-                                        ? description : Lex::simplify_comment(comment));
+                                        ? description : comment);
             }
 
 #ifdef ROUNDTRIP
@@ -343,8 +357,10 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
     if (cl_uml)
         cl_uml->set_under_construction(TRUE);
 
-    while (Lex::mark(), ((s = Lex::read_word()) != "}")) {
-        if (s.isEmpty()) {
+    while (Lex::mark(), ((s = Lex::read_word()) != "}"))
+    {
+        if (s.isEmpty())
+        {
             if (! Package::scanning())
                 Lex::premature_eof();
 
@@ -472,7 +488,8 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
 
             continue;
         }
-        else {
+        else
+        {
             cl->manage_member(s, visibility, container, path
 #ifdef ROUNDTRIP
                               , roundtrip, expected_order
@@ -543,9 +560,9 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
             if (cl->updated) {
                 Statistic::one_class_updated_more();
 
-                UmlCom::trace(QString("<font face=helvetica>class <i>")
+                UmlCom::trace(QString(QString("<font face=helvetica>class <i>")
                               + cl->text(0) + "</i> updated from <i>"
-                              + Lex::filename() + "</i></font><br>");
+                              + Lex::filename() + "</i></font><br>").toLatin1().constData());
             }
         }
 
@@ -571,7 +588,7 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype,
 void Class::declaration(const WrapperStr & name, const WrapperStr & stereotype,
                         const WrapperStr & decl
 #ifdef ROUNDTRIP
-                        , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                        , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
                        )
 {
@@ -609,11 +626,89 @@ void Class::declaration(const WrapperStr & name, const WrapperStr & stereotype,
         }
 }
 
+
+ESwitchKeyword Class::manage_operation(WrapperStr& s, WrapperStr& type, WrapperStr& name,
+                                         const QList<FormalParameterList> & tmplts, WrapperStr& modifier, WrapperStr& pretype,
+                                       bool& inlinep, bool& virtualp, bool& staticp, bool& constp,
+                                       bool& volatilep, bool explicitp, bool friendp, bool typenamep, aVisibility& visibility,
+                                       WrapperStr& friend_template, WrapperStr& comment, WrapperStr& description
+                                       #ifdef ROUNDTRIP
+                                                                           , bool roundtrip,  QList<UmlItem *> expected_order
+                                       #endif
+                                       )
+{
+    // suppose an operation
+    if (Package::scanning())
+        return ESwitchKeyword::k_break;
+
+    if (type.isEmpty()) {
+        if (!Package::scanning())
+            Lex::error_near("(");
+        return ESwitchKeyword::k_break;
+    }
+
+    BooL func = FALSE;
+    WrapperStr cl_name = WrapperStr(text(0).toLatin1().constData());
+    WrapperStr cl_full_name = cl_name;
+    int index;
+
+    if ((index = cl_name.find('<')) != -1)
+        cl_name.truncate(index);
+
+    if (name.isEmpty()) {
+        if ((type == cl_full_name) ||
+            (type == (WrapperStr("~") + cl_full_name))) {
+            name = type;
+            type = "";
+        }
+        else if ((type == cl_name) ||
+                 (type == (WrapperStr("~") + cl_name))) {
+            name = type;
+            type = "";
+        }
+        else if (type.left(9) == "operator ") {
+            name = type;
+            type = 0;
+        }
+        else {
+            WrapperStr typ;
+
+            if (((index = type.find('<')) != -1) &&
+                // wrong tests : not so simple
+                (((typ = type.left(index)) == cl_name) ||
+                 (typ == (WrapperStr("~") + cl_name)))) {
+                name = type;
+                type = "";
+            }
+            else {
+                if (! UmlOperation::pfunc(func, name, type, "${name}"))
+                    return ESwitchKeyword::k_break;
+
+                //???modifier = FALSE;
+                if (!func) {
+                    s = Lex::read_word();
+                    return ESwitchKeyword::k_continue;
+                }
+            }
+        }
+    }
+
+    UmlOperation::new_one(this, name, tmplts, type, modifier, pretype, visibility,
+                          inlinep, virtualp, staticp, constp, volatilep,
+                          typenamep, explicitp, friendp, friend_template,
+                          comment, description, func
+#ifdef ROUNDTRIP
+                          , roundtrip, expected_order
+#endif
+                         );
+    return ESwitchKeyword::k_return;
+}
+
 void Class::manage_member(WrapperStr s, aVisibility visibility,
                           ClassContainer * /*container*/,
                           const WrapperStr & path
 #ifdef ROUNDTRIP
-                          , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                          , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                          )
 {
@@ -641,155 +736,109 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
     WrapperStr value;
     WrapperStr bitfield;
     WrapperStr pretype;	// struct/union/class/enum
-    Q3ValueList<FormalParameterList> tmplts;
+    QList<FormalParameterList> tmplts;
     WrapperStr friend_template;
 
 #ifdef DEBUG_DOUML
     QLOG_INFO() << "Class::manage_member(" << s << ")\n";
 #endif
-
-    for (;;) {
-        if (s == "static") {
-            staticp = TRUE;
-            Lex::mark();
-        }
-        else if (s == "virtual") {
-            virtualp = TRUE;
-            Lex::mark();
-        }
-        else if (s == "const") {
-            if (!modifier.isEmpty())
-                modifier += WrapperStr(" ") + s;
-            else {
-                constp = TRUE;
-                Lex::mark();
-            }
-        }
-        else if (s == "mutable") {
-            if (!modifier.isEmpty())
-                modifier += WrapperStr(" ") + s;
-            else {
-                mutablep = TRUE;
-                Lex::mark();
-            }
-        }
-        else if (s == "volatile") {
-            if (!modifier.isEmpty())
-                modifier += WrapperStr(" ") + s;
-            else {
-                volatilep = TRUE;
-                Lex::mark();
-            }
-        }
-        else if (s == "typename") {
-            // note : may have "const typename ...", but not "typename const ..."
-            if (!modifier.isEmpty())
-                modifier += WrapperStr(" ") + s;
-            else {
-                typenamep = TRUE;
-                Lex::mark();
-            }
-        }
-        else if (s == "inline") {
-            inlinep = TRUE;
-            Lex::mark();
-        }
-        else if (s == "explicit") {
-            explicitp = TRUE;
+    QHash<QString, std::function<ESwitchKeyword()>> hashBased;
+    std::function<ESwitchKeyword(bool&)> modifierProcessor = [&](bool& toProcess)
+    {
+        if (!modifier.isEmpty())
+            modifier += WrapperStr(" ") + s;
+        else {
+            toProcess = TRUE;
             Lex::mark();
         }
-        else if ((s == "unsigned") || (s == "signed") ||
-                 (s == "void") || (s == "bool"))
-            type = s;
-        else if ((s == "char") || (s == "short") || (s == "int") ||
-                 (s == "long") || (s == "float") || (s == "double")) {
-            type = (type.isEmpty()) ? s : type + " " + s;
-        }
-        else if (Lex::star(s) || (s == "&") || (s == "volatile")) {
-            if (!modifier.isEmpty())
-                modifier += WrapperStr(" ") + s;
-            else if (!type.isEmpty())
-                modifier = s;
-            else {
+        return ESwitchKeyword::k_none;
+    };
+    std::function<ESwitchKeyword(bool&)> basicProcessor = [&](bool& toProcess)
+    {
+        toProcess = TRUE;
+        Lex::mark();
+        return ESwitchKeyword::k_none;
+    };
+    std::function<ESwitchKeyword()> typeProcessor = [&]()
+    {
+        type = (type.isEmpty()) ? s : type + " " + s;
+        return ESwitchKeyword::k_none;
+    };
+    std::function<ESwitchKeyword()> operationProcessor = [&]()
+    {
+        return manage_operation(s, type, name, tmplts, modifier, pretype,
+                                inlinep,virtualp,staticp,constp,volatilep,explicitp,friendp,typenamep,
+                                visibility,
+                                friend_template,comment,description
+#ifdef ROUNDTRIP
+                                ,roundtrip, expected_order
+#endif
+                                );
+    };
+    std::function<ESwitchKeyword()> starProcessor = [&]()
+    {
+        if (!modifier.isEmpty())
+            modifier += WrapperStr(" ") + s;
+        else if (!type.isEmpty())
+            modifier = s;
+        else {
 #ifdef DEBUG_DOUML
-                QLOG_INFO() << "ERROR modifier " << s << " et type empty\n";
+            QLOG_INFO() << "ERROR modifier " << s << " et type empty\n";
 #endif
 
-                if (!Package::scanning())
-                    Lex::error_near(s);
+            if (!Package::scanning())
+                Lex::error_near(s);
+            return ESwitchKeyword::k_break;
+        }
+        return ESwitchKeyword::k_none;
+    };
+
+
+    //type block
+    hashBased.insert("unsigned", typeProcessor); hashBased.insert("explicit", typeProcessor); hashBased.insert("signed", typeProcessor);
+    hashBased.insert("void", typeProcessor); hashBased.insert("bool", typeProcessor); hashBased.insert("char", typeProcessor);
+    hashBased.insert("short", typeProcessor);hashBased.insert("int", typeProcessor);hashBased.insert("long", typeProcessor);
+    hashBased.insert("float", typeProcessor); hashBased.insert("double", typeProcessor);
+    //modifier block
+    hashBased.insert("static", std::bind(basicProcessor, std::ref(staticp)));
+    hashBased.insert("virtual", std::bind(basicProcessor, std::ref(virtualp)));
+    hashBased.insert("inline", std::bind(basicProcessor, std::ref(inlinep)));
+    hashBased.insert("explicit", std::bind(basicProcessor, std::ref(explicitp)));
+    hashBased.insert("const", std::bind(modifierProcessor, std::ref(constp)));
+    hashBased.insert("mutable", std::bind(modifierProcessor, std::ref(mutablep)));
+    //volatile seemed to have unaccessible second else if in the original. need to cehck
+    hashBased.insert("volatile", std::bind(modifierProcessor, std::ref(volatilep)));
+    hashBased.insert("typename", std::bind(modifierProcessor, std::ref(typenamep)));
+
+    // pass block
+    hashBased.insert("star", starProcessor);
+    hashBased.insert("&",  starProcessor);
+
+    // containers block
+    hashBased.insert("(",  operationProcessor);
+    QString control = "";
+    for (;;)
+    {
+        control =  Lex::star(s) ? "star" : control;
+        if(hashBased.contains(s) || hashBased.contains(control))
+        {
 
-                break;
+            ESwitchKeyword retVal;
+            retVal = hashBased.contains(control) ? hashBased[control]() : hashBased[s]();
+            control = "";
+            if(retVal == ESwitchKeyword::k_none)
+            {
+                s = Lex::read_word();
+                continue;
             }
-        }
-        else if (s == "(") {
-            // suppose an operation
-            if (Package::scanning())
-                break;
-
-            if (type.isEmpty()) {
-                if (!Package::scanning())
-                    Lex::error_near("(");
-
+            else if (retVal == ESwitchKeyword::k_continue)
+                continue;
+            else if (retVal == ESwitchKeyword::k_break)
                 break;
-            }
-
-            BooL func = FALSE;
-            WrapperStr cl_name = WrapperStr(text(0).toAscii().constData());
-            WrapperStr cl_full_name = cl_name;
-            int index;
-
-            if ((index = cl_name.find('<')) != -1)
-                cl_name.truncate(index);
-
-            if (name.isEmpty()) {
-                if ((type == cl_full_name) ||
-                    (type == (WrapperStr("~") + cl_full_name))) {
-                    name = type;
-                    type = "";
-                }
-                else if ((type == cl_name) ||
-                         (type == (WrapperStr("~") + cl_name))) {
-                    name = type;
-                    type = "";
-                }
-                else if (type.left(9) == "operator ") {
-                    name = type;
-                    type = 0;
-                }
-                else {
-                    WrapperStr typ;
-
-                    if (((index = type.find('<')) != -1) &&
-                        // wrong tests : not so simple
-                        (((typ = type.left(index)) == cl_name) ||
-                         (typ == (WrapperStr("~") + cl_name)))) {
-                        name = type;
-                        type = "";
-                    }
-                    else {
-                        if (! UmlOperation::pfunc(func, name, type, "${name}"))
-                            break;
-
-                        //???modifier = FALSE;
-                        if (!func) {
-                            s = Lex::read_word();
-                            continue;
-                        }
-                    }
-                }
-            }
-
-            UmlOperation::new_one(this, name, tmplts, type, modifier, pretype, visibility,
-                                  inlinep, virtualp, staticp, constp, volatilep,
-                                  typenamep, explicitp, friendp, friend_template,
-                                  comment, description, func
-#ifdef ROUNDTRIP
-                                  , roundtrip, expected_order
-#endif
-                                 );
-            return;
+            else
+                return;
         }
-        else if (s == "=") {
+        if (s == "=") {
             // initialized variable, by pass value
             Lex::mark();
             UmlOperation::skip_expr(";");
@@ -800,7 +849,8 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
 
             value = "= " + Lex::region();
         }
-        else if (s == ";") {
+        else if (s == ";")
+        {
             if (Package::scanning())
                 return;
 
@@ -836,7 +886,50 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
 
             return;
         }
-        else if (s == "friend") {
+        //attributes seperated by ,
+        else if (s == ",")
+        {
+            if (Package::scanning())
+                return;
+
+            if (name.isEmpty() || type.isEmpty()) {
+                Lex::error_near(",");
+                return;
+            }
+
+            UmlTypeSpec dest_type;
+            WrapperStr typeform = "${type}";
+
+            if (CppSettings::umlType(type).isEmpty() &&
+                (modifier.isEmpty() || (modifier == "*") || (modifier == "&")) &&
+                bitfield.isEmpty() &&
+                !typenamep &&
+                (compute_type(type, dest_type, typeform, TRUE), dest_type.type != 0) &&
+                ((typeform == "${type}") || (array.isEmpty() && modifier.isEmpty())))
+                UmlRelation::new_one(this, name, dest_type.type, modifier, pretype,
+                                     array, typeform, visibility, staticp, constp,
+                                     mutablep, volatilep, value, comment, description
+#ifdef ROUNDTRIP
+                                     , roundtrip, expected_order
+#endif
+                                    );
+            else
+                UmlAttribute::new_one(this, name, type, modifier, pretype, array,
+                                      visibility, staticp, constp, typenamep, mutablep,
+                                      volatilep, bitfield, value, comment, description
+#ifdef ROUNDTRIP
+                                      , roundtrip, expected_order
+#endif
+                                     );
+            name = "";
+            modifier = "";
+            bitfield = "";
+            array = "";
+            value = "";
+
+        }
+        else if (s == "friend")
+        {
             s = Lex::read_word();
 
             if (s == "QMAC_PASCAL")
@@ -928,7 +1021,8 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
         }
         else if ((s == "struct") ||
                  (s == "union") ||
-                 (s == "enum")) {
+                 (s == "enum"))
+        {
             Lex::mark();
 
             WrapperStr s2 = Lex::read_word();
@@ -968,11 +1062,11 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
 #endif
                                     );
                     else
-                        reverse(this, s, tmplts, path, 0
+                        reverse(this, s, tmplts, path, 0,
 #ifdef ROUNDTRIP
-                                , roundtrip, expected_order
+                                 roundtrip, expected_order,
 #endif
-                               );
+                               "");
 
                     return;
                 }
@@ -992,7 +1086,7 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
 #ifdef ROUNDTRIP
                         , roundtrip, expected_order
 #endif
-                       );
+                       , "");
                 return;
             }
             else if ((s2 != "{") && (s2 != ":")) {
@@ -1014,12 +1108,13 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
 #ifdef ROUNDTRIP
                             , roundtrip, expected_order
 #endif
-                           );
+                           , "");
 
                 return;
             }
         }
-        else if (s == "class") {
+        else if (s == "class")
+        {
             Lex::mark();
 
             WrapperStr s2 = Lex::read_word();
@@ -1046,11 +1141,12 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
 #ifdef ROUNDTRIP
                         , roundtrip, expected_order
 #endif
-                       );
+                       , "");
                 return;
             }
         }
-        else if (s == "typedef") {
+        else if (s == "typedef")
+        {
             reverse_typedef(this, path, tmplts
 #ifdef ROUNDTRIP
                             , roundtrip, expected_order
@@ -1058,7 +1154,8 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
                            );
             return;
         }
-        else if (s == "template") {
+        else if (s == "template")
+        {
             FormalParameterList tmplt;
 
             tmplts.append(tmplt);
@@ -1135,7 +1232,7 @@ void Class::manage_member(WrapperStr s, aVisibility visibility,
 Class * Class::reverse_enum(ClassContainer * container,
                             const WrapperStr & path, WrapperStr name
 #ifdef ROUNDTRIP
-                            , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                            , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
                            )
 {
@@ -1144,6 +1241,11 @@ Class * Class::reverse_enum(ClassContainer * container,
     WrapperStr description = Lex::get_description();
     WrapperStr s;
 
+    Lex::simplify_comment(comment);
+    if(CppSettings::isGenerateJavadocStyleComment())
+    {
+        comment = Lex::remove_javadoc_star_signs_from_comment(comment);
+    }
     if (!from_typedef)
     {
         name = Lex::read_word();
@@ -1206,8 +1308,9 @@ Class * Class::reverse_enum(ClassContainer * container,
     // enum definition
     Class * cl = container->define(name, "enum");
 
-    if(cl)
+    if(cl) {
         QLOG_INFO() << "RE got definition" << cl->stereotype.operator QString();
+    }
     //QLOG_INFO() << "RE got definition" << cl->uml;
     if ((cl == 0) || cl->reversedp)
     {
@@ -1258,7 +1361,7 @@ Class * Class::reverse_enum(ClassContainer * container,
         expectedorder.append(cl_uml);
 
     bool roundtrip;
-    Q3PtrList<UmlItem> expected_order;
+    QList<UmlItem *> expected_order;
 
     if (cl_uml->is_created()) {
         Statistic::one_class_created_more();
@@ -1307,7 +1410,7 @@ Class * Class::reverse_enum(ClassContainer * container,
                 cl->set_updated();
             }
         }
-        else if (nequal(cl_uml->description(), Lex::simplify_comment(comment))) {
+        else if (nequal(cl_uml->description(), comment)) {
             // comment simplified
             cl_uml->set_Description(comment);
             cl->set_updated();
@@ -1323,7 +1426,7 @@ Class * Class::reverse_enum(ClassContainer * container,
 
         if (! comment.isEmpty())
             cl_uml->set_Description((s.find("${description}") != -1)
-                                    ? description : Lex::simplify_comment(comment));
+                                    ? description : comment);
 
         cl_uml->set_CppDecl(s);
 #ifdef ROUNDTRIP
@@ -1460,9 +1563,9 @@ Class * Class::reverse_enum(ClassContainer * container,
             if (cl->updated) {
                 Statistic::one_class_updated_more();
 
-                UmlCom::trace(QString("<font face=helvetica>class <i>")
+                UmlCom::trace(QString(QString("<font face=helvetica>class <i>")
                               + cl->text(0) + "</i> updated from <i>"
-                              + Lex::filename() + "</i></font><br>");
+                              + Lex::filename() + "</i></font><br>").toLatin1().constData());
             }
         }
 
@@ -1479,9 +1582,9 @@ Class * Class::reverse_enum(ClassContainer * container,
     }
 
     bool Class::reverse_typedef(ClassContainer  * container, const WrapperStr & path,
-                                Q3ValueList<FormalParameterList> & tmplts
+                                QList<FormalParameterList> & tmplts
 #ifdef ROUNDTRIP
-                                , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                                , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
                                )
     {
@@ -1552,7 +1655,7 @@ Class * Class::reverse_enum(ClassContainer * container,
 #ifdef ROUNDTRIP
                                               , rndtrp, expectedorder
 #endif
-                                             )) == 0)
+                                             , "")) == 0)
                     return FALSE;
 
                 // here '}' is the last item read
@@ -1687,7 +1790,11 @@ Class * Class::reverse_enum(ClassContainer * container,
         WrapperStr type;
         UmlTypeSpec base_type;
         WrapperStr typeform = "${type}";
-
+        Lex::simplify_comment(comment);
+        if(CppSettings::isGenerateJavadocStyleComment())
+        {
+            comment = Lex::remove_javadoc_star_signs_from_comment(comment);
+        }
         for (;;) {
             if ((s == "unsigned") || (s == "signed") ||
                 (s == "void") || (s == "bool")) {
@@ -1800,9 +1907,9 @@ Class * Class::reverse_enum(ClassContainer * container,
 
             if (roundtrip) {
                 UmlRelation * dep = 0;
-                const Q3PtrVector<UmlItem> & ch = ty_uml->children();
-                UmlItem ** v = ch.data();
-                UmlItem ** const vsup = v + ch.size();
+                const QVector<UmlItem*> & ch = ty_uml->children();
+                UmlItem *const* v = ch.data();
+                UmlItem *const*  vsup = v + ch.size();
 
                 for (; v != vsup; v += 1) {
                     if (((*v)->kind() == aRelation) &&
@@ -1912,7 +2019,7 @@ Class * Class::reverse_enum(ClassContainer * container,
                     ty->set_updated();
                 }
             }
-            else if (nequal(ty_uml->description(), Lex::simplify_comment(comment))) {
+            else if (nequal(ty_uml->description(), comment)) {
                 ty_uml->set_Description(comment); // comment was set
                 ty->set_updated();
             }
@@ -1923,7 +2030,7 @@ Class * Class::reverse_enum(ClassContainer * container,
 
             if (! comment.isEmpty())
                 ty_uml->set_Description((decl.find("${description}") != -1)
-                                        ? description : Lex::simplify_comment(comment));
+                                        ? description : comment);
 
 #ifdef ROUNDTRIP
         }
@@ -1953,7 +2060,7 @@ Class * Class::reverse_enum(ClassContainer * container,
             if (stereotype_declared) {
                 if (st != ((stereotype.isEmpty()) ? WrapperStr("class") : stereotype)) {
                     UmlCom::trace(WrapperStr("<font face=helvetica><b><i>") +
-                                  WrapperStr(text(0).toAscii().constData()) +
+                                  WrapperStr(text(0).toLatin1().constData()) +
                                   "</i> have several stereotypes</b></font><br><hr><br>");
                     return FALSE;
                 }
@@ -1984,7 +2091,7 @@ Class * Class::reverse_enum(ClassContainer * container,
 
         ((p->isa_package()) ? ((ClassContainer *)((Package *) p))
          : ((ClassContainer *)((Class *) p)))
-        ->declare_if_needed(WrapperStr(text(0).toAscii().constData()) + "::" + name, cl);
+        ->declare_if_needed(WrapperStr(text(0).toLatin1().constData()) + "::" + name, cl);
     }
 
     Class * Class::define(const WrapperStr & name, WrapperStr stereotype)
@@ -2005,7 +2112,7 @@ Class * Class::reverse_enum(ClassContainer * container,
 
             ((p->isa_package()) ? ((ClassContainer *)((Package *) p))
              : ((ClassContainer *)((Class *) p)))
-            ->define(WrapperStr(text(0).toAscii().constData()) + "::" + name, cl);
+            ->define(WrapperStr(text(0).toLatin1().constData()) + "::" + name, cl);
         }
     }
 
@@ -2081,7 +2188,7 @@ Class * Class::reverse_enum(ClassContainer * container,
         UmlItem * p = (((BrowserNode *) parent())->isa_package())
                       ? (UmlItem *)((Package *) parent())->get_uml()->get_classview(get_namespace())
                       : (UmlItem *)((Class *) parent())->get_uml();
-        WrapperStr str = WrapperStr(text(0).toAscii().constData());
+        WrapperStr str = WrapperStr(text(0).toLatin1().constData());
         bool anonymous = str.isEmpty();
 
         for (;;) {
@@ -2097,10 +2204,10 @@ Class * Class::reverse_enum(ClassContainer * container,
 
             if (uml == 0) {
                 // probably already exist
-                Q3PtrVector<UmlItem> ch = p->children();
+                QVector<UmlItem*> ch = p->children();
                 UmlItem * x;
 
-                for (unsigned chindex = 0; chindex != ch.size(); chindex += 1) {
+                for (int chindex = 0; chindex != ch.size(); chindex += 1) {
                     if (((x = ch[chindex])->kind() == aClass) && (x->name() == str)) {
                         uml = (UmlClass *) x;
 
@@ -2138,9 +2245,9 @@ Class * Class::reverse_enum(ClassContainer * container,
                 if (uml == 0) {
 #ifdef REVERSE
                     UmlCom::message("");
-                    CppCatWindow::trace(QString("<font face=helvetica><b>cannot create class <i>")
+                    CppCatWindow::trace(QString(QString("<font face=helvetica><b>cannot create class <i>")
                                         + text(0) + "</i> under <i>"
-                                        + parent()->text(0) + "</b></font><br>");
+                                        + parent()->text(0) + "</b></font><br>").toLatin1().constData());
                     throw 0;
 #else
                     QMessageBox::critical(0, "Fatal Error",
@@ -2161,8 +2268,8 @@ Class * Class::reverse_enum(ClassContainer * container,
 #ifdef ROUNDTRIP
 
                 if (roundtrip) {
-                    Q3ValueList<UmlFormalParameter> fs = uml->formals();
-                    Q3ValueList<UmlFormalParameter>::ConstIterator it2;
+                    QList<UmlFormalParameter> fs = uml->formals();
+                    QList<UmlFormalParameter>::ConstIterator it2;
 
                     for (rank = 0, it = formals.begin(), it2 = fs.begin();
                          (it != formals_end) && (it2 != fs.end());
@@ -2251,9 +2358,9 @@ void Class::set_uml(UmlClass * c)
 #ifndef ROUNDTRIP
 bool Class::already_in_bouml()
 {
-    Q3PtrVector<UmlItem> ch = get_uml()->children();
+    QVector<UmlItem*> ch = get_uml()->children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         if (ch[index]->kind() != aClass)
             return TRUE;
 
diff --git a/src/CppReverse/Class.h b/src/CppReverse/Class.h
index 465feee09..0b3370507 100644
--- a/src/CppReverse/Class.h
+++ b/src/CppReverse/Class.h
@@ -32,11 +32,17 @@
 #include "ClassContainer.h"
 #include "UmlClass.h"
 #include "Namespace.h"
-//Added by qt3to4:
 #include <QPixmap>
 #include "misc/mystr.h"
-#include <Q3ValueList>
-#include <Q3PtrList>
+#include <QList>
+
+enum class ESwitchKeyword
+{
+    k_none,
+    k_continue,
+    k_return,
+    k_break
+};
 
 class Class : public BrowserNode, public ClassContainer
 {
@@ -59,10 +65,19 @@ class Class : public BrowserNode, public ClassContainer
     NDict<Class> declared;
     NDict<Class> defined;
 
+    ESwitchKeyword manage_operation(WrapperStr& s,WrapperStr& type, WrapperStr& name,
+                                             const QList<FormalParameterList> &tmplts, WrapperStr& modifier, WrapperStr& pretype,
+                                           bool& inlinep,bool& virtualp,bool& staticp,bool& constp,
+                                           bool& volatilep, bool explicitp, bool friendp,bool typenamep, aVisibility& visibility,
+                                           WrapperStr& friend_template, WrapperStr& comment, WrapperStr& description
+#ifdef ROUNDTRIP
+                                    , bool roundtrip,  QList<UmlItem *> expected_order
+#endif
+                                    );
     void manage_member(WrapperStr s, aVisibility visibility,
                        ClassContainer * container, const WrapperStr & path
 #ifdef ROUNDTRIP
-                       , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                       , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                       );
 
@@ -87,7 +102,7 @@ class Class : public BrowserNode, public ClassContainer
     virtual void declaration(const WrapperStr & name, const WrapperStr & stereotype,
                              const WrapperStr & decl
 #ifdef ROUNDTRIP
-                             , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                             , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                             );
 
@@ -134,22 +149,23 @@ class Class : public BrowserNode, public ClassContainer
 
     static Class * reverse(ClassContainer * container,
                            WrapperStr stereotype,
-                           const Q3ValueList<FormalParameterList> & tmplt,
+                           const QList<FormalParameterList> & tmplt,
                            const WrapperStr & path, WrapperStr name
 #ifdef ROUNDTRIP
-                           , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                           , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
+                           , WrapperStr ignoredToken
                           );
     static Class * reverse_enum(ClassContainer * container,
                                 const WrapperStr & path, WrapperStr name
 #ifdef ROUNDTRIP
-                                , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                                , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
                                );
     static bool reverse_typedef(ClassContainer * container, const WrapperStr & path,
-                                Q3ValueList<FormalParameterList> & tmplts
+                                QList<FormalParameterList> & tmplts
 #ifdef ROUNDTRIP
-                                , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                                , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
                                );
 };
diff --git a/src/CppReverse/ClassContainer.cpp b/src/CppReverse/ClassContainer.cpp
index 085c10273..89e6684c4 100644
--- a/src/CppReverse/ClassContainer.cpp
+++ b/src/CppReverse/ClassContainer.cpp
@@ -29,7 +29,7 @@
 #include <iostream>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 #include "Logging/QsLog.h"
 using namespace std;
 #endif
@@ -45,7 +45,7 @@ using namespace std;
 #include "UmlArtifact.h"
 #endif
 
-Q3ValueList<FormalParameterList> ClassContainer::empty;
+QList<FormalParameterList> ClassContainer::empty;
 
 // to not have warning
 ClassContainer::~ClassContainer()
@@ -143,7 +143,7 @@ Class * ClassContainer::define(const WrapperStr & name,
 void ClassContainer::compute_type(WrapperStr type, UmlTypeSpec & typespec,
                                   WrapperStr & typeform,
                                   bool get_first_template_actual,
-                                  const Q3ValueList<FormalParameterList> & tmplts)
+                                  const QList<FormalParameterList> & tmplts)
 {
     typespec.type = 0;
     typespec.explicit_type = 0;
@@ -232,7 +232,7 @@ void ClassContainer::compute_type(WrapperStr type, UmlTypeSpec & typespec,
     }
 
     if (! tmplts.isEmpty()) {
-        Q3ValueList<FormalParameterList>::ConstIterator it1;
+        QList<FormalParameterList>::ConstIterator it1;
 
         for (it1 = tmplts.begin(); it1 != tmplts.end(); ++it1) {
             FormalParameterList::ConstIterator it2;
@@ -340,7 +340,7 @@ bool ClassContainer::find_type(WrapperStr type, UmlTypeSpec & typespec,
             unsigned level = 1;
 
             for (;;) {
-                int c = type[index2++].toAscii();
+                int c = type[index2++].toLatin1();
 
                 if (c == '<')
                     level += 1;
@@ -352,7 +352,7 @@ bool ClassContainer::find_type(WrapperStr type, UmlTypeSpec & typespec,
                 }
             }
 
-            if ((type[index2] != (char)0) && (defined[type.left(index2)] != (char)0))
+            if ((type[index2] != (char)0) && (defined[type.left(index2)] != 0))
                 // explicit template
                 index = index2;
             else if (defined[type.left(index)] != 0)
diff --git a/src/CppReverse/ClassContainer.h b/src/CppReverse/ClassContainer.h
index 34ca15464..7c918228b 100644
--- a/src/CppReverse/ClassContainer.h
+++ b/src/CppReverse/ClassContainer.h
@@ -30,10 +30,8 @@
 
 #include "UmlClass.h"
 #include "Namespace.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
-#include <Q3PtrList>
+#include <QList>
 
 class Class;
 class UmlTypeSpec;
@@ -55,13 +53,13 @@ class ClassContainer
     virtual void declaration(const WrapperStr & name, const WrapperStr & stereotype,
                              const WrapperStr & decl
 #ifdef ROUNDTRIP
-                             , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                             , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                             ) = 0;
 
     void compute_type(WrapperStr type, UmlTypeSpec & typespec,
                       WrapperStr & typeform, bool get_first_template_actual = FALSE,
-                      const Q3ValueList<FormalParameterList> & tmplts = empty);
+                      const QList<FormalParameterList> & tmplts = empty);
     bool find_type(WrapperStr type, UmlTypeSpec & typespec,
                    NDict<Class> & defined);
 #ifdef ROUNDTRIP
@@ -79,7 +77,7 @@ class ClassContainer
     Class * define(const WrapperStr & name, const WrapperStr & stereotype,
                    NDict<Class> & declared, NDict<Class> & defined);
 
-    static Q3ValueList<FormalParameterList> empty;
+    static QList<FormalParameterList> empty;
 };
 
 #endif
diff --git a/src/CppReverse/cppreverse.pro b/src/CppReverse/CppReverse.pro
similarity index 88%
rename from src/CppReverse/cppreverse.pro
rename to src/CppReverse/CppReverse.pro
index 5d5db2478..561192be0 100644
--- a/src/CppReverse/cppreverse.pro
+++ b/src/CppReverse/CppReverse.pro
@@ -1,5 +1,8 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES          = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \
         UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \
         UmlExtraClassMember.cpp \
@@ -98,31 +101,29 @@ SOURCES          = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \
 
 
 TARGET          = cpp_reverse
-DEFINES          = WITHCPP REVERSE BooL=bool DEBUG_BOUML
+DEFINES          += WITHCPP REVERSE BooL=bool FALSE=false TRUE=true
+#DEFINES += _RUN_PLUGOUT_EXTERNAL_
 
-INCLUDEPATH   = ../Tools ../CppReverse ../
-CONFIG += qtestlib
+INCLUDEPATH   += ../Tools ../CppReverse ../
+QT += testlib
 
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+#qt3support
 
-release{
-
-
-    MOC_DIR = bin/douml/cppreverse/MOC_release
-    OBJECTS_DIR = bin/douml/cppreverse/Obj_release
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/cpp_reverse
+    OBJECTS_DIR = $${DESTDIR}/obj_release/cpp_reverse
 }
-
-Debug{
-    MOC_DIR = bin/douml/cppreverse/MOC_Debug
-    OBJECTS_DIR = bin/douml/cppreverse/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/cpp_reverse
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/cpp_reverse
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
 
 HEADERS += \
     ../Logging/QsLogDest.h \
diff --git a/src/CppReverse/Lex.cpp b/src/CppReverse/Lex.cpp
index e30516d55..094468daa 100644
--- a/src/CppReverse/Lex.cpp
+++ b/src/CppReverse/Lex.cpp
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 // lexer written by hand rather than using [f]lex as usual,
-// BOUML is also my first development including a source code
+// DOUML is also my first development including a source code
 // reader where I do not use yacc/bison, to see how it is
 // without ... (comment by Bruno)
 
@@ -48,7 +48,7 @@ using namespace std;
 #include "Lex.h"
 #include "UmlCom.h"
 
-Q3AsciiDict<char> Lex::_defines;
+QHash<char*, char*> Lex::_defines;
 QString Lex::_filename;
 char * Lex::_buffer;
 LexContext Lex::_context;
@@ -64,7 +64,7 @@ void Lex::defines(const WrapperStr & f)
     }
 
     char l[1024];
-    int n;
+    qint64 n;
 
     while ((n = in.readLine(l, sizeof(l) - 1)) != -1) {
         if (n != 0) {
@@ -81,14 +81,14 @@ void Lex::defines(const WrapperStr & f)
             }
 
             char * p = strchr(l, '=');
-            const char * v;
+            char * v;
 
             if (p != 0) {
                 *p = 0;
                 v = strdup(p + 1);
             }
             else
-                v = "";
+                v = strdup("");
 
             _defines.insert(strdup(l), v);
         }
@@ -147,15 +147,15 @@ bool Lex::open(const QString & f)
     _context.description = "";
 
     QFile in(f);
-    unsigned sz;
+    size_t sz;
 
     if (!in.open(QIODevice::ReadOnly) ||
         ((_buffer = new char[(sz = in.size()) + 1]) == 0))
         return FALSE;
 
-    unsigned offset = 0;
+    size_t offset = 0;
 
-    do offset += in.readBlock(_buffer + offset, sz - offset);
+    do offset += in.read(_buffer + offset, sz - offset);
 
     while (offset != sz);
 
@@ -473,9 +473,9 @@ WrapperStr Lex::manage_operator(QString & result, int c, bool oper)
 #ifdef DEBUG_DOUML
     QLOG_INFO() << "retourne '" << result << "'\n";
 #endif
-    QByteArray temp = result.toAscii();
-    const char* c = temp.constData();
-    return WrapperStr(c);
+    QByteArray temp = result.toLatin1();
+    const char* ch = temp.constData();
+    return WrapperStr(ch);
 }
 
 char Lex::bypass_operator(int c, bool oper)
@@ -578,7 +578,7 @@ WrapperStr Lex::read_string()
         case '"':
         {
             result += c;
-            QByteArray temp = result.toAscii();
+            QByteArray temp = result.toLatin1();
             const char* c = temp.constData();
             return WrapperStr(c);
         }
@@ -754,6 +754,22 @@ WrapperStr Lex::simplify_comment(WrapperStr & comment)
         }
     }
 }
+// remove * sign in front of each line
+QString Lex::remove_javadoc_star_signs_from_comment(QString comment)
+{
+    if (comment.isEmpty())
+        return comment;
+    //if includes javadoc
+    if(comment.startsWith("*"))
+    {
+        if(comment.startsWith("*\n * "))
+            comment.remove(0,5);
+        else
+            comment.remove(0,1);
+        comment.replace(QRegExp("\\n[\\s]*\\* "), "\n");
+    }
+    return comment.trimmed();
+}
 
 void Lex::goes_to_word_beginning()
 {
@@ -931,7 +947,7 @@ WrapperStr Lex::read_word(bool in_expr)
     }
 
     if (! result.isEmpty()) {
-        const char * v = _defines.find((const char *) result);
+        const char * v = _defines.value(result.toLatin1().data());
 
         if (v != 0) {
             if (*v == 0)
@@ -950,7 +966,7 @@ WrapperStr Lex::read_word(bool in_expr)
     QLOG_INFO() << "retourne '" << result << "'\n";
 #endif
 
-    QByteArray temp = result.toAscii();
+    QByteArray temp = result.toLatin1();
     const char* c = temp.constData();
     return WrapperStr(c);
 }
@@ -986,7 +1002,7 @@ char Lex::read_word_bis(bool set_context, bool in_expr)
                 while (*p && (Separators.find(*p) == -1))
                     p += 1;
 
-                int n = p - _context.pointer;
+                ptrdiff_t n = p - _context.pointer;
 
                 if (n == 8) {
                     if (!strncmp(_context.pointer, "template", 8))
@@ -1124,7 +1140,7 @@ void Lex::finish_line()
 
 WrapperStr Lex::get_comments()
 {
-    WrapperStr result = WrapperStr(_context.comments.toAscii().constData());
+    WrapperStr result = WrapperStr(_context.comments.toLatin1().constData());
 
     _context.comments = QString();
     return result;
@@ -1132,7 +1148,7 @@ WrapperStr Lex::get_comments()
 
 WrapperStr Lex::get_comments(WrapperStr & co)
 {
-    WrapperStr result = WrapperStr(_context.comments.toAscii().constData());
+    WrapperStr result = WrapperStr(_context.comments.toLatin1().constData());
 
     _context.comments = QString();
 
@@ -1143,7 +1159,7 @@ WrapperStr Lex::get_comments(WrapperStr & co)
 
 WrapperStr Lex::get_description()
 {
-    WrapperStr result = WrapperStr(_context.description.toAscii().constData());
+    WrapperStr result = WrapperStr(_context.description.toLatin1().constData());
 
     _context.description = QString();
     return result;
@@ -1151,7 +1167,7 @@ WrapperStr Lex::get_description()
 
 WrapperStr Lex::get_description(WrapperStr & co)
 {
-    WrapperStr result = WrapperStr(_context.description.toAscii().constData());
+    WrapperStr result = WrapperStr(_context.description.toLatin1().constData());
 
     _context.description = QString();
 
@@ -1178,7 +1194,7 @@ bool Lex::identifierp(const char * s, bool strictp)
                 return FALSE;
         }
         else {
-            int len = strlen(s);
+            size_t len = strlen(s);
 
             if ((len > 3) &&
                 (s[len - 1] == '*') &&
@@ -1217,7 +1233,7 @@ bool Lex::star(const char * s)
     if (*s == '*')
         return TRUE;
 
-    int len = strlen(s);
+    size_t len = strlen(s);
 
     return ((len > 3) &&
             (s[len - 1] == '*') &&
@@ -1261,7 +1277,7 @@ void Lex::set_context(const LexContext & context)
 void Lex::syntax_error(WrapperStr s)
 {
     UmlCom::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                  + WrapperStr(_filename.toAscii().constData()) + "</i> line " +
+                  + WrapperStr(_filename.toLatin1().constData()) + "</i> line " +
                   WrapperStr().setNum(_context.line_number) + " <b>"
                   + s + "</b></font><br>");
 
@@ -1274,7 +1290,7 @@ void Lex::syntax_error(WrapperStr s)
 void Lex::warn(WrapperStr s)
 {
     UmlCom::trace(WrapperStr("<font face=helvetica>in <i> ")
-                  + WrapperStr(_filename.toAscii().constData()) + "</i> line " +
+                  + WrapperStr(_filename.toLatin1().constData()) + "</i> line " +
                   WrapperStr().setNum(_context.line_number) + " <b>"
                   + s + "</b></font><br>");
 
@@ -1287,7 +1303,7 @@ void Lex::warn(WrapperStr s)
 void Lex::premature_eof()
 {
     UmlCom::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                  + WrapperStr(_filename.toAscii().constData()) + "</i> line " +
+                  + WrapperStr(_filename.toLatin1().constData()) + "</i> line " +
                   WrapperStr().setNum(_context.line_number) +
                   " <b>premature eof</b></font><br>");
 
@@ -1300,7 +1316,7 @@ void Lex::premature_eof()
 void Lex::error_near(WrapperStr s)
 {
     UmlCom::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                  + WrapperStr(_filename.toAscii().constData()) + "</i> line " +
+                  + WrapperStr(_filename.toLatin1().constData()) + "</i> line " +
                   WrapperStr().setNum(_context.line_number) + " <b>near <font color =\"red\">"
                   + quote(s) + "</font></b></font><br>");
 
@@ -1479,7 +1495,7 @@ WrapperStr Lex::normalize(const WrapperStr & s)
                     {
                         int length = r.length() - 1;
                         QString temp =r.at(length);
-                        bool ident = ::identifierp(temp.toAscii().at(0));
+                        bool ident = ::identifierp(temp.toLatin1().at(0));
                         if (ident)
                             r += " ";
                     }
diff --git a/src/CppReverse/Lex.h b/src/CppReverse/Lex.h
index ae3677555..8128e9a2b 100644
--- a/src/CppReverse/Lex.h
+++ b/src/CppReverse/Lex.h
@@ -31,8 +31,6 @@
 // fstream is bugged under Windows
 #include <stdio.h>
 #include <qstring.h>
-#include <q3asciidict.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
 
 class LexContext
@@ -53,7 +51,7 @@ class LexContext
 class Lex
 {
 private:
-    static Q3AsciiDict<char> _defines;
+    static QHash<char*,char*> _defines;
     static QString _filename;
     static char * _buffer;
     static LexContext _context;
@@ -111,6 +109,7 @@ class Lex
     static WrapperStr read_list_elt();
     static bool finish_template(WrapperStr &);
     static WrapperStr simplify_comment(WrapperStr &);
+    static QString remove_javadoc_star_signs_from_comment(QString comment);
 };
 
 bool neq(const WrapperStr & s1, const WrapperStr & s2);
diff --git a/src/CppReverse/Namespace.cpp b/src/CppReverse/Namespace.cpp
index 203c825c1..5b4b05482 100644
--- a/src/CppReverse/Namespace.cpp
+++ b/src/CppReverse/Namespace.cpp
@@ -28,7 +28,7 @@
 #include "Namespace.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 // namespace stack, namespaces.last() = current namespace full name + "::",
 // i.e. A::B...::Z:: in case it is embeded in other one(s)
@@ -41,7 +41,7 @@ QStringList Namespace::Usings;
 int Namespace::AnonymousLevel;
 
 // to lost usings defined under a namespace/class block
-Q3ValueList<QStringList> Namespace::UsingScope;
+QList<QStringList> Namespace::UsingScope;
 
 // namespace aliases
 QMap<QString, WrapperStr> Namespace::Aliases;
@@ -55,7 +55,7 @@ void Namespace::set(const WrapperStr & s)
 void Namespace::unset()
 {
     // for upload only
-    Stack.remove(Stack.last());
+    Stack.removeLast();
 }
 
 void Namespace::enter(const WrapperStr & s)
@@ -68,14 +68,14 @@ void Namespace::enter(const WrapperStr & s)
 
 void Namespace::exit()
 {
-    Stack.remove(Stack.last());
+    Stack.removeLast();
     restore_using_scope();
 }
 
 void Namespace::restore_using_scope()
 {
     Usings = UsingScope.first();
-    UsingScope.remove(UsingScope.begin());
+    UsingScope.removeFirst();
 }
 
 QString Namespace::namespacify(WrapperStr s, bool local)
@@ -111,7 +111,7 @@ WrapperStr Namespace::current()
 
     QString & s = Stack.last();
 
-    QByteArray temp = (s.left(s.length() - 2)).toAscii();
+    QByteArray temp = (s.left(s.length() - 2)).toLatin1();
     const char * c = temp.constData();
     return WrapperStr(c);
 }
diff --git a/src/CppReverse/Namespace.h b/src/CppReverse/Namespace.h
index bfaf224ee..331c72c9e 100644
--- a/src/CppReverse/Namespace.h
+++ b/src/CppReverse/Namespace.h
@@ -28,10 +28,9 @@
 #ifndef NAMESPACE_H
 #define NAMESPACE_H
 
-#include <q3valuelist.h>
+#include <QList>
 #include <qstringlist.h>
 #include "misc/mystr.h"
-#include <q3dict.h>
 #include <qmap.h>
 
 #include "Lex.h"
@@ -75,7 +74,7 @@ class Namespace
     }
 
     static void add_alias(const WrapperStr & a, const WrapperStr & s) {
-        Aliases.replace(a, s);
+        Aliases[a] = s;
     }
     static void clear_aliases() {
         Aliases.clear();
@@ -88,7 +87,7 @@ class Namespace
     static QStringList Stack;
     static int AnonymousLevel;
     static QStringList Usings;
-    static Q3ValueList<QStringList> UsingScope;
+    static QList<QStringList> UsingScope;
     static QMap<QString, WrapperStr> Aliases;
 };
 
@@ -102,7 +101,7 @@ class NDict
 public:
     NDict() : hasAnonymous(FALSE) {}
     NDict(unsigned n) : hasAnonymous(FALSE) {
-        d.resize(n);
+        d.reserve(n);
     }
 
     void insert(const WrapperStr & key, const T * item);
@@ -112,21 +111,23 @@ class NDict
 
 private:
     bool hasAnonymous;
-    Q3Dict<T> d;
+    QHash<QString, T*> d;
 };
 
 template<class T>
 void NDict<T>::insert(const WrapperStr & key, const T * item)
 {
     hasAnonymous |= Namespace::underAnonymous();
-    d.insert(Namespace::namespacify(key, Namespace::underAnonymous()), item);
+    T * item2 = const_cast<T *>(item);
+    d.insert(Namespace::namespacify(key, Namespace::underAnonymous()), item2);
 }
 
 template<class T>
 void NDict<T>::replace(const WrapperStr & key, const T * item)
 {
     hasAnonymous |= Namespace::underAnonymous();
-    d.replace(Namespace::namespacify(key, Namespace::underAnonymous()), item);
+    T * item2 = const_cast<T *>(item);
+    d.insert(Namespace::namespacify(key, Namespace::underAnonymous()), item2);
 }
 
 template<class T>
diff --git a/src/CppReverse/Package.cpp b/src/CppReverse/Package.cpp
index 5f767a749..fe7be855b 100644
--- a/src/CppReverse/Package.cpp
+++ b/src/CppReverse/Package.cpp
@@ -28,16 +28,16 @@
 #ifdef DEBUG_DOUML
 #include <iostream>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 #include "Logging/QsLog.h"
 using namespace std;
 #endif
 
-#include <q3filedialog.h>
-#include <qapplication.h>
+#include <QFileDialog>
+#include <QApplication>
 #include <qmessagebox.h>
 #include <qdir.h>
 #include <qregexp.h>
@@ -68,7 +68,7 @@ QRegExp * Package::DirFilter;
 QRegExp * Package::FileFilter;
 
 // the packages selected by the user to reverse them
-Q3PtrList<Package> Package::Choozen;
+QList<Package *> Package::Choozen;
 
 // all the classes presents in the environment, the
 // key is the full name including namespaces
@@ -82,7 +82,7 @@ NDict<Class> Package::Defined(511);
 bool Package::Scan;
 
 // current template forms
-Q3ValueList<FormalParameterList> Package::Formals;
+QList<FormalParameterList> Package::Formals;
 
 QApplication * Package::app;
 
@@ -95,10 +95,10 @@ WrapperStr Package::fname;
 // currently roundtriped artifact
 UmlArtifact * Package::artfct;
 
-static Q3Dict<bool> H_Managed(97);
-static Q3Dict<bool> Src_Managed(97);
-static Q3Dict<Package> Pack_From_Path(97);
-static Q3Dict<UmlArtifact> Roundtriped(199);
+static QHash<QString,bool*> H_Managed;
+static QHash<QString,bool*> Src_Managed;
+static QHash<WrapperStr,Package*> Pack_From_Path;
+static QHash<QString,UmlArtifact*> Roundtriped;
 #endif
 
 static QString RootSDir;	// empty or finish by a /
@@ -118,7 +118,7 @@ static WrapperStr force_final_slash(WrapperStr p)
 
 static inline WrapperStr force_final_slash(QString p)
 {
-    return force_final_slash(WrapperStr(p.toAscii().constData()));
+    return force_final_slash(WrapperStr(p.toLatin1().constData()));
 }
 
 static WrapperStr root_relative_if_possible(WrapperStr p)
@@ -139,7 +139,7 @@ Package::Package(BrowserView * parent, UmlPackage * u)
 #endif
 
 Package::Package(Package * parent, QString p, QString n)
-    : BrowserNode(parent, n)
+    : BrowserNode(parent, n.toLatin1().constData())
 {
     h_path = src_path = force_final_slash(p);
     uml = 0;
@@ -189,10 +189,10 @@ Package::Package(Package * parent, UmlPackage * pk)
     namespace_ = pk->cppNamespace();
 
     if (!h_path.isEmpty())
-        Pack_From_Path.replace(h_path, this);
+        Pack_From_Path.insert(h_path, this);
 
     if ((h_path != src_path) && !src_path.isEmpty())
-        Pack_From_Path.replace(src_path, this);
+        Pack_From_Path.insert(src_path, this);
 }
 #endif
 
@@ -218,7 +218,7 @@ QString Package::get_src_path() const
 }
 #endif
 
-void Package::init(UmlPackage * r, QApplication * a)
+void Package::init(UmlPackage * r, QApplication *a)
 {
     app = a;
 
@@ -227,7 +227,7 @@ void Package::init(UmlPackage * r, QApplication * a)
 
     if (!RootSDir.isEmpty() && QDir::isRelativePath(RootSDir)) {
         QFileInfo f(UmlPackage::getProject()->supportFile());
-        QDir d(f.dirPath());
+        QDir d(f.path());
 
         RootSDir = force_final_slash(d.filePath(RootSDir)).operator QString();
         RootCDir = RootSDir;
@@ -236,11 +236,11 @@ void Package::init(UmlPackage * r, QApplication * a)
     QString s;
 
     DirFilter = (!(s = (const char *) CppSettings::reverseRoundtripDirRegExp()).isEmpty())
-                ? new QRegExp(s, CppSettings::isReverseRoundtripDirRegExpCaseSensitive(), TRUE)
+                ? new QRegExp(s, (Qt::CaseSensitivity)CppSettings::isReverseRoundtripDirRegExpCaseSensitive())
                 : 0;
 
     FileFilter = (!(s = (const char *) CppSettings::reverseRoundtripFileRegExp()).isEmpty())
-                 ? new QRegExp(s, CppSettings::isReverseRoundtripFileRegExpCaseSensitive(), TRUE)
+                 ? new QRegExp(s, (Qt::CaseSensitivity)CppSettings::isReverseRoundtripFileRegExpCaseSensitive())
                  : 0;
 
 #ifdef ROUNDTRIP
@@ -277,7 +277,7 @@ void Package::set_step(int s, int n)
             Scan = TRUE;
 
             if (n > 1)
-                new Progress(n, "Scanning in progress, please wait ...", app);
+                (new Progress(n, "Scanning in progress, please wait ...", app))->show();
 
             break;
 
@@ -349,8 +349,8 @@ void Package::own(UmlArtifact * art)
     QDir hd(h_path);
     QDir sd(src_path);
 
-    Roundtriped.insert(hd.absFilePath(art->name() + "." + CppSettings::headerExtension()), art);
-    Roundtriped.insert(sd.absFilePath(art->name() + "." + CppSettings::sourceExtension()), art);
+    Roundtriped.insert(hd.absoluteFilePath(art->name() + "." + CppSettings::headerExtension()), art);
+    Roundtriped.insert(sd.absoluteFilePath(art->name() + "." + CppSettings::sourceExtension()), art);
 }
 
 int Package::count_file_number()
@@ -359,9 +359,7 @@ int Package::count_file_number()
         file_number(h_path, TRUE, CppSettings::headerExtension())
         + file_number(src_path, TRUE, CppSettings::sourceExtension());
 
-    TreeItem * child;
-
-    for (child = firstChild(); child != 0; child = child->nextSibling())
+    foreach (TreeItem * child, children())
         if (((BrowserNode *) child)->isa_package())
             result += ((Package *) child)->count_file_number();
 
@@ -389,9 +387,7 @@ void Package::scan_dir()
     reverse_directory(h_path, TRUE, CppSettings::headerExtension(), TRUE);
     reverse_directory(src_path, TRUE, CppSettings::sourceExtension(), FALSE);
 
-    TreeItem * child;
-
-    for (child = firstChild(); child != 0; child = child->nextSibling())
+    foreach (TreeItem * child, children())
         if (((BrowserNode *) child)->isa_package())
             ((Package *) child)->scan_dir();
 }
@@ -402,17 +398,15 @@ void Package::scan_dirs(int & n)
     n = 0;
 
     QStringList dirs;
-    QString path = QDir::currentDirPath();
+    QString path = QDir::currentPath();
 
     /* lgfreitas: This is the loop that keeps asking for dirs to reverse. */
     // get input C++ source dirs
-    while (!(path = Q3FileDialog::getExistingDirectory(path, 0, 0,
-                    "select a directory to reverse, press cancel to finish"))
-           .isEmpty()) {
+    while (!(path = QFileDialog::getExistingDirectory(0, path, "select a directory to reverse, press cancel to finish")).isEmpty()) {
 
         int pathlen = path.length();
 
-        if (((const char *) path)[pathlen - 1] != '/') {
+        if (((const char *) path.toLatin1().constData())[pathlen - 1] != '/') {
             path += "/";
             pathlen += 1;
         }
@@ -444,17 +438,16 @@ void Package::scan_dirs(int & n)
             WrapperStr s;
 
             dirs.append(path);
-            QString temp = "<font face=helvetica>%dth directory to reverse : <b>";
-            temp=temp.arg(QString::number((int) dirs.count()));
+            QString temp = QString("<font face=helvetica>%1th directory to reverse : <b>").arg(QString::number((int) dirs.count()));
             s+=temp;
-            s += WrapperStr(path.toAscii().constData()) + "</b><br></font>\n";
+            s += WrapperStr(path.toLatin1().constData()) + "</b><br></font>\n";
             UmlCom::trace(s);
 
             /* lgfreitas: Append the root path as a root package */
             Choozen.append(new Package(Root, path, d.dirName()));
 
             d.cdUp();
-            path = d.absPath();
+            path = d.absolutePath();
         }
 
         // just to give a chance to Douml to update trace window before the
@@ -478,10 +471,8 @@ void Package::scan_dirs(int & n)
     // count files
     UmlCom::message("count files ...");
 
-    Package * p;
-
     /* lgfreitas: This just counts the packages */
-    for (p = Choozen.first(); p != 0; p = Choozen.next()) {
+    foreach (Package *p, Choozen) {
         n += file_number(p->h_path, TRUE,
                          CppSettings::headerExtension())
              + file_number(p->src_path, TRUE,
@@ -494,8 +485,7 @@ void Package::scan_dirs(int & n)
     /* lgfreitas: This is where the reversing magic happens. It iterates
        through each package, asking for it to do the reversing on the
        given path */
-    for (p = Choozen.first(); p != 0; p = Choozen.next())
-    {
+    foreach (Package *p, Choozen) {
         p->reverse_directory(p->h_path, TRUE, CppSettings::headerExtension(), TRUE);
         p->reverse_directory(p->src_path, TRUE, CppSettings::sourceExtension(), FALSE);
     }
@@ -512,10 +502,7 @@ void Package::scan_dirs(int & n)
 static bool allowed(QRegExp * rg, QString f)
 {
     if (rg != 0) {
-        int matchLen;
-        return rg->exactMatch(f); //[lgfreitas] I do not know if this will work
-        /*return ((rg->match(f, 0, &matchLen) != 0) ||
-            (matchLen != (int) f.length()));*/
+        return (rg->indexIn(f) != 0 || rg->matchedLength() != f.length());
     }
     else
         return TRUE;
@@ -530,48 +517,21 @@ int Package::file_number(QString path, bool rec, const char * ext)
 
         if (! allowed(DirFilter, d.dirName()))
             return 0;
-
-        /*
-        const QFileInfoList * list = d.entryInfoList(QDir::Files | QDir::Readable);
-
-        if (list != 0) {
-          QFileInfoListIterator it(*list);
-          QFileInfo * fi;
-
-          while ((fi = it.current()) != 0) {
-        if (fi->extension(FALSE) == ext)
-          result += 1;
-        ++it;
-          }
-          */
         QFileInfoList list = d.entryInfoList(QDir::Files | QDir::Readable);
 
         if (!list.isEmpty()) {
             QFileInfoList::iterator it = list.begin();
+            int extIndex;
+            QString fileName;
 
-            while (it != list.end()) {
-                if ((*it).extension(FALSE) == ext) result += 1;
-
-                it++;
+            for(;it != list.end(); ++it){
+                fileName = (*it).fileName();
+                extIndex = fileName.lastIndexOf('.');
+                if (extIndex != -1 && fileName.mid(extIndex+1) == ext) result += 1;
             }
         }
 
         if (rec) {
-            /*      // sub directories
-                  list = d.entryInfoList(QDir::Dirs | QDir::NoSymLinks);
-
-                  if (list) {
-            	QFileInfoListIterator itd(*list);
-            	QFileInfo * di;
-
-            	while ((di = itd.current()) != 0) {
-            	  if (((const char *) di->fileName())[0] != '.')
-            	    result += file_number(di->filePath(), rec, ext);
-            	  ++itd;
-            	}
-                  }
-                }
-                */
 
             // sub directories
             list = d.entryInfoList(QDir::Dirs | QDir::NoSymLinks);
@@ -579,12 +539,10 @@ int Package::file_number(QString path, bool rec, const char * ext)
             if (!list.isEmpty()) {
                 QFileInfoList::iterator it = list.begin();
 
-                while (it != list.end()) {
+                for(;it != list.end(); ++it){
                     if ((*it).fileName()[0] != '.') {
                         result += file_number((*it).filePath(), rec, ext);
                     }
-
-                    it++;
                 }
             }
         }
@@ -613,9 +571,7 @@ void Package::send_dir()
     reverse_directory(h_path, TRUE, CppSettings::headerExtension(), TRUE);
     reverse_directory(src_path, TRUE, CppSettings::sourceExtension(), FALSE);
 
-    TreeItem * child;
-
-    for (child = firstChild(); child != 0; child = child->nextSibling())
+    foreach (TreeItem * child, children())
         if (((BrowserNode *) child)->isa_package())
             ((Package *) child)->send_dir();
 }
@@ -631,9 +587,7 @@ void Package::send_dirs(int n, bool rec)
 
     set_step(2, n);
 
-    Package * p;
-
-    for (p = Choozen.first(); p != 0; p = Choozen.next()) {
+    foreach (Package *p, Choozen) {
         p->reverse_directory(p->h_path, rec, CppSettings::headerExtension(), TRUE);
         p->reverse_directory(p->src_path, rec, CppSettings::sourceExtension(), FALSE);
     }
@@ -655,7 +609,7 @@ void Package::send_dirs(int n, bool rec)
 QString my_baseName(QFileInfo * fi)
 {
     QString fn = fi->fileName();
-    int index = fn.findRev('.');
+    int index = fn.lastIndexOf('.');
 
     return (index == -1)
            ? fn
@@ -673,13 +627,13 @@ void Package::reverse_directory(QString path, bool rec,
         return;
 
     if (h) {
-        if (H_Managed.find(path) != 0)
+        if (H_Managed.value(path) != 0)
             return;
 
         H_Managed.insert(path, (bool *) 1);
     }
     else {
-        if (Src_Managed.find(path) != 0)
+        if (Src_Managed.value(path) != 0)
             return;
 
         Src_Managed.insert(path, (bool *) 1);
@@ -693,105 +647,58 @@ void Package::reverse_directory(QString path, bool rec,
     if (! allowed(DirFilter, d.dirName()))
         return;
 
-    /*
-    const QFileInfoList list =
-      d.entryInfoList("*." + ext, QDir::Files | QDir::Readable);
-
-    if (list != 0) {
-      QFileInfoListIterator it(*list);
-
-      while (it.current() != 0) {
-        if (allowed(FileFilter, it.current()->fileName())) {
-    #ifdef ROUNDTRIP
-    QString fn = it.current()->absFilePath();
-    UmlArtifact * art = Roundtriped.find(fn);
-
-    if (h)
-      fname = my_baseName(it.current());
-
-    if ((art != 0) && (art->parent()->parent() != uml))
-      // own by an other package
-      ((UmlPackage *) art->parent()->parent())->get_package()->reverse_file(WrapperStr(fn), art, h);
-    else
-      reverse_file(WrapperStr(fn), art, h);
-    #else
-    if (h)
-      fname = my_baseName(it.current());
-    reverse_file(WrapperStr(it.current()->filePath()));
-    #endif
-        }
-        Progress::tic_it();
-        ++it;
-      }
-    }*/
-
+    QStringList filter;
+    filter<<"*."+ext;
     QFileInfoList list =
-        d.entryInfoList("*." + ext, QDir::Files | QDir::Readable);
+        d.entryInfoList(filter, QDir::Files | QDir::Readable);
 
     /* lgfreitas: If the package/path has files step thru them */
     if (list.isEmpty() == false)
     {
         QFileInfoList::iterator it = list.begin();
-
-        while (it != list.end())
+        for(;it != list.end(); ++it)
         {
             if (allowed(FileFilter, (*it).fileName())) {
 #ifdef ROUNDTRIP
-                QString fn = (*it).absFilePath();
-                UmlArtifact * art = Roundtriped.find(fn);
+                QString fn = (*it).absoluteFilePath();
+                UmlArtifact * art = Roundtriped.value(fn);
 
                 if (h)
                     fname = my_baseName(&(*it));
 
                 if ((art != 0) && (art->parent()->parent() != uml))
                     // own by an other package
-                    ((UmlPackage *) art->parent()->parent())->get_package()->reverse_file(WrapperStr(fn.toAscii().constData()), art, h);
+                    ((UmlPackage *) art->parent()->parent())->get_package()->reverse_file(WrapperStr(fn.toLatin1().constData()), art, h);
                 else
-                    reverse_file(WrapperStr(fn.toAscii().constData()), art, h);
+                    reverse_file(WrapperStr(fn.toLatin1().constData()), art, h);
 
 #else
 
                 if (h)
                     fname = my_baseName(&(*it));
 
-                QByteArray tmp = (*it).filePath().toAscii();
+                QByteArray tmp = (*it).filePath().toLatin1();
                 const char * c = tmp.constData();
                 reverse_file(c);
 #endif
             }
 
             Progress::tic_it();
-            ++it;
         }
     }
 
 
     if (rec) {
-        // sub directories
-        /*list = d.entryInfoList(QDir::Dirs | QDir::NoSymLinks);
-
-        if (list != 0) {
-          QFileInfoListIterator itd(*list);
-          QFileInfo * di;
-
-          while ((di = itd.current()) != 0) {
-        if (((const char *) di->fileName())[0] != '.')
-          find(di)->reverse_directory(di->filePath(), TRUE, ext, h);
-        ++itd;
-          }
-        }*/
         // sub directories
         list = d.entryInfoList(QDir::Dirs | QDir::NoSymLinks);
 
         if (!list.isEmpty()) {
             QFileInfoList::iterator itd = list.begin();
-
-            while (itd != list.end()) {
+            for(;itd != list.end(); ++itd)
+            {
                 if ((*itd).fileName()[0] != '.') {
                     find(&(*itd))->reverse_directory((*itd).filePath(), TRUE, ext, h);
                 }
-
-                ++itd;
             }
         }
     }
@@ -859,7 +766,7 @@ void Package::reverse_file(WrapperStr f
                 // #include or decl added by hand
                 art->set_usefull();
 
-                Q3PtrVector<UmlClass> empty;
+                QVector<UmlClass*> empty;
 
                 art->set_AssociatedClasses(empty);
             }
@@ -909,14 +816,34 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block)
                 Lex::mark();
                 /* lgfreitas: We are building a class here, so get the class name */
                 WrapperStr s2 = Lex::read_word();
+                WrapperStr possibleExportToken = s2;
+                WrapperStr nextWord = Lex::read_word();
+                nextWord = Lex::read_word();
+                Lex::come_back();
+                s2 = Lex::read_word();
 
+                QLOG_INFO() << "Nextword is: " << nextWord.operator QString();
                 /* lgfreitas: This seems to have the purpose of ignoring these parameters (personal use?) */
                 if ((strncmp(s2, "Q_EXPORT", 8) == 0) ||
                     (strncmp(s2, "QM_EXPORT", 9) == 0) ||
                     (strncmp(s2, "Q_PNGEXPORT", 11) == 0))
                     s2 = Lex::read_word();
 
-                if (Lex::identifierp(s2, TRUE) &&
+                if(nextWord == "{" || nextWord == ":")
+                {
+                    //s2 = Lex::read_word();
+                    QLOG_INFO() << "Using export mode";
+
+#ifdef ROUNDTRIP
+                    QList<UmlItem *> dummy;
+
+                    Class::reverse(this, s, Formals, f, 0, FALSE, dummy, possibleExportToken);
+#else
+                    Class::reverse(this, s, Formals, f, 0, possibleExportToken);
+#endif
+
+                }
+                else if (Lex::identifierp(s2, TRUE) &&
                     ((s2 = Lex::read_word()) != "{") && (s2 != ":") && (s2 != ";")) {
                     // form like 'class X Y'
                     pretype = s;
@@ -926,11 +853,11 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block)
                     Lex::come_back();
                     // do not manage 'struct {..} var;' or 'struct {..} f()' ...
 #ifdef ROUNDTRIP
-                    Q3PtrList<UmlItem> dummy;
+                    QList<UmlItem *> dummy;
 
-                    Class::reverse(this, s, Formals, f, 0, FALSE, dummy);
+                    Class::reverse(this, s, Formals, f, 0, FALSE, dummy, "");
 #else
-                    Class::reverse(this, s, Formals, f, 0);
+                    Class::reverse(this, s, Formals, f, 0, "");
 #endif
                 }
             }
@@ -948,7 +875,7 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block)
                     Lex::come_back();
                     // do not manage 'enum {..} var;' or 'enum {..} f()' ...
 #ifdef ROUNDTRIP
-                    Q3PtrList<UmlItem> dummy;
+                    QList<UmlItem *> dummy;
 
                     Class::reverse_enum(this, f, 0, FALSE, dummy);
 #else
@@ -958,7 +885,7 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block)
             }
             else if (s == "typedef") {
 #ifdef ROUNDTRIP
-                Q3PtrList<UmlItem> dummy;
+                QList<UmlItem *> dummy;
 
                 Class::reverse_typedef(this, f, Formals, FALSE, dummy);
 #else
@@ -1254,7 +1181,7 @@ void Package::reverse_variable(const WrapperStr & name)
     init = WrapperStr("=") + init.left(init.length() - 1);
 
     // search the corresponding attribute
-    Q3PtrVector<UmlItem> children = typespec.type->children();
+    QVector<UmlItem*> children = typespec.type->children();
     unsigned rank = children.size();
 
     while (rank--) {
@@ -1393,7 +1320,7 @@ void Package::define(WrapperStr name, Class * cl)
 void Package::declaration(const WrapperStr &, const WrapperStr &,
                           const WrapperStr &
 #ifdef ROUNDTRIP
-                          , bool, Q3PtrList<UmlItem> &
+                          , bool, QList<UmlItem *> &
 #endif
                          )
 {
@@ -1416,13 +1343,14 @@ Class * Package::upload_define(UmlClass * ucl)
 UmlPackage * Package::get_uml(bool mandatory)
 {
     if (uml == 0) {
-        const char * name = text(0);
+        QByteArray nameArray = text(0).toLatin1();
+        const char * name = nameArray.constData();
         Package * pa = (Package *) parent();
         UmlPackage * uml_pa = pa->get_uml();	// will end on project
 
-        Q3PtrVector<UmlItem> ch = uml_pa->children();
+        QVector<UmlItem*> ch = uml_pa->children();
 
-        for (unsigned index = 0; index != ch.size(); index += 1) {
+        for (int index = 0; index != ch.size(); index += 1) {
             UmlItem * it = ch[index];
 
             if ((it->kind() == aPackage) && (it->name() == name))
@@ -1470,14 +1398,12 @@ Package * Package::find(QFileInfo * di)
 #endif
 
     QString s = di->fileName();
-    TreeItem * child;
-
-    for (child = firstChild(); child != 0; child = child->nextSibling())
+    foreach (TreeItem * child, children())
         if (((BrowserNode *) child)->isa_package() &&
             (child->text(0) == s))
             return (Package *) child;
 
-    return new Package(this, WrapperStr((di->filePath()).toAscii().constData()), WrapperStr(s.toAscii().constData()));
+    return new Package(this, WrapperStr((di->filePath()).toLatin1().constData()), WrapperStr(s.toLatin1().constData()));
 }
 
 /*
diff --git a/src/CppReverse/Package.h b/src/CppReverse/Package.h
index 603d10827..d79bde798 100644
--- a/src/CppReverse/Package.h
+++ b/src/CppReverse/Package.h
@@ -28,14 +28,9 @@
 #ifndef PACKAGE_H
 #define PACKAGE_H
 
-#include <q3dict.h>
-#include <q3ptrlist.h>
-//Added by qt3to4:
 #include <QPixmap>
 #include "misc/mystr.h"
-#include <Q3ValueList>
-#include <Q3PtrList>
-
+#include <QList>
 #include "BrowserNode.h"
 #include "ClassContainer.h"
 
@@ -43,7 +38,7 @@ class QDir;
 class QFileInfo;
 class QRegExp;
 class UmlPackage;
-class QApplication;
+class QGuiApplication;
 
 /* lgfreitas: Represents a UML package */
 class Package : public BrowserNode, public ClassContainer
@@ -73,7 +68,7 @@ class Package : public BrowserNode, public ClassContainer
     virtual void declaration(const WrapperStr & name, const WrapperStr & stereotype,
                              const WrapperStr & decl
 #ifdef ROUNDTRIP
-                             , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                             , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                             );
 
@@ -129,15 +124,15 @@ class Package : public BrowserNode, public ClassContainer
     WrapperStr src_path;	// empty or finish by a /
 
     static QApplication * app;
-    static Q3PtrList<Package> Choozen; /* List of chosen "packages" to reverse */
+    static QList<Package *> Choozen; /* List of chosen "packages" to reverse */
     static int Nfiles;
     static bool Scan;
     static Package * Root;
     static QRegExp * DirFilter;
     static QRegExp * FileFilter;
     //static Package * Unknown;
-    static Q3ValueList<FormalParameterList> Formals;
-    static Q3PtrList<UmlClass> UsedClasses;
+    static QList<FormalParameterList> Formals;
+    static QList<UmlClass *> UsedClasses;
 
     static NDict<Class> Declared;
     static NDict<Class> Defined;
diff --git a/src/CppReverse/Progress.cpp b/src/CppReverse/Progress.cpp
index 0f189daf1..db6048ab1 100644
--- a/src/CppReverse/Progress.cpp
+++ b/src/CppReverse/Progress.cpp
@@ -36,8 +36,9 @@
 Progress * Progress::it = 0;
 
 Progress::Progress(int n, const char * lbl, QApplication * a)
-    : Q3ProgressDialog(0, 0, n, 0, 0, FALSE, Qt::WDestructiveClose), n(0), app(a)
+    : QProgressDialog(lbl, "Cancel", 0, n, 0), n(0), app(a)
 {
+    setAttribute(Qt::WA_DeleteOnClose, true);
     if (it != 0)
         delete it;
 
@@ -53,7 +54,7 @@ Progress::~Progress()
 
 void Progress::tic()
 {
-    setProgress(++n);
+    setValue(++n);
     raise();
     app->processEvents();
 }
diff --git a/src/CppReverse/Progress.h b/src/CppReverse/Progress.h
index 3f4507e1f..fe64262ba 100644
--- a/src/CppReverse/Progress.h
+++ b/src/CppReverse/Progress.h
@@ -30,9 +30,9 @@
 
 class QApplication;
 
-#include <q3progressdialog.h>
+#include <qprogressdialog.h>
 
-class Progress : public Q3ProgressDialog
+class Progress : public QProgressDialog
 {
 public:
     Progress(int, const char *, QApplication *);
diff --git a/src/CppReverse/TreeItem.h b/src/CppReverse/TreeItem.h
index d9b34dd79..322e1038b 100644
--- a/src/CppReverse/TreeItem.h
+++ b/src/CppReverse/TreeItem.h
@@ -1,5 +1,4 @@
-//Added by qt3to4:
-#include <Q3PtrList>
+
 // *************************************************************************
 //
 // Copyright 2004-2010 Bruno PAGES  .
@@ -39,14 +38,14 @@
 
 #else
 
-#include <q3ptrlist.h>
 #include <qstring.h>
+#include <QList>
 
 class TreeItem
 {
 private:
     TreeItem * its_parent;
-    Q3PtrList<TreeItem> its_children;
+    QList<TreeItem *> its_children;
     QString its_name;
 
 public:
@@ -62,12 +61,10 @@ class TreeItem
         return its_parent;
     };
 
-    TreeItem * firstChild() {
-        return its_children.first();
-    };
-    TreeItem * nextSibling() {
-        return its_parent->its_children.next();
-    };
+    const QList<TreeItem *> &children()
+    {
+        return its_children;
+    }
 };
 
 #endif
diff --git a/src/CppReverse/UmlArtifact.cpp b/src/CppReverse/UmlArtifact.cpp
index 862aa4b79..369275c44 100644
--- a/src/CppReverse/UmlArtifact.cpp
+++ b/src/CppReverse/UmlArtifact.cpp
@@ -31,7 +31,7 @@
 #include "UmlPackage.h"
 #include "Package.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 bool UmlArtifact::has_roundtrip_expected;
 UmlArtifact * UmlArtifact::main_art;
@@ -41,7 +41,7 @@ bool UmlArtifact::set_roundtrip_expected()
     if ((stereotype() != "source") || cppSource().isEmpty())
         return TRUE;
 
-    const Q3PtrVector<UmlClass> & cls = associatedClasses();
+    const QVector<UmlClass*> & cls = associatedClasses();
 
     if (cls.isEmpty()) {
         if ((name() == "main") && cppHeader().isEmpty())
@@ -55,9 +55,8 @@ bool UmlArtifact::set_roundtrip_expected()
     useless = TRUE;
     fully_updated = TRUE;
     ((UmlPackage *) parent()->parent())->get_package()->own(this);
-
-    UmlClass ** v = cls.data();
-    UmlClass ** vsup = v + cls.size();
+    UmlClass *const* v = cls.data();
+    UmlClass *const* vsup = v + cls.size();
     bool result = isWritable();
 
     for (; v != vsup; v += 1)
@@ -92,7 +91,7 @@ UmlArtifact * UmlArtifact::get_main()
     return main_art;
 }
 
-void UmlArtifact::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlArtifact::mark_useless(QList<UmlItem *> & l)
 {
     if (useless) {
         set_isMarked(TRUE);
diff --git a/src/CppReverse/UmlArtifact.h b/src/CppReverse/UmlArtifact.h
index e9bf0c217..0a8f61d73 100644
--- a/src/CppReverse/UmlArtifact.h
+++ b/src/CppReverse/UmlArtifact.h
@@ -29,9 +29,7 @@
 #define UMLARTIFACT_H
 
 #include "UmlBaseArtifact.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 // This class manages 'artifact'
 // You can modify it as you want (except the constructor)
@@ -66,7 +64,7 @@ class UmlArtifact : public UmlBaseArtifact
     virtual bool set_roundtrip_expected();
     virtual void scan_it(int & n);
     virtual void send_it(int n);
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     bool set_roundtrip_expected_for_class();
     bool is_roundtrip_expected() const {
         return roundtrip_expected;
diff --git a/src/CppReverse/UmlAttribute.cpp b/src/CppReverse/UmlAttribute.cpp
index 647839645..873c9b94b 100644
--- a/src/CppReverse/UmlAttribute.cpp
+++ b/src/CppReverse/UmlAttribute.cpp
@@ -30,7 +30,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 using namespace std;
 #endif
@@ -94,7 +94,7 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
                            const WrapperStr & bitfield, const WrapperStr & value,
                            WrapperStr comment, WrapperStr description
 #ifdef ROUNDTRIP
-                           , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                           , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                           )
 {
@@ -149,6 +149,11 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
         Lex::finish_line();
 
         comment = Lex::get_comments(comment);
+        Lex::simplify_comment(comment);
+        if(CppSettings::isGenerateJavadocStyleComment())
+        {
+            comment = Lex::remove_javadoc_star_signs_from_comment(comment);
+        }
         description = Lex::get_description(description);
 
         bool pfunc = (type.find('$') != -1);
@@ -195,7 +200,7 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
                 decl.replace(index, 7, typeform);
             else if (typespec.type == 0) {
                 WrapperStr t = typespec.explicit_type;
-                int index2;
+                int index2 = 0;
 
                 if (!t.isEmpty() && (t.at(t.length() - 1) == ">") && ((index2 = t.find('<')) > 0))
                 {
@@ -238,7 +243,7 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
                     container->set_updated();
                 }
             }
-            else if (nequal(at->description(), Lex::simplify_comment(comment))) {
+            else if (nequal(at->description(), comment)) {
                 at->set_Description(comment); // comment was set
                 container->set_updated();
             }
@@ -316,7 +321,7 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
 
             if (!comment.isEmpty())
                 at->set_Description((decl.find("${description}") != -1)
-                                    ? description : Lex::simplify_comment(comment));
+                                    ? description : comment);
 
             if (constp)
                 at->set_isReadOnly(TRUE);
diff --git a/src/CppReverse/UmlAttribute.h b/src/CppReverse/UmlAttribute.h
index 83f1a5dac..12fc329cc 100644
--- a/src/CppReverse/UmlAttribute.h
+++ b/src/CppReverse/UmlAttribute.h
@@ -29,9 +29,7 @@
 #define UMLATTRIBUTE_H
 
 #include "UmlBaseAttribute.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 class Class;
 
@@ -49,7 +47,7 @@ class UmlAttribute : public UmlBaseAttribute
                         const WrapperStr & value,	WrapperStr comment,
                         WrapperStr description
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        );
 #ifdef ROUNDTRIP
diff --git a/src/CppReverse/UmlClass.cpp b/src/CppReverse/UmlClass.cpp
index bd744295b..81a6f1efc 100644
--- a/src/CppReverse/UmlClass.cpp
+++ b/src/CppReverse/UmlClass.cpp
@@ -29,9 +29,9 @@
 #include <iostream>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 using namespace std;
 #endif
@@ -59,13 +59,13 @@ using namespace std;
 
 // contains the classes whose definition in currently read
 // may be more than one because of the nested classes
-Q3PtrList<UmlClass> UmlClass::UnderConstruction;
+QList<UmlClass *> UmlClass::UnderConstruction;
 
 // used (by using) classes list
-Q3Dict<UmlClass> UmlClass::Usings;
+QHash<QString,UmlClass*> UmlClass::Usings;
 
 // to lost usings defined under a namespace/class block
-Q3ValueList<Q3Dict<UmlClass> > UmlClass::UsingScope;
+QList<QHash<QString,UmlClass*> > UmlClass::UsingScope;
 
 UmlClass::UmlClass(void * id, const WrapperStr & n)
     : UmlBaseClass(id, n)
@@ -75,12 +75,12 @@ UmlClass::UmlClass(void * id, const WrapperStr & n)
 {}
 
 bool UmlClass::manage_inherit(ClassContainer * container,
-                              const Q3ValueList<FormalParameterList> & tmplts
+                              const QList<FormalParameterList> & tmplts
 #ifdef REVERSE
                               , bool libp
 # ifdef ROUNDTRIP
-                              , bool roundtrip, Q3PtrList<UmlItem> & expected_order
-                              , bool container_roundtrip, Q3PtrList<UmlItem> & container_expected_order
+                              , bool roundtrip, QList<UmlItem *> & expected_order
+                              , bool container_roundtrip, QList<UmlItem *> & container_expected_order
 # endif
 #endif
                              )
@@ -176,9 +176,14 @@ bool UmlClass::manage_inherit(ClassContainer * container,
                 // must add inheritance before setting actuals
                 if (
 #ifdef ROUNDTRIP
-                    is_new &&
+                    is_new && (
+#endif
+                               (rel = UmlBaseRelation::create(aRealization, this, mother.type)) == 0
+#ifdef ROUNDTRIP
+                               )
 #endif
-                    ((rel = UmlBaseRelation::create(aRealization, this, mother.type)) == 0)) {
+                    )
+                {
                     Lex::warn("cannot inherit <font color =\"red\">" +
                               Lex::quote(mother_name) + " </font>");
 #ifdef DEBUG_DOUML
@@ -291,13 +296,13 @@ UmlClass * UmlClass::auxilarily_typedef(const WrapperStr & base
                                         , bool libp
 # ifdef ROUNDTRIP
                                         , bool container_roundtrip
-                                        , Q3PtrList<UmlItem> & container_expected_order
+                                        , QList<UmlItem *> & container_expected_order
 # endif
 #endif
                                        )
 {
     WrapperStr typedef_decl = CppSettings::typedefDecl();
-    const Q3PtrVector<UmlItem> & children = parent()->children();
+    const QVector<UmlItem*>& children = parent()->children();
     unsigned n = children.count();
     unsigned index;
 
@@ -334,7 +339,7 @@ UmlClass * UmlClass::auxilarily_typedef(const WrapperStr & base
                 break;
 
         if (index == n) {
-            UmlClass * cl = UmlClass::create(parent(), s);
+            UmlClass * cl = UmlClass::create(parent(), s.toLatin1().constData());
 
             if (cl == 0) {
 #ifdef REVERSE
@@ -377,15 +382,15 @@ UmlClass * UmlClass::auxilarily_typedef(const WrapperStr & base
 }
 
 bool UmlClass::get_actuals(UmlClass * mother, ClassContainer * container,
-                           const Q3ValueList<FormalParameterList> & tmplts
+                           const QList<FormalParameterList> & tmplts
 #ifdef ROUNDTRIP
                            , bool roundtrip
 #endif
                           )
 {
     // < read
-    const Q3ValueList<UmlActualParameter> actuals = this->actuals();
-    Q3ValueList<UmlActualParameter>::ConstIterator it;
+    const QList<UmlActualParameter> actuals = this->actuals();
+    QList<UmlActualParameter>::ConstIterator it;
     unsigned rank;
 
     for (it = actuals.begin(), rank = 0; (*it).superClass() != mother; ++it, rank += 1)
@@ -467,12 +472,12 @@ void UmlClass::set_under_construction(bool y, bool rec)
     else if (rec)
         UnderConstruction.clear();
     else
-        UnderConstruction.removeRef(this);
+        UnderConstruction.removeOne(this);
 }
 
 bool UmlClass::inside_its_definition()
 {
-    return UnderConstruction.findRef(this) != -1;
+    return UnderConstruction.contains(this);
 }
 
 bool UmlClass::is_itself(WrapperStr t)
@@ -484,8 +489,8 @@ bool UmlClass::is_itself(WrapperStr t)
 
     t = t.mid(index + 1, t.length() - index - 2);
 
-    Q3ValueList<UmlFormalParameter> l = formals();
-    Q3ValueList<UmlFormalParameter>::ConstIterator it = l.begin();
+    QList<UmlFormalParameter> l = formals();
+    QList<UmlFormalParameter>::ConstIterator it = l.begin();
     WrapperStr t2 = (*it).name();
 
     while ((++it) != l.end())
@@ -497,7 +502,7 @@ bool UmlClass::is_itself(WrapperStr t)
 void UmlClass::restore_using_scope()
 {
     Usings = UsingScope.first();
-    UsingScope.remove(UsingScope.begin());
+    UsingScope.removeFirst();
 }
 
 #ifdef REVERSE
@@ -532,7 +537,7 @@ void UmlClass::need_artifact(const WrapperStr & nmsp)
 
             UmlDeploymentView * cpv =
                 ((UmlPackage *) parent()->parent())->get_deploymentview(nmsp);
-            const Q3PtrVector<UmlItem> & children = cpv->children();
+            const QVector<UmlItem*> & children = cpv->children();
             int n = (int) children.count();
 
             for (index = 0; index != n; index += 1) {
@@ -582,7 +587,7 @@ bool UmlClass::need_source()
     const WrapperStr & stereotype = this->stereotype();
 
     if ((stereotype != "enum") && (stereotype != "typedef")) {
-        Q3PtrVector<UmlItem> children = this->children();
+        QVector<UmlItem*> children = this->children();
         unsigned u = children.size();
 
         while (u--)
@@ -610,12 +615,12 @@ void UmlClass::upload(ClassContainer * cnt)
 
     the_class = cnt->upload_define(this);
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
-
-    for (; v != vsup; v += 1)
-        (*v)->upload(the_class);
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    QVectorIterator<UmlItem*> it(ch);
+    while(it.hasNext())
+    {
+        it.next()->upload(the_class);;
+    }
 
     if (! na.isEmpty())
         Namespace::unset();
@@ -629,28 +634,29 @@ bool UmlClass::set_roundtrip_expected()
           !associatedArtifact()->set_roundtrip_expected_for_class())))
         return TRUE;
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlClassItem ** v = (UmlClassItem **) ch.data();
-    UmlClassItem ** const vsup = v + ch.size();
-    bool result = UmlClassItem::set_roundtrip_expected();
+    const QVector<UmlItem*> & ch = UmlItem::children();
 
-    for (; v != vsup; v += 1)
-        result &= (*v)->set_roundtrip_expected();
+    bool result = UmlClassItem::set_roundtrip_expected();
 
+    QVectorIterator<UmlItem*> it(ch);
+    while(it.hasNext())
+    {
+        result &= it.next()->set_roundtrip_expected();
+    }
     return result;
 
 }
 
-void UmlClass::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlClass::mark_useless(QList<UmlItem *> & l)
 {
     UmlClassItem::mark_useless(l);
 
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
-    UmlClassItem ** v = (UmlClassItem **) ch.data();
-    UmlClassItem ** const vsup = v + ch.size();
-
-    for (; v != vsup; v += 1)
-        (*v)->mark_useless(l);
+    const QVector<UmlItem*>& ch = UmlItem::children();
+    QVectorIterator<UmlItem*> it(ch);
+    while(it.hasNext())
+    {
+        it.next()->mark_useless(l);
+    }
 }
 
 void UmlClass::scan_it(int & n)
@@ -667,21 +673,22 @@ void UmlClass::send_it(int n)
 
 UmlItem * UmlClass::search_for_att_rel(const WrapperStr & name)
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
 
-    for (; v != vsup; v += 1) {
-        switch ((*v)->kind()) {
+    QVectorIterator<UmlItem*> it(ch);
+    while(it.hasNext())
+    {
+        UmlItem* item = it.next();
+        switch (item->kind()) {
         case anAttribute:
-            if ((*v)->name() == name)
-                return *v;
+            if (item->name() == name)
+                return item;
 
             break;
 
         case aRelation:
-            if (((UmlRelation *) *v)->roleName() == name)
-                return *v;
+            if (((UmlRelation *) item)->roleName() == name)
+                return item;
 
             break;
 
@@ -696,15 +703,15 @@ UmlItem * UmlClass::search_for_att_rel(const WrapperStr & name)
 UmlExtraClassMember *
 UmlClass::search_for_extra(const WrapperStr & name, const WrapperStr & decl)
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
-
-    for (; v != vsup; v += 1) {
-        if (((*v)->kind() == anExtraClassMember) &&
-            ((*v)->name() == name) &&
-            !neq(((UmlExtraClassMember *) *v)->cppDecl(), decl))
-            return (UmlExtraClassMember *) *v;
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    QVectorIterator<UmlItem*> it(ch);
+    while(it.hasNext())
+    {
+        UmlItem* item = it.next();
+        if ((item->kind() == anExtraClassMember) &&
+            (item->name() == name) &&
+            !neq(((UmlExtraClassMember *) item)->cppDecl(), decl))
+            return (UmlExtraClassMember *) item;
     }
 
     return 0;
@@ -712,17 +719,17 @@ UmlClass::search_for_extra(const WrapperStr & name, const WrapperStr & decl)
 
 UmlRelation * UmlClass::search_for_inherit(UmlClass * mother)
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
-
-    for (; v != vsup; v += 1) {
-        if (((*v)->kind() == aRelation) &&
-            (((UmlRelation *) *v)->roleType() == mother)) {
-            switch (((UmlRelation *) *v)->relationKind()) {
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    QVectorIterator<UmlItem*> it(ch);
+    while(it.hasNext())
+    {
+        UmlItem* item = it.next();
+        if ((item->kind() == aRelation) &&
+            (((UmlRelation *) item)->roleType() == mother)) {
+            switch (((UmlRelation *) item)->relationKind()) {
             case aGeneralisation:
             case aRealization:
-                return (UmlRelation *) *v;
+                return (UmlRelation *) item;
 
             default:
                 break;
@@ -733,22 +740,20 @@ UmlRelation * UmlClass::search_for_inherit(UmlClass * mother)
     return 0;
 }
 
-void UmlClass::reorder(Q3PtrList<UmlItem> & expected_order)
+void UmlClass::reorder(QList<UmlItem *> & expected_order)
 {
     if (expected_order.isEmpty())
         return;
 
-    Q3PtrVector<UmlItem> ch = UmlItem::children(); // copy
+    QVector<UmlItem*> ch = UmlItem::children(); // copy
     UmlItem ** v = ch.data();
 
     unload(); // to not reload children each time
 
     //bool updated = FALSE;
     UmlItem * expected_previous = 0;
-    Q3PtrListIterator<UmlItem> expected_it(expected_order);
-    UmlItem * expected;
 
-    while ((expected = expected_it.current()) != 0) {
+    foreach (UmlItem * expected, expected_order) {
         if (*v != expected) {
             //updated = TRUE;
             expected->moveAfter(expected_previous);
@@ -765,7 +770,6 @@ void UmlClass::reorder(Q3PtrList<UmlItem> & expected_order)
         }
 
         expected_previous = expected;
-        ++expected_it;
         v += 1;
     }
 
diff --git a/src/CppReverse/UmlClass.h b/src/CppReverse/UmlClass.h
index 3c1b160a3..097da9c53 100644
--- a/src/CppReverse/UmlClass.h
+++ b/src/CppReverse/UmlClass.h
@@ -32,8 +32,7 @@
 #include "UmlFormalParameter.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
-#include <Q3PtrList>
+#include <QList>
 
 class ClassContainer;
 #ifdef ROUNDTRIP
@@ -42,7 +41,7 @@ class UmlRelation;
 class UmlExtraClassMember;
 #endif
 
-typedef Q3ValueList<UmlFormalParameter> FormalParameterList;
+typedef QList<UmlFormalParameter> FormalParameterList;
 
 class UmlClass : public UmlBaseClass
 {
@@ -56,17 +55,17 @@ class UmlClass : public UmlBaseClass
     UmlClass(void * id, const WrapperStr & n);
 
     bool manage_inherit(ClassContainer * pack,
-                        const Q3ValueList<FormalParameterList> & tmplt
+                        const QList<FormalParameterList> & tmplt
 #ifdef REVERSE
                         , bool libp
 # ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
-                        , bool container_roundtrip, Q3PtrList<UmlItem> & container_expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
+                        , bool container_roundtrip, QList<UmlItem *> & container_expected_order
 # endif
 #endif
                        );
     bool get_actuals(UmlClass * mother, ClassContainer * container,
-                     const Q3ValueList<FormalParameterList> & formals
+                     const QList<FormalParameterList> & formals
 #ifdef ROUNDTRIP
                      , bool roundtrip
 #endif
@@ -80,7 +79,7 @@ class UmlClass : public UmlBaseClass
         Usings.clear();
     }
     void using_it() {
-        Usings.replace(name(), this);
+        Usings.insert(name(), this);
     }
     static UmlClass * used(const char * n) {
         return Usings[n];
@@ -97,7 +96,7 @@ class UmlClass : public UmlBaseClass
 # ifdef ROUNDTRIP
     virtual void upload(ClassContainer * cnt);
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
     bool is_created() const {
@@ -112,7 +111,7 @@ class UmlClass : public UmlBaseClass
     UmlItem * search_for_att_rel(const WrapperStr & name);
     UmlExtraClassMember * search_for_extra(const WrapperStr & name, const WrapperStr & decl);
     UmlRelation * search_for_inherit(UmlClass * mother);
-    void reorder(Q3PtrList<UmlItem> & expected_order);
+    void reorder(QList<UmlItem *> & expected_order);
 # endif
 #endif
 
@@ -122,14 +121,14 @@ class UmlClass : public UmlBaseClass
                                   , bool libp
 # ifdef ROUNDTRIP
                                   , bool container_roundtrip
-                                  , Q3PtrList<UmlItem> & container_expected_order
+                                  , QList<UmlItem *> & container_expected_order
 # endif
 #endif
                                  );
 
-    static Q3PtrList<UmlClass> UnderConstruction;
-    static Q3Dict<UmlClass> Usings;
-    static Q3ValueList<Q3Dict<UmlClass> > UsingScope;
+    static QList<UmlClass *> UnderConstruction;
+    static QHash<QString,UmlClass*> Usings;
+    static QList<QHash<QString,UmlClass*> > UsingScope;
 };
 
 #endif
diff --git a/src/CppReverse/UmlClassItem.cpp b/src/CppReverse/UmlClassItem.cpp
index 95672043a..da1028265 100644
--- a/src/CppReverse/UmlClassItem.cpp
+++ b/src/CppReverse/UmlClassItem.cpp
@@ -27,7 +27,6 @@
 
 #include "UmlClassItem.h"
 //Added by qt3to4:
-#include <Q3PtrList>
 
 #ifdef ROUNDTRIP
 bool UmlClassItem::set_roundtrip_expected()
@@ -41,7 +40,7 @@ bool UmlClassItem::set_roundtrip_expected()
     return isWritable();
 }
 
-void UmlClassItem::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlClassItem::mark_useless(QList<UmlItem *> & l)
 {
     if (is_useless()) {
         set_isMarked(TRUE);
diff --git a/src/CppReverse/UmlClassItem.h b/src/CppReverse/UmlClassItem.h
index a55961d61..1ab230406 100644
--- a/src/CppReverse/UmlClassItem.h
+++ b/src/CppReverse/UmlClassItem.h
@@ -28,11 +28,7 @@
 #ifndef UMLCLASSITEM_H
 #define UMLCLASSITEM_H
 
-#include <q3ptrlist.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
-
 #include "UmlBaseClassItem.h"
 
 class UmlClassItem : public UmlBaseClassItem
@@ -64,7 +60,7 @@ class UmlClassItem : public UmlBaseClassItem
         useless = !y;
     }
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
 # endif
 #endif
 };
diff --git a/src/CppReverse/UmlClassView.cpp b/src/CppReverse/UmlClassView.cpp
index f8a538455..4d5b0c910 100644
--- a/src/CppReverse/UmlClassView.cpp
+++ b/src/CppReverse/UmlClassView.cpp
@@ -34,15 +34,15 @@
 #include "Package.h"
 #include "Progress.h"
 //Added by qt3to4:
-#include <Q3PtrList>
 
-static Q3PtrDict<UmlArtifact> Artifacts;
+
+static QHash<UmlArtifact*,UmlArtifact*> Artifacts;
 
 void UmlClassView::upload(ClassContainer * cnt)
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         (*v)->upload(cnt);
@@ -50,9 +50,9 @@ void UmlClassView::upload(ClassContainer * cnt)
 
 bool UmlClassView::set_roundtrip_expected()
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
     bool result = isWritable();
 
     for (; v != vsup; v += 1)
@@ -61,9 +61,9 @@ bool UmlClassView::set_roundtrip_expected()
     return result;
 }
 
-void UmlClassView::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlClassView::mark_useless(QList<UmlItem *> & l)
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
     UmlClassItem ** v = (UmlClassItem **) ch.data();
     UmlClassItem ** const vsup = v + ch.size();
 
@@ -74,9 +74,9 @@ void UmlClassView::mark_useless(Q3PtrList<UmlItem> & l)
 void UmlClassView::scan_it(int & n)
 {
     // compute artifact list
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     n = 0;
 
@@ -87,7 +87,7 @@ void UmlClassView::scan_it(int & n)
             if (cl->is_roundtrip_expected()) {
                 UmlArtifact * art = cl->associatedArtifact();
 
-                if ((art != 0) && (Artifacts.find(art) == 0)) {
+                if ((art != 0) && (Artifacts.find(art) == Artifacts.end())) {
                     Artifacts.insert(art, art);
                     n += 1;
                 }
@@ -98,14 +98,18 @@ void UmlClassView::scan_it(int & n)
     if (n != 0) {
         Package::set_step(1, n);
 
-        Q3PtrDictIterator<UmlArtifact> iter(Artifacts);
+        QHashIterator<UmlArtifact*,UmlArtifact*> iter(Artifacts);
 
-        do {
-            ((UmlPackage *) iter.current()->parent()->parent())
-            ->get_package()->reverse(iter.current());
+        while (iter.hasNext()){
+            iter.next();
+            if(iter.value() != 0)
+            {
+            ((UmlPackage *) iter.value()->parent()->parent())
+            ->get_package()->reverse(iter.value());
             Progress::tic_it();
+            }
         }
-        while (++iter, iter.current() != 0);
+
 
         Package::set_step(1, -1);
     }
@@ -116,14 +120,17 @@ void UmlClassView::send_it(int n)
     if (n != 0) {
         Package::set_step(2, n);
 
-        Q3PtrDictIterator<UmlArtifact> iter(Artifacts);
-
-        do {
-            ((UmlPackage *) iter.current()->parent()->parent())
-            ->get_package()->reverse(iter.current());
-            Progress::tic_it();
+        QHashIterator<UmlArtifact*,UmlArtifact*> iter(Artifacts);
+        while(iter.hasNext())
+        {
+            iter.next();
+            if(iter.value() != 0)
+            {
+                ((UmlPackage *) iter.value()->parent()->parent())
+                ->get_package()->reverse(iter.value());
+                Progress::tic_it();
+        }
         }
-        while (++iter, iter.current() != 0);
 
         Package::set_step(2, -1);
     }
diff --git a/src/CppReverse/UmlClassView.h b/src/CppReverse/UmlClassView.h
index ca5f2b09f..47928211a 100644
--- a/src/CppReverse/UmlClassView.h
+++ b/src/CppReverse/UmlClassView.h
@@ -29,9 +29,7 @@
 #define UMLCLASSVIEW_H
 
 #include "UmlBaseClassView.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 class UmlClassView : public UmlBaseClassView
 {
@@ -42,7 +40,7 @@ class UmlClassView : public UmlBaseClassView
 #ifdef ROUNDTRIP
     virtual void upload(ClassContainer *);
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
 #endif
diff --git a/src/CppReverse/UmlDeploymentView.cpp b/src/CppReverse/UmlDeploymentView.cpp
index f87cb40e6..e2e4fc2e6 100644
--- a/src/CppReverse/UmlDeploymentView.cpp
+++ b/src/CppReverse/UmlDeploymentView.cpp
@@ -33,15 +33,15 @@
 #include "Package.h"
 #include "Progress.h"
 //Added by qt3to4:
-#include <Q3PtrList>
 
-static Q3PtrList<UmlArtifact> Artifacts;
+
+static QList<UmlArtifact *> Artifacts;
 
 bool UmlDeploymentView::set_roundtrip_expected()
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
     bool result = isWritable();
 
     for (; v != vsup; v += 1)
@@ -50,9 +50,9 @@ bool UmlDeploymentView::set_roundtrip_expected()
     return result;
 }
 
-void UmlDeploymentView::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlDeploymentView::mark_useless(QList<UmlItem *> & l)
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
     UmlClassItem ** v = (UmlClassItem **) ch.data();
     UmlClassItem ** const vsup = v + ch.size();
 
@@ -63,9 +63,9 @@ void UmlDeploymentView::mark_useless(Q3PtrList<UmlItem> & l)
 void UmlDeploymentView::scan_it(int & n)
 {
     // compute artifact list
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     n = 0;
 
@@ -80,15 +80,13 @@ void UmlDeploymentView::scan_it(int & n)
     if (n != 0) {
         Package::set_step(1, n);
 
-        Q3PtrListIterator<UmlArtifact> iter(Artifacts);
         Package * pk =
-            ((UmlPackage *) iter.current()->parent()->parent())->get_package();
+                ((UmlPackage *) Artifacts.first()->parent()->parent())->get_package();
 
-        do {
-            pk->reverse(iter.current());
+        foreach (UmlArtifact *artifact, Artifacts) {
+            pk->reverse(artifact);
             Progress::tic_it();
         }
-        while (++iter, iter.current() != 0);
 
 
         Package::set_step(1, -1);
@@ -100,15 +98,13 @@ void UmlDeploymentView::send_it(int n)
     if (n != 0) {
         Package::set_step(2, n);
 
-        Q3PtrListIterator<UmlArtifact> iter(Artifacts);
         Package * pk =
-            ((UmlPackage *) iter.current()->parent()->parent())->get_package();
+            ((UmlPackage *) Artifacts.first()->parent()->parent())->get_package();
 
-        do {
-            pk->reverse(iter.current());
+        foreach (UmlArtifact *artifact, Artifacts) {
+            pk->reverse(artifact);
             Progress::tic_it();
         }
-        while (++iter, iter.current() != 0);
 
 
         Package::set_step(2, -1);
diff --git a/src/CppReverse/UmlDeploymentView.h b/src/CppReverse/UmlDeploymentView.h
index e60b58282..aa963a8cb 100644
--- a/src/CppReverse/UmlDeploymentView.h
+++ b/src/CppReverse/UmlDeploymentView.h
@@ -29,9 +29,7 @@
 #define UMLDEPLOYMENTVIEW_H
 
 #include "UmlBaseDeploymentView.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 // This class manages 'deployment view'
 // You can modify it as you want (except the constructor)
@@ -44,7 +42,7 @@ class UmlDeploymentView : public UmlBaseDeploymentView
 
 #ifdef ROUNDTRIP
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
 #endif
diff --git a/src/CppReverse/UmlItem.cpp b/src/CppReverse/UmlItem.cpp
index 9d3b4e56e..2242027fc 100644
--- a/src/CppReverse/UmlItem.cpp
+++ b/src/CppReverse/UmlItem.cpp
@@ -29,7 +29,7 @@
 #include "UmlCom.h"
 #include "UmlPackage.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 UmlItem::~UmlItem()
 {
@@ -47,7 +47,7 @@ bool UmlItem::set_roundtrip_expected()
     return TRUE;
 }
 
-void UmlItem::mark_useless(Q3PtrList<UmlItem> &)
+void UmlItem::mark_useless(QList<UmlItem *> &)
 {
     // does nothing
 }
diff --git a/src/CppReverse/UmlItem.h b/src/CppReverse/UmlItem.h
index fedd007fc..ec70426f4 100644
--- a/src/CppReverse/UmlItem.h
+++ b/src/CppReverse/UmlItem.h
@@ -29,12 +29,9 @@
 #define UMLITEM_H
 
 #include "UmlBaseItem.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 #ifdef ROUNDTRIP
-#include <q3ptrlist.h>
 
 class ClassContainer;
 #endif
@@ -50,7 +47,7 @@ class UmlItem : public UmlBaseItem
 #ifdef ROUNDTRIP
     virtual void upload(ClassContainer *);
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
 #endif
diff --git a/src/CppReverse/UmlOperation.cpp b/src/CppReverse/UmlOperation.cpp
index eedefb8a2..b5e611fb3 100644
--- a/src/CppReverse/UmlOperation.cpp
+++ b/src/CppReverse/UmlOperation.cpp
@@ -28,17 +28,17 @@
 #ifdef DEBUG_DOUML
 #include <iostream>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 #include "Logging/QsLog.h"
 
 using namespace std;
 #endif
 
 #include <qstringlist.h>
-
+#include <QSettings>
 #include "UmlOperation.h"
 #include "Package.h"
 #include "UmlClass.h"
@@ -48,6 +48,7 @@ using namespace std;
 #include "UmlCom.h"
 #include "CppSettings.h"
 #include "Lex.h"
+#include <QSettings>
 #ifdef REVERSE
 #include "Statistic.h"
 # ifdef ROUNDTRIP
@@ -55,9 +56,9 @@ using namespace std;
 # endif
 #endif
 
-NDict< Q3PtrList<UmlOperation> > UmlOperation::friends;
+NDict< QList<UmlOperation *> > UmlOperation::friends;
 #ifdef ROUNDTRIP
-Q3PtrDict<WrapperStr> UmlOperation::DefNotYetSet(97);
+QHash<UmlOperation *,WrapperStr*> UmlOperation::DefNotYetSet;
 #endif
 
 UmlOperation::UmlOperation(void * id, const WrapperStr & n)
@@ -216,39 +217,43 @@ static void insert_template(const FormalParameterList & tmplt,
 }
 
 bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
-                           const Q3ValueList<FormalParameterList> & tmplts,
+                           const QList<FormalParameterList> & tmplts,
                            WrapperStr type, const WrapperStr & modifier,
                            const WrapperStr & pretype, aVisibility visibility,
                            bool inlinep, bool virtualp, bool staticp, bool constp,
                            bool volatilep, bool typenamep, bool explicitp,
                            bool friendp, WrapperStr friend_template,
                            WrapperStr comment, WrapperStr description, bool pfunc
-#ifdef ROUNDTRIP
-                           , bool roundtrip, Q3PtrList<UmlItem> & expected_order
-#endif
-                          )
+                           #ifdef ROUNDTRIP
+                           , bool roundtrip, QList<UmlItem *> & expected_order
+                           #endif
+                           )
 {
     // the "(" was read
 
+    Lex::simplify_comment(comment);
+    if(CppSettings::isGenerateJavadocStyleComment())
+    {
+        comment = Lex::remove_javadoc_star_signs_from_comment(comment);
+    }
 #ifdef DEBUG_DOUML
     QLOG_INFO() << "OPERATION '" << name << "' type '" << type << "' modifier '" << modifier << "'\n";
 #endif
 
-    WrapperStr cl_name = WrapperStr((cl->text(0)).toAscii().constData());
+    WrapperStr cl_name = WrapperStr((cl->text(0)).toLatin1().constData());
     UmlOperation * op;
 #ifdef ROUNDTRIP
-    bool may_roundtrip = roundtrip &&
-                         (!cl->from_libp() || (visibility != PrivateVisibility));
-    Q3ValueList<UmlParameter> params;
+    bool may_roundtrip = roundtrip && (!cl->from_libp() || (visibility != PrivateVisibility));
+    QList<UmlParameter> params;
     WrapperStr body;
 
     if (may_roundtrip)
 #else
     if (
-# ifdef REVERSE
-        cl->from_libp() &&
-# endif
-        (visibility == PrivateVisibility))
+        # ifdef REVERSE
+            cl->from_libp() &&
+        # endif
+            (visibility == PrivateVisibility))
 #endif
         op = 0;
     else {
@@ -271,20 +276,22 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
     UmlTypeSpec return_type;
     WrapperStr typeform;
 
-    if (!pfunc) {
+    if (!pfunc)
+    {
         typeform = (pretype.isEmpty())
-                   ? WrapperStr("${type}")
-                   : pretype + " ${type}";
+                ? WrapperStr("${type}")
+                : pretype + " ${type}";
 
         if (! type.isEmpty())
             // not a contructor or destructor
             cl->compute_type(type, return_type, typeform, FALSE, tmplts);
     }
 
-    int index;
+    int index = 0;
     WrapperStr decl;
 
-    if (op != 0) {
+    if (op != 0)
+    {
         op->set_Visibility(visibility);
 
         if (staticp) op->set_isClassMember(staticp);
@@ -304,17 +311,17 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
         decl = CppSettings::operationDecl();
 
         if ((decl.operator QString().lastIndexOf(';') == -1) ||
-            (decl.find("${friend}") == -1) ||
-            (decl.find("${static}") == -1) ||
-            ((index = decl.find("${(}")) == -1) ||
-            ((index = decl.find("${)}", index + 4)) == -1) ||
-            (decl.find("${volatile}", index + 4) == -1) ||
-            (decl.find("${const}", index + 4) == -1) ||
-            ((index = decl.find("${type}")) == -1) ||
-            (decl.find("${name}", index + 7) == -1) ||
-            (decl.find("${abstract}", index + 7) == -1)) {
+                (decl.find("${friend}") == -1) ||
+                (decl.find("${static}") == -1) ||
+                ((index = decl.find("${(}")) == -1) ||
+                ((index = decl.find("${)}", index + 4)) == -1) ||
+                (decl.find("${volatile}", index + 4) == -1) ||
+                (decl.find("${const}", index + 4) == -1) ||
+                ((index = decl.find("${type}")) == -1) ||
+                (decl.find("${name}", index + 7) == -1) ||
+                (decl.find("${abstract}", index + 7) == -1)) {
             // throw is not mandatory
-            decl = "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};";
+            decl = "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${final}${override}${volatile}${abstract}${default}${delete};";
             index = decl.find("${type}");
         }
 
@@ -359,7 +366,7 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
         if (!comment.isEmpty())
             if (op != 0)
                 op->set_Description((decl.find("${description}") != -1)
-                                    ? description : Lex::simplify_comment(comment));
+                                    ? description : comment);
 
     }
 
@@ -375,15 +382,18 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
     // note : don't use preserve_body identifier like in Java
     // else need to report existing operation detection when
     // will read its body rather than only its declaration
-    if (may_roundtrip) {
-        while (read_param(cl, rank, param, decl, tmplts, on_error, TRUE)) {
+    if (may_roundtrip)
+    {
+        while (read_param(cl, rank, param, decl, tmplts, on_error, TRUE))
+        {
             if (may_roundtrip) {
                 params.append(param);
                 rank += 1;
             }
         }
 
-        if ((op = already_exist(cl, name, params, FALSE)) != 0) {
+        if ((op = already_exist(cl, name, params, FALSE)) != 0)
+        {
             // update already existing operation
             op->set_usefull();
 
@@ -415,12 +425,13 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
                     cl->set_updated();
                 }
             }
-            else if (nequal(op->description(), Lex::simplify_comment(comment))) {
+            else if (nequal(op->description(), comment)) {
                 op->set_Description(comment); // comment was set
                 cl->set_updated();
             }
         }
-        else {
+        else
+        {
             // operation doesn't yet exist
             op = UmlBaseOperation::create(cl->get_uml(), name);
 
@@ -444,9 +455,9 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
 
             if (!comment.isEmpty())
                 op->set_Description((decl.find("${description}") != -1)
-                                    ? description : Lex::simplify_comment(comment));
+                                    ? description : comment);
 
-            Q3ValueList<UmlParameter>::Iterator it;
+            QList<UmlParameter>::Iterator it;
 
             for (rank = 0, it = params.begin(); it != params.end(); ++it, rank += 1) {
                 if (!op->addParameter(rank, *it)) {
@@ -473,10 +484,10 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
 
     if ((op != 0) && friendp) {
         // not an operation
-        Q3PtrList<UmlOperation> * fr = friends[name];
+        QList<UmlOperation *> * fr = friends[name];
 
         if (fr == 0) {
-            fr = new Q3PtrList<UmlOperation>;
+            fr = new QList<UmlOperation *>;
             fr->append(op);
             friends.insert(name, fr);
         }
@@ -490,7 +501,7 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
         Lex::mark();
 
         if (((s = Lex::read_word()) != ")") ||
-            ((s = Lex::read_word()) != "(")) {
+                ((s = Lex::read_word()) != "(")) {
             Lex::error_near(s);
             return FALSE;
         }
@@ -517,50 +528,121 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
 #endif
             op->set_ReturnType(return_type);
     }
-
-    // const may be before volatile
-    bool is_const;
-
-    if ((s = Lex::read_word()) == "const") {
-        is_const = TRUE;
+    bool is_const = false;
+    bool is_volatile = false;
+    bool is_final = false;
+    bool is_override = false;
+    while(1)
+    {
         s = Lex::read_word();
-    }
-    else
-        is_const = FALSE;
-
-    // volatile
-    if (s == "volatile") {
-        if (op != 0) {
-#ifdef ROUNDTRIP
-
-            if (may_roundtrip) {
-                if (!op->isVolatile()) {
-                    cl->set_updated();
-                    op->set_isVolatile(TRUE);
+        if(s ==  "const"||
+                s ==  "throw"||
+                s ==  "volatile"||
+                s ==  "final"||
+                s ==  "override"
+                )
+        {
+            if ( s == "const") {
+                is_const = TRUE;
+            }
+            else if(s == "volatile")
+            {
+                is_volatile = true;
+                if (op != 0) {
+        #ifdef ROUNDTRIP
+
+                    if (may_roundtrip) {
+                        if (!op->isVolatile()) {
+                            cl->set_updated();
+                            op->set_isVolatile(TRUE);
+                        }
+                    }
+                    else
+        #endif
+                        op->set_isVolatile(TRUE);
                 }
             }
-            else
-#endif
-                op->set_isVolatile(TRUE);
-        }
+            // throw
 
-        s = Lex::read_word();
-    }
+            else if (s == "throw") {
+                if ((s = Lex::read_word()) != "(") {
+                    Lex::error_near("throw");
+                    skip_body((s == "{") ? 1 : 0);
+                    return FALSE;
+                }
 
-#ifdef ROUNDTRIP
-    else if (may_roundtrip && op->isVolatile()) {
-        cl->set_updated();
-        op->set_isVolatile(FALSE);
-    }
+                rank = 0;
 
-#endif
+                if (op == 0)
+                    skip_expr(")");
+                else {
+                    UmlTypeSpec excpt;
+
+        #ifdef ROUNDTRIP
+
+                    if (may_roundtrip) {
+                        const QList<UmlTypeSpec> old_exceptions = op->exceptions();
+                        QList<UmlTypeSpec>::ConstIterator it_old;
+                        bool has;
+
+                        for (it_old = old_exceptions.begin();
+                             ((has = read_throw_elt(cl, excpt, tmplts)) != FALSE) &&
+                             (it_old != old_exceptions.end());
+                             ++it_old, rank += 1) {
+                            if (!excpt.equal(*it_old)) {
+                                op->replaceException(rank, excpt);
+                                cl->set_updated();
+                            }
+                        }
 
-    // const may be after volatile
-    if (s == "const") {
-        is_const = TRUE;
-        s = Lex::read_word();
+                        if (has) {
+                            // have missing exceptions
+                            cl->set_updated();
+
+                            do {
+                                op->addException(rank++, excpt);
+                            }
+                            while (read_throw_elt(cl, excpt, tmplts));
+                        }
+                        else if (it_old != old_exceptions.end()) {
+                            // have extra exceptions
+                            cl->set_updated();
+
+                            do {
+                                op->removeException(rank);
+                                it_old++;
+                            }
+                            while (it_old != old_exceptions.end());
+                        }
+                    }
+                    else
+        #endif
+                        while (read_throw_elt(cl, excpt, tmplts))
+                            op->addException(rank++, excpt);
+                }
+
+                if ((rank != 0) && (decl.find("${throw}") == -1))
+                    decl.insert(decl.find("${abstract}"), "${throw}");
+            }
+            else if ( s == "final") {
+                is_final = true;
+                }
+            else if ( s == "override") {
+                is_override = true;
+                }
+        }
+        else
+        {
+            break;
+        }
     }
+    #ifdef ROUNDTRIP
+        if (!is_volatile &&may_roundtrip && op->isVolatile()) {
+            cl->set_updated();
+            op->set_isVolatile(FALSE);
+        }
 
+    #endif
     if (op != 0) {
 #ifdef ROUNDTRIP
 
@@ -574,73 +656,33 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
 #endif
             if (is_const)
                 op->set_isCppConst(TRUE);
-    }
 
-    // throw
+#ifdef ROUNDTRIP
 
-    if (s == "throw") {
-        if ((s = Lex::read_word()) != "(") {
-            Lex::error_near("throw");
-            skip_body((s == "{") ? 1 : 0);
-            return FALSE;
+        if (may_roundtrip) {
+            if (op->isCppFinal() != is_final) {
+                cl->set_updated();
+                op->set_isCppFinal(is_final);
+            }
         }
-
-        rank = 0;
-
-        if (op == 0)
-            skip_expr(")");
-        else {
-            UmlTypeSpec excpt;
+        else
+#endif
+            if (is_final)
+                op->set_isCppFinal(TRUE);
 
 #ifdef ROUNDTRIP
 
-            if (may_roundtrip) {
-                const Q3ValueList<UmlTypeSpec> old_exceptions = op->exceptions();
-                Q3ValueList<UmlTypeSpec>::ConstIterator it_old;
-                bool has;
-
-                for (it_old = old_exceptions.begin();
-                     ((has = read_throw_elt(cl, excpt, tmplts)) != FALSE) &&
-                     (it_old != old_exceptions.end());
-                     ++it_old, rank += 1) {
-                    if (!excpt.equal(*it_old)) {
-                        op->replaceException(rank, excpt);
-                        cl->set_updated();
-                    }
-                }
-
-                if (has) {
-                    // have missing exceptions
-                    cl->set_updated();
-
-                    do {
-                        op->addException(rank++, excpt);
-                    }
-                    while (read_throw_elt(cl, excpt, tmplts));
-                }
-                else if (it_old != old_exceptions.end()) {
-                    // have extra exceptions
-                    cl->set_updated();
-
-                    do {
-                        op->removeException(rank);
-                        it_old++;
-                    }
-                    while (it_old != old_exceptions.end());
-                }
+        if (may_roundtrip) {
+            if (op->isCppOverride() != is_override) {
+                cl->set_updated();
+                op->set_isCppOverride(is_override);
             }
-            else
-#endif
-                while (read_throw_elt(cl, excpt, tmplts))
-                    op->addException(rank++, excpt);
         }
-
-        if ((rank != 0) && (decl.find("${throw}") == -1))
-            decl.insert(decl.find("${abstract}"), "${throw}");
-
-        s = Lex::read_word();
+        else
+#endif
+            if (is_override)
+                op->set_isCppOverride(TRUE);
     }
-
     if ((index = cl_name.find('<')) != -1)
         cl_name.truncate(index);
 
@@ -665,24 +707,64 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
     }
 
     bool defined_in_decl = FALSE;
-
-    // abstract
+    // abstract, default or delete
     if (s == "=") {
-        if (Lex::read_word() != "0")
-            return FALSE;
 
-        if (op != 0) {
-#ifdef ROUNDTRIP
+        s = Lex::read_word();
+        //default and delete
+        if (s == "0")
+        {
 
-            if (may_roundtrip) {
-                if (!op->isAbstract()) {
-                    cl->set_updated();
+            if (op != 0) {
+    #ifdef ROUNDTRIP
+
+                if (may_roundtrip) {
+                    if (!op->isAbstract()) {
+                        cl->set_updated();
+                        op->set_isAbstract(TRUE);
+                    }
+                }
+                else
+    #endif
                     op->set_isAbstract(TRUE);
+            }
+        }
+        else if (s == "default")
+        {
+            if (op != 0) {
+    #ifdef ROUNDTRIP
+
+                if (may_roundtrip) {
+                    if (!op->isCppDefault()) {
+                        cl->set_updated();
+                        op->set_isCppDefault(TRUE);
+                    }
                 }
+                else
+    #endif
+                    op->set_isCppDefault(TRUE);
             }
-            else
-#endif
-                op->set_isAbstract(TRUE);
+        }
+        else if (s == "delete")
+        {
+            if (op != 0) {
+    #ifdef ROUNDTRIP
+
+                if (may_roundtrip) {
+                    if (!op->isCppDelete()) {
+                        cl->set_updated();
+                        op->set_isCppDelete(TRUE);
+                    }
+                }
+                else
+    #endif
+                     op->set_isCppDelete(TRUE);
+            }
+            printf("delete\r\n");
+        }
+        else
+        {
+            return FALSE;
         }
 
         s = Lex::read_word();
@@ -694,6 +776,14 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
             cl->set_updated();
             op->set_isAbstract(FALSE);
         }
+        if (may_roundtrip && op->isCppDelete()) {
+            cl->set_updated();
+            op->set_isCppDelete(false);
+        }
+        if (may_roundtrip && op->isCppDefault()) {
+            cl->set_updated();
+            op->set_isCppDefault(false);
+        }
 
 #endif
 
@@ -818,15 +908,15 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
                 int index = def.find("${(}");
 
                 if ((index == -1) ||
-                    (def.find("${body}", index) == -1) ||
-                    (def.find("${type}") == -1) ||
-                    (def.find("${class}::${name}") == -1) ||
-                    (def.find("${const}", index) == -1) ||
-                    (def.find("${volatile}", index) == -1)) {
+                        (def.find("${body}", index) == -1) ||
+                        (def.find("${type}") == -1) ||
+                        (def.find("${class}::${name}") == -1) ||
+                        (def.find("${const}", index) == -1) ||
+                        (def.find("${volatile}", index) == -1)) {
                     // use a definition where ${body] is not indented
                     def = (decl.find("${throw}") != -1)
-                          ? "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{\n${body}}\n"
-                          : "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}{\n${body}}\n";
+                            ? "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{\n${body}}\n"
+                            : "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}{\n${body}}\n";
                     index = def.find("${(}");
                 }
                 else {
@@ -920,7 +1010,7 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name,
 
 bool UmlOperation::read_param(ClassContainer * container, unsigned rank,
                               UmlParameter & param, WrapperStr & decl,
-                              const Q3ValueList<FormalParameterList> & tmplt,
+                              const QList<FormalParameterList> & tmplt,
                               BooL & on_error, bool add_defaultvalue)
 {
 #ifdef DEBUG_DOUML
@@ -1022,7 +1112,7 @@ bool UmlOperation::read_param(ClassContainer * container, unsigned rank,
                 Lex::unread_word();	// ')'
 
             param.dir = (constp || modifier.isEmpty())
-                        ? InputDirection : InputOutputDirection;
+                    ? InputDirection : InputOutputDirection;
 
             WrapperStr s2;
 
@@ -1061,7 +1151,7 @@ bool UmlOperation::read_param(ClassContainer * container, unsigned rank,
             }
             else {
                 param.type.explicit_type =
-                    param.type.explicit_type.simplifyWhiteSpace();
+                        param.type.explicit_type.simplifyWhiteSpace();
                 s2 += param.type.explicit_type;
                 param.type.explicit_type.remove(param.type.explicit_type.find(pn),
                                                 pn.length());
@@ -1133,8 +1223,8 @@ bool UmlOperation::read_param(ClassContainer * container, unsigned rank,
             BooL func;
 
             if ((s == "(") &&
-                pfunc(func, param.name, param.type.explicit_type, pn) &&
-                !func)
+                    pfunc(func, param.name, param.type.explicit_type, pn) &&
+                    !func)
                 pfct = TRUE;
             else {
                 Lex::error_near(s);
@@ -1151,7 +1241,7 @@ bool UmlOperation::read_param(ClassContainer * container, unsigned rank,
 
 bool UmlOperation::read_throw_elt(ClassContainer * container,
                                   UmlTypeSpec & typespec,
-                                  const Q3ValueList<FormalParameterList> & tmplts)
+                                  const QList<FormalParameterList> & tmplts)
 {
     char c;
 
@@ -1189,38 +1279,35 @@ bool UmlOperation::read_throw_elt(ClassContainer * container,
     return FALSE;
 }
 
-void UmlOperation::friend_operations(Q3PtrList<UmlOperation> & candidates,
-                                     const Q3ValueList<FormalParameterList> & tmplts,
+void UmlOperation::friend_operations(QList<UmlOperation *> & candidates,
+                                     const QList<FormalParameterList> & tmplts,
                                      const WrapperStr & name)
 {
-    Q3PtrList<UmlOperation> * fr = friends[name];
+    QList<UmlOperation *> * fr = friends[name];
 
     if (fr != 0) {
         // may be a friend operation
         FormalParameterList t;
         const FormalParameterList & tmpl = (tmplts.isEmpty()) ? t : tmplts.last();
-        Q3PtrListIterator<UmlOperation> it(*fr);
 
-        while (it.current() != 0) {
+        foreach (UmlOperation *op, *fr) {
             const FormalParameterList & formals =
-                ((UmlClass *) it.current()->parent())->formals();
+                    ((UmlClass *) op->parent())->formals();
 
             if (tmpl.count() <= formals.count()) {
                 unsigned rank = tmpl.count();
 
                 while (rank--) {
                     if (//??(formals[rank].Name() != tmplt[rank].Name()) ||
-                        (formals[rank].type() != tmpl[rank].type())) {
+                            (formals[rank].type() != tmpl[rank].type())) {
                         break;
                     }
                 }
 
                 if (rank == ~0u)
                     // candidate
-                    candidates.append(it.current());
+                    candidates.append(op);
             }
-
-            ++it;
         }
     }
 }
@@ -1255,8 +1342,8 @@ static bool compare_templates(const FormalParameterList & t1,
     return TRUE;
 }
 
-bool UmlOperation::operations(Q3PtrList<UmlOperation> & candidates, UmlClass * cl,
-                              const Q3ValueList<FormalParameterList> & tmplts,
+bool UmlOperation::operations(QList<UmlOperation *> & candidates, UmlClass * cl,
+                              const QList<FormalParameterList> & tmplts,
                               const FormalParameterList *& oper_tmplt,
                               const WrapperStr & name)
 {
@@ -1271,7 +1358,7 @@ bool UmlOperation::operations(Q3PtrList<UmlOperation> & candidates, UmlClass * c
     do {
         if (!((UmlClass *) cl1)->formals().isEmpty()) {
             // template not explicit
-            if (bypassed_tmplts == tmplts.count()) {
+            if ((int)bypassed_tmplts == tmplts.count()) {
                 Lex::warn("not enouth template specification for <font color =\"red\">"
                           + Lex::quote(name) + "</font>");
                 return TRUE;
@@ -1305,9 +1392,9 @@ bool UmlOperation::operations(Q3PtrList<UmlOperation> & candidates, UmlClass * c
                 rank -= 1;
 
                 if (!tmplts[rank].isEmpty() && // not a template specialisation
-                    !compare_templates(((UmlClass *) cl1)->formals(),
-                                       tmplts[rank], "for",
-                                       ((UmlClass *) cl1)->name()))
+                        !compare_templates(((UmlClass *) cl1)->formals(),
+                                           tmplts[rank], "for",
+                                           ((UmlClass *) cl1)->name()))
                     return TRUE;
             }
         }
@@ -1320,9 +1407,9 @@ bool UmlOperation::operations(Q3PtrList<UmlOperation> & candidates, UmlClass * c
 
     int index;
     WrapperStr opname = ((index = name.operator QString().lastIndexOf("::")) > 0)
-                       ? name.mid(index + 2)
-                       : name;
-    Q3PtrVector<UmlItem> children = cl->children();
+            ? name.mid(index + 2)
+            : name;
+    QVector<UmlItem*> children = cl->children();
 
     rank = children.size();
 
@@ -1330,7 +1417,7 @@ bool UmlOperation::operations(Q3PtrList<UmlOperation> & candidates, UmlClass * c
         UmlItem * it = children[rank];
 
         if ((it->kind() == aRelation) ? (((UmlRelation *) it)->roleName() == opname)
-            : (it->name() == opname)) {
+                : (it->name() == opname)) {
             switch (it->kind()) {
             case anOperation:
 
@@ -1338,7 +1425,7 @@ bool UmlOperation::operations(Q3PtrList<UmlOperation> & candidates, UmlClass * c
                 // bypass template operations (their decl is empty)
                 if (((((UmlOperation *) it)->formals != 0)
                      ? (oper_tmplt != 0) : (oper_tmplt == 0)) &&
-                    !((UmlOperation *) it)->cppDecl().isEmpty())
+                        !((UmlOperation *) it)->cppDecl().isEmpty())
                     candidates.append((UmlOperation *) it);
 
             default:	// to avoid compiler warning
@@ -1407,7 +1494,7 @@ bool UmlOperation::operations(Q3PtrList<UmlOperation> & candidates, UmlClass * c
 
 void UmlOperation::reverse_definition(Package * pack, WrapperStr name,
                                       WrapperStr type,
-                                      Q3ValueList<FormalParameterList> & tmplts,
+                                      QList<FormalParameterList> & tmplts,
                                       bool inlinep, const WrapperStr & comment,
                                       const WrapperStr & description)
 {
@@ -1435,12 +1522,16 @@ void UmlOperation::reverse_definition(Package * pack, WrapperStr name,
             WrapperStr s1;
             WrapperStr s2;
 
-            if (((index = type.operator QString().lastIndexOf("::")) > 0) &&
-                pack->find_type(normalized = Lex::normalize(type.left(index)), tcl) &&
-                (s1 = tcl.type->name(),
-                 s2 = type.mid(index + 2),
-                 s1 = ((index = s1.find('<')) != -1) ? s1.left(index) : s1,
-                 ((s1 == s2) || (s2 == (WrapperStr("~") + s1))))) {
+            auto hasDoubleColon = [&](){index = type.operator QString().lastIndexOf("::"); return index > 0;};
+            auto typeFound = [&](){return pack->find_type(normalized = Lex::normalize(type.left(index)), tcl);};
+            auto readTypes = [&]()
+            {
+                s1 = tcl.type->name();
+                s2 = type.mid(index + 2);
+                s1 = ((index = s1.find('<')) != -1) ? s1.left(index) : s1;
+            };
+            if (hasDoubleColon() && typeFound() && (readTypes(),  ((s1 == s2) || (s2 == (WrapperStr("~") + s1)))))
+            {
                 name = type;
                 type = 0;
             }
@@ -1466,12 +1557,12 @@ void UmlOperation::reverse_definition(Package * pack, WrapperStr name,
         }
     }
 
-    Q3PtrList<UmlOperation> candidates;
+    QList<UmlOperation *> candidates;
     const FormalParameterList * oper_tmplt;
 
     if ((tcl.type != 0) ||	// set in case of a contructor/destructor
-        (((index = name.operator QString().lastIndexOf("::")) > 0) &&
-         pack->find_type(normalized = Lex::normalize(name.left(index)), tcl))) {
+            (((index = name.operator QString().lastIndexOf("::")) > 0) &&
+             pack->find_type(normalized = Lex::normalize(name.left(index)), tcl))) {
         if (! operations(candidates, tcl.type, tmplts, oper_tmplt, name))
             // a variable, already managed inside operations
             return;
@@ -1485,28 +1576,28 @@ void UmlOperation::reverse_definition(Package * pack, WrapperStr name,
     QLOG_INFO() << candidates.count() << " compatible operations for " << name << '\n';
 #endif
 
-    if (candidates.isEmpty()) {
+    if (candidates.isEmpty())
+    {
         Lex::warn("<font color =\"red\"> " + Lex::quote(name) + "</font> is lost");
         UmlOperation::skip_body();
         return;
     }
 
-    Q3PtrListIterator<UmlOperation> it(candidates);
     LexContext context = Lex::get_context();
     BooL on_error = FALSE;
     unsigned nargs = ~0u;
     UmlClass * cl = 0;
 
-    do {
-        if ((nargs == ~0u) || (it.current()->params().count() == nargs)) {
-            if (cl != it.current()->parent()) {
-                cl = (UmlClass *) it.current()->parent();
+    foreach (UmlOperation *op, candidates) {
+        if ((nargs == ~0u) || (op->params().count() == (int)nargs)) {
+            if (cl != op->parent()) {
+                cl = (UmlClass *) op->parent();
                 cl->set_under_construction(TRUE, TRUE);
             }
 
-            if (it.current()->reverse_if_def(pack, tmplts, oper_tmplt, inlinep,
-                                             pfct, comment, description,
-                                             on_error, nargs, name)) {
+            if (op->reverse_if_def(pack, tmplts, oper_tmplt, inlinep,
+                                   pfct, comment, description,
+                                   on_error, nargs, name)) {
                 cl->set_under_construction(FALSE, TRUE);
                 return;
             }
@@ -1514,9 +1605,9 @@ void UmlOperation::reverse_definition(Package * pack, WrapperStr name,
             Lex::set_context(context);
         }
 
-        ++it;
+        if (on_error)
+            break;
     }
-    while (!on_error && (it.current() != 0));
 
     cl->set_under_construction(FALSE, TRUE);
 
@@ -1527,7 +1618,7 @@ void UmlOperation::reverse_definition(Package * pack, WrapperStr name,
 }
 
 bool UmlOperation::reverse_if_def(Package * pack,
-                                  Q3ValueList<FormalParameterList> & tmplts,
+                                  QList<FormalParameterList> & tmplts,
                                   const FormalParameterList * oper_tmplt,
                                   bool inlinep, bool pfct, const WrapperStr & comment,
                                   const WrapperStr & description, BooL & on_error,
@@ -1536,17 +1627,14 @@ bool UmlOperation::reverse_if_def(Package * pack,
     // parameters
 
     UmlParameter param;
-    Q3ValueList<UmlParameter> params = this->params();
-    Q3PtrList<WrapperStr> param_names;
+    QList<UmlParameter> params = this->params();
     WrapperStr decl = "${(}${)}";
     unsigned rank = 0;
 
-    param_names.setAutoDelete(TRUE);
-
     while (read_param(pack /*yes !*/, rank, param, decl, tmplts, on_error, FALSE)) {
-        if ((params.count() <= rank) ||
-            (params[rank].dir != param.dir) ||
-            (params[rank].type.toString() != param.type.toString()))
+        if ((params.count() <= (int)rank) ||
+                (params[rank].dir != param.dir) ||
+                (params[rank].type.toString() != param.type.toString()))
             // uncompatible
             return FALSE;
 
@@ -1566,7 +1654,7 @@ bool UmlOperation::reverse_if_def(Package * pack,
 
     if (pfct) {
         if (((s = Lex::read_word()) != ")") ||
-            ((s = Lex::read_word()) != "(")) {
+                ((s = Lex::read_word()) != "(")) {
             Lex::error_near(s);
             on_error = TRUE;
             return FALSE;
@@ -1621,7 +1709,7 @@ bool UmlOperation::reverse_if_def(Package * pack,
 
     // throw
 
-    const Q3ValueList<UmlTypeSpec> exc = exceptions();
+    const QList<UmlTypeSpec> exc = exceptions();
 
     if (s == "throw") {
         if (Lex::read_word_bis(TRUE, FALSE) != '(') {
@@ -1635,14 +1723,14 @@ bool UmlOperation::reverse_if_def(Package * pack,
         rank = 0;
 
         while (read_throw_elt(pack, tcl, tmplts)) {
-            if ((exc.count() <= rank) || (exc[rank].toString() != tcl.toString()))
+            if ((exc.count() <= (int)rank) || (exc[rank].toString() != tcl.toString()))
                 // uncompatible
                 return FALSE;
 
             rank += 1;
         }
 
-        if (exc.count() != rank)
+        if (exc.count() != (int)rank)
             // uncompatible
             return FALSE;
 
@@ -1665,7 +1753,7 @@ bool UmlOperation::reverse_if_def(Package * pack,
     int end = def.find("${)}");
 
     if (def.mid(start, end - start + 4).simplifyWhiteSpace() ==
-        decl.simplifyWhiteSpace()) {
+            decl.simplifyWhiteSpace()) {
         // operation find !
         if (formals == 0) {
             if (oper_tmplt != 0) {
@@ -1703,9 +1791,9 @@ bool UmlOperation::reverse_if_def(Package * pack,
         else {
 #ifdef ROUNDTRIP
 
-            while (params.count() != nargs) {
+            while (params.count() != (int)nargs) {
 #if QT_VERSION == 230
-                Q3ValueList<UmlParameter>::Iterator it = params.end();
+                QList<UmlParameter>::Iterator it = params.end();
 
                 --it;
                 params.remove(it);
@@ -1715,7 +1803,7 @@ bool UmlOperation::reverse_if_def(Package * pack,
             }
 
             if (cl->reversed() &&
-                ((op = already_exist(cl, this->name(), params, TRUE)) != 0)) {
+                    ((op = already_exist(cl, this->name(), params, TRUE)) != 0)) {
                 // update already existing operation
                 roundtrip = TRUE;
                 op->set_usefull();
@@ -1741,15 +1829,15 @@ bool UmlOperation::reverse_if_def(Package * pack,
                 op->set_ReturnType(returnType());
 
                 // parameters
-                Q3ValueList<UmlParameter>::ConstIterator itp;
+                QList<UmlParameter>::ConstIterator itp;
                 unsigned rk;
 
                 for (itp = params.begin(), rk = 0; itp != params.end(); ++itp, rk += 1)
                     op->addParameter(rk, *itp);
 
                 // exceptions
-                const Q3ValueList<UmlTypeSpec> exc = exceptions();
-                Q3ValueList<UmlTypeSpec>::ConstIterator ite;
+                const QList<UmlTypeSpec> exc = exceptions();
+                QList<UmlTypeSpec>::ConstIterator ite;
 
                 for (ite = exc.begin(), rk = 0; ite != exc.end(); ite++, rk += 1)
                     op->addException(rk, *ite);
@@ -1765,7 +1853,7 @@ bool UmlOperation::reverse_if_def(Package * pack,
             int index = s.operator QString().lastIndexOf("::");
 
             s = // <...>
-                s.mid(s.find('<', (index == -1) ? 0 : index + 2));
+                    s.mid(s.find('<', (index == -1) ? 0 : index + 2));
 
             if (! def0.isEmpty())
                 def = def0;
@@ -1864,12 +1952,18 @@ bool UmlOperation::reverse_if_def(Package * pack,
                 insert_template(*formals, def, FALSE);
                 def_modified = TRUE;
             }
-
             s = comment;
+            Lex::simplify_comment(s);
+            if(CppSettings::isGenerateJavadocStyleComment())
+            {
+                s = Lex::remove_javadoc_star_signs_from_comment(s);
+            }
+
+
 
             if (!s.isEmpty() &&
-                nequal(op->description(), description) &&
-                nequal(op->description(), Lex::simplify_comment(s))) {
+                    nequal(op->description(), description) &&
+                    nequal(op->description(), s)) {
                 int index;
 
                 if ((index = def.find("${description}")) != -1) {
@@ -2000,11 +2094,11 @@ bool UmlOperation::need_source()
 }
 #endif
 
-void UmlOperation::update_param_names(Q3ValueList<UmlParameter> & params)
+void UmlOperation::update_param_names(QList<UmlParameter> & params)
 {
-    Q3ValueList<UmlParameter>::Iterator itdef;
-    const Q3ValueList<UmlParameter> decl_params = this->params();
-    Q3ValueList<UmlParameter>::ConstIterator itdecl;
+    QList<UmlParameter>::Iterator itdef;
+    const QList<UmlParameter> decl_params = this->params();
+    QList<UmlParameter>::ConstIterator itdecl;
     unsigned rank;
 
     for (rank = 0, itdef = params.begin(), itdecl = decl_params.begin();
@@ -2023,11 +2117,11 @@ void UmlOperation::update_param_names(Q3ValueList<UmlParameter> & params)
 
 #ifdef ROUNDTRIP
 void UmlOperation::update_params(Class * cl,
-                                 Q3ValueList<UmlParameter> & params)
+                                 QList<UmlParameter> & params)
 {
-    Q3ValueList<UmlParameter>::Iterator itp1;
-    const Q3ValueList<UmlParameter> old_params = this->params();
-    Q3ValueList<UmlParameter>::ConstIterator itp2;
+    QList<UmlParameter>::Iterator itp1;
+    const QList<UmlParameter> old_params = this->params();
+    QList<UmlParameter>::ConstIterator itp2;
     unsigned rank;
 
     for (rank = 0, itp1 = params.begin(), itp2 = old_params.begin();
@@ -2037,8 +2131,8 @@ void UmlOperation::update_params(Class * cl,
         const UmlParameter & p2 = *itp2;
 
         if (((p1.name.isEmpty()) ? !p2.name.isEmpty() : (p1.name != p2.name)) ||
-            nequal(p1.default_value, p2.default_value) ||
-            !p1.type.equal(p2.type)) {
+                nequal(p1.default_value, p2.default_value) ||
+                !p1.type.equal(p2.type)) {
             if (p1.name.isEmpty())
                 p1.name = p2.name;
 
@@ -2078,11 +2172,11 @@ void UmlOperation::update_params(Class * cl,
 }
 
 void UmlOperation::update_exceptions(Class * cl,
-                                     const Q3ValueList<UmlTypeSpec> & exceptions)
+                                     const QList<UmlTypeSpec> & exceptions)
 {
-    Q3ValueList<UmlTypeSpec>::ConstIterator ite1;
-    const Q3ValueList<UmlTypeSpec> old_exceptions = this->exceptions();
-    Q3ValueList<UmlTypeSpec>::ConstIterator ite2;
+    QList<UmlTypeSpec>::ConstIterator ite1;
+    const QList<UmlTypeSpec> old_exceptions = this->exceptions();
+    QList<UmlTypeSpec>::ConstIterator ite2;
     unsigned rank;
 
     for (rank = 0, ite1 = exceptions.begin(), ite2 = old_exceptions.begin();
@@ -2121,15 +2215,25 @@ void UmlOperation::update_exceptions(Class * cl,
 
 void UmlOperation::clean_body(WrapperStr & body)
 {
-    const char * BodyPrefix = "// Bouml preserved body begin ";
-    const char * BodyPostfix = "// Bouml preserved body end ";
+    //    const char * BodyPrefix = "// Bouml preserved body begin ";
+    //    const char * BodyPostfix = "// Bouml preserved body end ";
+
+    static const char * BodyPrefix = "// Bouml preserved body begin ";
+    static const char * BodyPrefix2 = "// Douml preserved body begin ";
+    static const char * BodyPostfix = "// Bouml preserved body end ";
+    static const char * BodyPostfix2 = "// Douml preserved body end ";
+
     const int BodyPrefixLength = 30;
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    int compat = settings.value("Main/compatibility_save").toInt();
 
-    int index = body.find(BodyPrefix);
+    const char* actualPrefix = compat ? BodyPrefix : BodyPrefix2;
+    int index = body.find(actualPrefix);
 
     if (index != -1) {
         const char * b =
-            strchr(((const char *) body) + index + BodyPrefixLength, '\n');
+                strchr(((const char *) body) + index + BodyPrefixLength, '\n');
 
         if (b == 0) {
             // invalid
@@ -2137,7 +2241,7 @@ void UmlOperation::clean_body(WrapperStr & body)
             return;
         }
 
-        const char * e = strstr(b, BodyPostfix);
+        const char * e = strstr(b, compat ? BodyPostfix : BodyPostfix2);
 
         if (e != 0) {
             while ((e != b) && (e[-1] != '\n'))
@@ -2149,20 +2253,20 @@ void UmlOperation::clean_body(WrapperStr & body)
 }
 
 UmlOperation * UmlOperation::already_exist(Class * container,
-        const WrapperStr & name,
-        Q3ValueList<UmlParameter> & params,
-        bool empty_decl)
+                                           const WrapperStr & name,
+                                           QList<UmlParameter> & params,
+                                           bool empty_decl)
 {
-    const Q3PtrVector<UmlItem> & ch = container->get_uml()->UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
-    Q3PtrList<UmlOperation> opers;
+    const QVector<UmlItem*> & ch = container->get_uml()->UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
+    QList<UmlOperation *> opers;
 
     for (; v != vsup; v += 1)
         if (((*v)->kind() == anOperation) &&
-            ((*v)->name() == name) &&
-            ((UmlOperation *) *v)->is_useless() &&
-            (((UmlOperation *) *v)->cppDecl().isEmpty() == empty_decl))
+                ((*v)->name() == name) &&
+                ((UmlOperation *) *v)->is_useless() &&
+                (((UmlOperation *) *v)->cppDecl().isEmpty() == empty_decl))
             opers.append((UmlOperation *) *v);
 
     switch (opers.count()) {
@@ -2172,20 +2276,19 @@ UmlOperation * UmlOperation::already_exist(Class * container,
     case 1:
         // suppose it is this one
         // even don't know if it is placed later in file
-        return opers.getFirst();
+        return opers.first();
 
     default:
         break;
     }
 
-    UmlOperation * op;
-    Q3PtrList<UmlOperation> same_names;
+    QList<UmlOperation *> same_names;
 
     // search for operation having the same params name and number
-    for (op = opers.first(); op != 0; op = opers.next()) {
-        Q3ValueList<UmlParameter> ps = op->params();
-        Q3ValueList<UmlParameter>::ConstIterator it1;
-        Q3ValueList<UmlParameter>::ConstIterator it2;
+    foreach (UmlOperation *op, opers) {
+        QList<UmlParameter> ps = op->params();
+        QList<UmlParameter>::ConstIterator it1;
+        QList<UmlParameter>::ConstIterator it2;
         bool same_type = TRUE;
         bool same_name = TRUE;
 
@@ -2219,7 +2322,7 @@ UmlOperation * UmlOperation::already_exist(Class * container,
         // only one having the same number of param
         // and same param names (type changed)
         // suppose this one
-        return same_names.getFirst();
+        return same_names.first();
     }
 
     // suppose not find
@@ -2228,18 +2331,29 @@ UmlOperation * UmlOperation::already_exist(Class * container,
 
 void UmlOperation::force_defs()
 {
-    Q3PtrDictIterator<WrapperStr> it(DefNotYetSet);
+    QHashIterator<UmlOperation *,WrapperStr*> it(DefNotYetSet);
+
 
-    for (; it.current(); ++it) {
-        UmlOperation * op = (UmlOperation *) it.currentKey();
+    while(it.hasNext())
+    {
+        it.next();
+        if(it.value())
+        {
+            UmlOperation * op = (UmlOperation *) it.key();
 
-        if (neq(*(it.current()), op->cppDef())) {
-            op->set_CppDef(*(it.current()));
-            ((UmlClass *) op->parent())->get_class()->set_updated();
+            if (neq(*(it.value()), op->cppDef())) {
+                op->set_CppDef(*(it.value()));
+                ((UmlClass *) op->parent())->get_class()->set_updated();
+            }
         }
     }
 
-    DefNotYetSet.setAutoDelete(TRUE);
+    //DefNotYetSet.setAutoDelete(TRUE);
+    it.toFront();
+    while(it.hasNext())
+    {
+        delete it.next().value();
+    }
     DefNotYetSet.clear();
 }
 
diff --git a/src/CppReverse/UmlOperation.h b/src/CppReverse/UmlOperation.h
index 61aa23cf0..6e6f617f7 100644
--- a/src/CppReverse/UmlOperation.h
+++ b/src/CppReverse/UmlOperation.h
@@ -31,10 +31,8 @@
 #include "UmlBaseOperation.h"
 #include "UmlClass.h"
 #include "Namespace.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
-#include <Q3PtrList>
+#include <QList>
 
 class ClassContainer;
 class Package;
@@ -47,7 +45,7 @@ class UmlOperation : public UmlBaseOperation
     virtual ~UmlOperation();
 
     static bool new_one(Class * cl, const WrapperStr & name,
-                        const Q3ValueList<FormalParameterList> & tmplt,
+                        const QList<FormalParameterList> & tmplt,
                         WrapperStr type, const WrapperStr & modifier,
                         const WrapperStr & pretype, aVisibility visibility,
                         bool inlinep, bool virtualp, bool staticp, bool constp,
@@ -55,11 +53,11 @@ class UmlOperation : public UmlBaseOperation
                         bool friendp, WrapperStr friend_template,
                         WrapperStr comment, WrapperStr description, bool pfunc
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        );
     static void reverse_definition(Package * pack, WrapperStr name, WrapperStr type,
-                                   Q3ValueList<FormalParameterList> & tmplt,
+                                   QList<FormalParameterList> & tmplt,
                                    bool inlinep, const WrapperStr & comment,
                                    const WrapperStr & description);
 
@@ -76,41 +74,41 @@ class UmlOperation : public UmlBaseOperation
                       const char * namespec);
 private:
 #ifdef ROUNDTRIP
-    static Q3PtrDict<WrapperStr> DefNotYetSet;
+    static QHash<UmlOperation *,WrapperStr*> DefNotYetSet;
 #endif
-    static NDict< Q3PtrList<UmlOperation> > friends;
+    static NDict< QList<UmlOperation *> > friends;
     FormalParameterList * formals;
     WrapperStr def0;	// for template operations
 
     static bool read_param(ClassContainer * container, unsigned rank,
                            UmlParameter & param, WrapperStr & decl,
-                           const Q3ValueList<FormalParameterList> & tmplt,
+                           const QList<FormalParameterList> & tmplt,
                            BooL & on_error, bool add_defaultvalue);
-    static void friend_operations(Q3PtrList<UmlOperation> & candidates,
-                                  const Q3ValueList<FormalParameterList> & tmplt,
+    static void friend_operations(QList<UmlOperation *> & candidates,
+                                  const QList<FormalParameterList> & tmplt,
                                   const WrapperStr & name);
-    static bool operations(Q3PtrList<UmlOperation> & candidates, UmlClass * cl,
-                           const Q3ValueList<FormalParameterList> & tmplt,
+    static bool operations(QList<UmlOperation *> & candidates, UmlClass * cl,
+                           const QList<FormalParameterList> & tmplt,
                            const FormalParameterList *& oper_tmplt,
                            const WrapperStr & name);
     static bool read_throw_elt(ClassContainer * container,
                                UmlTypeSpec & typespec,
-                               const Q3ValueList<FormalParameterList> & tmplts);
+                               const QList<FormalParameterList> & tmplts);
     bool reverse_if_def(Package * pack,
-                        Q3ValueList<FormalParameterList> & tmplts,
+                        QList<FormalParameterList> & tmplts,
                         const FormalParameterList * oper_tmplt,
                         bool inlinep, bool pfct, const WrapperStr & comment,
                         const WrapperStr & description, BooL & on_error,
                         unsigned & nargs, WrapperStr oper_name);
 
-    void update_param_names(Q3ValueList<UmlParameter> & params);
+    void update_param_names(QList<UmlParameter> & params);
 #ifdef ROUNDTRIP
-    void update_params(Class * cl, Q3ValueList<UmlParameter> & params);
-    void update_exceptions(Class * cl, const Q3ValueList<UmlTypeSpec> & exceptions);
+    void update_params(Class * cl, QList<UmlParameter> & params);
+    void update_exceptions(Class * cl, const QList<UmlTypeSpec> & exceptions);
 
     static void clean_body(WrapperStr & body);
     static UmlOperation * already_exist(Class * container, const WrapperStr & name,
-                                        Q3ValueList<UmlParameter> & params,
+                                        QList<UmlParameter> & params,
                                         bool empty_decl);
 #endif
 };
diff --git a/src/CppReverse/UmlPackage.cpp b/src/CppReverse/UmlPackage.cpp
index d5902d6fd..6fd03a0dc 100644
--- a/src/CppReverse/UmlPackage.cpp
+++ b/src/CppReverse/UmlPackage.cpp
@@ -41,7 +41,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 UmlPackage::UmlPackage(void * id, const WrapperStr & n)
     : UmlBasePackage(id, n)
@@ -110,9 +110,9 @@ UmlClassView * UmlPackage::get_classview(const WrapperStr & nmsp)
         pack = this;
 
     if (pack->class_view == 0) {
-        Q3PtrVector<UmlItem> ch = pack->children();
+        QVector<UmlItem*> ch = pack->children();
 
-        for (unsigned index = 0; index != ch.size(); index += 1)
+        for (int index = 0; index != ch.size(); index += 1)
 
             // return the first class view find
             if (ch[index]->kind() == aClassView)
@@ -250,9 +250,9 @@ UmlDeploymentView * UmlPackage::get_deploymentview(const WrapperStr & nmsp)
         pack = this;
 
     if (pack->deployment_view == 0) {
-        Q3PtrVector<UmlItem> ch = pack->children();
+        QVector<UmlItem*> ch = pack->children();
 
-        for (unsigned index = 0; index != ch.size(); index += 1)
+        for (int index = 0; index != ch.size(); index += 1)
 
             // return the first class view find
             if (ch[index]->kind() == aDeploymentView)
@@ -285,9 +285,9 @@ void UmlPackage::init(Package * p)
 {
     package = p;
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         (*v)->upload(package);
@@ -297,9 +297,9 @@ void UmlPackage::upload(ClassContainer * cnt)
 {
     package = new Package((Package *) cnt, this);
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         (*v)->upload(package);
@@ -309,9 +309,9 @@ int UmlPackage::count_roundtriped()
 {
     int result = 1;
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         if ((*v)->kind() == aPackage)
@@ -330,9 +330,9 @@ bool UmlPackage::set_roundtrip_expected()
 
     Progress::tic_it();
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
     bool result = isWritable();
 
     for (; v != vsup; v += 1)
@@ -341,9 +341,9 @@ bool UmlPackage::set_roundtrip_expected()
     return result;
 }
 
-void UmlPackage::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlPackage::mark_useless(QList<UmlItem *> & l)
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
     UmlClassItem ** v = (UmlClassItem **) ch.data();
     UmlClassItem ** const vsup = v + ch.size();
 
diff --git a/src/CppReverse/UmlPackage.h b/src/CppReverse/UmlPackage.h
index cd3da1216..37a6ddabb 100644
--- a/src/CppReverse/UmlPackage.h
+++ b/src/CppReverse/UmlPackage.h
@@ -31,7 +31,6 @@
 #include "UmlBasePackage.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 class UmlClassView;
 #ifdef REVERSE
@@ -55,7 +54,7 @@ class UmlPackage : public UmlBasePackage
     void init(Package *);
     virtual void upload(ClassContainer *);
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
     Package * get_package() const {
diff --git a/src/CppReverse/UmlRelation.cpp b/src/CppReverse/UmlRelation.cpp
index ddb55b4a3..826d83f0f 100644
--- a/src/CppReverse/UmlRelation.cpp
+++ b/src/CppReverse/UmlRelation.cpp
@@ -30,7 +30,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 #include "Logging/QsLog.h"
 
 using namespace std;
@@ -97,7 +97,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
                           const WrapperStr & value, WrapperStr comment,
                           WrapperStr description
 #ifdef ROUNDTRIP
-                          , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                          , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                          )
 {
@@ -161,6 +161,11 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
         Lex::finish_line();
 
         comment = Lex::get_comments(comment);
+        Lex::simplify_comment(comment);
+        if(CppSettings::isGenerateJavadocStyleComment())
+        {
+            comment = Lex::remove_javadoc_star_signs_from_comment(comment);
+        }
         description = Lex::get_description(description);
 
 #ifdef ROUNDTRIP
@@ -309,7 +314,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
                     container->set_updated();
                 }
             }
-            else if (nequal(rel->description(), Lex::simplify_comment(comment))) {
+            else if (nequal(rel->description(), comment)) {
                 rel->set_Description(comment); // comment was set
                 container->set_updated();
             }
@@ -324,7 +329,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
 
         if (!comment.isEmpty())
             rel->set_Description((decl.find("${description") != -1)
-                                 ? description : Lex::simplify_comment(comment));
+                                 ? description : comment);
 
         return rel->set_RoleName(name);
     }
@@ -356,7 +361,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
 #ifdef ROUNDTRIP
 
     bool UmlRelation::new_friend(Class * container, UmlClass * to,
-                                 Q3PtrList<UmlItem> & expected_order)
+                                 QList<UmlItem *> & expected_order)
     {
         UmlClass * from = container->get_uml();
 
@@ -364,9 +369,9 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
         QLOG_INFO() << "FRIEND from '" << from->name() << "' to '" << to->name() << "'\n";
 #endif
 
-        const Q3PtrVector<UmlItem> & ch = from->children();
-        UmlItem ** v = ch.data();
-        UmlItem ** const vsup = v + ch.size();
+        const QVector<UmlItem*> & ch = from->children();
+        UmlItem *const* v = ch.data();
+        UmlItem *const*  vsup = v + ch.size();
 
         for (; v != vsup; v += 1) {
             if (((*v)->kind() == aRelation) &&
@@ -422,7 +427,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
         UmlRelation * r2 = (r1 != this) ? this : side(FALSE);
 
         if (r1->isReadOnly() || r2->isReadOnly()) {
-            UmlCom::trace(WrapperStr("<font face=helvetica>in <i>") + WrapperStr(Lex::filename().toAscii().constData())
+            UmlCom::trace(WrapperStr("<font face=helvetica>in <i>") + WrapperStr(Lex::filename().toLatin1().constData())
                           + "</i> line " + WrapperStr().setNum(Lex::line_number())
                           + " <b>cannot remove relation between classes <i>"
                           + roleType()->name() + "</i> and <i>" + parent()->name()
diff --git a/src/CppReverse/UmlRelation.h b/src/CppReverse/UmlRelation.h
index 265a4311d..d53c0e551 100644
--- a/src/CppReverse/UmlRelation.h
+++ b/src/CppReverse/UmlRelation.h
@@ -29,9 +29,7 @@
 #define UMLRELATION_H
 
 #include "UmlBaseRelation.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 class Class;
 
@@ -50,7 +48,7 @@ class UmlRelation : public UmlBaseRelation
                         const WrapperStr & value,	WrapperStr comment,
                         WrapperStr description
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        );
     static bool new_friend(UmlClass * from, UmlClass * to);
@@ -58,7 +56,7 @@ class UmlRelation : public UmlBaseRelation
 #ifdef ROUNDTRIP
     void set_unidir();
     static bool new_friend(Class * from, UmlClass * to,
-                           Q3PtrList<UmlItem> & expected_order);
+                           QList<UmlItem *> & expected_order);
 #endif
 };
 
diff --git a/src/CppReverse/main.cpp b/src/CppReverse/main.cpp
index 1aeaa47f1..aca1aba41 100644
--- a/src/CppReverse/main.cpp
+++ b/src/CppReverse/main.cpp
@@ -24,7 +24,7 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-#include <qapplication.h>
+#include <qcoreapplication.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
 
@@ -42,11 +42,12 @@
 
 int main(int argc, char ** argv)
 {
+#ifndef _RUN_PLUGOUT_EXTERNAL_
     if (argc != 2)
         return 0;
-
-    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+#endif
+    //QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+    //QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #ifdef DEBUG
     QsLogging::Logger & logger = QsLogging::Logger::instance();
     logger.setLoggingLevel(QsLogging::TraceLevel);
@@ -61,7 +62,11 @@ int main(int argc, char ** argv)
     QLOG_INFO() << "Starting the log";
 #endif
     //QTest::qSleep(7000);
+#ifndef _RUN_PLUGOUT_EXTERNAL_
     if (UmlCom::connect(WrapperStr(argv[1]).operator QString().toUInt())) {
+#else
+    if (UmlCom::connect(5000)) {
+#endif
         try {
             //UmlCom::with_ack(FALSE);
             UmlCom::trace("<b>C++ reverse</b> release 2.15<br>");
diff --git a/src/CppRoundtrip/cpproundtrip.pro b/src/CppRoundtrip/CppRoundtrip.pro
similarity index 90%
rename from src/CppRoundtrip/cpproundtrip.pro
rename to src/CppRoundtrip/CppRoundtrip.pro
index 9ce979f0c..cb6913670 100644
--- a/src/CppRoundtrip/cpproundtrip.pro
+++ b/src/CppRoundtrip/CppRoundtrip.pro
@@ -1,5 +1,8 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES          = main.cpp Statistic.cpp \
         ../CppReverse/UmlClassItem.cpp \
         ../CppReverse/UmlAttribute.cpp \
@@ -150,27 +153,25 @@ SOURCES          = main.cpp Statistic.cpp \
 
 
 TARGET          = cpp_roundtrip
-DEFINES          = WITHCPP REVERSE ROUNDTRIP BooL=bool
-INCLUDEPATH   = ../Tools ../CppRoundtrip ../CppReverse
+DEFINES          += WITHCPP REVERSE ROUNDTRIP BooL=bool FALSE=false TRUE=true
+INCLUDEPATH   += ../Tools ../CppRoundtrip ../CppReverse
+#DEFINES += _RUN_PLUGOUT_EXTERNAL_
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+#qt3support
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/roundtrip/MOC_release
-    OBJECTS_DIR = bin/douml/roundtrip/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/cpp_roundtrip
+    OBJECTS_DIR = $${DESTDIR}/obj_release/cpp_roundtrip
 }
-
-Debug{
-    MOC_DIR = bin/douml/roundtrip/MOC_Debug
-    OBJECTS_DIR = bin/douml/roundtrip/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/cpp_roundtrip
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/cpp_roundtrip
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/src/CppRoundtrip/main.cpp b/src/CppRoundtrip/main.cpp
index f01467ec4..7c32e3d30 100644
--- a/src/CppRoundtrip/main.cpp
+++ b/src/CppRoundtrip/main.cpp
@@ -29,7 +29,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 #include "UmlCom.h"
 #include "UmlItem.h"
@@ -43,10 +43,13 @@
 
 int main(int argc, char ** argv)
 {
+#ifndef _RUN_PLUGOUT_EXTERNAL_
     if (argc != 2)
         return 0;
-
     if (UmlCom::connect(WrapperStr(argv[1]).operator QString().toUInt())) {
+#else
+    if (UmlCom::connect(5000)){
+#endif
         bool aborted = TRUE;
 
         try {
@@ -131,15 +134,15 @@ int main(int argc, char ** argv)
 
             // umark all
             {
-                Q3PtrVector<UmlItem> marked = UmlItem::markedItems();
-                UmlItem ** v = marked.data();
-                UmlItem ** const vsup = v + marked.size();
-
-                for (; v != vsup; v += 1)
-                    (*v)->set_isMarked(FALSE);
+                QVector<UmlItem*> marked = UmlItem::markedItems();
+                QVectorIterator<UmlItem*> it(marked);
+                while(it.hasNext())
+                {
+                    it.next()->set_isMarked(FALSE);
+                }
             }
 
-            Q3PtrList<UmlItem> useless;
+            QList<UmlItem *> useless;
 
             item->mark_useless(useless);
 
@@ -150,13 +153,10 @@ int main(int argc, char ** argv)
                                       "Delete them ?",
                                       "Yes", "No", QString(), 1, 1)
                  == 0)) {
-                Q3PtrListIterator<UmlItem> iter(useless);
-
-                do {
-                    if (iter.current()->isMarked())
-                        iter.current()->deleteIt();
+                foreach (UmlItem *item, useless) {
+                    if (item->isMarked())
+                        item->deleteIt();
                 }
-                while (++iter, iter.current() != 0);
             }
 
             project->set_childrenVisible(TRUE);
diff --git a/src/CustomWidgets/EdgeMenuToolBar.cpp b/src/CustomWidgets/EdgeMenuToolBar.cpp
index 37e048b72..386d22ebc 100644
--- a/src/CustomWidgets/EdgeMenuToolBar.cpp
+++ b/src/CustomWidgets/EdgeMenuToolBar.cpp
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -36,8 +36,10 @@ EdgeMenuToolBar::EdgeMenuToolBar(QWidget * _parent) : QToolBar(_parent)
     connect(this, SIGNAL(putIntoClipboard(QString)), clipboard.getData(), SLOT(OnPutItemIntoClipboard(QString)));
 }
 
+
 EdgeMenuToolBar::~EdgeMenuToolBar()
 {
+    printf("toolbar deleted\r\n");
 }
 
 void EdgeMenuToolBar::SetRelativeOrientation(int value)
@@ -108,8 +110,7 @@ void EdgeMenuToolBar::FillClipboardMenu(int base)
         if (text.length() < 15)
             itemText = text;
         else {
-            text.left(15);
-            itemText = text  + "...";
+            itemText = text.left(15) + "...";
         }
 
         QAction * action = new QAction(itemText, clipboardMenu);
diff --git a/src/CustomWidgets/EdgeMenuToolBar.h b/src/CustomWidgets/EdgeMenuToolBar.h
index 4e5eca51e..aa32b6228 100644
--- a/src/CustomWidgets/EdgeMenuToolBar.h
+++ b/src/CustomWidgets/EdgeMenuToolBar.h
@@ -21,13 +21,17 @@
 // e-mail : doumleditor@gmail.com
 //
 // *************************************************************************
+
 #ifndef EDGEMENUTOOLBAR_H
 #define EDGEMENUTOOLBAR_H
+
 #include <QToolBar>
 #include <QTimer>
 #include <QMenu>
 #include "CustomWidgets/MultiPurposeDragArea.h"
+
 class EdgeMenuDialog;
+
 class EdgeMenuToolBar : public QToolBar
 {
     Q_OBJECT
@@ -39,10 +43,10 @@ class EdgeMenuToolBar : public QToolBar
     void SetDialog(EdgeMenuDialog *);
 protected:
     //! called on window show()
-    void leaveEvent(QEvent * event);
-    void enterEvent(QEvent * event);
+    virtual void leaveEvent(QEvent * event) override;
+    virtual void enterEvent(QEvent * event) override;
 
-    void focusOutEvent(QFocusEvent *) override;
+    virtual void focusOutEvent(QFocusEvent *) override;
 private:
 
     void IntitiateMove(QPoint);
diff --git a/src/CustomWidgets/GenericDelegate.cpp b/src/CustomWidgets/GenericDelegate.cpp
new file mode 100644
index 000000000..c4f7e8ed1
--- /dev/null
+++ b/src/CustomWidgets/GenericDelegate.cpp
@@ -0,0 +1,67 @@
+#include "GenericDelegate.h"
+#include <QApplication>
+#include <QVariant>
+//static QRect CheckBoxRect(const QStyleOptionViewItem &view_item_style_options) {
+//  QStyleOptionButton check_box_style_option;
+//  QRect check_box_rect = QApplication::style()->subElementRect(
+//      QStyle::SE_CheckBoxIndicator,
+//      &check_box_style_option);
+//  QPoint check_box_point(view_item_style_options.rect.x() +
+//                         view_item_style_options.rect.width() / 2 -
+//                         check_box_rect.width() / 2,
+//                         view_item_style_options.rect.y() +
+//                         view_item_style_options.rect.height() / 2 -
+//                         check_box_rect.height() / 2);
+//  return QRect(check_box_point, check_box_rect.size());
+//}
+
+GenericDelegate::GenericDelegate(QObject *parent, bool _hideText)
+    : QStyledItemDelegate(parent), hideText(_hideText)
+{
+}
+QWidget * GenericDelegate::createEditor(QWidget *parent,
+    const QStyleOptionViewItem &/* option */,
+    const QModelIndex &/* index */) const
+{
+    return widgetCreator(parent);
+}
+
+void GenericDelegate::setEditorData(QWidget *editor,
+                                    const QModelIndex &index) const
+{
+    if(dataAccessor)
+        dataAccessor(editor, index);
+}
+void GenericDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
+                                   const QModelIndex &index) const
+{
+    if(dataSetter)
+        dataSetter(editor, model, index);
+}
+
+QString GenericDelegate::displayText(const QVariant &value, const QLocale &locale) const
+{
+    if(hideText)
+        return QString();
+    else
+        return QStyledItemDelegate::displayText(value, locale);
+}
+
+
+void GenericDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    if(!index.isValid())
+        return;
+    if(paintProcessor)
+        paintProcessor(this, painter, option, index);
+    else
+        QStyledItemDelegate::paint(painter, option, index);
+}
+
+bool GenericDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index)
+{
+    if(editorEventProcessor)
+        return editorEventProcessor(event, model, option, index);
+    else
+        return QStyledItemDelegate::editorEvent(event, model, option, index);
+}
diff --git a/src/CustomWidgets/GenericDelegate.h b/src/CustomWidgets/GenericDelegate.h
new file mode 100644
index 000000000..ee49a4286
--- /dev/null
+++ b/src/CustomWidgets/GenericDelegate.h
@@ -0,0 +1,61 @@
+// *************************************************************************
+//
+//
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef GENERICDELEGATE_H
+#define GENERICDELEGATE_H
+
+#include <QStyledItemDelegate>
+#include <functional>
+
+class GenericDelegate : public QStyledItemDelegate
+{
+public:
+    GenericDelegate(QObject *parent = 0, bool _hideText = false);
+
+    virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
+                                  const QModelIndex &index) const override;
+
+    virtual void setEditorData(QWidget *editor, const QModelIndex &index) const override;
+    virtual void setModelData(QWidget *editor, QAbstractItemModel *model,
+                              const QModelIndex &index) const override;
+    virtual QString displayText(const QVariant &value, const QLocale &locale) const override;
+
+    virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    virtual bool editorEvent(QEvent *event,
+                             QAbstractItemModel *model,
+                             const QStyleOptionViewItem &option,
+                             const QModelIndex &index) override;
+
+    std::function<void(QWidget *, const QModelIndex &) > dataAccessor;
+    std::function<void(QWidget *,QAbstractItemModel*,  const QModelIndex &)> dataSetter;
+    std::function<QWidget *(QWidget *)> widgetCreator;
+    std::function<void (const QStyledItemDelegate* , QPainter *,const QStyleOptionViewItem&,const QModelIndex &)> paintProcessor;
+    std::function<bool(QEvent *event,QAbstractItemModel *model,const QStyleOptionViewItem &option,const QModelIndex &index)> editorEventProcessor;
+    bool hideText = false;
+
+private:
+    //std::function<void(QWidget *,  const QStyleOptionViewItem &, const QModelIndex &)const> geometryUpdater;
+};
+
+#endif // GENERICDELEGATE_H
diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp
new file mode 100644
index 000000000..185471c0a
--- /dev/null
+++ b/src/CustomWidgets/quickedit.cpp
@@ -0,0 +1,1141 @@
+// *************************************************************************
+//
+//
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#include "quickedit.h"
+#include "ui_quickedit.h"
+
+#include "Libs/L_UniversalModels/include/TreeModel.h"
+#include "Libs/L_UniversalModels/include/TreeItemInterface.h"
+#include "Libs/L_UniversalModels/include/treeviewfunctions.h"
+#include "Libs/L_UniversalModels/include/treeviewtemplatefunctions.h"
+#include "Libs/L_UniversalModels/include/TreeItem.h"
+#include "Libs/L_UniversalModels/include/genericeventfilter.h"
+#include "Libs/L_UniversalModels/include/ItemController.h"
+
+#include "browser/BrowserClass.h"
+#include "browser/BrowserOperationAttribute.h"
+#include "browser/BrowserNodeDummy.h"
+#include "browser/BrowserAttribute.h"
+#include "browser/BrowserRelation.h"
+#include "browser/BrowserOperationAttribute.h"
+#include "browserfunctions/operationfuncs.h"
+#include "browser/BrowserExtraMember.h"
+#include "tool/snippets.h"
+#include "GenerationSettings.h"
+#include "AttributeData.h"
+#include "BrowserView.h"
+#include "AType.h"
+#include "UmlEnum.h"
+#include "data/ClassData.h"
+
+#include "data/OperationData.h"
+#include "data/RelationData.h"
+#include "GenericDelegate.h"
+#include <QStyledItemDelegate>
+
+#include <QCompleter>
+#include <QStringListModel>
+#include <QSettings>
+#include <QHeaderView>
+#include <algorithm>
+#include <iostream>
+#include <array>
+#include <functional>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QTextCodec>
+
+namespace TreeFunctions {
+
+
+}
+
+using namespace TreeFunctions;
+
+static QRect CheckBoxRect(const QStyleOptionViewItem &view_item_style_options)
+{
+    QStyleOptionButton check_box_style_option;
+    QRect check_box_rect = QApplication::style()->subElementRect(
+                QStyle::SE_CheckBoxIndicator,
+                &check_box_style_option);
+    QPoint check_box_point(view_item_style_options.rect.x() +
+                           view_item_style_options.rect.width() / 2 -
+                           check_box_rect.width() / 2,
+                           view_item_style_options.rect.y() +
+                           view_item_style_options.rect.height() / 2 -
+                           check_box_rect.height() / 2);
+    return QRect(check_box_point, check_box_rect.size());
+}
+
+static bool editorEvent(QEvent *event,
+                        QAbstractItemModel *model,
+                        const QStyleOptionViewItem &option,
+                        const QModelIndex &index)
+{
+    if ((event->type() == QEvent::MouseButtonRelease) ||
+            (event->type() == QEvent::MouseButtonDblClick)) {
+        QMouseEvent *mouse_event = static_cast<QMouseEvent*>(event);
+        if (mouse_event->button() != Qt::LeftButton ||
+                !CheckBoxRect(option).contains(mouse_event->pos())) {
+            return false;
+        }
+        if (event->type() == QEvent::MouseButtonDblClick) {
+            return true;
+        }
+    } else if (event->type() == QEvent::KeyPress) {
+        if (static_cast<QKeyEvent*>(event)->key() != Qt::Key_Space &&
+                static_cast<QKeyEvent*>(event)->key() != Qt::Key_Select) {
+            return false;
+        }
+    } else {
+        return false;
+    }
+
+    bool checked = index.model()->data(index, Qt::DisplayRole).toBool();
+    model->setData(index, !checked, Qt::DisplayRole);
+    return model->setData(index, !checked, Qt::EditRole);
+}
+
+QuickEdit::QuickEdit(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::QuickEdit)
+{
+    ui->setupUi(this);
+#ifdef __sil__
+    this->setToolTip("QuickEdit");
+#endif
+    this->setWindowTitle(QObject::tr("Quick Edit"));
+    if(!dummyView)
+        dummyView = new BrowserView();
+}
+
+QuickEdit::~QuickEdit()
+{
+    delete ui;
+}
+
+void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, TreeModel* model, QSharedPointer<TreeItemInterface> interface)
+{
+    FilterTreeAndRestoreNodes<TreeItemInterface, TreeItem, BrowserNode>(
+        [](BrowserNode* data) { return QVariant(data->get_name()); },
+        bind(&QuickEdit::CreateCheckList, this),
+        expandedNodes,
+        view,
+        model,
+        interface,
+        false,
+        true);
+}
+
+void QuickEdit::OnContextMenu(QPoint point)
+{
+    QModelIndex current = ui->tvEditor->selectionModel()->currentIndex();
+    if (!current.isValid())
+        return;
+
+    current = current.sibling(current.row(), 0);
+    TreeItemInterface* itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* currentNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+    if (!itemAsInterface)
+        return;
+
+    CreateMenu();
+    SetupMenu(itemAsInterface);
+    if (currentNode->TypeID() != TypeIdentifier<BrowserOperationAttribute>::id())
+    {
+        contextMenu->removeAction(actBefore);
+        contextMenu->removeAction(actAfter);
+    }
+
+    contextMenu->popup(ui->tvEditor->mapToGlobal(point));
+}
+
+void QuickEdit::OnShow()
+{
+    currentNode = static_cast<BrowserNode*>(originalView->currentItem());
+    if (!currentNode)
+        return;
+    Show(currentNode);
+}
+
+void QuickEdit::OnAddParameter()
+{
+    AddParameter();
+}
+
+void QuickEdit::OnAddOperation()
+{
+    AddOperation();
+}
+
+void QuickEdit::OnAddAttribute()
+{
+    AddAttribute();
+}
+
+void QuickEdit::OnPerformFiltering(QString)
+{
+    PerformFiltering(expandedNodes, ui->tvEditor, treeModel, rootInterface);
+
+    // expand all items
+    ExpandAllSatisfying<TreeItemInterface>([](TreeItemInterface*) { return true; },
+                                           ui->tvEditor,
+                                           treeModel,
+                                           QModelIndex());
+}
+
+void QuickEdit::OnDecreaseOpenLevels()
+{
+    int level = MaxOpenLevel(ui->tvEditor, treeModel, QModelIndex());
+    level--;
+    ExpandUpToLevel(ui->tvEditor, treeModel, QModelIndex(), level);
+}
+
+void QuickEdit::OnIncreaseOpenLevels()
+{
+    int level = MaxOpenLevel(ui->tvEditor, treeModel, QModelIndex());
+    level++;
+    ExpandUpToLevel(ui->tvEditor, treeModel, QModelIndex(), level);
+}
+
+void QuickEdit::OnChangeColumnVisibility()
+{
+    CheckColumnVisibility();
+}
+
+void QuickEdit::OnMoveMarkedAfter()
+{
+    MoveMarked(false);
+}
+
+void QuickEdit::OnMoveMarkedBefore()
+{
+    MoveMarked(true);
+}
+
+void QuickEdit::OnRefreshTable()
+{
+    RefreshTable();
+}
+
+void QuickEdit::OnCollapseExpandSelf()
+{
+    QModelIndex index = ui->tvEditor->currentIndex();
+    if (index.isValid())
+        CollapseExpand(index.sibling(index.row(), 0));
+}
+
+void QuickEdit::OnCollapseExpandParent()
+{
+    QModelIndex index = ui->tvEditor->currentIndex();
+    index = index.parent();
+    if (index.isValid())
+        CollapseExpand(index.sibling(index.row(), 0));
+}
+
+void QuickEdit::CreateMenu()
+{
+    if (!contextMenu.isNull())
+        return;
+
+    contextMenu.reset(new QMenu());
+    collapseExpandMenu = new QMenu();
+    collapseExpandMenu->setTitle(tr("Collapse/Expand"));
+    actCollapseExpandSelf = new QAction(tr("Self"), this);
+    actCollapseExpandParent = new QAction(tr("Parent"), this);
+    contextMenu->addSeparator();
+    actBefore = new QAction(tr("Move marked before"), this);
+    actAfter = new QAction(tr("Move marked after"), this);
+
+    connect(actBefore, SIGNAL(triggered()), this, SLOT(OnMoveMarkedBefore()));
+    connect(actAfter, SIGNAL(triggered()), this, SLOT(OnMoveMarkedAfter()));
+    connect(actCollapseExpandSelf, SIGNAL(triggered()), this, SLOT(OnCollapseExpandSelf()));
+    connect(actCollapseExpandParent, SIGNAL(triggered()), this, SLOT(OnCollapseExpandParent()));
+}
+
+void QuickEdit::SetupMenu(TreeItemInterface * interface)
+{
+    contextMenu->clear();
+    collapseExpandMenu->addAction(actCollapseExpandSelf);
+    collapseExpandMenu->addAction(actCollapseExpandParent);
+    contextMenu->addMenu(collapseExpandMenu);
+    contextMenu->addSeparator();
+    contextMenu->addAction(actBefore);
+    contextMenu->addAction(actAfter);
+
+    if (BrowserNode::marked_nodes().count() == 0)
+    {
+        actBefore->setEnabled(false);
+        actAfter->setEnabled(false);
+    }
+    else
+    {
+        actBefore->setEnabled(true);
+        actAfter->setEnabled(true);
+    }
+
+    actCollapseExpandSelf->setEnabled(interface->childCount() != 0);
+}
+
+void QuickEdit::SetupItemCreationFuncs()
+{
+    itemCreators.insert(UmlClass,                         std::bind(&QuickEdit::AssignItemsForClass, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlAttribute,                     std::bind(&QuickEdit::AssignItemsForAttribute, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlOperation,                     std::bind(&QuickEdit::AssignItemsForOperation, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlAggregation,                   std::bind(&QuickEdit::AssignItemsForRelation, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlAggregationByValue,            std::bind(&QuickEdit::AssignItemsForRelation, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlDirectionalAggregation,        std::bind(&QuickEdit::AssignItemsForRelation, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlDirectionalAggregationByValue, std::bind(&QuickEdit::AssignItemsForRelation, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlExtraMember,                   std::bind(&QuickEdit::AssignItemsForExtraNode, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlClassView,                     std::bind(&QuickEdit::AssignItemsForClassView, this, std::placeholders::_1, std::placeholders::_2));
+    itemCreators.insert(UmlPackage,                       std::bind(&QuickEdit::AssignItemsForPackage, this, std::placeholders::_1, std::placeholders::_2));
+}
+
+void QuickEdit::CheckColumnVisibility()
+{
+    const bool hide = !(ui->chkCpp->isChecked());
+
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("pass"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("const"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("volatile"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("friend"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("virtual"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("inline"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("defaulted"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("delete"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("override"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("final"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("default_value"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("prefix"), hide);
+    ui->tvEditor->header()->setSectionHidden(columns.indexOf("postfix"), hide);
+}
+
+void QuickEdit::AddParameter()
+{
+    QModelIndex current = ui->tvEditor->selectionModel()->currentIndex();
+    if (!current.isValid())
+        return;
+
+    current = current.sibling(current.row(), 0);
+    TreeItemInterface* itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* currentNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+
+    BrowserOperation* operationNode;
+
+    if (currentNode->TypeID() == TypeIdentifier<BrowserOperation>::id())
+    {
+        operationNode = static_cast<BrowserOperation*>(currentNode);
+    }
+    else if (currentNode->TypeID() == TypeIdentifier<BrowserOperationAttribute>::id())
+    {
+        operationNode = static_cast<BrowserOperationAttribute*>(currentNode)->get_operation();
+        itemAsInterface = itemAsInterface->parent();
+        current = current.parent();
+    }
+    else
+        return;
+
+    OperationData* currentData = static_cast<OperationData*>(operationNode->get_data());
+    int originalParamCount = currentData->nparams;
+    currentData->set_n_params(originalParamCount + 1);
+    QModelIndex parentIndex = current.parent();
+
+    parentIndex = parentIndex.sibling(parentIndex.row(), 0);
+    TreeItemInterface* parent = static_cast<TreeItemInterface*>(parentIndex.internalPointer());
+    if (!parent)
+        parent = treeModel->RootItem();
+    int insertIndex = parent->GetIndexOfChild(itemAsInterface);
+    auto sharedOfOperation = parent->GetChildren()[insertIndex];
+
+    int newItemPosition = currentData->nparams;
+    if (!treeModel->insertRows(sharedOfOperation->childCount(), 1, current))
+        return;
+
+    QSharedPointer<BrowserNode> param(new BrowserOperationAttribute(dummyView,
+                                                                    static_cast<BrowserOperation*>(operationNode),
+                                                                    currentData->params.last()));
+    localNodeHolder.push_back(param);
+    if (!current.isValid())
+        return;
+    QModelIndex newItem = treeModel->index(sharedOfOperation->childCount() - 1, 0, current);
+    TreeItemInterface *newItemInterface = static_cast<TreeItemInterface*>(newItem.internalPointer());
+    TreeItem<BrowserNode>* newItemAsNode = static_cast<TreeItem<BrowserNode>*>(newItemInterface);
+    newItemAsNode->SetController(operationAttributeController);
+    newItemAsNode->SetParent(sharedOfOperation);
+    newItemAsNode->SetInternalData(param.data());
+    operationNode->modified();
+    OperationFuncs::recompute_param(operationNode, newItemPosition - 1, true);
+}
+
+void QuickEdit::AddOperation()
+{
+    QModelIndex current = ui->tvEditor->selectionModel()->currentIndex();
+    if (!current.isValid())
+        return;
+
+    current = current.sibling(current.row(), 0);
+    TreeItemInterface *itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* currentNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+
+    BrowserClass* classNode;
+
+    int newItemPosition = 0;
+    if (currentNode->TypeID() == TypeIdentifier<BrowserClass>::id())
+    {
+        classNode = static_cast<BrowserClass*>(currentNode);
+        newItemPosition = itemAsInterface->childCount();
+    }
+    else if (currentNode->TypeID() == TypeIdentifier<BrowserOperation>::id() && current.parent().isValid())
+    {
+        itemAsInterface = static_cast<TreeItemInterface*>(current.parent().internalPointer());
+        classNode = static_cast<BrowserClass*>(itemAsInterface->InternalPointer());
+        newItemPosition = current.row()+1;
+        current = current.parent();
+    }
+    else
+        return;
+
+    if (!classNode)
+        return;
+    BrowserOperation* newOperation = static_cast<BrowserOperation*>(classNode->addOperation());
+    //classNode->move(newOperation, currentNode);
+    classNode->select_in_browser();
+    QModelIndex parentIndex;
+    TreeItemInterface* parent;
+    if (treeModel->parent(current).isValid())
+    {
+        parentIndex = treeModel->parent(current);
+        parentIndex = parentIndex.sibling(parentIndex.row(), 0);
+        parent = static_cast<TreeItemInterface*>(parentIndex.internalPointer());
+    }
+    else
+        parent = treeModel->RootItem();
+    int insertIndex = parent->GetIndexOfChild(itemAsInterface);
+    auto sharedOfOperation = parent->GetChildren()[insertIndex];
+
+    if (!treeModel->insertRows(newItemPosition - 1, 1, current))
+        return;
+
+    if (!current.isValid())
+        return;
+
+    QModelIndex newItem = treeModel->index(newItemPosition - 1, 0, current);
+    TreeItemInterface *newItemInterface = static_cast<TreeItemInterface*>(newItem.internalPointer());
+    TreeItem<BrowserNode>* newItemAsNode = static_cast<TreeItem<BrowserNode>*>(newItemInterface);
+    newItemAsNode->SetController(operationController);
+    newItemAsNode->SetParent(sharedOfOperation);
+    newItemAsNode->SetInternalData(newOperation);
+}
+
+void QuickEdit::AddAttribute()
+{
+    QModelIndex current = ui->tvEditor->selectionModel()->currentIndex();
+    if (!current.isValid())
+        return;
+
+    current = current.sibling(current.row(), 0);
+    TreeItemInterface *itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* currentNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+
+    BrowserClass* classNode;
+
+    int newItemPosition = 0;
+    if (currentNode->TypeID() == TypeIdentifier<BrowserClass>::id())
+    {
+        classNode = static_cast<BrowserClass*>(currentNode);
+        if (!classNode)
+            return;
+        newItemPosition = itemAsInterface->childCount();
+    }
+    else if((currentNode->TypeID() * in(TypeIdentifier<BrowserOperation>::id(),
+                                       TypeIdentifier<BrowserAttribute>::id())) &&
+            current.parent().isValid())
+    {
+        itemAsInterface = static_cast<TreeItemInterface*>(current.parent().internalPointer());
+        classNode = static_cast<BrowserClass*>(itemAsInterface->InternalPointer());
+        newItemPosition = current.row() + 1;
+        current = current.parent();
+    }
+    else
+        return;
+
+    //classNode->addOperation()
+    BrowserAttribute* newAttribute;
+    if (QString(classNode->get_stereotype()) == "enum")
+        newAttribute = static_cast<BrowserAttribute*>(classNode->addEnumItem());
+    else
+        newAttribute = static_cast<BrowserAttribute*>(classNode->addAttribute());
+    //classNode->move(newAttribute, currentNode);
+    classNode->select_in_browser();
+    QModelIndex parentIndex;
+    TreeItemInterface* parent;
+    if (treeModel->parent(current).isValid())
+    {
+        parentIndex = treeModel->parent(current);
+        parentIndex = parentIndex.sibling(parentIndex.row(), 0);
+        parent = static_cast<TreeItemInterface*>(parentIndex.internalPointer());
+    }
+    else
+        parent = treeModel->RootItem();
+
+    int insertIndex = parent->GetIndexOfChild(itemAsInterface);
+
+    QSharedPointer<TreeItemInterface> sharedOfNode = parent->GetChildren()[insertIndex];
+
+    if (!treeModel->insertRows(newItemPosition, 1, current))
+        return;
+
+    if (!current.isValid())
+        return;
+
+    QModelIndex newItem = treeModel->index(newItemPosition,0,current);
+    TreeItemInterface *newItemInterface = static_cast<TreeItemInterface*>(newItem.internalPointer());
+    TreeItem<BrowserNode>* newItemAsNode = static_cast<TreeItem<BrowserNode>*>(newItemInterface);
+    newItemAsNode->SetController(attributeController);
+    newItemAsNode->SetParent(sharedOfNode);
+    newItemAsNode->SetInternalData(newAttribute);
+}
+
+void QuickEdit::RefreshTable()
+{
+    if (currentNode)
+        Show(currentNode);
+}
+
+void QuickEdit::CollapseExpand(const QModelIndex &index)
+{
+    ui->tvEditor->setExpanded(index, !ui->tvEditor->isExpanded(index));
+}
+
+BrowserNode *QuickEdit::GetCurrentNode()
+{
+    QModelIndex current = ui->tvEditor->currentIndex();
+    TreeItemInterface* itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* itemAsNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+    return itemAsNode;
+}
+
+QSharedPointer<TreeItemInterface> QuickEdit::GetSharedOfOperation(const QModelIndex & index)
+{
+    QModelIndex parentIndex = index.parent();
+    parentIndex = parentIndex.sibling(parentIndex.row(), 0);
+    TreeItemInterface* parent = static_cast<TreeItemInterface*>(parentIndex.internalPointer());
+    if (!parent)
+        parent = treeModel->RootItem();
+    TreeItemInterface* itemAsInterface = static_cast<TreeItemInterface*>(index.internalPointer());
+    int operationIndex = parent->GetIndexOfChild(itemAsInterface);
+    return parent->GetChildren()[operationIndex];
+}
+
+QList<std::function<bool (TreeItemInterface *)> > QuickEdit::CreateCheckList()
+{
+    QList<std::function<bool(TreeItemInterface*)>> result;
+    if (!ui->leSearch->text().trimmed().isEmpty())
+    {
+        QString value = ui->leSearch->text();
+        auto addressFilterFunc = [value](TreeItemInterface* iface)
+            {
+                BrowserNode* data = static_cast<BrowserNode*>(iface->InternalPointer());
+                QString name = data->get_name();
+                bool match = data->get_name().contains(value, Qt::CaseInsensitive);
+                return match;
+            };
+
+        result.append(addressFilterFunc);
+    }
+    return result;
+}
+
+void QuickEdit::SetupTreeModel(TreeModel*& model,
+                               QTreeView* view,
+                               QSharedPointer<TreeItemInterface>& interface,
+                               QSharedPointer<ItemController<BrowserNode>>& controller,
+                               QSharedPointer<BrowserNode>& data)
+{
+    model = new TreeModel();
+
+    TreeItem<BrowserNode>* pointer = new TreeItem<BrowserNode>(0);
+    data = QSharedPointer<BrowserNode>(new BrowserNodeDummy(dummyView));
+    pointer->SetController(controller);
+    pointer->SetInternalData(data.data());
+    //controller->SetColumns(QStringList() << "class");
+    interface = QSharedPointer<TreeItemInterface>(pointer);
+
+    model->InsertRootItem(interface);
+
+    view->setModel(model);
+
+    view->setContextMenuPolicy(Qt::CustomContextMenu);
+    view->setEditTriggers(QAbstractItemView::DoubleClicked);
+    view->setColumnWidth(0, 230);
+    view->setExpandsOnDoubleClick(false);
+    view->setRootIsDecorated(true);
+}
+
+void QuickEdit::Init(UmlWindow* window, BrowserView* view)
+{
+    originalView = view;
+    mainWindow = window;
+
+    // setup null controller
+    nullController = QSharedPointer<ItemController<BrowserNode>>(new ItemController<BrowserNode>());
+
+    validTypes << UmlAggregation << UmlAggregationByValue << UmlDirectionalAggregation << UmlClass
+               << UmlDirectionalAggregationByValue << UmlAttribute << UmlOperation << UmlExtraMember << UmlClassView << UmlPackage;
+
+    columns << "name" << "mark" << "deleted" << "prefix" << "type" << "postfix" << "default_value" << "stereotype"
+            << "visibility" << "direction" << "static" << "abstract" << "multiplicity"
+            << "const" << "volatile" << "friend" << "virtual" << "inline"
+            << "defaulted" << "delete" << "override" << "final" << "noexcept";
+
+    SetupItemCreationFuncs();
+    qRegisterMetaType<QList<BrowserNode*>>("QList<BrowserNode*>");
+    SetupControllers();
+    SetupDelegates();
+    SetupTreeModel(treeModel, ui->tvEditor, rootInterface, classController, modelRoot);
+    ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu);
+
+    ui->tvEditor->setAlternatingRowColors(true);
+    connect(ui->tvEditor, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnContextMenu(QPoint)));
+    connect(ui->leSearch, SIGNAL(textChanged(QString)), this, SLOT(OnPerformFiltering(QString)));
+    connect(ui->pbUpOneLevel, SIGNAL(clicked()), this, SLOT(OnDecreaseOpenLevels()));
+    connect(ui->pbDownOneLevel, SIGNAL(clicked()), this, SLOT(OnIncreaseOpenLevels()));
+    connect(ui->pbAddParameter, SIGNAL(clicked()), this, SLOT(OnAddParameter()));
+    connect(ui->pbAddOperation, SIGNAL(clicked()), this, SLOT(OnAddOperation()));
+    connect(ui->pbAddAttribute, SIGNAL(clicked()), this, SLOT(OnAddAttribute()));
+    connect(ui->pbRefreshView, SIGNAL(clicked()), this, SLOT(OnRefreshTable()));
+    connect(ui->chkCpp, SIGNAL(clicked()), this, SLOT(OnChangeColumnVisibility()));
+//    connect(ui->tvEditor->header(), SIGNAL(sectionResized(int,int,int)),
+//            this, SLOT(OnNewSectionSizes(int,int,int)));
+
+}
+
+void QuickEdit::Show(BrowserNode * node)
+{
+    //first, we need to determine the type of currently selected item
+    // if we cannot open window for such node type - do nothing
+    rootInterface->removeChildren(0, rootInterface->childCount());
+    localNodeHolder.clear();
+    if (!node)
+        return;
+    UmlCode nodeType = node->get_type();
+    if(!validTypes.contains(nodeType))
+        return;
+    //next we need to recursively create items for node
+    if (!itemCreators.contains(nodeType))
+        return;
+    itemCreators[nodeType](rootInterface, node);
+    // we then assign items and all is ok
+    treeModel->InsertRootItem(rootInterface);
+
+    // expand all items
+    ExpandAllSatisfying<TreeItemInterface>([](TreeItemInterface*) { return true; },
+                                           ui->tvEditor,
+                                           treeModel,
+                                           QModelIndex());
+
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    QByteArray arr = settings.value("headers/quickedit", QByteArray()).toByteArray();
+    if (!arr.isNull())
+        ui->tvEditor->header()->restoreState(arr);
+
+    ui->chkCpp->setChecked(settings.value("quickedit_checkboxes/cpp",true).toBool());
+    ui->chkJava->setChecked(settings.value("quickedit_checkboxes/java", true).toBool());
+    ui->chkPhp->setChecked(settings.value("quickedit_checkboxes/php",true).toBool());
+    ui->chkPython->setChecked(settings.value("quickedit_checkboxes/python", true).toBool());
+    ui->chkIdl->setChecked(settings.value("quickedit_checkboxes/idl", true).toBool());
+    QSize size = settings.value("window/size", QSize()).toSize();
+
+    CheckColumnVisibility();
+    if (!size.isValid())
+        this->showMaximized();
+    else
+    {
+        this->resize(size);
+        this->show();
+    }
+
+}
+bool QuickEdit::ValidType(BrowserNode * node)
+{
+    if (!node)
+        return false;
+    UmlCode nodeType = node->get_type();
+    if (!validTypes.contains(nodeType))
+        return false;
+    return true;
+}
+
+
+void QuickEdit::closeEvent(QCloseEvent *)
+{
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    if (ui->tvEditor->header()->count() > 0)
+    {
+        settings.setValue("headers/quickedit", ui->tvEditor->header()->saveState());
+        settings.sync();
+    }
+    settings.setValue("quickedit_checkboxes/cpp", ui->chkCpp->isChecked());
+    settings.setValue("quickedit_checkboxes/java", ui->chkJava->isChecked());
+    settings.setValue("quickedit_checkboxes/php",ui->chkPhp->isChecked());
+    settings.setValue("quickedit_checkboxes/python", ui->chkPython->isChecked());
+    settings.setValue("quickedit_checkboxes/idl", ui->chkIdl->isChecked());
+    if (!this->isMaximized())
+        settings.setValue("window/size", this->size());
+    else
+        settings.setValue("window/size",QSize());
+    ui->leSearch->setText("");
+}
+
+QSharedPointer<TreeItemInterface> QuickEdit::CreateInterfaceNode(QSharedPointer<TreeItemInterface> root,
+                                                                 QSharedPointer<ItemController<BrowserNode>> controller,
+                                                                 BrowserNode* node)
+{
+    TreeItem<BrowserNode>* pointer = new TreeItem<BrowserNode>(0);
+    QSharedPointer<TreeItemInterface> interfaceItem(pointer);
+    pointer->SetController(controller);
+    pointer->SetInternalData(node);
+    pointer->SetParent(root);
+    return interfaceItem;
+}
+
+
+void QuickEdit::AssignItemsForClass(QSharedPointer<TreeItemInterface> root, BrowserNode* classNode)
+{
+    auto interfaceItem = CreateInterfaceNode(root, classController, classNode);
+    auto children = classNode->children(validTypes);
+    std::reverse(children.begin(), children.end());
+    for (const auto& child : children)
+    {
+        if (!child)
+            continue;
+        UmlCode nodeType = child->get_type();
+        itemCreators[nodeType](interfaceItem, child);
+    }
+    root->AddChildren(QList<QSharedPointer<TreeItemInterface>>() << interfaceItem);
+}
+
+void QuickEdit::AssignItemsForAttribute(QSharedPointer<TreeItemInterface> root, BrowserNode* classNode)
+{
+    auto interfaceItem = CreateInterfaceNode(root, attributeController, classNode);
+    root->AddChildren(QList<QSharedPointer<TreeItemInterface>>() << interfaceItem);
+}
+
+void QuickEdit::AssignItemsForRelation(QSharedPointer<TreeItemInterface> root, BrowserNode* classNode)
+{
+    auto interfaceItem = CreateInterfaceNode(root, relationController, classNode);
+    root->AddChildren(QList<QSharedPointer<TreeItemInterface>>() << interfaceItem);
+}
+
+void QuickEdit::AssignItemsForExtraNode(QSharedPointer<TreeItemInterface> root, BrowserNode* extraNode)
+{
+    auto interfaceItem = CreateInterfaceNode(root, extraNodeController, extraNode);
+    root->AddChildren(QList<QSharedPointer<TreeItemInterface>>() << interfaceItem);
+}
+
+void QuickEdit::AssignItemsForClassView(QSharedPointer<TreeItemInterface> root, BrowserNode* classViewNode)
+{
+    auto interfaceItem = CreateInterfaceNode(root, classController, classViewNode);
+    auto children = classViewNode->children(validTypes);
+    std::reverse(children.begin(), children.end());
+    for (const auto& child : children)
+    {
+        if (!child)
+            continue;
+        UmlCode nodeType = child->get_type();
+        itemCreators[nodeType](root, child);
+    }
+}
+
+void QuickEdit::AssignItemsForPackage(QSharedPointer<TreeItemInterface> root, BrowserNode* packageNode)
+{
+    auto interfaceItem = CreateInterfaceNode(root, classController, packageNode);
+    auto children = packageNode->children(validTypes);
+    std::reverse(children.begin(), children.end());
+    for (const auto& child : children)
+    {
+        if (!child)
+            continue;
+        UmlCode nodeType = child->get_type();
+        itemCreators[nodeType](root, child);
+    }
+}
+
+void QuickEdit::MoveMarked(bool before)
+{
+    QModelIndex current = ui->tvEditor->currentIndex();
+
+    if (!current.isValid())
+        return;
+
+    TreeItemInterface* itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* currentNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+
+    //next we reorganize nodes in parent
+    TreeItemInterface* parentInterface = itemAsInterface->parent();
+    auto children = parentInterface->GetChildren();
+    QList<QSharedPointer<TreeItemInterface>> markedChildren;
+    // we store all marked nodes
+    QList<BrowserNode*> parentList;
+    for (const auto& child : children)
+    {
+        BrowserNode* childNode = static_cast<BrowserNode*>(child->InternalPointer());
+        if(!parentList.contains(static_cast<BrowserNode*>(childNode->parent())))
+            parentList.append(static_cast<BrowserNode*>(childNode->parent()));
+        if(childNode->markedp())
+            markedChildren.append(child);
+    }
+
+    if (parentList.size() > 1)
+        return;
+
+    // remove all marked from children
+    for (const auto& child : markedChildren)
+    {
+        children.removeOne(child);
+    }
+    //get the new position of origin node
+    int newPositionOfCurrent = -1;
+    for (const auto& child : children)
+    {
+        newPositionOfCurrent++;
+        BrowserNode* childNode = static_cast<BrowserNode*>(child->InternalPointer());
+        if(childNode == currentNode)
+        {
+            if(!before)
+                newPositionOfCurrent++;
+            break;
+        }
+    }
+    //insert the nodes back
+    std::reverse(markedChildren.begin(), markedChildren.end());
+    for (const auto& child : markedChildren)
+    {
+        children.insert(newPositionOfCurrent, child);
+    }
+
+    auto sharedOfOperation = GetSharedOfOperation(current.parent());
+    TreeItem<BrowserNode>* operationItemAsNode = static_cast<TreeItem<BrowserNode>*>(sharedOfOperation.data());
+    // reorganize params vector
+
+    BrowserOperation* operationNode = static_cast<BrowserOperation*>(operationItemAsNode->InternalPointer());
+    OperationData* operationData = static_cast<OperationData*>(operationNode->get_data());
+    operationData->params.clear();
+    for (const auto& child : children)
+    {
+        BrowserOperationAttribute* attributeNode = static_cast<BrowserOperationAttribute*>(child->InternalPointer());
+        operationData->params.append(attributeNode->get_param());
+    }
+
+    // install children back
+    QModelIndex parentIndex = current.parent();
+    treeModel->removeRows(0, children.count(), parentIndex);
+    treeModel->insertRows(0, children.count(), parentIndex);
+    int pos = -1;
+    for (const auto& child : children)
+    {
+        pos++;
+        QModelIndex newItem = treeModel->index(pos, 0, parentIndex);
+        if (!newItem.isValid())
+            continue;
+        TreeItemInterface *newItemInterface = static_cast<TreeItemInterface*>(newItem.internalPointer());
+        TreeItem<BrowserNode>* newItemAsNode = static_cast<TreeItem<BrowserNode>*>(newItemInterface);
+        newItemAsNode->SetController(operationAttributeController);
+        newItemAsNode->SetParent(sharedOfOperation);
+        newItemAsNode->SetInternalData(static_cast<BrowserNode*>(child->InternalPointer()));
+    }
+    pos = -1;
+    for (const auto& child : children)
+    {
+        pos++;
+        QModelIndex newItem = treeModel->index(pos, 0, parentIndex);
+        if (!newItem.isValid())
+            continue;
+        BrowserNode* node = static_cast<BrowserNode*>(child->InternalPointer());
+        node->set_marked(false);
+    }
+
+    QModelIndex newItem = treeModel->index(pos, 0, parentIndex);
+    if (newItem.isValid())
+        pos++;
+    operationNode->modified();
+}
+
+void QuickEdit::AssignItemsForOperation(QSharedPointer<TreeItemInterface> root, BrowserNode* node)
+{
+    QList<QSharedPointer<TreeItemInterface>> items;
+
+    auto interfaceItem = CreateInterfaceNode(root, operationController, node);
+    BrowserOperation* operationNode = static_cast<BrowserOperation*>(node);
+    // first we make a dummy node for return type
+    QSharedPointer<BrowserNode> returnType(new BrowserOperationReturnType(dummyView, operationNode));
+    QList<QSharedPointer<BrowserNode>> operationNodes;
+    operationNodes << returnType;
+    // next we make dummy nodes for all attributes
+    int paramCount = ((OperationData*)operationNode->get_data())->nparams;
+
+    for (int i = 0; i < paramCount; ++i)
+    {
+        QSharedPointer<BrowserNode> param(new BrowserOperationAttribute(dummyView,
+                                                                        operationNode,
+                                                                        ((OperationData*)operationNode->get_data())->params[i]));
+        operationNodes << param;
+        items << CreateInterfaceNode(interfaceItem, operationAttributeController, param.data());
+    }
+    interfaceItem->AddChildren(items);
+    root->AddChildren(QList<QSharedPointer<TreeItemInterface>>() << interfaceItem);
+    localNodeHolder.append(operationNodes);
+}
+
+static void paintCheckbox(const QStyledItemDelegate* delegate,
+                          QPainter* painter,
+                          const QStyleOptionViewItem& option,
+                          const QModelIndex& index)
+{
+    QVariant value = index.model()->data(index, Qt::DisplayRole);
+    delegate->QStyledItemDelegate::paint(painter, option, index);
+    if (!value.isValid())
+        return;
+
+    bool checked = index.model()->data(index, Qt::DisplayRole).toBool();
+
+    QStyleOptionButton check_box_style_option;
+    check_box_style_option.state |= QStyle::State_Enabled;
+    if (checked) {
+        check_box_style_option.state |= QStyle::State_On;
+    } else {
+        check_box_style_option.state |= QStyle::State_Off;
+    }
+    check_box_style_option.rect = CheckBoxRect(option);
+
+    QApplication::style()->drawControl(QStyle::CE_CheckBox,
+                                       &check_box_style_option,
+                                       painter);
+}
+
+void QuickEdit::CheckBoxDelegateSetup()
+{
+    GenericDelegate* checkboxDelegate = new GenericDelegate(ui->tvEditor, true);
+    checkboxDelegate->widgetCreator = [](QWidget*) { return static_cast<QWidget*>(0); };
+    checkboxDelegate->paintProcessor = paintCheckbox;
+    checkboxDelegate->editorEventProcessor = editorEvent;
+
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("static"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("abstract"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("const"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("volatile"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("friend"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("virtual"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("inline"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("defaulted"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("delete"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("override"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("final"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("deleted"), checkboxDelegate);
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("mark"), checkboxDelegate);
+}
+
+void QuickEdit::VisibilityDelegateSetup()
+{
+    GenericDelegate* visibilityDelegate = new GenericDelegate(ui->tvEditor, false);
+
+    visibilityDelegate->widgetCreator = [](QWidget* parent)
+    {
+        QStringList visibilities;
+        visibilities << "public" << "protected" << "private" << "package" << "default";
+        QComboBox* box = new QComboBox(parent);
+        QStringListModel* model = new QStringListModel;
+        model->setStringList(visibilities);
+        box->setModel(model);
+        box->setEditable(false);
+        return box;
+    };
+
+    visibilityDelegate->dataAccessor = [](QWidget* editor, const QModelIndex& index)
+    {
+        QString value = index.model()->data(index, Qt::EditRole).toString();
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        box->setCurrentText(value);
+    };
+
+    visibilityDelegate->dataSetter = [](QWidget* editor, QAbstractItemModel* model, const QModelIndex& index)
+    {
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        QString value = box->currentText();
+        model->setData(index, value, Qt::EditRole);
+    };
+    
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("visibility"), visibilityDelegate);
+}
+
+void QuickEdit::TypeDelegateSetup()
+{
+    GenericDelegate* delegate = new GenericDelegate(ui->tvEditor, false);
+
+    delegate->widgetCreator = [](QWidget* parent)
+    {
+        BrowserNodeList result;
+        QStringList classes;
+        BrowserClass::instances(result);
+        result.full_names(classes);
+
+        QStringList basics = GenerationSettings::basic_types();
+        classes+=basics;
+        QCompleter* completer = new QCompleter(classes, parent);
+        completer->setCaseSensitivity(Qt::CaseSensitive);
+
+        QComboBox* box = new QComboBox(parent);
+        QStringListModel* model = new QStringListModel;
+        model->setStringList(classes);
+        box->setModel(model);
+        box->setEditable(true);
+        box->setCompleter(completer);
+        return box;
+    };
+
+    delegate->dataAccessor = [](QWidget* editor, const QModelIndex& index)
+    {
+        QString value = index.model()->data(index, Qt::EditRole).toString();
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        box->setCurrentText(value);
+    };
+
+    delegate->dataSetter = [](QWidget* editor, QAbstractItemModel* model, const QModelIndex& index)
+    {
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        QString value = box->currentText();
+        model->setData(index, value, Qt::EditRole);
+    };
+
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("type"), delegate);
+}
+
+void QuickEdit::PrefixDelegateSetup()
+{
+    GenericDelegate* delegate = new GenericDelegate(ui->tvEditor, false);
+
+    delegate->widgetCreator = [](QWidget* parent)
+    {
+        QStringList list;
+        list << " " << "const " << "volatile ";
+        QCompleter* completer = new QCompleter(list, parent);
+        completer->setCaseSensitivity(Qt::CaseSensitive);
+
+        QComboBox* box = new QComboBox(parent);
+        QStringListModel* model = new QStringListModel;
+        model->setStringList(list);
+        box->setModel(model);
+        box->setEditable(true);
+        box->setCompleter(completer);
+        return box;
+    };
+
+    delegate->dataAccessor = [](QWidget* editor, const QModelIndex& index)
+    {
+        QString value = index.model()->data(index, Qt::EditRole).toString();
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        box->setCurrentText(value);
+    };
+    
+    delegate->dataSetter = [](QWidget* editor, QAbstractItemModel* model, const QModelIndex& index)
+    {
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        QString value = box->currentText();
+        model->setData(index, value, Qt::EditRole);
+    };
+
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("prefix"), delegate);
+}
+
+void QuickEdit::PostfixDelegateSetup()
+{
+    GenericDelegate* delegate = new GenericDelegate(ui->tvEditor, false);
+
+    delegate->widgetCreator = [](QWidget* parent)
+    {
+        QStringList list;
+        list << " " << "*" << "&";
+        QCompleter* completer = new QCompleter(list, parent);
+        completer->setCaseSensitivity(Qt::CaseSensitive);
+
+        QComboBox* box = new QComboBox(parent);
+        QStringListModel* model = new QStringListModel;
+        model->setStringList(list);
+        box->setModel(model);
+        box->setEditable(true);
+        box->setCompleter(completer);
+        return box;
+    };
+
+    delegate->dataAccessor = [](QWidget* editor, const QModelIndex& index)
+    {
+        QString value = index.model()->data(index, Qt::EditRole).toString();
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        box->setCurrentText(value);
+    };
+
+    delegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex& index)
+    {
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        QString value = box->currentText();
+        model->setData(index, value, Qt::EditRole);
+    };
+
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("postfix"), delegate);
+}
+
+void QuickEdit::DirectionDelegateSetup()
+{
+    GenericDelegate* delegate = new GenericDelegate(ui->tvEditor, false);
+
+    delegate->widgetCreator = [](QWidget* parent)
+    {
+        QStringList visibilities;
+        visibilities << "inout" << "in" << "out";
+        QComboBox* box = new QComboBox(parent);
+        QStringListModel* model = new QStringListModel;
+        model->setStringList(visibilities);
+        box->setModel(model);
+        box->setEditable(false);
+        return box;
+    };
+    
+    delegate->dataAccessor = [](QWidget* editor, const QModelIndex& index)
+    {
+        QString value = index.model()->data(index, Qt::EditRole).toString();
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        box->setCurrentText(value);
+    };
+
+    delegate->dataSetter = [](QWidget* editor, QAbstractItemModel* model, const QModelIndex& index)
+    {
+        QComboBox* box = static_cast<QComboBox*>(editor);
+        QString value = box->currentText();
+        model->setData(index, value, Qt::EditRole);
+    };
+
+    ui->tvEditor->setItemDelegateForColumn(columns.indexOf("direction"), delegate);
+}
diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h
new file mode 100644
index 000000000..75deb41ae
--- /dev/null
+++ b/src/CustomWidgets/quickedit.h
@@ -0,0 +1,172 @@
+// *************************************************************************
+//
+//
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef QUICKEDIT_H
+#define QUICKEDIT_H
+
+#include <QWidget>
+#include <QHash>
+#include <functional>
+#include "UmlEnum.h"
+
+namespace Ui {
+class QuickEdit;
+}
+class BrowserView;
+class TreeModel;
+class BrowserNode;
+class TreeItemInterface;
+class QTreeView;
+class QListWidgetItem;
+class GenericEventFilter;
+class UmlWindow;
+class QMenu;
+class QModelIndex;
+template <typename T>
+class ItemController;
+
+template <typename T>
+class QSharedPointer;
+template <typename T, typename K>
+class QHash;
+
+
+class QuickEdit : public QWidget
+{
+    Q_OBJECT
+    
+public:
+    explicit QuickEdit(QWidget *parent = 0);
+    ~QuickEdit();
+    void Init(UmlWindow* window, BrowserView* view);
+    void Show(BrowserNode*);
+    bool ValidType(BrowserNode*);
+protected:
+    virtual void closeEvent(QCloseEvent *) override;
+
+private:
+    Ui::QuickEdit *ui = nullptr;
+    BrowserView* dummyView = nullptr;
+    BrowserView* originalView = nullptr;
+    UmlWindow* mainWindow = nullptr;
+    QScopedPointer<QMenu> contextMenu;
+    QMenu* collapseExpandMenu = nullptr;
+    QList<UmlCode> validTypes;
+
+    QList<QSharedPointer<BrowserNode> > localNodeHolder;
+    QHash<UmlCode, std::function<void(QSharedPointer<TreeItemInterface>, BrowserNode*)>> itemCreators;
+    TreeModel* treeModel = nullptr;
+    bool isFiltered = false;
+    QStringList expandedNodes;
+    QSharedPointer<TreeItemInterface> rootInterface;
+    QSharedPointer<BrowserNode> modelRoot;
+
+    QSharedPointer<ItemController<BrowserNode>> nullController;
+    QSharedPointer<ItemController<BrowserNode>> classController;
+    QSharedPointer<ItemController<BrowserNode>> operationController;
+    QSharedPointer<ItemController<BrowserNode>> attributeController;
+    QSharedPointer<ItemController<BrowserNode>> operationAttributeController;
+    QSharedPointer<ItemController<BrowserNode>> relationController;
+    QSharedPointer<ItemController<BrowserNode>> extraNodeController;
+
+    QAction* actBefore = nullptr;
+    QAction* actAfter = nullptr;
+    QAction* actCollapseExpandSelf = nullptr;
+    QAction* actCollapseExpandParent = nullptr;
+
+
+    QStringList columns;
+    //QModelIndex current;
+    BrowserNode* currentNode = nullptr;
+
+    void SetupTreeModel(TreeModel*&,
+                        QTreeView*,
+                        QSharedPointer<TreeItemInterface>&,
+                        QSharedPointer<ItemController<BrowserNode>>&,
+                        QSharedPointer<BrowserNode>&);
+
+    void SetupClassController();
+    void SetupOperationController();
+    void SetupAttributeController();
+    void SetupOperationAttributeController();
+    void SetupRelationController();
+    void SetupExtraNodeController();
+    void SetupControllers();
+    void SetupDelegates();
+    void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer<TreeItemInterface>);
+    QList<std::function<bool(TreeItemInterface*)>> CreateCheckList();
+    void CreateMenu();
+    void SetupMenu(TreeItemInterface *);
+    void VisibilityDelegateSetup();
+    void TypeDelegateSetup();
+    void DirectionDelegateSetup();
+    void CheckBoxDelegateSetup();
+    void PrefixDelegateSetup();
+    void PostfixDelegateSetup();
+    void SetupItemCreationFuncs();
+    void CheckColumnVisibility();
+
+    void AddParameter();
+    void AddOperation();
+    void AddAttribute();
+
+    void RefreshTable();
+    void CollapseExpand(const QModelIndex& index );
+
+
+    BrowserNode* GetCurrentNode();
+    QSharedPointer<TreeItemInterface> GetSharedOfOperation(const QModelIndex& );
+
+    QSharedPointer<TreeItemInterface> CreateInterfaceNode(QSharedPointer<TreeItemInterface> root,
+                                                          QSharedPointer<ItemController<BrowserNode>> controller,
+                                                          BrowserNode* node);
+
+    void AssignItemsForOperation(QSharedPointer<TreeItemInterface> root, BrowserNode*);
+    void AssignItemsForClass(QSharedPointer<TreeItemInterface> root, BrowserNode*);
+    void AssignItemsForAttribute(QSharedPointer<TreeItemInterface> root, BrowserNode*);
+    void AssignItemsForRelation(QSharedPointer<TreeItemInterface> root, BrowserNode *);
+    void AssignItemsForExtraNode(QSharedPointer<TreeItemInterface> root, BrowserNode*);
+    void AssignItemsForClassView(QSharedPointer<TreeItemInterface> root, BrowserNode*);
+    void AssignItemsForPackage(QSharedPointer<TreeItemInterface> root, BrowserNode*);
+
+    void MoveMarked(bool);
+
+public slots:
+    void OnContextMenu(QPoint);
+    void OnShow();
+    void OnAddParameter();
+    void OnAddOperation();
+    void OnAddAttribute();
+    void OnPerformFiltering(QString);
+    void OnDecreaseOpenLevels();
+    void OnIncreaseOpenLevels();
+    void OnChangeColumnVisibility();
+    void OnMoveMarkedAfter();
+    void OnMoveMarkedBefore();
+    void OnRefreshTable();
+    void OnCollapseExpandSelf();
+    void OnCollapseExpandParent();
+};
+
+#endif // QUICKEDIT_H
diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp
new file mode 100644
index 000000000..74b31c7d6
--- /dev/null
+++ b/src/CustomWidgets/quickeditcontrollersetup.cpp
@@ -0,0 +1,741 @@
+// *************************************************************************
+//
+//
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#include "quickedit.h"
+
+#include "Libs/L_UniversalModels/include/ItemController.h"
+#include "Libs/L_UniversalModels/include/TreeModel.h"
+#include "Libs/L_UniversalModels/include/TreeItemInterface.h"
+#include "Libs/L_UniversalModels/include/treeviewfunctions.h"
+#include "Libs/L_UniversalModels/include/treeviewtemplatefunctions.h"
+#include "Libs/L_UniversalModels/include/TreeItem.h"
+#include "Libs/L_UniversalModels/include/genericeventfilter.h"
+#include "browser/BrowserClass.h"
+#include "browser/BrowserOperationAttribute.h"
+#include "browser/BrowserNodeDummy.h"
+#include "browser/BrowserAttribute.h"
+#include "tool/snippets.h"
+#include "ProfiledStereotypes.h"
+#include "browser/BrowserRelation.h"
+#include "browser/BrowserExtraMember.h"
+#include "AttributeData.h"
+#include "BrowserView.h"
+#include "AType.h"
+#include "UmlEnum.h"
+#include "data/ClassData.h"
+#include "data/OperationData.h"
+#include "data/RelationData.h"
+#include "GenericDelegate.h"
+#include "browserfunctions/operationfuncs.h"
+
+#include <algorithm>
+#include <iostream>
+#include <array>
+#include <functional>
+
+// Helper macros
+
+#define ADD_GETSET(TYPE, HOLDER, ROW, ROLES, CONVERTER, ACCESSOR, SETTER) \
+    HOLDER->AddGetter(columns.indexOf(ROW), ROLES, \
+        [](const BrowserNode* data, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return QVariant(); \
+            const TYPE* pointer = static_cast<const TYPE*>(data); \
+            if (pointer) \
+                return QVariant(pointer->ACCESSOR()); \
+            else \
+                return QVariant(); \
+        } \
+        ); \
+    HOLDER->AddSetter(columns.indexOf(ROW), ROLES, \
+        [](BrowserNode* data, QVariant value, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return false; \
+            TYPE* pointer = static_cast<TYPE*>(data); \
+            if (pointer) \
+                pointer->SETTER(value.CONVERTER()); \
+            pointer->modified(); \
+            return true; \
+        } \
+        );
+
+#define ADD_PIXMAP_GETTER(TYPE, HOLDER, ROW, ROLES, ACCESSOR) \
+    HOLDER->AddGetter(columns.indexOf(ROW), ROLES, \
+        [](const BrowserNode* data, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return QVariant(); \
+            const TYPE* pointer = static_cast<const TYPE*>(data); \
+            if (pointer) \
+                return QVariant(QIcon(*pointer->ACCESSOR(0))); \
+            else \
+                return QVariant(); \
+        } \
+        ); \
+
+#define ADD_GETSET_CONVERTED(TYPE, HOLDER, ROW, ROLES, VARIANTCONVERTER, VALUECONVERTER, ACCESSOR, SETTER) \
+    HOLDER->AddGetter(columns.indexOf(ROW), ROLES, \
+        [](const BrowserNode* data, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return QVariant(); \
+            const TYPE* pointer = static_cast<const TYPE*>(data); \
+            if (pointer) \
+                return QVariant(pointer->ACCESSOR()); \
+            else \
+                return QVariant(); \
+        } \
+        ); \
+    HOLDER->AddSetter(columns.indexOf(ROW), ROLES, \
+        [](BrowserNode* data, QVariant value, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data)\
+                return false; \
+            TYPE* pointer = static_cast<TYPE*>(data);\
+            if (pointer) \
+                SETTER(VALUECONVERTER(value.VARIANTCONVERTER())); \
+            pointer->modified();\
+            return true;\
+        } \
+        );
+
+#define ADD_GETSET_DIRECT(TYPE, HOLDER, ROW, ROLES, CONVERTER, PARAM) \
+    HOLDER->AddGetter(columns.indexOf(ROW), ROLES, \
+        [](const BrowserNode* data, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return QVariant(); \
+            const TYPE* pointer = static_cast<const TYPE*>(data); \
+            if (pointer) \
+                return QVariant(pointer->PARAM); \
+            else \
+                return QVariant(); \
+        } \
+        ); \
+    HOLDER->AddSetter(columns.indexOf(ROW), ROLES, \
+        [](BrowserNode* data, QVariant value, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return false; \
+            TYPE* pointer = static_cast<TYPE*>(data); \
+            if (pointer) \
+                pointer->PARAM = value.CONVERTER(); \
+            pointer->modified(); \
+            return true;\
+        } \
+        );
+
+#define ADD_GETSET_DIRECT_ASSIGNMENT(TYPE, HOLDER, ROW, ROLES, PARAM, ASSIGNSTRING) \
+    HOLDER->AddGetter(columns.indexOf(ROW), ROLES, \
+        [](const BrowserNode* data, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return QVariant(); \
+            const TYPE* pointer = static_cast<const TYPE*>(data); \
+            if (pointer) \
+                return QVariant(pointer->PARAM); \
+            else \
+                return QVariant(); \
+        } \
+        ); \
+    HOLDER->AddSetter(columns.indexOf(ROW), ROLES, \
+        [](BrowserNode* data, QVariant value, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return false; \
+            TYPE* pointer = static_cast<TYPE*>(data); \
+            if (pointer) \
+                pointer->PARAM = ASSIGNSTRING; \
+            pointer->modified(); \
+            return true; \
+        } \
+        );
+
+#define ADD_GETSET_DATA(TYPE, DATA_TYPE, HOLDER, ROW, ROLES, CONVERTER, ACCESSOR, SETTER) \
+    HOLDER->AddGetter(columns.indexOf(ROW), ROLES, \
+        [] (const BrowserNode* data, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return QVariant(); \
+            const TYPE* pointer = static_cast<const TYPE*>(data); \
+            if (pointer) \
+                return QVariant(((DATA_TYPE*)pointer->get_data())->ACCESSOR()); \
+            else \
+                return QVariant(); \
+        } \
+        ); \
+    HOLDER->AddSetter(columns.indexOf(ROW), ROLES, \
+        [] (BrowserNode* data, QVariant value, const QModelIndex& index) \
+        { \
+            Q_UNUSED(index) \
+            if (!data) \
+                return false; \
+            TYPE* pointer = static_cast<TYPE*>(data); \
+            if (pointer) \
+                ((DATA_TYPE*)pointer->get_data())->SETTER(value.CONVERTER()); \
+            pointer->modified(); \
+            return true;\
+        } \
+        );
+
+// Display and Edit roles
+static const auto rolesEdit = QVector<int>({Qt::DisplayRole,Qt::EditRole});
+// Decoration role
+static const auto rolesDeco = QVector<int>({Qt::DecorationRole});
+
+/*!
+ Set up the quick edit view for all types of items.
+ */
+void QuickEdit::SetupControllers()
+{
+    SetupClassController();
+    SetupOperationController();
+    SetupAttributeController();
+    SetupOperationAttributeController();
+    SetupRelationController();
+    SetupExtraNodeController();
+}
+
+/*!
+ Set up all the quick edit view's delegates/
+ */
+void QuickEdit::SetupDelegates()
+{
+    CheckBoxDelegateSetup();
+    VisibilityDelegateSetup();
+    TypeDelegateSetup();
+    DirectionDelegateSetup();
+    PrefixDelegateSetup();
+    PostfixDelegateSetup();
+}
+
+/*!
+ Sets the quick edit view for Class items.
+ */
+void QuickEdit::SetupClassController()
+{
+    classController = QSharedPointer<ItemController<BrowserNode>>(new ItemController<BrowserNode>());
+    classController->SetColumns(columns);
+
+    ADD_GETSET(          BrowserClass, classController, "name",       rolesEdit, toString, get_name,                       set_name);
+    ADD_GETSET(          BrowserClass, classController, "stereotype", rolesEdit, toString, get_stereotype,                 def->set_stereotype);
+    ADD_GETSET(          BrowserClass, classController, "deleted",    rolesEdit, toBool,   deletedp,                       set_deleted);
+    ADD_GETSET_CONVERTED(BrowserClass, classController, "visibility", rolesEdit, toString, BrowserNode::encode_visibility, visibility_as_string, pointer->def->set_uml_visibility);
+    ADD_GETSET(          BrowserClass, classController, "abstract",   rolesEdit, toBool,   def->get_is_abstract,           def->set_is_abstract);
+
+    ADD_PIXMAP_GETTER(BrowserClass, classController, "name", rolesDeco, pixmap);
+
+    classController->AddFlagsFunctor(
+        [this](const QModelIndex& index)
+        {
+            Qt::ItemFlags result;
+            result |= Qt::ItemIsSelectable;
+            if (!(index.column() * in(columns.indexOf("name"),
+                                      columns.indexOf("stereotype"),
+                                      columns.indexOf("visibility"),
+                                      columns.indexOf("abstract"),
+                                      columns.indexOf("deleted")))) {
+                return result;
+            }
+            TreeItemInterface* iface = static_cast<TreeItemInterface*>(index.internalPointer());
+            if (!iface)
+                return result;
+            BrowserNode* pointer = static_cast<BrowserNode*>(iface->InternalPointer());
+            if (!pointer)
+                return result;
+            if (pointer->is_writable()) {
+                result |= Qt::ItemIsEditable;
+            }
+            result |=  Qt::ItemIsEnabled;
+            return result;
+        }
+    );
+}
+
+/*!
+ Sets the quick edit view for Operation items.
+ */
+void QuickEdit::SetupOperationController()
+{
+    operationController = QSharedPointer<ItemController<BrowserNode>>(new ItemController<BrowserNode>());
+    operationController->SetColumns(columns);
+
+    ADD_GETSET(          BrowserOperation, operationController,                "name",       rolesEdit, toString().toLatin1().constData, get_name,                       set_name);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "type",       rolesEdit, toString,                        get_return_type().get_type,     set_return_type);
+    ADD_GETSET_CONVERTED(BrowserOperation, operationController,                "visibility", rolesEdit, toString,                        BrowserNode::encode_visibility, visibility_as_string, pointer->def->set_uml_visibility);
+    ADD_GETSET(          BrowserOperation, operationController,                "deleted",    rolesEdit, toBool,                          deletedp,                       set_deleted);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "static",     rolesEdit, toBool,                          get_isa_class_operation,        set_isa_class_operation);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "abstract",   rolesEdit, toBool,                          get_is_abstract,                set_is_abstract);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "const",      rolesEdit, toBool,                          get_cpp_const,                  set_cpp_const);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "volatile",   rolesEdit, toBool,                          get_is_volatile,                set_is_volatile);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "friend",     rolesEdit, toBool,                          get_cpp_friend,                 set_cpp_friend);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "virtual",    rolesEdit, toBool,                          get_cpp_virtual,                set_cpp_virtual);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "inline",     rolesEdit, toBool,                          get_cpp_inline,                 set_cpp_inline);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "defaulted",  rolesEdit, toBool,                          get_cpp_default,                set_cpp_default);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "delete",     rolesEdit, toBool,                          get_cpp_delete,                 set_cpp_delete);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "override",   rolesEdit, toBool,                          get_cpp_override,               set_cpp_override);
+    ADD_GETSET_DATA(     BrowserOperation, OperationData, operationController, "final",      rolesEdit, toBool,                          get_cpp_final,                  set_cpp_final);
+
+    // post processors
+    operationController->AddPostProcessors(
+        columns.indexOf("name"),
+        QVector<int>(rolesEdit),
+        [](BrowserNode* node, const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            BrowserOperation* oper = static_cast<BrowserOperation*>(node);
+            oper->modified();
+            oper->setText(0, oper->get_name());
+            oper->package_modified();
+            oper->get_data()->modified();
+        }
+    );
+
+    // pixmap getter
+    ADD_PIXMAP_GETTER(BrowserOperation, operationController, "name", rolesDeco, pixmap);
+
+    // flags functors
+    operationController->AddFlagsFunctor(
+        [this](const QModelIndex& index)
+        {
+            Qt::ItemFlags result;
+            result |= Qt::ItemIsSelectable;
+            if (!(index.column() * in(columns.indexOf("name"),
+                                      columns.indexOf("type"),
+                                      columns.indexOf("static"),
+                                      columns.indexOf("visibility"),
+                                      columns.indexOf("abstract"),
+                                      columns.indexOf("const"),
+                                      columns.indexOf("volatile"),
+                                      columns.indexOf("friend"),
+                                      columns.indexOf("virtual"),
+                                      columns.indexOf("inline"),
+                                      columns.indexOf("defaulted"),
+                                      columns.indexOf("delete"),
+                                      columns.indexOf("override"),
+                                      columns.indexOf("final"),
+                                      columns.indexOf("deleted")))) {
+                return result;
+            }
+            TreeItemInterface* iface = static_cast<TreeItemInterface*>(index.internalPointer());
+            if (!iface)
+                return result;
+            BrowserOperation* pointer = static_cast<BrowserOperation*>(iface->InternalPointer());
+            if (!pointer)
+                return result;
+            if (pointer->is_writable() && !((OperationData*)pointer->get_data())->get_or_set()) {
+                result |= Qt::ItemIsEditable;
+            }
+            result |=  Qt::ItemIsEnabled;
+            return result;
+        }
+    );
+}
+
+/*!
+ Sets the quick edit view for the Attribute items.
+ */
+void QuickEdit::SetupAttributeController()
+{
+    attributeController = QSharedPointer<ItemController<BrowserNode>>(new ItemController<BrowserNode>());
+    attributeController->SetColumns(columns);
+
+    ADD_GETSET(          BrowserAttribute, attributeController,                "name",          rolesEdit, toString, get_name,                       set_name);
+    ADD_GETSET_DATA(     BrowserAttribute, AttributeData, attributeController, "type",          rolesEdit, toString, get_type().get_type,            set_type);
+    ADD_GETSET_DATA(     BrowserAttribute, AttributeData, attributeController, "default_value", rolesEdit, toString, get_init_value,                 set_init_value);
+    ADD_GETSET(          BrowserAttribute, attributeController,                "stereotype",    rolesEdit, toString, get_stereotype,                 def->set_stereotype);
+    ADD_GETSET(          BrowserAttribute, attributeController,                "deleted",       rolesEdit, toBool,   deletedp,                       set_deleted);
+    ADD_GETSET_CONVERTED(BrowserAttribute, attributeController,                "visibility",    rolesEdit, toString, BrowserNode::encode_visibility, visibility_as_string, pointer->def->set_visibility);
+    ADD_GETSET_DATA(     BrowserAttribute, AttributeData, attributeController, "static",        rolesEdit, toBool,   get_isa_class_attribute,        set_isa_class_attribute);
+    ADD_PIXMAP_GETTER(   BrowserAttribute, attributeController,                "name",          rolesDeco, pixmap);
+
+    attributeController->AddFlagsFunctor(
+        [this](const QModelIndex& index)
+        {
+            Qt::ItemFlags result;
+            result |= Qt::ItemIsSelectable;
+            if (!(index.column() * in(columns.indexOf("name"),
+                                      columns.indexOf("type"),
+                                      columns.indexOf("default_value"),
+                                      columns.indexOf("stereotype"),
+                                      columns.indexOf("visibility"),
+                                      columns.indexOf("static"),
+                                      columns.indexOf("deleted")))) {
+                return result;
+            }
+
+            TreeItemInterface* iface = static_cast<TreeItemInterface*>(index.internalPointer());
+            if (!iface)
+                return result;
+            BrowserNode* pointer = static_cast<BrowserNode*>(iface->InternalPointer());
+            if (!pointer)
+                return result;
+
+            if (pointer->is_writable())
+                result |= Qt::ItemIsEditable;
+
+            result |= Qt::ItemIsEnabled;
+
+            return result;
+        }
+    );
+
+    attributeController->AddPostProcessors(
+        columns.indexOf("name"),
+        QVector<int>(rolesEdit),
+        [](BrowserNode* node ,const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            BrowserAttribute* attr = static_cast<BrowserAttribute*>(node);
+            attr->modified();
+            attr->setText(0,attr->get_name() );
+            attr->package_modified();
+            attr->get_data()->modified();
+        }
+    );
+}
+
+/*!
+ Sets the quick edit view for the Operation Attribute items.
+ */
+void QuickEdit::SetupOperationAttributeController()
+{
+    operationAttributeController = QSharedPointer<ItemController<BrowserNode>>(new ItemController<BrowserNode>());
+    operationAttributeController->SetColumns(columns);
+
+    ADD_GETSET(BrowserOperationAttribute, operationAttributeController, "name",          rolesEdit, toString, get_name,                  set_name);
+    ADD_GETSET(BrowserOperationAttribute, operationAttributeController, "type",          rolesEdit, toString, get_param_type().get_type, set_param_type);
+    ADD_GETSET(BrowserOperationAttribute, operationAttributeController, "default_value", rolesEdit, toString, get_default_value,         set_default_value);
+    ADD_GETSET(BrowserOperationAttribute, operationAttributeController, "direction",     rolesEdit, toString, get_direction,             set_direction);
+    ADD_GETSET(BrowserOperationAttribute, operationAttributeController, "mark",          rolesEdit, toBool,   markedp,                   set_marked);
+
+    operationAttributeController->AddGetter(
+        columns.indexOf("deleted"),
+        rolesEdit,
+        [](const BrowserNode* data, const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            if (!data)
+                return QVariant();
+            const BrowserOperationAttribute* pointer = static_cast<const BrowserOperationAttribute*>(data);
+            if (pointer)
+                return QVariant(pointer->deletedp());
+            else
+                return QVariant();
+        }
+    );
+
+    operationAttributeController->AddSetter(
+        columns.indexOf("deleted"),
+        rolesEdit,
+        [](BrowserNode* data, QVariant value, const QModelIndex& index)
+        {
+            if (!data)
+                return false;
+            BrowserOperationAttribute* pointer = static_cast<BrowserOperationAttribute*>(data);
+            if (pointer) {
+                pointer->set_deleted(value.toBool(), index.row());
+                pointer->modified();
+            }
+            return true;
+        }
+    );
+
+    operationAttributeController->AddGetter(
+        columns.indexOf("prefix"),
+        rolesEdit,
+        [](const BrowserNode* data, const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            if (!data)
+                return QVariant();
+            const BrowserOperationAttribute* pointer = static_cast<const BrowserOperationAttribute*>(data);
+            if (pointer)
+                return QVariant(pointer->get_specifier(index.row()));
+            else
+                return QVariant();
+        }
+    );
+
+    operationAttributeController->AddSetter(
+        columns.indexOf("prefix"),
+        rolesEdit,
+        [](BrowserNode* data, QVariant value, const QModelIndex& index)
+        {
+            if (!data)
+                return false;
+            BrowserOperationAttribute* pointer = static_cast<BrowserOperationAttribute*>(data);
+            if (pointer) {
+                pointer->set_specifier(value.toString(), index.row());
+                pointer->modified();
+            }
+            return true;
+        }
+    );
+
+    operationAttributeController->AddGetter(
+        columns.indexOf("postfix"),
+        rolesEdit,
+        [](const BrowserNode* data, const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            if (!data)
+                return QVariant();
+            const BrowserOperationAttribute* pointer = static_cast<const BrowserOperationAttribute*>(data);
+            if (pointer)
+                return QVariant(pointer->get_passage_type(index.row()));
+            else
+                return QVariant();
+        }
+    );
+
+    operationAttributeController->AddSetter(
+        columns.indexOf("postfix"),
+        rolesEdit,
+        [](BrowserNode* data, QVariant value, const QModelIndex& index)
+        {
+            if (!data)
+                return false;
+            BrowserOperationAttribute* pointer = static_cast<BrowserOperationAttribute*>(data);
+            if (pointer) {
+                pointer->set_passage_type(value.toString(), index.row());
+                pointer->modified();
+            }
+            return true;
+        }
+    );
+
+    operationAttributeController->AddPostProcessors(
+        columns.indexOf("direction"),
+        QVector<int>(rolesEdit),
+        [](BrowserNode* node, const QModelIndex& index)
+        {
+            BrowserOperationAttribute* oper = static_cast<BrowserOperationAttribute*>(node);
+            OperationFuncs::recompute_param(oper->get_operation(), index.row(), true);
+        }
+    );
+
+    ADD_PIXMAP_GETTER(BrowserOperationAttribute, operationAttributeController, "name", rolesDeco, pixmap);
+
+    operationAttributeController->AddFlagsFunctor(
+        [this](const QModelIndex& index)
+        {
+            Qt::ItemFlags result;
+            result |= Qt::ItemIsSelectable;
+            if (!(index.column() * in(columns.indexOf("name"),
+                                      columns.indexOf("type"),
+                                      columns.indexOf("default_value"),
+                                      columns.indexOf("direction"),
+                                      columns.indexOf("deleted"),
+                                      columns.indexOf("mark"),
+                                      columns.indexOf("prefix"),
+                                      columns.indexOf("postfix")))) {
+                return result;
+            }
+
+            TreeItemInterface* iface = static_cast<TreeItemInterface*>(index.internalPointer());
+            if(!iface)
+                return result;
+            BrowserOperationAttribute* pointer = static_cast<BrowserOperationAttribute*>(iface->InternalPointer());
+            if(!pointer)
+                return result;
+
+            if(pointer->is_writable() && !pointer->is_get_set()) {
+                result |= Qt::ItemIsEditable;
+            }
+            result |=  Qt::ItemIsEnabled ;
+            return result;
+        }
+    );
+}
+
+/*!
+ Sets the quick edit view for the Relation items.
+ */
+void QuickEdit::SetupRelationController()
+{
+    relationController = QSharedPointer<ItemController<BrowserNode>>(new ItemController<BrowserNode>());
+    relationController->SetColumns(columns);
+
+    ADD_GETSET(       BrowserRelation, relationController, "name",    rolesEdit, toString, get_name, set_name);
+    ADD_GETSET_DIRECT(BrowserRelation, relationController, "default", rolesEdit, toString, def->a.init_value.operator QString());
+    ADD_GETSET(       BrowserRelation, relationController, "deleted", rolesEdit, toBool,   deletedp, set_deleted);
+
+    ADD_PIXMAP_GETTER(BrowserRelation, relationController, "name", rolesDeco, pixmap);
+
+    relationController->AddGetter(
+        columns.indexOf("visibility"),
+        rolesEdit,
+        [](const BrowserNode* data, const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            if (!data)
+                return QVariant();
+            const BrowserRelation* pointer = static_cast<const BrowserRelation*>(data);
+            if (pointer)
+                return QVariant(pointer->visibility_as_string());
+            else
+                return QVariant();
+        }
+    );
+
+    relationController->AddSetter(
+        columns.indexOf("visibility"),
+        rolesEdit,
+        [](BrowserNode* data, QVariant value, const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            if (!data)
+                return false;
+            BrowserRelation* pointer = static_cast<BrowserRelation*>(data);
+            if (pointer) {
+                pointer->def->a.uml_visibility = BrowserNode::encode_visibility(value.toString());
+            }
+            pointer->modified();
+            return true;
+        }
+    );
+
+    ADD_GETSET_DIRECT(BrowserRelation, relationController, "static",       rolesEdit, toBool,   def->a.isa_class_relation);
+    ADD_GETSET_DIRECT(BrowserRelation, relationController, "multiplicity", rolesEdit, toString, def->a.multiplicity.operator QString());
+
+    relationController->AddGetter(
+        columns.indexOf("type"),
+        rolesEdit,
+        [](const BrowserNode* data, const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            if (!data)
+                return QVariant();
+            const BrowserRelation* pointer = static_cast<const BrowserRelation*>(data);
+            if (pointer)
+                return QVariant(pointer->def->get_end_class()->get_name());
+            else
+                return QVariant();
+        }
+    );
+
+    relationController->AddSetter(
+        1,
+        rolesEdit,
+        [](BrowserNode* data, QVariant value, const QModelIndex& index)
+        {
+            Q_UNUSED(index);
+            if (!data)
+                return false;
+            BrowserRelation* pointer = static_cast<BrowserRelation*>(data);
+            if (pointer)
+                pointer->def->get_end_class()->set_name(value.toString());
+
+            pointer->modified();
+            return true;
+        }
+    );
+
+    relationController->AddFlagsFunctor(
+        [this](const QModelIndex& index)
+        {
+            Qt::ItemFlags result;
+
+            result |= Qt::ItemIsSelectable;
+
+            if (!(index.column() * in(columns.indexOf("name"),
+                                      columns.indexOf("type"),
+                                      columns.indexOf("default"),
+                                      columns.indexOf("visibility"),
+                                      columns.indexOf("deleted")))) {
+                return result;
+            }
+
+            TreeItemInterface* iface = static_cast<TreeItemInterface*>(index.internalPointer());
+            if (!iface)
+                return result;
+            BrowserNode* pointer = static_cast<BrowserNode*>(iface->InternalPointer());
+            if (!pointer)
+                return result;
+
+            if (pointer->is_writable() &&
+                (index.column() * in(columns.indexOf("name"),
+                                     columns.indexOf("default"),
+                                     columns.indexOf("visibility")))) {
+                result |= Qt::ItemIsEditable;
+            }
+
+            result |= Qt::ItemIsEnabled;
+
+            return result;
+        }
+    );
+}
+
+/*!
+ Sets the quick edit view for the Extra Member items.
+ */
+void QuickEdit::SetupExtraNodeController()
+{
+    extraNodeController = QSharedPointer<ItemController<BrowserNode>>(new ItemController<BrowserNode>());
+    extraNodeController->SetColumns(columns);
+
+    ADD_GETSET(       BrowserExtraMember, extraNodeController, "name",    rolesEdit, toString().toLatin1().constData, get_name, set_name);
+    ADD_GETSET(       BrowserExtraMember, extraNodeController, "deleted", rolesEdit, toBool, deletedp, set_deleted);
+    ADD_PIXMAP_GETTER(BrowserExtraMember, extraNodeController, "name",    rolesDeco, pixmap);
+
+    extraNodeController->AddFlagsFunctor(
+        [this](const QModelIndex& index)
+        {
+             Qt::ItemFlags result;
+             result |= Qt::ItemIsSelectable;
+             if (!(index.column() * in(columns.indexOf("name"),
+                                       columns.indexOf("deleted")))) {
+                 return result;
+             }
+
+             TreeItemInterface* iface = static_cast<TreeItemInterface*>(index.internalPointer());
+             if (!iface)
+                 return result;
+             BrowserNode* pointer = static_cast<BrowserNode*>(iface->InternalPointer());
+             if (!pointer)
+                 return result;
+
+             if (pointer->is_writable())
+                 result |= Qt::ItemIsEditable;
+
+             result |=  Qt::ItemIsEnabled;
+
+             return result;
+        }
+    );
+}
diff --git a/src/Factories/DialogConnections.h b/src/Factories/DialogConnections.h
index 72ae07aa9..d7ec3d6bd 100644
--- a/src/Factories/DialogConnections.h
+++ b/src/Factories/DialogConnections.h
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -32,9 +32,11 @@ class EdgeMenuToolBar;
 #include "CustomWidgets/EdgeMenuToolBar.h"
 #include "dialog/EdgeMenuDialog.h"
 #include "QPushButton"
+
 template<typename DialogType>
 void ConnectToLimitedDialog(DialogType * dialog, EdgeMenuToolBar * toolbar)
 {
+#ifdef EDGETOOLENABLED
     QPushButton * pageButton = qobject_cast<QPushButton *>(toolbar->findChild<QPushButton *>("OkayElement"));
     QObject::connect(pageButton, SIGNAL(clicked()), dialog, SLOT(accept()));
     pageButton = qobject_cast<QPushButton *>(toolbar->findChild<QPushButton *>("CancelElement"));
@@ -65,10 +67,16 @@ void ConnectToLimitedDialog(DialogType * dialog, EdgeMenuToolBar * toolbar)
     dialog->ConnectionToToolBarEstablished();
     dialog->SetToolBar(toolbar);
     //toolbar->setParent(dialog);
+#else
+    Q_UNUSED(dialog);
+    Q_UNUSED(toolbar);
+#endif
 }
+
 template<typename DialogType>
 void ConnectToClassDialog(DialogType * dialog, EdgeMenuToolBar * toolbar)
 {
+#ifdef EDGETOOLENABLED
     MultiPurposeDragArea * dragArea = qobject_cast<MultiPurposeDragArea *>(toolbar->findChild<MultiPurposeDragArea *>("DragArea"));
     QObject::connect(dragArea, SIGNAL(changeTab(int)), dialog, SLOT(OnChangeTab(int)));
 
@@ -79,9 +87,11 @@ void ConnectToClassDialog(DialogType * dialog, EdgeMenuToolBar * toolbar)
     QObject::connect(pageButton, SIGNAL(clicked()), dialog, SLOT(OnPickPreviousSibling()));
 
     ConnectToLimitedDialog<DialogType>(dialog, toolbar);
+#else
+    Q_UNUSED(dialog);
+    Q_UNUSED(toolbar);
+#endif
 }
 
 
-
-
 #endif // DIALOGCONNECTIONS_H
diff --git a/src/Factories/EdgeMenuFactory.cpp b/src/Factories/EdgeMenuFactory.cpp
index 20a0ac8ae..a84215afa 100644
--- a/src/Factories/EdgeMenuFactory.cpp
+++ b/src/Factories/EdgeMenuFactory.cpp
@@ -40,8 +40,9 @@ void EdgeMenuFactory::OnEdgeMenuRequested(uint classID)
 
 void EdgeMenuFactory::SpawnEdgeMenu(uint classID, EdgeMenuDialogBase * sender)
 {
+#ifdef EDGETOOLENABLED
     EdgeMenuToolBar * toolbar;
-
+    
     if (!createdToolbars.contains(classID)) {
         toolbar = (factories[classID])();
         createdToolbars.insert(classID, toolbar);
@@ -120,6 +121,10 @@ void EdgeMenuFactory::SpawnEdgeMenu(uint classID, EdgeMenuDialogBase * sender)
         toolbar->setAttribute(Qt::WA_ShowWithoutActivating);
         toolbar->show();
     }
+#else
+    Q_UNUSED(classID);
+    Q_UNUSED(sender);
+#endif
 }
 
 void EdgeMenuFactory::AddFactory(uint id, ToolbarFactory factory)
diff --git a/src/Factories/EdgeToolBarCreation.cpp b/src/Factories/EdgeToolBarCreation.cpp
index ff5feb855..c240d4e9e 100644
--- a/src/Factories/EdgeToolBarCreation.cpp
+++ b/src/Factories/EdgeToolBarCreation.cpp
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -30,38 +30,43 @@
 #include <QLabel>
 #include <QAction>
 #include <QFileInfo>
+#include <QLabel>
+
+#ifdef EDGETOOLENABLED
+static const int defaultButtonSize = 15;
+#endif // EDGETOOLENABLED
 
-static int defaultButtonSize = 15;
 EdgeMenuToolBar * CreateLimitedDialogMenu()
 {
     EdgeMenuToolBar * toolbar = new EdgeMenuToolBar();
+#ifdef EDGETOOLENABLED
     toolbar->setAttribute(Qt::WA_ShowWithoutActivating);
     QAction * clipboardAction = new QAction(toolbar);
     clipboardAction->setText("Clip...");
-    clipboardAction->setName("Clipboard");
+    clipboardAction->setObjectName("Clipboard");
 
-    MultiPurposeDragArea * dragArea = new MultiPurposeDragArea();
-    dragArea->setName("DragArea");
+    MultiPurposeDragArea * dragArea = new MultiPurposeDragArea(0);
+    dragArea->setObjectName("DragArea");
     dragArea->setBaseSize(defaultButtonSize, defaultButtonSize);
     dragArea->setMinimumHeight(defaultButtonSize);
     dragArea->setMinimumWidth(defaultButtonSize);
     QHBoxLayout * layout = new QHBoxLayout();
     layout->setContentsMargins(0, 0, 0, 0);
-    QLabel * label = new QLabel();
+    QLabel * label = new QLabel(0);
 
-    label->setPixmap(QIcon("../src/icons/mouse_control.png").pixmap());
+    label->setPixmap(QPixmap(":/root/icons/mouse_control.png"));
     layout->addWidget(label);
     dragArea->setLayout(layout);
 
-    QPushButton * okayElement = new QPushButton();
-    okayElement->setIcon(QIcon(":/root/src/icons/accept.png"));
-    okayElement->setName("OkayElement");
+    QPushButton * okayElement = new QPushButton(0);
+    okayElement->setIcon(QIcon(":/root/icons/accept.png"));
+    okayElement->setObjectName("OkayElement");
     okayElement->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     okayElement->setBaseSize(defaultButtonSize, defaultButtonSize);
 
-    QPushButton * cancelElement = new QPushButton();
-    cancelElement->setIcon(QIcon(":/root/src/icons/reject.png"));
-    cancelElement->setName("CancelElement");
+    QPushButton * cancelElement = new QPushButton(0);
+    cancelElement->setIcon(QIcon(":/root/icons/reject.png"));
+    cancelElement->setObjectName("CancelElement");
     okayElement->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
     cancelElement->setBaseSize(defaultButtonSize, defaultButtonSize);
 
@@ -75,7 +80,7 @@ EdgeMenuToolBar * CreateLimitedDialogMenu()
     toolbar->addWidget(cancelElement);
     toolbar->addAction(clipboardAction);
     toolbar->addWidget(okayElement);
-
+#endif
 
     return toolbar;
 }
@@ -84,44 +89,45 @@ EdgeMenuToolBar * CreateClassDialogMenu()
 {
     EdgeMenuToolBar * toolbar = new EdgeMenuToolBar();
     //toolbar->setWindowFlags(Qt::Tool);
-
+#ifdef EDGETOOLENABLED
     QAction * clipboardAction = new QAction(toolbar);
-    clipboardAction->setName("Clipboard");
+    clipboardAction->setObjectName("Clipboard");
     clipboardAction->setText("Clip...");
 
-    MultiPurposeDragArea * dragArea = new MultiPurposeDragArea();
-    dragArea->setName("DragArea");
+    MultiPurposeDragArea * dragArea = new MultiPurposeDragArea(0);
+
+    dragArea->setObjectName("DragArea");
     dragArea->setBaseSize(defaultButtonSize, defaultButtonSize);
     dragArea->setMinimumHeight(defaultButtonSize);
     dragArea->setMinimumWidth(defaultButtonSize);
     QHBoxLayout * layout = new QHBoxLayout();
     layout->setContentsMargins(0, 0, 0, 0);
-    QLabel * label = new QLabel();
-    label->setPixmap(QIcon(":/root/src/icons/mouse_control.png").pixmap());
+    QLabel * label = new QLabel("",0);
+    label->setPixmap(QPixmap(":/root/icons/mouse_control.png"));
     layout->addWidget(label);
     dragArea->setLayout(layout);
 
-//    QFileInfo f("../src/icons/mouse_control.png");
+//    QFileInfo f(":/root/icons/mouse_control.png");
 //    bool exists = f.exists();
 
-    QPushButton * okayElement = new QPushButton();
-    okayElement->setIcon(QIcon(":/root/src/icons/accept.png"));
-    okayElement->setName("OkayElement");
+    QPushButton * okayElement = new QPushButton(0);
+    okayElement->setIcon(QIcon(":/root/icons/accept.png"));
+    okayElement->setObjectName("OkayElement");
     okayElement->setBaseSize(defaultButtonSize, defaultButtonSize);
 
-    QPushButton * nextElement = new QPushButton();
-    nextElement->setIcon(QIcon(":/root/src/icons/up.png"));
-    nextElement->setName("NextElement");
+    QPushButton * nextElement = new QPushButton(0);
+    nextElement->setIcon(QIcon(":/root/icons/up.png"));
+    nextElement->setObjectName("NextElement");
     nextElement->setBaseSize(defaultButtonSize, defaultButtonSize);
 
-    QPushButton * previousElement = new QPushButton();
-    previousElement->setIcon(QIcon(":/root/src/icons/down.png"));
-    previousElement->setName("PreviousElement");
+    QPushButton * previousElement = new QPushButton(0);
+    previousElement->setIcon(QIcon(":/root/icons/down.png"));
+    previousElement->setObjectName("PreviousElement");
     previousElement->setBaseSize(defaultButtonSize, defaultButtonSize);
 
-    QPushButton * cancelElement = new QPushButton();
-    cancelElement->setIcon(QIcon(":/root/src/icons/reject.png"));
-    cancelElement->setName("CancelElement");
+    QPushButton * cancelElement = new QPushButton(0);
+    cancelElement->setIcon(QIcon(":/root/icons/reject.png"));
+    cancelElement->setObjectName("CancelElement");
     cancelElement->setBaseSize(defaultButtonSize, defaultButtonSize);
 
     toolbar->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
@@ -137,6 +143,7 @@ EdgeMenuToolBar * CreateClassDialogMenu()
     toolbar->addWidget(previousElement);
     toolbar->addAction(clipboardAction);
     toolbar->addWidget(okayElement);
+    #endif
     return toolbar;
 }
 
diff --git a/src/Generators.pro b/src/Generators.pro
index 06f3bbabe..391b75db0 100644
--- a/src/Generators.pro
+++ b/src/Generators.pro
@@ -1,5 +1,18 @@
 TEMPLATE = subdirs
-SUBDIRS += CppGenerator CppReverse CppRoundtrip IdlGenerator JavaCat JavaGenerator JavaReverse JavaRoundtrip PhpGenerator PhpReverse PythonGenerator RoundtripBody 
+SUBDIRS += CppGenerator\
+        CppReverse\
+        CppRoundtrip\
+        IdlGenerator\
+        JavaCat\
+        JavaGenerator\
+        JavaReverse\
+        JavaRoundtrip\
+        PhpGenerator\
+        PhpReverse\
+        PythonGenerator\
+        RoundtripBody\
+        ProjectControl\
+        ProjectSynchro
 
 CODECFORTR      = UTF-8
 CODECFORSRC     = UTF-8
diff --git a/src/IdlGenerator/IdlGenerator.pro b/src/IdlGenerator/IdlGenerator.pro
index d33483d07..66098d570 100644
--- a/src/IdlGenerator/IdlGenerator.pro
+++ b/src/IdlGenerator/IdlGenerator.pro
@@ -1,6 +1,8 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
-
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES          = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \
         UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \
         UmlExtraClassMember.cpp \
@@ -98,23 +100,21 @@ SOURCES          = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \
 
 
 TARGET          = idl_generator
-DEFINES          = WITHIDL BooL=bool
-INCLUDEPATH   = ../Tools ../IdlGenerator ../
+DEFINES          += WITHIDL BooL=bool FALSE=false TRUE=true
+INCLUDEPATH   += ../Tools ../IdlGenerator ../
 DESTDIR = ../../bin
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network
+#qt3support
 
-QMAKE_CXXFLAGS += -std=gnu++11
-Release{
-    MOC_DIR = ../../bin/MOC_release/idl_gen
-    OBJECTS_DIR = ../../bin/Obj_release/idl_gen
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/idl_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_release/idl_generator
 }
-
-Debug{
-    MOC_DIR = ../../bin/MOC_debug/idl_gen
-    OBJECTS_DIR = ../../bin/Obj_debug/idl_gen
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/idl_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/idl_generator
 }
-
-    DESTDIR = ../../bin
-
diff --git a/src/IdlGenerator/UmlArtifact.cpp b/src/IdlGenerator/UmlArtifact.cpp
index 801d95e22..f2010359e 100644
--- a/src/IdlGenerator/UmlArtifact.cpp
+++ b/src/IdlGenerator/UmlArtifact.cpp
@@ -31,7 +31,7 @@
 #include "misc/mystr.h"
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 #include "UmlArtifact.h"
 #include "IdlSettings.h"
@@ -101,9 +101,9 @@ void UmlArtifact::generate()
 #if 0
         // compute dependencies
 
-        Q3PtrList<CppRefType> dependencies;
+        QList<CppRefType *> dependencies;
 #endif
-        const Q3PtrVector<UmlClass> & cls = associatedClasses();
+        const QVector<UmlClass*> & cls = associatedClasses();
         unsigned n = cls.count();
         unsigned index;
 
diff --git a/src/IdlGenerator/UmlClass.cpp b/src/IdlGenerator/UmlClass.cpp
index c15f63b79..aa88715ae 100644
--- a/src/IdlGenerator/UmlClass.cpp
+++ b/src/IdlGenerator/UmlClass.cpp
@@ -30,7 +30,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "UmlClass.h"
 #include "UmlRelation.h"
@@ -70,7 +70,7 @@ void UmlClass::generate(QTextStream & f)
     if (idlDecl().isEmpty())
         return;
 
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     WrapperStr stereotype = idl_stereotype();
     bool a_typedef = (stereotype == "typedef");
     bool an_enum = (stereotype == "enum");
@@ -80,7 +80,7 @@ void UmlClass::generate(QTextStream & f)
     WrapperStr templ;
     const char * sep;
     WrapperStr indent = "";
-    unsigned index;
+    int index;
 
     while ((*p == ' ') || (*p == '\t'))
         indent += *p++;
@@ -148,10 +148,10 @@ void UmlClass::generate(QTextStream & f)
                 f << baseType().toString();
 
                 UmlClass * cl = baseType().type;
-                const Q3ValueList<UmlActualParameter> & actuals = this->actuals();
+                const QList<UmlActualParameter> & actuals = this->actuals();
 
                 if ((cl != 0) && !actuals.isEmpty()) {
-                    Q3ValueList<UmlActualParameter>::ConstIterator it;
+                    QList<UmlActualParameter>::ConstIterator it;
 
                     for (it = actuals.begin(); it != actuals.end(); ++it)
                         if ((*it).superClass() == cl)
@@ -170,7 +170,7 @@ void UmlClass::generate(QTextStream & f)
 
                 // items declaration
 
-                unsigned n = 0;
+                int n = 0;
 
                 for (index = 0; index != ch.size(); index += 1)
                     if ((ch[index]->kind() != aNcRelation) &&
@@ -274,9 +274,9 @@ void UmlClass::write(QTextStream & f)
         else if ((index = s.find("${Name}")) != -1)
             s.replace(index, 7, capitalize(name()));
         else if ((index = s.find("${NAME}")) != -1)
-            s.replace(index, 7, name().upper());
+            s.replace(index, 7, name().upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            s.replace(index, 7, name().lower());
+            s.replace(index, 7, name().lower().toLatin1().constData());
 
         f << s;
     }
diff --git a/src/IdlGenerator/UmlClass.h b/src/IdlGenerator/UmlClass.h
index a14e3b638..85d5043a7 100644
--- a/src/IdlGenerator/UmlClass.h
+++ b/src/IdlGenerator/UmlClass.h
@@ -28,11 +28,8 @@
 #ifndef UMLCLASS_H
 #define UMLCLASS_H
 
-#include <q3dict.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-
 #include "UmlBaseClass.h"
 
 class QTextStream;
diff --git a/src/IdlGenerator/UmlClassItem.h b/src/IdlGenerator/UmlClassItem.h
index 4723684cf..779dea645 100644
--- a/src/IdlGenerator/UmlClassItem.h
+++ b/src/IdlGenerator/UmlClassItem.h
@@ -27,12 +27,8 @@
 
 #ifndef UMLCLASSITEM_H
 #define UMLCLASSITEM_H
-
-#include <q3ptrlist.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-
 #include "UmlBaseClassItem.h"
 
 class QTextStream;
diff --git a/src/IdlGenerator/UmlClassView.cpp b/src/IdlGenerator/UmlClassView.cpp
index abe804ded..c0b1747e8 100644
--- a/src/IdlGenerator/UmlClassView.cpp
+++ b/src/IdlGenerator/UmlClassView.cpp
@@ -29,9 +29,9 @@
 
 void UmlClassView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/IdlGenerator/UmlDeploymentView.cpp b/src/IdlGenerator/UmlDeploymentView.cpp
index c34ceb554..87d719f8e 100644
--- a/src/IdlGenerator/UmlDeploymentView.cpp
+++ b/src/IdlGenerator/UmlDeploymentView.cpp
@@ -29,8 +29,8 @@
 
 void UmlDeploymentView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
diff --git a/src/IdlGenerator/UmlItem.cpp b/src/IdlGenerator/UmlItem.cpp
index 891045a5f..cda18d3d5 100644
--- a/src/IdlGenerator/UmlItem.cpp
+++ b/src/IdlGenerator/UmlItem.cpp
@@ -38,7 +38,7 @@ UmlItem::~UmlItem()
 
 void UmlItem::manage_comment(const char *& p, const char *& pp)
 {
-    static QString the_comment;
+    static QByteArray the_comment;
 
     p += 10;
 
@@ -73,7 +73,7 @@ void UmlItem::manage_comment(const char *& p, const char *& pp)
 
 void UmlItem::manage_description(const char *& p, const char *& pp)
 {
-    static QString the_comment;
+    static QByteArray the_comment;
 
     p += 14;
 
@@ -81,7 +81,7 @@ void UmlItem::manage_description(const char *& p, const char *& pp)
         description().isEmpty())
         return;
 
-    the_comment = description().operator QString();
+    the_comment = (description().operator QString()).toLatin1();
 
     switch (*p) {
     case 0:
@@ -102,7 +102,7 @@ void UmlItem::manage_alias(const char *& p, QTextStream & ts)
     const char * pclosed;
 
     if ((p[1] == '{') && ((pclosed = strchr(p + 2, '}')) != 0)) {
-        Q3CString key(p + 2, pclosed - p - 1);
+        QByteArray key(p + 2, pclosed - p - 1);
         WrapperStr value;
         UmlItem * node = this;
 
diff --git a/src/IdlGenerator/UmlOperation.cpp b/src/IdlGenerator/UmlOperation.cpp
index 1c7a5411d..e8d9504db 100644
--- a/src/IdlGenerator/UmlOperation.cpp
+++ b/src/IdlGenerator/UmlOperation.cpp
@@ -30,7 +30,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "UmlOperation.h"
 #include "UmlSettings.h"
@@ -40,10 +40,10 @@
 #include "UmlRelation.h"
 #include "util.h"
 
-static bool generate_dir(const Q3ValueList<UmlParameter> & params,
+static bool generate_dir(const QList<UmlParameter> & params,
                          unsigned rank, QTextStream & f)
 {
-    if (rank >= params.count())
+    if ((int)rank >= params.count())
         return FALSE;
 
     switch (params[rank].dir) {
@@ -62,20 +62,20 @@ static bool generate_dir(const Q3ValueList<UmlParameter> & params,
     return TRUE;
 }
 
-static bool generate_type(const Q3ValueList<UmlParameter> & params,
+static bool generate_type(const QList<UmlParameter> & params,
                           unsigned rank, QTextStream & f)
 {
-    if (rank >= params.count())
+    if ((int)rank >= params.count())
         return FALSE;
 
     UmlClass::write(f, params[rank].type);
     return TRUE;
 }
 
-static bool generate_var(const Q3ValueList<UmlParameter> & params,
+static bool generate_var(const QList<UmlParameter> & params,
                          unsigned rank, QTextStream & f)
 {
-    if (rank >= params.count())
+    if ((int)rank >= params.count())
         return FALSE;
 
     f << params[rank].name;
@@ -113,9 +113,9 @@ WrapperStr UmlOperation::compute_name()
         else if ((index = get_set_spec.find("${Name}")) != -1)
             get_set_spec.replace(index, 7, capitalize(s));
         else if ((index = s.find("${NAME}")) != -1)
-            get_set_spec.replace(index, 7, s.upper());
+            get_set_spec.replace(index, 7, s.upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            get_set_spec.replace(index, 7, s.lower());
+            get_set_spec.replace(index, 7, s.lower().toLatin1().constData());
 
         return get_set_spec;
     }
@@ -138,8 +138,8 @@ void UmlOperation::generate_decl(QTextStream & f,
 
         const char * p = idlDecl();
         const char * pp = 0;
-        const Q3ValueList<UmlParameter> & params = this->params();
-        const Q3ValueList<UmlTypeSpec> & exceptions = this->exceptions();
+        const QList<UmlParameter> & params = this->params();
+        const QList<UmlTypeSpec> & exceptions = this->exceptions();
         unsigned rank;
 
         while ((*p == ' ') || (*p == '\t'))
@@ -234,7 +234,7 @@ void UmlOperation::generate_decl(QTextStream & f,
 
                 if (! exceptions.isEmpty()) {
                     const char * sep;
-                    Q3ValueList<UmlTypeSpec>::ConstIterator it;
+                    QList<UmlTypeSpec>::ConstIterator it;
 
                     for (it = exceptions.begin(), sep = " raises (";
                          it != exceptions.end();
diff --git a/src/IdlGenerator/UmlPackage.cpp b/src/IdlGenerator/UmlPackage.cpp
index a821f7842..488b3a4b7 100644
--- a/src/IdlGenerator/UmlPackage.cpp
+++ b/src/IdlGenerator/UmlPackage.cpp
@@ -50,7 +50,7 @@ static void create_directory(WrapperStr s)
             s.replace(index++, 1, "/");
     }
 
-    s = QDir::cleanDirPath(s) + "/";
+    s = QDir::cleanPath(s) + "/";
     index = s.find("/");
 
     int index2;
@@ -87,7 +87,7 @@ WrapperStr UmlPackage::path(const WrapperStr & f)
             if (!RootDir.isEmpty() && // empty -> error
                 QDir::isRelativePath(RootDir)) {
                 QFileInfo f(getProject()->supportFile());
-                QDir d(f.dirPath());
+                QDir d(f.path());
 
                 RootDir = d.filePath(RootDir);
             }
@@ -126,7 +126,7 @@ WrapperStr UmlPackage::path(const WrapperStr & f)
     if (! d.exists())
         create_directory(dir);	// don't return on error
 
-    return WrapperStr(d.filePath(f).toAscii().constData()) + WrapperStr(".") +
+    return WrapperStr(d.filePath(f).toLatin1().constData()) + WrapperStr(".") +
            IdlSettings::sourceExtension();
 }
 
@@ -139,9 +139,9 @@ WrapperStr UmlPackage::text_path(const WrapperStr & f)
 
 void UmlPackage::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/IdlGenerator/main.cpp b/src/IdlGenerator/main.cpp
index 9bf39d74f..a25c71d08 100644
--- a/src/IdlGenerator/main.cpp
+++ b/src/IdlGenerator/main.cpp
@@ -54,7 +54,7 @@ int main(int argc, char ** argv)
 
             s = "<hr><font face=helvetica>Generation done : %1 warnings, %2 errors</font><br>";
             s=s.arg(QString::number(n_warnings())).arg(QString::number(n_errors()));
-            UmlCom::trace(s);
+            UmlCom::trace(s.toLatin1().constData());
 
             UmlCom::message("");
 
diff --git a/src/IdlGenerator/util.cpp b/src/IdlGenerator/util.cpp
index 86f227ea9..76ec6755e 100644
--- a/src/IdlGenerator/util.cpp
+++ b/src/IdlGenerator/util.cpp
@@ -80,7 +80,7 @@ WrapperStr current_indent(const char * p, const char * begin)
     while ((p != begin) && ((p[-1] == ' ') || (p[-1] == '\t')))
         indent.prepend(*--p);
 
-    return WrapperStr(indent.toAscii().constData());
+    return WrapperStr(indent.toLatin1().constData());
 }
 
 //
diff --git a/src/IdlGenerator/util.h b/src/IdlGenerator/util.h
index c0655133f..b97947385 100644
--- a/src/IdlGenerator/util.h
+++ b/src/IdlGenerator/util.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef _UTIL_H
-#define _UTIL_h
+#define _UTIL_H
 
 #include "misc/mystr.h"
 
@@ -44,4 +44,5 @@ extern void incr_error();
 extern void incr_warning();
 extern int n_errors();
 extern int n_warnings();
+
 #endif
diff --git a/src/JavaCat/BrowserNode.cpp b/src/JavaCat/BrowserNode.cpp
index dd84e8bb4..9ec1691e3 100644
--- a/src/JavaCat/BrowserNode.cpp
+++ b/src/JavaCat/BrowserNode.cpp
@@ -34,24 +34,31 @@
 #include "anItemKind.h"
 #include "BrowserView.h"
 //Added by qt3to4:
-#include <Q3PtrCollection>
+
 
 BrowserNode::BrowserNode(BrowserView * parent, const char * n)
-    : TreeItem(parent, n)
+    : TreeItem(parent)
 {
+    setText(0,n);
 }
 
 BrowserNode::BrowserNode(BrowserNode * parent, const char * n)
-    : TreeItem(parent, n)
+    : TreeItem(parent)
 {
     // move it at end
-    TreeItem * child = parent->firstChild();
+    setText(0,n);
+    BrowserNode * child = parent->firstChild();
 
     while (child->nextSibling())
         child = child->nextSibling();
 
     if (child != this)
-        moveItem(child);
+    {
+        //moveItem(child);
+        parent->takeChild(parent->indexOfChild(this));
+        parent->insertChild(parent->indexOfChild(child)+1, this);
+
+    }
 }
 
 void BrowserNode::activated()
@@ -67,24 +74,63 @@ void BrowserNode::selected()
 void BrowserNodeList::search(BrowserNode * bn, int k,
                              const QString & s, bool cs)
 {
-    TreeItem * child;
+    BrowserNode * child;
 
     for (child = bn->firstChild(); child != 0; child = child->nextSibling()) {
         if ((k == aPackage)
             ? (((BrowserNode *) child)->isa_package() &&
-               (child->text(0).find(s, 0, cs) != -1))
+               (child->text(0).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1))
             : (!((BrowserNode *) child)->isa_package() &&
                ((k == aClass)
-                ? (child->text(0).find(s, 0, cs) != -1)
-                : (WrapperStr(((Class *) child)->get_description()).operator QString().find(s, 0, cs) != -1))))
+                ? (child->text(0).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1)
+                : (WrapperStr(((Class *) child)->get_description()).operator QString().indexOf(s, 0,(Qt::CaseSensitivity) cs) != -1))))
             append((BrowserNode *) child);
 
         search((BrowserNode *) child, k, s, cs);
     }
 }
 
-int BrowserNodeList::compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2)
+bool BrowserNodeList::lessThan(BrowserNode *a, BrowserNode *b)
+{
+    return a->text(0) < b->text(0);
+}
+
+void BrowserNodeList::sort()
 {
-    return ((BrowserNode *) item1)->text(0)
-           .compare(((BrowserNode *) item2)->text(0));
+    std::sort(begin(), end(), lessThan);
 }
+BrowserNode *BrowserNode::nextSibling()
+{
+    for(int i = 0; i < parent()->childCount(); i++)
+    {
+        if(parent()->child(i) == this)
+        {
+            if((i+1)<parent()->childCount())
+                return (BrowserNode *)parent()->child(i+1);
+            break;
+        }
+    }
+    return NULL;
+}
+/*void BrowserNode::paintCell(QPainter * p, const QPalette & cg, int column,
+                            int width, int alignment)
+{
+    BrowserNode::data used instead
+    const QColor & bg = p->background().color();
+    QBrush backBrush = p->background();
+    if (is_marked) {
+        p->setBackgroundMode(::Qt::OpaqueMode);
+        backBrush.setColor(UmlRedColor);
+        p->setBackground(backBrush);
+    }
+
+    p->setFont((is_writable()) ? BoldFont : NormalFont);
+    QTreeWidgetItem::paintCell(p, cg, column, width, alignment);
+    if (is_marked) {
+        p->setBackgroundMode(::Qt::TransparentMode);
+        backBrush.setColor(bg);
+        p->setBackground(backBrush);
+    }
+
+
+}*/
diff --git a/src/JavaCat/BrowserNode.h b/src/JavaCat/BrowserNode.h
index bda314b66..88f47ff05 100644
--- a/src/JavaCat/BrowserNode.h
+++ b/src/JavaCat/BrowserNode.h
@@ -31,8 +31,8 @@
 #include "TreeItem.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrCollection>
-#include <Q3PtrList>
+
+
 
 #ifndef REVERSE
 class BrowserView;
@@ -45,6 +45,7 @@ class Class;
 class BrowserNode : public TreeItem
 {
 public:
+    BrowserNode* firstChild() const {return /*(BrowserNode*)this->child(0)*/0;}
     BrowserNode(BrowserNode * parent, const char * n);
     virtual ~BrowserNode() {};	// to avoid compiler warning
 
@@ -66,6 +67,8 @@ class BrowserNode : public TreeItem
     virtual void backup(QDataStream  & dt) const = 0;
     virtual QString get_path() const = 0;
 #endif
+    BrowserNode* nextSibling();
+    virtual QVariant data(int column, int role) const override { Q_UNUSED(column); Q_UNUSED(role); return QVariant(); }
 };
 
 
@@ -73,13 +76,14 @@ class BrowserNode : public TreeItem
 
 // a sortable list of BrowserNode
 
-#include <q3ptrlist.h>
 
-class BrowserNodeList : public Q3PtrList<BrowserNode>
+
+class BrowserNodeList : public QList<BrowserNode *>
 {
 public:
     void search(BrowserNode * bn, int k, const QString & s, bool cs);
-    virtual int compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2);
+    static bool lessThan(BrowserNode *a, BrowserNode *b);
+    void sort();
 };
 
 #endif
diff --git a/src/JavaCat/BrowserSearchDialog.cpp b/src/JavaCat/BrowserSearchDialog.cpp
index 9428696c9..1e93f2d27 100644
--- a/src/JavaCat/BrowserSearchDialog.cpp
+++ b/src/JavaCat/BrowserSearchDialog.cpp
@@ -27,15 +27,15 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
-#include <q3groupbox.h>
+#include <qgroupbox.h>
 //Added by qt3to4:
-#include <Q3GridLayout>
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "BrowserSearchDialog.h"
 #include "BrowserView.h"
@@ -60,24 +60,25 @@ static const struct {
 };
 
 BrowserSearchDialog::BrowserSearchDialog(const QPoint & p)
-    : QDialog(0, "Browser search", TRUE)
+    : QDialog(0 )
 {
-    setCaption("Browser search");
+    setModal(true);
+    setWindowTitle("Browser search");
     move(p);
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
-
-    Q3GridLayout * gl = new Q3GridLayout(vbox, 4, 2, 5/*space*/);
+    QGridLayout * gl = new QGridLayout(this/*4, 2, 5space*/);
+    vbox->addLayout(gl);
 
     gl->addWidget(new QLabel("Kind", this), 0, 0, Qt::AlignLeft);
-    kind = new Q3ComboBox(FALSE, this);
+    kind = new QComboBox(this);
 
     for (int index = 0; index != sizeof(Kinds) / sizeof(*Kinds); index += 1)
-        kind->insertItem(Kinds[index].lbl);
+        kind->addItem(Kinds[index].lbl);
 
-    kind->setCurrentItem(saved_kind);
+    kind->setCurrentIndex(saved_kind);
     gl->addWidget(kind, 0, 1);
 
     ed = new QLineEdit(this);
@@ -85,18 +86,22 @@ BrowserSearchDialog::BrowserSearchDialog(const QPoint & p)
     gl->addWidget(new QLabel("Containing", this), 1, 0, Qt::AlignLeft);
     gl->addWidget(ed, 1, 1);
 
-    Q3GroupBox * gb = new Q3GroupBox(2, Qt::Horizontal, this);
+    QGridLayout *gbLayout =new QGridLayout(this);
+    QGroupBox * gb = new QGroupBox(/*2, Qt::Horizontal,*/ this);
+    gb->setLayout(gbLayout);
 
     case_sensitive = new QCheckBox("case sensitive", gb);
+    gbLayout->addWidget(case_sensitive);
     case_sensitive->setChecked(saved_case_sensitive);
 
     gl->addWidget(gb, 2, 1);
 
     gl->addWidget(new QLabel("Result", this), 3, 0, Qt::AlignLeft);
-    results = new Q3ComboBox(FALSE, this);
+    results = new QComboBox(this);
     gl->addWidget(results, 3, 1);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout(this);
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
     QPushButton * search_b = new QPushButton("Search", this);
     QPushButton * select_b = new QPushButton("Select", this);
@@ -117,7 +122,8 @@ BrowserSearchDialog::BrowserSearchDialog(const QPoint & p)
 
 BrowserSearchDialog::~BrowserSearchDialog()
 {
-    saved_kind = kind->currentItem();
+
+    saved_kind = kind->currentIndex();
     saved_ed = ed->text();
     saved_case_sensitive = case_sensitive->isChecked();
 }
@@ -127,16 +133,14 @@ void BrowserSearchDialog::search()
     nodes.clear();
     results->clear();
 
-    nodes.search(Package::get_root(), Kinds[kind->currentItem()].k,
-                 ed->text(), case_sensitive->isChecked());
+    nodes.search(Package::get_root(), Kinds[kind->currentIndex()].k,
+                 ed->text(), (Qt::CaseSensitivity)case_sensitive->isChecked());
     nodes.sort();
 
-    BrowserNode * bn;
-
-    for (bn = nodes.first(); bn != 0; bn = nodes.next()) {
+    foreach (BrowserNode *bn, nodes) {
         QString up = ((BrowserNode *) bn->parent())->get_path();
 
-        results->insertItem((up.isEmpty())
+        results->addItem((up.isEmpty())
                             ? QString(bn->text(0))
                             : bn->text(0) + QString("   [") + up + "]");
     }
@@ -145,6 +149,6 @@ void BrowserSearchDialog::search()
 void BrowserSearchDialog::select()
 {
     if (results->count() != 0)
-        BrowserView::select(nodes.at(results->currentItem()));
+        BrowserView::select(nodes.at(results->currentIndex()));
 }
 
diff --git a/src/JavaCat/BrowserSearchDialog.h b/src/JavaCat/BrowserSearchDialog.h
index 2a361d98b..aa4024829 100644
--- a/src/JavaCat/BrowserSearchDialog.h
+++ b/src/JavaCat/BrowserSearchDialog.h
@@ -32,7 +32,7 @@
 
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QLineEdit;
 class QCheckBox;
 
@@ -42,8 +42,8 @@ class BrowserSearchDialog : public QDialog
 
 protected:
     BrowserNodeList nodes;
-    Q3ComboBox * kind;
-    Q3ComboBox * results;
+    QComboBox * kind;
+    QComboBox * results;
     QLineEdit * ed;
     QCheckBox * case_sensitive;
 
diff --git a/src/JavaCat/BrowserView.cpp b/src/JavaCat/BrowserView.cpp
index 7d2509695..2f0b4e4b0 100644
--- a/src/JavaCat/BrowserView.cpp
+++ b/src/JavaCat/BrowserView.cpp
@@ -30,13 +30,13 @@
 
 BrowserView * BrowserView::the;
 
-BrowserView::BrowserView(QWidget * parent) : Q3ListView(parent)
+BrowserView::BrowserView(QWidget * parent) : QTreeWidget(parent)
 {
     the = this;
-
-    setSorting(-1);		// manual sorting
-    addColumn("browser          ");
-    setTreeStepSize(18);
+    //setSorting(-1);		// manual sorting
+   // addColumn("browser          ");
+    headerItem()->setText(0, QObject::tr("browser          "));
+    //setTreeStepSize(18);
 
     connect(this, SIGNAL(selectionChanged(Q3ListViewItem *)),
             this, SLOT(selected(Q3ListViewItem *)));
@@ -46,18 +46,20 @@ BrowserView::BrowserView(QWidget * parent) : Q3ListView(parent)
 
 }
 
-void BrowserView::select(Q3ListViewItem * b)
+void BrowserView::select(QTreeWidgetItem *b)
 {
-    the->ensureItemVisible(b);
-    the->setSelected(b, TRUE);
+    //the->ensureItemVisible(b);
+    the->scrollToItem(b);
+    //the->setSelected(b, TRUE);
+    the->select(b);
 }
 
-void BrowserView::selected(Q3ListViewItem * b)
+void BrowserView::selected(QTreeWidgetItem * b)
 {
     ((BrowserNode *) b)->activated();
 }
 
-void BrowserView::rightPressed(Q3ListViewItem * item)
+void BrowserView::rightPressed(QTreeWidgetItem * item)
 {
     if (item != 0)
         ((BrowserNode *) item)->menu();
@@ -65,7 +67,9 @@ void BrowserView::rightPressed(Q3ListViewItem * item)
 
 void BrowserView::refer(const QString & href)
 {
-    BrowserNode * bn = (BrowserNode *) selectedItem();
+    BrowserNode * bn = nullptr;// = (BrowserNode *) selectedItem();
+    if (selectedItems().count())
+        bn = (BrowserNode *)selectedItems().at(0);
 
     if (bn != 0)
         bn->refer(href);
diff --git a/src/JavaCat/BrowserView.h b/src/JavaCat/BrowserView.h
index 025b17d01..d7aacad43 100644
--- a/src/JavaCat/BrowserView.h
+++ b/src/JavaCat/BrowserView.h
@@ -28,9 +28,9 @@
 #ifndef BROWSERVIEW_H
 #define BROWSERVIEW_H
 
-#include <q3listview.h>
+#include <qtreewidget.h>
 
-class BrowserView : public Q3ListView
+class BrowserView : public QTreeWidget
 {
     Q_OBJECT
 
@@ -43,11 +43,11 @@ class BrowserView : public Q3ListView
     static BrowserView * instance() {
         return the;
     };
-    static void select(Q3ListViewItem * b);
+    static void select(QTreeWidgetItem *b);
 
 protected slots:
-    void selected(Q3ListViewItem *);
-    void rightPressed(Q3ListViewItem *);
+    void selected(QTreeWidgetItem *);
+    void rightPressed(QTreeWidgetItem *);
 
 public slots:
     void refer(const QString & href);
diff --git a/src/JavaCat/Class.cpp b/src/JavaCat/Class.cpp
index 73148caa0..9fc565f0b 100644
--- a/src/JavaCat/Class.cpp
+++ b/src/JavaCat/Class.cpp
@@ -29,16 +29,16 @@
 #include <qdatastream.h>
 #ifndef REVERSE
 #include <qapplication.h>
-#include <q3popupmenu.h>
+#include <qmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 #include <qmessagebox.h>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include "misc/mystr.h"
 #include <QPixmap>
 //Added by qt3to4:
-#include <Q3PtrList>
+
 #endif
 
 #include "Class.h"
@@ -63,7 +63,39 @@ UmlArtifact * Class::CurrentArtifact;
 #include "Pixmap.h"
 #include "ShowFileDialog.h"
 
-Q3PtrList<Class> Class::Historic;
+HistoricList Class::Historic;
+
+void HistoricList::appendClass(Class *klass)
+{
+    while (current + 1 != Historic.size())
+        Historic.removeLast();
+
+    Historic.append(klass);
+    ++current;
+}
+
+bool HistoricList::hasPrev() const
+{
+    return current != 0;
+}
+
+Class *HistoricList::prev()
+{
+    --current;
+    return Historic[current];
+}
+
+bool HistoricList::hasNext() const
+{
+    return current + 1 < Historic.size();
+}
+
+Class *HistoricList::next()
+{
+    ++current;
+    return Historic[current];
+}
+
 #endif
 
 Class::Class(BrowserNode * p, const char * n, char st)
@@ -131,15 +163,15 @@ UmlClass * Class::get_uml()
     UmlItem * p = (((BrowserNode *) parent())->isa_package())
                   ? (UmlItem *)((Package *) parent())->get_uml()->get_classview()
                   : (UmlItem *)((Class *) parent())->get_uml();
-    WrapperStr str = WrapperStr(text(0).toAscii().constData());
+    WrapperStr str = WrapperStr(text(0).toLatin1().constData());
 
     uml = UmlBaseClass::create(p, str);
 
     if (uml == 0) {
         // probably already exist
-        const Q3PtrVector<UmlItem> & ch = p->children();
-        UmlItem ** v = ch.data();
-        UmlItem ** const vsup = v + ch.size();
+        const QVector<UmlItem*> & ch = p->children();
+        UmlItem *const* v = ch.data();
+        UmlItem *const*  vsup = v + ch.size();
         UmlItem * x;
 
         for (; v != vsup; v += 1) {
@@ -152,9 +184,9 @@ UmlClass * Class::get_uml()
         if (uml == 0) {
 #ifdef REVERSE
             UmlCom::message("");
-            UmlCom::trace(QString("<font face=helvetica><b>cannot create class <i>")
+            UmlCom::trace(QString(QString("<font face=helvetica><b>cannot create class <i>")
                           + text(0) + "</i> under <i>"
-                          + parent()->text(0) + "</b></font><br>");
+                          + parent()->text(0) + "</b></font><br>").toLatin1().constData());
             throw 0;
 #else
             QMessageBox::critical(0, "Fatal Error",
@@ -297,8 +329,8 @@ FormalParameterList::ConstIterator it;
 #ifdef ROUNDTRIP
 
 if (roundtrip) {
-    Q3ValueList<UmlFormalParameter> fs = uml->formals();
-    Q3ValueList<UmlFormalParameter>::ConstIterator it2;
+    QList<UmlFormalParameter> fs = uml->formals();
+    QList<UmlFormalParameter>::ConstIterator it2;
 
     for (rank = 0, it = formals.begin(), it2 = fs.begin();
          (it != formals_end) && (it2 != fs.end());
@@ -348,9 +380,9 @@ return uml;
 #ifndef ROUNDTRIP
 bool Class::already_in_bouml()
 {
-    const Q3PtrVector<UmlItem> & ch = get_uml()->children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = get_uml()->children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         if ((*v)->kind() != aClass)
@@ -366,9 +398,9 @@ bool Class::already_in_bouml()
 bool Class::reverse(ClassContainer * container, WrapperStr stereotype,
                     WrapperStr annotation, bool abstractp, bool finalp,
                     aVisibility visibility, WrapperStr & path,
-                    Q3ValueList<FormalParameterList> tmplts
+                    QList<FormalParameterList> tmplts
 #ifdef ROUNDTRIP
-                    , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                    , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
                    )
 {
@@ -406,7 +438,7 @@ bool Class::reverse(ClassContainer * container, WrapperStr stereotype,
     }
 
     bool roundtrip = FALSE;
-    Q3PtrList<UmlItem> expected_order;
+    QList<UmlItem *> expected_order;
 #else
     UmlClass * cl_uml = 0;
 #endif
@@ -672,9 +704,9 @@ bool Class::reverse(ClassContainer * container, WrapperStr stereotype,
             if (cl->updated) {
                 Statistic::one_class_updated_more();
 
-                UmlCom::trace(QString("<font face=helvetica>class <i>")
+                UmlCom::trace(QString(QString("<font face=helvetica>class <i>")
                               + cl->text(0) + "</i> updated from <i>"
-                              + Lex::filename() + "</i></font><br>");
+                              + Lex::filename() + "</i></font><br>").toLatin1().constData());
             }
         }
         else {
@@ -704,20 +736,20 @@ bool Class::reverse(ClassContainer * container, WrapperStr stereotype,
 }
 
 bool Class::manage_extends(ClassContainer * container,
-                           const Q3ValueList<FormalParameterList> & tmplts
+                           const QList<FormalParameterList> & tmplts
 #ifdef ROUNDTRIP
-                           , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                           , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                           )
 {
     // out of scanning
 #ifdef TRACE
-    QLOG_INFO() << name() << "->manage_extends()\n";
+    QLOG_INFO() << (uml ? uml->name() : "") << "->manage_extends()\n";
 #endif
 
     UmlTypeSpec typespec;
     Class * cl = 0;
-    Q3ValueList<UmlTypeSpec> actuals;
+    QList<UmlTypeSpec> actuals;
     WrapperStr str_actuals;
     WrapperStr dummy;
 
@@ -745,21 +777,21 @@ bool Class::manage_extends(ClassContainer * container,
 }
 
 bool Class::manage_implements(ClassContainer * container, aRelationKind k,
-                              const Q3ValueList<FormalParameterList> & tmplts
+                              const QList<FormalParameterList> & tmplts
 #ifdef ROUNDTRIP
-                              , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                              , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                              )
 {
     // out of scanning
 #ifdef TRACE
-    QLOG_INFO() << name() << "->manage_implements()\n";
+    QLOG_INFO() << (uml ? uml->name() : "") << "->manage_implements()\n";
 #endif
 
     for (;;) {
         UmlTypeSpec typespec;
         Class * cl = 0;
-        Q3ValueList<UmlTypeSpec> actuals;
+        QList<UmlTypeSpec> actuals;
         WrapperStr str_actuals;
         WrapperStr dummy;
 
@@ -801,10 +833,10 @@ bool Class::manage_implements(ClassContainer * container, aRelationKind k,
 }
 
 bool Class::add_inherit(aRelationKind k, UmlTypeSpec & typespec,
-                        Q3ValueList<UmlTypeSpec> & actuals,
+                        QList<UmlTypeSpec> & actuals,
                         WrapperStr & str_actuals
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        )
 {
@@ -816,9 +848,9 @@ bool Class::add_inherit(aRelationKind k, UmlTypeSpec & typespec,
 #ifdef ROUNDTRIP
 
     if (roundtrip) {
-        const Q3PtrVector<UmlItem> & ch = uml->children();
-        UmlItem ** v = ch.data();
-        UmlItem ** const vsup = v + ch.size();
+        const QVector<UmlItem*> & ch = uml->children();
+        UmlItem *const* v = ch.data();
+        UmlItem *const*  vsup = v + ch.size();
         UmlItem * x;
 
         rel = 0;
@@ -847,8 +879,8 @@ bool Class::add_inherit(aRelationKind k, UmlTypeSpec & typespec,
                             set_updated();
                         }
 
-                        Q3ValueList<UmlActualParameter> current_actuals = uml->actuals();
-                        Q3ValueList<UmlActualParameter>::ConstIterator iter_current;
+                        QList<UmlActualParameter> current_actuals = uml->actuals();
+                        QList<UmlActualParameter>::ConstIterator iter_current;
 
                         // search for first corresponding actual
                         for (iter_current = current_actuals.begin();
@@ -863,7 +895,7 @@ bool Class::add_inherit(aRelationKind k, UmlTypeSpec & typespec,
                         else  {
                             expected_decl = "${type}";
 
-                            Q3ValueList<UmlTypeSpec>::ConstIterator iter = actuals.begin();
+                            QList<UmlTypeSpec>::ConstIterator iter = actuals.begin();
 
                             do {
                                 if (!(*iter).equal((*iter_current).value())) {
@@ -920,7 +952,7 @@ bool Class::add_inherit(aRelationKind k, UmlTypeSpec & typespec,
         rel->set_JavaDecl("${type}");
 
         if (! actuals.isEmpty()) {
-            Q3ValueList<UmlTypeSpec>::ConstIterator iter;
+            QList<UmlTypeSpec>::ConstIterator iter;
             unsigned actual_rank = (typespec.explicit_type.isEmpty())
                                    ? uml->actuals().count()
                                    : 0;
@@ -955,12 +987,12 @@ void Class::inherit(Class * cl)
 
             if ((cl->uml != 0) && !cl->uml->is_created()) {
                 if (cl->uml->is_roundtrip_expected())
-                    ((Package *) cl->parent())->reverse_file(WrapperStr(f.toAscii().constData()),
+                    ((Package *) cl->parent())->reverse_file(WrapperStr(f.toLatin1().constData()),
                             cl->uml->associatedArtifact());
             }
             else
 #endif
-                ((Package *) cl->parent())->reverse_file(WrapperStr(f.toAscii().constData()));
+                ((Package *) cl->parent())->reverse_file(WrapperStr(f.toLatin1().constData()));
 
             Lex::pop_context();
             Package::pop_context();
@@ -970,25 +1002,29 @@ void Class::inherit(Class * cl)
         }
     }
 
-    Q3DictIterator<Class> it(cl->Defined);
+    QHashIterator<WrapperStr, Class*> it(cl->Defined);
 
-    while (it.current()) {
-        Defined.replace(it.currentKey(), it.current());
-        ++it;
+    while (it.hasNext()) {
+        it.next();
+        if(it.value())
+        {
+        Defined.insert(it.key(), it.value());
+        }
     }
 
-    Q3DictIterator<UmlClass> it_uml(cl->user_defined);
+    QHashIterator<WrapperStr,UmlClass*> it_uml(cl->user_defined);
 
-    while (it_uml.current()) {
-        user_defined.replace(it_uml.currentKey(), it_uml.current());
-        ++it_uml;
+    while (it_uml.hasNext()) {
+        it_uml.next();
+        if(it_uml.value())
+            user_defined.insert(it_uml.key(), it_uml.value());
     }
 }
 
 // this inherits uml_cl => it knowns uml_cl's sub-classes
 void Class::inherit(UmlClass * uml_cl, WrapperStr header)
 {
-    Q3PtrVector<UmlItem> ch = uml_cl->children();
+    QVector<UmlItem*> ch = uml_cl->children();
     UmlItem ** v = ch.data();
     UmlItem ** const vsup = v + ch.size();
     UmlItem * x;
@@ -997,7 +1033,7 @@ void Class::inherit(UmlClass * uml_cl, WrapperStr header)
         if ((x = *v)->kind() == aClass) {
             WrapperStr s = (header.isEmpty()) ? x->name() : header + x->name();
 
-            user_defined.replace(s, (UmlClass *) x);
+            user_defined.insert(s, (UmlClass *) x);
             s += ".";
             inherit((UmlClass *) x, s);
         }
@@ -1005,7 +1041,7 @@ void Class::inherit(UmlClass * uml_cl, WrapperStr header)
 }
 
 bool Class::get_formals(FormalParameterList & tmplt, bool name_only,
-                        Q3ValueList<FormalParameterList> & tmplts)
+                        QList<FormalParameterList> & tmplts)
 {
     // '<' already read
     tmplt.clear();
@@ -1085,7 +1121,7 @@ bool Class::get_formals(FormalParameterList & tmplt, bool name_only,
 
 bool Class::manage_member(WrapperStr s, WrapperStr & path
 #ifdef ROUNDTRIP
-                          , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                          , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                          )
 {
@@ -1116,8 +1152,8 @@ bool Class::manage_member(WrapperStr s, WrapperStr & path
     WrapperStr array;
     UmlTypeSpec type;
     bool type_read = FALSE;
-    Q3ValueList<FormalParameterList> tmplts;
-    Q3ValueList<UmlTypeSpec> actuals;
+    QList<FormalParameterList> tmplts;
+    QList<UmlTypeSpec> actuals;
     WrapperStr str_actuals;
     WrapperStr name;
     WrapperStr value;
@@ -1236,7 +1272,7 @@ bool Class::manage_member(WrapperStr s, WrapperStr & path
                 return FALSE;
             }
             else if (name.isEmpty()) {
-                if (type.toString() == WrapperStr(text(0).toAscii().constData())) {
+                if (type.toString() == WrapperStr(text(0).toLatin1().constData())) {
                     // constructor
                     name = text(0);
                     type.type = 0;
@@ -1415,7 +1451,7 @@ bool Class::manage_member(WrapperStr s, WrapperStr & path
 
 bool Class::manage_enum_items(
 #ifdef ROUNDTRIP
-    bool roundtrip, Q3PtrList<UmlItem> & expected_order
+    bool roundtrip, QList<UmlItem *> & expected_order
 #endif
 )
 {
@@ -1481,11 +1517,11 @@ Class * Class::localy_defined(QString name) const
 #endif
 
 void Class::compute_type(WrapperStr name, UmlTypeSpec & typespec,
-                         const Q3ValueList<FormalParameterList> & tmplts,
+                         const QList<FormalParameterList> & tmplts,
                          Class ** need_object)
 {
-    const Q3ValueList<UmlFormalParameter> formals = get_uml()->formals();
-    Q3ValueList<UmlFormalParameter>::ConstIterator it;
+    const QList<UmlFormalParameter> formals = get_uml()->formals();
+    QList<UmlFormalParameter>::ConstIterator it;
 
     for (it = formals.begin(); it != formals.end(); it++) {
         if ((*it).name() == name) {
@@ -1538,7 +1574,7 @@ void Class::compute_type(WrapperStr name, UmlTypeSpec & typespec,
 
         int index = s.find('.');
 
-        if ((index != -1) && (s.left(index) == (const char *) cl->text(0)))
+        if ((index != -1) && (s.left(index) == (const char *) cl->text(0).toLatin1().constData()))
             s = s.mid(index + 1);
         else
             break;
@@ -1557,7 +1593,7 @@ void Class::declare(const WrapperStr & name, Class * cl)
 {
     Defined.insert(name, cl);
 
-    WrapperStr s = WrapperStr(text(0).toAscii().constData()) + '.' + name;
+    WrapperStr s = WrapperStr(text(0).toLatin1().constData()) + '.' + name;
     ((BrowserNode *) parent())->declare(s, cl);
 }
 
@@ -1581,6 +1617,13 @@ const QPixmap * Class::pixmap(int) const
 void Class::paintCell(QPainter * p, const QColorGroup & cg, int column,
                       int width, int alignment)
 {
+    Q_UNUSED(p);
+    Q_UNUSED(cg);
+    Q_UNUSED(column);
+    Q_UNUSED(width);
+    Q_UNUSED(alignment);
+
+    /*
     if (abstractp) {
         QFont fnt = p->font();
 
@@ -1592,6 +1635,7 @@ void Class::paintCell(QPainter * p, const QColorGroup & cg, int column,
     }
     else
         BrowserNode::paintCell(p, cg, column, width, alignment);
+        */
 }
 
 // called when the user click on the node
@@ -1613,10 +1657,7 @@ void Class::selected()
 void Class::manage_historic()
 {
     // manage historic
-    while (Historic.getLast() != Historic.current())
-        Historic.removeLast();
-
-    Historic.append(this);
+    Historic.appendClass(this);
 }
 
 // called when the node is activated for any reason
@@ -1646,7 +1687,7 @@ void Class::activated()
 
         int index = 0;
 
-        while ((index = s.find("\n@", index)) != -1) {
+        while ((index = s.indexOf("\n@", index)) != -1) {
             if (s[index + 2].isLetter()) {
                 int index2 = index;
 
@@ -1676,8 +1717,8 @@ void Class::activated()
 
         index = 0;
 
-        while ((index = s.find("{@link ", index)) != -1) {
-            int index2 = s.find("}", index + 7);
+        while ((index = s.indexOf("{@link ", index)) != -1) {
+            int index2 = s.indexOf("}", index + 7);
 
             if (index2 == -1)
                 index += 7;
@@ -1697,13 +1738,13 @@ void Class::activated()
                     else {
                         // {@link X} => <a href="X">X</a>
                         QString X = s.mid(index + 7, index2 - index - 7);
-                        int index4 = X.find('#');
+                        int index4 = X.indexOf('#');
 
                         if (index4 != -1) {
                             // does not have class sub artifacts
                             // {@link X#Y} => <a href="X">X</a>.Y
                             X.truncate(index4);
-                            s.replace(s.find('#', index), 1, "\">" + X + "</a>.");
+                            s.replace(s.indexOf('#', index), 1, "\">" + X + "</a>.");
                             s.replace(index, 7, "<a href=\"");
                         }
                         else {
@@ -1714,14 +1755,14 @@ void Class::activated()
                 }
                 else {
                     QString X = s.mid(index + 7, index3 - index - 7);
-                    int index4 = X.find('#');
+                    int index4 = X.indexOf('#');
 
                     if (index4 != -1) {
                         // does not have class sub artifacts
                         // {@link X#Y Y} => <a href="X">X</a>.Y
                         X.truncate(index4);
                         s.remove(index3, index2 - index3 + 1);
-                        s.replace(s.find('#', index), 1, "\">" + X + "</a>.");
+                        s.replace(s.indexOf('#', index), 1, "\">" + X + "</a>.");
                         s.replace(index, 7, "<a href=\"");
                     }
                     else {
@@ -1743,29 +1784,38 @@ void Class::activated()
 
 void Class::historic_back()
 {
-    if (Historic.current() != Historic.getFirst())
+    if (Historic.hasPrev())
         BrowserView::select(Historic.prev());
 }
 
 void Class::historic_forward()
 {
-    if (Historic.current() != Historic.getLast())
+    if (Historic.hasNext())
         BrowserView::select(Historic.next());
 }
 
 void Class::menu()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
+    QAction *action;
+
+    action = m.addAction(text(0));
+    action->setData(-1);
 
-    m.insertItem(text(0), -1);
-    m.insertSeparator();
+    m.addSeparator();
 
     if (! reversed())
-        m.insertItem("Send it", 0);
+    {
+        m.addAction("Send it");
+        action->setData(0);
+    }
 
-    m.insertItem("Show file", 1);
+    m.addAction("Show file");
+    action->setData(1);
 
-    switch (m.exec(QCursor::pos())) {
+    action = m.exec(QCursor::pos());
+    if(action)
+    switch (action->data().toInt()) {
     case 0: {
         Class * cl = this;
         BrowserNode * b;
@@ -1802,59 +1852,59 @@ void Class::backup(QDataStream  & dt) const
 {
     switch (stereotype) {
     case 'i':
-        dt << ((Q_INT8)((abstractp) ? 'i' : 'I'));
+        dt << ((qint8)((abstractp) ? 'i' : 'I'));
         break;
 
     case 'e':
-        dt << ((Q_INT8) 'E');
+        dt << ((qint8) 'E');
         break;
 
     default:
         // class
-        dt << ((Q_INT8)((abstractp) ? 'c' : 'C'));
+        dt << ((qint8)((abstractp) ? 'c' : 'C'));
         break;
     }
 
-    Q_INT32 len;
+    qint32 len;
 
     len = text(0).length();
     dt << len;
-    dt.writeRawBytes(text(0), len);
+    dt.writeRawData(text(0).toLatin1().constData(), len);
 
     len = filename.length();
     dt << len;
-    dt.writeRawBytes(filename, len);
+    dt.writeRawData(filename, len);
 
     len = description.length();
     dt << len;
 
     if (!description.isEmpty())
-        dt.writeRawBytes(description, len);
+        dt.writeRawData(description, len);
 
     // sub classes
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         ((BrowserNode *) child)->backup(dt);
 
-    dt << ((Q_INT8) '@');
+    dt << ((qint8) '@');
 }
 
 #endif
 
 void Class::restore(QDataStream  & dt, char c, BrowserNode * parent)
 {
-    Q_INT32 len;
+    qint32 len;
 
     dt >> len;
     char * n = new char[len + 1];
-    dt.readRawBytes(n, len);
+    dt.readRawData(n, len);
     n[len] = 0;
 
     dt >> len;
     char * fn = new char[len + 1];
-    dt.readRawBytes(fn, len);
+    dt.readRawData(fn, len);
     fn[len] = 0;
 
     dt >> len;
@@ -1864,7 +1914,7 @@ void Class::restore(QDataStream  & dt, char c, BrowserNode * parent)
         d = 0;
     else {
         d = new char[len + 1];
-        dt.readRawBytes(d, len);
+        dt.readRawData(d, len);
         d[len] = 0;
     }
 
@@ -1906,7 +1956,7 @@ void Class::restore(QDataStream  & dt, char c, BrowserNode * parent)
 
     // sub classes
 
-    Q_INT8 k;
+    qint8 k;
 
     while (dt >> k, k != '@')
         restore(dt, (char) k, cl);
diff --git a/src/JavaCat/Class.h b/src/JavaCat/Class.h
index c55c0c493..4a2b68397 100644
--- a/src/JavaCat/Class.h
+++ b/src/JavaCat/Class.h
@@ -35,8 +35,8 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include "misc/mystr.h"
-#include <Q3ValueList>
-#include <Q3PtrList>
+#include <QList>
+
 
 #ifdef REVERSE
 class UmlArtifact;
@@ -46,12 +46,26 @@ class QPainter;
 class QColorGroup;
 #endif
 
+class Class;
+
+class HistoricList
+{
+    QList<Class *> Historic;
+    int current;
+public:
+    void appendClass(Class *klass);
+    bool hasPrev() const;
+    Class *prev();
+    bool hasNext() const;
+    Class *next();
+};
+
 class Class : public BrowserNode, public ClassContainer
 {
 protected:
     WrapperStr filename;
     UmlClass * uml;
-    Q3Dict<UmlClass> user_defined;
+    QHash<WrapperStr,UmlClass*> user_defined;
     char stereotype;	// 'c' : class, 'i' : interface, '@' @interface, 'e' : enum
     bool abstractp;
     bool reversedp;
@@ -66,40 +80,40 @@ class Class : public BrowserNode, public ClassContainer
     bool description_updatedp;
     WrapperStr description;
 
-    static Q3PtrList<Class> Historic;
+    static HistoricList Historic;
 #endif
     FormalParameterList formals;
 
     bool get_formals(FormalParameterList & tmplt, bool name_only,
-                     Q3ValueList<FormalParameterList> & tmplts);
+                     QList<FormalParameterList> & tmplts);
     bool manage_extends(ClassContainer * container,
-                        const Q3ValueList<FormalParameterList> & tmplts
+                        const QList<FormalParameterList> & tmplts
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        );
     bool manage_implements(ClassContainer * container, aRelationKind k,
-                           const Q3ValueList<FormalParameterList> & tmplts
+                           const QList<FormalParameterList> & tmplts
 #ifdef ROUNDTRIP
-                           , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                           , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                           );
     bool add_inherit(aRelationKind k, UmlTypeSpec & typespec,
-                     Q3ValueList<UmlTypeSpec> & actuals, WrapperStr & str_actual
+                     QList<UmlTypeSpec> & actuals, WrapperStr & str_actual
 #ifdef ROUNDTRIP
-                     , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                     , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                     );
     void inherit(Class * cl);
     void inherit(UmlClass * uml_cl, WrapperStr header = 0);
     bool manage_member(WrapperStr s, WrapperStr & path
 #ifdef ROUNDTRIP
-                       , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                       , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                       );
     bool manage_enum_items(
 #ifdef ROUNDTRIP
-        bool roundtrip, Q3PtrList<UmlItem> & expected_order
+        bool roundtrip, QList<UmlItem *> & expected_order
 #endif
     );
     void set_description(const char * p);
@@ -119,7 +133,7 @@ class Class : public BrowserNode, public ClassContainer
 #endif
 
     virtual void compute_type(WrapperStr type, UmlTypeSpec & typespec,
-                              const Q3ValueList<FormalParameterList> & tmplts,
+                              const QList<FormalParameterList> & tmplts,
                               Class ** need_object = 0);
     virtual Class * define(const WrapperStr & name, char st);
     virtual void declare(const WrapperStr &, Class *);
@@ -172,9 +186,9 @@ class Class : public BrowserNode, public ClassContainer
     static bool reverse(ClassContainer * container, WrapperStr stereotype,
                         WrapperStr annotation, bool abstractp, bool finalp,
                         aVisibility visibility,	WrapperStr & f,
-                        Q3ValueList<FormalParameterList> tmplts
+                        QList<FormalParameterList> tmplts
 #ifdef ROUNDTRIP
-                        , bool rndtrp, Q3PtrList<UmlItem> & expectedorder
+                        , bool rndtrp, QList<UmlItem *> & expectedorder
 #endif
                        );
 
diff --git a/src/JavaCat/ClassContainer.cpp b/src/JavaCat/ClassContainer.cpp
index 7ed50314e..c9a682d22 100644
--- a/src/JavaCat/ClassContainer.cpp
+++ b/src/JavaCat/ClassContainer.cpp
@@ -31,7 +31,7 @@
 #include "Lex.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 ClassContainer::~ClassContainer()
 {
@@ -45,8 +45,8 @@ ClassContainer::~ClassContainer()
 // among actuals, def is genericname<...${type}...>
 
 bool ClassContainer::read_type(UmlTypeSpec & typespec, Class ** cl,
-                               const Q3ValueList<FormalParameterList> & tmplts,
-                               Q3ValueList<UmlTypeSpec> * actuals,
+                               const QList<FormalParameterList> & tmplts,
+                               QList<UmlTypeSpec> * actuals,
                                WrapperStr & str_actuals, WrapperStr s,
                                UmlClass ** first_actual_class, WrapperStr & def,
                                WrapperStr & genericname)
diff --git a/src/JavaCat/ClassContainer.h b/src/JavaCat/ClassContainer.h
index ad941414e..95fded16c 100644
--- a/src/JavaCat/ClassContainer.h
+++ b/src/JavaCat/ClassContainer.h
@@ -28,10 +28,10 @@
 #ifndef _CLASS_CONTAINER_H
 #define _CLASS_CONTAINER_H
 
-#include <q3dict.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 #include "UmlClass.h"
 
 class Class;
@@ -44,13 +44,13 @@ class ClassContainer
     virtual ~ClassContainer();
 
     virtual void compute_type(WrapperStr type, UmlTypeSpec & typespec,
-                              const Q3ValueList<FormalParameterList> & tmplts,
+                              const QList<FormalParameterList> & tmplts,
                               Class ** need_object = 0) = 0;
     virtual Class * define(const WrapperStr & name, char st) = 0;
 
     bool read_type(UmlTypeSpec & typespec, Class ** cl,
-                   const Q3ValueList<FormalParameterList> & tmplts,
-                   Q3ValueList<UmlTypeSpec> * actuals,
+                   const QList<FormalParameterList> & tmplts,
+                   QList<UmlTypeSpec> * actuals,
                    WrapperStr & str_actual, WrapperStr s,
                    UmlClass ** first_actual_class, WrapperStr & def,
                    WrapperStr & genericname);
@@ -59,7 +59,7 @@ class ClassContainer
 #endif
 
 protected:
-    Q3Dict<Class> Defined;
+    QHash<WrapperStr, Class*> Defined;
 };
 
 #endif
diff --git a/src/JavaCat/CommentView.cpp b/src/JavaCat/CommentView.cpp
index a45b3488d..cd7fe2069 100644
--- a/src/JavaCat/CommentView.cpp
+++ b/src/JavaCat/CommentView.cpp
@@ -27,11 +27,11 @@
 
 #include "CommentView.h"
 
-CommentView::CommentView(QWidget * parent) : Q3TextBrowser/*QTextView*/(parent)
+CommentView::CommentView(QWidget * parent) : QTextBrowser/*QTextView*/(parent)
 {
 }
 
-void CommentView::setSource(const QString & name)
+void CommentView::setSource(const QUrl & name)
 {
     emit refer(name);
 }
diff --git a/src/JavaCat/CommentView.h b/src/JavaCat/CommentView.h
index 96dc2b6d0..98c805461 100644
--- a/src/JavaCat/CommentView.h
+++ b/src/JavaCat/CommentView.h
@@ -29,19 +29,19 @@
 #define COMMENTVIEW_H
 
 //#include <qtextview.h>
-#include <q3textbrowser.h>
+#include <qtextbrowser.h>
 
-class CommentView : public Q3TextBrowser/*QTextView*/
+class CommentView : public QTextBrowser/*QTextView*/
 {
     Q_OBJECT
 
 public:
     CommentView(QWidget * parent);
 
-    virtual void setSource(const QString & name);
+    virtual void setSource(const QUrl & name) override;
 
 signals:
-    void refer(const QString & name);
+    void refer(const QUrl & name);
 };
 
 #endif
diff --git a/src/JavaCat/javacat.pro b/src/JavaCat/JavaCat.pro
similarity index 87%
rename from src/JavaCat/javacat.pro
rename to src/JavaCat/JavaCat.pro
index 8b0ed2368..9cf610e65 100644
--- a/src/JavaCat/javacat.pro
+++ b/src/JavaCat/JavaCat.pro
@@ -1,7 +1,11 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 HEADERS          = JavaCatWindow.h BrowserView.h BrowserSearchDialog.h ShowFileDialog.h \
-        CommentView.h
+        CommentView.h \
+    menufactory.h
 SOURCES          = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \
         UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \
         UmlExtraClassMember.cpp \
@@ -98,30 +102,28 @@ SOURCES          = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \
     ../misc/mystr.cpp \
     ../Logging/QsLogDest.cpp \
     ../Logging/QsLog.cpp \
-    ../Logging/QsDebugOutput.cpp
+    ../Logging/QsDebugOutput.cpp \
+    menufactory.cpp
 
 TARGET          = java_catalog
-DEFINES          = WITHJAVA
-INCLUDEPATH   = ../Tools ../JavaCat
+DEFINES          += WITHJAVA TRUE=true FALSE=false
+INCLUDEPATH   += ../Tools ../JavaCat
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+#qt3support
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/java_cat/MOC_release
-    OBJECTS_DIR = bin/douml/java_cat/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/java_catalog
+    OBJECTS_DIR = $${DESTDIR}/obj_release/java_catalog
 }
-
-Debug{
-    MOC_DIR = bin/douml/java_cat/MOC_Debug
-    OBJECTS_DIR = bin/douml/java_cat/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/java_catalog
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/java_catalog
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/src/JavaCat/JavaCatWindow.cpp b/src/JavaCat/JavaCatWindow.cpp
index 733d7ad48..97e4c936e 100644
--- a/src/JavaCat/JavaCatWindow.cpp
+++ b/src/JavaCat/JavaCatWindow.cpp
@@ -28,23 +28,23 @@
 #include <stdlib.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
-#include <q3popupmenu.h>
+#include <qmenu.h>
 #include <qmenubar.h>
-#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <qsplitter.h>
-#include <qwindowsstyle.h>
-#include <qmotifstyle.h>
+//#include <qwindowsstyle.h>
+//#include <qmotifstyle.h>
 //#include <qmotifplusstyle.h>
-#include <q3whatsthis.h>
-#include <q3filedialog.h>
+#include <qwhatsthis.h>
+#include <qfiledialog.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qdatastream.h>
 #include <QTextStream>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 
 #include "JavaCatWindow.h"
@@ -61,6 +61,7 @@
 #include "scan.xpm"
 #include "left_xpm.xpm"
 #include "right_xpm.xpm"
+#include "menufactory.h"
 
 JavaCatWindow * JavaCatWindow::the;
 
@@ -73,102 +74,124 @@ const char * UpText = "To select the <i>browser</i> current item's parent.";
 const char * LeftText = "Go to previous selected <i>class</i>";
 const char * RightText = "Go to next selected <i>class</i>";
 
-JavaCatWindow::JavaCatWindow() : Q3MainWindow(0, "Java Catalog", Qt::WDestructiveClose)
+JavaCatWindow::JavaCatWindow() : QMainWindow(0)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
     the = this;
-    setCaption("Java Catalog");
+    setWindowTitle("Java Catalog");
     commented = 0;
 
-    Q3PopupMenu * menu;
+    QMenu * menu;
     QPixmap pixmap;
+    QAction *action;
 
-    Q3ToolBar * tools = new Q3ToolBar(this, "operations");
+    QToolBar * tools = new QToolBar("operations", this);
 
-    addToolBar(tools, "Operations", Qt::DockTop, TRUE);
+    addToolBar(Qt::TopToolBarArea, tools);
 
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&File", menu);
+    //menu = new QMenu(this);
+    menu = menuBar()->addMenu("&File");
 
     pixmap = QPixmap(fileopen);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Open", QString(),
-                                     this, SLOT(load()), tools, "open"),
-                     OpenText);
-    menu->setWhatsThis(menu->insertItem(pixmap, "&Open", this,
-                                        SLOT(load()), Qt::CTRL + Qt::Key_O),
-                       OpenText);
+    action = tools->addAction(pixmap,"Open", this, SLOT(load()));
+    action->setWhatsThis(OpenText);
+    action->setToolTip("open");
+
+
+    action = menu->addAction(pixmap,"&Open", this, SLOT(load()));
+    action->setWhatsThis(OpenText);
+    action->setToolTip("open");
+    action->setShortcut(Qt::CTRL + Qt::Key_O);
 
     pixmap = QPixmap(filesave);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Save", QString(),
-                                     this, SLOT(save()), tools, "save"),
-                     SaveText);
-    menu->setWhatsThis(menu->insertItem(pixmap, "&Save", this,
-                                        SLOT(save()), Qt::CTRL + Qt::Key_S),
-                       SaveText);
-
-    menu->insertSeparator();
+    action = tools->addAction(pixmap,"Save", this, SLOT(save()));
+    action->setWhatsThis(SaveText);
+    action->setToolTip("save");
+
+
+    action = menu->addAction(pixmap,"&Save", this, SLOT(save()));
+    action->setWhatsThis(SaveText);
+    action->setToolTip("save");
+    action->setShortcut(Qt::CTRL + Qt::Key_S);
+
+
+    menu->addSeparator();
+
     pixmap = QPixmap(::scan);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Scan", QString(),
-                                     this, SLOT(scan()), tools, "scan"),
-                     ScanText);
-    menu->setWhatsThis(menu->insertItem(pixmap, "S&can", this,
-                                        SLOT(scan()), Qt::CTRL + Qt::Key_C),
-                       ScanText);
+    action = tools->addAction(pixmap,"Scan", this, SLOT(save()));
+    action->setWhatsThis(ScanText);
+    action->setToolTip("scan");
+
+    action = menu->addAction(pixmap,"S&can", this, SLOT(save()));
+    action->setWhatsThis(ScanText);
+    action->setToolTip("scan");
+    action->setShortcut(Qt::CTRL + Qt::Key_C);
+
+
 
-    menu->insertSeparator();
-    menu->insertItem("&Quit", this, SLOT(quit()), Qt::CTRL + Qt::Key_Q);
+    menu->addSeparator();
 
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&Browse", menu);
+
+    action = menu->addAction("&Quit", this, SLOT(quit()), Qt::CTRL + Qt::Key_Q);
+
+    //menu = new QMenu(this);
+    menu = menuBar()->addMenu("&Browse");
 
     pixmap = QPixmap(browsersearch);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Search", QString(),
-                                     this, SLOT(browser_search()), tools, "search"),
-                     SearchText);
-    menu->setWhatsThis(menu->insertItem(pixmap, "&Search", this,
-                                        SLOT(browser_search()), Qt::CTRL + Qt::Key_S),
-                       SearchText);
+    action = tools->addAction(pixmap,"Search", this, SLOT(browser_search()));
+    action->setWhatsThis(SearchText);
+    action->setToolTip("Search");
+
+    action = menu->addAction(pixmap,"&Search", this, SLOT(browser_search()));
+    action->setWhatsThis(SearchText);
+    action->setToolTip("Search");
+    action->setShortcut(Qt::CTRL + Qt::Key_S);
+
 
     pixmap = QPixmap(left_xpm);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Back", QString(),
-                                     this, SLOT(historic_back()),
-                                     tools, "back"),
-                     LeftText);
+    action = tools->addAction(pixmap,"Back", this, SLOT(historic_back()));
+    action->setWhatsThis(LeftText);
+    action->setToolTip("back");
 
     pixmap = QPixmap(right_xpm);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Forward", QString(),
-                                     this, SLOT(historic_forward()),
-                                     tools, "forward"),
-                     RightText);
+    action = tools->addAction(pixmap,"Forward", this, SLOT(historic_forward()));
+    action->setWhatsThis(RightText);
+    action->setToolTip("forward");
+
+    action = tools->addAction(QApplication::style()->standardIcon(QStyle::SP_TitleBarContextHelpButton).pixmap(200,2000), "Whats's this?",
+                               this, SLOT(whats_this()));
 
-    (void)Q3WhatsThis::whatsThisButton(tools);
+
+
+    //(void)QWhatsThis::whatsThisButton(tools);
 
     //
 
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&Style", menu);
+    //menu = new QMenu(this);
+    menu = menuBar()->addMenu("&Style");
 
 #if !defined(QT_NO_STYLE_MOTIF)
-    menu->insertItem("Motif", this, SLOT(motif_style()));
+    menu->addAction("Motif", this, SLOT(motif_style()));
 #endif
 #if !defined(QT_NO_STYLE_MOTIFPLUS)
-    menu->insertItem("MotifPlus", this, SLOT(motifplus_style()));
+    menu->addAction("MotifPlus", this, SLOT(motifplus_style()));
 #endif
-    menu->insertItem("Windows", this, SLOT(windows_style()));
+    menu->addAction("Windows", this, SLOT(windows_style()));
 
     //
 
-    menuBar()->insertSeparator();
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&Help", menu);
+    menuBar()->addSeparator();
+    //menu = new QMenu(this);
+    menu = menuBar()->addMenu("&Help");
 
-    menu->insertItem("&About", this, SLOT(about()), Qt::Key_F1);
-    menu->insertItem("About&Qt", this, SLOT(aboutQt()));
-    menu->insertSeparator();
-    menu->insertItem("What's This", this, SLOT(whatsThis()), Qt::SHIFT + Qt::Key_F1);
+    menu->addAction("&About", this, SLOT(about()), Qt::Key_F1);
+    menu->addAction("About&Qt", this, SLOT(aboutQt()));
+    menu->addSeparator();
+    menu->addAction("What's This", this, SLOT(whatsThis()), Qt::SHIFT + Qt::Key_F1);
 
     //
 
-    spl = new QSplitter(Qt::Vertical, this, "spl");
+    spl = new QSplitter(Qt::Vertical, this/*, "spl"*/);
 
     browser = new BrowserView(spl);
     comment = new CommentView(spl);
@@ -176,9 +199,9 @@ JavaCatWindow::JavaCatWindow() : Q3MainWindow(0, "Java Catalog", Qt::WDestructiv
     connect(comment, SIGNAL(refer(const QString &)),
             browser, SLOT(refer(const QString &)));
 
-    spl->moveToFirst(browser);
+    spl->addWidget(browser);
 
-    Q3ValueList<int> lsz = spl->sizes();
+    QList<int> lsz = spl->sizes();
     int h = lsz.first() + lsz.last();
 
     lsz.first() = (h * 3) / 4;
@@ -186,13 +209,13 @@ JavaCatWindow::JavaCatWindow() : Q3MainWindow(0, "Java Catalog", Qt::WDestructiv
 
     spl->setSizes(lsz);
 
-    spl->setResizeMode(comment, QSplitter::KeepSize);
+    //spl->setResizeMode(comment, QSplitter::KeepSize);
     setCentralWidget(spl);
 }
 
 void remove_crlf(char * s)
 {
-    int len = strlen(s);
+    size_t len = strlen(s);
 
     if (len != 0) {
         if (s[len - 1] == '\n')
@@ -205,13 +228,13 @@ void remove_crlf(char * s)
 
 void JavaCatWindow::load()
 {
-    QString here = QDir::currentDirPath();
+    QString here = QDir::currentPath();
     QString start;
 
     // note : QFile fp(QDir::home().absFilePath(".doumlcat")) doesn't work
     // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlcat");
-    FILE * fp = fopen((const char *) s, "r");
+    QString s = QDir::home().absoluteFilePath(".doumlcat");
+    FILE * fp = fopen((const char *) s.toLatin1().constData(), "r");
 
 
 
@@ -240,16 +263,16 @@ void JavaCatWindow::load()
     }
 
     QString path =
-        Q3FileDialog::getOpenFileName(start, "*.cat", this);
+        QFileDialog::getOpenFileName(this, "", start, "*.cat");
 
     if (! path.isEmpty()) {
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
 
         QFile f(path);
 
         if (f.open(QIODevice::ReadOnly)) {
-            if ((fp = fopen((const char *) s, "w")) != 0) {
-                fwrite((const char *) path, 1, path.length(), fp);
+            if ((fp = fopen((const char *) s.toLatin1().constData(), "w")) != 0) {
+                fwrite((const char *) path.toLatin1().constData(), 1, path.length(), fp);
                 fputc('\n', fp);
                 fclose(fp);
             }
@@ -257,7 +280,7 @@ void JavaCatWindow::load()
             QDataStream dt(&f);
 
             Package::get_root()->restore_children(dt);
-            Package::get_root()->setOpen(TRUE);
+            Package::get_root()->setExpanded(TRUE);
         }
 
         QApplication::restoreOverrideCursor();
@@ -269,12 +292,12 @@ void JavaCatWindow::load()
 void JavaCatWindow::save()
 {
     QString path =
-        Q3FileDialog::getSaveFileName(QString(), "*.cat", this);
+        QFileDialog::getSaveFileName(this, QString(), QString(), "*.cat");
 
     if (! path.isEmpty()) {
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
 
-        if (path.right(4).upper() != ".CAT")
+        if (path.right(4).toUpper() != ".CAT")
             path += ".cat";
 
         QFile f(path);
@@ -322,7 +345,7 @@ void JavaCatWindow::quit()
 void JavaCatWindow::motif_style()
 {
 #if !defined(QT_NO_STYLE_MOTIF)
-    QApplication::setStyle(new QMotifStyle);
+    QApplication::setStyle("motif");
 #endif
 }
 
@@ -337,7 +360,7 @@ void JavaCatWindow::motifplus_style()
 void JavaCatWindow::windows_style()
 {
 #ifndef QT_NO_STYLE_WINDOWS
-    QApplication::setStyle(new QWindowsStyle);
+    QApplication::setStyle("windows");
 #endif
 }
 
@@ -359,7 +382,7 @@ void JavaCatWindow::trace(QString s)
     // sometimes the contains/scrollbar does not show all
     // change the split position to force correct updating
 
-    Q3ValueList<int> sz = the->spl->sizes();
+    QList<int> sz = the->spl->sizes();
 
     if (sz[1] & 1) {
         sz[0] += 1;
@@ -382,3 +405,7 @@ void JavaCatWindow::clear_trace()
 {
     the->comment->setText(QString());
 }
+void JavaCatWindow::whats_this() const
+{
+    QWhatsThis::enterWhatsThisMode();
+}
diff --git a/src/JavaCat/JavaCatWindow.h b/src/JavaCat/JavaCatWindow.h
index ac70d4a0e..996db1605 100644
--- a/src/JavaCat/JavaCatWindow.h
+++ b/src/JavaCat/JavaCatWindow.h
@@ -37,7 +37,7 @@
 
 #else
 
-#include <q3mainwindow.h>
+#include <qmainwindow.h>
 
 class QSplitter;
 class BrowserView;
@@ -46,7 +46,7 @@ class CommentView;
 
 // singleton
 
-class JavaCatWindow : public Q3MainWindow
+class JavaCatWindow : public QMainWindow
 {
     Q_OBJECT
 
@@ -57,6 +57,8 @@ class JavaCatWindow : public Q3MainWindow
     static void trace(WrapperStr);
     static void clear_trace();
 
+public slots:
+    void whats_this() const;
 protected:
     static JavaCatWindow * the;
 
diff --git a/src/JavaCat/Lex.cpp b/src/JavaCat/Lex.cpp
index f41fc7ba6..5d947bd73 100644
--- a/src/JavaCat/Lex.cpp
+++ b/src/JavaCat/Lex.cpp
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 // lexer written by hand rather than using [f]lex as usual,
-// BOUML is also my first development including a source code
+// DOUML is also my first development including a source code
 // reader where I do not use yacc/bison, to see how it is
 // without ...
 
@@ -110,7 +110,7 @@ bool Lex::open(const QString & f)
     context.mark = 0;
 
     QFile in(f);
-    unsigned sz;
+    qint64 sz;
 
     if (!in.open(QIODevice::ReadOnly) ||
         ((context.buffer = new char[(sz = in.size()) + 1]) == 0))
@@ -118,7 +118,7 @@ bool Lex::open(const QString & f)
 
     unsigned offset = 0;
 
-    do offset += in.readBlock(context.buffer + offset, sz - offset);
+    do offset += in.read(context.buffer + offset, sz - offset);
 
     while (offset != sz);
 
@@ -374,7 +374,7 @@ WrapperStr Lex::manage_operator(QString & result, int c)
 #ifdef TRACE
     QLOG_INFO() << "retourne '" << result << "'\n";
 #endif
-    return WrapperStr(result.toAscii().constData());
+    return WrapperStr(result.toLatin1().constData());
 }
 
 char Lex::bypass_operator(int c)
@@ -446,7 +446,7 @@ WrapperStr Lex::read_string()
             break;
 
         case '"':
-            return WrapperStr((result += c).toAscii().constData());
+            return WrapperStr((result += c).toLatin1().constData());
 
         default:
             result += c;
@@ -771,7 +771,7 @@ WrapperStr Lex::read_word(bool in_templ)
 #ifdef TRACE
     QLOG_INFO() << "retourne '" << result << "'\n";
 #endif
-    return WrapperStr(result.toAscii().constData());
+    return WrapperStr(result.toLatin1().constData());
 }
 
 char Lex::read_word_bis(bool in_templ)
@@ -785,7 +785,7 @@ char Lex::read_word_bis(bool in_templ)
             result = '>';
         }
         else {
-            result = context.reread.latin1()[0];
+            result = context.reread.toLatin1()[0];
             context.reread = QString();
         }
     }
@@ -938,7 +938,7 @@ void Lex::finish_line()
 
 WrapperStr Lex::get_comments()
 {
-    WrapperStr result = WrapperStr(context.comments.toAscii().constData());
+    WrapperStr result = WrapperStr(context.comments.toLatin1().constData());
 
     context.comments = QString();
     return result;
@@ -946,7 +946,7 @@ WrapperStr Lex::get_comments()
 
 WrapperStr Lex::get_comments(WrapperStr & co)
 {
-    WrapperStr result = WrapperStr(context.comments.toAscii().constData());
+    WrapperStr result = WrapperStr(context.comments.toLatin1().constData());
 
     context.comments = QString();
 
@@ -957,7 +957,7 @@ WrapperStr Lex::get_comments(WrapperStr & co)
 
 WrapperStr Lex::get_description()
 {
-    WrapperStr result = WrapperStr(context.description.toAscii().constData());
+    WrapperStr result = WrapperStr(context.description.toLatin1().constData());
 
     context.description = QString();
     return result;
@@ -965,7 +965,7 @@ WrapperStr Lex::get_description()
 
 WrapperStr Lex::get_description(WrapperStr & co)
 {
-    WrapperStr result = WrapperStr(context.description.toAscii().constData());
+    WrapperStr result = WrapperStr(context.description.toLatin1().constData());
 
     context.description = QString();
 
@@ -1007,7 +1007,7 @@ WrapperStr Lex::region()
 void Lex::syntax_error(WrapperStr s)
 {
     JavaCatWindow::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                         + WrapperStr(context.filename.toAscii().constData()) + "</i> line " +
+                         + WrapperStr(context.filename.toLatin1().constData()) + "</i> line " +
                          WrapperStr().setNum(context.line_number) + " <b>"
                          + s + "</b></font><br>");
 
@@ -1023,7 +1023,7 @@ void Lex::syntax_error(WrapperStr s)
 void Lex::premature_eof()
 {
     JavaCatWindow::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                         + WrapperStr(context.filename.toAscii().constData()) + "</i> line " +
+                         + WrapperStr(context.filename.toLatin1().constData()) + "</i> line " +
                          WrapperStr().setNum(context.line_number) +
                          " <b>premature eof</b></font><br>");
 
@@ -1039,7 +1039,7 @@ void Lex::premature_eof()
 void Lex::error_near(WrapperStr s, const char * m)
 {
     JavaCatWindow::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                         + WrapperStr(context.filename.toAscii().constData()) + "</i> line " +
+                         + WrapperStr(context.filename.toLatin1().constData()) + "</i> line " +
                          WrapperStr().setNum(context.line_number) + " <b>near <font color =\"red\">"
                          + quote(s) + "</font></b>" + m + "</font><br>");
 
diff --git a/src/JavaCat/Package.cpp b/src/JavaCat/Package.cpp
index 399706eb2..04361bb8f 100644
--- a/src/JavaCat/Package.cpp
+++ b/src/JavaCat/Package.cpp
@@ -25,11 +25,11 @@
 //
 // *************************************************************************
 
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qapplication.h>
 #ifndef REVERSE
 #include <qmessagebox.h>
-#include <q3popupmenu.h>
+#include <qmenu.h>
 #include <qcursor.h>
 #include <qinputdialog.h>
 #endif
@@ -39,11 +39,11 @@
 #ifdef ROUNDTRIP
 #include <qmessagebox.h>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include "misc/mystr.h"
 #include <QPixmap>
 //Added by qt3to4:
-#include <Q3PtrList>
+
 #endif
 
 #include "Package.h"
@@ -81,24 +81,24 @@ bool Package::scan;
 
 // all the classes presents in the environment, the
 // key is the full name including package
-Q3Dict<Class> Package::classes(1001);
+QHash<WrapperStr,Class*> Package::classes;
 
 // the java classes, the key are just the name without package
-Q3Dict<Class> Package::java_classes(1001);
+QHash<WrapperStr,Class*> Package::java_classes;
 
-// all the classes defined in bouml, not known through a .cat
+// all the classes defined in douml, not known through a .cat
 // nor reversed, the key is the full name including package
-Q3Dict<UmlClass> Package::user_classes(1001);
+QHash<WrapperStr,UmlClass*> Package::user_classes;
 
 // packages known through a .cat or reversed, the key is the
 // Java package spec
-Q3Dict<Package> Package::known_packages(101);
+QHash<WrapperStr,Package*> Package::known_packages;
 
-// all the packages defined in bouml, not known through a .cat
+// all the packages defined in douml, not known through a .cat
 // nor reversed (except roundtrip), the key is the java package spec
-Q3Dict<UmlPackage> Package::user_packages(101);
+QHash<WrapperStr,UmlPackage*> Package::user_packages;
 
-// package which does not exist even in bouml
+// package which does not exist even in douml
 QStringList Package::unknown_packages;
 
 // to know if java.lang. was artificialy added in Package::imports
@@ -114,17 +114,17 @@ QStringList Package::static_imports;
 QStack<QStringList> Package::stack;
 
 // current template forms
-Q3ValueList<FormalParameterList> Package::Formals;
+QList<FormalParameterList> Package::Formals;
 
 QApplication * Package::app;
 
 static QString RootSDir;	// empty or finish by a /
 static WrapperStr RootCDir;	// empty or finish by a /
 
-static Q3Dict<bool> FileManaged;
+static QHash<WrapperStr,bool*> FileManaged;
 
 #ifdef ROUNDTRIP
-static Q3Dict<bool> DirManaged;
+static QHash<QString,bool*> DirManaged;
 #endif
 
 static WrapperStr force_final_slash(WrapperStr p)
@@ -141,7 +141,7 @@ static WrapperStr force_final_slash(WrapperStr p)
 
 static inline WrapperStr force_final_slash(QString p)
 {
-    return force_final_slash(WrapperStr(p.toAscii().constData()));
+    return force_final_slash(WrapperStr(p.toLatin1().constData()));
 }
 
 static WrapperStr root_relative_if_possible(WrapperStr p)
@@ -149,7 +149,8 @@ static WrapperStr root_relative_if_possible(WrapperStr p)
     int pln = p.length();
     int rln = RootCDir.length();
 
-    return ((pln >= rln) && (p.left(rln).length() == rln)) // [lgfreitas] i am assuming its comparing lengths...
+    //todo try to fix root relative
+    return ((pln >= rln) && (p.left(rln).length() == (unsigned)rln)) // [lgfreitas] i am assuming its comparing lengths...
            ? p.mid(rln)
            : p;
 }
@@ -231,7 +232,7 @@ void Package::init(UmlPackage * r, QApplication * a)
 
     if (!RootSDir.isEmpty() && QDir::isRelativePath(RootSDir)) {
         QFileInfo f(UmlPackage::getProject()->supportFile());
-        QDir d(f.dirPath());
+        QDir d(f.path());
 
         RootSDir = force_final_slash(d.filePath(RootSDir)).operator QString();
         RootCDir = RootSDir;
@@ -240,11 +241,11 @@ void Package::init(UmlPackage * r, QApplication * a)
     QString s;
 
     DirFilter = (!(s = (const char *) JavaSettings::reverseRoundtripDirRegExp()).isEmpty())
-                ? new QRegExp(s, JavaSettings::isReverseRoundtripDirRegExpCaseSensitive(), TRUE)
+                ? new QRegExp(s, (Qt::CaseSensitivity)JavaSettings::isReverseRoundtripDirRegExpCaseSensitive())
                 : 0;
 
     FileFilter = (!(s = (const char *) JavaSettings::reverseRoundtripFileRegExp()).isEmpty())
-                 ? new QRegExp(s, JavaSettings::isReverseRoundtripFileRegExpCaseSensitive(), TRUE)
+                 ? new QRegExp(s, (Qt::CaseSensitivity)JavaSettings::isReverseRoundtripFileRegExpCaseSensitive())
                  : 0;
 
     Ext = JavaSettings::sourceExtension().operator QString();
@@ -287,7 +288,7 @@ void Package::set_step(int s, int n)
 
         case 1:
             scan = TRUE;
-            FileManaged.resize(101);
+            FileManaged.reserve(101);
 
             if (n > 1)
                 new Progress(n, "Scanning in progress, please wait ...", app);
@@ -298,7 +299,7 @@ void Package::set_step(int s, int n)
             // 2
             scan = FALSE;
             FileManaged.clear();
-            FileManaged.resize(101);
+            FileManaged.reserve(101);
 
             if (n > 1)
 #ifdef ROUNDTRIP
@@ -324,9 +325,7 @@ int Package::count_file_number()
 
     QDir d(path);
     int result = file_number(d, TRUE);
-    TreeItem * child;
-
-    for (child = firstChild(); child != 0; child = child->nextSibling())
+    foreach (TreeItem *child, children())
         if (((BrowserNode *) child)->isa_package())
             result += ((Package *) child)->count_file_number();
 
@@ -350,9 +349,7 @@ void Package::scan_dir()
 
     reverse_directory(d, TRUE);
 
-    TreeItem * child;
-
-    for (child = firstChild(); child != 0; child = child->nextSibling())
+    foreach (TreeItem *child, children())
         if (((BrowserNode *) child)->isa_package())
             ((Package *) child)->scan_dir();
 }
@@ -362,17 +359,16 @@ Package * Package::scan_dir(int & n)
     n = 0;
 
     // get input java source dir
-    QString path = Q3FileDialog::getExistingDirectory(QDir::currentDirPath(), 0, 0,
-                   "select the base directory to reverse");
+    QString path = QFileDialog::getExistingDirectory(0, "select the base directory to reverse",QDir::currentPath(), 0);
 
     if (! path.isEmpty()) {
         QDir d(path);
 
-        Package * p = new Package(root, path, d.dirName());
+        Package * p = new Package(root, path.toLatin1().constData(), d.dirName().toLatin1().constData());
 
         // scanning phase
 #ifndef REVERSE
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
         JavaCatWindow::clear_trace();
 #endif
         UmlCom::message("count files ...");
@@ -383,7 +379,7 @@ Package * Package::scan_dir(int & n)
 #ifndef REVERSE
         QApplication::restoreOverrideCursor();
 
-        root->setOpen(TRUE);
+        root->setExpanded(TRUE);
 #endif
 
         return p;
@@ -396,7 +392,6 @@ Package * Package::scan_dir(int & n)
 static bool allowed(QRegExp * rg, QString f)
 {
     if (rg != 0) {
-        int matchLen;
         return rg->exactMatch(f); //[lgfreitas] I do not know if this will work
         /*return ((rg->match(f, 0, &matchLen) != 0) ||
             (matchLen != (int) f.length()));*/
@@ -419,60 +414,32 @@ int Package::file_number(QDir & d, bool rec)
 #endif
 
     int result = 0;
-    /*const QFileInfoList * list = d.entryInfoList(QDir::Files | QDir::Readable);
-
-    if (list != 0) {
-      QFileInfoListIterator it(*list);
-      QFileInfo * fi;
-
-      while ((fi = it.current()) != 0) {
-        if (fi->extension(FALSE) == Ext)
-    result += 1;
-
-        ++it;
-      }
-    }*/
     QFileInfoList list = d.entryInfoList(QDir::Files | QDir::Readable);
 
     if (!list.isEmpty()) {
         QFileInfoList::iterator it = list.begin();
+        QString extension;
+        int dotIndex;
 
-        while (it != list.end()) {
-            if ((*it).extension(FALSE) == Ext) result += 1;
-
-            it++;
+        for(;it != list.end(); ++it){
+            dotIndex = (*it).fileName().lastIndexOf('.');
+            extension = extension.mid(dotIndex+1);
+            if (extension == Ext) result += 1;
         }
     }
 
     if (rec) {
         // sub directories
-        /*list = d.entryInfoList(QDir::Dirs | QDir::NoSymLinks);
-
-        if (list != 0) {
-          QFileInfoListIterator itd(*list);
-          QFileInfo * di;
-
-          while ((di = itd.current()) != 0) {
-        if (((const char *) di->fileName())[0] != '.') {
-          QDir sd(di->filePath());
-
-          result += file_number(sd, rec);
-        }
-        ++itd;
-          }
-        }*/
         list = d.entryInfoList(QDir::Dirs | QDir::NoSymLinks);
 
         if (!list.isEmpty()) {
             QFileInfoList::iterator it = list.begin();
 
-            while (it != list.end()) {
+            for(;it != list.end(); ++it){
                 if ((*it).fileName()[0] != '.') {
                     QDir sd((*it).filePath());
                     result += file_number(sd, rec);
                 }
-
-                it++;
             }
         }
     }
@@ -539,9 +506,7 @@ void Package::send_dir()
 
     reverse_directory(d, TRUE);
 
-    TreeItem * child;
-
-    for (child = firstChild(); child != 0; child = child->nextSibling())
+    foreach (TreeItem *child, children())
         if (((BrowserNode *) child)->isa_package())
             ((Package *) child)->send_dir();
 }
@@ -624,7 +589,7 @@ void Package::reverse_directory(QDir & d, bool rec)
 {
 #ifdef ROUNDTRIP
 
-    if (d.path().isEmpty() || DirManaged.find(d.path()) != 0)
+    if (d.path().isEmpty() || DirManaged.value(d.path()) != 0)
         return;
 
     DirManaged.insert(d.path(), (bool *) 1);
@@ -638,20 +603,22 @@ void Package::reverse_directory(QDir & d, bool rec)
 
     if (!list.isEmpty()) {
         QFileInfoList::iterator it = list.begin();
+        QString extension;
+        int dotIndex;
 
-        while (it != list.end()) {
-            if ((*it).extension() == Ext) {
+        for(;it != list.end(); ++it) {
+            dotIndex = (*it).fileName().lastIndexOf('.');
+            extension = extension.mid(dotIndex+1);
+            if (extension == Ext) {
                 if (allowed(FileFilter, (*it).fileName()))
-                    reverse_file(WrapperStr((*it).filePath().toAscii().constData())
+                    reverse_file(WrapperStr((*it).filePath().toLatin1().constData())
 #ifdef ROUNDTRIP
-                                 , roundtriped.find((*it).baseName())
+                                 , roundtriped.value((*it).baseName())
 #endif
                                 );
 
                 Progress::tic_it();
             }
-
-            ++it;
         }
     }
 
@@ -662,14 +629,14 @@ void Package::reverse_directory(QDir & d, bool rec)
         if (!list.isEmpty()) {
             QFileInfoList::iterator itd = list.begin();
 
-            while (itd != list.end()) {
+            for(;itd != list.end(); ++itd) {
                 if ((*itd).fileName()[0] != '.') {
                     QDir sd((*itd).filePath());
 #ifndef REVERSE
 
                     if (allowed(DirFilter, sd.dirName())) {
 #endif
-                        Package * p = find(WrapperStr(sd.dirName().toAscii().constData()), TRUE);
+                        Package * p = find(WrapperStr(sd.dirName().toLatin1().constData()), TRUE);
 
                         if (p != 0)
                             p->reverse_directory(sd, TRUE);
@@ -679,8 +646,6 @@ void Package::reverse_directory(QDir & d, bool rec)
 
 #endif
                 }
-
-                ++itd;
             }
         }
     }
@@ -690,7 +655,7 @@ void Package::reverse_directory(QDir & d, bool rec)
 void Package::reverse(UmlArtifact * art)
 {
     if (allowed(FileFilter, art->name() + "." + Ext))
-        reverse_file(path + "/" + art->name() + "." + WrapperStr(Ext.toAscii().constData()), art);
+        reverse_file(path + "/" + art->name() + "." + WrapperStr(Ext.toLatin1().constData()), art);
 }
 #endif
 
@@ -730,7 +695,7 @@ void Package::reverse_file(WrapperStr f
                 art->set_JavaSource(JavaSettings::sourceContent());
                 art->set_Description("");
 
-                Q3PtrVector<UmlClass> empty;
+                QVector<UmlClass*> empty;
 
                 art->set_AssociatedClasses(empty);
             }
@@ -795,7 +760,7 @@ void Package::reverse_file(WrapperStr f
                 s = Lex::read_word();
             }
 
-            if (imports.findIndex("java.lang.") == -1) {
+            if (imports.indexOf("java.lang.") == -1) {
                 imports.append("java.lang.");
                 java_lang_added = TRUE;
             }
@@ -811,7 +776,7 @@ void Package::reverse_file(WrapperStr f
                 if ((s == "class") || (s == "enum") ||
                     (s == "interface") || (s == "@interface")) {
 #ifdef ROUNDTRIP
-                    Q3PtrList<UmlItem> dummy;
+                    QList<UmlItem *> dummy;
 #endif
 
                     if (!Class::reverse(this, s, annotation, abstractp,
@@ -952,8 +917,8 @@ void Package::update_package_list(WrapperStr name)
         (user_packages[name] == 0) &&
         (classes[name] == 0) &&
         (user_classes[name] == 0) &&
-        (unknown_packages.findIndex(name) == -1)) {
-        // try to find the package in bouml
+        (unknown_packages.indexOf(name) == -1)) {
+        // try to find the package in douml
         UmlPackage * up = UmlPackage::getProject()->findJavaPackage(name);
 
         if (up == 0) {
@@ -963,7 +928,7 @@ void Package::update_package_list(WrapperStr name)
                 WrapperStr subname = name.left(index);
 
                 if ((user_packages[subname] != 0) ||
-                    (unknown_packages.findIndex(subname) != -1))
+                    (unknown_packages.indexOf(subname) != -1))
                     return;
 
                 if ((up = UmlPackage::getProject()->findJavaPackage(subname)) != 0)
@@ -988,9 +953,9 @@ void Package::update_package_list(WrapperStr name)
 
 void Package::update_class_list(WrapperStr pack, UmlItem * container)
 {
-    const Q3PtrVector<UmlItem> & ch = container->children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = container->children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
     UmlItem * it;
 
     for (; v != vsup; v += 1) {
@@ -998,7 +963,7 @@ void Package::update_class_list(WrapperStr pack, UmlItem * container)
 
         switch (it->kind()) {
         case aClass:
-            user_classes.replace(pack + it->name(), (UmlClass *) it);
+            user_classes.insert(pack + it->name(), (UmlClass *) it);
             update_class_list(pack + it->name() + ".", (UmlClass *) it);
             break;
 
@@ -1027,7 +992,7 @@ Class * Package::define(const WrapperStr & name, char st)
         classes.insert(package + "." + name, cl);
 
         if (classes.count() / 2 >= classes.size())
-            classes.resize(classes.size() * 2 - 1);
+            classes.reserve(classes.size() * 2 - 1);
     }
     else {
         Defined.insert(name, cl);
@@ -1056,7 +1021,7 @@ Class * Package::localy_defined(QString name) const
 #endif
 
 void Package::compute_type(WrapperStr name, UmlTypeSpec & typespec,
-                           const Q3ValueList<FormalParameterList> & tmplts,
+                           const QList<FormalParameterList> & tmplts,
                            Class ** need_object)
 {
     typespec.type = 0;
@@ -1072,7 +1037,7 @@ void Package::compute_type(WrapperStr name, UmlTypeSpec & typespec,
         Class * cl;
 
         if (! tmplts.isEmpty()) {
-            Q3ValueList<FormalParameterList>::ConstIterator it1;
+            QList<FormalParameterList>::ConstIterator it1;
 
             for (it1 = tmplts.begin(); it1 != tmplts.end(); ++it1) {
                 FormalParameterList::ConstIterator it2;
@@ -1120,10 +1085,10 @@ void Package::compute_type(WrapperStr name, UmlTypeSpec & typespec,
             QString s;
             int index2;
 
-            if (((const char *) import)[import.length() - 1] == '.')
+            if (((const char *) import.toLatin1().constData())[import.length() - 1] == '.')
                 // import a.b.* ('*' removed)
                 s = import + name.operator QString();	// a.b.name
-            else if (((index2 = import.findRev('.')) != -1) &&
+            else if (((index2 = import.lastIndexOf('.')) != -1) &&
                      (import.mid(index2 + 1) == left))
                 // import a.b.c & name = c.d...
                 s = import.left(index2 + 1) + name.operator QString();	// a.b.name
@@ -1251,9 +1216,13 @@ Package * Package::find(WrapperStr s, bool nohack)
     }
 
     Package * p = 0;
-    TreeItem * child;
 
-    for (child = firstChild(); child != 0; child = child->nextSibling()) {
+    // TODO: remove suspicious macro TreeItem in order to remove Qt3 dependency.
+#ifdef REVERSE
+    foreach (TreeItem * child,  children()) {
+#else
+    for (BrowserNode *child = firstChild(); child; child = child->nextSibling()) {
+#endif
         if (((BrowserNode *) child)->isa_package() &&
             (child->text(0) == (const char *) name)) {
             p = (Package *) child;
@@ -1291,7 +1260,7 @@ void Package::set_package(WrapperStr s)
     Package * pack = this;
 
     while ((pack != 0) && pack->package.isEmpty()) {
-        known_packages.replace(s, pack);
+        known_packages.insert(s, pack);
         pack->package = s;
 
         if (pack->uml != 0)
@@ -1314,13 +1283,13 @@ UmlPackage * Package::get_uml(bool mandatory)
             ((uml = UmlPackage::getProject()->findJavaPackage(package)) != 0))
             return uml;
 
-        const char * name = text(0);
+        QString name = text(0);
         Package * pa = (Package *) parent();
         UmlPackage * uml_pa = pa->get_uml();	// will end on project
 
-        const Q3PtrVector<UmlItem> & ch = uml_pa->children();
-        UmlItem ** v = ch.data();
-        UmlItem ** const vsup = v + ch.size();
+        const QVector<UmlItem*> & ch = uml_pa->children();
+        UmlItem *const* v = ch.data();
+        UmlItem *const*  vsup = v + ch.size();
         UmlItem * it;
 
         for (; v != vsup; v += 1) {
@@ -1332,7 +1301,7 @@ UmlPackage * Package::get_uml(bool mandatory)
             }
         }
 
-        if ((uml = UmlBasePackage::create(uml_pa, name)) == 0) {
+        if ((uml = UmlBasePackage::create(uml_pa, name.toLatin1().constData())) == 0) {
             if (!mandatory)
                 return 0;
 
@@ -1399,26 +1368,30 @@ void Package::menu()
         // the project
         return;
 
-    Q3PopupMenu m(0);
+    QMenu m(0);
+    QAction* action;
 
-    m.insertItem(text(0), -1);
-    m.insertSeparator();
+    action = m.addAction(text(0));
+    action->setData(-1);
+    m.addSeparator();
 
     if (parent() == root) {
-        m.insertItem("Rename", 2);
-        m.insertSeparator();
+        action = m.addAction("Rename");
+        action->setData(2);
+        m.addSeparator();
     }
 
     bool have_classe = FALSE;
     bool have_package = FALSE;
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling()) {
         if (!((BrowserNode *) child)->isa_package()) {
             if (! have_classe) {
                 have_classe = TRUE;
-                m.insertItem("Send its classes", 0);
+                m.addAction("Send its classes");
+                action->setData(0);
 
                 if (have_package)
                     break;
@@ -1426,14 +1399,18 @@ void Package::menu()
         }
         else if (! have_package) {
             have_package = TRUE;
-            m.insertItem("Send its classes and classes of sub-packages", 1);
+            m.addAction("Send its classes and classes of sub-packages");
+            action->setData(1);
 
             if (have_classe)
                 break;
         }
     }
 
-    int choice = m.exec(QCursor::pos());
+    action = m.exec(QCursor::pos());
+    if(action)
+    {
+    int choice = action->data().toInt();
 
     switch (choice) {
     case 0:
@@ -1441,7 +1418,7 @@ void Package::menu()
         QDir d(path);
 
         if (d.exists()) {
-            QApplication::setOverrideCursor(Qt::waitCursor);
+            QApplication::setOverrideCursor(Qt::WaitCursor);
             new Progress(file_number(d, choice == 1), "Reverse in progress, please wait ...", app);
             JavaCatWindow::clear_trace();
             JavaSettings::set_UseDefaults(TRUE);
@@ -1459,48 +1436,49 @@ void Package::menu()
 
     case 2: {
         bool ok = FALSE;
-        QString s = QInputDialog::getText("Rename", "new name :",
+        QString s = QInputDialog::getText(0,"Rename", "new name :",
                                           QLineEdit::Normal, text(0), &ok);
 
         if (ok && !s.isEmpty() && (s != text(0)))
             setText(0, s);
     }
     }
+    }
 }
 
 // note : 'QDataStream >> char *' bugged on windows
 
 void Package::backup(QDataStream  & dt) const
 {
-    dt << ((Q_INT8) '{');
+    dt << ((qint8) '{');
 
-    Q_INT32 len;
+    qint32 len;
 
     len = text(0).length();
     dt << len;
-    dt.writeRawBytes(text(0), len);
+    dt.writeRawData(text(0).toLatin1().constData(), len);
 
     len = path.length();
     dt << len;
-    dt.writeRawBytes(path, len);
+    dt.writeRawData(path, len);
 
     len = package.length();
     dt << len;
 
     if (!package.isEmpty())
-        dt.writeRawBytes(package, len);
+        dt.writeRawData(package, len);
 
     backup_children(dt);
 }
 
 void Package::backup_children(QDataStream  & dt) const
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         ((BrowserNode *) child)->backup(dt);
 
-    dt << ((Q_INT8) '}');
+    dt << ((qint8) '}');
 }
 
 #endif // !REVERSE
@@ -1508,16 +1486,16 @@ void Package::backup_children(QDataStream  & dt) const
 void Package::restore(QDataStream  & dt, Package * parent)
 {
     // '{' already read
-    Q_INT32 len;
+    qint32 len;
 
     dt >> len;
     char * name = new char[len + 1];
-    dt.readRawBytes(name, len);
+    dt.readRawData(name, len);
     name[len] = 0;
 
     dt >> len;
     char * path = new char[len + 1];
-    dt.readRawBytes(path, len);
+    dt.readRawData(path, len);
     path[len] = 0;
 
     dt >> len;
@@ -1527,7 +1505,7 @@ void Package::restore(QDataStream  & dt, Package * parent)
         package = 0;
     else {
         package = new char[len + 1];
-        dt.readRawBytes(package, len);
+        dt.readRawData(package, len);
         package[len] = 0;
     }
 
@@ -1543,7 +1521,7 @@ void Package::restore(QDataStream  & dt, Package * parent)
         pack = new Package(parent, path, name);
 
         if (package != 0) {
-            known_packages.replace(package, pack);
+            known_packages.insert(package, pack);
             pack->package = package;
             delete [] package;
         }
@@ -1562,7 +1540,7 @@ void Package::restore(QDataStream  & dt, Package * parent)
 void Package::restore_children(QDataStream  & dt)
 {
     for (;;) {
-        Q_INT8 c;
+        qint8 c;
 
         dt >> c;
 
diff --git a/src/JavaCat/Package.h b/src/JavaCat/Package.h
index e52c32706..114a84b40 100644
--- a/src/JavaCat/Package.h
+++ b/src/JavaCat/Package.h
@@ -28,13 +28,13 @@
 #ifndef PACKAGE_H
 #define PACKAGE_H
 
-#include <q3dict.h>
+
 #include <qstringlist.h>
 #include <qstack.h>
 //Added by qt3to4:
 #include <QPixmap>
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 #include "Class.h"
 #include "UmlClass.h"
@@ -95,7 +95,7 @@ class Package : public BrowserNode, public ClassContainer
     void new_class(Class *);
 
     virtual void compute_type(WrapperStr type, UmlTypeSpec & typespec,
-                              const Q3ValueList<FormalParameterList> & tmplts,
+                              const QList<FormalParameterList> & tmplts,
                               Class ** need_object = 0);
     virtual Class * define(const WrapperStr & name, char st);
     virtual void declare(const WrapperStr &, Class *);
@@ -137,9 +137,9 @@ class Package : public BrowserNode, public ClassContainer
     UmlPackage * uml;
     WrapperStr package;		// java package may be with '.'
     WrapperStr path;
-    Q3Dict<Class> Undefined;
+    QHash<WrapperStr,Class*> Undefined;
 #ifdef ROUNDTRIP
-    Q3Dict<UmlArtifact> roundtriped;
+    QHash<QString,UmlArtifact*> roundtriped;
 #endif
 
     static bool scan;
@@ -148,17 +148,17 @@ class Package : public BrowserNode, public ClassContainer
     static QRegExp * DirFilter;
     static QRegExp * FileFilter;
     static QString Ext;
-    static Q3Dict<Class> classes;
-    static Q3Dict<Class> java_classes;
-    static Q3Dict<UmlClass> user_classes;
-    static Q3Dict<Package> known_packages;
-    static Q3Dict<UmlPackage> user_packages;
+    static QHash<WrapperStr,Class*> classes;
+    static QHash<WrapperStr,Class*> java_classes;
+    static QHash<WrapperStr,UmlClass*> user_classes;
+    static QHash<WrapperStr,Package*> known_packages;
+    static QHash<WrapperStr,UmlPackage*> user_packages;
     static QStringList unknown_packages;
     static QStringList imports;
     static bool java_lang_added;
     static QStringList static_imports;
     static QStack<QStringList> stack;
-    static Q3ValueList<FormalParameterList> Formals;
+    static QList<FormalParameterList> Formals;
     static QApplication * app;
 
     static int file_number(QDir & dir, bool rec);
diff --git a/src/JavaCat/Progress.cpp b/src/JavaCat/Progress.cpp
index 0f189daf1..6ea300f4e 100644
--- a/src/JavaCat/Progress.cpp
+++ b/src/JavaCat/Progress.cpp
@@ -36,8 +36,9 @@
 Progress * Progress::it = 0;
 
 Progress::Progress(int n, const char * lbl, QApplication * a)
-    : Q3ProgressDialog(0, 0, n, 0, 0, FALSE, Qt::WDestructiveClose), n(0), app(a)
+    : QProgressDialog(0, 0, 0, n, 0, 0), n(0), app(a)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
     if (it != 0)
         delete it;
 
@@ -53,7 +54,7 @@ Progress::~Progress()
 
 void Progress::tic()
 {
-    setProgress(++n);
+    setValue(++n);
     raise();
     app->processEvents();
 }
diff --git a/src/JavaCat/Progress.h b/src/JavaCat/Progress.h
index 3f4507e1f..f4f380b7d 100644
--- a/src/JavaCat/Progress.h
+++ b/src/JavaCat/Progress.h
@@ -30,9 +30,9 @@
 
 class QApplication;
 
-#include <q3progressdialog.h>
+#include <QProgressDialog>
 
-class Progress : public Q3ProgressDialog
+class Progress : public QProgressDialog
 {
 public:
     Progress(int, const char *, QApplication *);
diff --git a/src/JavaCat/ShowFileDialog.cpp b/src/JavaCat/ShowFileDialog.cpp
index eec9920de..e0008f2e9 100644
--- a/src/JavaCat/ShowFileDialog.cpp
+++ b/src/JavaCat/ShowFileDialog.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <Q3TextEdit>
+#include <QTextEdit>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfile.h>
@@ -37,28 +37,29 @@
 #include <qapplication.h>
 #include <qdir.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 #include "misc/mystr.h"
 #include <QDesktopWidget>
-
+#include <QSettings>
 #include "ShowFileDialog.h"
 
 ShowFileDialog::ShowFileDialog(const WrapperStr & filename)
-    : QDialog(0, filename)
+    : QDialog(0)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    setWindowTitle(filename);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->addWidget(new QLabel("You can specify the editor through the environment dialog",
                                this));
 
-    e = new Q3TextEdit(this);
+    e = new QTextEdit(this);
 
     QFile f(filename);
 
     if (f.open(QIODevice::ReadOnly)) {
         QTextStream t(&f);
 
-        e->setText(t.read());
+        e->setText(t.readAll());
     }
 
     QFont font = e->font();
@@ -72,7 +73,7 @@ ShowFileDialog::ShowFileDialog(const WrapperStr & filename)
 
 void ShowFileDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
 
     int w = QApplication::desktop()->width();
     int h = QApplication::desktop()->height();
@@ -80,49 +81,26 @@ void ShowFileDialog::polish()
     int cy = h / 2;
     bool virtual_desktop = FALSE;
 
-    // try to read .doumlrc
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        w = r - l + 1;
-                        h = b - t + 1;
-                        cx = (r + l) / 2;
-                        cy = (t + b) / 2;
-                        virtual_desktop = TRUE;
-                    }
-                }
-
-                break;
-            }
-        }
-
-        fclose(fp);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec("UTF-8");
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        w = r - l + 1;
+        h = b - t + 1;
+        cx = (r + l) / 2;
+        cy = (t + b) / 2;
+        virtual_desktop = TRUE;
+      }
     }
 
     resize(w / 2, h / 2);
diff --git a/src/JavaCat/ShowFileDialog.h b/src/JavaCat/ShowFileDialog.h
index bd836be23..c375dddad 100644
--- a/src/JavaCat/ShowFileDialog.h
+++ b/src/JavaCat/ShowFileDialog.h
@@ -32,14 +32,14 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 
-class Q3TextEdit;
+class QTextEdit;
 
 class ShowFileDialog : public QDialog
 {
     Q_OBJECT
 
 protected:
-    Q3TextEdit * e;
+    QTextEdit * e;
 
 public:
     ShowFileDialog(const WrapperStr & fn);
diff --git a/src/JavaCat/TreeItem.h b/src/JavaCat/TreeItem.h
index 1680fc3a8..75bc17abe 100644
--- a/src/JavaCat/TreeItem.h
+++ b/src/JavaCat/TreeItem.h
@@ -1,5 +1,5 @@
 //Added by qt3to4:
-#include <Q3PtrList>
+
 // *************************************************************************
 //
 // Copyright 2004-2010 Bruno PAGES  .
@@ -32,21 +32,22 @@
 
 #ifndef REVERSE
 
-#include <q3listview.h>
+#include <QTreeWidget>
 #include <qstring.h>
 
-#define TreeItem Q3ListViewItem
+#define TreeItem QTreeWidgetItem
 
 #else
 
-#include <q3ptrlist.h>
-#include <qstring.h>
+#include <QList>
+#include <QString>
+#include <QVariant>
 
 class TreeItem
 {
 private:
     TreeItem * its_parent;
-    Q3PtrList<TreeItem> its_children;
+    QList<TreeItem *> its_children;
     QString its_name;	// java_classes share it in case of a java classes
 
 public:
@@ -58,16 +59,18 @@ class TreeItem
     void setText(int, QString s) {
         its_name = s;
     };
+    void setText(QString s) {
+        its_name = s;
+    };
     TreeItem * parent() {
         return its_parent;
     };
 
-    TreeItem * firstChild() {
-        return its_children.first();
-    };
-    TreeItem * nextSibling() {
-        return its_parent->its_children.next();
-    };
+    const QList<TreeItem *> &children() const {
+        return its_children;
+    }
+    
+    virtual QVariant data(int column, int role) const = 0;
 };
 
 #endif
diff --git a/src/JavaCat/UmlArtifact.cpp b/src/JavaCat/UmlArtifact.cpp
index e1c427ec5..0a8ccea5a 100644
--- a/src/JavaCat/UmlArtifact.cpp
+++ b/src/JavaCat/UmlArtifact.cpp
@@ -31,7 +31,7 @@
 #include "UmlPackage.h"
 #include "Package.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 bool UmlArtifact::has_roundtrip_expected;
 
@@ -40,7 +40,7 @@ bool UmlArtifact::set_roundtrip_expected()
     if ((stereotype() != "source") || javaSource().isEmpty())
         return TRUE;
 
-    const Q3PtrVector<UmlClass> & cls = associatedClasses();
+    const QVector<UmlClass*> & cls = associatedClasses();
 
     if (cls.isEmpty())
         return TRUE;
@@ -51,8 +51,8 @@ bool UmlArtifact::set_roundtrip_expected()
     fully_updated = TRUE;
     ((UmlPackage *) parent()->parent())->get_package()->own(this);
 
-    UmlClass ** v = cls.data();
-    UmlClass ** vsup = v + cls.size();
+    UmlClass *const* v = cls.data();
+    UmlClass *const* vsup = v + cls.size();
     bool result = isWritable();
 
     for (; v != vsup; v += 1)
@@ -82,7 +82,7 @@ bool UmlArtifact::is_roundtrip_usefull()
     return has_roundtrip_expected;
 }
 
-void UmlArtifact::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlArtifact::mark_useless(QList<UmlItem *> & l)
 {
     if (useless) {
         set_isMarked(TRUE);
diff --git a/src/JavaCat/UmlArtifact.h b/src/JavaCat/UmlArtifact.h
index 061bfbe2a..b35e5490f 100644
--- a/src/JavaCat/UmlArtifact.h
+++ b/src/JavaCat/UmlArtifact.h
@@ -31,7 +31,7 @@
 #include "UmlBaseArtifact.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
+
 
 // This class manages 'artifact'
 // You can modify it as you want (except the constructor)
@@ -58,7 +58,7 @@ class UmlArtifact : public UmlBaseArtifact
     virtual bool set_roundtrip_expected();
     virtual void scan_it(int & n);
     virtual void send_it(int n);
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     bool set_roundtrip_expected_for_class();
     bool is_roundtrip_expected() const {
         return roundtrip_expected;
diff --git a/src/JavaCat/UmlAttribute.cpp b/src/JavaCat/UmlAttribute.cpp
index 7a8de8ad0..89f655276 100644
--- a/src/JavaCat/UmlAttribute.cpp
+++ b/src/JavaCat/UmlAttribute.cpp
@@ -30,7 +30,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 using namespace std;
 #endif
@@ -94,7 +94,7 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
                            const WrapperStr & value, WrapperStr comment,
                            WrapperStr description, WrapperStr annotation
 #ifdef ROUNDTRIP
-                           , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                           , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                           )
 {
@@ -104,9 +104,14 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
 
     if (
 #ifdef REVERSE
-        container->from_libp() &&
+        container->from_libp() && (
+#endif
+                                   visibility == PrivateVisibility
+#ifdef REVERSE
+                                   )
 #endif
-        (visibility == PrivateVisibility)) {
+        )
+    {
         Lex::finish_line();
         Lex::clear_comments();
         return TRUE;
@@ -302,11 +307,12 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
 
             if ((typespec.type == 0) && (cl->stereotype() != "enum")) {
                 WrapperStr t = typespec.explicit_type;
-                int index2;
+                int index2 = 0;
 
                 if (!t.isEmpty() &&
                         (t.at(t.length() - 1) == ">") &&
-                    ((index2 = t.find('<')) > 0)) {
+                    ((index2 = t.find('<')) > 0))
+                {
                     at->set_Stereotype(t.left(index2));
                     typespec.explicit_type =
                         // may be a,b ...
@@ -340,7 +346,7 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name,
     bool UmlAttribute::manage_enum_item(WrapperStr name, UmlClass * cl
 #ifdef ROUNDTRIP
                                         , bool roundtrip,
-                                        Q3PtrList<UmlItem> & expected_order
+                                        QList<UmlItem *> & expected_order
 #endif
                                        )
     {
diff --git a/src/JavaCat/UmlAttribute.h b/src/JavaCat/UmlAttribute.h
index badd0e54d..f2b02801e 100644
--- a/src/JavaCat/UmlAttribute.h
+++ b/src/JavaCat/UmlAttribute.h
@@ -29,9 +29,7 @@
 #define UMLATTRIBUTE_H
 
 #include "UmlBaseAttribute.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 class Class;
 
@@ -48,14 +46,14 @@ class UmlAttribute : public UmlBaseAttribute
                         const WrapperStr & value, WrapperStr comment,
                         WrapperStr description, WrapperStr annotation
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        );
 
     static bool manage_enum_item(WrapperStr s, UmlClass * cl
 #ifdef ROUNDTRIP
                                  , bool roundtrip,
-                                 Q3PtrList<UmlItem> & expected_order
+                                 QList<UmlItem *> & expected_order
 #endif
                                 );
 };
diff --git a/src/JavaCat/UmlClass.cpp b/src/JavaCat/UmlClass.cpp
index 878d43802..eb22c83e6 100644
--- a/src/JavaCat/UmlClass.cpp
+++ b/src/JavaCat/UmlClass.cpp
@@ -30,7 +30,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 #endif
 #include "UmlClass.h"
 #include "UmlArtifact.h"
@@ -57,7 +57,7 @@ UmlClass::UmlClass(void * id, const WrapperStr & n)
 
 void UmlClass::need_artifact(const QStringList & imports,
                              bool remove_java_lang,
-                             const QStringList & static_imports,
+                             const QStringList & ,
                              const WrapperStr & path, UmlArtifact *& cp)
 {
     if (parent()->kind() == aClassView) {
@@ -69,7 +69,7 @@ void UmlClass::need_artifact(const QStringList & imports,
             if ((cp = associatedArtifact()) == 0) {
                 // create associated artifact
                 QFileInfo fi(path);
-                WrapperStr artname = WrapperStr(fi.baseName().toAscii().constData());
+                WrapperStr artname = WrapperStr(fi.baseName().toLatin1().constData());
 
                 if ((cp = UmlBaseArtifact::create(pack->get_deploymentview(), artname)) == 0) {
                     UmlCom::trace(WrapperStr("<font face=helvetica><b>cannot create<i> artifact ")
@@ -89,7 +89,7 @@ void UmlClass::need_artifact(const QStringList & imports,
 
 
                 for (QStringList::const_iterator it = imports.begin(); it != imports.end(); it++) {
-                    WrapperStr import = WrapperStr((*it).toAscii().constData());
+                    WrapperStr import = WrapperStr((*it).toLatin1().constData());
 
                     if (!remove_java_lang || (import != "java.lang.")) {
                         import += (((const char *) import)[import.length() - 1] == '.')
@@ -101,7 +101,7 @@ void UmlClass::need_artifact(const QStringList & imports,
                 }
 
                 for (QStringList::const_iterator it = imports.begin(); it != imports.end(); it++) {
-                    s.insert(index, (const char *)("import static" + WrapperStr((*it).toAscii().constData()) + '\n'));
+                    s.insert(index, (const char *)QString("import static" + WrapperStr((*it).toLatin1().constData()) + '\n').toLatin1().constData());
                     index = s.find("${definition}", index);
                 }
             }
@@ -117,9 +117,9 @@ void UmlClass::upload(ClassContainer * cnt)
 {
     the_class = cnt->upload_define(this);
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         (*v)->upload(the_class);
@@ -133,7 +133,7 @@ bool UmlClass::set_roundtrip_expected()
           !associatedArtifact()->set_roundtrip_expected_for_class())))
         return TRUE;
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
+    const QVector<UmlItem*> & ch = UmlItem::children();
     UmlClassItem ** v = (UmlClassItem **) ch.data();
     UmlClassItem ** const vsup = v + ch.size();
     bool result = UmlClassItem::set_roundtrip_expected();
@@ -145,11 +145,11 @@ bool UmlClass::set_roundtrip_expected()
 
 }
 
-void UmlClass::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlClass::mark_useless(QList<UmlItem *> & l)
 {
     UmlClassItem::mark_useless(l);
 
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
     UmlClassItem ** v = (UmlClassItem **) ch.data();
     UmlClassItem ** const vsup = v + ch.size();
 
@@ -171,9 +171,9 @@ void UmlClass::send_it(int n)
 
 UmlItem * UmlClass::search_for_att_rel(const WrapperStr & name)
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1) {
         switch ((*v)->kind()) {
@@ -197,22 +197,20 @@ UmlItem * UmlClass::search_for_att_rel(const WrapperStr & name)
     return 0;
 }
 
-void UmlClass::reorder(Q3PtrList<UmlItem> & expected_order)
+void UmlClass::reorder(QList<UmlItem *> & expected_order)
 {
     if (expected_order.isEmpty())
         return;
 
-    Q3PtrVector<UmlItem> ch = UmlItem::children(); // copy
+    QVector<UmlItem*> ch = UmlItem::children(); // copy
     UmlItem ** v = ch.data();
 
     unload(); // to not reload children each time
 
     //bool updated = FALSE;
     UmlItem * expected_previous = 0;
-    Q3PtrListIterator<UmlItem> expected_it(expected_order);
-    UmlItem * expected;
 
-    while ((expected = expected_it.current()) != 0) {
+    foreach (UmlItem *expected, expected_order) {
         if (*v != expected) {
             //updated = TRUE;
             expected->moveAfter(expected_previous);
@@ -229,7 +227,6 @@ void UmlClass::reorder(Q3PtrList<UmlItem> & expected_order)
         }
 
         expected_previous = expected;
-        ++expected_it;
         v += 1;
     }
 
diff --git a/src/JavaCat/UmlClass.h b/src/JavaCat/UmlClass.h
index 7c843827e..ef683b34e 100644
--- a/src/JavaCat/UmlClass.h
+++ b/src/JavaCat/UmlClass.h
@@ -29,9 +29,7 @@
 #define UMLCLASS_H
 
 #include "UmlBaseClass.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 #ifdef ROUNDTRIP
 class Class;
@@ -60,7 +58,7 @@ class UmlClass : public UmlBaseClass
 # ifdef ROUNDTRIP
     virtual void upload(ClassContainer * cnt);
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
     bool is_created() const {
@@ -73,7 +71,7 @@ class UmlClass : public UmlBaseClass
         return the_class;
     }
     UmlItem * search_for_att_rel(const WrapperStr & name);
-    void reorder(Q3PtrList<UmlItem> & expected_order);
+    void reorder(QList<UmlItem *> & expected_order);
 # endif
 #endif
     static void manage_generic(WrapperStr & form, UmlTypeSpec & typespec,
diff --git a/src/JavaCat/UmlClassItem.cpp b/src/JavaCat/UmlClassItem.cpp
index 7f624803d..39f48e03a 100644
--- a/src/JavaCat/UmlClassItem.cpp
+++ b/src/JavaCat/UmlClassItem.cpp
@@ -27,7 +27,7 @@
 
 #include "UmlClassItem.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 #ifdef ROUNDTRIP
 bool UmlClassItem::set_roundtrip_expected()
@@ -41,7 +41,7 @@ bool UmlClassItem::set_roundtrip_expected()
     return isWritable();
 }
 
-void UmlClassItem::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlClassItem::mark_useless(QList<UmlItem *> & l)
 {
     if (is_useless()) {
         set_isMarked(TRUE);
diff --git a/src/JavaCat/UmlClassItem.h b/src/JavaCat/UmlClassItem.h
index 5515bfada..a23d58406 100644
--- a/src/JavaCat/UmlClassItem.h
+++ b/src/JavaCat/UmlClassItem.h
@@ -27,12 +27,7 @@
 
 #ifndef CLASSITEM_H
 #define CLASSITEM_H
-
-#include <q3ptrlist.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
-
 #include "UmlBaseClassItem.h"
 
 class UmlClassItem : public UmlBaseClassItem
@@ -61,7 +56,7 @@ class UmlClassItem : public UmlBaseClassItem
         useless = !y;
     }
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
 #endif
 };
 
diff --git a/src/JavaCat/UmlClassView.cpp b/src/JavaCat/UmlClassView.cpp
index e4eb30065..41ce764b4 100644
--- a/src/JavaCat/UmlClassView.cpp
+++ b/src/JavaCat/UmlClassView.cpp
@@ -24,11 +24,6 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-
-#include <q3ptrdict.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
 #include "UmlClassView.h"
 
 #ifdef ROUNDTRIP
@@ -37,13 +32,13 @@
 #include "UmlPackage.h"
 #include "Package.h"
 
-static Q3PtrDict<UmlArtifact> Artifacts;
+static QHash<UmlArtifact*,UmlArtifact*> Artifacts;
 
 void UmlClassView::upload(ClassContainer * cnt)
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         (*v)->upload(cnt);
@@ -51,9 +46,9 @@ void UmlClassView::upload(ClassContainer * cnt)
 
 bool UmlClassView::set_roundtrip_expected()
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
     bool result = isWritable();
 
     for (; v != vsup; v += 1)
@@ -62,9 +57,9 @@ bool UmlClassView::set_roundtrip_expected()
     return result;
 }
 
-void UmlClassView::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlClassView::mark_useless(QList<UmlItem *> & l)
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
     UmlClassItem ** v = (UmlClassItem **) ch.data();
     UmlClassItem ** const vsup = v + ch.size();
 
@@ -75,9 +70,9 @@ void UmlClassView::mark_useless(Q3PtrList<UmlItem> & l)
 void UmlClassView::scan_it(int & n)
 {
     // compute artifact list
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     n = 0;
 
@@ -88,7 +83,7 @@ void UmlClassView::scan_it(int & n)
             if (cl->is_roundtrip_expected()) {
                 UmlArtifact * art = cl->associatedArtifact();
 
-                if ((art != 0) && (Artifacts.find(art) == 0)) {
+                if ((art != 0) && (Artifacts.value(art) == 0)) {
                     Artifacts.insert(art, art);
                     n += 1;
                 }
@@ -99,13 +94,13 @@ void UmlClassView::scan_it(int & n)
     if (n != 0) {
         Package::set_step(1, n);
 
-        Q3PtrDictIterator<UmlArtifact> iter(Artifacts);
+        QHashIterator<UmlArtifact*,UmlArtifact*> iter(Artifacts);
 
-        do {
-            ((UmlPackage *) iter.current()->parent()->parent())
-            ->get_package()->reverse(iter.current());
+        while (iter.hasNext()){
+            iter.next();
+            if(iter.value() != 0)
+            ((UmlPackage *) iter.value()->parent()->parent())->get_package()->reverse(iter.value());
         }
-        while (++iter, iter.current() != 0);
 
         Package::set_step(1, -1);
     }
@@ -116,14 +111,13 @@ void UmlClassView::send_it(int n)
     if (n != 0) {
         Package::set_step(2, n);
 
-        Q3PtrDictIterator<UmlArtifact> iter(Artifacts);
+        QHashIterator<UmlArtifact*,UmlArtifact*> iter(Artifacts);
 
-        do {
-            ((UmlPackage *) iter.current()->parent()->parent())
-            ->get_package()->reverse(iter.current());
+        while (iter.hasNext()){
+            iter.next();
+            if(iter.value() != 0)
+            ((UmlPackage *) iter.value()->parent()->parent())->get_package()->reverse(iter.value());
         }
-        while (++iter, iter.current() != 0);
-
         Package::set_step(2, -1);
     }
 }
diff --git a/src/JavaCat/UmlClassView.h b/src/JavaCat/UmlClassView.h
index 1d79daf84..9a4618bbe 100644
--- a/src/JavaCat/UmlClassView.h
+++ b/src/JavaCat/UmlClassView.h
@@ -31,7 +31,7 @@
 #include "UmlBaseClassView.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
+
 
 class ClassContainer;
 
@@ -44,7 +44,7 @@ class UmlClassView : public UmlBaseClassView
 #ifdef ROUNDTRIP
     virtual void upload(ClassContainer *);
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
 #endif
diff --git a/src/JavaCat/UmlDeploymentView.cpp b/src/JavaCat/UmlDeploymentView.cpp
index f8512130c..d09ef2105 100644
--- a/src/JavaCat/UmlDeploymentView.cpp
+++ b/src/JavaCat/UmlDeploymentView.cpp
@@ -32,15 +32,15 @@
 #include "UmlPackage.h"
 #include "Package.h"
 //Added by qt3to4:
-#include <Q3PtrList>
 
-static Q3PtrList<UmlArtifact> Artifacts;
+
+static QList<UmlArtifact *> Artifacts;
 
 bool UmlDeploymentView::set_roundtrip_expected()
 {
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
     bool result = isWritable();
 
     for (; v != vsup; v += 1)
@@ -49,9 +49,9 @@ bool UmlDeploymentView::set_roundtrip_expected()
     return result;
 }
 
-void UmlDeploymentView::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlDeploymentView::mark_useless(QList<UmlItem *> & l)
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
     UmlClassItem ** v = (UmlClassItem **) ch.data();
     UmlClassItem ** const vsup = v + ch.size();
 
@@ -62,9 +62,9 @@ void UmlDeploymentView::mark_useless(Q3PtrList<UmlItem> & l)
 void UmlDeploymentView::scan_it(int & n)
 {
     // compute artifact list
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     n = 0;
 
@@ -79,15 +79,11 @@ void UmlDeploymentView::scan_it(int & n)
     if (n != 0) {
         Package::set_step(1, n);
 
-        Q3PtrListIterator<UmlArtifact> iter(Artifacts);
         Package * pk =
-            ((UmlPackage *) iter.current()->parent()->parent())->get_package();
-
-        do {
-            pk->reverse(iter.current());
-        }
-        while (++iter, iter.current() != 0);
+            ((UmlPackage *) Artifacts.first()->parent()->parent())->get_package();
 
+        foreach (UmlArtifact *artifact, Artifacts)
+            pk->reverse(artifact);
 
         Package::set_step(1, -1);
     }
@@ -98,14 +94,11 @@ void UmlDeploymentView::send_it(int n)
     if (n != 0) {
         Package::set_step(2, n);
 
-        Q3PtrListIterator<UmlArtifact> iter(Artifacts);
         Package * pk =
-            ((UmlPackage *) iter.current()->parent()->parent())->get_package();
+            ((UmlPackage *) Artifacts.first()->parent()->parent())->get_package();
 
-        do {
-            pk->reverse(iter.current());
-        }
-        while (++iter, iter.current() != 0);
+        foreach (UmlArtifact *artifact, Artifacts)
+            pk->reverse(artifact);
 
 
         Package::set_step(2, -1);
diff --git a/src/JavaCat/UmlDeploymentView.h b/src/JavaCat/UmlDeploymentView.h
index c8998a5e8..cd5ecf448 100644
--- a/src/JavaCat/UmlDeploymentView.h
+++ b/src/JavaCat/UmlDeploymentView.h
@@ -31,7 +31,7 @@
 #include "UmlBaseDeploymentView.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
+
 
 // This class manages 'deployment view'
 // You can modify it as you want (except the constructor)
@@ -44,7 +44,7 @@ class UmlDeploymentView : public UmlBaseDeploymentView
 
 #ifdef ROUNDTRIP
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
 #endif
diff --git a/src/JavaCat/UmlExtraClassMember.cpp b/src/JavaCat/UmlExtraClassMember.cpp
index 48a0f71df..56240f929 100644
--- a/src/JavaCat/UmlExtraClassMember.cpp
+++ b/src/JavaCat/UmlExtraClassMember.cpp
@@ -33,21 +33,21 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 // an empty string is != a null string in Qt !
-bool inline neq(const WrapperStr & s1, const WrapperStr & s2)
-{
-    return (s1.isEmpty()) ? !s2.isEmpty() : (s1 != s2);
-}
+//bool inline neq(const WrapperStr & s1, const WrapperStr & s2)
+//{
+//    return (s1.isEmpty()) ? !s2.isEmpty() : (s1 != s2);
+//}
 
 void UmlExtraClassMember::add_init(UmlClass * cl, WrapperStr def, bool roundtrip,
-                                   Q3PtrList<UmlItem> & expected_order)
+                                   QList<UmlItem *> & expected_order)
 {
     if (roundtrip) {
-        const Q3PtrVector<UmlItem> & ch = cl->children();
-        UmlItem ** v = ch.data();
-        UmlItem ** const vsup = v + ch.size();
+        const QVector<UmlItem*> & ch = cl->children();
+        UmlItem *const* v = ch.data();
+        UmlItem *const*  vsup = v + ch.size();
         UmlItem * x;
 
         for (; v != vsup; v += 1) {
diff --git a/src/JavaCat/UmlExtraClassMember.h b/src/JavaCat/UmlExtraClassMember.h
index 68823ab54..1ee3dcc7b 100644
--- a/src/JavaCat/UmlExtraClassMember.h
+++ b/src/JavaCat/UmlExtraClassMember.h
@@ -31,7 +31,7 @@
 #include "UmlBaseExtraClassMember.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
+
 
 #ifdef ROUNDTRIP
 class UmlClass;
@@ -51,7 +51,7 @@ class UmlExtraClassMember : public UmlBaseExtraClassMember
 
 #ifdef ROUNDTRIP
     static void add_init(UmlClass * cl, WrapperStr def, bool roundtrip,
-                         Q3PtrList<UmlItem> & expected_order);
+                         QList<UmlItem *> & expected_order);
 #endif
 };
 
diff --git a/src/JavaCat/UmlFormalParameter.h b/src/JavaCat/UmlFormalParameter.h
index e3bfd9857..79f1d7f9f 100644
--- a/src/JavaCat/UmlFormalParameter.h
+++ b/src/JavaCat/UmlFormalParameter.h
@@ -28,10 +28,7 @@
 #ifndef _UMLFORMALPARAMETER_H
 #define _UMLFORMALPARAMETER_H
 
-#include <q3valuelist.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
-
 #include "UmlBaseFormalParameter.h"
 
 // This class manages 'formal parameters' of a template class. For instance 'T' in
@@ -47,6 +44,6 @@ class UmlFormalParameter : public UmlBaseFormalParameter
     UmlFormalParameter(WrapperStr n, const UmlTypeSpec & e);
 };
 
-typedef Q3ValueList<UmlFormalParameter> FormalParameterList;
+typedef QList<UmlFormalParameter> FormalParameterList;
 
 #endif
diff --git a/src/JavaCat/UmlItem.cpp b/src/JavaCat/UmlItem.cpp
index 42856a55a..97d9d7977 100644
--- a/src/JavaCat/UmlItem.cpp
+++ b/src/JavaCat/UmlItem.cpp
@@ -28,7 +28,7 @@
 #include "UmlItem.h"
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 UmlItem::~UmlItem()
 {
@@ -46,7 +46,7 @@ bool UmlItem::set_roundtrip_expected()
     return TRUE;
 }
 
-void UmlItem::mark_useless(Q3PtrList<UmlItem> &)
+void UmlItem::mark_useless(QList<UmlItem *> &)
 {
     // does nothing
 }
diff --git a/src/JavaCat/UmlItem.h b/src/JavaCat/UmlItem.h
index fedd007fc..f26b2abb1 100644
--- a/src/JavaCat/UmlItem.h
+++ b/src/JavaCat/UmlItem.h
@@ -29,12 +29,9 @@
 #define UMLITEM_H
 
 #include "UmlBaseItem.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
-
 #ifdef ROUNDTRIP
-#include <q3ptrlist.h>
+
 
 class ClassContainer;
 #endif
@@ -50,7 +47,7 @@ class UmlItem : public UmlBaseItem
 #ifdef ROUNDTRIP
     virtual void upload(ClassContainer *);
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
 #endif
diff --git a/src/JavaCat/UmlOperation.cpp b/src/JavaCat/UmlOperation.cpp
index ceb7d3369..c5f86d0bd 100644
--- a/src/JavaCat/UmlOperation.cpp
+++ b/src/JavaCat/UmlOperation.cpp
@@ -29,9 +29,9 @@
 #include <iostream>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 using namespace std;
 #endif
@@ -56,7 +56,7 @@ using namespace std;
 #endif
 
 bool UmlOperation::new_one(Class * container, const WrapperStr & name,
-                           const Q3ValueList<FormalParameterList> & tmplts,
+                           const QList<FormalParameterList> & tmplts,
                            const WrapperStr & oper_templ,
                            UmlTypeSpec & type, WrapperStr str_actuals,
                            UmlClass * first_actual_class, WrapperStr type_def,
@@ -66,7 +66,7 @@ bool UmlOperation::new_one(Class * container, const WrapperStr & name,
                            const WrapperStr & array, WrapperStr comment,
                            WrapperStr description, WrapperStr annotation
 #ifdef ROUNDTRIP
-                           , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                           , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                           )
 {
@@ -82,17 +82,21 @@ bool UmlOperation::new_one(Class * container, const WrapperStr & name,
     bool may_roundtrip = roundtrip &&
                          (!container->from_libp() ||	(visibility != PrivateVisibility));
     UmlTypeSpec return_type;
-    Q3ValueList<UmlParameter> params;
-    Q3ValueList<UmlTypeSpec> exceptions;
+    QList<UmlParameter> params;
+    QList<UmlTypeSpec> exceptions;
     WrapperStr body;
 
     if (may_roundtrip)
 #else
     if (
 # ifdef REVERSE
-        container->from_libp() &&
+        container->from_libp() && (
+# endif
+                                   visibility == PrivateVisibility
+# ifdef REVERSE
+                                   )
 # endif
-        (visibility == PrivateVisibility))
+        )
 #endif
         op = 0;
     else {
@@ -235,7 +239,7 @@ bool UmlOperation::new_one(Class * container, const WrapperStr & name,
                                      + name + "</i> in <i>" + cl->name()
                                      + "</i></b></font><br>");
 # ifdef TRACE
-                QLOG_INFO() << "ERROR cannot add param '" << param.name << "' type '" << param.type.Type() << '\n';
+                QLOG_INFO() << "ERROR cannot add param '" << param.name << "' type '" << param.type.toString() << '\n';
 # endif
                 return FALSE;
             }
@@ -471,9 +475,9 @@ bool UmlOperation::new_one(Class * container, const WrapperStr & name,
                 op->set_ReturnType(return_type);
             }
 
-            Q3ValueList<UmlParameter>::Iterator itp1;
-            const Q3ValueList<UmlParameter> old_params = op->params();
-            Q3ValueList<UmlParameter>::ConstIterator itp2;
+            QList<UmlParameter>::Iterator itp1;
+            const QList<UmlParameter> old_params = op->params();
+            QList<UmlParameter>::ConstIterator itp2;
 
             for (rank = 0, itp1 = params.begin(), itp2 = old_params.begin();
                  (itp1 != params.end()) && (itp2 != old_params.end());
@@ -518,9 +522,9 @@ bool UmlOperation::new_one(Class * container, const WrapperStr & name,
                 while (itp2 != old_params.end());
             }
 
-            Q3ValueList<UmlTypeSpec>::ConstIterator ite1;
-            const Q3ValueList<UmlTypeSpec> old_exceptions = op->exceptions();
-            Q3ValueList<UmlTypeSpec>::ConstIterator ite2;
+            QList<UmlTypeSpec>::ConstIterator ite1;
+            const QList<UmlTypeSpec> old_exceptions = op->exceptions();
+            QList<UmlTypeSpec>::ConstIterator ite2;
 
             for (rank = 0, ite1 = exceptions.begin(), ite2 = old_exceptions.begin();
                  (ite1 != exceptions.end()) && (ite2 != old_exceptions.end());
@@ -592,12 +596,12 @@ bool UmlOperation::new_one(Class * container, const WrapperStr & name,
 
         expected_order.append(op);
 
-        Q3ValueList<UmlParameter>::ConstIterator itp;
+        QList<UmlParameter>::ConstIterator itp;
 
         for (rank = 0, itp = params.begin(); itp != params.end(); ++itp)
             op->addParameter(rank++, *itp);
 
-        Q3ValueList<UmlTypeSpec>::ConstIterator ite;
+        QList<UmlTypeSpec>::ConstIterator ite;
 
         for (rank = 0, ite = exceptions.begin(); ite != exceptions.end(); ++ite)
             op->addException(rank++, *ite);
@@ -643,7 +647,7 @@ bool UmlOperation::new_one(Class * container, const WrapperStr & name,
 }
 
 bool UmlOperation::read_param(Class * container, unsigned rank,
-                              const Q3ValueList<FormalParameterList> & tmplts,
+                              const QList<FormalParameterList> & tmplts,
                               UmlParameter & param, WrapperStr & def, bool bypass)
 {
 #ifdef TRACE
@@ -655,7 +659,7 @@ bool UmlOperation::read_param(Class * container, unsigned rank,
     bool ellipsis = FALSE;
     WrapperStr array;
     bool type_read = FALSE;
-    Q3ValueList<UmlTypeSpec> actuals;
+    QList<UmlTypeSpec> actuals;
     WrapperStr str_actuals;
     WrapperStr annotation;
 
@@ -894,7 +898,7 @@ UmlOperation  * UmlOperation::already_exist_from_id(Class * container, WrapperSt
                           " before line " + QString::number(Lex::line_number()) +
                           " : invalid preserve body identifier</font><br>";
 
-            UmlCom::trace(err);
+            UmlCom::trace(err.toLatin1().constData());
             throw 0;
         }
 
@@ -908,7 +912,7 @@ UmlOperation  * UmlOperation::already_exist_from_id(Class * container, WrapperSt
                           " before line " + QString::number(Lex::line_number()) +
                           " : invalid preserve body block, end of line expected</font><br>";
 
-            UmlCom::trace(err);
+            UmlCom::trace(err.toLatin1().constData());
             throw 0;
         }
 
@@ -920,7 +924,7 @@ UmlOperation  * UmlOperation::already_exist_from_id(Class * container, WrapperSt
                           " before line " + QString::number(Lex::line_number()) +
                           " : invalid preserve body block, wrong balanced</font><br>";
 
-            UmlCom::trace(err);
+            UmlCom::trace(err.toLatin1().constData());
             throw 0;
         }
 
@@ -937,7 +941,7 @@ UmlOperation  * UmlOperation::already_exist_from_id(Class * container, WrapperSt
                               " before line " + QString::number(Lex::line_number()) +
                               " : preserve body block identifier used twice</font><br>";
 
-                UmlCom::trace(err);
+                UmlCom::trace(err.toLatin1().constData());
                 throw 0;
             }
 
@@ -953,12 +957,12 @@ UmlOperation  * UmlOperation::already_exist_from_id(Class * container, WrapperSt
 }
 
 UmlOperation * UmlOperation::already_exist(Class * container, const WrapperStr & name,
-        Q3ValueList<UmlParameter> & params)
+        QList<UmlParameter> & params)
 {
-    const Q3PtrVector<UmlItem> & ch = container->get_uml()->UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
-    Q3PtrList<UmlOperation> opers;
+    const QVector<UmlItem*> & ch = container->get_uml()->UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
+    QList<UmlOperation *> opers;
 
     for (; v != vsup; v += 1)
         if (((*v)->kind() == anOperation) &&
@@ -973,20 +977,19 @@ UmlOperation * UmlOperation::already_exist(Class * container, const WrapperStr &
     case 1:
         // suppose it is this one
         // even don't know if it is placed later in file
-        return opers.getFirst();
+        return opers.first();
 
     default:
         break;
     }
 
-    UmlOperation * op;
-    Q3PtrList<UmlOperation> same_names;
+    QList<UmlOperation *> same_names;
 
     // search for operation having the same params name and number
-    for (op = opers.first(); op != 0; op = opers.next()) {
-        Q3ValueList<UmlParameter> ps = op->params();
-        Q3ValueList<UmlParameter>::ConstIterator it1;
-        Q3ValueList<UmlParameter>::ConstIterator it2;
+    foreach (UmlOperation *op, opers) {
+        QList<UmlParameter> ps = op->params();
+        QList<UmlParameter>::ConstIterator it1;
+        QList<UmlParameter>::ConstIterator it2;
         bool same_type = TRUE;
         bool same_name = TRUE;
 
@@ -1020,7 +1023,7 @@ UmlOperation * UmlOperation::already_exist(Class * container, const WrapperStr &
         // only one having the same number of param
         // and same param names (type changed)
         // suppose this one
-        return same_names.getFirst();
+        return same_names.first();
     }
 
     // suppose not find
diff --git a/src/JavaCat/UmlOperation.h b/src/JavaCat/UmlOperation.h
index e8ce25571..3704e3211 100644
--- a/src/JavaCat/UmlOperation.h
+++ b/src/JavaCat/UmlOperation.h
@@ -30,10 +30,8 @@
 
 #include "UmlBaseOperation.h"
 #include "UmlClass.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
-#include <Q3PtrList>
+#include <QList>
 
 class Class;
 
@@ -41,7 +39,7 @@ class UmlOperation : public UmlBaseOperation
 {
 private:
     static bool read_param(Class * container, unsigned rank,
-                           const Q3ValueList<FormalParameterList> & tmplts,
+                           const QList<FormalParameterList> & tmplts,
                            UmlParameter & param, WrapperStr & decl, bool bypass);
 
 public:
@@ -49,7 +47,7 @@ class UmlOperation : public UmlBaseOperation
         : UmlBaseOperation(id, n) {};
 
     static bool new_one(Class * container, const WrapperStr & name,
-                        const Q3ValueList<FormalParameterList> & tmplts,
+                        const QList<FormalParameterList> & tmplts,
                         const WrapperStr & oper_templ,
                         UmlTypeSpec & type, WrapperStr str_actuals,
                         UmlClass * first_actual_class, WrapperStr type_def,
@@ -59,7 +57,7 @@ class UmlOperation : public UmlBaseOperation
                         const WrapperStr & array,	WrapperStr comment,
                         WrapperStr description, WrapperStr annotation
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        );
 
@@ -70,7 +68,7 @@ class UmlOperation : public UmlBaseOperation
 private:
     static UmlOperation * already_exist_from_id(Class * container, WrapperStr & body);
     static UmlOperation * already_exist(Class * container, const WrapperStr & name,
-                                        Q3ValueList<UmlParameter> & params);
+                                        QList<UmlParameter> & params);
 #endif
 };
 
diff --git a/src/JavaCat/UmlPackage.cpp b/src/JavaCat/UmlPackage.cpp
index 12c843e0f..60857cd35 100644
--- a/src/JavaCat/UmlPackage.cpp
+++ b/src/JavaCat/UmlPackage.cpp
@@ -31,7 +31,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 #endif
 
 #include "UmlPackage.h"
@@ -60,9 +60,9 @@ UmlPackage::UmlPackage(void * id, const WrapperStr & n)
 UmlClassView * UmlPackage::get_classview()
 {
     if (classview == 0) {
-        const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-        UmlItem ** v = ch.data();
-        UmlItem ** const vsup = v + ch.size();
+        const QVector<UmlItem*> & ch = UmlItem::children();
+        UmlItem *const* v = ch.data();
+        UmlItem *const*  vsup = v + ch.size();
 
         for (; v != vsup; v += 1) {
             // return the first class view find
@@ -97,9 +97,9 @@ UmlClassView * UmlPackage::get_classview()
 UmlDeploymentView * UmlPackage::get_deploymentview()
 {
     if (deploymentview == 0) {
-        const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-        UmlItem ** v = ch.data();
-        UmlItem ** const vsup = v + ch.size();
+        const QVector<UmlItem*> & ch = UmlItem::children();
+        UmlItem *const* v = ch.data();
+        UmlItem *const*  vsup = v + ch.size();
 
         for (; v != vsup; v += 1) {
             // return the first class view found
@@ -136,9 +136,9 @@ void UmlPackage::init(Package * p)
 {
     package = p;
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         (*v)->upload(package);
@@ -148,9 +148,9 @@ void UmlPackage::upload(ClassContainer * cnt)
 {
     package = new Package((Package *) cnt, this);
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         (*v)->upload(package);
@@ -160,9 +160,9 @@ int UmlPackage::count_roundtriped()
 {
     int result = 1;
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
 
     for (; v != vsup; v += 1)
         if ((*v)->kind() == aPackage)
@@ -178,9 +178,9 @@ bool UmlPackage::set_roundtrip_expected()
 
     Progress::tic_it();
 
-    const Q3PtrVector<UmlItem> & ch = UmlItem::children();
-    UmlItem ** v = ch.data();
-    UmlItem ** const vsup = v + ch.size();
+    const QVector<UmlItem*> & ch = UmlItem::children();
+    UmlItem *const* v = ch.data();
+    UmlItem *const*  vsup = v + ch.size();
     bool result = isWritable();
 
     for (; v != vsup; v += 1)
@@ -189,9 +189,9 @@ bool UmlPackage::set_roundtrip_expected()
     return result;
 }
 
-void UmlPackage::mark_useless(Q3PtrList<UmlItem> & l)
+void UmlPackage::mark_useless(QList<UmlItem *> & l)
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
     UmlClassItem ** v = (UmlClassItem **) ch.data();
     UmlClassItem ** const vsup = v + ch.size();
 
diff --git a/src/JavaCat/UmlPackage.h b/src/JavaCat/UmlPackage.h
index dfa0b90d8..f0b072568 100644
--- a/src/JavaCat/UmlPackage.h
+++ b/src/JavaCat/UmlPackage.h
@@ -29,9 +29,7 @@
 #define UMLPACKAGE_H
 
 #include "UmlBasePackage.h"
-//Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
 
 class UmlClassView;
 #ifdef REVERSE
@@ -54,7 +52,7 @@ class UmlPackage : public UmlBasePackage
     void init(Package *);
     virtual void upload(ClassContainer *);
     virtual bool set_roundtrip_expected();
-    virtual void mark_useless(Q3PtrList<UmlItem> & l);
+    virtual void mark_useless(QList<UmlItem *> & l);
     virtual void scan_it(int & n);
     virtual void send_it(int n);
     Package * get_package() const {
diff --git a/src/JavaCat/UmlRelation.cpp b/src/JavaCat/UmlRelation.cpp
index 34b5b53eb..9318410d1 100644
--- a/src/JavaCat/UmlRelation.cpp
+++ b/src/JavaCat/UmlRelation.cpp
@@ -30,7 +30,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 using namespace std;
 #endif
@@ -98,20 +98,20 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
                           WrapperStr comment, WrapperStr description,
                           WrapperStr annotation
 #ifdef ROUNDTRIP
-                          , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                          , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                          )
 {
-#ifdef TRACE
-    QLOG_INFO() << "RELATION '" << name << "' from '" << cl->Name() << "' to '" << dest.type->Name()
-                << "' array '" << array << "'\n";
-#endif
-
     if (
 #ifdef REVERSE
-        container->from_libp() &&
+        container->from_libp() && (
+#endif
+                                   visibility == PrivateVisibility
+#ifdef REVERSE
+                                   )
 #endif
-        (visibility == PrivateVisibility)) {
+        )
+    {
         Lex::finish_line();
         Lex::clear_comments();
         return TRUE;
@@ -120,6 +120,11 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
     UmlClass * cl = container->get_uml();
     UmlRelation * rel;
 
+#ifdef TRACE
+    QLOG_INFO() << "RELATION '" << name << "' from '" << cl->name() << "' to '" << dest.type->name()
+        << "' array '" << array << "'\n";
+#endif
+
 #ifdef ROUNDTRIP
     bool created;
 
@@ -281,20 +286,20 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
                               WrapperStr comment, WrapperStr description,
                               WrapperStr annotation
 #ifdef ROUNDTRIP
-                              , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                              , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                              )
     {
-#ifdef TRACE
-        QLOG_INFO() << "RELATION '" << name << "' from '" << cl->Name() << "' to '" << type->Name()
-                    << "' array '" << array << "'\n";
-#endif
-
         if (
 #ifdef REVERSE
-            container->from_libp() &&
+            container->from_libp() && (
+#endif
+                                       visibility == PrivateVisibility
+#ifdef REVERSE
+                                       )
 #endif
-            (visibility == PrivateVisibility)) {
+            )
+        {
             Lex::finish_line();
             Lex::clear_comments();
             return TRUE;
@@ -308,6 +313,11 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
         UmlClass * cl = container->get_uml();
         UmlRelation * rel;
 
+#ifdef TRACE
+        QLOG_INFO() << "RELATION '" << name << "' from '" << cl->name() << "' to '" << type->name()
+            << "' array '" << array << "'\n";
+#endif
+
 #ifdef ROUNDTRIP
         bool created;
 
@@ -489,7 +499,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name,
             UmlRelation * r2 = (r1 != this) ? this : side(FALSE);
 
             if (r1->isReadOnly() || r2->isReadOnly()) {
-                UmlCom::trace(WrapperStr("<font face=helvetica>in <i>") + WrapperStr(Lex::filename().toAscii().constData())
+                UmlCom::trace(WrapperStr("<font face=helvetica>in <i>") + WrapperStr(Lex::filename().toLatin1().constData())
                               + "</i> line " + WrapperStr().setNum(Lex::line_number())
                               + " <b>cannot remove relation between classes <i>"
                               + roleType()->name() + "</i> and <i>" + parent()->name()
diff --git a/src/JavaCat/UmlRelation.h b/src/JavaCat/UmlRelation.h
index 22ca04c0e..e672faea1 100644
--- a/src/JavaCat/UmlRelation.h
+++ b/src/JavaCat/UmlRelation.h
@@ -28,10 +28,10 @@
 #ifndef UMLRELATION_H
 #define UMLRELATION_H
 
-#include <q3valuelist.h>
+#include <QList>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrList>
+
 
 #include "UmlBaseRelation.h"
 #include "UmlTypeSpec.h"
@@ -54,7 +54,7 @@ class UmlRelation : public UmlBaseRelation
                         WrapperStr comment, WrapperStr description,
                         WrapperStr annotation
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        );
     static bool new_one(Class * container, const WrapperStr & name,
@@ -66,7 +66,7 @@ class UmlRelation : public UmlBaseRelation
                         WrapperStr comment, WrapperStr description,
                         WrapperStr annotation
 #ifdef ROUNDTRIP
-                        , bool roundtrip, Q3PtrList<UmlItem> & expected_order
+                        , bool roundtrip, QList<UmlItem *> & expected_order
 #endif
                        );
 #ifdef ROUNDTRIP
diff --git a/src/JavaCat/menufactory.cpp b/src/JavaCat/menufactory.cpp
new file mode 100644
index 000000000..1332d410f
--- /dev/null
+++ b/src/JavaCat/menufactory.cpp
@@ -0,0 +1,132 @@
+// *************************************************************************
+//
+// Copyright 2012 Daniel Hellsson
+//
+// This file is part of the DoUML Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : douml@hellsson.com
+// home   : http://github.com/leonardo2d/douml/
+//
+// *************************************************************************
+
+#include "menufactory.h"
+#include <QObject>
+
+void MenuFactory::createTitle(
+    QMenu & menu,
+    const QString & title)
+{
+    QAction * pItem = menu.addAction(title);
+    QFont font = menu.font();
+    font.setBold(true);
+    pItem->setFont(font);
+    pItem->setEnabled(false);
+}
+
+void MenuFactory::addItems(
+    QMenu & menu,
+    const Item items[],
+    const int nofItems)
+{
+    for (int i = 0; i < nofItems; i++) {
+        addItem(
+            menu,
+            items[i].name,
+            items[i].id,
+            items[i].whatsThis);
+    }
+}
+
+void MenuFactory::addItem(
+    QMenu   &   menu,
+    const char * const name,
+    const int         id,
+    const char * const whatsThis)
+{
+    QAction *action = menu.addAction(QObject::tr(name));
+    if(whatsThis)
+        action->setWhatsThis(QObject::tr(whatsThis));
+    action->setData(id);
+}
+void MenuFactory::addItem(
+    QMenu   &   menu,
+    QString const name,
+    const int         id,
+    QString const whatsThis)
+{
+    QAction *action = menu.addAction(name);
+    if(!whatsThis.isEmpty())
+        action->setWhatsThis((whatsThis));
+    action->setData(id);
+}
+QMenu & MenuFactory::menu()
+{
+    return m_menu;
+}
+
+void MenuFactory::createTitle(
+    const QString title)
+{
+    createTitle(m_menu, title);
+}
+
+void MenuFactory::addItems(
+    const Item    items[],
+    const int     nofItems)
+{
+    addItems(m_menu, items, nofItems);
+}
+
+void MenuFactory::addItem(
+    const char * const name,
+    const int         id,
+    const char * const whatsThis)
+{
+    addItem(m_menu, name, id, whatsThis);
+}
+
+void MenuFactory::addItem(
+    const char * const name,
+    QMenu * const      subMenu)
+{
+    Q_UNUSED(name);
+    
+    //m_menu.insertItem(name, subMenu);
+    m_menu.addMenu(subMenu);
+}
+
+
+void MenuFactory::insertSeparator()
+{
+    m_menu.addSeparator();
+}
+
+QAction *MenuFactory::findAction(const QMenu &menu, int id)
+{
+    foreach (QAction* action, menu.actions()) {
+        if(action->data().toInt() == id)return action;
+    }
+    return NULL;
+}
+
+void MenuFactory::insertItem(QMenu &parentMenu, QString name, QMenu *menu, QString what)
+{
+    menu->setTitle(name);
+    parentMenu.addMenu(menu);
+    if(!what.isEmpty())
+        menu->setWhatsThis(what);
+}
diff --git a/src/JavaCat/menufactory.h b/src/JavaCat/menufactory.h
new file mode 100644
index 000000000..cebecd290
--- /dev/null
+++ b/src/JavaCat/menufactory.h
@@ -0,0 +1,88 @@
+// *************************************************************************
+//
+// Copyright 2012 Daniel Hellsson
+//
+// This file is part of the DoUML Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : douml@hellsson.com
+// home   : http://github.com/leonardo2d/douml/
+//
+// *************************************************************************
+
+#ifndef MENUFACTORY_H
+#define MENUFACTORY_H
+
+#include <QMenu>
+//#include <QMenuItem>
+//#include "mystr.h"
+class MenuFactory
+{
+private:
+    QMenu m_menu;
+
+public:
+    typedef struct _Item {
+        const char * const name;
+        const int id;
+        const char * const whatsThis;
+    } Item;
+
+    static void createTitle(
+        QMenu     &     menu,
+        const QString & title);
+
+    static void addItems(
+        QMenu & menu,
+        const Item    items[],
+        const int     nofItems);
+
+    static void addItem(
+        QMenu   &   menu,
+        const char * const name,
+        const int         id,
+        const char * const whatsThis = NULL);
+    static void addItem(
+        QMenu   &   menu,
+        QString const name,
+        const int         id,
+        QString const whatsThis = QString());
+
+    virtual void createTitle(
+        const QString title);
+
+    virtual void addItems(
+        const Item    items[],
+        const int     nofItems);
+
+    virtual void addItem(
+        const char * const name,
+        const int         id,
+        const char * const whatsThis = NULL);
+
+    virtual void addItem(
+        const char * const name,
+        QMenu * const      subMenu);
+
+    virtual QMenu & menu();
+
+    virtual void insertSeparator();
+    static QAction* findAction(const QMenu &menu , int id);
+    static void insertItem(QMenu& parentMenu, QString name, QMenu* menu, QString what = QString());
+
+};
+
+#endif // MENUFACTORY_H
diff --git a/src/JavaGenerator/JavaGenerator.pro b/src/JavaGenerator/JavaGenerator.pro
index 400253588..341ace170 100644
--- a/src/JavaGenerator/JavaGenerator.pro
+++ b/src/JavaGenerator/JavaGenerator.pro
@@ -1,5 +1,8 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES          = UmlClassItem.cpp UmlAttribute.cpp \
         UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \
         UmlExtraClassMember.cpp UmlArtifact.cpp \
@@ -95,25 +98,21 @@ SOURCES          = UmlClassItem.cpp UmlAttribute.cpp \
     ../Logging/QsLog.cpp \
     ../Logging/QsDebugOutput.cpp
 TARGET          = java_generator
-DEFINES          = WITHJAVA BooL=bool
-INCLUDEPATH   = ../Tools ../JavaGenerator ../
-
-DESTDIR = ../../bin
+DEFINES          += WITHJAVA BooL=bool TRUE=true FALSE=false
+INCLUDEPATH   += ../Tools ../JavaGenerator ../
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network
+#qt3support
 
-QMAKE_CXXFLAGS += -std=gnu++11
-Release{
-    MOC_DIR = ../../bin/MOC_release/java_gen/
-    OBJECTS_DIR = ../../bin/Obj_release/java_gen
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/java_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_release/java_generator
 }
-
-Debug{
-    MOC_DIR = ../../bin/MOC_debug/java_gen/
-    OBJECTS_DIR = ../../bin/Obj_debug/java_gen
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/java_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/java_generator
 }
-
-    DESTDIR = ../../bin
-
diff --git a/src/JavaGenerator/UmlArtifact.cpp b/src/JavaGenerator/UmlArtifact.cpp
index b4e18404b..518ae777c 100644
--- a/src/JavaGenerator/UmlArtifact.cpp
+++ b/src/JavaGenerator/UmlArtifact.cpp
@@ -76,7 +76,7 @@ void UmlArtifact::generate()
                              + name + "</i> in " + path + "</i></font><br>");
 
         // get bodies if preserve
-        const Q3PtrVector<UmlClass> & cls = associatedClasses();
+        const QVector<UmlClass*> & cls = associatedClasses();
 
         if (preserve())
             UmlOperation::read_bodies(path);
@@ -280,13 +280,13 @@ bool UmlArtifact::is_imported(const WrapperStr & s)
     if (imports == 0)
         Q_ASSERT_X(0, "Null Pointer Dereference", "Javagenerator/UmlArtifact.cpp");
 
-    return (imports->find(s) != 0);
+    return (imports->value(s) != 0);
 }
 
 bool UmlArtifact::is_imported(WrapperStr path, WrapperStr class_name)
 {
     if (imports == 0) {
-        imports = new Q3AsciiDict<UmlArtifact>(17);
+        imports = new QHash<WrapperStr, UmlArtifact*>;
 
         WrapperStr s = javaSource();
         int index = 0;
@@ -313,8 +313,8 @@ bool UmlArtifact::is_imported(WrapperStr path, WrapperStr class_name)
         }
     }
 
-    return ((imports->find(path + '.' + class_name) != 0) ||
-            (imports->find(path + ".*") != 0));
+    return ((imports->value(path + '.' + class_name) != 0) ||
+            (imports->value(path + ".*") != 0));
 }
 
 bool UmlArtifact::must_be_saved(const char * path, const char * new_contains)
diff --git a/src/JavaGenerator/UmlArtifact.h b/src/JavaGenerator/UmlArtifact.h
index b2deda295..0294f3d53 100644
--- a/src/JavaGenerator/UmlArtifact.h
+++ b/src/JavaGenerator/UmlArtifact.h
@@ -28,10 +28,7 @@
 #ifndef UMLARTIFACT_H
 #define UMLARTIFACT_H
 
-#include <q3asciidict.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
-
 #include "UmlBaseArtifact.h"
 
 class UmlPackage;
@@ -43,7 +40,7 @@ class UmlArtifact : public UmlBaseArtifact
 {
 private:
     bool managed;
-    Q3AsciiDict<UmlArtifact> * imports;
+    QHash<WrapperStr, UmlArtifact*> * imports;
 
     static UmlArtifact * current;
     static UmlPackage * package_of_generated_artifact;
diff --git a/src/JavaGenerator/UmlAttribute.cpp b/src/JavaGenerator/UmlAttribute.cpp
index 929d24e00..9e6e91912 100644
--- a/src/JavaGenerator/UmlAttribute.cpp
+++ b/src/JavaGenerator/UmlAttribute.cpp
@@ -133,7 +133,7 @@ void UmlAttribute::generate(QTextStream & f, const WrapperStr & cl_stereotype,
                     f << "[]";
                 else {
                     for (unsigned index = 0; index != m.length(); index += 1) {
-                        switch (m.at(index).toAscii().at(0)) {
+                        switch (m.at(index).toLatin1().at(0)) {
                         case '[':
                             f << '[';
                             break;
diff --git a/src/JavaGenerator/UmlAttribute.h b/src/JavaGenerator/UmlAttribute.h
index b4484a215..59a93aeea 100644
--- a/src/JavaGenerator/UmlAttribute.h
+++ b/src/JavaGenerator/UmlAttribute.h
@@ -41,14 +41,15 @@ class UmlAttribute : public UmlBaseAttribute
     UmlAttribute(void * id, const WrapperStr & n)
         :  UmlBaseAttribute(id, n) {};
 
+    using UmlBaseAttribute::generate;
     virtual void generate(QTextStream & f, const WrapperStr & cl_stereotype,
-                          WrapperStr indent);
+                          WrapperStr indent) override;
     virtual void generate_enum_pattern_item(QTextStream & f, int & current_value,
                                             const WrapperStr & class_name,
-                                            WrapperStr indent);
-    virtual void generate_enum_pattern_case(QTextStream & f, WrapperStr indent);
-    virtual void generate_enum_item(QTextStream & f, WrapperStr indent, BooL & first);
-    virtual void generate_enum_member(QTextStream & f, WrapperStr indent);
+                                            WrapperStr indent) override;
+    virtual void generate_enum_pattern_case(QTextStream & f, WrapperStr indent) override;
+    virtual void generate_enum_item(QTextStream & f, WrapperStr indent, BooL & first) override;
+    virtual void generate_enum_member(QTextStream & f, WrapperStr indent) override;
 
 private:
     void generate(QTextStream & f, const WrapperStr & cl_stereotype,
diff --git a/src/JavaGenerator/UmlClass.cpp b/src/JavaGenerator/UmlClass.cpp
index 8ef8072aa..a77289444 100644
--- a/src/JavaGenerator/UmlClass.cpp
+++ b/src/JavaGenerator/UmlClass.cpp
@@ -31,7 +31,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "UmlClass.h"
 #include "UmlPackage.h"
@@ -73,8 +73,8 @@ void UmlClass::generate()
 
 void UmlClass::generate(QTextStream & f, WrapperStr indent)
 {
-    Q3PtrVector<UmlItem> ch = children();
-    const Q3ValueList<UmlActualParameter> actuals = this->actuals();
+    QVector<UmlItem*> ch = children();
+    const QList<UmlActualParameter> actuals = this->actuals();
     const unsigned sup = ch.size();
     const WrapperStr & stereotype = java_stereotype();
     bool an_enum_pattern = (stereotype == "enum_pattern");
@@ -301,9 +301,9 @@ void UmlClass::write(QTextStream & f)
         else if ((index = s.find("${Name}")) != -1)
             s.replace(index, 7, capitalize(name()));
         else if ((index = s.find("${NAME}")) != -1)
-            s.replace(index, 7, name().upper());
+            s.replace(index, 7, name().upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            s.replace(index, 7, name().lower());
+            s.replace(index, 7, name().lower().toLatin1().constData());
 
         f << s;
     }
@@ -391,13 +391,13 @@ void UmlClass::generate_enum_member(QTextStream & f, WrapperStr indent)
 
 void UmlClass::generate_formals(QTextStream & f)
 {
-    Q3ValueList<UmlFormalParameter> fs = formals();
+    QList<UmlFormalParameter> fs = formals();
 
     if (! fs.isEmpty()) {
-        Q3ValueList<UmlFormalParameter>::Iterator it;
+        QList<UmlFormalParameter>::Iterator it;
         const char * sep = "<";
 
-        for (it = fs.begin(); it != fs.end(); it++) {
+        for (it = fs.begin(); it != fs.end(); ++it) {
             UmlFormalParameter & p = *it;
 
             f << sep;
@@ -420,7 +420,7 @@ void UmlClass::generate_formals(QTextStream & f)
 
 void UmlClass::generate_import(QTextStream & f, const WrapperStr & indent)
 {
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     const unsigned sup = ch.size();
     unsigned index;
 
diff --git a/src/JavaGenerator/UmlClass.h b/src/JavaGenerator/UmlClass.h
index ddb91d20e..840a36dac 100644
--- a/src/JavaGenerator/UmlClass.h
+++ b/src/JavaGenerator/UmlClass.h
@@ -28,7 +28,7 @@
 #ifndef UMLCLASS_H
 #define UMLCLASS_H
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
diff --git a/src/JavaGenerator/UmlClassItem.h b/src/JavaGenerator/UmlClassItem.h
index 263effc48..f1e27dde0 100644
--- a/src/JavaGenerator/UmlClassItem.h
+++ b/src/JavaGenerator/UmlClassItem.h
@@ -28,7 +28,7 @@
 #ifndef UMLCLASSITEM_H
 #define UMLCLASSITEM_H
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
@@ -45,6 +45,7 @@ class UmlClassItem : public UmlBaseClassItem
         : UmlBaseClassItem(id, n) {
     };
 
+    using UmlBaseClassItem::generate;
     virtual void generate(QTextStream & f, const WrapperStr & cl_stereotype,
                           WrapperStr indent) = 0;
     virtual void generate_enum_pattern_item(QTextStream & f, int & current_value,
diff --git a/src/JavaGenerator/UmlClassMember.cpp b/src/JavaGenerator/UmlClassMember.cpp
index 0430fb1eb..93c7f677e 100644
--- a/src/JavaGenerator/UmlClassMember.cpp
+++ b/src/JavaGenerator/UmlClassMember.cpp
@@ -114,7 +114,7 @@ void UmlClassMember::generate_visibility(QTextStream & f, const char * parent_st
 }
 
 /*
-bool UmlClassMember::compute_dependency(Q3PtrList<JavaRefType> & dependencies,
+bool UmlClassMember::compute_dependency(QList<JavaRefType *> & dependencies,
 					WrapperStr decl, const UmlTypeSpec & t)
 {
   remove_comments(decl);
diff --git a/src/JavaGenerator/UmlClassView.cpp b/src/JavaGenerator/UmlClassView.cpp
index abe804ded..c0b1747e8 100644
--- a/src/JavaGenerator/UmlClassView.cpp
+++ b/src/JavaGenerator/UmlClassView.cpp
@@ -29,9 +29,9 @@
 
 void UmlClassView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/JavaGenerator/UmlDeploymentView.cpp b/src/JavaGenerator/UmlDeploymentView.cpp
index c34ceb554..87d719f8e 100644
--- a/src/JavaGenerator/UmlDeploymentView.cpp
+++ b/src/JavaGenerator/UmlDeploymentView.cpp
@@ -29,8 +29,8 @@
 
 void UmlDeploymentView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
diff --git a/src/JavaGenerator/UmlExtraClassMember.cpp b/src/JavaGenerator/UmlExtraClassMember.cpp
index d88ee9103..d8d0cf25e 100644
--- a/src/JavaGenerator/UmlExtraClassMember.cpp
+++ b/src/JavaGenerator/UmlExtraClassMember.cpp
@@ -33,7 +33,7 @@
 #include "UmlExtraClassMember.h"
 
 /*
-void UmlExtraClassMember::compute_dependency(Q3PtrList<JavaRefType> &, WrapperStr) {
+void UmlExtraClassMember::compute_dependency(QList<JavaRefType *> &, WrapperStr) {
   // does nothing
 }
 */
diff --git a/src/JavaGenerator/UmlItem.cpp b/src/JavaGenerator/UmlItem.cpp
index faac05706..03fb784d7 100644
--- a/src/JavaGenerator/UmlItem.cpp
+++ b/src/JavaGenerator/UmlItem.cpp
@@ -39,7 +39,7 @@ UmlItem::~UmlItem()
 void UmlItem::manage_comment(const char *& p, const char *& pp,
                              bool javadoc)
 {
-    static QString the_comment;
+    static QByteArray the_comment;
 
     p += 10;
 
@@ -87,12 +87,12 @@ void UmlItem::manage_comment(const char *& p, const char *& pp,
     }
 
     pp = p;
-    p = the_comment;
+    p = the_comment.constData();
 }
 
 void UmlItem::manage_description(const char *& p, const char *& pp)
 {
-    static QString the_comment;
+    static QByteArray the_comment;
 
     p += 14;
 
@@ -100,7 +100,7 @@ void UmlItem::manage_description(const char *& p, const char *& pp)
         description().isEmpty())
         return;
 
-    the_comment = description().operator QString();
+    the_comment = description().operator QString().toLatin1().constData();
 
     switch (*p) {
     case 0:
@@ -112,7 +112,7 @@ void UmlItem::manage_description(const char *& p, const char *& pp)
     }
 
     pp = p;
-    p = the_comment;
+    p = the_comment.constData();
 }
 
 void UmlItem::manage_alias(const char *& p, QTextStream & ts)
@@ -121,7 +121,7 @@ void UmlItem::manage_alias(const char *& p, QTextStream & ts)
     const char * pclosed;
 
     if ((p[1] == '{') && ((pclosed = strchr(p + 2, '}')) != 0)) {
-        Q3CString key(p + 2, pclosed - p - 1);
+        QByteArray key(p + 2, pclosed - p - 1);
         WrapperStr value;
         UmlItem * node = this;
 
diff --git a/src/JavaGenerator/UmlOperation.cpp b/src/JavaGenerator/UmlOperation.cpp
index 8353bc817..851792948 100644
--- a/src/JavaGenerator/UmlOperation.cpp
+++ b/src/JavaGenerator/UmlOperation.cpp
@@ -32,7 +32,7 @@
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
 
 #include "UmlOperation.h"
@@ -44,26 +44,26 @@
 #include "util.h"
 
 // to manage preserved bodies, the key is the id under bouml
-Q3IntDict<char> UmlOperation::bodies(127);
+QHash<int,char*> UmlOperation::bodies;
 const char * BodyPrefix = "// Bouml preserved body begin ";
 const char * BodyPostfix = "// Bouml preserved body end ";
 const int BodyPrefixLength = 30;
 const int BodyPostfixLength = 28;
 
-static bool generate_type(const Q3ValueList<UmlParameter> & params,
+static bool generate_type(const QList<UmlParameter> & params,
                           unsigned rank, QTextStream & f)
 {
-    if (rank >= params.count())
+    if ((int)rank >= params.count())
         return FALSE;
 
     UmlClass::write(f, params[rank].type);
     return TRUE;
 }
 
-static bool generate_var(const Q3ValueList<UmlParameter> & params,
+static bool generate_var(const QList<UmlParameter> & params,
                          unsigned rank, QTextStream & f)
 {
-    if (rank >= params.count())
+    if ((int)rank >= params.count())
         return FALSE;
 
     f << params[rank].name;
@@ -99,9 +99,9 @@ WrapperStr UmlOperation::compute_name()
         else if ((index = get_set_spec.find("${Name}")) != -1)
             get_set_spec.replace(index, 7, capitalize(s));
         else if ((index = s.find("${NAME}")) != -1)
-            get_set_spec.replace(index, 7, s.upper());
+            get_set_spec.replace(index, 7, s.upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            get_set_spec.replace(index, 7, s.lower());
+            get_set_spec.replace(index, 7, s.lower().toLatin1().constData());
 
         return get_set_spec;
     }
@@ -116,6 +116,9 @@ const char * UmlOperation::generate_body(QTextStream & f,
         WrapperStr indent,
         const char * p)
 {
+    if(isAbstract())
+        return p + 7;
+
     const char * body = 0;
     WrapperStr modeler_body;
     bool no_indent;
@@ -125,7 +128,7 @@ const char * UmlOperation::generate_body(QTextStream & f,
         unsigned id = get_id();
 
         sprintf(s_id, "%08X", id);
-        body = bodies.find((long) id);
+        body = bodies.value(id);
     }
 
     if (body == 0) {
@@ -205,7 +208,7 @@ void UmlOperation::generate(QTextStream & f, const WrapperStr & cl_stereotype,
         const char * p = javaDecl();
         const char * pp = 0;
         const char * afterparam = 0;
-        const Q3ValueList<UmlParameter> & params = this->params();
+        const QList<UmlParameter> & params = this->params();
         unsigned rank;
         const char * body_indent = strstr(p, "${body}");
 
@@ -344,8 +347,8 @@ void UmlOperation::generate(QTextStream & f, const WrapperStr & cl_stereotype,
             else if (!strncmp(p, "${throws}", 9)) {
                 p += 9;
                 const char * sep;
-                const Q3ValueList<UmlTypeSpec> & exceptions = this->exceptions();
-                Q3ValueList<UmlTypeSpec>::ConstIterator it;
+                const QList<UmlTypeSpec> & exceptions = this->exceptions();
+                QList<UmlTypeSpec>::ConstIterator it;
 
                 for (it = exceptions.begin(), sep = " throws ";
                      it != exceptions.end();
@@ -423,10 +426,10 @@ static char * read_file(const char * filename)
 
     if (fp.open(QIODevice::ReadOnly)) {
         QFileInfo fi(fp);
-        int size = fi.size();
+        qint64 size = fi.size();
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) == -1) {
+        if (fp.read(s, size) == -1) {
             delete [] s;
             return 0;
         }
@@ -440,7 +443,7 @@ static char * read_file(const char * filename)
         return 0;
 }
 
-static void read_bodies(const char * path, Q3IntDict<char> & bodies)
+static void read_bodies(const char * path, QHash<int, char*> & bodies)
 {
     char * s = read_file(path);
 
@@ -461,7 +464,7 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
                 UmlCom::fatal_error("read_bodies 1");
             }
 
-            if (bodies.find(id) != 0) {
+            if (bodies.value(id) != 0) {
                 UmlCom::trace(WrapperStr("<font  color =\"red\"> Error in ") + path +
                               " : preserve body identifier used twice</font><br>");
                 UmlCom::bye(n_errors() + 1);
@@ -495,7 +498,7 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
 
             *p2 = 0;
 
-            int len = p2 - body + 1;
+            ptrdiff_t len = p2 - body + 1;
             char * b = new char[len];
 
             memcpy(b, body, len);
@@ -510,7 +513,12 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
 
 void UmlOperation::read_bodies(const char * path)
 {
-    bodies.setAutoDelete(TRUE);
+    //bodies.setAutoDelete(TRUE);
+    QHashIterator<int,char*> it(bodies);
+    while(it.hasNext())
+    {
+        delete it.next().value();
+    }
     bodies.clear();
     ::read_bodies(path, bodies);
 }
diff --git a/src/JavaGenerator/UmlOperation.h b/src/JavaGenerator/UmlOperation.h
index e59d0866d..9aa1ea32f 100644
--- a/src/JavaGenerator/UmlOperation.h
+++ b/src/JavaGenerator/UmlOperation.h
@@ -27,12 +27,8 @@
 
 #ifndef UMLOPERATION_H
 #define UMLOPERATION_H
-
-#include <q3intdict.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-
 #include "UmlBaseOperation.h"
 
 class QTextStream;
@@ -40,7 +36,7 @@ class QTextStream;
 class UmlOperation : public UmlBaseOperation
 {
 private:
-    static Q3IntDict<char> bodies;
+    static QHash<int,char*> bodies;
 
 public:
     UmlOperation(void * id, const WrapperStr & n)
diff --git a/src/JavaGenerator/UmlPackage.cpp b/src/JavaGenerator/UmlPackage.cpp
index 553f20a73..550e864a1 100644
--- a/src/JavaGenerator/UmlPackage.cpp
+++ b/src/JavaGenerator/UmlPackage.cpp
@@ -58,7 +58,7 @@ WrapperStr UmlPackage::file_path(const WrapperStr & f)
             if (!RootDir.isEmpty() && // empty -> error
                 QDir::isRelativePath(RootDir)) {
                 QFileInfo f(getProject()->supportFile());
-                QDir d(f.dirPath());
+                QDir d(f.path());
 
                 RootDir = d.filePath(RootDir);
             }
@@ -96,7 +96,7 @@ WrapperStr UmlPackage::file_path(const WrapperStr & f)
                 s.replace(index++, 1, "/");
         }
 
-        s = QDir::cleanDirPath(s) + "/";
+        s = QDir::cleanPath(s) + "/";
         index = s.find("/");
 
         int index2;
@@ -118,7 +118,7 @@ WrapperStr UmlPackage::file_path(const WrapperStr & f)
         }
     }
 
-    return WrapperStr(d.filePath(f).toAscii().constData()) + WrapperStr(".") +
+    return WrapperStr(d.filePath(f).toLatin1().constData()) + WrapperStr(".") +
            JavaSettings::sourceExtension();
 }
 
@@ -131,9 +131,9 @@ WrapperStr UmlPackage::text_path(const WrapperStr & f)
 
 void UmlPackage::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/JavaGenerator/UmlRelation.cpp b/src/JavaGenerator/UmlRelation.cpp
index 4cc16d1fe..051050d4a 100644
--- a/src/JavaGenerator/UmlRelation.cpp
+++ b/src/JavaGenerator/UmlRelation.cpp
@@ -29,7 +29,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "UmlRelation.h"
 #include "UmlClass.h"
@@ -39,7 +39,7 @@
 #include "UmlCom.h"
 
 void UmlRelation::generate_extends(const char *& sep, QTextStream & f,
-                                   const Q3ValueList<UmlActualParameter> & actuals,
+                                   const QList<UmlActualParameter> & actuals,
                                    const WrapperStr & cl_stereotype)
 {
     switch (relationKind()) {
@@ -102,7 +102,7 @@ void UmlRelation::generate_extends(const char *& sep, QTextStream & f,
                 p += 7;
 
                 if (!actuals.isEmpty()) {
-                    Q3ValueList<UmlActualParameter>::ConstIterator ita;
+                    QList<UmlActualParameter>::ConstIterator ita;
                     bool used = FALSE;
 
                     for (ita = actuals.begin(); ita != actuals.end(); ++ita) {
@@ -126,7 +126,7 @@ void UmlRelation::generate_extends(const char *& sep, QTextStream & f,
 }
 
 void UmlRelation::generate_implements(const char *& sep, QTextStream & f,
-                                      const Q3ValueList<UmlActualParameter> & actuals,
+                                      const QList<UmlActualParameter> & actuals,
                                       const WrapperStr & cl_stereotype)
 {
     switch (relationKind()) {
@@ -160,7 +160,7 @@ void UmlRelation::generate_implements(const char *& sep, QTextStream & f,
                         p += 7;
 
                         if (!actuals.isEmpty()) {
-                            Q3ValueList<UmlActualParameter>::ConstIterator ita;
+                            QList<UmlActualParameter>::ConstIterator ita;
                             bool used = FALSE;
 
                             for (ita = actuals.begin(); ita != actuals.end(); ++ita) {
@@ -303,7 +303,7 @@ void UmlRelation::generate(QTextStream & f, const WrapperStr & cl_stereotype,
                         f << "[]";
                     else {
                         for (unsigned index = 0; index != m.length(); index += 1) {
-                            switch (m.at(index).toAscii().at(0)) {
+                            switch (m.at(index).toLatin1().at(0)) {
                             case '[':
                                 f << '[';
                                 break;
diff --git a/src/JavaGenerator/UmlRelation.h b/src/JavaGenerator/UmlRelation.h
index 405598cc0..1fce8c830 100644
--- a/src/JavaGenerator/UmlRelation.h
+++ b/src/JavaGenerator/UmlRelation.h
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QTextStream;
 
@@ -53,10 +53,10 @@ class UmlRelation : public UmlBaseRelation
     virtual void generate_import(QTextStream & f, const WrapperStr & indent);
 
     void generate_extends(const char *& sep, QTextStream & f,
-                          const Q3ValueList<UmlActualParameter> & actuals,
+                          const QList<UmlActualParameter> & actuals,
                           const WrapperStr & stereotype);
     void generate_implements(const char *& sep, QTextStream & f,
-                             const Q3ValueList<UmlActualParameter> & actuals,
+                             const QList<UmlActualParameter> & actuals,
                              const WrapperStr & stereotype);
 };
 
diff --git a/src/JavaGenerator/main.cpp b/src/JavaGenerator/main.cpp
index e86c1d160..fe577af0a 100644
--- a/src/JavaGenerator/main.cpp
+++ b/src/JavaGenerator/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char ** argv)
 
             QString s("<hr><font face=helvetica>Generation done : %1 warnings, %2 errors</font><br>");
             s=s.arg(QString::number(n_warnings())).arg(QString::number(n_errors()));
-            UmlCom::trace(s);
+            UmlCom::trace(s.toLatin1().constData());
 
             UmlCom::showTrace();
             UmlCom::message("");
diff --git a/src/JavaGenerator/util.cpp b/src/JavaGenerator/util.cpp
index d3494bcc9..2ecee75ab 100644
--- a/src/JavaGenerator/util.cpp
+++ b/src/JavaGenerator/util.cpp
@@ -81,7 +81,7 @@ WrapperStr current_indent(const char * p, const char * begin)
     while ((p != begin) && ((p[-1] == ' ') || (p[-1] == '\t')))
         indent.prepend(*--p);
 
-    return WrapperStr(indent.toAscii().constData());
+    return WrapperStr(indent.toLatin1().constData());
 }
 
 //
diff --git a/src/JavaGenerator/util.h b/src/JavaGenerator/util.h
index 02f08d18c..c925d4859 100644
--- a/src/JavaGenerator/util.h
+++ b/src/JavaGenerator/util.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef _UTIL_H
-#define _UTIL_h
+#define _UTIL_H
 
 #include <qstring.h>
 //Added by qt3to4:
diff --git a/src/JavaReverse/javareverse.pro b/src/JavaReverse/JavaReverse.pro
similarity index 90%
rename from src/JavaReverse/javareverse.pro
rename to src/JavaReverse/JavaReverse.pro
index 2c528778b..b97d453b0 100644
--- a/src/JavaReverse/javareverse.pro
+++ b/src/JavaReverse/JavaReverse.pro
@@ -1,6 +1,9 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
-HEADERS          = 
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
+HEADERS          =
 SOURCES          = main.cpp BrowserNode.cpp Statistic.cpp \
         ../JavaCat/UmlClassItem.cpp ../JavaCat/UmlArtifact.cpp \
         ../JavaCat/UmlAttribute.cpp ../JavaCat/UmlClass.cpp \
@@ -102,23 +105,21 @@ SOURCES          = main.cpp BrowserNode.cpp Statistic.cpp \
     ../Logging/QsDebugOutput.cpp
 
 TARGET          = java_reverse
-DEFINES          = WITHJAVA REVERSE
-INCLUDEPATH   = ../Tools ../JavaReverse ../JavaCat ../
+DEFINES          += WITHJAVA REVERSE TRUE=true FALSE=false
+INCLUDEPATH   += ../Tools ../JavaReverse ../JavaCat ../
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+#qt3support
 
-QMAKE_CXXFLAGS += -std=gnu++11
-Release{
-    MOC_DIR = ../../bin/MOC_release/java_rev
-    OBJECTS_DIR = ../../bin/Obj_release/java_rev
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/java_reverse
+    OBJECTS_DIR = $${DESTDIR}/obj_release/java_reverse
 }
-
-Debug{
-    MOC_DIR = ../../bin/MOC_debug/java_rev/
-    OBJECTS_DIR = ../../bin/Obj_debug/java_rev
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/java_reverse
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/java_reverse
 }
-
-    DESTDIR = ../../bin
-
diff --git a/src/JavaReverse/main.cpp b/src/JavaReverse/main.cpp
index 9aa5aa2af..ad992a17f 100644
--- a/src/JavaReverse/main.cpp
+++ b/src/JavaReverse/main.cpp
@@ -26,8 +26,7 @@
 // *************************************************************************
 
 #include <qapplication.h>
-#include <q3filedialog.h>
-//Added by qt3to4:
+#include <qfiledialog.h>
 #include "misc/mystr.h"
 #include <stdlib.h>
 #include <qfile.h>
@@ -46,7 +45,7 @@
 
 void remove_crlf(char * s)
 {
-    int len = strlen(s);
+    size_t len = strlen(s);
 
     if (len != 0) {
         if (s[len - 1] == '\n')
@@ -80,28 +79,12 @@ int main(int argc, char ** argv)
 
                 Package::init((UmlPackage *) item, app);
 
-                QString here = QDir::currentDirPath();
+                QString here = QDir::currentPath();
                 QString path;
                 // note : QFile fp(QDir::home().absFilePath(".doumlcat")) doesn't work
                 // if the path contains non latin1 characters, for instance cyrillic !
-                QString s = QDir::home().absFilePath(".doumlcat");
-                FILE * fp = fopen((const char *) s, "r");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+                QString s = QDir::home().absoluteFilePath(".doumlcat");
+                FILE * fp = fopen((const char *) s.toLatin1().constData(), "r");
                 if (fp != 0) {
                     char line[512];
 
@@ -114,15 +97,14 @@ int main(int argc, char ** argv)
                 }
 
                 while (!(path =
-                             Q3FileDialog::getOpenFileName(path, "*.cat",
-                                     0, 0,
-                                     "select a java catalog file to read it, or cancel"))
+                             QFileDialog::getOpenFileName(0,"select a java catalog file to read it, or cancel",path, "*.cat",
+                                     0, 0))
                        .isEmpty()) {
                     QFile f(path);
 
                     if (f.open(QIODevice::ReadOnly)) {
-                        if ((fp = fopen((const char *) s, "w")) != 0) {
-                            fwrite((const char *) path, 1, path.length(), fp);
+                        if ((fp = fopen((const char *) s.toLatin1().constData(), "w")) != 0) {
+                            fwrite((const char *) path.toLatin1().constData(), 1, path.length(), fp);
                             fputc('\n', fp);
                             fclose(fp);
                         }
diff --git a/src/JavaRoundtrip/javaroundtrip.pro b/src/JavaRoundtrip/JavaRoundtrip.pro
similarity index 89%
rename from src/JavaRoundtrip/javaroundtrip.pro
rename to src/JavaRoundtrip/JavaRoundtrip.pro
index cc56d5b29..a6ab45cfc 100644
--- a/src/JavaRoundtrip/javaroundtrip.pro
+++ b/src/JavaRoundtrip/JavaRoundtrip.pro
@@ -1,6 +1,9 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
-HEADERS          = 
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
+HEADERS          =
 SOURCES          = main.cpp BrowserNode.cpp Statistic.cpp \
         ../JavaCat/UmlClassItem.cpp ../JavaCat/UmlArtifact.cpp \
         ../JavaCat/UmlAttribute.cpp ../JavaCat/UmlClass.cpp \
@@ -102,24 +105,21 @@ SOURCES          = main.cpp BrowserNode.cpp Statistic.cpp \
     ../Logging/QsDebugOutput.cpp
 
 TARGET          = java_roundtrip
-DEFINES          = WITHJAVA REVERSE ROUNDTRIP
-INCLUDEPATH   = ../Tools ../JavaRoundtrip ../JavaCat ../ ../misc
+DEFINES          += WITHJAVA REVERSE ROUNDTRIP TRUE=true FALSE=false
+INCLUDEPATH   += ../Tools ../JavaRoundtrip ../JavaCat ../ ../misc
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+#qt3support
 
-
-QMAKE_CXXFLAGS += -std=gnu++11
-release{
-    MOC_DIR = ../../bin/MOC_release/java_round
-    OBJECTS_DIR = ../../bin/Obj_release/java_round
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/java_roundtrip
+    OBJECTS_DIR = $${DESTDIR}/obj_release/java_roundtrip
 }
-
-Debug{
-    MOC_DIR = ../../bin/MOC_debug/java_round
-    OBJECTS_DIR = ../../bin/Obj_debug/java_round
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/java_roundtrip
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/java_roundtrip
 }
-
-    DESTDIR = ../../bin
-
diff --git a/src/JavaRoundtrip/Statistic.cpp b/src/JavaRoundtrip/Statistic.cpp
index efebd1600..8eb10f508 100644
--- a/src/JavaRoundtrip/Statistic.cpp
+++ b/src/JavaRoundtrip/Statistic.cpp
@@ -28,16 +28,16 @@
 #include "Statistic.h"
 #include "UmlCom.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 unsigned Statistic::n_updated;
 unsigned Statistic::n_created;
 
 void Statistic::produce()
 {
-    UmlCom::trace(Q3CString("<br><hr><br><font face=helvetica>Java roundtrip done</font><br><br>") +
-                  Q3CString("<font face=helvetica>	") +
-                  Q3CString().setNum(n_updated) + Q3CString(" classes updated </font><br>") +
-                  Q3CString("<font face=helvetica>	") +
-                  Q3CString().setNum(n_created) + Q3CString(" classes created</font><br><hr><br>"));
+    UmlCom::trace(QByteArray("<br><hr><br><font face=helvetica>Java roundtrip done</font><br><br>") +
+                  QByteArray("<font face=helvetica>	") +
+                  QByteArray().setNum(n_updated) + QByteArray(" classes updated </font><br>") +
+                  QByteArray("<font face=helvetica>	") +
+                  QByteArray().setNum(n_created) + QByteArray(" classes created</font><br><hr><br>"));
 }
diff --git a/src/JavaRoundtrip/main.cpp b/src/JavaRoundtrip/main.cpp
index eaea7bff5..80af927b3 100644
--- a/src/JavaRoundtrip/main.cpp
+++ b/src/JavaRoundtrip/main.cpp
@@ -26,11 +26,7 @@
 // *************************************************************************
 
 #include <qapplication.h>
-#include <q3filedialog.h>
-//Added by qt3to4:
-#include <Q3CString>
-//Added by qt3to4:
-#include <Q3PtrList>
+#include <qfiledialog.h>
 #include <stdlib.h>
 #include <qfile.h>
 #include <qdir.h>
@@ -48,7 +44,7 @@
 
 void remove_crlf(char * s)
 {
-    int len = strlen(s);
+    size_t len = strlen(s);
 
     if (len != 0) {
         if (s[len - 1] == '\n')
@@ -64,7 +60,7 @@ int main(int argc, char ** argv)
     if (argc != 2)
         return 0;
 
-    if (UmlCom::connect(Q3CString(argv[1]).toUInt())) {
+    if (UmlCom::connect(QByteArray(argv[1]).toUInt())) {
         bool aborted = TRUE;
 
         try {
@@ -135,8 +131,8 @@ int main(int argc, char ** argv)
             QString path;
             // note : QFile fp(QDir::home().absFilePath(".doumlcat")) doesn't work
             // if the path contains non latin1 characters, for instance cyrillic !
-            QString s = QDir::home().absFilePath(".doumlcat");
-            FILE * fp = fopen((const char *) s, "r");
+            QString s = QDir::home().absoluteFilePath(".doumlcat");
+            FILE * fp = fopen((const char *) s.toLatin1().constData(), "r");
 
 
 
@@ -165,15 +161,13 @@ int main(int argc, char ** argv)
             }
 
             while (!(path =
-                         Q3FileDialog::getOpenFileName(path, "*.cat",
-                                 0, 0,
-                                 "select a java catalog file to read it, or cancel"))
-                   .isEmpty()) {
+                         QFileDialog::getOpenFileName(0, "select a java catalog file to read it, or cancel",path, "*.cat",
+                                 0)).isEmpty()) {
                 QFile f(path);
 
                 if (f.open(QIODevice::ReadOnly)) {
-                    if ((fp = fopen((const char *) s, "w")) != 0) {
-                        fwrite((const char *) path, 1, path.length(), fp);
+                    if ((fp = fopen((const char *) s.toLatin1().constData(), "w")) != 0) {
+                        fwrite((const char *) path.toLatin1().constData(), 1, path.length(), fp);
                         fputc('\n', fp);
                         fclose(fp);
                     }
@@ -193,7 +187,7 @@ int main(int argc, char ** argv)
 
             // umark all
             {
-                Q3PtrVector<UmlItem> marked = UmlItem::markedItems();
+                QVector<UmlItem*> marked = UmlItem::markedItems();
                 UmlItem ** v = marked.data();
                 UmlItem ** const vsup = v + marked.size();
 
@@ -201,7 +195,7 @@ int main(int argc, char ** argv)
                     (*v)->set_isMarked(FALSE);
             }
 
-            Q3PtrList<UmlItem> useless;
+            QList<UmlItem *> useless;
 
             item->mark_useless(useless);
 
@@ -212,13 +206,11 @@ int main(int argc, char ** argv)
                                       "Delete them ?",
                                       "Yes", "No", QString(), 1, 1)
                  == 0)) {
-                Q3PtrListIterator<UmlItem> iter(useless);
 
-                do {
-                    if (iter.current()->isMarked())
-                        iter.current()->deleteIt();
-                }
-                while (++iter, iter.current() != 0);
+                foreach (UmlItem *item, useless) {
+                    if (item->isMarked())
+                        item->deleteIt();
+                };
             }
 
             UmlPackage::getProject()->set_childrenVisible(TRUE);
diff --git a/src/Libs/L_UniversalModels/L_UniversalModels.pro b/src/Libs/L_UniversalModels/L_UniversalModels.pro
new file mode 100644
index 000000000..be7efec5b
--- /dev/null
+++ b/src/Libs/L_UniversalModels/L_UniversalModels.pro
@@ -0,0 +1,63 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2012-11-30T17:04:40
+#
+#-------------------------------------------------
+
+QT       += core sql
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = UniversalModels
+TEMPLATE = lib
+unix:CONFIG+= build_all staticlib
+windows:CONFIG+= build_all
+TARGET = $$qtLibraryTarget(UniversalModels)
+
+INCLUDEPATH += include \
+            ../L_UniversalModels
+
+CONFIG += c++11
+
+DEFINES += QT_DEPRECATED_WARNINGS
+
+DEFINES += L_TREE_CONTROLLER_LIBRARY
+
+HEADERS += include/AdaptingTableModel.h \
+    include/AdaptingTableModelPrivate.h \
+    include/genericeventfilter.h \
+    include/ItemController.h \
+    include/l_tree_controller_global.h \
+    include/TableDataInterface.h \
+    include/TableDataListHolder.h \
+    include/treeitemfunctions.h \
+    include/TreeItem.h \
+    include/TreeItemInterface.h \
+    include/TreeModel.h \
+    include/treeviewfunctions.h \
+    include/treeviewtemplatefunctions.h
+
+SOURCES += src/AdaptingTableModel.cpp \
+    src/AdaptingTableModelPrivate.cpp \
+    src/genericeventfilter.cpp \
+#   src/ItemController.cpp \
+    src/TableDataInterface.cpp \
+    src/TreeItemInterface.cpp \
+    src/TreeModel.cpp \
+    src/treeviewfunctions.cpp \
+    src/treeviewtemplatefunctions.cpp
+
+DESTDIR = ../../../bin
+
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/UniversalModels
+    OBJECTS_DIR = $${DESTDIR}/obj_release/UniversalModels
+}
+
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/UniversalModels
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/UniversalModels
+}
+UI_DIR = UI
diff --git a/src/Libs/L_UniversalModels/UML/models/128042.diagram b/src/Libs/L_UniversalModels/UML/models/128042.diagram
new file mode 100644
index 000000000..422973695
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/128042.diagram
@@ -0,0 +1,33 @@
+format 76
+
+classcanvas 128042 class_ref 547370 // AbstractTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 88 183 2000
+end
+classcanvas 128170 class_ref 549034 // TreeItemBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 423 191 2006
+end
+classcanvas 128554 class_ref 556458 // ItemData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 652 174 2000
+end
+relationcanvas 128298 relation_ref 606250 // <generalisation>
+  decenter_begin 163
+  decenter_end 186
+  from ref 128170 z 2007 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128426 relation_ref 606378 // <unidirectional association>
+  decenter_begin 483
+  from ref 128170 z 2007 stereotype "<<QList>>" xyz 285 347 2007 to ref 128042
+  role_a_pos 206 330 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128682 relation_ref 612906 // <generalisation>
+  from ref 128554 z 2007 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/134570.diagram b/src/Libs/L_UniversalModels/UML/models/134570.diagram
new file mode 100644
index 000000000..93e417138
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/134570.diagram
@@ -0,0 +1,169 @@
+format 76
+
+classcanvas 128042 class_ref 142762 // AbstractQueryBitInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 258.558 906.394 2006
+end
+classcanvas 128170 class_ref 688426 // ItemConnectorStatusFunctor
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 48 152 2006
+end
+classcanvas 128298 class_ref 142890 // AbstractQueryClause
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 108.52 772.681 2006
+end
+classcanvas 128426 class_ref 143018 // QueryBitInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightyellow
+  xyz 511.604 893.299 2006
+end
+classcanvas 128682 class_ref 143146 // AbstractQueryGenerator
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 947.89 908.909 2011
+end
+classcanvas 128938 class_ref 143402 // AbstractQueryItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1095.54 650.087 2011
+end
+classcanvas 129194 class_ref 143530 // QueryClause
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightblue
+  xyz 121.435 550.142 2011
+end
+classcanvas 129322 class_ref 583594 // AbstractItemConnectorStatus
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 209.352 380.859 2000
+end
+classcanvas 129450 class_ref 583722 // AbstractItemConnectorData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 703.334 383.377 2000
+end
+classcanvas 130474 class_ref 143274 // EClauses
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightgreen
+  xyz 618.185 646.442 2006
+end
+classcanvas 130602 class_ref 583850 // ItemConnector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightblue
+  xyz 509.444 138.798 2000
+end
+classcanvas 132394 class_ref 150314 // AbstractItemConnector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 482.395 365.918 2011
+end
+classcanvas 133034 class_ref 150570 // ItemConnectorStatus
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color verylightorange
+  xyz 231.453 150.378 2000
+end
+classcanvas 133418 class_ref 198314 // ItemConnectorData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color verylightorange
+  xyz 726 158 2005
+end
+classcanvas 133674 class_ref 204842 // ItemConnectorConstant
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 934 368 2005
+end
+classcanvas 133930 class_ref 216362 // QueryItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 769 509 2005
+end
+fragment 134058 ""
+  color lightmagenta xyzwh 118.6 84.8 1995 1035 400
+end
+classcanvas 134186 class_ref 143658 // QueryGenerator
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 641 909 2005
+end
+fragment 134314 ""
+  color verylightgray xyzwh 36.5 511.1 2000 1258 539
+end
+relationcanvas 128554 relation_ref 143658 // <generalisation>
+  from ref 128426 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131626 relation_ref 151722 // <generalisation>
+  from ref 129194 z 2007 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132010 relation_ref 158506 // <directional composition>
+  from ref 129194 z 2007 to ref 130474
+  role_a_pos 587 679 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133162 relation_ref 171818 // <directional composition>
+  from ref 130602 z 2001 stereotype "<<QScopedPointer>>" xyz 366 300 3000 to ref 129322
+  role_a_pos 337 354 3000 no_role_b
+  multiplicity_a_pos 337 377 3000 no_multiplicity_b
+end
+relationcanvas 133290 relation_ref 171946 // <directional composition>
+  from ref 130602 z 2001 stereotype "<<QScopedPointer>>" xyz 620 302 3000 to ref 129450
+  role_a_pos 761 365 3000 no_role_b
+  multiplicity_a_pos 737 365 3000 no_multiplicity_b
+end
+relationcanvas 133546 relation_ref 213418 // <generalisation>
+  from ref 133418 z 2006 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133802 relation_ref 219946 // <generalisation>
+  from ref 133674 z 2006 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134442 relation_ref 752682 // <generalisation>
+  from ref 128170 z 2007 to ref 129322
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134570 relation_ref 143786 // <generalisation>
+  from ref 129194 z 2007 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134698 relation_ref 626090 // <generalisation>
+  from ref 132394 z 2012 to ref 129322
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134826 relation_ref 626218 // <generalisation>
+  from ref 132394 z 2012 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134954 relation_ref 626474 // <generalisation>
+  from ref 133034 z 2001 to ref 129322
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135082 relation_ref 626346 // <generalisation>
+  decenter_begin 451
+  from ref 130602 z 2012 to ref 132394
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135210 relation_ref 226474 // <generalisation>
+  from ref 133930 z 2012 to ref 128938
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135338 relation_ref 143914 // <generalisation>
+  from ref 134186 z 2012 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135466 relation_ref 151594 // <generalisation>
+  from ref 134186 z 2007 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135594 relation_ref 233130 // <generalisation>
+  from ref 133930 z 2007 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/141098.diagram b/src/Libs/L_UniversalModels/UML/models/141098.diagram
new file mode 100644
index 000000000..b6c5a5373
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/141098.diagram
@@ -0,0 +1,16 @@
+format 76
+
+classcanvas 128042 class_ref 539434 // ReportGeneratorBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 200 134 2000
+end
+classcanvas 128170 class_ref 539562 // ReportGenerator
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 333 332 2000
+end
+relationcanvas 128298 relation_ref 605610 // <generalisation>
+  from ref 128170 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/141226.diagram b/src/Libs/L_UniversalModels/UML/models/141226.diagram
new file mode 100644
index 000000000..b60a5828a
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/141226.diagram
@@ -0,0 +1,26 @@
+format 76
+
+usecasecanvas 128042 usecase_ref 128042 // Vector of Connections
+  xyzwh 276 225 3005 64 32 label_xy 242 257
+end
+usecasecanvas 128170 usecase_ref 128170 // ARMWindow
+  xyzwh 357 109 3005 64 32 label_xy 352 141
+end
+usecasecanvas 128298 usecase_ref 128298 // Settings Structure
+  xyzwh 160 102 3005 64 32 label_xy 136 134
+end
+usecasecanvas 128426 usecase_ref 128426 // Abstract Connection
+  xyzwh 172 392 3005 64 32 label_xy 143 424
+end
+usecasecanvas 128554 usecase_ref 128554 // Abstract User
+  xyzwh 424 630 3005 64 32 label_xy 415 662
+end
+usecasecanvas 128682 usecase_ref 128682 // System User
+  xyzwh 323 578 3005 64 32 label_xy 317 610
+end
+usecasecanvas 128810 usecase_ref 128810 // User
+  xyzwh 493 559 3005 64 32 label_xy 511 591
+end
+note 128938 "Is a global user for the DB. Is kept at the using machine in a ciphered state."
+  xyzwh 49 623 2000 213 73
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/141354.diagram b/src/Libs/L_UniversalModels/UML/models/141354.diagram
new file mode 100644
index 000000000..e0bb0e22f
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/141354.diagram
@@ -0,0 +1,55 @@
+format 76
+
+note 128042 "Fonts:
+- Labels for elements
+- Message plain text
+- Formatted message text
+- Syntax Highlighted text
+- Erraneous Text
+- Table
+"
+  xyzwh 72 61 2000 191 143
+usecasecanvas 128170 usecase_ref 128938 // Text entity
+  xyzwh 298 279 3005 64 32 label_xy 298 311
+end
+usecasecanvas 128298 usecase_ref 129066 // Family
+  xyzwh 545 517 3005 64 32 label_xy 557 549
+end
+usecasecanvas 128426 usecase_ref 129194 // Size
+  xyzwh 550 463 3005 64 32 label_xy 570 495
+end
+usecasecanvas 128682 usecase_ref 129450 // Zoom
+  xyzwh 621 469 3005 64 32 label_xy 636 501
+end
+usecasecanvas 128810 usecase_ref 129578 // Bold/italic
+  xyzwh 456 439 3005 64 32 label_xy 459 471
+end
+usecasecanvas 128938 usecase_ref 129706 // Foreground/background
+  xyzwh 604 176 3005 64 32 label_xy 563 208
+end
+usecasecanvas 129066 usecase_ref 129834 // Identficator
+  xyzwh 487 153 3005 64 32 label_xy 485 189
+end
+usecasecanvas 129194 usecase_ref 129962 // Using Code
+  xyzwh 72 283 3005 64 32 label_xy 70 315
+end
+usecasecanvas 129322 usecase_ref 130090 // Type of text
+  xyzwh 180 280 3005 64 32 label_xy 176 312
+end
+usecasecanvas 129450 usecase_ref 130218 // Font Settings
+  xyzwh 554 366 3005 64 32 label_xy 543 405
+end
+usecasecanvas 129578 usecase_ref 130346 // Additional Settings
+  xyzwh 554 246 3005 64 32 label_xy 529 278
+end
+usecasecanvas 129706 usecase_ref 130474 // Text
+  xyzwh 562 118 3005 64 32 label_xy 581 150
+end
+fragment 129834 ""
+  color lightblue xyzwh 254 227 2000 180 152
+end
+line 129962 --->
+  from ref 128170 z 3006 to ref 129450
+line 130090 --->
+  from ref 128170 z 3006 to ref 129578
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/141482.diagram b/src/Libs/L_UniversalModels/UML/models/141482.diagram
new file mode 100644
index 000000000..1f05dac80
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/141482.diagram
@@ -0,0 +1,103 @@
+format 76
+
+classcanvas 128042 class_ref 163882 // AbstractSchemeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 476 361 2000
+end
+classcanvas 128170 class_ref 163754 // AbstractFontSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 8 86 2005
+end
+classcanvas 128298 class_ref 164010 // AbstractFontColorSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 399 79 2000
+end
+classcanvas 128426 class_ref 164138 // AbstractFontInfoSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 572 204 2000
+end
+classcanvas 129194 class_ref 164266 // SchemeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 245 59 2000
+end
+classcanvas 129834 class_ref 164394 // FontSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 34 380 2000
+end
+classcanvas 130090 class_ref 164522 // FontColorSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 689 66 2006
+end
+classcanvas 130346 class_ref 164650 // FontInfoSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 768 330 2000
+end
+classcanvas 131114 class_ref 171178 // ModelSetupFont
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 239 603 2000
+end
+classcanvas 131242 class_ref 171306 // QAbstractListModel
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 230 753 2000
+end
+relationcanvas 128554 relation_ref 178602 // <generalisation>
+  from ref 128042 z 2006 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128682 relation_ref 178730 // <generalisation>
+  from ref 128042 z 2001 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 178858 // <generalisation>
+  from ref 128042 z 2001 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129322 relation_ref 179242 // <generalisation>
+  from ref 129194 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 179498 // <directional aggregation>
+  from ref 129194 z 2001 to ref 128298
+  role_a_pos 293 153 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129706 relation_ref 179626 // <directional aggregation>
+  from ref 129194 z 2001 to ref 128426
+  role_a_pos 464 231 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129962 relation_ref 179754 // <generalisation>
+  from ref 129834 z 2006 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 179882 // <generalisation>
+  from ref 130090 z 2007 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130474 relation_ref 180010 // <generalisation>
+  from ref 130346 z 2001 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130986 relation_ref 179370 // <directional aggregation>
+  from ref 129194 z 2006 to ref 128170
+  role_a_pos 176 199 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131498 relation_ref 186538 // <generalisation>
+  from ref 131114 z 2001 to ref 131242
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132266 relation_ref 186794 // <directional aggregation>
+  from ref 131114 z 2001 stereotype "<<list>>" xyz 391 606 3000 to ref 128042
+  role_a_pos 432 556 3000 no_role_b
+  multiplicity_a_pos 459 583 3000 no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/141866.diagram b/src/Libs/L_UniversalModels/UML/models/141866.diagram
new file mode 100644
index 000000000..fbb9eb819
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/141866.diagram
@@ -0,0 +1,67 @@
+format 76
+
+activitynodecanvas 128170 activitynode_ref 128042 // initial_node
+  xyz 30 53 2000
+end
+activityactioncanvas 130090 activityaction_ref 128170 // activity action Initial Scale
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 215 228 2000 84 40
+end
+activityactioncanvas 130218 activityaction_ref 128298 // activity action Memory Limit
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 106 229 2005 70 40
+end
+activityactioncanvas 130346 activityaction_ref 128426 // activity action Scene Pointer
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 6 216 2000 79 40
+end
+activityactioncanvas 130474 activityaction_ref 128554 // activity action Background request Pointer
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 276 168 2000 89 40
+end
+activityactioncanvas 130602 activityaction_ref 128682 // activity action Initializing state
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 279 33 2000 100 60
+end
+activitynodecanvas 132010 activitynode_ref 128426 // decision
+  xyz 165 155 2010
+end
+textcanvas 132778 "Not initializing any member to read background maps
+because an external singleton will be used"
+  bg mediumgreen  xyzwh 449 46 2000 248 26
+flowcanvas 131754 flow_ref 129322 // <flow>
+  
+  from ref 128170 z 2001 to ref 130602
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 132138 flow_ref 129450 // <flow>
+  
+  from ref 130602 z 2011 to ref 132010
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 132266 flow_ref 129578 // <flow>
+  
+  from ref 132010 z 2011 to ref 130346
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 132394 flow_ref 129706 // <flow>
+  
+  from ref 132010 z 2011 to ref 130218
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 132522 flow_ref 129834 // <flow>
+  
+  from ref 132010 z 2011 to ref 130090
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 132650 flow_ref 129962 // <flow>
+  
+  from ref 132010 z 2011 to ref 130474
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/141994.diagram b/src/Libs/L_UniversalModels/UML/models/141994.diagram
new file mode 100644
index 000000000..541fa32a9
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/141994.diagram
@@ -0,0 +1,87 @@
+format 76
+
+activityobjectcanvas 128170 activityobject_ref 128682 // activity object Requested Scale Initialization
+  show_infonote default drawing_language default show_stereotype_properties default
+  xyzwh 23 170 2000 155 31
+end
+activitynodecanvas 128298 activitynode_ref 128682 // fork
+  xyz 207 171 2000
+end
+activityactioncanvas 128554 activityaction_ref 128938 // activity action Set cursor position
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 164 284 2000 100 60
+end
+activitynodecanvas 128810 activitynode_ref 128810 // decision
+  xyz 284 166 2000
+end
+activityactioncanvas 129066 activityaction_ref 129066 // activity action Request Scale Pixel Size
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 405 77 2000 100 60
+end
+textcanvas 129578 "No precalculated size"
+  xyzwh 295 90 2008 102 13
+activitynodecanvas 130090 activitynode_ref 128938 // join
+  xyz 564 173 2000
+end
+textcanvas 130474 "Precalculated size found"
+  xyzwh 327 165 2006 116 13
+activityactioncanvas 130858 activityaction_ref 129322 // activity action Split region into smaller maps 
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 621 155 2000 100 60
+end
+activityactioncanvas 131242 activityaction_ref 129450 // activity action Load maps around the cursor depending on whether scale is active
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 613 264 2000 113 84
+end
+flowcanvas 128426 flow_ref 130090 // <flow>
+  
+  from ref 128170 z 2001 to ref 128298
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 128682 flow_ref 130218 // <flow>
+  
+  from ref 128298 z 2001 to ref 128554
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 128938 flow_ref 130346 // <flow>
+  
+  from ref 128298 z 2001 to ref 128810
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 129194 flow_ref 130474 // <flow>
+  geometry VH
+  
+  from ref 128810 z 2001 to point 294 104
+  line 129450 z 2001 to ref 129066
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 130218 flow_ref 130602 // <flow>
+  
+  from ref 129066 z 2001 to ref 130090
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 130346 flow_ref 130730 // <flow>
+  
+  from ref 128810 z 2001 to ref 130090
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 130986 flow_ref 131114 // <flow>
+  
+  from ref 130090 z 2001 to ref 130858
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 131114 flow_ref 131242 // <flow>
+  
+  from ref 128554 z 2001 to ref 130090
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 131370 flow_ref 131370 // <flow>
+  
+  from ref 130858 z 2001 to ref 131242
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/142122.diagram b/src/Libs/L_UniversalModels/UML/models/142122.diagram
new file mode 100644
index 000000000..82493c213
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/142122.diagram
@@ -0,0 +1,151 @@
+format 76
+
+activityobjectcanvas 128042 activityobject_ref 128810 // activity object Cursor changed position
+  show_infonote default drawing_language default show_stereotype_properties default
+  xyzwh 74 64 2000 131 31
+end
+activitynodecanvas 128298 activitynode_ref 129066 // decision
+  xyz 224 264 2000
+end
+activityactioncanvas 128938 activityaction_ref 129834 // activity action Read combined image from map pieces
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 435 250 2000 100 60
+end
+textcanvas 129194 "All needed pieces are available"
+  xyzwh 257 260 2006 147 13
+activitynodecanvas 129322 activitynode_ref 129194 // decision
+  xyz 224 353 2000
+end
+activityactioncanvas 129706 activityaction_ref 129962 // activity action Load maps around the cursor new position
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 35 566 2000 111 68
+end
+textcanvas 130090 "Memory available"
+  xyzwh 119 352 2006 82 13
+activityactioncanvas 130218 activityaction_ref 130090 // activity action Initiate memory cleanup procedure
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 119 427 2000 100 60
+end
+textcanvas 130474 "Low on memory"
+  xyzwh 243 424 2006 74 13
+activityactioncanvas 134314 activityaction_ref 130218 // activity action Fill vector of potentially obsolette maps
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 698 110 2000 100 60
+end
+activityactioncanvas 134442 activityaction_ref 130346 // activity action Return new image to the application
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 549 114 2000 100 60
+end
+activitynodecanvas 134826 activitynode_ref 129322 // fork
+  xyz 571 264 2000
+end
+activityactioncanvas 135338 activityaction_ref 130474 // activity action Load the maps surrounding the active area
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 703 358 2000 100 60
+end
+activityactioncanvas 135722 activityaction_ref 130602 // activity action For each scale according to if it's active
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 90 149 2000 100 60
+end
+activitynodecanvas 136234 activitynode_ref 129450 // decision
+  xyz 632 286 2000
+end
+textcanvas 136874 "Scale is active"
+  xyzwh 669 289 2006 69 13
+activitynodecanvas 137002 activitynode_ref 129578 // activity_final
+  xyz 633 482 2000
+end
+textcanvas 137258 "Scale is not active"
+  xyzwh 553 376 2000 87 13
+flowcanvas 129066 flow_ref 131754 // <flow>
+  
+  from ref 128298 z 2001 to ref 128938
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 129450 flow_ref 131882 // <flow>
+  
+  from ref 128298 z 2001 to ref 129322
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 129834 flow_ref 132010 // <flow>
+  
+  from ref 129322 z 2001 to point 90 371
+  line 129962 z 2001 to ref 129706
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 131114 flow_ref 132394 // <flow>
+  geometry HVr
+  
+  from ref 129322 z 2001 to point 234 454
+  line 131242 z 2001 to ref 130218
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 132778 flow_ref 133034 // <flow>
+  geometry HVr
+  
+  from ref 130218 z 2001 to point 165 594
+  line 132906 z 2001 to ref 129706
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 133034 flow_ref 133162 // <flow>
+  
+  from ref 129706 z 2001 to point 87 672
+  line 133162 z 2001 to point 483 674
+  line 133290 z 2001 to ref 128938
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 134954 flow_ref 133418 // <flow>
+  
+  from ref 128938 z 2001 to ref 134826
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 135082 flow_ref 133546 // <flow>
+  
+  from ref 134826 z 2001 to ref 134314
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 135210 flow_ref 133674 // <flow>
+  
+  from ref 134826 z 2001 to ref 134442
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 135850 flow_ref 133930 // <flow>
+  
+  from ref 128042 z 2001 to ref 135722
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 135978 flow_ref 134058 // <flow>
+  
+  from ref 135722 z 2001 to ref 128298
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 136362 flow_ref 134186 // <flow>
+  
+  from ref 134826 z 2001 to ref 136234
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 136490 flow_ref 134314 // <flow>
+  geometry HV
+  
+  from ref 136234 z 2001 to point 749 302
+  line 136746 z 2001 to ref 135338
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 137130 flow_ref 134442 // <flow>
+  
+  from ref 136234 z 2001 to ref 137002
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 137514 flow_ref 134570 // <flow>
+  
+  from ref 135338 z 2001 to ref 137002
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/143018.bodies b/src/Libs/L_UniversalModels/UML/models/143018.bodies
new file mode 100644
index 000000000..10b0862f6
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/143018.bodies
@@ -0,0 +1,13 @@
+class QueryBitInfo
+!!!290858.cpp!!!	clone() : AbstractQueryBitInfo
+	return new QueryBitInfo(*this);
+!!!155818.cpp!!!	Enable() : void
+	enabled = true;
+!!!155946.cpp!!!	Disable() : void
+	enabled = false;
+!!!156074.cpp!!!	IsEnabled() : bool
+	return enabled;
+!!!156202.cpp!!!	GetItemName() : string
+	return name;
+!!!156330.cpp!!!	SetItemName(in _name : string) : void
+	name = _name;
diff --git a/src/Libs/L_UniversalModels/UML/models/143530.bodies b/src/Libs/L_UniversalModels/UML/models/143530.bodies
new file mode 100644
index 000000000..7c82e339d
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/143530.bodies
@@ -0,0 +1,18 @@
+class QueryClause
+!!!290986.cpp!!!	clone() : QueryClause
+	return new QueryClause(*this);
+!!!291114.cpp!!!	~QueryClause()
+//	int k;
+//	k++;
+!!!156458.cpp!!!	SetClausePosition(in pos : int) : void
+	positionInQuery = pos;
+!!!156586.cpp!!!	GetClausePosition() : int
+	return positionInQuery;
+!!!156714.cpp!!!	GetClauseText() : string
+	return text;
+!!!156842.cpp!!!	SetClauseText(in _text : string) : void
+	text = _text;
+!!!158890.cpp!!!	SetClauseType(in _type : EClauses) : void
+	type = _type;
+!!!159018.cpp!!!	GetClauseType() : EClauses
+	return type;
diff --git a/src/Libs/L_UniversalModels/UML/models/143658.bodies b/src/Libs/L_UniversalModels/UML/models/143658.bodies
new file mode 100644
index 000000000..5bf9b2d8a
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/143658.bodies
@@ -0,0 +1,97 @@
+class QueryGenerator
+!!!291242.cpp!!!	QueryGenerator()
+
+!!!291370.cpp!!!	QueryGenerator(in origin : QueryGenerator)
+	QLOG_INFO() << "Query generator: Entering the constructor of filtering query generator";
+	foreach(QSharedPointer<AbstractQueryClause> clause, origin.queryClauses)
+	{
+		queryClauses.push_back(QSharedPointer<AbstractQueryClause>(clause->clone()));
+	}
+	foreach(QSharedPointer<AbstractQueryItem> item, origin.queryItems)
+	{
+		queryItems.push_back(QSharedPointer<AbstractQueryItem>(item->clone()));
+	}
+!!!291498.cpp!!!	~QueryGenerator()
+	QLOG_INFO() << "Query generator: Deletion of query generator object";
+!!!291626.cpp!!!	clone() : QueryGenerator
+	QLOG_TRACE() << "Query generator: Cloning query generator";
+	return new QueryGenerator(*this);
+!!!156970.cpp!!!	GenerateQuery() : string
+	QLOG_INFO() << "Query generator: Generating query";
+	QLOG_TRACE() << "Query generator: Amount of items in generator: " << queryItems.size();
+	QString clauseText("");
+	//qDebug()<<QString("Amount of clauses in generator:")<<queryClauses.size();
+	Q_ASSERT(queryClauses.size() != 0);
+	foreach(QSharedPointer<AbstractQueryClause> clause, queryClauses)
+	{
+		Q_ASSERT(clause.data() != 0);
+		//qDebug()<<QString("Clause points to:")<<clause.data();
+		clauseText = clauseText + GenerateClause(clause);
+		QLOG_TRACE() << "text is: " << clauseText;
+	}
+	return clauseText;
+!!!157226.cpp!!!	RemoveQueryItem(in _name : string) : bool
+	QLOG_INFO() << "Query generator: Removing item from query generator";
+	int index = 0;
+	while(!queryItems.empty())
+	{
+		AbstractQueryBitInfo* info = dynamic_cast<AbstractQueryBitInfo*>(queryItems[index].data());
+		if(info->GetItemName() == _name)
+		{
+			queryItems.remove(index);
+			return true;
+		}
+	}
+	qDebug()<<QString("Attempt to delete non existing item");
+	Q_ASSERT(!queryItems.empty());
+	return false;
+!!!166442.cpp!!!	RemoveQueryClause(in _clause : string) : bool
+	QLOG_INFO() << "Query generator: Removing query clause";
+	int index = 0;
+  	while(!queryClauses.empty())
+  	{
+  		AbstractQueryBitInfo* info = dynamic_cast<AbstractQueryBitInfo*>(queryClauses[index].data());
+  		if(info->GetItemName() == _clause)
+  		{
+  			queryClauses.remove(index);
+  			return true;
+  		}
+  	}
+  	Q_ASSERT(!queryClauses.empty());
+  	return false;
+!!!158122.cpp!!!	GenerateClause(in clause : clausesharedpointer) : string
+	QLOG_INFO() << "Query generator: Generating clause: " << clause->GetClauseText();
+
+	QString clauseText;
+	Q_ASSERT(clause.data() != 0);
+	clauseText += clause->GetClauseText();
+	bool hit = false;
+	if(!queryItems.isEmpty())
+	{
+		foreach(QSharedPointer<AbstractQueryItem> item, queryItems)
+		{
+			Q_ASSERT(item.data() != 0);
+			bool enabled = CheckEnabled(clause->GetClauseType(), item.data());
+			if(!enabled || (item->GetParentClause() != clause->GetClauseType()))
+				continue;
+
+			if(item->GetItemText().length() > 0)
+			{
+				if(hit)
+				{
+					clauseText += item->GetLinkType();
+				}
+				clauseText += item->GetItemText();
+
+				hit = true;
+			}
+		}
+		if(!hit)
+			clauseText ="";
+		//qDebug()<<"At this time, the clause is: "<<clauseText;
+	}
+	else
+	{
+		clauseText ="";
+	}
+	return clauseText;
diff --git a/src/Libs/L_UniversalModels/UML/models/147626.diagram b/src/Libs/L_UniversalModels/UML/models/147626.diagram
new file mode 100644
index 000000000..d30e36b49
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/147626.diagram
@@ -0,0 +1,69 @@
+format 76
+
+classcanvas 128042 class_ref 546090 // AdditionalChecksForSplitMessage
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 342 145 2000
+end
+classcanvas 128170 class_ref 505898 // MessageSplitter
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 78 72 2005
+end
+classcanvas 128682 class_ref 546218 // AdditionalChecksSourceBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 352 398 2000
+end
+classcanvas 128938 class_ref 546474 // CheckBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1083 100 2000
+end
+classcanvas 129066 class_ref 546602 // AdditionalChecksAirport
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1236 191 2000
+end
+classcanvas 129322 class_ref 546346 // AdditionalCheckSourceDB
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 886 606 2000
+end
+classcanvas 129450 class_ref 546218 // AdditionalChecksSourceBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 876 435 2000
+end
+classcanvas 129706 class_ref 546730 // AdditionalChecksDate
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 819 187 2005
+end
+classcanvas 129962 class_ref 546474 // CheckBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 586 329 2000
+end
+relationcanvas 128554 relation_ref 612266 // <directional aggregation>
+  from ref 128042 z 2006 to ref 128170
+  role_a_pos 272 506 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 612394 // <directional aggregation>
+  from ref 128042 z 2001 stereotype "<<QSharedPointer>>" xyz 392 366 3000 to ref 128682
+  role_a_pos 451 380 3000 no_role_b
+  multiplicity_a_pos 427 380 3000 no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 612522 // <generalisation>
+  from ref 129066 z 2001 to ref 128938
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 612650 // <generalisation>
+  from ref 129322 z 2001 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 619178 // <generalisation>
+  from ref 129706 z 2006 to ref 128938
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 619306 // <directional aggregation>
+  from ref 128042 z 2001 to ref 129962
+  role_a_pos 529 356 3000 no_role_b
+  multiplicity_a_pos 571 379 3000 no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/148010.diagram b/src/Libs/L_UniversalModels/UML/models/148010.diagram
new file mode 100644
index 000000000..23b3f43c2
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/148010.diagram
@@ -0,0 +1,25 @@
+format 76
+
+classcanvas 128042 class_ref 177962 // PointerIsNull
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 40 360 2000
+end
+classcanvas 128170 class_ref 177834 // ExceptionBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 141 84 2000
+end
+classcanvas 128426 class_ref 178090 // StringResourceError
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 148 361 2006
+end
+relationcanvas 128298 relation_ref 193322 // <generalisation>
+  from ref 128042 z 2001 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 193450 // <generalisation>
+  from ref 128426 z 2007 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/148650.diagram b/src/Libs/L_UniversalModels/UML/models/148650.diagram
new file mode 100644
index 000000000..949a06135
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/148650.diagram
@@ -0,0 +1,51 @@
+format 76
+
+classcanvas 128170 class_ref 179626 // AniGraphicsItemRouteLabel
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 229 37 2005
+end
+classcanvas 128298 class_ref 179498 // AniGraphicsItemLineSegment
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 600 25 2010
+end
+classcanvas 128426 class_ref 192810 // AniGraphicsItemArea
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 242 673 2000
+end
+classcanvas 129706 class_ref 234666 // AniGraphicsRouteSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 866 190 2000
+end
+classcanvas 129962 class_ref 220202 // AniGraphicsTextObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 6 225 2000
+end
+classcanvas 130218 class_ref 289578 // TreeLinkedItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 467 632 2000
+end
+classcanvas 130858 class_ref 172714 // AniPoint
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 961 478 2005
+end
+relationcanvas 130090 relation_ref 248746 // <directional aggregation>
+  from ref 128170 z 2006 to ref 129962
+  role_a_pos 204 302 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 269482 // <generalisation>
+  from ref 128170 z 2006 to ref 130218
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130474 relation_ref 269610 // <generalisation>
+  from ref 128298 z 2011 to ref 130218
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 269738 // <generalisation>
+  from ref 128426 z 2001 to ref 130218
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/154154.diagram b/src/Libs/L_UniversalModels/UML/models/154154.diagram
new file mode 100644
index 000000000..59ac3c361
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/154154.diagram
@@ -0,0 +1,333 @@
+format 76
+
+classcanvas 128042 class_ref 559914 // MessageBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 832 582 2000
+end
+classcanvas 128093 class_ref 646826 // ValidationMistake
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 955 712 2000
+end
+classcanvas 128170 class_ref 560042 // AFTNMessage
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 829 706 2000
+end
+classcanvas 128426 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 675 531 2006
+end
+classcanvas 128810 class_ref 505898 // MessageSplitter
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 822 399 3005
+end
+classcanvas 129066 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 675 581 2000
+end
+classcanvas 129450 class_ref 579626 // MessageFormatBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 994 398 2005
+end
+classcanvas 129962 class_ref 532394 // ValidatorLoaderDB
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1214 506 2000
+end
+classcanvas 131370 class_ref 519082 // ValidatorLoaderBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1041 508 2000
+end
+classcanvas 131882 class_ref 532778 // TreeNode
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 543 465 2012
+end
+classcanvas 132266 class_ref 532906 // TreeBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 451 466 2018
+end
+classcanvas 132650 class_ref 539434 // ReportGeneratorBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 695 135 2000
+end
+classcanvas 132778 class_ref 539562 // ReportGenerator
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 709 46 2006
+end
+classcanvas 133034 class_ref 546218 // AdditionalChecksSourceBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 214 271 2000
+end
+classcanvas 133162 class_ref 546346 // AdditionalCheckSourceDB
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 221 347 2006
+end
+classcanvas 133674 class_ref 546474 // CheckBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 264 91 2006
+end
+classcanvas 134058 class_ref 553386 // AdditionalChecksValidationResult
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1047 813 2012
+end
+classcanvas 135210 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 673 482 2018
+end
+classcanvas 135594 class_ref 592938 // EMessageFormats
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1333 571 2006
+end
+classcanvas 136874 class_ref 613034 // AdditionalChecksDictionaryGeneric
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 381 92 2012
+end
+classcanvas 137130 class_ref 613162 // AdditionalChecksGeneric
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 70 92 2017
+end
+classcanvas 137386 class_ref 612906 // MessageFormatGeneric
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1311 398 2012
+end
+classcanvas 137770 class_ref 546090 // AdditionalChecksForSplitMessage
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 202 182 3011
+end
+fragment 138282 ""
+  color green xyzwh 652 275 1995 540 418
+end
+classcanvas 138538 class_ref 553386 // AdditionalChecksValidationResult
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 771 814 2000
+end
+classcanvas 138922 class_ref 599466 // EMessageFormatResult
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1317 651 2011
+end
+fragment 139434 ""
+  color green xyzwh 45 47 1995 558 362
+end
+classcanvas 139562 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 852 286 2018
+end
+classcanvas 141226 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 556 562 2018
+end
+classcanvas 141738 class_ref 619818 // FieldCheckObligatoryChildren
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 30 545 2000
+end
+classcanvas 141994 class_ref 546474 // CheckBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 80 631 2000
+end
+classcanvas 142634 class_ref 546474 // CheckBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 994 291 2000
+end
+classcanvas 143530 class_ref 633770 // MessageFormatInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1314 267 2000
+end
+classcanvas 143786 class_ref 633770 // MessageFormatInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 657 713 2000
+end
+classcanvas 144298 class_ref 640298 // EMessageFormatDetectionStatus
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1271 123 2006
+end
+relationcanvas 128298 relation_ref 625834 // <generalisation>
+  from ref 128170 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128349 relation_ref 141277 // <aggregation>
+  from ref 128042 z 2001 to ref 128093
+  role_a_pos 879 700 3000 role_b_pos 907 609 3000
+  multiplicity_a_pos 975 727 3000 multiplicity_b_pos 907 636 3000
+end
+relationcanvas 128682 relation_ref 626090 // <directional aggregation>
+  from ref 128042 z 2007 to ref 128426
+  role_a_pos 729 537 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128938 relation_ref 626218 // <directional aggregation>
+  decenter_begin 202
+  decenter_end 108
+  from ref 128810 z 3006 to ref 128042
+  role_a_pos 852 561 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 639274 // <directional aggregation>
+  from ref 128042 z 2001 to ref 129066
+  role_a_pos 729 580 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 640042 // <directional aggregation>
+  from ref 128810 z 3006 to ref 129450
+  role_a_pos 941 397 3000 no_role_b
+  multiplicity_a_pos 978 424 3000 no_multiplicity_b
+end
+relationcanvas 131626 relation_ref 598698 // <generalisation>
+  from ref 129962 z 2001 to ref 131370
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132010 relation_ref 599082 // <generalisation>
+  from ref 128426 z 2013 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132138 relation_ref 599082 // <generalisation>
+  from ref 129066 z 2013 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132394 relation_ref 598954 // <generalisation>
+  from ref 131882 z 2019 to ref 132266
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132906 relation_ref 605610 // <generalisation>
+  from ref 132778 z 2007 to ref 132650
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133290 relation_ref 612650 // <generalisation>
+  from ref 133162 z 2007 to ref 133034
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134442 relation_ref 646570 // <directional aggregation>
+  decenter_begin 865
+  from ref 129450 z 2006 to ref 131370
+  role_a_pos 1117 487 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134570 relation_ref 646698 // <directional composition>
+  decenter_begin 842
+  decenter_end 846
+  from ref 128810 z 3006 to ref 128042
+  role_a_pos 920 561 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135338 relation_ref 599082 // <generalisation>
+  from ref 135210 z 2019 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135466 relation_ref 653354 // <directional aggregation>
+  from ref 128810 z 3006 to point 692 458
+  line 140842 z 3006 to ref 135210
+  role_a_pos 704 461 3000 no_role_b
+  multiplicity_a_pos 679 461 3000 no_multiplicity_b
+end
+relationcanvas 137002 relation_ref 661162 // <generalisation>
+  from ref 136874 z 2013 to ref 133674
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 137258 relation_ref 661290 // <generalisation>
+  from ref 137130 z 2018 to ref 133674
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 137514 relation_ref 660906 // <generalisation>
+  from ref 137386 z 2013 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 137898 relation_ref 612266 // <directional aggregation>
+  from ref 137770 z 3012 to ref 128810
+  role_a_pos 714 381 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 138026 relation_ref 612394 // <directional aggregation>
+  from ref 137770 z 3012 stereotype "<<QSharedPointer>>" xyz 144 278 3012 to ref 133034
+  role_a_pos 313 253 3000 no_role_b
+  multiplicity_a_pos 289 253 3000 no_multiplicity_b
+end
+relationcanvas 138154 relation_ref 619306 // <directional aggregation>
+  from ref 137770 z 3012 to ref 133674
+  role_a_pos 313 136 3000 no_role_b
+  multiplicity_a_pos 288 136 3000 no_multiplicity_b
+end
+line 139050 ---+ decenter_end 186
+  from ref 138922 z 2012 to point 1015 676
+  line 139178 z 2012 to ref 129450
+relationcanvas 139946 relation_ref 599082 // <generalisation>
+  from ref 139562 z 2019 to point 574 425
+  line 140202 z 2019 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 140074 relation_ref 667818 // <directional aggregation>
+  from ref 128810 z 3006 stereotype "<<QVector>>" xyz 842 360 3000 to ref 139562
+  role_a_pos 884 331 3000 no_role_b
+  multiplicity_a_pos 859 331 3000 no_multiplicity_b
+end
+relationcanvas 141354 relation_ref 599082 // <generalisation>
+  from ref 141226 z 2019 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142506 relation_ref 674986 // <generalisation>
+  from ref 141738 z 2001 to ref 141994
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142762 relation_ref 675114 // <directional aggregation>
+  from ref 128810 z 3006 stereotype "<<hash>>" xyz 926 362 3000 to ref 142634
+  role_a_pos 901 303 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142890 relation_ref 696234 // <directional aggregation>
+  decenter_begin 270
+  from ref 128426 z 2007 to ref 128042
+  role_a_pos 745 566 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143018 relation_ref 696234 // <directional aggregation>
+  decenter_begin 754
+  from ref 129066 z 2001 to ref 128042
+  role_a_pos 745 583 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143146 relation_ref 696234 // <directional aggregation>
+  from ref 135210 z 2019 to point 727 497
+  line 145066 z 2019 to ref 128042
+  role_a_pos 764 567 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143274 relation_ref 696234 // <directional aggregation>
+  from ref 139562 z 2019 to ref 128042
+  role_a_pos 887 561 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143402 relation_ref 696234 // <directional aggregation>
+  from ref 141226 z 2019 to ref 128042
+  role_a_pos 745 577 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143658 relation_ref 704042 // <directional composition>
+  from ref 137386 z 2013 to ref 143530
+  role_a_pos 1385 309 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143914 relation_ref 704170 // <directional composition>
+  from ref 128042 z 2001 to ref 143786
+  role_a_pos 750 684 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+line 144554 ---+ decenter_begin 726 decenter_end 837
+  from ref 144298 z 2007 to ref 143530
+relationcanvas 144682 relation_ref 704298 // <directional composition>
+  from ref 143530 z 2007 to ref 144298
+  role_a_pos 1380 183 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/155178.diagram b/src/Libs/L_UniversalModels/UML/models/155178.diagram
new file mode 100644
index 000000000..7515edc32
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/155178.diagram
@@ -0,0 +1,25 @@
+format 76
+
+classcanvas 128042 class_ref 172714 // AniPoint
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 94 22 2000
+end
+classcanvas 128170 class_ref 192938 // AniPointRoute
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 80 495 2000
+end
+classcanvas 128426 class_ref 199466 // AniAreaPoint
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 318 56 2006
+end
+relationcanvas 128298 relation_ref 154410 // <generalisation>
+  from ref 128170 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 154538 // <generalisation>
+  from ref 128426 z 2007 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/160682.diagram b/src/Libs/L_UniversalModels/UML/models/160682.diagram
new file mode 100644
index 000000000..39f359611
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/160682.diagram
@@ -0,0 +1,157 @@
+format 76
+
+classcanvas 128042 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyzwh 218 754 2000 217 39
+end
+classcanvas 128170 class_ref 505642 // FieldValidator
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 486 371 2000
+end
+classcanvas 128298 class_ref 626474 // FieldTreeData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 158 299 3005
+end
+classcanvas 128554 class_ref 626602 // FieldProcessingData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 375 299 3005
+end
+classcanvas 128810 class_ref 626730 // FieldRegexData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 262 299 2006
+end
+classcanvas 129194 class_ref 626858 // FieldProcessingDataBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 262 654 2000
+end
+classcanvas 129450 class_ref 626986 // FieldRegexDataBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 438 652 2000
+end
+classcanvas 129706 class_ref 627114 // FieldTreeDataBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 129 653 2005
+end
+classcanvas 130730 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyzwh 136 132 3011 117 43
+end
+classcanvas 131754 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyzwh 328 130 2000 127 39
+end
+classcanvas 133674 class_ref 559914 // MessageBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 282 835 2000
+end
+classcanvas 134314 class_ref 633642 // FieldDataPieceBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 248 543 2000
+end
+classcanvas 135594 class_ref 633770 // MessageFormatInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 48 368 2000
+end
+relationcanvas 129322 relation_ref 682282 // <generalisation>
+  from ref 128554 z 3006 to ref 129194
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 682410 // <generalisation>
+  from ref 128810 z 2007 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 682538 // <generalisation>
+  from ref 128298 z 3006 to ref 129706
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129962 relation_ref 682666 // <generalisation>
+  from ref 128042 z 2006 to ref 129706
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 682794 // <generalisation>
+  from ref 128042 z 2001 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 682922 // <generalisation>
+  decenter_begin 497
+  decenter_end 407
+  from ref 128042 z 2001 to ref 129194
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131882 relation_ref 689450 // <directional aggregation>
+  from ref 128298 z 3012 to ref 130730
+  role_a_pos 204 181 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132778 relation_ref 689706 // <directional aggregation>
+  decenter_begin 865
+  decenter_end 661
+  from ref 128554 z 3006 to ref 131754
+  role_a_pos 425 175 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132906 relation_ref 689578 // <directional aggregation>
+  decenter_end 70
+  from ref 128810 z 2007 to ref 131754
+  role_a_pos 345 175 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133034 relation_ref 682154 // <directional composition>
+  decenter_begin 324
+  decenter_end 96
+  from ref 130730 z 3012 to ref 128298
+  role_a_pos 176 278 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133290 relation_ref 682026 // <directional composition>
+  from ref 131754 z 2007 to ref 128810
+  role_a_pos 333 278 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133546 relation_ref 681898 // <directional composition>
+  decenter_end 629
+  from ref 131754 z 3006 to ref 128554
+  role_a_pos 463 278 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133802 relation_ref 696234 // <directional aggregation>
+  from ref 128042 z 2001 to ref 133674
+  role_a_pos 337 814 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133930 relation_ref 696362 // <directional composition>
+  from ref 128810 z 2007 to ref 128170
+  role_a_pos 435 360 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135210 relation_ref 697002 // <generalisation>
+  from ref 128298 z 3006 to ref 134314
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135338 relation_ref 697130 // <generalisation>
+  from ref 128810 z 2007 to ref 134314
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135466 relation_ref 697258 // <generalisation>
+  from ref 128554 z 3006 to ref 134314
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135850 relation_ref 697514 // <directional composition>
+  from ref 128298 z 3006 to ref 135594
+  role_a_pos 141 344 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/161706.diagram b/src/Libs/L_UniversalModels/UML/models/161706.diagram
new file mode 100644
index 000000000..66e5efe9d
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/161706.diagram
@@ -0,0 +1,287 @@
+format 76
+
+classcanvas 128170 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 687.3 765.4 2000
+end
+classcanvas 128554 class_ref 212778 // EAniGraphicsSettingsObjectsTypes
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 229.3 759.7 2005
+end
+classcanvas 128810 class_ref 219434 // AniGraphicsColoredObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 684.7 1046.4 2000
+end
+classcanvas 128938 class_ref 219306 // AbstractAniGraphicsColoredObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightgreen
+  xyz 1053.5 1052.6 2000
+end
+classcanvas 129322 class_ref 219946 // AniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 904.2 743.7 2000
+end
+classcanvas 129450 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightgreen
+  xyz 1113.9 793.9 2000
+end
+classcanvas 129706 class_ref 219690 // AniGraphicsLineObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 287.5 1210.1 2000
+end
+classcanvas 130602 class_ref 220202 // AniGraphicsTextObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 314.6 1367.8 2000
+end
+classcanvas 130986 class_ref 220458 // AniGraphicsAreaObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 561.3 1435.6 2000
+end
+classcanvas 132650 class_ref 227754 // AniGraphicsPictureObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1019.8 1339.2 2000
+end
+classcanvas 133034 class_ref 227370 // AbstractAniGraphicsPathObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightgreen
+  xyz 1374.4 1083.8 2000
+end
+classcanvas 133162 class_ref 227498 // AniGraphicsPathObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1394.7 1213.6 2005
+end
+classcanvas 133418 class_ref 220714 // AniGraphicsIconObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1330.8 1458.1 2005
+end
+classcanvas 133674 class_ref 220586 // AbstractAniGraphicsIconObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightgreen
+  xyz 1318.6 1674.8 2000
+end
+classcanvas 134442 class_ref 249642 // AbstractTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 982.8 313.2 2006
+end
+classcanvas 134698 class_ref 249770 // BasicObjectTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyzwh 692.5 278.4 2000 159 385
+end
+classcanvas 135722 class_ref 256682 // RootObjectTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1329.5 196.2 2000
+end
+classcanvas 137002 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 418.9 42 2000
+end
+classcanvas 138026 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 95.8 64.6 2000
+end
+classcanvas 140714 class_ref 276266 // NullInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 124 396.2 2006
+end
+classcanvas 141098 class_ref 276394 // AbstractEnabledQuery
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 972.6 162 2000
+end
+classcanvas 142122 class_ref 282922 // AniGraphicsSimpleItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 797.2 1456.2 2006
+end
+classcanvas 143018 class_ref 357930 // AniGraphicsSettingsHash
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 29 703 2012
+end
+classcanvas 144554 class_ref 212650 // AbstractAniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 387 1024 2000
+end
+classcanvas 145450 class_ref 358058 // EGraphicsItemType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 225 527 3005
+end
+classcanvas 145706 class_ref 371114 // AniGraphicsCursorSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 26 1119 2000
+end
+classcanvas 146218 class_ref 289578 // TreeLinkedItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 540 399 2000
+end
+relationcanvas 129066 relation_ref 174634 // <generalisation>
+  decenter_begin 402
+  from ref 128810 z 2001 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 174762 // <generalisation>
+  from ref 128810 z 2001 to ref 128938
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 174890 // <generalisation>
+  from ref 129322 z 2001 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 175402 // <generalisation>
+  from ref 129706 z 2001 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130730 relation_ref 175530 // <generalisation>
+  from ref 130602 z 2001 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131242 relation_ref 175786 // <generalisation>
+  from ref 130986 z 2001 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132778 relation_ref 182954 // <generalisation>
+  from ref 132650 z 2001 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133290 relation_ref 183210 // <generalisation>
+  from ref 133162 z 2006 to ref 132650
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133546 relation_ref 183338 // <generalisation>
+  from ref 133418 z 2006 to ref 132650
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133802 relation_ref 183466 // <generalisation>
+  from ref 133418 z 2006 to ref 133674
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133930 relation_ref 183594 // <generalisation>
+  from ref 133162 z 2006 to ref 133034
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134954 relation_ref 209834 // <generalisation>
+  from ref 128170 z 2001 to ref 134698
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135978 relation_ref 217258 // <generalisation>
+  geometry HVH unfixed
+  from ref 135722 z 2007 to point 1157 445
+  line 136362 z 2007 to point 1157 469
+  line 136490 z 2007 to ref 134442
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 136618 relation_ref 209706 // <generalisation>
+  decenter_begin 270
+  decenter_end 202
+  from ref 134698 z 2007 to ref 134442
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 136746 relation_ref 223786 // <directional aggregation>
+  from ref 134698 z 2007 to ref 134442
+  role_a_pos 921 453 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 136874 relation_ref 230314 // <generalisation>
+  from ref 129322 z 2001 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 140330 relation_ref 248874 // <generalisation>
+  from ref 128170 z 2001 to ref 138026
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 140970 relation_ref 255658 // <generalisation>
+  from ref 140714 z 2007 to ref 138026
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 141354 relation_ref 255786 // <generalisation>
+  from ref 134442 z 2007 to ref 141098
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 141610 relation_ref 256042 // <generalisation>
+  from ref 137002 z 2001 to ref 141098
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142250 relation_ref 262698 // <generalisation>
+  from ref 142122 z 2007 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142378 relation_ref 346026 // <generalisation>
+  from ref 138026 z 2001 to ref 137002
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142506 relation_ref 374570 // <directional composition>
+  decenter_begin 379
+  decenter_end 412
+  from ref 128170 z 2006 to point 677 843
+  line 145066 z 2006 to ref 128554
+  role_a_pos 449 829 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142634 relation_ref 374698 // <directional composition>
+  decenter_end 300
+  from ref 135722 z 2006 to point 1011 701
+  line 144042 z 2006 to point 543 702
+  line 144810 z 2006 to point 542 820
+  line 144938 z 2006 to ref 128554
+  role_a_pos 449 805 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143402 relation_ref 381610 // <generalisation>
+  decenter_begin 819
+  decenter_end 754
+  from ref 143018 z 2013 to point 153 560
+  line 145194 z 2013 to ref 134698
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143530 relation_ref 381738 // <directional composition>
+  from ref 143018 z 2013 to ref 128554
+  role_a_pos 158 859 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143786 relation_ref 381866 // <generalisation>
+  decenter_end 185
+  from ref 143018 z 2013 to ref 138026
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 144682 relation_ref 167978 // <generalisation>
+  from ref 128170 z 2001 to ref 144554
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 145578 relation_ref 388778 // <directional composition>
+  from ref 143018 z 3006 to ref 145450
+  role_a_pos 230 733 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 145834 relation_ref 395306 // <generalisation>
+  from ref 145706 z 2013 to ref 143018
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 146090 relation_ref 436522 // <directional aggregation>
+  from ref 129706 z 2001 to ref 129450
+  role_a_pos 1081 897 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/167210.diagram b/src/Libs/L_UniversalModels/UML/models/167210.diagram
new file mode 100644
index 000000000..31b56482e
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/167210.diagram
@@ -0,0 +1,16 @@
+format 76
+
+classcanvas 128042 class_ref 646826 // ValidationMistake
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 449 603 2000
+end
+classcanvas 128170 class_ref 505386 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 54 31 2000
+end
+relationcanvas 128298 relation_ref 710826 // <directional aggregation>
+  from ref 128042 z 2001 to ref 128170
+  role_a_pos 266 821 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/168362.diagram b/src/Libs/L_UniversalModels/UML/models/168362.diagram
new file mode 100644
index 000000000..523639715
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/168362.diagram
@@ -0,0 +1,74 @@
+format 76
+
+classcanvas 128042 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 242 72 2000
+end
+classcanvas 128298 class_ref 234666 // AniGraphicsRouteSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 238 159 2000
+end
+classcanvas 130090 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color green
+  xyz 18 140 2006
+end
+classcanvas 130346 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 538 139 2000
+end
+classcanvas 130474 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 167 458 2006
+end
+relationcanvas 128426 relation_ref 192426 // <generalisation>
+  from ref 128298 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 191786 // <directional aggregation>
+  from ref 128298 z 2007 to ref 130090
+  role_a_pos 208 224 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 237866 // <generalisation>
+  decenter_end 657
+  from ref 130346 z 2007 to point 454 570
+  line 131370 z 2007 to ref 130474
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130858 relation_ref 240298 // <directional aggregation>
+  decenter_end 407
+  from ref 128298 z 2007 to ref 130474
+  role_a_pos 260 440 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130986 relation_ref 240426 // <directional aggregation>
+  decenter_begin 559
+  decenter_end 628
+  from ref 128298 z 2007 to ref 130474
+  role_a_pos 303 440 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131114 relation_ref 240554 // <directional aggregation>
+  decenter_begin 694
+  decenter_end 953
+  from ref 128298 z 2007 to ref 130474
+  role_a_pos 366 440 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131242 relation_ref 240682 // <directional aggregation>
+  decenter_begin 186
+  decenter_end 119
+  from ref 128298 z 2007 to ref 130474
+  role_a_pos 205 440 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131498 relation_ref 248874 // <generalisation>
+  from ref 128042 z 2001 to ref 130346
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/168490.diagram b/src/Libs/L_UniversalModels/UML/models/168490.diagram
new file mode 100644
index 000000000..51ddec5a2
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/168490.diagram
@@ -0,0 +1,66 @@
+format 76
+
+classcanvas 128042 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 286 49 2000
+end
+classcanvas 128298 class_ref 234538 // AniGraphicsDataSheetSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 280 99 2006
+end
+classcanvas 129578 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color green
+  xyz 25 484 2000
+end
+classcanvas 130730 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 722 505 2006
+end
+classcanvas 131498 class_ref 377642 // AniGraphicsItemDataSheet
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 946 137 2012
+end
+relationcanvas 128554 relation_ref 192554 // <generalisation>
+  from ref 128298 z 2007 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 239274 // <directional aggregation>
+  decenter_begin 261
+  decenter_end 300
+  from ref 128298 z 2007 to ref 129578
+  role_a_pos 98 466 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129962 relation_ref 239402 // <directional aggregation>
+  from ref 128298 z 2007 to ref 129578
+  role_a_pos 238 488 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 239530 // <directional aggregation>
+  decenter_begin 79
+  decenter_end 108
+  from ref 128298 z 2007 to ref 129578
+  role_a_pos 60 466 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131114 relation_ref 248874 // <generalisation>
+  from ref 128042 z 2007 to point 795 64
+  line 131370 z 2007 to ref 130730
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131242 relation_ref 346026 // <generalisation>
+  from ref 130730 z 2007 to ref 129578
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131626 relation_ref 402474 // <directional aggregation>
+  from ref 131498 z 2013 to ref 128298
+  role_a_pos 476 295 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/168618.diagram b/src/Libs/L_UniversalModels/UML/models/168618.diagram
new file mode 100644
index 000000000..6b12aa34b
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/168618.diagram
@@ -0,0 +1,80 @@
+format 76
+
+classcanvas 128170 class_ref 234922 // AniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 268 167 2000
+end
+classcanvas 128298 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 264 70 2005
+end
+classcanvas 128426 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color green
+  xyz 20 218 2000
+end
+classcanvas 129962 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 229 755 2006
+end
+classcanvas 130986 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 592 146 2012
+end
+classcanvas 131498 class_ref 303658 // AbstractAniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 47 31 2000
+end
+relationcanvas 129066 relation_ref 192682 // <directional aggregation>
+  from ref 128170 z 2001 to ref 128426
+  role_a_pos 144 244 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 193450 // <generalisation>
+  from ref 128170 z 2006 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 238634 // <directional aggregation>
+  decenter_begin 254
+  decenter_end 172
+  from ref 128170 z 2007 to ref 129962
+  role_a_pos 276 737 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 238762 // <directional aggregation>
+  from ref 128170 z 2007 to point 131 345
+  line 130474 z 2007 to ref 129962
+  role_a_pos 280 737 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 238890 // <directional aggregation>
+  from ref 128170 z 2007 to point 189 340
+  line 130602 z 2007 to ref 129962
+  role_a_pos 297 737 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130730 relation_ref 239018 // <directional aggregation>
+  decenter_begin 560
+  from ref 128170 z 2007 to ref 129962
+  role_a_pos 353 737 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131370 relation_ref 248874 // <generalisation>
+  from ref 128298 z 2013 to ref 130986
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131754 relation_ref 290602 // <generalisation>
+  from ref 128170 z 2001 to ref 131498
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131882 relation_ref 346026 // <generalisation>
+  from ref 130986 z 2013 to ref 129962
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/168746.diagram b/src/Libs/L_UniversalModels/UML/models/168746.diagram
new file mode 100644
index 000000000..fcf3d1c86
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/168746.diagram
@@ -0,0 +1,75 @@
+format 76
+
+classcanvas 128170 class_ref 235178 // AniGraphicsPointSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 256 275 2000
+end
+classcanvas 128298 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 253 118 2005
+end
+classcanvas 128426 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color green
+  xyz 9 249 2000
+end
+classcanvas 129706 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 524 197 2000
+end
+classcanvas 129962 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 246 541 2006
+end
+classcanvas 130858 class_ref 351274 // AbstractAniGraphicsPointSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 21 332 2000
+end
+relationcanvas 128938 relation_ref 193578 // <generalisation>
+  from ref 128170 z 2006 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 193834 // <directional aggregation>
+  from ref 128170 z 2001 to ref 128426
+  role_a_pos 142 273 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 240938 // <directional aggregation>
+  decenter_begin 335
+  decenter_end 356
+  from ref 128170 z 2007 to ref 129962
+  role_a_pos 223 533 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 241066 // <directional aggregation>
+  decenter_begin 103
+  decenter_end 128
+  from ref 128170 z 2007 to ref 129962
+  role_a_pos 281 523 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130474 relation_ref 241194 // <directional aggregation>
+  decenter_begin 832
+  decenter_end 708
+  from ref 128170 z 2007 to ref 129962
+  role_a_pos 395 523 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 248874 // <generalisation>
+  from ref 128298 z 2006 to ref 129706
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130730 relation_ref 346026 // <generalisation>
+  from ref 129706 z 2007 to ref 129962
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130986 relation_ref 361002 // <generalisation>
+  from ref 128170 z 2001 to ref 130858
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/175402.diagram b/src/Libs/L_UniversalModels/UML/models/175402.diagram
new file mode 100644
index 000000000..199d856a7
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/175402.diagram
@@ -0,0 +1,129 @@
+format 76
+
+classcanvas 128170 class_ref 241706 // AniGraphicsAirportSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color verylightorange
+  xyz 304 682 2000
+end
+classcanvas 129066 class_ref 235178 // AniGraphicsPointSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 310 407 2005
+end
+classcanvas 130218 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 306 61 2011
+end
+classcanvas 130730 class_ref 212650 // AbstractAniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 8 102 2017
+end
+classcanvas 132138 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 572 40 2011
+end
+classcanvas 132650 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 18 396 2017
+end
+classcanvas 134186 class_ref 303658 // AbstractAniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 553 791 2000
+end
+classcanvas 134570 class_ref 219946 // AniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 879 329 2017
+end
+classcanvas 134826 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 859 636 3005
+end
+relationcanvas 129194 relation_ref 201002 // <generalisation>
+  from ref 128170 z 2006 to ref 129066
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 193578 // <generalisation>
+  from ref 129066 z 2012 to ref 130218
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130858 relation_ref 167978 // <generalisation>
+  from ref 130218 z 2018 to ref 130730
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132778 relation_ref 240938 // <directional aggregation>
+  decenter_begin 74
+  from ref 129066 z 2018 to ref 132650
+  role_a_pos 226 461 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132906 relation_ref 241066 // <directional aggregation>
+  decenter_begin 395
+  from ref 129066 z 2018 to ref 132650
+  role_a_pos 226 504 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133034 relation_ref 241194 // <directional aggregation>
+  decenter_begin 694
+  from ref 129066 z 2018 to ref 132650
+  role_a_pos 226 542 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133290 relation_ref 241578 // <directional aggregation>
+  decenter_begin 531
+  decenter_end 180
+  from ref 128170 z 2018 to point 50 817
+  line 133674 z 2018 to ref 132650
+  role_a_pos 63 718 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133418 relation_ref 241706 // <directional aggregation>
+  decenter_begin 370
+  decenter_end 652
+  from ref 128170 z 2018 to point 145 776
+  line 133802 z 2018 to ref 132650
+  role_a_pos 157 718 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133546 relation_ref 241834 // <directional aggregation>
+  decenter_begin 54
+  decenter_end 675
+  from ref 128170 z 2018 to point 246 688
+  line 133930 z 2018 to ref 132650
+  role_a_pos 228 615 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134058 relation_ref 248874 // <generalisation>
+  from ref 130218 z 2012 to ref 132138
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134314 relation_ref 332842 // <generalisation>
+  from ref 128170 z 2001 to ref 134186
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134442 relation_ref 346026 // <generalisation>
+  from ref 132138 z 2018 to ref 132650
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134698 relation_ref 230314 // <generalisation>
+  from ref 134570 z 2018 to ref 130218
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134954 relation_ref 174890 // <generalisation>
+  from ref 134570 z 3006 to ref 134826
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135082 relation_ref 193834 // <directional aggregation>
+  from ref 129066 z 3006 to ref 134826
+  role_a_pos 827 672 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/175530.diagram b/src/Libs/L_UniversalModels/UML/models/175530.diagram
new file mode 100644
index 000000000..0a633c4e6
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/175530.diagram
@@ -0,0 +1,54 @@
+format 76
+
+classcanvas 128042 class_ref 241962 // AbstractAniGraphicsAreaForbiddenEntrySettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightgreen
+  xyz 32 500 2000
+end
+classcanvas 128170 class_ref 242090 // AniGraphicsAreaRestrictedEntrySettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 346 486 2000
+end
+classcanvas 128298 class_ref 234922 // AniGraphicsAreaSettings
+  draw_all_relations default hide_attributes no hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 389 351 2005
+end
+classcanvas 128682 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 614 289 3005
+end
+classcanvas 129962 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 388 36 3010
+end
+classcanvas 130474 class_ref 212650 // AbstractAniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightgreen
+  xyz 67 62 3016
+end
+relationcanvas 128426 relation_ref 201642 // <generalisation>
+  from ref 128170 z 2006 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 201770 // <generalisation>
+  from ref 128170 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 192682 // <directional aggregation>
+  from ref 128298 z 3006 to ref 128682
+  role_a_pos 582 355 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 193450 // <generalisation>
+  from ref 128298 z 3011 to ref 129962
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 167978 // <generalisation>
+  from ref 129962 z 3017 to ref 130474
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/175658.diagram b/src/Libs/L_UniversalModels/UML/models/175658.diagram
new file mode 100644
index 000000000..d709eaf28
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/175658.diagram
@@ -0,0 +1,25 @@
+format 76
+
+classcanvas 128042 class_ref 249130 // AbstractAniGraphicsLocalRouteSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 35 598 2000
+end
+classcanvas 128170 class_ref 249258 // AniGraphicsLocalRouteSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 352 592 2000
+end
+classcanvas 128426 class_ref 234666 // AniGraphicsRouteSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 367 324 2005
+end
+relationcanvas 128298 relation_ref 208810 // <generalisation>
+  from ref 128170 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 208938 // <generalisation>
+  from ref 128170 z 2006 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/175786.diagram b/src/Libs/L_UniversalModels/UML/models/175786.diagram
new file mode 100644
index 000000000..8bb561f98
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/175786.diagram
@@ -0,0 +1,94 @@
+format 76
+
+classcanvas 128170 class_ref 249514 // AniGraphicsInternationalRouteSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 360 731 2000
+end
+classcanvas 128298 class_ref 234666 // AniGraphicsRouteSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 396 436 2000
+end
+classcanvas 128682 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 397 99 2006
+end
+classcanvas 128938 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 89 288 3005
+end
+classcanvas 129962 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 728 447 2000
+end
+classcanvas 130730 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 742 156 2006
+end
+classcanvas 131370 class_ref 234410 // AbstractAniGraphicsRouteSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 86 477 2000
+end
+relationcanvas 128426 relation_ref 209322 // <generalisation>
+  from ref 128170 z 2001 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 192426 // <generalisation>
+  from ref 128298 z 2007 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129066 relation_ref 191786 // <directional aggregation>
+  from ref 128298 z 3006 to ref 128938
+  role_a_pos 279 416 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 240298 // <directional aggregation>
+  decenter_begin 79
+  decenter_end 115
+  from ref 128298 z 2001 to ref 129962
+  role_a_pos 695 467 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 240426 // <directional aggregation>
+  decenter_end 340
+  from ref 128298 z 2001 to ref 129962
+  role_a_pos 653 537 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130474 relation_ref 240554 // <directional aggregation>
+  decenter_begin 321
+  decenter_end 231
+  from ref 128298 z 2001 to ref 129962
+  role_a_pos 650 503 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 240682 // <directional aggregation>
+  decenter_begin 685
+  decenter_end 416
+  from ref 128298 z 2001 to ref 129962
+  role_a_pos 674 560 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131498 relation_ref 242090 // <generalisation>
+  from ref 128298 z 2001 to ref 131370
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131626 relation_ref 248874 // <generalisation>
+  from ref 128682 z 2007 to ref 130730
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131754 relation_ref 346026 // <generalisation>
+  from ref 130730 z 2007 to ref 129962
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131882 relation_ref 443050 // <directional aggregation>
+  decenter_begin 842
+  from ref 128298 z 2001 to ref 129962
+  role_a_pos 682 598 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/175914.diagram b/src/Libs/L_UniversalModels/UML/models/175914.diagram
new file mode 100644
index 000000000..a3d4d35fa
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/175914.diagram
@@ -0,0 +1,138 @@
+format 76
+
+classcanvas 128042 class_ref 242218 // AbstractAniGraphicsAreaRegionalCenterSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz -19 912 2000
+end
+classcanvas 128170 class_ref 242346 // AniGraphicsAreaRegionalCenterSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color verylightorange
+  xyz 299 913 2000
+end
+classcanvas 128298 class_ref 234922 // AniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 358 360 2005
+end
+classcanvas 128682 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightblue
+  xyz 641.2 551 3005
+end
+classcanvas 129706 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 358 11 3010
+end
+classcanvas 131242 class_ref 249770 // BasicObjectTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 119 59 3016
+end
+classcanvas 131498 class_ref 249642 // AbstractTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 122 484 3022
+end
+classcanvas 131882 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 614 258 2000
+end
+classcanvas 132778 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 634 3 2006
+end
+classcanvas 133674 class_ref 219946 // AniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 854 292 2000
+end
+classcanvas 134058 class_ref 303658 // AbstractAniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 921 666 2011
+end
+relationcanvas 128034 relation_ref 346026 // <generalisation>
+  from ref 132778 z 2007 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128426 relation_ref 201898 // <generalisation>
+  from ref 128170 z 2006 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 202026 // <generalisation>
+  from ref 128170 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 192682 // <directional aggregation>
+  from ref 128298 z 3006 to point 566 631
+  line 130858 z 3006 to ref 128682
+  role_a_pos 609 616 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 193450 // <generalisation>
+  from ref 128298 z 3011 to ref 129706
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131370 relation_ref 209834 // <generalisation>
+  from ref 129706 z 3017 to ref 131242
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131626 relation_ref 209706 // <generalisation>
+  from ref 131242 z 3023 to ref 131498
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131754 relation_ref 223786 // <directional aggregation>
+  decenter_begin 282
+  decenter_end 286
+  from ref 131242 z 3023 to ref 131498
+  role_a_pos 164 466 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132138 relation_ref 238634 // <directional aggregation>
+  from ref 128298 z 2006 to ref 131882
+  role_a_pos 700 300 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132266 relation_ref 238762 // <directional aggregation>
+  decenter_begin 586
+  decenter_end 824
+  from ref 128298 z 2006 to ref 131882
+  role_a_pos 783 300 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132394 relation_ref 238890 // <directional aggregation>
+  decenter_begin 337
+  decenter_end 564
+  from ref 128298 z 2006 to ref 131882
+  role_a_pos 731 300 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132650 relation_ref 239018 // <directional aggregation>
+  from ref 128298 z 2006 to ref 131882
+  role_a_pos 700 300 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133290 relation_ref 248874 // <generalisation>
+  from ref 129706 z 3011 to ref 132778
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133802 relation_ref 174890 // <generalisation>
+  from ref 133674 z 3006 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133930 relation_ref 230314 // <generalisation>
+  from ref 133674 z 3011 to ref 129706
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134186 relation_ref 290602 // <generalisation>
+  from ref 128298 z 2012 to ref 134058
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/176042.diagram b/src/Libs/L_UniversalModels/UML/models/176042.diagram
new file mode 100644
index 000000000..ecf33be6f
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/176042.diagram
@@ -0,0 +1,43 @@
+format 76
+
+classcanvas 128042 class_ref 242474 // AbstractAniGraphicsRouteEntryCorridorSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 30 832 2000
+end
+classcanvas 128170 class_ref 242602 // AniGraphicsRouteEntryCorridorSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 330 832 2000
+end
+classcanvas 128298 class_ref 234922 // AniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 645 337 2005
+end
+classcanvas 128938 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 53 479 3011
+end
+classcanvas 129962 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 369 233 3011
+end
+relationcanvas 128426 relation_ref 202154 // <generalisation>
+  from ref 128170 z 2006 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 202282 // <generalisation>
+  from ref 128170 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129066 relation_ref 192682 // <directional aggregation>
+  from ref 128298 z 3012 to ref 128938
+  role_a_pos 243 547 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 193450 // <generalisation>
+  from ref 128298 z 3012 to ref 129962
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/180522.diagram b/src/Libs/L_UniversalModels/UML/models/180522.diagram
new file mode 100644
index 000000000..155046eaa
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/180522.diagram
@@ -0,0 +1,48 @@
+format 76
+
+classinstance 128042 class_ref 667434 // DatabaseMessageIO
+  name ""   xyz 592 4 2000 life_line_z 2000
+classinstance 128170 class_ref 667690 // MessageEditor
+  name ""   xyz 53 4 2000 life_line_z 2000
+classinstance 128298 class_ref 667818 // FPLMessageSeparated
+  name ""   xyz 324 4 2000 life_line_z 2000
+durationcanvas 128426 classinstance_ref 128298 // :FPLMessageSeparated
+  xyzwh 391 56 2010 11 29
+end
+durationcanvas 128554 classinstance_ref 128170 // :MessageEditor
+  xyzwh 96 65 2010 11 105
+  overlappingdurationcanvas 128682
+    xyzwh 102 120 2020 11 25
+  end
+end
+durationcanvas 128810 classinstance_ref 128298 // :FPLMessageSeparated
+  xyzwh 391 131 2010 11 59
+end
+durationcanvas 128938 classinstance_ref 128042 // :DatabaseMessageIO
+  xyzwh 652 163 2010 11 36
+end
+msg 129066 synchronous
+  from durationcanvas_ref 128426
+  to durationcanvas_ref 128554
+  yz 68 2015 explicitmsg "Accept Message Clicked"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 182 55
+msg 129194 synchronous
+  from durationcanvas_ref 128554
+  to durationcanvas_ref 128810
+  yz 152 2015 explicitmsg "Save Request Result"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  args "bool"
+  label_xy 191 139
+msg 129322 synchronous
+  from durationcanvas_ref 128810
+  to durationcanvas_ref 128938
+  yz 177 2015 explicitmsg "MessageAccepted"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 474 164
+reflexivemsg 129450 synchronous
+  to durationcanvas_ref 128682
+  yz 120 2025 explicitmsg "Request Confirmation"
+  show_full_operations_definition default drawing_language default show_context_mode default
+  label_xy 109 104
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/180650.diagram b/src/Libs/L_UniversalModels/UML/models/180650.diagram
new file mode 100644
index 000000000..454bd376d
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/180650.diagram
@@ -0,0 +1,3 @@
+format 76
+
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/182570.diagram b/src/Libs/L_UniversalModels/UML/models/182570.diagram
new file mode 100644
index 000000000..84a9e2979
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/182570.diagram
@@ -0,0 +1,16 @@
+format 76
+
+classcanvas 128042 class_ref 250154 // AbstractAniGraphicsIndividualObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 353 182 2000
+end
+classcanvas 128170 class_ref 250026 // AniGraphicsIndividualObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 70 167 2005
+end
+relationcanvas 128298 relation_ref 210602 // <generalisation>
+  from ref 128170 z 2006 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/187178.diagram b/src/Libs/L_UniversalModels/UML/models/187178.diagram
new file mode 100644
index 000000000..ac55a0bf3
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/187178.diagram
@@ -0,0 +1,157 @@
+format 76
+
+classcanvas 128042 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyzwh 218 754 2000 217 39
+end
+classcanvas 128170 class_ref 676138 // FieldValidator
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 486 371 2000
+end
+classcanvas 128298 class_ref 676010 // FieldTreeData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 158 299 3005
+end
+classcanvas 128554 class_ref 675754 // FieldProcessingData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 375 299 3005
+end
+classcanvas 128810 class_ref 675882 // FieldRegexData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 262 299 2006
+end
+classcanvas 129194 class_ref 678570 // FieldProcessingDataBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 262 654 2000
+end
+classcanvas 129450 class_ref 678442 // FieldRegexDataBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 438 652 2000
+end
+classcanvas 129706 class_ref 678314 // FieldTreeDataBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 129 653 2005
+end
+classcanvas 130730 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyzwh 136 132 3011 117 43
+end
+classcanvas 131754 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyzwh 328 130 2000 127 39
+end
+classcanvas 133674 class_ref 678058 // MessageBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 282 835 2000
+end
+classcanvas 134314 class_ref 678698 // FieldDataPieceBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 248 543 2000
+end
+classcanvas 135594 class_ref 678826 // MessageFormatInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 48 368 2000
+end
+relationcanvas 129322 relation_ref 741290 // <generalisation>
+  from ref 128554 z 3006 to ref 129194
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 741802 // <generalisation>
+  from ref 128810 z 2007 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 740778 // <generalisation>
+  from ref 128298 z 3006 to ref 129706
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129962 relation_ref 739242 // <generalisation>
+  from ref 128042 z 2006 to ref 129706
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 739370 // <generalisation>
+  from ref 128042 z 2001 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 739498 // <generalisation>
+  decenter_begin 497
+  decenter_end 407
+  from ref 128042 z 2001 to ref 129194
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131882 relation_ref 740906 // <directional aggregation>
+  from ref 128298 z 3012 to ref 130730
+  role_a_pos 205 180 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132778 relation_ref 741418 // <directional aggregation>
+  decenter_begin 865
+  decenter_end 661
+  from ref 128554 z 3006 to ref 131754
+  role_a_pos 424 174 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132906 relation_ref 741930 // <directional aggregation>
+  decenter_end 70
+  from ref 128810 z 2007 to ref 131754
+  role_a_pos 346 174 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133034 relation_ref 739114 // <directional composition>
+  decenter_begin 324
+  decenter_end 96
+  from ref 130730 z 3012 to ref 128298
+  role_a_pos 176 281 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133290 relation_ref 738986 // <directional composition>
+  from ref 131754 z 2007 to ref 128810
+  role_a_pos 333 281 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133546 relation_ref 738858 // <directional composition>
+  decenter_end 629
+  from ref 131754 z 3006 to ref 128554
+  role_a_pos 463 281 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133802 relation_ref 739626 // <directional aggregation>
+  from ref 128042 z 2001 to ref 133674
+  role_a_pos 336 817 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133930 relation_ref 741674 // <directional composition>
+  from ref 128810 z 2007 to ref 128170
+  role_a_pos 435 360 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135210 relation_ref 741034 // <generalisation>
+  from ref 128298 z 3006 to ref 134314
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135338 relation_ref 742058 // <generalisation>
+  from ref 128810 z 2007 to ref 134314
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135466 relation_ref 741546 // <generalisation>
+  from ref 128554 z 3006 to ref 134314
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135850 relation_ref 741162 // <directional composition>
+  from ref 128298 z 3006 to ref 135594
+  role_a_pos 141 344 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/187306.diagram b/src/Libs/L_UniversalModels/UML/models/187306.diagram
new file mode 100644
index 000000000..f8f553358
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/187306.diagram
@@ -0,0 +1,16 @@
+format 76
+
+classcanvas 128042 class_ref 677290 // ValidationMistake
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 449 603 2000
+end
+classcanvas 128170 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 54 31 2000
+end
+relationcanvas 128298 relation_ref 742314 // <directional aggregation>
+  from ref 128042 z 2001 to ref 128170
+  role_a_pos 242 764 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/187434.diagram b/src/Libs/L_UniversalModels/UML/models/187434.diagram
new file mode 100644
index 000000000..0cb89c6c9
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/187434.diagram
@@ -0,0 +1,347 @@
+format 76
+
+classcanvas 128042 class_ref 678058 // MessageBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 832 582 2000
+end
+classcanvas 128170 class_ref 677290 // ValidationMistake
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 955 712 2000
+end
+classcanvas 128298 class_ref 674730 // AFTNMessage
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 829 706 2000
+end
+classcanvas 128426 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 675 531 2006
+end
+classcanvas 128810 class_ref 676394 // MessageSplitter
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 822 399 3005
+end
+classcanvas 129066 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 675 581 2000
+end
+classcanvas 129450 class_ref 677418 // MessageFormatBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 994 398 2005
+end
+classcanvas 129962 class_ref 676906 // ValidatorLoaderDB
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1214 506 2000
+end
+classcanvas 131370 class_ref 677546 // ValidatorLoaderBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1041 508 2000
+end
+classcanvas 131882 class_ref 676650 // TreeNode
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 543 465 2012
+end
+classcanvas 132266 class_ref 678186 // TreeBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 451 466 2018
+end
+classcanvas 132650 class_ref 677674 // ReportGeneratorBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 695 135 2000
+end
+classcanvas 132778 class_ref 676522 // ReportGenerator
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 709 46 2006
+end
+classcanvas 133034 class_ref 677802 // AdditionalChecksSourceBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 214 271 2000
+end
+classcanvas 133162 class_ref 674858 // AdditionalCheckSourceDB
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 221 347 2006
+end
+classcanvas 133674 class_ref 677930 // CheckBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 264 91 2006
+end
+classcanvas 134058 class_ref 675370 // AdditionalChecksValidationResult
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1047 813 2012
+end
+classcanvas 135210 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 673 482 2018
+end
+classcanvas 135594 class_ref 679722 // EMessageFormats
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1333 571 2006
+end
+classcanvas 136874 class_ref 674986 // AdditionalChecksDictionaryGeneric
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 381 92 2012
+end
+classcanvas 137130 class_ref 675242 // AdditionalChecksGeneric
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 70 92 2017
+end
+classcanvas 137386 class_ref 676266 // MessageFormatGeneric
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1311 398 2012
+end
+classcanvas 137770 class_ref 675114 // AdditionalChecksForSplitMessage
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 202 182 3011
+end
+fragment 138282 ""
+  color green xyzwh 652 275 1995 540 418
+end
+classcanvas 138538 class_ref 675370 // AdditionalChecksValidationResult
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 771 814 2000
+end
+classcanvas 138922 class_ref 679338 // EMessageFormatResult
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1317 651 2011
+end
+fragment 139434 ""
+  color green xyzwh 45 47 1995 558 362
+end
+classcanvas 139562 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 852 286 2018
+end
+classcanvas 141226 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 556 562 2018
+end
+classcanvas 141738 class_ref 675626 // FieldCheckObligatoryChildren
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 30 545 2000
+end
+classcanvas 141994 class_ref 677930 // CheckBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 80 631 2000
+end
+classcanvas 142634 class_ref 677930 // CheckBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 994 291 2000
+end
+classcanvas 143530 class_ref 678826 // MessageFormatInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1314 267 2000
+end
+classcanvas 143786 class_ref 678826 // MessageFormatInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 657 713 2000
+end
+classcanvas 144298 class_ref 679082 // EMessageFormatDetectionStatus
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1271 123 2006
+end
+classcanvas 145194 class_ref 701610 // FieldFactoryBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1037 55 2000
+end
+classcanvas 145322 class_ref 653738 // FieldFactory
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1044 173 2000
+end
+relationcanvas 128682 relation_ref 743978 // <directional aggregation>
+  from ref 128042 z 2007 to ref 128426
+  role_a_pos 729 539 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128938 relation_ref 739754 // <directional aggregation>
+  decenter_begin 202
+  decenter_end 108
+  from ref 128810 z 3006 to ref 128042
+  role_a_pos 852 561 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 743850 // <directional aggregation>
+  from ref 128042 z 2001 to ref 129066
+  role_a_pos 729 582 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 739882 // <directional aggregation>
+  from ref 128810 z 3006 to ref 129450
+  role_a_pos 941 397 3000 no_role_b
+  multiplicity_a_pos 978 424 3000 no_multiplicity_b
+end
+relationcanvas 131626 relation_ref 742698 // <generalisation>
+  from ref 129962 z 2001 to ref 131370
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132010 relation_ref 738730 // <generalisation>
+  from ref 128426 z 2013 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132138 relation_ref 738730 // <generalisation>
+  from ref 129066 z 2013 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132394 relation_ref 740522 // <generalisation>
+  from ref 131882 z 2019 to ref 132266
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132906 relation_ref 740650 // <generalisation>
+  from ref 132778 z 2007 to ref 132650
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133290 relation_ref 742570 // <generalisation>
+  from ref 133162 z 2007 to ref 133034
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134442 relation_ref 743722 // <directional aggregation>
+  decenter_begin 865
+  from ref 129450 z 2006 to ref 131370
+  role_a_pos 1115 490 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 134570 relation_ref 740010 // <directional composition>
+  decenter_begin 842
+  decenter_end 846
+  from ref 128810 z 3006 to ref 128042
+  role_a_pos 920 561 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135338 relation_ref 738730 // <generalisation>
+  from ref 135210 z 2019 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 135466 relation_ref 740266 // <directional aggregation>
+  from ref 128810 z 3006 to point 692 458
+  line 140842 z 3006 to ref 135210
+  role_a_pos 704 464 3000 no_role_b
+  multiplicity_a_pos 680 464 3000 no_multiplicity_b
+end
+relationcanvas 137002 relation_ref 743338 // <generalisation>
+  from ref 136874 z 2013 to ref 133674
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 137258 relation_ref 743466 // <generalisation>
+  from ref 137130 z 2018 to ref 133674
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 137514 relation_ref 742826 // <generalisation>
+  from ref 137386 z 2013 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 137898 relation_ref 738346 // <directional aggregation>
+  from ref 137770 z 3012 to ref 128810
+  role_a_pos 714 381 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 138026 relation_ref 738474 // <directional aggregation>
+  from ref 137770 z 3012 stereotype "<<QSharedPointer>>" xyz 144 278 3012 to ref 133034
+  role_a_pos 313 253 3000 no_role_b
+  multiplicity_a_pos 289 253 3000 no_multiplicity_b
+end
+relationcanvas 138154 relation_ref 738602 // <directional aggregation>
+  from ref 137770 z 3012 to ref 133674
+  role_a_pos 313 136 3000 no_role_b
+  multiplicity_a_pos 288 136 3000 no_multiplicity_b
+end
+line 139050 ---+ decenter_end 186
+  from ref 138922 z 2012 to point 1015 676
+  line 139178 z 2012 to ref 129450
+relationcanvas 139946 relation_ref 738730 // <generalisation>
+  from ref 139562 z 2019 to point 574 425
+  line 140202 z 2019 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 140074 relation_ref 740138 // <directional aggregation>
+  from ref 128810 z 3006 stereotype "<<QVector>>" xyz 842 360 3000 to ref 139562
+  role_a_pos 883 328 3000 no_role_b
+  multiplicity_a_pos 859 328 3000 no_multiplicity_b
+end
+relationcanvas 141354 relation_ref 738730 // <generalisation>
+  from ref 141226 z 2019 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142506 relation_ref 743082 // <generalisation>
+  from ref 141738 z 2001 to ref 141994
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142762 relation_ref 740394 // <directional aggregation>
+  from ref 128810 z 3006 stereotype "<<hash>>" xyz 926 362 3000 to ref 142634
+  role_a_pos 901 303 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 142890 relation_ref 739626 // <directional aggregation>
+  decenter_begin 270
+  from ref 128426 z 2007 to ref 128042
+  role_a_pos 759 568 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143018 relation_ref 739626 // <directional aggregation>
+  decenter_begin 754
+  from ref 129066 z 2001 to ref 128042
+  role_a_pos 759 585 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143146 relation_ref 739626 // <directional aggregation>
+  from ref 135210 z 2019 to point 727 497
+  line 145066 z 2019 to ref 128042
+  role_a_pos 764 567 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143274 relation_ref 739626 // <directional aggregation>
+  from ref 139562 z 2019 to ref 128042
+  role_a_pos 886 564 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143402 relation_ref 739626 // <directional aggregation>
+  from ref 141226 z 2019 to ref 128042
+  role_a_pos 759 579 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143658 relation_ref 742954 // <directional composition>
+  from ref 137386 z 2013 to ref 143530
+  role_a_pos 1385 309 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 143914 relation_ref 744106 // <directional composition>
+  from ref 128042 z 2001 to ref 143786
+  role_a_pos 750 684 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+line 144554 ---+ decenter_begin 726 decenter_end 837
+  from ref 144298 z 2007 to ref 143530
+relationcanvas 144682 relation_ref 742186 // <directional composition>
+  from ref 143530 z 2007 to ref 144298
+  role_a_pos 1380 183 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 145450 relation_ref 738218 // <generalisation>
+  from ref 128298 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 145578 relation_ref 742442 // <aggregation>
+  from ref 128042 z 2001 to ref 128170
+  role_a_pos 879 700 3000 role_b_pos 907 609 3000
+  multiplicity_a_pos 975 727 3000 multiplicity_b_pos 907 636 3000
+end
+relationcanvas 145706 relation_ref 717354 // <generalisation>
+  decenter_begin 456
+  from ref 145322 z 2001 to ref 145194
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/189098.diagram b/src/Libs/L_UniversalModels/UML/models/189098.diagram
new file mode 100644
index 000000000..0c3b7760c
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/189098.diagram
@@ -0,0 +1,34 @@
+format 76
+
+classcanvas 128042 class_ref 283050 // AniGraphicsMapUnderlaySettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 96 620 2000
+end
+classcanvas 128298 class_ref 219434 // AniGraphicsColoredObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 590 447 2000
+end
+classcanvas 128426 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 613 74 2006
+end
+classcanvas 128682 class_ref 282922 // AniGraphicsSimpleItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 403 634 2006
+end
+relationcanvas 128554 relation_ref 174634 // <generalisation>
+  from ref 128298 z 2007 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 262698 // <generalisation>
+  from ref 128682 z 2007 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128938 relation_ref 262826 // <directional aggregation>
+  from ref 128042 z 2007 to ref 128682
+  role_a_pos 314 647 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/193962.diagram b/src/Libs/L_UniversalModels/UML/models/193962.diagram
new file mode 100644
index 000000000..b45fd8d5a
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/193962.diagram
@@ -0,0 +1,105 @@
+format 76
+
+classcanvas 128042 class_ref 653610 // MainWindowPrivate
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1167 49 2000
+end
+classcanvas 128170 class_ref 547370 // AbstractTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1173 153 2000
+end
+classcanvas 128426 class_ref 675498 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1037 318 2000
+end
+classcanvas 128554 class_ref 695082 // TreeField
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1105 317 2000
+end
+classcanvas 128810 class_ref 547370 // AbstractTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1036 6 2000
+end
+classcanvas 129706 class_ref 708138 // ValidatorLoaderDBTree
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1214 317 2000
+end
+classcanvas 129834 class_ref 676906 // ValidatorLoaderDB
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1228 421 2000
+end
+classcanvas 130090 class_ref 714794 // TreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 391 227 2005
+end
+classcanvas 130218 class_ref 714666 // ItemController
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 362 331 2000
+end
+classcanvas 130474 class_ref 676650 // TreeNode
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1027 427 2006
+end
+classcanvas 131626 class_ref 714922 // TreeItemInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 516 238 2000
+end
+classcanvas 131882 class_ref 721578 // InterfaceAwareTreeData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 497 526 2000
+end
+classcanvas 132266 class_ref 728234 // AddressTemplateData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 207 524 2000
+end
+classcanvas 133034 class_ref 728490 // AddressTemplateTreeData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 195 615 2000
+end
+relationcanvas 128298 relation_ref 759338 // <directional aggregation>
+  from ref 128042 z 2001 stereotype "<<list>>" xyz 1206 119 3000 to ref 128170
+  role_a_pos 1239 132 3000 no_role_b
+  multiplicity_a_pos 1214 132 3000 no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 759978 // <generalisation>
+  from ref 128554 z 2001 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129962 relation_ref 766506 // <generalisation>
+  from ref 129706 z 2001 to ref 129834
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 773034 // <directional aggregation>
+  from ref 130090 z 2006 to ref 130218
+  role_a_pos 421 310 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 738730 // <generalisation>
+  from ref 128426 z 2007 to ref 130474
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131754 relation_ref 773418 // <generalisation>
+  from ref 130090 z 2006 to ref 131626
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132394 relation_ref 780074 // <generalisation>
+  decenter_begin 503
+  from ref 132266 z 2001 to ref 131882
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132522 relation_ref 780202 // <directional aggregation>
+  from ref 131882 z 2001 to ref 131626
+  role_a_pos 583 283 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133162 relation_ref 786858 // <directional composition>
+  from ref 132266 z 2001 to ref 133034
+  role_a_pos 286 594 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/195626.diagram b/src/Libs/L_UniversalModels/UML/models/195626.diagram
new file mode 100644
index 000000000..88da39418
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/195626.diagram
@@ -0,0 +1,24 @@
+format 76
+
+classcanvas 128042 class_ref 296362 // EAreaDrawingType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 192 197 2000
+end
+classcanvas 128170 class_ref 296234 // AniAreaRestrictedEntry
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 428 102 2000
+end
+classcanvas 128426 class_ref 296490 // ERestrictionType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 445 489 2000
+end
+classcanvas 128682 class_ref 296618 // ELevelType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 708 402 2000
+end
+relationcanvas 128554 relation_ref 276522 // <directional composition>
+  from ref 128170 z 2001 to ref 128426
+  role_a_pos 509 471 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/200490.diagram b/src/Libs/L_UniversalModels/UML/models/200490.diagram
new file mode 100644
index 000000000..e3a323fe9
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/200490.diagram
@@ -0,0 +1,71 @@
+format 75
+
+classcanvas 128170 class_ref 735018 // AdaptingTableModel
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 63 503 2000
+end
+classcanvas 128682 class_ref 714666 // ItemController
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 285 177 2011
+end
+classcanvas 129066 class_ref 714794 // TreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 494 178 2017
+end
+classcanvas 129450 class_ref 714922 // TreeItemInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 468 299 2023
+end
+classcanvas 130474 class_ref 741802 // TreeModel
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 488 413 2000
+end
+classcanvas 132394 class_ref 748330 // TableDataInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 66 303 2000
+end
+classcanvas 132650 class_ref 748458 // TableDataListHolder
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 64 178 2000
+end
+classcanvas 133290 class_ref 761642 // AdaptingTableModelPrivate
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 43 422 2000
+end
+relationcanvas 129194 relation_ref 773034 // <directional aggregation>
+  from ref 129066 z 2018 to ref 128682
+  role_a_pos 397 185 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 773418 // <generalisation>
+  from ref 129066 z 2024 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130730 relation_ref 800426 // <directional aggregation>
+  from ref 130474 z 2024 stereotype "<<list>>" xyz 502 374 3000 to ref 129450
+  role_a_pos 538 344 3000 no_role_b
+  multiplicity_a_pos 511 344 3000 no_multiplicity_b
+end
+relationcanvas 132778 relation_ref 807466 // <generalisation>
+  decenter_begin 495
+  from ref 132650 z 2001 to ref 132394
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133034 relation_ref 807722 // <directional aggregation>
+  from ref 132650 z 2012 to ref 128682
+  role_a_pos 223 185 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133418 relation_ref 814250 // <directional aggregation>
+  from ref 133290 z 2001 to ref 132394
+  role_a_pos 140 348 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133546 relation_ref 814378 // <directional aggregation>
+  from ref 128170 z 2001 to ref 133290
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002
new file mode 100644
index 000000000..b41909260
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/201002
@@ -0,0 +1,3273 @@
+format 75
+"TreeController" // TreeController
+  revision 38
+  modified_by 42 "zeks"
+  // class settings
+  //class diagram settings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  //use case diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default
+  //sequence diagram settings
+  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+  //collaboration diagram settings
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
+  //object diagram settings
+   write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+  //component diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  //deployment diagram settings
+  package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  //state diagram settings
+  package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+  show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+  //activity diagram settings
+  package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+  show_infonote default drawing_language default show_stereotype_properties default
+  
+  cpp_h_dir "include/"
+  cpp_src_dir "src/"
+  ncouples 3
+  key "exportHeader" value "#include \"l_tree_controller_global.h\""
+  key "export" value "L_TREE_CONTROLLER_EXPORT"
+  key "copyright" value "// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************"
+  classview 254890 "classes"
+    //class diagram settings
+    draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default show_msg_context default draw_all_relations default shadow default show_stereotype_properties default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default show_class_context_mode default show_msg_context_mode default
+    //state diagram settings
+    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+    show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+    //class settings
+    //activity diagram settings
+    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+    show_infonote default drawing_language default show_stereotype_properties default
+    associated_deployment_view deploymentview_ref 227626 // classes
+    classdiagram 200490 "Adapting Table Model"
+      draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+      size A3
+    end
+
+    class 714794 "TreeItem"
+      visibility package 
+      nformals 1
+      formal name "T" type "class" explicit_default_value ""
+        explicit_extends ""
+      cpp_decl "${description}${template}class @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      ncouples 1
+      key "export" value " "
+      extra_member 175786 "value_type"
+	
+	cpp "typedef TreeItem<T> value_type;" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 2139690 "TreeItem"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 1
+	
+	  param inout name "data" explicit_type "T"
+	    defaultvalue "nullptr"
+	cpp_decl "    ${description}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}@{externalClass}@{externalClass}@{externalClass}${class}::${name}${(}${t0} * ${p0}${)} @{cInit}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${synchronized}${name}${(}${)}${throws} {
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+	ncouples 1
+	key "cInit" value ": TreeItemInterface()"
+      end
+
+      operation 2139946 "TreeItem"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${description}${inline}explicit ${name}${(}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${)}${volatile} @{cInit}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${synchronized}${name}${(}${)}${throws} {
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+	ncouples 1
+	key "cInit" value ": TreeItemInterface()"
+      end
+
+      operation 2228906 "GetChildren"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "QList<QSharedPointer<TreeItemInterface> >"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2215466 "ResetState"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2139818 "~TreeItem"
+	cpp_virtual public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${description}${inline}${virtual}${name}${(}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${)}${volatile} 
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2113578 "columnCount"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2113706 "childCount"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2113450 "data"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "variant"
+	nparams 2
+	
+	  param in name "index" explicit_type "modelIndex"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2113322 "isCheckable"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "bool"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2113194 "setCheckState"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "state" explicit_type "Qt::CheckState"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2113066 "checkState"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "Qt::CheckState"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2112810 "setData"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "bool"
+	nparams 3
+	
+	  param in name "index" explicit_type "modelIndex"
+	  param in name "value" explicit_type "variant"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}, const ${t1} & ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2112682 "removeChildren"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "bool"
+	nparams 2
+	
+	  param in name "position" explicit_type "int"
+	  param in name "count" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2112554 "insertChildren"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "bool"
+	nparams 2
+	
+	  param in name "position" explicit_type "int"
+	  param in name "count" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2114346 "children"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "QList<QSharedPointer<TreeItemInterface > >&"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2114218 "children"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "const QList<QSharedPointer<TreeItemInterface > >&"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2114090 "addChildren"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "_children" explicit_type "QList<QSharedPointer<TreeItemInterface> >"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2114858 "get_controller"
+	force_body_gen const cpp_inline public return_type class_ref 714666 // ItemController
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}QSharedPointer<${type} > ${name}${(}${)}${const}${volatile};
+"
+	cpp_def "${description}${inline}QSharedPointer<${type} > ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    return controller;
+}
+"
+	cpp_name_spec "Get${Name}"
+	final 
+	java_name_spec "get${Name}"
+	php_final 
+	php_name_spec "get${Name}"
+	
+	python_name_spec "get${Name}"
+	
+	idl_name_spec "get_${name}"
+	get_of_relation classrelation_ref 773418 // controller (<directional aggregation>)
+      end
+
+      operation 2114986 "set_controller"
+	force_body_gen public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "value" type class_ref 714666 // ItemController
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}QSharedPointer<${t0} > ${p0}${)}${const}${volatile};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}QSharedPointer<${t0} > ${p0}${)}${const}${volatile}${staticnl}
+{
+    controller = ${p0};
+}
+"
+	cpp_name_spec "Set${Name}"
+	
+	java_name_spec "set${Name}"
+	
+	php_name_spec "set${Name}"
+	
+	python_name_spec "set${Name}"
+	
+	idl_name_spec "set_${name}"
+	set_of_relation classrelation_ref 773418 // controller (<directional aggregation>)
+      end
+
+      operation 2124970 "GetColumns"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "stringlist"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2125098 "IndexOf"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "int"
+	nparams 1
+	
+	  param inout name "item" type class_ref 714922 // TreeItemInterface
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} * ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2140074 "SetInternalData"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "_data" explicit_type "T"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} * ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2131626 "InternalPointer"
+	preserve_cpp_body_indent public explicit_return_type "void*"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2317098 "InternalPointer"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "void*"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2149674 "child"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "TreeItemInterface*"
+	nparams 1
+	
+	  param in name "row" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2149802 "parent"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "TreeItemInterface*"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2150058 "row"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2150314 "SetParent"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "_parent" explicit_type "QSharedPointer<TreeItemInterface >"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2150442 "GetIndexOfChild"
+	preserve_cpp_body_indent public explicit_return_type "int"
+	nparams 1
+	
+	  param inout name "child" type class_ref 714922 // TreeItemInterface
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} * ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2208426 "flags"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "Qt::ItemFlags"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2228650 "AddChildren"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "void"
+	nparams 2
+	
+	  param in name "children" explicit_type "QList<QSharedPointer<TreeItemInterface> >"
+	  param in name "insertAfter" explicit_type "int"
+	    defaultvalue "0"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2310570 "GetParent"
+	cpp_virtual public explicit_return_type "QSharedPointer<TreeItemInterface>"
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      attribute 1257514 "m_data"
+	private explicit_type "T*"
+	init_value "nullptr"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1258026 "m_children"
+	protected explicit_type "QList<QSharedPointer<TreeItemInterface > >"
+	stereotype "std::list"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1257898 "m_parent"
+	protected explicit_type "QWeakPointer<TreeItemInterface >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1258282 "m_isCheckable"
+	private explicit_type "bool"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1258154 "m_checkState"
+	private explicit_type "Qt::CheckState"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      classrelation 773418 // controller (<directional aggregation>)
+	relation 773034 o--> name "<directional aggregation>"
+	  a role_name "controller" private
+	    cpp default "    ${description}${static}${mutable}${volatile}${const}QSharedPointer<${type} > ${name}${value};
+"
+	    classrelation_ref 773418 // controller (<directional aggregation>)
+	  b parent class_ref 714666 // ItemController
+	get_oper operation_ref 2114858 // get_controller
+	set_oper operation_ref 2114986 // set_controller
+      end
+
+      classrelation 773802 // (<generalisation>)
+	relation 773418 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 773802 // (<generalisation>)
+	  b parent class_ref 714922 // TreeItemInterface
+      end
+    end
+
+    class 714666 "ItemController"
+      visibility package 
+      nformals 1
+      formal name "T" type "class" explicit_default_value ""
+        explicit_extends ""
+      cpp_decl "${description}${template}class @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      ncouples 1
+      key "export" value " "
+      operation 2112042 "get_columns"
+	force_body_gen const cpp_inline public explicit_return_type "stringlist"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    return columns;
+}
+"
+	cpp_name_spec "Get${Name}"
+	final 
+	java_name_spec "get${Name}"
+	php_final 
+	php_name_spec "get${Name}"
+	
+	python_name_spec "get${Name}"
+	
+	idl_name_spec "get_${name}"
+	get_of_attribute attribute_ref 1257386 // columns
+      end
+
+      operation 2112170 "set_columns"
+	force_body_gen public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "value" explicit_type "stringlist"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${)}${const}${volatile};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    columns = ${p0};
+}
+"
+	cpp_name_spec "Set${Name}"
+	
+	java_name_spec "set${Name}"
+	
+	php_name_spec "set${Name}"
+	
+	python_name_spec "set${Name}"
+	
+	idl_name_spec "set_${name}"
+	set_of_attribute attribute_ref 1257386 // columns
+      end
+
+      operation 2112298 "GetValue"
+	preserve_cpp_body_indent public explicit_return_type "QVariant"
+	nparams 3
+	
+	  param in name "item" explicit_type "T"
+	  param in name "index" explicit_type "modelIndex"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} * ${p0}, const ${t1} & ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2112426 "SetValue"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 4
+	
+	  param inout name "item" explicit_type "T"
+	  param in name "index" explicit_type "modelIndex"
+	  param in name "value" explicit_type "QVariant"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}, const ${t1} & ${p1}${v1}, const ${t2} & ${p2}${v2}, ${t3} ${p3}${v3}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} * ${p0}, const ${t1} & ${p1}, const ${t2} & ${p2}, ${t3} ${p3}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2168746 "AddGetter"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 2
+	
+	  param in name "index" explicit_type "QPair<int,int>"
+	  param inout name "function" explicit_type "std::function<QVariant(const T*, QModelIndex)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2297258 "AddGetter"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 3
+	
+	  param in name "row" explicit_type "int"
+	  param in name "roles" explicit_type "QVector<int>"
+	  param inout name "function" explicit_type "std::function<QVariant(const T*, QModelIndex)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, const ${t1} & ${p1}, ${t2} ${p2}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2168874 "AddSetter"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 2
+	
+	  param in name "index" explicit_type "QPair<int,int>"
+	  param inout name "function" explicit_type "std::function<bool(T*, QVariant, QModelIndex)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2297130 "AddSetter"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 3
+	
+	  param in name "row" explicit_type "int"
+	  param in name "roles" explicit_type "QVector<int>"
+	  param inout name "function" explicit_type "std::function<bool(T*, QVariant, QModelIndex)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, const ${t1} & ${p1}, ${t2} ${p2}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2303914 "AddPostProcessor"
+	public explicit_return_type "void"
+	nparams 3
+	
+	  param in name "column" explicit_type "int"
+	  param in name "role" explicit_type "int"
+	  param inout name "_postProcessor" explicit_type "std::function<void(T*, const QModelIndex&)>"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}, ${t2} & ${p2}${v2}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}, ${t2} & ${p2}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2303786 "AddPostProcessors"
+	public explicit_return_type "void"
+	nparams 3
+	
+	  param in name "column" explicit_type "int"
+	  param in name "roles" explicit_type "QVector<int>"
+	  param inout name "_postProcessor" explicit_type "std::function<void(T*,const QModelIndex&)>"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} & ${p2}${v2}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}, const ${t1} & ${p1}, ${t2} & ${p2}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2207658 "flags"
+	preserve_cpp_body_indent const public explicit_return_type "Qt::ItemFlags"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2207786 "get_flagsFunctors"
+	force_body_gen cpp_inline public explicit_return_type "QVector<std::function<Qt::ItemFlags(const QModelIndex&)> >"
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    return flagsFunctors;
+}
+"
+	cpp_name_spec "Get${Name}"
+	final java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  return flagsFunctors;
+}
+"
+	java_name_spec "get${Name}"
+	php_final 
+	php_name_spec "get${Name}"
+	
+	python_name_spec "get${Name}"
+	
+	idl_name_spec "get_${name}"
+	get_of_attribute attribute_ref 1294122 // flagsFunctors
+      end
+
+      operation 2207914 "set_flagsFunctors"
+	force_body_gen public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "value" explicit_type "QVector<std::function<Qt::ItemFlags(const QModelIndex&)> >"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${)}${const}${volatile}${throw};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    flagsFunctors = ${p0};
+}
+"
+	cpp_name_spec "Set${Name}"
+	java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  flagsFunctors = ${p0};
+}
+"
+	java_name_spec "set${Name}"
+	
+	php_name_spec "set${Name}"
+	
+	python_name_spec "set${Name}"
+	
+	idl_name_spec "set_${name}"
+	set_of_attribute attribute_ref 1294122 // flagsFunctors
+      end
+
+      operation 2208298 "AddFlagsFunctor"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "functor" explicit_type "std::function<Qt::ItemFlags(const QModelIndex&)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2208170 "SetDefaultTreeFunctor"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      attribute 1257386 "columns"
+	private explicit_type "stringlist"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+	get_oper operation_ref 2112042 // get_columns
+	set_oper operation_ref 2112170 // set_columns
+      end
+
+      attribute 1257642 "getters"
+	private explicit_type "QHash<QPair<int, int>, std::function<QVariant(const T*, QModelIndex)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1257770 "setters"
+	private explicit_type "QHash<QPair<int,int>, std::function<bool(T*, QVariant, QModelIndex)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1294122 "flagsFunctors"
+	private explicit_type "QVector<std::function<Qt::ItemFlags(const QModelIndex&)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+	get_oper operation_ref 2207786 // get_flagsFunctors
+	set_oper operation_ref 2207914 // set_flagsFunctors
+      end
+
+      attribute 1326890 "postProcessors"
+	private explicit_type "QHash<QPair<int, int> , std::function<void(T*, const QModelIndex&)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+    end
+
+    class 714922 "TreeItemInterface"
+      abstract visibility package 
+      cpp_decl "${description}${template}class @{export} @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      operation 2151338 "TreeItemInterface"
+	public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${description}${inline}explicit ${name}${(}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${)}${volatile} 
+{
+    ${body}}
+"
+	java_def "  ${comment}${@}${visibility}${final}${synchronized}${name}${(}${)}${throws} {
+  ${body}}
+"
+	
+	
+	
+      end
+
+      operation 2151466 "~TreeItemInterface"
+	cpp_virtual public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${description}${inline}${virtual}${name}${(}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${)}${volatile} 
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2228778 "GetChildren"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "QList<QSharedPointer<TreeItemInterface> >"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2115114 "childCount"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2115242 "columnCount"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2115370 "data"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "variant"
+	nparams 2
+	
+	  param in name "index" explicit_type "modelIndex"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2115498 "isCheckable"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "bool"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2115626 "setCheckState"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "state" explicit_type "Qt::CheckState"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2115754 "checkState"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "Qt::CheckState"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2116010 "setData"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "bool"
+	nparams 3
+	
+	  param in name "index" explicit_type "modelIndex"
+	  param in name "value" explicit_type "variant"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2116138 "removeChildren"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "bool"
+	nparams 2
+	
+	  param in name "position" explicit_type "int"
+	  param in name "count" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2116266 "insertChildren"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "bool"
+	nparams 2
+	
+	  param in name "position" explicit_type "int"
+	  param in name "count" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2118442 "GetColumns"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "stringlist"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2131754 "InternalPointer"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "void*"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2290602 "InternalPointer"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "void*"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2149418 "child"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "TreeItemInterface*"
+	nparams 1
+	
+	  param in name "row" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2149546 "parent"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "TreeItemInterface*"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2149930 "row"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2150186 "SetParent"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "_parent" explicit_type "QSharedPointer<TreeItemInterface >"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2208042 "flags"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "Qt::ItemFlags"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2228522 "AddChildren"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "void"
+	nparams 2
+	
+	  param in name "children" explicit_type "QList<QSharedPointer<TreeItemInterface> >"
+	  param in name "insertAfter" explicit_type "int"
+	    defaultvalue "0"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2235434 "IndexOf"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "int"
+	nparams 1
+	
+	  param inout name "item" type class_ref 714922 // TreeItemInterface
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2235562 "GetIndexOfChild"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "int"
+	nparams 1
+	
+	  param inout name "child" type class_ref 714922 // TreeItemInterface
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} * ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2310442 "GetParent"
+	abstract cpp_virtual public explicit_return_type "QSharedPointer<TreeItemInterface>"
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+    end
+
+    class 735018 "AdaptingTableModel"
+      visibility package 
+      cpp_decl "${description}${template}class @{export} @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      ncouples 1
+      key "parent" value ": public QAbstractTableModel"
+      extra_member 195626 "object"
+	
+	cpp "
+Q_OBJECT
+" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 2158250 "AdaptingTableModel"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 1
+	
+	  param inout name "parent" explicit_type "QObject"
+	    defaultvalue "0"
+	cpp_decl "    ${description}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${t0} * ${p0}${)} @{cInit}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${synchronized}${name}${(}${)}${throws} {
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+	ncouples 1
+	key "cInit" value ": QAbstractTableModel(parent),
+d_ptr(new AdaptingTableModelPrivate())"
+      end
+
+      operation 2158378 "~AdaptingTableModel"
+	cpp_virtual public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${description}${inline}${virtual}${name}${(}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${)}${volatile} 
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2158506 "data"
+	preserve_cpp_body_indent const public explicit_return_type "QVariant"
+	nparams 2
+	
+	  param in name "index" explicit_type "modelIndex"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2168618 "setData"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 3
+	
+	  param in name "index" explicit_type "modelIndex"
+	  param in name "value" explicit_type "variant"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}, const ${t1} & ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2158634 "rowCount"
+	preserve_cpp_body_indent const public explicit_return_type "int"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2158762 "columnCount"
+	preserve_cpp_body_indent const public explicit_return_type "int"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2198314 "SetInterface"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "_interface" explicit_type "QSharedPointer<TableDataInterface>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2178218 "index"
+	preserve_cpp_body_indent const public explicit_return_type "QModelIndex"
+	nparams 3
+	
+	  param in name "row" explicit_type "int"
+	  param in name "column" explicit_type "int"
+	  param in name "parent" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}, const ${t2} & ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}, const ${t2} & ${p2}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2191530 "flags"
+	preserve_cpp_body_indent const public explicit_return_type "Qt::ItemFlags"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2191658 "headerData"
+	preserve_cpp_body_indent const public explicit_return_type "QVariant"
+	nparams 3
+	
+	  param in name "section" explicit_type "int"
+	  param inout name "orientation" explicit_type "Qt::Orientation"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2262954 "RowForValue"
+	public explicit_return_type "int"
+	nparams 1
+	
+	  param in name "value" explicit_type "void*"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2269482 "sort"
+	public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2283818 "RemoveRow"
+	public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      extra_member 188842 "slots"
+	
+	cpp "
+public slots:
+" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 2191402 "OnReloadDataFromInterface"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      classrelation 814762 // (<directional aggregation>)
+	relation 814378 o--> name "<directional aggregation>"
+	  a role_name "" private
+	    cpp default "
+"
+	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	    classrelation_ref 814762 // (<directional aggregation>)
+	  b parent class_ref 761642 // AdaptingTableModelPrivate
+      end
+
+      extra_member 202282 "declare_private"
+	
+	cpp "Q_DECLARE_PRIVATE(AdaptingTableModel)" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      attribute 1300778 "d_ptr"
+	protected explicit_type "AdaptingTableModelPrivate* const"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+    end
+
+    class 741802 "TreeModel"
+      visibility package 
+      cpp_decl "${description}${template}class @{export} @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 800810 // rootItem (<directional aggregation>)
+	relation 800426 o--> name "<directional aggregation>"
+	  stereotype "list"
+	  a role_name "rootItem" multiplicity "*" private
+	    cpp default "     ${description}${static}${mutable}${volatile}${const}${stereotype}<${type} *> ${name}${value};
+"
+	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};
+"
+	    classrelation_ref 800810 // rootItem (<directional aggregation>)
+	  b parent class_ref 714922 // TreeItemInterface
+      end
+    end
+
+    class 748330 "TableDataInterface"
+      abstract visibility package 
+      cpp_decl "${description}${template}class @{export} @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      ncouples 1
+      key "parent" value ": public QObject"
+      extra_member 188970 "object"
+	
+	cpp "
+Q_OBJECT
+" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 2184746 "TableDataInterface"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 1
+	
+	  param inout name "parent" explicit_type "QObject"
+	    defaultvalue "0"
+	cpp_decl "    ${description}${inline}${name}${(}${t0} * ${p0}${v0}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${t0} * ${p0}${)} @{cInit}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${synchronized}${name}${(}${)}${throws} {
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+	ncouples 1
+	key "cInit" value ": QObject(parent)"
+      end
+
+      operation 2184874 "~TableDataInterface"
+	cpp_virtual public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${description}${inline}${virtual}${name}${(}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${)}${volatile} 
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2175914 "GetValue"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "QVariant"
+	nparams 3
+	
+	  param in name "row" explicit_type "int"
+	  param in name "column" explicit_type "int"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2176042 "SetValue"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "void"
+	nparams 4
+	
+	  param in name "row" explicit_type "int"
+	  param in name "column" explicit_type "int"
+	  param in name "role" explicit_type "int"
+	  param in name "value" explicit_type "QVariant"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}, ${t2} ${p2}${v2}, const ${t3} & ${p3}${v3}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2176170 "GetColumns"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "stringlist"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2176810 "rowCount"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2177066 "columnCount"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2242218 "PreviousRowCount"
+	abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2248874 "InternalPointer"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "void*"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2255658 "InternalPointer"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "void*"
+	nparams 1
+	
+	  param in name "row" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2262186 "Equal"
+	abstract cpp_virtual public explicit_return_type "bool"
+	nparams 2
+	
+	  param in name "row" explicit_type "int"
+	  param in name "data" explicit_type "void*"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2269994 "SetSortFunction"
+	abstract cpp_virtual public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "func" explicit_type "std::function<bool(void*, void*)>"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2269738 "sort"
+	abstract cpp_virtual public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2277290 "flags"
+	abstract preserve_cpp_body_indent const cpp_virtual public explicit_return_type "Qt::ItemFlags"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2283946 "RemoveRow"
+	abstract cpp_virtual public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "index" explicit_type "int"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      extra_member 189098 "signals"
+	
+	cpp "
+signals:
+" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 2191786 "reloadData"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+    end
+
+    class 748458 "TableDataListHolder"
+      abstract visibility package 
+      nformals 1
+      formal name "T" type "class" explicit_default_value ""
+        explicit_extends ""
+      cpp_decl "${description}${template}class @{export} @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      ncouples 1
+      key "export" value ""
+      classrelation 807850 // (<generalisation>)
+	relation 807466 ---|> name "<generalisation>"
+	  a public
+	    cpp default "${type}"
+	    java "${type}"
+	    classrelation_ref 807850 // (<generalisation>)
+	  b parent class_ref 748330 // TableDataInterface
+      end
+
+      operation 2176298 "GetValue"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "QVariant"
+	nparams 3
+	
+	  param in name "row" explicit_type "int"
+	  param in name "column" explicit_type "int"
+	  param in name "role" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}, ${t2} ${p2}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2176426 "SetValue"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "void"
+	nparams 4
+	
+	  param in name "row" explicit_type "int"
+	  param in name "column" explicit_type "int"
+	  param in name "role" explicit_type "int"
+	  param in name "value" explicit_type "QVariant"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}, ${t2} ${p2}${v2}, const ${t3} & ${p3}${v3}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}, ${t2} ${p2}, const ${t3} & ${p3}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2176554 "GetColumns"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "stringlist"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2178090 "SetColumns"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "_columns" explicit_type "stringlist"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2176682 "SetData"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "data" explicit_type "QList<T*>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2198570 "GetData"
+	preserve_cpp_body_indent const public explicit_return_type "QList<T>"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2221994 "GetData"
+	preserve_cpp_body_indent public explicit_return_type "QList<T>&"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2277034 "get_flagsFunctors"
+	class_operation force_body_gen cpp_inline public explicit_return_type "QVector<std::function<Qt::ItemFlags(const QModelIndex&)> >"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    return flagsFunctors;
+}
+"
+	cpp_name_spec "Get${Name}"
+	final java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  return flagsFunctors;
+}
+"
+	java_name_spec "get${Name}"
+	php_final 
+	php_name_spec "get${Name}"
+	
+	python_name_spec "get${Name}"
+	
+	idl_name_spec "get_${name}"
+	get_of_attribute attribute_ref 1294122 // flagsFunctors
+      end
+
+      operation 2177194 "columnCount"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2176938 "rowCount"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2177578 "AddGetter"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 2
+	
+	  param in name "index" explicit_type "QPair<int,int>"
+	  param inout name "function" explicit_type "std::function<QVariant(const T*)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2177706 "AddSetter"
+	preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 2
+	
+	  param in name "index" explicit_type "QPair<int,int>"
+	  param inout name "function" explicit_type "std::function<void(T*, QVariant)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2242346 "PreviousRowCount"
+	preserve_cpp_body_indent cpp_virtual public explicit_return_type "int"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2249002 "InternalPointer"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "void*"
+	nparams 0
+	
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2255530 "InternalPointer"
+	preserve_cpp_body_indent const cpp_virtual public explicit_return_type "void*"
+	nparams 1
+	
+	  param in name "row" explicit_type "int"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent 
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2262314 "Equal"
+	cpp_virtual public explicit_return_type "bool"
+	nparams 2
+	
+	  param in name "row" explicit_type "int"
+	  param in name "data" explicit_type "void*"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2276906 "flags"
+	preserve_cpp_body_indent const public explicit_return_type "Qt::ItemFlags"
+	nparams 1
+	
+	  param in name "index" explicit_type "modelIndex"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} & ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2270250 "sort"
+	cpp_virtual public explicit_return_type "void"
+	nparams 0
+	
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2276778 "AddFlagsFunctor"
+	class_operation preserve_cpp_body_indent public explicit_return_type "void"
+	nparams 1
+	
+	  param inout name "functor" explicit_type "std::function<Qt::ItemFlags(const QModelIndex&)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2277162 "set_flagsFunctors"
+	class_operation force_body_gen public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "value" explicit_type "QVector<std::function<Qt::ItemFlags(const QModelIndex&)> >"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${)}${const}${volatile};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    flagsFunctors = ${p0};
+}
+"
+	cpp_name_spec "Set${Name}"
+	java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${t0} ${p0}${)}${throws}${staticnl}{
+  flagsFunctors = ${p0};
+}
+"
+	java_name_spec "set${Name}"
+	
+	php_name_spec "set${Name}"
+	
+	python_name_spec "set${Name}"
+	
+	idl_name_spec "set_${name}"
+	set_of_attribute attribute_ref 1294122 // flagsFunctors
+      end
+
+      operation 2270122 "SetSortFunction"
+	cpp_virtual public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "func" explicit_type "std::function<bool(void*, void*)>"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      operation 2284074 "RemoveRow"
+	cpp_virtual public explicit_return_type "void"
+	nparams 1
+	
+	  param in name "index" explicit_type "int"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${t0} ${p0}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      attribute 1286314 "m_data"
+	private explicit_type "QList<T*>"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1286570 "setters"
+	private explicit_type "QHash<QPair<int,int>, std::function<void(T*, QVariant)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1286442 "getters"
+	private explicit_type "QHash<QPair<int, int>, std::function<QVariant(const T*)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      classrelation 808106 // controller (<directional aggregation>)
+	relation 807722 o--> name "<directional aggregation>"
+	  a role_name "controller" private
+	    cpp default "    ${description}${static}${mutable}${volatile}${const}QSharedPointer<${type} > ${name}${value};
+"
+	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	    classrelation_ref 808106 // controller (<directional aggregation>)
+	  b parent class_ref 714666 // ItemController
+      end
+
+      attribute 1286698 "m_columns"
+	private explicit_type "stringlist"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1307306 "previousRowCount"
+	private explicit_type "int"
+	init_value "0"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1313834 "sortFunction"
+	private explicit_type "std::function<bool(void*, void*)>"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1320362 "flagsFunctors"
+	class_attribute private explicit_type "QVector<std::function<Qt::ItemFlags(const QModelIndex&)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+	get_oper operation_ref 2277034 // get_flagsFunctors
+	set_oper operation_ref 2277162 // set_flagsFunctors
+      end
+    end
+
+    class 755114 "StructToDBEditor"
+      visibility package 
+      nformals 1
+      formal name "T" type "class" explicit_default_value ""
+        explicit_extends ""
+      cpp_decl "${description}${template}class @{export} @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      ncouples 1
+      key "export" value ""
+      operation 2206250 "Insert"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 3
+	
+	  param in name "tableName" explicit_type "string"
+	  param inout name "data" explicit_type "T"
+	  param in name "db" explicit_type "QSqlDatabase"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} * ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} * ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2235690 "UpdateIndexAsLastInTable"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 4
+	
+	  param in name "tableName" explicit_type "string"
+	  param inout name "data" explicit_type "T"
+	  param in name "db" explicit_type "QSqlDatabase"
+	  param in name "indexSetter" explicit_type "std::function<void(T*,int)>"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} * ${p1}${v1}, ${t2} ${p2}${v2}, ${t3} ${p3}${v3}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} * ${p1}, ${t2} ${p2}, ${t3} ${p3}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2206762 "Update"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 3
+	
+	  param in name "tableName" explicit_type "string"
+	  param inout name "data" explicit_type "T"
+	  param in name "db" explicit_type "QSqlDatabase"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} * ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} * ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2207146 "Delete"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 3
+	
+	  param in name "tableName" explicit_type "string"
+	  param inout name "data" explicit_type "T"
+	  param in name "db" explicit_type "QSqlDatabase"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} * ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} * ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2207018 "InsertOrUpdate"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 3
+	
+	  param in name "tableName" explicit_type "string"
+	  param inout name "data" explicit_type "T"
+	  param in name "db" explicit_type "QSqlDatabase"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} * ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} * ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2206890 "TestExistence"
+	preserve_cpp_body_indent public explicit_return_type "bool"
+	nparams 3
+	
+	  param in name "tableName" explicit_type "string"
+	  param inout name "data" explicit_type "T"
+	  param in name "db" explicit_type "QSqlDatabase"
+	cpp_decl "    ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} * ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract};
+"
+	cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} ${p0}, ${t1} * ${p1}, ${t2} ${p2}${)}${const}${staticnl}
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      attribute 1293738 "nameToPermission"
+	public explicit_type "QHash<QString, std::function<bool(T*)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1293610 "nameToValue"
+	public explicit_type "QHash<QString, std::function<QVariant(T*)> >"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      attribute 1293866 "keys"
+	public explicit_type "stringlist"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+    end
+
+    class 761642 "AdaptingTableModelPrivate"
+      visibility package 
+      cpp_decl "${description}${template}class @{export} @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      ncouples 1
+      key "export" value " "
+      extra_member 202154 "public_member"
+	
+	cpp "Q_DECLARE_PUBLIC(AdaptingTableModel)" ""
+	java ""
+	php ""
+	python ""
+	idl ""
+      end
+
+      operation 2215210 "AdaptingTableModelPrivate"
+	preserve_cpp_body_indent public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${description}${inline}explicit ${name}${(}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${)}${volatile} 
+{
+    ${body}}
+"
+	preserve_java_body_indent java_def "  ${comment}${@}${visibility}${final}${synchronized}${name}${(}${)}${throws} {
+  ${body}}
+"
+	preserve_php_body_indent 
+	preserve_python_body_indent 
+	
+      end
+
+      operation 2215338 "~AdaptingTableModelPrivate"
+	cpp_virtual public explicit_return_type ""
+	nparams 0
+	
+	cpp_decl "    ${description}${inline}${virtual}${name}${(}${)}${volatile};
+"
+	cpp_def "${description}${inline}@{externalClass}${class}::${name}${(}${)}${volatile} 
+{
+    ${body}}
+"
+	
+	
+	
+	
+      end
+
+      attribute 1300650 "q_ptr"
+	private explicit_type "AdaptingTableModel *"
+	cpp_decl "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};"
+	java_decl ""
+	php_decl ""
+	python_decl ""
+	idl_decl ""
+      end
+
+      classrelation 814634 // interface (<directional aggregation>)
+	relation 814250 o--> name "<directional aggregation>"
+	  a role_name "interface" private
+	    cpp default "    ${description}${static}${mutable}${volatile}${const}QSharedPointer<${type}> ${name}${value};
+"
+	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	    classrelation_ref 814634 // interface (<directional aggregation>)
+	  b parent class_ref 748330 // TableDataInterface
+      end
+    end
+  end
+
+  deploymentview 227498 "deployment"
+    //deployment diagram settings
+    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  end
+
+  deploymentview 227626 "classes"
+    //deployment diagram settings
+    package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+    draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+    artifact 613162 "TreeItem"
+      stereotype "source"
+      cpp_h "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+
+${namespace_end}
+#endif
+"
+      associated_classes
+	class_ref 714794 // TreeItem
+      end
+      ncouples 1
+      key "header" value "#include <QAbstractItemView>"
+    end
+
+    artifact 613034 "ItemController"
+      stereotype "source"
+      cpp_h "@{copyright}
+#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      associated_classes
+	class_ref 714666 // ItemController
+      end
+      ncouples 1
+      key "header" value "#include <functional>"
+    end
+
+    artifact 613290 "TreeItemInterface"
+      stereotype "source"
+      cpp_h "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+@{h_later}
+${namespace_end}
+#endif
+"
+      cpp_src "${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 714922 // TreeItemInterface
+      end
+      ncouples 2
+      key "header" value "#include <QWeakPointer>
+#include <QList>
+#include <functional>
+
+"
+      key "h_later" value "
+"
+    end
+
+    artifact 619946 "AddressTemplateData"
+      stereotype "source"
+      cpp_h "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+      end
+    end
+
+    artifact 620074 "InterfaceAwareTreeData"
+      stereotype "source"
+      cpp_h "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+      end
+    end
+
+    artifact 626602 "AddressTemplateTreeData"
+      stereotype "source"
+      cpp_h "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+      end
+    end
+
+    artifact 633386 "AdaptingTableModel"
+      stereotype "source"
+      cpp_h "@{copyright}
+#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "@{copyright}
+${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 735018 // AdaptingTableModel
+      end
+      ncouples 1
+      key "header" value "#include <QAbstractTableModel>
+"
+    end
+
+    artifact 639914 "TableDataInterface"
+      stereotype "source"
+      cpp_h "@{copyright}
+#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 748330 // TableDataInterface
+      end
+    end
+
+    artifact 640042 "TableDataListHolder"
+      stereotype "source"
+      cpp_h "@{copyright}
+#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      associated_classes
+	class_ref 748458 // TableDataListHolder
+      end
+    end
+
+    artifact 646570 "StructToDBEditor"
+      stereotype "source"
+      cpp_h "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 755114 // StructToDBEditor
+      end
+      ncouples 1
+      key "header" value "#include <functional>
+#include <QxtLogger>
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QSqlField>
+#include <QSqlRecord>
+#include <QSqlQuery>"
+    end
+
+    artifact 653098 "AdaptingTableModelPrivate"
+      stereotype "source"
+      cpp_h "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+      cpp_src "${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+      associated_classes
+	class_ref 761642 // AdaptingTableModelPrivate
+      end
+      ncouples 2
+      key "header" value "#include \"AdaptingTableModel.h\""
+      key "src" value "#include \"TableDataInterface.h\""
+    end
+  end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/202282.diagram b/src/Libs/L_UniversalModels/UML/models/202282.diagram
new file mode 100644
index 000000000..08f3ce1d6
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/202282.diagram
@@ -0,0 +1,34 @@
+format 76
+
+classcanvas 128042 class_ref 242346 // AniGraphicsAreaRegionalCenterSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 152 223 2000
+end
+classcanvas 128170 class_ref 242090 // AniGraphicsAreaRestrictedEntrySettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 723 222 2000
+end
+classcanvas 128298 class_ref 234922 // AniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 465 133 2006
+end
+classcanvas 128682 class_ref 303658 // AbstractAniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 447 674 2012
+end
+relationcanvas 128426 relation_ref 201642 // <generalisation>
+  from ref 128170 z 2007 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 201898 // <generalisation>
+  from ref 128042 z 2007 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 290602 // <generalisation>
+  from ref 128298 z 2013 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/208810.diagram b/src/Libs/L_UniversalModels/UML/models/208810.diagram
new file mode 100644
index 000000000..ace4d3080
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/208810.diagram
@@ -0,0 +1,105 @@
+format 76
+
+classcanvas 128042 class_ref 310186 // AniAreaObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 345 418 2000
+end
+classcanvas 128170 class_ref 296234 // AniAreaRestrictedEntry
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 48 162 2000
+end
+classcanvas 128298 class_ref 310314 // AniAreaFIR
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 757 519 2000
+end
+classcanvas 128682 class_ref 296362 // EAreaDrawingType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 139 864 3005
+end
+classcanvas 129322 class_ref 296490 // ERestrictionType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 65 553 3005
+end
+classcanvas 129834 class_ref 316970 // AniObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 375 89 2000
+end
+classcanvas 130090 class_ref 317226 // AniAreaZonalCenter
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 815 288 2000
+end
+classcanvas 130858 class_ref 324138 // AniAirport
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 686 737 2006
+end
+classcanvas 131882 class_ref 172714 // AniPoint
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1032 44 2012
+end
+relationcanvas 128426 relation_ref 297642 // <generalisation>
+  from ref 128170 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 297770 // <generalisation>
+  from ref 128298 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129066 relation_ref 297130 // <directional composition>
+  from ref 128042 z 3006 to ref 128682
+  role_a_pos 256 837 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 276522 // <directional composition>
+  from ref 128170 z 3006 to ref 129322
+  role_a_pos 129 535 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129962 relation_ref 304426 // <generalisation>
+  decenter_begin 509
+  from ref 128042 z 2001 to ref 129834
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 304554 // <generalisation>
+  from ref 130090 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130474 relation_ref 360234 // <generalisation>
+  from ref 128298 z 2001 to ref 129834
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 360362 // <generalisation>
+  from ref 130090 z 2001 to ref 129834
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130730 relation_ref 360490 // <generalisation>
+  from ref 128170 z 2001 to ref 129834
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130986 relation_ref 332714 // <generalisation>
+  from ref 130858 z 2007 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131114 relation_ref 359466 // <generalisation>
+  from ref 130858 z 2007 to ref 129834
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132010 relation_ref 409002 // <directional composition>
+  from ref 129834 z 2013 to ref 131882
+  role_a_pos 996 151 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132138 relation_ref 409258 // <directional composition>
+  from ref 129834 z 2013 to ref 131882
+  role_a_pos 981 151 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/215338.diagram b/src/Libs/L_UniversalModels/UML/models/215338.diagram
new file mode 100644
index 000000000..5b3381b4d
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/215338.diagram
@@ -0,0 +1,20 @@
+format 76
+
+classcanvas 128042 class_ref 310314 // AniAreaFIR
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 14 293 2000
+end
+classcanvas 128298 class_ref 242346 // AniGraphicsAreaRegionalCenterSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 445 436 2000
+end
+classcanvas 128554 class_ref 310186 // AniAreaObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 216 231 3005
+end
+relationcanvas 128682 relation_ref 297770 // <generalisation>
+  from ref 128042 z 3006 to ref 128554
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/215466.diagram b/src/Libs/L_UniversalModels/UML/models/215466.diagram
new file mode 100644
index 000000000..441ad422a
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/215466.diagram
@@ -0,0 +1,48 @@
+format 76
+
+classcanvas 128042 class_ref 317354 // AniGraphicsItemAreaZonalCenter
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 517 564 2000
+end
+classcanvas 128170 class_ref 310186 // AniAreaObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 150 448 2005
+end
+classcanvas 128298 class_ref 317226 // AniAreaZonalCenter
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 343 250 2011
+end
+classcanvas 128554 class_ref 192810 // AniGraphicsItemArea
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 337 508 2011
+end
+classcanvas 128938 class_ref 317482 // AniGraphicsAreaZonalCenterSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 506 829 2000
+end
+relationcanvas 128426 relation_ref 304554 // <generalisation>
+  from ref 128298 z 2012 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 304682 // <generalisation>
+  from ref 128042 z 2012 to ref 128554
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 305450 // <directional aggregation>
+  from ref 128042 z 2001 to ref 128938
+  role_a_pos 626 811 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129322 relation_ref 360106 // <directional composition>
+  from ref 128554 z 2012 to ref 128170
+  role_a_pos 294 706 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129450 relation_ref 359722 // <directional composition>
+  from ref 128042 z 2012 to ref 128298
+  role_a_pos 481 446 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/221994.diagram b/src/Libs/L_UniversalModels/UML/models/221994.diagram
new file mode 100644
index 000000000..1124fdc2c
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/221994.diagram
@@ -0,0 +1,121 @@
+format 76
+
+classcanvas 128042 class_ref 316970 // AniObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 189 23 2000
+end
+classcanvas 128170 class_ref 310186 // AniAreaObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 167 593 2006
+end
+classcanvas 128682 class_ref 172714 // AniPoint
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 600 66 2000
+end
+classcanvas 128938 class_ref 324138 // AniAirport
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 373 654 2012
+end
+classcanvas 129706 class_ref 390698 // AniRoute
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 610 1048 2000
+end
+classcanvas 130346 class_ref 390826 // AniLineSegment
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 580 503 2000
+end
+classcanvas 131498 class_ref 172842 // AniRouteSegmentInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 786 503 2000
+end
+classcanvas 132394 class_ref 404138 // AniScaleVector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 895 103 3005
+end
+classcanvas 133418 class_ref 485034 // AniObjectPaintingData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 12 249 2005
+end
+relationcanvas 128298 relation_ref 304426 // <generalisation>
+  from ref 128170 z 2007 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 332714 // <generalisation>
+  from ref 128938 z 2013 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129322 relation_ref 359466 // <generalisation>
+  from ref 128938 z 2013 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129450 relation_ref 409002 // <directional composition>
+  decenter_begin 312
+  from ref 128042 z 2001 to ref 128682
+  role_a_pos 564 169 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 409258 // <directional composition>
+  decenter_begin 425
+  decenter_end 731
+  from ref 128042 z 2001 to ref 128682
+  role_a_pos 549 219 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 415786 // <generalisation>
+  decenter_end 629
+  from ref 129706 z 2001 to point 547 992
+  line 132138 z 2001 to point 547 292
+  line 132266 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130474 relation_ref 416042 // <directional composition>
+  decenter_begin 187
+  decenter_end 187
+  from ref 130346 z 2001 to ref 128682
+  role_a_pos 627 306 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 416170 // <directional composition>
+  decenter_begin 587
+  decenter_end 888
+  from ref 130346 z 2001 to ref 128682
+  role_a_pos 690 306 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131370 relation_ref 416426 // <directional composition>
+  from ref 130346 z 2001 to ref 128682
+  role_a_pos 657 306 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132522 relation_ref 456362 // <directional composition>
+  from ref 128682 z 3006 to ref 132394
+  role_a_pos 864 206 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132650 relation_ref 456234 // <directional composition>
+  decenter_begin 231
+  decenter_end 127
+  from ref 128682 z 3006 to ref 132394
+  role_a_pos 864 119 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132906 relation_ref 497578 // <directional composition>
+  from ref 128170 z 3006 to ref 132394
+  role_a_pos 819 253 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133034 relation_ref 497706 // <directional composition>
+  from ref 128170 z 3006 to ref 132394
+  role_a_pos 856 253 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 133162 relation_ref 497834 // <directional composition>
+  from ref 128170 z 3006 to ref 132394
+  role_a_pos 829 253 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/222122.diagram b/src/Libs/L_UniversalModels/UML/models/222122.diagram
new file mode 100644
index 000000000..db08be5f1
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/222122.diagram
@@ -0,0 +1,49 @@
+format 76
+
+classcanvas 128042 class_ref 316970 // AniObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 562 329 2000
+end
+classcanvas 128426 class_ref 324138 // AniAirport
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 202 552 2000
+end
+classcanvas 128938 class_ref 241706 // AniGraphicsAirportSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 489 746 2000
+end
+classcanvas 129322 class_ref 331434 // AniAirportType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 178 72 2005
+end
+classcanvas 129578 class_ref 310186 // AniAreaObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 753 190 3005
+end
+classcanvas 130218 class_ref 344618 // AniGraphicsItemBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 745 785 2000
+end
+relationcanvas 129450 relation_ref 326186 // <directional composition>
+  from ref 128426 z 2006 to ref 129322
+  role_a_pos 259 508 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129706 relation_ref 304426 // <generalisation>
+  from ref 129578 z 3006 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 332714 // <generalisation>
+  decenter_end 361
+  from ref 128426 z 3006 to point 378 386
+  line 129962 z 3006 to ref 129578
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 359466 // <generalisation>
+  from ref 128426 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/228650.diagram b/src/Libs/L_UniversalModels/UML/models/228650.diagram
new file mode 100644
index 000000000..23cecf01a
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/228650.diagram
@@ -0,0 +1,50 @@
+format 76
+
+classcanvas 128042 class_ref 282922 // AniGraphicsSimpleItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 117 440 2000
+end
+classcanvas 128170 class_ref 249642 // AbstractTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 898 71 2005
+end
+classcanvas 128298 class_ref 249770 // BasicObjectTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 671 24 2011
+end
+classcanvas 128682 class_ref 219434 // AniGraphicsColoredObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 87 137 2006
+end
+classcanvas 128938 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 388 100 2017
+end
+relationcanvas 128426 relation_ref 209706 // <generalisation>
+  decenter_begin 354
+  decenter_end 298
+  from ref 128298 z 2012 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 223786 // <directional aggregation>
+  from ref 128298 z 2012 to ref 128170
+  role_a_pos 837 208 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 262698 // <generalisation>
+  from ref 128042 z 2007 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129066 relation_ref 209834 // <generalisation>
+  from ref 128938 z 2018 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 174634 // <generalisation>
+  from ref 128682 z 2018 to ref 128938
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/228778.diagram b/src/Libs/L_UniversalModels/UML/models/228778.diagram
new file mode 100644
index 000000000..3dd347aa2
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/228778.diagram
@@ -0,0 +1,83 @@
+format 76
+
+classcanvas 128042 class_ref 219946 // AniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 246 562 2000
+end
+classcanvas 128170 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 18 623 2006
+end
+classcanvas 128426 class_ref 249642 // AbstractTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 1039 424 2000
+end
+classcanvas 128554 class_ref 249770 // BasicObjectTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 702 389 3005
+end
+classcanvas 129450 class_ref 212650 // AbstractAniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 444 314 2000
+end
+classcanvas 129578 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 467 564 3011
+end
+classcanvas 130218 class_ref 276394 // AbstractEnabledQuery
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 1027 146 2006
+end
+classcanvas 130474 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 792 45 3011
+end
+relationcanvas 128298 relation_ref 174890 // <generalisation>
+  from ref 128042 z 2007 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128682 relation_ref 209706 // <generalisation>
+  decenter_begin 246
+  decenter_end 222
+  from ref 128554 z 3006 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 223786 // <directional aggregation>
+  from ref 128554 z 3006 to ref 128426
+  role_a_pos 978 557 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129706 relation_ref 167978 // <generalisation>
+  from ref 129578 z 3012 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 209834 // <generalisation>
+  from ref 129578 z 3012 to ref 128554
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129962 relation_ref 230314 // <generalisation>
+  from ref 128042 z 3012 to ref 129578
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 255786 // <generalisation>
+  from ref 128426 z 2007 to ref 130218
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130602 relation_ref 256042 // <generalisation>
+  from ref 130474 z 3012 to ref 130218
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/228906.diagram b/src/Libs/L_UniversalModels/UML/models/228906.diagram
new file mode 100644
index 000000000..8bbbfff0c
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/228906.diagram
@@ -0,0 +1,37 @@
+format 76
+
+classcanvas 128042 class_ref 276266 // NullInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 385 543 2000
+end
+classcanvas 128170 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 189 461 2006
+end
+classcanvas 128426 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 168 103 2012
+end
+classcanvas 128682 class_ref 276394 // AbstractEnabledQuery
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 469 200 2018
+end
+relationcanvas 128034 relation_ref 346026 // <generalisation>
+  from ref 128170 z 2013 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128298 relation_ref 255658 // <generalisation>
+  from ref 128042 z 2007 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 256042 // <generalisation>
+  from ref 128426 z 2019 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/229034.diagram b/src/Libs/L_UniversalModels/UML/models/229034.diagram
new file mode 100644
index 000000000..bfb9d2266
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/229034.diagram
@@ -0,0 +1,76 @@
+format 76
+
+classcanvas 128170 class_ref 249642 // AbstractTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 883 284 2000
+end
+classcanvas 128298 class_ref 276394 // AbstractEnabledQuery
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 877 118 2006
+end
+classcanvas 128554 class_ref 263210 // AbstractFormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 568 20 2012
+end
+classcanvas 128810 class_ref 249770 // BasicObjectTreeItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 606 348 2006
+end
+classcanvas 129194 class_ref 212650 // AbstractAniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color lightred
+  xyz 30 610 2005
+end
+classcanvas 129450 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  color blue
+  xyz 50 342 2012
+end
+classcanvas 129834 class_ref 269738 // FormInteractionInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 65 35 2018
+end
+relationcanvas 128426 relation_ref 255786 // <generalisation>
+  from ref 128170 z 2007 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128682 relation_ref 256042 // <generalisation>
+  from ref 128554 z 2013 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128938 relation_ref 209706 // <generalisation>
+  from ref 128810 z 2007 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129066 relation_ref 223786 // <directional aggregation>
+  from ref 128810 z 2007 to ref 128170
+  role_a_pos 822 441 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 167978 // <generalisation>
+  from ref 129450 z 2013 to ref 129194
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129706 relation_ref 209834 // <generalisation>
+  from ref 129450 z 2013 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 248874 // <generalisation>
+  from ref 129450 z 2019 to ref 129834
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 346026 // <generalisation>
+  from ref 129834 z 2019 to ref 128554
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/229162.diagram b/src/Libs/L_UniversalModels/UML/models/229162.diagram
new file mode 100644
index 000000000..0d64ccad2
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/229162.diagram
@@ -0,0 +1,54 @@
+format 76
+
+classcanvas 128042 class_ref 219690 // AniGraphicsLineObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 143 530 2000
+end
+classcanvas 128426 class_ref 219434 // AniGraphicsColoredObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 135 343 2006
+end
+classcanvas 128682 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 163 46 2012
+end
+fragment 128938 "Object"
+  refer classdiagram_ref 229034 // Object Settings
+  xyzwh 392 142 0 85 45
+end
+classcanvas 129450 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 518 512 2000
+end
+classcanvas 129578 class_ref 219946 // AniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 542 153 2018
+end
+relationcanvas 128554 relation_ref 175402 // <generalisation>
+  from ref 128042 z 2007 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 174634 // <generalisation>
+  from ref 128426 z 2013 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129706 relation_ref 174890 // <generalisation>
+  from ref 129578 z 2019 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 230314 // <generalisation>
+  from ref 129578 z 2019 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 436522 // <directional aggregation>
+  from ref 128042 z 2001 to ref 129450
+  role_a_pos 486 578 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+line 129322 -_-_
+  from ref 128682 z 2013 to ref 128938
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/229290.diagram b/src/Libs/L_UniversalModels/UML/models/229290.diagram
new file mode 100644
index 000000000..0513f45c1
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/229290.diagram
@@ -0,0 +1,76 @@
+format 76
+
+classcanvas 128042 class_ref 227754 // AniGraphicsPictureObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 286 430 2000
+end
+classcanvas 128170 class_ref 227498 // AniGraphicsPathObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 110 631 2006
+end
+classcanvas 128426 class_ref 220714 // AniGraphicsIconObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 450 648 2006
+end
+classcanvas 128682 class_ref 219434 // AniGraphicsColoredObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 290 228 2006
+end
+classcanvas 128938 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 609 191 2012
+end
+fragment 129194 "_Object"
+  refer classdiagram_ref 229034 // Object Settings
+  xyzwh 891 278 2000 85 45
+end
+classcanvas 129450 class_ref 220586 // AbstractAniGraphicsIconObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 431 820 2012
+end
+classcanvas 129706 class_ref 227370 // AbstractAniGraphicsPathObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 85 818 2012
+end
+classcanvas 129962 class_ref 212650 // AbstractAniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 789 490 2018
+end
+relationcanvas 128298 relation_ref 183210 // <generalisation>
+  from ref 128170 z 2007 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 183338 // <generalisation>
+  from ref 128426 z 2007 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 182954 // <generalisation>
+  from ref 128042 z 2007 to ref 128682
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129066 relation_ref 174634 // <generalisation>
+  from ref 128682 z 2013 to ref 128938
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 183466 // <generalisation>
+  from ref 128426 z 2013 to ref 129450
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 183594 // <generalisation>
+  from ref 128170 z 2013 to ref 129706
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130090 relation_ref 167978 // <generalisation>
+  from ref 128938 z 2019 to ref 129962
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+line 129322 -_-_
+  from ref 128938 z 2013 to ref 129194
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/229418.diagram b/src/Libs/L_UniversalModels/UML/models/229418.diagram
new file mode 100644
index 000000000..f712cf0dd
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/229418.diagram
@@ -0,0 +1,11 @@
+format 76
+
+classcanvas 128042 class_ref 337962 // CursorSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 115 328 2000
+end
+classcanvas 128554 class_ref 357930 // AniGraphicsSettingsHash
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 399 234 2000
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/235946.diagram b/src/Libs/L_UniversalModels/UML/models/235946.diagram
new file mode 100644
index 000000000..1a2bdc3fd
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/235946.diagram
@@ -0,0 +1,43 @@
+format 76
+
+classcanvas 128042 class_ref 344618 // AniGraphicsItemBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 616 106 2000
+end
+classcanvas 130090 class_ref 179626 // AniGraphicsItemRouteLabel
+  draw_all_relations default hide_attributes yes hide_operations yes hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 694 40 2000
+end
+classcanvas 130602 class_ref 358058 // EGraphicsItemType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 326 122 2011
+end
+classcanvas 130986 class_ref 357930 // AniGraphicsSettingsHash
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 45 75 2000
+end
+classcanvas 131370 class_ref 377642 // AniGraphicsItemDataSheet
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 601 317 2006
+end
+relationcanvas 130218 relation_ref 352810 // <generalisation>
+  from ref 130090 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130858 relation_ref 388650 // <directional composition>
+  from ref 128042 z 2012 to ref 130602
+  role_a_pos 458 207 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131242 relation_ref 388778 // <directional composition>
+  from ref 130986 z 2012 to ref 130602
+  role_a_pos 295 219 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131498 relation_ref 402218 // <generalisation>
+  from ref 131370 z 2007 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/242986.diagram b/src/Libs/L_UniversalModels/UML/models/242986.diagram
new file mode 100644
index 000000000..dcb373f7c
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/242986.diagram
@@ -0,0 +1,7 @@
+format 76
+
+classcanvas 128170 class_ref 310186 // AniAreaObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 134 150 2000
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/249642.diagram b/src/Libs/L_UniversalModels/UML/models/249642.diagram
new file mode 100644
index 000000000..ff5034d4f
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/249642.diagram
@@ -0,0 +1,34 @@
+format 76
+
+classcanvas 128042 class_ref 337962 // CursorSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 621 152 2000
+end
+classcanvas 128170 class_ref 357930 // AniGraphicsSettingsHash
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 291 266 3005
+end
+classcanvas 128426 class_ref 371114 // AniGraphicsCursorSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 587 342 3011
+end
+classcanvas 128682 class_ref 303658 // AbstractAniGraphicsAreaSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 570 595 2000
+end
+relationcanvas 128554 relation_ref 395306 // <generalisation>
+  from ref 128426 z 3012 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 395434 // <directional aggregation>
+  from ref 128426 z 3012 to ref 128682
+  role_a_pos 678 577 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128938 relation_ref 395562 // <directional aggregation>
+  from ref 128042 z 3012 to ref 128426
+  role_a_pos 678 324 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/269226.diagram b/src/Libs/L_UniversalModels/UML/models/269226.diagram
new file mode 100644
index 000000000..eeddecb58
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/269226.diagram
@@ -0,0 +1,43 @@
+format 76
+
+classcanvas 128042 class_ref 390698 // AniRoute
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 108 483 2000
+end
+classcanvas 128170 class_ref 397482 // AbstractLineInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 88 249 2000
+end
+classcanvas 128426 class_ref 397610 // ValidityCheck
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 326 366 2000
+end
+classcanvas 128682 class_ref 390826 // AniLineSegment
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 548 351 2006
+end
+classcanvas 129450 class_ref 219690 // AniGraphicsLineObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 886 490 2005
+end
+relationcanvas 128298 relation_ref 429610 // <generalisation>
+  from ref 128042 z 2001 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 429738 // <generalisation>
+  from ref 128042 z 2001 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128938 relation_ref 429866 // <generalisation>
+  from ref 128682 z 2007 to ref 128426
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 511786 // <directional aggregation>
+  from ref 128682 z 2007 stereotype "<<QSharedPointer>>" xyz 324 590 3000 to ref 128042
+  role_a_pos 210 552 3000 no_role_b
+  multiplicity_a_pos 210 575 3000 no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/275754.diagram b/src/Libs/L_UniversalModels/UML/models/275754.diagram
new file mode 100644
index 000000000..c06d720e7
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/275754.diagram
@@ -0,0 +1,54 @@
+format 76
+
+classcanvas 128042 class_ref 404266 // AniScaleTracer
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 694 536 2000
+end
+classcanvas 128170 class_ref 404138 // AniScaleVector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 676 188 2005
+end
+classcanvas 128426 class_ref 390826 // AniLineSegment
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 1099 33 2000
+end
+classcanvas 128682 class_ref 172714 // AniPoint
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 877 292 2006
+end
+relationcanvas 128298 relation_ref 449578 // <generalisation>
+  from ref 128170 z 2006 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 416042 // <directional composition>
+  decenter_begin 856
+  from ref 128426 z 2007 to ref 128682
+  role_a_pos 977 420 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128938 relation_ref 416170 // <directional composition>
+  from ref 128426 z 2007 to ref 128682
+  role_a_pos 977 369 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129066 relation_ref 416426 // <directional composition>
+  decenter_begin 500
+  from ref 128426 z 2007 to ref 128682
+  role_a_pos 977 359 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 456234 // <directional composition>
+  decenter_begin 194
+  decenter_end 699
+  from ref 128682 z 2007 to ref 128170
+  role_a_pos 810 350 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129322 relation_ref 456362 // <directional composition>
+  decenter_end 824
+  from ref 128682 z 2007 to ref 128170
+  role_a_pos 810 385 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/282282.diagram b/src/Libs/L_UniversalModels/UML/models/282282.diagram
new file mode 100644
index 000000000..2a3d10bb9
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/282282.diagram
@@ -0,0 +1,88 @@
+format 76
+
+classcanvas 128042 class_ref 410794 // AniAbstractPainterInterface
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 127 55 2000
+end
+classcanvas 128170 class_ref 410922 // AniGraphicsItemTemplate
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 133 398 2005
+end
+classcanvas 128810 class_ref 289578 // TreeLinkedItem
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 415 75 2011
+end
+classcanvas 129322 class_ref 417578 // AniAbstractPainterBase
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 391 236 2000
+end
+classcanvas 129834 class_ref 234538 // AniGraphicsDataSheetSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 884 50 2000
+end
+classcanvas 130218 class_ref 417706 // AniGraphicsItemBaseClean
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 128 684 2000
+end
+classcanvas 130858 class_ref 358058 // EGraphicsItemType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 441 550 2000
+end
+classcanvas 131242 class_ref 404138 // AniScaleVector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 889 510 2005
+end
+classcanvas 132010 class_ref 430762 // AniPaintControllerTemplate
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 669 494 2006
+end
+relationcanvas 128426 relation_ref 469802 // <directional aggregation>
+  from ref 128170 z 2006 stereotype "<<:unique_ptr>>" xyz 172 320.5 3000 to ref 128042
+  role_a_pos 221 287 3000 no_role_b
+  multiplicity_a_pos 197 287 3000 no_multiplicity_b
+end
+relationcanvas 129450 relation_ref 470186 // <generalisation>
+  from ref 129322 z 2012 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 470314 // <generalisation>
+  from ref 129322 z 2001 to ref 128042
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 477098 // <generalisation>
+  from ref 128170 z 2006 to ref 130218
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 131114 relation_ref 477482 // <directional composition>
+  from ref 128170 z 2006 to ref 130858
+  role_a_pos 410 617 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132138 relation_ref 504362 // <generalisation>
+  from ref 132010 z 2007 to ref 129322
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132394 relation_ref 505002 // <directional composition>
+  from ref 132010 z 2007 to ref 131242
+  role_a_pos 820 633 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132522 relation_ref 505130 // <directional composition>
+  decenter_begin 201
+  decenter_end 243
+  from ref 132010 z 2007 to ref 131242
+  role_a_pos 857 556 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 132650 relation_ref 505258 // <directional composition>
+  decenter_begin 911
+  decenter_end 794
+  from ref 132010 z 2007 to ref 131242
+  role_a_pos 895 724 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/288810.diagram b/src/Libs/L_UniversalModels/UML/models/288810.diagram
new file mode 100644
index 000000000..9c27369b8
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/288810.diagram
@@ -0,0 +1,7 @@
+format 76
+
+classcanvas 128170 class_ref 404138 // AniScaleVector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 148 99 2005
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/288938.diagram b/src/Libs/L_UniversalModels/UML/models/288938.diagram
new file mode 100644
index 000000000..454bd376d
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/288938.diagram
@@ -0,0 +1,3 @@
+format 76
+
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/295466.diagram b/src/Libs/L_UniversalModels/UML/models/295466.diagram
new file mode 100644
index 000000000..0c6170511
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/295466.diagram
@@ -0,0 +1,7 @@
+format 76
+
+classcanvas 128810 class_ref 404138 // AniScaleVector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 490 154 2005
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/301994.diagram b/src/Libs/L_UniversalModels/UML/models/301994.diagram
new file mode 100644
index 000000000..5c82ff180
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/301994.diagram
@@ -0,0 +1,30 @@
+format 76
+
+classcanvas 128042 class_ref 310186 // AniAreaObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 162 175 2000
+end
+classcanvas 128170 class_ref 404138 // AniScaleVector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 530 190 2005
+end
+relationcanvas 128298 relation_ref 497578 // <directional composition>
+  from ref 128042 z 2006 to ref 128170
+  role_a_pos 454 302 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128426 relation_ref 497706 // <directional composition>
+  decenter_begin 224
+  decenter_end 178
+  from ref 128042 z 2006 to ref 128170
+  role_a_pos 491 219 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 497834 // <directional composition>
+  decenter_begin 305
+  decenter_end 268
+  from ref 128042 z 2006 to ref 128170
+  role_a_pos 464 243 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/308522.diagram b/src/Libs/L_UniversalModels/UML/models/308522.diagram
new file mode 100644
index 000000000..debf9b52a
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/308522.diagram
@@ -0,0 +1,56 @@
+format 76
+
+classcanvas 128042 class_ref 390826 // AniLineSegment
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 220 266 2000
+end
+classcanvas 128170 class_ref 390698 // AniRoute
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 570 334 2006
+end
+classcanvas 128554 class_ref 437290 // AniRouteSegment
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 553 608 2000
+end
+classcanvas 129578 class_ref 172842 // AniRouteSegmentInfo
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 823 623 2000
+end
+classcanvas 130090 class_ref 404138 // AniScaleVector
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 348 819 2005
+end
+relationcanvas 129066 relation_ref 518570 // <directional composition>
+  from ref 128554 z 2001 stereotype "<<QSharedPointer>>" xyz 420 655.5 3000 to ref 128042
+  role_a_pos 398 596 3000 no_role_b
+  multiplicity_a_pos 398 619 3000 no_multiplicity_b
+end
+relationcanvas 129450 relation_ref 518826 // <directional aggregation>
+  decenter_begin 238
+  decenter_end 180
+  from ref 128554 z 2007 stereotype "<<QSharedPointer>>" xyz 535 550 3000 to ref 128170
+  role_a_pos 596 500 3000 no_role_b
+  multiplicity_a_pos 572 500 3000 no_multiplicity_b
+end
+relationcanvas 129706 relation_ref 518954 // <directional aggregation>
+  from ref 128554 z 2001 stereotype "<<QSharedPointer>>" xyz 702 743 3000 to ref 129578
+  role_a_pos 790 719 3000 no_role_b
+  multiplicity_a_pos 808 742 3000 no_multiplicity_b
+end
+relationcanvas 129834 relation_ref 519082 // <directional aggregation>
+  from ref 128170 z 2007 stereotype "<<:vector>>" xyz 588 550 3000 to ref 128554
+  role_a_pos 626 590 3000 no_role_b
+  multiplicity_a_pos 602 590 3000 no_multiplicity_b
+end
+relationcanvas 130218 relation_ref 519210 // <directional composition>
+  from ref 128554 z 2006 to ref 130090
+  role_a_pos 482 875 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130346 relation_ref 572330 // <directional aggregation>
+  decenter_begin 67
+  from ref 128042 z 2001 stereotype "<<sharedpointer>>" xyz 426 475 3000 to ref 128554
+  role_a_pos 559 632 3000 no_role_b
+  multiplicity_a_pos 535 632 3000 no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/315050.diagram b/src/Libs/L_UniversalModels/UML/models/315050.diagram
new file mode 100644
index 000000000..10ddf9ba6
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/315050.diagram
@@ -0,0 +1,46 @@
+format 76
+
+classcanvas 128042 class_ref 457130 // AniGeneralPoint
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 429 661 2000
+end
+classcanvas 128170 class_ref 172714 // AniPoint
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 225 227 2000
+end
+classcanvas 128298 class_ref 316970 // AniObject
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 689 115 2006
+end
+classcanvas 128938 class_ref 464426 // AniGeneralPointType
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 168 675 2012
+end
+relationcanvas 128426 relation_ref 409002 // <directional composition>
+  decenter_begin 652
+  decenter_end 808
+  from ref 128298 z 2007 to ref 128170
+  role_a_pos 325 401 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128554 relation_ref 409258 // <directional composition>
+  from ref 128298 z 2007 to ref 128170
+  role_a_pos 325 334 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128682 relation_ref 525738 // <generalisation>
+  from ref 128042 z 2001 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128810 relation_ref 525866 // <generalisation>
+  from ref 128042 z 2007 to ref 128298
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129322 relation_ref 532650 // <directional composition>
+  from ref 128042 z 2013 to ref 128938
+  role_a_pos 308 756 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/321578.diagram b/src/Libs/L_UniversalModels/UML/models/321578.diagram
new file mode 100644
index 000000000..f7190bdb0
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/321578.diagram
@@ -0,0 +1,16 @@
+format 76
+
+classcanvas 128042 class_ref 478250 // IconPainter
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 111 126 2000
+end
+classcanvas 128170 class_ref 478378 // AbstractIconPainter
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 298 152 2000
+end
+relationcanvas 128298 relation_ref 545834 // <generalisation>
+  from ref 128042 z 2001 to ref 128170
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/321706.diagram b/src/Libs/L_UniversalModels/UML/models/321706.diagram
new file mode 100644
index 000000000..35e789e5a
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/321706.diagram
@@ -0,0 +1,11 @@
+format 76
+
+classcanvas 128042 class_ref 157226 // GISLibrary
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 137 96 2000
+end
+classcanvas 128170 class_ref 478506 // GISLibraryPrivate
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 470 48 2000
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/328234.diagram b/src/Libs/L_UniversalModels/UML/models/328234.diagram
new file mode 100644
index 000000000..d0b63fbc3
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/328234.diagram
@@ -0,0 +1,16 @@
+format 76
+
+classcanvas 128042 class_ref 485034 // AniObjectPaintingData
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 192 329 2000
+end
+classcanvas 128170 class_ref 485290 // AniObjectPaintingDataManager
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 404 136 2000
+end
+relationcanvas 128298 relation_ref 552490 // <directional composition>
+  from ref 128170 z 2001 stereotype "<<QHash<QString, AniObjectPaintingData>>>" xyz 281 301 3000 to ref 128042
+  role_a_pos 348 344 3000 no_role_b
+  multiplicity_a_pos 324 344 3000 no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/334762.diagram b/src/Libs/L_UniversalModels/UML/models/334762.diagram
new file mode 100644
index 000000000..d33e0d9bf
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/334762.diagram
@@ -0,0 +1,57 @@
+format 76
+
+classcanvas 128042 class_ref 491818 // AniGraphicsTimedItemSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 271 413 2000
+end
+classcanvas 128298 class_ref 220202 // AniGraphicsTextObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 549 560 2000
+end
+classcanvas 128426 class_ref 227754 // AniGraphicsPictureObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 261 61 2000
+end
+classcanvas 128810 class_ref 212522 // AniGraphicsObjectSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 19 315 2006
+end
+classcanvas 129066 class_ref 219946 // AniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 24 17 2012
+end
+classcanvas 129322 class_ref 219818 // AbstractAniLinkedListSettings
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 597 66 2018
+end
+relationcanvas 128554 relation_ref 559018 // <directional aggregation>
+  from ref 128042 z 2001 to ref 128426
+  role_a_pos 372 241 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128682 relation_ref 559146 // <directional aggregation>
+  from ref 128042 z 2001 to ref 128298
+  role_a_pos 521 622 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128938 relation_ref 559274 // <generalisation>
+  from ref 128042 z 2007 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129194 relation_ref 230314 // <generalisation>
+  from ref 129066 z 2013 to ref 128810
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129450 relation_ref 174890 // <generalisation>
+  from ref 129066 z 2019 to ref 129322
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129578 relation_ref 565802 // <directional aggregation>
+  from ref 128042 z 2019 to ref 129322
+  role_a_pos 623 238 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/34.session b/src/Libs/L_UniversalModels/UML/models/34.session
new file mode 100644
index 000000000..446e6cb5b
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/34.session
@@ -0,0 +1,55 @@
+window_sizes 1680 1005 393 1182 700 82
+diagrams
+  classdiagram_ref 134570 // dia
+    1355 1167 77 4 0 0
+  classdiagram_ref 161706 // Global Diagram
+    1020 679 100 2 0 285
+  classdiagram_ref 182570 // (Unused)Individual Settings
+    1020 679 100 4 0 0
+  classdiagram_ref 228650 // Simple item
+    1020 679 100 3 0 0
+  classdiagram_ref 228906 // NullInterface
+    1020 679 100 4 0 0
+  classdiagram_ref 229034 // Object Settings
+    1020 679 100 3 0 0
+  classdiagram_ref 229290 // Picture Object
+    1020 679 100 3 0 0
+  classdiagram_ref 229418 // Cursor
+    1020 679 100 3 0 0
+  classdiagram_ref 202282 // Area : Hierarchy
+    1020 679 100 3 0 0
+  classdiagram_ref 175402 // Airport
+    1020 679 100 3 216 0
+  classdiagram_ref 175274 // Dia
+    1020 679 100 4 0 0
+  classdiagram_ref 175786 // International Routes
+    1020 679 100 3 216 0
+  classdiagram_ref 175658 // Local Routes
+    1020 679 100 4 0 0
+  classdiagram_ref 189098 // Map
+    1020 679 100 3 0 0
+  classdiagram_ref 175530 // NoEntry Area
+    1020 679 100 3 0 0
+  classdiagram_ref 175914 // Regional Center Area
+    1020 679 100 3 324 0
+  active  classdiagram_ref 176042 // Rote Entry Corridor
+    1277 849 100 3 144 0
+end
+show_stereotypes
+selected class_ref 410794 // AniAbstractPainterInterface
+open
+  
+  package_ref 128170 // Geo
+  class_ref 317226 // AniAreaZonalCenter
+  class_ref 199466 // AniAreaPoint
+  class_ref 324138 // AniAirport
+  class_ref 410922 // AniGraphicsItemTemplate
+  class_ref 410794 // AniAbstractPainterInterface
+  class_ref 417578 // AniAbstractPainterBase
+  class_ref 430762 // AniPaintControllerTemplate
+  
+  package_ref 141226 // AniGraphics
+  class_ref 128034 // AniObjectTEST
+  deploymentview_ref 134562 // tests
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/341290.diagram b/src/Libs/L_UniversalModels/UML/models/341290.diagram
new file mode 100644
index 000000000..a14e7b3b0
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/341290.diagram
@@ -0,0 +1,16 @@
+format 76
+
+classcanvas 128042 class_ref 498858 // Field
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 127 101 2000
+end
+classcanvas 128170 class_ref 498474 // FieldValidator
+  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
+  xyz 405 117 2000
+end
+relationcanvas 128298 relation_ref 578858 // <directional composition>
+  from ref 128042 z 2001 to ref 128170
+  role_a_pos 354 161 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session
new file mode 100644
index 000000000..5f4acdeae
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/42.session
@@ -0,0 +1,13 @@
+window_sizes 1680 988 628 1047 806 104
+diagrams
+  active  classdiagram_ref 200490 // Adapting Table Model
+    1047 806 100 3 0 0
+end
+show_stereotypes
+selected class_ref 714666 // ItemController
+open
+  class_ref 714666 // ItemController
+  class_ref 741802 // TreeModel
+  deploymentview_ref 227626 // classes
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/93.session b/src/Libs/L_UniversalModels/UML/models/93.session
new file mode 100644
index 000000000..b64a039e6
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/93.session
@@ -0,0 +1,20 @@
+window_sizes 1680 988 450 1350 833 111
+diagrams
+  classdiagram_ref 160682 // Structure Diagram : Field
+    1167 284 100 4 84 0
+  classdiagram_ref 167210 // Structure Diagram : Mistake
+    1464 831 100 3 72 0
+  active  classdiagram_ref 154154 // message
+    1464 833 100 2 0 0
+end
+show_stereotypes
+selected class_ref 559914 // MessageBase
+open
+  deploymentview_ref 180522 // include_
+  classview_ref 193578 // include
+  classview_ref 206634 // Message Format Checks
+  classview_ref 206762 // Additional Checks
+  class_ref 559914 // MessageBase
+  classview_ref 207146 // Processing Results
+end
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/cpp_includes b/src/Libs/L_UniversalModels/UML/models/cpp_includes
new file mode 100644
index 000000000..1a1177892
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/cpp_includes
@@ -0,0 +1,127 @@
+// "a type" "needed cpp_includes"
+"vector" "#include <QVector>
+"
+
+"list" "#include <QList>"
+
+"map" "#include <map>
+using namespace std;"
+
+"string" "#include <string>
+"
+
+"QStringList" "#include <QStringList>"
+
+"QString" "#include <QString>
+#include <QDebug>"
+
+"QSharedPointer" "#include <QSharedPointer>"
+
+"QVector" "#include <QVector>"
+
+"QLineEdit" "#include <QLineEdit>"
+
+"QDateTimeEdit" "#include <QDateTimeEdit>"
+
+"QCheckBox" "#include<QCheckBox>"
+
+"QObject" "#include <QObject>"
+
+"QCheckBox" "#include <QCheckBox>"
+
+"QLineEdit" "#include <QLineEdit>"
+
+"QDateTimeEdit" "#include <QDateTimeEdit>"
+
+"QListView" "#include <QListView>"
+
+"QAbstractItemModel" "#include <QAbstractItemModel>"
+
+"QColor" "#include <QColor>"
+
+"QFont" "#include <QFont>"
+
+"QAbstractListModel" "#include <QAbstractListModel>"
+
+"QModelIndex" "#include <QModelIndex>"
+
+"QVariant" "#include <QVariant>"
+
+"QList" "#include <QList>"
+
+"runtime_error" "#include <stdexcept>"
+
+"QLibrary" "#include <QLibrary>"
+
+"QCursor" "#include <QCursor>"
+
+"QSize" "#include <QSize>"
+
+"QImage" "#include <QImage>"
+
+"BITMAPINFOHEADER" "#include \"windows.h\""
+
+"RECT" "#include \"windows.h\""
+
+"QScopedPointer" "#include <QScopedPointer>"
+
+"QPoint" "#include <QPoint>"
+
+"QMap" "#include <QMap>"
+
+"QGraphicsScene" "#include <QGraphicsScene>"
+
+"std::vector<int>" "#include <vector>"
+
+"QRectF" "#include <QRectF>"
+
+"QPainterPath" "#include <QPainterPath>"
+
+"QGraphicsItem" "#include <QGraphicsItem>"
+
+"QPointF" "#include <QPointF>"
+
+"QGLWidget" "#include <QGLWidget>"
+
+"QGraphicsItem" "#include <QGraphicsItem>"
+
+"QPixmap" "#include <QPixmap>"
+
+"QTimerEvent" "#include <QTimerEvent>"
+
+"QPainter" "#include <QPainter>"
+
+"QStyleOptionGraphicsItem" "#include<QStyleOptionGraphicsItem>"
+
+"QWidget" "#include<QWidget>"
+
+"QPen" "#include <QPen>"
+
+"QTransform" "#include <QTransform>"
+
+"QPolygon" "#include <QPolygon>"
+
+"QGraphicsSceneMouseEvent" "#include <QGraphicsSceneMouseEvent>"
+
+"QGraphicsSceneHoverEvent" "#include <QGraphicsSceneHoverEvent>"
+
+"QRect" "#include <QRect>"
+
+"QFont" "#include <QFont>"
+
+"QBrush" "#include <QBrush>"
+
+"QIcon" "#include <QIcon>"
+
+"QHash" "#include <QHash>"
+
+"QDateTime" "#include <QDateTime>"
+
+"QEvent" "#include <QEvent>"
+
+"QRegExp" "#include <QRegExp>"
+
+"std::ptr_vector<T>" "#include <boost/ptr_container/ptr_vector.hpp>"
+
+"QMultiMap" "#include <QMultiMap>"
+
diff --git a/src/Libs/L_UniversalModels/UML/models/generation_settings b/src/Libs/L_UniversalModels/UML/models/generation_settings
new file mode 100644
index 000000000..7c8b4673d
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/generation_settings
@@ -0,0 +1,385 @@
+
+  cpp_default_defs 
+  cpp_h_extension "h" cpp_src_extension "cpp" java_extension "java" php_extension "php" python_extension "py" idl_extension "idl"
+  cpp_include_with_path
+  cpp_relative_path
+
+  type_forms 74 // uml cpp java idl cpp_in cpp_out cpp_inout cpp_return
+    "void" "void" "void" "void" "${type}" "${type} &" "${type}" "${type}"
+    "any" "void *" "Object" "any" "const ${type}" "${type}" "${type} &" "${type}"
+    "bool" "bool" "boolean" "boolean" "${type}" "${type} &" "${type} &" "${type}"
+    "char" "char" "char" "char" "${type}" "${type} &" "${type} &" "${type}"
+    "uchar" "unsigned char" "char" "octet" "${type}" "${type} &" "${type} &" "${type}"
+    "byte" "unsigned char" "byte" "octet" "${type}" "${type} &" "${type} &" "${type}"
+    "short" "short" "short" "short" "${type}" "${type} &" "${type} &" "${type}"
+    "ushort" "unsigned short" "short" "unsigned short" "${type}" "${type} &" "${type} &" "${type}"
+    "int" "int" "int" "long" "${type}" "${type} &" "${type} &" "${type}"
+    "uint" "unsigned int" "int" "unsigned long" "${type}" "${type} &" "${type} &" "${type}"
+    "long" "long" "long" "long" "${type}" "${type} &" "${type} &" "${type}"
+    "ulong" "unsigned long" "long" "unsigned long" "${type}" "${type} &" "${type} &" "${type}"
+    "float" "float" "float" "float" "${type}" "${type} &" "${type} &" "${type}"
+    "double" "double" "double" "double" "${type}" "${type} &" "${type} &" "${type}"
+    "string" "QString" "String" "string" "${type}" "${type} &" "${type} &" "${type}"
+    "stringlist" "QStringList" "sdfd" "dsfds" "${type}" "${type} &" "${type} &" "${type}"
+    "sharedpointer" "QSharedPointer" "dfds" "dsfsdf" "${type}" "${type} &" "${type} &" "${type}"
+    "clausesharedpointer" "QSharedPointer<AbstractQueryClause>" "sdfdf" "sdsad" "${type}" "${type} &" "${type} &" "${type}"
+    "itemsharedpointer" "QSharedPointer<AbstractQueryItem>" "asdas" "sdfd" "${type}" "${type} &" "${type} &" "${type}"
+    "lineedit" "QLineEdit" "asdsd" "asd" "${type}" "${type} &" "${type} &" "${type}"
+    "datetimeedit" "QDateTimeEdit" "asds" "sads" "${type}" "${type} &" "${type} &" "${type}"
+    "listview" "QListView" "asdas" "asd" "${type}" "${type} &" "${type} &" "${type}"
+    "scopeditems" "QScopedPointer<AbstractQueryItem>" "ghjj" "hjhj" "${type}" "${type} &" "${type} &" "${type}"
+    "object" "QObject" "sdasd" "asdasd" "${type} *" "${type} &" "${type} &" "${type}"
+    "checkbox" "QCheckBox" "sdasda" "asdasd" "${type} @{pointer}" "${type} &" "${type} &" "${type}"
+    "scopedpointer" "QScopedPoiter" "sad" "asd" "${type}" "${type} &" "${type} &" "${type}"
+    "color" "QColor" "zdas" "asds" "${type}" "${type} &" "${type} &" "${type}"
+    "abstractlistmodel" "QAbstractListModel" "asdsa" "sadsd" "${type}" "${type} &" "${type} &" "${type}"
+    "modelIndex" "QModelIndex" "sdfd" "asdsd" "const ${type} &" "${type} &" "${type} &" "${type}"
+    "variant" "QVariant" "asdasd" "sadasd" "${type}" "${type} &" "${type} &" "${type}"
+    "runtime_error" "std::runtime_error" "dfsd" "sdfsd" "${type}" "${type} &" "${type} &" "${type}"
+    "size" "QSize" "ASD" "ASDASD" "${type}" "${type} &" "${type} &" "${type}"
+    "image" "QImage" "sdasd" "asdasd" "${type}" "${type} &" "${type} &" "${type}"
+    "HMAP" "long int" "adsad" "asdas" "${type}" "${type} &" "${type} &" "${type}"
+    "HSITE" "long int" "asdsa" "asdsd" "${type}" "${type} &" "${type} &" "${type}"
+    "BITMAPINFOHEADER" "BITMAPINFOHEADER" "asdasd" "asdasd" "${type}" "${type} &" "${type} &" "${type}"
+    "WINAPI" "__stdcall" "fdsad" "asdasd" "${type}" "${type} &" "${type} &" "${type}"
+    "HINSTANCE" "HINSTANCE" "asdas" "asdasd" "${type}" "${type} &" "${type} &" "${type}"
+    "QLibrary" "QLibrary" "asdad" "asdasd" "${type}" "${type} &" "${type} &" "${type}"
+    "cursor" "QCursor" "asdas" "asdsad" "const ${type} &" "${type} &" "${type} &" "const ${type} &"
+    "winrect" "RECT" "sdasd" "asdsad" "${type}" "${type} &" "${type} &" "${type}"
+    "map" "QMap" "ads" "asdas" "${type}" "${type} &" "${type} &" "${type}"
+    "qPoint" "QPoint" "asda" "asdasd" "const ${type} &" "${type} &" "${type} &" "const ${type} &"
+    "path" "QPainterPath" "QPainterPath" "QPainterPath" "const ${type} &" "${type} &" "${type} &" "${type}"
+    "rectf" "QRectF" "ad" "asdas" "const ${type} &" "${type} &" "${type} &" "${type}"
+    "scene" "QGraphicsScene" "df" "sdfsdf" "${type}" "${type} &" "${type} &" "${type} *"
+    "qPointF" "QPointF" "ds" "asdad" "const ${type} &" "${type} &" "${type} &" "${type}"
+    "glWidget" "QGLWidget" "dsda" "sadasd" "${type}" "${type} &" "${type} &" "${type}"
+    "graphicsitem" "QGraphicsItem" "ad" "asdas" "${type} *" "${type} &" "${type} &" "${type}"
+    "renderthread" "RenderThread" "asd" "asdsd" "${type}" "${type} &" "${type} &" "${type}"
+    "pixmap" "QPixmap" "asd" "asd" "const ${type} &" "${type} &" "${type} &" "${type}"
+    "timerevent" "QTimerEvent" "sads" "sdsad" "${type} *" "${type} &" "${type} &" "${type}"
+    "painter" "QPainter" "QPainter" "QPainter" "${type} *" "${type} &" "${type} &" "${type}"
+    "styleItem" "QStyleOptionGraphicsItem" "QStyleOptionGraphicsItem" "QStyleOptionGraphicsItem" "const ${type} *" "${type} *" "${type} *" "${type}"
+    "widget" "QWidget" "QWidget" "QWidget" "${type}" "${type} &" "${type} *" "${type}"
+    "pen" "QPen" "QPen" "QPen" "${type}" "${type} &" "${type} &" "${type}"
+    "transform" "QTransform" "QTransform" "QTransform" "${type}" "${type} &" "${type} &" "${type}"
+    "polygon" "QPolygon" "QPolygon" "QPolygon" "${type}" "${type} &" "${type} &" "${type}"
+    "sceneMouseEvent" "QGraphicsSceneMouseEvent" "QGraphicsSceneMouseEvent" "QGraphicsSceneMouseEvent" "${type} *" "${type} *" "${type} *" "${type}"
+    "sceneHoverEvent" "QGraphicsSceneHoverEvent" "QGraphicsSceneHoverEvent" "QGraphicsSceneHoverEvent" "${type}" "${type} &" "${type} *" "${type}"
+    "rect" "QRect" "ad" "asdas" "const ${type} &" "${type} &" "${type} &" "${type}"
+    "font" "QFont" "QFont" "QFont" "${type}" "${type} &" "${type} &" "${type}"
+    "brush" "QBrush" "QBrush" "QBrush" "${type}" "${type} &" "${type} &" "${type}"
+    "icon" "QIcon" "QIcon" "QIcon" "${type}" "${type} &" "${type} &" "${type}"
+    "hash" "QHash" "QHash" "QHash" "${type}" "${type} &" "${type} &" "${type}"
+    "datetime" "QDateTime" "QDateTime" "QDateTime" "${type}" "${type} &" "${type} &" "${type}"
+    "event" "QEvent" "QEvent" "QEvent" "${type} *" "${type} &" "${type} &" "${type}"
+    "ptr_vector_t" "boost::ptr_vector<T>" "std::ptr_vector" "std::ptr_vector" "${type}" "${type} &" "${type} &" "${type}"
+    "ref_ptr_vector_t" "boost::ptr_vector<T>" "boost::ptr_vector<T>" "boost::ptr_vector<T>" "${type}" "${type} &" "${type} &" "${type}"
+    "shared_pointer_vector_t" "QVector<QSharedPointer<T> >" "QVector<QSharedPointer<T> >" "QVector<QSharedPointer<T> >" "${type}" "${type} &" "${type} &" "${type}"
+    "ref_shared_pointer_vector_t" "QVector<QSharedPointer<T> >&" "QVector<QSharedPointer<T> >&" "QVector<QSharedPointer<T> >&" "${type}" "${type} &" "${type} &" "${type}"
+    "QSharedPointer<T>" "QSharedPointer<T>" "QSharedPointer<T>" "QSharedPointer<T>" "${type}" "${type} &" "${type} &" "${type}"
+    "QVector<QSharedPointer<T> >" "QVector<QSharedPointer<T> >" "QVector<QSharedPointer<T> >" "QVector<QSharedPointer<T> >" "${type}" "${type} &" "${type} &" "${type}"
+    "multimap" "QMultiMap" "QMultiMap" "QMultiMap" "${type}" "${type} &" "${type} &" "${type}"
+  
+  relations_stereotypes 8 // uml cpp java pythonidl
+    "sequence" "vector" "Vector" "list" "sequence"
+    "vector" "QVector" "Vector" "list" "sequence"
+    "list" "QList" "List" "list" "sequence"
+    "set" "set" "Set" "set" "sequence"
+    "map" "QMap" "Map" "dict" "sequence"
+    "sharedpointer" "QSharedPointer" "" "" ""
+    "object_cast" "object_cast" "" "" ""
+    "scopedpointer" "QScopedPointer" "" "" ""
+  
+  classes_stereotypes 14 // uml cpp java php python idl
+    "class" "class" "class" "class" "class" "valuetype"
+    "interface" "class" "interface" "interface" "class" "interface"
+    "exception" "class" "class" "class" "class" "exception"
+    "enum" "enum" "enum" "enum" "enum" "enum"
+    "enum_pattern" "enum" "enum_pattern" "enum" "enum" "enum"
+    "struct" "struct" "class" "class" "class" "struct"
+    "union" "union" "class" "class" "class" "union"
+    "typedef" "typedef" "ignored" "ignored" "ignored" "typedef"
+    "boundary" "class" "class" "class" "class" "interface"
+    "control" "class" "class" "class" "class" "valuetype"
+    "entity" "class" "class" "class" "class" "valuetype"
+    "actor" "ignored" "ignored" "ignored" "ignored" "ignored"
+    "@interface" "ignored" "@interface" "ignored" "ignored" "ignored"
+    "stereotype" "ignored" "ignored" "ignored" "ignored" "ignored"
+  
+  cpp_enum_default_type_forms "${type}" "${type} &" "${type} &" "${type}" // in out inout return
+  other_cpp_types_default_type_forms "const ${type} &" "${type} &" "${type} &" "${type}" // in out inout return
+
+  cpp_default_h_content "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${description}
+${includes}
+@{exportHeader}
+@{loggingHeader}
+@{header}
+${declarations}
+@{h_exdef}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+  cpp_default_src_content "${description}
+@{meta}
+@{src}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+  cpp_default_class_decl "${description}${template}class @{export} @{externalClass}${name}${inherit}  @{parent}
+{
+${members}};
+${inlines}
+"
+  cpp_default_external_class_decl "${name}
+#include <${name}.h>
+"
+  cpp_default_struct_decl "${description}${template}struct ${name}${inherit} 
+{
+${members}};
+${inlines}
+"
+  cpp_default_union_decl "${description}${template}union ${name} 
+{
+${members}};
+${inlines}
+"
+  cpp_default_enum_decl "${description}enum @{externalClass}${name} 
+{
+${items}
+};
+"
+  cpp_default_typedef_decl "${description}ypedef ${type} ${name};
+"
+  cpp_default_attribute_declaration "     ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" // multiplicity 1
+  "    ${description}${static}${mutable}${volatile}${const}${stereotype}<${type} > ${name}${value};
+" // multiplicity * a..b
+  "    ${description}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};
+" // multiplicity [..]
+  cpp_default_enum_item_declaration "  ${name}${value},${description}"
+  cpp_association_aggregation_declaration
+    "    ${description}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+" // multiplicity 1
+    "     ${description}${static}${mutable}${volatile}${const}${stereotype}<${type} *> ${name}${value};
+" // multiplicity * a..b
+    "    ${description}${static}${mutable}${volatile}${const}${type} * ${name}${multiplicity}${value};
+" // multiplicity [..]
+  cpp_aggregation_by_value_declaration
+    "    ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};
+" // multiplicity 1
+    "    ${description}${static}${mutable}${volatile}${const}${stereotype}<${type} > ${name}${value};
+" // multiplicity * a..b
+    "    ${description}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};
+" // multiplicity [..]
+  cpp_get "Get${Name}" inline const public
+  cpp_set "Set${Name}" public
+  cpp_default_operation_declaration "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+  cpp_default_operation_definition "${description}${inline}${type} @{externalClass}${class}::${name}${(}${)}${const}${volatile}${staticnl}
+{
+    ${body}}
+"
+  cpp_indent_visibility "  "java_default_src_content "${comment}
+${package}
+${imports}
+${definition}"
+  java_default_class_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+  java_default_external_class_decl "${name}"
+  java_default_interface_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+  java5_default_enum_decl "${comment}${@}${visibility}${final}${abstract}enum ${name}${implements} {
+${items};
+${members}}
+"
+  java_default_enum_decl "${comment}${@}${visibility}final class ${name} {
+${members}
+  private final int value;
+
+  public int value() {
+    return value;
+  }
+
+  public static ${name} fromInt(int value) {
+    switch (value) {
+${cases}    default: throw new Error();
+    }
+
+  }
+  private ${name}(int v) { value = v; };
+}
+"
+  java_default_attribute_declaration "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+" // multiplicity 1
+  "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};
+" // multiplicity * a..b
+  "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};
+" // multiplicity N
+  java5_default_enum_item_declaration "  ${@}${name}${value},${comment}"
+  java_default_enum_item_declaration "  ${comment}${@}public static final int _${name}${value};
+public static final ${class} ${name} = new ${class}(_${name});
+"
+  java_default_enum_case "    case _${name}: return ${name};
+"
+  java_association_aggregation_declaration
+    "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+" // multiplicity 1
+    "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};
+" // multiplicity * a..b
+    "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};
+" // multiplicity N
+  java_get "get${Name}" final public
+  java_set "set${Name}" public
+  java_default_operation_definition "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+  php_default_src_content "<?php
+${comment}
+${namespace}
+${require_once}
+${definition}
+?>
+"
+  php_default_class_decl "${comment}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+  php_default_enum_decl "${comment}${visibility}final class ${name} {
+${items}}
+"
+  php_default_external_class_decl "${name}"
+  php_default_interface_decl "${comment}interface ${name} {
+${members}}
+"
+  php_default_attribute_declaration "  ${comment}${visibility}${const}${static}${var}${name}${value};
+"
+  php_default_enum_item_decl "  const ${name}${value};${comment}
+"
+  php_default_relation_declaration"  ${comment}${visibility}${const}${static}${var}${name}${value};
+"
+  php_get "get${Name}" final
+  php_set "set${Name}"
+  php_default_operation_definition "  ${comment}${final}${visibility}${abstract}${static}function ${name}${(}${)}
+{
+  ${body}}
+"
+  python_2_2
+  python_indent_step "    "
+  python_default_src_content "${comment}
+${import}
+${definition}"
+  python_default_class_decl "class ${name}${inherit}:
+${docstring}${members}
+"
+  python_default_enum_decl "class ${name}:
+${docstring}${members}
+"
+  python_default_external_class_decl "${name}"
+  python_default_attribute_declaration "${comment}${self}${name} = ${value}
+" // multiplicity 1
+  "${comment}${self}${name} = ${stereotype}()
+" // multiplicity != 1
+  python_default_enum_item_decl "${comment}${self}${name} = ${value}
+"
+  python_default_relation_declaration"${comment}${self}${name} = ${value}
+" // multiplicity 1
+  "${comment}${self}${name} = ${stereotype}()
+" // multiplicity != 1
+  python_default_composition_declaration"${comment}${self}${name} = ${type}()
+" // multiplicity 1
+  "${comment}${self}${name} = ${stereotype}()
+" // multiplicity != 1
+  python_default_operation_definition "${@}${static}${abstract}def ${name}${(}${)}:
+${docstring}${body}
+"
+  python_default_initoperation_definition "${@}${static}${abstract}def ${name}${(}${p0}${v0}${)}:
+${docstring}super(${class}, ${p0}).__init__()
+${body}
+"
+  python_get "get${Name}"
+  python_set "set${Name}"
+  idl_default_src_content "#ifndef ${MODULE}_${NAME}_H
+#define ${MODULE}_${NAME}_H
+
+${comment}
+${includes}
+${module_start}
+${definition}
+${module_end}
+#endif
+"
+  idl_default_interface_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+  idl_default_valuetype_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} {
+${members}};
+"
+  idl_default_struct_decl "${comment}struct ${name} {
+${members}};
+"
+  idl_default_typedef_decl "${comment}typedef ${type} ${name};
+"
+  idl_default_exception_decl "${comment}exception ${name} {
+${members}};
+"
+  idl_default_union_decl "${comment}union ${name} switch(${switch}) {
+${members}};
+"
+  idl_default_enum_decl "${comment}enum ${name} {
+${items}};
+"
+  idl_default_external_class_decl "${name}
+#include \"${name}.idl\"
+"
+  idl_default_attribute_declaration "  ${comment}${readonly}${attribute}${type} ${name};
+" // multiplicity 1
+  "  ${comment}${readonly}${attribute}${stereotype}<${type}> ${name};
+" // multiplicity * a..b
+  "  ${comment}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};
+" // multiplicity N
+  idl_default_valuetype_attribute_declaration "  ${comment}${visibility}${type} ${name};
+" // multiplicity 1
+  "  ${comment}${visibility}${stereotype}<${type}> ${name};
+" // multiplicity * a..b
+  "  ${comment}${visibility}${stereotype}<${type},${multiplicity}> ${name};
+" // multiplicity N
+  idl_default_const_declaration "  ${comment}const ${type} ${name}${value};
+" // multiplicity 1
+  "  ${comment}const ${stereotype}<${type}> ${name}${value};
+" // multiplicity * a..b
+  "  ${comment}const ${stereotype}<${type},${multiplicity}> ${name}${value};
+" // multiplicity N
+  idl_default_enum_item_declaration "  ${name},${comment}"
+  idl_default_union_item_declaration "  ${comment}case ${case} : ${readonly}${type} ${name};" // multiplicity 1
+  "  ${comment}case ${case} : ${readonly}${stereotype}<${type}> ${name};" // multiplicity * a..b
+  "  ${comment}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};" // multiplicity N
+  idl_association_aggregation_declaration
+    "  ${comment}${readonly}${attribute}${type} ${name};
+" // multiplicity 1
+    "  ${comment}${readonly}${attribute}${stereotype}<${type}> ${name};
+" // multiplicity * a..b
+    "  ${comment}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};
+" // multiplicity N
+  idl_valuetype_association_aggregation_declaration
+    "  ${comment}${visibility}${type} ${name};
+" // multiplicity 1
+    "  ${comment}${visibility}${stereotype}<${type}> ${name};
+" // multiplicity * a..b
+    "  ${comment}${visibility}${stereotype}<${type},${multiplicity}> ${name};
+" // multiplicity N
+  idl_union_association_aggregation_declaration
+    "  ${comment}case ${case} : ${readonly}${type} ${name};" // multiplicity 1
+    "  ${comment}case ${case} : ${readonly}${stereotype}<${type}> ${name};" // multiplicity * a..b
+    "  ${comment}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};" // multiplicity N
+  idl_get "get_${name}"
+  idl_set "set_${name}"  twoways
+  idl_default_operation_declaration "  ${comment}${oneway}${type} ${name}${(}${)}${raisesnl}${raises};
+"
+  uml_get_name uml uml_set_name uml
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/idl_includes b/src/Libs/L_UniversalModels/UML/models/idl_includes
new file mode 100644
index 000000000..fceab64b9
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/idl_includes
@@ -0,0 +1 @@
+// "a type" "needed idl_includes"
diff --git a/src/Libs/L_UniversalModels/UML/models/java_imports b/src/Libs/L_UniversalModels/UML/models/java_imports
new file mode 100644
index 000000000..bbd370acb
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/java_imports
@@ -0,0 +1 @@
+// "a type" "needed java_imports"
diff --git a/src/Libs/L_UniversalModels/UML/models/models.prj b/src/Libs/L_UniversalModels/UML/models/models.prj
new file mode 100644
index 000000000..6587ffec7
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/models.prj
@@ -0,0 +1,59 @@
+format 75
+"models"
+  revision 129
+  modified_by 42 "zeks"
+  cpp_root_dir "E:\\Programming\\Douml\\src\\Libs\\L_UniversalModels\\"
+
+
+  
+  // class settings
+  default_attribute_visibility private default_relation_visibility private default_operation_visibility public
+  //class diagram settings
+  draw_all_relations yes hide_attributes no hide_operations no hide_getset_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_relation_visibility no show_infonote no shadow yes show_stereotype_properties no
+  //use case diagram settings
+  package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes class_drawing_mode actor shadow yes show_stereotype_properties no
+  //sequence diagram settings
+  show_full_operations_definition no write_horizontally yes class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no show_class_context_mode no show_msg_context_mode no
+  //collaboration diagram settings
+  show_full_operations_definition no show_hierarchical_rank no write_horizontally yes drawing_language uml package_name_in_tab no show_context no show_msg_context no draw_all_relations yes shadow yes show_stereotype_properties no
+  //object diagram settings
+   write_horizontally yes package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes show_stereotype_properties no
+  //component diagram settings
+  package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes
+  draw_component_as_icon no show_component_req_prov no show_component_rea no show_stereotype_properties no
+  //deployment diagram settings
+  package_name_in_tab no show_context no write_horizontally yes auto_label_position yes draw_all_relations yes shadow yes
+  draw_component_as_icon no show_component_req_prov no show_component_rea no show_stereotype_properties no
+  //state diagram settings
+  package_name_in_tab no show_context no auto_label_position yes write_trans_label_horizontally yes show_trans_definition no draw_all_relations yes shadow yes
+  show_activities yes region_horizontally yes drawing_language uml show_stereotype_properties no
+  //activity diagram settings
+  package_name_in_tab no show_context no show_opaque_action_definition no auto_label_position yes write_flow_label_horizontally no draw_all_relations yes shadow yes
+  show_infonote yes drawing_language uml show_stereotype_properties no
+  
+  class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white 
+  font_size 9
+  diagram_format A4
+
+  image_root_dir ""
+
+  mark_for_import
+  
+  cpp_h_dir "include/Geo"
+  cpp_src_dir "src/Geo"
+  ncouples 11
+  key "pointer" value "*"
+  key "doxy" value ""
+  key "parent" value ""
+  key "meta" value ""
+  key "externalClass" value ""
+  key "export" value ""
+  key "exportHeader" value ""
+  key "loggingHeader" value ""
+  key "src" value ""
+  key "header" value ""
+  key "h_exdef" value ""
+  package_ref 201002 // TreeController
+preserve_bodies
+
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/python_imports b/src/Libs/L_UniversalModels/UML/models/python_imports
new file mode 100644
index 000000000..4a1bd3a85
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/python_imports
@@ -0,0 +1 @@
+// "a type" "needed python_imports"
diff --git a/src/Libs/L_UniversalModels/UML/models/stereotypes b/src/Libs/L_UniversalModels/UML/models/stereotypes
new file mode 100644
index 000000000..5abec53c4
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/stereotypes
@@ -0,0 +1,59 @@
+
+  package_stereotypes  7 "facade" "framework" "model" "library" "stub" "toplevel" "profile"
+    -_-> 3 "access" "import" "from"
+  end
+  
+  class_stereotypes  20 "actor" "auxiliary" "boundary" "control" "entity" "enum" "enum_pattern" "exception" "focus" "implementationClass" "interface" "@interface" "metaclass" "stereotype" "struct" "type" "typedef" "union" "utility" "function_typedef"
+    ---- 4 "list" "set" "vector" "map"
+    ---> 4 "list" "set" "vector" "map"
+    ---|> 4 "{complete,disjoint}" "{incomplete,disjoint}" "{complete,overlapping}" "{incomplete,overlapping}"
+    o--- 4 "list" "set" "vector" "map"
+    *--- 4 "list" "set" "vector" "map"
+    o--> 5 "list" "set" "vector" "map" "sharedpointer"
+    *--> 5 "list" "set" "vector" "map" "scopedpointer"
+    -_-> 4 "friend" "from" "import" "instantiate"
+    -_-|> 1 "bind"
+  end
+  
+  use_case_stereotypes 1 "realization"
+  
+    ---|> 4 "{complete,disjoint}" "{incomplete,disjoint}" "{complete,overlapping}" "{incomplete,overlapping}"
+    -_-> 2 "include" "extend"
+  end
+  
+  artifact_stereotypes  7 "document" "file" "script" "source" "text" "library" "executable"
+    -_-> 4 "deploy" "manifest" "import" "from"
+  end
+  
+  attribute_stereotypes  7 "list" "set" "vector" "map" "object_cast" "sharedpointer" "hash"
+  operation_stereotypes  1 "sharedpointer"
+  state_stereotypes  3 "machine" "submachine" "top"
+  activity_stereotypes  0
+  flow_stereotypes  3 "interrupt" "multicast" "multireceive"
+  interruptibleactivityregion_stereotypes  0
+  pseudostate_stereotypes  0
+  stateaction_stereotypes  2 "send-signal" "receive-signal"
+  parameter_stereotypes  0
+  parameterset_stereotypes  0
+  activitynode_stereotypes  0
+  activityaction_stereotypes  0
+  activityobject_stereotypes  2 "datastore" "centralBuffer"
+  expansionregion_stereotypes  0
+  activitypartition_stereotypes  0
+  pin_stereotypes  0
+  component_stereotypes  6 "buildComponent" "entity" "implement" "process" "service" "subsystem"
+  deploymentnode_stereotypes  3 "cpu" "device" "executionEnvironment"
+  classview_stereotypes  0
+  usecaseview_stereotypes  0
+  componentview_stereotypes  0
+  deploymentview_stereotypes  0
+  classdiagram_stereotypes  0
+  seqdiagram_stereotypes  0
+  msg_stereotypes  0
+  coldiagram_stereotypes  0
+  usecasediagram_stereotypes  0
+  statediagram_stereotypes  0
+  activitydiagram_stereotypes  0
+  componentdiagram_stereotypes  0
+  deploymentdiagram_stereotypes  0
+end
diff --git a/src/Libs/L_UniversalModels/UML/models/tools b/src/Libs/L_UniversalModels/UML/models/tools
new file mode 100644
index 000000000..9cbc9f4f8
--- /dev/null
+++ b/src/Libs/L_UniversalModels/UML/models/tools
@@ -0,0 +1,34 @@
+// 'tool' "the executable" "displayed string" {target}+
+tool "HTML documentation" "ghtml" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue ExtraMember ClassInstance State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (flat)" "ghtml -flat" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue ExtraMember ClassInstance State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (svg)" "ghtml -svg" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue ExtraMember ClassInstance State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (flat, svg)" "ghtml -flat -svg" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue ExtraMember ClassInstance State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "C++ utilities" "cpp_util" Class
+tool "Global Change" "global_change" Class Project Package ClassView DeploymentView
+tool "Uml projection" "uml_proj" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue Project Package ClassView
+tool "Sort" "browsersort" Class Operation Attribute Generalisation Realize Dependency Association Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit
+tool "HTML documentation" "ghtml" State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition
+tool "HTML doc. (flat)" "ghtml -flat" State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition
+tool "HTML doc. (svg)" "ghtml -svg" State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition
+tool "HTML doc. (flat, svg)" "ghtml -flat -svg" State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition
+tool "C++ state machine" "stmgen" State
+tool "HTML documentation" "ghtml" Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow
+tool "HTML doc. (flat)" "ghtml -flat" Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow
+tool "HTML doc. (svg)" "ghtml -svg" Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow
+tool "HTML doc. (flat, svg)" "ghtml -flat -svg" Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow
+tool "HTML documentation" "ghtml" Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (flat)" "ghtml -flat" Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (svg)" "ghtml -svg" Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (flat, svg)" "ghtml -flat -svg" Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "Generate .pro" "gpro" Artifact
+tool "Import Rose" "irose" Project Package
+tool "Generate XMI 1.2" "gxmi" Project
+tool "Generate XMI 2.x" "gxmi2" Project
+tool "Import XMI 2.x" "ixmi2" Project Package
+tool "Use case wizard" "usecasewizard" UseCase
+tool "Check-in" "file_control ci" Project Package
+tool "Check-out" "file_control co" Project Package
+tool "Deploy classes" "deplcl" ClassView
+tool "Global Change" "global_change" Project Package ClassView DeploymentView
+tool "Uml projection" "uml_proj" Project Package ClassView
+tool "Sort" "browsersort" Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit
diff --git a/src/Libs/L_UniversalModels/include/AdaptingTableModel.h b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h
new file mode 100644
index 000000000..a51c6edee
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h
@@ -0,0 +1,77 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef _ADAPTINGTABLEMODEL_H
+#define _ADAPTINGTABLEMODEL_H
+
+
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
+#include <QSharedPointer>
+
+#include "l_tree_controller_global.h"
+
+#include <QAbstractTableModel>
+
+class TableDataInterface;
+class AdaptingTableModelPrivate;
+
+
+class L_TREE_CONTROLLER_EXPORT AdaptingTableModel  : public QAbstractTableModel
+{
+
+Q_OBJECT
+
+public:
+    AdaptingTableModel(QObject * parent = 0);
+
+    virtual ~AdaptingTableModel();
+
+    virtual QVariant data(const QModelIndex & index, int role) const override;
+    virtual bool setData(const QModelIndex & index, const QVariant & value, int role) override;
+    virtual int rowCount(const QModelIndex & index) const override;
+    virtual int columnCount(const QModelIndex & index) const override;
+    void SetInterface(QSharedPointer<TableDataInterface> _interface);
+    virtual QModelIndex index(int row, int column, const QModelIndex & parent) const override;
+    Qt::ItemFlags flags(const QModelIndex & index) const override;
+    virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    int RowForValue(void* value);
+
+    using QAbstractTableModel::sort;
+    void sort();
+
+    void RemoveRow(const QModelIndex & index);
+
+public slots:
+    void OnReloadDataFromInterface();
+
+private:
+Q_DECLARE_PRIVATE(AdaptingTableModel)
+
+protected:
+     AdaptingTableModelPrivate* const d_ptr;
+};
+
+#endif
diff --git a/src/Libs/L_UniversalModels/include/AdaptingTableModelPrivate.h b/src/Libs/L_UniversalModels/include/AdaptingTableModelPrivate.h
new file mode 100644
index 000000000..8d023a831
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/AdaptingTableModelPrivate.h
@@ -0,0 +1,51 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#ifndef _ADAPTINGTABLEMODELPRIVATE_H
+#define _ADAPTINGTABLEMODELPRIVATE_H
+
+
+#include <QSharedPointer>
+
+#include "l_tree_controller_global.h"
+
+#include "AdaptingTableModel.h"
+class AdaptingTableModel;
+class TableDataInterface;
+
+
+class   AdaptingTableModelPrivate  
+{
+Q_DECLARE_PUBLIC(AdaptingTableModel)
+  public:
+    explicit AdaptingTableModelPrivate();
+
+    virtual ~AdaptingTableModelPrivate();
+
+
+  private:
+     AdaptingTableModel * q_ptr;
+    QSharedPointer<TableDataInterface> interface;
+
+};
+#endif
diff --git a/src/Libs/L_UniversalModels/include/ItemController.h b/src/Libs/L_UniversalModels/include/ItemController.h
new file mode 100644
index 000000000..e7a4a645b
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/ItemController.h
@@ -0,0 +1,226 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef _ITEMCONTROLLER_H
+#define _ITEMCONTROLLER_H
+
+#include <QStringList>
+#include <QVariant>
+#include <QModelIndex>
+#include <QVector>
+#include <QHash>
+
+#include "l_tree_controller_global.h"
+
+#include <functional>
+
+template<class T>
+class ItemController  
+{
+public:
+    inline QStringList GetColumns() const;
+    void SetColumns(QStringList value);
+    QVariant GetValue(const T * item, const QModelIndex & index, int role);
+    bool SetValue(T * item, const QModelIndex & index, const QVariant & value, int role);
+    void AddGetter(const QPair<int,int> & index, std::function<QVariant(const T*, QModelIndex)> function);
+    void AddGetter(int row, const QVector<int> & roles, std::function<QVariant(const T*, QModelIndex)> function);
+    void AddSetter(const QPair<int,int> & index, std::function<bool(T*, QVariant, QModelIndex)> function);
+    void AddSetter(int row, const QVector<int> & roles, std::function<bool(T*, QVariant, QModelIndex)> function);
+    void AddPostProcessor(int column, int role, const std::function<void(T*, const QModelIndex&)> & _postProcessor);
+    void AddPostProcessors(int column, const QVector<int> & roles, const std::function<void(T*,const QModelIndex&)> & _postProcessor);
+    Qt::ItemFlags flags(const QModelIndex & index) const;
+    inline QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > GetFlagsFunctors();
+    void SetFlagsFunctors(QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > value);
+    void AddFlagsFunctor(std::function<Qt::ItemFlags(const QModelIndex&)> functor);
+    void SetDefaultTreeFunctor();
+
+private:
+    QStringList columns;
+    QHash<QPair<int,int>, std::function<QVariant(const T*, QModelIndex)> > getters;
+    QHash<QPair<int,int>, std::function<bool(T*, QVariant, QModelIndex)> > setters;
+    QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > flagsFunctors;
+    QHash<QPair<int,int>, std::function<void(T*, const QModelIndex&)> > postProcessors;
+};
+
+template<class T>
+inline QStringList ItemController<T>::GetColumns() const 
+{
+    return columns;
+}
+
+template<class T>
+void ItemController<T>::SetColumns(QStringList value) 
+{
+    columns = value;
+}
+
+template<class T>
+QVariant ItemController<T>::GetValue(const T * item, const QModelIndex & index, int role) 
+{
+    // Bouml preserved body begin 00203B2A
+    //return QVariant();
+    if (!getters.contains(QPair<int,int>(index.column(), role)))
+        return QVariant();
+    QVariant ret = getters[QPair<int,int>(index.column(), role)](item, index);
+    return ret;
+    // Bouml preserved body end 00203B2A
+}
+
+template<class T>
+bool ItemController<T>::SetValue(T * item, const QModelIndex & index, const QVariant & value, int role) 
+{
+    // Bouml preserved body begin 00203BAA
+    if (!setters.contains(QPair<int,int>(index.column(), role)))
+        return false;
+    bool result = setters[QPair<int,int>(index.column(), role)](item, value, index);
+    if (postProcessors.contains(QPair<int,int>(index.column(), role)) && postProcessors[QPair<int,int>(index.column(), role)] != 0)
+        postProcessors[QPair<int,int>(index.column(), role)](item, index);
+    return result;
+    // Bouml preserved body end 00203BAA
+}
+
+template<class T>
+void ItemController<T>::AddGetter(const QPair<int,int> & index, std::function<QVariant(const T*, QModelIndex)> function) 
+{
+    // Bouml preserved body begin 002117AA
+
+    Q_ASSERT(!getters.contains(index)); // do we mean to replace the current one,
+                                        // or should we use insertMulti here and
+                                        // then 'values' instead of 'operator[]'
+                                        // when accessing the hash?
+
+    getters.insert(index, function);
+    // Bouml preserved body end 002117AA
+}
+
+template<class T>
+void ItemController<T>::AddGetter(int row, const QVector<int> & roles, std::function<QVariant(const T*, QModelIndex)> function) 
+{
+    // Bouml preserved body begin 00230DAA
+    for (int role : roles)
+    {
+        AddGetter(QPair<int,int>(row, role), function);
+    }
+    // Bouml preserved body end 00230DAA
+}
+
+template<class T>
+void ItemController<T>::AddSetter(const QPair<int,int> & index, std::function<bool(T*, QVariant, QModelIndex)> function) 
+{
+    // Bouml preserved body begin 0021182A
+
+    Q_ASSERT(!setters.contains(index)); // do we mean to replace the current one,
+                                        // or should we use insertMulti here and
+                                        // then 'values' instead of 'operator[]'
+                                        // when accessing the hash?
+
+    setters.insert(index, function);
+    // Bouml preserved body end 0021182A
+}
+
+template<class T>
+void ItemController<T>::AddSetter(int row, const QVector<int> & roles, std::function<bool(T*, QVariant, QModelIndex)> function) 
+{
+    // Bouml preserved body begin 00230D2A
+    for (int role : roles)
+    {
+        AddSetter(QPair<int,int>(row, role), function);
+    }
+    // Bouml preserved body end 00230D2A
+}
+
+template<class T>
+void ItemController<T>::AddPostProcessor(int column, int role, const std::function<void(T*, const QModelIndex&)> & _postProcessor)
+{
+    // Bouml preserved body begin 002327AA
+
+    Q_ASSERT(!postProcessors.contains(QPair<int,int>(column,role))); // do we mean to replace the current one,
+                                                                     // or should we use insertMulti here and
+                                                                     // then 'values' instead of 'operator[]'
+                                                                     // when accessing the hash?
+
+    postProcessors.insert(QPair<int,int>(column,role), _postProcessor);
+    // Bouml preserved body end 002327AA
+}
+
+template<class T>
+void ItemController<T>::AddPostProcessors(int column, const QVector<int> & roles, const std::function<void(T*,const QModelIndex&)> & _postProcessor)
+{
+    // Bouml preserved body begin 0023272A
+    for (int role : roles)
+    {
+        AddPostProcessor(column, role, _postProcessor);
+    }
+    // Bouml preserved body end 0023272A
+}
+
+template<class T>
+Qt::ItemFlags ItemController<T>::flags(const QModelIndex & index) const 
+{
+    // Bouml preserved body begin 0021AFAA
+    Qt::ItemFlags result;
+    for (const auto& func: flagsFunctors)
+    {
+        result |= func(index);
+    }
+    return result;
+    // Bouml preserved body end 0021AFAA
+}
+
+template<class T>
+inline QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > ItemController<T>::GetFlagsFunctors() 
+{
+    return flagsFunctors;
+}
+
+template<class T>
+void ItemController<T>::SetFlagsFunctors(QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > value) 
+{
+    flagsFunctors = value;
+}
+
+template<class T>
+void ItemController<T>::AddFlagsFunctor(std::function<Qt::ItemFlags(const QModelIndex&)> functor) 
+{
+    // Bouml preserved body begin 0021B22A
+    flagsFunctors.append(functor);
+    // Bouml preserved body end 0021B22A
+}
+
+template<class T>
+void ItemController<T>::SetDefaultTreeFunctor() 
+{
+    // Bouml preserved body begin 0021B1AA
+    AddFlagsFunctor([](const QModelIndex& index)
+    {
+        Qt::ItemFlags flags;
+        if (index.column() == 0)
+            flags |= Qt::ItemIsUserCheckable;
+        return flags;
+    }
+    );
+    // Bouml preserved body end 0021B1AA
+}
+
+#endif
diff --git a/src/Libs/L_UniversalModels/include/TableDataInterface.h b/src/Libs/L_UniversalModels/include/TableDataInterface.h
new file mode 100644
index 000000000..0a1414736
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/TableDataInterface.h
@@ -0,0 +1,64 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef _TABLEDATAINTERFACE_H
+#define _TABLEDATAINTERFACE_H
+
+#include <QObject>
+#include <QVariant>
+#include <QStringList>
+#include <QModelIndex>
+#include <functional>
+
+#include "l_tree_controller_global.h"
+
+class L_TREE_CONTROLLER_EXPORT TableDataInterface  : public QObject
+{
+
+Q_OBJECT
+
+  public:
+    TableDataInterface(QObject * parent = 0);
+
+    virtual ~TableDataInterface();
+
+    virtual QVariant GetValue(int row, int column, int role) const = 0;
+    virtual void SetValue(int row, int column, int role, const QVariant & value) = 0;
+    virtual QStringList GetColumns() = 0;
+    virtual int rowCount() const = 0;
+    virtual int columnCount() const = 0;
+    virtual int PreviousRowCount() = 0;
+    virtual void* InternalPointer() const = 0;
+    virtual void* InternalPointer(int row) const = 0;
+    virtual bool Equal(int row, void* data) = 0;
+    virtual void SetSortFunction(std::function<bool(void*, void*)> func) = 0;
+    virtual void sort() = 0;
+    virtual Qt::ItemFlags flags(const QModelIndex & index) const = 0;
+    virtual void RemoveRow(int index) = 0;
+
+signals:
+    void reloadData();
+};
+
+#endif
diff --git a/src/Libs/L_UniversalModels/include/TableDataListHolder.h b/src/Libs/L_UniversalModels/include/TableDataListHolder.h
new file mode 100644
index 000000000..6e6d2283c
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/TableDataListHolder.h
@@ -0,0 +1,274 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef _TABLEDATALISTHOLDER_H
+#define _TABLEDATALISTHOLDER_H
+
+#include "TableDataInterface.h"
+#include <QVariant>
+#include <QStringList>
+#include <QList>
+#include <QVector>
+#include <QModelIndex>
+#include <QHash>
+#include <QSharedPointer>
+#include "ItemController.h"
+
+template<class T>
+class  TableDataListHolder : public TableDataInterface  
+{
+public:
+    virtual QVariant GetValue(int row, int column, int role) const override;
+    virtual void SetValue(int row, int column, int role, const QVariant & value) override;
+    virtual QStringList GetColumns() override;
+    void SetColumns(QStringList _columns);
+    void SetData(const QList<T*> & data);
+    QList<T*> GetData() const;
+    QList<T*>& GetData();
+    static inline QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > GetFlagsFunctors();
+    virtual int columnCount() const override;
+    virtual int rowCount() const override;
+    void AddGetter(const QPair<int,int> & index, std::function<QVariant(const T*)> function);
+    void AddSetter(const QPair<int,int> & index, std::function<void(T*, QVariant)> function);
+    virtual int PreviousRowCount() override;
+    virtual void* InternalPointer() const override;
+    virtual void* InternalPointer(int row) const override;
+    virtual bool Equal(int row, void* data) override;
+    Qt::ItemFlags flags(const QModelIndex & index) const override;
+    virtual void sort() override;
+    static void AddFlagsFunctor(std::function<Qt::ItemFlags(const QModelIndex&)> functor);
+    static void SetFlagsFunctors(QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > value);
+    virtual void SetSortFunction(std::function<bool(void*, void*)> func) override;
+    virtual void RemoveRow(int index) override;
+
+private:
+    QList<T*> m_data;
+    QHash<QPair<int,int>, std::function<void(T*, QVariant)> > setters;
+    QHash<QPair<int, int>, std::function<QVariant(const T*)> > getters;
+    QSharedPointer<ItemController<T> > controller;
+
+    QStringList m_columns;
+    int previousRowCount = 0;
+    std::function<bool(void*, void*)> sortFunction;
+    static QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > flagsFunctors;
+};
+
+template<class T>
+QVariant TableDataListHolder<T>::GetValue(int row, int column, int role) const 
+{
+    // Bouml preserved body begin 0021352A
+    if (!getters.contains(QPair<int,int>(column, role)))
+        return QVariant();
+    QVariant ret = getters[QPair<int,int>(column, role)](m_data.at(row));
+    return ret;
+    // Bouml preserved body end 0021352A
+}
+
+template<class T>
+void TableDataListHolder<T>::SetValue(int row, int column, int role, const QVariant & value) 
+{
+    // Bouml preserved body begin 002135AA
+    if (!setters.contains(QPair<int,int>(column, role)))
+        return;
+    setters[QPair<int,int>(column, role)](m_data[row], value);
+    // Bouml preserved body end 002135AA
+}
+
+template<class T>
+QStringList TableDataListHolder<T>::GetColumns() 
+{
+    // Bouml preserved body begin 0021362A
+    return m_columns;
+    // Bouml preserved body end 0021362A
+}
+
+template<class T>
+void TableDataListHolder<T>::SetColumns(QStringList _columns) 
+{
+    // Bouml preserved body begin 00213C2A
+    m_columns = _columns;
+    // Bouml preserved body end 00213C2A
+}
+
+template<class T>
+void TableDataListHolder<T>::SetData(const QList<T*> & data) 
+{
+    // Bouml preserved body begin 002136AA
+    previousRowCount = m_data.size();
+    m_data = data;
+    emit reloadData();
+    // Bouml preserved body end 002136AA
+}
+
+template<class T>
+QList<T*> TableDataListHolder<T>::GetData() const
+{
+    // Bouml preserved body begin 00218C2A
+    return m_data;
+    // Bouml preserved body end 00218C2A
+}
+
+template<class T>
+QList<T*>& TableDataListHolder<T>::GetData()
+{
+    // Bouml preserved body begin 0021E7AA
+    return m_data;
+    // Bouml preserved body end 0021E7AA
+}
+
+template<class T>
+inline QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > TableDataListHolder<T>::GetFlagsFunctors()
+
+{
+    return flagsFunctors;
+}
+
+template<class T>
+int TableDataListHolder<T>::columnCount() const 
+{
+    // Bouml preserved body begin 002138AA
+    return m_columns.size();
+    // Bouml preserved body end 002138AA
+}
+
+template<class T>
+int TableDataListHolder<T>::rowCount() const 
+{
+    // Bouml preserved body begin 002137AA
+    return m_data.size();
+    // Bouml preserved body end 002137AA
+}
+
+template<class T>
+void TableDataListHolder<T>::AddGetter(const QPair<int,int> & index, std::function<QVariant(const T*)> function) 
+{
+    // Bouml preserved body begin 00213A2A
+    getters.insert(index, function);
+    // Bouml preserved body end 00213A2A
+}
+
+template<class T>
+void TableDataListHolder<T>::AddSetter(const QPair<int,int> & index, std::function<void(T*, QVariant)> function) 
+{
+    // Bouml preserved body begin 00213AAA
+    setters.insert(index, function);
+    // Bouml preserved body end 00213AAA
+}
+
+template<class T>
+int TableDataListHolder<T>::PreviousRowCount() 
+{
+    // Bouml preserved body begin 0022372A
+    return previousRowCount;
+    // Bouml preserved body end 0022372A
+}
+
+template<class T>
+void* TableDataListHolder<T>::InternalPointer() const 
+{
+    // Bouml preserved body begin 0022512A
+    if (m_data.size() == 0)
+        return 0;
+    return m_data[0];
+    // Bouml preserved body end 0022512A
+}
+
+template<class T>
+void* TableDataListHolder<T>::InternalPointer(int row) const 
+{
+    // Bouml preserved body begin 00226AAA
+    if (m_data.size() < row)
+        return 0;
+    return m_data[row];
+    // Bouml preserved body end 00226AAA
+}
+
+template<class T>
+bool TableDataListHolder<T>::Equal(int row, void* data) 
+{
+    // Bouml preserved body begin 0022852A
+    T* value = static_cast<T*>(data);
+    if (*m_data[row] == *value)
+        return true;
+    return false;
+    // Bouml preserved body end 0022852A
+}
+
+template<class T>
+Qt::ItemFlags TableDataListHolder<T>::flags(const QModelIndex & index) const 
+{
+    // Bouml preserved body begin 0022BE2A
+    Qt::ItemFlags result;
+    for (const auto& func: flagsFunctors)
+    {
+        result |= func(index);
+    }
+    return result;
+    // Bouml preserved body end 0022BE2A
+}
+
+template<class T>
+void TableDataListHolder<T>::sort() 
+{
+    // Bouml preserved body begin 0022A42A
+    std::sort(m_data.begin(), m_data.end(), sortFunction);
+    // Bouml preserved body end 0022A42A
+}
+
+template<class T>
+void TableDataListHolder<T>::AddFlagsFunctor(std::function<Qt::ItemFlags(const QModelIndex&)> functor)
+
+{
+    // Bouml preserved body begin 0022BDAA
+    flagsFunctors.append(functor);
+    // Bouml preserved body end 0022BDAA
+}
+
+template<class T>
+void TableDataListHolder<T>::SetFlagsFunctors(QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > value)
+
+{
+    flagsFunctors = value;
+}
+
+template<class T>
+void TableDataListHolder<T>::SetSortFunction(std::function<bool(void*, void*)> func) 
+{
+    // Bouml preserved body begin 0022A3AA
+    sortFunction = func;
+    // Bouml preserved body end 0022A3AA
+}
+
+template<class T>
+void TableDataListHolder<T>::RemoveRow(int index) 
+{
+    // Bouml preserved body begin 0022DA2A
+    m_data.removeOne(*(m_data.begin()+index));
+    // Bouml preserved body end 0022DA2A
+}
+
+template<class T>
+QVector<std::function<Qt::ItemFlags(const QModelIndex&)> > TableDataListHolder<T>::flagsFunctors;
+
+#endif
diff --git a/src/Libs/L_UniversalModels/include/TreeItem.h b/src/Libs/L_UniversalModels/include/TreeItem.h
new file mode 100644
index 000000000..ece6baf5e
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/TreeItem.h
@@ -0,0 +1,390 @@
+// *************************************************************************
+//
+// 
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef _TREEITEM_H
+#define _TREEITEM_H
+
+#include <QList>
+#include <QSharedPointer>
+#include "TreeItemInterface.h"
+#include <QVariant>
+#include <QModelIndex>
+#include "ItemController.h"
+#include <QStringList>
+
+#include "l_tree_controller_global.h"
+
+#include <QAbstractItemView>
+
+template<class T>
+class TreeItem : public TreeItemInterface  
+{
+typedef TreeItem<T> value_type;
+public:
+    TreeItem(T * data = nullptr);
+    explicit TreeItem();
+
+    virtual QList<QSharedPointer<TreeItemInterface> > GetChildren() override;
+
+    void ResetState();
+
+    virtual ~TreeItem();
+
+    virtual int columnCount() const override;
+    virtual int childCount() const override;
+    virtual QVariant data(const QModelIndex & index, int role) override;
+    virtual bool isCheckable() const override;
+    virtual void setCheckState(Qt::CheckState state) override;
+    virtual Qt::CheckState checkState() override;
+    virtual bool setData(const QModelIndex & index, const QVariant & value, int role) override;
+    virtual bool removeChildren(int position, int count) override;
+    virtual bool insertChildren(int position, int count) override;
+
+    virtual QList<QSharedPointer<TreeItemInterface > >& children();
+    virtual const QList<QSharedPointer<TreeItemInterface > >& children() const;
+    void addChildren(QList<QSharedPointer<TreeItemInterface> > _children);
+    inline QSharedPointer<ItemController<T> > GetController() const;
+
+    void SetController(QSharedPointer<ItemController<T> > value);
+    virtual QStringList GetColumns() override;
+    virtual int IndexOf(TreeItemInterface * item) override;
+    void SetInternalData(T * _data);
+    virtual void* InternalPointer() override;
+    virtual void* InternalPointer() const override;
+    virtual TreeItemInterface* child(int row) override;
+    virtual TreeItemInterface* parent() override;
+    virtual int row() override;
+    virtual void SetParent(QSharedPointer<TreeItemInterface > _parent) override;
+    virtual int GetIndexOfChild(TreeItemInterface * child) override;
+    virtual Qt::ItemFlags flags(const QModelIndex & index) const override;
+    virtual void AddChildren(QList<QSharedPointer<TreeItemInterface> > children, int insertAfter = 0) override;
+    virtual QSharedPointer<TreeItemInterface> GetParent() override;
+
+private:
+    T* m_data = nullptr;
+
+protected:
+     QList<QSharedPointer<TreeItemInterface > > m_children;
+     QWeakPointer<TreeItemInterface > m_parent;
+
+private:
+    bool m_isCheckable;
+    Qt::CheckState m_checkState;
+    QSharedPointer<ItemController<T> > controller;
+};
+
+template<class T>
+TreeItem<T>::TreeItem(T * data) : TreeItemInterface()
+{
+    // Bouml preserved body begin 0020A62A
+    ResetState();
+    m_data = data;
+    // Bouml preserved body end 0020A62A
+}
+
+template<class T>
+TreeItem<T>::TreeItem() : TreeItemInterface()
+{
+    // Bouml preserved body begin 0020A72A
+    ResetState();
+    // Bouml preserved body end 0020A72A
+}
+
+template<class T>
+QList<QSharedPointer<TreeItemInterface> > TreeItem<T>::GetChildren() 
+{
+    // Bouml preserved body begin 002202AA
+    return m_children;
+    // Bouml preserved body end 002202AA
+}
+
+template<class T>
+void TreeItem<T>::ResetState() 
+{
+    // Bouml preserved body begin 0021CE2A
+    m_checkState = Qt::Unchecked;
+    //m_data = T();
+    m_children.clear();
+    m_parent.clear();
+    m_isCheckable = false;
+    controller = QSharedPointer<ItemController<T> >();
+    // Bouml preserved body end 0021CE2A
+}
+
+template<class T>
+TreeItem<T>::~TreeItem() 
+{
+    // Bouml preserved body begin 0020A6AA
+    // Bouml preserved body end 0020A6AA
+}
+
+template<class T>
+int TreeItem<T>::columnCount() const 
+{
+    // Bouml preserved body begin 0020402A
+    return controller->GetColumns().size();
+    // Bouml preserved body end 0020402A
+}
+
+template<class T>
+int TreeItem<T>::childCount() const 
+{
+    // Bouml preserved body begin 002040AA
+    return m_children.size();
+    // Bouml preserved body end 002040AA
+}
+
+template<class T>
+QVariant TreeItem<T>::data(const QModelIndex & index, int role) 
+{
+    // Bouml preserved body begin 00203FAA
+    return controller->GetValue(m_data, index, role);
+    // Bouml preserved body end 00203FAA
+}
+
+template<class T>
+bool TreeItem<T>::isCheckable() const 
+{
+    // Bouml preserved body begin 00203F2A
+    return m_isCheckable;
+    // Bouml preserved body end 00203F2A
+}
+
+template<class T>
+void TreeItem<T>::setCheckState(Qt::CheckState state) 
+{
+    // Bouml preserved body begin 00203EAA
+    m_checkState = state;
+    // Bouml preserved body end 00203EAA
+}
+
+template<class T>
+Qt::CheckState TreeItem<T>::checkState() 
+{
+    // Bouml preserved body begin 00203E2A
+    return m_checkState;
+    // Bouml preserved body end 00203E2A
+}
+
+template<class T>
+bool TreeItem<T>::setData(const QModelIndex & index, const QVariant & value, int role) 
+{
+    // Bouml preserved body begin 00203D2A
+    controller->SetValue(m_data, index,value, role);
+    return true;
+    // Bouml preserved body end 00203D2A
+}
+
+template<class T>
+bool TreeItem<T>::removeChildren(int position, int count) 
+{
+    // Bouml preserved body begin 00203CAA
+    if (position < 0 || position > m_children.size())
+        return false;
+    //qDebug() << Q_FUNC_INFO;
+    auto leftBound = m_children.begin()+position;
+    auto rightBound = leftBound + (count);
+    m_children.erase(leftBound,rightBound);
+    return true;
+    // Bouml preserved body end 00203CAA
+}
+
+template<class T>
+bool TreeItem<T>::insertChildren(int position, int count) 
+{
+    // Bouml preserved body begin 00203C2A
+    if (position < 0 || position > m_children.size())
+        return false;
+
+    for (int row = 0; row < count; ++row)
+    {
+        QSharedPointer<TreeItemInterface> item (new TreeItem<T>(0));
+        item->SetParent(this->parent()->GetChildren()[this->parent()->GetIndexOfChild(this)]);
+        m_children.insert(position, item);
+    }
+
+    return true;
+    // Bouml preserved body end 00203C2A
+}
+
+template<class T>
+QList<QSharedPointer<TreeItemInterface > >& TreeItem<T>::children() 
+{
+    // Bouml preserved body begin 0020432A
+    return m_children;
+    // Bouml preserved body end 0020432A
+}
+
+template<class T>
+const QList<QSharedPointer<TreeItemInterface > >& TreeItem<T>::children() const 
+{
+    // Bouml preserved body begin 002042AA
+    return m_children;
+    // Bouml preserved body end 002042AA
+}
+
+template<class T>
+void TreeItem<T>::addChildren(QList<QSharedPointer<TreeItemInterface> > _children) 
+{
+    // Bouml preserved body begin 0020422A
+    m_children.append(_children);
+    // Bouml preserved body end 0020422A
+}
+
+template<class T>
+inline QSharedPointer<ItemController<T> > TreeItem<T>::GetController() const 
+{
+    return controller;
+}
+
+template<class T>
+void TreeItem<T>::SetController(QSharedPointer<ItemController<T> > value) 
+{
+    controller = value;
+}
+
+template<class T>
+QStringList TreeItem<T>::GetColumns() 
+{
+    // Bouml preserved body begin 00206CAA
+    return controller->GetColumns();
+    // Bouml preserved body end 00206CAA
+}
+
+template<class T>
+int TreeItem<T>::IndexOf(TreeItemInterface * item) 
+{
+    // Bouml preserved body begin 00206D2A
+    return GetIndexOfChild(item);
+    // Bouml preserved body end 00206D2A
+}
+
+template<class T>
+void TreeItem<T>::SetInternalData(T * _data) 
+{
+    // Bouml preserved body begin 0020A7AA
+    m_data = _data;
+    // Bouml preserved body end 0020A7AA
+}
+
+template<class T>
+void* TreeItem<T>::InternalPointer() 
+{
+    // Bouml preserved body begin 002086AA
+    return m_data;
+    // Bouml preserved body end 002086AA
+}
+
+template<class T>
+void* TreeItem<T>::InternalPointer() const 
+{
+    // Bouml preserved body begin 00235B2A
+     return m_data;
+    // Bouml preserved body end 00235B2A
+}
+
+template<class T>
+TreeItemInterface* TreeItem<T>::child(int row) 
+{
+    // Bouml preserved body begin 0020CD2A
+    TreeItemInterface* returnChildren = nullptr;
+    if (m_children.size() > row)
+        returnChildren = m_children[row].data();
+    return returnChildren;
+    // Bouml preserved body end 0020CD2A
+}
+
+template<class T>
+TreeItemInterface* TreeItem<T>::parent() 
+{
+    // Bouml preserved body begin 0020CDAA
+    return m_parent.toStrongRef().data();
+    // Bouml preserved body end 0020CDAA
+}
+
+template<class T>
+int TreeItem<T>::row() 
+{
+    // Bouml preserved body begin 0020CEAA
+    if (!m_parent.isNull())
+        return dynamic_cast<TreeItem<T>*>(m_parent.toStrongRef().data())->IndexOf(this);
+    return 0;
+    // Bouml preserved body end 0020CEAA
+}
+
+template<class T>
+void TreeItem<T>::SetParent(QSharedPointer<TreeItemInterface > _parent) 
+{
+    // Bouml preserved body begin 0020CFAA
+    m_parent = _parent;
+    // Bouml preserved body end 0020CFAA
+}
+
+template<class T>
+int TreeItem<T>::GetIndexOfChild(TreeItemInterface * child) 
+{
+    // Bouml preserved body begin 0020D02A
+    for (int i = 0; i < m_children.size(); ++i)
+    {
+        if (m_children.at(i).data() == child)
+            return i;
+    }
+    return -1;
+    // Bouml preserved body end 0020D02A
+}
+
+template<class T>
+Qt::ItemFlags TreeItem<T>::flags(const QModelIndex & index) const 
+{
+    // Bouml preserved body begin 0021B2AA
+    if (index.isValid())
+        return controller->flags(index);
+    return Qt::ItemFlags();
+    // Bouml preserved body end 0021B2AA
+}
+
+template<class T>
+void TreeItem<T>::AddChildren(QList<QSharedPointer<TreeItemInterface> > children, int insertAfter) 
+{
+    // Bouml preserved body begin 002201AA
+    //m_children.insert(m_children.begin() + insertAfter, children);
+    //m_children.reserve(m_children.size() + children.size());
+    int i = 0;
+    for (const auto& child : children)
+    {
+        m_children.insert(m_children.begin() + insertAfter + i, child);
+        i++;
+    }
+    // Bouml preserved body end 002201AA
+}
+
+template<class T>
+QSharedPointer<TreeItemInterface> TreeItem<T>::GetParent() 
+{
+    // Bouml preserved body begin 002341AA
+    return m_parent.toStrongRef();
+    // Bouml preserved body end 002341AA
+}
+
+#endif
diff --git a/src/Libs/L_UniversalModels/include/TreeItemInterface.h b/src/Libs/L_UniversalModels/include/TreeItemInterface.h
new file mode 100644
index 000000000..a5024e2a5
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/TreeItemInterface.h
@@ -0,0 +1,71 @@
+// *************************************************************************
+//
+//
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef _TREEITEMINTERFACE_H
+#define _TREEITEMINTERFACE_H
+
+#include <QList>
+#include <QSharedPointer>
+#include <QVariant>
+#include <QModelIndex>
+#include <QStringList>
+
+#include "l_tree_controller_global.h"
+
+#include <QWeakPointer>
+#include <QList>
+#include <functional>
+
+class L_TREE_CONTROLLER_EXPORT TreeItemInterface  
+{
+  public:
+    explicit TreeItemInterface();
+
+    virtual ~TreeItemInterface();
+
+    virtual QList<QSharedPointer<TreeItemInterface> > GetChildren() = 0;
+    virtual int childCount() const = 0;
+    virtual int columnCount() const = 0;
+    virtual QVariant data(const QModelIndex & index, int role) = 0;
+    virtual bool isCheckable() const = 0;
+    virtual void setCheckState(Qt::CheckState state) = 0;
+    virtual Qt::CheckState checkState() = 0;
+    virtual bool setData(const QModelIndex & index, const QVariant & value, int role) = 0;
+    virtual bool removeChildren(int position, int count) = 0;
+    virtual bool insertChildren(int position, int count) = 0;
+    virtual QStringList GetColumns() = 0;
+    virtual void* InternalPointer() = 0;
+    virtual void* InternalPointer() const = 0;
+    virtual TreeItemInterface* child(int row) = 0;
+    virtual TreeItemInterface* parent() = 0;
+    virtual int row() = 0;
+    virtual void SetParent(QSharedPointer<TreeItemInterface > _parent) = 0;
+    virtual Qt::ItemFlags flags(const QModelIndex & index) const = 0;
+    virtual void AddChildren(QList<QSharedPointer<TreeItemInterface> > children, int insertAfter = 0) = 0;
+    virtual int IndexOf(TreeItemInterface * item) = 0;
+    virtual int GetIndexOfChild(TreeItemInterface * child) = 0;
+    virtual QSharedPointer<TreeItemInterface> GetParent() = 0;
+};
+
+#endif
diff --git a/src/Libs/L_UniversalModels/include/TreeModel.h b/src/Libs/L_UniversalModels/include/TreeModel.h
new file mode 100644
index 000000000..8b437751a
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/TreeModel.h
@@ -0,0 +1,72 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef TREEFILTER_TREEMODEL_H
+#define TREEFILTER_TREEMODEL_H
+
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
+#include <QString>
+#include <QDebug>
+#include "include/TreeItemInterface.h"
+#include "l_tree_controller_global.h"
+
+class QTreeView;
+
+class L_TREE_CONTROLLER_EXPORT TreeModel  : public QAbstractItemModel
+{
+  Q_OBJECT
+  public:
+    TreeModel(QObject * parent = 0);
+
+    virtual ~TreeModel();
+
+    virtual QVariant data(const QModelIndex & index, int role) const override;
+    virtual bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) override;
+    virtual Qt::ItemFlags flags(const QModelIndex & index) const override;
+    virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    virtual QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const override;
+    virtual QModelIndex parent(const QModelIndex & index) const override;
+    virtual int rowCount(const QModelIndex & parent = QModelIndex()) const override;
+    virtual int columnCount(const QModelIndex & parent = QModelIndex()) const override;
+
+    TreeItemInterface * RootItem();
+    void UpdateData(QModelIndex);
+    void InsertRootItem(QSharedPointer<TreeItemInterface>);
+    TreeItemInterface * getItem(const QModelIndex & index) const;
+
+    virtual bool insertRows(int position, int rows, const QModelIndex & parent) override;
+    virtual bool removeRows(int position, int rows, const QModelIndex & parent) override;
+
+    void reset();
+
+    QSharedPointer<TreeItemInterface> rootItem;
+
+signals:
+    void dataEditFinished(const QModelIndex &);
+};
+
+
+#endif
diff --git a/src/Libs/L_UniversalModels/include/genericeventfilter.h b/src/Libs/L_UniversalModels/include/genericeventfilter.h
new file mode 100644
index 000000000..3af10a8b6
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/genericeventfilter.h
@@ -0,0 +1,45 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#ifndef GENERICEVENTFILTER_H
+#define GENERICEVENTFILTER_H
+#include <qobject.h>
+#include <QString>
+#include <QEvent>
+#include <functional>
+#include "l_tree_controller_global.h"
+class L_TREE_CONTROLLER_EXPORT GenericEventFilter: public QObject
+{
+Q_OBJECT
+private:
+    std::function<bool(QObject *, QEvent *)> eventProcessor;
+public:
+    GenericEventFilter(QObject* parent = 0);
+    virtual ~GenericEventFilter();
+    void SetEventProcessor(std::function<bool(QObject *, QEvent *)>);
+protected:
+    bool eventFilter(QObject *obj, QEvent *event);
+
+
+};
+#endif // GENERICEVENTFILTER_H
diff --git a/src/Libs/L_UniversalModels/include/l_tree_controller_global.h b/src/Libs/L_UniversalModels/include/l_tree_controller_global.h
new file mode 100644
index 000000000..1cee860bf
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/l_tree_controller_global.h
@@ -0,0 +1,38 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#ifndef L_TREE_CONTROLLER_GLOBAL_H
+#define L_TREE_CONTROLLER_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+#include <QHash>
+
+#if defined(L_TREE_CONTROLLER_LIBRARY)
+#  define L_TREE_CONTROLLER_EXPORT Q_DECL_EXPORT
+#else
+#  define L_TREE_CONTROLLER_EXPORT Q_DECL_IMPORT
+#endif
+
+
+
+#endif // L_TREE_CONTROLLER_GLOBAL_H
diff --git a/src/Libs/L_UniversalModels/include/treeitemfunctions.h b/src/Libs/L_UniversalModels/include/treeitemfunctions.h
new file mode 100644
index 000000000..4112241da
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/treeitemfunctions.h
@@ -0,0 +1,214 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef TREEITEMFUNCTIONS_H
+#define TREEITEMFUNCTIONS_H
+
+#include "include/TreeItemInterface.h"
+
+namespace TreeFunctions
+{
+template<typename K>
+using RootChecks = QList<std::function<bool(K*)> >;
+template<typename K>
+using ModifierFunction = std::function<void(K*)>;
+template<typename K>
+using ModifierFunctions = QList<ModifierFunction<K> >;
+
+
+/** Отфильтровывает из дерева ноды которые удовлетворяют условиям проверок
+ * @rootItem верхний уровень дерева от которого производится фильтрация
+ * @filterFunctions список проверок которым должна удовлетворять нода
+ * @forcePick говорит о том, что ноду нужно зацепить в любом случае(когда нода-папка удовлетворяет условию)
+ **/
+
+template<typename InterfaceType, typename ConcreteItemType>
+QSharedPointer<InterfaceType> RecursiveGetSubset(InterfaceType* rootItem,
+                                                 RootChecks<InterfaceType> filterFunctions,
+                                                 bool forcePick = false,
+                                                 bool forceChildren = true)
+{
+    QList<QSharedPointer<InterfaceType>> newChildren;
+    bool nodeValid = true;
+    for(std::function<bool(InterfaceType*)> filter: filterFunctions)
+    {
+       if(!filter(rootItem))
+       {
+           nodeValid = false;
+           break;
+       }
+    }
+    if(!rootItem->GetChildren().isEmpty())
+    {
+        for(QSharedPointer<InterfaceType> child: rootItem->GetChildren())
+        {
+            forcePick = (forcePick || nodeValid) && forceChildren;
+            QSharedPointer<InterfaceType> newChild = RecursiveGetSubset<InterfaceType,ConcreteItemType>(child.data(), filterFunctions, forcePick, forceChildren);
+            if(!newChild.isNull())
+                newChildren += newChild;
+        }
+    }
+    QSharedPointer<InterfaceType> newItem;
+    bool hasValidDescendants = !newChildren.isEmpty();
+    if(nodeValid || hasValidDescendants || forcePick)
+    {
+        newItem = QSharedPointer<InterfaceType>(new ConcreteItemType(*dynamic_cast<ConcreteItemType*>(rootItem)));
+        newItem->removeChildren(0, newItem->childCount());
+        for(QSharedPointer<InterfaceType> child: newChildren)
+        {
+            child->SetParent(newItem);
+        }
+        newItem->AddChildren(newChildren);
+    }
+    return newItem;
+}
+
+
+template<typename InterfaceType>
+bool RecursiveSearch(InterfaceType* rootItem, RootChecks<InterfaceType> filterFunctions)
+{
+    bool result = true;
+    for(std::function<bool(InterfaceType*)> filter: filterFunctions)
+    {
+       if(!filter(rootItem))
+       {
+           result = false;
+           break;
+       }
+    }
+    if(result)
+        return true;
+    if(!rootItem->GetChildren().isEmpty())
+    {
+        for(QSharedPointer<InterfaceType> child: rootItem->GetChildren())
+        {
+            bool result = RecursiveSearch<InterfaceType>(child.data(), filterFunctions);
+            if(result)
+                return true;
+        }
+    }
+    return false;
+}
+
+template<typename InterfaceType>
+void ModifyNode(InterfaceType* node, ModifierFunctions<InterfaceType> modifierFunctions)
+{
+    if(!node)
+        return;
+    for(ModifierFunction<InterfaceType> func : modifierFunctions)
+    {
+        func(node);
+    }
+
+}
+
+template<typename InterfaceType>
+bool RecursiveModify(InterfaceType* rootItem,
+                     RootChecks<InterfaceType> filterFunctions,
+                     ModifierFunctions<InterfaceType> modifierFunctions,
+                     bool parentsFirst = true,
+                     bool stopAtFirstMatch = true)
+{
+    bool result = false;
+    bool nodeValid = true;
+    for(std::function<bool(InterfaceType*)> filter: filterFunctions)
+    {
+       if(!filter(rootItem))
+       {
+           nodeValid = false;
+           break;
+       }
+    }
+    if(nodeValid && parentsFirst)
+    {
+        result = true;
+        ModifyNode<InterfaceType>(rootItem,modifierFunctions);
+        if(stopAtFirstMatch)
+            return result;
+    }
+
+    if(!rootItem->GetChildren().isEmpty())
+    {
+        for(QSharedPointer<InterfaceType> child: rootItem->GetChildren())
+        {
+            result = RecursiveModify<InterfaceType>(child.data(), filterFunctions, modifierFunctions, parentsFirst, stopAtFirstMatch);
+            if(stopAtFirstMatch)
+                return result;
+        }
+    }
+    if(nodeValid && !parentsFirst)
+    {
+        result = true;
+        ModifyNode<InterfaceType>(rootItem,modifierFunctions);
+        if(stopAtFirstMatch)
+            return result;
+    }
+    return result;
+}
+
+/** Отфильтровывает из дерева список свойств по переданному аксессору
+ * @rootItem верхний уровень дерева от которого производится фильтрация
+ * @accessor функция для доступа к конкретному члену структуры который надо выцепить
+ **/
+
+template<typename K, typename T>
+QList<K> RecursiveGet(T* rootItem, std::function<K(T*)> accessor)
+{
+    QList<K> result;
+    if(!rootItem->GetChildren().isEmpty())
+    {
+        for(QSharedPointer<T> child: rootItem->GetChildren())
+        {
+            result += RecursiveGet(child.data(), accessor);
+        }
+    }
+    result.append(accessor(rootItem));
+    return result;
+
+}
+
+/** Отфильтровывает из дерева ноды которые удовлетворяют условиям проверок
+ * и помещает их в интерфейс для последующего запихивания в дерево
+ *
+ * @rootItem верхний уровень дерева от которого производится фильтрация
+ * @filterFunctions список проверок которым должна удовлетворять нода
+ **/
+
+template<typename InterfaceType, template <typename> class ItemType, typename DataType>
+QSharedPointer<InterfaceType > FilterSubset(QSharedPointer<InterfaceType> rootItem,
+                                            QList<std::function<bool(InterfaceType*)> > filterFunctions,
+                                            bool forceRoot = false,
+                                            bool forceChildren = true)
+{
+    QSharedPointer<InterfaceType > item;
+    ItemType<DataType>* newRoot = new ItemType<DataType>(0);
+    item = QSharedPointer<InterfaceType >(newRoot);
+
+    item = TreeFunctions::RecursiveGetSubset<InterfaceType, ItemType<DataType>>(rootItem.data(), filterFunctions, forceRoot, forceChildren);
+    return item;
+}
+
+} // namespace TreeFunctions
+
+#endif // TREEITEMFUNCTIONS_H
diff --git a/src/Libs/L_UniversalModels/include/treeviewfunctions.h b/src/Libs/L_UniversalModels/include/treeviewfunctions.h
new file mode 100644
index 000000000..5bf25d2c0
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/treeviewfunctions.h
@@ -0,0 +1,69 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef TREEFUNCTIONS_H
+#define TREEFUNCTIONS_H
+
+#include <QList>
+#include <QModelIndex>
+#include <QAbstractItemView>
+#include "l_tree_controller_global.h"
+
+class QTreeView;
+
+namespace TreeFunctions
+{
+
+enum class ENodeInsertionMode
+{
+    sibling,
+    child
+};
+
+
+/*
+ * Информация о том как именно вставляется потомок. Нодой или папкой
+ **/
+
+/** Рекурсивно восстанавливает состояние нод дерева
+ * @nodes список открытых нод. Заполняется как послеовательная строка строка-колонка...
+ * @view отображение в котором требуется восстановить состояние
+ * @model указатель на модель
+ * @startIndex индекс для детей которого восстанавливается состояние
+ * @path текущий путь вверх по дереву
+ **/
+L_TREE_CONTROLLER_EXPORT void ApplyNodePathExpandState(QStringList & nodes, QTreeView * view, QAbstractItemModel * model, const QModelIndex startIndex, QString path = QString());
+
+/** Рекурсивно сохраняет состояние нод дерева
+ * @nodes список открытых нод. Заполняется как последовательная строка строка-колонка...
+ * @view отображение в котором требуется сохранить состояние
+ * @model указатель на модель
+ * @startIndex индекс для детей которого сохраняется состояние
+ * @path текущий путь вверх по дереву
+ **/
+L_TREE_CONTROLLER_EXPORT void StoreNodePathExpandState(QStringList & nodes, QTreeView * view, QAbstractItemModel * model, const QModelIndex startIndex, QString path = QString());
+
+} // namespace TreeFunctions
+
+#endif // TREEFUNCTIONS_H
diff --git a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h
new file mode 100644
index 000000000..0921eaf2e
--- /dev/null
+++ b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h
@@ -0,0 +1,386 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef TREEVIEWTEMPLATEFUNCTIONS_H
+#define TREEVIEWTEMPLATEFUNCTIONS_H
+
+#include <QAbstractItemView>
+#include <QTreeView>
+#include "include/TreeModel.h"
+#include "include/TreeItemInterface.h"
+#include "include/treeviewfunctions.h"
+#include "include/treeitemfunctions.h"
+#include "include/l_tree_controller_global.h"
+
+//class QAbstractItemView;
+
+namespace TreeFunctions
+{
+
+/** Создаёт структуру интерфейса дерева из предварительно созданного объекта данных
+ * @parentItem объект к которому следует прицепить данный интерфейс как потомка
+ * @data готовая к обработке структура с данными
+ * @controller указатель на структуру доступа к данным из модели
+ **/
+
+template<typename DataType, typename InterfaceType, template <typename> class ItemType, template <typename> class ControllerType>
+QSharedPointer<InterfaceType>  CreateInterfaceFromData(QSharedPointer<InterfaceType> parentItem, DataType& data,
+                                                       QSharedPointer<ControllerType<DataType> > controller)
+{
+    ItemType<DataType>* pointer = new ItemType<DataType>();
+    QSharedPointer<InterfaceType > newItem(pointer);
+    pointer->SetInternalData(data);
+    pointer->SetController(controller);
+    pointer->SetParent(parentItem);
+
+    data.SetInterfacePointer(newItem.data());
+    return newItem;
+}
+
+/** Возвращет из отображения указатель на текущий интерфейс
+ * @view указатель на отображение из которого извлекается интерфейс
+ **/
+
+template<typename InterfaceType>
+InterfaceType* GetCurrentInterface(QAbstractItemView* view)
+{
+    auto currentIndex = view->selectionModel()->currentIndex();
+    if(!currentIndex.isValid())
+        return nullptr;
+    auto pointer = static_cast<InterfaceType*>(currentIndex.internalPointer());
+    return pointer;
+}
+
+/** Возвращет из отображения указатель на текущие данные
+ * @view указатель на отображение из которого извлекаются данные
+ **/
+
+template<template<typename> class TreeItemType, typename DataType, typename InterfaceType>
+DataType* GetCurrentDataPointer(QAbstractItemView* view)
+{
+    TreeItemType<DataType> *pointer = dynamic_cast<TreeItemType<DataType>* >(GetCurrentInterface<InterfaceType>(view));
+    DataType* data = static_cast<DataType*>(pointer->InternalPointer());
+    return data;
+}
+
+/** Возвращает родителя для создаваемого потомка на основании режима вставки
+ * @insertionMode Информация о том как именно вставляется потомок. Нодой или папкой
+ * @current указатель на интерфейс являющийся текущим в модели
+ * @root указатель на корневую ноду (для сличения с корнем дерева)
+ **/
+
+template<template<typename> class TreeItemType, typename DataType, typename InterfaceType>
+QSharedPointer<InterfaceType> GetParent(ENodeInsertionMode insertionMode, InterfaceType* current, QSharedPointer<InterfaceType> root)
+{
+    InterfaceType* parent = current->parent();
+    bool parentIsRoot = parent == root.data();
+    QSharedPointer<InterfaceType> sharedOfParent;
+    if(insertionMode == ENodeInsertionMode::sibling)
+    {
+        if(parentIsRoot)
+            sharedOfParent = root;
+        else
+        {
+            TreeItemType<DataType>* parentOfParent = dynamic_cast<TreeItemType<DataType>*>(parent->parent());
+            sharedOfParent = parent->parent()->GetChildren().at(parentOfParent->IndexOf(parent));
+        }
+    }
+    else
+    {
+        sharedOfParent = parent->GetChildren().at(parent->IndexOf(current));
+    }
+    return sharedOfParent;
+
+}
+
+/** Возвращает индекс строки для создания нового потомка в модели
+ * @view указатель на отображение из которого извлекаются данные
+ * @insertionMode Информация о том как именно вставляется потомок. Нодой или папкой
+ * @addBelow указывает вставить потомка перед текущим индексом или после него
+ **/
+
+static inline int GetChildInsertionIndex(QAbstractItemView* view, ENodeInsertionMode insertionMode, bool addBelow)
+{
+    if(insertionMode == ENodeInsertionMode::child)
+        return view->model()->rowCount()-1;
+    int indexOfCurrentNode = view->selectionModel()->currentIndex().row();
+    int indexToInsert;
+    if(addBelow)
+    {
+        if(indexOfCurrentNode + 1 < view->model()->rowCount())
+            indexToInsert = indexOfCurrentNode + 1;
+        else
+            indexToInsert = indexOfCurrentNode;
+
+    }
+    else
+        indexToInsert = indexOfCurrentNode;
+    return indexToInsert;
+}
+
+/** Создаёт потомка или сиблинга для текущей ноды в дереве (берется из view)
+ * @dataGenerator генератор для создания данных для помещения в интерфейс
+ * @view указатель на отображение
+ * @root указатель на корневую ноду (для сличения с корнем дерева)
+ * @insertionMode Информация о том как именно вставляется потомок. Нодой или папкой
+ * @addBelow указывает вставить потомка перед текущим индексом или после него
+ **/
+
+template<template<typename> class TreeItemType, typename DataType, typename InterfaceType>
+TreeItemType<DataType>* AddItem(std::function<DataType(DataType*)> dataGenerator, QAbstractItemView* view,
+                                QSharedPointer<InterfaceType> root, ENodeInsertionMode insertionMode, bool addBelow = true)
+{
+    QSharedPointer<InterfaceType> parent = GetParent<TreeItemType, DataType, InterfaceType>
+            (insertionMode, GetCurrentInterface<InterfaceType>(view), root);
+
+    bool parentIsRoot = parent.data() == root.data();
+
+    TreeItemType<DataType>* parentItem = dynamic_cast<TreeItemType<DataType>*>(parent.data());
+    DataType* parentData = static_cast<DataType*>(parentItem->InternalPointer());
+
+
+    DataType data = dataGenerator(parentIsRoot ? nullptr : parentData);
+
+
+    TreeItemType<DataType>* newTemplateItem = new TreeItemType<DataType>();
+    QSharedPointer<InterfaceType > newItem(newTemplateItem);
+    newTemplateItem->SetInternalData(data);
+    newTemplateItem->SetController(dynamic_cast<TreeItemType<DataType>*>(parent.data())->GetController());
+    newTemplateItem->SetParent(parent);
+
+    data.SetInterfacePointer(newItem.data());
+
+    int indexToInsert = GetChildInsertionIndex(view, insertionMode, addBelow);
+    parent->AddChildren(QList<QSharedPointer<InterfaceType> >() << newItem, indexToInsert);
+    TreeModel* model = dynamic_cast<TreeModel*>(view->model());
+    model->InsertRootItem(root);
+    return dynamic_cast<TreeItemType<DataType>*>(newItem.data());
+}
+
+/** Производит фильтрацию в дереве и устанавливает результат в качестве корневой ноды
+ * @dataGenerator генератор для создания данных для помещения в интерфейс
+ * @treeView указатель на дерево-отображение
+ * @rootItem указатель на корневую ноду (для сличения с корнем дерева)
+ * @createCheckListFunc фуннкция создающая необходимые для фильтрации проверки
+ * @expandedNodes ссылка на хранилице открытых нод дерева
+ * @isFilteredTree ссылка на хранилище состояние фильтрованности дерева
+ **/
+
+template<typename InterfaceType, template <typename> class ItemType, typename DataType>
+bool PerformFiltering(TreeModel* treeModel,
+                      QSharedPointer<InterfaceType > rootItem,
+                      std::function<QList<std::function<bool (InterfaceType *)> > ()> createCheckListFunc,
+                      bool forceRoot = false,
+                      bool forceChildren = true)
+{
+    QSharedPointer<InterfaceType > item;
+    QList<std::function<bool (InterfaceType *)> > checkList = createCheckListFunc();
+    if(checkList.isEmpty())
+        item = rootItem;
+    else
+        item = TreeFunctions::FilterSubset<InterfaceType,ItemType,DataType>(rootItem, checkList, forceRoot, forceChildren);
+    treeModel->InsertRootItem(item);
+    if(item == rootItem)
+        return false;
+    return true;
+}
+
+template<typename InterfaceType, template <typename> class ItemType, typename DataType>
+static inline QString GetPathFromIndex(std::function<QVariant(DataType*)> dataAccessor, const QModelIndex& startIndex)
+{
+    auto pointer = static_cast<InterfaceType*>(startIndex.internalPointer());
+    ItemType<DataType> *dataPointer = nullptr;
+    QString path;
+    if(pointer)
+    {
+        dataPointer = dynamic_cast<ItemType<DataType>* >(pointer);
+        DataType* data = static_cast<DataType*>(dataPointer->InternalPointer());
+        QString newPath = dataAccessor(data).toString() + QObject::tr(",");
+        path+=newPath;
+    }
+    else
+    {
+        path+=QObject::tr("-11111,");
+    }
+    return path;
+}
+
+template<typename InterfaceType, template <typename> class ItemType, typename DataType>
+static inline QString GetFullPathFromIndex(std::function<QVariant(DataType*)> dataAccessor, QModelIndex startIndex)
+{
+    QString result;
+    if(!startIndex.isValid())
+        return QString();
+    if(startIndex.parent().isValid())
+        result.append(GetFullPathFromIndex<InterfaceType,ItemType,DataType>(dataAccessor, startIndex.parent()));
+    return result + GetPathFromIndex<InterfaceType,ItemType,DataType>(dataAccessor, startIndex);
+}
+
+/** Рекурсивно восстанавливает состояние нод дерева
+ * @nodes список открытых нод. Заполняется как послеовательная строка строка-колонка...
+ * @view отображение в котором требуется восстановить состояние
+ * @model указатель на модель
+ * @startIndex индекс для детей которого восстанавливается состояние
+ * @path текущий путь вверх по дереву
+ **/
+//template<template<typename> class TreeItemType, typename DataType, typename InterfaceType>
+//DataType* GetCurrentDataPointer(QAbstractItemView* view)
+
+template<typename InterfaceType, template <typename> class ItemType, typename DataType>
+void ApplyNodePathExpandState(std::function<QVariant(DataType*)> dataAccessor,
+                              QStringList & nodes,
+                              QTreeView * view,
+                              QAbstractItemModel * model,
+                              const QModelIndex startIndex,
+                              QString path = QString())
+{
+    path+=GetPathFromIndex<InterfaceType,ItemType,DataType>(dataAccessor, startIndex);
+    for(int i(0); i < model->rowCount(startIndex); ++i)
+    {
+        QModelIndex child = model->index(i, 0, startIndex);
+        QString nextPath = path + GetPathFromIndex<InterfaceType,ItemType,DataType>(dataAccessor,child);
+        if(!nodes.contains(nextPath))
+            continue;
+        ApplyNodePathExpandState<InterfaceType,ItemType, DataType>
+                (dataAccessor, nodes, view, model, child, path);
+    }
+    if(nodes.contains(path))
+        view->setExpanded( startIndex.sibling(startIndex.row(), 0), true );
+}
+
+/** Рекурсивно сохраняет состояние нод дерева
+ * @nodes список открытых нод. Заполняется как последовательная строка строка-колонка...
+ * @view отображение в котором требуется сохранить состояние
+ * @model указатель на модель
+ * @startIndex индекс для детей которого сохраняется состояние
+ * @path текущий путь вверх по дереву
+ **/
+template<typename InterfaceType, template <typename> class ItemType, typename DataType>
+void StoreNodePathExpandState(std::function<QVariant(DataType*)> dataAccessor,
+                              QStringList & nodes,
+                              QTreeView * view,
+                              QAbstractItemModel * model,
+                              const QModelIndex startIndex,
+                              QString path = QString())
+{
+    // Bouml preserved body begin 002020AA
+    path+=GetPathFromIndex<InterfaceType,ItemType,DataType>(dataAccessor, startIndex);
+    for(int i(0); i < model->rowCount(startIndex); ++i)
+    {
+        QModelIndex child = model->index(i, 0, startIndex);
+        if(!child.isValid())
+            continue;
+        if(!view->isExpanded(child))
+        {
+            QString nextPath = path + GetPathFromIndex<InterfaceType,ItemType,DataType>(dataAccessor,child);
+            nodes.removeAll(nextPath);
+            continue;
+        }
+        StoreNodePathExpandState<InterfaceType,ItemType, DataType>
+                (dataAccessor,nodes, view, model, model->index(i, 0, startIndex), path);
+    }
+
+    if(view->isExpanded(startIndex))
+    {
+        if(!nodes.contains(path))
+            nodes << path;
+    }
+    // Bouml preserved body end 002020AA
+}
+
+template<typename InterfaceType>
+bool ExpandAllSatisfying(std::function<bool(InterfaceType*)> check,
+                         QTreeView * view,
+                         QAbstractItemModel * model,
+                         const QModelIndex startIndex)
+{
+    bool returnResult = false;
+    for(int i(0); i < model->rowCount(startIndex); ++i)
+    {
+        QModelIndex child = model->index(i, 0, startIndex);
+        if(ExpandAllSatisfying<InterfaceType>
+                (check, view, model, child))
+        {
+            view->setExpanded( startIndex.sibling(startIndex.row(), 0), true );
+            returnResult = true;
+        }
+    }
+    if(returnResult || check(static_cast<InterfaceType*>(startIndex.internalPointer())))
+        returnResult = true;
+    return returnResult;
+}
+
+static inline int MaxOpenLevel(QTreeView * view, QAbstractItemModel * model,const QModelIndex startIndex, int level = -1, bool isFirst = true)
+{
+    static int result = 0;
+    level++;
+    if(isFirst)
+    {
+        result = 0;
+        isFirst = false;
+    }
+    if(view->isExpanded(startIndex.sibling(startIndex.row(), 0)) && (result <= level))
+        result = level;
+
+    for(int i(0); i < model->rowCount(startIndex); ++i)
+    {
+        QModelIndex child = model->index(i, 0, startIndex);
+        MaxOpenLevel(view, model, child, level, isFirst);
+
+    }
+    level--;
+    return result;
+}
+
+static inline void ExpandUpToLevel(QTreeView * view,QAbstractItemModel * model, const QModelIndex startIndex,int maxLevel, int level = -1)
+{
+    int currentLevel = level+1;
+    for(int i(0); i < model->rowCount(startIndex); ++i)
+    {
+        bool expand = currentLevel <= maxLevel;
+//        qDebug() << "Level: " << currentLevel;
+//        qDebug() << "Maxlevel: " << maxLevel;
+//        qDebug() << "Expand? " << expand;
+        QModelIndex child = model->index(i, 0, startIndex);
+        view->setExpanded( startIndex.sibling(startIndex.row(), 0), expand);
+        ExpandUpToLevel(view, model, child,maxLevel, currentLevel);
+    }
+}
+
+template<typename InterfaceType, template <typename> class ItemType, typename DataType>
+void FilterTreeAndRestoreNodes(std::function<QVariant(DataType*)> dataAccessor,
+                               std::function<QList<std::function<bool (InterfaceType *)> > ()> createCheckListFunc,
+                               QStringList & nodes,
+                               QTreeView * view,
+                               TreeModel * model,
+                               QSharedPointer<InterfaceType > startIndex, bool forceRoot = false,  bool forceChildren = true)
+{
+    TreeFunctions::StoreNodePathExpandState<InterfaceType,ItemType,DataType>(dataAccessor, nodes, view, model, QModelIndex());
+    PerformFiltering<InterfaceType,ItemType,DataType>(model,startIndex,createCheckListFunc, forceRoot, forceChildren);
+    TreeFunctions::ApplyNodePathExpandState<InterfaceType,ItemType,DataType>(dataAccessor, nodes, view, model, QModelIndex());
+}
+
+} // namespace TreeFunctions
+
+#endif // TREEVIEWTEMPLATEFUNCTIONS_H
diff --git a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp
new file mode 100644
index 000000000..1b8accde5
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp
@@ -0,0 +1,185 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+
+
+#include "../include/AdaptingTableModel.h"
+#include "../include/TableDataInterface.h"
+#include "../include/AdaptingTableModelPrivate.h"
+
+AdaptingTableModel::AdaptingTableModel(QObject * parent) : QAbstractTableModel(parent),
+d_ptr(new AdaptingTableModelPrivate())
+{
+    // Bouml preserved body begin 0020EEAA
+    // Bouml preserved body end 0020EEAA
+}
+
+AdaptingTableModel::~AdaptingTableModel() 
+{
+    // Bouml preserved body begin 0020EF2A
+    delete d_ptr;
+    // Bouml preserved body end 0020EF2A
+}
+
+QVariant AdaptingTableModel::data(const QModelIndex & index, int role) const 
+{
+    // Bouml preserved body begin 0020EFAA
+    Q_D(const AdaptingTableModel);
+    if(!index.isValid())
+        return QVariant();
+    return d->interface->GetValue(index.row(),  index.column(), role);
+    // Bouml preserved body end 0020EFAA
+}
+
+bool AdaptingTableModel::setData(const QModelIndex & index, const QVariant & value, int role) 
+{
+    // Bouml preserved body begin 0021172A
+    Q_D(AdaptingTableModel);
+    if(!index.isValid())
+        return false;
+    d->interface->SetValue(index.row(),  index.column(), role, value);
+    return true;
+    // Bouml preserved body end 0021172A
+}
+
+int AdaptingTableModel::rowCount(const QModelIndex & index) const 
+{
+    // Bouml preserved body begin 0020F02A
+    Q_UNUSED(index);
+    Q_D(const AdaptingTableModel);
+    return d->interface->rowCount();
+    // Bouml preserved body end 0020F02A
+}
+
+int AdaptingTableModel::columnCount(const QModelIndex & index) const 
+{
+    // Bouml preserved body begin 0020F0AA
+    Q_UNUSED(index);
+    Q_D(const AdaptingTableModel);
+    return d->interface->columnCount();
+    // Bouml preserved body end 0020F0AA
+}
+
+void AdaptingTableModel::SetInterface(QSharedPointer<TableDataInterface> _interface) 
+{
+    // Bouml preserved body begin 00218B2A
+    Q_D(AdaptingTableModel);
+    d->interface = _interface;
+    TableDataInterface* interfacePointer = d->interface.data();
+    disconnect(interfacePointer, SIGNAL(reloadData()), this, SLOT(OnReloadDataFromInterface()));
+    connect(interfacePointer, SIGNAL(reloadData()), this, SLOT(OnReloadDataFromInterface()));
+    // Bouml preserved body end 00218B2A
+}
+
+QModelIndex AdaptingTableModel::index(int row, int column, const QModelIndex & parent) const 
+{
+    // Bouml preserved body begin 00213CAA
+    Q_D(const AdaptingTableModel);
+    if (!hasIndex(row, column, parent))
+        return QModelIndex();
+    return createIndex(row, column, d->interface->InternalPointer(row));
+    // Bouml preserved body end 00213CAA
+}
+
+Qt::ItemFlags AdaptingTableModel::flags(const QModelIndex & index) const 
+{
+    // Bouml preserved body begin 002170AA
+    Q_D(const AdaptingTableModel);
+    if (!index.isValid())
+        return 0;
+    return d->interface->flags(index);
+    // Bouml preserved body end 002170AA
+}
+
+QVariant AdaptingTableModel::headerData(int section, Qt::Orientation orientation, int role) const 
+{
+    // Bouml preserved body begin 0021712A
+    Q_D(const AdaptingTableModel);
+    if(d->interface->rowCount() == 0 )
+        return QVariant();
+    if(section < 0 || section > d->interface->GetColumns().size())
+        return QVariant();
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+    {
+        //qDebug() << interface->GetColumns().at(section);
+        return d->interface->GetColumns().at(section);
+    }
+    return QVariant();
+    // Bouml preserved body end 0021712A
+}
+
+int AdaptingTableModel::RowForValue(void* value) 
+{
+    // Bouml preserved body begin 002287AA
+    Q_D(const AdaptingTableModel);
+    for(int i(0); i < rowCount(QModelIndex()); ++i)
+    {
+        if(d->interface->Equal(i, value))
+            return i;
+    }
+    return -1;
+    // Bouml preserved body end 002287AA
+}
+
+void AdaptingTableModel::sort() 
+{
+    // Bouml preserved body begin 0022A12A
+    // Bouml preserved body end 0022A12A
+}
+
+void AdaptingTableModel::RemoveRow(const QModelIndex & index) 
+{
+    // Bouml preserved body begin 0022D92A
+    Q_D(AdaptingTableModel);
+    if(!index.isValid())
+        return;
+    d->interface->RemoveRow(index.row());
+    beginRemoveRows(QModelIndex(), index.row(),index.row());
+    endRemoveRows();
+    // Bouml preserved body end 0022D92A
+}
+
+void AdaptingTableModel::OnReloadDataFromInterface() 
+{
+    // Bouml preserved body begin 0021702A
+    Q_D(AdaptingTableModel);
+    //reset();
+        beginResetModel();
+        endResetModel();
+
+    if(d->interface->PreviousRowCount() != 0)
+    {
+        int removeLimit = d->interface->PreviousRowCount() == 0 ? 0 : d->interface->PreviousRowCount();
+        beginRemoveRows(QModelIndex(), 0, removeLimit);
+        endRemoveRows();
+    }
+    if(d->interface->rowCount() != 0)
+    {
+        beginInsertRows(QModelIndex(), 0, d->interface->rowCount()-1);
+        endInsertRows();
+    }
+    // Bouml preserved body end 0021702A
+}
+
+#include "moc_AdaptingTableModel.cpp"
diff --git a/src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp b/src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp
new file mode 100644
index 000000000..b595ea87d
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp
@@ -0,0 +1,41 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#include "TableDataInterface.h"
+#include "../include/AdaptingTableModelPrivate.h"
+#include "../include/AdaptingTableModel.h"
+#include "../include/TableDataInterface.h"
+
+AdaptingTableModelPrivate::AdaptingTableModelPrivate() 
+{
+    // Bouml preserved body begin 0021CD2A
+    // Bouml preserved body end 0021CD2A
+}
+
+AdaptingTableModelPrivate::~AdaptingTableModelPrivate() 
+{
+    // Bouml preserved body begin 0021CDAA
+    // Bouml preserved body end 0021CDAA
+}
+
diff --git a/src/Libs/L_UniversalModels/src/ItemController.cpp b/src/Libs/L_UniversalModels/src/ItemController.cpp
new file mode 100644
index 000000000..d56a48f88
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/ItemController.cpp
@@ -0,0 +1,27 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+
+#include "e:/Projects/L_TreeController/include/TreeItemController.h"
+
diff --git a/src/Libs/L_UniversalModels/src/TableDataInterface.cpp b/src/Libs/L_UniversalModels/src/TableDataInterface.cpp
new file mode 100644
index 000000000..4bae36160
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/TableDataInterface.cpp
@@ -0,0 +1,17 @@
+
+
+
+#include "../include/TableDataInterface.h"
+
+TableDataInterface::TableDataInterface(QObject * parent) : QObject(parent)
+{
+    // Bouml preserved body begin 0021562A
+    // Bouml preserved body end 0021562A
+}
+
+TableDataInterface::~TableDataInterface() 
+{
+    // Bouml preserved body begin 002156AA
+    // Bouml preserved body end 002156AA
+}
+
diff --git a/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp b/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp
new file mode 100644
index 000000000..10d8ba754
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp
@@ -0,0 +1,17 @@
+
+
+
+#include "../include/TreeItemInterface.h"
+
+TreeItemInterface::TreeItemInterface() 
+{
+    // Bouml preserved body begin 0020D3AA
+    // Bouml preserved body end 0020D3AA
+}
+
+TreeItemInterface::~TreeItemInterface() 
+{
+    // Bouml preserved body begin 0020D42A
+    // Bouml preserved body end 0020D42A
+}
+
diff --git a/src/Libs/L_UniversalModels/src/TreeModel.cpp b/src/Libs/L_UniversalModels/src/TreeModel.cpp
new file mode 100644
index 000000000..ee49f763c
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp
@@ -0,0 +1,293 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#include <QSize>
+#include <QColor>
+#include "include/TreeModel.h"
+//#include "include/Logging/LoggerTracer.h"
+#include "include/ItemController.h"
+#include "include/TreeItemInterface.h"
+
+TreeModel::TreeModel(QObject * parent)
+    : QAbstractItemModel(parent)
+
+{
+    // Bouml preserved body begin 0014C62A
+    // Bouml preserved body end 0014C62A
+}
+
+TreeModel::~TreeModel()
+{
+    // Bouml preserved body begin 0014C6AA
+    // Bouml preserved body end 0014C6AA
+}
+
+QVariant TreeModel::data(const QModelIndex & index, int role) const
+{
+    // Bouml preserved body begin 0014C72A
+
+    if (!index.isValid())
+        return QVariant();
+
+    TreeItemInterface *item = static_cast<TreeItemInterface*>(index.internalPointer());
+
+
+    if ( role == Qt::CheckStateRole && index.column() == 0 && (flags(index) & Qt::ItemIsUserCheckable))
+        return static_cast< int >( item->checkState() ? Qt::Checked : Qt::Unchecked );
+
+    if(role == Qt::DisplayRole || role == Qt::EditRole ||  role == Qt::DecorationRole)
+        return item->data(index,role);
+
+//    if(role == Qt::DecorationRole )
+//        return item->data(index.column(),role);
+
+    if(role == Qt::SizeHintRole)
+        return QSize(100, 20);
+    return QVariant();
+    // Bouml preserved body end 0014C72A
+}
+
+bool TreeModel::setData(const QModelIndex & index, const QVariant & value, int role)
+{
+    // Bouml preserved body begin 0014C7AA
+    if (role != Qt::EditRole && role!=Qt::CheckStateRole)
+        return false;
+
+
+    if(role==Qt::CheckStateRole)
+    {
+        TreeItemInterface *item = static_cast<TreeItemInterface*>(index.internalPointer());
+        item->setCheckState(static_cast<Qt::CheckState>(value.toInt()));
+        emit dataChanged(index,index);
+        return true;
+    }
+
+    if(role==Qt::EditRole)
+    {
+        TreeItemInterface* item = dynamic_cast<TreeItemInterface*>(getItem(index));
+        bool result = item->setData(index, value, role);
+
+        if (result)
+        {
+            emit dataChanged(index, index);
+            emit dataEditFinished(index);
+        }
+    }
+    return false;
+    // Bouml preserved body end 0014C7AA
+}
+
+Qt::ItemFlags TreeModel::flags(const QModelIndex & index) const
+{
+    // Bouml preserved body begin 0014C82A
+
+    if (!index.isValid())
+        return 0;
+
+    //Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    TreeItemInterface* iface = static_cast<TreeItemInterface*>(index.internalPointer());
+    Qt::ItemFlags flags = iface->flags(index);
+
+//    if ( index.column() == 0 )
+//        flags |= Qt::ItemIsUserCheckable;
+
+    return flags;
+    // Bouml preserved body end 0014C82A
+}
+
+QVariant TreeModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    // Bouml preserved body begin 0014C8AA
+    if(rootItem == 0 )
+        return QVariant();
+    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+        return rootItem->GetColumns().at(section);
+    return QVariant();
+    // Bouml preserved body end 0014C8AA
+}
+
+QModelIndex TreeModel::index(int row, int column, const QModelIndex & parent) const
+{
+    // Bouml preserved body begin 0014C92A
+
+    //TRACE_FUNCTION;
+    if(rootItem.isNull())
+        return QModelIndex();
+    if (!hasIndex(row, column, parent))
+        return QModelIndex();
+
+    TreeItemInterface *parentItem;
+
+    if (!parent.isValid())
+        parentItem = rootItem.data();
+    else
+        parentItem = static_cast<TreeItemInterface*>(parent.internalPointer());
+
+    TreeItemInterface *childItem = static_cast<TreeItemInterface*>(parentItem->child(row));
+    if (childItem)
+        return createIndex(row, column, childItem);
+    else
+        return QModelIndex();
+    // Bouml preserved body end 0014C92A
+}
+
+QModelIndex TreeModel::parent(const QModelIndex & index) const
+{
+    // Bouml preserved body begin 0014C9AA
+
+    //TRACE_FUNCTION;
+    if (!index.isValid())
+        return QModelIndex();
+
+    TreeItemInterface *childItem = static_cast<TreeItemInterface*>(index.internalPointer());
+    TreeItemInterface *parentItem = dynamic_cast<TreeItemInterface*>(childItem->parent());
+
+    if (parentItem == rootItem)
+        return QModelIndex();
+
+    return createIndex(parentItem->row(), 0, parentItem);
+    // Bouml preserved body end 0014C9AA
+}
+
+int TreeModel::rowCount(const QModelIndex & parent) const
+{
+    // Bouml preserved body begin 0014CA2A
+    //TRACE_FUNCTION;
+    if(rootItem.isNull())
+        return 0;
+    TreeItemInterface *parentItem;
+    //    if (parent.column() > 0)
+    //        return 0;
+
+    if (!parent.isValid())
+        parentItem = rootItem.data();
+    else
+        parentItem = static_cast<TreeItemInterface*>(parent.internalPointer());
+
+    return parentItem->childCount();
+    // Bouml preserved body end 0014CA2A
+}
+
+int TreeModel::columnCount(const QModelIndex & parent) const
+{
+    // Bouml preserved body begin 0014CAAA
+    //TRACE_FUNCTION;
+    if(rootItem.isNull())
+        return 0;
+    if (parent.isValid())
+        return static_cast<TreeItemInterface*>(parent.internalPointer())->columnCount();
+    else
+        return rootItem->columnCount();
+    // Bouml preserved body end 0014CAAA
+}
+
+TreeItemInterface * TreeModel::RootItem()
+{
+    // Bouml preserved body begin 0014CB2A
+    //TRACE_FUNCTION;
+    return rootItem.data();
+    // Bouml preserved body end 0014CB2A
+}
+
+void TreeModel::UpdateData(QModelIndex index)
+{
+    TreeItemInterface* item = static_cast<TreeItemInterface*>(index.internalPointer());
+    QModelIndex lastChild = index.child(item->childCount()-1, item->columnCount()-1);
+    emit dataChanged(index.sibling(index.row(),0),
+                     lastChild);
+}
+
+void TreeModel::InsertRootItem(QSharedPointer<TreeItemInterface> item)
+{
+    reset();
+    if(!rootItem.isNull() && rootItem->childCount() != 0)
+    {
+        int prevRows = rootItem->childCount();
+        int prevColumns = rootItem->columnCount();
+        beginRemoveRows(QModelIndex(), 0, prevRows-1);
+        endRemoveRows();
+        emit dataChanged(index(0,0), index(prevRows-1, prevColumns));
+    }
+
+    if(!item.isNull() && item->childCount() != 0)
+    {
+        beginInsertRows(QModelIndex(), 0, item->childCount()-1);
+        endInsertRows();
+        emit dataChanged(index(0,0), index(item->childCount()-1, item->columnCount()));
+    }
+    rootItem = item;
+}
+
+
+TreeItemInterface * TreeModel::getItem(const QModelIndex & index) const
+{
+    // Bouml preserved body begin 0014CC2A
+    //TRACE_FUNCTION;
+    if (index.isValid()) {
+        TreeItemInterface *item = static_cast<TreeItemInterface*>(index.internalPointer());
+        if (item) return item;
+    }
+    return rootItem.data();
+    // Bouml preserved body end 0014CC2A
+}
+
+bool TreeModel::insertRows(int position, int rows, const QModelIndex & parent)
+{
+    // Bouml preserved body begin 0014CCAA
+    //TRACE_FUNCTION;
+    TreeItemInterface *parentItem = getItem(parent);
+    bool success = true;
+
+    beginInsertRows(parent, position, position + rows - 1);
+    success = parentItem->insertChildren(position, rows);
+    endInsertRows();
+
+    emit dataChanged(this->index(position, 0, parent), this->index(position + rows - 1, columnCount(), parent));
+    return success;
+    // Bouml preserved body end 0014CCAA
+}
+
+bool TreeModel::removeRows(int position, int rows, const QModelIndex & parent)
+{
+    // Bouml preserved body begin 0014CD2A
+    //TRACE_FUNCTION;
+    TreeItemInterface *parentItem = getItem(parent);
+    bool success = true;
+
+    beginRemoveRows(parent, position, position + rows - 1);
+    success = parentItem->removeChildren(position, rows);
+    endRemoveRows();
+    //emit dataChanged(this->index(position, 0, parent), this->index(position + rows - 1, columnCount(), parent));
+
+    return success;
+    // Bouml preserved body end 0014CD2A
+}
+
+void TreeModel::reset()
+{
+    //QAbstractItemModel::reset();
+    beginResetModel();
+    endResetModel();
+}
+
+
diff --git a/src/Libs/L_UniversalModels/src/genericeventfilter.cpp b/src/Libs/L_UniversalModels/src/genericeventfilter.cpp
new file mode 100644
index 000000000..deac66d62
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/genericeventfilter.cpp
@@ -0,0 +1,49 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#include "include/genericeventfilter.h"
+GenericEventFilter::GenericEventFilter(QObject* parent):QObject(parent)
+{
+
+}
+GenericEventFilter::~GenericEventFilter()
+{}
+
+bool GenericEventFilter::eventFilter(QObject *obj, QEvent *event)
+{
+    if(eventProcessor != 0)
+    {
+        if(eventProcessor(obj, event))
+        {
+            event->accept();
+            return true;
+        }
+        else return false;
+    }
+    else
+        return false;
+}
+void GenericEventFilter::SetEventProcessor(std::function<bool(QObject *, QEvent *)> processor)
+{
+    eventProcessor = processor;
+}
diff --git a/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp b/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp
new file mode 100644
index 000000000..7aa208f1b
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp
@@ -0,0 +1,71 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#include "include/treeviewfunctions.h"
+#include <QTreeView>
+#include <functional>
+namespace TreeFunctions
+{
+void ApplyNodePathExpandState(QStringList & nodes,
+                      QTreeView * view,
+                      QAbstractItemModel * model,
+                      const QModelIndex startIndex,
+                      QString path)
+{
+    // Bouml preserved body begin 00201FAA
+    path+=QString::number(startIndex.row()) + QString::number(startIndex.column());
+    for(int i(0); i < model->rowCount(startIndex); ++i)
+    {
+        QModelIndex nextIndex = model->index(i, 0, startIndex);
+        QString nextPath = path + QString::number(nextIndex.row()) + QString::number(nextIndex.column());
+        if(!nodes.contains(nextPath))
+            continue;
+        ApplyNodePathExpandState(nodes, view, model, nextIndex, path);
+    }
+    if(nodes.contains(path))
+        view->setExpanded( startIndex.sibling(startIndex.row(), 0), true );
+    // Bouml preserved body end 00201FAA
+}
+
+void StoreNodePathExpandState(QStringList & nodes,
+                      QTreeView * view,
+                      QAbstractItemModel * model,
+                      const QModelIndex startIndex,
+                      QString path)
+{
+    // Bouml preserved body begin 002020AA
+    path+=QString::number(startIndex.row()) + QString::number(startIndex.column());
+    for(int i(0); i < model->rowCount(startIndex); ++i)
+    {
+        if(!view->isExpanded(model->index(i, 0, startIndex)))
+            continue;
+        StoreNodePathExpandState(nodes, view, model, model->index(i, 0, startIndex), path);
+    }
+
+    if(view->isExpanded(startIndex))
+        nodes << path;
+    // Bouml preserved body end 002020AA
+}
+
+
+}
diff --git a/src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp b/src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp
new file mode 100644
index 000000000..26d3a04f5
--- /dev/null
+++ b/src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp
@@ -0,0 +1,29 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#include "include/treeviewtemplatefunctions.h"
+#include "include/treeviewfunctions.h"
+namespace TreeFunctions
+{
+
+}
diff --git a/src/Logging/QsLogDest.cpp b/src/Logging/QsLogDest.cpp
index 30b0aa6af..3830c4ca4 100644
--- a/src/Logging/QsLogDest.cpp
+++ b/src/Logging/QsLogDest.cpp
@@ -37,7 +37,7 @@ class FileDestination : public Destination
 {
 public:
     FileDestination(const QString & filePath);
-    virtual void write(const QString & message);
+    virtual void write(const QString & message) override;
 
 private:
     QFile mFile;
@@ -62,7 +62,7 @@ void FileDestination::write(const QString & message)
 class DebugOutputDestination : public Destination
 {
 public:
-    virtual void write(const QString & message);
+    virtual void write(const QString & message) override;
 };
 
 void DebugOutputDestination::write(const QString & message)
diff --git a/src/PhpGenerator/PhpGenerator.pro b/src/PhpGenerator/PhpGenerator.pro
index 8e7598627..d99e625ba 100644
--- a/src/PhpGenerator/PhpGenerator.pro
+++ b/src/PhpGenerator/PhpGenerator.pro
@@ -1,5 +1,8 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES          = UmlClassItem.cpp UmlAttribute.cpp \
         UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \
         UmlExtraClassMember.cpp UmlArtifact.cpp \
@@ -94,20 +97,20 @@ SOURCES          = UmlClassItem.cpp UmlAttribute.cpp \
     ../Logging/QsLog.cpp \
     ../Logging/QsDebugOutput.cpp
 TARGET          = php_generator
-DEFINES          = WITHPHP
-INCLUDEPATH   = ../Tools ../PhpGenerator ../
-DESTDIR = ../../bin
+DEFINES          += WITHPHP FALSE=false TRUE=true
+INCLUDEPATH   += ../Tools ../PhpGenerator ../
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network
+#qt3support
 
-QMAKE_CXXFLAGS += -std=gnu++11
-Release{
-    MOC_DIR = ../../bin/MOC_release/php_gen
-    OBJECTS_DIR = ../../bin/Obj_release/php_gen
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/php_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_release/php_generator
 }
-
-Debug{
-    MOC_DIR = ../../bin/MOC_debug/php_gen
-    OBJECTS_DIR = ../../bin/Obj_debug/php_gen
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/php_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/php_generator
 }
diff --git a/src/PhpGenerator/UmlArtifact.cpp b/src/PhpGenerator/UmlArtifact.cpp
index 3c765dcb6..db7897db4 100644
--- a/src/PhpGenerator/UmlArtifact.cpp
+++ b/src/PhpGenerator/UmlArtifact.cpp
@@ -75,7 +75,7 @@ void UmlArtifact::generate()
                              + name + "</i> in " + path + "</i></font><br>");
 
         // get bodies if preserve
-        const Q3PtrVector<UmlClass> & cls = associatedClasses();
+        const QVector<UmlClass*> & cls = associatedClasses();
 
         if (preserve())
             UmlOperation::read_bodies(path);
diff --git a/src/PhpGenerator/UmlArtifact.h b/src/PhpGenerator/UmlArtifact.h
index ac03899d9..14a221d9b 100644
--- a/src/PhpGenerator/UmlArtifact.h
+++ b/src/PhpGenerator/UmlArtifact.h
@@ -28,10 +28,7 @@
 #ifndef UMLARTIFACT_H
 #define UMLARTIFACT_H
 
-#include <q3asciidict.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
-
 #include "UmlBaseArtifact.h"
 
 class UmlPackage;
diff --git a/src/PhpGenerator/UmlClass.cpp b/src/PhpGenerator/UmlClass.cpp
index 816151ddd..40c76bb69 100644
--- a/src/PhpGenerator/UmlClass.cpp
+++ b/src/PhpGenerator/UmlClass.cpp
@@ -73,7 +73,7 @@ void UmlClass::generate(QTextStream & f, WrapperStr indent)
     if (stereotype == "ignored")
         return;
 
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     const unsigned sup = ch.size();
     bool an_enum = (stereotype == "enum");
     int enum_item_rank = 0;
@@ -220,7 +220,7 @@ void UmlClass::generate(QTextStream &, const WrapperStr &, WrapperStr, int &)
 void UmlClass::generate_require_onces(QTextStream & f, WrapperStr & made)
 {
     if (!phpDecl().isEmpty()) {
-        Q3PtrVector<UmlItem> ch = children();
+        QVector<UmlItem*> ch = children();
         unsigned index;
         const unsigned sup = ch.size();
 
@@ -255,9 +255,9 @@ void UmlClass::generate_require_onces(QTextStream & f, WrapperStr & made,
             else if ((index = s.find("${Name}")) != -1)
                 s.replace(index, 7, capitalize(name()));
             else if ((index = s.find("${NAME}")) != -1)
-                s.replace(index, 7, name().upper());
+                s.replace(index, 7, name().upper().toLatin1().constData());
             else if ((index = s.find("${nAME}")) != -1)
-                s.replace(index, 7, name().lower());
+                s.replace(index, 7, name().lower().toLatin1().constData());
             else
                 break;
         }
@@ -343,9 +343,9 @@ void UmlClass::write(QTextStream & f)
         else if ((index = s.find("${Name}")) != -1)
             s.replace(index, 7, capitalize(name()));
         else if ((index = s.find("${NAME}")) != -1)
-            s.replace(index, 7, name().upper());
+            s.replace(index, 7, name().upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            s.replace(index, 7, name().lower());
+            s.replace(index, 7, name().lower().toLatin1().constData());
 
         f << s;
     }
diff --git a/src/PhpGenerator/UmlClass.h b/src/PhpGenerator/UmlClass.h
index f3f9fe066..dc730a3b5 100644
--- a/src/PhpGenerator/UmlClass.h
+++ b/src/PhpGenerator/UmlClass.h
@@ -28,7 +28,7 @@
 #ifndef UMLCLASS_H
 #define UMLCLASS_H
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
diff --git a/src/PhpGenerator/UmlClassItem.h b/src/PhpGenerator/UmlClassItem.h
index 192a9f632..83ec3fa7b 100644
--- a/src/PhpGenerator/UmlClassItem.h
+++ b/src/PhpGenerator/UmlClassItem.h
@@ -28,7 +28,7 @@
 #ifndef UMLCLASSITEM_H
 #define UMLCLASSITEM_H
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
@@ -45,6 +45,7 @@ class UmlClassItem : public UmlBaseClassItem
         : UmlBaseClassItem(id, n) {
     };
 
+    using UmlBaseClassItem::generate;    
     virtual void generate(QTextStream & f, const WrapperStr & cl_stereotype,
                           WrapperStr indent, int & enum_item_rank) = 0;
 };
diff --git a/src/PhpGenerator/UmlClassMember.cpp b/src/PhpGenerator/UmlClassMember.cpp
index ee43406cd..b5d35a987 100644
--- a/src/PhpGenerator/UmlClassMember.cpp
+++ b/src/PhpGenerator/UmlClassMember.cpp
@@ -112,7 +112,7 @@ void UmlClassMember::generate_visibility(QTextStream & f)
 }
 
 /*
-bool UmlClassMember::compute_dependency(Q3PtrList<PhpRefType> & dependencies,
+bool UmlClassMember::compute_dependency(QList<PhpRefType *> & dependencies,
 					WrapperStr decl, const UmlTypeSpec & t)
 {
   remove_comments(decl);
diff --git a/src/PhpGenerator/UmlClassView.cpp b/src/PhpGenerator/UmlClassView.cpp
index abe804ded..c0b1747e8 100644
--- a/src/PhpGenerator/UmlClassView.cpp
+++ b/src/PhpGenerator/UmlClassView.cpp
@@ -29,9 +29,9 @@
 
 void UmlClassView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/PhpGenerator/UmlDeploymentView.cpp b/src/PhpGenerator/UmlDeploymentView.cpp
index c34ceb554..87d719f8e 100644
--- a/src/PhpGenerator/UmlDeploymentView.cpp
+++ b/src/PhpGenerator/UmlDeploymentView.cpp
@@ -29,8 +29,8 @@
 
 void UmlDeploymentView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
diff --git a/src/PhpGenerator/UmlExtraClassMember.cpp b/src/PhpGenerator/UmlExtraClassMember.cpp
index 1d46a383d..84cbed63d 100644
--- a/src/PhpGenerator/UmlExtraClassMember.cpp
+++ b/src/PhpGenerator/UmlExtraClassMember.cpp
@@ -33,7 +33,7 @@
 #include "UmlExtraClassMember.h"
 
 /*
-void UmlExtraClassMember::compute_dependency(Q3PtrList<PhpRefType> &, WrapperStr) {
+void UmlExtraClassMember::compute_dependency(QList<PhpRefType *> &, WrapperStr) {
   // does nothing
 }
 */
diff --git a/src/PhpGenerator/UmlItem.cpp b/src/PhpGenerator/UmlItem.cpp
index ff83c28a6..d7ff9968a 100644
--- a/src/PhpGenerator/UmlItem.cpp
+++ b/src/PhpGenerator/UmlItem.cpp
@@ -39,7 +39,7 @@ UmlItem::~UmlItem()
 void UmlItem::manage_comment(const char *& p, const char *& pp,
                              bool javadoc)
 {
-    static QString the_comment;
+    static QByteArray the_comment;
 
     p += 10;
 
@@ -92,7 +92,7 @@ void UmlItem::manage_comment(const char *& p, const char *& pp,
 
 void UmlItem::manage_description(const char *& p, const char *& pp)
 {
-    static QString the_comment;
+    static QByteArray the_comment;
 
     p += 14;
 
@@ -100,7 +100,7 @@ void UmlItem::manage_description(const char *& p, const char *& pp)
         description().isEmpty())
         return;
 
-    the_comment = description().operator QString();
+    the_comment = description().operator QString().toLatin1();
 
     switch (*p) {
     case 0:
@@ -112,7 +112,7 @@ void UmlItem::manage_description(const char *& p, const char *& pp)
     }
 
     pp = p;
-    p = the_comment;
+    p = the_comment.constData();
 }
 
 void UmlItem::manage_alias(const char *& p, QTextStream & ts)
@@ -121,7 +121,7 @@ void UmlItem::manage_alias(const char *& p, QTextStream & ts)
     const char * pclosed;
 
     if ((p[1] == '{') && ((pclosed = strchr(p + 2, '}')) != 0)) {
-        Q3CString key(p + 2, pclosed - p - 1);
+        QByteArray key(p + 2, pclosed - p - 1);
         WrapperStr value;
         UmlItem * node = this;
 
diff --git a/src/PhpGenerator/UmlOperation.cpp b/src/PhpGenerator/UmlOperation.cpp
index 626476306..61fad7ddd 100644
--- a/src/PhpGenerator/UmlOperation.cpp
+++ b/src/PhpGenerator/UmlOperation.cpp
@@ -32,7 +32,7 @@
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
 
 #include "UmlOperation.h"
@@ -44,14 +44,14 @@
 #include "util.h"
 
 // to manage preserved bodies, the key is the id under bouml
-Q3IntDict<char> UmlOperation::bodies(127);
+QHash<int,char*> UmlOperation::bodies;
 const char * BodyPrefix = "// Bouml preserved body begin ";
 const char * BodyPostfix = "// Bouml preserved body end ";
 const int BodyPrefixLength = 30;
 const int BodyPostfixLength = 28;
 
-static bool generate_type(const Q3ValueList<UmlParameter> & params,
-                          unsigned rank, QTextStream & f)
+static bool generate_type(const QList<UmlParameter> & params,
+                          int rank, QTextStream & f)
 {
     if (rank >= params.count())
         return FALSE;
@@ -60,8 +60,8 @@ static bool generate_type(const Q3ValueList<UmlParameter> & params,
     return TRUE;
 }
 
-static bool generate_var(const Q3ValueList<UmlParameter> & params,
-                         unsigned rank, QTextStream & f)
+static bool generate_var(const QList<UmlParameter> & params,
+                         int rank, QTextStream & f)
 {
     if (rank >= params.count())
         return FALSE;
@@ -70,8 +70,8 @@ static bool generate_var(const Q3ValueList<UmlParameter> & params,
     return TRUE;
 }
 
-static bool generate_init(const Q3ValueList<UmlParameter> & params,
-                          unsigned rank, QTextStream & f)
+static bool generate_init(const QList<UmlParameter> & params,
+                          int rank, QTextStream & f)
 {
     if (rank >= params.count())
         return FALSE;
@@ -111,9 +111,9 @@ WrapperStr UmlOperation::compute_name()
         else if ((index = get_set_spec.find("${Name}")) != -1)
             get_set_spec.replace(index, 7, capitalize(s));
         else if ((index = s.find("${NAME}")) != -1)
-            get_set_spec.replace(index, 7, s.upper());
+            get_set_spec.replace(index, 7, s.upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            get_set_spec.replace(index, 7, s.lower());
+            get_set_spec.replace(index, 7, s.lower().toLatin1().constData());
 
         return get_set_spec;
     }
@@ -128,6 +128,8 @@ const char * UmlOperation::generate_body(QTextStream & f,
         WrapperStr indent,
         const char * p)
 {
+    if(isAbstract())
+        return p + 7;
     const char * body = 0;
     WrapperStr modeler_body;
     bool no_indent;
@@ -137,7 +139,7 @@ const char * UmlOperation::generate_body(QTextStream & f,
         unsigned id = get_id();
 
         sprintf(s_id, "%08X", id);
-        body = bodies.find((long) id);
+        body = bodies.value(id);
     }
 
     if (body == 0) {
@@ -198,7 +200,7 @@ void UmlOperation::generate(QTextStream & f, const WrapperStr & cl_stereotype,
         const char * p = phpDecl();
         const char * pp = 0;
         const char * afterparam = 0;
-        const Q3ValueList<UmlParameter> & params = this->params();
+        const QList<UmlParameter> & params = this->params();
         unsigned rank;
         const char * body_indent = strstr(p, "${body}");
 
@@ -362,8 +364,8 @@ void UmlOperation::generate_require_onces(QTextStream & f, WrapperStr & made)
 
         s = s.mid((unsigned) index1, (unsigned)(index2 - index1));
 
-        const Q3ValueList<UmlParameter> & params = this->params();
-        Q3ValueListConstIterator<UmlParameter> it;
+        const QList<UmlParameter> & params = this->params();
+        QList<UmlParameter>::ConstIterator it;
         unsigned rank;
         char ti[16];
 
@@ -388,10 +390,10 @@ static char * read_file(const char * filename)
 
     if (fp.open(QIODevice::ReadOnly)) {
         QFileInfo fi(fp);
-        int size = fi.size();
+        qint64 size = fi.size();
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) == -1) {
+        if (fp.read(s, size) == -1) {
             delete [] s;
             return 0;
         }
@@ -405,7 +407,7 @@ static char * read_file(const char * filename)
         return 0;
 }
 
-static void read_bodies(const char * path, Q3IntDict<char> & bodies)
+static void read_bodies(const char * path, QHash<int,char*> & bodies)
 {
     char * s = read_file(path);
 
@@ -426,7 +428,7 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
                 UmlCom::fatal_error("read_bodies 1");
             }
 
-            if (bodies.find(id) != 0) {
+            if (bodies.value(id) != 0) {
                 UmlCom::trace(WrapperStr("<font  color =\"red\"> Error in ") + path +
                               " : preserve body identifier used twice</font><br>");
                 UmlCom::bye(n_errors() + 1);
@@ -460,7 +462,7 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
 
             *p2 = 0;
 
-            int len = p2 - body + 1;
+            ptrdiff_t len = p2 - body + 1;
             char * b = new char[len];
 
             memcpy(b, body, len);
@@ -475,7 +477,11 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
 
 void UmlOperation::read_bodies(const char * path)
 {
-    bodies.setAutoDelete(TRUE);
+    //bodies.setAutoDelete(TRUE);
+    QHashIterator<int,char*> it(bodies);
+    while(it.hasNext())
+        delete it.next().value();
+
     bodies.clear();
     ::read_bodies(path, bodies);
 }
diff --git a/src/PhpGenerator/UmlOperation.h b/src/PhpGenerator/UmlOperation.h
index 0bdcf12bc..ae1bc9fd5 100644
--- a/src/PhpGenerator/UmlOperation.h
+++ b/src/PhpGenerator/UmlOperation.h
@@ -28,11 +28,9 @@
 #ifndef UMLOPERATION_H
 #define UMLOPERATION_H
 
-#include <q3intdict.h>
-//Added by qt3to4:
+
 #include "misc/mystr.h"
 #include <QTextStream>
-
 #include "UmlBaseOperation.h"
 
 class QTextStream;
@@ -40,7 +38,7 @@ class QTextStream;
 class UmlOperation : public UmlBaseOperation
 {
 private:
-    static Q3IntDict<char> bodies;
+    static QHash<int,char*> bodies;
 
 public:
     UmlOperation(void * id, const WrapperStr & n)
diff --git a/src/PhpGenerator/UmlPackage.cpp b/src/PhpGenerator/UmlPackage.cpp
index 648c556fa..b364eef18 100644
--- a/src/PhpGenerator/UmlPackage.cpp
+++ b/src/PhpGenerator/UmlPackage.cpp
@@ -47,8 +47,8 @@ static WrapperStr RootDir;
 static WrapperStr relative_path(const QDir & destdir, WrapperStr relto)
 {
     QDir fromdir(relto);
-    WrapperStr from = WrapperStr(fromdir.absPath().toAscii().constData());
-    WrapperStr to = WrapperStr(destdir.absPath().toAscii().constData());
+    WrapperStr from = WrapperStr(fromdir.absolutePath().toLatin1().constData());
+    WrapperStr to = WrapperStr(destdir.absolutePath().toLatin1().constData());
     const char * cfrom = from;
     const char * cto = to;
     int lastsep = -1;
@@ -119,7 +119,7 @@ WrapperStr UmlPackage::rootDir()
         if (!RootDir.isEmpty() && // empty -> error
             QDir::isRelativePath(RootDir)) {
             QFileInfo f(getProject()->supportFile());
-            QDir d(f.dirPath());
+            QDir d(f.path());
 
             RootDir = d.filePath(RootDir);
         }
@@ -171,7 +171,7 @@ WrapperStr UmlPackage::file_path(const WrapperStr & f, WrapperStr relto)
                 s.replace(index++, 1, "/");
         }
 
-        s = QDir::cleanDirPath(s) + "/";
+        s = QDir::cleanPath(s) + "/";
         index = s.find("/");
 
         int index2;
@@ -194,7 +194,7 @@ WrapperStr UmlPackage::file_path(const WrapperStr & f, WrapperStr relto)
     }
 
     WrapperStr df = (dir.file_absolute || relto.isEmpty())
-                   ? WrapperStr(d.filePath(f).toAscii().constData())
+                   ? WrapperStr(d.filePath(f).toLatin1().constData())
                    : relative_path(d, relto) + f;
 
     if (PhpSettings::isRelativePath() && (df[0] != '/') && (df[0] != '.'))
@@ -212,9 +212,9 @@ WrapperStr UmlPackage::text_path(const WrapperStr & f)
 
 void UmlPackage::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/PhpGenerator/main.cpp b/src/PhpGenerator/main.cpp
index c1b4407db..450e1ce39 100644
--- a/src/PhpGenerator/main.cpp
+++ b/src/PhpGenerator/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char ** argv)
             s = "<hr><font face=helvetica>Generation done : %1 warnings, %2 errors</font><br>";
             s=s.arg(QString::number(n_warnings())).arg(QString::number(n_errors()));
 
-            UmlCom::trace(s);
+            UmlCom::trace(s.toLatin1().constData());
 
             UmlCom::showTrace();
             UmlCom::message("");
diff --git a/src/PhpGenerator/util.cpp b/src/PhpGenerator/util.cpp
index df02261b5..3cd0b56ab 100644
--- a/src/PhpGenerator/util.cpp
+++ b/src/PhpGenerator/util.cpp
@@ -80,7 +80,7 @@ WrapperStr current_indent(const char * p, const char * begin)
     while ((p != begin) && ((p[-1] == ' ') || (p[-1] == '\t')))
         indent.prepend(*--p);
 
-    return WrapperStr(indent.toAscii().constData());
+    return WrapperStr(indent.toLatin1().constData());
 }
 
 //
diff --git a/src/PhpGenerator/util.h b/src/PhpGenerator/util.h
index 02f08d18c..c925d4859 100644
--- a/src/PhpGenerator/util.h
+++ b/src/PhpGenerator/util.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef _UTIL_H
-#define _UTIL_h
+#define _UTIL_H
 
 #include <qstring.h>
 //Added by qt3to4:
diff --git a/src/PhpReverse/BrowserNode.h b/src/PhpReverse/BrowserNode.h
index 6c84770e9..76ab54d74 100644
--- a/src/PhpReverse/BrowserNode.h
+++ b/src/PhpReverse/BrowserNode.h
@@ -31,8 +31,8 @@
 #include "TreeItem.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3PtrCollection>
-#include <Q3PtrList>
+
+
 
 #ifndef REVERSE
 class BrowserView;
@@ -69,9 +69,9 @@ class BrowserNode : public TreeItem
 
 // a sortable list of BrowserNode
 
-#include <q3ptrlist.h>
 
-class BrowserNodeList : public Q3PtrList<BrowserNode>
+
+class BrowserNodeList : public QList<BrowserNode *>
 {
 public:
     void search(BrowserNode * bn, int k, const QString & s, bool cs);
diff --git a/src/PhpReverse/Class.cpp b/src/PhpReverse/Class.cpp
index e0e1de7b3..b534b3a3d 100644
--- a/src/PhpReverse/Class.cpp
+++ b/src/PhpReverse/Class.cpp
@@ -31,7 +31,7 @@
 #include "misc/mystr.h"
 #include <QPixmap>
 //Added by qt3to4:
-#include <Q3PtrList>
+
 using namespace std;
 #endif
 
@@ -64,7 +64,7 @@ using namespace std;
 #include "Pixmap.h"
 #include "ShowFileDialog.h"
 
-Q3PtrList<Class> Class::Historic;
+QList<Class *> Class::Historic;
 #endif
 
 Class::Class(Package * p, const char * n, char st)
@@ -86,16 +86,16 @@ UmlClass * Class::get_uml()
 
     UmlItem * p = // no nested classe in php
         (UmlItem *)((Package *) parent())->get_uml()->get_classview(get_namespace());
-    WrapperStr str = WrapperStr(text(0).toAscii().constData());
+    WrapperStr str = WrapperStr(text(0).toLatin1().constData());
 
     uml = UmlBaseClass::create(p, str);
 
     if (uml == 0) {
         // probably already exist
-        Q3PtrVector<UmlItem> ch = p->children();
+        QVector<UmlItem*> ch = p->children();
         UmlItem * x;
 
-        for (unsigned chindex = 0; chindex != ch.size(); chindex += 1) {
+        for (int chindex = 0; chindex != ch.size(); chindex += 1) {
             if (((x = ch[chindex])->kind() == aClass) && (x->name() == str)) {
                 uml = (UmlClass *) x;
                 break;
@@ -105,9 +105,9 @@ UmlClass * Class::get_uml()
         if (uml == 0) {
 #ifdef REVERSE
             UmlCom::message("");
-            UmlCom::trace(QString("<font face=helvetica><b>cannot create class <i>")
+            UmlCom::trace(QString(QString("<font face=helvetica><b>cannot create class <i>")
                           + text(0) + "</i> under <i>"
-                          + parent()->text(0) + "</b></font><br>");
+                          + parent()->text(0) + "</b></font><br>").toLatin1().constData());
             throw 0;
 #else
             QMessageBox::critical(0, "Fatal Error",
@@ -138,9 +138,9 @@ UmlClass * Class::get_uml()
 
 bool Class::already_in_bouml()
 {
-    Q3PtrVector<UmlItem> ch = get_uml()->children();
+    QVector<UmlItem*> ch = get_uml()->children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         if (ch[index]->kind() != aClass)
             return TRUE;
 
@@ -208,7 +208,7 @@ bool Class::reverse(Package * container, WrapperStr stereotype,
     }
 
     if (Package::scanning()) {
-        char c = s.operator QString().toAscii().at(0);
+        char c = s.operator QString().toLatin1().at(0);
 
         while (c != '{') {
             if ((c = Lex::read_word_bis()) == 0)
diff --git a/src/PhpReverse/Class.h b/src/PhpReverse/Class.h
index 9c0721697..73a819953 100644
--- a/src/PhpReverse/Class.h
+++ b/src/PhpReverse/Class.h
@@ -35,7 +35,7 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include "misc/mystr.h"
-#include <Q3PtrList>
+
 
 class Package;
 class UmlArtifact;
@@ -60,7 +60,7 @@ class Class : public BrowserNode
     bool description_updatedp;
     WrapperStr description;
 
-    static Q3PtrList<Class> Historic;
+    static QList<Class *> Historic;
 #endif
 
     bool manage_extends(ClassContainer * container);
diff --git a/src/PhpReverse/ClassContainer.h b/src/PhpReverse/ClassContainer.h
index 925b81a66..6226ba9f2 100644
--- a/src/PhpReverse/ClassContainer.h
+++ b/src/PhpReverse/ClassContainer.h
@@ -28,7 +28,7 @@
 #ifndef _CLASS_CONTAINER_H
 #define _CLASS_CONTAINER_H
 
-#include <q3dict.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include "UmlClass.h"
@@ -50,7 +50,7 @@ class ClassContainer
     bool bypass_type(WrapperStr s);
 
 protected:
-    Q3Dict<Class> Defined;
+    QHash<WrapperStr,Class*> Defined;
 };
 
 #endif
diff --git a/src/PhpReverse/Lex.cpp b/src/PhpReverse/Lex.cpp
index 37ae06b12..5474e3253 100644
--- a/src/PhpReverse/Lex.cpp
+++ b/src/PhpReverse/Lex.cpp
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 // lexer written by hand rather than using [f]lex as usual,
-// BOUML is also my first development including a source code
+// DOUML is also my first development including a source code
 // reader where I do not use yacc/bison, to see how it is
 // without ...
 
@@ -104,7 +104,7 @@ bool Lex::open(const QString & f)
     context.mark = 0;
 
     QFile in(f);
-    unsigned sz;
+    qint64 sz;
 
     if (!in.open(QIODevice::ReadOnly) ||
         ((context.buffer = new char[(sz = in.size()) + 1]) == 0))
@@ -112,7 +112,7 @@ bool Lex::open(const QString & f)
 
     unsigned offset = 0;
 
-    do offset += in.readBlock(context.buffer + offset, sz - offset);
+    do offset += in.read(context.buffer + offset, sz - offset);
 
     while (offset != sz);
 
@@ -295,7 +295,7 @@ WrapperStr Lex::manage_operator(QString & result, int c)
 #ifdef TRACE
     QLOG_INFO() << "retourne '" << result << "'\n";
 #endif
-    return WrapperStr(result.toAscii().constData());
+    return WrapperStr(result.toLatin1().constData());
 }
 
 char Lex::bypass_operator(int c)
@@ -365,7 +365,7 @@ WrapperStr Lex::read_string()
             break;
 
         case '"':
-            return WrapperStr((result += c).toAscii().constData());
+            return WrapperStr((result += c).toLatin1().constData());
 
         default:
             result += c;
@@ -572,13 +572,13 @@ WrapperStr Lex::read_word()
         QLOG_INFO() << "retourne '" << result << "'\n";
 
 #endif
-    return WrapperStr(result.toAscii().constData());
+    return WrapperStr(result.toLatin1().constData());
 }
 
 char Lex::read_word_bis()
 {
     if (!context.reread.isEmpty()) {
-        char result = context.reread[0].latin1();
+        char result = context.reread[0].toLatin1();
 
         context.reread = QString();
         return result;
@@ -699,7 +699,7 @@ void Lex::finish_line()
 
 WrapperStr Lex::get_comments()
 {
-    WrapperStr result = WrapperStr(context.comments.toAscii().constData());
+    WrapperStr result = WrapperStr(context.comments.toLatin1().constData());
 
     context.comments = QString();
     return result;
@@ -707,7 +707,7 @@ WrapperStr Lex::get_comments()
 
 WrapperStr Lex::get_comments(WrapperStr & co)
 {
-    WrapperStr result = WrapperStr(context.comments.toAscii().constData());
+    WrapperStr result = WrapperStr(context.comments.toLatin1().constData());
 
     context.comments = QString();
 
@@ -718,7 +718,7 @@ WrapperStr Lex::get_comments(WrapperStr & co)
 
 WrapperStr Lex::get_description()
 {
-    WrapperStr result = WrapperStr(context.description.toAscii().constData());
+    WrapperStr result = WrapperStr(context.description.toLatin1().constData());
 
     context.description = QString();
     return result;
@@ -726,7 +726,7 @@ WrapperStr Lex::get_description()
 
 WrapperStr Lex::get_description(WrapperStr & co)
 {
-    WrapperStr result = WrapperStr(context.description.toAscii().constData());
+    WrapperStr result = WrapperStr(context.description.toLatin1().constData());
 
     context.description = QString();
 
@@ -768,7 +768,7 @@ WrapperStr Lex::region()
 void Lex::syntax_error(WrapperStr s)
 {
     PhpCatWindow::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                        + WrapperStr(context.filename.toAscii().constData()) + "</i> line " +
+                        + WrapperStr(context.filename.toLatin1().constData()) + "</i> line " +
                         WrapperStr().setNum(context.line_number) + " <b>"
                         + s + "</b></font><br>");
 
@@ -781,7 +781,7 @@ void Lex::syntax_error(WrapperStr s)
 void Lex::premature_eof()
 {
     PhpCatWindow::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                        + WrapperStr(context.filename.toAscii().constData()) + "</i> line " +
+                        + WrapperStr(context.filename.toLatin1().constData()) + "</i> line " +
                         WrapperStr().setNum(context.line_number) +
                         " <b>premature eof</b></font><br>");
 
@@ -794,7 +794,7 @@ void Lex::premature_eof()
 void Lex::error_near(WrapperStr s)
 {
     PhpCatWindow::trace(WrapperStr("<font face=helvetica>syntax error in <i> ")
-                        + WrapperStr(context.filename.toAscii().constData()) + "</i> line " +
+                        + WrapperStr(context.filename.toLatin1().constData()) + "</i> line " +
                         WrapperStr().setNum(context.line_number) + " <b>near <font color =\"red\">"
                         + quote(s) + "</font></b></font><br>");
 
diff --git a/src/PhpReverse/Namespace.cpp b/src/PhpReverse/Namespace.cpp
index 632fe7daa..5bcd20eeb 100644
--- a/src/PhpReverse/Namespace.cpp
+++ b/src/PhpReverse/Namespace.cpp
@@ -91,5 +91,5 @@ WrapperStr Namespace::current()
 
     QString & s = Stack.last();
 
-    return WrapperStr(s.left(s.length() - 1).toAscii().constData());
+    return WrapperStr(s.left(s.length() - 1).toLatin1().constData());
 }
diff --git a/src/PhpReverse/Namespace.h b/src/PhpReverse/Namespace.h
index d6aa2211e..4cf4c3c99 100644
--- a/src/PhpReverse/Namespace.h
+++ b/src/PhpReverse/Namespace.h
@@ -28,10 +28,10 @@
 #ifndef NAMESPACE_H
 #define NAMESPACE_H
 
-#include <q3valuelist.h>
+#include <QList>
 #include <qstringlist.h>
 #include "misc/mystr.h"
-#include <q3dict.h>
+
 #include <qmap.h>
 
 #include "Lex.h"
@@ -50,7 +50,7 @@ class Namespace
     }
 
     static void add_alias(const WrapperStr & a, const WrapperStr & s) {
-        Aliases.replace(a.operator QString(), s);
+        Aliases[a.operator QString()]= s;
     }
     static void clear_aliases() {
         Aliases.clear();
@@ -74,28 +74,28 @@ class NDict
 public:
     NDict() {}
     NDict(unsigned n) {
-        d.resize(n);
+        d.reserve(n);
     }
 
-    void insert(const WrapperStr & key, const T * item);
-    void replace(const WrapperStr & key, const T * item);
+    void insert(const WrapperStr & key, T *item);
+    void replace(const WrapperStr & key, T *item);
     bool remove(const WrapperStr & key);
     T * operator[](const WrapperStr & key) const;
 
 private:
-    Q3Dict<T> d;
+    QHash<QString, T*> d;
 };
 
 template<class T>
-void NDict<T>::insert(const WrapperStr & key, const T * item)
+void NDict<T>::insert(const WrapperStr & key, T * item)
 {
     d.insert(Namespace::namespacify(key), item);
 }
 
 template<class T>
-void NDict<T>::replace(const WrapperStr & key, const T * item)
+void NDict<T>::replace(const WrapperStr & key, T * item)
 {
-    d.replace(Namespace::namespacify(key), item);
+    d.insert(Namespace::namespacify(key), item);
 }
 
 template<class T>
diff --git a/src/PhpReverse/Package.cpp b/src/PhpReverse/Package.cpp
index 7180c3dc1..96e803fd6 100644
--- a/src/PhpReverse/Package.cpp
+++ b/src/PhpReverse/Package.cpp
@@ -25,7 +25,7 @@
 //
 // *************************************************************************
 
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qapplication.h>
 #ifndef REVERSE
 #include <qmessagebox.h>
@@ -120,11 +120,11 @@ void Package::init(UmlPackage * r, QApplication * a)
     QString s;
 
     DirFilter = (!(s = (const char *) PhpSettings::reverseRoundtripDirRegExp()).isEmpty())
-                ? new QRegExp(s, PhpSettings::isReverseRoundtripDirRegExpCaseSensitive(), TRUE)
+                ? new QRegExp(s, (Qt::CaseSensitivity)PhpSettings::isReverseRoundtripDirRegExpCaseSensitive())
                 : 0;
 
     FileFilter = (!(s = (const char *) PhpSettings::reverseRoundtripFileRegExp()).isEmpty())
-                 ? new QRegExp(s, PhpSettings::isReverseRoundtripFileRegExpCaseSensitive(), TRUE)
+                 ? new QRegExp(s, (Qt::CaseSensitivity)PhpSettings::isReverseRoundtripFileRegExpCaseSensitive())
                  : 0;
 
     Ext = PhpSettings::sourceExtension().operator QString();
@@ -140,19 +140,18 @@ void Package::init(UmlPackage * r, QApplication * a)
 
 void Package::new_class(Class * cl)
 {
-    php_classes.insert((const char *) cl->text(0), cl);
+    php_classes.insert((const char *) cl->text(0).toLatin1().constData(), cl);
 }
 
 Package * Package::scan_dir()
 {
     // get input php source dir
 
-    QString path = Q3FileDialog::getExistingDirectory(QDir::currentDirPath(), 0, 0,
-                   "select the base directory to reverse");
+    QString path = QFileDialog::getExistingDirectory(0, "select the base directory to reverse", QDir::currentPath(), 0);
 
     if (! path.isEmpty()) {
         QDir d(path);
-        Package * p = new Package(root, path, d.dirName());
+        Package * p = new Package(root, path.toLatin1().constData(), d.dirName().toLatin1().constData());
 
         // scanning phase
 #ifndef REVERSE
@@ -188,7 +187,7 @@ void Package::progress_closed()
 static bool allowed(QRegExp * rg, QString f)
 {
     if (rg != 0) {
-        int matchLen;
+        //int matchLen;
         return rg->exactMatch(f);/*
     return ((rg->match(f, 0, &matchLen) != 0) ||
 	    (matchLen != (int) f.length()));*/
@@ -203,63 +202,34 @@ int Package::file_number(QDir & d, bool rec)
         return 0;
 
     int result = 0;
-//  const QFileInfoList * list = d.entryInfoList(QDir::Files | QDir::Readable);
-    /*
-     if (list != 0) {
-       QFileInfoListIterator it(*list);
-       QFileInfo * fi;
-
-       while ((fi = it.current()) != 0) {
-         if (fi->extension(FALSE) == Ext)
-    result += 1;
-         ++it;
-       }
-     }*/
 
     // Oh lord, Bruno is so used to cut-n-paste, I am getting sick.
     QFileInfoList list = d.entryInfoList(QDir::Files | QDir::Readable);
 
     if (!list.isEmpty()) {
         QFileInfoList::iterator it = list.begin();
+            int extIndex;
+            QString fileName;
 
-        while (it != list.end()) {
-            if ((*it).extension(FALSE) == Ext) result += 1;
-
-            it++;
+            for(;it != list.end(); ++it) {
+                fileName = (*it).fileName();
+                extIndex = fileName.lastIndexOf('.');
+                if (extIndex != -1 && fileName.mid(extIndex+1) == Ext) result += 1;
         }
     }
 
     if (rec) {
 //     // sub directories
-//     list = d.entryInfoList(QDir::Dirs | QDir::NoSymLinks);
-//
-//     if (list != 0) {
-//       QFileInfoListIterator itd(*list);
-//       QFileInfo * di;
-//
-//       while ((di = itd.current()) != 0) {
-// 	if (((const char *) di->fileName())[0] != '.') {
-// 	  QDir sd(di->filePath());
-//
-// 	  result += file_number(sd, rec);
-// 	}
-// 	++itd;
-//       }
-//     }
-//   }
-//
         list = d.entryInfoList(QDir::Dirs | QDir::NoSymLinks);
 
         if (!list.isEmpty()) {
             QFileInfoList::iterator it = list.begin();
 
-            while (it != list.end()) {
+            for(;it != list.end(); ++it){
                 if ((*it).fileName()[0] != '.') {
                     QDir sd((*it).filePath());
                     result += file_number(sd, rec);
                 }
-
-                it++;
             }
         }
     }
@@ -296,7 +266,7 @@ void Package::send_dir(bool rec)
 QString my_baseName(QFileInfo * fi)
 {
     QString fn = fi->fileName();
-    int index = fn.findRev('.');
+    int index = fn.lastIndexOf('.');
 
     return (index == -1)
            ? fn
@@ -314,31 +284,22 @@ void Package::reverse_directory(QDir & d, bool rec)
     if (!list.isEmpty()) {
         QFileInfoList::iterator it = list.begin();
 
-        while (it != list.end()) {
-            if ((*it).extension(FALSE) == Ext) {
+       for(;it != list.end(); ++it) {
+            int extIndex;
+            QString fileName;
+            fileName = (*it).fileName();
+            extIndex = fileName.lastIndexOf('.');
+            if (extIndex != -1 && fileName.mid(extIndex+1) == Ext){
+            //if ((*it).extension(FALSE) == Ext) {
                 if (allowed(FileFilter, (*it).fileName()))
-                    reverse_file(WrapperStr((*it).filePath().toAscii().constData()), WrapperStr(my_baseName(&(*it)).toAscii().constData()));
+                    reverse_file(WrapperStr((*it).filePath().toLatin1().constData()), WrapperStr(my_baseName(&(*it)).toLatin1().constData()));
 
                 if (progress)
                     progress->tic();
 
                 app->processEvents();
             }
-
-            ++it;
         }
-
-        /*
-            while ((fi = it.current()) != 0) {
-              if (fi->extension(FALSE) == Ext) {
-        	if (allowed(FileFilter, fi->fileName()))
-        	  reverse_file(WrapperStr(fi->filePath()), WrapperStr(my_baseName(fi)));
-        	if (progress)
-        	  progress->tic();
-        	app->processEvents();
-              }
-              ++it;
-            }*/
     }
 
     if (rec) {
@@ -348,18 +309,16 @@ void Package::reverse_directory(QDir & d, bool rec)
         if (!list.isEmpty()) {
             QFileInfoList::iterator itd = list.begin();
 
-            while (itd != list.end()) {
+            for(;itd != list.end(); ++itd) {
 
                 if ((*itd).fileName()[0] != '.') {
                     QDir sd((*itd).filePath());
 
-                    Package * p = find(WrapperStr(sd.dirName().toAscii().constData()), TRUE);
+                    Package * p = find(WrapperStr(sd.dirName().toLatin1().constData()), TRUE);
 
                     if (p != 0)
                         p->reverse_directory(sd, TRUE);
                 }
-
-                ++itd;
             }
         }
     }
@@ -613,9 +572,9 @@ void Package::use()
 
 void Package::update_class_list(WrapperStr pack, UmlItem * container)
 {
-    const Q3PtrVector<UmlItem> & ch = container->children();
+    const QVector<UmlItem*> & ch = container->children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         UmlItem * it = ch[i];
 
         switch (it->kind()) {
@@ -742,9 +701,8 @@ Package * Package::find(WrapperStr name, bool nohack)
         return this;
 
     Package * p = 0;
-    TreeItem * child;
 
-    for (child = firstChild(); child != 0; child = child->nextSibling()) {
+    foreach (TreeItem *child, children()) {
         if (((BrowserNode *) child)->isa_package() &&
             (child->text(0) == (const char *) name)) {
             p = (Package *) child;
@@ -780,20 +738,20 @@ Package * Package::package_unknown()
 UmlPackage * Package::get_uml(bool mandatory)
 {
     if (uml == 0) {
-        const char * name = text(0);
+        QString name = text(0);
         Package * pa = (Package *) parent();
         UmlPackage * uml_pa = pa->get_uml();	// will end on project
 
-        Q3PtrVector<UmlItem> ch = uml_pa->children();
+        QVector<UmlItem*> ch = uml_pa->children();
 
-        for (unsigned index = 0; index != ch.size(); index += 1) {
+        for (int index = 0; index != ch.size(); index += 1) {
             UmlItem * it = ch[index];
 
             if ((it->kind() == aPackage) && (it->name() == name))
                 return uml = (UmlPackage *) it;
         }
 
-        if ((uml = UmlBasePackage::create(uml_pa, name)) == 0) {
+        if ((uml = UmlBasePackage::create(uml_pa, name.toLatin1().constData())) == 0) {
             if (!mandatory)
                 return 0;
 
diff --git a/src/PhpReverse/phpreverse.pro b/src/PhpReverse/PhpReverse.pro
similarity index 89%
rename from src/PhpReverse/phpreverse.pro
rename to src/PhpReverse/PhpReverse.pro
index dd691ef3a..b6a6ee881 100644
--- a/src/PhpReverse/phpreverse.pro
+++ b/src/PhpReverse/PhpReverse.pro
@@ -1,6 +1,8 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
-HEADERS          = 
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+DEFINES += QT_DEPRECATED_WARNINGS
+HEADERS          =
 SOURCES          = main.cpp \
         UmlClassItem.cpp UmlArtifact.cpp \
         UmlAttribute.cpp UmlClass.cpp \
@@ -102,27 +104,24 @@ SOURCES          = main.cpp \
     ../Logging/QsDebugOutput.cpp
 
 TARGET          = php_reverse
-DEFINES          = WITHPHP REVERSE
-INCLUDEPATH   = ../Tools ../PhpReverse
+DEFINES          += WITHPHP REVERSE TRUE=true FALSE=false
+INCLUDEPATH   += ../Tools ../PhpReverse
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+#qt3support
 
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/php_rev/MOC_release
-    OBJECTS_DIR = bin/douml/php_rev/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/php_reverse
+    OBJECTS_DIR = $${DESTDIR}/obj_release/php_reverse
 }
-
-Debug{
-    MOC_DIR = bin/douml/php_rev/MOC_Debug
-    OBJECTS_DIR = bin/douml/php_rev/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/php_reverse
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/php_reverse
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/src/PhpReverse/Progress.cpp b/src/PhpReverse/Progress.cpp
index bba9b3854..9de51ba43 100644
--- a/src/PhpReverse/Progress.cpp
+++ b/src/PhpReverse/Progress.cpp
@@ -33,8 +33,9 @@
 #include "Package.h"
 
 Progress::Progress(int n, const char * lbl)
-    : Q3ProgressDialog(lbl, 0, n, 0, 0, FALSE, Qt::WDestructiveClose), n(0)
+    : QProgressDialog(lbl, 0, 0, n, 0, 0), n(0)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
     setMinimumDuration(1000);
 }
 
@@ -45,5 +46,5 @@ Progress::~Progress()
 
 void Progress::tic()
 {
-    setProgress(++n);
+    setValue(++n);
 }
diff --git a/src/PhpReverse/Progress.h b/src/PhpReverse/Progress.h
index 94e45f693..d2d7e790c 100644
--- a/src/PhpReverse/Progress.h
+++ b/src/PhpReverse/Progress.h
@@ -28,9 +28,9 @@
 #ifndef PROGRESS_H
 #define PROGRESS_H
 
-#include <q3progressdialog.h>
+#include <qprogressdialog.h>
 
-class Progress : public Q3ProgressDialog
+class Progress : public QProgressDialog
 {
 public:
     Progress(int, const char *);
diff --git a/src/PhpReverse/TreeItem.h b/src/PhpReverse/TreeItem.h
index d9b34dd79..d8affe291 100644
--- a/src/PhpReverse/TreeItem.h
+++ b/src/PhpReverse/TreeItem.h
@@ -1,5 +1,5 @@
 //Added by qt3to4:
-#include <Q3PtrList>
+
 // *************************************************************************
 //
 // Copyright 2004-2010 Bruno PAGES  .
@@ -39,14 +39,14 @@
 
 #else
 
-#include <q3ptrlist.h>
-#include <qstring.h>
+#include <QList>
+#include <QString>
 
 class TreeItem
 {
 private:
     TreeItem * its_parent;
-    Q3PtrList<TreeItem> its_children;
+    QList<TreeItem *> its_children;
     QString its_name;
 
 public:
@@ -62,12 +62,9 @@ class TreeItem
         return its_parent;
     };
 
-    TreeItem * firstChild() {
-        return its_children.first();
-    };
-    TreeItem * nextSibling() {
-        return its_parent->its_children.next();
-    };
+    const QList<TreeItem *> &children() const {
+        return its_children;
+    }
 };
 
 #endif
diff --git a/src/PhpReverse/UmlClassItem.h b/src/PhpReverse/UmlClassItem.h
index da06dacd0..831fc2303 100644
--- a/src/PhpReverse/UmlClassItem.h
+++ b/src/PhpReverse/UmlClassItem.h
@@ -28,7 +28,7 @@
 #ifndef CLASSITEM_H
 #define CLASSITEM_H
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 
diff --git a/src/PhpReverse/UmlFormalParameter.h b/src/PhpReverse/UmlFormalParameter.h
index e3bfd9857..a6ef1a0da 100644
--- a/src/PhpReverse/UmlFormalParameter.h
+++ b/src/PhpReverse/UmlFormalParameter.h
@@ -28,7 +28,7 @@
 #ifndef _UMLFORMALPARAMETER_H
 #define _UMLFORMALPARAMETER_H
 
-#include <q3valuelist.h>
+#include <QList>
 //Added by qt3to4:
 #include "misc/mystr.h"
 
@@ -47,6 +47,6 @@ class UmlFormalParameter : public UmlBaseFormalParameter
     UmlFormalParameter(WrapperStr n, const UmlTypeSpec & e);
 };
 
-typedef Q3ValueList<UmlFormalParameter> FormalParameterList;
+typedef QList<UmlFormalParameter> FormalParameterList;
 
 #endif
diff --git a/src/PhpReverse/UmlOperation.cpp b/src/PhpReverse/UmlOperation.cpp
index c4e4158fb..fce2b4365 100644
--- a/src/PhpReverse/UmlOperation.cpp
+++ b/src/PhpReverse/UmlOperation.cpp
@@ -29,7 +29,7 @@
 #include <iostream>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 using namespace std;
 #endif
 
@@ -255,7 +255,7 @@ bool UmlOperation::new_one(Class * container, aVisibility visibility,
             s.replace(index1, t.explicit_type.length(), "${type}");
         }
 
-        Q3ValueList<UmlParameter> l = op->params();
+        QList<UmlParameter> l = op->params();
         unsigned nparams = l.count();
 
         if (nparams != 0) {
@@ -279,7 +279,7 @@ bool UmlOperation::new_one(Class * container, aVisibility visibility,
                 else {
                     varname = varname.mid(1);
 
-                    Q3ValueList<UmlParameter>::Iterator it;
+                    QList<UmlParameter>::Iterator it;
 
                     for (it = l.begin(), rank = 0; it != l.end(); ++it, rank += 1) {
                         if ((*it).name == varname) {
diff --git a/src/PhpReverse/UmlPackage.cpp b/src/PhpReverse/UmlPackage.cpp
index b50fc1a17..2c1d2eb7c 100644
--- a/src/PhpReverse/UmlPackage.cpp
+++ b/src/PhpReverse/UmlPackage.cpp
@@ -102,9 +102,9 @@ UmlClassView * UmlPackage::get_classview(const WrapperStr & nmsp)
         pack = this;
 
     if (pack->classview == 0) {
-        Q3PtrVector<UmlItem> ch = pack->children();
+        QVector<UmlItem*> ch = pack->children();
 
-        for (unsigned index = 0; index != ch.size(); index += 1)
+        for (int index = 0; index != ch.size(); index += 1)
 
             // return the first class view find
             if (ch[index]->kind() == aClassView)
@@ -185,9 +185,9 @@ UmlDeploymentView * UmlPackage::get_deploymentview(const WrapperStr & nmsp)
         pack = this;
 
     if (pack->deploymentview == 0) {
-        Q3PtrVector<UmlItem> ch = pack->children();
+        QVector<UmlItem*> ch = pack->children();
 
-        for (unsigned index = 0; index != ch.size(); index += 1)
+        for (int index = 0; index != ch.size(); index += 1)
 
             // return the first class view find
             if (ch[index]->kind() == aDeploymentView)
diff --git a/src/PhpReverse/UmlRelation.h b/src/PhpReverse/UmlRelation.h
index 0f088b4e3..bd28422de 100644
--- a/src/PhpReverse/UmlRelation.h
+++ b/src/PhpReverse/UmlRelation.h
@@ -28,7 +28,7 @@
 #ifndef UMLRELATION_H
 #define UMLRELATION_H
 
-#include <q3valuelist.h>
+#include <QList>
 //Added by qt3to4:
 #include "misc/mystr.h"
 
diff --git a/src/PhpReverse/main.cpp b/src/PhpReverse/main.cpp
index 6c7548de0..9cedea2b6 100644
--- a/src/PhpReverse/main.cpp
+++ b/src/PhpReverse/main.cpp
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #include <qapplication.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <stdlib.h>
@@ -68,7 +68,7 @@ int main(int argc, char ** argv)
 
                 Package::init((UmlPackage *) item, app);
 
-                QString here = QDir::currentDirPath();
+                QString here = QDir::currentPath();
 
                 /*
 
diff --git a/src/PlugOutUpgrade/UmlClass.cpp b/src/PlugOutUpgrade/UmlClass.cpp
index c45a01257..b8a4bceb5 100644
--- a/src/PlugOutUpgrade/UmlClass.cpp
+++ b/src/PlugOutUpgrade/UmlClass.cpp
@@ -583,9 +583,9 @@ UmlRelation * UmlClass::add_vect_assoc(const char * name, aVisibility v, UmlClas
 
 UmlOperation * UmlClass::get_operation(const char * who)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1)
+    for (int i = 0; i != ch.size(); i += 1)
         if ((ch[i]->kind() == anOperation) &&
             (ch[i]->name() == who))
             return (UmlOperation *) ch[i];
@@ -595,9 +595,9 @@ UmlOperation * UmlClass::get_operation(const char * who)
 
 UmlAttribute * UmlClass::get_attribute(const char * who)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1)
+    for (int i = 0; i != ch.size(); i += 1)
         if ((ch[i]->kind() == anAttribute) &&
             (ch[i]->name() == who))
             return (UmlAttribute *) ch[i];
@@ -607,9 +607,9 @@ UmlAttribute * UmlClass::get_attribute(const char * who)
 
 UmlRelation * UmlClass::get_relation(aRelationKind k, const char * who)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == aRelation) {
             UmlRelation * rel = (UmlRelation *) ch[i];
 
@@ -624,9 +624,9 @@ UmlRelation * UmlClass::get_relation(aRelationKind k, const char * who)
 
 UmlRelation * UmlClass::get_relation(const char * who)
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == aRelation) {
             UmlRelation * rel = (UmlRelation *) ch[i];
 
@@ -641,7 +641,7 @@ UmlRelation * UmlClass::get_relation(const char * who)
 void UmlClass::replace_friend()
 {
     WrapperStr s;
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned i = ch.size();
 
     while (i--) {
@@ -661,7 +661,7 @@ void UmlClass::replace_friend()
 void UmlClass::add_friend(const char * scl)
 {
     WrapperStr s = WrapperStr("  friend class ") + scl + ";\n";
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     unsigned i = ch.size();
 
     while (i--) {
diff --git a/src/PlugOutUpgrade/UmlClass.h b/src/PlugOutUpgrade/UmlClass.h
index a1a65cbb2..336fa2841 100644
--- a/src/PlugOutUpgrade/UmlClass.h
+++ b/src/PlugOutUpgrade/UmlClass.h
@@ -28,7 +28,7 @@
 #ifndef UMLCLASS_H
 #define UMLCLASS_H
 
-#include <q3dict.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 
diff --git a/src/PlugOutUpgrade/UmlClassItem.h b/src/PlugOutUpgrade/UmlClassItem.h
index d5a7e44c2..c0aee115d 100644
--- a/src/PlugOutUpgrade/UmlClassItem.h
+++ b/src/PlugOutUpgrade/UmlClassItem.h
@@ -1,7 +1,7 @@
 #ifndef UMLCLASSITEM_H
 #define UMLCLASSITEM_H
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 
diff --git a/src/PlugOutUpgrade/UmlClassView.cpp b/src/PlugOutUpgrade/UmlClassView.cpp
index ad9513c7f..c69fe9a21 100644
--- a/src/PlugOutUpgrade/UmlClassView.cpp
+++ b/src/PlugOutUpgrade/UmlClassView.cpp
@@ -2,8 +2,8 @@
 
 void UmlClassView::replace_friend()
 {
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned i;
+    const QVector<UmlItem*> ch = children();
+    int i;
 
     for (i = 0; i != ch.size(); i += 1)
         ch[i]->replace_friend();
diff --git a/src/PlugOutUpgrade/UmlItem.cpp b/src/PlugOutUpgrade/UmlItem.cpp
index 4887dcb36..745448414 100644
--- a/src/PlugOutUpgrade/UmlItem.cpp
+++ b/src/PlugOutUpgrade/UmlItem.cpp
@@ -6,16 +6,16 @@ UmlItem::~UmlItem()
 
 void UmlItem::rename_jdk5()
 {
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1)
+    for (int i = 0; i != ch.size(); i += 1)
         ch[i]->rename_jdk5();
 }
 
 void UmlItem::move_after(anItemKind k, const char * name)
 {
-    const Q3PtrVector<UmlItem> ch = parent()->children();
-    unsigned i;
+    const QVector<UmlItem*> ch = parent()->children();
+    int i;
 
     for (i = 0; i != ch.size(); i += 1) {
         if ((ch[i]->kind() == k) &&
diff --git a/src/PlugOutUpgrade/UmlOperation.cpp b/src/PlugOutUpgrade/UmlOperation.cpp
index bb3f47fb4..af137f2d7 100644
--- a/src/PlugOutUpgrade/UmlOperation.cpp
+++ b/src/PlugOutUpgrade/UmlOperation.cpp
@@ -33,7 +33,7 @@
 #include "util.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 static WrapperStr remove_throw(WrapperStr d)
 {
@@ -253,8 +253,8 @@ static bool rename(WrapperStr & s, bool java, bool javasettings)
             int index = 0;
 
             while ((index = s.find(o, index)) != -1) {
-                if (((index == 0) || is_sep(s[index - 1].ascii())) &&
-                    is_sep(s[index + o_len].ascii())) {
+                if (((index == 0) || is_sep(s[index - 1].toLatin1())) &&
+                    is_sep(s[index + o_len].toLatin1())) {
                     s.replace(index, o_len, n);
                     index += n_len;
                     changed = TRUE;
@@ -351,13 +351,13 @@ UmlOperation * UmlOperation::java2Php(UmlClass * php, UmlClass * java,
     to->set_Visibility(from->visibility());
     to->set_CppVisibility(from->cppVisibility());
 
-    const Q3ValueList<UmlParameter> params = from->params();
-    unsigned index;
+    const QList<UmlParameter> params = from->params();
+    int index;
 
     for (index = 0; index != params.count(); index += 1)
         to->addParameter(index, params[index]);
 
-    const Q3ValueList<UmlTypeSpec> exceptions = from->exceptions();
+    const QList<UmlTypeSpec> exceptions = from->exceptions();
 
     for (index = 0; index != exceptions.count(); index += 1)
         to->addException(index, exceptions[index]);
@@ -415,13 +415,13 @@ UmlOperation * UmlOperation::java2Python(UmlClass * python, UmlClass * java,
     to->set_Visibility(from->visibility());
     to->set_CppVisibility(from->cppVisibility());
 
-    const Q3ValueList<UmlParameter> params = from->params();
-    unsigned index;
+    const QList<UmlParameter> params = from->params();
+    int index;
 
     for (index = 0; index != params.count(); index += 1)
         to->addParameter(index, params[index]);
 
-    const Q3ValueList<UmlTypeSpec> exceptions = from->exceptions();
+    const QList<UmlTypeSpec> exceptions = from->exceptions();
 
     for (index = 0; index != exceptions.count(); index += 1)
         to->addException(index, exceptions[index]);
@@ -479,13 +479,13 @@ UmlOperation * UmlOperation::cpp2Python(UmlClass * python, UmlClass * cpp,
     to->set_Visibility(from->visibility());
     to->set_CppVisibility(from->cppVisibility());
 
-    const Q3ValueList<UmlParameter> params = from->params();
-    unsigned index;
+    const QList<UmlParameter> params = from->params();
+    int index;
 
     for (index = 0; index != params.count(); index += 1)
         to->addParameter(index, params[index]);
 
-    const Q3ValueList<UmlTypeSpec> exceptions = from->exceptions();
+    const QList<UmlTypeSpec> exceptions = from->exceptions();
 
     for (index = 0; index != exceptions.count(); index += 1)
         to->addException(index, exceptions[index]);
diff --git a/src/PlugOutUpgrade/UmlPackage.cpp b/src/PlugOutUpgrade/UmlPackage.cpp
index d06598a14..3f14ccf8c 100644
--- a/src/PlugOutUpgrade/UmlPackage.cpp
+++ b/src/PlugOutUpgrade/UmlPackage.cpp
@@ -26,8 +26,7 @@
 // *************************************************************************
 
 #include <qmessagebox.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include "misc/mystr.h"
 
 #include "UmlPackage.h"
@@ -86,7 +85,7 @@ void upgrade_rename_class(UmlClass * base_item,
   if (!UmlBaseItem::set_Name(s))\n\
     return FALSE;\n\
 \n\
-  const Q3PtrVector<UmlItem> ch = children();\n\
+  const QVector<UmlItem*> ch = children();\n\
   WrapperStr destr = \"~\" + name();\n\
 \n\
   for (unsigned i = 0; i != ch.size(); i += 1) {\n\
@@ -248,12 +247,12 @@ void upgrade_UmlSettings()
 
     for (i = 0; i != sizeof(s) / sizeof(s[0]); i += 1) {
         // add attribute
-        const Q3PtrVector<UmlItem> ch = cl->children();
+        const QVector<UmlItem*> ch = cl->children();
         UmlAttribute * at =
             cl->add_attribute(s[i].att, ProtectedVisibility, "string", 0, 0);
         at->set_isClassMember(TRUE);
 
-        for (unsigned j = 0; j != ch.size(); j += 1) {
+        for (int j = 0; j != ch.size(); j += 1) {
             if (ch[j]->name() == s[i].after) {
                 at->moveAfter(ch[j]);
                 break;
@@ -355,14 +354,14 @@ void upgrade_CppSettings()
     };
     UmlClass * cl = UmlClass::get("CppSettings", 0);
     unsigned i;
-    unsigned j;
+    int j;
 
     for (i = 0; i != sizeof(s) / sizeof(s[0]); i += 1) {
         UmlAttribute * at =
             cl->add_attribute(s[i].att, PrivateVisibility, "string", 0, 0);
         at->set_isClassMember(TRUE);
 
-        const Q3PtrVector<UmlItem> ch = cl->children();
+        const QVector<UmlItem*> ch = cl->children();
 
         for (j = 0; j != ch.size(); j += 1) {
             if (ch[j]->name() == s[i].after_att) {
@@ -562,12 +561,12 @@ void upgrade_jdk5(UmlClass * javasettings)
 
     UmlPackage::getProject()->rename_jdk5();
 
-    Q3PtrVector<UmlItem> ch = javasettings->children();
+    QVector<UmlItem*> ch = javasettings->children();
     UmlOperation * set_EnumPatternDecl = 0;
     UmlOperation * set_EnumPatternItemCase = 0;
     UmlAttribute * _enum_pattern_decl = 0;
     UmlAttribute * _enum_pattern_item_case = 0;
-    unsigned i;
+    int i;
 
     // rename JavaSettings operations and attributes
     // updates read_'s body
@@ -948,7 +947,7 @@ void upgrade_jdk5(UmlClass * javasettings)
             (ch[i]->name() == "send_cmd")) {
             op1 = (UmlOperation *) ch[i];
 
-            Q3ValueList<UmlParameter> params = op1->params();
+            QList<UmlParameter> params = op1->params();
 
             if (params.count() == 6) {
                 UmlParameter p = params.last();
@@ -958,7 +957,7 @@ void upgrade_jdk5(UmlClass * javasettings)
                 op1->set_CppDecl("    ${comment}${friend}${static}${virtual}${type} ${name}${(}const ${t0} ${p0}, ${t1} ${p1}, ${t2} ${p2}, const ${t3} ${p3}, const ${t4} ${p4}, const ${t5} & ${p5}, const ${t6} & ${p6}${)}${const}${volatile}${abstract}${final}${default}${delete}${override};");
                 op1->set_CppDef("${inline}${type} ${class}::${name}${(}const ${t0} ${p0}, ${t1} ${p1}, ${t2} ${p2}, const ${t3} ${p3}, const ${t4} ${p4}, const ${t5} & ${p5}, const ${t6} & ${p6}${)}${const}${volatile}${staticnl}{\n${body}}");
                 op1->set_JavaDef("  ${comment}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${t0} ${p0}, ${t1} ${p1}, ${t2} ${p2}, ${t3} ${p3}, ${t4} ${p4}, ${t5} ${p5}, ${t6} ${p6}${)}${throws}${staticnl}{\n${body}}");
-                op1->set_CppBody("#ifdef DEBUGBOUML\n"
+                op1->set_CppBody("#ifdef DEBUG_DOUML\n"
                                  "  QLOG_INFO() <<\"UmlCom::send_cmd(id, \" << cmd << \", \" << arg1 << \\\", \\\"\" << arg2 << \"\\\", \\\"\" << arg3 << \"\\\", \" << \", UmlTypeSpec, UmlTypeSpec)\\n\";\n"
                                  "#endif\n"
                                  "  \n"
@@ -1176,8 +1175,8 @@ void fixe_package_diagram()
 
     // replace _assoc_diagram
 
-    const Q3PtrVector<UmlItem> ch = basepackage->children();
-    unsigned i;
+    const QVector<UmlItem*> ch = basepackage->children();
+    int i;
 
     for (i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == aRelation) {
@@ -1396,9 +1395,9 @@ void add_object_activity_diagram_item_kind()
     UmlAttribute * anObjectDiagram = itkind->add_enum_item("anObjectDiagram");
     UmlAttribute * anActivityDiagram = itkind->add_enum_item("anActivityDiagram");
 
-    const Q3PtrVector<UmlItem> ch = itkind->children();
+    const QVector<UmlItem*> ch = itkind->children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->name() == "aDeploymentDiagram") {
             anObjectDiagram->moveAfter(ch[i]);
             anActivityDiagram->moveAfter(anObjectDiagram);
@@ -3257,7 +3256,7 @@ void add_missing_opers()
         op->set_cpp("const Q3PtrVector<${type}>", "",
                     "  UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);\n"
                     "  \n"
-                    "  Q3PtrVector<UmlItem> result;\n"
+                    "  QVector<UmlItem*> result;\n"
                     "  \n"
                     "  UmlCom::read_item_list(result);\n"
                     "  return result;\n",
@@ -3278,7 +3277,7 @@ void add_missing_opers()
         op->set_cpp("const Q3PtrVector<${type}>", "",
                     "  UmlCom::send_cmd(_identifier, referencedByCmd);\n"
                     "  \n"
-                    "  Q3PtrVector<UmlItem> result;\n"
+                    "  QVector<UmlItem*> result;\n"
                     "  \n"
                     "  UmlCom::read_item_list(result);\n"
                     "  return result;\n",
@@ -3363,7 +3362,7 @@ void add_missing_opers()
         op->set_java("void", "${t0} ${p0}",
                      "  UmlCom.send_cmd(CmdFamily.miscGlobalCmd, MiscGlobalCmd._loadCmd, p);\n",
                      FALSE);
-        op->set_Description("Does nothing in case an edition is on going under BOUML. Else :\n"
+        op->set_Description("Does nothing in case an edition is on going under DoUML. Else :\n"
                             "close the current project (in case it is not saved the last modifications are lost),\n"
                             "load the specified one, and all the communications with the plug-outs including the\n"
                             "current one are closed.\n");
@@ -3441,8 +3440,8 @@ void replacefriend()
 
 void UmlPackage::replace_friend()
 {
-    const Q3PtrVector<UmlItem> ch = children();
-    unsigned i;
+    const QVector<UmlItem*> ch = children();
+    int i;
 
     for (i = 0; i != ch.size(); i += 1)
         ch[i]->replace_friend();
@@ -3885,13 +3884,13 @@ void fixe_idlsetting_read()
 
 UmlOperation * wrong_umlcom_send_cmd(UmlClass * uml_com)
 {
-    const Q3PtrVector<UmlItem> ch = uml_com->children();
+    const QVector<UmlItem*> ch = uml_com->children();
     UmlOperation * r = 0;
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if ((ch[i]->kind() == anOperation)  && (ch[i]->name() == "send_cmd")) {
             UmlOperation * op = (UmlOperation *) ch[i];
-            const Q3ValueList<UmlParameter> p = op->params();
+            const QList<UmlParameter> p = op->params();
 
             if ((p.count() == 3) &&
                 ((p[0].type.type == UmlClass::get("CmdFamily", 0)) ||
@@ -4731,13 +4730,13 @@ void fixe_set_associateddiagram(UmlItem * v)
 
     UmlCom::trace("<b>fixe operations <i>set_AssociatedDiagram</i></b><br>");
 
-    const Q3PtrVector<UmlItem> ch1 = v->children();
+    const QVector<UmlItem*> ch1 = v->children();
 
-    for (unsigned i1 = 0; i1 != ch1.size(); i1 += 1) {
+    for (int i1 = 0; i1 != ch1.size(); i1 += 1) {
         if (ch1[i1]->kind() == aClass) {
-            const Q3PtrVector<UmlItem> ch2 = ch1[i1]->children();
+            const QVector<UmlItem*> ch2 = ch1[i1]->children();
 
-            for (unsigned i2 = 0; i2 != ch2.size(); i2 += 1) {
+            for (int i2 = 0; i2 != ch2.size(); i2 += 1) {
                 if ((ch2[i2]->kind() == anOperation) &&
                 (ch2[i2]->name() == "set_AssociatedDiagram")) {
                     UmlOperation * op = (UmlOperation *) ch2[i2];
@@ -4801,7 +4800,7 @@ void bypass_q3ptrvector_bug()
 
     UmlClass::get("UmlBaseArtifact", 0)
     ->get_operation("set_AssociatedClasses")
-    ->set_CppBody("  UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);\n"
+    ->set_CppBody("  UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);\n"
                   "  if (UmlCom::read_bool()) {\n"
                   "      // tests != to bypass Qt 2.3 bug\n"
                   "    if (_defined && (&_assoc_classes != &l))\n"
@@ -4813,7 +4812,7 @@ void bypass_q3ptrvector_bug()
 
     UmlClass::get("UmlBaseParameterSet", 0)
     ->get_operation("set_Pins")
-    ->set_CppBody("  UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);\n"
+    ->set_CppBody("  UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);\n"
                   "  if (UmlCom::read_bool()) {\n"
                   "      // tests != to bypass Qt 2.3 bug\n"
                   "    if (_defined && (&_pins != &v)) _pins = v;\n"
@@ -4843,7 +4842,7 @@ void add_methods(UmlClass * opercl, UmlClass * uml_item)
 
     op->set_isCppConst(TRUE);
     op->set_cpp("const Q3PtrVector<${type}>", "",
-                "  Q3PtrVector<UmlItem> l;\n"
+                "  QVector<UmlItem*> l;\n"
                 "\n"
                 "  UmlCom::send_cmd(_identifier, sideCmd);\n"
                 "  UmlCom::read_item_list(l);\n"
@@ -5373,9 +5372,9 @@ bool ask_for_upgrade()
 void update_api_version(const char * v)
 {
     UmlClass * com = UmlClass::get("UmlCom", 0);
-    const Q3PtrVector<UmlItem> ch = com->children();
+    const QVector<UmlItem*> ch = com->children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if ((ch[i]->kind() == anOperation) &&
         (ch[i]->name() == "connect")) {
             unsigned uid = UmlCom::user_id();
@@ -5644,7 +5643,7 @@ bool UmlPackage::upgrade()
 
         UmlClass * bci = UmlClass::get("UmlBaseClassInstance", 0);
         UmlOperation * op = bci->get_operation("add_Relation");
-        const Q3ValueList<UmlParameter> params = op->params();
+        const QList<UmlParameter> params = op->params();
 
         if (params.first().type.type->name() == "UmlAttribute") {
             if (!work && !ask_for_upgrade())
diff --git a/src/PlugOutUpgrade/activity.cpp b/src/PlugOutUpgrade/activity.cpp
index 82fed6c2f..e6c83b9fa 100644
--- a/src/PlugOutUpgrade/activity.cpp
+++ b/src/PlugOutUpgrade/activity.cpp
@@ -39,8 +39,7 @@
 
 #include "util.h"
 #include "activity.h"
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include "misc/mystr.h"
 
 //
@@ -2080,7 +2079,7 @@ void add_pinparam(UmlClassView * base_class_view, UmlClassView * user_class_view
     op->set_Description(" set the pins");
     op->add_param(0, InputDirection, "v", user_activitypin);
     op->set_cpp("${type}", "const Q3PtrVector<${t0}> & ${p0}",
-                "  UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);\n"
+                "  UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);\n"
                 "  if (UmlCom::read_bool()) {\n"
                 "    if (_defined) _pins = v;\n"
                 "    return TRUE;\n"
@@ -2139,7 +2138,7 @@ void add_pinparam(UmlClassView * base_class_view, UmlClassView * user_class_view
     op = base_parameterset->add_op("read_uml_", ProtectedVisibility, "void");
     op->set_cpp("${type}", "",
                 "  UmlBaseItem::read_uml_();\n"
-                "  UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);\n",
+                "  UmlCom::read_item_list((QVector<UmlItem*> &) _pins);\n",
                 FALSE, 0, 0);
     op->set_java("${type}", "",
                  "  super.read_uml_();\n"
@@ -2149,7 +2148,7 @@ void add_pinparam(UmlClassView * base_class_view, UmlClassView * user_class_view
 
     // update an UmlCom::send_cmd
 
-    const Q3PtrVector<UmlItem> ch = UmlClass::get("UmlCom", 0)->children();
+    const QVector<UmlItem*> ch = UmlClass::get("UmlCom", 0)->children();
     UmlClass * cl = UmlClass::get("UmlClass", 0);
 
     UmlCom::trace("update UmlCom::send_cmd(...)<br>\n");
@@ -2159,7 +2158,7 @@ void add_pinparam(UmlClassView * base_class_view, UmlClassView * user_class_view
             (ch[index]->name() == "send_cmd")) {
             op = (UmlOperation *) ch[index];
 
-            Q3ValueList<UmlParameter> params = op->params();
+            QList<UmlParameter> params = op->params();
 
             if (params.count() == 3) {
                 UmlParameter p = params.last();
@@ -2197,7 +2196,7 @@ void add_pinparam(UmlClassView * base_class_view, UmlClassView * user_class_view
         s = op->cppBody();
 
         if ((index = s.find("l);")) != -1) {
-            s.insert(index, "(const Q3PtrVector<UmlItem> &) ");
+            s.insert(index, "(const QVector<UmlItem*> &) ");
             op->set_CppBody(s);
         }
     }
@@ -3213,7 +3212,7 @@ void add_additionalactions(UmlClass * base_item, UmlClass * user_item)
 
     // replace friends rels
 
-    const Q3PtrVector<UmlItem> ch = base_item->children();
+    const QVector<UmlItem*> ch = base_item->children();
     UmlExtraClassMember * ex = 0;
 
     i = ch.size();
diff --git a/src/PlugOutUpgrade/instance.cpp b/src/PlugOutUpgrade/instance.cpp
index e727d3086..3f4d526c1 100644
--- a/src/PlugOutUpgrade/instance.cpp
+++ b/src/PlugOutUpgrade/instance.cpp
@@ -40,7 +40,7 @@
 #include "instance.h"
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 
 //
 // add class instance
@@ -247,7 +247,7 @@ void add_class_instance(UmlClassView * base_class_view, UmlClassView * user_clas
     op->add_param(0, OutputDirection, "result", attr);
     op->set_cpp("void", "Q3PtrVector<${t0}> & ${p0}",
                 "  UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);\n"
-                "  UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);\n",
+                "  UmlCom::read_item_list((QVector<UmlItem*> &) result);\n",
                 FALSE, 0, 0);
     op->set_java("${type}[]", "",
                  "  UmlCom.send_cmd(identifier_(), OnInstanceCmd.attributesCmd, (byte) 1);\n"
@@ -270,7 +270,7 @@ void add_class_instance(UmlClassView * base_class_view, UmlClassView * user_clas
     op->set_cpp("void",
                 "${t0} * ${p0}, Q3PtrVector<${t1}> & ${p1}",
                 "  UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);\n"
-                "  UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);\n",
+                "  UmlCom::read_item_list((QVector<UmlItem*> &) result);\n",
                 FALSE, 0, 0);
     op->set_java("${type}[]", "${t0} ${p0}",
                  "  UmlCom.send_cmd(identifier_(), OnInstanceCmd.relationsCmd, other.identifier_());\n"
@@ -310,7 +310,7 @@ void add_class_instance(UmlClassView * base_class_view, UmlClassView * user_clas
     op->add_param(0, InputDirection, "relation", attr);
     op->add_param(1, InputDirection, "other", user_class_instance);
     op->set_cpp("bool", "${t0} * ${p0}, ${t1} * ${p1}",
-                "  Q3PtrVector<UmlItem> v(2);\n"
+                "  QVector<UmlItem*> v(2);\n"
                 "\n"
                 "  v.insert(0, relation);\n"
                 "  v.insert(1, other);\n"
@@ -335,7 +335,7 @@ void add_class_instance(UmlClassView * base_class_view, UmlClassView * user_clas
     op->add_param(0, InputDirection, "relation", attr);
     op->add_param(1, InputDirection, "other", user_class_instance);
     op->set_cpp("bool", "${t0} * ${p0}, ${t1} * ${p1}",
-                "  Q3PtrVector<UmlItem> v(2);\n"
+                "  QVector<UmlItem*> v(2);\n"
                 "\n"
                 "  v.insert(0, relation);\n"
                 "  v.insert(1, other);\n"
@@ -503,7 +503,7 @@ void fixe_classinstance(UmlClass * bci)
 
     UmlClass * rel = UmlClass::get("UmlRelation", 0);
     UmlOperation * op = bci->get_operation("add_Relation");
-    Q3ValueList<UmlParameter> params = op->params();
+    QList<UmlParameter> params = op->params();
     UmlParameter param = params.first();
 
     param.type.type = rel;
diff --git a/src/PlugOutUpgrade/php.cpp b/src/PlugOutUpgrade/php.cpp
index 95baf77fc..7397067ff 100644
--- a/src/PlugOutUpgrade/php.cpp
+++ b/src/PlugOutUpgrade/php.cpp
@@ -862,9 +862,9 @@ void associate_php_artifacts(UmlArtifact * phpsettingsart,
 {
     UmlDeploymentView * dv = (UmlDeploymentView *)
                              UmlClass::get("UmlArtifact", 0)->associatedArtifact()->parent();
-    const Q3PtrVector<UmlItem> ch = dv->children();
+    const QVector<UmlItem*> ch = dv->children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if ((ch[i]->kind() == anArtifact) && (ch[i]->name() == "executable")) {
             ((UmlArtifact *) ch[i])->addAssociatedArtifact(phpsettingsart);
             ((UmlArtifact *) ch[i])->addAssociatedArtifact(phpsettingscmdart);
diff --git a/src/PlugOutUpgrade/plug_out_upgrade.pro b/src/PlugOutUpgrade/plug_out_upgrade.pro
index 0111465ca..fc67cb645 100644
--- a/src/PlugOutUpgrade/plug_out_upgrade.pro
+++ b/src/PlugOutUpgrade/plug_out_upgrade.pro
@@ -1,5 +1,7 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
+CONFIG -= app_bundle
+CONFIG          += qt warn_on c++11
+DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES          = util.cpp activity.cpp state.cpp instance.cpp \
         insertbase.cpp php.cpp python.cpp diagdef.cpp \
         UmlClassItem.cpp UmlAttribute.cpp \
@@ -99,10 +101,10 @@ SOURCES          = util.cpp activity.cpp state.cpp instance.cpp \
     ../Logging/QsDebugOutput.cpp
 
 TARGET          = plug_out_upgrade
-DEFINES          = WITHCPP WITHJAVA WITHPHP WITHIDL WITHPYTHON
-INCLUDEPATH   = ../Tools ../PlugOutUpgrade ../
+DEFINES         += WITHCPP WITHJAVA WITHPHP WITHIDL WITHPYTHON FALSE=false TRUE=true
+INCLUDEPATH   += ../Tools ../PlugOutUpgrade ../
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network  widgets
 
 HEADERS += \
     ../Logging/QsLogDest.h \
@@ -111,19 +113,17 @@ HEADERS += \
 
 INCLUDEPATH += ../../src
 #CONFIG += qtestlib
-Release{
-
+    UI_DIR = src/ui
+    DESTDIR = ../../bin
 
-    MOC_DIR = bin/douml/plug_upg/MOC_release
-    OBJECTS_DIR = bin/douml/plug_upg/Obj_release
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
 }
 
-CONFIG(declarative_debug){
-    MOC_DIR = bin/douml/plug_upg/MOC_Debug
-    OBJECTS_DIR = bin/douml/plug_upg/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
diff --git a/src/PlugOutUpgrade/python.cpp b/src/PlugOutUpgrade/python.cpp
index 38faa2fff..b2ef5e458 100644
--- a/src/PlugOutUpgrade/python.cpp
+++ b/src/PlugOutUpgrade/python.cpp
@@ -1017,9 +1017,9 @@ void associate_python_artifacts(UmlArtifact * pythonsettingsart,
 {
     UmlDeploymentView * dv = (UmlDeploymentView *)
                              UmlClass::get("UmlArtifact", 0)->associatedArtifact()->parent();
-    const Q3PtrVector<UmlItem> ch = dv->children();
+    const QVector<UmlItem*> ch = dv->children();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if ((ch[i]->kind() == anArtifact) && (ch[i]->name() == "executable")) {
             ((UmlArtifact *) ch[i])->addAssociatedArtifact(pythonsettingsart);
             ((UmlArtifact *) ch[i])->addAssociatedArtifact(pythonsettingscmdart);
diff --git a/src/ProjectControl/BrowserNode.cpp b/src/ProjectControl/BrowserNode.cpp
index bae90820f..caff09668 100644
--- a/src/ProjectControl/BrowserNode.cpp
+++ b/src/ProjectControl/BrowserNode.cpp
@@ -32,11 +32,10 @@
 #include <stdlib.h>
 
 #include <qapplication.h>
-#include <q3popupmenu.h>
+#include <QMenu>
 #include <qcursor.h>
-//Added by qt3to4:
 #include <QPixmap>
-#include <Q3PtrCollection>
+
 #include <QKeyEvent>
 
 #include "BrowserNode.h"
@@ -50,23 +49,22 @@
 #define REVISION_COL 3
 #define MODIFIEDBY_COL 4
 
-// why the hell Qt::CTRL ?!
 #ifdef __APPLE__
-#define CTRL "Apple"
+static const QString controlKeyName = "Apple";
 #else
-#define CTRL "Ctrl"
+static const QString controlKeyName = "Ctrl";
 #endif
 
 BrowserNode::BrowserNode(BrowserView * parent, QString fn)
-    : Q3ListViewItem(parent), filename(fn)
+    : QTreeWidgetItem(parent), filename(fn)
 {
 }
 
 BrowserNode::BrowserNode(BrowserNode * parent, QString fn)
-    : Q3ListViewItem(parent), filename(fn)
+    : QTreeWidgetItem(parent), filename(fn)
 {
     // move it at end
-    Q3ListViewItem * child = parent->firstChild();
+    BrowserNode * child = parent->firstChild();
 
     while (child->nextSibling())
         child = child->nextSibling();
@@ -89,7 +87,16 @@ const QPixmap * BrowserNode::pixmap(int col) const
     else
         return (ro) ? RoOtherPackageIcon : OtherPackageIcon;
 }
-
+QVariant	BrowserNode::data(int column, int role) const
+{
+    if(role == Qt::DecorationRole)
+    {
+        const QPixmap *pix = pixmap(column);
+        if(pix)
+            return QIcon(*pix);
+    }
+    return QTreeWidgetItem::data(column, role);
+}
 bool BrowserNode::load(QDir & dir)
 {
     char * buff = read_file(dir, filename, ro);
@@ -186,9 +193,9 @@ bool BrowserNode::load(QDir & dir)
 void BrowserNode::key_event(QKeyEvent * e)
 {
     // control or alt is pressed with p, u or a
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
-    if (e->state() == ::Qt::ControlModifier) {
+    if (e->modifiers()&::Qt::ControlModifier) {
         switch (e->key()) {
         case ::Qt::Key_A:
             assign(user_id());
@@ -229,91 +236,113 @@ void BrowserNode::menu()
     if (who.isEmpty())
         who = "<" + QString::number(user_id()) + ">";
 
-    Q3PopupMenu m(0);
+    QMenu m(0);
+    QAction *action;
 
-    m.insertItem("Package " + text(0), -1);
+    action = m.addAction("Package " + text(0));
+    action->setData(-1);
 
     if (! ro) {
-        m.insertSeparator();
+        m.addSeparator();
 
         if (owner == user_id()) {
-            m.insertItem("Protect this package ("CTRL"+p)", 3);
-            m.insertItem("Unassign this package ("CTRL"+u)", 2);
+            action = m.addAction("Protect this package (" + controlKeyName + "+p)");
+            action->setData(3);
+            action = m.addAction("Unassign this package (" + controlKeyName + "+u)");
+            action->setData(2);
         }
         else if (owner == -1) {
-            m.insertItem("Protect this package ("CTRL"+p)", 3);
-            m.insertItem("Assign this package to " + who + " ("CTRL"+a)", 1);
+            action = m.addAction("Protect this package (" + controlKeyName + "+p)");
+            action->setData(3);
+            action = m.addAction("Assign this package to " + who + " (" + controlKeyName + "+a)");
+            action->setData(1);
         }
         else if (owner < 2) {
-            m.insertItem("Assign this package to " + who + " ("CTRL"+a)", 1);
-            m.insertItem("Unassign this package (Ctrl+u)", 2);
+            action = m.addAction("Assign this package to " + who + " (" + controlKeyName + "+a)");
+            action->setData(1);
+            action = m.addAction("Unassign this package (Ctrl+u)");
+            action->setData(2);
         }
         else {
-            m.insertItem("Protect this package ("CTRL"+p)", 3);
-            m.insertItem("Unassign this package ("CTRL"+u)", 2);
-            m.insertItem("Assign this package to " + who + " ("CTRL"+a)", 1);
+            action =  m.addAction("Protect this package (" + controlKeyName + "+p)");
+            action->setData(3);
+            action = m.addAction("Unassign this package (" + controlKeyName + "+u)");
+            action->setData(2);
+            action = m.addAction("Assign this package to " + who + " (" + controlKeyName + "+a)");
+            action->setData(1);
         }
     }
 
     if (firstChild() != 0) {
-        m.insertSeparator();
-        m.insertItem("Protect " + who + "'s packages recursively from this one", 10);
-        m.insertItem("Protect unassigned packages recursively from this one", 11);
-        m.insertItem("Protect all packages recursively from this one (Alt+p)", 12);
-        m.insertItem("Assign to " + who + " unassigned packages recursively from this one", 13);
-        m.insertItem("Assign to " + who + " all packages recursively from this one (Alt+a)", 14);
-        m.insertItem("Unassign " + who + "'s packages recursively from this one", 15);
-        m.insertItem("Unassign all packages recursively from this one (Alt+u)", 16);
+        m.addSeparator();
+        action = m.addAction("Protect " + who + "'s packages recursively from this one");
+        action->setData(10);
+        action = m.addAction("Protect unassigned packages recursively from this one");
+        action->setData(11);
+        action = m.addAction("Protect all packages recursively from this one (Alt+p)");
+        action->setData(12);
+        action = m.addAction("Assign to " + who + " unassigned packages recursively from this one");
+        action->setData(13);
+        action = m.addAction("Assign to " + who + " all packages recursively from this one (Alt+a)");
+        action->setData(14);
+        action = m.addAction("Unassign " + who + "'s packages recursively from this one");
+        action->setData(15);
+        action = m.addAction("Unassign all packages recursively from this one (Alt+u)");
+        action->setData(16);
     }
     else if (ro)
         return;
 
-    int choice = m.exec(QCursor::pos());
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int choice = retAction->data().toInt();
 
-    QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
-    switch (choice) {
-    case 1:
-        assign(user_id());
-        break;
+        switch (choice) {
+        case 1:
+            assign(user_id());
+            break;
 
-    case 2:
-        assign(-1);
-        break;
+        case 2:
+            assign(-1);
+            break;
 
-    case 3:
-        assign(0);
-        break;
+        case 3:
+            assign(0);
+            break;
 
-    case 10:
-        assign_mine(0);
-        break;
+        case 10:
+            assign_mine(0);
+            break;
 
-    case 11:
-        assign_unassigned(0);
-        break;
+        case 11:
+            assign_unassigned(0);
+            break;
 
-    case 12:
-        assign_all(0);
-        break;
+        case 12:
+            assign_all(0);
+            break;
 
-    case 13:
-        assign_unassigned(user_id());
-        break;
+        case 13:
+            assign_unassigned(user_id());
+            break;
 
-    case 14:
-        assign_all(user_id());
-        break;
+        case 14:
+            assign_all(user_id());
+            break;
 
-    case 15:
-        assign_mine(-1);
-        break;
+        case 15:
+            assign_mine(-1);
+            break;
 
-    case 16:
-        assign_all(-1);
+        case 16:
+            assign_all(-1);
 
-    default:
-        break;
+        default:
+            break;
+        }
     }
 
     QApplication::restoreOverrideCursor();
@@ -328,15 +357,15 @@ void BrowserNode::assign(int w)
         char * p = read_file(dir, filename, dummy);
 
         if (p != 0) {
-            QString path = dir.absFilePath(filename);
-            FILE * fp = fopen(path, "wb");
+            QString path = dir.absoluteFilePath(filename);
+            FILE * fp = fopen(path.toLatin1().constData(), "wb");
 
             if (fp != 0) {
                 fprintf(fp, "format %d\n\"%s\"\n  revision %s\n",
-                        format, (const char *) text(TREE_COL), (const char *) text(REVISION_COL));
+                        format, (const char *) text(TREE_COL).toLatin1().constData(), (const char *) text(REVISION_COL).toLatin1().constData());
 
                 if (!modifier_name.isEmpty())
-                    fprintf(fp, "  modified_by %d \"%s\"\n", modifier_id, (const char *) modifier_name);
+                    fprintf(fp, "  modified_by %d \"%s\"\n", modifier_id, (const char *) modifier_name.toLatin1().constData());
 
                 if (w != -1) {
                     fprintf(fp, "  owner %d", w);
@@ -348,7 +377,7 @@ void BrowserNode::assign(int w)
                         setText(OWNERNAME_COL, s);
 
                         if (! s.isEmpty())
-                            fprintf(fp, " \"%s\"\n", (const char *) s);
+                            fprintf(fp, " \"%s\"\n", (const char *) s.toLatin1().constData());
                         else
                             fputs(" \"\"\n", fp);
                     }
@@ -366,7 +395,7 @@ void BrowserNode::assign(int w)
 
                 fputs("  ", fp);
 
-                int new_offset = (int) ftell(fp);
+                long new_offset = ftell(fp);
 
                 fputs(p + offset, fp);
                 fclose(fp);
@@ -386,7 +415,7 @@ void BrowserNode::assign_mine(int w)
     if (owner == user_id())
         assign(w);
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         ((BrowserNode *) child)->assign_mine(w);
@@ -397,7 +426,7 @@ void BrowserNode::assign_unassigned(int w)
     if (owner == -1)
         assign(w);
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         ((BrowserNode *) child)->assign_unassigned(w);
@@ -407,28 +436,52 @@ void BrowserNode::assign_all(int w)
 {
     assign(w);
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         ((BrowserNode *) child)->assign_all(w);
 }
 
+BrowserNode *BrowserNode::nextSibling()
+{
+    for(int i = 0; i < parent()->childCount(); i++)
+    {
+        if(parent()->child(i) == this)
+        {
+            if((i+1)<parent()->childCount())
+                return (BrowserNode *)parent()->child(i+1);
+            break;
+        }
+    }
+    return NULL;
+}
+
+void BrowserNode::moveItem(BrowserNode *after)
+{
+    if(this->parent())
+    {
+        this->parent()->removeChild(this);
+        if(after->parent())
+        {
+            after->parent()->insertChild(after->parent()->indexOfChild(after)+1, this);
+        }
+    }
+}
 //
 
 void BrowserNodeList::search(BrowserNode * bn, const QString & s, bool cs)
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = bn->firstChild(); child != 0; child = child->nextSibling()) {
-        if (child->text(TREE_COL).find(s, 0, cs) != -1)
+        if (child->text(TREE_COL).indexOf(s, 0, cs ? Qt::CaseInsensitive : Qt::CaseInsensitive) != -1)
             append((BrowserNode *) child);
 
         search((BrowserNode *) child, s, cs);
     }
 }
-
-int BrowserNodeList::compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2)
+int BrowserNodeList::compareItems(void *item1, void* item2)
 {
     return ((BrowserNode *) item1)->text(TREE_COL)
-           .compare(((BrowserNode *) item2)->text(TREE_COL));
+            .compare(((BrowserNode *) item2)->text(TREE_COL));
 }
diff --git a/src/ProjectControl/BrowserNode.h b/src/ProjectControl/BrowserNode.h
index 90a749bc7..8cc0206e5 100644
--- a/src/ProjectControl/BrowserNode.h
+++ b/src/ProjectControl/BrowserNode.h
@@ -27,20 +27,16 @@
 
 #ifndef BROWSERNODE_H
 #define BROWSERNODE_H
-
-#include <q3listview.h>
-//Added by qt3to4:
 #include <QKeyEvent>
-#include <Q3PtrCollection>
 #include <QPixmap>
-//Added by qt3to4:
-#include <Q3PtrList>
+#include <QTreeWidgetItem>
+
 
 class QDir;
 class QKeyEvent;
 class BrowserView;
 
-class BrowserNode : public Q3ListViewItem
+class BrowserNode : public QTreeWidgetItem
 {
 public:
     BrowserNode(BrowserView * parent, QString fn);
@@ -55,7 +51,12 @@ class BrowserNode : public Q3ListViewItem
     }
     bool load(QDir & dir);
     void key_event(QKeyEvent *);
+    BrowserNode* firstChild() const {return (BrowserNode*)this->child(0);}
 
+    BrowserNode *nextSibling();
+    void repaint(){ /*doldurulacak*/}
+    void moveItem(BrowserNode *after);
+    QVariant data(int column, int role) const;
 private:
     void assign(int);
     void assign_mine(int);
@@ -69,19 +70,19 @@ class BrowserNode : public Q3ListViewItem
     int modifier_id;
     int owner;
     int format;
-    int offset;
+    size_t offset;
     BooL ro;
 };
 
 // a sortable list of BrowserNode
 
-#include <q3ptrlist.h>
 
-class BrowserNodeList : public Q3PtrList<BrowserNode>
+
+class BrowserNodeList : public QList<BrowserNode *>
 {
 public:
     void search(BrowserNode * bn, const QString & s, bool cs);
-    virtual int compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2);
+    static int compareItems(void *item1, void *item2);
 };
 
 #endif
diff --git a/src/ProjectControl/BrowserSearchDialog.cpp b/src/ProjectControl/BrowserSearchDialog.cpp
index f6db32e60..8830590aa 100644
--- a/src/ProjectControl/BrowserSearchDialog.cpp
+++ b/src/ProjectControl/BrowserSearchDialog.cpp
@@ -27,51 +27,55 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
-#include <q3groupbox.h>
-//Added by qt3to4:
-#include <Q3GridLayout>
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "BrowserSearchDialog.h"
 #include "BrowserView.h"
+#include <QComboBox>
+#include <QGroupBox>
 
 QString BrowserSearchDialog::saved_ed;
 bool BrowserSearchDialog::saved_case_sensitive;
 
 BrowserSearchDialog::BrowserSearchDialog(const QPoint & p)
-    : QDialog(0, "Browser search", TRUE)
+    : QDialog(0)
 {
-    setCaption("Browser search");
+    setWindowTitle("Browser search");
+    setModal(true);
     move(p);
-
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
-    Q3GridLayout * gl = new Q3GridLayout(vbox, 4, 2, 5/*space*/);
+    QGridLayout * gl = new QGridLayout(this);//(4, 2, 5/*space*/);
+    vbox->addLayout(gl);
 
     ed = new QLineEdit(this);
     ed->setText(saved_ed);
     gl->addWidget(new QLabel("Containing", this), 1, 0, Qt::AlignLeft);
     gl->addWidget(ed, 1, 1);
 
-    Q3GroupBox * gb = new Q3GroupBox(2, Qt::Horizontal, this);
+    QGroupBox * gb = new QGroupBox(this);//(2, Qt::Horizontal, this);
 
+    gb->setLayout(new QVBoxLayout);
     case_sensitive = new QCheckBox("case sensitive", gb);
+    gb->layout()->addWidget(case_sensitive);
     case_sensitive->setChecked(saved_case_sensitive);
 
     gl->addWidget(gb, 2, 1);
 
     gl->addWidget(new QLabel("Result", this), 3, 0, Qt::AlignLeft);
-    results = new Q3ComboBox(FALSE, this);
+    results = new QComboBox(this);
+    results->setEditable(false);
     gl->addWidget(results, 3, 1);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
     QPushButton * search_b = new QPushButton("Search", this);
     QPushButton * select_b = new QPushButton("Select", this);
@@ -88,6 +92,7 @@ BrowserSearchDialog::BrowserSearchDialog(const QPoint & p)
     connect(close_b, SIGNAL(clicked()), this, SLOT(reject()));
 
     setMaximumHeight(sizeHint().height());
+
 }
 
 BrowserSearchDialog::~BrowserSearchDialog()
@@ -95,7 +100,12 @@ BrowserSearchDialog::~BrowserSearchDialog()
     saved_ed = ed->text();
     saved_case_sensitive = case_sensitive->isChecked();
 }
-
+bool compareItems( BrowserNode * s1 , BrowserNode * s2 )
+{
+    //return s1. < s2.getRollNo();
+    //return ((BrowserNode *) s1)->text(TREE_COL).compare(((BrowserNode *) s2)->text(TREE_COL));
+    return BrowserNodeList::compareItems(s1,s2);
+}
 void BrowserSearchDialog::search()
 {
     nodes.clear();
@@ -103,14 +113,18 @@ void BrowserSearchDialog::search()
 
     nodes.search(BrowserView::get_project(), ed->text(),
                  case_sensitive->isChecked());
-    nodes.sort();
+    //nodes.sort();
+    //qSort(nodes.begin(), nodes.end(), compareItems);
+    std::sort(nodes.begin(), nodes.end(), compareItems);
 
     BrowserNode * bn;
 
-    for (bn = nodes.first(); bn != 0; bn = nodes.next()) {
+    int i = 0;
+    for (i = 0; i < nodes.count(); i++) {
+        bn = nodes.at(i);
         QString up = ((BrowserNode *) bn->parent())->get_path();
 
-        results->insertItem((up.isEmpty())
+        results->addItem((up.isEmpty())
                             ? QString(bn->text(0))
                             : bn->text(0) + QString("   [") + up + "]");
     }
@@ -119,6 +133,6 @@ void BrowserSearchDialog::search()
 void BrowserSearchDialog::select()
 {
     if (results->count() != 0)
-        BrowserView::select(nodes.at(results->currentItem()));
+        BrowserView::select(nodes.at(results->currentIndex()));
 }
 
diff --git a/src/ProjectControl/BrowserSearchDialog.h b/src/ProjectControl/BrowserSearchDialog.h
index 9e2cbbe82..6fd8f37c8 100644
--- a/src/ProjectControl/BrowserSearchDialog.h
+++ b/src/ProjectControl/BrowserSearchDialog.h
@@ -32,7 +32,7 @@
 
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QLineEdit;
 class QCheckBox;
 
@@ -42,7 +42,7 @@ class BrowserSearchDialog : public QDialog
 
 protected:
     BrowserNodeList nodes;
-    Q3ComboBox * results;
+    QComboBox * results;
     QLineEdit * ed;
     QCheckBox * case_sensitive;
 
diff --git a/src/ProjectControl/BrowserView.cpp b/src/ProjectControl/BrowserView.cpp
index 5e3def6dc..1eb78145f 100644
--- a/src/ProjectControl/BrowserView.cpp
+++ b/src/ProjectControl/BrowserView.cpp
@@ -37,29 +37,23 @@
 BrowserView * BrowserView::the;
 QDir BrowserView::dir;
 
-BrowserView::BrowserView(QWidget * parent) : Q3ListView(parent)
+BrowserView::BrowserView(QWidget * parent) : QTreeWidget(parent)
 {
     the = this;
 
-    setSorting(-1);		// manual sorting
-    addColumn("browser          ");
-    addColumn("Owner id");
-    addColumn("Owner name");
-    addColumn("Revision");
-    addColumn("Modified by");
-    setColumnWidthMode(0, Maximum);
-    setColumnWidthMode(1, Maximum);
-    setColumnWidthMode(2, Maximum);
-    setColumnWidthMode(3, Maximum);
-    setColumnWidthMode(4, Maximum);
-    setColumnAlignment(1, ::Qt::AlignHCenter);
-    setColumnAlignment(2, ::Qt::AlignHCenter);
-    setColumnAlignment(3, ::Qt::AlignHCenter);
-    setColumnAlignment(4, ::Qt::AlignHCenter);
-    setTreeStepSize(18);
-
-    connect(this, SIGNAL(rightButtonPressed(Q3ListViewItem *, const QPoint &, int)),
-            this, SLOT(rightPressed(Q3ListViewItem *)));
+    //setSorting(-1);		// manual sorting
+    setColumnCount(5);
+    QStringList headers;
+
+     headers<<("browser          ");
+     headers<<("Owner id");
+     headers<<("Owner name");
+     headers<<("Revision");
+     headers<<("Modified by");
+    setHeaderLabels(headers);
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(this, SIGNAL(customContextMenuRequested(const QPoint&)),
+            this, SLOT(rightPressed(const QPoint&)));
 }
 
 BrowserView::~BrowserView()
@@ -68,7 +62,7 @@ BrowserView::~BrowserView()
 
 void BrowserView::close()
 {
-    if (firstChild() != 0) {
+    if (itemAt(0,0) != 0) {
         dir.rmdir("all.lock");
         clear();
     }
@@ -76,7 +70,7 @@ void BrowserView::close()
 
 BrowserNode * BrowserView::get_project()
 {
-    return (BrowserNode *) the->firstChild();
+    return (BrowserNode *) the->itemAt(0,0);
 }
 
 void BrowserView::set_project(QDir di)
@@ -86,22 +80,24 @@ void BrowserView::set_project(QDir di)
     setRootIsDecorated(TRUE/*FALSE*/);
 }
 
-void BrowserView::rightPressed(Q3ListViewItem * item)
+void BrowserView::rightPressed(const QPoint &pos)
 {
-    if (item != 0)
-        ((BrowserNode *) item)->menu();
+    BrowserNode *node = static_cast<BrowserNode *>(itemAt(pos));
+
+    if (node != 0)
+        ((BrowserNode *) node)->menu();
 }
 
 void BrowserView::keyPressEvent(QKeyEvent * e)
 {
-    switch (e->state()) {
+    switch (e->modifiers()) {
     case ::Qt::ControlModifier:
     case ::Qt::AltModifier:
         switch (e->key()) {
         case ::Qt::Key_A:
         case ::Qt::Key_P:
         case ::Qt::Key_U: {
-            Q3ListViewItem * t = selectedItem();
+            QTreeWidgetItem * t = currentItem();
 
             if (t != 0) {
                 ((BrowserNode *) t)->key_event(e);
@@ -116,11 +112,11 @@ void BrowserView::keyPressEvent(QKeyEvent * e)
         break;
     }
 
-    Q3ListView::keyPressEvent(e);
+    QTreeWidget::keyPressEvent(e);
 }
 
-void BrowserView::select(Q3ListViewItem * b)
+void BrowserView::select(QTreeWidgetItem *b)
 {
-    the->ensureItemVisible(b);
-    the->setSelected(b, TRUE);
+    the->scrollToItem(b);
+    the->setCurrentItem(b);
 }
diff --git a/src/ProjectControl/BrowserView.h b/src/ProjectControl/BrowserView.h
index b5dc1aa67..7c140095e 100644
--- a/src/ProjectControl/BrowserView.h
+++ b/src/ProjectControl/BrowserView.h
@@ -28,14 +28,13 @@
 #ifndef BROWSERVIEW_H
 #define BROWSERVIEW_H
 
-#include <q3listview.h>
-#include <qdir.h>
-//Added by qt3to4:
+#include <QDir>
 #include <QKeyEvent>
+#include <QTreeWidget>
 
 class BrowserNode;
 
-class BrowserView : public Q3ListView
+class BrowserView : public QTreeWidget
 {
     Q_OBJECT
 
@@ -50,7 +49,7 @@ class BrowserView : public Q3ListView
     void set_project(QDir dir);
     void close();
 
-    static void select(Q3ListViewItem * b);
+    static void select(QTreeWidgetItem * b);
     static BrowserNode * get_project();
     static QDir & get_dir() {
         return dir;
@@ -60,7 +59,7 @@ class BrowserView : public Q3ListView
     virtual void keyPressEvent(QKeyEvent *);
 
 protected slots:
-    void rightPressed(Q3ListViewItem *);
+    void rightPressed(const QPoint &pos);
 };
 
 #endif
diff --git a/src/ProjectControl/ControlWindow.cpp b/src/ProjectControl/ControlWindow.cpp
index a30d4b884..c4ae1263f 100644
--- a/src/ProjectControl/ControlWindow.cpp
+++ b/src/ProjectControl/ControlWindow.cpp
@@ -31,20 +31,14 @@
 
 #include <qapplication.h>
 #include <qmessagebox.h>
-#include <q3popupmenu.h>
+#include <QMenu>
 #include <qmenubar.h>
-#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <qstatusbar.h>
-#include <qwindowsstyle.h>
-#include <qmotifstyle.h>
-//#include <qmotifplusstyle.h>
-#include <q3whatsthis.h>
-#include <q3filedialog.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <QTextStream>
-//Added by qt3to4:
 #include <QPixmap>
 
 #include "ControlWindow.h"
@@ -56,117 +50,155 @@
 #include "fileopen.xpm"
 #include "browsersearch.xpm"
 #include "actor.xpm"
-
+#include <QFileDialog>
+#include <QWhatsThis>
+#include <QSettings>
+#include <QTextCodec>
 ControlWindow * ControlWindow::the;
 
 const char * OpenText = "To load a project";
 const char * SearchText = "To search a <i>package</i> in the <i>browser</i>.";
 const char * ChangeUserText = "To be an other user.";
+QToolButton *
+CreateToolButton(
+        QPixmap icon,
+        QWidget * receiver,
+        const char * boundslot,
+        QToolBar * parent,
+        QString shown,
+        QString whatsThis)
+{
+    QToolButton * newButton = new QToolButton();
+    QObject::connect(newButton, SIGNAL(clicked()), receiver, boundslot);
+    newButton->setIcon(icon);
+    newButton->setText(shown);
+    newButton->setToolTip(shown);
+    newButton->setMinimumSize(30, 30);
+    newButton->setWhatsThis(whatsThis);
+    parent->addWidget(newButton);
+    return newButton;
+}
 
-ControlWindow::ControlWindow(QDir & homeDir) : Q3MainWindow(0, "Project control", Qt::WDestructiveClose)
+ControlWindow::ControlWindow(QDir & homeDir) : QMainWindow(0)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
     the = this;
-    setCaption("Project control");
+    setWindowTitle("Project control");
 
-    Q3PopupMenu * menu;
+    QMenu * menu;
     QPixmap pixmap;
+    QAction *action;
 
-    Q3ToolBar * tools = new Q3ToolBar(this, "operations");
+    QToolBar * tools = new QToolBar("operations", this);
 
-    addToolBar(tools, "Operations", Qt::DockTop, TRUE);
+    addToolBar(Qt::TopToolBarArea, tools);
 
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("P&roject", menu);
+    menu = new QMenu(this);
+    menu->setTitle("P&roject");
+    menuBar()->addMenu(menu);
 
     // open
 
     pixmap = QPixmap(fileopen);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Open", QString(),
-                                     this, SLOT(load()), tools, "open"),
-                     OpenText);
-    menu->setWhatsThis(menu->insertItem(pixmap, "&Open", this,
-                                        SLOT(load()), Qt::CTRL + Qt::Key_O),
-                       OpenText);
+    QToolButton *button = CreateToolButton(pixmap,this, SLOT(load()), tools, "Open", OpenText);
+    //Q3WhatsThis::add(new QToolButton(pixmap, "Open", QString(),
+    //                               this, SLOT(load()), tools, "open"),
+    //             OpenText);
+
+    action = menu->addAction(pixmap, "&Open", this,
+                             SLOT(load()), Qt::CTRL + Qt::Key_O);
+    action->setWhatsThis(OpenText);
+    //    menu->setWhatsThis(menu->insertItem(pixmap, "&Open", this,
+    //                                        SLOT(load()), Qt::CTRL + Qt::Key_O),
+    //                       OpenText);
 
-    // change user
 
+    // change user
     pixmap = QPixmap(actor);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Who", QString(),
-                                     this, SLOT(change_user()), tools, "Change user"),
-                     ChangeUserText);
-    menu->setWhatsThis(menu->insertItem(pixmap, "Change &user", this,
-                                        SLOT(change_user()), Qt::CTRL + Qt::Key_C),
-                       ChangeUserText);
+
+
+    button = CreateToolButton(pixmap,this, SLOT(change_user()), tools, "Who", ChangeUserText);
+
+    //    Q3WhatsThis::add(new QToolButton(pixmap, "Who", QString(),
+    //                                     this, SLOT(change_user()), tools, "Change user"),
+    //                     ChangeUserText);
+    action  = menu->addAction(pixmap, "Change &user", this,
+                              SLOT(change_user()), Qt::CTRL + Qt::Key_C);
+    action->setWhatsThis(ChangeUserText);
 
     // search
 
     pixmap = QPixmap(browsersearch);
-    Q3WhatsThis::add(new QToolButton(pixmap, "Search", QString(),
-                                     this, SLOT(browser_search()), tools, "search"),
-                     SearchText);
-    menu->setWhatsThis(menu->insertItem(pixmap, "&Search", this,
-                                        SLOT(browser_search()), Qt::CTRL + Qt::Key_S),
-                       SearchText);
+    button = CreateToolButton(pixmap,this, SLOT(browser_search()), tools, "Search", SearchText);
+    //    Q3WhatsThis::add(new QToolButton(pixmap, "Search", QString(),
+    //                                     this, SLOT(browser_search()), tools, "search"),
+    //                     SearchText);
+    action = menu->addAction(pixmap, "&Search", this,
+                             SLOT(browser_search()), Qt::CTRL + Qt::Key_S);
+    action->setWhatsThis(SearchText);
 
     // quit & what
 
-    menu->insertItem("&Quit", this, SLOT(quit()), Qt::CTRL + Qt::Key_Q);
-
-    (void)Q3WhatsThis::whatsThisButton(tools);
+    action = menu->addAction("&Quit", this, SLOT(quit()), Qt::CTRL + Qt::Key_Q);
+    QAction *whatsThisAction = QWhatsThis::createAction();
+    tools->addAction(whatsThisAction);
+    //(void)Q3WhatsThis::whatsThisButton(tools);
 
     // historic
 
     // note : QFile fp(QDir::home().absFilePath(".douml")) doesn't work
     // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = homeDir.absFilePath(".douml");
-    FILE * fp = fopen((const char *) s, "r");
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            remove_crlf(line);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    settings.beginGroup("Recent_Files");
+    for(int i = 1; i <= 10; ++i)
+    {
+        const QString line = settings.value(tr("File%1").arg(i)).toString();
+        if(!line.isEmpty())
+        {
             historic.append(line);
         }
-
-        fclose(fp);
+        else
+        {
+            break;
+        }
     }
-
-    menu->insertSeparator();
+    menu->addSeparator();
     QString whats = QString("to open this project.<br><br>The historic is saved in <i>")
-                    + homeDir.absFilePath(".douml") + "</i>";
+            + homeDir.absoluteFilePath(".douml") + "</i>";
 
     for (int i = 0; i < int(historic.count()); i += 1) {
-        int id = menu->insertItem(*historic.at(i),
-                                  this, SLOT(historicActivated(int)));
-        menu->setItemParameter(id, i);
-        menu->setWhatsThis(id, whats);
+        action = menu->addAction(historic.at(i),
+                                 this, SLOT(historicActivated()));
+        action->setData(i);
+        action->setWhatsThis(whats);
+        //menu->setItemParameter(id, i);
+        //menu->setWhatsThis(id, whats);
     }
 
     // style
 
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&Style", menu);
+
+    menu = menuBar()->addMenu("&Style");
 
 #if !defined(QT_NO_STYLE_MOTIF)
-    menu->insertItem("Motif", this, SLOT(motif_style()));
+    menu->addAction("Motif", this, SLOT(motif_style()));
 #endif
 #if !defined(QT_NO_STYLE_MOTIFPLUS)
-    menu->insertItem("MotifPlus", this, SLOT(motifplus_style()));
+    menu->addAction("MotifPlus", this, SLOT(motifplus_style()));
 #endif
-    menu->insertItem("Windows", this, SLOT(windows_style()));
+    menu->addAction("Windows", this, SLOT(windows_style()));
 
     // help & about
 
-    menuBar()->insertSeparator();
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&Help", menu);
-
-    menu->insertItem("&About", this, SLOT(about()), Qt::Key_F1);
-    menu->insertItem("About&Qt", this, SLOT(aboutQt()));
-    menu->insertSeparator();
-    menu->insertItem("What's This", this, SLOT(whatsThis()), Qt::SHIFT + Qt::Key_F1);
+    menuBar()->addSeparator();
+    menu = menuBar()->addMenu("&Help");
 
+    menu->addAction("&About", this, SLOT(about()), Qt::Key_F1);
+    menu->addAction("About&Qt", this, SLOT(aboutQt()));
+    menu->addSeparator();
+    //menu->addAction("What's This", whatsThisAction, SIGNAL(triggered(bool)), Qt::SHIFT + Qt::Key_F1);
+    menu->addAction(whatsThisAction);
     //
 
     browser = new BrowserView(this);
@@ -182,18 +214,19 @@ ControlWindow::~ControlWindow()
     browser->close();
 }
 
-void ControlWindow::historicActivated(int id)
+void ControlWindow::historicActivated()
 {
-    QStringList::Iterator it = historic.at(id);
-
-    if (it != historic.end())
-        load(*it);
+    QAction* s = static_cast<QAction* >(sender());
+    if(s)
+    {
+        load(s->text());
+    }
 }
 
 void ControlWindow::show_identity()
 {
-    statusBar()->message("User is " + user_name(user_id()) +
-                         " [id " + QString::number(user_id()) + "]");
+    statusBar()->showMessage("User is " + user_name(user_id()) +
+                             " [id " + QString::number(user_id()) + "]");
 }
 
 void ControlWindow::change_user()
@@ -211,11 +244,11 @@ void ControlWindow::change_user()
 QString my_baseName(QFileInfo & fi)
 {
     QString fn = fi.fileName();
-    int index = fn.findRev('.');
+    int index = fn.lastIndexOf('.');
 
     return (index == -1)
-           ? fn
-           : fn.left(index);
+            ? fn
+            : fn.left(index);
 }
 
 void ControlWindow::load(QString path)
@@ -227,28 +260,33 @@ void ControlWindow::load(QString path)
     if (!fi.exists())
         return;
 
-    QDir dir(fi.dirPath(TRUE));
+    QDir dir(fi.path());
 
     if (! dir.mkdir("all.lock"))
         QMessageBox::critical(0, "Control project",
                               (dir.exists("all.lock"))
                               ? "\
-The project is already locked by 'Project control' or 'Project syncho'\n\
-(the directory 'all.lock' exists)"
+                                The project is already locked by 'Project control' or 'Project syncho'\n\
+                                (the directory 'all.lock' exists)"
                               : "Can't create directory 'all.lock'");
     else {
-        const QFileInfoList * l = dir.entryInfoList("*.lock");
+        const QFileInfoList l = dir.entryInfoList(QStringList()<<"*.lock");
 
-        if (l != 0)  {
-            Q3PtrListIterator<QFileInfo> it(*l);
-            QFileInfo * fi;
+        if (!l.isEmpty())  {
+            //QFileInfoList::iterator it= l.begin();
+            //Q3PtrListIterator<QFileInfo> it(*l);
+            //QFileInfo * fi;
             QString ids;
 
-            while ((fi = it.current()) != 0) {
+            /*while ((fi = it.current()) != 0) {
                 if (fi->isDir() && (my_baseName(*fi) != "all"))
                     ids += " " + my_baseName(*fi);
 
                 ++it;
+            }*/
+            foreach (QFileInfo fi, l) {
+                if (fi.isDir() && (my_baseName(fi) != "all"))
+                    ids += " " + my_baseName(fi);
             }
 
             if (! ids.isEmpty()) {
@@ -259,11 +297,16 @@ The project is already locked by 'Project control' or 'Project syncho'\n\
             }
         }
 
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
         browser->set_project(dir);
-        browser->get_project()->setOpen(TRUE);
+        browser->get_project()->setExpanded(TRUE);
 
         bool r = browser->get_project()->load(dir);
+        browser->resizeColumnToContents(0);
+        browser->resizeColumnToContents(1);
+        browser->resizeColumnToContents(2);
+        browser->resizeColumnToContents(3);
+        browser->resizeColumnToContents(4);
 
         QApplication::restoreOverrideCursor();
 
@@ -276,7 +319,7 @@ The project is already locked by 'Project control' or 'Project syncho'\n\
 
 void ControlWindow::load()
 {
-    QString path = Q3FileDialog::getOpenFileName(QString(), "*.prj", this);
+    QString path = QFileDialog::getOpenFileName(this, QString(), "*.prj");
 
     if (! path.isEmpty())
         load(path);
@@ -298,21 +341,21 @@ void ControlWindow::browser_search()
 void ControlWindow::motif_style()
 {
 #if !defined(QT_NO_STYLE_MOTIF)
-    QApplication::setStyle(new QMotifStyle);
+    QApplication::setStyle("motif");
 #endif
 }
 
 void ControlWindow::motifplus_style()
 {
 #if !defined(QT_NO_STYLE_MOTIFPLUS)
-    QApplication::setStyle(new QMotifPlusStyle);
+    QApplication::setStyle("motifPlus");
 #endif
 }
 
 void ControlWindow::windows_style()
 {
 #ifndef QT_NO_STYLE_WINDOWS
-    QApplication::setStyle(new QWindowsStyle);
+    QApplication::setStyle("windows");
 #endif
 }
 
diff --git a/src/ProjectControl/ControlWindow.h b/src/ProjectControl/ControlWindow.h
index 80f015a27..0df09d819 100644
--- a/src/ProjectControl/ControlWindow.h
+++ b/src/ProjectControl/ControlWindow.h
@@ -28,7 +28,7 @@
 #ifndef CONTROLWINDOW_H
 #define CONTROLWINDOW_H
 
-#include <q3mainwindow.h>
+#include <QMainWindow>
 #include <qstringlist.h>
 
 class BrowserView;
@@ -37,7 +37,7 @@ class QDir;
 
 // singleton
 
-class ControlWindow : public Q3MainWindow
+class ControlWindow : public QMainWindow
 {
     Q_OBJECT
 
@@ -58,7 +58,7 @@ private slots:
     void load();
     void quit();
     void browser_search();
-    void historicActivated(int id);
+    void historicActivated();
     void change_user();
 
 
diff --git a/src/ProjectControl/UserDialog.cpp b/src/ProjectControl/UserDialog.cpp
index f05f44c3d..0c156574b 100644
--- a/src/ProjectControl/UserDialog.cpp
+++ b/src/ProjectControl/UserDialog.cpp
@@ -27,24 +27,25 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <QComboBox>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3HBoxLayout>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 
 #include "UserDialog.h"
 #include "myio.h"
 
 UserDialog::UserDialog(const QPoint & p)
-    : QDialog(0, "Browser search", TRUE)
+    : QDialog(0)
 {
-    setCaption("Choose user");
+    setWindowTitle("Choose user");
+    setModal(true);
     move(p);
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
     QLabel * lbl1;
     QLabel * lbl2;
 
@@ -57,30 +58,33 @@ UserDialog::UserDialog(const QPoint & p)
     lbl->setAlignment(::Qt::AlignCenter);
     vbox->addWidget(lbl);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
     lbl1 = new QLabel("User : ", this);
     hbox->addWidget(lbl1);
-    ids = new Q3ComboBox(FALSE, this);
+    ids = new QComboBox(this);
+    ids->setEditable(false);
 
     for (int index = 2; index != 128; index += 1) {
         QString s = user_name(index);
 
-        ids->insertItem((s.isEmpty())
+        ids->addItem((s.isEmpty())
                         ? QString::number(index)
                         : QString::number(index) + " (" + s + ")");
     }
 
-    ids->setCurrentItem(user_id() - 2);
+    ids->setCurrentIndex(user_id() - 2);
 
     QSizePolicy sp = ids->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     ids->setSizePolicy(sp);
 
     hbox->addWidget(ids);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
     lbl2 = new QLabel("New name : ", this);
     lbl1->setFixedWidth(lbl2->sizeHint().width());
@@ -88,7 +92,8 @@ UserDialog::UserDialog(const QPoint & p)
     edname = new QLineEdit(this);
     hbox->addWidget(edname);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
     QPushButton * ok = new QPushButton("Ok", this);
@@ -110,12 +115,12 @@ UserDialog::~UserDialog()
 
 int UserDialog::id()
 {
-    return ids->currentItem() + 2;
+    return ids->currentIndex() + 2;
 }
 
 QString UserDialog::name()
 {
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
 
     return (s.isEmpty()) ? user_name(id()) : s;
 }
diff --git a/src/ProjectControl/UserDialog.h b/src/ProjectControl/UserDialog.h
index fec7cab80..70c259355 100644
--- a/src/ProjectControl/UserDialog.h
+++ b/src/ProjectControl/UserDialog.h
@@ -30,7 +30,7 @@
 
 #include <qdialog.h>
 
-class Q3ComboBox;
+class QComboBox;
 class QLineEdit;
 
 class UserDialog : public QDialog
@@ -38,7 +38,7 @@ class UserDialog : public QDialog
     Q_OBJECT
 
 protected:
-    Q3ComboBox * ids;
+    QComboBox * ids;
     QLineEdit * edname;
 
 public:
diff --git a/src/ProjectControl/main.cpp b/src/ProjectControl/main.cpp
index 161994683..260c66536 100644
--- a/src/ProjectControl/main.cpp
+++ b/src/ProjectControl/main.cpp
@@ -41,78 +41,47 @@
 #include "myio.h"
 
 #include <QDesktopWidget>
-
+#include <QSettings>
+#include <QTextCodec>
 int main(int argc, char ** argv)
 {
     QApplication * app = new QApplication(argc, argv);
 
-    int uid = -1;
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QDir homeDir = QDir::home();
-    QString s = homeDir.absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     int cx = -1;
     int cy = -1;
     int w = QApplication::desktop()->width();
     int h = QApplication::desktop()->height();
 
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            remove_crlf(line);
-
-            if (!strncmp(line, "ID ", 3)) {
-                sscanf(line + 3, "%d", &uid);
-                break;
-            }
-            else if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        cx = (r + l) / 2;
-                        cy = (t + b) / 2;
-                        w = r - l;
-                        h = b - t;
-                    }
-                }
-            }
-        }
-
-        fclose(fp);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    int uid = settings.value("Main/id", -1).toInt();
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        cx = (r + l) / 2;
+        cy = (t + b) / 2;
+        w = r - l;
+        h = b - t;
+      }
     }
-
     if (uid == -1)
         QMessageBox::critical(0, "Control project", "Own identifier not defined");
     else if ((uid < 2) || (uid > 127))
         QMessageBox::critical(0, "Control project", "invalid Identifier");
     else {
-        set_user_id(uid, homeDir.dirName());
+        set_user_id(uid, QDir::homePath());
         app->connect(app, SIGNAL(lastWindowClosed()), SLOT(quit()));
         init_pixmaps();
-
+        QDir homeDir = QDir::home();
         ControlWindow * ww = new ControlWindow(homeDir);
 
         ww->resize((w * 3) / 5, (h * 3) / 5);
diff --git a/src/ProjectControl/myio.cpp b/src/ProjectControl/myio.cpp
index 7c1db207a..39a5f9209 100644
--- a/src/ProjectControl/myio.cpp
+++ b/src/ProjectControl/myio.cpp
@@ -140,9 +140,9 @@ char * read_token(char *& st)
 
 //
 
-static int open_file(QFile & fp, BooL & ro)
+static qint64 open_file(QFile & fp, BooL & ro)
 {
-    QString filename = fp.name();
+    QString filename = fp.fileName();
 
     while (! fp.open(QIODevice::ReadOnly)) {
         if (QMessageBox::critical(0, "Uml",
@@ -160,14 +160,14 @@ static int open_file(QFile & fp, BooL & ro)
 
 char * read_file(QDir & dir, QString fn, BooL & ro)
 {
-    QString filename = dir.absFilePath(fn);
+    QString filename = dir.absoluteFilePath(fn);
     QFile fp(filename);
-    int size;
+    qint64 size;
 
     if ((size = open_file(fp, ro)) != -1) {
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) == -1) {
+        if (fp.read(s, size) == -1) {
             QMessageBox::critical(0, "Error", filename + "cannot be read");
             delete [] s;
             return 0;
@@ -220,7 +220,7 @@ void set_user_id(int id, QString s)
 
 void remove_crlf(char * s)
 {
-    int len = strlen(s);
+    size_t len = strlen(s);
 
     if (len != 0) {
         if (s[len - 1] == '\n')
diff --git a/src/ProjectControl/projectcontrol.pro b/src/ProjectControl/projectcontrol.pro
index c8c4cd083..b93ab13b6 100644
--- a/src/ProjectControl/projectcontrol.pro
+++ b/src/ProjectControl/projectcontrol.pro
@@ -1,14 +1,44 @@
-TEMPLATE      = app
-CONFIG          += qt warn_on debug
-HEADERS          = BrowserNode.h BrowserView.h BrowserSearchDialog.h \
-        ControlWindow.h UserDialog.h
-SOURCES          = main.cpp BrowserNode.cpp ControlWindow.cpp \
-        BrowserView.cpp Pixmap.cpp BrowserSearchDialog.cpp \
-        UserDialog.cpp myio.cpp 
-
-
-TARGET          = projectControl
-DEFINES          = BooL=bool
-INCLUDEPATH   = 
-#The following line was inserted by qt3to4
-QT += network  qt3support 
+TEMPLATE = app
+
+CONFIG -= app_bundle
+
+CONFIG += qt warn_on c++11
+
+DEFINES += QT_DEPRECATED_WARNINGS
+
+HEADERS = \
+    BrowserNode.h \
+    BrowserView.h \
+    BrowserSearchDialog.h \
+    ControlWindow.h \
+    UserDialog.h
+
+SOURCES = \
+    main.cpp \
+    BrowserNode.cpp \
+    ControlWindow.cpp \
+    BrowserView.cpp \
+    Pixmap.cpp \
+    BrowserSearchDialog.cpp \
+    UserDialog.cpp \
+    myio.cpp
+
+TARGET = projectControl
+DEFINES += BooL=bool FALSE=false TRUE=true TR=tr
+QT += network widgets
+
+DESTDIR = ../../bin
+
+UI_DIR = src/ui
+
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
+}
+
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
+}
diff --git a/src/ProjectSynchro/BrowserNode.cpp b/src/ProjectSynchro/BrowserNode.cpp
index dc810bdd6..4f705037c 100644
--- a/src/ProjectSynchro/BrowserNode.cpp
+++ b/src/ProjectSynchro/BrowserNode.cpp
@@ -44,27 +44,22 @@
 #define REVISION_COL 1
 #define MODIFIEDBY_COL 2
 
-#ifdef __APPLE__
-#define Qt::CTRL "Apple"
-#else
-#define Qt::CTRL "Ctrl"
-#endif
 
-Q3Dict<BrowserNode> BrowserNode::Youngs;
+QHash<QString, BrowserNode*> BrowserNode::Youngs;
 
 BrowserNode::BrowserNode(BrowserView * parent, QString fn)
-    : Q3ListViewItem(parent), filename(fn), view(parent), state(Unknown)
+    : QTreeWidgetItem(parent), filename(fn), view(parent), state(Unknown)
 {
     parent->add_node(this);
 }
 
 BrowserNode::BrowserNode(BrowserNode * parent, QString fn, BrowserView * v)
-    : Q3ListViewItem(parent), filename(fn), view(v), state(Unknown)
+    : QTreeWidgetItem(parent), filename(fn), view(v), state(Unknown)
 {
     v->add_node(this);
 
     // move it at end
-    Q3ListViewItem * child = parent->firstChild();
+    BrowserNode * child = (BrowserNode *)parent->child(0);
 
     while (child->nextSibling())
         child = child->nextSibling();
@@ -72,7 +67,7 @@ BrowserNode::BrowserNode(BrowserNode * parent, QString fn, BrowserView * v)
     if (child != this)
         moveItem(child);
 
-    parent->setOpen(TRUE);
+    parent->setExpanded(true);
 }
 
 void BrowserNode::set_state(State st)
@@ -80,12 +75,12 @@ void BrowserNode::set_state(State st)
     state = st;
 
     if (state == Young)
-        Youngs.replace(filename, this);
+        Youngs.insert(filename, this);
 }
 
 int BrowserNode::get_rev() const
 {
-    return atoi(text(REVISION_COL));
+    return text(REVISION_COL).toInt();
 }
 
 // solve state and return TRUE if Young
@@ -226,23 +221,24 @@ bool BrowserNode::load(QDir & dir)
 }
 
 // synchronize all in todir, current packages are 'nodes'
-void BrowserNode::synchronize(QDir & todir, Q3Dict<BrowserNode> & nodes)
+void BrowserNode::synchronize(QDir & todir, QHash<QString, BrowserNode*> & nodes)
 {
-    static Q3Dict<void> useful(9973);	// all useful files
+    static QHash<QString, void*> useful;//(9973);	// all useful files
     static bool made_useful = TRUE;	// set at the first call
 
     // compare nodes with young packages
 
-    Q3DictIterator<BrowserNode> ity(Youngs);
+    //Q3DictIterator<BrowserNode> ity(Youngs);
+    QHash<QString, BrowserNode*>::iterator ity = Youngs.begin();//ity(Youngs);
 
-    for (; ity.current(); ++ity) {
-        BrowserNode * from = ity.current();
-        BrowserNode * curr_bn = nodes.find(ity.currentKey());
+    for (; ity != Youngs.end(); ++ity) {
+        BrowserNode * from = *ity;
+        BrowserNode * curr_bn = *nodes.find(ity.key());
 
         if ((curr_bn == 0) || (curr_bn->state == Old)) {
             // don't exist or must be updated
             if (made_useful)
-                useful.insert(ity.currentKey(), (void *) 1);
+                useful.insert(ity.key(), (void *) 1);
 
             QDir & fromdir = from->view->get_dir();
 
@@ -295,11 +291,12 @@ void BrowserNode::synchronize(QDir & todir, Q3Dict<BrowserNode> & nodes)
 
     if (made_useful) {
         // memorize up to date packages, diagrams and classes body file
-        Q3DictIterator<BrowserNode> itn(nodes);
+        //Q3DictIterator<BrowserNode> itn(nodes);
+        QHash<QString, BrowserNode*>::iterator itn = nodes.begin();//ity(Youngs);
 
-        for (; itn.current(); ++itn)
-            if (itn.current()->state == UpToDate)
-                itn.current()->memo(useful);
+        for (; itn != nodes.end(); ++itn)
+            if (itn.value()->state == UpToDate)
+                itn.value()->memo(useful);
 
         made_useful = FALSE;
     }
@@ -309,7 +306,7 @@ void BrowserNode::synchronize(QDir & todir, Q3Dict<BrowserNode> & nodes)
 }
 
 // this is useful, memorize it and its diagrams and classes body file
-void BrowserNode::memo(Q3Dict<void> & useful)
+void BrowserNode::memo(QHash<QString, void *> &useful)
 {
     useful.insert(filename, (void *) 1);
 
@@ -322,3 +319,40 @@ void BrowserNode::memo(Q3Dict<void> & useful)
         useful.insert(*its, (void *) 1);
 }
 
+
+BrowserNode *BrowserNode::nextSibling()
+{
+    for(int i = 0; i < parent()->childCount(); i++)
+    {
+        if(parent()->child(i) == this)
+        {
+            if((i+1)<parent()->childCount())
+                return (BrowserNode *)parent()->child(i+1);
+            break;
+        }
+    }
+    return NULL;
+}
+
+
+void BrowserNode::moveItem(BrowserNode *after)
+{
+    if(this->parent())
+    {
+        this->parent()->removeChild(this);
+        if(after->parent())
+        {
+            after->parent()->insertChild(after->parent()->indexOfChild(after)+1, this);
+        }
+    }
+}
+QVariant	BrowserNode::data(int column, int role) const
+{
+    if(role == Qt::DecorationRole)
+    {
+        const QPixmap *pix = pixmap(column);
+        if(pix)
+            return QIcon(*pix);
+    }
+    return QTreeWidgetItem::data(column, role);
+}
diff --git a/src/ProjectSynchro/BrowserNode.h b/src/ProjectSynchro/BrowserNode.h
index 5bb7364ac..21229e173 100644
--- a/src/ProjectSynchro/BrowserNode.h
+++ b/src/ProjectSynchro/BrowserNode.h
@@ -28,12 +28,10 @@
 #ifndef BROWSERNODE_H
 #define BROWSERNODE_H
 
-#include <q3listview.h>
-#include <q3dict.h>
 //Added by qt3to4:
 #include <QKeyEvent>
 #include <QPixmap>
-
+#include <QTreeWidgetItem>
 class QDir;
 class QKeyEvent;
 class BrowserView;
@@ -42,7 +40,7 @@ enum State {
     UpToDate, Young, Old, Deleted, Unknown
 };
 
-class BrowserNode : public Q3ListViewItem
+class BrowserNode : public QTreeWidgetItem
 {
 public:
     BrowserNode(BrowserView * parent, QString fn);
@@ -64,11 +62,14 @@ class BrowserNode : public Q3ListViewItem
     int get_rev() const;
 
     bool solve();	// solve state and return TRUE if Young
-    static void synchronize(QDir & todir, Q3Dict<BrowserNode> & nodes);
+    static void synchronize(QDir & todir, QHash<QString, BrowserNode*> & nodes);
 
+    BrowserNode *nextSibling();
+    void moveItem(BrowserNode *after);
+    QVariant data(int column, int role) const;
 private:
 
-    void memo(Q3Dict<void> & useful);
+    void memo(QHash<QString, void *> &useful);
 
     QString filename;
     QString modifier_name;
@@ -78,7 +79,7 @@ class BrowserNode : public Q3ListViewItem
     QStringList diagrams;
     QStringList classes;
 
-    static Q3Dict<BrowserNode> Youngs;
+    static QHash<QString, BrowserNode*> Youngs;
 };
 
 #endif
diff --git a/src/ProjectSynchro/BrowserView.cpp b/src/ProjectSynchro/BrowserView.cpp
index 26abc9a77..133beea5f 100644
--- a/src/ProjectSynchro/BrowserView.cpp
+++ b/src/ProjectSynchro/BrowserView.cpp
@@ -30,11 +30,8 @@
 
 
 #include <qlabel.h>
-#include <q3popupmenu.h>
+#include <QMenu>
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
 #include "BrowserView.h"
 #include "BrowserNode.h"
 #include "SynchroWindow.h"
@@ -42,23 +39,22 @@
 #define DICT_SIZE 101
 
 BrowserView::BrowserView(QWidget * parent)
-    : Q3ListView(parent), lbl(0), need_update(FALSE), cant_update(FALSE)
+    : QTreeWidget(parent), lbl(0), need_update(FALSE), cant_update(FALSE)
 {
-    nodes.resize(DICT_SIZE);
-
-    setSorting(-1);		// manual sorting
-    addColumn("browser          ");	// will be changed
-    addColumn("Rev.");
-    addColumn("Modified by");
-    setColumnWidthMode(0, Maximum);
-    setColumnWidthMode(1, Maximum);
-    setColumnWidthMode(2, Maximum);
-    setColumnAlignment(1, ::Qt::AlignHCenter);
-    setColumnAlignment(2, ::Qt::AlignHCenter);
-    setTreeStepSize(18);
-
-    connect(this, SIGNAL(selectionChanged(Q3ListViewItem *)),
-            this, SLOT(select(Q3ListViewItem *)));
+    nodes.reserve(DICT_SIZE);
+
+    setSortingEnabled(false);		// manual sorting
+
+
+    setColumnCount(3);
+    QStringList headers;
+
+     headers<<("browser          ");
+     headers<<("Rev.");
+     headers<<("Modified by");
+    setHeaderLabels(headers);
+    connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+            this, SLOT(select(QTreeWidgetItem*,QTreeWidgetItem*)));
 }
 
 BrowserView::~BrowserView()
@@ -67,7 +63,7 @@ BrowserView::~BrowserView()
 
 void BrowserView::close()
 {
-    if (firstChild() != 0) {
+    if (itemAt(0,0)) {
         dir.rmdir("all.lock");
         clear();
     }
@@ -75,7 +71,7 @@ void BrowserView::close()
 
 BrowserNode * BrowserView::get_project() const
 {
-    return (BrowserNode *) firstChild();
+    return (BrowserNode *) itemAt(0,0);
 }
 
 void BrowserView::set_project(QDir di)
@@ -85,28 +81,35 @@ void BrowserView::set_project(QDir di)
     setRootIsDecorated(TRUE/*FALSE*/);
 
     di.cdUp();
+#if 0
     setColumnText(0, di.path());
+#endif
 }
 
-void BrowserView::select(Q3ListViewItem * b)
+void BrowserView::select(QTreeWidgetItem *b, QTreeWidgetItem *previous)
 {
     static bool ongoing = FALSE;
 
+    Q_UNUSED(previous);
+
+    if(!b)
+        return;
     if (!ongoing) {
         ongoing = TRUE;
 
-        const Q3PtrList<BrowserView> & l = SynchroWindow::get_browsers();
-        Q3PtrListIterator<BrowserView> it(l);
+        const QList<BrowserView *> & l = SynchroWindow::get_browsers();
+        QList<BrowserView*>::const_iterator it = l.begin();
         QString fn = ((BrowserNode *) b)->file_name();
 
-        for (; it.current(); ++it) {
-            it.current()->clearSelection();
+        for (; it!= l.end(); ++it) {
+            (*it)->clearSelection();
 
-            BrowserNode * bn = it.current()->nodes.find(fn);
+            BrowserNode * bn = (*it)->nodes.find(fn).value();
 
             if (bn != 0) {
-                it.current()->ensureItemVisible(bn);
-                it.current()->Q3ListView::setSelected(bn, TRUE);
+                (*it)->scrollToItem(bn);
+                setCurrentItem(bn);
+                //(*it)->Q3ListView::setSelected(bn, TRUE);
             }
         }
 
@@ -123,7 +126,7 @@ void BrowserView::add_node(BrowserNode * bn)
 
 BrowserNode * BrowserView::get_node(QString f) const
 {
-    return nodes.find(f);
+    return nodes.find(f).value();
 }
 
 //
@@ -136,25 +139,25 @@ struct Use {
     Use(int rev) : rev_min(rev), rev_max(rev), count(1) {}
 };
 
-void BrowserView::update(const Q3PtrList<BrowserView> & lv)
+void BrowserView::update(const QList<BrowserView *> & lv)
 {
-    Q3Dict<Use> all_nodes(DICT_SIZE);
-    Q3PtrListIterator<BrowserView> itv(lv);
+    QHash<QString, Use*> all_nodes;//(DICT_SIZE);
+    QList<BrowserView*>::const_iterator itv = lv.begin();
 
-    all_nodes.setAutoDelete(TRUE);
+    //all_nodes.setAutoDelete(TRUE);
 
     // look at the revision in each view
 
-    for (; itv.current(); ++itv) {
-        Q3DictIterator<BrowserNode> itd(itv.current()->nodes);
+    for (; itv != lv.end(); ++itv) {
+        QHash<QString, BrowserNode*>::iterator itd = (*itv)->nodes.begin();
 
-        for (; itd.current(); ++itd) {
-            BrowserNode * bn = itd.current();
+        for (; itd != (*itv)->nodes.end() ; ++itd) {
+            BrowserNode * bn = *itd;
             int rev = bn->get_rev();
-            Use * use = all_nodes.find(itd.currentKey());
+            Use * use = all_nodes.find(itd.key()).value();
 
             if (use == 0)
-                all_nodes.insert(itd.currentKey(), new Use(rev));
+                all_nodes.insert(itd.key(), new Use(rev));
             else {
                 if (rev < use->rev_min)
                     use->rev_min = rev;
@@ -173,24 +176,26 @@ void BrowserView::update(const Q3PtrList<BrowserView> & lv)
     int nviews = lv.count();
     QStringList deleted_or_new;
 
-    Q3DictIterator<Use> itu(all_nodes);
+    QHash<QString, Use*>::iterator itu = all_nodes.begin();
 
-    for (; itu.current(); ++itu) {
-        QString who = itu.currentKey();
-        Use * use = itu.current();
+    for (; itu!=all_nodes.end(); ++itu) {
+        QString who = itu.key();
+        Use * use = itu.value();
 
         if (use->count == nviews) {
             // exist in all views : solve the state
             if (use->rev_min == use->rev_max) {
                 // up to date in all views
-                for (itv.toFirst(); itv.current(); ++itv)
-                    itv.current()->nodes.find(who)->set_state(UpToDate);
+                itv = lv.begin();
+                for (; itv != lv.end(); ++itv)
+                    (*itv)->nodes.find(who).value()->set_state(UpToDate);
             }
             else {
                 int max = use->rev_max;
 
-                for (itv.toFirst(); itv.current(); ++itv) {
-                    BrowserNode * pack = itv.current()->nodes.find(who);
+                itv = lv.begin();
+                for (; itv != lv.end(); ++itv) {
+                    BrowserNode * pack = (*itv)->nodes.find(who).value();
 
                     pack->set_state((pack->get_rev() == max) ? Young : Old);
                 }
@@ -200,15 +205,20 @@ void BrowserView::update(const Q3PtrList<BrowserView> & lv)
             // deleted or new, mark it unknown for this step
             deleted_or_new.append(who);
 
-            for (itv.toFirst(); itv.current(); ++itv) {
-                BrowserNode * pack = itv.current()->nodes.find(who);
+            itv = lv.begin();
+            for (; itv != lv.end(); ++itv) {
+                BrowserNode * pack = (*itv)->nodes.find(who).value();
 
                 if (pack != 0)
                     pack->set_state(Unknown);
             }
         }
     }
-
+    itu = all_nodes.begin();
+    for (; itu!=all_nodes.end(); ++itu)
+    {
+        delete itu.value();
+    }
     all_nodes.clear();
 
     // solve packages marked unknown
@@ -218,12 +228,13 @@ void BrowserView::update(const Q3PtrList<BrowserView> & lv)
 
     for (it = deleted_or_new.begin(); it != deleted_or_new.end(); ++it) {
         QString who = *it;
-        Q3PtrList<BrowserNode> images;
+        QList<BrowserNode *> images;
         bool young = FALSE;
 
         // set the state in each view without looking at the others
-        for (itv.toFirst(); itv.current(); ++itv) {
-            BrowserNode * pack = itv.current()->nodes.find(who);
+        itv = lv.begin();
+        for (; itv != lv.end(); ++itv) {
+            BrowserNode * pack = (*itv)->nodes.find(who).value();
 
             if (pack != 0) {
                 images.append(pack);
@@ -235,16 +246,18 @@ void BrowserView::update(const Q3PtrList<BrowserView> & lv)
 
         // set the final state if young, else all already marked deleted
         if (young) {
-            BrowserNode * pack;
+            ;
 
-            for (pack = images.first(); pack != 0; pack = images.next())
+            foreach (BrowserNode * pack, images) {
                 pack->set_state(Young);
+            }
         }
     }
 
     // force update on views
-    for (itv.toFirst(); itv.current(); ++itv)
-        itv.current()->update_it();
+    itv = lv.begin();
+    for (; itv != lv.end(); ++itv)
+        (*itv)->update_it();
 }
 
 void BrowserView::update_it()
@@ -255,10 +268,10 @@ void BrowserView::update_it()
     int nold = 0;
     int ndel = 0;
 
-    Q3DictIterator<BrowserNode> itd(nodes);
+    QHash<QString, BrowserNode*>::iterator itd = nodes.begin();
 
-    for (; itd.current(); ++itd) {
-        BrowserNode * bn = itd.current();
+    for (; itd != nodes.end(); ++itd) {
+        BrowserNode * bn = itd.value();
 
         switch (bn->get_state()) {
         case Old:
@@ -293,8 +306,9 @@ void BrowserView::update_it()
         lbl->setText("Up to date");
 
     lbl->show();
-
+#if 0
     triggerUpdate();
+#endif
 }
 
 //
diff --git a/src/ProjectSynchro/BrowserView.h b/src/ProjectSynchro/BrowserView.h
index ddf6b31c3..92f631dcb 100644
--- a/src/ProjectSynchro/BrowserView.h
+++ b/src/ProjectSynchro/BrowserView.h
@@ -28,24 +28,21 @@
 #ifndef BROWSERVIEW_H
 #define BROWSERVIEW_H
 
-#include <q3listview.h>
 #include <qdir.h>
-#include <q3dict.h>
-//Added by qt3to4:
 #include <QLabel>
-//Added by qt3to4:
-#include <Q3PtrList>
+#include <QTreeWidget>
+
 
 class BrowserNode;
 class QLabel;
 
-class BrowserView : public Q3ListView
+class BrowserView : public QTreeWidget
 {
     Q_OBJECT
 
 protected:
     QDir dir;
-    Q3Dict<BrowserNode> nodes;
+    QHash<QString, BrowserNode*> nodes;
     QLabel * lbl;
     bool need_update;
     bool cant_update;
@@ -77,13 +74,13 @@ class BrowserView : public Q3ListView
 
     void synchronize();
 
-    static void update(const Q3PtrList<BrowserView> &);
+    static void update(const QList<BrowserView *> &);
 
 protected:
     void update_it();
 
 protected slots:
-    void select(Q3ListViewItem * b);
+    void select(QTreeWidgetItem * b, QTreeWidgetItem *previous);
 };
 
 #endif
diff --git a/src/ProjectSynchro/SynchroDialog.cpp b/src/ProjectSynchro/SynchroDialog.cpp
index a3fd272e2..dd5a4d3be 100644
--- a/src/ProjectSynchro/SynchroDialog.cpp
+++ b/src/ProjectSynchro/SynchroDialog.cpp
@@ -31,32 +31,32 @@
 #include <qpushbutton.h>
 #include <qapplication.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3HBoxLayout>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 #include "SynchroDialog.h"
 #include "BrowserView.h"
 
-SynchroDialog::SynchroDialog(Q3PtrList<BrowserView> & b)
-    : QDialog(0, "Synchronize", TRUE), browsers(b)
+SynchroDialog::SynchroDialog(QList<BrowserView *> & b)
+    : QDialog(), browsers(b)
 {
-    setCaption("Synchronize");
+    setWindowTitle("Synchronize");
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
     bool has_ro = FALSE;
     bool has_ro_need_update = FALSE;
     bool has_need_update = FALSE;
-    Q3PtrListIterator<BrowserView> it(browsers);
+    QList<BrowserView*>::iterator it = browsers.begin();
 
-    for (; it.current(); ++it) {
-        if (it.current()->is_need_update()) {
-            if (it.current()->is_cant_update()) {
+    for (; it != browsers.end(); ++it) {
+        if ((*it)->is_need_update()) {
+            if ((*it)->is_cant_update()) {
                 has_ro = TRUE;
                 has_ro_need_update = TRUE;
             }
@@ -103,13 +103,15 @@ SynchroDialog::SynchroDialog(Q3PtrList<BrowserView> & b)
 
     //
 
-    for (it.toFirst() ; it.current(); ++it) {
-        if (it.current()->is_need_update()) {
-            QCheckBox * cb = new QCheckBox(it.current()->get_dir().path(), this);
+    it = browsers.begin();
+
+        for (; it != browsers.end(); ++it) {
+        if ((*it)->is_need_update()) {
+            QCheckBox * cb = new QCheckBox((*it)->get_dir().path(), this);
 
             vbox->addWidget(cb);
 
-            if (it.current()->is_cant_update())
+            if ((*it)->is_cant_update())
                 cb->setEnabled(FALSE);
             else
                 checks.append(cb);
@@ -118,7 +120,8 @@ SynchroDialog::SynchroDialog(Q3PtrList<BrowserView> & b)
 
     //
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
     if (has_need_update) {
@@ -143,17 +146,17 @@ SynchroDialog::~SynchroDialog()
 
 void SynchroDialog::accept()
 {
-    Q3PtrListIterator<BrowserView> itprj(browsers);
-    Q3PtrListIterator<QCheckBox> itcb(checks);
+    QList<BrowserView*>::iterator itprj = browsers.begin();
+    QList<QCheckBox*>::iterator itcb = checks.begin();
     bool work = FALSE;
-
-    QApplication::setOverrideCursor(Qt::waitCursor);
-
-    for (; itprj.current(); ++itprj) {
-        if (itprj.current()->is_need_update() &&
-            !itprj.current()->is_cant_update()) {
-            if (itcb.current()->isChecked()) {
-                itprj.current()->synchronize();
+    ++itcb;
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+
+    for (; itprj != browsers.end(); ++itprj) {
+        if ((*itprj)->is_need_update() &&
+            !(*itprj)->is_cant_update()) {
+            if ((*itcb)->isChecked()) {
+                (*itprj)->synchronize();
                 work = TRUE;
             }
 
diff --git a/src/ProjectSynchro/SynchroDialog.h b/src/ProjectSynchro/SynchroDialog.h
index 5a5066ddf..f6f50a453 100644
--- a/src/ProjectSynchro/SynchroDialog.h
+++ b/src/ProjectSynchro/SynchroDialog.h
@@ -29,9 +29,9 @@
 #define SYNCHRODIALOG_H
 
 #include <qdialog.h>
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
-#include <Q3PtrList>
+
 
 class QCheckBox;
 class BrowserView;
@@ -41,11 +41,11 @@ class SynchroDialog : public QDialog
     Q_OBJECT
 
 protected:
-    Q3PtrList<BrowserView> & browsers;
-    Q3PtrList<QCheckBox> checks;
+    QList<BrowserView *> & browsers;
+    QList<QCheckBox *> checks;
 
 public:
-    SynchroDialog(Q3PtrList<BrowserView> & b);
+    SynchroDialog(QList<BrowserView *> & b);
     virtual ~SynchroDialog();
 
 public slots:
diff --git a/src/ProjectSynchro/SynchroWindow.cpp b/src/ProjectSynchro/SynchroWindow.cpp
index c60f96cc4..312686d45 100644
--- a/src/ProjectSynchro/SynchroWindow.cpp
+++ b/src/ProjectSynchro/SynchroWindow.cpp
@@ -31,20 +31,13 @@
 
 #include <qapplication.h>
 #include <qmessagebox.h>
-#include <q3popupmenu.h>
+#include <QMenu>
 #include <qmenubar.h>
-#include <qwindowsstyle.h>
-#include <qmotifstyle.h>
-#include <qmotifplusstyle.h>
-#include <q3filedialog.h>
+#include <QFileDialog>
 #include <qfile.h>
 #include <qdir.h>
 #include <QTextStream>
-#include <q3hbox.h>
-#include <q3vbox.h>
-//Added by qt3to4:
 #include <QPixmap>
-
 #include "SynchroWindow.h"
 #include "BrowserView.h"
 #include "BrowserNode.h"
@@ -53,73 +46,75 @@
 
 SynchroWindow * SynchroWindow::the;
 
-SynchroWindow::SynchroWindow() : Q3MainWindow(0, "Project synchro", Qt::WDestructiveClose)
+SynchroWindow::SynchroWindow() : QMainWindow(0)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
     the = this;
-    setCaption("Project synchro");
+    setWindowTitle("Project synchro");
 
-    Q3PopupMenu * menu;
+    QMenu * menu;
     QPixmap pixmap;
 
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&Project", menu);
+    //menu = new QMenu(this);
+    menu = menuBar()->addMenu("&Project");
 
     // open
 
 #include "fileopen.xpm"
     pixmap = QPixmap(fileopen);
-    menu->insertItem(pixmap, "&Open", this,
+    menu->addAction(pixmap, "&Open", this,
                      SLOT(load()), Qt::CTRL + Qt::Key_O);
 
     // quit
 
-    menu->insertItem("&Quit", this, SLOT(quit()), Qt::CTRL + Qt::Key_Q);
+    menu->addAction("&Quit", this, SLOT(quit()), Qt::CTRL + Qt::Key_Q);
 
     // synchronize
 
-    menu->insertSeparator();
-    menu->insertItem("&Synchonize", this, SLOT(synchronize()), Qt::CTRL + Qt::Key_S);
+    menu->addSeparator();
+    menu->addAction("&Synchonize", this, SLOT(synchronize()), Qt::CTRL + Qt::Key_S);
 
     // style
 
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&Style", menu);
+    //menu = new Q3PopupMenu(this);
+    menu = menuBar()->addMenu("&Style");
 
 #if !defined(QT_NO_STYLE_MOTIF)
-    menu->insertItem("Motif", this, SLOT(motif_style()));
+    menu->addAction("Motif", this, SLOT(motif_style()));
 #endif
 #if !defined(QT_NO_STYLE_MOTIFPLUS)
-    menu->insertItem("MotifPlus", this, SLOT(motifplus_style()));
+    menu->addAction("MotifPlus", this, SLOT(motifplus_style()));
 #endif
-    menu->insertItem("Windows", this, SLOT(windows_style()));
+    menu->addAction("Windows", this, SLOT(windows_style()));
 
     // help & about
 
-    menuBar()->insertSeparator();
-    menu = new Q3PopupMenu(this);
-    menuBar()->insertItem("&Help", menu);
+    menuBar()->addSeparator();
+    //menu = new Q3PopupMenu(this);
+    menu = menuBar()->addMenu("&Help");
 
-    menu->insertItem("&About", this, SLOT(about()), Qt::Key_F1);
-    menu->insertItem("About&Qt", this, SLOT(aboutQt()));
+    menu->addAction("&About", this, SLOT(about()), Qt::Key_F1);
+    menu->addAction("About&Qt", this, SLOT(aboutQt()));
 
     //
-
-    hbox = new Q3HBox(this);
-    setCentralWidget(hbox);
+    QWidget *central = new QWidget(this);
+    setCentralWidget(central);
+    hbox = new QHBoxLayout(central);
+    //setCentralWidget(hbox);
 }
 
 SynchroWindow::~SynchroWindow()
 {
-    BrowserView * browser;
-
-    for (browser = browsers.first(); browser != 0; browser = browsers.next())
+    foreach (BrowserView * browser, browsers) {
         browser->close();
+    }
+
 }
 
 QString my_baseName(QFileInfo & fi)
 {
     QString fn = fi.fileName();
-    int index = fn.findRev('.');
+    int index = fn.lastIndexOf('.');
 
     return (index == -1)
            ? fn
@@ -136,12 +131,11 @@ void SynchroWindow::load(QString path)
         return;
     }
 
-    QDir dir(fi.dirPath(TRUE));
-    BrowserView * browser;
+    QDir dir(fi.path());
 
     path = dir.canonicalPath();
+    foreach (BrowserView * browser, browsers) {
 
-    for (browser = browsers.first(); browser != 0; browser = browsers.next()) {
         if (browser->get_dir().canonicalPath() == path) {
             QMessageBox::critical(0, "Project synchro",
                                   "Project instance already read");
@@ -159,18 +153,22 @@ The project is already locked by 'Project control' or 'Project syncho'\n\
 (the directory '" + path + "/all.lock' exists)"
                               : "Can't create directory '" + path + "/all.lock'");
     else {
-        const QFileInfoList * l = dir.entryInfoList("*.lock");
+        const QFileInfoList l = dir.entryInfoList(QStringList()<<"*.lock");
 
-        if (l != 0) {
-            Q3PtrListIterator<QFileInfo> it(*l);
-            QFileInfo * pfi;
+        if (!l.isEmpty()) {
+            //Q3PtrListIterator<QFileInfo> it(*l);
+            //QFileInfo * pfi;
             QString ids;
-
+            /*
             while ((pfi = it.current()) != 0) {
                 if (pfi->isDir() && (my_baseName(*pfi) != "all"))
                     ids += " " + my_baseName(*pfi);
 
                 ++it;
+            }*/
+            foreach (QFileInfo fi, l) {
+                if (fi.isDir() && (my_baseName(fi) != "all"))
+                    ids += " " + my_baseName(fi);
             }
 
             if (! ids.isEmpty()) {
@@ -181,10 +179,12 @@ The project is already locked by 'Project control' or 'Project syncho'\n\
             }
         }
 
-        Q3VBox * vbox = new Q3VBox(hbox);
-        BrowserView * browser = new BrowserView(vbox);
+        QVBoxLayout * vbox = new QVBoxLayout();
+        hbox->addLayout(vbox);
+        BrowserView * browser = new BrowserView(this);
+        vbox->addWidget(browser);
 
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
         browser->set_project(dir);
 
         bool r = browser->get_project()->load(dir);
@@ -200,20 +200,20 @@ The project is already locked by 'Project control' or 'Project syncho'\n\
             if (browsers.isEmpty())
                 project_name = fi.fileName();
 
+#if 0
             vbox->show();
+#endif
             browsers.append(browser);
         }
     }
 }
 
 void SynchroWindow::load()
-{
-    QString path =
-        Q3FileDialog::getOpenFileName(QString(),
-                                      (project_name.isEmpty())
-                                      ? "*.prj"
-                                      : project_name,
-                                      this);
+{   
+    QString path = QFileDialog::getOpenFileName(this, QString(), (project_name.isEmpty())
+                                                ? "*.prj"
+                                                : project_name);
+
 
     if (! path.isEmpty()) {
         load(path);
@@ -239,7 +239,7 @@ void SynchroWindow::load(int argc, char ** argv)
             return;
         }
 
-        if (fi.extension(FALSE) != "prj") {
+        if (!fi.fileName().endsWith(".prj")) {
             QMessageBox::critical(0, "Project synchro",
                                   argv[index] + QString(" is not a project"));
             return;
@@ -263,10 +263,10 @@ void SynchroWindow::load(int argc, char ** argv)
 
 void SynchroWindow::quit()
 {
-    BrowserView * browser;
 
-    for (browser = browsers.first(); browser != 0; browser = browsers.next())
+    foreach (BrowserView * browser, browsers) {
         browser->close();
+    }
 
     QApplication::exit(0);
 }
@@ -291,21 +291,21 @@ void SynchroWindow::synchronize()
 void SynchroWindow::motif_style()
 {
 #if !defined(QT_NO_STYLE_MOTIF)
-    QApplication::setStyle(new QMotifStyle);
+    QApplication::setStyle("motif");
 #endif
 }
 
 void SynchroWindow::motifplus_style()
 {
 #if !defined(QT_NO_STYLE_MOTIFPLUS)
-    QApplication::setStyle(new QMotifPlusStyle);
+    QApplication::setStyle("motifPlus");
 #endif
 }
 
 void SynchroWindow::windows_style()
 {
 #ifndef QT_NO_STYLE_WINDOWS
-    QApplication::setStyle(new QWindowsStyle);
+    QApplication::setStyle("windows");
 #endif
 }
 
diff --git a/src/ProjectSynchro/SynchroWindow.h b/src/ProjectSynchro/SynchroWindow.h
index 97eb64d75..7b522a489 100644
--- a/src/ProjectSynchro/SynchroWindow.h
+++ b/src/ProjectSynchro/SynchroWindow.h
@@ -28,10 +28,9 @@
 #ifndef SYNCHROWINDOW_H
 #define SYNCHROWINDOW_H
 
-#include <q3mainwindow.h>
-#include <q3ptrlist.h>
-//Added by qt3to4:
-#include <Q3PtrList>
+#include <QMainWindow>
+#include <QHBoxLayout>
+
 
 class Q3HBox;
 class BrowserView;
@@ -39,7 +38,7 @@ class BrowserNode;
 
 // singleton
 
-class SynchroWindow : public Q3MainWindow
+class SynchroWindow : public QMainWindow
 {
     Q_OBJECT
 
@@ -49,7 +48,7 @@ class SynchroWindow : public Q3MainWindow
 
     void load(int argc, char ** argv);
 
-    static const Q3PtrList<BrowserView> & get_browsers() {
+    static const QList<BrowserView *> & get_browsers() {
         return the->browsers;
     }
     static void abort();
@@ -58,8 +57,8 @@ class SynchroWindow : public Q3MainWindow
     static SynchroWindow * the;
 
     QString project_name;
-    Q3PtrList<BrowserView> browsers;
-    Q3HBox * hbox;
+    QList<BrowserView *> browsers;
+    QHBoxLayout * hbox;
 
     void load(QString path);
 
diff --git a/src/ProjectSynchro/main.cpp b/src/ProjectSynchro/main.cpp
index 2ab5beeaa..606feb91e 100644
--- a/src/ProjectSynchro/main.cpp
+++ b/src/ProjectSynchro/main.cpp
@@ -39,67 +39,38 @@
 #include "SynchroWindow.h"
 #include "Pixmap.h"
 #include "myio.h"
-
+#include <QSettings>
+#include <QDesktopWidget>
+#include <QTextCodec>
 int main(int argc, char ** argv)
 {
     QApplication * app = new QApplication(argc, argv);
 
-    int uid = -1;
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QDir homeDir = QDir::home();
-    QString s = homeDir.absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     int cx = -1;
     int cy = -1;
     int w = QApplication::desktop()->width();
     int h = QApplication::desktop()->height();
 
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            remove_crlf(line);
-
-            if (!strncmp(line, "ID ", 3)) {
-                sscanf(line + 3, "%d", &uid);
-                break;
-            }
-            else if (!strncmp(line, "DESKTOP ", 8)) {
-                int l, t, r, b;
-
-                if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4) {
-                    if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
-                        !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
-                        !((r <= l) || (b <= t))) {
-                        cx = (r + l) / 2;
-                        cy = (t + b) / 2;
-                        w = r - l;
-                        h = b - t;
-                    }
-                }
-            }
-        }
-
-        fclose(fp);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    int uid = settings.value("Main/id", -1).toInt();
+    int l, t, r, b;
+    l = settings.value("Desktop/left", -1).toInt();
+    r = settings.value("Desktop/right", -1).toInt();
+    t = settings.value("Desktop/top", -1).toInt();
+    b = settings.value("Desktop/bottom", -1).toInt();
+
+    if(l != -1 && r != -1 && t != -1 && b != -1)
+    {
+      if (!((r == 0) && (t == 0) && (r == 0) && (b == 0)) &&
+          !((r < 0) || (t < 0) || (r < 0) || (b < 0)) &&
+          !((r <= l) || (b <= t)))
+      {
+        cx = (r + l) / 2;
+        cy = (t + b) / 2;
+        w = r - l;
+        h = b - t;
+      }
     }
 
     if (uid == -1)
@@ -107,7 +78,7 @@ int main(int argc, char ** argv)
     else if ((uid < 2) || (uid > 127))
         QMessageBox::critical(0, "Synchro project", "invalid Identifier");
     else {
-        set_user_id(uid, homeDir.dirName());
+        set_user_id(uid, QDir::home().dirName());
         app->connect(app, SIGNAL(lastWindowClosed()), SLOT(quit()));
         init_pixmaps();
 
diff --git a/src/ProjectSynchro/myio.cpp b/src/ProjectSynchro/myio.cpp
index cd84d5fe1..a97fd5151 100644
--- a/src/ProjectSynchro/myio.cpp
+++ b/src/ProjectSynchro/myio.cpp
@@ -143,9 +143,9 @@ char * read_token(char *& st)
 
 //
 
-static int open_file(QFile & fp, BooL & ro)
+static qint64 open_file(QFile & fp, BooL & ro)
 {
-    QString filename = fp.name();
+    QString filename = fp.fileName();
 
     while (! fp.open(QIODevice::ReadOnly)) {
         if (QMessageBox::critical(0, "Uml",
@@ -163,14 +163,14 @@ static int open_file(QFile & fp, BooL & ro)
 
 char * read_file(QDir & dir, QString fn, BooL & ro)
 {
-    QString filename = dir.absFilePath(fn);
+    QString filename = dir.absoluteFilePath(fn);
     QFile fp(filename);
-    int size;
+    qint64 size;
 
     if ((size = open_file(fp, ro)) != -1) {
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) == -1) {
+        if (fp.read(s, size) == -1) {
             QMessageBox::critical(0, "Error", filename + "cannot be read");
             delete [] s;
             return 0;
@@ -192,16 +192,16 @@ char * read_file(QDir & dir, QString fn, BooL & ro)
 
 bool is_readonly(QDir & dir, QString fn)
 {
-    QFileInfo fi(dir.absFilePath(fn));
+    QFileInfo fi(dir.absoluteFilePath(fn));
 
     return fi.exists() && !fi.isWritable();
 }
 
 bool has_backup_files(QDir & dir)
 {
-    const QFileInfoList * l = dir.entryInfoList("*.bak");
+    const QFileInfoList l = dir.entryInfoList(QStringList()<<"*.bak");
 
-    return (l != 0) && !l->isEmpty();
+    return !l.isEmpty();
 }
 
 void abort(QString s)
@@ -219,17 +219,17 @@ present, resynchronize after renaming the bak files";
 
 void copy(QDir & fromdir, QDir & todir, QString fn)
 {
-    QString to = todir.absFilePath(fn);
+    QString to = todir.absoluteFilePath(fn);
     QFileInfo fi(to);
 
     if (fi.exists() && !todir.rename(to, to + ".bak"))
         abort(to + " can't be renamed " + to + ".bak");
 
-    QString from = fromdir.absFilePath(fn);
-    FILE * fpin = fopen((const char *) from, "rb");
+    QString from = fromdir.absoluteFilePath(fn);
+    FILE * fpin = fopen((const char *) from.toLatin1().constData(), "rb");
 
     if (fpin != 0) {
-        FILE * fpout = fopen((const char *) to, "wb");
+        FILE * fpout = fopen((const char *) to.toLatin1().constData(), "wb");
 
         static char buff[256];
         unsigned n;
@@ -245,21 +245,21 @@ void copy(QDir & fromdir, QDir & todir, QString fn)
 
 void copy_if_needed(QDir & fromdir, QDir & todir, QString fn)
 {
-    QString to = todir.absFilePath(fn);
+    QString to = todir.absoluteFilePath(fn);
     QFileInfo ti(to);
 
     if (!ti.exists())
         // to rename from
         copy(fromdir, todir, fn);
     else {
-        QString from = fromdir.absFilePath(fn);
-        FILE * fpfrom = fopen((const char *) from, "rb");
+        QString from = fromdir.absoluteFilePath(fn);
+        FILE * fpfrom = fopen((const char *) from.toLatin1().constData(), "rb");
 
         if (fpfrom == 0)
             // to create from
             copy(fromdir, todir, fn);
         else {
-            FILE * fpto = fopen((const char *) to, "rb");
+            FILE * fpto = fopen((const char *) to.toLatin1().constData(), "rb");
 
             if (fpto == 0) {
                 // supose copy needed
@@ -290,46 +290,42 @@ void copy_if_needed(QDir & fromdir, QDir & todir, QString fn)
     }
 }
 
-void purge(QDir & dir, Q3Dict<void> & useful)
+void purge(QDir & dir, QHash<QString, void *> &useful)
 {
-    const QFileInfoList * l;
+    QFileInfoList  l = dir.entryInfoList(QStringList()<<"*.diagram"<<"*.bodies"<<"*.bak");
 
     // remove bak and useless diagrams and bodies
-    if ((l = dir.entryInfoList("*.diagram *.bodies *.bak")) != 0) {
-        Q3PtrListIterator<QFileInfo> it(*l);
-        QFileInfo * fi;
+    if (!l.isEmpty()) {
 
-        while ((fi = it.current()) != 0) {
-            if ((useful.find(fi->fileName()) == 0) &&
-                ! QFile::remove(fi->absFilePath()))
+        foreach (QFileInfo fi, l) {
+            if ((useful.find(fi.fileName()).value() == 0) &&
+                ! QFile::remove(fi.absoluteFilePath()))
                 QMessageBox::critical(0, "Project synchro",
-                                      "can't remove " + fi->absFilePath() +
+                                      "can't remove " + fi.absoluteFilePath() +
                                       ", do it yourself");
-
-            ++it;
         }
     }
 
     // remove deleted packages
-    if ((l = dir.entryInfoList("*")) != 0) {
-        Q3PtrListIterator<QFileInfo> it(*l);
-        QFileInfo * fi;
-
-        while ((fi = it.current()) != 0) {
-            QString s = fi->fileName();
-            const char * p = s;
-
-            while ((*p >= '0') && (*p <= '9'))
-                p += 1;
+    l = dir.entryInfoList(QStringList()<<"*");
+    if (!l.isEmpty()) {
+        foreach (QFileInfo fi, l) {
+            QString s = fi.fileName();
+            //const char * p = s;
+            int i;
+            for(i = 0; i < s.count(); i++)
+            {
+                if(!(s.at(i) >= '0' && s.at(i) <= '9'))
+                    break;
+            }
 
-            if ((*p == 0) &&
-                (useful.find(s) == 0) &&
-                ! QFile::remove(fi->absFilePath()))
+            if ((i == s.count()) &&
+                (useful.find(s).value() == 0) &&
+                ! QFile::remove(fi.absoluteFilePath()))
                 QMessageBox::critical(0, "Project synchro",
-                                      "can't remove " + fi->absFilePath() +
+                                      "can't remove " + fi.absoluteFilePath() +
                                       ", do it yourself");
 
-            ++it;
         }
     }
 }
@@ -367,7 +363,7 @@ void set_user_id(int id, QString s)
 
 void remove_crlf(char * s)
 {
-    int len = strlen(s);
+    size_t len = strlen(s);
 
     if (len != 0) {
         if (s[len - 1] == '\n')
diff --git a/src/ProjectSynchro/myio.cpp.bak b/src/ProjectSynchro/myio.cpp.bak
new file mode 100644
index 000000000..bb8d3920c
--- /dev/null
+++ b/src/ProjectSynchro/myio.cpp.bak
@@ -0,0 +1,380 @@
+// *************************************************************************
+//
+// Copyright 2004-2010 Bruno PAGES  .
+// Copyright 2012-2013 Nikolai Marchenko.
+// Copyright 2012-2013 Leonardo Guilherme.
+//
+// This file is part of the DOUML Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+// home   : http://sourceforge.net/projects/douml
+//
+// *************************************************************************
+
+
+
+
+
+#include <qfile.h>
+#include <qstring.h>
+#include <qdir.h>
+#include <qmessagebox.h>
+
+#include "myio.h"
+#include "SynchroWindow.h"
+
+static char RemovedChar;
+//static int LineNum;
+
+static void skip_whitespace_comment(char *& s)
+{
+    *s = RemovedChar;
+
+    for (;;) {
+        switch (*s) {
+        case '\n':
+
+            //LineNum += 1;
+        case ' ':
+        case '\r':
+        case '\t':
+            s += 1;
+            break;
+
+        case '/':
+            for (s += 2; *s != '\n'; s += 1)
+                if (*s == 0)
+                    return;
+
+            //LineNum += 1;
+            s += 1;
+            break;
+
+        default:
+            return;
+        }
+    }
+}
+
+// return the string without the '"'
+char * read_string(char *& st)
+{
+    skip_whitespace_comment(st);
+
+    if (*st == 0)
+        return 0;
+
+    char * r = st + 1;
+
+    for (;;) {
+        switch (*++st) {
+        case '"':
+            *st++ = 0;
+            RemovedChar = *st;
+            {
+                char * p = r;
+                char * p2;
+
+                while ((p2 = strchr(p, '\\')) != 0) {
+                    strcpy(p2, p2 + 1);
+                    p = p2 + 1;
+                }
+
+                p = r;
+
+                while ((p2 = strchr(p, '\r')) != 0) {
+                    strcpy(p2, p2 + 1);
+                    p = p2 + 1;
+                }
+            }
+            return r;
+
+        case '\\':
+            st += 1;
+            break;
+
+        case '\n':
+            //LineNum += 1;
+            break;
+        }
+    }
+}
+
+// in case of a string the start '"' is return (not the last one)
+char * read_token(char *& st)
+{
+    skip_whitespace_comment(st);
+
+    if (*st == 0)
+        return 0;
+
+    if (*st == '"') {
+        RemovedChar = '"';
+        return read_string(st) - 1;
+    }
+
+    char * r = st;
+    char c;
+
+    do
+        c = *++st;
+
+    while ((c > ' ') && (c != '"'));
+
+    RemovedChar = c;
+    *st = 0;
+
+    return r;
+}
+
+//
+
+static int open_file(QFile & fp, BooL & ro)
+{
+    QString filename = fp.fileName();
+
+    while (! fp.open(QIODevice::ReadOnly)) {
+        if (QMessageBox::critical(0, "Uml",
+                                  filename + "\ncannot be opened for read, retry ?\n",
+                                  "yes", "no", 0, 0, 0) != 0)
+            return -1;
+    }
+
+    QFileInfo fi(fp);
+
+    ro = !fi.isWritable();
+
+    return fi.size();
+}
+
+char * read_file(QDir & dir, QString fn, BooL & ro)
+{
+    QString filename = dir.absFilePath(fn);
+    QFile fp(filename);
+    int size;
+
+    if ((size = open_file(fp, ro)) != -1) {
+        char * s = new char[size + 1];
+
+        if (fp.readBlock(s, size) == -1) {
+            QMessageBox::critical(0, "Error", filename + "cannot be read");
+            delete [] s;
+            return 0;
+        }
+        else {
+            s[size] = 0;
+            //Linenum = 1;
+            RemovedChar = *s;
+
+            if (fn[0].isNumber() && ((fn.toInt() & 127) == 0))
+                ro = TRUE;
+
+            return s;
+        }
+    }
+    else
+        return 0;
+}
+
+bool is_readonly(QDir & dir, QString fn)
+{
+    QFileInfo fi(dir.absFilePath(fn));
+
+    return fi.exists() && !fi.isWritable();
+}
+
+bool has_backup_files(QDir & dir)
+{
+    const QFileInfoList * l = dir.entryInfoList("*.bak");
+
+    return (l != 0) && !l->isEmpty();
+}
+
+void abort(QString s)
+{
+    s += "\n\n\
+to nullify the synchronization for this project you\n\
+must rename all files xxx.bak to xxx. Warning, some\n\
+extra files corresponding to the new version may be\n\
+present, resynchronize after renaming the bak files";
+
+    QMessageBox::critical(0, "Project synchro",
+                          "Synchronization aborted :\n\n" + s);
+    SynchroWindow::abort();
+}
+
+void copy(QDir & fromdir, QDir & todir, QString fn)
+{
+    QString to = todir.absFilePath(fn);
+    QFileInfo fi(to);
+
+    if (fi.exists() && !todir.rename(to, to + ".bak"))
+        abort(to + " can't be renamed " + to + ".bak");
+
+    QString from = fromdir.absFilePath(fn);
+    FILE * fpin = fopen((const char *) from, "rb");
+
+    if (fpin != 0) {
+        FILE * fpout = fopen((const char *) to, "wb");
+
+        static char buff[256];
+        unsigned n;
+
+        while ((n = (unsigned) fread(buff, 1, sizeof(buff), fpin)) != 0)
+            if ((unsigned) fwrite(buff, 1, n, fpout) != n)
+                abort("error writing in " + to);
+
+        fclose(fpout);
+        fclose(fpin);
+    }
+}
+
+void copy_if_needed(QDir & fromdir, QDir & todir, QString fn)
+{
+    QString to = todir.absFilePath(fn);
+    QFileInfo ti(to);
+
+    if (!ti.exists())
+        // to rename from
+        copy(fromdir, todir, fn);
+    else {
+        QString from = fromdir.absFilePath(fn);
+        FILE * fpfrom = fopen((const char *) from, "rb");
+
+        if (fpfrom == 0)
+            // to create from
+            copy(fromdir, todir, fn);
+        else {
+            FILE * fpto = fopen((const char *) to, "rb");
+
+            if (fpto == 0) {
+                // supose copy needed
+                fclose(fpfrom);
+                copy(fromdir, todir, fn);
+            }
+            else {
+                bool docopy = FALSE;
+                int c;
+
+                while ((c = fgetc(fpfrom)) != EOF) {
+                    if (c != fgetc(fpto)) {
+                        docopy = TRUE;
+                        break;
+                    }
+                }
+
+                if (! docopy)
+                    docopy = (fgetc(fpto) != EOF);
+
+                fclose(fpfrom);
+                fclose(fpto);
+
+                if (docopy)
+                    copy(fromdir, todir, fn);
+            }
+        }
+    }
+}
+
+void purge(QDir & dir, QHash<QString, void *> &useful)
+{
+    const QFileInfoList * l;
+
+    // remove bak and useless diagrams and bodies
+    if ((l = dir.entryInfoList("*.diagram *.bodies *.bak")) != 0) {
+        Q3PtrListIterator<QFileInfo> it(*l);
+        QFileInfo * fi;
+
+        while ((fi = it.current()) != 0) {
+            if ((useful.find(fi->fileName()) == 0) &&
+                ! QFile::remove(fi->absFilePath()))
+                QMessageBox::critical(0, "Project synchro",
+                                      "can't remove " + fi->absFilePath() +
+                                      ", do it yourself");
+
+            ++it;
+        }
+    }
+
+    // remove deleted packages
+    if ((l = dir.entryInfoList("*")) != 0) {
+        Q3PtrListIterator<QFileInfo> it(*l);
+        QFileInfo * fi;
+
+        while ((fi = it.current()) != 0) {
+            QString s = fi->fileName();
+            const char * p = s;
+
+            while ((*p >= '0') && (*p <= '9'))
+                p += 1;
+
+            if ((*p == 0) &&
+                (useful.find(s) == 0) &&
+                ! QFile::remove(fi->absFilePath()))
+                QMessageBox::critical(0, "Project synchro",
+                                      "can't remove " + fi->absFilePath() +
+                                      ", do it yourself");
+
+            ++it;
+        }
+    }
+}
+
+//
+
+QString User[128];
+
+void set_user_name(int id, QString s)
+{
+    User[id] = s;
+}
+
+QString user_name(int id)
+{
+    return User[id];
+}
+
+//
+
+static int uid;
+
+int user_id()
+{
+    return uid;
+}
+
+void set_user_id(int id, QString s)
+{
+    User[id] = s;
+    uid = id;
+}
+
+//
+
+void remove_crlf(char * s)
+{
+    int len = strlen(s);
+
+    if (len != 0) {
+        if (s[len - 1] == '\n')
+            s[--len] = 0;
+
+        if ((len != 0) && (s[len - 1] == '\r'))
+            s[len - 1] = 0;
+    }
+}
+
diff --git a/src/ProjectSynchro/myio.h b/src/ProjectSynchro/myio.h
index 0d779f784..843d8e17e 100644
--- a/src/ProjectSynchro/myio.h
+++ b/src/ProjectSynchro/myio.h
@@ -28,7 +28,7 @@
 #ifndef MYIO_H
 #define MYIO_H
 
-#include <q3dict.h>
+
 
 class QDir;
 
@@ -40,7 +40,7 @@ bool has_backup_files(QDir & dir);
 void delete_backup_files(QDir & dir);
 void copy(QDir & fromdir, QDir & todir, QString fn);
 void copy_if_needed(QDir & fromdir, QDir & todir, QString fn);
-void purge(QDir & dir, Q3Dict<void> & useful);
+void purge(QDir & dir, QHash<QString, void *> &useful);
 
 void set_user_name(int owner, QString s);
 QString user_name(int id);
diff --git a/src/ProjectSynchro/projectsynchro.pro b/src/ProjectSynchro/projectsynchro.pro
index 6c1bcc935..6e6f3141e 100644
--- a/src/ProjectSynchro/projectsynchro.pro
+++ b/src/ProjectSynchro/projectsynchro.pro
@@ -1,12 +1,42 @@
-TEMPLATE      = app
-CONFIG          += qt warn_on debug
-HEADERS          = BrowserNode.h BrowserView.h SynchroWindow.h SynchroDialog.h
-SOURCES          = main.cpp BrowserNode.cpp SynchroWindow.cpp \
-        BrowserView.cpp SynchroDialog.cpp Pixmap.cpp myio.cpp 
-
-
-TARGET          = projectSynchro
-DEFINES          = BooL=bool
-INCLUDEPATH   = 
-#The following line was inserted by qt3to4
-QT += network  qt3support 
+TEMPLATE = app
+
+CONFIG -= app_bundle
+
+CONFIG += qt warn_on c++11
+
+DEFINES += QT_DEPRECATED_WARNINGS
+
+HEADERS = \
+    BrowserNode.h \
+    BrowserView.h \
+    SynchroWindow.h \
+    SynchroDialog.h
+
+SOURCES = \
+    main.cpp \
+    BrowserNode.cpp \
+    SynchroWindow.cpp \
+    BrowserView.cpp \
+    SynchroDialog.cpp \
+    Pixmap.cpp \
+    myio.cpp
+
+TARGET = projectSynchro
+DEFINES += BooL=bool FALSE=false TRUE=true TR=tr
+QT += network widgets
+
+DESTDIR = ../../bin
+
+UI_DIR = src/ui
+
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_release/$${TARGET}
+}
+
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET}
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET}
+}
diff --git a/src/PythonGenerator/PythonGenerator.pro b/src/PythonGenerator/PythonGenerator.pro
index 7b96c2c89..4dbf8e99a 100644
--- a/src/PythonGenerator/PythonGenerator.pro
+++ b/src/PythonGenerator/PythonGenerator.pro
@@ -1,5 +1,8 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES          = UmlClassItem.cpp UmlAttribute.cpp \
         UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \
         UmlExtraClassMember.cpp UmlArtifact.cpp \
@@ -94,27 +97,23 @@ SOURCES          = UmlClassItem.cpp UmlAttribute.cpp \
     ../Logging/QsLog.cpp \
     ../Logging/QsDebugOutput.cpp
 TARGET          = python_generator
-DEFINES          = WITHPYTHON BooL=bool
-INCLUDEPATH   = ../Tools ../PythonGenerator ../
-DESTDIR = ../../bin
+DEFINES          += WITHPYTHON BooL=bool FALSE=false TRUE=true
+INCLUDEPATH   += ../Tools ../PythonGenerator ../
 
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network widgets
+#qt3support
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/py_gen/MOC_release
-    OBJECTS_DIR = bin/douml/py_gen/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/python_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_release/python_generator
 }
-
-Debug{
-    MOC_DIR = bin/douml/py_gen/MOC_Debug
-    OBJECTS_DIR = bin/douml/py_gen/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/python_generator
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/python_generator
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/src/PythonGenerator/UmlArtifact.cpp b/src/PythonGenerator/UmlArtifact.cpp
index 147bcb13d..d46c0d640 100644
--- a/src/PythonGenerator/UmlArtifact.cpp
+++ b/src/PythonGenerator/UmlArtifact.cpp
@@ -46,7 +46,7 @@ WrapperStr UmlArtifact::imports;
 
 void UmlArtifact::generate_imports(QTextStream & f, WrapperStr & made)
 {
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     unsigned index;
     const unsigned sup = ch.size();
 
@@ -115,7 +115,7 @@ void UmlArtifact::generate()
                              + name + "</i> in " + path + "</i></font><br>");
 
         // get bodies if preserve
-        const Q3PtrVector<UmlClass> & cls = associatedClasses();
+        const QVector<UmlClass*> & cls = associatedClasses();
 
         if (preserve())
             UmlOperation::read_bodies(path);
diff --git a/src/PythonGenerator/UmlArtifact.h b/src/PythonGenerator/UmlArtifact.h
index e33bc998d..7eb61e55d 100644
--- a/src/PythonGenerator/UmlArtifact.h
+++ b/src/PythonGenerator/UmlArtifact.h
@@ -28,11 +28,8 @@
 #ifndef UMLARTIFACT_H
 #define UMLARTIFACT_H
 
-#include <q3asciidict.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-
 #include "UmlBaseArtifact.h"
 
 class QTextStream;
diff --git a/src/PythonGenerator/UmlClass.cpp b/src/PythonGenerator/UmlClass.cpp
index fb69e0c50..c2a3bccad 100644
--- a/src/PythonGenerator/UmlClass.cpp
+++ b/src/PythonGenerator/UmlClass.cpp
@@ -54,7 +54,7 @@ WrapperStr UmlClass::python_stereotype()
 void UmlClass::generate_imports(QTextStream & f, WrapperStr & made)
 {
     if (! pythonDecl().isEmpty()) {
-        Q3PtrVector<UmlItem> ch = children();
+        QVector<UmlItem*> ch = children();
         unsigned index;
         const unsigned sup = ch.size();
 
@@ -143,7 +143,7 @@ void UmlClass::generate(QTextStream & f, WrapperStr indent,
     if ((p == 0) || (*p == 0))
         return;
 
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     const unsigned sup = ch.size();
     int enum_item_rank = 0;
     unsigned index;
@@ -288,7 +288,7 @@ void UmlClass::generate_instance_att_rel(QTextStream & f, WrapperStr indent,
     const WrapperStr & stereotype = python_stereotype();
     int enum_item_rank = 0;
 
-    Q3PtrVector<UmlItem> ch = children();
+    QVector<UmlItem*> ch = children();
     const unsigned sup = ch.size();
     unsigned index;
 
@@ -338,9 +338,9 @@ void UmlClass::write(QTextStream & f)
         else if ((index = s.find("${Name}")) != -1)
             s.replace(index, 7, capitalize(name()));
         else if ((index = s.find("${NAME}")) != -1)
-            s.replace(index, 7, name().upper());
+            s.replace(index, 7, name().upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            s.replace(index, 7, name().lower());
+            s.replace(index, 7, name().lower().toLatin1().constData());
 
         f << s;
     }
diff --git a/src/PythonGenerator/UmlClass.h b/src/PythonGenerator/UmlClass.h
index f8dd49a75..bca1c3552 100644
--- a/src/PythonGenerator/UmlClass.h
+++ b/src/PythonGenerator/UmlClass.h
@@ -28,7 +28,7 @@
 #ifndef UMLCLASS_H
 #define UMLCLASS_H
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
diff --git a/src/PythonGenerator/UmlClassItem.h b/src/PythonGenerator/UmlClassItem.h
index 78e2069e2..ffd3cb439 100644
--- a/src/PythonGenerator/UmlClassItem.h
+++ b/src/PythonGenerator/UmlClassItem.h
@@ -28,7 +28,7 @@
 #ifndef UMLCLASSITEM_H
 #define UMLCLASSITEM_H
 
-#include <q3ptrlist.h>
+
 //Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
@@ -45,6 +45,7 @@ class UmlClassItem : public UmlBaseClassItem
         : UmlBaseClassItem(id, n) {
     };
 
+    using UmlBaseClassItem::generate;
     virtual void generate(QTextStream & f, const WrapperStr & cl_stereotype,
                           WrapperStr indent, BooL & indent_needed,
                           int & enum_item_rank, const WrapperStr & self) = 0;
diff --git a/src/PythonGenerator/UmlClassView.cpp b/src/PythonGenerator/UmlClassView.cpp
index abe804ded..c0b1747e8 100644
--- a/src/PythonGenerator/UmlClassView.cpp
+++ b/src/PythonGenerator/UmlClassView.cpp
@@ -29,9 +29,9 @@
 
 void UmlClassView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/PythonGenerator/UmlDeploymentView.cpp b/src/PythonGenerator/UmlDeploymentView.cpp
index c34ceb554..87d719f8e 100644
--- a/src/PythonGenerator/UmlDeploymentView.cpp
+++ b/src/PythonGenerator/UmlDeploymentView.cpp
@@ -29,8 +29,8 @@
 
 void UmlDeploymentView::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
diff --git a/src/PythonGenerator/UmlItem.cpp b/src/PythonGenerator/UmlItem.cpp
index 4bb9858f8..b2e5c0914 100644
--- a/src/PythonGenerator/UmlItem.cpp
+++ b/src/PythonGenerator/UmlItem.cpp
@@ -143,7 +143,7 @@ void UmlItem::manage_alias(const char *& p, QTextStream & ts,
     const char * pclosed;
 
     if ((p[1] == '{') && ((pclosed = strchr(p + 2, '}')) != 0)) {
-        Q3CString key(p + 2, pclosed - p - 1);
+        QByteArray key(p + 2, pclosed - p - 1);
         WrapperStr value;
         UmlItem * node = this;
 
diff --git a/src/PythonGenerator/UmlOperation.cpp b/src/PythonGenerator/UmlOperation.cpp
index de7a13a80..2c4af6cf3 100644
--- a/src/PythonGenerator/UmlOperation.cpp
+++ b/src/PythonGenerator/UmlOperation.cpp
@@ -32,7 +32,7 @@
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include "misc/mystr.h"
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
 
 #include "UmlOperation.h"
@@ -44,7 +44,7 @@
 #include "util.h"
 
 // to manage preserved bodies, the key is the id under Douml
-Q3IntDict<char> UmlOperation::bodies(127);
+QHash<int,char*> UmlOperation::bodies;
 const char * BodyPrefix = "## Bouml preserved body begin ";
 const char * BodyPostfix = "## Bouml preserved body end ";
 const int BodyPrefixLength = 30;
@@ -73,8 +73,8 @@ void UmlOperation::generate_imports(QTextStream & f, WrapperStr & made)
 
         s = s.mid((unsigned) index1, (unsigned)(index2 - index1));
 
-        const Q3ValueList<UmlParameter> & params = this->params();
-        Q3ValueListConstIterator<UmlParameter> it;
+        const QList<UmlParameter> & params = this->params();
+        QList<UmlParameter>::ConstIterator it;
         unsigned rank;
         char ti[16];
 
@@ -91,8 +91,8 @@ void UmlOperation::generate_imports(QTextStream & f, WrapperStr & made)
     }
 }
 
-static bool generate_type(const Q3ValueList<UmlParameter> & params,
-                          unsigned rank, QTextStream & f, bool in_params)
+static bool generate_type(const QList<UmlParameter> & params,
+                          int rank, QTextStream & f, bool in_params)
 {
     if (rank >= params.count())
         return FALSE;
@@ -106,8 +106,8 @@ static bool generate_type(const Q3ValueList<UmlParameter> & params,
     return TRUE;
 }
 
-static bool generate_var(const Q3ValueList<UmlParameter> & params,
-                         unsigned rank, QTextStream & f)
+static bool generate_var(const QList<UmlParameter> & params,
+                         int rank, QTextStream & f)
 {
     if (rank >= params.count())
         return FALSE;
@@ -116,8 +116,8 @@ static bool generate_var(const Q3ValueList<UmlParameter> & params,
     return TRUE;
 }
 
-static bool generate_init(const Q3ValueList<UmlParameter> & params,
-                          unsigned rank, QTextStream & f)
+static bool generate_init(const QList<UmlParameter> & params,
+                          int rank, QTextStream & f)
 {
     if (rank >= params.count())
         return FALSE;
@@ -157,9 +157,9 @@ WrapperStr UmlOperation::compute_name()
         else if ((index = get_set_spec.find("${Name}")) != -1)
             get_set_spec.replace(index, 7, capitalize(s));
         else if ((index = s.find("${NAME}")) != -1)
-            get_set_spec.replace(index, 7, s.upper());
+            get_set_spec.replace(index, 7, s.upper().toLatin1().constData());
         else if ((index = s.find("${nAME}")) != -1)
-            get_set_spec.replace(index, 7, s.lower());
+            get_set_spec.replace(index, 7, s.lower().toLatin1().constData());
 
         return get_set_spec;
     }
@@ -173,6 +173,9 @@ const char * UmlOperation::generate_body(QTextStream & f,
         BooL & indent_needed,
         const char * p)
 {
+    if(isAbstract())
+        return p + 7;
+
     const char * body = 0;
     WrapperStr modeler_body;
     WrapperStr body_indent;
@@ -182,7 +185,7 @@ const char * UmlOperation::generate_body(QTextStream & f,
         unsigned id = get_id();
 
         sprintf(s_id, "%08X", id);
-        body = bodies.find((long) id);
+        body = bodies.value(id);
     }
 
     if (body == 0) {
@@ -194,7 +197,7 @@ const char * UmlOperation::generate_body(QTextStream & f,
     }
 
     if (name() == "__init__") {
-        const Q3ValueList<UmlParameter> & params = this->params();
+        const QList<UmlParameter> & params = this->params();
 
         if (params.count() != 0)
             ((UmlClass *) parent())->generate_instance_att_rel(f, indent, indent_needed,
@@ -287,7 +290,7 @@ void UmlOperation::generate(QTextStream & f, const WrapperStr &,
     WrapperStr saved_indent = indent;
     WrapperStr indent_step = PythonSettings::indentStep();
     const char * afterparam = 0;
-    const Q3ValueList<UmlParameter> & params = this->params();
+    const QList<UmlParameter> & params = this->params();
     unsigned rank;
     bool isinline = TRUE;
     bool in_params = FALSE;
@@ -483,10 +486,10 @@ static char * read_file(const char * filename)
 
     if (fp.open(QIODevice::ReadOnly)) {
         QFileInfo fi(fp);
-        int size = fi.size();
+        qint64 size = fi.size();
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) == -1) {
+        if (fp.read(s, size) == -1) {
             delete [] s;
             return 0;
         }
@@ -500,7 +503,7 @@ static char * read_file(const char * filename)
         return 0;
 }
 
-static void read_bodies(const char * path, Q3IntDict<char> & bodies)
+static void read_bodies(const char * path, QHash<int,char*> & bodies)
 {
     char * s = read_file(path);
 
@@ -521,7 +524,7 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
                 UmlCom::fatal_error("read_bodies 1");
             }
 
-            if (bodies.find(id) != 0) {
+            if (bodies.value(id) != 0) {
                 UmlCom::trace(WrapperStr("<font  color =\"red\"> Error in ") + path +
                               " : preserve body identifier used twice</font><br>");
                 UmlCom::bye(n_errors() + 1);
@@ -555,7 +558,7 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
 
             *p2 = 0;
 
-            int len = p2 - body + 1;
+            ptrdiff_t len = p2 - body + 1;
             char * b = new char[len];
 
             memcpy(b, body, len);
@@ -570,7 +573,12 @@ static void read_bodies(const char * path, Q3IntDict<char> & bodies)
 
 void UmlOperation::read_bodies(const char * path)
 {
-    bodies.setAutoDelete(TRUE);
+    //bodies.setAutoDelete(TRUE);
+    QHashIterator<int,char*> it(bodies);
+    while(it.hasNext())
+    {
+        delete it.next().value();
+    }
     bodies.clear();
     ::read_bodies(path, bodies);
 }
diff --git a/src/PythonGenerator/UmlOperation.h b/src/PythonGenerator/UmlOperation.h
index 36db7390d..71435c9cc 100644
--- a/src/PythonGenerator/UmlOperation.h
+++ b/src/PythonGenerator/UmlOperation.h
@@ -27,12 +27,8 @@
 
 #ifndef UMLOPERATION_H
 #define UMLOPERATION_H
-
-#include <q3intdict.h>
-//Added by qt3to4:
 #include "misc/mystr.h"
 #include <QTextStream>
-
 #include "UmlBaseOperation.h"
 
 class QTextStream;
@@ -40,7 +36,7 @@ class QTextStream;
 class UmlOperation : public UmlBaseOperation
 {
 private:
-    static Q3IntDict<char> bodies;
+    static QHash<int, char*> bodies;
 
 public:
     UmlOperation(void * id, const WrapperStr & n)
diff --git a/src/PythonGenerator/UmlPackage.cpp b/src/PythonGenerator/UmlPackage.cpp
index 87c3e8d43..5193815a7 100644
--- a/src/PythonGenerator/UmlPackage.cpp
+++ b/src/PythonGenerator/UmlPackage.cpp
@@ -56,7 +56,7 @@ WrapperStr UmlPackage::file_path(const WrapperStr & f)
             if (!RootDir.isEmpty() && // empty -> error
                 QDir::isRelativePath(RootDir)) {
                 QFileInfo f(getProject()->supportFile());
-                QDir d(f.dirPath());
+                QDir d(f.path());
 
                 RootDir = d.filePath(RootDir);
             }
@@ -94,7 +94,7 @@ WrapperStr UmlPackage::file_path(const WrapperStr & f)
                 s.replace(index++, 1, "/");
         }
 
-        s = QDir::cleanDirPath(s) + "/";
+        s = QDir::cleanPath(s) + "/";
         index = s.find("/");
 
         int index2;
@@ -116,7 +116,7 @@ WrapperStr UmlPackage::file_path(const WrapperStr & f)
         }
     }
 
-    return WrapperStr(d.filePath(f).toAscii().constData()) + WrapperStr(".") +
+    return WrapperStr(d.filePath(f).toLatin1().constData()) + WrapperStr(".") +
            PythonSettings::sourceExtension();
 }
 
@@ -129,9 +129,9 @@ WrapperStr UmlPackage::text_path(const WrapperStr & f)
 
 void UmlPackage::generate()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->generate();
 }
 
diff --git a/src/PythonGenerator/main.cpp b/src/PythonGenerator/main.cpp
index 2788b8973..9b8e58240 100644
--- a/src/PythonGenerator/main.cpp
+++ b/src/PythonGenerator/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char ** argv)
 
             QString s("<hr><font face=helvetica>Generation done : %1 warnings, %2 errors</font><br>");
             s=s.arg(QString::number(n_warnings())).arg(QString::number(n_errors()));
-            UmlCom::trace(s);
+            UmlCom::trace(s.toLatin1().constData());
 
 
             UmlCom::showTrace();
diff --git a/src/PythonGenerator/util.h b/src/PythonGenerator/util.h
index 674d30968..0d405d4e9 100644
--- a/src/PythonGenerator/util.h
+++ b/src/PythonGenerator/util.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef _UTIL_H
-#define _UTIL_h
+#define _UTIL_H
 
 #include <qstring.h>
 //Added by qt3to4:
diff --git a/src/RoundtripBody/RoundtripBody.pro b/src/RoundtripBody/RoundtripBody.pro
index 232d22d46..3623b98df 100644
--- a/src/RoundtripBody/RoundtripBody.pro
+++ b/src/RoundtripBody/RoundtripBody.pro
@@ -1,5 +1,8 @@
 TEMPLATE      = app
-CONFIG          += qt warn_on
+CONFIG -= app_bundle
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES          = main.cpp util.cpp \
         UmlClassItem.cpp UmlAttribute.cpp \
         UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \
@@ -97,25 +100,22 @@ SOURCES          = main.cpp util.cpp \
     ../Logging/QsLog.cpp \
     ../Logging/QsDebugOutput.cpp
 TARGET          = roundtrip_body
-DEFINES          = WITHCPP WITHJAVA WITHPHP WITHIDL WITHPYTHON
-INCLUDEPATH   = ../Tools ../RoundtripBody
+DEFINES          += WITHCPP WITHJAVA WITHPHP WITHIDL WITHPYTHON FALSE=false TRUE=true
+INCLUDEPATH   += ../Tools ../RoundtripBody
 #The following line was inserted by qt3to4
-QT += network  qt3support 
+QT += network
+#qt3support
 INCLUDEPATH += ../../src
-CONFIG += qtestlib
-Release{
-
-
-    MOC_DIR = bin/douml/rtrip_body/MOC_release
-    OBJECTS_DIR = bin/douml/rtrip_body/Obj_release
+QT += testlib
+DESTDIR = ../../bin
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/roundtrip_body
+    OBJECTS_DIR = $${DESTDIR}/obj_release/roundtrip_body
 }
-
-Debug{
-    MOC_DIR = bin/douml/rtrip_body/MOC_Debug
-    OBJECTS_DIR = bin/douml/rtrip_body/Obj_Debug
-
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/roundtrip_body
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/roundtrip_body
 }
-    UI_DIR = src/ui
-    DESTDIR = ../../bin
-
-QMAKE_CXXFLAGS += -std=gnu++11
+UI_DIR = src/ui
diff --git a/src/RoundtripBody/UmlDeploymentView.cpp b/src/RoundtripBody/UmlDeploymentView.cpp
index 83c2fea80..c6ffcc76a 100644
--- a/src/RoundtripBody/UmlDeploymentView.cpp
+++ b/src/RoundtripBody/UmlDeploymentView.cpp
@@ -29,32 +29,32 @@
 
 void UmlDeploymentView::roundtrip_cpp()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->roundtrip_cpp();
 }
 
 void UmlDeploymentView::roundtrip_java()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->roundtrip_java();
 }
 
 void UmlDeploymentView::roundtrip_php()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->roundtrip_php();
 }
 
 void UmlDeploymentView::roundtrip_python()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->roundtrip_python();
 }
diff --git a/src/RoundtripBody/UmlOperation.cpp b/src/RoundtripBody/UmlOperation.cpp
index 28ecaa8ab..17d554328 100644
--- a/src/RoundtripBody/UmlOperation.cpp
+++ b/src/RoundtripBody/UmlOperation.cpp
@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <QTextStream>
+#include <QSettings>
+#include <QTextCodec>
 #include <qfile.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
@@ -37,10 +39,14 @@
 #include "UmlCom.h"
 #include "util.h"
 
-const char * BodyPrefix = "// Bouml preserved body begin ";
-const char * BodyPostfix = "// Bouml preserved body end ";
-const char * BodyPythonPrefix = "## Bouml preserved body begin ";
-const char * BodyPythonPostfix = "## Bouml preserved body end ";
+static const char * BodyPrefix = "// Bouml preserved body begin ";
+static const char * BodyPostfix = "// Bouml preserved body end ";
+static const char * BodyPythonPrefix = "## Bouml preserved body begin ";
+static const char * BodyPythonPostfix = "## Bouml preserved body end ";
+static const char * BodyPrefix2 = "// Douml preserved body begin ";
+static const char * BodyPostfix2 = "// Douml preserved body end ";
+static const char * BodyPythonPrefix2 = "## Douml preserved body begin ";
+static const char * BodyPythonPostfix2 = "## Douml preserved body end ";
 const int BodyPrefixLength = 30;
 const int BodyPostfixLength = 28;
 
@@ -50,10 +56,10 @@ static char * read_file(const char * filename)
 
     if (fp.open(QIODevice::ReadOnly)) {
         QFileInfo fi(fp);
-        int size = fi.size();
+        qint64 size = fi.size();
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) == -1) {
+        if (fp.read(s, size) == -1) {
             delete [] s;
             return 0;
         }
@@ -91,6 +97,13 @@ void UmlOperation::roundtrip(const char * path, aLanguage who)
 {
     char * s = read_file(path);
 
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    int compat = settings.value("Main/compatibility_save").toInt();
+
+    const char* actuaPrefix = compat ? BodyPrefix : BodyPrefix2;
+    const char* actualPostfix = compat ? BodyPostfix : BodyPostfix2;
+
     if (s != 0) {
         char * p1 = s;
         char * p2;
@@ -105,24 +118,24 @@ void UmlOperation::roundtrip(const char * path, aLanguage who)
             get_body = &UmlOperation::cppBody;
             set_body = &UmlOperation::set_CppBody;
             set_contextualbodyindent = &UmlOperation::set_CppContextualBodyIndent;
-            prefix = BodyPrefix;
-            postfix = BodyPostfix;
+            prefix = actuaPrefix;
+            postfix = actualPostfix;
             break;
 
         case javaLanguage:
             get_body = &UmlOperation::javaBody;
             set_body = &UmlOperation::set_JavaBody;
             set_contextualbodyindent = &UmlOperation::set_JavaContextualBodyIndent;
-            prefix = BodyPrefix;
-            postfix = BodyPostfix;
+            prefix = actuaPrefix;
+            postfix = actualPostfix;
             break;
 
         case phpLanguage:
             get_body = &UmlOperation::phpBody;
             set_body = &UmlOperation::set_PhpBody;
             set_contextualbodyindent = &UmlOperation::set_PhpContextualBodyIndent;
-            prefix = BodyPrefix;
-            postfix = BodyPostfix;
+            prefix = actuaPrefix;
+            postfix = actualPostfix;
             break;
 
         default:
@@ -130,8 +143,15 @@ void UmlOperation::roundtrip(const char * path, aLanguage who)
             get_body = &UmlOperation::pythonBody;
             set_body = &UmlOperation::set_PythonBody;
             set_contextualbodyindent = &UmlOperation::set_PythonContextualBodyIndent;
-            prefix = BodyPythonPrefix;
-            postfix = BodyPythonPostfix;
+
+
+
+
+            const char* actualPythonPrefix = compat ? BodyPythonPrefix : BodyPythonPrefix2;
+            const char* actualPythonPostfix = compat ? BodyPythonPostfix : BodyPythonPostfix2;
+
+            prefix = actualPythonPrefix;
+            postfix = actualPythonPostfix;
         }
 
         while ((p2 = strstr(p1, prefix)) != 0) {
@@ -165,8 +185,7 @@ void UmlOperation::roundtrip(const char * path, aLanguage who)
                                 UmlBaseItem::from_id((unsigned) id, anOperation);
 
             if (op == 0) {
-                QString n("%1");
-                n.arg(QString::number((unsigned) id));
+                QString n = QString::number((unsigned) id);
                 UmlCom::trace(WrapperStr("<font  color =\"red\"> Error in ") + path +
                               linenumber(s, p2 - BodyPrefixLength) +
                               " : invalid operation id " + n + "</font><br>");
diff --git a/src/RoundtripBody/UmlPackage.cpp b/src/RoundtripBody/UmlPackage.cpp
index 3d8dd2a37..bcb07be79 100644
--- a/src/RoundtripBody/UmlPackage.cpp
+++ b/src/RoundtripBody/UmlPackage.cpp
@@ -71,7 +71,7 @@ WrapperStr UmlPackage::rootDir(aLanguage who)
         if (!RootDir.isEmpty() && // empty -> error
             QDir::isRelativePath(RootDir)) {
             QFileInfo f(getProject()->supportFile());
-            QDir d(f.dirPath());
+            QDir d(f.path());
 
             RootDir = d.filePath(RootDir);
         }
@@ -112,7 +112,7 @@ WrapperStr UmlPackage::source_path(const WrapperStr & f)
 
     QDir d(dir.src);
 
-    return WrapperStr(d.filePath(f).toAscii().constData()) + WrapperStr(".") + CppSettings::sourceExtension();
+    return WrapperStr(d.filePath(f).toLatin1().constData()) + WrapperStr(".") + CppSettings::sourceExtension();
 }
 
 WrapperStr UmlPackage::header_path(const WrapperStr & f)
@@ -141,14 +141,14 @@ WrapperStr UmlPackage::header_path(const WrapperStr & f)
 
     QDir d(dir.h);
 
-    return WrapperStr(d.filePath(f).toAscii().constData()) + WrapperStr(".") + CppSettings::headerExtension();
+    return WrapperStr(d.filePath(f).toLatin1().constData()) + WrapperStr(".") + CppSettings::headerExtension();
 }
 
 void UmlPackage::roundtrip_cpp()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->roundtrip_cpp();
 }
 
@@ -178,7 +178,7 @@ WrapperStr UmlPackage::java_path(const WrapperStr & f)
 
     QDir d(dir.src);
 
-    return WrapperStr(d.filePath(f).toAscii().constData()) + WrapperStr(".") + JavaSettings::sourceExtension();
+    return WrapperStr(d.filePath(f).toLatin1().constData()) + WrapperStr(".") + JavaSettings::sourceExtension();
 }
 
 WrapperStr UmlPackage::php_path(const WrapperStr & f)
@@ -207,7 +207,7 @@ WrapperStr UmlPackage::php_path(const WrapperStr & f)
 
     QDir d(dir.src);
 
-    return WrapperStr(d.filePath(f).toAscii().constData()) + WrapperStr(".") + PhpSettings::sourceExtension();
+    return WrapperStr(d.filePath(f).toLatin1().constData()) + WrapperStr(".") + PhpSettings::sourceExtension();
 }
 
 WrapperStr UmlPackage::python_path(const WrapperStr & f)
@@ -236,30 +236,30 @@ WrapperStr UmlPackage::python_path(const WrapperStr & f)
 
     QDir d(dir.src);
 
-    return WrapperStr(d.filePath(f).toAscii().constData()) + WrapperStr(".") + PythonSettings::sourceExtension();
+    return WrapperStr(d.filePath(f).toLatin1().constData()) + WrapperStr(".") + PythonSettings::sourceExtension();
 }
 
 void UmlPackage::roundtrip_java()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->roundtrip_java();
 }
 
 void UmlPackage::roundtrip_php()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->roundtrip_php();
 }
 
 void UmlPackage::roundtrip_python()
 {
-    Q3PtrVector<UmlItem> ch = UmlItem::children();
+    QVector<UmlItem*> ch = UmlItem::children();
 
-    for (unsigned index = 0; index != ch.size(); index += 1)
+    for (int index = 0; index != ch.size(); index += 1)
         ch[index]->roundtrip_python();
 }
 
diff --git a/src/RoundtripBody/main.cpp b/src/RoundtripBody/main.cpp
index 850f63e44..7c937c2a9 100644
--- a/src/RoundtripBody/main.cpp
+++ b/src/RoundtripBody/main.cpp
@@ -75,7 +75,7 @@ int main(int argc, char ** argv)
 
             QString s("<hr><font face=helvetica>Generation done : %1 errors</font><br>");
             s=s.arg(QString::number(n_errors()));
-            UmlCom::trace(s);
+            UmlCom::trace(s.toLatin1().constData());
 
             UmlCom::showTrace();
             UmlCom::message("");
diff --git a/src/RoundtripBody/util.h b/src/RoundtripBody/util.h
index bd581f09b..ac3e374fc 100644
--- a/src/RoundtripBody/util.h
+++ b/src/RoundtripBody/util.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef _UTIL_H
-#define _UTIL_h
+#define _UTIL_H
 
 #include "misc/mystr.h"
 
diff --git a/src/Tools/CppSettings.cpp b/src/Tools/CppSettings.cpp
index 6218f20d3..c77262de4 100644
--- a/src/Tools/CppSettings.cpp
+++ b/src/Tools/CppSettings.cpp
@@ -29,7 +29,7 @@ WrapperStr CppSettings::type(WrapperStr s)
 
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -40,7 +40,7 @@ bool CppSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -64,7 +64,7 @@ WrapperStr CppSettings::relationAttributeStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -75,7 +75,7 @@ bool CppSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -99,7 +99,7 @@ WrapperStr CppSettings::classStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->cpp : s;
 }
@@ -110,7 +110,7 @@ bool CppSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -134,9 +134,9 @@ WrapperStr CppSettings::include(WrapperStr s)
 {
     read_if_needed_();
 
-   QString * r = _map_includes[s];
+   QString r = _map_includes[s];
 
-    return (r) ? *r : QString();
+    return (!r.isEmpty()) ? r : QString();
 }
 
 bool CppSettings::set_Include(WrapperStr s, WrapperStr v)
@@ -145,14 +145,10 @@ bool CppSettings::set_Include(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(cppSettingsCmd, setCppIncludeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-       QString * r = _map_includes.take(s);
+       QString r = _map_includes.take(s);
 
         if (!v.isEmpty())
-            _map_includes.insert(s, new QString(v.GetInternalRef()));
-
-        if (r)
-            delete r;
-
+            _map_includes.insert(s, QString(v.GetInternalRef()));
         return TRUE;
     }
     else
@@ -533,7 +529,7 @@ WrapperStr CppSettings::builtinIn(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_in : WrapperStr();
 }
@@ -550,7 +546,7 @@ bool CppSettings::set_BuiltinIn(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppInCmd, type, form);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -571,7 +567,7 @@ WrapperStr CppSettings::builtinOut(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_out : WrapperStr();
 }
@@ -588,7 +584,7 @@ bool CppSettings::set_BuiltinOut(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppOutCmd, type, form);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -609,7 +605,7 @@ WrapperStr CppSettings::builtinInOut(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_inout : WrapperStr();
 }
@@ -626,7 +622,7 @@ bool CppSettings::set_BuiltinInOut(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppInOutCmd, type, form);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -647,7 +643,7 @@ WrapperStr CppSettings::builtinReturn(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->cpp_return : WrapperStr();
 }
@@ -664,7 +660,7 @@ bool CppSettings::set_BuiltinReturn(WrapperStr type, WrapperStr form)
     UmlCom::send_cmd(cppSettingsCmd, setCppReturnCmd, type, form);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(type);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(type);
 
         if (b == 0)
             b = UmlSettings::add_type(type);
@@ -1267,14 +1263,14 @@ bool CppSettings::_is_inline_force_header_in_h;
 
 WrapperStr CppSettings::_visibility_indent;
 
-Q3Dict<QString> CppSettings::_map_includes;
+QHash<QString,QString> CppSettings::_map_includes;
 
 void CppSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -1300,13 +1296,13 @@ void CppSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
         WrapperStr i = UmlCom::read_string();
 
-        _map_includes.insert(t, new QString(i.GetInternalRef()));
+        _map_includes.insert(t, QString(i.GetInternalRef()));
     }
 
     _h_content = UmlCom::read_string();
diff --git a/src/Tools/CppSettings.h b/src/Tools/CppSettings.h
index f696aec05..ff340be86 100644
--- a/src/Tools/CppSettings.h
+++ b/src/Tools/CppSettings.h
@@ -7,7 +7,6 @@
 #include "misc/mystr.h"
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
 
 // This class manages settings concerning C++, configured through
 // the 'Generation settings' dialog.
@@ -660,7 +659,7 @@ class CppSettings : public UmlSettings
 
     static WrapperStr _visibility_indent;
 
-    static Q3Dict<QString> _map_includes;
+    static QHash<QString, QString> _map_includes;
 
 
 protected:
diff --git a/src/Tools/IdlSettings.cpp b/src/Tools/IdlSettings.cpp
index 86d6816a8..26d9dca32 100644
--- a/src/Tools/IdlSettings.cpp
+++ b/src/Tools/IdlSettings.cpp
@@ -29,7 +29,7 @@ WrapperStr IdlSettings::type(WrapperStr s)
 
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s, 0);
 
     return (b) ? b->idl : s;
 }
@@ -40,7 +40,7 @@ bool IdlSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s, 0);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -64,7 +64,7 @@ WrapperStr IdlSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s, 0);
 
     return (b) ? b->idl : s;
 }
@@ -75,7 +75,7 @@ bool IdlSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s, 0);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -99,7 +99,7 @@ WrapperStr IdlSettings::classStereotype(WrapperStr s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s, 0);
 
     return (b) ? b->idl : "valuetype";
 }
@@ -110,7 +110,7 @@ bool IdlSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(idlSettingsCmd, setIdlClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s, 0);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -651,14 +651,14 @@ WrapperStr IdlSettings::_src_content;
 
 WrapperStr IdlSettings::_ext;
 
-Q3Dict<QString> IdlSettings::_map_includes;
+QHash<WrapperStr,QString*> IdlSettings::_map_includes;
 
 void IdlSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -680,7 +680,7 @@ void IdlSettings::read_()
     _map_includes.clear();
 
     if (n > _map_includes.size())
-        _map_includes.resize(n);
+        _map_includes.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/src/Tools/IdlSettings.h b/src/Tools/IdlSettings.h
index d76fbe0f7..58725df4e 100644
--- a/src/Tools/IdlSettings.h
+++ b/src/Tools/IdlSettings.h
@@ -6,8 +6,6 @@
 
 #include "misc/mystr.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
-
 // This class manages settings concerning IDL, configured through
 // the 'Generation settings' dialog.
 //
@@ -333,7 +331,7 @@ class IdlSettings : public UmlSettings
 
     static WrapperStr _ext;
 
-    static Q3Dict<QString> _map_includes;
+    static QHash<WrapperStr,QString*> _map_includes;
 
 
 protected:
diff --git a/src/Tools/JavaSettings.cpp b/src/Tools/JavaSettings.cpp
index fcad47a5b..2bfcc4d63 100644
--- a/src/Tools/JavaSettings.cpp
+++ b/src/Tools/JavaSettings.cpp
@@ -29,7 +29,7 @@ WrapperStr JavaSettings::type(const WrapperStr & s)
 
     read_if_needed_();
 
-    UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+    UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
     return (b) ? b->java : s;
 }
@@ -40,7 +40,7 @@ bool JavaSettings::set_Type(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaTypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlBuiltin * b = UmlSettings::_map_builtins.find(s);
+        UmlBuiltin * b = UmlSettings::_map_builtins.value(s);
 
         if (b == 0)
             b = UmlSettings::add_type(s);
@@ -64,7 +64,7 @@ WrapperStr JavaSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
@@ -75,7 +75,7 @@ bool JavaSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -99,7 +99,7 @@ WrapperStr JavaSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->java : s;
 }
@@ -110,7 +110,7 @@ bool JavaSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(javaSettingsCmd, setJavaClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -715,14 +715,14 @@ bool JavaSettings::_is_generate_javadoc_comment;
 
 bool JavaSettings::_is_force_package_gen;
 
-Q3Dict<QString> JavaSettings::_map_imports;
+QHash<WrapperStr,QString*> JavaSettings::_map_imports;
 
 void JavaSettings::read_()
 {
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -744,7 +744,7 @@ void JavaSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/src/Tools/JavaSettings.h b/src/Tools/JavaSettings.h
index 1739bdf37..126516f82 100644
--- a/src/Tools/JavaSettings.h
+++ b/src/Tools/JavaSettings.h
@@ -7,7 +7,7 @@
 #include "misc/mystr.h"
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning JAVA, configured through
 // the 'Generation settings' dialog.
@@ -376,7 +376,7 @@ class JavaSettings : public UmlSettings
 
     static bool _is_force_package_gen;
 
-    static Q3Dict<QString> _map_imports;
+    static QHash<WrapperStr,QString*> _map_imports;
 
 
 protected:
diff --git a/src/Tools/PhpSettings.cpp b/src/Tools/PhpSettings.cpp
index 1b8878536..d7e945cbc 100644
--- a/src/Tools/PhpSettings.cpp
+++ b/src/Tools/PhpSettings.cpp
@@ -28,7 +28,7 @@ WrapperStr PhpSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->php : s;
 }
@@ -39,7 +39,7 @@ bool PhpSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(phpSettingsCmd, setPhpClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -637,15 +637,17 @@ void PhpSettings::read_()
     _rel_decl = UmlCom::read_string();
     _oper_def = UmlCom::read_string();
 #ifndef WITHJAVA
-    _get_visibility =
+    _get_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _get_name = UmlCom::read_string();
     _is_get_final = UmlCom::read_bool();
 #ifndef WITHJAVA
-    _set_visibility =
+    _set_visibility = (aVisibility) UmlCom::read_char();
+#else
+    UmlCom::read_char();
 #endif
-        (aVisibility) UmlCom::read_char();
     _set_name = UmlCom::read_string();
     _is_set_final = UmlCom::read_bool();
     _is_generate_javadoc_comment = UmlCom::read_bool();
diff --git a/src/Tools/PhpSettings.h b/src/Tools/PhpSettings.h
index 17a920869..0681a8a86 100644
--- a/src/Tools/PhpSettings.h
+++ b/src/Tools/PhpSettings.h
@@ -7,7 +7,7 @@
 #include "misc/mystr.h"
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PHP, configured through
 // the 'Generation settings' dialog.
diff --git a/src/Tools/PythonSettings.cpp b/src/Tools/PythonSettings.cpp
index 59cc04bce..e40eb6c8c 100644
--- a/src/Tools/PythonSettings.cpp
+++ b/src/Tools/PythonSettings.cpp
@@ -65,7 +65,7 @@ WrapperStr PythonSettings::relationAttributeStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
@@ -76,7 +76,7 @@ bool PythonSettings::set_RelationAttributeStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(pythonSettingsCmd, setPythonRelationAttributeStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_relation_attribute_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_rel_attr_stereotype(s);
@@ -100,7 +100,7 @@ WrapperStr PythonSettings::classStereotype(const WrapperStr & s)
 {
     read_if_needed_();
 
-    UmlStereotype * b = UmlSettings::_map_class_stereotypes.find(s);
+    UmlStereotype * b = UmlSettings::_map_class_stereotypes.value(s);
 
     return (b) ? b->python : s;
 }
@@ -111,7 +111,7 @@ bool PythonSettings::set_ClassStereotype(WrapperStr s, WrapperStr v)
     UmlCom::send_cmd(pythonSettingsCmd, setPythonClassStereotypeCmd, s, v);
 
     if (UmlCom::read_bool()) {
-        UmlStereotype * st = UmlSettings::_map_class_stereotypes.find(s);
+        UmlStereotype * st = UmlSettings::_map_class_stereotypes.value(s);
 
         if (st == 0)
             st = UmlSettings::add_class_stereotype(s);
@@ -426,7 +426,7 @@ WrapperStr PythonSettings::_src_content;
 
 WrapperStr PythonSettings::_ext;
 
-Q3Dict<QString> PythonSettings::_map_imports;
+QHash<QString, QString*> PythonSettings::_map_imports;
 
 void PythonSettings::read_()
 {
@@ -436,8 +436,8 @@ void PythonSettings::read_()
 
     _root = UmlCom::read_string();
 
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
@@ -453,7 +453,7 @@ void PythonSettings::read_()
     _map_imports.clear();
 
     if (n > _map_imports.size())
-        _map_imports.resize(n);
+        _map_imports.reserve(n);
 
     for (index = 0; index != n; index += 1) {
         WrapperStr t = UmlCom::read_string();
diff --git a/src/Tools/PythonSettings.h b/src/Tools/PythonSettings.h
index d20bd582b..96d8f61b3 100644
--- a/src/Tools/PythonSettings.h
+++ b/src/Tools/PythonSettings.h
@@ -7,7 +7,7 @@
 #include "misc/mystr.h"
 #include "aVisibility.h"
 #include "UmlSettings.h"
-#include <q3dict.h>
+
 
 // This class manages settings concerning PYTHON, configured through
 // the 'Generation settings' dialog.
@@ -228,7 +228,7 @@ class PythonSettings : public UmlSettings
 
     static WrapperStr _ext;
 
-    static Q3Dict<QString> _map_imports;
+    static QHash<QString, QString*> _map_imports;
 
 protected:
     static void read_();
diff --git a/src/Tools/SignalBlockerWrapper.h b/src/Tools/SignalBlockerWrapper.h
index 2588f23c4..575780def 100644
--- a/src/Tools/SignalBlockerWrapper.h
+++ b/src/Tools/SignalBlockerWrapper.h
@@ -28,11 +28,11 @@ class QSignalBlockerCallProxy
 };
 
 template<class T>
-class QSignalBlocker
+class QSignalBlockerW
 {
     T * const o;
 public:
-    explicit QSignalBlocker( T * oo )
+    explicit QSignalBlockerW( T * oo )
       : o(oo)
     {
     }
@@ -42,13 +42,13 @@ class QSignalBlocker
              o->blockSignals( true );
          return QSignalBlockerCallProxy<T>(o);
     }
-    ~QSignalBlocker() {}
+    ~QSignalBlockerW() {}
 };
 
 template<class T>
-QSignalBlocker<T> SilentCall(T* o)
+QSignalBlockerW<T> SilentCall(T* o)
 {
-    return QSignalBlocker<T>(o);
+    return QSignalBlockerW<T>(o);
 }
 
 #endif // SIGNALBLOCKERWRAPPER_H
diff --git a/src/Tools/UmlBaseArtifact.cpp b/src/Tools/UmlBaseArtifact.cpp
index eda6da540..fd41c6e1a 100644
--- a/src/Tools/UmlBaseArtifact.cpp
+++ b/src/Tools/UmlBaseArtifact.cpp
@@ -37,7 +37,7 @@ bool UmlBaseArtifact::set_AssociatedDiagram(UmlDeploymentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseArtifact::associatedClasses()
+const QVector<UmlClass *> &UmlBaseArtifact::associatedClasses()
 {
     read_if_needed_();
 
@@ -51,8 +51,7 @@ bool UmlBaseArtifact::addAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _assoc_classes.resize(_assoc_classes.size() + 1);
-            _assoc_classes.insert(_assoc_classes.size() - 1, cl);
+            _assoc_classes.append(cl);
         }
 
         return TRUE;
@@ -68,18 +67,12 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _assoc_classes.findRef(cl);
+            unsigned index = (unsigned) _assoc_classes.indexOf(cl);
 
             if (((int) index) == -1)
                 // theo impossible
                 return FALSE;
-
-            unsigned last = _assoc_classes.size() - 1;
-
-            if (index != last)
-                _assoc_classes.insert(index, _assoc_classes[last]);
-
-            _assoc_classes.resize(last);
+            _assoc_classes.removeAt(index);
         }
 
         return TRUE;
@@ -88,9 +81,9 @@ bool UmlBaseArtifact::removeAssociatedClass(UmlClass * cl)
         return FALSE;
 }
 
-bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
+bool UmlBaseArtifact::set_AssociatedClasses(const QVector<UmlClass*> & l)
 {
-    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector<UmlItem> &) l);
+    UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector<UmlItem*> &) l);
 
     if (UmlCom::read_bool()) {
         if (_defined)
@@ -102,7 +95,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector<UmlClass> & l)
         return FALSE;
 }
 
-const Q3PtrVector<UmlArtifact> & UmlBaseArtifact::associatedArtifacts()
+const QVector<UmlArtifact*> & UmlBaseArtifact::associatedArtifacts()
 {
     read_if_needed_();
 
@@ -116,8 +109,7 @@ bool UmlBaseArtifact::addAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            _associated.resize(_associated.size() + 1);
-            _associated.insert(_associated.size() - 1, cp);
+            _associated.append(cp);
         }
 
         return TRUE;
@@ -133,18 +125,12 @@ bool UmlBaseArtifact::removeAssociatedArtifact(UmlArtifact * cp)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            unsigned index = (unsigned) _associated.findRef(cp);
+            unsigned index = (unsigned) _associated.indexOf(cp);
 
             if (((int) index) == -1)
                 // theo impossible
                 return FALSE;
-
-            unsigned last = _associated.size() - 1;
-
-            if (index != last)
-                _associated.insert(index, _associated[last]);
-
-            _associated.resize(last);
+            _associated.removeAt(index);
         }
 
         return TRUE;
@@ -279,16 +265,16 @@ void UmlBaseArtifact::read_uml_()
     unsigned index;
 
     n = UmlCom::read_unsigned();
-    _assoc_classes.resize(n);
+    _assoc_classes.reserve(n);
 
     for (index = 0; index != n; index += 1)
         _assoc_classes.insert(index, (UmlClass *) UmlBaseItem::read_());
 
     n = UmlCom::read_unsigned();
-    _associated.resize(n);
+    _associated.reserve(n);
 
     for (index = 0; index != n; index += 1)
-        _associated.insert(index, (UmlArtifact *) UmlBaseItem::read_());
+        _associated.append((UmlArtifact *) UmlBaseItem::read_());
 }
 
 #ifdef WITHCPP
diff --git a/src/Tools/UmlBaseArtifact.h b/src/Tools/UmlBaseArtifact.h
index b1271e3b5..c87770170 100644
--- a/src/Tools/UmlBaseArtifact.h
+++ b/src/Tools/UmlBaseArtifact.h
@@ -4,7 +4,6 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
 #include "misc/mystr.h"
 
 #include "UmlClass.h"	// to avoid destructor problem
@@ -37,7 +36,7 @@ class UmlBaseArtifact : public UmlItem
 
     // returns (in Java a copy of) the optional associated classes
     // significant when the artifact is stereotyped <<source>>
-    const Q3PtrVector<UmlClass> & associatedClasses();
+    const QVector<UmlClass*> & associatedClasses();
 
     // adds 'cl' at the end of the associated classes list, returns false
     // if 'cl' is already an associate class.
@@ -56,11 +55,11 @@ class UmlBaseArtifact : public UmlItem
     // significant when the artifact is stereotyped <<source>>
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & l);
+    bool set_AssociatedClasses(const QVector<UmlClass *> &l);
 
     // returns (in Java a copy of) the associated artifacts list
     // significant when the artifact is not stereotyped <<source>>
-    const Q3PtrVector<UmlArtifact> & associatedArtifacts();
+    const QVector<UmlArtifact *> &associatedArtifacts();
 
     // adds an associated artifacts, returns false if 'cp' is already
     // an associate artifact.
@@ -148,9 +147,9 @@ class UmlBaseArtifact : public UmlItem
 private:
     UmlDeploymentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _assoc_classes;
+    QVector<UmlClass*> _assoc_classes;
 
-    Q3PtrVector<UmlArtifact> _associated;
+    QVector<UmlArtifact*> _associated;
 
 #ifdef WITHCPP
     WrapperStr _cpp_h;
diff --git a/src/Tools/UmlBaseClass.cpp b/src/Tools/UmlBaseClass.cpp
index caf277550..c3569023f 100644
--- a/src/Tools/UmlBaseClass.cpp
+++ b/src/Tools/UmlBaseClass.cpp
@@ -9,9 +9,8 @@
 
 #include "UmlCom.h"
 #include "Tools/ApiCmd.h"
-//Added by qt3to4:
+#include <QList>
 
-#include <Q3ValueList>
 UmlClass * UmlBaseClass::create(UmlItem * parent, const char * s)
 {
     return (UmlClass *) parent->create_(aClass, s);
@@ -46,11 +45,11 @@ bool UmlBaseClass::set_BaseType(const UmlTypeSpec & t)
     return set_it_(_base_type, t, setBaseTypeCmd);
 }
 
-Q3ValueList<UmlFormalParameter> UmlBaseClass::formals()
+QList<UmlFormalParameter> UmlBaseClass::formals()
 {
     UmlCom::send_cmd(_identifier, formalsCmd);
 
-    Q3ValueList<UmlFormalParameter> formals;
+    QList<UmlFormalParameter> formals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlFormalParameter f;
@@ -82,11 +81,11 @@ bool UmlBaseClass::replaceFormal(unsigned int rank, const UmlFormalParameter & f
     return UmlCom::read_bool();
 }
 
-Q3ValueList<UmlActualParameter> UmlBaseClass::actuals()
+QList<UmlActualParameter> UmlBaseClass::actuals()
 {
     UmlCom::send_cmd(_identifier, actualsCmd);
 
-    Q3ValueList<UmlActualParameter> actuals;
+    QList<UmlActualParameter> actuals;
 
     for (unsigned n = UmlCom::read_unsigned(); n; n -= 1) {
         UmlActualParameter a;
@@ -131,17 +130,17 @@ UmlArtifact * UmlBaseClass::associatedArtifact()
     return (UmlArtifact *) UmlBaseItem::read_();
 }
 
-const Q3PtrVector<UmlComponent> UmlBaseClass::associatedComponents()
+const QVector<UmlComponent *> UmlBaseClass::associatedComponents()
 {
     UmlCom::send_cmd(_identifier, assocComponentCmd);
 
-    Q3PtrVector<UmlComponent> result;
+    QVector<UmlComponent*> result;
     unsigned n = UmlCom::read_unsigned();
 
-    result.resize(n);
+    result.reserve(n);
 
     for (unsigned index = 0; index != n; index += 1)
-        result.insert(index, (UmlComponent *) UmlBaseItem::read_());
+        result.append((UmlComponent *) UmlBaseItem::read_());
 
     return result;
 }
@@ -392,10 +391,10 @@ bool UmlBaseClass::set_Name(const WrapperStr & s)
     if (!UmlBaseItem::set_Name(s))
         return FALSE;
 
-    const Q3PtrVector<UmlItem> ch = children();
+    const QVector<UmlItem*> ch = children();
     WrapperStr destr = "~" + name();
 
-    for (unsigned i = 0; i != ch.size(); i += 1) {
+    for (int i = 0; i != ch.size(); i += 1) {
         if (ch[i]->kind() == anOperation) {
             if (ch[i]->name() == name())
                 ch[i]->set_Name(s);
@@ -407,7 +406,7 @@ bool UmlBaseClass::set_Name(const WrapperStr & s)
     return TRUE;
 }
 
-Q3Dict<UmlClass> UmlBaseClass::_classes(1001);
+QHash<QString,UmlClass*> UmlBaseClass::_classes;
 
 UmlBaseClass::UmlBaseClass(void * id, const WrapperStr & n)
     : UmlClassMember(id, n)
@@ -417,7 +416,7 @@ UmlBaseClass::UmlBaseClass(void * id, const WrapperStr & n)
     _classes.insert(n, (UmlClass *) this);
 
     if ((_classes.count() / 2) >= _classes.size())
-        _classes.resize(_classes.size() * 2 - 1);
+        _classes.reserve(_classes.size() * 2 - 1);
 }
 
 void UmlBaseClass::read_uml_()
diff --git a/src/Tools/UmlBaseClass.h b/src/Tools/UmlBaseClass.h
index 1c6640861..207a16b39 100644
--- a/src/Tools/UmlBaseClass.h
+++ b/src/Tools/UmlBaseClass.h
@@ -5,11 +5,7 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
 #include "misc/mystr.h"
-#include <q3dict.h>
-
 #include "UmlFormalParameter.h"
 #include "UmlActualParameter.h"
 class UmlClass;
@@ -54,7 +50,7 @@ class UmlBaseClass : public UmlClassMember
     bool set_BaseType(const UmlTypeSpec & t);
 
     // returns (a copy of) the formals list
-    Q3ValueList<UmlFormalParameter> formals();
+    QList<UmlFormalParameter> formals();
 
     // remove the formal of the given rank (0...), returns 0 on error
     //
@@ -77,7 +73,7 @@ class UmlBaseClass : public UmlClassMember
     bool replaceFormal(unsigned int rank, const UmlFormalParameter & formal);
 
     // returns (a copy of) the actuals list
-    Q3ValueList<UmlActualParameter> actuals();
+    QList<UmlActualParameter> actuals();
 
     // replace the actual value at the given rank (0...)
     //
@@ -100,7 +96,7 @@ class UmlBaseClass : public UmlClassMember
 
     // returns the components realizing or providing the class.
     // To set them refer to the UmlBaseComponent's operation setAssociatedClasses()
-    const Q3PtrVector<UmlComponent> associatedComponents();
+    const QVector<UmlComponent *> associatedComponents();
 
 #ifdef WITHCPP
     // returns TRUE if the class is external, its definition
@@ -224,7 +220,7 @@ class UmlBaseClass : public UmlClassMember
     static UmlClass * get(const WrapperStr & n, const UmlPackage * p);
 
     //returns all the classes
-    static void getAll(Q3PtrVector<UmlClass> & v);
+    static void getAll(QHash<int,UmlClass*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -243,7 +239,7 @@ class UmlBaseClass : public UmlClassMember
     friend class UmlBaseArtifact;
 
 private:
-    static Q3Dict<UmlClass> _classes;
+    static QHash<QString,UmlClass*> _classes;
 
     bool _abstract;
 
diff --git a/src/Tools/UmlBaseClassInstance.cpp b/src/Tools/UmlBaseClassInstance.cpp
index 09590b5c0..c6588f082 100644
--- a/src/Tools/UmlBaseClassInstance.cpp
+++ b/src/Tools/UmlBaseClassInstance.cpp
@@ -7,7 +7,7 @@
 #include "UmlRelation.h"
 #include "UmlObjectDiagram.h"
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
 anItemKind UmlBaseClassInstance::kind()
 {
@@ -46,7 +46,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v)
     else     return FALSE;
 }
 
-void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
+void UmlBaseClassInstance::attributesValue(QList<SlotAttribute> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 0);
 
@@ -61,7 +61,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList<SlotAttribute> & result)
     }
 }
 
-void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
+void UmlBaseClassInstance::relationsValue(QList<SlotRelation> & result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0);
 
@@ -76,16 +76,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList<SlotRelation> & result)
     }
 }
 
-void UmlBaseClassInstance::availableAttributes(Q3PtrVector<UmlAttribute> & result)
+void UmlBaseClassInstance::availableAttributes(QHash<int,UmlAttribute*> & result)
 {
     UmlCom::send_cmd(_identifier, attributesCmd, (char) 1);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
-void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result)
+void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QHash<int, UmlRelation *> &result)
 {
     UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier);
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) result);
+    UmlCom::read_item_list((QVector<UmlItem*> &) result);
 }
 
 bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const char * value)
@@ -96,7 +96,7 @@ bool UmlBaseClassInstance::set_AttributeValue(UmlAttribute * attribute, const ch
 
 bool UmlBaseClassInstance::add_Relation(UmlAttribute * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v;
 
     v.insert(0, relation);
     v.insert(1, other);
@@ -106,7 +106,7 @@ bool UmlBaseClassInstance::add_Relation(UmlAttribute * relation, UmlClassInstanc
 
 bool UmlBaseClassInstance::remove_Relation(UmlAttribute * relation, UmlClassInstance * other)
 {
-    Q3PtrVector<UmlItem> v(2);
+    QVector<UmlItem*> v;
 
     v.insert(0, relation);
     v.insert(1, other);
diff --git a/src/Tools/UmlBaseClassInstance.h b/src/Tools/UmlBaseClassInstance.h
index 495265cff..f6775558f 100644
--- a/src/Tools/UmlBaseClassInstance.h
+++ b/src/Tools/UmlBaseClassInstance.h
@@ -6,8 +6,7 @@
 #include "SlotRelation.h"
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3valuelist.h>
-#include <q3ptrvector.h>
+#include <QList>
 #include "misc/mystr.h"
 
 class UmlClassInstance;
@@ -40,17 +39,17 @@ class UmlBaseClassInstance : public UmlItem
     bool set_Type(UmlClass * v);
 
     // Returns the attributes having a value
-    void attributesValue(Q3ValueList<SlotAttribute> & result);
+    void attributesValue(QList<SlotAttribute> & result);
 
     // Returns the attributes having a value
-    void relationsValue(Q3ValueList<SlotRelation> & result);
+    void relationsValue(QList<SlotRelation> & result);
 
     // Returns all the attributes of the class instance,
     // including the inherited
-    void availableAttributes(Q3PtrVector<UmlAttribute> & result);
+    void availableAttributes(QHash<int, UmlAttribute *> &result);
 
     // Returns all the possible relations from the current instance to 'other', including the inherited
-    void availableRelations(UmlClassInstance * other, Q3PtrVector<UmlRelation> & result);
+    void availableRelations(UmlClassInstance * other, QHash<int,UmlRelation*> & result);
 
     // Remove the slot if the value is null.
     // Else set the value for the given attribute, replacing it
diff --git a/src/Tools/UmlBaseClassItem.h b/src/Tools/UmlBaseClassItem.h
index 658eec0e1..b5acbf8ef 100644
--- a/src/Tools/UmlBaseClassItem.h
+++ b/src/Tools/UmlBaseClassItem.h
@@ -64,7 +64,7 @@ class UmlBaseClassItem : public UmlItem
     bool set_IdlDecl(const char * s);
 #endif
 
-    virtual void unload(bool = FALSE, bool = FALSE);
+    virtual void unload(bool = false, bool = false);
 
     friend class UmlBaseAttribute;
     friend class UmlBaseOperation;
diff --git a/src/Tools/UmlBaseComponent.cpp b/src/Tools/UmlBaseComponent.cpp
index 39f618fb7..267a0db17 100644
--- a/src/Tools/UmlBaseComponent.cpp
+++ b/src/Tools/UmlBaseComponent.cpp
@@ -35,28 +35,28 @@ bool UmlBaseComponent::set_AssociatedDiagram(UmlComponentDiagram * d)
         return FALSE;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::realizingClasses()
+const QVector<UmlClass*> & UmlBaseComponent::realizingClasses()
 {
     read_if_needed_();
 
     return _realizing;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::providedClasses()
+const QVector<UmlClass *> &UmlBaseComponent::providedClasses()
 {
     read_if_needed_();
 
     return _provided;
 }
 
-const Q3PtrVector<UmlClass> & UmlBaseComponent::requiredClasses()
+const QVector<UmlClass*> & UmlBaseComponent::requiredClasses()
 {
     read_if_needed_();
 
     return _required;
 }
 
-bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required)
+bool UmlBaseComponent::set_AssociatedClasses(const QVector<UmlClass*> & realizing, const QVector<UmlClass*> & provided, const QVector<UmlClass*> & required)
 {
     UmlCom::send_cmd(_identifier, setAssocClassesCmd,
                      realizing, provided, required);
@@ -93,21 +93,21 @@ void UmlBaseComponent::read_uml_()
     unsigned index;
 
     n = UmlCom::read_unsigned();
-    _realizing.resize(n);
+    _realizing.reserve(n);
 
     for (index = 0; index != n; index += 1)
-        _realizing.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _realizing.append((UmlClass *) UmlBaseItem::read_());
 
     n = UmlCom::read_unsigned();
-    _provided.resize(n);
+    _provided.reserve(n);
 
     for (index = 0; index != n; index += 1)
-        _provided.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _provided.append((UmlClass *) UmlBaseItem::read_());
 
     n = UmlCom::read_unsigned();
-    _required.resize(n);
+    _required.reserve(n);
 
     for (index = 0; index != n; index += 1)
-        _required.insert(index, (UmlClass *) UmlBaseItem::read_());
+        _required.append((UmlClass *) UmlBaseItem::read_());
 }
 
diff --git a/src/Tools/UmlBaseComponent.h b/src/Tools/UmlBaseComponent.h
index e61309f12..8c05de74a 100644
--- a/src/Tools/UmlBaseComponent.h
+++ b/src/Tools/UmlBaseComponent.h
@@ -4,7 +4,6 @@
 
 #include "UmlItem.h"
 #include "anItemKind.h"
-#include <q3ptrvector.h>
 #include "misc/mystr.h"
 
 #include "UmlClass.h"	// to avoid destructor problem
@@ -36,18 +35,18 @@ class UmlBaseComponent : public UmlItem
     bool set_AssociatedDiagram(UmlComponentDiagram * d);
 
     // returns (in Java a copy of) the optional realizing classes
-    const Q3PtrVector<UmlClass> & realizingClasses();
+    const QVector<UmlClass *> &realizingClasses();
 
     // returns (in Java a copy of) the optional provided classes
-    const Q3PtrVector<UmlClass> & providedClasses();
+    const QVector<UmlClass*> & providedClasses();
 
     // returns (in Java a copy of) the optional required classes
-    const Q3PtrVector<UmlClass> & requiredClasses();
+    const QVector<UmlClass *> &requiredClasses();
 
     // set the realization, provided and required classes lists
     //
     // On error return FALSE in C++, produce a RuntimeException in Java
-    bool set_AssociatedClasses(const Q3PtrVector<UmlClass> & realizing, const Q3PtrVector<UmlClass> & provided, const Q3PtrVector<UmlClass> & required);
+    bool set_AssociatedClasses(const QVector<UmlClass *> &realizing, const QVector<UmlClass *> &provided, const QVector<UmlClass *> &required);
 
     // to unload the object to free memory, it will be reloaded
     // automatically if needed. args unused
@@ -57,11 +56,11 @@ class UmlBaseComponent : public UmlItem
 private:
     UmlComponentDiagram * _assoc_diagram;
 
-    Q3PtrVector<UmlClass> _realizing;
+    QVector<UmlClass*> _realizing;
 
-    Q3PtrVector<UmlClass> _provided;
+    QVector<UmlClass*> _provided;
 
-    Q3PtrVector<UmlClass> _required;
+    QVector<UmlClass*> _required;
 
 
 protected:
diff --git a/src/Tools/UmlBaseItem.cpp b/src/Tools/UmlBaseItem.cpp
index ae473d3c5..a08cb4c23 100644
--- a/src/Tools/UmlBaseItem.cpp
+++ b/src/Tools/UmlBaseItem.cpp
@@ -1,32 +1,31 @@
 
 #include "UmlBaseItem.h"
-#include "UmlItem.h"
-#include "UmlTypeSpec.h"
-
 #include "UmlCom.h"
-#include "UmlRelation.h"
-#include "UmlNcRelation.h"
-#include "UmlAttribute.h"
-#include "UmlOperation.h"
+#include "UmlPackage.h"
+#include "UmlClassView.h"
+#include "UmlDeploymentView.h"
+#include "UmlClassDiagram.h"
 #include "UmlClass.h"
+#include "UmlOperation.h"
+#include "UmlRelation.h"
+#include "UmlTypeSpec.h"
+#include "UmlItem.h"
+#include "UmlArtifact.h"
+#include "UmlObjectDiagram.h"
 #include "UmlClassInstance.h"
+#include "UmlAttribute.h"
+#include "UmlExtraClassMember.h"
+#include "UmlNcRelation.h"
 #include "UmlUseCase.h"
 #include "UmlNode.h"
-#include "UmlArtifact.h"
 #include "UmlComponent.h"
-#include "UmlClassDiagram.h"
 #include "UmlUseCaseDiagram.h"
 #include "UmlSequenceDiagram.h"
 #include "UmlCollaborationDiagram.h"
 #include "UmlComponentDiagram.h"
-#include "UmlObjectDiagram.h"
 #include "UmlDeploymentDiagram.h"
-#include "UmlClassView.h"
 #include "UmlUseCaseView.h"
 #include "UmlComponentView.h"
-#include "UmlDeploymentView.h"
-#include "UmlPackage.h"
-#include "UmlExtraClassMember.h"
 #include "UmlState.h"
 #include "UmlTransition.h"
 #include "UmlRegion.h"
@@ -120,7 +119,7 @@ UmlItem * UmlBaseItem::parent()
 }
 
 // & ONLY HERE, TOO GANGEROUS FUR USER USE
-const Q3PtrVector<UmlItem> & UmlBaseItem::children()
+const QVector<UmlItem*> &UmlBaseItem::children()
 {
     if (_children == 0)
         read_children_();
@@ -145,17 +144,17 @@ bool UmlBaseItem::propertyValue(const WrapperStr & k, WrapperStr & v)
     read_if_needed_();
 
 
-    QString * s = _dict[k];
+    QString s = _dict[k];
 
 
-    if (s == 0)
+    if (s.isEmpty())
     {
         QLOG_INFO() << "DICT READ FAILURE";
         QLOG_INFO() << "CLASS WAS: " << k.operator QString();
-        Q3DictIterator<QString> it( _dict );
-        for( ; it.current(); ++it )
+        QHash<QString,QString>::Iterator it = _dict.begin(); // _dict );
+        for( ; it != _dict.end(); ++it )
         {
-            QLOG_INFO() << it.currentKey();
+            QLOG_INFO() << it.key();
         }
         QLOG_INFO() << "END";
 
@@ -163,7 +162,7 @@ bool UmlBaseItem::propertyValue(const WrapperStr & k, WrapperStr & v)
     }
     QLOG_INFO() << "DICT READ SUCCESS";
 
-    v = *s;
+    v = s;
     return TRUE;
 
 }
@@ -176,12 +175,12 @@ bool UmlBaseItem::set_PropertyValue(const WrapperStr & k, const WrapperStr & v)
 
     if (UmlCom::read_bool()) {
         if (_defined) {
-            QString * s = _dict[k];
+            QString s = _dict[k];
 
-            if (s == 0)
-                _dict.insert(k.operator QString(), new QString(v.operator QString()));
+            if (s.isEmpty())
+                _dict.insert(k.operator QString(), QString(v.operator QString()));
             else
-                *s = v.operator QString();
+                s = v.operator QString();
         }
 
         return TRUE;
@@ -190,7 +189,7 @@ bool UmlBaseItem::set_PropertyValue(const WrapperStr & k, const WrapperStr & v)
         return FALSE;
 }
 
-const Q3Dict<QString> UmlBaseItem::properties()
+const QHash<QString,QString> UmlBaseItem::properties()
 {
     read_if_needed_();
 
@@ -238,11 +237,11 @@ bool UmlBaseItem::set_isMarked(bool v)
     return set_it_(_marked, v, setMarkedCmd);
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::referencedBy()
+const QVector<UmlItem*> UmlBaseItem::referencedBy()
 {
     UmlCom::send_cmd(_identifier, referencedByCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
@@ -254,14 +253,13 @@ void UmlBaseItem::unload(bool rec, bool del)
     _stereotype = 0;
     _dict.clear();
     _description = 0;
-
     if (_children != 0) {
         if (rec) {
-            for (unsigned chindex = 0; chindex != _children->size(); chindex += 1) {
-                _children->at(chindex)->unload(TRUE, del);
+            for (int chindex = 0; chindex != _children->size(); chindex += 1) {
+                _children->value(chindex)->unload(TRUE, del);
 
                 if (del)
-                    delete _children->at(chindex);
+                    delete _children->value(chindex);
             }
         }
 
@@ -286,17 +284,17 @@ bool UmlBaseItem::isToolRunning(int id)
     return UmlCom::read_bool();
 }
 
-const Q3PtrVector<UmlItem> UmlBaseItem::markedItems()
+const QVector<UmlItem*> UmlBaseItem::markedItems()
 {
     UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd);
 
-    Q3PtrVector<UmlItem> result;
+    QVector<UmlItem*> result;
 
     UmlCom::read_item_list(result);
     return result;
 }
 
-Q3PtrDict<UmlItem> UmlBaseItem::_all(997);
+QHash<void*, UmlItem*> UmlBaseItem::_all;
 
 void UmlBaseItem::read_if_needed_()
 {
@@ -363,7 +361,7 @@ UmlItem * UmlBaseItem::create_(anItemKind k, const char * s)
         if (_children != 0) {
             unsigned n = _children->count();
 
-            _children->resize(n + 1);
+            //_children->resize(n + 1);
             _children->insert(n, result);
         }
 
@@ -382,7 +380,7 @@ void UmlBaseItem::read_uml_()
     while (n--) {
         WrapperStr k = UmlCom::read_string();
 
-        _dict.insert(k, new QString(UmlCom::read_string()));
+        _dict.insert(k, QString(UmlCom::read_string()));
     }
 
     _description = UmlCom::read_string();
@@ -425,15 +423,15 @@ void UmlBaseItem::read_idl_()
 void UmlBaseItem::read_children_()
 {
     UmlCom::send_cmd(_identifier, childrenCmd);
-    _children = new Q3PtrVector<UmlItem>;
+    _children = new QVector<UmlItem*>;
 
     UmlCom::read_item_list(*_children);
 
-    UmlBaseItem ** v = (UmlBaseItem **) _children->data();
-    UmlBaseItem ** vsup = v + _children->size();
-
-    while (v != vsup)
-        (*v++)->_parent = (UmlItem *) this;
+    QVectorIterator<UmlItem*> it(*_children);
+    while(it.hasNext())
+    {
+        it.next()->_parent = (UmlItem *) this;
+    }
 }
 
 void UmlBaseItem::reread_children_if_needed_()
@@ -442,12 +440,11 @@ void UmlBaseItem::reread_children_if_needed_()
         UmlCom::send_cmd(_identifier, childrenCmd);
 
         UmlCom::read_item_list(*_children);
-
-        UmlBaseItem ** v = (UmlBaseItem **) _children->data();
-        UmlBaseItem ** vsup = v + _children->size();
-
-        while (v != vsup)
-            (*v++)->_parent = (UmlItem *) this;
+        QVectorIterator<UmlItem*> it(*_children);
+        while(it.hasNext())
+        {
+            it.next()->_parent = (UmlItem *) this;
+        }
     }
 }
 
@@ -529,41 +526,36 @@ UmlItem * UmlBaseItem::read_()
 
     UmlItem * result = _all[id];
 
-    if (result == 0) {
+   if (result == 0) {
         switch (kind) {
+        case aClassView:
+            return new UmlClassView(id, name);
+
         case aRelation:
             return new UmlRelation(id, name);
 
-        case anAttribute:
-            return new UmlAttribute(id, name);
-
         case anOperation:
             return new UmlOperation(id, name);
+        case anArtifact:
+            return new UmlArtifact(id, name);
+        case anAttribute:
+            return new UmlAttribute(id, name);
 
         case anExtraClassMember:
             return new UmlExtraClassMember(id, name);
 
-        case aClass:
-            return new UmlClass(id, name);
-
         case anUseCase:
             return new UmlUseCase(id, name);
 
         case aComponent:
             return new UmlComponent(id, name);
 
-        case anArtifact:
-            return new UmlArtifact(id, name);
-
         case aNode:
             return new UmlNode(id, name);
 
         case aNcRelation:
             return new UmlNcRelation(id, name);
 
-        case aClassDiagram:
-            return new UmlClassDiagram(id, name);
-
         case anUseCaseDiagram:
             return new UmlUseCaseDiagram(id, name);
 
@@ -579,20 +571,28 @@ UmlItem * UmlBaseItem::read_()
         case aDeploymentDiagram:
             return new UmlDeploymentDiagram(id, name);
 
-        case aClassView:
-            return new UmlClassView(id, name);
-
         case anUseCaseView:
             return new UmlUseCaseView(id, name);
 
         case aComponentView:
             return new UmlComponentView(id, name);
 
+        case aClass:
+            return new UmlClass(id, name);
+
+        case aClassDiagram:
+            return new UmlClassDiagram(id, name);
+
         case aDeploymentView:
             return new UmlDeploymentView(id, name);
 
         case aPackage:
             return new UmlPackage(id, name);
+        case anObjectDiagram:
+            return new UmlObjectDiagram(id, name);
+
+        case aClassInstance:
+            return new UmlClassInstance(id, name);
 
         case aState:
             return new UmlState(id, name);
@@ -642,9 +642,6 @@ UmlItem * UmlBaseItem::read_()
         case aJoinPseudoState:
             return new UmlJoinPseudoState(id);
 
-        case anObjectDiagram:
-            return new UmlObjectDiagram(id, name);
-
         case anActivityDiagram:
             return new UmlActivityDiagram(id, name);
 
@@ -741,9 +738,6 @@ UmlItem * UmlBaseItem::read_()
         case aPartition:
             return new UmlActivityPartition(id, name);
 
-        case aClassInstance:
-            return new UmlClassInstance(id, name);
-
         case anAcceptCallAction:
             return new UmlAcceptCallAction(id, name);
 
@@ -779,8 +773,8 @@ UmlBaseItem::UmlBaseItem(void * id, const WrapperStr & n)
 {
     _all.insert(id, (UmlItem *) this);
 
-    if (_all.count() / _all.size() > 10)
-        _all.resize(_all.size() * 2 - 1);
+   // if (_all.count() / _all.size() > 10)
+      //  _all.resize(_all.size() * 2 - 1);
 }
 
 UmlBaseItem::~UmlBaseItem()
@@ -792,7 +786,7 @@ UmlBaseItem::~UmlBaseItem()
 }
 
 
-// not in plug-outs managed through bouml
+// not in plug-outs managed through douml
 
 // warning : operation bodies are lost
 bool UmlBaseItem::moveIn(UmlItem * x)
diff --git a/src/Tools/UmlBaseItem.h b/src/Tools/UmlBaseItem.h
index 10d71b033..45a18aa54 100644
--- a/src/Tools/UmlBaseItem.h
+++ b/src/Tools/UmlBaseItem.h
@@ -4,9 +4,9 @@
 
 #include "anItemKind.h"
 #include "misc/mystr.h"
-#include <q3ptrvector.h>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+//#include <q3ptrvector.h>
+//
+//#include <q3ptrdict.h>
 #include "OnInstanceCmd.h"
 #include "aVisibility.h"
 #include "aDirection.h"
@@ -73,7 +73,7 @@ class UmlBaseItem
 
     // returns (in Java : a copy of) the children list, to go all over the browser tree
     // NOTE : RETURN RFE ONLY HERE, too dangerous for user use
-    const Q3PtrVector<UmlItem> & children();
+    const QVector<UmlItem *> &children();
 
     // return TRUE if the children exist and are visible (independently
     // of the scroll bar) in the browser, else FALSE
@@ -107,7 +107,7 @@ class UmlBaseItem
 
     // returns all the properties of the object through (in Java a copy of) a dictionnary
 
-    const Q3Dict<QString> properties();
+    const QHash<QString,QString> properties();
 
     // If the parameter is null, move the current item to be
     // the first child of its parent. Else the current item and
@@ -163,7 +163,7 @@ class UmlBaseItem
     //  The result may contains UmlAttribute, UmlRelations, UmlNcRelations,
     //  UmlOperation (their bodies are not taken into account) , UmlClass
     //  and UmlComponents.
-    const Q3PtrVector<UmlItem> referencedBy();
+    const QVector<UmlItem*> referencedBy();
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -171,7 +171,7 @@ class UmlBaseItem
     // if 'del' is true the sub items are deleted in C++, and removed from the
     // internal dictionnary in C++ and Java (to allow it to be garbaged),
     // you will have to call Children() to re-access to them
-    virtual void unload(bool rec = FALSE, bool del = FALSE);
+    virtual void unload(bool rec = false, bool del = false);
 
     //  'id' is an identifier returned by apply(), indicates if the tool is still running
     static bool isToolRunning(int id);
@@ -186,7 +186,7 @@ class UmlBaseItem
     void setUser(unsigned uid);
     static UmlItem * from_id(unsigned uid, anItemKind);
 
-    static const Q3PtrVector<UmlItem> markedItems();
+    static const QVector<UmlItem*> markedItems();
 
     friend class UmlBaseClassItem;
     friend class UmlBaseAttribute;
@@ -237,11 +237,11 @@ class UmlBaseItem
 
     UmlItem * _parent;
 
-    Q3PtrVector<UmlItem> * _children;
+    QVector<UmlItem*> * _children;
 
-    Q3Dict<QString> _dict;
+    QHash<QString,QString> _dict;
 
-    static Q3PtrDict<UmlItem> _all;
+    static QHash<void*, UmlItem*> _all;
 
 
 protected:
diff --git a/src/Tools/UmlBaseOperation.cpp b/src/Tools/UmlBaseOperation.cpp
index 53af10467..c5c7da98a 100644
--- a/src/Tools/UmlBaseOperation.cpp
+++ b/src/Tools/UmlBaseOperation.cpp
@@ -2,27 +2,19 @@
 #include "UmlBaseOperation.h"
 #include "UmlOperation.h"
 #include "UmlClass.h"
-
 #include "UmlCom.h"
 #include "UmlBaseClass.h"
 #include "UmlClassMember.h"
-//#include "misc/myio.h"
-//Added by qt3to4:
-
-#include <Q3ValueList>
-
+#include <QList>
 #include <QFileInfo>
 #include <QSettings>
 
 
 unsigned api_format(bool useTrueFormat)
 {
-    QFileInfo info("settings.ini");
-    bool test = info.exists();
-    QSettings settings("settings.ini", QSettings::IniFormat);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
     settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
-    int compat = settings.value("Main/compatibility_save").toInt();
-    //int compat = 0;
+    int compat = settings.value("Main/compatibility_save", 0).toInt();
     if((compat != 1) || useTrueFormat)
     {
         int fileFormat = settings.value("Main/fileformat").toInt();
@@ -96,7 +88,7 @@ bool UmlBaseOperation::set_ReturnType(const UmlTypeSpec & t)
     return set_it_(_return_type, t, setReturnTypeCmd);
 }
 
-const Q3ValueList<UmlParameter> UmlBaseOperation::params()
+const QList<UmlParameter> UmlBaseOperation::params()
 {
     read_if_needed_();
 
@@ -110,7 +102,7 @@ bool UmlBaseOperation::addParameter(unsigned rank, const UmlParameter & p)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.insert(_params.at(rank), p);
+            _params.insert(rank, p);
 
         return TRUE;
     }
@@ -124,7 +116,7 @@ bool UmlBaseOperation::removeParameter(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _params.remove(_params.at(rank));
+            _params.removeAt(rank);
 
         return TRUE;
     }
@@ -147,7 +139,7 @@ bool UmlBaseOperation::replaceParameter(unsigned rank, const UmlParameter & p)
         return FALSE;
 }
 
-const Q3ValueList<UmlTypeSpec> UmlBaseOperation::exceptions()
+const QList<UmlTypeSpec> UmlBaseOperation::exceptions()
 {
     read_if_needed_();
 
@@ -160,7 +152,7 @@ bool UmlBaseOperation::addException(unsigned rank, const UmlTypeSpec & t)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.insert(_exceptions.at(rank), t);
+            _exceptions.insert(rank, t);
 
         return TRUE;
     }
@@ -174,7 +166,7 @@ bool UmlBaseOperation::removeException(unsigned rank)
 
     if (UmlCom::read_bool()) {
         if (_defined)
-            _exceptions.remove(_exceptions.at(rank));
+            _exceptions.removeAt(rank);
 
         return TRUE;
     }
diff --git a/src/Tools/UmlBaseOperation.h b/src/Tools/UmlBaseOperation.h
index c376dd8f0..7b3bda93c 100644
--- a/src/Tools/UmlBaseOperation.h
+++ b/src/Tools/UmlBaseOperation.h
@@ -5,9 +5,8 @@
 #include "UmlClassMember.h"
 #include "anItemKind.h"
 #include "UmlTypeSpec.h"
-#include <q3valuelist.h>
+#include <QList>
 #include "misc/mystr.h"
-
 #include "UmlParameter.h"
 class UmlOperation;
 class UmlClass;
@@ -52,7 +51,7 @@ class UmlBaseOperation : public UmlClassMember
     bool set_ReturnType(const UmlTypeSpec & t);
 
     // returns (in java a copy of) the parameters list
-    const Q3ValueList<UmlParameter> params();
+    const QList<UmlParameter> params();
 
     // adds a parameter at the given rank (0...)
     //
@@ -70,7 +69,7 @@ class UmlBaseOperation : public UmlClassMember
     bool replaceParameter(unsigned rank, const UmlParameter & p);
 
     // returns the exceptions
-    const Q3ValueList<UmlTypeSpec> exceptions();
+    const QList<UmlTypeSpec> exceptions();
 
     // adds the exception at the given rank (0...)
     //
@@ -440,26 +439,26 @@ class UmlBaseOperation : public UmlClassMember
 
 
 private:
-    bool _force_body_generation : 1;
+    bool _force_body_generation = false;
 
-    bool _abstract : 1;
+    bool _abstract = false;
 
 #ifdef WITHCPP
-    bool _cpp_const : 1;
+    bool _cpp_const = false;
 
-    bool _cpp_friend : 1;
+    bool _cpp_friend = false;
 
-    bool _cpp_virtual : 1;
+    bool _cpp_virtual = false;
 
-    bool _cpp_inline : 1;
+    bool _cpp_inline = false;
 
-    bool _cpp_default : 1;
+    bool _cpp_default = false;
 
-    bool _cpp_delete : 1;
+    bool _cpp_delete = false;
 
-    bool _cpp_override : 1;
+    bool _cpp_override = false;
 
-    bool _cpp_final : 1;
+    bool _cpp_final = false;
 
 #endif
 
@@ -515,9 +514,9 @@ class UmlBaseOperation : public UmlClassMember
 
     UmlTypeSpec _return_type;
 
-    Q3ValueList<UmlParameter> _params;
+    QList<UmlParameter> _params;
 
-    Q3ValueList<UmlTypeSpec> _exceptions;
+    QList<UmlTypeSpec> _exceptions;
 
 #ifdef WITHCPP
     WrapperStr _cpp_def;
diff --git a/src/Tools/UmlBasePackage.cpp b/src/Tools/UmlBasePackage.cpp
index 6c28fba0e..48669f215 100644
--- a/src/Tools/UmlBasePackage.cpp
+++ b/src/Tools/UmlBasePackage.cpp
@@ -2,11 +2,9 @@
 #include "UmlBasePackage.h"
 #include "UmlPackage.h"
 #include "UmlDiagram.h"
-
 #include "UmlCom.h"
 #include "Tools/ApiCmd.h"
 #include "Tools/ApiCmd.h"
-//Added by qt3to4:
 
 UmlPackage * UmlBasePackage::create(UmlPackage * parent, const char * name)
 {
diff --git a/src/Tools/UmlBasePackage.h b/src/Tools/UmlBasePackage.h
index 77ac15466..67c4e9ca2 100644
--- a/src/Tools/UmlBasePackage.h
+++ b/src/Tools/UmlBasePackage.h
@@ -185,7 +185,7 @@ class UmlBasePackage : public UmlItem
     static void loadProject(WrapperStr p);
 
     //returns all the Java packages
-    static void getAll(Q3PtrVector<UmlPackage> & v);
+    static void getAll(QHash<int,UmlPackage*> & v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
diff --git a/src/Tools/UmlBaseParameterSet.cpp b/src/Tools/UmlBaseParameterSet.cpp
index 307417d45..581c6a0c2 100644
--- a/src/Tools/UmlBaseParameterSet.cpp
+++ b/src/Tools/UmlBaseParameterSet.cpp
@@ -15,15 +15,15 @@ anItemKind UmlBaseParameterSet::kind()
     return aParameterSet;
 }
 
-const Q3PtrVector<UmlActivityPin> & UmlBaseParameterSet::pins()
+const QVector<UmlActivityPin *> &UmlBaseParameterSet::pins()
 {
     read_if_needed_();
     return _pins;
 }
 
-bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
+bool UmlBaseParameterSet::set_Pins(const QVector<UmlActivityPin*> & v)
 {
-    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector<UmlItem> &) v);
+    UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector<UmlItem*> &) v);
 
     if (UmlCom::read_bool()) {
         if (_defined) _pins = v;
@@ -36,13 +36,13 @@ bool UmlBaseParameterSet::set_Pins(const Q3PtrVector<UmlActivityPin> & v)
 
 void UmlBaseParameterSet::unload(bool rec, bool del)
 {
-    _pins.resize(0);
+    _pins.clear();
     UmlBaseItem::unload(rec, del);
 }
 
 void UmlBaseParameterSet::read_uml_()
 {
     UmlBaseItem::read_uml_();
-    UmlCom::read_item_list((Q3PtrVector<UmlItem> &) _pins);
+    UmlCom::read_item_list((QVector<UmlItem*> &) _pins);
 }
 
diff --git a/src/Tools/UmlBaseParameterSet.h b/src/Tools/UmlBaseParameterSet.h
index d99f877be..02d09a053 100644
--- a/src/Tools/UmlBaseParameterSet.h
+++ b/src/Tools/UmlBaseParameterSet.h
@@ -6,8 +6,6 @@
 #include "UmlItem.h"
 #include "anItemKind.h"
 #include "misc/mystr.h"
-#include <q3ptrvector.h>
-
 class UmlActivityParameter;
 class UmlActivityAction;
 
@@ -33,10 +31,10 @@ class UmlBaseParameterSet : public UmlItem
 
 public:
     // return the pins part of the parameter set
-    const Q3PtrVector<UmlActivityPin> & pins();
+    const QVector<UmlActivityPin *> &pins();
 
     // set the pins
-    bool set_Pins(const Q3PtrVector<UmlActivityPin> & v);
+    bool set_Pins(const QVector<UmlActivityPin *> &v);
 
     // to unload the object to free memory, it will be reloaded automatically
     // if needed. Recursively done for the sub items if 'rec' is TRUE.
@@ -48,7 +46,7 @@ class UmlBaseParameterSet : public UmlItem
 
 
 private:
-    Q3PtrVector<UmlActivityPin> _pins;
+    QVector<UmlActivityPin*> _pins;
 
 
 protected:
diff --git a/src/Tools/UmlCom.cpp b/src/Tools/UmlCom.cpp
index 8537ec9c6..0f9777964 100644
--- a/src/Tools/UmlCom.cpp
+++ b/src/Tools/UmlCom.cpp
@@ -9,8 +9,7 @@ using namespace std;
 
 #include "UmlCom.h"
 
-#include <q3socketdevice.h>
-
+#include <QTcpSocket>
 #include "UmlCom.h"
 #include "UmlItem.h"
 #include "UmlTypeSpec.h"
@@ -18,12 +17,14 @@ using namespace std;
 #include "UmlSettings.h"
 #include "Tools/ApiCmd.h"
 #include "Logging/QsLog.h"
+#include <QHostAddress>
 
 bool UmlCom::connect(unsigned int port)
 {
-    sock = new Q3SocketDevice(Q3SocketDevice::Stream);
-    sock->setAddressReusable(TRUE);
-
+    sock = new QTcpSocket(/*QTcpSocket::Stream*/0);
+#ifdef habip
+    sock->setAddressReusable(true);
+#endif
     buffer_in_size = 1024;
     buffer_in = new char[buffer_in_size];
     buffer_in_end = p_buffer_in = 0;
@@ -36,15 +37,16 @@ bool UmlCom::connect(unsigned int port)
 
     ha.setAddress("127.0.0.1");
 
-    if (sock->connect(ha, port)) {
+    sock->connectToHost(ha, port);
+    if (sock->waitForConnected()) {
         // send API version
         QLOG_INFO() << "Sending API version";
         write_unsigned(APIVERSION);
         flush();
-        return TRUE;
+        return true;
     }
     else
-        return FALSE;
+        return false;
 }
 
 UmlItem * UmlCom::targetItem()
@@ -84,11 +86,11 @@ void UmlCom::close()
     sock = 0;
 }
 
-Q3SocketDevice * UmlCom::sock;
+QTcpSocket * UmlCom::sock;
 
 char * UmlCom::buffer_in;
 
-unsigned int UmlCom::buffer_in_size;
+size_t UmlCom::buffer_in_size;
 
 char * UmlCom::p_buffer_in;
 
@@ -98,12 +100,12 @@ char * UmlCom::buffer_out;
 
 char * UmlCom::p_buffer_out;
 
-unsigned int UmlCom::buffer_out_size;
+size_t UmlCom::buffer_out_size;
 
-void UmlCom::check_size_out(unsigned int len)
+void UmlCom::check_size_out(size_t len)
 {
     QLOG_INFO() << "Size check initiated for length :" << len;
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + len) >= buffer_out_size) {
         buffer_out_size = used + len + 1024;
@@ -136,7 +138,7 @@ void UmlCom::read_if_needed()
     }
 }
 
-void UmlCom::read_buffer(unsigned int len)
+void UmlCom::read_buffer(size_t len)
 {
 #ifdef TRACE
     QLOG_INFO() << "enter UmlCom::read_buffer(" << len << ")\n";
@@ -148,12 +150,12 @@ void UmlCom::read_buffer(unsigned int len)
         buffer_in = new char[buffer_in_size];
     }
 
-    int remainder = (int) len;
-    int nread;
+    qint64 remainder = len;
+    qint64 nread;
     char * p = buffer_in;
 
     for (;;) {
-        if ((nread = sock->readBlock(p, remainder)) == -1) {
+        if ((nread = sock->read(p, remainder)) == -1) {
             if (sock->error() != 0) {
 #ifdef TRACE
                 QLOG_INFO() << "UmlCom::read_buffer ERROR, already " << p - buffer_in
@@ -174,7 +176,7 @@ void UmlCom::read_buffer(unsigned int len)
             break;
 
         p += nread;
-        sock->waitForMore(100);
+        sock->waitForReadyRead(100);
     }
 
 #ifdef TRACE
@@ -226,7 +228,7 @@ void UmlCom::write_string(const char * p)
     if (p == 0)
         p = "";
 
-    unsigned len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -570,65 +572,58 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, cha
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l)
 {
 #ifdef TRACE
-    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlItem> & l)\n";
+    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const QVector<UmlItem*> & l)\n";
 #endif
 
     write_char(onInstanceCmd);
     write_id(id);
     write_char(cmd);
-
     unsigned n = l.count();
-    UmlItem ** v = l.data();
-    UmlItem ** vsup = v + n;
-
     write_unsigned(n);
-
-    for (; v != vsup; v += 1)
-        write_id((*v)->_identifier);
-
+    QVectorIterator<UmlItem*> it(l);
+    while(it.hasNext())
+    {
+        write_id(it.next()->_identifier);
+    }
     flush();
 }
 
-void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)
+void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass*> & l1, const QVector<UmlClass*> & l2, const QVector<UmlClass*> & l3)
 {
 #ifdef TRACE
-    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3)\n";
+    QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const QHash<int,UmlClass*> & l1, const QHash<int,UmlClass*> & l2, const QHash<int,UmlClass*> & l3)\n";
 #endif
 
     write_char(onInstanceCmd);
     write_id(id);
     write_char(cmd);
-
     unsigned n;
-    UmlClass ** v;
-    UmlClass ** vsup;
 
     n = l1.count();
     write_unsigned(n);
-    v = l1.data();
-    vsup = v + n;
-
-    for (; v != vsup; v += 1)
-        write_id(((UmlBaseItem *) *v)->_identifier);
-
+    QVectorIterator<UmlClass*> it1(l1);
+    while(it1.hasNext())
+    {
+        write_id(it1.next()->_identifier);
+    }
     n = l2.count();
     write_unsigned(n);
-    v = l2.data();
-    vsup = v + n;
-
-    for (; v != vsup; v += 1)
-        write_id(((UmlBaseItem *) *v)->_identifier);
+    QVectorIterator<UmlClass*> it2(l2);
+    while(it2.hasNext())
+    {
+        write_id(it2.next()->_identifier);
+    }
 
     n = l3.count();
     write_unsigned(n);
-    v = l3.data();
-    vsup = v + n;
-
-    for (; v != vsup; v += 1)
-        write_id(((UmlBaseItem *) *v)->_identifier);
+    QVectorIterator<UmlClass*> it3(l3);
+    while(it3.hasNext())
+    {
+        write_id(it3.next()->_identifier);
+    }
 
     flush();
 }
@@ -665,7 +660,7 @@ const char * UmlCom::read_string()
 
     read_if_needed();
 
-    unsigned len = strlen(p_buffer_in) + 1;
+    size_t len = strlen(p_buffer_in) + 1;
     QLOG_INFO() << "reading string of length" << len;
     p_buffer_in += len;
 
@@ -704,13 +699,12 @@ unsigned int UmlCom::read_unsigned()
            ((unsigned char *) p_buffer_in)[-1];
 }
 
-void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
+void UmlCom::read_item_list(QVector<UmlItem*> & v)
 {
     QLOG_INFO() << "reading item list" ;
     unsigned n = read_unsigned();
     QLOG_INFO() << "item list seems to have a sice of " << n;
-    v.resize(n);
-
+    v.reserve(n);
 #ifdef TRACE
     QLOG_INFO() << "UmlCom::read_item_list " << n << " items\n";
 #endif
@@ -718,7 +712,7 @@ void UmlCom::read_item_list(Q3PtrVector<UmlItem> & v)
     // warning : don't use data() to directly store
     // in UmlItem ** else count() will be false later
     for (unsigned index = 0; index != n; index += 1)
-        v.insert(index, UmlBaseItem::read_());
+        v.append(UmlBaseItem::read_());
 }
 
 void UmlCom::fatal_error(const WrapperStr &
@@ -737,7 +731,7 @@ void UmlCom::fatal_error(const WrapperStr &
 void UmlCom::flush()
 {
     if (sock != 0) {
-        int len = p_buffer_out - buffer_out - 4;
+        ptrdiff_t len = p_buffer_out - buffer_out - 4;
         QLOG_INFO() << "writing legth to read" << len;
         /* the four first bytes of buffer_out are free to contains the length */
         buffer_out[0] = len >> 24;
@@ -747,9 +741,8 @@ void UmlCom::flush()
 
         len += 4;
         p_buffer_out = buffer_out;
-
         for (;;) {
-            int sent = sock->writeBlock(p_buffer_out, len);
+            qint64 sent = sock->write(p_buffer_out, len);
 
             if (sent == -1) {
                 close();	// to not try to send "bye" !
@@ -779,9 +772,10 @@ void UmlCom::set_user_id(unsigned uid)
 
 bool UmlCom::set_root_permission(bool y)
 {
+
     send_cmd(miscGlobalCmd, setRootPermissionCmd, (char) y);
     // read_char only valid if y is TRUE, else com closed
-    return (y) ? (bool) read_char() : (bool) FALSE;
+    return (y) ? (bool) read_char() : (bool) false;
 }
 
 void UmlCom::send_cmd(CmdFamily f, unsigned int cmd, unsigned int u, char c)
diff --git a/src/Tools/UmlCom.h b/src/Tools/UmlCom.h
index 0d865157b..b7f8ae8cf 100644
--- a/src/Tools/UmlCom.h
+++ b/src/Tools/UmlCom.h
@@ -3,7 +3,7 @@
 
 #define APIVERSION 55
 
-#include <q3socketdevice.h>
+#include <QTcpSocket>
 #include "CmdFamily.h"
 #include "OnInstanceCmd.h"
 #include "anItemKind.h"
@@ -11,14 +11,14 @@
 #include "misc/mystr.h"
 #include "misc/codec.h"
 
-#include <q3ptrvector.h>
+//#include <q3ptrvector.h>
 #include <qstring.h>
 
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
 
-class Q3SocketDevice;
+class QTcpSocket;
 class UmlItem;
 class UmlTypeSpec;
 class UmlClass;
@@ -79,11 +79,11 @@ class UmlCom
     static void close();
 
 private:
-    static Q3SocketDevice * sock;
+    static QTcpSocket * sock;
 
     static char * buffer_in;
 
-    static unsigned int buffer_in_size;
+    static size_t buffer_in_size;
 
     static char * p_buffer_in;
 
@@ -93,19 +93,19 @@ class UmlCom
 
     static char * p_buffer_out;
 
-    static unsigned int buffer_out_size;
+    static size_t buffer_out_size;
 
 
 protected:
     //internal, do NOT use it
 
-    static void check_size_out(unsigned int len);
+    static void check_size_out(size_t len);
     //internal, do NOT use it
 
     static void read_if_needed();
     //internal, do NOT use it
 
-    static void read_buffer(unsigned int len);
+    static void read_buffer(size_t len);
     //internal, do NOT use it
 
     static void write_bool(bool b);
@@ -220,8 +220,8 @@ class UmlCom
     static void send_cmd(const void * id, OnInstanceCmd cmd, unsigned int arg1, char arg2, const char * arg3, const char * arg4, const UmlTypeSpec & arg5);
     //internal, do NOT use it
 
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlItem> & l);
-    static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector<UmlClass> & l1, const Q3PtrVector<UmlClass> & l2, const Q3PtrVector<UmlClass> & l3);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlItem*> & l);
+    static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector<UmlClass *> &l1, const QVector<UmlClass *> &l2, const QVector<UmlClass *> &l3);
 
     //internal, do NOT use it
 
@@ -244,7 +244,7 @@ class UmlCom
     static unsigned int read_unsigned();
     // internal, do NOT use it
 
-    static void read_item_list(Q3PtrVector<UmlItem> & v);
+    static void read_item_list(QVector<UmlItem*> & v);
     //internal, do NOT use it
 
     static void fatal_error(const WrapperStr & msg);
diff --git a/src/Tools/UmlSettings.cpp b/src/Tools/UmlSettings.cpp
index 43efec015..51fc924b1 100644
--- a/src/Tools/UmlSettings.cpp
+++ b/src/Tools/UmlSettings.cpp
@@ -156,29 +156,29 @@ WrapperStr UmlSettings::_attribute_default_description;
 
 WrapperStr UmlSettings::_relation_default_description;
 
-Q3Dict<UmlBuiltin> UmlSettings::_map_builtins;
+QHash<QString, UmlBuiltin*> UmlSettings::_map_builtins;
 
 UmlBuiltin * UmlSettings::_builtins;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_relation_attribute_stereotypes;
+QHash<QString, UmlStereotype*> UmlSettings::_map_relation_attribute_stereotypes;
 
 UmlStereotype * UmlSettings::_relation_attribute_stereotypes;
 
-Q3Dict<UmlStereotype> UmlSettings::_map_class_stereotypes;
+QHash<QString, UmlStereotype*> UmlSettings::_map_class_stereotypes;
 
 UmlStereotype * UmlSettings::_class_stereotypes;
 
 void UmlSettings::read_()
 {
-    unsigned n;
-    unsigned index;
+    int n;
+    int index;
 
     n = UmlCom::read_unsigned();
 
     _builtins = new UmlBuiltin[n];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _builtins[index].uml = UmlCom::read_string();
@@ -190,7 +190,7 @@ void UmlSettings::read_()
     _relation_attribute_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _relation_attribute_stereotypes[index].uml = UmlCom::read_string();
@@ -203,7 +203,7 @@ void UmlSettings::read_()
     _class_stereotypes = new UmlStereotype[n];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         _class_stereotypes[index].uml = UmlCom::read_string();
@@ -275,17 +275,17 @@ WrapperStr UmlSettings::uml_class_stereotype(const WrapperStr & t, WrapperStr Um
 
 UmlBuiltin * UmlSettings::add_type(const WrapperStr & s)
 {
-    unsigned n = _map_builtins.count();
-    unsigned index;
+    int n = _map_builtins.count();
+    int index;
 
     UmlBuiltin * builtins = new UmlBuiltin[n + 1];
 
     if (n / 2 > _map_builtins.size())
-        _map_builtins.resize(_map_builtins.size() * 2 - 1);
+        _map_builtins.reserve(_map_builtins.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         builtins[index] = _builtins[index];
-        _map_builtins.replace(builtins[index].uml, &builtins[index]);
+        _map_builtins.insert(builtins[index].uml, &builtins[index]);
     }
 
     builtins[index].uml = s;
@@ -313,17 +313,17 @@ UmlBuiltin * UmlSettings::add_type(const WrapperStr & s)
 
 UmlStereotype * UmlSettings::add_rel_attr_stereotype(const WrapperStr & s)
 {
-    unsigned n = _map_relation_attribute_stereotypes.count();
-    unsigned index;
+    int n = _map_relation_attribute_stereotypes.count();
+    int index;
 
     UmlStereotype * relation_attribute_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_relation_attribute_stereotypes.size())
-        _map_relation_attribute_stereotypes.resize(_map_relation_attribute_stereotypes.size() * 2 - 1);
+        _map_relation_attribute_stereotypes.reserve(_map_relation_attribute_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         relation_attribute_stereotypes[index] = _relation_attribute_stereotypes[index];
-        _map_relation_attribute_stereotypes.replace(relation_attribute_stereotypes[index].uml,
+        _map_relation_attribute_stereotypes.insert(relation_attribute_stereotypes[index].uml,
                 &relation_attribute_stereotypes[index]);
     }
 
@@ -349,17 +349,17 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const WrapperStr & s)
 
 UmlStereotype * UmlSettings::add_class_stereotype(const WrapperStr & s)
 {
-    unsigned n = _map_class_stereotypes.count();
-    unsigned index;
+    int n = _map_class_stereotypes.count();
+    int index;
 
     UmlStereotype * class_stereotypes = new UmlStereotype[n + 1];
 
     if (n / 2 > _map_class_stereotypes.size())
-        _map_class_stereotypes.resize(_map_class_stereotypes.size() * 2 - 1);
+        _map_class_stereotypes.reserve(_map_class_stereotypes.size() * 2 - 1);
 
     for (index = 0; index != n; index += 1) {
         class_stereotypes[index] = _class_stereotypes[index];
-        _map_class_stereotypes.replace(class_stereotypes[index].uml, &class_stereotypes[index]);
+        _map_class_stereotypes.insert(class_stereotypes[index].uml, &class_stereotypes[index]);
     }
 
     class_stereotypes[index].uml = s;
diff --git a/src/Tools/UmlSettings.h b/src/Tools/UmlSettings.h
index c641cd683..a56bee172 100644
--- a/src/Tools/UmlSettings.h
+++ b/src/Tools/UmlSettings.h
@@ -4,7 +4,6 @@
 
 #include "misc/mystr.h"
 #include "aLanguage.h"
-#include <q3dict.h>
 
 struct UmlBuiltin;
 struct UmlStereotype;
@@ -100,15 +99,15 @@ class UmlSettings
 
     static WrapperStr _relation_default_description;
 
-    static Q3Dict<UmlBuiltin> _map_builtins;
+    static QHash<QString,UmlBuiltin*> _map_builtins;
 
     static UmlBuiltin * _builtins;
 
-    static Q3Dict<UmlStereotype> _map_relation_attribute_stereotypes;
+    static QHash<QString,UmlStereotype*> _map_relation_attribute_stereotypes;
 
     static UmlStereotype * _relation_attribute_stereotypes;
 
-    static Q3Dict<UmlStereotype> _map_class_stereotypes;
+    static QHash<QString,UmlStereotype*> _map_class_stereotypes;
 
     static UmlStereotype * _class_stereotypes;
 
diff --git a/src/UMl/UMl.prj b/src/UMl/UMl.prj
new file mode 100644
index 000000000..2f8dea057
--- /dev/null
+++ b/src/UMl/UMl.prj
@@ -0,0 +1,41 @@
+format 75
+"UMl"
+  revision 1
+  modified_by 42 "zeks"
+
+
+  
+  // class settings
+  default_attribute_visibility private default_relation_visibility private default_operation_visibility public
+  //class diagram settings
+  draw_all_relations yes hide_attributes no hide_operations no hide_getset_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_context no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_relation_visibility no show_infonote no shadow yes show_stereotype_properties no
+  //use case diagram settings
+  package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes class_drawing_mode actor shadow yes show_stereotype_properties no
+  //sequence diagram settings
+  show_full_operations_definition no write_horizontally yes class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no show_class_context_mode no show_msg_context_mode no
+  //collaboration diagram settings
+  show_full_operations_definition no show_hierarchical_rank no write_horizontally yes drawing_language uml package_name_in_tab no show_context no show_msg_context no draw_all_relations yes shadow yes show_stereotype_properties no
+  //object diagram settings
+   write_horizontally yes package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes show_stereotype_properties no
+  //component diagram settings
+  package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes
+  draw_component_as_icon no show_component_req_prov no show_component_rea no show_stereotype_properties no
+  //deployment diagram settings
+  package_name_in_tab no show_context no write_horizontally yes auto_label_position yes draw_all_relations yes shadow yes
+  draw_component_as_icon no show_component_req_prov no show_component_rea no show_stereotype_properties no
+  //state diagram settings
+  package_name_in_tab no show_context no auto_label_position yes write_trans_label_horizontally yes show_trans_definition no draw_all_relations yes shadow yes
+  show_activities yes region_horizontally yes drawing_language uml show_stereotype_properties no
+  //activity diagram settings
+  package_name_in_tab no show_context no show_opaque_action_definition no auto_label_position yes write_flow_label_horizontally no draw_all_relations yes shadow yes
+  show_infonote yes drawing_language uml show_stereotype_properties no
+  
+  class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white 
+  font_size 8
+  diagram_format A4
+
+  image_root_dir ""
+
+  mark_for_import
+  
+end
diff --git a/src/UMl/cpp_includes b/src/UMl/cpp_includes
new file mode 100644
index 000000000..531b86f76
--- /dev/null
+++ b/src/UMl/cpp_includes
@@ -0,0 +1,13 @@
+// "a type" "needed cpp_includes"
+"vector" "#include <vector>
+using namespace std;"
+
+"list" "#include <list>
+using namespace std;"
+
+"map" "#include <map>
+using namespace std;"
+
+"string" "#include <string>
+using namespace std;"
+
diff --git a/src/UMl/generation_settings b/src/UMl/generation_settings
new file mode 100644
index 000000000..08e935350
--- /dev/null
+++ b/src/UMl/generation_settings
@@ -0,0 +1,312 @@
+
+  
+  cpp_h_extension "h" cpp_src_extension "cpp" java_extension "java" php_extension "php" python_extension "py" idl_extension "idl"
+  cpp_inline_dont_force_incl_in_h
+
+  type_forms 15 // uml cpp java idl cpp_in cpp_out cpp_inout cpp_return
+    "void" "void" "void" "void" "${type}" "${type} &" "${type}" "${type}"
+    "any" "void *" "Object" "any" "const ${type}" "${type}" "${type} &" "${type}"
+    "bool" "bool" "boolean" "boolean" "${type}" "${type} &" "${type} &" "${type}"
+    "char" "char" "char" "char" "${type}" "${type} &" "${type} &" "${type}"
+    "uchar" "unsigned char" "char" "octet" "${type}" "${type} &" "${type} &" "${type}"
+    "byte" "unsigned char" "byte" "octet" "${type}" "${type} &" "${type} &" "${type}"
+    "short" "short" "short" "short" "${type}" "${type} &" "${type} &" "${type}"
+    "ushort" "unsigned short" "short" "unsigned short" "${type}" "${type} &" "${type} &" "${type}"
+    "int" "int" "int" "long" "${type}" "${type} &" "${type} &" "${type}"
+    "uint" "unsigned int" "int" "unsigned long" "${type}" "${type} &" "${type} &" "${type}"
+    "long" "long" "long" "long" "${type}" "${type} &" "${type} &" "${type}"
+    "ulong" "unsigned long" "long" "unsigned long" "${type}" "${type} &" "${type} &" "${type}"
+    "float" "float" "float" "float" "${type}" "${type} &" "${type} &" "${type}"
+    "double" "double" "double" "double" "${type}" "${type} &" "${type} &" "${type}"
+    "string" "string" "String" "string" "${type}" "${type} &" "${type} &" "${type}"
+  
+  relations_stereotypes 5 // uml cpp java pythonidl
+    "sequence" "vector" "Vector" "list" "sequence"
+    "vector" "vector" "Vector" "list" "sequence"
+    "list" "list" "List" "list" "sequence"
+    "set" "set" "Set" "set" "sequence"
+    "map" "map" "Map" "dict" "sequence"
+  
+  classes_stereotypes 14 // uml cpp java php python idl
+    "class" "class" "class" "class" "class" "valuetype"
+    "interface" "class" "interface" "interface" "class" "interface"
+    "exception" "class" "class" "class" "class" "exception"
+    "enum" "enum" "enum" "enum" "enum" "enum"
+    "enum_pattern" "enum" "enum_pattern" "enum" "enum" "enum"
+    "struct" "struct" "class" "class" "class" "struct"
+    "union" "union" "class" "class" "class" "union"
+    "typedef" "typedef" "ignored" "ignored" "ignored" "typedef"
+    "boundary" "class" "class" "class" "class" "interface"
+    "control" "class" "class" "class" "class" "valuetype"
+    "entity" "class" "class" "class" "class" "valuetype"
+    "actor" "ignored" "ignored" "ignored" "ignored" "ignored"
+    "@interface" "ignored" "@interface" "ignored" "ignored" "ignored"
+    "stereotype" "ignored" "ignored" "ignored" "ignored" "ignored"
+  
+  cpp_enum_default_type_forms "${type}" "${type} &" "${type} &" "${type}" // in out inout return
+  other_cpp_types_default_type_forms "const ${type} &" "${type} &" "${type} &" "${type}" // in out inout return
+
+  cpp_default_h_content "#ifndef ${NAMESPACE}_${NAME}_H
+#define ${NAMESPACE}_${NAME}_H
+
+${comment}
+${includes}
+${declarations}
+${namespace_start}
+${definition}
+${namespace_end}
+#endif
+"
+  cpp_default_src_content "${comment}
+${includes}
+${namespace_start}
+${members}
+${namespace_end}"
+  cpp_default_class_decl "${comment}${template}class ${name}${inherit} {
+${members}};
+${inlines}
+"
+  cpp_default_external_class_decl "${name}
+#include <${name}.h>
+"
+  cpp_default_struct_decl "${comment}${template}struct ${name}${inherit} {
+${members}};
+${inlines}
+"
+  cpp_default_union_decl "${comment}${template}union ${name} {
+${members}};
+${inlines}
+"
+  cpp_default_enum_decl "${comment}enum ${name} {
+${items}
+};
+"
+  cpp_default_typedef_decl "${comment}typedef ${type} ${name};
+"
+  cpp_default_attribute_declaration "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+" // multiplicity 1
+  "    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value};
+" // multiplicity * a..b
+  "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};
+" // multiplicity [..]
+  cpp_default_enum_item_declaration "  ${name}${value},${comment}"
+  cpp_association_aggregation_declaration
+    "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};
+" // multiplicity 1
+    "    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type} *> ${name}${value};
+" // multiplicity * a..b
+    "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${multiplicity}${value};
+" // multiplicity [..]
+  cpp_aggregation_by_value_declaration
+    "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};
+" // multiplicity 1
+    "    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value};
+" // multiplicity * a..b
+    "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};
+" // multiplicity [..]
+  cpp_get "get_${name}" inline const value_const public
+  cpp_set "set_${name}" public
+  cpp_default_operation_declaration "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};
+"
+  cpp_default_operation_definition "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{
+  ${body}}
+"
+  cpp_indent_visibility "  "java_default_src_content "${comment}
+${package}
+${imports}
+${definition}"
+  java_default_class_decl "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+  java_default_external_class_decl "${name}"
+  java_default_interface_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+  java5_default_enum_decl "${comment}${@}${visibility}${final}${abstract}enum ${name}${implements} {
+${items};
+${members}}
+"
+  java_default_enum_decl "${comment}${@}${visibility}final class ${name} {
+${members}
+      private final int value;
+
+      public int value() {
+        return value;
+      }
+
+      public static ${name} fromInt(int value) {
+        switch (value) {
+    ${cases}    default: throw new Error();
+        }
+
+      }
+      private ${name}(int v) { value = v; };
+}
+"
+  java_default_attribute_declaration "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+" // multiplicity 1
+  "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};
+" // multiplicity * a..b
+  "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};
+" // multiplicity N
+  java5_default_enum_item_declaration "  ${@}${name}${value},${comment}"
+  java_default_enum_item_declaration "  ${comment}${@}public static final int _${name}${value};
+    public static final ${class} ${name} = new ${class}(_${name});
+"
+  java_default_enum_case "    case _${name}: return ${name};
+"
+  java_association_aggregation_declaration
+    "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+" // multiplicity 1
+    "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};
+" // multiplicity * a..b
+    "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};
+" // multiplicity N
+  java_get "get${Name}" final public
+  java_set "set${Name}" public
+  java_default_operation_definition "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{
+  ${body}}
+"
+  php_default_src_content "<?php
+${comment}
+${namespace}
+${require_once}
+${definition}
+?>
+"
+  php_default_class_decl "${comment}${final}${abstract}class ${name}${extends}${implements} {
+${members}}
+"
+  php_default_enum_decl "${comment}${visibility}final class ${name} {
+${items}}
+"
+  php_default_external_class_decl "${name}"
+  php_default_interface_decl "${comment}interface ${name} {
+${members}}
+"
+  php_default_attribute_declaration "  ${comment}${visibility}${const}${static}${var}${name}${value};
+"
+  php_default_enum_item_decl "  const ${name}${value};${comment}
+"
+  php_default_relation_declaration"  ${comment}${visibility}${const}${static}${var}${name}${value};
+"
+  php_get "get${Name}" final
+  php_set "set${Name}"
+  php_default_operation_definition "  ${comment}${final}${visibility}${abstract}${static}function ${name}${(}${)}
+{
+  ${body}}
+"
+  python_2_2
+  python_indent_step "    "
+  python_default_src_content "${comment}
+${import}
+${definition}"
+  python_default_class_decl "class ${name}${inherit}:
+${docstring}${members}
+"
+  python_default_enum_decl "class ${name}:
+${docstring}${members}
+"
+  python_default_external_class_decl "${name}"
+  python_default_attribute_declaration "${comment}${self}${name} = ${value}
+" // multiplicity 1
+  "${comment}${self}${name} = ${stereotype}()
+" // multiplicity != 1
+  python_default_enum_item_decl "${comment}${self}${name} = ${value}
+"
+  python_default_relation_declaration"${comment}${self}${name} = ${value}
+" // multiplicity 1
+  "${comment}${self}${name} = ${stereotype}()
+" // multiplicity != 1
+  python_default_composition_declaration"${comment}${self}${name} = ${type}()
+" // multiplicity 1
+  "${comment}${self}${name} = ${stereotype}()
+" // multiplicity != 1
+  python_default_operation_definition "${@}${static}${abstract}def ${name}${(}${)}:
+${docstring}${body}
+"
+  python_default_initoperation_definition "${@}${static}${abstract}def ${name}${(}${p0}${v0}${)}:
+${docstring}super(${class}, ${p0}).__init__()
+${body}
+"
+  python_get "get${Name}"
+  python_set "set${Name}"
+  idl_default_src_content "#ifndef ${MODULE}_${NAME}_H
+#define ${MODULE}_${NAME}_H
+
+${comment}
+${includes}
+${module_start}
+${definition}
+${module_end}
+#endif
+"
+  idl_default_interface_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+  idl_default_valuetype_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} {
+${members}};
+"
+  idl_default_struct_decl "${comment}struct ${name} {
+${members}};
+"
+  idl_default_typedef_decl "${comment}typedef ${type} ${name};
+"
+  idl_default_exception_decl "${comment}exception ${name} {
+${members}};
+"
+  idl_default_union_decl "${comment}union ${name} switch(${switch}) {
+${members}};
+"
+  idl_default_enum_decl "${comment}enum ${name} {
+${items}};
+"
+  idl_default_external_class_decl "${name}
+#include \"${name}.idl\"
+"
+  idl_default_attribute_declaration "  ${comment}${readonly}${attribute}${type} ${name};
+" // multiplicity 1
+  "  ${comment}${readonly}${attribute}${stereotype}<${type}> ${name};
+" // multiplicity * a..b
+  "  ${comment}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};
+" // multiplicity N
+  idl_default_valuetype_attribute_declaration "  ${comment}${visibility}${type} ${name};
+" // multiplicity 1
+  "  ${comment}${visibility}${stereotype}<${type}> ${name};
+" // multiplicity * a..b
+  "  ${comment}${visibility}${stereotype}<${type},${multiplicity}> ${name};
+" // multiplicity N
+  idl_default_const_declaration "  ${comment}const ${type} ${name}${value};
+" // multiplicity 1
+  "  ${comment}const ${stereotype}<${type}> ${name}${value};
+" // multiplicity * a..b
+  "  ${comment}const ${stereotype}<${type},${multiplicity}> ${name}${value};
+" // multiplicity N
+  idl_default_enum_item_declaration "  ${name},${comment}"
+  idl_default_union_item_declaration "  ${comment}case ${case} : ${readonly}${type} ${name};" // multiplicity 1
+  "  ${comment}case ${case} : ${readonly}${stereotype}<${type}> ${name};" // multiplicity * a..b
+  "  ${comment}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};" // multiplicity N
+  idl_association_aggregation_declaration
+    "  ${comment}${readonly}${attribute}${type} ${name};
+" // multiplicity 1
+    "  ${comment}${readonly}${attribute}${stereotype}<${type}> ${name};
+" // multiplicity * a..b
+    "  ${comment}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};
+" // multiplicity N
+  idl_valuetype_association_aggregation_declaration
+    "  ${comment}${visibility}${type} ${name};
+" // multiplicity 1
+    "  ${comment}${visibility}${stereotype}<${type}> ${name};
+" // multiplicity * a..b
+    "  ${comment}${visibility}${stereotype}<${type},${multiplicity}> ${name};
+" // multiplicity N
+  idl_union_association_aggregation_declaration
+    "  ${comment}case ${case} : ${readonly}${type} ${name};" // multiplicity 1
+    "  ${comment}case ${case} : ${readonly}${stereotype}<${type}> ${name};" // multiplicity * a..b
+    "  ${comment}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};" // multiplicity N
+  idl_get "get_${name}"
+  idl_set "set_${name}"  twoways
+  idl_default_operation_declaration "  ${comment}${oneway}${type} ${name}${(}${)}${raisesnl}${raises};
+"
+  uml_get_name uml uml_set_name uml
+end
diff --git a/src/UMl/idl_includes b/src/UMl/idl_includes
new file mode 100644
index 000000000..fceab64b9
--- /dev/null
+++ b/src/UMl/idl_includes
@@ -0,0 +1 @@
+// "a type" "needed idl_includes"
diff --git a/src/UMl/java_imports b/src/UMl/java_imports
new file mode 100644
index 000000000..bbd370acb
--- /dev/null
+++ b/src/UMl/java_imports
@@ -0,0 +1 @@
+// "a type" "needed java_imports"
diff --git a/src/UMl/python_imports b/src/UMl/python_imports
new file mode 100644
index 000000000..4a1bd3a85
--- /dev/null
+++ b/src/UMl/python_imports
@@ -0,0 +1 @@
+// "a type" "needed python_imports"
diff --git a/src/UMl/stereotypes b/src/UMl/stereotypes
new file mode 100644
index 000000000..3680bcebf
--- /dev/null
+++ b/src/UMl/stereotypes
@@ -0,0 +1,59 @@
+
+  package_stereotypes  6 "facade" "framework" "model library" "stub" "toplevel" "profile"
+    -_-> 3 "access" "import" "from"
+  end
+  
+  class_stereotypes  19 "actor" "auxiliary" "boundary" "control" "entity" "enum" "enum_pattern" "exception" "focus" "implementationClass" "interface" "@interface" "metaclass" "stereotype" "struct" "type" "typedef" "union" "utility"
+    ---- 4 "list" "set" "vector" "map"
+    ---> 4 "list" "set" "vector" "map"
+    ---|> 4 "{complete,disjoint}" "{incomplete,disjoint}" "{complete,overlapping}" "{incomplete,overlapping}"
+    o--- 4 "list" "set" "vector" "map"
+    *--- 4 "list" "set" "vector" "map"
+    o--> 4 "list" "set" "vector" "map"
+    *--> 4 "list" "set" "vector" "map"
+    -_-> 4 "friend" "from" "import" "instantiate"
+    -_-|> 1 "bind"
+  end
+  
+  use_case_stereotypes 1 "realization"
+  
+    ---|> 4 "{complete,disjoint}" "{incomplete,disjoint}" "{complete,overlapping}" "{incomplete,overlapping}"
+    -_-> 2 "include" "extend"
+  end
+  
+  artifact_stereotypes  7 "document" "file" "script" "source" "text" "library" "executable"
+    -_-> 4 "deploy" "manifest" "import" "from"
+  end
+  
+  attribute_stereotypes  4 "list" "set" "vector" "map"
+  operation_stereotypes  0
+  state_stereotypes  3 "machine" "submachine" "top"
+  activity_stereotypes  0
+  flow_stereotypes  3 "interrupt" "multicast" "multireceive"
+  interruptibleactivityregion_stereotypes  0
+  pseudostate_stereotypes  0
+  stateaction_stereotypes  2 "send-signal" "receive-signal"
+  parameter_stereotypes  0
+  parameterset_stereotypes  0
+  activitynode_stereotypes  0
+  activityaction_stereotypes  0
+  activityobject_stereotypes  2 "datastore" "centralBuffer"
+  expansionregion_stereotypes  0
+  activitypartition_stereotypes  0
+  pin_stereotypes  0
+  component_stereotypes  6 "buildComponent" "entity" "implement" "process" "service" "subsystem"
+  deploymentnode_stereotypes  3 "cpu" "device" "executionEnvironment"
+  classview_stereotypes  0
+  usecaseview_stereotypes  0
+  componentview_stereotypes  0
+  deploymentview_stereotypes  0
+  classdiagram_stereotypes  0
+  seqdiagram_stereotypes  0
+  msg_stereotypes  0
+  coldiagram_stereotypes  0
+  usecasediagram_stereotypes  0
+  statediagram_stereotypes  0
+  activitydiagram_stereotypes  0
+  componentdiagram_stereotypes  0
+  deploymentdiagram_stereotypes  0
+end
diff --git a/src/UMl/tools b/src/UMl/tools
new file mode 100644
index 000000000..3579028be
--- /dev/null
+++ b/src/UMl/tools
@@ -0,0 +1,18 @@
+// 'tool' "the executable" "displayed string" {target}+
+tool "HTML documentation" "ghtml" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue ExtraMember ClassInstance State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (flat)" "ghtml -flat" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue ExtraMember ClassInstance State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (svg)" "ghtml -svg" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue ExtraMember ClassInstance State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "HTML doc. (flat, svg)" "ghtml -flat -svg" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue ExtraMember ClassInstance State Region StateAction Initial EntryPoint Final Terminate ExitPoint DeepHistory ShallowHistory Junction Choice Fork Join Transition Activity InterruptibleActivityRegion ExpansionRegion ActivityObject ActivityAction Parameter ParameterSet Pin ExpansionNode InitialActivityNode FinalActivityNode ExitPointActivityNode DecisionActivityNode MergeActivityNode ForkActivityNode JoinActivityNode Flow Project Package UseCaseView ClassView ComponentView DeploymentView UseCaseDiagram SeqDiagram ColDiagram ClassDiagram ObjectDiagram StateDiagram ActivityDiagram ComponentDiagram DeploymentDiagram UseCase Component Node Artifact Inherit DependOn
+tool "Generate .pro" "gpro" Artifact
+tool "Import Rose" "irose" Project Package
+tool "C++ utilities" "cpp_util" Class
+tool "Generate XMI 1.2" "gxmi" Project
+tool "Generate XMI 2.1" "gxmi2" Project
+tool "Import XMI 2.1" "ixmi2" Project Package
+tool "C++ state machine" "stmgen" State
+tool "Use case wizard" "usecasewizard" UseCase
+tool "Check-in" "file_control ci" Project Package
+tool "Check-out" "file_control co" Project Package
+tool "Deploy classes" "deplcl" ClassView
+tool "Global Change" "global_change" Class Project Package ClassView DeploymentView
+tool "Uml projection" "uml_proj" Class Operation Attribute Generalisation Realize Dependency Association DirectionalAssociation Aggregation AggregationByValue DirectionalAggregation DirectionalAggregationByValue Project Package ClassView
diff --git a/src/browser/BrowserActivity.cpp b/src/browser/BrowserActivity.cpp
index 8b35014b3..4aec36b13 100644
--- a/src/browser/BrowserActivity.cpp
+++ b/src/browser/BrowserActivity.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 #include <QDragMoveEvent>
 #include <QDropEvent>
@@ -68,7 +68,7 @@
 IdDict<BrowserActivity> BrowserActivity::all(__FILE__);
 QStringList BrowserActivity::its_default_stereotypes;	// unicode
 
-BrowserActivity::BrowserActivity(QString s, BrowserNode * p, int id)
+BrowserActivity::BrowserActivity(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserActivity>(all, id),
       def(new ActivityData), associated_diagram(0)
 {
@@ -90,7 +90,7 @@ BrowserActivity::BrowserActivity(const BrowserActivity * model, BrowserNode * p)
     comment = model->comment;
 }
 
-BrowserNode * BrowserActivity::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserActivity::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserActivity(this, p);
 
@@ -110,13 +110,15 @@ void BrowserActivity::clear(bool old)
 {
     all.clear(old);
     BrowserActivityNode::clear(old);
-    BrowserParameter::clear(old);
     BrowserActivityAction::clear(old);
+
+    BrowserParameter::clear(old);
     BrowserInterruptibleActivityRegion::clear(old);
     BrowserExpansionRegion::clear(old);
     BrowserActivityObject::clear(old);
     BrowserActivityPartition::clear(old);
     BrowserFlow::clear(old);
+
 }
 
 void BrowserActivity::update_idmax_for_root()
@@ -136,13 +138,13 @@ void BrowserActivity::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserActivity::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserActivity::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -153,17 +155,17 @@ void BrowserActivity::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
 }
 
 // callers suppose this only take specification into acount
-void BrowserActivity::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserOperation * op)
+void BrowserActivity::compute_referenced_by(QList<BrowserNode *> & l,
+                                            BrowserOperation * op)
 {
     IdIterator<BrowserActivity> it(all);
+    while(it.hasNext()){
+        it.next();
+        if (it.value())
+            if (!it.value()->deletedp() &&
+                    (it.value()->def->get_specification() == op))
+                l.append(it.value());
 
-    while (it.current()) {
-        if (!it.current()->deletedp() &&
-            (it.current()->def->get_specification() == op))
-            l.append(it.current());
-
-        ++it;
     }
 }
 
@@ -187,15 +189,15 @@ BrowserActivity * BrowserActivity::add_activity(BrowserNode * future_parent)
 {
     QString name;
 
-    return (!future_parent->enter_child_name(name, TR("enter activity's name : "),
-            UmlActivity, TRUE, FALSE))
+    return (!future_parent->enter_child_name(name, QObject::tr("enter activity's name : "),
+                                             UmlActivity, TRUE, FALSE))
 
-           ? 0
-           : add_activity(future_parent, name);
+            ? 0
+            : add_activity(future_parent, name);
 }
 
 BrowserActivity * BrowserActivity::add_activity(BrowserNode * future_parent,
-        const char * name)
+                                                QString name)
 {
     BrowserActivity * r = new BrowserActivity(name, future_parent);
 
@@ -208,17 +210,17 @@ BrowserActivity * BrowserActivity::add_activity(BrowserNode * future_parent,
 BrowserActivity * BrowserActivity::get_activity(BrowserNode * parent)
 {
     BrowserNodeList l;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = parent->firstChild(); child != 0; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlActivity))
+                (((BrowserNode *) child)->get_type() == UmlActivity))
             l.append((BrowserNode *) child);
 
     BrowserNode * old;
     QString name;
 
-    if (!parent->enter_child_name(name, TR("enter activity's name : "),
+    if (!parent->enter_child_name(name, QObject::tr("enter activity's name : "),
                                   UmlActivity, l, &old,
                                   TRUE, FALSE))
         return 0;
@@ -237,11 +239,10 @@ BrowserActivity * BrowserActivity::get_activity(BrowserNode * parent)
 BrowserNode * BrowserActivity::add_parameter(BrowserParameter * param)
 {
     QString name;
-
-    if (enter_child_name(name, TR("enter parameter's name : "),
+    if (enter_child_name(name, QObject::tr("enter parameter's name : "),
                          UmlParameter, TRUE, FALSE)) {
         param = (param == 0) ? new BrowserParameter(name, this)
-                : (BrowserParameter *) param->duplicate(this, name);
+                             : (BrowserParameter *) param->duplicate(this, name);
 
         setOpen(TRUE);
         def->modified();
@@ -250,14 +251,13 @@ BrowserNode * BrowserActivity::add_parameter(BrowserParameter * param)
 
         return param;
     }
-
     return 0;
 }
 
 void BrowserActivity::menu()
 {
     MenuFactory builder(name);
-    Q3PopupMenu toolm(0);
+    QMenu toolm(0);
 
     builder.createTitle(def->definition(FALSE, TRUE));
     builder.insertSeparator();
@@ -306,61 +306,63 @@ void BrowserActivity::menu()
         }
 
         builder.addItem(
-            "Edit",
-            5,
-            "to edit the <i>artivity</i>, \
-a double click with the left mouse button does the same thing");
-
-        if (!is_read_only) {
-            builder.addItem(
-                "Duplicate",
-                6,
-                "to copy the <i>activity</i> in a new one");
-            builder.insertSeparator();
-
-            if (edition_number == 0) {
+                    "Edit",
+                    5,
+                    "to edit the <i>artivity</i>, \
+                    a double click with the left mouse button does the same thing");
+
+                    if (!is_read_only) {
+                        builder.addItem(
+                        "Duplicate",
+                        6,
+                        "to copy the <i>activity</i> in a new one");
+                        builder.insertSeparator();
+
+                        if (edition_number == 0) {
+                            builder.addItem(
+                            "Delete",
+                            9,
+                            "to delete the <i>activity</i>. \
+                            Note that you can undelete it after");
+                        }
+                    }
+
+                    builder.insertSeparator();
                 builder.addItem(
-                    "Delete",
-                    9,
-                    "to delete the <i>activity</i>. \
-Note that you can undelete it after");
-            }
-        }
-
-        builder.insertSeparator();
-        builder.addItem(
-            "Referenced by",
-            12,
-            "to know who reference the <i>activity</i>");
-        mark_menu(builder.menu(), TR("the activity"), 90);
+                    "Referenced by",
+                    12,
+                    "to know who reference the <i>activity</i>");
+        mark_menu(builder.menu(), QObject::tr("the activity"), 90);
         ProfiledStereotypes::menu(builder.menu(), this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
+                Tool::menu_insert(&toolm, get_type(), 100)) {
             builder.insertSeparator();
             builder.addItem("Tools", &toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
         builder.addItem(
-            "Undelete",
-            10,
-            "to undelete the <i>activity</i>");
+                    "Undelete",
+                    10,
+                    "to undelete the <i>activity</i>");
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
                 builder.addItem(
-                    "Undelete recursively",
-                    11,
-                    "undelete the activity and its children");
+                            "Undelete recursively",
+                            11,
+                            "undelete the activity and its children");
                 break;
             }
         }
     }
 
-    exec_menu_choice(builder.menu().exec(QCursor::pos()));
+    QAction * retAction = builder.menu().exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserActivity::exec_menu_choice(int rank)
@@ -368,14 +370,14 @@ void BrowserActivity::exec_menu_choice(int rank)
     switch (rank) {
     case 0: {
         BrowserActivityDiagram * d =
-            BrowserActivityDiagram::add_activity_diagram(this);
+                BrowserActivityDiagram::add_activity_diagram(this);
 
         if (d == 0)
             return;
 
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 1:
         add_parameter(0);
@@ -400,31 +402,31 @@ void BrowserActivity::exec_menu_choice(int rank)
     case 6: {
         QString name;
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter activity's name : "),
-                UmlActivity, TRUE, FALSE))
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter activity's name : "),
+                                                         UmlActivity, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
     }
-    break;
+        break;
 
     case 7: {
         BrowserActivityAction * r =
-            BrowserActivityAction::add_activityaction(this, 0);
+                BrowserActivityAction::add_activityaction(this, 0);
 
         if (r != 0)
             r->select_in_browser();
     }
 
-    return;
+        return;
 
     case 8: {
         BrowserActivityObject * r =
-            BrowserActivityObject::add_activityobject(this, 0);
+                BrowserActivityObject::add_activityobject(this, 0);
 
         if (r != 0)
             r->select_in_browser();
     }
 
-    return;
+        return;
 
     case 9:
         delete_it();
@@ -452,12 +454,11 @@ void BrowserActivity::exec_menu_choice(int rank)
 
         return;
     }
-
     ((BrowserNode *) parent())->modified();
     package_modified();
 }
 
-void BrowserActivity::apply_shortcut(QString s)
+void BrowserActivity::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -503,7 +504,7 @@ void BrowserActivity::apply_shortcut(QString s)
         if (s == "Undelete")
             choice = 10;
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -521,8 +522,8 @@ void BrowserActivity::apply_shortcut(QString s)
 void BrowserActivity::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited)
         def->edit();
@@ -543,7 +544,7 @@ UmlCode BrowserActivity::get_type() const
 
 QString BrowserActivity::get_stype() const
 {
-    return TR("activity");
+    return QObject::tr("activity");
 }
 
 int BrowserActivity::get_identifier() const
@@ -570,14 +571,14 @@ BrowserNodeList & BrowserActivity::instances(BrowserNodeList & result, bool sort
 {
     IdIterator<BrowserActivity> it(all);
     BrowserActivity * a;
-
-    while ((a = it.current()) != 0) {
-        if (!a->deletedp())
-            result.append(a);
-
-        ++it;
+    while (it.hasNext()) {
+        it.next();
+        if(it.value() != NULL){
+            a = it.value();
+            if (!a->deletedp())
+                result.append(a);
+        }
     }
-
     if (sort)
         result.sort_it();
 
@@ -590,7 +591,7 @@ BrowserNode * BrowserActivity::get_associated() const
 }
 
 void BrowserActivity::set_associated_diagram(BrowserActivityDiagram * dg,
-        bool on_read)
+                                             bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -615,7 +616,6 @@ void BrowserActivity::on_delete()
 void BrowserActivity::init()
 {
     its_default_stereotypes.clear();
-
     BrowserParameter::init();
     BrowserActivityAction::init();
     BrowserActivityObject::init();
@@ -624,6 +624,7 @@ void BrowserActivity::init()
     BrowserExpansionRegion::init();
     BrowserActivityPartition::init();
     BrowserFlow::init();
+
 }
 
 // unicode
@@ -637,14 +638,14 @@ bool BrowserActivity::api_compatible(unsigned v) const
     return (v > 24);
 }
 
-Q3ValueList<BrowserParameter *> BrowserActivity::get_params() const
+QList<BrowserParameter *> BrowserActivity::get_params() const
 {
-    Q3ValueList<BrowserParameter *> l;
-    Q3ListViewItem * child = firstChild();
+    QList<BrowserParameter *> l;
+    BrowserNode * child = firstChild();
 
     while (child != 0) {
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlParameter))
+                (((BrowserNode *) child)->get_type() == UmlParameter))
             l.append((BrowserParameter *) child);
 
         child = child->nextSibling();
@@ -711,7 +712,7 @@ bool BrowserActivity::tool_cmd(ToolCom * com, const char * args)
                         ok = FALSE;
                 }
             }
-            break;
+                break;
 
             default:
                 if (IsaActivityNode(k))
@@ -749,13 +750,13 @@ bool BrowserActivity::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-bool BrowserActivity::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserActivity::may_contains_them(const QList<BrowserNode *> & l,
                                         BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    Q_UNUSED(duplicable);
+    
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlInterruptibleActivityRegion:
         case UmlExpansionRegion:
         case UmlParameter:
@@ -771,16 +772,11 @@ bool BrowserActivity::may_contains_them(const Q3PtrList<BrowserNode> & l,
         case ForkAN:
         case JoinAN:
         case UmlDependOn:
-            return (((const BrowserNode *) it.current()->get_container(UmlActivity)) == this);
+            return (((const BrowserNode *) node->get_container(UmlActivity)) == this);
 
         default:
             return FALSE;
         }
-
-        if (! may_contains(it.current(), FALSE))
-            return FALSE;
-
-        duplicable = may_contains_it(it.current());
     }
 
     return TRUE;
@@ -797,21 +793,21 @@ QString BrowserActivity::may_connect(const BrowserNode * dest) const
         return 0;
 
     default:
-        return TR("illegal");
+        return QObject::tr("illegal");
     }
 }
 
 void BrowserActivity::DragMoveEvent(QDragMoveEvent * e)
 {
     if (UmlDrag::canDecode(e, BrowserParameter::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserActivityNode::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserActivityAction::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserActivityObject::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserInterruptibleActivityRegion::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserExpansionRegion::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserActivityPartition::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserActivityDiagram::drag_key(this))) {
+            UmlDrag::canDecode(e, BrowserActivityNode::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserActivityAction::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserActivityObject::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserInterruptibleActivityRegion::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserExpansionRegion::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserActivityPartition::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserActivityDiagram::drag_key(this))) {
         if (!is_read_only)
             e->accept();
         else
@@ -829,15 +825,15 @@ void BrowserActivity::DropEvent(QDropEvent * e)
 void BrowserActivity::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        (UmlDrag::canDecode(e, BrowserParameter::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserActivityNode::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserActivityAction::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserActivityObject::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserInterruptibleActivityRegion::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserExpansionRegion::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserActivityPartition::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserActivityDiagram::drag_key(this))))
+            (UmlDrag::canDecode(e, BrowserParameter::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserActivityNode::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserActivityAction::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserActivityObject::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserInterruptibleActivityRegion::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserExpansionRegion::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserActivityPartition::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserActivityDiagram::drag_key(this))))
         e->accept();
     else
         e->ignore();
@@ -846,7 +842,6 @@ void BrowserActivity::DragMoveInsideEvent(QDragMoveEvent * e)
 void BrowserActivity::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, BrowserParameter::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserActivityNode::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserActivityAction::drag_key(this))) != 0) ||
@@ -856,11 +851,11 @@ void BrowserActivity::DropAfterEvent(QDropEvent * e, BrowserNode * after)
          ((bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserActivityPartition::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserActivityDiagram::drag_key(this))) != 0)) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE))
             move(bn, after);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -908,7 +903,7 @@ void BrowserActivity::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -945,8 +940,8 @@ BrowserActivity * BrowserActivity::read_ref(char *& st)
     BrowserActivity * result = all[id];
 
     return (result == 0)
-           ? new BrowserActivity(id)
-           : result;
+            ? new BrowserActivity(id)
+            : result;
 }
 
 BrowserActivity * BrowserActivity::read(char *& st, char * k,
@@ -960,8 +955,8 @@ BrowserActivity * BrowserActivity::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserActivity(id)
-               : result;
+                ? new BrowserActivity(id)
+                : result;
     }
     else if (!strcmp(k, "activity")) {
         id = read_id(st);
@@ -995,7 +990,7 @@ BrowserActivity * BrowserActivity::read(char *& st, char * k,
         result->BrowserNode::read(st, k, id);
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         if (strcmp(k, "end")) {
             while (BrowserParameter::read(st, k, result) ||
@@ -1008,7 +1003,6 @@ BrowserActivity * BrowserActivity::read(char *& st, char * k,
                    BrowserActivityDiagram::read(st, k, result) ||
                    BrowserSimpleRelation::read(st, k, result))
                 k = read_keyword(st);
-
             if (strcmp(k, "end"))
                 wrong_keyword(k, "end");
         }
@@ -1022,17 +1016,15 @@ BrowserActivity * BrowserActivity::read(char *& st, char * k,
 BrowserNode * BrowserActivity::read_any_ref(char *& st, char * k)
 {
     BrowserNode * r;
-
     if (((r = BrowserActivity::read(st, k, 0)) == 0) &&
-        ((r = BrowserParameter::read(st, k, 0)) == 0) &&
-        ((r = BrowserActivityNode::read(st, k, 0)) == 0) &&
-        ((r = BrowserActivityAction::read(st, k, 0)) == 0) &&
-        ((r = BrowserActivityObject::read(st, k, 0)) == 0) &&
-        ((r = BrowserInterruptibleActivityRegion::read(st, k, 0)) == 0) &&
-        ((r = BrowserExpansionRegion::read(st, k, 0)) == 0) &&
-        ((r = BrowserFlow::read(st, k, 0)) == 0))
+            ((r = BrowserParameter::read(st, k, 0)) == 0) &&
+            ((r = BrowserActivityNode::read(st, k, 0)) == 0) &&
+            ((r = BrowserActivityAction::read(st, k, 0)) == 0) &&
+            ((r = BrowserActivityObject::read(st, k, 0)) == 0) &&
+            ((r = BrowserInterruptibleActivityRegion::read(st, k, 0)) == 0) &&
+            ((r = BrowserExpansionRegion::read(st, k, 0)) == 0) &&
+            ((r = BrowserFlow::read(st, k, 0)) == 0))
         r = BrowserActivityPartition::read(st, k, 0);
-
     return r;
 }
 
@@ -1042,18 +1034,16 @@ BrowserNode * BrowserActivity::get_it(const char * k, int id)
         return all[id];
 
     BrowserNode * r;
-
     if (((r = BrowserParameter::get_it(k, id)) == 0) &&
-        ((r = BrowserActivityNode::get_it(k, id)) == 0) &&
-        ((r = BrowserActivityAction::get_it(k, id)) == 0) &&
-        ((r = BrowserActivityObject::get_it(k, id)) == 0) &&
-        ((r = BrowserInterruptibleActivityRegion::get_it(k, id)) == 0) &&
-        ((r = BrowserExpansionRegion::get_it(k, id)) == 0) &&
-        ((r = BrowserFlow::get_it(k, id)) == 0) &&
-        ((r = BrowserSimpleRelation::get_it(k, id)) == 0) &&
-        ((r = BrowserActivityPartition::get_it(k, id)) == 0)
-       )
+            ((r = BrowserActivityNode::get_it(k, id)) == 0) &&
+            ((r = BrowserActivityAction::get_it(k, id)) == 0) &&
+            ((r = BrowserActivityObject::get_it(k, id)) == 0) &&
+            ((r = BrowserInterruptibleActivityRegion::get_it(k, id)) == 0) &&
+            ((r = BrowserExpansionRegion::get_it(k, id)) == 0) &&
+            ((r = BrowserFlow::get_it(k, id)) == 0) &&
+            ((r = BrowserSimpleRelation::get_it(k, id)) == 0) &&
+            ((r = BrowserActivityPartition::get_it(k, id)) == 0)
+            )
         r = BrowserActivityDiagram::get_it(k, id);
-
     return r;
 }
diff --git a/src/browser/BrowserActivity.h b/src/browser/BrowserActivity.h
index 9db970f22..d02539cfb 100644
--- a/src/browser/BrowserActivity.h
+++ b/src/browser/BrowserActivity.h
@@ -34,7 +34,7 @@
 #include <QPixmap>
 #include <QDropEvent>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QDragMoveEvent>
 
 class QPixmap;
@@ -60,19 +60,19 @@ class BrowserActivity : public BrowserNode, public Labeled<BrowserActivity>
     void exec_menu_choice(int rank);
 
 public:
-    BrowserActivity(QString s, BrowserNode * p, int id = 0);
+    BrowserActivity(const QString & s, BrowserNode * p, int id = 0);
     BrowserActivity(const BrowserActivity * model, BrowserNode * p);
     virtual ~BrowserActivity();
 
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> & l,
+    virtual bool may_contains_them(const QList<BrowserNode *> & l,
                                    BooL & duplicable) const;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserNodeList & instances(BrowserNodeList &, bool sort);
     static BrowserActivity * add_activity(BrowserNode * future_parent);
-    static BrowserActivity * add_activity(BrowserNode * future_parent, const char * name);
+    static BrowserActivity * add_activity(BrowserNode * future_parent, QString name);
     static BrowserActivity * get_activity(BrowserNode * parent);
-    Q3ValueList<BrowserParameter *> get_params() const;
+    QList<BrowserParameter *> get_params() const;
     void add_activity_diagram();
     BrowserNode * add_parameter(BrowserParameter * p);
     QString may_connect(const BrowserNode * dest) const;
@@ -80,7 +80,7 @@ class BrowserActivity : public BrowserNode, public Labeled<BrowserActivity>
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -108,8 +108,8 @@ class BrowserActivity : public BrowserNode, public Labeled<BrowserActivity>
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserOperation *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserOperation *);
 
     static void init();
     static const QStringList & default_stereotypes();
diff --git a/src/browser/BrowserActivityAction.cpp b/src/browser/BrowserActivityAction.cpp
index 4067f9075..852c6d646 100644
--- a/src/browser/BrowserActivityAction.cpp
+++ b/src/browser/BrowserActivityAction.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+////#include <q3popupmenu.h>
+//#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+//#include <QList>
 #include <QPixmap>
 #include <QDragMoveEvent>
 #include <QDropEvent>
@@ -67,7 +67,7 @@
 IdDict<BrowserActivityAction> BrowserActivityAction::all(257, __FILE__);
 QStringList BrowserActivityAction::its_default_stereotypes;	// unicode
 
-BrowserActivityAction::BrowserActivityAction(QString s, BrowserNode * p, int id)
+BrowserActivityAction::BrowserActivityAction(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserActivityAction>(all, id),
       def(new ActivityActionData), associated_diagram(0)
 {
@@ -89,15 +89,15 @@ BrowserActivityAction::BrowserActivityAction(const BrowserActivityAction * model
     comment = model->comment;
 }
 
-BrowserActivityAction::BrowserActivityAction(QString s, BrowserNode * p,
-        UmlActionKind k)
+BrowserActivityAction::BrowserActivityAction(const QString & s, BrowserNode * p,
+                                             UmlActionKind k)
     : BrowserNode(s, p), Labeled<BrowserActivityAction>(all, 0),
       def(new ActivityActionData(k)), associated_diagram(0)
 {
     def->set_browser_node(this);
 }
 
-BrowserNode * BrowserActivityAction::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserActivityAction::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserActivityAction(this, p);
 
@@ -131,37 +131,35 @@ void BrowserActivityAction::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserActivityAction::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserActivityAction::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserFlow::compute_referenced_by(l, this);
-
     if (! ondelete)
         BrowserActivityDiagram::compute_referenced_by(l, this, "activityactioncanvas", "activityaction_ref");
 }
 
-void BrowserActivityAction::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * target)
+void BrowserActivityAction::compute_referenced_by(QList<BrowserNode *> & l,
+                                                  BrowserNode * target)
 {
     IdIterator<BrowserActivityAction> it(all);
-
-    while (it.current()) {
-        if (!it.current()->deletedp()) {
-            const char * what;
-            BrowserNode * who =
-                it.current()->def->get_action()->referenced(what);
-
-            if (who == target)
-                l.append(it.current());
-        }
-
-        ++it;
+    while(it.hasNext()){
+        it.next();
+        if (it.value())
+            if (!it.value()->deletedp()) {
+                const char * what;
+                BrowserNode * who =
+                        it.value()->def->get_action()->referenced(what);
+
+                if (who == target)
+                    l.append(it.value());
+            }
     }
 }
 
@@ -220,16 +218,15 @@ const QPixmap * BrowserActivityAction::pixmap(int) const
 
 BrowserNode *
 BrowserActivityAction::add_parameter_set(BrowserParameterSet * paramset,
-        const char * name)
+                                         const char * name)
 {
     paramset = (paramset == 0) ? BrowserParameterSet::new_one(name, this)
-               : (BrowserParameterSet *) paramset->duplicate(this, name);
+                               : (BrowserParameterSet *) paramset->duplicate(this, name);
 
     setOpen(TRUE);
     def->modified();
     package_modified();
     paramset->select_in_browser();
-
     return paramset;
 }
 
@@ -260,17 +257,17 @@ QString BrowserActivityAction::may_connect(UmlCode & l, const BrowserNode * dest
         BrowserNode * container = dest->get_container(UmlActivity);
 
         if (container == 0)
-            return TR("illegal");
+            return QObject::tr("illegal");
 
         if (get_container(UmlActivity) != container)
-            return TR("not in the same activity");
+            return QObject::tr("not in the same activity");
 
         const BrowserActivityElement * elt =
-            dynamic_cast<const BrowserActivityElement *>(dest);
+                dynamic_cast<const BrowserActivityElement *>(dest);
 
         return (elt == 0)
-               ? TR("illegal")
-               : elt->connexion_from(TRUE);
+                ? QObject::tr("illegal")
+                : elt->connexion_from(TRUE);
     }
 
     case UmlDependency:
@@ -286,11 +283,11 @@ QString BrowserActivityAction::may_connect(UmlCode & l, const BrowserNode * dest
             return 0;
 
         default:
-            return TR("illegal");
+            return QObject::tr("illegal");
         }
 
     default:
-        return TR("illegal");
+        return QObject::tr("illegal");
     }
 }
 
@@ -302,18 +299,18 @@ QString BrowserActivityAction::connexion_from(bool) const
 
 BrowserActivityAction *
 BrowserActivityAction::add_activityaction(BrowserNode * future_parent,
-        const char * s)
+                                          const char * s)
 {
     QString name;
 
     if (s != 0)
         name = s;
-    else if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
-             UmlActivityAction, TRUE, TRUE))
+    else if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
+                                              UmlActivityAction, TRUE, TRUE))
         return 0;
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent);
+            new BrowserActivityAction(name, future_parent);
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -324,18 +321,18 @@ BrowserActivityAction::add_activityaction(BrowserNode * future_parent,
 BrowserActivityAction * BrowserActivityAction::get_activityaction(BrowserNode * future_parent)
 {
     BrowserNodeList l;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = future_parent->firstChild(); child != 0; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlActivityAction) &&
-            (((BrowserNode *) child)->get_name()[0] != 0))
+                (((BrowserNode *) child)->get_type() == UmlActivityAction) &&
+                (((BrowserNode *) child)->get_name()[0] != 0))
             l.append((BrowserNode *) child);
 
     BrowserNode * old = 0;
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
                                          UmlActivityAction, l, &old, TRUE, TRUE))
         return 0;
 
@@ -343,7 +340,7 @@ BrowserActivityAction * BrowserActivityAction::get_activityaction(BrowserNode *
         return ((BrowserActivityAction *) old);
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent);
+            new BrowserActivityAction(name, future_parent);
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -353,19 +350,19 @@ BrowserActivityAction * BrowserActivityAction::get_activityaction(BrowserNode *
 
 BrowserActivityAction *
 BrowserActivityAction::add_call_behavior(BrowserNode * future_parent,
-        BrowserNode * beh)
+                                         BrowserNode * beh)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
                                          UmlActivityAction, TRUE, TRUE))
         return 0;
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent, UmlCallBehaviorAction);
+            new BrowserActivityAction(name, future_parent, UmlCallBehaviorAction);
 
     ((CallBehaviorAction *)((ActivityActionData *) r->get_data())->get_action())
-    ->set_behavior(beh);
+            ->set_behavior(beh);
     r->set_pins();
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -375,20 +372,20 @@ BrowserActivityAction::add_call_behavior(BrowserNode * future_parent,
 
 BrowserActivityAction *
 BrowserActivityAction::add_call_operation(BrowserNode * future_parent,
-        BrowserOperation * oper)
+                                          BrowserOperation * oper)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
                                          UmlActivityAction, TRUE, TRUE))
         return 0;
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent, UmlCallOperationAction);
+            new BrowserActivityAction(name, future_parent, UmlCallOperationAction);
 
 
     ((CallOperationAction *)((ActivityActionData *) r->get_data())->get_action())
-    ->set_operation(oper);
+            ->set_operation(oper);
     r->set_pins();
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -398,20 +395,20 @@ BrowserActivityAction::add_call_operation(BrowserNode * future_parent,
 
 BrowserActivityAction *
 BrowserActivityAction::add_read_variable_value(BrowserNode * future_parent,
-        BrowserNode * var)
+                                               BrowserNode * var)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
                                          UmlActivityAction, TRUE, TRUE))
         return 0;
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent, UmlReadVariableValueAction);
+            new BrowserActivityAction(name, future_parent, UmlReadVariableValueAction);
 
 
     ((ReadVariableValueAction *)((ActivityActionData *) r->get_data())->get_action())
-    ->set_variable(var);
+            ->set_variable(var);
     r->set_pins();
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -421,20 +418,20 @@ BrowserActivityAction::add_read_variable_value(BrowserNode * future_parent,
 
 BrowserActivityAction *
 BrowserActivityAction::add_clear_variable_value(BrowserNode * future_parent,
-        BrowserNode * var)
+                                                BrowserNode * var)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
                                          UmlActivityAction, TRUE, TRUE))
         return 0;
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent, UmlClearVariableValueAction);
+            new BrowserActivityAction(name, future_parent, UmlClearVariableValueAction);
 
 
     ((ClearVariableValueAction *)((ActivityActionData *) r->get_data())->get_action())
-    ->set_variable(var);
+            ->set_variable(var);
     r->set_pins();
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -444,20 +441,20 @@ BrowserActivityAction::add_clear_variable_value(BrowserNode * future_parent,
 
 BrowserActivityAction *
 BrowserActivityAction::add_write_variable_value(BrowserNode * future_parent,
-        BrowserNode * var)
+                                                BrowserNode * var)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
                                          UmlActivityAction, TRUE, TRUE))
         return 0;
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent, UmlWriteVariableValueAction);
+            new BrowserActivityAction(name, future_parent, UmlWriteVariableValueAction);
 
 
     ((WriteVariableValueAction *)((ActivityActionData *) r->get_data())->get_action())
-    ->set_variable(var);
+            ->set_variable(var);
     r->set_pins();
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -467,19 +464,19 @@ BrowserActivityAction::add_write_variable_value(BrowserNode * future_parent,
 
 BrowserActivityAction *
 BrowserActivityAction::add_add_variable_value(BrowserNode * future_parent,
-        BrowserNode * var)
+                                              BrowserNode * var)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
                                          UmlActivityAction, TRUE, TRUE))
         return 0;
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent, UmlAddVariableValueAction);
+            new BrowserActivityAction(name, future_parent, UmlAddVariableValueAction);
 
     ((AddVariableValueAction *)((ActivityActionData *) r->get_data())->get_action())
-    ->set_variable(var);
+            ->set_variable(var);
 
     r->set_pins();
     future_parent->setOpen(TRUE);
@@ -490,19 +487,19 @@ BrowserActivityAction::add_add_variable_value(BrowserNode * future_parent,
 
 BrowserActivityAction *
 BrowserActivityAction::add_remove_variable_value(BrowserNode * future_parent,
-        BrowserNode * var)
+                                                 BrowserNode * var)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
                                          UmlActivityAction, TRUE, TRUE))
         return 0;
 
     BrowserActivityAction * r =
-        new BrowserActivityAction(name, future_parent, UmlRemoveVariableValueAction);
+            new BrowserActivityAction(name, future_parent, UmlRemoveVariableValueAction);
 
     ((RemoveVariableValueAction *)((ActivityActionData *) r->get_data())->get_action())
-    ->set_variable(var);
+            ->set_variable(var);
     r->set_pins();
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -516,91 +513,94 @@ void BrowserActivityAction::menu()
     BrowserNode * who = 0;
     QString kind = stringify(def->get_action_kind());
     int index = 0;
-
-    while ((index = kind.find("_")) != -1)
+    while ((index = kind.indexOf("_")) != -1)
         kind.replace(index, 1, " ");
 
-    Q3PopupMenu m(0, "Activity action");
-    Q3PopupMenu toolm(0);
+    QMenu m("Activity action",0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only) {
             if (def->may_add_pin())
-                m.setWhatsThis(m.insertItem(TR("New pin"), 0),
-                               TR("to add a <i>pin</i>"));
+                MenuFactory::addItem(m, QObject::tr("New pin"), 0,
+                                     QObject::tr("to add a <i>pin</i>"));
 
-            m.setWhatsThis(m.insertItem(TR("New parameter set"), 7),
-                           TR("to add a <i>Parameter Set</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("New parameter set"), 7,
+                                 QObject::tr("to add a <i>Parameter Set</i>"));
+            m.addSeparator();
         }
 
-        m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                       TR("to edit the <i>" + kind + "</i>, \
-a double click with the left mouse button does the same thing"));
+        MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                             QObject::tr("to edit the <i> %1 </i>, "
+                                         "a double click with the left mouse button does the same thing").arg(kind));
 
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 2),
-                           TR("to copy the <i>" + kind + "</i> in a new one"));
+            MenuFactory::addItem(m, QObject::tr("Duplicate"), 2,
+                                 QObject::tr("to copy the <i>%1</i> in a new one").arg(kind));
         }
 
         const char * what;
 
         if ((who = def->get_action()->referenced(what)) != 0) {
-            m.insertSeparator();
-            m.insertItem(TR(QString("Select ") + what), 8);
+            m.addSeparator();
+            MenuFactory::addItem(m, QObject::tr("Select  %1").arg(what), 8);
         }
 
         if (!is_read_only) {
-            m.insertSeparator();
+            m.addSeparator();
 
             if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 3),
-                               TR("to delete the <i>" + kind + "</i>. \
-Note that you can undelete it after"));
+                MenuFactory::addItem(m, QObject::tr("Delete"), 3,
+                                     QObject::tr("to delete the <i>%1</i>. \
+                                                 Note that you can undelete it after").arg(kind));
         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 4),
-                       TR("to know who reference the <i>" + kind + "</i> \
-through a flow or dependency"));
-        mark_menu(m, TR("the " + kind), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 4,
+                             QObject::tr("to know who reference the <i>%1</i> \
+                                         through a flow or dependency").arg(kind));
+                                         mark_menu(m, QObject::tr("the %1").arg(kind), 90);
+                             ProfiledStereotypes::menu(m, this, 99990);
+
+                if ((edition_number == 0) &&
+                    Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>" + kind + "</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>%1</i>").arg(kind));
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 6),
-                               TR("to undelete the <i>" + kind + "</i> and its <i>pins</i> and \
-<i>flows</i> or <i>dependencies</i> (except if the element at the other side is also deleted)"));
-                break;
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 6,
+                                     QObject::tr("to undelete the <i>%1</i> and its <i>pins</i> and \
+                                                 <i>flows</i> or <i>dependencies</i> (except if the element at the other side is also deleted)").arg(kind));
+                                                 break;
             }
         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()), who);
+    QAction *retActon = m.exec(QCursor::pos());
+    if(retActon)
+        exec_menu_choice(retActon->data().toInt(), who);
+
 }
 
 void BrowserActivityAction::exec_menu_choice(int rank,
-        BrowserNode * who)
+                                             BrowserNode * who)
 {
     switch (rank) {
+
     case 0:
         if (BrowserPin::add_pin(0, this) != 0)
             modified();
-
         return;
 
     case 7:
@@ -614,11 +614,11 @@ void BrowserActivityAction::exec_menu_choice(int rank,
     case 2: {
         QString name;
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter activity action's \nname (may be empty) : "),
-                get_type(), TRUE, TRUE))
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter activity action's \nname (may be empty) : "),
+                                                         get_type(), TRUE, TRUE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
     }
-    break;
+        break;
 
     case 3:
         delete_it();
@@ -655,7 +655,7 @@ void BrowserActivityAction::exec_menu_choice(int rank,
     package_modified();
 }
 
-void BrowserActivityAction::apply_shortcut(QString s)
+void BrowserActivityAction::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -692,7 +692,7 @@ void BrowserActivityAction::apply_shortcut(QString s)
         if (s == "Undelete")
             choice = 5;
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -710,8 +710,8 @@ void BrowserActivityAction::apply_shortcut(QString s)
 void BrowserActivityAction::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited)
         def->edit();
@@ -735,10 +735,10 @@ QString BrowserActivityAction::get_stype() const
     QString s = stringify(def->get_action_kind());
     int index = 0;
 
-    while ((index = s.find("_")) != -1)
+    while ((index = s.indexOf("_")) != -1)
         s.replace(index, 1, " ");
 
-    return TR(s);
+    return s;//QObject::tr(s);
 }
 
 int BrowserActivityAction::get_identifier() const
@@ -777,7 +777,7 @@ BrowserNode * BrowserActivityAction::get_associated() const
 }
 
 void BrowserActivityAction::set_associated_diagram(BrowserNode * dg,
-        bool on_read)
+                                                   bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -802,7 +802,6 @@ void BrowserActivityAction::on_delete()
 void BrowserActivityAction::init()
 {
     its_default_stereotypes.clear();
-
     BrowserParameterSet::init();
     BrowserPin::init();
 }
@@ -820,14 +819,14 @@ bool BrowserActivityAction::api_compatible(unsigned v) const
              (def->get_action_kind() <= UmlValueSpecificationAction)));
 }
 
-Q3ValueList<BrowserPin *> BrowserActivityAction::get_pins() const
+QList<BrowserPin *> BrowserActivityAction::get_pins() const
 {
-    Q3ValueList<BrowserPin *> l;
-    Q3ListViewItem * child = firstChild();
+    QList<BrowserPin *> l;
+    BrowserNode * child = firstChild();
 
     while (child != 0) {
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlActivityPin))
+                (((BrowserNode *) child)->get_type() == UmlActivityPin))
             l.append((BrowserPin *) child);
 
         child = child->nextSibling();
@@ -838,11 +837,11 @@ Q3ValueList<BrowserPin *> BrowserActivityAction::get_pins() const
 
 void BrowserActivityAction::remove_pins()
 {
-    Q3ListViewItem * child = firstChild();
+    BrowserNode * child = firstChild();
 
     while (child != 0) {
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlActivityPin))
+                (((BrowserNode *) child)->get_type() == UmlActivityPin))
             ((BrowserPin *) child)->delete_it();
 
         child = child->nextSibling();
@@ -853,24 +852,23 @@ void BrowserActivityAction::set_pins()
 {
     remove_pins();
 
-    Q3ValueList<PinDescr> l = def->get_action()->pins();
-    Q3ValueList<PinDescr>::ConstIterator iter;
+    QList<PinDescr> l = def->get_action()->pins();
+    QList<PinDescr>::ConstIterator iter;
 
     for (iter = l.begin(); iter != l.end(); ++iter) {
         const PinDescr & pd = *iter;
-
         BrowserPin::new_one(this, pd.name, (const PinParamData &) pd);
     }
 }
 
-Q3ValueList<BrowserParameterSet *> BrowserActivityAction::get_parametersets() const
+QList<BrowserParameterSet *> BrowserActivityAction::get_parametersets() const
 {
-    Q3ValueList<BrowserParameterSet *> l;
-    Q3ListViewItem * child = firstChild();
+    QList<BrowserParameterSet *> l;
+    BrowserNode * child = firstChild();
 
     while (child != 0) {
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlParameterSet))
+                (((BrowserNode *) child)->get_type() == UmlParameterSet))
             l.append((BrowserParameterSet *) child);
 
         child = child->nextSibling();
@@ -883,7 +881,7 @@ void BrowserActivityAction::write_id(ToolCom * com)
 {
     com->write_id(this,
                   UmlActivityAction - UmlRelations + def->get_action_kind(),
-                  name);
+                  name.toLatin1().constData());
 }
 
 bool BrowserActivityAction::tool_cmd(ToolCom * com, const char * args)
@@ -904,13 +902,12 @@ bool BrowserActivityAction::tool_cmd(ToolCom * com, const char * args)
 
             case UmlFlow: {
                 BrowserNode * end = (BrowserNode *) com->get_id(args);
-
                 if (may_connect(k, end).isEmpty())
                     (new BrowserFlow(this, end))->write_id(com);
                 else
                     ok = FALSE;
             }
-            break;
+                break;
 
             case UmlSimpleRelations: {
                 UmlCode c;
@@ -926,7 +923,7 @@ bool BrowserActivityAction::tool_cmd(ToolCom * com, const char * args)
                         ok = FALSE;
                 }
             }
-            break;
+                break;
 
             case UmlActivityPin:
                 BrowserPin::new_one(this, args)->write_id(com);
@@ -961,18 +958,16 @@ bool BrowserActivityAction::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-bool BrowserActivityAction::may_contains_them(const Q3PtrList<BrowserNode> & l,
-        BooL & duplicable) const
+bool BrowserActivityAction::may_contains_them(const QList<BrowserNode *> & l,
+                                              BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlParameterSet:
         case UmlActivityPin:
         case UmlFlow:
         case UmlDependOn:
-            if (((const BrowserNode *) it.current()->parent()) != this)
+            if (((const BrowserNode *) node->parent()) != this)
                 return FALSE;
 
             break;
@@ -981,10 +976,10 @@ bool BrowserActivityAction::may_contains_them(const Q3PtrList<BrowserNode> & l,
             return FALSE;
         }
 
-        if (! may_contains(it.current(), FALSE))
+        if (! may_contains(node, FALSE))
             return FALSE;
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -993,9 +988,9 @@ bool BrowserActivityAction::may_contains_them(const Q3PtrList<BrowserNode> & l,
 void BrowserActivityAction::DragMoveEvent(QDragMoveEvent * e)
 {
     if (UmlDrag::canDecode(e, BrowserFlow::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserPin::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserParameterSet::drag_key(this))) {
+            UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserPin::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserParameterSet::drag_key(this))) {
         if (!is_read_only)
             e->accept();
         else
@@ -1013,10 +1008,10 @@ void BrowserActivityAction::DropEvent(QDropEvent * e)
 void BrowserActivityAction::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        (UmlDrag::canDecode(e, BrowserFlow::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserPin::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserParameterSet::drag_key(this))))
+            (UmlDrag::canDecode(e, BrowserFlow::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserPin::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserParameterSet::drag_key(this))))
         e->accept();
     else
         e->ignore();
@@ -1025,16 +1020,15 @@ void BrowserActivityAction::DragMoveInsideEvent(QDragMoveEvent * e)
 void BrowserActivityAction::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, BrowserFlow::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserPin::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserParameterSet::drag_key(this))) != 0)) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE))
             move(bn, after);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -1047,7 +1041,7 @@ void BrowserActivityAction::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 QString BrowserActivityAction::drag_key() const
 {
     return QString::number(UmlActivityAction)
-           + "#" + QString::number((unsigned long) get_container(UmlActivity));
+            + "#" + QString::number((unsigned long) get_container(UmlActivity));
 }
 
 QString BrowserActivityAction::drag_postfix() const
@@ -1058,7 +1052,7 @@ QString BrowserActivityAction::drag_postfix() const
 QString BrowserActivityAction::drag_key(BrowserNode * p)
 {
     return QString::number(UmlActivityAction)
-           + "#" + QString::number((unsigned long) p->get_container(UmlActivity));
+            + "#" + QString::number((unsigned long) p->get_container(UmlActivity));
 }
 
 void BrowserActivityAction::save_stereotypes(QTextStream & st)
@@ -1101,7 +1095,7 @@ void BrowserActivityAction::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -1138,12 +1132,12 @@ BrowserActivityAction * BrowserActivityAction::read_ref(char *& st)
     BrowserActivityAction * result = all[id];
 
     return (result == 0)
-           ? new BrowserActivityAction(id)
-           : result;
+            ? new BrowserActivityAction(id)
+            : result;
 }
 
 BrowserActivityAction * BrowserActivityAction::read(char *& st, char * k,
-        BrowserNode * parent)
+                                                    BrowserNode * parent)
 {
     BrowserActivityAction * result;
     int id;
@@ -1153,8 +1147,8 @@ BrowserActivityAction * BrowserActivityAction::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserActivityAction(id)
-               : result;
+                ? new BrowserActivityAction(id)
+                : result;
     }
     else if (!strcmp(k, "activityaction")) {
         id = read_id(st);
@@ -1185,7 +1179,7 @@ BrowserActivityAction * BrowserActivityAction::read(char *& st, char * k,
             BrowserNode * diag;
 
             if (((diag = BrowserActivityDiagram::read(st, k, 0)) == 0) &&
-                ((diag = BrowserStateDiagram::read(st, k, 0)) == 0))
+                    ((diag = BrowserStateDiagram::read(st, k, 0)) == 0))
                 wrong_keyword(k, "state/activity diagram ref");
 
             result->set_associated_diagram(diag, TRUE);
@@ -1199,7 +1193,7 @@ BrowserActivityAction * BrowserActivityAction::read(char *& st, char * k,
 
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         if (strcmp(k, "end")) {
             while (BrowserPin::read(st, k, result) ||
@@ -1207,7 +1201,6 @@ BrowserActivityAction * BrowserActivityAction::read(char *& st, char * k,
                    BrowserFlow::read(st, k, result) ||
                    BrowserSimpleRelation::read(st, k, result))
                 k = read_keyword(st);
-
             if (strcmp(k, "end"))
                 wrong_keyword(k, "end");
         }
@@ -1228,6 +1221,5 @@ BrowserNode * BrowserActivityAction::get_it(const char * k, int id)
 
     if ((r = BrowserPin::get_it(k, id)) == 0)
         r = BrowserParameterSet::get_it(k, id);
-
     return r;
 }
diff --git a/src/browser/BrowserActivityAction.h b/src/browser/BrowserActivityAction.h
index 0f378a49a..cc28277fa 100644
--- a/src/browser/BrowserActivityAction.h
+++ b/src/browser/BrowserActivityAction.h
@@ -1,9 +1,3 @@
-//Added by qt3to4:
-#include <QTextStream>
-#include <QDragMoveEvent>
-#include <QDropEvent>
-#include <Q3ValueList>
-#include <QPixmap>
 // *************************************************************************
 //
 // Copyright 2004-2010 Bruno PAGES  .
@@ -34,6 +28,13 @@
 #ifndef BROWSER_ACTIVITYACTION_H
 #define BROWSER_ACTIVITYACTION_H
 
+//Added by qt3to4:
+#include <QTextStream>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+//#include <QList>
+#include <QPixmap>
+
 class QPixmap;
 class ActivityActionData;
 class BrowserPin;
@@ -63,14 +64,14 @@ class BrowserActivityAction : public BrowserNode, public Labeled<BrowserActivity
     void exec_menu_choice(int rank, BrowserNode * who);
 
 public:
-    BrowserActivityAction(QString s, BrowserNode * p, int id = 0);
+    BrowserActivityAction(const QString & s, BrowserNode * p, int id = 0);
     BrowserActivityAction(const BrowserActivityAction * model, BrowserNode * p);
-    BrowserActivityAction(QString s, BrowserNode * p, UmlActionKind);
+    BrowserActivityAction(const QString & s, BrowserNode * p, UmlActionKind);
     virtual ~BrowserActivityAction();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> & l,
+                                    const QString & name = QString());
+    virtual bool may_contains_them(const QList<BrowserNode *> & l,
                                    BooL & duplicable) const;
     static BrowserActivityAction * add_activityaction(BrowserNode * future_parent,
             const char * s);
@@ -91,8 +92,8 @@ class BrowserActivityAction : public BrowserNode, public Labeled<BrowserActivity
             BrowserNode * var);
 
     void set_pins();
-    Q3ValueList<BrowserPin *> get_pins() const;
-    Q3ValueList<BrowserParameterSet *> get_parametersets() const;
+    QList<BrowserPin *> get_pins() const;
+    QList<BrowserParameterSet *> get_parametersets() const;
     void remove_pins();
     void update_pins();
     BrowserNode * add_parameter_set(BrowserParameterSet *, const char *);
@@ -104,7 +105,7 @@ class BrowserActivityAction : public BrowserNode, public Labeled<BrowserActivity
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -133,8 +134,8 @@ class BrowserActivityAction : public BrowserNode, public Labeled<BrowserActivity
     virtual void write_id(ToolCom * com);
     virtual bool api_compatible(unsigned v) const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
     static void init();
     static const QStringList & default_stereotypes();
diff --git a/src/browser/BrowserActivityDiagram.cpp b/src/browser/BrowserActivityDiagram.cpp
index c634f7407..9d3e0c5ae 100644
--- a/src/browser/BrowserActivityDiagram.cpp
+++ b/src/browser/BrowserActivityDiagram.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+////#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+//#include <QList>
 #include <QPixmap>
 #include <QDropEvent>
 
@@ -45,21 +45,21 @@
 #include "UmlPixmap.h"
 #include "SettingsDialog.h"
 #include "DiagramView.h"
+#include "BrowserView.h"
 #include "myio.h"
 #include "strutil.h"
 #include "ToolCom.h"
 #include "Tool.h"
 #include "ui/menufactory.h"
-#include "BrowserView.h"
 #include "ProfiledStereotypes.h"
 #include "mu.h"
 #include "translate.h"
-
-Q3PtrList<BrowserActivityDiagram> BrowserActivityDiagram::imported;
-Q3ValueList<int> BrowserActivityDiagram::imported_ids;
+#include <qdir.h>
+QList<BrowserActivityDiagram *> BrowserActivityDiagram::imported;
+QList<int> BrowserActivityDiagram::imported_ids;
 QStringList BrowserActivityDiagram::its_default_stereotypes;	// unicode
 
-BrowserActivityDiagram::BrowserActivityDiagram(QString s, BrowserNode * p, int id)
+BrowserActivityDiagram::BrowserActivityDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -85,7 +85,9 @@ BrowserActivityDiagram::BrowserActivityDiagram(BrowserActivityDiagram * model, B
     is_modified = TRUE;
 
     if (model->window != 0)
+    {
         model->window->duplicate(get_ident(), "diagram");
+    }
     else {
         char * diagram;
 
@@ -115,10 +117,9 @@ BrowserActivityDiagram::~BrowserActivityDiagram()
         QString fn;
 
         fn.sprintf("%d.diagram", get_ident());
-
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
 
     all.remove(get_ident());
@@ -143,33 +144,32 @@ BrowserActivityDiagram  * BrowserActivityDiagram::add_activity_diagram(BrowserNo
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter activity diagram's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter activity diagram's name : "),
                                         UmlActivityDiagram, TRUE, FALSE))
         return new BrowserActivityDiagram(name, future_parent);
     else
         return 0;
 }
 
-void BrowserActivityDiagram::set_name(const char * s)
+void BrowserActivityDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
 
     if (window != 0)
-        window->setCaption(s);
+    {
+        window->setWindowTitle(s);
+    }
 }
 
 void BrowserActivityDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserActivityDiagram * d = imported.take(0);
-
-        (new ActivityDiagramWindow(d->full_name(), d, *it))->close(TRUE);
-        it = imported_ids.remove(it);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserActivityDiagram *d, imported) {
+        (new ActivityDiagramWindow(d->full_name(), d, *it))->close();
+        it = imported_ids.erase(it);
         d->is_modified = TRUE;
     }
+    imported.clear();
 }
 
 void BrowserActivityDiagram::renumber(int phase)
@@ -187,11 +187,12 @@ void BrowserActivityDiagram::delete_it()
 {
     if (window)
         delete window;
+    window = 0;
 
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserActivityDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserActivityDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserActivityDiagram * result = new BrowserActivityDiagram(this, p);
 
@@ -223,50 +224,53 @@ void BrowserActivityDiagram::draw_svg() const
 
 void BrowserActivityDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Show"), 0),
-                       TR("to show and edit the <i>activity diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Show"), 0,
+                       QObject::tr("to show and edit the <i>activity diagram</i>"));
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                           TR("to edit the <i>activity diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                           QObject::tr("to edit the <i>activity diagram</i>"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 2),
-                               TR("to set how the <i>activity diagram</i>'s items must be drawn"));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to duplicate the <i>activity diagram</i>"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 2,
+                               QObject::tr("to set how the <i>activity diagram</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 3,
+                               QObject::tr("to duplicate the <i>activity diagram</i>"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 4),
-                                   TR("to delete the <i>activity diagram</i>. \
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 4,
+                                   QObject::tr("to delete the <i>activity diagram</i>. \
 Note that you can undelete it after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the activity diagram"), 90);
+        mark_menu(m, QObject::tr("the activity diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>activity diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                       QObject::tr("to undelete the <i>activity diagram</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserActivityDiagram::exec_menu_choice(int rank)
@@ -277,7 +281,7 @@ void BrowserActivityDiagram::exec_menu_choice(int rank)
         return;
 
     case 1:
-        edit(TR("Activity diagram"), its_default_stereotypes);
+        edit( QObject::tr("Activity diagram"), its_default_stereotypes);
         return;
 
     case 2:
@@ -287,7 +291,7 @@ void BrowserActivityDiagram::exec_menu_choice(int rank)
     case 3: {
         QString name;
 
-        if (((BrowserNode *)parent())->enter_child_name(name, TR("enter activity diagram's name : "),
+        if (((BrowserNode *)parent())->enter_child_name(name, QObject::tr("enter activity diagram's name : "),
                 UmlActivityDiagram, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
         else
@@ -317,7 +321,7 @@ void BrowserActivityDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserActivityDiagram::apply_shortcut(QString s)
+void BrowserActivityDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -359,7 +363,7 @@ void BrowserActivityDiagram::open(bool)
         window = new ActivityDiagramWindow(full_name(TRUE), this);
     else
         window->raise();
-
+    windowDestroyed = false;
     window->setFocus();
 }
 
@@ -371,14 +375,14 @@ void BrowserActivityDiagram::edit_settings()
 
         settings.complete(st, TRUE);
 
-        co[0].set(TR("activity color"), &activity_color);
-        co[1].set(TR("activity region color"), &activityregion_color);
-        co[2].set(TR("activity partition color"), &activitypartition_color);
-        co[3].set(TR("activity action color"), &activityaction_color);
-        co[4].set(TR("parameter and pin color"), &parameterpin_color);
-        co[5].set(TR("note color"), &note_color);
-        co[6].set(TR("package color"), &package_color);
-        co[7].set(TR("fragment color"), &fragment_color);
+        co[0].set( QObject::tr("activity color"), &activity_color);
+        co[1].set( QObject::tr("activity region color"), &activityregion_color);
+        co[2].set( QObject::tr("activity partition color"), &activitypartition_color);
+        co[3].set( QObject::tr("activity action color"), &activityaction_color);
+        co[4].set( QObject::tr("parameter and pin color"), &parameterpin_color);
+        co[5].set( QObject::tr("note color"), &note_color);
+        co[6].set( QObject::tr("package color"), &package_color);
+        co[7].set( QObject::tr("fragment color"), &fragment_color);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -416,7 +420,7 @@ UmlCode BrowserActivityDiagram::get_type() const
 
 QString BrowserActivityDiagram::get_stype() const
 {
-    return TR("activity diagram");
+    return QObject::tr("activity diagram");
 }
 
 int BrowserActivityDiagram::get_identifier() const
@@ -557,11 +561,10 @@ bool BrowserActivityDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
     return TRUE;
-
     case saveInCmd:
         if (window != 0)
             com->write_ack(window->get_view()->save_pict(args, TRUE, FALSE));
@@ -572,11 +575,10 @@ bool BrowserActivityDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
 
         return TRUE;
-
     default:
         return (def->tool_cmd(com, args, this, comment) ||
                 BrowserNode::tool_cmd(com, args));
@@ -613,7 +615,7 @@ const QStringList & BrowserActivityDiagram::default_stereotypes()
     return its_default_stereotypes;
 }
 
-void BrowserActivityDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
+void BrowserActivityDiagram::compute_referenced_by(QList<BrowserNode *> & l,
         BrowserNode * bn,
         char const * kc,
         char const * kr)
@@ -621,8 +623,9 @@ void BrowserActivityDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
     int id = bn->get_identifier();
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
-
-    while ((d = it.current()) != 0) {
+    while(it.hasNext()){
+        it.next();
+    if ((d = it.value()) != 0)
         if (!d->deletedp() && (d->get_type() == UmlActivityDiagram)) {
             if ((((BrowserActivityDiagram *) d)->window != 0)
                 ? ((BrowserActivityDiagram *) d)->window->get_view()->is_present(bn)
@@ -630,7 +633,6 @@ void BrowserActivityDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
                 l.append((BrowserActivityDiagram *) d);
         }
 
-        ++it;
     }
 }
 
@@ -678,7 +680,9 @@ void BrowserActivityDiagram::save(QTextStream & st, bool ref, QString & warning)
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
@@ -745,7 +749,6 @@ BrowserActivityDiagram * BrowserActivityDiagram::read(char *& st, char * k,
 
         r->is_read_only = ((!in_import() && read_only_file())) ||
                           ((user_id() != 0) && r->is_api_base());
-
         QFileInfo fi(BrowserView::get_dir(), QString::number(id) + ".diagram");
 
         if (!in_import() && fi.exists() && !fi.isWritable())
diff --git a/src/browser/BrowserActivityDiagram.h b/src/browser/BrowserActivityDiagram.h
index c38a0ce24..1f6d597df 100644
--- a/src/browser/BrowserActivityDiagram.h
+++ b/src/browser/BrowserActivityDiagram.h
@@ -34,8 +34,7 @@
 #include <QPixmap>
 #include <QDropEvent>
 #include <QTextStream>
-#include <Q3ValueList>
-
+#include <QList>
 class QPixmap;
 class ActivityDiagramWindow;
 class SimpleData;
@@ -45,8 +44,8 @@ class BrowserActivityDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserActivityDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserActivityDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
 
     SimpleData * def;
@@ -68,19 +67,19 @@ class BrowserActivityDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserActivityDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserActivityDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserActivityDiagram();
 
     virtual void delete_it();
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
     virtual void draw_svg() const;
     bool api_compatible(unsigned v) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual void on_close();
     virtual void read_session(char *& st);
@@ -89,7 +88,7 @@ class BrowserActivityDiagram : public BrowserDiagram
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
     virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
+    virtual void set_name(const QString & s);
     virtual void update_drawing_settings();
     virtual void get_activitydiagramsettings(ActivityDiagramSettings &) const;
     virtual void get_activitydrawingsettings(ActivityDrawingSettings &) const;
@@ -119,7 +118,7 @@ class BrowserActivityDiagram : public BrowserDiagram
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 
     static QString drag_key(BrowserNode * p);
diff --git a/src/browser/BrowserActivityNode.cpp b/src/browser/BrowserActivityNode.cpp
index edfc7a0de..bc6d8b500 100644
--- a/src/browser/BrowserActivityNode.cpp
+++ b/src/browser/BrowserActivityNode.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+////#include <q3popupmenu.h>
+//#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -62,7 +62,7 @@
 IdDict<BrowserActivityNode> BrowserActivityNode::all(257, __FILE__);
 QStringList BrowserActivityNode::its_default_stereotypes;	// unicode
 
-BrowserActivityNode::BrowserActivityNode(UmlCode c, QString s, BrowserNode * p, int id)
+BrowserActivityNode::BrowserActivityNode(UmlCode c, const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserActivityNode>(all, id),
       kind(c), def(new SimpleData)
 {
@@ -86,7 +86,7 @@ BrowserActivityNode::BrowserActivityNode(const BrowserActivityNode * model, Brow
     kind = model->kind;
 }
 
-BrowserNode * BrowserActivityNode::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserActivityNode::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserActivityNode(this, p);
 
@@ -115,17 +115,16 @@ void BrowserActivityNode::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserActivityNode::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserActivityNode::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserFlow::compute_referenced_by(l, this);
-
     if (! ondelete)
         BrowserActivityDiagram::compute_referenced_by(l, this, "activitynodecanvas", "activitynode_ref");
 }
@@ -201,8 +200,7 @@ const QPixmap * BrowserActivityNode::pixmap(int) const
 
 bool BrowserActivityNode::target_of_flow() const
 {
-    Q3PtrList<BrowserNode> l;
-
+    QList<BrowserNode *> l;
     BrowserFlow::compute_referenced_by(l, this);
     return !l.isEmpty();
 }
@@ -219,19 +217,19 @@ QString BrowserActivityNode::may_start() const
     switch (get_type()) {
     case FlowFinalAN:
     case ActivityFinalAN:
-        return TR("can't have outgoing flow");
+        return QObject::tr("can't have outgoing flow");
 
     case InitialAN:
     case MergeAN:	      // theo all input and output must
     case JoinAN:	      // be control/data exclusively
         // only one flow is allowed
     {
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             if ((((BrowserNode *) child)->get_type() == UmlFlow) &&
                 (!((BrowserNode *) child)->deletedp()))
-                return TR("can't have several outgoing flows");
+                return QObject::tr("can't have several outgoing flows");
     }
 
     // no break
@@ -246,35 +244,35 @@ QString BrowserActivityNode::may_connect(const BrowserNode * dest) const
     BrowserNode * bn = dest->get_container(UmlActivity);
 
     if ((bn != 0) && (get_container(UmlActivity) != bn))
-        return TR("not in the same activity");
+        return QObject::tr("not in the same activity");
 
     BasicData * data = dest->get_data();
 
     switch (dest->get_type()) {
     case InitialAN:
-        return TR("initial node can't have incoming flow");
+        return QObject::tr("initial node can't have incoming flow");
 
     case ForkAN:
         return (((BrowserActivityNode *) dest)->target_of_flow())
-               ? TR("fork can't have several incoming flow")
+               ? QObject::tr("fork can't have several incoming flow")
                : QString();
 
     case UmlParameter:
         if (((ParameterData *) data)->get_dir() == UmlIn)
-            return TR("an input parameter can't have incoming flows");
+            return QObject::tr("an input parameter can't have incoming flows");
         else if (!((ParameterData *) data)->get_is_control())
-            return TR("parameter can't accept control flow (not 'is_control')");
+            return QObject::tr("parameter can't accept control flow (not 'is_control')");
         else
             return QString();
 
     case UmlExpansionNode:
         return (!((ActivityObjectData *) data)->get_is_control())
-               ? TR("can't accept control flow (not 'is_control')")
+               ? QObject::tr("can't accept control flow (not 'is_control')")
                : QString();
 
     case UmlActivityPin:
         return (!((PinData *) data)->get_is_control())
-               ? TR("pin can't accept control flow (not 'is_control')")
+               ? QObject::tr("pin can't accept control flow (not 'is_control')")
                : QString();
 
     case UmlActivityObject:
@@ -287,7 +285,7 @@ QString BrowserActivityNode::may_connect(const BrowserNode * dest) const
         return 0;
 
     default:
-        return TR("illegal");
+        return QObject::tr("illegal");
     }
 }
 
@@ -296,14 +294,14 @@ QString BrowserActivityNode::connexion_from(bool control) const
     switch (get_type()) {
     case ForkAN:  // theo all input and output must be control/data exclusively
         if (target_of_flow())
-            return TR("fork can't have several incoming flow");
+            return QObject::tr("fork can't have several incoming flow");
         else
             return 0;
 
     case FlowFinalAN:
     case ActivityFinalAN:
         if (! control)
-            return TR("can't have incoming data flow");
+            return QObject::tr("can't have incoming data flow");
         else
             return 0;
 
@@ -313,7 +311,7 @@ QString BrowserActivityNode::connexion_from(bool control) const
         return 0;
 
     default:
-        return TR("illegal");
+        return QObject::tr("illegal");
     }
 }
 
@@ -343,51 +341,53 @@ BrowserActivityNode * BrowserActivityNode::get_activitynode(BrowserNode * future
 void BrowserActivityNode::menu()
 {
     QString s = stringify(kind);
-    int index = s.find("_");
+    int index = s.indexOf("_");
 
     if (index != -1)
         s.replace(index, 1, " ");
-
-    Q3PopupMenu m(0, "Activity node");
-    Q3PopupMenu toolm(0);
+    QMenu m("Activity node", 0 );
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                       TR("to edit the <i>" + s + "</i>, \
-a double click with the left mouse button does the same thing"));
+        MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                       QObject::tr("to edit the <i>%1</i>, \
+a double click with the left mouse button does the same thing").arg(s));
 
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 2),
-                           TR("to copy the <i>" + s + "</i> in a new one"));
-            m.insertSeparator();
+            MenuFactory::addItem(m,  QObject::tr("Duplicate"), 2,
+                           QObject::tr("to copy the <i>%1</i> in a new one").arg(s));
+            m.addSeparator();
 
             if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 3),
-                               TR("to delete the <i>" + s + "</i>. \
-Note that you can undelete it after"));
+                MenuFactory::addItem(m, QObject::tr("Delete"), 3,
+                               QObject::tr("to delete the <i>%1</i>. \
+Note that you can undelete it after").arg(s));
         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 5),
-                       TR("to know who reference the <i>" + s + "</i> \
-through a flow"));
-        mark_menu(m, TR("the " + s), 90);
+        MenuFactory::addItem(m,  QObject::tr("Referenced by"), 5,
+                       QObject::tr("to know who reference the <i>%1</i> \
+through a flow").arg(s));
+        mark_menu(m, QObject::tr("the %1").arg(s), 90);
         ProfiledStereotypes::menu(m, this, 99990);;
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 4),
-                       TR("to undelete the <i>" + s + "</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 4,
+                       QObject::tr("to undelete the <i>%1</i>").arg(s));
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserActivityNode::exec_menu_choice(int rank)
@@ -428,7 +428,7 @@ void BrowserActivityNode::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserActivityNode::apply_shortcut(QString s)
+void BrowserActivityNode::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -466,7 +466,7 @@ void BrowserActivityNode::open(bool)
         QString s = stringify(kind);
         int index = 0;
 
-        while ((index = s.find("_")) != -1)
+        while ((index = s.indexOf("_")) != -1)
             s.replace(index, 1, " ");
 
         static QSize previous_size;
@@ -490,12 +490,12 @@ UmlCode BrowserActivityNode::get_type() const
 QString BrowserActivityNode::get_stype() const
 {
     QString s = stringify(kind);
-    int index = s.find("_");
+    int index = s.indexOf("_");
 
     if (index != -1)
         s.replace(index, 1, " ");
 
-    return TR(s);
+    return s; //QObject::tr(s);
 }
 
 int BrowserActivityNode::get_identifier() const
@@ -558,7 +558,6 @@ bool BrowserActivityNode::tool_cmd(ToolCom * com, const char * args)
             switch (k) {
             case UmlFlow: {
                 BrowserNode * end = (BrowserNode *) com->get_id(args);
-
                 if (may_connect(end).isEmpty())
                     (new BrowserFlow(this, end))->write_id(com);
                 else
@@ -614,13 +613,12 @@ void BrowserActivityNode::DragMoveInsideEvent(QDragMoveEvent * e)
 void BrowserActivityNode::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, BrowserFlow::drag_key(this))) != 0)) &&
         (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE))
             move(bn, after);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -682,7 +680,7 @@ void BrowserActivityNode::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -770,7 +768,6 @@ BrowserActivityNode * BrowserActivityNode::read(char *& st, char * k,
         if (strcmp(k, "end")) {
             while (BrowserFlow::read(st, k, result))
                 k = read_keyword(st);
-
             if (strcmp(k, "end"))
                 wrong_keyword(k, "end");
         }
diff --git a/src/browser/BrowserActivityNode.h b/src/browser/BrowserActivityNode.h
index af67639c5..e0a8beb0f 100644
--- a/src/browser/BrowserActivityNode.h
+++ b/src/browser/BrowserActivityNode.h
@@ -58,12 +58,12 @@ class BrowserActivityNode : public BrowserNode, public Labeled<BrowserActivityNo
     void exec_menu_choice(int rank);
 
 public:
-    BrowserActivityNode(UmlCode c, QString s, BrowserNode * p, int id = 0);
+    BrowserActivityNode(UmlCode c, const QString & s, BrowserNode * p, int id = 0);
     BrowserActivityNode(const BrowserActivityNode * model, BrowserNode * p);
     virtual ~BrowserActivityNode();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserActivityNode * add_activitynode(BrowserNode * future_parent,
             UmlCode c, const char * name);
     static BrowserActivityNode * get_activitynode(BrowserNode * future_parent, UmlCode c);
@@ -75,7 +75,7 @@ class BrowserActivityNode : public BrowserNode, public Labeled<BrowserActivityNo
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -98,7 +98,7 @@ class BrowserActivityNode : public BrowserNode, public Labeled<BrowserActivityNo
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
     bool target_of_flow() const;
 
     virtual bool allow_empty() const;
diff --git a/src/browser/BrowserActivityObject.cpp b/src/browser/BrowserActivityObject.cpp
index ba5635c5b..751918a19 100644
--- a/src/browser/BrowserActivityObject.cpp
+++ b/src/browser/BrowserActivityObject.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+//#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -63,7 +63,7 @@
 IdDict<BrowserActivityObject> BrowserActivityObject::all(257, __FILE__);
 QStringList BrowserActivityObject::its_default_stereotypes;	// unicode
 
-BrowserActivityObject::BrowserActivityObject(QString s, BrowserNode * p, int id)
+BrowserActivityObject::BrowserActivityObject(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserActivityObject>(all, id),
       def(new ActivityObjectData), associated_diagram(0)
 {
@@ -85,7 +85,7 @@ BrowserActivityObject::BrowserActivityObject(const BrowserActivityObject * model
     comment = model->comment;
 }
 
-BrowserNode * BrowserActivityObject::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserActivityObject::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserActivityObject(this, p);
 
@@ -115,13 +115,13 @@ void BrowserActivityObject::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserActivityObject::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserActivityObject::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserFlow::compute_referenced_by(l, this);
@@ -130,18 +130,17 @@ void BrowserActivityObject::referenced_by(Q3PtrList<BrowserNode> & l, bool ondel
         BrowserActivityDiagram::compute_referenced_by(l, this, "activityobjectcanvas", "activityobject_ref");
 }
 
-void BrowserActivityObject::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * target)
+void BrowserActivityObject::compute_referenced_by(QList<BrowserNode *> & l,
+                                                  BrowserNode * target)
 {
     IdIterator<BrowserActivityObject> it(all);
-
-    while (it.current()) {
-        if (!it.current()->deletedp()) {
-            if (it.current()->def->get_type().type == target)
-                l.append(it.current());
-        }
-
-        ++it;
+    while(it.hasNext()){
+        it.next();
+        if (it.value())
+            if (!it.value()->deletedp()) {
+                if (it.value()->def->get_type().type == target)
+                    l.append(it.value());
+            }
     }
 }
 
@@ -195,17 +194,17 @@ QString BrowserActivityObject::may_connect(UmlCode & l, const BrowserNode * dest
         BrowserNode * container = dest->get_container(UmlActivity);
 
         if (container == 0)
-            return TR("illegal");
+            return QObject::tr("illegal");
 
         if (get_container(UmlActivity) != container)
-            return TR("not in the same activity");
+            return QObject::tr("not in the same activity");
 
         const BrowserActivityElement * elt =
-            dynamic_cast<const BrowserActivityElement *>(dest);
+                dynamic_cast<const BrowserActivityElement *>(dest);
 
         return (elt == 0)
-               ? TR("illegal")
-               : elt->connexion_from(def->get_is_control());
+                ? QObject::tr("illegal")
+                : elt->connexion_from(def->get_is_control());
     }
 
     case UmlDependency:
@@ -221,11 +220,11 @@ QString BrowserActivityObject::may_connect(UmlCode & l, const BrowserNode * dest
             return 0;
 
         default:
-            return TR("illegal");
+            return QObject::tr("illegal");
         }
 
     default:
-        return TR("illegal");
+        return QObject::tr("illegal");
     }
 }
 
@@ -236,18 +235,18 @@ QString BrowserActivityObject::connexion_from(bool) const
 
 BrowserActivityObject *
 BrowserActivityObject::add_activityobject(BrowserNode * future_parent,
-        const char * s)
+                                          QString s)
 {
     QString name;
 
     if (s != 0)
         name = s;
-    else if (!future_parent->enter_child_name(name, TR("enter activity object's \nname (may be empty) : "),
-             UmlActivityObject, TRUE, TRUE))
+    else if (!future_parent->enter_child_name(name, QObject::tr("enter activity object's \nname (may be empty) : "),
+                                              UmlActivityObject, TRUE, TRUE))
         return 0;
 
     BrowserActivityObject * r =
-        new BrowserActivityObject(name, future_parent);
+            new BrowserActivityObject(name, future_parent);
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -264,18 +263,18 @@ bool BrowserActivityObject::same_name(const QString &, UmlCode) const
 BrowserActivityObject * BrowserActivityObject::get_activityobject(BrowserNode * future_parent)
 {
     BrowserNodeList l;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = future_parent->firstChild(); child != 0; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlActivityObject) &&
-            (((BrowserNode *) child)->get_name()[0] != 0))
+                (((BrowserNode *) child)->get_type() == UmlActivityObject) &&
+                (((BrowserNode *) child)->get_name()[0] != 0))
             l.append((BrowserNode *) child);
 
     BrowserNode * old = 0;
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter activity object's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter activity object's \nname (may be empty) : "),
                                          UmlActivityObject, l, &old, TRUE, TRUE))
         return 0;
 
@@ -283,7 +282,7 @@ BrowserActivityObject * BrowserActivityObject::get_activityobject(BrowserNode *
         return ((BrowserActivityObject *) old);
 
     BrowserActivityObject * r =
-        new BrowserActivityObject(name, future_parent);
+            new BrowserActivityObject(name, future_parent);
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -293,57 +292,60 @@ BrowserActivityObject * BrowserActivityObject::get_activityobject(BrowserNode *
 
 void BrowserActivityObject::menu()
 {
-    Q3PopupMenu m(0, "Activity object");
-    Q3PopupMenu toolm(0);
+    QMenu m("Activity object",0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                       TR("to edit the <i>activity object</i>, \
-a double click with the left mouse button does the same thing"));
-
-        if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 2),
-                           TR("to copy the <i>activity object</i> in a new one"));
-            m.insertSeparator();
-
-            if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 3),
-                               TR("to delete the <i>activity object</i>. \
-Note that you can undelete it after"));
-        }
-
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 4),
-                       TR("to know who reference the <i>activity object</i> \
-through a flow or dependency"));
-        mark_menu(m, TR("the activity object"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
-        }
+        MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                             QObject::tr("to edit the <i>activity object</i>, \
+                                         a double click with the left mouse button does the same thing"));
+
+                                         if (!is_read_only) {
+                                             MenuFactory::addItem(m, QObject::tr("Duplicate"), 2,
+                                             QObject::tr("to copy the <i>activity object</i> in a new one"));
+                                             m.addSeparator();
+
+                                             if (edition_number == 0)
+                                             MenuFactory::addItem(m, QObject::tr("Delete"), 3,
+                                             QObject::tr("to delete the <i>activity object</i>. \
+                                             Note that you can undelete it after"));
+                                         }
+
+                                         MenuFactory::addItem(m, QObject::tr("Referenced by"), 4,
+                                                              QObject::tr("to know who reference the <i>activity object</i> \
+                                                                          through a flow or dependency"));
+                                                                          mark_menu(m, QObject::tr("the activity object"), 90);
+                                                              ProfiledStereotypes::menu(m, this, 99990);
+
+                                         if ((edition_number == 0) &&
+                                             Tool::menu_insert(&toolm, get_type(), 100)) {
+                                             m.addSeparator();
+                                             toolm.setTitle(QObject::tr("Tool"));
+                                             m.addMenu(&toolm);
+                                         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>activity object</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>activity object</i>"));
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 6),
-                               TR("undelete the <i>activity object</i> and its <i>expansion nodes</i> and \
-<i>flows</i> or <i>dependencies</i>(except if the element at the other side is also deleted)"));
-                break;
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 6,
+                                     QObject::tr("undelete the <i>activity object</i> and its <i>expansion nodes</i> and \
+                                                 <i>flows</i> or <i>dependencies</i>(except if the element at the other side is also deleted)"));
+                                                 break;
             }
         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserActivityObject::exec_menu_choice(int rank)
@@ -356,11 +358,11 @@ void BrowserActivityObject::exec_menu_choice(int rank)
     case 2: {
         QString name;
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter activity object's \nname (may be empty) : "),
-                get_type(), TRUE, TRUE))
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter activity object's \nname (may be empty) : "),
+                                                         get_type(), TRUE, TRUE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
     }
-    break;
+        break;
 
     case 3:
         delete_it();
@@ -393,7 +395,7 @@ void BrowserActivityObject::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserActivityObject::apply_shortcut(QString s)
+void BrowserActivityObject::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -421,7 +423,7 @@ void BrowserActivityObject::apply_shortcut(QString s)
         if (s == "Undelete")
             choice = 5;
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -439,8 +441,8 @@ void BrowserActivityObject::apply_shortcut(QString s)
 void BrowserActivityObject::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited)
         def->edit("Activity Object", its_default_stereotypes);
@@ -461,7 +463,7 @@ UmlCode BrowserActivityObject::get_type() const
 
 QString BrowserActivityObject::get_stype() const
 {
-    return TR("activity object");
+    return QObject::tr("activity object");
 }
 
 int BrowserActivityObject::get_identifier() const
@@ -500,7 +502,7 @@ BrowserNode * BrowserActivityObject::get_associated() const
 }
 
 void BrowserActivityObject::set_associated_diagram(BrowserActivityDiagram * dg,
-        bool on_read)
+                                                   bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -553,7 +555,7 @@ bool BrowserActivityObject::tool_cmd(ToolCom * com, const char * args)
             UmlCode k = com->get_kind(args);
 
             switch (k) {
-                // dependency not yet managed
+            // dependency not yet managed
             case UmlFlow: {
                 BrowserNode * end = (BrowserNode *) com->get_id(args);
 
@@ -562,7 +564,7 @@ bool BrowserActivityObject::tool_cmd(ToolCom * com, const char * args)
                 else
                     ok = FALSE;
             }
-            break;
+                break;
 
             case UmlSimpleRelations: {
                 UmlCode c;
@@ -578,7 +580,7 @@ bool BrowserActivityObject::tool_cmd(ToolCom * com, const char * args)
                         ok = FALSE;
                 }
             }
-            break;
+                break;
 
             default:
                 ok = FALSE;
@@ -609,25 +611,20 @@ bool BrowserActivityObject::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-bool BrowserActivityObject::may_contains_them(const Q3PtrList<BrowserNode> & l,
-        BooL & duplicable) const
+bool BrowserActivityObject::may_contains_them(const QList<BrowserNode *> & l,
+                                              BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    Q_UNUSED(duplicable);
+    
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlFlow:
         case UmlDependOn:
-            return (((const BrowserNode *) it.current()->parent()) == this);
+            return (((const BrowserNode *) node->parent()) == this);
 
         default:
             return FALSE;
         }
-
-        if (! may_contains(it.current(), FALSE))
-            return FALSE;
-
-        duplicable = may_contains_it(it.current());
     }
 
     return TRUE;
@@ -636,7 +633,7 @@ bool BrowserActivityObject::may_contains_them(const Q3PtrList<BrowserNode> & l,
 void BrowserActivityObject::DragMoveEvent(QDragMoveEvent * e)
 {
     if (UmlDrag::canDecode(e, BrowserFlow::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))) {
+            UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))) {
         if (!is_read_only)
             e->accept();
         else
@@ -654,8 +651,8 @@ void BrowserActivityObject::DropEvent(QDropEvent * e)
 void BrowserActivityObject::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        (UmlDrag::canDecode(e, BrowserFlow::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))))
+            (UmlDrag::canDecode(e, BrowserFlow::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))))
         e->accept();
     else
         e->ignore();
@@ -667,11 +664,11 @@ void BrowserActivityObject::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 
     if ((((bn = UmlDrag::decode(e, BrowserFlow::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this))) != 0)) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE))
             move(bn, after);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical( QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -684,7 +681,7 @@ void BrowserActivityObject::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 QString BrowserActivityObject::drag_key() const
 {
     return QString::number(UmlActivityObject)
-           + "#" + QString::number((unsigned long) get_container(UmlActivity));
+            + "#" + QString::number((unsigned long) get_container(UmlActivity));
 }
 
 QString BrowserActivityObject::drag_postfix() const
@@ -695,7 +692,7 @@ QString BrowserActivityObject::drag_postfix() const
 QString BrowserActivityObject::drag_key(BrowserNode * p)
 {
     return QString::number(UmlActivityObject)
-           + "#" + QString::number((unsigned long) p->get_container(UmlActivity));
+            + "#" + QString::number((unsigned long) p->get_container(UmlActivity));
 }
 
 void BrowserActivityObject::save_stereotypes(QTextStream & st)
@@ -738,7 +735,7 @@ void BrowserActivityObject::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -775,12 +772,12 @@ BrowserActivityObject * BrowserActivityObject::read_ref(char *& st)
     BrowserActivityObject * result = all[id];
 
     return (result == 0)
-           ? new BrowserActivityObject(id)
-           : result;
+            ? new BrowserActivityObject(id)
+            : result;
 }
 
 BrowserActivityObject * BrowserActivityObject::read(char *& st, char * k,
-        BrowserNode * parent)
+                                                    BrowserNode * parent)
 {
     BrowserActivityObject * result;
     int id;
@@ -790,8 +787,8 @@ BrowserActivityObject * BrowserActivityObject::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserActivityObject(id)
-               : result;
+                ? new BrowserActivityObject(id)
+                : result;
     }
     else if (!strcmp(k, "activityobject")) {
         id = read_id(st);
@@ -834,7 +831,7 @@ BrowserActivityObject * BrowserActivityObject::read(char *& st, char * k,
         }
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         return result;
     }
diff --git a/src/browser/BrowserActivityObject.h b/src/browser/BrowserActivityObject.h
index 1ef48ba1f..5761d44c2 100644
--- a/src/browser/BrowserActivityObject.h
+++ b/src/browser/BrowserActivityObject.h
@@ -60,16 +60,16 @@ class BrowserActivityObject : public BrowserNode, public Labeled<BrowserActivity
     void exec_menu_choice(int rank);
 
 public:
-    BrowserActivityObject(QString s, BrowserNode * p, int id = 0);
+    BrowserActivityObject(const QString & s, BrowserNode * p, int id = 0);
     BrowserActivityObject(const BrowserActivityObject * model, BrowserNode * p);
     virtual ~BrowserActivityObject();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> & l,
+                                    const QString & name = QString());
+    virtual bool may_contains_them(const QList<BrowserNode *> & l,
                                    BooL & duplicable) const;
     static BrowserActivityObject * add_activityobject(BrowserNode * future_parent,
-            const char * s);
+            QString s);
     static BrowserActivityObject * get_activityobject(BrowserNode * future_parent);
     virtual BasicData * add_relation(UmlCode, BrowserNode * end);
     QString may_start() const;
@@ -80,7 +80,7 @@ class BrowserActivityObject : public BrowserNode, public Labeled<BrowserActivity
     virtual void iconChanged();
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -109,8 +109,8 @@ class BrowserActivityObject : public BrowserNode, public Labeled<BrowserActivity
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
     static void init();
     static const QStringList & default_stereotypes();
diff --git a/src/browser/BrowserActivityPartition.cpp b/src/browser/BrowserActivityPartition.cpp
index 2c18ac628..b3d7adca7 100644
--- a/src/browser/BrowserActivityPartition.cpp
+++ b/src/browser/BrowserActivityPartition.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -65,7 +65,7 @@
 IdDict<BrowserActivityPartition> BrowserActivityPartition::all(__FILE__);
 QStringList BrowserActivityPartition::its_default_stereotypes;	// unicode
 
-BrowserActivityPartition::BrowserActivityPartition(QString s, BrowserNode * p, int id)
+BrowserActivityPartition::BrowserActivityPartition(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserActivityPartition>(all, id),
       def(new ActivityPartitionData), associated_diagram(0)
 {
@@ -87,7 +87,7 @@ BrowserActivityPartition::BrowserActivityPartition(const BrowserActivityPartitio
     comment = model->comment;
 }
 
-BrowserNode * BrowserActivityPartition::duplicate(BrowserNode * p, QString s)
+BrowserNode * BrowserActivityPartition::duplicate(BrowserNode * p, const QString & s)
 {
     BrowserNode * result = new BrowserActivityPartition(this, p);
 
@@ -117,13 +117,13 @@ void BrowserActivityPartition::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserActivityPartition::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserActivityPartition::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -157,19 +157,19 @@ BrowserActivityPartition::add_activitypartition(BrowserNode * future_parent)
 {
     QString name;
 
-    return (!future_parent->enter_child_name(name, TR("enter activity partition's \nname (may be empty) : "),
-            UmlActivityPartition, TRUE, TRUE))
+    return (!future_parent->enter_child_name(name, QObject::tr("enter activity partition's \nname (may be empty) : "),
+                                             UmlActivityPartition, TRUE, TRUE))
 
-           ? 0
-           : add_activitypartition(future_parent, name);
+            ? 0
+            : add_activitypartition(future_parent, name.toLatin1().constData());
 }
 
 BrowserActivityPartition *
 BrowserActivityPartition::add_activitypartition(BrowserNode * future_parent,
-        const char * name)
+                                                QString name)
 {
     BrowserActivityPartition * r =
-        new BrowserActivityPartition(name, future_parent);
+            new BrowserActivityPartition(name, future_parent);
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -181,17 +181,17 @@ BrowserActivityPartition *
 BrowserActivityPartition::get_activitypartition(BrowserNode * parent)
 {
     BrowserNodeList l;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = parent->firstChild(); child != 0; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlActivityPartition))
+                (((BrowserNode *) child)->get_type() == UmlActivityPartition))
             l.append((BrowserNode *) child);
 
     BrowserNode * old;
     QString name;
 
-    if (!parent->enter_child_name(name, TR("enter activity partition's \nname (may be empty) : "),
+    if (!parent->enter_child_name(name, QObject::tr("enter activity partition's \nname (may be empty) : "),
                                   UmlActivityPartition, l, &old,
                                   TRUE, TRUE))
         return 0;
@@ -200,7 +200,7 @@ BrowserActivityPartition::get_activitypartition(BrowserNode * parent)
         return ((BrowserActivityPartition *) old);
 
     BrowserActivityPartition * r =
-        new BrowserActivityPartition(name, parent);
+            new BrowserActivityPartition(name, parent);
 
     parent->setOpen(TRUE);
     parent->package_modified();
@@ -210,61 +210,64 @@ BrowserActivityPartition::get_activitypartition(BrowserNode * parent)
 
 void BrowserActivityPartition::menu()
 {
-    Q3PopupMenu m(0, "activity partition");
-    Q3PopupMenu toolm(0);
+    QMenu m("activity partition", 0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("New sub activity partition"), 0),
-                           TR("to add a sub <i>activity partition</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("New sub activity partition"), 0,
+                                 QObject::tr("to add a sub <i>activity partition</i>"));
+            m.addSeparator();
         }
 
-        m.setWhatsThis(m.insertItem(TR("Edit"), 4),
-                       TR("to edit the <i>activity partition</i>, \
-a double click with the left mouse button does the same thing"));
+        MenuFactory::addItem(m, QObject::tr("Edit"), 4,
+                             QObject::tr("to edit the <i>activity partition</i>, \
+                                         a double click with the left mouse button does the same thing"));
 
-        if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 5),
-                           TR("to copy the <i>activity partition</i> in a new one"));
-            m.insertSeparator();
+                                         if (!is_read_only) {
+                                             MenuFactory::addItem(m, QObject::tr("Duplicate"), 5,
+                                             QObject::tr("to copy the <i>activity partition</i> in a new one"));
+                                             m.addSeparator();
 
-            if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 8),
-                               TR("to delete the <i>activity partition</i>. \
-Note that you can undelete it after"));
-        }
+                                             if (edition_number == 0)
+                                             MenuFactory::addItem(m, QObject::tr("Delete"), 8,
+                                             QObject::tr("to delete the <i>activity partition</i>. \
+                                             Note that you can undelete it after"));
+                                         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 3),
-                       TR("to know who reference the <i>partition</i>"));
-        mark_menu(m, TR("the activity partition"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
+                                         MenuFactory::addItem(m, QObject::tr("Referenced by"), 3,
+                                                              QObject::tr("to know who reference the <i>partition</i>"));
+                             mark_menu(m, QObject::tr("the activity partition").toLatin1().constData(), 90);
+                ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 9),
-                       TR("to undelete the <i>activity partition</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 9,
+                             QObject::tr("to undelete the <i>activity partition</i>"));
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 10),
-                               TR("undelete the activity partition and its children"));
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 10,
+                                     QObject::tr("undelete the activity partition and its children"));
                 break;
             }
         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserActivityPartition::exec_menu_choice(int rank)
@@ -285,11 +288,11 @@ void BrowserActivityPartition::exec_menu_choice(int rank)
     case 5: {
         QString name;
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter activity partition's \nname (may be empty) : "),
-                UmlActivityPartition, TRUE, TRUE))
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter activity partition's \nname (may be empty) : "),
+                                                         UmlActivityPartition, TRUE, TRUE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
     }
-    break;
+        break;
 
     case 8:
         delete_it();
@@ -318,7 +321,7 @@ void BrowserActivityPartition::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserActivityPartition::apply_shortcut(QString s)
+void BrowserActivityPartition::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -352,7 +355,7 @@ void BrowserActivityPartition::apply_shortcut(QString s)
         if (s == "Undelete")
             choice = 9;
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -370,8 +373,8 @@ void BrowserActivityPartition::apply_shortcut(QString s)
 void BrowserActivityPartition::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited) {
         (new ActivityPartitionDialog(def))->show();
@@ -393,7 +396,7 @@ UmlCode BrowserActivityPartition::get_type() const
 
 QString BrowserActivityPartition::get_stype() const
 {
-    return TR("activity partition");
+    return QObject::tr("activity partition");
 }
 
 int BrowserActivityPartition::get_identifier() const
@@ -432,7 +435,7 @@ BrowserNode * BrowserActivityPartition::get_associated() const
 }
 
 void BrowserActivityPartition::set_associated_diagram(BrowserActivityDiagram * dg,
-        bool on_read)
+                                                      bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -510,25 +513,20 @@ bool BrowserActivityPartition::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-bool BrowserActivityPartition::may_contains_them(const Q3PtrList<BrowserNode> & l,
-        BooL & duplicable) const
+bool BrowserActivityPartition::may_contains_them(const QList<BrowserNode *> & l,
+                                                 BooL & duplicable) const
 {
+    Q_UNUSED(duplicable);
+    
     BrowserNode * activity = get_container(UmlActivity);
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlActivityPartition:
-            return (((const BrowserNode *) it.current()->get_container(UmlActivity)) == activity);
+            return (((const BrowserNode *) node->get_container(UmlActivity)) == activity);
 
         default:
             return FALSE;
         }
-
-        if (! may_contains(it.current(), FALSE))
-            return FALSE;
-
-        duplicable = may_contains_it(it.current());
     }
 
     return TRUE;
@@ -554,7 +552,7 @@ void BrowserActivityPartition::DropEvent(QDropEvent * e)
 void BrowserActivityPartition::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        (UmlDrag::canDecode(e, BrowserActivityPartition::drag_key(this))))
+            (UmlDrag::canDecode(e, BrowserActivityPartition::drag_key(this))))
         e->accept();
     else
         e->ignore();
@@ -565,36 +563,37 @@ void BrowserActivityPartition::DropAfterEvent(QDropEvent * e, BrowserNode * afte
     BrowserNode * bn;
 
     if ((((bn = UmlDrag::decode(e, BrowserActivityPartition::drag_key(this))) != 0)) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn, TRUE))  {
             if ((after == 0) &&
-                ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
+                    ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
                 // have choice
-                Q3PopupMenu m(0);
-
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
-
-                switch (m.exec(QCursor::pos())) {
-                case 1:
-                    break;
+                QMenu m(0);
+
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In ") + QString(get_name()), 1);
+                MenuFactory::addItem(m, QObject::tr("After ") + QString(get_name()), 2);
+                QAction *retAction = m.exec(QCursor::pos());
+                if(retAction)
+                    switch (retAction->data().toInt()) {
+                    case 1:
+                        break;
 
-                case 2:
-                    ((BrowserNode *) parent())->DropAfterEvent(e, this);
-                    return;
+                    case 2:
+                        ((BrowserNode *) parent())->DropAfterEvent(e, this);
+                        return;
 
-                default:
-                    e->ignore();
-                    return;
-                }
+                    default:
+                        e->ignore();
+                        return;
+                    }
             }
 
             move(bn, after);
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical( QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -607,7 +606,7 @@ void BrowserActivityPartition::DropAfterEvent(QDropEvent * e, BrowserNode * afte
 QString BrowserActivityPartition::drag_key() const
 {
     return QString::number(UmlActivityPartition)
-           + "#" + QString::number((unsigned long) get_container(UmlActivity));
+            + "#" + QString::number((unsigned long) get_container(UmlActivity));
 }
 
 QString BrowserActivityPartition::drag_postfix() const
@@ -618,18 +617,18 @@ QString BrowserActivityPartition::drag_postfix() const
 QString BrowserActivityPartition::drag_key(BrowserNode * p)
 {
     return QString::number(UmlActivityPartition)
-           + "#" + QString::number((unsigned long) p->get_container(UmlActivity));
+            + "#" + QString::number((unsigned long) p->get_container(UmlActivity));
 }
 
 void BrowserActivityPartition::post_load()
 {
     // to manage deleted represented elts
     IdIterator<BrowserActivityPartition> it(all);
+    while(it.hasNext()){
+        it.next();
+        if (it.value())
+            it.value()->def->post_load();
 
-    while (it.current()) {
-        it.current()->def->post_load();
-
-        ++it;
     }
 }
 
@@ -671,7 +670,7 @@ void BrowserActivityPartition::save(QTextStream & st, bool ref, QString & warnin
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -715,8 +714,8 @@ BrowserActivityPartition::read_ref(char *& st)
     BrowserActivityPartition * result = all[id];
 
     return (result == 0)
-           ? new BrowserActivityPartition(id)
-           : result;
+            ? new BrowserActivityPartition(id)
+            : result;
 }
 
 BrowserActivityPartition *
@@ -731,8 +730,8 @@ BrowserActivityPartition::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserActivityPartition(id)
-               : result;
+                ? new BrowserActivityPartition(id)
+                : result;
     }
     else if (!strcmp(k, "activitypartition")) {
         id = read_id(st);
@@ -766,7 +765,7 @@ BrowserActivityPartition::read(char *& st, char * k,
         result->BrowserNode::read(st, k, id);
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         BrowserNode * act = parent;
 
@@ -796,6 +795,6 @@ BrowserActivityPartition::read(char *& st, char * k,
 BrowserNode * BrowserActivityPartition::get_it(const char * k, int id)
 {
     return (!strcmp(k, "activitypartition_ref"))
-           ? all[id]
-           : 0;
+            ? all[id]
+              : 0;
 }
diff --git a/src/browser/BrowserActivityPartition.h b/src/browser/BrowserActivityPartition.h
index e410a13da..404debe00 100644
--- a/src/browser/BrowserActivityPartition.h
+++ b/src/browser/BrowserActivityPartition.h
@@ -58,22 +58,22 @@ class BrowserActivityPartition : public BrowserNode, public Labeled<BrowserActiv
     void exec_menu_choice(int rank);
 
 public:
-    BrowserActivityPartition(QString s, BrowserNode * p, int id = 0);
+    BrowserActivityPartition(const QString & s, BrowserNode * p, int id = 0);
     BrowserActivityPartition(const BrowserActivityPartition * model, BrowserNode * p);
     virtual ~BrowserActivityPartition();
 
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> & l,
+    virtual bool may_contains_them(const QList<BrowserNode *> & l,
                                    BooL & duplicable) const;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserActivityPartition * add_activitypartition(BrowserNode * future_parent);
-    static BrowserActivityPartition * add_activitypartition(BrowserNode * future_parent, const char * name);
+    static BrowserActivityPartition * add_activitypartition(BrowserNode * future_parent, QString name);
     static BrowserActivityPartition * get_activitypartition(BrowserNode * parent);
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -94,7 +94,7 @@ class BrowserActivityPartition : public BrowserNode, public Labeled<BrowserActiv
     static BrowserNode * get_it(const char * k, int id);
     static void post_load();
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
 
     static void clear(bool old);
     static void update_idmax_for_root();
diff --git a/src/browser/BrowserArtifact.cpp b/src/browser/BrowserArtifact.cpp
index ed454d575..3a854aafc 100644
--- a/src/browser/BrowserArtifact.cpp
+++ b/src/browser/BrowserArtifact.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <QMenu.h>
 #include <qcursor.h>
 #include <qdir.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 #include <QDragMoveEvent>
 #include <QDropEvent>
@@ -53,21 +53,22 @@
 #include "Tool.h"
 #include "ui/menufactory.h"
 #include "ClassListDialog.h"
+#include "UmlDrag.h"
+#include "DialogUtil.h"
 #include "GenerationSettings.h"
 #include "SourceDialog.h"
 #include "ReferenceDialog.h"
-#include "UmlDrag.h"
-#include "DialogUtil.h"
+
 #include "BrowserView.h"
 #include "ProfiledStereotypes.h"
 #include "mu.h"
 #include "translate.h"
-
+#include <qobject.h>
 IdDict<BrowserArtifact> BrowserArtifact::all(257, __FILE__);
 QStringList BrowserArtifact::its_default_stereotypes;	// unicode
 QStringList BrowserArtifact::relation_default_stereotypes;	// unicode
 
-BrowserArtifact::BrowserArtifact(QString s, BrowserNode * p, int id)
+BrowserArtifact::BrowserArtifact(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserArtifact>(all, id),
       cpp_h_edited(FALSE), cpp_src_edited(FALSE),
       java_edited(FALSE), php_edited(FALSE),
@@ -114,7 +115,7 @@ void BrowserArtifact::delete_it()
 {
     BrowserNode::delete_it();
 
-    Q3ValueList<BrowserClass *>::Iterator it;
+    QList<BrowserClass *>::Iterator it;
 
     for (it = associated_classes.begin(); it != associated_classes.end(); ++it)
         (*it)->set_associated_artifact(0, FALSE);
@@ -122,13 +123,12 @@ void BrowserArtifact::delete_it()
     associated_classes.clear();
 }
 
-BrowserNode * BrowserArtifact::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserArtifact::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserArtifact * result = new BrowserArtifact(this, p);
 
     result->set_name((name.isEmpty()) ? get_name() : name);
     result->update_stereotype();
-
     return result;
 }
 
@@ -145,50 +145,53 @@ void BrowserArtifact::update_idmax_for_root()
 void BrowserArtifact::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
-
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserArtifact::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserArtifact::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     compute_referenced_by(l, this);
-
     if (! ondelete)
         BrowserDeploymentDiagram::compute_referenced_by(l, this, "artifactcanvas", "artifact_ref");
 }
 
-void BrowserArtifact::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserClass * target)
+void BrowserArtifact::compute_referenced_by(QList<BrowserNode *> & l,
+                                            BrowserClass * target)
 {
     IdIterator<BrowserArtifact> it(all);
     BrowserArtifact * a;
 
-    while ((a = it.current()) != 0) {
-        if (!a->deletedp() &&
-            (a->associated_classes.findIndex(target) != -1))
-            l.append(a);
+    while(it.hasNext()){
+        it.next();
+        if ((a = it.value()) != 0)
+            if (!a->deletedp() &&
+                    (a->associated_classes.indexOf(target) != -1))
+                l.append(a);
 
-        ++it;
     }
 }
 
-void BrowserArtifact::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserArtifact * target)
+void BrowserArtifact::compute_referenced_by(QList<BrowserNode *> & l,
+                                            BrowserArtifact * target)
 {
-    IdIterator<BrowserArtifact> it(all);
 
-    while (it.current()) {
-        if (!it.current()->deletedp() &&
-            (it.current()->def->get_associated() != 0) &&
-            (it.current()->def->get_associated()->find(target) != 0))
-            l.append(it.current());
+    IdIterator<BrowserArtifact> it(all);
 
-        ++it;
+    while (it.hasNext()) {
+        it.next();
+        if(it.value())
+        {
+            if (!it.value()->deletedp() &&
+                    (it.value()->def->get_associated() != 0) &&
+                    (it.value()->def->get_associated()->contains(target) != 0))
+                l.append(it.value());
+        }
     }
+
 }
 
 void BrowserArtifact::renumber(int phase)
@@ -201,7 +204,6 @@ const QPixmap * BrowserArtifact::pixmap(int) const
 {
     if (deletedp())
         return DeletedArtifactIcon;
-
     const QPixmap * px = ProfiledStereotypes::browserPixmap(def->get_stereotype());
 
     return (px != 0) ? px : ArtifactIcon;
@@ -209,6 +211,7 @@ const QPixmap * BrowserArtifact::pixmap(int) const
 
 void BrowserArtifact::iconChanged()
 {
+
     repaint();
     def->modified();
 }
@@ -218,14 +221,18 @@ QString BrowserArtifact::full_name(bool rev, bool) const
     return fullname(rev);
 }
 
-QString BrowserArtifact::get_path(QString path, QString root,
+QString BrowserArtifact::get_path(const QString & pathInit, const QString & rootInit,
                                   const char * ext) const
 {
+    QString root = rootInit;
+    
     if (QDir::isRelativePath(root))
         root = BrowserView::get_dir().filePath(root);
 
     QDir d_root(root);
 
+    QString path = pathInit;
+
     if (path.isEmpty())
         path = root;
     else if (QDir::isRelativePath(path))
@@ -249,71 +256,70 @@ void BrowserArtifact::get_paths(QString & cpp_h_path, QString & cpp_src_path,
 
     if (a_text || !strcmp(def->get_stereotype(), "source")) {
         PackageData * pd = (PackageData *)
-                           ((BrowserNode *) parent()->parent())->get_data();
+                ((BrowserNode *) parent()->parent())->get_data();
 
         if (!a_text && (def->get_cpp_h()[0] != 0))
             cpp_h_path = get_path((const char *) pd->get_cpp_h_dir(),
                                   GenerationSettings::get_cpp_root_dir(),
-                                  GenerationSettings::get_cpp_h_extension());
+                                  GenerationSettings::get_cpp_h_extension().toLatin1().constData());
 
         if (def->get_cpp_src()[0] != 0)
             cpp_src_path = get_path((const char *) pd->get_cpp_src_dir(),
                                     GenerationSettings::get_cpp_root_dir(),
                                     (a_text) ? (const char *) 0
-                                    : (const char *) GenerationSettings::get_cpp_src_extension());
+                                             : (const char *) GenerationSettings::get_cpp_src_extension().toLatin1().constData());
 
         if (def->get_java_src()[0] != 0)
             java_path = get_path((const char *) pd->get_java_dir(),
                                  GenerationSettings::get_java_root_dir(),
                                  (a_text) ? (const char *) 0
-                                 : (const char *) GenerationSettings::get_java_extension());
+                                          : (const char *) GenerationSettings::get_java_extension().toLatin1().constData());
 
         if (def->get_php_src()[0] != 0)
             php_path = get_path((const char *) pd->get_php_dir(),
                                 GenerationSettings::get_php_root_dir(),
                                 (a_text) ? (const char *) 0
-                                : (const char *) GenerationSettings::get_php_extension());
+                                         : (const char *) GenerationSettings::get_php_extension().toLatin1().constData());
 
         if (def->get_python_src()[0] != 0)
             python_path = get_path((const char *) pd->get_python_dir(),
                                    GenerationSettings::get_python_root_dir(),
                                    (a_text) ? (const char *) 0
-                                   : (const char *) GenerationSettings::get_python_extension());
+                                            : (const char *) GenerationSettings::get_python_extension().toLatin1().constData());
 
         if (def->get_idl_src()[0] != 0)
             idl_path = get_path((const char *) pd->get_idl_dir(),
                                 GenerationSettings::get_idl_root_dir(),
                                 (a_text) ? (const char *) 0
-                                : (const char *) GenerationSettings::get_idl_extension());
+                                         : (const char *) GenerationSettings::get_idl_extension().toLatin1().constData());
     }
 }
 
 // just check if the inheritance already exist
 QString BrowserArtifact::check_inherit(const BrowserNode * new_parent) const
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling()) {
         BrowserNode * ch = ((BrowserNode *) child);
 
         if ((ch->get_type() == UmlInherit) &&
-            ((((SimpleRelationData *) ch->get_data())->get_end_node())
-             == new_parent))
-            return TR("already exist");
+                ((((SimpleRelationData *) ch->get_data())->get_end_node())
+                 == new_parent))
+            return QObject::tr("already exist");
     }
-
-    return (new_parent != this) ? QString() : TR("circular inheritance");
+    return (new_parent != this) ? QString() : QObject::tr("circular inheritance");
 }
 
 void BrowserArtifact::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu clsubm(0);
-    Q3PopupMenu gensubm(0);
-    Q3PopupMenu editsubm(0);
-    Q3PopupMenu roundtripbodysubm(0);
-    Q3PopupMenu roundtripsubm(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu clsubm(0);
+    QMenu gensubm(0);
+    QMenu editsubm(0);
+    QMenu roundtripbodysubm(0);
+    QMenu roundtripsubm(0);
+    QMenu toolm(0);
     QString cpp_h_path;
     QString cpp_src_path;
     QString java_path;
@@ -322,20 +328,20 @@ void BrowserArtifact::menu()
     QString idl_path;
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>artifact</i>, \
-a double click with the left mouse button does the same thing"));
-
-            if (!is_read_only && (edition_number == 0)) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Delete"), 1),
-                               TR("to delete the <i>artifact</i>. \
-Note that you can undelete it after"));
-            }
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>artifact</i>, \
+                                             a double click with the left mouse button does the same thing"));
+
+                                             if (!is_read_only && (edition_number == 0)) {
+                                                 m.addSeparator();
+                                                 MenuFactory::addItem(m, QObject::tr("Delete"), 1,
+                                                 QObject::tr("to delete the <i>artifact</i>. \
+                                                 Note that you can undelete it after"));
+                                             }
         }
 
         bool a_text = !strcmp(def->get_stereotype(), "text");
@@ -346,132 +352,134 @@ Note that you can undelete it after"));
         bool idl = GenerationSettings::idl_get_default_defs();
 
         if ((a_text || !strcmp(def->get_stereotype(), "source")) &&
-            (cpp || java || php || python || idl)) {
-            m.insertSeparator();
-            m.insertItem(TR("Generate"), &gensubm);
+                (cpp || java || php || python || idl)) {
+            m.addSeparator();
+            MenuFactory::insertItem(m, QObject::tr("Generate"), &gensubm);
 
             if (cpp)
-                gensubm.insertItem("C++", 10);
+                MenuFactory::addItem(gensubm, "C++", 10);
 
             if (java)
-                gensubm.insertItem("Java", 11);
+                MenuFactory::addItem(gensubm, "Java", 11);
 
             if (php)
-                gensubm.insertItem("Php", 22);
+                MenuFactory::addItem(gensubm, "Php", 22);
 
             if (python)
-                gensubm.insertItem("Python", 25);
+                MenuFactory::addItem(gensubm, "Python", 25);
 
             if (idl)
-                gensubm.insertItem("Idl", 12);
+                MenuFactory::addItem(gensubm, "Idl", 12);
 
             if (!a_text && preserve_bodies() && (cpp || java || php || python)) {
-                m.insertItem(TR("Roundtrip body"), &roundtripbodysubm);
+                MenuFactory::insertItem(m, QObject::tr("Roundtrip body"), &roundtripbodysubm);
 
                 if (cpp)
-                    roundtripbodysubm.insertItem("C++", 30);
+                    MenuFactory::addItem(roundtripbodysubm, "C++", 30);
 
                 if (java)
-                    roundtripbodysubm.insertItem("Java", 31);
+                    MenuFactory::addItem(roundtripbodysubm, "Java", 31);
 
                 if (php)
-                    roundtripbodysubm.insertItem("Php", 32);
+                    MenuFactory::addItem(roundtripbodysubm, "Php", 32);
 
                 if (python)
-                    roundtripbodysubm.insertItem("Python", 33);
+                    MenuFactory::addItem(roundtripbodysubm, "Python", 33);
             }
 
             get_paths(cpp_h_path, cpp_src_path, java_path, php_path, python_path, idl_path);
 
             if (cpp && !a_text && !cpp_h_edited && !cpp_h_path.isEmpty()) {
-                editsubm.insertItem(TR("C++ header file"), 14);
+                MenuFactory::addItem(editsubm, QObject::tr("C++ header file"), 14);
 
-                if (! is_read_only) roundtripsubm.insertItem("C++", 15);
+                if (! is_read_only) MenuFactory::addItem(roundtripsubm, "C++", 15);
             }
 
             if (cpp && !cpp_src_edited && !cpp_src_path.isEmpty()) {
-                editsubm.insertItem(TR("C++ source file"), 16);
+                MenuFactory::addItem(editsubm, QObject::tr("C++ source file"), 16);
             }
 
             if (java && !java_edited && !java_path.isEmpty()) {
-                editsubm.insertItem(TR("Java source file"), 18);
+                MenuFactory::addItem(editsubm, QObject::tr("Java source file"), 18);
 
-                if (! is_read_only) roundtripsubm.insertItem("Java", 19);
+                if (! is_read_only) MenuFactory::addItem(roundtripsubm, "Java", 19);
             }
 
             if (php && !php_edited && !php_path.isEmpty()) {
-                editsubm.insertItem(TR("Php source file"), 23);
+                MenuFactory::addItem(editsubm, QObject::tr("Php source file"), 23);
                 //if (! is_read_only) roundtripsubm.insertItem("Php", 24);
             }
 
             if (python && !python_edited && !python_path.isEmpty()) {
-                editsubm.insertItem(TR("Python source file"), 26);
+                MenuFactory::addItem(editsubm, QObject::tr("Python source file"), 26);
                 //if (! is_read_only) roundtripsubm.insertItem("Python", 27);
             }
 
             if (idl && !idl_edited && !idl_path.isEmpty()) {
-                editsubm.insertItem(TR("Idl source file"), 20);
+                MenuFactory::addItem(editsubm, QObject::tr("Idl source file"), 20);
                 //if (! is_read_only) roundtripsubm.insertItem("Idl", 21);
             }
 
-            if (roundtripsubm.count() != 0)
-                m.insertItem(TR("Roundtrip"), &roundtripsubm);
+            if (roundtripsubm.actions().count() != 0)
+                MenuFactory::insertItem(m, QObject::tr("Roundtrip"), &roundtripsubm);
 
-            if (editsubm.count() != 0)
-                m.insertItem(TR("See file"), &editsubm);
+            if (editsubm.actions().count() != 0)
+                MenuFactory::insertItem(m, QObject::tr("See file"), &editsubm);
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 3),
-                       TR("to know who reference the <i>artifact</i> \
-through a relation"));
-        mark_menu(m, TR("the artifact"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 3,
+                             QObject::tr("to know who reference the <i>artifact</i> \
+                                         through a relation"));
+                                         mark_menu(m, QObject::tr("the artifact").toLatin1().constData(), 90);
+                             ProfiledStereotypes::menu(m, this, 99990);
+
+                if ((edition_number == 0) &&
+                    Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 2),
-                       TR("to undelete the <i>artifact</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 2,
+                             QObject::tr("to undelete the <i>artifact</i>"));
 
     int n = 0;
-    Q3ValueList<BrowserClass *>::ConstIterator end = associated_classes.end();
-    Q3ValueList<BrowserClass *>::ConstIterator it;
+    QList<BrowserClass *>::ConstIterator end = associated_classes.end();
+    QList<BrowserClass *>::ConstIterator it;
 
     for (it = associated_classes.begin(); it != end; ++it)
         if (!(*it)->deletedp())
             n += 1;
 
     if (n == 1) {
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Select the associated class"), 10000),
-                       TR("to select the associated <i>class</i>"));
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Select the associated class"), 10000,
+                             QObject::tr("to select the associated <i>class</i>"));
     }
     else if (n > 20) {
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Select an associated class"), 9999),
-                       TR("to select an associated <i>class</i>"));
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Select an associated class"), 9999,
+                             QObject::tr("to select an associated <i>class</i>"));
     }
     else if (n != 0) {
-        m.insertSeparator();
-        MenuFactory::createTitle(clsubm, TR("Choose class"));
-        clsubm.insertSeparator();
+        m.addSeparator();
+        MenuFactory::createTitle(clsubm, QObject::tr("Choose class"));
+        clsubm.addSeparator();
 
         for (it = associated_classes.begin(), n = 10000; it != end; ++it)
             if (!(*it)->deletedp())
-                clsubm.insertItem((*it)->full_name(TRUE), n++);
+                MenuFactory::addItem(clsubm, (*it)->full_name(TRUE), n++);
 
-        m.setWhatsThis(m.insertItem(TR("Select an associated class"), &clsubm),
-                       TR("to select an associated <i>class</i>"));
+        MenuFactory::insertItem(m, QObject::tr("Select an associated class"), &clsubm,
+                                QObject::tr("to select an associated <i>class</i>"));
     }
-
-    exec_menu_choice(m.exec(QCursor::pos()),
-                     cpp_h_path, cpp_src_path,
-                     java_path, php_path, python_path, idl_path);
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt(),
+                         cpp_h_path, cpp_src_path,
+                         java_path, php_path, python_path, idl_path);
 }
 
 void BrowserArtifact::exec_menu_choice(int rank,
@@ -505,44 +513,44 @@ void BrowserArtifact::exec_menu_choice(int rank,
 
         ToolCom::run((verbose_generation())
                      ? ((preserve) ? "cpp_generator -v -p" : "cpp_generator -v")
-                         : ((preserve) ? "cpp_generator -p" : "cpp_generator"),
-                         this);
+                     : ((preserve) ? "cpp_generator -p" : "cpp_generator"),
+                     this);
     }
 
-    return;
+        return;
 
     case 11: {
         bool preserve = preserve_bodies();
 
         ToolCom::run((verbose_generation())
                      ? ((preserve) ? "java_generator -v -p" : "java_generator -v")
-                         : ((preserve) ? "java_generator -p" : "java_generator"),
-                         this);
+                     : ((preserve) ? "java_generator -p" : "java_generator"),
+                     this);
     }
 
-    return;
+        return;
 
     case 22: {
         bool preserve = preserve_bodies();
 
         ToolCom::run((verbose_generation())
                      ? ((preserve) ? "php_generator -v -p" : "php_generator -v")
-                         : ((preserve) ? "php_generator -p" : "php_generator"),
-                         this);
+                     : ((preserve) ? "php_generator -p" : "php_generator"),
+                     this);
     }
 
-    return;
+        return;
 
     case 25: {
         bool preserve = preserve_bodies();
 
         ToolCom::run((verbose_generation())
                      ? ((preserve) ? "python_generator -v -p" : "python_generator -v")
-                         : ((preserve) ? "python_generator -p" : "python_generator"),
-                         this);
+                     : ((preserve) ? "python_generator -p" : "python_generator"),
+                     this);
     }
 
-    return;
+        return;
 
     case 12:
         ToolCom::run((verbose_generation()) ? "idl_generator -v" : "idl_generator", this);
@@ -613,7 +621,7 @@ void BrowserArtifact::exec_menu_choice(int rank,
         return;
 
     case 9999: {
-        ClassListDialog dialog(TR("Choose class"), associated_classes);
+        ClassListDialog dialog(QObject::tr("Choose class").toLatin1().constData(), associated_classes);
 
         dialog.raise();
 
@@ -623,13 +631,13 @@ void BrowserArtifact::exec_menu_choice(int rank,
         rank = dialog.choosen() + 10000;
     }
 
-    // no break
+        // no break
     default:
         if (rank >= 99990)
             ProfiledStereotypes::choiceManagement(this, rank - 99990);
         else if (rank >= 10000) {
             int n;
-            Q3ValueList<BrowserClass *>::ConstIterator it;
+            QList<BrowserClass *>::ConstIterator it;
 
             for (it = associated_classes.begin(), n = 10000;
                  (*it)->deletedp() || (n++ != rank);
@@ -649,7 +657,7 @@ void BrowserArtifact::exec_menu_choice(int rank,
     package_modified();
 }
 
-void BrowserArtifact::apply_shortcut(QString s)
+void BrowserArtifact::apply_shortcut(const QString & s)
 {
     int choice = -1;
     QString cpp_h_path;
@@ -801,7 +809,7 @@ UmlCode BrowserArtifact::get_type() const
 
 QString BrowserArtifact::get_stype() const
 {
-    return TR("artifact");
+    return QObject::tr("artifact");
 }
 
 int BrowserArtifact::get_identifier() const
@@ -816,6 +824,7 @@ const char * BrowserArtifact::help_topic() const
 
 void BrowserArtifact::DragMoveEvent(QDragMoveEvent * e)
 {
+
     if (UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))) {
         if (!is_read_only)
             e->accept();
@@ -824,15 +833,18 @@ void BrowserArtifact::DragMoveEvent(QDragMoveEvent * e)
     }
     else
         ((BrowserNode *) parent())->DragMoveInsideEvent(e);
+
 }
 
 void BrowserArtifact::DragMoveInsideEvent(QDragMoveEvent * e)
 {
+
     if (!is_read_only &&
-        UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)))
+            UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)))
         e->accept();
     else
         e->ignore();
+
 }
 
 void BrowserArtifact::DropEvent(QDropEvent * e)
@@ -845,15 +857,15 @@ void BrowserArtifact::DropAfterEvent(QDropEvent * e, BrowserNode * after)
     BrowserNode * bn;
 
     if (((bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this))) != 0) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE)) {
             BrowserNode * old = ((BrowserNode *) bn->parent());
 
             if (after)
                 bn->moveItem(after);
             else {
-                bn->parent()->takeItem(bn);
-                insertItem(bn);
+                bn->parent()->removeChild(bn);
+                addChild(bn);
             }
 
             if (old != this) {
@@ -866,7 +878,7 @@ void BrowserArtifact::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             package_modified();
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -877,15 +889,14 @@ void BrowserArtifact::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 }
 
 BrowserArtifact * BrowserArtifact::get_artifact(BrowserNode * future_parent,
-        bool existing)
+                                                bool existing)
 {
     BrowserNode * old;
     QString name;
     BrowserNodeList nodes;
-
     if (!future_parent->enter_child_name(name,
-                                         (existing) ? TR("choose existing artifact")
-                                         : TR("enter artifact's name : "),
+                                         (existing) ? QObject::tr("choose existing artifact")
+                                         : QObject::tr("enter artifact's name : "),
                                          UmlArtifact, instances(nodes), &old,
                                          TRUE, FALSE, existing))
         return 0;
@@ -895,7 +906,6 @@ BrowserArtifact * BrowserArtifact::get_artifact(BrowserNode * future_parent,
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
-
     return new BrowserArtifact(name, future_parent);
 }
 
@@ -903,12 +913,13 @@ BrowserArtifact * BrowserArtifact::add_artifact(BrowserNode * future_parent)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter artifact's name : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter artifact's name : "),
                                          UmlArtifact, TRUE, FALSE))
         return 0;
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
+
     return new BrowserArtifact(name, future_parent);
 }
 
@@ -922,25 +933,25 @@ BrowserNodeList & BrowserArtifact::instances(BrowserNodeList & result, const cha
     IdIterator<BrowserArtifact> it(all);
 
     if ((st == 0) || (*st == 0)) {
-        while (it.current() != 0) {
-            if (!it.current()->deletedp())
-                result.append(it.current());
-
-            ++it;
+        while(it.hasNext())
+        {
+            it.next();
+            if (it.value() != 0)
+                if (!it.value()->deletedp())
+                    result.append(it.value());
         }
     }
     else {
-        while (it.current() != 0) {
-            if (!it.current()->deletedp() &&
-                !strcmp(it.current()->get_data()->get_stereotype(), st))
-                result.append(it.current());
-
-            ++it;
+        while(it.hasNext()){
+            it.next();
+            if (it.value() != 0)
+                if (!it.value()->deletedp() &&
+                        !strcmp(it.value()->get_data()->get_stereotype(), st))
+                    result.append(it.value());
         }
     }
 
     result.sort_it();
-
     return result;
 }
 
@@ -949,13 +960,12 @@ BrowserArtifact * BrowserArtifact::find(const char * s)
     IdIterator<BrowserArtifact> it(all);
     BrowserArtifact * cl;
 
-    while ((cl = it.current()) != 0) {
-        if (strcmp(cl->name, s) == 0)
-            return cl;
-
-        ++it;
+    while(it.hasNext()){
+        it.next();
+        if ((cl = it.value()) != 0)
+            if (strcmp(cl->name.toLatin1().constData(), s) == 0)
+                return cl;
     }
-
     return 0;
 }
 
@@ -965,7 +975,7 @@ BrowserNode * BrowserArtifact::get_associated() const
 }
 
 void BrowserArtifact::set_associated_diagram(BrowserDeploymentDiagram * dg,
-        bool on_read)
+                                             bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -999,7 +1009,7 @@ void BrowserArtifact::on_delete()
     */
 }
 
-const Q3ValueList<BrowserClass *> & BrowserArtifact::get_associated_classes() const
+const QList<BrowserClass *> & BrowserArtifact::get_associated_classes() const
 {
     return associated_classes;
 }
@@ -1010,8 +1020,8 @@ void BrowserArtifact::associate_class(BrowserClass * c, bool on_read)
 
     /*
     QObject::connect(c->get_data(), SIGNAL(deleted()),
-    	   def, SLOT(on_delete()));
-    	   */
+           def, SLOT(on_delete()));
+           */
     if (!on_read) {
         ClassData * cd = (ClassData *) c->get_data();
 
@@ -1049,47 +1059,41 @@ void BrowserArtifact::associate_class(BrowserClass * c, bool on_read)
 
 bool BrowserArtifact::add_associated_class(BrowserClass * c, bool on_read)
 {
-    if (associated_classes.findIndex(c) == -1) {
+    if (associated_classes.indexOf(c) == -1) {
         associated_classes.append(c);
         associate_class(c, on_read);
         return TRUE;
     }
-
     return FALSE;
 }
 
 bool BrowserArtifact::remove_associated_class(BrowserClass * c, bool on_read)
 {
-    Q3ValueList<BrowserClass *>::Iterator it = associated_classes.find(c);
-
-    if (it != associated_classes.end()) {
-        associated_classes.remove(it);
+    if (associated_classes.contains(c)) {
+        associated_classes.removeOne(c);
         c->set_associated_artifact(0, on_read);
-
         /*
         QObject::disconnect(c->get_data(), SIGNAL(deleted()),
-        		def, SLOT(on_delete()));
-        		*/
+                def, SLOT(on_delete()));
+                */
         if (!on_read)
             package_modified();
-
         return TRUE;
     }
-
     return FALSE;
 }
 
-void BrowserArtifact::set_associated_classes(const Q3ValueList<BrowserClass *> & l,
-        bool on_read)
+void BrowserArtifact::set_associated_classes(const QList<BrowserClass *> & l,
+                                             bool on_read)
 {
     // manage removed classes
-    Q3ValueList<BrowserClass *>::Iterator it = associated_classes.begin();
 
+    QList<BrowserClass *>::Iterator it = associated_classes.begin();
     while (it != associated_classes.end()) {
-        if (l.findIndex(*it) == -1) {
+        if (l.indexOf(*it) == -1) {
             BrowserClass * cl = *it;
 
-            it = associated_classes.remove(it);
+            it = associated_classes.erase(it);
             cl->set_associated_artifact(0, on_read);
         }
         else
@@ -1097,17 +1101,18 @@ void BrowserArtifact::set_associated_classes(const Q3ValueList<BrowserClass *> &
     }
 
     // manage added classes
-    Q3ValueList<BrowserClass *> old = associated_classes;
+    QList<BrowserClass *> old = associated_classes;
     associated_classes = l;	// to follow order
-    Q3ValueList<BrowserClass *>::Iterator end = associated_classes.end();
+    QList<BrowserClass *>::Iterator end = associated_classes.end();
 
     for (it = associated_classes.begin(); it != end; ++it)
-        if (old.findIndex(*it) == -1)
+        if (old.indexOf(*it) == -1)
             // new
             associate_class(*it, on_read);
 
     if (!on_read)
         package_modified();
+
 }
 
 void BrowserArtifact::init()
@@ -1161,28 +1166,28 @@ bool BrowserArtifact::tool_cmd(ToolCom * com, const char * args)
 
             case setAssocClassesCmd: {
                 // check redondency
-                Q3ValueList<BrowserClass *> l;
+                QList<BrowserClass *> l;
                 unsigned n = com->get_unsigned(args);
 
                 while (n--)
                     l.append((BrowserClass *) com->get_id(args));
 
-                Q3ValueList<BrowserClass *>::ConstIterator it = l.begin();
-                Q3ValueList<BrowserClass *>::ConstIterator end = l.end();
+                QList<BrowserClass *>::ConstIterator it = l.begin();
+                QList<BrowserClass *>::ConstIterator end = l.end();
 
                 while (it != end) {
                     BrowserClass * cl = *it;
-
-                    if (l.find(++it, cl) != end) {
+                    if (l.contains(cl)) {
                         com->write_ack(FALSE);
                         return TRUE;
                     }
+                    ++it;
                 }
 
                 set_associated_classes(l);
                 com->write_ack(TRUE);
             }
-            break;
+                break;
 
             case setUserCmd:
                 // plug-out upgrade
@@ -1225,7 +1230,7 @@ bool BrowserArtifact::tool_cmd(ToolCom * com, const char * args)
                             end = (BrowserNode *) com->get_id(args);
 
                             if ((end->get_type() == UmlArtifact) &&
-                                (check_inherit(end).isEmpty()))
+                                    (check_inherit(end).isEmpty()))
                                 add_relation(UmlInherit, end)->get_browser_node()->write_id(com);
                             else
                                 ok = FALSE;
@@ -1237,7 +1242,7 @@ bool BrowserArtifact::tool_cmd(ToolCom * com, const char * args)
                         }
                     }
                 }
-                break;
+                    break;
 
                 default:
                     ok = FALSE;
@@ -1317,8 +1322,8 @@ void BrowserArtifact::save(QTextStream & st, bool ref, QString & warning)
             st << "associated_classes";
             indent(+1);
 
-            Q3ValueList<BrowserClass *>::ConstIterator it;
-            Q3ValueList<BrowserClass *>::ConstIterator end = associated_classes.end();
+            QList<BrowserClass *>::ConstIterator it;
+            QList<BrowserClass *>::ConstIterator end = associated_classes.end();
 
             for (it = associated_classes.begin(); it != end; ++it) {
                 nl_indent(st);
@@ -1334,7 +1339,7 @@ void BrowserArtifact::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -1365,15 +1370,15 @@ void BrowserArtifact::save(QTextStream & st, bool ref, QString & warning)
 BrowserArtifact * BrowserArtifact::read_ref(char *& st, const char * k)
 {
     if (strcmp(k, "artifact_ref") &&
-        ((read_file_format() >= 20) || strcmp(k, "component_ref")))
+            ((read_file_format() >= 20) || strcmp(k, "component_ref")))
         wrong_keyword(k, "artifact_ref");
 
     int id = read_id(st);
     BrowserArtifact * result = all[id];
 
     return (result == 0)
-           ? new BrowserArtifact(id)
-           : result;
+            ? new BrowserArtifact(id)
+            : result;
 }
 
 BrowserArtifact * BrowserArtifact::read(char *& st, char * k,
@@ -1383,7 +1388,7 @@ BrowserArtifact * BrowserArtifact::read(char *& st, char * k,
     int id;
 
     if (!strcmp(k, "artifact_ref") ||
-        ((read_file_format() < 20) && !strcmp(k, "component_ref"))) {
+            ((read_file_format() < 20) && !strcmp(k, "component_ref"))) {
         if ((result = all[id = read_id(st)]) == 0)
             result = new BrowserArtifact(id);
 
@@ -1419,7 +1424,7 @@ BrowserArtifact * BrowserArtifact::read(char *& st, char * k,
         result->is_defined = TRUE;
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         if ((read_file_format() < 20) && !strcmp(k, "associated_component_diagram")) {
             // old format && component -> artifact
@@ -1435,7 +1440,7 @@ BrowserArtifact * BrowserArtifact::read(char *& st, char * k,
 
         if ((read_file_format() < 20) && !strcmp(k, "associated_class")) {
             // old format from component definition (component -> artifact)
-            Q3ValueList<BrowserClass *> l;
+            QList<BrowserClass *> l;
 
             if (read_file_format() < 3)
                 // very old format
@@ -1447,7 +1452,7 @@ BrowserArtifact * BrowserArtifact::read(char *& st, char * k,
             k = read_keyword(st);
         }
         else if (!strcmp(k, "associated_classes")) {
-            Q3ValueList<BrowserClass *> l;
+            QList<BrowserClass *> l;
 
             while (strcmp((k = read_keyword(st)), "end"))
                 l.append(BrowserClass::read_ref(st, k));
diff --git a/src/browser/BrowserArtifact.h b/src/browser/BrowserArtifact.h
index 52b4d61a1..568fc7cff 100644
--- a/src/browser/BrowserArtifact.h
+++ b/src/browser/BrowserArtifact.h
@@ -2,7 +2,7 @@
 #include <QPixmap>
 #include <QDropEvent>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QDragMoveEvent>
 // *************************************************************************
 //
@@ -60,7 +60,7 @@ class BrowserArtifact : public BrowserNode, public Labeled<BrowserArtifact>
     BooL idl_edited;
     ArtifactData * def;
     BrowserDeploymentDiagram * associated_diagram;
-    Q3ValueList<BrowserClass *> associated_classes;
+    QList<BrowserClass *> associated_classes;
 
 protected:
     void exec_menu_choice(int rank,
@@ -69,7 +69,7 @@ class BrowserArtifact : public BrowserNode, public Labeled<BrowserArtifact>
                           QString python_path, QString idl_path);
 
 public:
-    BrowserArtifact(QString s, BrowserNode * p, int id = 0);
+    BrowserArtifact(const QString & s, BrowserNode * p, int id = 0);
     BrowserArtifact(const BrowserArtifact * model, BrowserNode * p);
     BrowserArtifact(int id);
 
@@ -78,18 +78,18 @@ class BrowserArtifact : public BrowserNode, public Labeled<BrowserArtifact>
     virtual BrowserNode * get_associated() const;
     void set_associated_diagram(BrowserDeploymentDiagram *, bool on_read = FALSE);
 
-    const Q3ValueList<BrowserClass *> & get_associated_classes() const;
-    void set_associated_classes(const Q3ValueList<BrowserClass *> & l,
+    const QList<BrowserClass *> & get_associated_classes() const;
+    void set_associated_classes(const QList<BrowserClass *> & l,
                                 bool on_read = FALSE);
     bool add_associated_class(BrowserClass *, bool on_read = FALSE);
     bool remove_associated_class(BrowserClass *, bool on_read = FALSE);
 
     virtual void delete_it();
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool force_edit);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -121,9 +121,9 @@ class BrowserArtifact : public BrowserNode, public Labeled<BrowserArtifact>
     virtual const QPixmap * pixmap(int) const;
     virtual void iconChanged();
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserArtifact *);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserClass *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserArtifact *);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserClass *);
 
     static void init();
     static const QStringList & default_stereotypes();
@@ -140,7 +140,7 @@ class BrowserArtifact : public BrowserNode, public Labeled<BrowserArtifact>
     void get_paths(QString & cpp_h_path, QString & cpp_src_path,
                    QString & java_path, QString & php_path,
                    QString & python_path, QString & idl_path) const;
-    QString get_path(QString path, QString root,
+    QString get_path(const QString & path, const QString & root,
                      const char * ext) const;
 };
 
diff --git a/src/browser/BrowserAttribute.cpp b/src/browser/BrowserAttribute.cpp
index ac4306716..b396769ef 100644
--- a/src/browser/BrowserAttribute.cpp
+++ b/src/browser/BrowserAttribute.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+////#include <q3popupmenu.h>
 #include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
@@ -60,7 +60,7 @@
 IdDict<BrowserAttribute> BrowserAttribute::all(1021, __FILE__);
 QStringList BrowserAttribute::its_default_stereotypes;	// unicode
 
-BrowserAttribute::BrowserAttribute(QString s, BrowserNode * p, AttributeData * d, int id)
+BrowserAttribute::BrowserAttribute(const QString & s, BrowserNode * p, AttributeData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserAttribute>(all, id),
       def(d), get_oper(0), set_oper(0)
 {
@@ -82,7 +82,7 @@ BrowserAttribute::BrowserAttribute(const BrowserAttribute * model, BrowserNode *
     comment = model->comment;
 }
 
-BrowserAttribute * BrowserAttribute::new_one(QString s, BrowserNode * p,
+BrowserAttribute * BrowserAttribute::new_one(const QString & s, BrowserNode * p,
         bool enum_item)
 {
     AttributeData * d = new AttributeData();
@@ -93,11 +93,12 @@ BrowserAttribute * BrowserAttribute::new_one(QString s, BrowserNode * p,
     return result;
 }
 
-BrowserNode * BrowserAttribute::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserAttribute::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserAttribute * result = new BrowserAttribute(this, p);
 
-    if (name.isEmpty()) {
+    if (name.isEmpty())
+    {
         result->set_name(get_name());
         result->def->replace((BrowserClass *) parent(), (BrowserClass *) p);
     }
@@ -105,6 +106,8 @@ BrowserNode * BrowserAttribute::duplicate(BrowserNode * p, QString name)
         result->set_name(name);
 
     result->update_stereotype();
+    //move(result, this);
+    //result->select_in_browser();
 
     return result;
 }
@@ -115,6 +118,11 @@ BrowserAttribute::~BrowserAttribute()
     delete def;
 }
 
+uint BrowserAttribute::TypeID()
+{
+    return TypeIdentifier<BrowserAttribute>::id();
+}
+
 void BrowserAttribute::clear(bool old)
 {
     all.clear(old);
@@ -217,7 +225,6 @@ const QPixmap * BrowserAttribute::pixmap(int) const
 {
     if (deletedp())
         return DeletedAttributeIcon;
-
     const QPixmap * px = ProfiledStereotypes::browserPixmap(def->get_stereotype());
 
     if (px != 0)
@@ -239,96 +246,99 @@ const QPixmap * BrowserAttribute::pixmap(int) const
     }
 }
 
-void BrowserAttribute::paintCell(QPainter * p, const QColorGroup & cg, int column,
-                                 int width, int alignment)
+QVariant BrowserAttribute::data(int column, int role) const
 {
-    const QColor & bg = p->backgroundColor();
-
-    if (is_marked) {
-        p->setBackgroundMode(Qt::OpaqueMode);
-        p->setBackgroundColor(UmlRedColor);
-    }
-
-    p->setFont((def->get_isa_class_attribute())
-               ? ((is_writable()) ? BoldUnderlineFont : UnderlineFont)
-                   : ((is_writable()) ? BoldFont : NormalFont));
-    Q3ListViewItem::paintCell(p, cg, column, width, alignment);
-
-    if (is_marked) {
-        p->setBackgroundMode(Qt::TransparentMode);
-        p->setBackgroundColor(bg);
+    if(role == Qt::FontRole)
+    {
+        if(def->get_isa_class_attribute())
+        {
+            if(is_writable())
+                return BoldUnderlineFont;
+            else
+                return UnderlineFont;
+        }
+        else
+        {
+            if(is_writable())
+                return BoldFont;
+            else
+                return NormalFont;
+        }
     }
+    return BrowserNode::data(column, role);
 }
-
 void BrowserAttribute::menu()
 {
     const char * st = ((BrowserClass *) parent())->get_stereotype();
     bool item = (!strcmp(st, "enum_pattern") || !strcmp(st, "enum")) &&
                 strcmp(get_stereotype(), "attribute");
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited)
             if (get_container(UmlClass) != 0)
-                m.setWhatsThis(m.insertItem(TR("Up"), 20),
-                               TR("to return to parent node"));
+                MenuFactory::addItem(m, QObject::tr("Up"), 20,
+                               QObject::tr("to return to parent node"));
 
-        m.setWhatsThis(m.insertItem(TR("Edit"), 0),
+        MenuFactory::addItem(m, QObject::tr("Edit"), 0,
                        (item)
-                       ? TR("to edit the <i>item</i>,"
+                       ? QObject::tr("to edit the <i>item</i>,"
                             "a double click with the left mouse button does the same thing")
-                       : TR("to edit the <i>attribute</i>,"
+                       : QObject::tr("to edit the <i>attribute</i>,"
                             "a double click with the left mouse button does the same thing"));
 
         if (!is_read_only && (edition_number == 0)) {
             if (!item && (get_oper == 0))
-                m.setWhatsThis(m.insertItem(TR("New get operation"), 3),
-                               TR("to auto define the <i>get operation</i>"));
+                MenuFactory::addItem(m, QObject::tr("New get operation"), 3,
+                               QObject::tr("to auto define the <i>get operation</i>"));
 
             if (!item && (set_oper == 0))
-                m.setWhatsThis(m.insertItem(TR("New set operation"), 4),
-                               TR("to auto define the <i>set operation</i>"));
+                MenuFactory::addItem(m, QObject::tr("New set operation"), 4,
+                               QObject::tr("to auto define the <i>set operation</i>"));
 
             if (!item && (get_oper == 0) && (set_oper == 0))
-                m.setWhatsThis(m.insertItem(TR("New get and set operation"), 5),
-                               TR("to auto define the <i>get</i> and <i>set operation</i>s"));
+                MenuFactory::addItem(m, QObject::tr("New get and set operation"), 5,
+                               QObject::tr("to auto define the <i>get</i> and <i>set operation</i>s"));
 
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 6),
-                           TR("to copy the <i>attribute</i> in a new one"));
+            MenuFactory::addItem(m, QObject::tr("Duplicate"), 6,
+                           QObject::tr("to copy the <i>attribute</i> in a new one"));
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 7),
-                       TR("to know who reference the <i>class</i>"));
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 7,
+                       QObject::tr("to know who reference the <i>class</i>"));
 
         if (!is_read_only && (edition_number == 0)) {
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Delete"), 1),
-                           (item) ? TR("to delete the <i>item</i>. \
+            m.addSeparator();
+            MenuFactory::addItem(m, QObject::tr("Delete"), 1,
+                           (item) ? QObject::tr("to delete the <i>item</i>. \
                                        Note that you can undelete it after")
-                           : TR("to delete the <i>attribute</i>. \
+                           : QObject::tr("to delete the <i>attribute</i>. \
                                             Note that you can undelete it after"));
         }
 
-        mark_menu(m, TR("the attribute"), 90);
+        mark_menu(m, QObject::tr("the attribute"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 2),
-                       (item) ? TR("to undelete the <i>item</i>")
-                       : TR("to undelete the <i>attribute</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 2,
+                       (item) ? QObject::tr("to undelete the <i>item</i>")
+                       : QObject::tr("to undelete the <i>attribute</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+        QAction *resultAction = m.exec(QCursor::pos());
+        if(resultAction)
+            exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserAttribute::exec_menu_choice(int rank)
@@ -342,7 +352,6 @@ void BrowserAttribute::exec_menu_choice(int rank)
         if (!strcmp(((BrowserNode *) parent())->get_data()->get_stereotype(),
                     "stereotype"))
             ProfiledStereotypes::deleted(this);
-
         delete_it();
         break;
 
@@ -353,7 +362,6 @@ void BrowserAttribute::exec_menu_choice(int rank)
                     "stereotype"))
             // the deletion was may be not propaged
             ProfiledStereotypes::recompute(TRUE);
-
         break;
 
     case 3:
@@ -369,8 +377,12 @@ void BrowserAttribute::exec_menu_choice(int rank)
         break;
 
     case 6:
-        ((BrowserClass *) parent())->add_attribute(this);
+    {
+        BrowserNode * attrDuplicate = ((BrowserClass *) parent())->duplicate_attribute(this);
+        move(attrDuplicate, this);
+        attrDuplicate->select_in_browser();
         return;
+    }
 
     case 7:
         ReferenceDialog::show(this);
@@ -384,7 +396,8 @@ void BrowserAttribute::exec_menu_choice(int rank)
     default:
         if (rank >= 99990)
             ProfiledStereotypes::choiceManagement(this, rank - 99990);
-        else if (rank >= 100)
+        else
+            if (rank >= 100)
             ToolCom::run(Tool::command(rank - 100), this);
         else
             mark_management(rank - 90);
@@ -396,7 +409,7 @@ void BrowserAttribute::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserAttribute::apply_shortcut(QString s)
+void BrowserAttribute::apply_shortcut(const QString & s)
 {
     int choice = -1;
     const char * st = ((BrowserClass *) parent())->get_stereotype();
@@ -459,6 +472,7 @@ void BrowserAttribute::modified()
 {
     repaint();
     ((BrowserNode *) parent())->modified();
+    def->modified();
 
     if (get_oper != 0)
         update_get_oper();
@@ -474,7 +488,7 @@ UmlCode BrowserAttribute::get_type() const
 
 QString BrowserAttribute::get_stype() const
 {
-    return TR("attribute");
+    return QObject::tr("attribute");
 }
 
 int BrowserAttribute::get_identifier() const
@@ -521,27 +535,26 @@ void BrowserAttribute::member_cpp_def(const QString & prefix, const QString &,
     }
 }
 
-void BrowserAttribute::compute_referenced_by(Q3PtrList<BrowserNode> & l,
+void BrowserAttribute::compute_referenced_by(QList<BrowserNode *> & l,
         BrowserNode * target)
 {
     IdIterator<BrowserAttribute> it(all);
-
-    while (it.current()) {
-        if (!it.current()->deletedp()) {
-            const AType & t = it.current()->def->get_type();
+    while(it.hasNext()){
+        it.next();
+        if(it.value())
+        if (!it.value()->deletedp()) {
+            const AType & t = it.value()->def->get_type();
 
             if (t.type == target)
-                l.append(it.current());
+                l.append(it.value());
         }
 
-        ++it;
     }
 }
 
-void BrowserAttribute::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserAttribute::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
-
     if (! ondelete)
         BrowserActivityAction::compute_referenced_by(l, this);
 }
@@ -574,7 +587,9 @@ void BrowserAttribute::post_load()
     IdIterator<BrowserAttribute> it(all);
     BrowserAttribute * at;
 
-    while ((at = it.current()) != 0) {
+    while(it.hasNext()){
+        it.next();
+        if((at = it.value()) != 0)
         if ((at->get_oper != 0) && at->get_oper->is_undefined())
             // operation was deleted
             at->get_oper = 0;
@@ -582,8 +597,6 @@ void BrowserAttribute::post_load()
         if ((at->set_oper != 0) && at->set_oper->is_undefined())
             // operation was deleted
             at->set_oper = 0;
-
-        ++it;
     }
 }
 
diff --git a/src/browser/BrowserAttribute.h b/src/browser/BrowserAttribute.h
index 073a60d56..199976a26 100644
--- a/src/browser/BrowserAttribute.h
+++ b/src/browser/BrowserAttribute.h
@@ -43,6 +43,7 @@ class BrowserClass;
 class BrowserAttribute : public BrowserNode, public Labeled<BrowserAttribute>
 {
     friend class StereotypesDialog;
+    friend class QuickEdit;
 
 protected:
     static IdDict<BrowserAttribute> all;
@@ -58,13 +59,13 @@ class BrowserAttribute : public BrowserNode, public Labeled<BrowserAttribute>
     void exec_menu_choice(int rank);
 
 public:
-    BrowserAttribute(QString s, BrowserNode * p, AttributeData * d, int id = 0);
+    BrowserAttribute(const QString & s, BrowserNode * p, AttributeData * d, int id = 0);
     BrowserAttribute(const BrowserAttribute * model, BrowserNode * p);
     virtual ~BrowserAttribute();
-
-    virtual void delete_it();
+    uint TypeID() override;
+    virtual void delete_it() override;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString()) override;
 
     BrowserOperation * get_get_oper() {
         return get_oper;
@@ -79,50 +80,50 @@ class BrowserAttribute : public BrowserNode, public Labeled<BrowserAttribute>
     void add_get_oper();
     void add_set_oper();
 
-    virtual const QPixmap * pixmap(int) const;
-    virtual void paintCell(QPainter *, const QColorGroup &, int, int, int);
+    virtual const QPixmap * pixmap(int) const override;
 
-    virtual void menu();
-    virtual void apply_shortcut(QString s);
-    virtual void open(bool);
+    virtual void menu() override;
+    virtual void apply_shortcut(const QString & s) override;
+    virtual void open(bool) override;
     void open_new_ste_attr();
-    virtual UmlCode get_type() const;
-    virtual QString get_stype() const;
-    virtual int get_identifier() const;
-    virtual const char * help_topic() const;
-    virtual void modified();
-    virtual BasicData * get_data() const;
-    virtual bool allow_spaces() const;
-    virtual bool same_name(const QString & s, UmlCode type) const;
-    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
+    virtual UmlCode get_type() const override;
+    virtual QString get_stype() const override;
+    virtual int get_identifier() const override;
+    virtual const char * help_topic() const override;
+    virtual void modified() override;
+    virtual BasicData * get_data() const override;
+    virtual bool allow_spaces() const override;
+    virtual bool same_name(const QString & s, UmlCode type) const override;
+    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const override;
     virtual void member_cpp_def(const QString & prefix, const QString &,
-                                QString & s, bool templ) const;
-    virtual const char * constraint() const;
+                                QString & s, bool templ) const override;
+    virtual const char * constraint() const override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning);
+    virtual void save(QTextStream &, bool ref, QString & warning) override;
     static BrowserAttribute * read_ref(char *&);
     static BrowserAttribute * read(char *& , char *, BrowserNode *, bool force = TRUE);
     static BrowserNode * get_it(const char * k, int id);
     static void post_load();
 
-    static BrowserAttribute * new_one(QString s, BrowserNode * p, bool enum_item);
+    static BrowserAttribute * new_one(const QString & s, BrowserNode * p, bool enum_item);
 
     static void init();
     static void clear(bool old);
     static void update_idmax_for_root();
-    virtual void renumber(int phase);
-    virtual void prepare_update_lib() const;
+    virtual void renumber(int phase) override;
+    virtual void prepare_update_lib() const override;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE) override;
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 
-    virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after);
+    virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after) override;
 
     static const QStringList & default_stereotypes();
     static void read_stereotypes(char *& , char *& k);
     static void save_stereotypes(QTextStream &);
+    virtual QVariant data(int column, int role) const override;
 };
 
 #endif
diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp
index 1ca79f756..68fce57e2 100644
--- a/src/browser/BrowserClass.cpp
+++ b/src/browser/BrowserClass.cpp
@@ -30,16 +30,15 @@
 
 
 
-
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qpainter.h>
 #include <qcursor.h>
 #include <qapplication.h>
 #include <qfile.h>
-#include <q3dict.h>
+////
 //Added by qt3to4:
 #include <QPixmap>
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
 #include <QDropEvent>
 #include <QDragMoveEvent>
@@ -54,11 +53,12 @@
 #include "BrowserSimpleRelation.h"
 #include "BrowserArtifact.h"
 #include "BrowserComponent.h"
+
+#include "ClassData.h"
 #include "ArtifactData.h"
 #include "AttributeData.h"
 #include "OperationData.h"
 #include "RelationData.h"
-#include "ClassData.h"
 #include "PackageData.h"
 #include "BrowserClassView.h"
 #include "BrowserClassDiagram.h"
@@ -88,6 +88,7 @@
 #include "translate.h"
 #include "RelationData.h"
 #include "menufactory.h"
+#include "misc/TypeIdentifier.h"
 
 // Added for porting by lgfreitas
 #include <QChar>
@@ -100,7 +101,7 @@ QStringList BrowserClass::relations_default_stereotypes[UmlRelations];	// unicod
 static bool NeedPostLoad = FALSE;
 static BrowserClass * TemporaryClass;
 
-BrowserClass::BrowserClass(QString s, BrowserNode * p, ClassData * d, int id)
+BrowserClass::BrowserClass(const QString & s, BrowserNode * p, ClassData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserClass>(all, id),
       def(d), associated_diagram(0), associated_artifact(0)
 {
@@ -140,7 +141,7 @@ void BrowserClass::delete_it()
             associated_artifact->is_writable())
         associated_artifact->remove_associated_class(this);
 
-    Q3ValueList<BrowserComponent *>::Iterator it;
+    QList<BrowserComponent *>::Iterator it;
 
     for (it = associated_components.begin();
          it != associated_components.end();
@@ -160,7 +161,6 @@ bool BrowserClass::undelete(bool rec, QString & warning, QString & renamed)
         // undelete the node
         QString s = name;
         bool ren = FALSE;
-
         while (((BrowserNode *) parent())
                ->wrong_child_name(s, get_type(),
                                   allow_spaces(), allow_empty()) ||
@@ -168,7 +168,6 @@ bool BrowserClass::undelete(bool rec, QString & warning, QString & renamed)
             s = "_" + s;
             ren = TRUE;
         }
-
         is_deleted = FALSE;
         is_modified = TRUE;
         get_data()->undelete(warning, renamed);
@@ -183,10 +182,9 @@ bool BrowserClass::undelete(bool rec, QString & warning, QString & renamed)
     }
     else
         result = FALSE;
-
     if (rec) {
         // undelete the sub elts
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             result |= ((BrowserNode *) child)->undelete(rec, warning, renamed);
@@ -220,13 +218,14 @@ void BrowserClass::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
+
 }
 
-void BrowserClass::support_file(Q3Dict<char> & files, bool add) const
+void BrowserClass::support_file(QHash<QString,char*> & files, bool add) const
 {
     QString s;
 
@@ -237,26 +236,27 @@ void BrowserClass::support_file(Q3Dict<char> & files, bool add) const
     else
         files.remove(s);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->support_file(files, add);
+
 }
 
-void BrowserClass::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserClass::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
+
     IdIterator<BrowserClass> it(all);
     BrowserClass * c;
+    while(it.hasNext()){
+        it.next();
+        if((c = it.value()) != 0)
+            if (!c->deletedp() &&
+                    (c != this) &&
+                    c->def->reference(this))
+                l.append(c);
 
-    while ((c = it.current()) != 0) {
-        if (!c->deletedp() &&
-                (c != this) &&
-                c->def->reference(this))
-            l.append(c);
-
-        ++it;
     }
-
     BrowserRelation::compute_referenced_by(l, this);
     BrowserSimpleRelation::compute_referenced_by(l, this);
     BrowserArtifact::compute_referenced_by(l, this);
@@ -273,6 +273,7 @@ void BrowserClass::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
         BrowserClassDiagram::compute_referenced_by(l, this, "classcanvas", "class_ref");
         BrowserUseCaseDiagram::compute_referenced_by(l, this, "classcanvas", "class_ref");
     }
+
 }
 
 void BrowserClass::renumber(int phase)
@@ -283,43 +284,46 @@ void BrowserClass::renumber(int phase)
     BrowserNode::renumber(phase);
 }
 
-bool BrowserClass::new_java_enums(QString new_st)
+bool BrowserClass::new_java_enums(const QString & new_st)
 {
+
     IdIterator<BrowserClass> it(all);
     bool result = FALSE;
+    while(it.hasNext()){
+        it.next();
+        if(it.value()) {
+            ClassData * d = it.value()->def;
+            const char * st = d->get_stereotype();
+
+            if (*st != 0) {
+                if (strcmp(st, "enum_pattern") == 0) {
+                    d->set_stereotype(new_st);
+
+                    if (it.value()->is_read_only)
+                        result = TRUE;
+                    else
+                        it.value()->package_modified();
+                }
+                else if ((strcmp(st, "enum") == 0) && (*(d->get_javadecl()) != 0)) {
+                    d->set_stereotype("enum_pattern");
 
-    while (it.current()) {
-        ClassData * d = it.current()->def;
-        const char * st = d->get_stereotype();
-
-        if (*st != 0) {
-            if (strcmp(st, "enum_pattern") == 0) {
-                d->set_stereotype(new_st);
-
-                if (it.current()->is_read_only)
-                    result = TRUE;
-                else
-                    it.current()->package_modified();
-            }
-            else if ((strcmp(st, "enum") == 0) && (*(d->get_javadecl()) != 0)) {
-                d->set_stereotype("enum_pattern");
-
-                if (it.current()->is_read_only)
-                    result = TRUE;
-                else
-                    it.current()->package_modified();
+                    if (it.value()->is_read_only)
+                        result = TRUE;
+                    else
+                        it.value()->package_modified();
+                }
             }
         }
-
-        ++it;
     }
 
-    if (new_st.isEmpty())
-        new_st = "enum_pattern";
+    QString new_st_to_append = new_st;
+    if (new_st_to_append.isEmpty())
+        new_st_to_append = "enum_pattern";
 
-    its_default_stereotypes.append(new_st);
+    its_default_stereotypes.append(new_st_to_append);
 
     return result;
+
 }
 
 const QPixmap * BrowserClass::pixmap(int) const
@@ -344,32 +348,32 @@ const QPixmap * BrowserClass::pixmap(int) const
         return ActorIcon;
     else if (stereotype)
         return StereotypeIcon;
-
     const QPixmap * px = ProfiledStereotypes::browserPixmap(st);
 
     if (px != 0)
         return px;
-    else if (! nestedp())
-        return (tmplt) ? TemplateIcon : ClassIcon;
-    else {
-        switch (def->get_uml_visibility()) {
-        case UmlPublic:
-            return (tmplt) ? PublicEmbeddedTemplateIcon
-                           : PublicEmbeddedClassIcon;
+    else
+        if (! nestedp())
+            return (tmplt) ? TemplateIcon : ClassIcon;
+        else {
+            switch (def->get_uml_visibility()) {
+            case UmlPublic:
+                return (tmplt) ? PublicEmbeddedTemplateIcon
+                               : PublicEmbeddedClassIcon;
 
-        case UmlProtected:
-            return (tmplt) ? ProtectedEmbeddedTemplateIcon
-                           : ProtectedEmbeddedClassIcon;
+            case UmlProtected:
+                return (tmplt) ? ProtectedEmbeddedTemplateIcon
+                               : ProtectedEmbeddedClassIcon;
 
-        case UmlPrivate:
-            return (tmplt) ? PrivateEmbeddedTemplateIcon
-                           : PrivateEmbeddedClassIcon;
+            case UmlPrivate:
+                return (tmplt) ? PrivateEmbeddedTemplateIcon
+                               : PrivateEmbeddedClassIcon;
 
-        default:
-            return (tmplt) ? PackageEmbeddedTemplateIcon
-                           : PackageEmbeddedClassIcon;
+            default:
+                return (tmplt) ? PackageEmbeddedTemplateIcon
+                               : PackageEmbeddedClassIcon;
+            }
         }
-    }
 }
 
 void BrowserClass::iconChanged()
@@ -380,6 +384,7 @@ void BrowserClass::iconChanged()
 
 void BrowserClass::update_stereotype(bool rec)
 {
+
     if (def != 0) {
         const char * stereotype = def->get_stereotype();
 
@@ -387,7 +392,7 @@ void BrowserClass::update_stereotype(bool rec)
                 stereotype[0] &&
                 (strcmp(stereotype, "stereotype") != 0)) {
             QString s = toUnicode(stereotype);
-            int index = s.find(':');
+            int index = s.indexOf(':');
 
             setText(0,
                     "<<" + ((index == -1) ? s : s.mid(index + 1))
@@ -398,34 +403,35 @@ void BrowserClass::update_stereotype(bool rec)
     }
 
     if (rec) {
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             ((BrowserNode *) child)->update_stereotype(TRUE);
     }
+
 }
 
-void BrowserClass::paintCell(QPainter * p, const QColorGroup & cg, int column,
-                             int width, int alignment)
+QVariant BrowserClass::data(int column, int role) const
 {
-    const QColor & bg = p->backgroundColor();
-
-    if (is_marked) {
-        p->setBackgroundMode(::Qt::OpaqueMode);
-        p->setBackgroundColor(UmlRedColor);
-    }
-
-    p->setFont((def->get_is_abstract())
-               ? ((is_writable()) ? BoldItalicFont : ItalicFont)
-               : ((is_writable()) ? BoldFont : NormalFont));
-    Q3ListViewItem::paintCell(p, cg, column, width, alignment);
-
-    if (is_marked) {
-        p->setBackgroundMode(::Qt::TransparentMode);
-        p->setBackgroundColor(bg);
+    if(role == Qt::FontRole)
+    {
+        if(def->get_is_abstract())
+        {
+            if(is_writable())
+                return BoldItalicFont;
+            else
+                return ItalicFont;
+        }
+        else
+        {
+            if(is_writable())
+                return BoldFont;
+            else
+                return NormalFont;
+        }
     }
+    return BrowserNode::data(column, role);
 }
-
 QString BrowserClass::full_name(bool rev, bool) const
 {
     return fullname(rev);
@@ -503,7 +509,9 @@ QString BrowserClass::contextual_name(ShowContextMode mode) const
 void BrowserClass::member_cpp_def(const QString &, const QString &,
                                   QString & s, bool) const
 {
+
     ClassDialog::cpp_generate_members_def(this, s);
+
 }
 
 
@@ -532,31 +540,34 @@ static const int too_much_inherited_functions_index = 9999;
 static const int sensible_amount_of_visible_entries = 25;
 
 
-void BrowserClass::InstallParentsMenuItems(Q3PopupMenu& inhopersubm)
+void BrowserClass::InstallParentsMenuItems(QMenu& inhopersubm)
 {
+
     QStringList parents = get_parents_names();
     for(QList<QString>::Iterator it = parents.begin(); it != parents.end(); it++)
     {
         int currentId = first_inherited_function_index + sensible_amount_of_visible_entries + (it - parents.begin());
-        inhopersubm.insertItem(TR("Implement whole " + *it), currentId);
-        inhopersubm.setWhatsThis(currentId, QString("to implement whole ") + *it);
+
+        MenuFactory::addItem(inhopersubm,QObject::tr("Implement whole ") + *it, currentId, QString("to implement whole "));
+        //inhopersubm.setWhatsThis(currentId, QString("to implement whole ") + *it);
     }
     if(!parents.isEmpty())
-        inhopersubm.insertSeparator();
+        inhopersubm.addSeparator();
+
 }
 
 void BrowserClass::menu()
 {
+    QList<BrowserOperation *> inheritedOperations = inherited_operations(sensible_amount_of_visible_entries);
 
-    Q3PtrList<BrowserOperation> inheritedOperations = inherited_operations(sensible_amount_of_visible_entries);
+    QMenu gensubm(0);
+    QMenu roundtripm(0);
+    QMenu inhopersubm(0);
+    QMenu compsubm(0);
+    QMenu toolm(0);
 
-    Q3PopupMenu gensubm(0);
-    Q3PopupMenu roundtripm(0);
-    Q3PopupMenu inhopersubm(0);
-    Q3PopupMenu compsubm(0);
-    Q3PopupMenu toolm(0);
     MenuFactory builder(WrapperStr("Menu"));
-    Q3PopupMenu& m = builder.menu();
+    QMenu& m = builder.menu();
     bool isstereotype = (strcmp(def->get_stereotype(), "stereotype") == 0);
     bool ismetaclass = (strcmp(def->get_stereotype(), "metaclass") == 0);
     QString what = (isstereotype) ? "<i>stereotype</i>"
@@ -572,21 +583,21 @@ void BrowserClass::menu()
         {
             if (edition_number == 0)
             {
-                m.insertSeparator();
+                m.addSeparator();
 
                 const char * stereotype = def->get_stereotype();
 
                 if (!strcmp(stereotype, "enum") || !strcmp(stereotype, "enum_pattern"))
-                    m.setWhatsThis(m.insertItem(TR("Add item"), add_item_index),
-                                   TR("to add an <i>item</i> to the <i>enum</i>"));
+                    MenuFactory::addItem(m, QObject::tr("Add item"), add_item_index,
+                                         QObject::tr("to add an <i>item</i> to the <i>enum</i>"));
 
                 if (strcmp(stereotype, "typedef") && strcmp(stereotype, "enum_pattern"))
                 {
-                    m.setWhatsThis(m.insertItem(TR("Add attribute"), add_attribute_index),
-                                   TR("to add an <i>attribute</i> to the ") + what);
+                    MenuFactory::addItem(m, QObject::tr("Add attribute"), add_attribute_index,
+                                         QObject::tr("to add an <i>attribute</i> to the ") + what);
 
-                    m.setWhatsThis(m.insertItem(TR("Add operation"), add_operation_index),
-                                   TR("to add an <i>operation</i> to the ") + what);
+                    MenuFactory::addItem(m, QObject::tr("Add operation"), add_operation_index,
+                                         QObject::tr("to add an <i>operation</i> to the ") + what);
 
                     bool isUnion = strcmp(stereotype, "union");
                     if (!inheritedOperations.isEmpty() && isUnion)
@@ -594,38 +605,37 @@ void BrowserClass::menu()
 
                         InstallParentsMenuItems(inhopersubm);
 
-                        if (inheritedOperations.count() > (unsigned)sensible_amount_of_visible_entries)
-                            m.setWhatsThis(m.insertItem(TR("Add inherited operation"), too_much_inherited_functions_index),
-                                           TR("to redefine an inherited <i>operation</i> in the <i>class</i>"));
+                        if (inheritedOperations.count() > sensible_amount_of_visible_entries)
+                            MenuFactory::addItem(m, QObject::tr("Add inherited operation"), too_much_inherited_functions_index,
+                                                 QObject::tr("to redefine an inherited <i>operation</i> in the <i>class</i>"));
                         else
                         {
-                            BrowserOperation * oper;
-
-                            MenuFactory::createTitle(inhopersubm, TR("Choose operation to add it"));
-                            inhopersubm.insertSeparator();
+                            MenuFactory::createTitle(inhopersubm,  QObject::tr("Choose operation to add it"));
+                            inhopersubm.addSeparator();
 
-                            for (oper = inheritedOperations.first(), index = first_inherited_function_index;
-                                 oper;
-                                 oper = inheritedOperations.next(), index += 1)
+                            index = first_inherited_function_index;
+                            foreach (BrowserOperation * oper, inheritedOperations)
                             {
                                 QString menuItemText = ((BrowserNode *) oper->parent())->get_name() +
                                         QString("::") + oper->get_data()->definition(TRUE, FALSE);
 
-
                                 if (((OperationData *) oper->get_data())->get_is_abstract())
                                 {
                                     QFont font = inhopersubm.font();
                                     font.setItalic(true);
-                                    inhopersubm.insertItem(menuItemText, index);
+                                    MenuFactory::addItem(inhopersubm,menuItemText, index);
                                     //somewhat hackish but seems to work
                                     inhopersubm.actions().last()->setFont(font);
                                 }
                                 else
-                                    inhopersubm.insertItem(menuItemText, index);
+                                    MenuFactory::addItem(inhopersubm,menuItemText, index);
+                                ++index;
                             }
 
-                            m.setWhatsThis(m.insertItem(TR("Add inherited operation"), &inhopersubm),
-                                           TR("to redefine an inherited <i>operation</i> in the <i>class</i>"));
+
+                            MenuFactory::insertItem(m, QObject::tr("Add inherited operation"), &inhopersubm,
+                                                    QObject::tr("to redefine an inherited <i>operation</i> in the <i>class</i>"));
+
                         }
                     }
                     if (!isstereotype &&
@@ -633,24 +643,24 @@ void BrowserClass::menu()
                             strcmp(stereotype, "enum") &&
                             strcmp(stereotype, "enum_pattern"))
                     {
-                        m.setWhatsThis(m.insertItem(TR("Add nested class"), add_nested_class_index),
-                                       TR("to add an <i>nested class</i> to the <i>class</i>"));
+                        MenuFactory::addItem(m, QObject::tr("Add nested class"), add_nested_class_index,
+                                             QObject::tr("to add an <i>nested class</i> to the <i>class</i>"));
                     }
 
-                    m.setWhatsThis(m.insertItem(TR("Add extra member"), add_extra_member_index),
-                                   TR("to add an <i>extra member</i> to the <i>class</i>"));
+                    MenuFactory::addItem(m, QObject::tr("Add extra member"), add_extra_member_index,
+                                         QObject::tr("to add an <i>extra member</i> to the <i>class</i>"));
                 }
 
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Edit"), edit_index),
-                               TR("to edit the " + what + ","
-                                  "a double click with the left mouse button does the same thing"));
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), duplicate_index),
-                               TR("to duplicate the " + what));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Delete"), delete_index),
-                               TR("to delete the " + what + "."
-                                  "Note that you can undelete it after"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Edit"), edit_index,
+                                     QObject::tr("to edit the ") + what + ","
+                                                                          "a double click with the left mouse button does the same thing");
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), duplicate_index,
+                                     QObject::tr("to duplicate the ") + what);
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Delete"), delete_index,
+                                     QObject::tr("to delete the ") + what + "."
+                                                                            "Note that you can undelete it after");
 
                 if (!isstereotype &&
                         !ismetaclass &&
@@ -661,7 +671,7 @@ void BrowserClass::menu()
 
                     if ((bcv != 0) && !bcv->deletedp())
                     {
-                        Q3ListViewItem * child;
+                        BrowserNode * child;
 
                         for (child = bcv->firstChild(); child; child = child->nextSibling())
                             if (!((BrowserNode *) child)->deletedp() &&
@@ -672,10 +682,10 @@ void BrowserClass::menu()
                         if (child == 0)
                         {
                             // no artifact having the same name, propose to create it
-                            m.insertSeparator();
-                            m.setWhatsThis(m.insertItem(TR("Create source artifact"), 5),
-                                           TR("to add a <i>&lt;&lt;source&gt;&gt; artifact</i> in the <i>deployment view</i> associated to "
-                                              "the <i>class view</i>, this artifact will contain the generated code of the class"));
+                            m.addSeparator();
+                            MenuFactory::addItem(m, QObject::tr("Create source artifact"), 5,
+                                                 QObject::tr("to add a <i>&lt;&lt;source&gt;&gt; artifact</i> in the <i>deployment view</i> associated to "
+                                                             "the <i>class view</i>, this artifact will contain the generated code of the class"));
                         }
                     }
                 }
@@ -683,11 +693,11 @@ void BrowserClass::menu()
         }
         else
         {
-            m.setWhatsThis(m.insertItem(TR("Edit"), edit_index),
-                           TR("to edit the " + what + ", "
-                              "a double click with the left mouse button does the same thing"));
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), duplicate_index),
-                           TR("to duplicate the " + what));
+            MenuFactory::addItem(m, QObject::tr("Edit"), edit_index,
+                                 QObject::tr("to edit the ") + what + ", "
+                                                                      "a double click with the left mouse button does the same thing");
+            MenuFactory::addItem(m, QObject::tr("Duplicate"), duplicate_index,
+                                 QObject::tr("to duplicate the ") + what);
         }
 
         bool have_sep = FALSE;
@@ -696,10 +706,10 @@ void BrowserClass::menu()
                 (associated_artifact != 0) &&
                 !associated_artifact->deletedp())
         {
-            m.insertSeparator();
+            m.addSeparator();
             have_sep = TRUE;
-            m.setWhatsThis(m.insertItem(TR("Select associated artifact"), select_artifact_index),
-                           TR("to select the associated <i>&lt;&lt;source&gt;&gt; artifact</i>"));
+            MenuFactory::addItem(m, QObject::tr("Select associated artifact"), select_artifact_index,
+                                 QObject::tr("to select the associated <i>&lt;&lt;source&gt;&gt; artifact</i>"));
         }
 
         if (!isstereotype &&
@@ -707,35 +717,34 @@ void BrowserClass::menu()
                 !associated_components.isEmpty())
         {
             if (! have_sep)
-                m.insertSeparator();
+                m.addSeparator();
 
             if (associated_components.first() == associated_components.last())
                 // only one component
-                m.setWhatsThis(m.insertItem(TR("Select associated component"), select_component_index),
-                               TR("to select the <i>component</i> providing the <i>class</i>"));
+                MenuFactory::addItem(m, QObject::tr("Select associated component"), select_component_index,
+                                     QObject::tr("to select the <i>component</i> providing the <i>class</i>"));
             else
             {
-                MenuFactory::createTitle(compsubm, TR("Choose component"));
-                compsubm.insertSeparator();
-
-                m.setWhatsThis(m.insertItem(TR("Select an associated component"), &compsubm),
-                               TR("to select a <i>component</i> providing the <i>class</i>"));
+                MenuFactory::createTitle(compsubm,  QObject::tr("Choose component"));
+                compsubm.addSeparator();
+                MenuFactory::insertItem(m, QObject::tr("Select an associated component"), &compsubm,
+                                        QObject::tr("to select a <i>component</i> providing the <i>class</i>"));
 
                 index = select_component_index;
 
-                Q3ValueList<BrowserComponent *>::Iterator it;
+                QList<BrowserComponent *>::Iterator it;
 
                 for (it = associated_components.begin(), index = select_component_index;
                      it != associated_components.end();
                      it++, index += 1)
-                    compsubm.insertItem((*it)->full_name(TRUE), index);
+                    MenuFactory::addItem(compsubm,(*it)->full_name(TRUE), index);
             }
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), see_references_index),
-                       TR("to know who reference the " + what));
-        mark_menu(m, TR("the class"), 90);
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), see_references_index,
+                             QObject::tr("to know who reference the ") + what);
+        mark_menu(m,  QObject::tr("the class").toLatin1().constData(), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if (!isstereotype && !ismetaclass)
@@ -748,68 +757,77 @@ void BrowserClass::menu()
 
             if (! nestedp() && (cpp || java || php || python || idl))
             {
-                m.insertSeparator();
-                m.insertItem(TR("Generate"), &gensubm);
+                m.addSeparator();
+                MenuFactory::insertItem(m, QObject::tr("Generate"), &gensubm);
 
                 if (cpp)
                 {
-                    gensubm.insertItem("C++", generate_cpp_index);
+                    MenuFactory::addItem(gensubm , "C++", generate_cpp_index);
 
                     if ((edition_number == 0) && !is_read_only)
-                        roundtripm.insertItem("C++", roundtrip_cpp_index);
+                        MenuFactory::addItem(roundtripm , "C++", roundtrip_cpp_index);
                 }
 
                 if (java)
                 {
-                    gensubm.insertItem("Java", generate_java_index);
+                    MenuFactory::addItem(gensubm , "Java", generate_java_index);
 
                     if ((edition_number == 0) && !is_read_only)
-                        roundtripm.insertItem("Java", roundtrip_java_index);
+                        MenuFactory::addItem(roundtripm , "Java", roundtrip_java_index);
                 }
 
                 if (php)
-                    gensubm.insertItem("Php", generate_php_index);
+                    MenuFactory::addItem(gensubm , "Php", generate_php_index);
 
                 if (python)
-                    gensubm.insertItem("Python", generate_python_index);
+                    MenuFactory::addItem(gensubm , "Python", generate_python_index);
 
                 if (idl)
-                    gensubm.insertItem("Idl", generate_idl_index);
+                    MenuFactory::addItem(gensubm , "Idl", generate_idl_index);
+
+                if (roundtripm.actions().count() != 0)
+                {
+
+                    MenuFactory::insertItem(m, QObject::tr("Roundtrip"), &roundtripm);
 
-                if (roundtripm.count() != 0)
-                    m.insertItem(TR("Roundtrip"), &roundtripm);
+                }
             }
         }
 
         if ((edition_number == 0) &&
                 Tool::menu_insert(&toolm, get_type(), 100))
         {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+
+            MenuFactory::insertItem(m, QObject::tr("Tool"), &toolm);
+
+            m.addMenu(&toolm);
+
         }
     }
     else if (!is_read_only && (edition_number == 0))
     {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), undelete_index),
-                       TR("undelete the " + what + ". "
-                          "Do not undelete its <i>attributes</i>, <i>operations</i> and <i>relations</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), undelete_index,
+                             QObject::tr("undelete the ") + what + ". "
+                                                                   "Do not undelete its <i>attributes</i>, <i>operations</i> and <i>relations</i>");
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
         {
             if (((BrowserNode *) child)->deletedp())
             {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), undelete_recursive_index),
-                               TR("undelete the " + what + " and its "
-                                  "nested <i>classes</i>, <i>attributes</i>, <i>operations</i> and "
-                                  "<i>relations</i> (except if the class at the other side is also deleted)"));
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), undelete_recursive_index,
+                                     QObject::tr("undelete the ") + what + " and its "
+                                                                           "nested <i>classes</i>, <i>attributes</i>, <i>operations</i> and "
+                                                                           "<i>relations</i> (except if the class at the other side is also deleted)");
                 break;
             }
         }
     }
-
-    exec_menu_choice(m.exec(QCursor::pos()), inheritedOperations);
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt(), inheritedOperations);
 }
 
 void BrowserClass::AddInheritedOperations(int rank)
@@ -817,7 +835,7 @@ void BrowserClass::AddInheritedOperations(int rank)
     int firstParentIndex = first_inherited_function_index + sensible_amount_of_visible_entries;
     int parentIndex = rank - firstParentIndex;
     QString parentName = get_parents_names().at(parentIndex);
-    Q3PtrList<BrowserOperation> inheritedOperations = inherited_operations(sensible_amount_of_visible_entries,parentName);
+    QList<BrowserOperation *> inheritedOperations = inherited_operations(sensible_amount_of_visible_entries,parentName);
     for(auto operation: inheritedOperations)
     {
         add_inherited_operation(operation);
@@ -829,34 +847,37 @@ QList<OperationData*> BrowserClass::CollectSameThroughInheritance(OperationData
     QList<OperationData*> result;
     if(passedNodes.contains(static_cast<BrowserNode*>(this)))
         return result;
+
     passedNodes.append(static_cast<BrowserNode*>(this));
     QList<BrowserNode*> listOfChildren;
     IdIterator<BrowserClass> it(all);
     BrowserClass* testedClass;
-
-    while ((testedClass = it.current()) != 0)
+    while (it.hasNext())
     {
-        BrowserNodeList listOfTested;
-        UmlCode kind1 = UmlGeneralisation;
-        UmlCode kind2 = UmlRealize;
-//        if(!goBack)
-//            kind1=kind2;
-        testedClass->children(listOfTested,kind1, kind2);
-        for(BrowserNode* node : listOfTested)
+        it.next();
+        if((testedClass = it.value()) != 0)
         {
-            BrowserRelation* generalization = static_cast<BrowserRelation*>(node);
-            RelationData* relData = static_cast<RelationData*>(generalization->get_data());
-            BrowserClass* startClass = relData->get_start_class();
-            BrowserClass* endClass = relData->get_end_class();
-            if(endClass != this && startClass != this)
-                continue;
-            //QLOG_INFO() << relData->get_start_class()->get_name() << stringify(generalization->get_type()) << relData->get_end_class()->get_name();
-            if(endClass == this)
-                listOfChildren.append(startClass);
-            else if (startClass == this  && goBack )
-                listOfChildren.append(endClass);
+            BrowserNodeList listOfTested;
+            UmlCode kind1 = UmlGeneralisation;
+            UmlCode kind2 = UmlRealize;
+            //        if(!goBack)
+            //            kind1=kind2;
+            testedClass->children(listOfTested,kind1, kind2);
+            for(BrowserNode* node : listOfTested)
+            {
+                BrowserRelation* generalization = static_cast<BrowserRelation*>(node);
+                RelationData* relData = static_cast<RelationData*>(generalization->get_data());
+                BrowserClass* startClass = relData->get_start_class();
+                BrowserClass* endClass = relData->get_end_class();
+                if(endClass != this && startClass != this)
+                    continue;
+                //QLOG_INFO() << relData->get_start_class()->get_name() << stringify(generalization->get_type()) << relData->get_end_class()->get_name();
+                if(endClass == this)
+                    listOfChildren.append(startClass);
+                else if (startClass == this  && goBack )
+                    listOfChildren.append(endClass);
+            }
         }
-        ++it;
     }
 
     QList<BrowserNode *>  passedCopy = passedNodes;
@@ -886,15 +907,22 @@ QList<OperationData*> BrowserClass::CollectSameThroughInheritance(OperationData
     BrowserClass* operContainter = static_cast<BrowserClass*>(oper->get_browser_node()->get_container(UmlClass));
     if(operContainter == this)
         return result;
-    Q3ValueList<OperationData *> usedInheritedOpers;
+    QList<OperationData *> usedInheritedOpers;
     QStringList listUsedInheritedOpers;
     get_own_opers(usedInheritedOpers,listUsedInheritedOpers);
     //QLOG_INFO() << oper->definition(TRUE, FALSE);
     for(OperationData* testedOper: usedInheritedOpers)
     {
-        //QLOG_INFO() << testedOper->definition(TRUE, FALSE);
+
+
         if(oper->definition(TRUE, FALSE) == testedOper->definition(TRUE, FALSE))
+            //if(compare)
         {
+            bool compare = PropagationEquality(*oper,*testedOper);
+            if(!compare)
+                continue;
+
+            //QLOG_INFO() << testedOper->definition(TRUE, FALSE);
             QString name = full_name();
             QString origin_name = oper->get_origin_class();
             QString containerName = operContainter->full_name();
@@ -909,7 +937,7 @@ QList<OperationData*> BrowserClass::CollectSameThroughInheritance(OperationData
 }
 
 void BrowserClass::exec_menu_choice(int rank,
-                                    Q3PtrList<BrowserOperation> & l)
+                                    QList<BrowserOperation *> & l)
 {
     bool isstereotypemetaclass =
             ((strcmp(def->get_stereotype(), "stereotype") == 0) ||
@@ -952,13 +980,13 @@ void BrowserClass::exec_menu_choice(int rank,
 
     case delete_index:
         ProfiledStereotypes::deleted(this);
+
         delete_it();
         break;
 
     case select_artifact_index:
         if (isstereotypemetaclass)
             return;
-
         if (associated_artifact == 0) {
             BrowserArtifact * ba =
                     new BrowserArtifact(name,
@@ -971,20 +999,16 @@ void BrowserClass::exec_menu_choice(int rank,
             associated_artifact->select_in_browser();
             return;
         }
-
         break;
 
     case undelete_index:
         BrowserNode::undelete(FALSE);
-
         if (!strcmp(get_data()->get_stereotype(), "stereotype"))
             ProfiledStereotypes::recompute(FALSE);
-
         break;
 
     case undelete_recursive_index:
         BrowserNode::undelete(TRUE);
-
         if (!strcmp(get_data()->get_stereotype(), "stereotype"))
             ProfiledStereotypes::recompute(FALSE);
 
@@ -1057,11 +1081,16 @@ void BrowserClass::exec_menu_choice(int rank,
         return;
 
     case duplicate_index: {
-        QString name;
+        QString name = get_name();
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter class's name : "),
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter class's name : "),
                                                          UmlClass, FALSE, FALSE))
-            duplicate((BrowserNode *) parent(), name)->select_in_browser();
+
+        {
+            BrowserNode * duplicatedNode = duplicate((BrowserNode *) parent(), name);
+            move(duplicatedNode, this);
+            duplicatedNode->select_in_browser();
+        }
         else
             return;
     }
@@ -1084,8 +1113,7 @@ void BrowserClass::exec_menu_choice(int rank,
     case too_much_inherited_functions_index:
     {
         l = inherited_operations(~0u);
-
-        OperationListDialog dialog(TR("Choose inherited operation"), l);
+        OperationListDialog dialog(QObject::tr("Choose inherited operation").toLatin1().constData(), l);
 
         dialog.raise();
 
@@ -1118,7 +1146,7 @@ void BrowserClass::exec_menu_choice(int rank,
     package_modified();
 }
 
-void BrowserClass::apply_shortcut(QString s)
+void BrowserClass::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -1159,7 +1187,7 @@ void BrowserClass::apply_shortcut(QString s)
                     BrowserNode * bcv = ((BrowserClassView *) parent())->get_associated();
 
                     if ((bcv != 0) && !bcv->deletedp()) {
-                        Q3ListViewItem * child;
+                        BrowserNode * child;
 
                         for (child = bcv->firstChild(); child; child = child->nextSibling())
                             if (!((BrowserNode *) child)->deletedp() &&
@@ -1208,8 +1236,7 @@ void BrowserClass::apply_shortcut(QString s)
     else if (!is_read_only && (edition_number == 0)) {
         if (s == "Undelete")
             choice = 6;
-
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -1221,12 +1248,12 @@ void BrowserClass::apply_shortcut(QString s)
         }
     }
 
-    Q3PtrList<BrowserOperation> l;
+    QList<BrowserOperation *> l;
 
     exec_menu_choice(choice, l);
 }
 
-BrowserNode * BrowserClass::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserClass::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserClass * result = new BrowserClass(this, p);
 
@@ -1235,25 +1262,35 @@ BrowserNode * BrowserClass::duplicate(BrowserNode * p, QString name)
     // count the current sub elt to not take into account two time the
     // bi-dir self relations
     unsigned n = 0;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         n += 1;
 
     // duplicates the sub elts
-    for (child = firstChild(); n != 0; child = child->nextSibling(), n -= 1) {
-        if (!((BrowserNode *) child)->deletedp()) {
-            if (IsaRelation(((BrowserNode *) child)->get_type())) {
+    for (child = firstChild(); n != 0; child = child->nextSibling(), n -= 1)
+    {
+        BrowserNode* nodeCopy = NULL;
+        if (!((BrowserNode *) child)->deletedp())
+        {
+            if (IsaRelation(((BrowserNode *) child)->get_type()))
+            {
                 RelationData * rd = (RelationData *)
                         ((BrowserNode *) child)->get_data();
 
-                if ((rd->get_start_class() != this) ||
-                        (rd->get_end_class() != this) ||
-                        rd->is_a((BrowserRelation *) child))
-                    ((BrowserNode *) child)->duplicate(result);
+                if ((rd->get_start_class() != this) || (rd->get_end_class() != this) || rd->is_a((BrowserRelation *) child))
+                    nodeCopy = ((BrowserNode *) child)->duplicate(result);
             }
             else
-                ((BrowserNode *) child)->duplicate(result);
+                nodeCopy =  ((BrowserNode *) child)->duplicate(result);
+        }
+        if (nodeCopy) {
+            nodeCopy->set_n_keys(static_cast<BrowserNode*>(child)->get_n_keys());
+            for (unsigned i = 0; i < static_cast<BrowserNode*>(child)->get_n_keys(); i++)
+            {
+                nodeCopy->set_key(i, static_cast<BrowserNode*>(child)->get_key(i));
+                nodeCopy->set_value(i, static_cast<BrowserNode*>(child)->get_value(i));
+            }
         }
     }
 
@@ -1264,23 +1301,21 @@ BrowserNode * BrowserClass::duplicate(BrowserNode * p, QString name)
             ((BrowserOperation *) child)->post_duplicate();
 
     result->update_stereotype(TRUE);
-
     return result;
 }
 
-void BrowserClass::set_name(const char * s)
+void BrowserClass::set_name(const QString & s)
 {
     if (name != s) {
         bool firsttime = name.isEmpty();
-
         if (! firsttime) {
             // rename constructors and destructors
-            Q3ListViewItem * child;
+            BrowserNode * child;
 
             for (child = firstChild(); child != 0; child = child->nextSibling()) {
                 if (!((BrowserNode *) child)->deletedp() &&
                         (((BrowserNode *) child)->get_type() == UmlOperation)) {
-                    const char * op_name = ((BrowserNode *) child)->get_name();
+                    const char * op_name = ((BrowserNode *) child)->get_name().toLatin1().constData();
 
                     if (op_name == name)
                         // renamed
@@ -1311,18 +1346,18 @@ void BrowserClass::set_name(const char * s)
 }
 
 BrowserNode * BrowserClass::add_attribute(BrowserAttribute * attr,
-                                          bool enum_item)
+                                          bool enum_item, bool sameName)
 {
     QString name;
-
-    if (enter_child_name(name, (enum_item) ? TR("enter item's name : ")
-                         : TR("enter attribute's name : "),
+    if(attr && sameName)
+        name = attr->get_name();
+    if (enter_child_name(name, (enum_item) ? QObject::tr("enter item's name : ")
+                         : QObject::tr("enter attribute's name : "),
                          UmlAttribute, FALSE, FALSE)) {
-        bool newone = (attr == 0);
+        bool newone = (attr == nullptr);
 
         attr = (newone) ? BrowserAttribute::new_one(name, this, enum_item)
                         : (BrowserAttribute *) attr->duplicate(this, name);
-
         setOpen(TRUE);
         def->modified();
         package_modified();
@@ -1333,13 +1368,42 @@ BrowserNode * BrowserClass::add_attribute(BrowserAttribute * attr,
         else if (!newone && 	// ProfiledStereotypes::added called later
                  !strcmp(def->get_stereotype(), "stereotype"))
             ProfiledStereotypes::added(attr);
-
         return attr;
     }
 
     return 0;
 }
 
+BrowserNode *BrowserClass::addAttribute()
+{
+    BrowserAttribute * attr = nullptr;
+    QString name;
+    attr = BrowserAttribute::new_one(name, this, false);
+    setOpen(TRUE);
+    def->modified();
+    package_modified();
+    attr->select_in_browser();
+    return attr;
+}
+
+BrowserNode *BrowserClass::addEnumItem()
+{
+    BrowserAttribute * attr = nullptr;
+    QString name;
+    attr = BrowserAttribute::new_one(name, this, true);
+    setOpen(TRUE);
+    def->modified();
+    package_modified();
+    attr->select_in_browser();
+    return attr;
+}
+
+BrowserNode *BrowserClass::duplicate_attribute(BrowserAttribute *attr, bool enum_item)
+{
+    //BrowserNode * attrDuplicate = add_attribute(attr, enum_item, true);
+    return add_attribute(attr, enum_item, true);;
+}
+
 BrowserNode * BrowserClass::add_extra_member(BrowserExtraMember * em)
 {
     em = (em == 0) ? BrowserExtraMember::new_one(QString(), this)
@@ -1365,12 +1429,15 @@ BrowserNode * BrowserClass::add_relation(BrowserRelation * rel)
     return rel;
 }
 
-BrowserNode * BrowserClass::add_operation(BrowserOperation * oper)
+BrowserNode * BrowserClass::add_operation(BrowserOperation * oper, bool sameName)
 {
     QString name;
+    if(oper && sameName)
+        name = oper->get_name();
 
-    if (enter_child_name(name, TR("enter operation's name : "),
-                         UmlOperation, FALSE, FALSE)) {
+    if (enter_child_name(name, QObject::tr("enter operation's name : "),
+                         UmlOperation, FALSE, FALSE))
+    {
         oper = (oper == 0) ? BrowserOperation::new_one(name, this)
                            : (BrowserOperation *) oper->duplicate(this);
 
@@ -1386,6 +1453,27 @@ BrowserNode * BrowserClass::add_operation(BrowserOperation * oper)
     return 0;
 }
 
+BrowserNode *BrowserClass::duplicate_operation(BrowserOperation *oper)
+{
+    return add_operation(oper, true);
+}
+
+BrowserNode *BrowserClass::addOperation(BrowserOperation *oper)
+{
+
+    QString name;
+    oper = BrowserOperation::new_one(name, this);
+
+
+    setOpen(TRUE);
+    def->modified();
+    package_modified();
+    oper->set_name(name);
+    oper->select_in_browser();
+
+    return oper;
+}
+
 BrowserNode * BrowserClass::add_inherited_operation(BrowserOperation * model)
 {
     BrowserOperation * oper = new BrowserOperation(model, this);
@@ -1415,25 +1503,25 @@ QString BrowserClass::may_start(UmlCode l) const
         case UmlGeneralisation:
         case UmlRealize:
             if (is_read_only && !root_permission())
-                return TR("read only");
+                return QObject::tr("read only");
             else {
                 BrowserNodeList inh;
                 children(inh, UmlGeneralisation, UmlRealize);
                 return (inh.count() <= 1)
                         ? QString()
-                        : TR("typedef can't generalize / realize several times");
+                        : QObject::tr("typedef can't generalize / realize several times");
             }
 
         case UmlDependency:
             if (is_read_only && !root_permission())
-                return TR("read only");
+                return QObject::tr("read only");
 
             // no break
         case UmlAnchor:
             return QString();
 
         default:
-            return TR("a typedef can't have relation");
+            return QObject::tr("a typedef can't have relation");
         }
     }
 
@@ -1441,7 +1529,7 @@ QString BrowserClass::may_start(UmlCode l) const
     case UmlGeneralisation:
     case UmlRealize:
         if (!strcmp(stereotype, "union"))
-            return TR("an union can't generalize / realize");
+            return QObject::tr("an union can't generalize / realize");
 
         // no break;
     case UmlAssociation:
@@ -1451,7 +1539,7 @@ QString BrowserClass::may_start(UmlCode l) const
     case UmlDirectionalAggregation:
     case UmlDirectionalAggregationByValue:
     case UmlDependency:
-        return (!is_read_only || root_permission()) ? QString() : TR("read only");
+        return (!is_read_only || root_permission()) ? QString() : QObject::tr("read only");
 
     default:
         return 0;
@@ -1468,16 +1556,17 @@ QString BrowserClass::may_connect(UmlCode l, BrowserClass * other)
     case UmlAssociation:
     case UmlAggregation:
     case UmlAggregationByValue:
-        return (!other->is_read_only || root_permission()) ? QString() : TR("read only");
+        return (!other->is_read_only || root_permission()) ? QString() : QObject::tr("read only");
 
     default:
-        return (l != UmlAnchor) ? QString() : TR("can't have anchor between classes");
+        return (l != UmlAnchor) ? QString() : QObject::tr("can't have anchor between classes");
     }
 }
 
 BasicData * BrowserClass::add_relation(UmlCode t, BrowserNode * end)
 {
-    if (IsaRelation(t)) {
+    if (IsaRelation(t))
+    {
         RelationData * d = new RelationData(t);
 
         BrowserRelation * br1 = new BrowserRelation(this, d);
@@ -1525,7 +1614,7 @@ UmlCode BrowserClass::get_type() const
 
 QString BrowserClass::get_stype() const
 {
-    return TR("class");
+    return QObject::tr("class");
 }
 
 int BrowserClass::get_identifier() const
@@ -1564,22 +1653,21 @@ bool BrowserClass::allow_spaces() const
 QList<BrowserClass*> BrowserClass::get_all_parents()
 {
     QList<BrowserClass*> result;
-    Q3PtrList<BrowserNode> notyet = parents();
+    QList<BrowserNode *> notyet = parents();
 
     while (! notyet.isEmpty())
     {
-        BrowserClass * cl = (BrowserClass *) notyet.getFirst();
+        BrowserClass * cl = (BrowserClass *) notyet.first();
         notyet.removeFirst();
 
         if ((cl != this) && (!result.contains(cl)))
         {
             result.append(cl);
 
-            Q3PtrList<BrowserNode> grand_parents = cl->parents();
-            BrowserNode * gp;
+            QList<BrowserNode *> grand_parents = cl->parents();
 
-            for (gp = grand_parents.first(); gp; gp = grand_parents.next())
-                if (notyet.findRef(gp) == -1)
+            foreach (BrowserNode * gp, grand_parents)
+                if (! notyet.contains(gp))
                     notyet.append(gp);
         }
     }
@@ -1597,24 +1685,28 @@ QStringList BrowserClass::get_parents_names()
     return result;
 }
 
+UmlVisibility BrowserClass::get_visibility() const
+{
+    return def->get_uml_visibility();
+}
+
 
 // compute all parents, grand parents ...
-void BrowserClass::get_all_parents(Q3PtrList<BrowserClass> & l) const
+void BrowserClass::get_all_parents(QList<BrowserClass *> & l) const
 {
-    Q3PtrList<BrowserNode> notyet = parents();
+    QList<BrowserNode *> notyet = parents();
 
     while (! notyet.isEmpty()) {
-        BrowserClass * cl = (BrowserClass *) notyet.getFirst();
+        BrowserClass * cl = (BrowserClass *) notyet.first();
         notyet.removeFirst();
 
-        if ((cl != this) && (l.findRef(cl) == -1)) {
+        if ((cl != this) && (! l.contains(cl))) {
             l.append(cl);
 
-            Q3PtrList<BrowserNode> grand_parents = cl->parents();
-            BrowserNode * gp;
+            QList<BrowserNode *> grand_parents = cl->parents();
 
-            for (gp = grand_parents.first(); gp; gp = grand_parents.next())
-                if (notyet.findRef(gp) == -1)
+            foreach (BrowserNode * gp, grand_parents)
+                if (! notyet.contains(gp))
                     notyet.append(gp);
         }
     }
@@ -1622,21 +1714,17 @@ void BrowserClass::get_all_parents(Q3PtrList<BrowserClass> & l) const
 
 // returns all attributes included the inherited
 
-void BrowserClass::get_attrs(BrowserNodeList & attributes) const
+void BrowserClass::get_attrs(BrowserNodeList & attributes)
 {
     attributes.clear();
 
-    Q3PtrList<BrowserClass> lcl;
+    QList<BrowserClass *> lcl;
 
     get_all_parents(lcl);
     lcl.append(this);
-
-    Q3PtrListIterator<BrowserClass> it(lcl);
-
-    for (; it.current(); ++it) {
-        Q3ListViewItem * child;
-
-        for (child = it.current()->firstChild(); child; child = child->nextSibling())
+    foreach (BrowserClass *current, lcl) {
+        BrowserNode * child;
+        for (child = current->firstChild(); child; child = child->nextSibling())
             if (!((BrowserNode *) child)->deletedp() &&
                     (((BrowserNode *) child)->get_type() == UmlAttribute))
                 attributes.append((BrowserNode *) child);
@@ -1646,16 +1734,15 @@ void BrowserClass::get_attrs(BrowserNodeList & attributes) const
 // returns all operations included the inherited (except the redefined ones
 // and the contructor and destructor of parents)
 
-void BrowserClass::get_opers(Q3ValueList<const OperationData *> & opers,
+void BrowserClass::get_opers(QList<const OperationData *> & opers,
                              QStringList & list) const
 {
-    Q3PtrList<BrowserClass> all_parents;
+    QList<BrowserClass *> all_parents;
 
     get_all_parents(all_parents);
-
     // own operations
-    Q3ListViewItem * child;
-    Q3Dict<void> already(499);
+    BrowserNode * child;
+    QMap<QString, int> already;
 
     for (child = firstChild(); child; child = child->nextSibling()) {
         if ((((BrowserNode *) child)->get_type() == UmlOperation) &&
@@ -1666,15 +1753,13 @@ void BrowserClass::get_opers(Q3ValueList<const OperationData *> & opers,
 
             opers.append(od);
             list.append(msg);
-            already.insert(msg, (void *) 1);
+            already.insert(msg,1);
         }
     }
 
     // inherited
 
-    BrowserClass * cl;
-
-    for (cl = all_parents.first(); cl != 0; cl = all_parents.next())
+    foreach (BrowserClass * cl, all_parents)
     {
         for (child = cl->firstChild(); child; child = child->nextSibling())
         {
@@ -1685,23 +1770,23 @@ void BrowserClass::get_opers(Q3ValueList<const OperationData *> & opers,
                         ((BrowserOperation *) child)->get_data();
                 QString profile = data->definition(TRUE, FALSE);
 
-                if (already.find(profile) == 0)
+                if (already.find(profile) == already.end())
                 {
                     // not yet added
                     opers.append(data);
                     list.append(profile);
-                    already.insert(profile, (void *) 1);
+                    already.insert(profile, 1);
                 }
             }
         }
     }
 }
 
-void BrowserClass::get_own_opers(Q3ValueList<OperationData *> &opers, QStringList &list)
+void BrowserClass::get_own_opers(QList<OperationData *> &opers, QStringList &list)
 {
     // own operations
-    Q3ListViewItem * child;
-    Q3Dict<void> already(499);
+    BrowserNode * child;
+    QMap<QString, int> already;
 
     for (child = firstChild(); child; child = child->nextSibling()) {
         if ((((BrowserNode *) child)->get_type() == UmlOperation) &&
@@ -1712,21 +1797,20 @@ void BrowserClass::get_own_opers(Q3ValueList<OperationData *> &opers, QStringLis
 
             opers.append(od);
             list.append(msg);
-            already.insert(msg, (void *) 1);
+            already.insert(msg, 1);
         }
     }
 }
 
-void BrowserClass::get_inherited_opers(Q3ValueList< OperationData *> &opers, QStringList &list)
+void BrowserClass::get_inherited_opers(QList< OperationData *> &opers, QStringList &list)
 {
-    Q3PtrList<BrowserClass> all_parents;
-
+    QList<BrowserClass *> all_parents;
     get_all_parents(all_parents);
 
-    BrowserClass * cl;
-    Q3ListViewItem * child;
-    Q3Dict<void> already(499);
-    for (cl = all_parents.first(); cl != 0; cl = all_parents.next())
+    BrowserNode * child;
+    QMap<QString, int> already;
+
+    foreach (BrowserClass * cl, all_parents)
     {
         for (child = cl->firstChild(); child; child = child->nextSibling())
         {
@@ -1737,12 +1821,12 @@ void BrowserClass::get_inherited_opers(Q3ValueList< OperationData *> &opers, QSt
                         ((BrowserOperation *) child)->get_data();
                 QString profile = data->definition(TRUE, FALSE);
 
-                if (already.find(profile) == 0)
+                if (already.find(profile) == already.end())
                 {
                     // not yet added
                     opers.append(data);
                     list.append(profile);
-                    already.insert(profile, (void *) 1);
+                    already.insert(profile, 1);
                 }
             }
         }
@@ -1751,11 +1835,11 @@ void BrowserClass::get_inherited_opers(Q3ValueList< OperationData *> &opers, QSt
 
 void BrowserClass::get_used_inherited_opers()
 {
-    Q3ValueList<OperationData *> ownOpers;
+    QList<OperationData *> ownOpers;
     QStringList listOwnOpers;
-    Q3ValueList<OperationData *> inheritedOpers;
+    QList<OperationData *> inheritedOpers;
     QStringList listInheritedOpers;
-    Q3ValueList<OperationData *> usedInheritedOpers;
+    QList<OperationData *> usedInheritedOpers;
     QStringList listUsedInheritedOpers;
     get_own_opers(ownOpers,listOwnOpers);
     get_inherited_opers(inheritedOpers,listInheritedOpers);
@@ -1777,16 +1861,15 @@ void BrowserClass::get_used_inherited_opers()
 // search for the relations from classes of 'from' having
 // target in 'to'
 
-static void get_assocs(Q3PtrList<BrowserClass> & from,
-                       Q3PtrList<BrowserClass> & to,
-                       Q3PtrList<RelationData> & rels)
+static void get_assocs(QList<BrowserClass *> & from,
+                       QList<BrowserClass *> & to,
+                       QList<RelationData *> & rels)
 {
-    Q3PtrListIterator<BrowserClass> it(from);
 
-    for (; it.current(); ++it) {
-        Q3ListViewItem * child;
+    foreach (BrowserClass *current, from) {
+        BrowserNode * child;
 
-        for (child = it.current()->firstChild(); child; child = child->nextSibling()) {
+        for (child = current->firstChild(); child; child = child->nextSibling()) {
             if (!((BrowserNode *) child)->deletedp()) {
                 switch (((BrowserNode *) child)->get_type()) {
                 case UmlAssociation:
@@ -1798,8 +1881,8 @@ static void get_assocs(Q3PtrList<BrowserClass> & from,
                     RelationData * rd = (RelationData *)
                             ((BrowserRelation *) child)->get_data();
 
-                    if ((rels.findRef(rd) == -1) &&
-                            (to.findRef(rd->get_end_class()) != -1))
+                    if ((rels.indexOf(rd) == -1) &&
+                            (to.contains(rd->get_end_class())))
                         rels.append(rd);
                 }
 
@@ -1809,16 +1892,17 @@ static void get_assocs(Q3PtrList<BrowserClass> & from,
             }
         }
     }
+
 }
 
 // returns all relation to target included the inherited
 // if 'rev' != 0 search also for relation in opposite direction
 // and set rev to the number of relation in the first direction
 void BrowserClass::get_rels(BrowserClass * target,
-                            Q3PtrList<RelationData> & l, int * rev) const
+                            QList<RelationData *> & l, int * rev) const
 {
-    Q3PtrList<BrowserClass> la;
-    Q3PtrList<BrowserClass> lb;
+    QList<BrowserClass *> la;
+    QList<BrowserClass *> lb;
 
     get_all_parents(la);
     target->get_all_parents(lb);
@@ -1828,28 +1912,26 @@ void BrowserClass::get_rels(BrowserClass * target,
 
     if (rev != 0) {
         *rev = l.count();
-        Q3PtrList<RelationData> ll;
+        QList<RelationData *> ll;
 
         get_assocs(lb, la, ll);
 
-        while (! ll.isEmpty())
-            l.append(ll.take(0));
+        l << ll;
+        ll.clear();
     }
 }
 
 // search for the relations from classes of 'from' having
 // target in 'to' (may be the reverse direction of a bidir)
 
-static void get_assocs(Q3PtrList<BrowserClass> & from,
-                       Q3PtrList<BrowserClass> & to,
-                       Q3PtrList<BrowserRelation> & rels)
+static void get_assocs(QList<BrowserClass *> & from,
+                       QList<BrowserClass *> & to,
+                       QList<BrowserRelation *> & rels)
 {
-    Q3PtrListIterator<BrowserClass> it(from);
-
-    for (; it.current(); ++it) {
-        Q3ListViewItem * child;
+    foreach (BrowserClass *current, from) {
+        BrowserNode * child;
 
-        for (child = it.current()->firstChild(); child; child = child->nextSibling()) {
+        for (child = current->firstChild(); child; child = child->nextSibling()) {
             if (!((BrowserNode *) child)->deletedp()) {
                 switch (((BrowserNode *) child)->get_type()) {
                 case UmlAssociation:
@@ -1858,13 +1940,13 @@ static void get_assocs(Q3PtrList<BrowserClass> & from,
                 case UmlAggregationByValue:
                 case UmlDirectionalAggregation:
                 case UmlDirectionalAggregationByValue:
-                    if (rels.findRef((BrowserRelation *) child) == -1) {
+                    if (! rels.contains((BrowserRelation *) child)) {
                         BrowserRelation * r = (BrowserRelation *) child;
                         RelationData * rd = (RelationData *) r->get_data();
 
                         if ((rd->is_a(r))
-                                ? (to.findRef(rd->get_end_class()) != -1)
-                                : (to.findRef(rd->get_start_class()) != -1))
+                                ? (to.contains(rd->get_end_class()))
+                                : (to.contains(rd->get_start_class())))
                             rels.append(r);
                     }
 
@@ -1879,10 +1961,10 @@ static void get_assocs(Q3PtrList<BrowserClass> & from,
 // returns all relation to target included the inherited
 // (may be the reverse direction of a bidir)
 void BrowserClass::get_rels(BrowserClass * target,
-                            Q3PtrList<BrowserRelation> & l) const
+                            QList<BrowserRelation *> & l) const
 {
-    Q3PtrList<BrowserClass> la;
-    Q3PtrList<BrowserClass> lb;
+    QList<BrowserClass *> la;
+    QList<BrowserClass *> lb;
 
     get_all_parents(la);
     target->get_all_parents(lb);
@@ -1895,17 +1977,16 @@ void BrowserClass::get_rels(BrowserClass * target,
 // except deleted
 void BrowserClass::get_tree(BrowserNodeList & l)
 {
-    Q3PtrList<BrowserClass> all_parents;
+    QList<BrowserClass *> all_parents;
 
     all_parents.append(this);
     get_all_parents(all_parents);
     l.clear();
-
-    for (BrowserClass * cl = all_parents.first(); cl != 0; cl = all_parents.next()) {
+    foreach (BrowserClass *cl, all_parents) {
         if (! cl->deletedp()) {
             l.append(cl);
 
-            for (Q3ListViewItem * child = cl->firstChild(); child; child = child->nextSibling()) {
+            for (BrowserNode * child = cl->firstChild(); child; child = child->nextSibling()) {
                 if (!((BrowserNode *) child)->deletedp()) {
                     UmlCode k = ((BrowserNode *) child)->get_type();
 
@@ -1963,50 +2044,42 @@ void BrowserClass::DragMoveInsideEvent(QDragMoveEvent * e)
         e->ignore();
 }
 
-bool BrowserClass::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserClass::may_contains_them(const QList<BrowserNode *> & l,
                                      BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
-        case UmlOperation:
-        {
-            BrowserOperation* asOperation = ((BrowserOperation *) it.current());
-            if (asOperation->get_get_of())
-            {
-                if (l.containsRef(asOperation->get_get_of())
-                        == 0)
-                    return FALSE;
+    foreach (BrowserNode *current, l) {
+        switch (current->get_type()) {
+        case UmlOperation: {
+            BrowserOperation* asOperation = ((BrowserOperation *) current);
+            if (asOperation->get_get_of()) {
+                if (! l.contains(asOperation->get_get_of()))
+                    return false;
             }
 
-            if (asOperation->get_set_of())
-            {
-                if (l.containsRef(asOperation->get_set_of())
-                        == 0)
-                    return FALSE;
+            if (asOperation->get_set_of()) {
+                if (! l.contains(asOperation->get_set_of()))
+                    return false;
             }
 
 
             break;
         }
 
-        case UmlAttribute:
-        {
-//            BrowserAttribute* asAttribute = ((BrowserAttribute *) it.current());
-//            if (asAttribute->get_get_oper())
-//            {
-//                int numReferencesToGetOperations=l.containsRef(asAttribute->get_get_oper());
-//                if (numReferencesToGetOperations == 0)
-//                    return FALSE;
-//            }
-
-//            if (asAttribute->get_set_oper())
-//            {
-//                int numReferencesToSetOperations=l.containsRef(asAttribute->get_set_oper());
-//                if (numReferencesToSetOperations == 0)
-//                    return FALSE;
-//            }
+        case UmlAttribute: {
+            //            BrowserAttribute* asAttribute = ((BrowserAttribute *) it.value());
+            //            if (asAttribute->get_get_oper())
+            //            {
+            //                int numReferencesToGetOperations=l.containsRef(asAttribute->get_get_oper());
+            //                if (numReferencesToGetOperations == 0)
+            //                    return FALSE;
+            //            }
+
+            //            if (asAttribute->get_set_oper())
+            //            {
+            //                int numReferencesToSetOperations=l.containsRef(asAttribute->get_set_oper());
+            //                if (numReferencesToSetOperations == 0)
+            //                    return FALSE;
+            //            }
 
             break;
         }
@@ -2016,16 +2089,15 @@ bool BrowserClass::may_contains_them(const Q3PtrList<BrowserNode> & l,
             break;
 
         case UmlDependOn:
-            if (((const BrowserNode *) it.current()->parent()) != this)
+            if (((const BrowserNode *) current->parent()) != this)
                 return FALSE;
 
             duplicable = FALSE;
             return TRUE;
 
-        default:
-        {
-            bool isNotRelation = !IsaRelation(it.current()->get_type()) ;
-            //bool parentIsOtherNode =  (((const BrowserNode *) it.current()->parent()) != this);
+        default: {
+            bool isNotRelation = !IsaRelation(current->get_type()) ;
+            //bool parentIsOtherNode =  (((const BrowserNode *) it.value()->parent()) != this);
             if (isNotRelation/* || parentIsOtherNode*/)
                 return FALSE;
 
@@ -2034,10 +2106,10 @@ bool BrowserClass::may_contains_them(const Q3PtrList<BrowserNode> & l,
         }
         }
 
-        if (! may_contains(it.current(), FALSE))
+        if (! may_contains(current, FALSE))
             return FALSE;
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(current);
     }
 
     return TRUE;
@@ -2061,7 +2133,6 @@ void BrowserClass::move(BrowserNode * bn, BrowserNode * after)
 
     if ((old_parent != this) && (what == UmlOperation)) {
         OperationData * d = (OperationData *) bn->get_data();
-
         cpp = d->get_body('c');
         java = d->get_body('j');
         php = d->get_body('p');
@@ -2070,7 +2141,6 @@ void BrowserClass::move(BrowserNode * bn, BrowserNode * after)
     }
     else
         cpp = java = php = python = 0;
-
     if ((old_parent != this) &&
             (what == UmlAttribute) &&
             (old_parent->get_type() == UmlClass) &&
@@ -2081,10 +2151,9 @@ void BrowserClass::move(BrowserNode * bn, BrowserNode * after)
     if (after)
         bn->moveItem(after);
     else {
-        bn->parent()->takeItem(bn);
+        ((BrowserNode*)bn->parent())->takeItem(bn);
         insertItem(bn);
     }
-
     if (old_parent != this) {
         old_parent->modified();
         old_parent->package_modified();
@@ -2128,10 +2197,8 @@ void BrowserClass::move(BrowserNode * bn, BrowserNode * after)
                 if (((BrowserAttribute *) bn)->get_set_oper() != 0)
                     ((BrowserAttribute *) bn)->get_set_oper()->delete_it();
             }
-
             if (!strcmp(get_data()->get_stereotype(), "stereotype"))
                 ProfiledStereotypes::added((BrowserAttribute *) bn);
-
             break;
 
         default:
@@ -2161,33 +2228,35 @@ void BrowserClass::DropAfterEvent(QDropEvent * e, BrowserNode * after)
          ((bn = UmlDrag::decode(e, BrowserOperation::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserRelation::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this))) != 0)) &&
-            (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this))
+    {
         bool a_class = (bn->get_type() == UmlClass);
 
-        if (may_contains(bn, a_class))  {
-            if ((after == 0) &&
-                    a_class &&
-                    ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
+        if (may_contains(bn, a_class))
+        {
+            if ((after == 0) && a_class && ((BrowserNode *) parent())->may_contains(bn, TRUE))
+            {
                 // have choice
-                Q3PopupMenu m(0);
-
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
-
-                switch (m.exec(QCursor::pos())) {
-                case 1:
-                    break;
+                QMenu m(0);
+
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In ") + QString(get_name()), 1);
+                MenuFactory::addItem(m, QObject::tr("After ") + QString(get_name()), 2);
+                QAction *retAction = m.exec(QCursor::pos());
+                if(retAction)
+                    switch (retAction->data().toInt()) {
+                    case 1:
+                        break;
 
-                case 2:
-                    ((BrowserNode *) parent())->DropAfterEvent(e, this);
-                    return;
+                    case 2:
+                        ((BrowserNode *) parent())->DropAfterEvent(e, this);
+                        return;
 
-                default:
-                    e->ignore();
-                    return;
-                }
+                    default:
+                        e->ignore();
+                        return;
+                    }
             }
 
             move(bn, after);
@@ -2195,7 +2264,7 @@ void BrowserClass::DropAfterEvent(QDropEvent * e, BrowserNode * after)
         else if (after == 0)
             ((BrowserNode *) parent())->DropAfterEvent(e, this);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -2203,6 +2272,7 @@ void BrowserClass::DropAfterEvent(QDropEvent * e, BrowserNode * after)
         ((BrowserNode *) parent())->DropAfterEvent(e, this);
     else
         e->ignore();
+
 }
 
 BrowserClass * BrowserClass::get_class(BrowserNode * future_parent,
@@ -2212,7 +2282,7 @@ BrowserClass * BrowserClass::get_class(BrowserNode * future_parent,
     QString name;
     BrowserNodeList nodes;
 
-    if (!future_parent->enter_child_name(name, TR("enter class's name : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter class's name : "),
                                          UmlClass, instances(nodes), &old,
                                          FALSE, FALSE))
         return 0;
@@ -2228,7 +2298,6 @@ BrowserClass * BrowserClass::get_class(BrowserNode * future_parent,
 
     if (stereotype != 0)
         cd->set_stereotype("actor");
-
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
 
@@ -2237,21 +2306,23 @@ BrowserClass * BrowserClass::get_class(BrowserNode * future_parent,
 
 BrowserClass * BrowserClass::add_class(bool stereotypep,
                                        BrowserNode * future_parent,
-                                       QString name)
+                                       const QString & nameInit)
 {
+    QString name = nameInit;
     if (name.isEmpty()) {
         if (!future_parent->enter_child_name(name,
-                                             (stereotypep) ? TR("enter stereotype's name : ")
-                                             : TR("enter class's name : "),
+                                             (stereotypep) ? QObject::tr("enter stereotype's name : ")
+                                             : QObject::tr("enter class's name : "),
                                              UmlClass, FALSE, FALSE))
             return 0;
 
         QString err;
-
         if (stereotypep &&
                 (!(err = ProfiledStereotypes::canAddStereotype((BrowserClassView *) future_parent,
                                                                name)).isEmpty())) {
-            msg_critical(TR("Error"), name + " " + err);
+            msg_critical(QObject::tr("Error"), name + " " + err);
+
+
             return 0;
         }
     }
@@ -2270,10 +2341,10 @@ BrowserClass * BrowserClass::add_class(bool stereotypep,
 }
 
 
-Q3PtrList<BrowserNode> BrowserClass::parents() const
+QList<BrowserNode *> BrowserClass::parents() const
 {
-    Q3PtrList<BrowserNode> l;
-    Q3ListViewItem * child;
+    QList<BrowserNode *> l;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling()) {
         BrowserNode * ch = ((BrowserNode *) child);
@@ -2288,7 +2359,6 @@ Q3PtrList<BrowserNode> BrowserClass::parents() const
             break;
         }
     }
-
     return l;
 }
 
@@ -2314,27 +2384,26 @@ QString BrowserClass::check_inherit(const BrowserNode * new_parent) const
     if ((!strcmp(parent_stereotype, "stereotype"))
             ? strcmp(def->get_stereotype(), "stereotype")
             : !strcmp(def->get_stereotype(), "stereotype"))
-        return TR("one of the two classes is not a stereotype");
+        return QObject::tr("one of the two classes is not a stereotype");
 
     return (!strcmp(parent_stereotype, "union"))
-            ? TR("an union can't generalize / realize")
+            ? QObject::tr("an union can't generalize / realize")
             : BrowserNode::check_inherit(new_parent);
 }
 
-Q3PtrList<BrowserOperation> BrowserClass::inherited_operations(unsigned limit, QString parent_name) const
+QList<BrowserOperation *> BrowserClass::inherited_operations(unsigned limit, const QString & parent_name) const
 {
-    QApplication::setOverrideCursor(::Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
-    Q3PtrList<BrowserClass> all_parents;
+    QList<BrowserClass *> all_parents;
 
     get_all_parents(all_parents);
-
+    QList<BrowserOperation *> l;
     // computes own operations profile list
-    Q3ListViewItem * child;
-    Q3Dict<BrowserOperation> already(499);
+    BrowserNode * child;
+    QMap<QString, BrowserOperation*> already;//(499);
 
-    for (child = firstChild(); child; child = child->nextSibling())
-    {
+    for (child = firstChild(); child; child = child->nextSibling()) {
         BrowserNode * childAsNode = dynamic_cast<BrowserNode*>(child);
         BrowserOperation * childAsOperation = dynamic_cast<BrowserOperation*>(child);
 
@@ -2345,16 +2414,13 @@ Q3PtrList<BrowserOperation> BrowserClass::inherited_operations(unsigned limit, Q
     }
 
     // computes undefined inherited operations list
-    Q3PtrList<BrowserOperation> l;
-    BrowserClass * cl;
 
-    for (cl = all_parents.first(); cl != 0; cl = all_parents.next())
-    {
+
+    foreach (BrowserClass *cl, all_parents) {
         if(!parent_name.isEmpty() && QString(cl->full_name()) != parent_name)
             continue;
 
-        for (child = cl->firstChild(); child; child = child->nextSibling())
-        {
+        for (child = cl->firstChild(); child; child = child->nextSibling()) {
             BrowserNode * childAsNode = dynamic_cast<BrowserNode*>(child);
             BrowserOperation * childAsOperation = dynamic_cast<BrowserOperation*>(child);
 
@@ -2367,38 +2433,34 @@ Q3PtrList<BrowserOperation> BrowserClass::inherited_operations(unsigned limit, Q
 
                 if ((data->get_uml_visibility() != UmlPrivate) &&
                         !data->get_isa_class_operation() &&
-                        !data->get_or_set())
-                {
+                        !data->get_or_set()) {
                     // may be refined
                     QString profile = data->definition(TRUE, FALSE);
-                    BrowserOperation * other = already.find(profile);
+                    BrowserOperation * other = already.value(profile);
 
-                    if (other == 0)
-                    {
+                    if (other == 0) {
                         l.append(childAsOperation);
                         already.insert(profile, childAsOperation);
 
-                        if (l.count() >= limit)
-                        {
+                        if (l.count() >= static_cast<int>(limit)) {
                             QApplication::restoreOverrideCursor();
 
                             return l;
                         }
-                    }
-                    else if (! data->get_is_abstract() &&
-                             ((OperationData *) other->get_data())
-                             ->get_is_abstract())
-                    {
+                    } else if (! data->get_is_abstract() &&
+                               ((OperationData *) other->get_data())
+                               ->get_is_abstract()) {
                         // to know later if the oper is abstract or not
-                        already.replace(profile, childAsOperation);
-                        l.removeRef(other);
+                        //already.replace(profile, childAsOperation);
+                        already.remove(profile);
+                        already.insert(profile, childAsOperation);
+                        l.removeOne(other);
                         l.append(childAsOperation);
                     }
                 }
             }
         }
     }
-
     QApplication::restoreOverrideCursor();
 
     return l;
@@ -2406,7 +2468,7 @@ Q3PtrList<BrowserOperation> BrowserClass::inherited_operations(unsigned limit, Q
 
 bool BrowserClass::have_abstract_operation()
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling()) {
         BrowserNode * ch = ((BrowserNode *) child);
@@ -2415,7 +2477,6 @@ bool BrowserClass::have_abstract_operation()
                 ((OperationData *) ch->get_data())->get_is_abstract())
             return TRUE;
     }
-
     return FALSE;
 }
 
@@ -2464,39 +2525,42 @@ BrowserNodeList & BrowserClass::instances(BrowserNodeList & result,
 
     if (non_nested) {
         if ((st == 0) || (*st == 0)) {
-            while ((cl = it.current()) != 0) {
-                if (!cl->deletedp() && !cl->nestedp())
-                    result.append(cl);
-
-                ++it;
+            while(it.hasNext())
+            {
+                it.next();
+                if ((cl = it.value()) != 0)
+                    if (!cl->deletedp() && !cl->nestedp())
+                        result.append(cl);
             }
         }
         else {
-            while ((cl = it.current()) != 0) {
-                if (!cl->deletedp() &&
-                        !cl->nestedp() &&
-                        !strcmp(cl->get_data()->get_stereotype(), st))
-                    result.append(cl);
-
-                ++it;
+            while(it.hasNext()){
+                it.next();
+                if ((cl = it.value()) != 0)
+                    if (!cl->deletedp() &&
+                            !cl->nestedp() &&
+                            !strcmp(cl->get_data()->get_stereotype(), st))
+                        result.append(cl);
             }
         }
     }
     else {
         if ((st == 0) || (*st == 0)) {
-            while ((cl = it.current()) != 0) {
-                if (!cl->deletedp())
-                    result.append(cl);
+            while(it.hasNext()){
+                it.next();
+                if((cl = it.value()) != 0)
+                    if (!cl->deletedp())
+                        result.append(cl);
 
-                ++it;
             }
         }
         else {
-            while ((cl = it.current()) != 0) {
-                if (!cl->deletedp() && !strcmp(cl->get_data()->get_stereotype(), st))
-                    result.append(cl);
+            while(it.hasNext()){
+                it.next();
+                if ((cl = it.value()) != 0)
+                    if (!cl->deletedp() && !strcmp(cl->get_data()->get_stereotype(), st))
+                        result.append(cl);
 
-                ++it;
             }
         }
     }
@@ -2508,7 +2572,7 @@ BrowserNodeList & BrowserClass::instances(BrowserNodeList & result,
 
 BrowserNode * BrowserClass::get_associated() const
 {
-    return associated_diagram;
+    return (BrowserNode *)associated_diagram;
 }
 
 void BrowserClass::set_associated_diagram(BrowserClassDiagram * dg,
@@ -2557,14 +2621,14 @@ void BrowserClass::set_associated_artifact(BrowserArtifact * a,
     }
 }
 
-const Q3ValueList<BrowserComponent *> & BrowserClass::get_associated_components() const
+const QList<BrowserComponent *> & BrowserClass::get_associated_components() const
 {
     return associated_components;
 }
 
 void BrowserClass::add_associated_component(BrowserComponent * c)
 {
-    if (associated_components.findIndex(c) == -1) {
+    if (associated_components.indexOf(c) == -1) {
         associated_components.append(c);
         QObject::connect(c->get_data(), SIGNAL(deleted()),
                          def, SLOT(on_delete()));
@@ -2573,10 +2637,10 @@ void BrowserClass::add_associated_component(BrowserComponent * c)
 
 void BrowserClass::remove_associated_component(BrowserComponent * c)
 {
-    Q3ValueList<BrowserComponent *>::Iterator it = associated_components.find(c);
+    //QList<BrowserComponent *>::Iterator it = associated_components.find(c);
 
-    if (it != associated_components.end()) {
-        associated_components.remove(it);
+    if (associated_components.contains(c)) {
+        associated_components.removeOne(c);
         QObject::disconnect(c->get_data(), SIGNAL(deleted()),
                             def, SLOT(on_delete()));
     }
@@ -2587,11 +2651,11 @@ void BrowserClass::on_delete()
     if (associated_diagram && associated_diagram->deletedp())
         associated_diagram = 0;
 
-    Q3ValueList<BrowserComponent *>::Iterator it = associated_components.begin();
+    QList<BrowserComponent *>::Iterator it = associated_components.begin();
 
     while (it != associated_components.end()) {
         if ((*it)->deletedp())
-            it = associated_components.remove(it);
+            it = associated_components.erase(it);
         else
             it++;
     }
@@ -2706,7 +2770,6 @@ bool BrowserClass::tool_cmd(ToolCom * com, const char * args)
                         default:
                             break;
                         }
-
                         ((RelationData *) add_relation(c, end))->get_start()->write_id(com);
                     }
                     else
@@ -2788,7 +2851,7 @@ bool BrowserClass::tool_cmd(ToolCom * com, const char * args)
                 com->write_id(0);
         }
         else {
-            Q3ValueList<BrowserComponent *>::Iterator it;
+            QList<BrowserComponent *>::Iterator it;
 
             com->write_unsigned(associated_components.count());
 
@@ -2832,13 +2895,14 @@ bool BrowserClass::tool_global_cmd(ToolCom * com, const char * args)
         BrowserNode * p = (BrowserNode *) com->get_id(args);	// package
 
         if (p != 0) {
-            Q3ListViewItem * child;
+
+            BrowserNode * child;
 
             for (child = p->firstChild(); child != 0; child = child->nextSibling()) {
                 // search a class view
                 if (!((BrowserNode *) child)->deletedp() &&
                         (((BrowserNode *) child)->get_type() == UmlClassView)) {
-                    Q3ListViewItem * ch;
+                    BrowserNode * ch;
 
                     for (ch = child->firstChild(); ch != 0; ch = ch->nextSibling()) {
                         // search the class
@@ -2851,18 +2915,20 @@ bool BrowserClass::tool_global_cmd(ToolCom * com, const char * args)
                     }
                 }
             }
+
         }
         else {
             IdIterator<BrowserClass> it(all);
             BrowserClass * cl;
 
-            while ((cl = it.current()) != 0) {
-                if (!cl->deletedp() && cl->name == args) {
-                    cl->write_id(com);
-                    return TRUE;
-                }
+            while(it.hasNext()){
+                it.next();
+                if((cl = it.value()) != 0)
+                    if (!cl->deletedp() && cl->name == args) {
+                        cl->write_id(com);
+                        return TRUE;
+                    }
 
-                ++it;
             }
         }
 
@@ -2891,7 +2957,7 @@ void BrowserClass::read_stereotypes(char *& st, char *& k)
         k = read_keyword(st);
 
         // force stereotype
-        if (its_default_stereotypes.findIndex("stereotype") == -1)
+        if (its_default_stereotypes.indexOf("stereotype") == -1)
             its_default_stereotypes.append("stereotype");
     }
     else
@@ -2926,8 +2992,7 @@ void BrowserClass::save(QTextStream & st, bool ref, QString & warning)
                 : 0;
 
         // saves the sub elts & operations body
-
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -2968,11 +3033,11 @@ void BrowserClass::save(QTextStream & st, bool ref, QString & warning)
             if (!bodyfn.isEmpty()) {
                 qf.close();
 
-                if (static_cast<uint>(qf.status()) != IO_Ok) {
+                if (qf.error() != QFile::NoError) {
                     // error, redo
                     for (;;) {
-                        (void) msg_critical(TR("Error"),
-                                            TR("Error while writting in\n%1\nmay be your disk is full", bodyfn),
+                        (void) msg_critical(QObject::tr("Error"),
+                                            QObject::tr("Error while writting in\n%1\nmay be your disk is full").arg(bodyfn),
                                             QMessageBox::Retry);
 
                         QFile qf2;
@@ -2992,14 +3057,13 @@ void BrowserClass::save(QTextStream & st, bool ref, QString & warning)
 
                         qf2.close();
 
-                        if (static_cast<uint>(qf2.status()) == IO_Ok)
+                        if (qf2.error() == QFile::NoError)
                             // all is ok
                             break;
                     }
                 }
             }
         }
-
         delete [] modified_bodies;
 
         if (def->get_bodies_modified()) {
@@ -3045,7 +3109,7 @@ QString BrowserClass::bodies_file() const
 
     QDir d = BrowserView::get_dir();
 
-    return d.absFilePath(fn);
+    return d.absoluteFilePath(fn);
 }
 
 BrowserClass * BrowserClass::find(const char * s)
@@ -3053,13 +3117,13 @@ BrowserClass * BrowserClass::find(const char * s)
     IdIterator<BrowserClass> it(all);
     BrowserClass * cl;
 
-    while ((cl = it.current()) != 0) {
-        if (strcmp(cl->name, s) == 0)
-            return cl;
+    while(it.hasNext()){
+        it.next();
+        if((cl = it.value()) != 0)
+            if (strcmp(cl->name.toLatin1().constData(), s) == 0)
+                return cl;
 
-        ++it;
     }
-
     return 0;
 }
 
@@ -3129,7 +3193,7 @@ void BrowserClass::plug_out_conversion()
             ((comArtifact = BrowserArtifact::find("UmlCom")) != 0)) {
         // do conversion
         int uid = user_id();
-        Q3ListViewItem * child;
+        BrowserNode * child;
         WrapperStr s;
         int index;
         AType t_deplview;
@@ -3195,7 +3259,7 @@ void BrowserClass::plug_out_conversion()
 
         for (child = baseArtifact->firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->get_type() == UmlOperation) {
-                if (strcmp(((BrowserNode *) child)->get_name(), "UmlBaseComponent") == 0) {
+                if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "UmlBaseComponent") == 0) {
                     // UmlBaseComponent constructor
                     BrowserOperation * baseComponentCreation =
                             new BrowserOperation((BrowserOperation *) child, baseComponent);
@@ -3220,7 +3284,7 @@ void BrowserClass::plug_out_conversion()
                     // UmlBaseArtifact constructor
                     ((BrowserNode *) child)->set_name("UmlBaseArtifact");
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "create") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "create") == 0) {
                     // UmlBaseComponent create operation
                     BrowserOperation * baseComponentCreate =
                             new BrowserOperation((BrowserOperation *) child, baseComponent);
@@ -3246,7 +3310,7 @@ void BrowserClass::plug_out_conversion()
                     op2->set_param_type(0, t_deplview);
                     set_user_id(0);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "kind") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "kind") == 0) {
                     // UmlBaseComponent kind operation
                     BrowserOperation * baseComponentKind =
                             new BrowserOperation((BrowserOperation *) child, baseComponent);
@@ -3270,7 +3334,7 @@ void BrowserClass::plug_out_conversion()
                     baseComponentKind->set_comment(((BrowserNode *) child)->get_comment());
                     set_user_id(0);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "read_uml_") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "read_uml_") == 0) {
                     // UmlBaseComponent read_uml_ operation
                     BrowserOperation * baseComponentRead_uml_ =
                             new BrowserOperation((BrowserOperation *) child, baseComponent);
@@ -3298,7 +3362,7 @@ void BrowserClass::plug_out_conversion()
 
                     set_user_id(0);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "associatedDiagram") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "associatedDiagram") == 0) {
                     // UmlBaseComponent associatedDiagram operation
                     BrowserOperation * baseComponentAssociatedDiagram =
                             new BrowserOperation((BrowserOperation *) child, baseComponent);
@@ -3322,7 +3386,7 @@ void BrowserClass::plug_out_conversion()
                     op2->set_return_type(t_depldiag);
                     set_user_id(0);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "set_AssociatedDiagram") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "set_AssociatedDiagram") == 0) {
                     // UmlBaseComponent set_AssociatedDiagram operation
                     BrowserOperation * baseComponentSet_AssociatedDiagram =
                             new BrowserOperation((BrowserOperation *) child, baseComponent);
@@ -3346,7 +3410,7 @@ void BrowserClass::plug_out_conversion()
                     op2->set_param_type(0, t_depldiag);
                     set_user_id(0);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "associatedComponents") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "associatedComponents") == 0) {
                     ((BrowserNode *) child)->set_name("associatedArtifacts");
                     set_user_id(uid);	// to create saved  *_<n>.b file name
                     op1 = (OperationData *)((BrowserNode *) child)->get_data();
@@ -3363,7 +3427,7 @@ void BrowserClass::plug_out_conversion()
 
                     set_user_id(0);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "addAssociatedComponent") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "addAssociatedComponent") == 0) {
                     ((BrowserNode *) child)->set_name("addAssociatedArtifact");
                     set_user_id(uid);	// to create saved  *_<n>.b file name
                     op1 = (OperationData *)((BrowserNode *) child)->get_data();
@@ -3381,7 +3445,7 @@ void BrowserClass::plug_out_conversion()
 
                     set_user_id(0);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "removeAssociatedComponent") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "removeAssociatedComponent") == 0) {
                     ((BrowserNode *) child)->set_name("removeAssociatedArtifact");
                     set_user_id(uid);	// to create saved  *_<n>.b file name
                     op1 = (OperationData *)((BrowserNode *) child)->get_data();
@@ -3399,7 +3463,7 @@ void BrowserClass::plug_out_conversion()
 
                     set_user_id(0);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "removeAllAssociatedComponents") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "removeAllAssociatedComponents") == 0) {
                     ((BrowserNode *) child)->set_name("removeAllAssociatedArtifacts");
                     set_user_id(uid);	// to create saved  *_<n>.b file name
                     op1 = (OperationData *)((BrowserNode *) child)->get_data();
@@ -3463,7 +3527,7 @@ void BrowserClass::plug_out_conversion()
 
         for (child = baseClass->firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->get_type() == UmlOperation) {
-                if (strcmp(((BrowserNode *) child)->get_name(), "associatedComponent") == 0) {
+                if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "associatedComponent") == 0) {
                     ((BrowserNode *) child)->set_name("associatedArtifact");
                     ((BrowserNode *) child)->set_comment(" returns the optional associated artifact,\n\
                                                          to set it refer to the UmlBaseArtifact's operations\n\
@@ -3491,14 +3555,14 @@ void BrowserClass::plug_out_conversion()
 
         for (child = baseClassView->firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->get_type() == UmlOperation) {
-                if (strcmp(((BrowserNode *) child)->get_name(), "associatedComponentView") == 0) {
+                if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "associatedComponentView") == 0) {
                     ((BrowserNode *) child)->set_name("associatedDeploymentView");
                     ((BrowserNode *) child)->set_comment(" returns the optional associated deployment view");
 
                     op1 = (OperationData *)((BrowserNode *) child)->get_data();
                     op1->set_return_type(t_deplview);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "set_AssociatedComponentView") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "set_AssociatedComponentView") == 0) {
                     ((BrowserNode *) child)->set_name("set_AssociatedDeploymentView");
                     ((BrowserNode *) child)->set_comment(" sets the associated deployment view, arg may be null to unset it\n\
                                                          \n\
@@ -3507,7 +3571,7 @@ void BrowserClass::plug_out_conversion()
                                                          op1 = (OperationData *)((BrowserNode *) child)->get_data();
                             op1->set_param_type(0, t_deplview);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "read_uml_") == 0) {
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "read_uml_") == 0) {
                     set_user_id(uid);	// to create saved  *_<n>.b file name
                     op1 = (OperationData *)((BrowserNode *) child)->get_data();
 
@@ -3535,7 +3599,7 @@ void BrowserClass::plug_out_conversion()
 
         for (child = baseItem->firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->get_type() == UmlOperation) {
-                if (strcmp(((BrowserNode *) child)->get_name(), "read_") == 0) {
+                if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "read_") == 0) {
                     set_user_id(uid);	// to create saved  *_<n>.b file name
                     op1 = (OperationData *)((BrowserNode *) child)->get_data();
 
@@ -3581,17 +3645,17 @@ void BrowserClass::plug_out_conversion()
 
         for (child = onInstanceCmd->firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->get_type() == UmlAttribute) {
-                if (strcmp(((BrowserNode *) child)->get_name(), "assocComponentCmd") == 0) {
+                if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "assocComponentCmd") == 0) {
                     a = (BrowserAttribute *)
                             ((BrowserAttribute *) child)->duplicate(onInstanceCmd, "assocArtifactCmd");
                     ((AttributeData *) a->get_data())->set_visibility(UmlPublic);
                     a->moveItem(child);
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "addAssocComponentCmd") == 0)
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "addAssocComponentCmd") == 0)
                     ((BrowserNode *) child)->set_name("addAssocArtifactCmd");
-                else if (strcmp(((BrowserNode *) child)->get_name(), "removeAssocComponentCmd") == 0)
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "removeAssocComponentCmd") == 0)
                     ((BrowserNode *) child)->set_name("removeAssocArtifactCmd");
-                else if (strcmp(((BrowserNode *) child)->get_name(), "removeAllAssocComponentsCmd") == 0)
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "removeAllAssocComponentsCmd") == 0)
                     ((BrowserNode *) child)->set_name("removeAllAssocArtifactsCmd");
             }
         }
@@ -3602,7 +3666,7 @@ void BrowserClass::plug_out_conversion()
             ((AttributeData *) a->get_data())->set_visibility(UmlPublic);
 
             for (child = anItemKind->firstChild(); child != 0; child = child->nextSibling()) {
-                if (strcmp(((BrowserNode *) child)->get_name(), "aNode") == 0) {
+                if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "aNode") == 0) {
                     a->moveItem(child);
                     break;
                 }
@@ -3614,7 +3678,7 @@ void BrowserClass::plug_out_conversion()
 
         for (child = com->firstChild(); child != 0; child = child->nextSibling()) {
             if ((((BrowserNode *) child)->get_type() == UmlOperation) &&
-                    (strcmp(((BrowserNode *) child)->get_name(), "connect") == 0)) {
+                    (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "connect") == 0)) {
                 set_user_id(uid);	// to create saved  *_<n>.b file name
                 op1 = (OperationData *)((BrowserNode *) child)->get_data();
 
@@ -3651,7 +3715,7 @@ void BrowserClass::plug_out_conversion()
 
         for (child = artifact->firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->get_type() == UmlOperation) {
-                if (strcmp(((BrowserNode *) child)->get_name(), "UmlComponent") == 0) {
+                if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "UmlComponent") == 0) {
                     BrowserOperation * componentCreate =
                             new BrowserOperation((BrowserOperation *) child, component);
 
@@ -3661,7 +3725,7 @@ void BrowserClass::plug_out_conversion()
                     OperationData::convert((OperationData *) componentCreate->get_data(),
                                            (OperationData *)((BrowserNode *) child)->get_data());
                 }
-                else if (strcmp(((BrowserNode *) child)->get_name(), "~UmlComponent") == 0)
+                else if (strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "~UmlComponent") == 0)
                     ((BrowserNode *) child)->set_name("~UmlArtifact");
             }
             else if (((BrowserNode *) child)->get_type() == UmlGeneralisation) {
@@ -3686,7 +3750,7 @@ void BrowserClass::plug_out_conversion()
 
         bn = (BrowserNode *) comArtifact->parent();
 
-        if (strcmp(bn->get_name(), "Com Component view") == 0) {
+        if (strcmp(bn->get_name().toLatin1().constData(), "Com Component view") == 0) {
             bn->set_name("Com Deployment view");
             bn->set_comment("The API system artifacts concerning the communication with DOUML\n\nDO NOT MODIFY THEM !!!\n");
         }
@@ -3696,7 +3760,7 @@ void BrowserClass::plug_out_conversion()
         if (settingsArtifact != 0) {
             bn = (BrowserNode *) settingsArtifact->parent();
 
-            if (strcmp(bn->get_name(), "Settings Component view") == 0) {
+            if (strcmp(bn->get_name().toLatin1().constData(), "Settings Component view") == 0) {
                 bn->set_name("Settings Deployment view");
                 bn->set_comment("The API system artifacts concerning the settings\n\nDO NOT MODIFY THEM !!!\n");
             }
@@ -3704,7 +3768,7 @@ void BrowserClass::plug_out_conversion()
 
         bn = (BrowserNode *) artifactArtifact->parent();
 
-        if (strcmp(bn->get_name(), "API USER component view") == 0) {
+        if (strcmp(bn->get_name().toLatin1().constData(), "API USER component view") == 0) {
             bn->set_name("API USER Deployment view");
             s = bn->get_comment();
             index = 0;
@@ -3717,6 +3781,7 @@ void BrowserClass::plug_out_conversion()
             bn->set_comment(s);
         }
     }
+
 }
 
 static BrowserClass * add_metaclass(BrowserClass * cl, const char * mclname,
@@ -3724,35 +3789,30 @@ static BrowserClass * add_metaclass(BrowserClass * cl, const char * mclname,
 {
     BrowserNode * p = 0;
     BrowserNode * pack = (BrowserNode *) cl->parent()->parent();
-
-    for (Q3ListViewItem * child = pack->firstChild(); child; child = child->nextSibling()) {
+    for (BrowserNode * child = pack->firstChild(); child; child = child->nextSibling()) {
         if ((((BrowserNode *) child)->get_type() == UmlClassView) &&
-                !strncmp(((BrowserNode *) child)->get_name(), "meta classes", 12) &&
+                !strncmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "meta classes", 12) &&
                 !((BrowserNode *) child)->wrong_child_name(mclname, UmlClass, FALSE, FALSE))
             p = (BrowserNode *) child;
     }
-
     if (p == 0) {
         QString s = "meta classes";
 
         while (pack->wrong_child_name(s, UmlClassView, TRUE, FALSE))
             s += "_";
-
         p = new BrowserClassView(s, pack);
     }
 
     BrowserClass * r = BrowserClass::add_class(FALSE, p, mclname);
 
     r->get_data()->set_stereotype("metaclass");
-
     if (mclpath != 0)
         r->set_value("metaclassPath", mclpath);
-
     return r;
 }
 
 static void extend(BrowserClass * cl, WrapperStr mclpath,
-                   Q3PtrList<BrowserClass> & metaclasses)
+                   QList<BrowserClass *> & metaclasses)
 {
     int index = mclpath.find('#');
 
@@ -3764,37 +3824,40 @@ static void extend(BrowserClass * cl, WrapperStr mclpath,
         const char * defltpath1 = "http://schema.omg.org/spec/UML/2.1/uml.xml";
         bool dflt = ((path == defltpath0) || (path == defltpath1));
 
-        Q3PtrListIterator<BrowserClass> it(metaclasses);
-        BrowserClass * mcl;
-
+        BrowserClass *metaclass = 0;
         if (dflt) {
-            for (; (mcl = it.current()) != 0; ++it) {
-                if (!strcmp(mclname, mcl->get_name())) {
-                    const char * s = mcl->get_value("metaclassPath");
+            foreach (BrowserClass *mcl, metaclasses) {
+                if (!strcmp(mclname, mcl->get_name().toLatin1().constData())) {
+                    QString s = mcl->get_value("metaclassPath");
 
-                    if ((s == 0) || !strcmp(s, defltpath0) || !strcmp(s, defltpath1))
+                    if (s.isEmpty()|| s == defltpath0 || s == defltpath1) {
+                        metaclass = mcl;
                         break;
+                    }
                 }
             }
         }
         else {
-            for (; (mcl = it.current()) != 0; ++it) {
-                if (!strcmp(mclname, mcl->get_name())) {
-                    const char * s = mcl->get_value("metaclassPath");
+            foreach (BrowserClass *mcl, metaclasses) {
+                if (!strcmp(mclname, mcl->get_name().toLatin1().constData())) {
+                    QString s = mcl->get_value("metaclassPath");
 
-                    if ((s != 0) && (path == s))
+                    if (path == s) {
+                        metaclass = mcl;
                         break;
+                    }
                 }
             }
         }
 
-        if (mcl == 0) {
-            mcl = add_metaclass(cl, mclname, (dflt) ? 0 : path.data());
-            metaclasses.append(mcl);
+        if (metaclass == 0) {
+            metaclass = add_metaclass(cl, mclname, (dflt) ? 0 : path.data());
+            metaclasses.append(metaclass);
         }
 
-        cl->add_relation(UmlDirectionalAssociation, mcl);
+        cl->add_relation(UmlDirectionalAssociation, metaclass);
     }
+
 }
 
 void BrowserClass::post_load()
@@ -3806,31 +3869,27 @@ void BrowserClass::post_load()
     BrowserOperation::post_load(); // must be done after rel and attr post_load
 
     if (NeedPostLoad) {
-        Q3PtrList<BrowserClass> stereotypes;
-        Q3PtrList<BrowserClass> metaclasses;
+        QList<BrowserClass *> stereotypes;
+        QList<BrowserClass *> metaclasses;
 
         IdIterator<BrowserClass> it(all);
         BrowserClass * cl;
-
-        while ((cl = it.current()) != 0) {
-            if (!cl->is_undefined()) {
-                const char * s = cl->def->get_stereotype();
-
-                if (strcmp(s, "metaclass") == 0)
-                    metaclasses.append(cl);
-
-                if ((strcmp(s, "stereotype") == 0) &&
-                        (((BrowserNode *) cl->parent()->parent())->get_type() == UmlPackage) &&
-                        !strcmp(((BrowserNode *) cl->parent()->parent())->get_stereotype(), "profile"))
-                    stereotypes.append(cl);
-            }
-
-            ++it;
+        while(it.hasNext()){
+            it.next();
+            if((cl = it.value()) != 0)
+                if (!cl->is_undefined()) {
+                    const char * s = cl->def->get_stereotype();
+
+                    if (strcmp(s, "metaclass") == 0)
+                        metaclasses.append(cl);
+
+                    if ((strcmp(s, "stereotype") == 0) &&
+                            (((BrowserNode *) cl->parent()->parent())->get_type() == UmlPackage) &&
+                            !strcmp(((BrowserNode *) cl->parent()->parent())->get_stereotype(), "profile"))
+                        stereotypes.append(cl);
+                }
         }
-
-        while (! stereotypes.isEmpty()) {
-            cl = stereotypes.take(0);
-
+        foreach (cl, stereotypes) {
             WrapperStr s = cl->get_value("stereotypeExtension"); // non empty
 
             s = s.simplifyWhiteSpace();
@@ -3847,6 +3906,7 @@ void BrowserClass::post_load()
 
             cl->remove_key_value("stereotypeExtension");
         }
+        stereotypes.clear();
 
         NeedPostLoad = FALSE;
     }
@@ -3949,12 +4009,14 @@ BrowserClass * BrowserClass::read(char *& st, char * k,
         result->BrowserNode::read(st, k, id);	// updates k
 
         if (strcmp(k, "end")) {
-            while (BrowserAttribute::read(st, k, result) ||
+            while (
+                   BrowserClass::read(st, k, result) ||
+                   BrowserAttribute::read(st, k, result) ||
                    BrowserOperation::read(st, k, result) ||
                    BrowserExtraMember::read(st, k, result) ||
                    BrowserRelation::read(st, k, result) ||
-                   BrowserSimpleRelation::read(st, k, result) ||
-                   BrowserClass::read(st, k, result))
+                   BrowserSimpleRelation::read(st, k, result))
+
                 k = read_keyword(st);
 
             if (in_import()) {
@@ -3972,7 +4034,6 @@ BrowserClass * BrowserClass::read(char *& st, char * k,
                  (read_file_format() < 63) &&
                  !strcmp(result->def->get_stereotype(), "stereotype"))
             NeedPostLoad = (result->get_value("stereotypeExtension") != 0);
-
         return result;
     }
     else
@@ -4014,3 +4075,8 @@ BrowserNode * BrowserClass::get_it(const char * k, int id)
 
     return r;
 }
+
+uint BrowserClass::TypeID()
+{
+    return TypeIdentifier<BrowserClass>::id();
+}
diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h
index c45d79b70..a8edf046f 100644
--- a/src/browser/BrowserClass.h
+++ b/src/browser/BrowserClass.h
@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include <QDragMoveEvent>
 #include <QDropEvent>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 // *************************************************************************
 //
@@ -49,12 +49,15 @@ class BrowserClassDiagram;
 
 #include "BrowserNode.h"
 #include "Labeled.h"
+#include "UmlEnum.h"
 
 class BrowserClass : public BrowserNode, public Labeled<BrowserClass>
 {
     friend class StereotypesDialog;
+    friend class QuickEdit;
 
 protected:
+    BrowserClass(int id);
     static IdDict<BrowserClass> all;
 
     static QStringList its_default_stereotypes;
@@ -63,88 +66,95 @@ class BrowserClass : public BrowserNode, public Labeled<BrowserClass>
     ClassData * def;
     BrowserClassDiagram * associated_diagram;
     BrowserArtifact * associated_artifact;	// generate its def
-    Q3ValueList<BrowserComponent *> associated_components;	// realize or provide it
+    QList<BrowserComponent *> associated_components;	// realize or provide it
 
 protected:
-    BrowserClass(int id);
-    void exec_menu_choice(int index, Q3PtrList<BrowserOperation> & l);
+
+    void exec_menu_choice(int index, QList<BrowserOperation *> & l);
 
 public:
-    BrowserClass(QString s, BrowserNode * p, ClassData * d, int id = 0);
+    BrowserClass(const QString & s, BrowserNode * p, ClassData * d, int id = 0);
     BrowserClass(const BrowserClass * model, BrowserNode * p);
     virtual ~BrowserClass();
 
-    BrowserNode * add_attribute(BrowserAttribute * attr = 0, bool enum_item = FALSE);
+    BrowserNode * add_attribute(BrowserAttribute * attr = 0, bool enum_item = FALSE, bool sameName = false);
+    BrowserNode * addAttribute();
+    BrowserNode * addEnumItem();
+    BrowserNode * duplicate_attribute(BrowserAttribute * attr = 0, bool enum_item = FALSE);
     BrowserNode * add_relation(BrowserRelation * rel);
-    BrowserNode * add_operation(BrowserOperation * oper = 0);
+    BrowserNode * add_operation(BrowserOperation * oper = 0, bool sameName = false);
+    BrowserNode * duplicate_operation(BrowserOperation * oper = 0);
+    BrowserNode * addOperation(BrowserOperation * oper = nullptr);
     BrowserNode * add_inherited_operation(BrowserOperation * model);
     BrowserNode * add_extra_member(BrowserExtraMember * em = 0);
-    Q3PtrList<BrowserOperation> inherited_operations(unsigned limit, QString parent_name = QString()) const;
+    QList<BrowserOperation *> inherited_operations(unsigned limit, const QString & parent_name = QString()) const;
     QString may_start(UmlCode l) const;
     QString may_connect(UmlCode l, BrowserClass * other);
-    virtual BasicData * add_relation(UmlCode, BrowserNode *);
-    virtual Q3PtrList<BrowserNode> parents() const;
-    void get_all_parents(Q3PtrList<BrowserClass> &) const;
+    virtual BasicData * add_relation(UmlCode, BrowserNode *) override;
+    virtual QList<BrowserNode *> parents() const override;
+    void get_all_parents(QList<BrowserClass *> &) const;
     // more modern interface to get all parents. Still a lot of qt3 compatibility inside
     QList<BrowserClass*> get_all_parents();
     QStringList get_parents_names();
+    using BrowserNode::get_visibility;
+    virtual UmlVisibility get_visibility() const override;
 
-
-    virtual QString check_inherit(const BrowserNode * parent) const;
+    virtual QString check_inherit(const BrowserNode * parent) const override;
     bool have_abstract_operation();
-    void get_opers(Q3ValueList<const OperationData *> & opers,
+    void get_opers(QList<const OperationData *> & opers,
                    QStringList & list) const;
-    void get_own_opers(Q3ValueList<OperationData *> &opers,
+    void get_own_opers(QList<OperationData *> &opers,
                    QStringList & list) ;
-    void get_inherited_opers(Q3ValueList<OperationData *> & opers,
+    void get_inherited_opers(QList<OperationData *> & opers,
                    QStringList & list) ;
     void get_used_inherited_opers();
 
 
 
-    void get_attrs(BrowserNodeList &) const;
-    void get_rels(BrowserClass *, Q3PtrList<RelationData> &, int * rev = 0) const;
-    void get_rels(BrowserClass * target, Q3PtrList<BrowserRelation> & l) const;
+    void get_attrs(BrowserNodeList &);
+    void get_rels(BrowserClass *, QList<RelationData *> &, int * rev = 0) const;
+    void get_rels(BrowserClass * target, QList<BrowserRelation *> & l) const;
     void get_tree(BrowserNodeList &);
-    virtual BrowserNode * get_associated() const;
+    virtual BrowserNode * get_associated() const override;
     void set_associated_diagram(BrowserClassDiagram *, bool on_read = FALSE);
     BrowserArtifact * get_associated_artifact() const;
     void set_associated_artifact(BrowserArtifact *, bool on_read = FALSE);
-    const Q3ValueList<BrowserComponent *> & get_associated_components() const;
+    const QList<BrowserComponent *> & get_associated_components() const;
     void add_associated_component(BrowserComponent *);
     void remove_associated_component(BrowserComponent *);
 
-    virtual void delete_it();
-    virtual bool undelete(bool rec, QString & warning, QString & renamed);
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> &,
-                                   BooL & duplicable) const;
-    virtual void move(BrowserNode *, BrowserNode * after);
+    virtual void delete_it() override;
+    virtual bool undelete(bool rec, QString & warning, QString & renamed) override;
+    virtual bool may_contains_them(const QList<BrowserNode *> &,
+                                   BooL & duplicable) const override;
+    virtual void move(BrowserNode *, BrowserNode * after) override;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
-    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
+                                    const QString & name = QString()) override;
+    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const override;
     QString contextual_name(ShowContextMode) const;
-    virtual void set_name(const char * s);
-    virtual void member_cpp_def(const QString &, const QString &, QString & s, bool) const;
-    virtual void menu();
-    virtual void apply_shortcut(QString s);
-    virtual void open(bool force_edit);
-    virtual UmlCode get_type() const;
-    virtual QString get_stype() const;
-    virtual int get_identifier() const;
-    virtual const char * help_topic() const;
-    virtual void modified();
-    virtual void on_delete();
-    virtual BasicData * get_data() const;
-    virtual bool allow_spaces() const;
-    virtual const QStringList & default_stereotypes(UmlCode, const BrowserNode *) const; // non class rel
-    virtual const char * constraint() const;
-
-    virtual void save(QTextStream &, bool ref, QString & warning);
+    virtual void set_name(const QString & s) override;
+    virtual void member_cpp_def(const QString &, const QString &, QString & s, bool) const override;
+    virtual void menu() override;
+    virtual void apply_shortcut(const QString & s) override;
+    virtual void open(bool force_edit) override;
+    virtual UmlCode get_type() const override;
+    virtual QString get_stype() const override;
+    virtual int get_identifier() const override;
+    virtual const char * help_topic() const override;
+    virtual void modified() override;
+    virtual void on_delete() override;
+    virtual BasicData * get_data() const override;
+    virtual bool allow_spaces() const override;
+    virtual const QStringList & default_stereotypes(UmlCode, const BrowserNode *) const override; // non class rel
+    virtual const char * constraint() const override;
+
+    virtual void save(QTextStream &, bool ref, QString & warning) override;
     static BrowserClass * read_ref(char *& , const char * k = 0);
     static BrowserClass * read(char *& , char *, BrowserNode *, bool force = TRUE);
     static BrowserNode * read_any_ref(char *& , char *);
     static BrowserNode * get_it(const char * k, int id);
     static void post_load();
+    uint TypeID() override;
 
     static void plug_out_conversion();
     bool get_bodies_read();
@@ -153,7 +163,7 @@ class BrowserClass : public BrowserNode, public Labeled<BrowserClass>
     void set_bodies_modified(bool y);
     QString bodies_file() const;
 
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
     static bool tool_global_cmd(ToolCom * com, const char * args);
 
     static BrowserNodeList & instances(BrowserNodeList &, const char * st = 0, bool non_nested = FALSE);
@@ -161,43 +171,42 @@ class BrowserClass : public BrowserNode, public Labeled<BrowserClass>
                                     const char * stereotype = 0);
     static BrowserClass * add_class(bool stereotypep,
                                     BrowserNode * future_parent,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserClass * find(const char * s);
 
     static void init();
     static void clear(bool old);
     static void update_idmax_for_root();
-    virtual void renumber(int phase);
-    virtual void prepare_update_lib() const;
-    virtual void support_file(Q3Dict<char> & files, bool add) const;
+    virtual void renumber(int phase) override;
+    virtual void prepare_update_lib() const override;
+    virtual void support_file(QHash<QString,char*> & files, bool add) const override;
 
     static const QStringList & default_stereotypes();
     static void read_stereotypes(char *& , char *&);
     static void save_stereotypes(QTextStream &);
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE) override;
 
-    static bool new_java_enums(QString new_st);
+    static bool new_java_enums(const QString & new_st);
 
-    virtual const QPixmap * pixmap(int) const;
-    virtual void update_stereotype(bool rec = FALSE);
-    virtual void iconChanged();
-    virtual void paintCell(QPainter * p, const QColorGroup & cg, int column,
-                           int width, int alignment);
+    virtual const QPixmap * pixmap(int) const override;
+    virtual void update_stereotype(bool rec = FALSE) override;
+    virtual void iconChanged() override;
 
-    virtual void DragMoveEvent(QDragMoveEvent * e);
-    virtual void DropEvent(QDropEvent * e);
-    virtual void DragMoveInsideEvent(QDragMoveEvent * e);
-    virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after);
+    virtual void DragMoveEvent(QDragMoveEvent * e) override;
+    virtual void DropEvent(QDropEvent * e) override;
+    virtual void DragMoveInsideEvent(QDragMoveEvent * e) override;
+    virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after) override;
 
     static BrowserClass * temporary();
 private:
     // some helpers
-    void InstallParentsMenuItems(Q3PopupMenu &inhopersubm);
+    void InstallParentsMenuItems(QMenu &inhopersubm);
     void AddInheritedOperations(int rank);
 
 public:
     QList<OperationData*>  CollectSameThroughInheritance(OperationData*,  QList<BrowserNode*>&, bool goBack = true);
+    virtual QVariant	data(int column, int role) const override;
 
 };
 
diff --git a/src/browser/BrowserClassDiagram.cpp b/src/browser/BrowserClassDiagram.cpp
index 9e29cea3f..02ccbbf47 100644
--- a/src/browser/BrowserClassDiagram.cpp
+++ b/src/browser/BrowserClassDiagram.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 
 #include "BrowserClassDiagram.h"
@@ -54,11 +54,11 @@
 #include "mu.h"
 #include "translate.h"
 
-Q3PtrList<BrowserClassDiagram> BrowserClassDiagram::imported;
-Q3ValueList<int> BrowserClassDiagram::imported_ids;
+QList<BrowserClassDiagram *> BrowserClassDiagram::imported;
+QList<int> BrowserClassDiagram::imported_ids;
 QStringList BrowserClassDiagram::its_default_stereotypes;	// unicode
 
-BrowserClassDiagram::BrowserClassDiagram(QString s, BrowserNode * p, int id)
+BrowserClassDiagram::BrowserClassDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -80,7 +80,9 @@ BrowserClassDiagram::BrowserClassDiagram(BrowserClassDiagram * model, BrowserNod
     is_modified = TRUE;
 
     if (model->window != 0)
+    {
         model->window->duplicate(get_ident(), "diagram");
+    }
     else {
         char * diagram;
 
@@ -108,7 +110,7 @@ BrowserClassDiagram::~BrowserClassDiagram()
 
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
     window = 0;
     all.remove(get_ident());
@@ -136,26 +138,23 @@ BrowserClassDiagram * BrowserClassDiagram::add_class_diagram(BrowserNode * futur
         return 0;
 }
 
-void BrowserClassDiagram::set_name(const char * s)
+void BrowserClassDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
 
     if (window != 0)
-        window->setCaption(s);
+        window->setWindowTitle(s);
 }
 
 void BrowserClassDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserClassDiagram * d = imported.take(0);
-
-        (new ClassDiagramWindow(d->full_name(), d, *it))->close(TRUE);
-        it = imported_ids.remove(it);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserClassDiagram *d, imported) {
+        (new ClassDiagramWindow(d->full_name(), d, *it))->close();
+        /*it = */imported_ids.removeOne(*it);
         d->is_modified = TRUE;
     }
+    imported.clear();
 }
 
 void BrowserClassDiagram::renumber(int phase)
@@ -173,11 +172,12 @@ void BrowserClassDiagram::delete_it()
 {
     if (window)
         delete window;
+    window = 0;
 
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserClassDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserClassDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserClassDiagram * result = new BrowserClassDiagram(this, p);
 
@@ -209,50 +209,52 @@ void BrowserClassDiagram::draw_svg() const
 
 void BrowserClassDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem("Show", 0),
+        MenuFactory::addItem(m, "Show", 0,
                        "to show and edit the <i>class diagram</i>");
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem("Edit", 1),
+            MenuFactory::addItem(m, "Edit", 1,
                            "to edit the <i>class diagram</i>");
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem("Edit drawing settings", 2),
+                MenuFactory::addItem(m, "Edit drawing settings", 2,
                                "to set how the <i>class diagram</i>'s items must be drawn");
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem("Duplicate", 3),
+                m.addSeparator();
+                MenuFactory::addItem(m, "Duplicate", 3,
                                "to duplicate the <i>class diagram</i>");
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem("Delete", 4),
+                    m.addSeparator();
+                    MenuFactory::addItem(m, "Delete", 4,
                                    "to delete the <i>class diagram</i>. \
 Note that you can undelete it after");
                 }
             }
         }
 
-        mark_menu(m, TR("the class diagram"), 90);
+        mark_menu(m, QObject::tr("the class diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem("Tool", &toolm);
+            m.addSeparator();
+            MenuFactory::insertItem(m,QObject::tr("Tool"), &toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem("Undelete", 5),
+        MenuFactory::addItem(m, "Undelete", 5,
                        "to undelete the <i>class diagram</i>");
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserClassDiagram::exec_menu_choice(int rank)
@@ -303,7 +305,7 @@ void BrowserClassDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserClassDiagram::apply_shortcut(QString s)
+void BrowserClassDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -351,7 +353,7 @@ void BrowserClassDiagram::open(bool)
     else
         window->raise();
 
-
+    windowDestroyed = false;
     window->setFocus();
 }
 
@@ -404,7 +406,7 @@ UmlCode BrowserClassDiagram::get_type() const
 
 QString BrowserClassDiagram::get_stype() const
 {
-    return TR("class diagram");
+    return QObject::tr("class diagram");
 }
 
 int BrowserClassDiagram::get_identifier() const
@@ -505,7 +507,7 @@ bool BrowserClassDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
     return TRUE;
@@ -520,9 +522,8 @@ bool BrowserClassDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
-
         return TRUE;
 
     default:
@@ -531,7 +532,7 @@ bool BrowserClassDiagram::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-void BrowserClassDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
+void BrowserClassDiagram::compute_referenced_by(QList<BrowserNode *> & l,
         BrowserNode * bn,
         char const * kc,
         char const * kr)
@@ -541,16 +542,15 @@ void BrowserClassDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
              : bn->get_identifier();
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
-
-    while ((d = it.current()) != 0) {
+    while(it.hasNext()){
+        it.next();
+        if((d = it.value()) != 0)
         if (!d->deletedp() && (d->get_type() == UmlClassDiagram)) {
             if ((((BrowserClassDiagram *) d)->window != 0)
                 ? ((BrowserClassDiagram *) d)->window->get_view()->is_present(bn)
                 : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
                 l.append((BrowserClassDiagram *) d);
         }
-
-        ++it;
     }
 }
 
@@ -594,7 +594,9 @@ void BrowserClassDiagram::save(QTextStream & st, bool ref, QString & warning)
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
diff --git a/src/browser/BrowserClassDiagram.h b/src/browser/BrowserClassDiagram.h
index 155ebbdc0..430d74458 100644
--- a/src/browser/BrowserClassDiagram.h
+++ b/src/browser/BrowserClassDiagram.h
@@ -33,8 +33,7 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include <QTextStream>
-#include <Q3ValueList>
-
+#include <QList>
 class QPixmap;
 class ClassDiagramWindow;
 class SimpleData;
@@ -45,8 +44,8 @@ class BrowserClassDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserClassDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserClassDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
 
     SimpleData * def;
@@ -64,39 +63,39 @@ class BrowserClassDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserClassDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserClassDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserClassDiagram();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
-
-    virtual const QPixmap * pixmap(int) const;
-    virtual void draw_svg() const;
-
-    virtual void menu();
-    virtual void apply_shortcut(QString s);
-    virtual void open(bool);
-    virtual void on_close();
-    virtual void read_session(char *& st);
-    virtual UmlCode get_type() const;
-    virtual QString get_stype() const;
-    virtual int get_identifier() const;
-    virtual const char * help_topic() const;
-    virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
-    virtual void update_drawing_settings();
-    virtual void get_classdiagramsettings(ClassDiagramSettings &) const;
-    virtual bool get_auto_label_position() const;
-    virtual bool get_shadow() const;
-    virtual bool get_draw_all_relations() const;
-    virtual void dont_draw_all_relations();
-    virtual bool get_show_stereotype_properties() const;
-    virtual UmlColor get_color(UmlCode) const;
-    virtual void package_settings(BooL & name_in_tab, ShowContextMode & show_context) const;
-    virtual bool tool_cmd(ToolCom * com, const char * args);
-
-    virtual void save(QTextStream &, bool ref, QString & warning);
+                                    const QString & name = QString()) override;
+
+    virtual const QPixmap * pixmap(int) const override;
+    virtual void draw_svg() const override;
+
+    virtual void menu() override;
+    virtual void apply_shortcut(const QString & s) override;
+    virtual void open(bool) override;
+    virtual void on_close() override;
+    virtual void read_session(char *& st) override;
+    virtual UmlCode get_type() const override;
+    virtual QString get_stype() const override;
+    virtual int get_identifier() const override;
+    virtual const char * help_topic() const override;
+    virtual BasicData * get_data() const override;
+    virtual void set_name(const QString & s) override;
+    virtual void update_drawing_settings() override;
+    virtual void get_classdiagramsettings(ClassDiagramSettings &) const override;
+    virtual bool get_auto_label_position() const override;
+    virtual bool get_shadow() const override;
+    virtual bool get_draw_all_relations() const override;
+    virtual void dont_draw_all_relations() override;
+    virtual bool get_show_stereotype_properties() const override;
+    virtual UmlColor get_color(UmlCode) const override;
+    virtual void package_settings(BooL & name_in_tab, ShowContextMode & show_context) const override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
+
+    virtual void save(QTextStream &, bool ref, QString & warning) override;
     static BrowserClassDiagram * read(char *& , char *, BrowserNode *);
     static BrowserClassDiagram * read_ref(char *& , const char *);
     static BrowserNode * get_it(const char * k, int id);
@@ -109,11 +108,11 @@ class BrowserClassDiagram : public BrowserDiagram
     static void read_stereotypes(char *& , char *& k);
     static void save_stereotypes(QTextStream &);
 
-    virtual void renumber(int phase);
+    virtual void renumber(int phase) override;
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 };
 
diff --git a/src/browser/BrowserClassInstance.cpp b/src/browser/BrowserClassInstance.cpp
index 9755e3037..ce9f1edcb 100644
--- a/src/browser/BrowserClassInstance.cpp
+++ b/src/browser/BrowserClassInstance.cpp
@@ -29,11 +29,11 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 
 #include "BrowserClassInstance.h"
@@ -61,8 +61,8 @@
 
 IdDict<BrowserClassInstance> BrowserClassInstance::all(__FILE__);
 
-BrowserClassInstance::BrowserClassInstance(QString s, BrowserClass * cl,
-        BrowserNode * p, int id)
+BrowserClassInstance::BrowserClassInstance(const QString & s, BrowserClass * cl,
+                                           BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserClassInstance>(all, id)
 {
     def = new ClassInstanceData(cl);
@@ -72,7 +72,7 @@ BrowserClassInstance::BrowserClassInstance(QString s, BrowserClass * cl,
 }
 
 BrowserClassInstance::BrowserClassInstance(const BrowserClassInstance * model,
-        BrowserNode * p)
+                                           BrowserNode * p)
     : BrowserNode(model->name, p), Labeled<BrowserClassInstance>(all, 0)
 {
     def = new ClassInstanceData(model->def);
@@ -103,7 +103,7 @@ bool BrowserClassInstance::undelete(bool, QString & warning, QString & renamed)
 
     if (def->get_class()->deletedp()) {
         warning += QString("<li><b>") + quote(name) +
-                   ":" + quote(def->get_class()->get_name()) + "</b>\n";
+                ":" + quote(def->get_class()->get_name()) + "</b>\n";
         return FALSE;
     }
 
@@ -116,7 +116,7 @@ bool BrowserClassInstance::undelete(bool, QString & warning, QString & renamed)
     return TRUE;
 }
 
-BrowserNode * BrowserClassInstance::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserClassInstance::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserClassInstance * result = new BrowserClassInstance(this, p);
 
@@ -129,19 +129,20 @@ BrowserNode * BrowserClassInstance::duplicate(BrowserNode * p, QString name)
 void BrowserClassInstance::post_load()
 {
     IdIterator<BrowserClassInstance> it(all);
-
-    while (it.current()) {
-        it.current()->def->init_other_side();
-        ++it;
+    while(it.hasNext()){
+        it.next();
+        if(it.value())
+        it.value()->def->init_other_side();
     }
 
-    it.toFirst();
-
-    while (it.current()) {
-        it.current()->def->check();
-        it.current()->def->check_rels();
+    it.toFront();
 
-        ++it;
+    while(it.hasNext()){
+        it.next();
+        if(it.value()) {
+        it.value()->def->check();
+        it.value()->def->check_rels();
+        }
     }
 }
 
@@ -197,7 +198,7 @@ void BrowserClassInstance::update_stereotype(bool)
 
         if (show_stereotypes && stereotype[0]) {
             QString s = toUnicode(stereotype);
-            int index = s.find(':');
+            int index = s.indexOf(':');
 
             setText(0,
                     "<<" + ((index == -1) ? s : s.mid(index + 1))
@@ -208,7 +209,7 @@ void BrowserClassInstance::update_stereotype(bool)
     }
 }
 
-void BrowserClassInstance::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserClassInstance::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserClassInstance::compute_referenced_by(l, this);
@@ -220,19 +221,20 @@ void BrowserClassInstance::referenced_by(Q3PtrList<BrowserNode> & l, bool ondele
     }
 }
 
-void BrowserClassInstance::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * target)
+void BrowserClassInstance::compute_referenced_by(QList<BrowserNode *> & l,
+                                                 BrowserNode * target)
 {
     IdIterator<BrowserClassInstance> it(all);
-
-    while (it.current()) {
-        if (!it.current()->deletedp()) {
-            ClassInstanceData * data = it.current()->def;
+    while(it.hasNext()){
+        it.next();
+        if(it.value()) {
+        if (!it.value()->deletedp()) {
+            ClassInstanceData * data = it.value()->def;
             bool add = (data->get_class() == target);
 
             if (!add && (target->get_type() == UmlAttribute)) {
-                const Q3ValueList<SlotAttr> & attrs = data->get_attributes();
-                Q3ValueList<SlotAttr>::ConstIterator it_a;
+                const QList<SlotAttr> & attrs = data->get_attributes();
+                QList<SlotAttr>::ConstIterator it_a;
 
                 for (it_a = attrs.begin(); it_a != attrs.end(); ++it_a) {
                     if ((*it_a).att == target) {
@@ -243,14 +245,14 @@ void BrowserClassInstance::compute_referenced_by(Q3PtrList<BrowserNode> & l,
             }
 
             if (!add) {
-                const Q3ValueList<SlotRel> & rels = data->get_relations();
-                Q3ValueList<SlotRel>::ConstIterator it_r;
+                const QList<SlotRel> & rels = data->get_relations();
+                QList<SlotRel>::ConstIterator it_r;
 
                 for (it_r = rels.begin(); it_r != rels.end(); ++it_r) {
                     const SlotRel & slot = *it_r;
 
                     if ((slot.is_a) ? (slot.rel->get_start() == target)
-                        : (slot.rel->get_end() == target)) {
+                            : (slot.rel->get_end() == target)) {
                         add = TRUE;
                         break;
                     }
@@ -263,59 +265,65 @@ void BrowserClassInstance::compute_referenced_by(Q3PtrList<BrowserNode> & l,
             }
 
             if (add)
-                l.append(it.current());
+                l.append(it.value());
         }
-
-        ++it;
+    }
     }
 }
 
 void BrowserClassInstance::menu()
 {
-    Q3PopupMenu m(0, "class instance");
-    Q3PopupMenu toolm(0);
+    QMenu m("class instance",0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>class instance</i>, \
-a double click with the left mouse button does the same thing"));
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 4),
-                           TR("to duplicate the <i>class instance</i>"));
-
-            if (!is_read_only && (edition_number == 0)) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Delete"), 1),
-                               TR("to delete the <i>class instance</i>. \
-Note that you can undelete it after"));
-            }
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>class instance</i>, \
+                                             a double click with the left mouse button does the same thing"));
+                                             MenuFactory::addItem(m, QObject::tr("Duplicate"), 4,
+                                                                  QObject::tr("to duplicate the <i>class instance</i>"));
+
+                                 if (!is_read_only && (edition_number == 0)) {
+                                     m.addSeparator();
+                                     MenuFactory::addItem(m, QObject::tr("Delete"), 1,
+                                     QObject::tr("to delete the <i>class instance</i>. \
+                                     Note that you can undelete it after"));
+                                 }
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 3),
-                       TR("to know who reference the <i>class instance</i> \
-through a relation"));
-        mark_menu(m, TR("the class instance"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 3,
+                             QObject::tr("to know who reference the <i>class instance</i> \
+                                         through a relation"));
+                                         mark_menu(m, QObject::tr("the class instance"), 90);
+                             ProfiledStereotypes::menu(m, this, 99990);
+
+                if ((edition_number == 0) &&
+                    Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 2),
-                       TR("to undelete the <i>class instance</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 2,
+                             QObject::tr("to undelete the <i>class instance</i>"));
 
         if (def->get_class()->deletedp())
-            m.setItemEnabled(2, FALSE);
+        {
+            QAction *act = MenuFactory::findAction(m, 2);
+            if(act)
+                act->setEnabled(false);
+        }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserClassInstance::exec_menu_choice(int rank)
@@ -355,7 +363,7 @@ void BrowserClassInstance::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserClassInstance::apply_shortcut(QString s)
+void BrowserClassInstance::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -390,8 +398,8 @@ void BrowserClassInstance::apply_shortcut(QString s)
 void BrowserClassInstance::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited)
         def->edit();
@@ -404,7 +412,7 @@ UmlCode BrowserClassInstance::get_type() const
 
 QString BrowserClassInstance::get_stype() const
 {
-    return TR("class instance");
+    return QObject::tr("class instance");
 }
 
 int BrowserClassInstance::get_identifier() const
@@ -423,7 +431,7 @@ BrowserClassInstance * BrowserClassInstance::get_classinstance(BrowserNode * fut
     QString name;
     BrowserNodeList nodes;
 
-    if (!future_parent->enter_child_name(name, TR("enter class instance's name (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter class instance's name (may be empty) : "),
                                          UmlClassInstance, instances(nodes),
                                          &old, TRUE, TRUE))
         return 0;
@@ -437,7 +445,7 @@ BrowserClassInstance * BrowserClassInstance::get_classinstance(BrowserNode * fut
         return 0;
 
     BrowserClassInstance * result =
-        new BrowserClassInstance(name, cl, future_parent);
+            new BrowserClassInstance(name, cl, future_parent);
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -452,29 +460,28 @@ BrowserClassInstance * BrowserClassInstance::get_classinstance(BrowserClass * cl
     BrowserNodeList nodes;
 
     IdIterator<BrowserClassInstance> it(all);
-
-    while (it.current() != 0) {
-        if (!it.current()->deletedp() &&
-            (((ClassInstanceData *)(it.current()->get_data()))->get_class() == cl))
-            nodes.append(it.current());
-
-        ++it;
+    while(it.hasNext()){
+        it.next();
+        if(it.value() != 0) {
+        if (!it.value()->deletedp() &&
+                (((ClassInstanceData *)(it.value()->get_data()))->get_class() == cl))
+            nodes.append(it.value());
+    }
     }
-
     nodes.sort_it();
 
     // use cl here but any element is good for
-    return (! cl->enter_child_name(dummy, TR("choose existing instance : "),
+    return (! cl->enter_child_name(dummy, QObject::tr("choose existing instance : "),
                                    UmlClassInstance, nodes, &old,
                                    TRUE, TRUE, TRUE))
-           ? 0 : ((BrowserClassInstance *) old);
+            ? 0 : ((BrowserClassInstance *) old);
 }
 
 BrowserClassInstance * BrowserClassInstance::add_classinstance(BrowserNode * future_parent)
 {
     QString name;
 
-    if (! future_parent->enter_child_name(name, TR("enter class instance's name (may be empty) : "),
+    if (! future_parent->enter_child_name(name, QObject::tr("enter class instance's name (may be empty) : "),
                                           UmlClassInstance, TRUE, TRUE))
         return 0;
 
@@ -484,7 +491,7 @@ BrowserClassInstance * BrowserClassInstance::add_classinstance(BrowserNode * fut
         return 0;
 
     BrowserClassInstance * result =
-        new BrowserClassInstance(name, cl, future_parent);
+            new BrowserClassInstance(name, cl, future_parent);
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -493,17 +500,17 @@ BrowserClassInstance * BrowserClassInstance::add_classinstance(BrowserNode * fut
 }
 
 // to add BrowserClassInstance from old diagrams
-BrowserClassInstance * BrowserClassInstance::get_it(QString s, BrowserClass * cl,
-        BrowserNode * parent)
+BrowserClassInstance * BrowserClassInstance::get_it(const QString & s, BrowserClass * cl,
+                                                    BrowserNode * parent)
 {
     if (! s.isEmpty()) {
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = parent->firstChild(); child != 0; child = child->nextSibling())
             if (!((BrowserNode *) child)->deletedp() &&
-                (((BrowserNode *) child)->get_type() == UmlClassInstance) &&
-                (((BrowserClassInstance *) child)->name == s) &&
-                (((BrowserClassInstance *) child)->def->get_class() == cl))
+                    (((BrowserNode *) child)->get_type() == UmlClassInstance) &&
+                    (((BrowserClassInstance *) child)->name == s) &&
+                    (((BrowserClassInstance *) child)->def->get_class() == cl))
                 return ((BrowserClassInstance *) child);
     }
 
@@ -516,28 +523,28 @@ BasicData * BrowserClassInstance::get_data() const
 }
 
 BrowserNodeList & BrowserClassInstance::instances(BrowserNodeList & result,
-        const char * st)
+                                                  const char * st)
 {
     IdIterator<BrowserClassInstance> it(all);
-
     if ((st == 0) || (*st == 0)) {
-        while (it.current() != 0) {
-            if (!it.current()->deletedp())
-                result.append(it.current());
+        while(it.hasNext()){
+            it.next();
+            if (it.value() != 0)
+                if (!it.value()->deletedp())
+                    result.append(it.value());
 
-            ++it;
         }
     }
     else {
-        while (it.current() != 0) {
-            if (!it.current()->deletedp() &&
-                !strcmp(it.current()->get_data()->get_stereotype(), st))
-                result.append(it.current());
+        while(it.hasNext()){
+            it.next();
+            if (it.value() != 0)
+                if (!it.value()->deletedp() &&
+                        !strcmp(it.value()->get_data()->get_stereotype(), st))
+                    result.append(it.value());
 
-            ++it;
         }
     }
-
     result.sort_it();
 
     return result;
@@ -549,7 +556,7 @@ BrowserNode * BrowserClassInstance::get_associated() const
 }
 
 void BrowserClassInstance::set_associated_diagram(BrowserObjectDiagram * dg,
-        bool on_read)
+                                                  bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -599,7 +606,7 @@ bool BrowserClassInstance::api_compatible(unsigned v) const
 
 
 void BrowserClassInstance::add_from_tool(BrowserNode * parent, ToolCom * com,
-        const char * args)
+                                         const char * args)
 {
     BrowserClass * cl = (BrowserClass *) com->get_id(args);
     BrowserClassInstance * ci = new BrowserClassInstance("", cl, parent);
@@ -645,12 +652,12 @@ BrowserClassInstance * BrowserClassInstance::read_ref(char *& st)
     BrowserClassInstance * result = all[id];
 
     return (result == 0)
-           ? new BrowserClassInstance(id)
-           : result;
+            ? new BrowserClassInstance(id)
+            : result;
 }
 
 BrowserClassInstance * BrowserClassInstance::read(char *& st, char * k,
-        BrowserNode * parent)
+                                                  BrowserNode * parent)
 {
     BrowserClassInstance * result;
     int id;
@@ -660,8 +667,8 @@ BrowserClassInstance * BrowserClassInstance::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserClassInstance(id)
-               : result;
+                ? new BrowserClassInstance(id)
+                : result;
     }
     else if (!strcmp(k, "classinstance")) {
         id = read_id(st);
@@ -669,14 +676,14 @@ BrowserClassInstance * BrowserClassInstance::read(char *& st, char * k,
 
         if (result == 0)
             result =
-                new BrowserClassInstance(read_string(st), (BrowserClass *) 0,
-                                         parent, id);
+                    new BrowserClassInstance(read_string(st), (BrowserClass *) 0,
+                                             parent, id);
         else if (result->is_defined) {
             BrowserClassInstance * already_exist = result;
 
             result =
-                new BrowserClassInstance(read_string(st), (BrowserClass *) 0,
-                                         parent, id);
+                    new BrowserClassInstance(read_string(st), (BrowserClass *) 0,
+                                             parent, id);
 
             already_exist->must_change_id(all);
             already_exist->unconsistent_fixed("class instance", result);
@@ -689,7 +696,7 @@ BrowserClassInstance * BrowserClassInstance::read(char *& st, char * k,
         result->is_defined = TRUE;
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         k = read_keyword(st);
 
diff --git a/src/browser/BrowserClassInstance.h b/src/browser/BrowserClassInstance.h
index 7eccd480b..02534b1f1 100644
--- a/src/browser/BrowserClassInstance.h
+++ b/src/browser/BrowserClassInstance.h
@@ -53,7 +53,7 @@ class BrowserClassInstance : public BrowserNode, public Labeled<BrowserClassInst
     void exec_menu_choice(int rank);
 
 public:
-    BrowserClassInstance(QString s, BrowserClass * cl,
+    BrowserClassInstance(const QString & s, BrowserClass * cl,
                          BrowserNode * p, int id = 0);
     BrowserClassInstance(const BrowserClassInstance * model, BrowserNode * p);
     BrowserClassInstance(int id);
@@ -64,14 +64,14 @@ class BrowserClassInstance : public BrowserNode, public Labeled<BrowserClassInst
 
     virtual bool undelete(bool, QString & warning, QString & renamed);
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual bool allow_empty() const;
     virtual void update_stereotype(bool rec = FALSE);
 
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool force_edit);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -86,15 +86,15 @@ class BrowserClassInstance : public BrowserNode, public Labeled<BrowserClassInst
     static BrowserClassInstance * read(char *& , char *, BrowserNode *);
     static BrowserNode * get_it(const char * k, int id);
 
-    static BrowserClassInstance * get_it(QString s, BrowserClass * cl,
+    static BrowserClassInstance * get_it(const QString & s, BrowserClass * cl,
                                          BrowserNode * parent);
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
     static void add_from_tool(BrowserNode * parent, ToolCom * com, const char * args);
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
     static BrowserNodeList & instances(BrowserNodeList &, const char * st = 0);
     static BrowserClassInstance * get_classinstance(BrowserNode * future_parent);
diff --git a/src/browser/BrowserClassView.cpp b/src/browser/BrowserClassView.cpp
index ab10af9a5..ad5942558 100644
--- a/src/browser/BrowserClassView.cpp
+++ b/src/browser/BrowserClassView.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <QMenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -38,12 +38,13 @@
 #include <QDropEvent>
 
 #include "BrowserClassView.h"
-#include "ClassViewDialog.h"
 #include "BrowserClassDiagram.h"
 #include "BrowserColDiagram.h"
+#include "ClassViewDialog.h"
 #include "BrowserSeqDiagram.h"
 #include "BrowserObjectDiagram.h"
 #include "BrowserDeploymentView.h"
+
 #include "BrowserClass.h"
 #include "BrowserClassInstance.h"
 #include "BrowserState.h"
@@ -67,7 +68,7 @@
 IdDict<BrowserClassView> BrowserClassView::all(__FILE__);
 QStringList BrowserClassView::its_default_stereotypes;	// unicode
 
-BrowserClassView::BrowserClassView(QString s, BrowserNode * p, int id)
+BrowserClassView::BrowserClassView(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserClassView>(all, id),
       associated_deployment_view(0)
 {
@@ -124,7 +125,7 @@ BrowserClassView::~BrowserClassView()
     delete def;
 }
 
-BrowserNode * BrowserClassView::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserClassView::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserClassView * result = new BrowserClassView(this, p);
 
@@ -138,7 +139,7 @@ BrowserClassView * BrowserClassView::add_class_view(BrowserNode * future_parent)
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter class view's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter class view's name : "),
                                         UmlClassView, TRUE, FALSE))
         return new BrowserClassView(name, future_parent);
     else
@@ -158,6 +159,7 @@ void BrowserClassView::update_idmax_for_root()
 {
     all.update_idmax_for_root();
     BrowserClass::update_idmax_for_root();
+
     BrowserState::update_idmax_for_root();
     BrowserActivity::update_idmax_for_root();
     BrowserClassInstance::update_idmax_for_root();
@@ -167,7 +169,7 @@ void BrowserClassView::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
@@ -207,63 +209,65 @@ QString BrowserClassView::full_name(bool rev, bool itself) const
 
 void BrowserClassView::menu()
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu subm(0);
-    Q3PopupMenu roundtripm(0);
-    Q3PopupMenu toolm(0);
+
+    QMenu m(0);
+    QMenu subm(0);
+    QMenu roundtripm(0);
+    QMenu toolm(0);
     bool isprofile = (strcmp(((BrowserNode *) parent())->get_data()->get_stereotype(),
                              "profile")
                       == 0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only && (edition_number == 0)) {
             if (isprofile)
-                m.setWhatsThis(m.insertItem(TR("New stereotype"), 18),
-                               TR("to add a <i>stereotype</i>"));
-
-            m.setWhatsThis(m.insertItem(TR("New class diagram"), 0),
-                           TR("to add a <i>class diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New sequence diagram"), 1),
-                           TR("to add a <i>sequence diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New communication diagram"), 2),
-                           TR("to add a <i>communication diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New object diagram"), 15),
-                           TR("to add a <i>object diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New class"), 3),
-                           TR("to add a <i>class</i>"));
-            m.setWhatsThis(m.insertItem(TR("New class instance"), 17),
-                           TR("to add a <i>class instance</i>"));
-            m.setWhatsThis(m.insertItem(TR("New state machine"), 4),
-                           TR("to add a <i>state machine</i>"));
-            m.setWhatsThis(m.insertItem(TR("New activity"), 16),
-                           TR("to add an <i>activity</i>"));
-            m.insertSeparator();
+
+               MenuFactory::addItem(m, QObject::tr("New stereotype"), 18,
+                               QObject::tr("to add a <i>stereotype</i>"));
+
+           MenuFactory::addItem(m, QObject::tr("New class diagram"), 0,
+                           QObject::tr("to add a <i>class diagram</i>"));
+           MenuFactory::addItem(m, QObject::tr("New sequence diagram"), 1,
+                           QObject::tr("to add a <i>sequence diagram</i>"));
+           MenuFactory::addItem(m, QObject::tr("New communication diagram"), 2,
+                           QObject::tr("to add a <i>communication diagram</i>"));
+           MenuFactory::addItem(m, QObject::tr("New object diagram"), 15,
+                           QObject::tr("to add a <i>object diagram</i>"));
+           MenuFactory::addItem(m, QObject::tr("New class"), 3,
+                           QObject::tr("to add a <i>class</i>"));
+           MenuFactory::addItem(m, QObject::tr("New class instance"), 17,
+                           QObject::tr("to add a <i>class instance</i>"));
+           MenuFactory::addItem(m, QObject::tr("New state machine"), 4,
+                           QObject::tr("to add a <i>state machine</i>"));
+           MenuFactory::addItem(m, QObject::tr("New activity"), 16,
+                           QObject::tr("to add an <i>activity</i>"));
+            m.addSeparator();
         }
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 5),
-                           TR("to edit the <i>class view</i>"));
+           MenuFactory::addItem(m, QObject::tr("Edit"), 5,
+                           QObject::tr("to edit the <i>class view</i>"));
 
             if (!is_read_only) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Edit class settings"), 6),
-                               TR("to set the sub classes's settings"));
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 7),
-                               TR("to set how the sub <i>class diagrams</i>'s items must be drawn"));
+                m.addSeparator();
+               MenuFactory::addItem(m, QObject::tr("Edit class settings"), 6,
+                               QObject::tr("to set the sub classes's settings"));
+               MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 7,
+                               QObject::tr("to set how the sub <i>class diagrams</i>'s items must be drawn"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 8),
-                                   TR("to delete the <i>class view</i> and its sub items. \
+                    m.addSeparator();
+                   MenuFactory::addItem(m, QObject::tr("Delete"), 8,
+                                   QObject::tr("to delete the <i>class view</i> and its sub items. \
 Note that you can undelete them after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the class view"), 90);
+        mark_menu(m, QObject::tr("the class view"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if (! isprofile) {
@@ -274,58 +278,63 @@ Note that you can undelete them after"));
             bool idl = GenerationSettings::idl_get_default_defs();
 
             if (cpp || java || php || python || idl) {
-                m.insertSeparator();
-                m.insertItem(TR("Generate"), &subm);
+                m.addSeparator();
+                subm.setTitle(QObject::tr("Generate"));
+                m.addMenu(&subm);
 
                 if (cpp) {
-                    subm.insertItem("C++", 11);
+                    MenuFactory::addItem(subm,"C++", 11);
 
                     if ((edition_number == 0) && !is_read_only)
-                        roundtripm.insertItem("C++", 31);
+                        MenuFactory::addItem(roundtripm,"C++", 31);
                 }
 
                 if (java) {
-                    subm.insertItem("Java", 12);
+                    MenuFactory::addItem(subm,"Java", 12);
 
                     if ((edition_number == 0) && !is_read_only)
-                        roundtripm.insertItem("Java", 32);
+                        MenuFactory::addItem(roundtripm,"Java", 32);
                 }
 
                 if (php)
-                    subm.insertItem("Php", 22);
+                    MenuFactory::addItem(subm,"Php", 22);
 
                 if (python)
-                    subm.insertItem("Python", 25);
+                    MenuFactory::addItem(subm,"Python", 25);
 
                 if (idl)
-                    subm.insertItem("Idl", 13);
+                    MenuFactory::addItem(subm,"Idl", 13);
 
-                if (roundtripm.count() != 0)
-                    m.insertItem(TR("Roundtrip"), &roundtripm);
+                if (roundtripm.actions().count() != 0)
+                    roundtripm.setTitle(QObject::tr("Roundtrip"));
+                    m.addMenu(&roundtripm);
             }
         }
 
         if ((edition_number == 0) &&
             (Tool::menu_insert(&toolm, get_type(), 100))) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 9),
-                       TR("undelete the <i>class view</i>. \
+       MenuFactory::addItem(m, QObject::tr("Undelete"), 9,
+                       QObject::tr("undelete the <i>class view</i>. \
 Do not undelete its sub items"));
-        m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 10),
-                       TR("undelete the <i>class view</i> and its sub items"));
+       MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 10,
+                       QObject::tr("undelete the <i>class view</i> and its sub items"));
     }
 
     if (!isprofile && (associated_deployment_view != 0)) {
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Select associated deployment view"), 14),
-                       TR("to select the associated <i>deployment view</i>"));
+        m.addSeparator();
+       MenuFactory::addItem(m, QObject::tr("Select associated deployment view"), 14,
+                       QObject::tr("to select the associated <i>deployment view</i>"));
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserClassView::exec_menu_choice(int rank)
@@ -343,6 +352,8 @@ void BrowserClassView::exec_menu_choice(int rank)
         if (d == 0)
             return;
 
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
     break;
@@ -353,7 +364,8 @@ void BrowserClassView::exec_menu_choice(int rank)
 
         if (d == 0)
             return;
-
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
     break;
@@ -364,11 +376,11 @@ void BrowserClassView::exec_menu_choice(int rank)
 
         if (d == 0)
             return;
-
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
     break;
-
     case 3: {
         BrowserClass * cl = BrowserClass::add_class(FALSE, this);
 
@@ -388,11 +400,9 @@ void BrowserClassView::exec_menu_choice(int rank)
         st->select_in_browser();
     }
     break;
-
     case 5:
         (new ClassViewDialog(get_data()))->show();
         return;
-
     case 6:
         if (! class_settings.edit(UmlClassView))
             return;
@@ -411,19 +421,19 @@ void BrowserClassView::exec_menu_choice(int rank)
             statediagram_settings.complete(st, FALSE);
             activitydiagram_settings.complete(st, FALSE);
 
-            co[0].set(TR("class color"), &class_color);
-            co[1].set(TR("note color"), &note_color);
-            co[2].set(TR("package color"), &package_color);
-            co[3].set(TR("fragment color"), &fragment_color);
-            co[4].set(TR("duration color"), &duration_color);
-            co[5].set(TR("continuation color"), &continuation_color);
-            co[6].set(TR("state color"), &state_color);
-            co[7].set(TR("state action color"), &stateaction_color);
-            co[8].set(TR("activity color"), &activity_color);
-            co[9].set(TR("activity region color"), &activityregion_color);
-            co[10].set(TR("activity partition color"), &activitypartition_color);
-            co[11].set(TR("activity action color"), &activityaction_color);
-            co[12].set(TR("parameter and pin color"), &parameterpin_color);
+            co[0].set(QObject::tr("class color"), &class_color);
+            co[1].set(QObject::tr("note color"), &note_color);
+            co[2].set(QObject::tr("package color"), &package_color);
+            co[3].set(QObject::tr("fragment color"), &fragment_color);
+            co[4].set(QObject::tr("duration color"), &duration_color);
+            co[5].set(QObject::tr("continuation color"), &continuation_color);
+            co[6].set(QObject::tr("state color"), &state_color);
+            co[7].set(QObject::tr("state action color"), &stateaction_color);
+            co[8].set(QObject::tr("activity color"), &activity_color);
+            co[9].set(QObject::tr("activity region color"), &activityregion_color);
+            co[10].set(QObject::tr("activity partition color"), &activitypartition_color);
+            co[11].set(QObject::tr("activity action color"), &activityaction_color);
+            co[12].set(QObject::tr("parameter and pin color"), &parameterpin_color);
 
             SettingsDialog dialog(&st, &co, FALSE);
 
@@ -525,7 +535,6 @@ void BrowserClassView::exec_menu_choice(int rank)
             ToolCom::run("java_roundtrip", this);
 
         return;
-
     case 14:
         if (! isprofile)
             associated_deployment_view->select_in_browser();
@@ -538,7 +547,8 @@ void BrowserClassView::exec_menu_choice(int rank)
 
         if (d == 0)
             return;
-
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
     break;
@@ -551,7 +561,6 @@ void BrowserClassView::exec_menu_choice(int rank)
     }
 
     return; // package_modified called
-
     case 17: {
         BrowserClassInstance * c =
             BrowserClassInstance::add_classinstance(this);
@@ -561,7 +570,6 @@ void BrowserClassView::exec_menu_choice(int rank)
     }
 
     return; // package_modified called
-
     case 18: {
         BrowserClass * cl = BrowserClass::add_class(TRUE, this);
 
@@ -584,9 +592,10 @@ void BrowserClassView::exec_menu_choice(int rank)
     }
 
     package_modified();
+
 }
 
-void BrowserClassView::apply_shortcut(QString s)
+void BrowserClassView::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -671,7 +680,7 @@ UmlCode BrowserClassView::get_type() const
 
 QString BrowserClassView::get_stype() const
 {
-    return TR("class view");
+    return QObject::tr("class view");
 }
 
 int BrowserClassView::get_identifier() const
@@ -980,13 +989,11 @@ void BrowserClassView::DragMoveInsideEvent(QDragMoveEvent * e)
         e->ignore();
 }
 
-bool BrowserClassView::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserClassView::may_contains_them(const QList<BrowserNode *> & l,
         BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *current, l) {
+        switch (current->get_type()) {
         case UmlClass:
         case UmlClassInstance:
         case UmlClassDiagram:
@@ -995,7 +1002,7 @@ bool BrowserClassView::may_contains_them(const Q3PtrList<BrowserNode> & l,
         case UmlObjectDiagram:
         case UmlState:
         case UmlActivity:
-            if (! may_contains(it.current(), FALSE))
+            if (! may_contains(current, FALSE))
                 return FALSE;
 
             break;
@@ -1004,7 +1011,7 @@ bool BrowserClassView::may_contains_them(const Q3PtrList<BrowserNode> & l,
             return FALSE;
         }
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(current);
     }
 
     return TRUE;
@@ -1024,7 +1031,6 @@ void BrowserClassView::DropEvent(QDropEvent * e)
 void BrowserClassView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, UmlClass)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlClassInstance)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlClassDiagram)) != 0) ||
@@ -1047,7 +1053,7 @@ void BrowserClassView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if (after)
                 bn->moveItem(after);
             else {
-                bn->parent()->takeItem(bn);
+                ((BrowserNode *)bn->parent())->takeItem(bn);
                 insertItem(bn);
             }
 
@@ -1063,7 +1069,7 @@ void BrowserClassView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             package_modified();
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -1075,7 +1081,7 @@ void BrowserClassView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 
 bool BrowserClassView::extract_from_profile()
 {
-    Q3ListViewItem * bn = firstChild();
+    BrowserNode * bn = firstChild();
     bool has_stereotypes = FALSE;
 
     while (bn != 0) {
@@ -1094,7 +1100,7 @@ bool BrowserClassView::extract_from_profile()
 
 void BrowserClassView::insert_in_profile()
 {
-    Q3ListViewItem * bn = firstChild();
+    BrowserNode * bn = firstChild();
 
     while (bn != 0) {
         if (!((BrowserNode *) bn)->deletedp() &&
@@ -1175,18 +1181,16 @@ void BrowserClassView::save(QTextStream & st, bool ref, QString & warning)
         save_color(st, "activitypartition_color", activitypartition_color, nl);
         save_color(st, "activityaction_color", activityaction_color, nl);
         save_color(st, "parameterpin_color", parameterpin_color, nl);
-
         if (associated_deployment_view != 0) {
             nl_indent(st);
             st << "associated_deployment_view ";
             associated_deployment_view->save(st, TRUE, warning);
         }
-
         BrowserNode::save(st);
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -1289,7 +1293,9 @@ BrowserClassView * BrowserClassView::read(char *& st, char * k,
         r->BrowserNode::read(st, k, id);				// updates k
 
         if (strcmp(k, "end")) {
-            while (BrowserClassDiagram::read(st, k, r) ||
+            while (
+
+                   BrowserClassDiagram::read(st, k, r) ||
                    BrowserColDiagram::read(st, k, r) ||
                    BrowserSeqDiagram::read(st, k, r) ||
                    BrowserObjectDiagram::read(st, k, r) ||
@@ -1298,7 +1304,6 @@ BrowserClassView * BrowserClassView::read(char *& st, char * k,
                    BrowserState::read(st, k, r) ||
                    BrowserActivity::read(st, k, r))
                 k = read_keyword(st);
-
             if (strcmp(k, "end"))
                 wrong_keyword(k, "end");
         }
@@ -1315,15 +1320,17 @@ BrowserNode * BrowserClassView::get_it(const char * k, int id)
         return all[id];
 
     BrowserNode * r;
+    if (
 
-    if (((r = BrowserClassDiagram::get_it(k, id)) == 0) &&
+            ((r = BrowserClassDiagram::get_it(k, id)) == 0) &&
         ((r = BrowserColDiagram::get_it(k, id)) == 0) &&
         ((r = BrowserSeqDiagram::get_it(k, id)) == 0) &&
         ((r = BrowserObjectDiagram::get_it(k, id)) == 0) &&
+
+
         ((r = BrowserClass::get_it(k, id)) == 0) &&
         ((r = BrowserState::get_it(k, id)) == 0))
         r = BrowserActivity::get_it(k, id);
-
     return r;
 }
 
diff --git a/src/browser/BrowserClassView.h b/src/browser/BrowserClassView.h
index b75d8e2e7..a1e99b9eb 100644
--- a/src/browser/BrowserClassView.h
+++ b/src/browser/BrowserClassView.h
@@ -27,8 +27,9 @@
 
 #ifndef BROWSER_CLASSVIEW_H
 #define BROWSER_CLASSVIEW_H
-
+#ifdef habip
 #include <q3intdict.h>
+#endif
 //Added by qt3to4:
 #include <QPixmap>
 #include <QDropEvent>
@@ -77,7 +78,7 @@ class BrowserClassView : public BrowserNode, public Labeled<BrowserClassView>
     void exec_menu_choice(int rank);
 
 public:
-    BrowserClassView(QString s, BrowserNode * p, int id = 0);
+    BrowserClassView(const QString & s, BrowserNode * p, int id = 0);
     BrowserClassView(const BrowserClassView * model, BrowserNode * p);
     virtual ~BrowserClassView();
 
@@ -88,16 +89,16 @@ class BrowserClassView : public BrowserNode, public Labeled<BrowserClassView>
     void set_associated_deploymentview(BrowserDeploymentView *, bool on_read = FALSE);
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> &,
+    virtual bool may_contains_them(const QList<BrowserNode *> &,
                                    BooL & duplicable) const;
     virtual BrowserNode * container(UmlCode) const; // container for class, state machine and activity
     virtual BasicData * get_data() const;
diff --git a/src/browser/BrowserColDiagram.cpp b/src/browser/BrowserColDiagram.cpp
index 078cb382d..577ddaaa7 100644
--- a/src/browser/BrowserColDiagram.cpp
+++ b/src/browser/BrowserColDiagram.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 
 #include "BrowserColDiagram.h"
@@ -53,11 +53,11 @@
 #include "mu.h"
 #include "translate.h"
 
-Q3PtrList<BrowserColDiagram> BrowserColDiagram::imported;
-Q3ValueList<int> BrowserColDiagram::imported_ids;
+QList<BrowserColDiagram *> BrowserColDiagram::imported;
+QList<int> BrowserColDiagram::imported_ids;
 QStringList BrowserColDiagram::its_default_stereotypes;	// unicode
 
-BrowserColDiagram::BrowserColDiagram(QString s, BrowserNode * p, int id)
+BrowserColDiagram::BrowserColDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -87,7 +87,9 @@ BrowserColDiagram::BrowserColDiagram(BrowserColDiagram * model, BrowserNode * p)
     is_modified = TRUE;
 
     if (model->window != 0)
+    {
         model->window->duplicate(get_ident(), "diagram");
+    }
     else {
         char * diagram;
 
@@ -107,7 +109,7 @@ BrowserColDiagram::~BrowserColDiagram()
 
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
 
     all.remove(get_ident());
@@ -128,33 +130,29 @@ BrowserColDiagram * BrowserColDiagram::add_collaboration_diagram(BrowserNode * f
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter communication diagram's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter communication diagram's name : "),
                                         UmlColDiagram, TRUE, FALSE))
         return new BrowserColDiagram(name, future_parent);
     else
         return 0;
 }
 
-void BrowserColDiagram::set_name(const char * s)
+void BrowserColDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
-
     if (window != 0)
-        window->setCaption(s);
+        window->setWindowTitle(s);
 }
 
 void BrowserColDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserColDiagram * d = imported.take(0);
-
-        (new ColDiagramWindow(d->full_name(), d, *it))->close(TRUE);
-        it = imported_ids.remove(it);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserColDiagram *d, imported) {
+        (new ColDiagramWindow(d->full_name(), d, *it))->close();
+        it = imported_ids.erase(it);
         d->is_modified = TRUE;
     }
+    imported.clear();
 }
 
 void BrowserColDiagram::renumber(int phase)
@@ -172,11 +170,11 @@ void BrowserColDiagram::delete_it()
 {
     if (window)
         delete window;
-
+    window = 0;
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserColDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserColDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserColDiagram * result = new BrowserColDiagram(this, p);
 
@@ -212,50 +210,54 @@ void BrowserColDiagram::draw_svg() const
 
 void BrowserColDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Show"), 0),
-                       TR("to show and edit the <i>communication diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Show"), 0,
+                             QObject::tr("to show and edit the <i>communication diagram</i>"));
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                           TR("to edit the <i>communication diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                                 QObject::tr("to edit the <i>communication diagram</i>"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 2),
-                               TR("to set how the <i>communication diagram</i>'s items must be drawn"));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to duplicate the <i>communication diagram</i>"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 2,
+                                     QObject::tr("to set how the <i>communication diagram</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 3,
+                                     QObject::tr("to duplicate the <i>communication diagram</i>"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 4),
-                                   TR("to delete the <i>communication diagram</i>. \
-Note that you can undelete it after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 4,
+                                         QObject::tr("to delete the <i>communication diagram</i>. \
+                                                     Note that you can undelete it after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the communication diagram"), 90);
+        mark_menu(m, QObject::tr("the communication diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>communication diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>communication diagram</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserColDiagram::exec_menu_choice(int rank)
@@ -266,7 +268,7 @@ void BrowserColDiagram::exec_menu_choice(int rank)
         break;
 
     case 1:
-        edit(TR("Communication diagram"), its_default_stereotypes);
+        edit( QObject::tr("Communication diagram"), its_default_stereotypes);
         return;
 
     case 2:
@@ -276,13 +278,13 @@ void BrowserColDiagram::exec_menu_choice(int rank)
     case 3: {
         QString name;
 
-        if (((BrowserNode *)parent())->enter_child_name(name, TR("enter communication diagram's name : "),
-                UmlColDiagram, TRUE, FALSE))
+        if (((BrowserNode *)parent())->enter_child_name(name, QObject::tr("enter communication diagram's name : "),
+                                                        UmlColDiagram, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
         else
             return;
     }
-    break;
+        break;
 
     case 4:
         delete_it();
@@ -306,7 +308,7 @@ void BrowserColDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserColDiagram::apply_shortcut(QString s)
+void BrowserColDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -349,7 +351,7 @@ void BrowserColDiagram::open(bool)
         window = new ColDiagramWindow(full_name(TRUE), this);
     else
         window->raise();
-
+    windowDestroyed = false;
     window->setFocus();
 }
 
@@ -361,10 +363,10 @@ void BrowserColDiagram::edit_settings()
 
         settings.complete(st, TRUE);
 
-        co[0].set(TR("package color"), &package_color);
-        co[1].set(TR("fragment color"), &fragment_color);
-        co[2].set(TR("note color"), &note_color);
-        co[3].set(TR("class instance \ncolor"), &class_instance_color);
+        co[0].set( QObject::tr("package color"), &package_color);
+        co[1].set( QObject::tr("fragment color"), &fragment_color);
+        co[2].set( QObject::tr("note color"), &note_color);
+        co[3].set( QObject::tr("class instance \ncolor"), &class_instance_color);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -403,7 +405,7 @@ UmlCode BrowserColDiagram::get_type() const
 
 QString BrowserColDiagram::get_stype() const
 {
-    return TR("communication diagram");
+    return QObject::tr("communication diagram");
 }
 
 int BrowserColDiagram::get_identifier() const
@@ -431,7 +433,7 @@ void BrowserColDiagram::get_collaborationdiagramsettings(CollaborationDiagramSet
 }
 
 void BrowserColDiagram::package_settings(BooL & name_in_tab,
-        ShowContextMode & show_context) const
+                                         ShowContextMode & show_context) const
 {
     name_in_tab = used_settings->package_name_in_tab == UmlYes;
     show_context = used_settings->show_class_pack_context_mode;
@@ -459,8 +461,8 @@ UmlColor BrowserColDiagram::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 bool BrowserColDiagram::get_shadow() const
@@ -482,7 +484,7 @@ bool BrowserColDiagram::get_draw_all_relations() const
 void BrowserColDiagram::dont_draw_all_relations()
 {
     settings.draw_all_relations =
-        used_settings->draw_all_relations = UmlNo;
+            used_settings->draw_all_relations = UmlNo;
 }
 
 bool BrowserColDiagram::get_show_stereotype_properties() const
@@ -515,10 +517,10 @@ bool BrowserColDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
-    return TRUE;
+        return TRUE;
 
     case saveInCmd:
         if (window != 0)
@@ -530,9 +532,8 @@ bool BrowserColDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
-
         return TRUE;
 
     case sideCmd:
@@ -543,9 +544,8 @@ bool BrowserColDiagram::tool_cmd(ToolCom * com, const char * args)
 
             ((ColDiagramView *) w->get_view())->send(com);
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
-
         return TRUE;
 
     default:
@@ -554,24 +554,25 @@ bool BrowserColDiagram::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-void BrowserColDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * bn,
-        char const * kc,
-        char const * kr)
+void BrowserColDiagram::compute_referenced_by(QList<BrowserNode *> & l,
+                                              BrowserNode * bn,
+                                              char const * kc,
+                                              char const * kr)
 {
     int id = bn->get_identifier();
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
+    while(it.hasNext()){
+        it.next();
+        if((d = it.value()) != 0) {
+            if (!d->deletedp() && (d->get_type() == UmlColDiagram)) {
+                if ((((BrowserColDiagram *) d)->window != 0)
+                        ? ((BrowserColDiagram *) d)->window->get_view()->is_present(bn)
+                        : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
+                    l.append((BrowserColDiagram *) d);
+            }
 
-    while ((d = it.current()) != 0) {
-        if (!d->deletedp() && (d->get_type() == UmlColDiagram)) {
-            if ((((BrowserColDiagram *) d)->window != 0)
-                ? ((BrowserColDiagram *) d)->window->get_view()->is_present(bn)
-                : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
-                l.append((BrowserColDiagram *) d);
         }
-
-        ++it;
     }
 }
 
@@ -615,7 +616,9 @@ void BrowserColDiagram::save(QTextStream & st, bool ref, QString & warning)
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
@@ -634,7 +637,7 @@ void BrowserColDiagram::save(QTextStream & st, bool ref, QString & warning)
 }
 
 BrowserColDiagram * BrowserColDiagram::read(char *& st, char * k,
-        BrowserNode * parent)
+                                            BrowserNode * parent)
 {
     BrowserColDiagram * r;
     int id;
@@ -668,7 +671,7 @@ BrowserColDiagram * BrowserColDiagram::read(char *& st, char * k,
         r->is_defined = TRUE;
 
         r->is_read_only = (!in_import() && read_only_file()) ||
-                          ((user_id() != 0) && r->is_api_base());
+                ((user_id() != 0) && r->is_api_base());
 
         QFileInfo fi(BrowserView::get_dir(), QString::number(id) + ".diagram");
 
diff --git a/src/browser/BrowserColDiagram.h b/src/browser/BrowserColDiagram.h
index 021e766e6..cd8e337f8 100644
--- a/src/browser/BrowserColDiagram.h
+++ b/src/browser/BrowserColDiagram.h
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QPixmap;
 class ColDiagramWindow;
@@ -44,8 +44,8 @@ class BrowserColDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserColDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserColDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
 
     SimpleData * def;
@@ -63,18 +63,18 @@ class BrowserColDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserColDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserColDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserColDiagram();
 
     virtual void delete_it();
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
     virtual void draw_svg() const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual void on_close();
     virtual void read_session(char *& st);
@@ -83,7 +83,7 @@ class BrowserColDiagram : public BrowserDiagram
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
     virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
+    virtual void set_name(const QString & s);
     virtual void update_drawing_settings();
     virtual void get_collaborationdiagramsettings(CollaborationDiagramSettings &) const;
     virtual void package_settings(BooL & name_in_tab, ShowContextMode & show_context) const;
@@ -112,7 +112,7 @@ class BrowserColDiagram : public BrowserDiagram
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 };
 
diff --git a/src/browser/BrowserComponent.cpp b/src/browser/BrowserComponent.cpp
index 16ddfcdd3..8af05550b 100644
--- a/src/browser/BrowserComponent.cpp
+++ b/src/browser/BrowserComponent.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <QMenu.h>
 #include <qcursor.h>
 #include <qdir.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 #include <QDragMoveEvent>
 #include <QDropEvent>
@@ -53,11 +53,13 @@
 #include "Tool.h"
 #include "ui/menufactory.h"
 #include "ClassListDialog.h"
+#include "ComponentDialog.h"
+#include "UmlDrag.h"
 #include "GenerationSettings.h"
 #include "ReferenceDialog.h"
-#include "UmlDrag.h"
+
 #include "mu.h"
-#include "ComponentDialog.h"
+
 #include "DialogUtil.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
@@ -65,7 +67,7 @@
 IdDict<BrowserComponent> BrowserComponent::all(257, __FILE__);
 QStringList BrowserComponent::its_default_stereotypes;	// unicode
 
-BrowserComponent::BrowserComponent(QString s, BrowserNode * p, int id)
+BrowserComponent::BrowserComponent(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserComponent>(all, id)
 {
     def = new SimpleData;
@@ -100,7 +102,7 @@ BrowserComponent::~BrowserComponent()
     delete def;
 }
 
-BrowserNode * BrowserComponent::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserComponent::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserComponent * result = new BrowserComponent(this, p);
 
@@ -123,14 +125,13 @@ void BrowserComponent::update_idmax_for_root()
 void BrowserComponent::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
-
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserComponent::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserComponent::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -140,19 +141,20 @@ void BrowserComponent::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
     }
 }
 
-void BrowserComponent::compute_referenced_by(Q3PtrList<BrowserNode> & l,
+void BrowserComponent::compute_referenced_by(QList<BrowserNode *> & l,
         BrowserClass * target)
 {
     IdIterator<BrowserComponent> it(all);
 
-    while (it.current()) {
-        if (!it.current()->deletedp() &&
-            ((it.current()->realizing_classes.findIndex(target) != -1) ||
-             (it.current()->provided_classes.findIndex(target) != -1) ||
-             (it.current()->required_classes.findIndex(target) != -1)))
-            l.append(it.current());
-
-        ++it;
+    while(it.hasNext()){
+        it.next();
+        if(it.value()) {
+        if (!it.value()->deletedp() &&
+            ((it.value()->realizing_classes.indexOf(target) != -1) ||
+             (it.value()->provided_classes.indexOf(target) != -1) ||
+             (it.value()->required_classes.indexOf(target) != -1)))
+            l.append(it.value());
+}
     }
 }
 
@@ -166,7 +168,6 @@ const QPixmap * BrowserComponent::pixmap(int) const
 {
     if (deletedp())
         return DeletedComponentIcon;
-
     const QPixmap * px = ProfiledStereotypes::browserPixmap(def->get_stereotype());
 
     return (px != 0) ? px : ComponentIcon;
@@ -186,7 +187,7 @@ QString BrowserComponent::full_name(bool rev, bool) const
 // just check if the inheritance already exist
 QString BrowserComponent::check_inherit(const BrowserNode * new_parent) const
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling()) {
         BrowserNode * ch = ((BrowserNode *) child);
@@ -194,18 +195,17 @@ QString BrowserComponent::check_inherit(const BrowserNode * new_parent) const
         if ((ch->get_type() == UmlInherit) &&
             ((((SimpleRelationData *) ch->get_data())->get_end_node())
              == new_parent))
-            return TR("already exist");
+            return QObject::tr("already exist");
     }
-
-    return (new_parent != this) ? QString() : TR("circular inheritance");
+    return (new_parent != this) ? QString() : QObject::tr("circular inheritance");
 }
 
-static void make_clsubm(Q3PopupMenu & m, Q3PopupMenu & sm,
-                        Q3ValueList<BrowserClass *> & l, int bias,
+static void make_clsubm(QMenu & m, QMenu & sm,
+                        QList<BrowserClass *> & l, int bias,
                         BooL & need_sep, QString s)
 {
     int n = 0;
-    Q3ValueList<BrowserClass *>::ConstIterator it;
+    QList<BrowserClass *>::ConstIterator it;
 
     for (it = l.begin(); it != l.end(); ++it)
         if (!(*it)->deletedp())
@@ -213,48 +213,48 @@ static void make_clsubm(Q3PopupMenu & m, Q3PopupMenu & sm,
 
     if (n == 1) {
         if (need_sep) {
-            m.insertSeparator();
+            m.addSeparator();
             need_sep = FALSE;
         }
 
-        m.setWhatsThis(m.insertItem(TR("Select the " + s + " class"), bias + 1),
-                       TR("to select the " + s + " <i>class</i>"));
+        MenuFactory::addItem(m, QObject::tr("Select the %1 class").arg(s), bias + 1,
+                       QObject::tr("to select the %1 <i>class</i>").arg(s));
     }
     else if (n > 20) {
         if (need_sep) {
-            m.insertSeparator();
+            m.addSeparator();
             need_sep = FALSE;
         }
 
-        m.setWhatsThis(m.insertItem(TR("Select a " + s + " class"), bias),
-                       TR("to select a " + s + " <i>class</i>"));
+        MenuFactory::addItem(m, QObject::tr("Select a %1 class").arg(s), bias,
+                       QObject::tr("to select a %1 <i>class</i>").arg(s));
     }
     else if (n != 0) {
         if (need_sep) {
-            m.insertSeparator();
+            m.addSeparator();
             need_sep = FALSE;
         }
 
-        MenuFactory::createTitle(sm, TR("Choose class"));
-        sm.insertSeparator();
+        MenuFactory::createTitle(sm, QObject::tr("Choose class"));
+        sm.addSeparator();
 
         for (it = l.begin(), n = bias + 1; it != l.end(); ++it)
             if (!(*it)->deletedp())
-                sm.insertItem((*it)->full_name(TRUE), n++);
+                MenuFactory::addItem(sm, (*it)->full_name(TRUE), n++);
 
-        m.setWhatsThis(m.insertItem(TR("Select a " + s + " class"), &sm),
-                       TR("to select a " + s + " <i>class</i>"));
+        MenuFactory::insertItem(m, QObject::tr("Select a %1 class").arg(s), &sm,
+                       QObject::tr("to select a %1 <i>class</i>").arg(s));
     }
 }
 
 static bool select_associated(int rank, int bias,
-                              Q3ValueList<BrowserClass *> & l)
+                              QList<BrowserClass *> & l)
 {
     if (rank < bias)
         return FALSE;
 
     if (rank == bias) {
-        ClassListDialog dialog(TR("Choose class"), l);
+        ClassListDialog dialog( QObject::tr("Choose class"), l);
 
         dialog.raise();
 
@@ -264,7 +264,7 @@ static bool select_associated(int rank, int bias,
         rank = dialog.choosen() + bias + 1;
     }
 
-    Q3ValueList<BrowserClass *>::ConstIterator it;
+    QList<BrowserClass *>::ConstIterator it;
     int n;
 
     for (it = l.begin(), n = bias + 1;
@@ -273,62 +273,62 @@ static bool select_associated(int rank, int bias,
         ;
 
     (*it)->select_in_browser();
-
     return TRUE;
 }
 
 
 void BrowserComponent::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu rqsubm(0);
-    Q3PopupMenu prsubm(0);
-    Q3PopupMenu rzsubm(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu rqsubm(0);
+    QMenu prsubm(0);
+    QMenu rzsubm(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("New nested component"), 4),
-                           TR("to add an <i>nested component</i> to the <i>component</i>"));
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>component</i>, \
+            MenuFactory::addItem(m, QObject::tr("New nested component"), 4,
+                           QObject::tr("to add an <i>nested component</i> to the <i>component</i>"));
+            m.addSeparator();
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                           QObject::tr("to edit the <i>component</i>, \
 a double click with the left mouse button does the same thing"));
 
             if (!is_read_only && (edition_number == 0)) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Delete"), 1),
-                               TR("to delete the <i>component</i>. \
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Delete"), 1,
+                               QObject::tr("to delete the <i>component</i>. \
 Note that you can undelete it after"));
             }
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 3),
-                       TR("to know who reference the <i>component</i> \
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 3,
+                       QObject::tr("to know who reference the <i>component</i> \
 through a relation"));
-        mark_menu(m, TR("the component"), 90);
+        mark_menu(m, QObject::tr("the component"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 2),
-                       TR("to undelete the <i>component</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 2,
+                       QObject::tr("to undelete the <i>component</i>"));
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 22),
-                               TR("undelete the <i>component</i> and its \
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 22,
+                               QObject::tr("undelete the <i>component</i> and its \
 nested <i>components</i> and <i>relations</i> \
 (except if the component at the other side is also deleted)"));
                 break;
@@ -342,7 +342,9 @@ nested <i>components</i> and <i>relations</i> \
     make_clsubm(m, prsubm, provided_classes, 19999, need_sep, "provided");
     make_clsubm(m, rzsubm, realizing_classes, 29999, need_sep, "realization");
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserComponent::exec_menu_choice(int rank)
@@ -381,21 +383,19 @@ void BrowserComponent::exec_menu_choice(int rank)
             select_associated(rank, 19999, provided_classes) ||
             select_associated(rank, 9999, required_classes))
             return;
-
         if (rank >= 99990)
             ProfiledStereotypes::choiceManagement(this, rank - 99990);
         else if (rank >= 100)
             ToolCom::run(Tool::command(rank - 100), this);
         else
             mark_management(rank - 90);
-
         return;
     }
 
     package_modified();
 }
 
-void BrowserComponent::apply_shortcut(QString s)
+void BrowserComponent::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -423,8 +423,7 @@ void BrowserComponent::apply_shortcut(QString s)
     else if (!is_read_only && (edition_number == 0)) {
         if (s == "Undelete")
             choice = 2;
-
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -466,7 +465,7 @@ UmlCode BrowserComponent::get_type() const
 
 QString BrowserComponent::get_stype() const
 {
-    return TR("component");
+    return QObject::tr("component");
 }
 
 int BrowserComponent::get_identifier() const
@@ -510,7 +509,6 @@ void BrowserComponent::DropEvent(QDropEvent * e)
 void BrowserComponent::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, UmlComponent)) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this))) != 0)) &&
         (bn != after) && (bn != this)) {
@@ -523,14 +521,16 @@ void BrowserComponent::DropAfterEvent(QDropEvent * e, BrowserNode * after)
                 a_comp &&
                 old->may_contains(bn, TRUE)) {
                 // have choice
-                Q3PopupMenu m(0);
+                QMenu m(0);
 
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In ") + QString(get_name()), 1);
+                 MenuFactory::addItem(m, QObject::tr("After ") + QString(get_name()), 2);
 
-                switch (m.exec(QCursor::pos())) {
+                QAction* act = m.exec(QCursor::pos());
+                if(act)
+                switch (act->data().toInt()) {
                 case 1:
                     break;
 
@@ -547,7 +547,7 @@ void BrowserComponent::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if (after)
                 bn->moveItem(after);
             else {
-                bn->parent()->takeItem(bn);
+                ((BrowserNode *)bn->parent())->takeItem(bn);
                 insertItem(bn);
             }
 
@@ -561,7 +561,7 @@ void BrowserComponent::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             package_modified();
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical( QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -577,10 +577,9 @@ BrowserComponent * BrowserComponent::get_component(BrowserNode * future_parent,
     BrowserNode * old;
     QString name;
     BrowserNodeList nodes;
-
     if (!future_parent->enter_child_name(name,
-                                         (existing) ? TR("choose existing component")
-                                         : TR("enter component's name : "),
+                                         (existing) ? QObject::tr("choose existing component")
+                                         : QObject::tr("enter component's name : "),
                                          UmlComponent, instances(nodes), &old,
                                          TRUE, FALSE, existing))
         return 0;
@@ -590,15 +589,13 @@ BrowserComponent * BrowserComponent::get_component(BrowserNode * future_parent,
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
-
     return new BrowserComponent(name, future_parent);
 }
 
 BrowserComponent * BrowserComponent::add_component(BrowserNode * future_parent)
 {
     QString name;
-
-    if (!future_parent->enter_child_name(name, TR("enter component's name : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter component's name : "),
                                          UmlComponent, TRUE, FALSE))
         return 0;
 
@@ -618,27 +615,28 @@ BrowserNodeList & BrowserComponent::instances(BrowserNodeList & result,
     IdIterator<BrowserComponent> it(all);
 
     if ((st == 0) || (*st == 0)) {
-        while (it.current() != 0) {
-            if (!it.current()->deletedp() &&
-                (!non_nested || !it.current()->nestedp()))
-                result.append(it.current());
+        while(it.hasNext()){
+            it.next();
+        if (it.value() != 0)
+            if (!it.value()->deletedp() &&
+                (!non_nested || !it.value()->nestedp()))
+                result.append(it.value());
 
-            ++it;
         }
     }
     else {
-        while (it.current() != 0) {
-            if (!it.current()->deletedp() &&
-                (!non_nested || !it.current()->nestedp()) &&
-                !strcmp(it.current()->get_data()->get_stereotype(), st))
-                result.append(it.current());
+        while(it.hasNext()){
+            it.next();
+        if (it.value() != 0)
+            if (!it.value()->deletedp() &&
+                (!non_nested || !it.value()->nestedp()) &&
+                !strcmp(it.value()->get_data()->get_stereotype(), st))
+                result.append(it.value());
 
-            ++it;
         }
     }
 
     result.sort_it();
-
     return result;
 }
 
@@ -667,19 +665,18 @@ void BrowserComponent::set_associated_diagram(BrowserNode * dg,
 void BrowserComponent::on_delete()
 {
     bool modif = FALSE;
-
     if (associated_diagram && associated_diagram->deletedp()) {
         associated_diagram = 0;
         modif = TRUE;
     }
 
-    Q3ValueList<BrowserClass *>::Iterator it;
+    QList<BrowserClass *>::Iterator it;
 
     it = realizing_classes.begin();
 
     while (it != realizing_classes.end()) {
         if ((*it)->deletedp()) {
-            it = realizing_classes.remove(it);
+            it = realizing_classes.erase(it);
             modif = TRUE;
         }
         else
@@ -690,7 +687,7 @@ void BrowserComponent::on_delete()
 
     while (it != provided_classes.end()) {
         if ((*it)->deletedp()) {
-            it = provided_classes.remove(it);
+            it = provided_classes.erase(it);
             modif = TRUE;
         }
         else
@@ -701,13 +698,12 @@ void BrowserComponent::on_delete()
 
     while (it != required_classes.end()) {
         if ((*it)->deletedp()) {
-            it = required_classes.remove(it);
+            it = required_classes.erase(it);
             modif = TRUE;
         }
         else
             ++it;
     }
-
     if (modif)
         package_modified();
 }
@@ -715,18 +711,17 @@ void BrowserComponent::on_delete()
 void BrowserComponent::remove_associated_class(BrowserClass * c)
 {
     bool done = FALSE;
-    Q3ValueList<BrowserClass *>::Iterator it;
-
-    if ((it = realizing_classes.find(c)) != realizing_classes.end()) {
-        realizing_classes.remove(it);
+    QList<BrowserClass *>::Iterator it;
+    if (realizing_classes.contains(c)) {
+        realizing_classes.removeOne(c);
         QObject::disconnect(c->get_data(), SIGNAL(deleted()),
                             def, SLOT(on_delete()));
         package_modified();
         done = TRUE;
     }
 
-    if ((it = provided_classes.find(c)) != provided_classes.end()) {
-        provided_classes.remove(it);
+    if (provided_classes.contains(c)) {
+        provided_classes.removeOne(c);
 
         if (! done) {
             QObject::disconnect(c->get_data(), SIGNAL(deleted()),
@@ -736,8 +731,8 @@ void BrowserComponent::remove_associated_class(BrowserClass * c)
         }
     }
 
-    if ((it = required_classes.find(c)) != required_classes.end()) {
-        required_classes.remove(it);
+    if (required_classes.contains(c)) {
+        required_classes.removeOne(c);
 
         if (! done) {
             QObject::disconnect(c->get_data(), SIGNAL(deleted()),
@@ -747,27 +742,25 @@ void BrowserComponent::remove_associated_class(BrowserClass * c)
     }
 }
 
-void BrowserComponent::get_all_provided_classes(Q3ValueList<BrowserClass *> & r) const
+void BrowserComponent::get_all_provided_classes(QList<BrowserClass *> & r) const
 {
-    Q3ValueList<BrowserClass *>::ConstIterator it;
-
+    QList<BrowserClass *>::ConstIterator it;
     for (it = provided_classes.begin() ; it != provided_classes.end(); it++)
-        if (r.findIndex(*it) == -1)
+        if (r.indexOf(*it) == -1)
             r.append(*it);
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         if (((BrowserNode *) child)->get_type() == UmlComponent)
             ((BrowserComponent *) child)->get_all_provided_classes(r);
 }
 
-void BrowserComponent::get_all_provided_classes(Q3ValueList<BrowserClass *> & r,
+void BrowserComponent::get_all_provided_classes(QList<BrowserClass *> & r,
         bool sorted) const
 {
     r = provided_classes;
-
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         if (((BrowserNode *) child)->get_type() == UmlComponent)
@@ -775,7 +768,7 @@ void BrowserComponent::get_all_provided_classes(Q3ValueList<BrowserClass *> & r,
 
     if (sorted) {
         BrowserNodeList nl;
-        Q3ValueList<BrowserClass *>::Iterator it;
+        QList<BrowserClass *>::Iterator it;
 
         for (it = r.begin() ; it != r.end(); it++)
             nl.append(*it);
@@ -783,40 +776,37 @@ void BrowserComponent::get_all_provided_classes(Q3ValueList<BrowserClass *> & r,
         r.clear();
         nl.sort_it();
 
-        while (! nl.isEmpty())
-            r.append((BrowserClass *) nl.take(0));
+        foreach (BrowserNode *node, nl)
+            r.append((BrowserClass *) node);
     }
 }
 
-void BrowserComponent::get_all_required_classes(Q3ValueList<BrowserClass *> & r) const
+void BrowserComponent::get_all_required_classes(QList<BrowserClass *> & r) const
 {
-    Q3ValueList<BrowserClass *>::ConstIterator it;
-
+    QList<BrowserClass *>::ConstIterator it;
     for (it = required_classes.begin() ; it != required_classes.end(); it++)
-        if (r.findIndex(*it) == -1)
+        if (!r.contains(*it))
             r.append(*it);
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         if (((BrowserNode *) child)->get_type() == UmlComponent)
             ((BrowserComponent *) child)->get_all_required_classes(r);
 }
 
-void BrowserComponent::get_all_required_classes(Q3ValueList<BrowserClass *> & r,
+void BrowserComponent::get_all_required_classes(QList<BrowserClass *> & r,
         bool sorted) const
 {
     r = required_classes;
-
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
         if (((BrowserNode *) child)->get_type() == UmlComponent)
             ((BrowserComponent *) child)->get_all_required_classes(r);
-
     if (sorted) {
         BrowserNodeList nl;
-        Q3ValueList<BrowserClass *>::Iterator it;
+        QList<BrowserClass *>::Iterator it;
 
         for (it = r.begin() ; it != r.end(); it++)
             nl.append(*it);
@@ -824,17 +814,17 @@ void BrowserComponent::get_all_required_classes(Q3ValueList<BrowserClass *> & r,
         r.clear();
         nl.sort_it();
 
-        while (! nl.isEmpty())
-            r.append((BrowserClass *) nl.take(0));
+        foreach (BrowserNode *node, nl)
+            r.append((BrowserClass *) node);
     }
 }
 
-void BrowserComponent::set_associated_classes(const Q3ValueList<BrowserClass *> & rz,
-        const Q3ValueList<BrowserClass *> & pr,
-        const Q3ValueList<BrowserClass *> & rq,
+void BrowserComponent::set_associated_classes(const QList<BrowserClass *> & rz,
+        const QList<BrowserClass *> & pr,
+        const QList<BrowserClass *> & rq,
         bool on_read)
 {
-    Q3ValueList<BrowserClass *>::Iterator it;
+    QList<BrowserClass *>::Iterator it;
 
     if (! on_read) {
         // manage removed classes
@@ -843,13 +833,13 @@ void BrowserComponent::set_associated_classes(const Q3ValueList<BrowserClass *>
         while (it != realizing_classes.end()) {
             QObject::disconnect((*it)->get_data(), SIGNAL(deleted()),
                                 def, SLOT(on_delete()));
-
-            if (rz.findIndex(*it) == -1) {
+            if (rz.indexOf(*it) == -1) {
                 // stop to be realizing
-                it = realizing_classes.remove(it);
+                realizing_classes.removeOne(*it);
             }
             else
                 ++it;
+
         }
 
         it = provided_classes.begin();
@@ -857,10 +847,9 @@ void BrowserComponent::set_associated_classes(const Q3ValueList<BrowserClass *>
         while (it != provided_classes.end()) {
             QObject::disconnect((*it)->get_data(), SIGNAL(deleted()),
                                 def, SLOT(on_delete()));
-
-            if (pr.findIndex(*it) == -1) {
+            if (pr.indexOf(*it) == -1) {
                 // stop to be provided
-                it = provided_classes.remove(it);
+                provided_classes.removeOne(*it);
             }
             else
                 ++it;
@@ -871,10 +860,9 @@ void BrowserComponent::set_associated_classes(const Q3ValueList<BrowserClass *>
         while (it != required_classes.end()) {
             QObject::disconnect((*it)->get_data(), SIGNAL(deleted()),
                                 def, SLOT(on_delete()));
-
-            if (rq.findIndex(*it) == -1) {
+            if (rq.indexOf(*it) == -1) {
                 // stop to be required
-                it = required_classes.remove(it);
+                required_classes.removeOne(*it);
             }
             else
                 ++it;
@@ -892,14 +880,13 @@ void BrowserComponent::set_associated_classes(const Q3ValueList<BrowserClass *>
     }
 
     provided_classes = pr;
-
     for (it = provided_classes.begin(); it != provided_classes.end(); ++it) {
         BrowserClass * cl = *it;
 
-        if (cl->get_associated_components().findIndex(this) == -1)
+        if (cl->get_associated_components().indexOf(this) == -1)
             cl->add_associated_component(this);
 
-        if (rz.findIndex(cl) == -1) {
+        if (rz.indexOf(cl) == -1) {
             QObject::connect(cl->get_data(), SIGNAL(deleted()),
                              def, SLOT(on_delete()));
         }
@@ -910,12 +897,11 @@ void BrowserComponent::set_associated_classes(const Q3ValueList<BrowserClass *>
     for (it = required_classes.begin(); it != required_classes.end(); ++it) {
         BrowserClass * cl = *it;
 
-        if ((rz.findIndex(cl) == -1) && (pr.findIndex(cl) == -1)) {
+        if ((rz.indexOf(cl) == -1) && (pr.indexOf(cl) == -1)) {
             QObject::connect(cl->get_data(), SIGNAL(deleted()),
                              def, SLOT(on_delete()));
         }
     }
-
     if (!on_read)
         package_modified();
 }
@@ -950,7 +936,7 @@ bool BrowserComponent::tool_cmd(ToolCom * com, const char * args)
         BrowserNode::tool_cmd(com, args);
 
         if (com->api_format() > 13) {
-            Q3ValueList<BrowserClass *>::Iterator it;
+            QList<BrowserClass *>::Iterator it;
 
             com->write_unsigned(realizing_classes.count());
 
@@ -1044,10 +1030,10 @@ bool BrowserComponent::tool_cmd(ToolCom * com, const char * args)
 
                 case setAssocClassesCmd: {
                     // check redondency
-                    Q3ValueList<BrowserClass *> rz;
-                    Q3ValueList<BrowserClass *> pr;
-                    Q3ValueList<BrowserClass *> rq;
-                    Q3ValueList<BrowserClass *>::ConstIterator it;
+                    QList<BrowserClass *> rz;
+                    QList<BrowserClass *> pr;
+                    QList<BrowserClass *> rq;
+                    QList<BrowserClass *>::ConstIterator it;
                     unsigned n;
 
                     n = com->get_unsigned(args);
@@ -1069,39 +1055,39 @@ bool BrowserComponent::tool_cmd(ToolCom * com, const char * args)
 
                     while (it != rz.end()) {
                         BrowserClass * cl = *it;
-
-                        if ((pr.find(cl) != pr.end()) ||
-                            (rq.find(cl) != rq.end()) ||
-                            (rz.find(++it, cl) != rz.end())) {
+                        if ((pr.contains(cl)) ||
+                            (rq.contains(cl)) ||
+                            (rz.contains(cl))) {
                             com->write_ack(FALSE);
                             return TRUE;
                         }
+                        ++it;
                     }
 
                     it = pr.begin();
 
                     while (it != pr.end()) {
                         BrowserClass * cl = *it;
-
-                        if ((rz.find(cl) != rz.end()) ||
-                            (rq.find(cl) != rq.end()) ||
-                            (pr.find(++it, cl) != pr.end())) {
+                        if ((rz.contains(cl)) ||
+                            (rq.contains(cl)) ||
+                            (pr.contains( cl))) {
                             com->write_ack(FALSE);
                             return TRUE;
                         }
+                        ++it;
                     }
 
                     it = rq.begin();
 
                     while (it != rq.end()) {
                         BrowserClass * cl = *it;
-
-                        if ((rz.find(cl) != rz.end()) ||
-                            (pr.find(cl) != pr.end()) ||
-                            (rq.find(++it, cl) != rq.end())) {
+                        if ((rz.contains(cl)) ||
+                            (pr.contains(cl)) ||
+                            (rq.contains( cl))) {
                             com->write_ack(FALSE);
                             return TRUE;
                         }
+                        ++it;
                     }
 
                     set_associated_classes(rz, pr, rq);
@@ -1158,7 +1144,7 @@ void BrowserComponent::save(QTextStream & st, bool ref, QString & warning)
             associated_diagram->save(st, TRUE, warning);
         }
 
-        Q3ValueList<BrowserClass *>::ConstIterator it;
+        QList<BrowserClass *>::ConstIterator it;
 
         if (! realizing_classes.isEmpty()) {
             nl_indent(st);
@@ -1209,7 +1195,7 @@ void BrowserComponent::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -1297,18 +1283,16 @@ BrowserComponent * BrowserComponent::read(char *& st, char * k,
             k = read_keyword(st);
 
             BrowserNode * diag;
-
             if (((diag = BrowserComponentDiagram::read(st, k, 0)) == 0) &&
                 ((diag = BrowserDeploymentDiagram::read(st, k, 0)) == 0))
                 wrong_keyword(k, "component/deployment diagram ref");
-
             result->set_associated_diagram(diag, TRUE);
             k = read_keyword(st);
         }
 
-        Q3ValueList<BrowserClass *> rz;
-        Q3ValueList<BrowserClass *> pr;
-        Q3ValueList<BrowserClass *> rq;
+        QList<BrowserClass *> rz;
+        QList<BrowserClass *> pr;
+        QList<BrowserClass *> rq;
 
         if (!strcmp(k, "realized_classes") || !strcmp(k, "realizing_classes")) {
             while (strcmp((k = read_keyword(st)), "end"))
diff --git a/src/browser/BrowserComponent.h b/src/browser/BrowserComponent.h
index 6a7c698a8..0b2581fef 100644
--- a/src/browser/BrowserComponent.h
+++ b/src/browser/BrowserComponent.h
@@ -2,7 +2,7 @@
 #include <QPixmap>
 #include <QDropEvent>
 #include <QTextStream>
-#include <Q3ValueList>
+//#include <QList>
 #include <QDragMoveEvent>
 // *************************************************************************
 //
@@ -53,18 +53,18 @@ class BrowserComponent : public BrowserNode, public Labeled<BrowserComponent>
 
     SimpleData * def;
     BrowserNode * associated_diagram;
-    Q3ValueList<BrowserClass *> realizing_classes;
-    Q3ValueList<BrowserClass *> provided_classes;
-    Q3ValueList<BrowserClass *> required_classes;
+    QList<BrowserClass *> realizing_classes;
+    QList<BrowserClass *> provided_classes;
+    QList<BrowserClass *> required_classes;
 
     void associate_class(BrowserClass * c);
     void exec_menu_choice(int rank);
 
-    void get_all_provided_classes(Q3ValueList<BrowserClass *> &) const;
-    void get_all_required_classes(Q3ValueList<BrowserClass *> &) const;
+    void get_all_provided_classes(QList<BrowserClass *> &) const;
+    void get_all_required_classes(QList<BrowserClass *> &) const;
 
 public:
-    BrowserComponent(QString s, BrowserNode * p, int id = 0);
+    BrowserComponent(const QString & s, BrowserNode * p, int id = 0);
     BrowserComponent(const BrowserComponent * model, BrowserNode * p);
     BrowserComponent(int id);
 
@@ -73,28 +73,28 @@ class BrowserComponent : public BrowserNode, public Labeled<BrowserComponent>
     virtual BrowserNode * get_associated() const;
     void set_associated_diagram(BrowserNode *, bool on_read = FALSE);
 
-    void set_associated_classes(const Q3ValueList<BrowserClass *> & rz,
-                                const Q3ValueList<BrowserClass *> & pr,
-                                const Q3ValueList<BrowserClass *> & rq,
+    void set_associated_classes(const QList<BrowserClass *> & rz,
+                                const QList<BrowserClass *> & pr,
+                                const QList<BrowserClass *> & rq,
                                 bool on_read = FALSE);
     void remove_associated_class(BrowserClass *);
-    const Q3ValueList<BrowserClass *> & get_provided_classes() const {
+    const QList<BrowserClass *> & get_provided_classes() const {
         return provided_classes;
     }
-    const Q3ValueList<BrowserClass *> & get_required_classes() const {
+    const QList<BrowserClass *> & get_required_classes() const {
         return required_classes;
     }
-    const Q3ValueList<BrowserClass *> & get_realizing_classes() const {
+    const QList<BrowserClass *> & get_realizing_classes() const {
         return realizing_classes;
     }
-    void get_all_provided_classes(Q3ValueList<BrowserClass *> &, bool sorted) const;
-    void get_all_required_classes(Q3ValueList<BrowserClass *> &, bool sorted) const;
+    void get_all_provided_classes(QList<BrowserClass *> &, bool sorted) const;
+    void get_all_required_classes(QList<BrowserClass *> &, bool sorted) const;
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool force_edit);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -124,8 +124,8 @@ class BrowserComponent : public BrowserNode, public Labeled<BrowserComponent>
     virtual const QPixmap * pixmap(int) const;
     virtual void iconChanged();
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserClass *);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserClass *);
 
     static void init();
     static const QStringList & default_stereotypes();
diff --git a/src/browser/BrowserComponentDiagram.cpp b/src/browser/BrowserComponentDiagram.cpp
index 20147e4a8..ba811efb4 100644
--- a/src/browser/BrowserComponentDiagram.cpp
+++ b/src/browser/BrowserComponentDiagram.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 
 #include "BrowserComponentDiagram.h"
@@ -54,11 +54,11 @@
 #include "mu.h"
 #include "translate.h"
 
-Q3PtrList<BrowserComponentDiagram> BrowserComponentDiagram::imported;
-Q3ValueList<int> BrowserComponentDiagram::imported_ids;
+QList<BrowserComponentDiagram *> BrowserComponentDiagram::imported;
+QList<int> BrowserComponentDiagram::imported_ids;
 QStringList BrowserComponentDiagram::its_default_stereotypes;	// unicode
 
-BrowserComponentDiagram::BrowserComponentDiagram(QString s, BrowserNode * p, int id)
+BrowserComponentDiagram::BrowserComponentDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -88,7 +88,9 @@ BrowserComponentDiagram::BrowserComponentDiagram(BrowserComponentDiagram * model
     is_modified = TRUE;
 
     if (model->window != 0)
+    {
         model->window->duplicate(get_ident(), "diagram");
+    }
     else {
         char * diagram;
 
@@ -108,7 +110,7 @@ BrowserComponentDiagram::~BrowserComponentDiagram()
 
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
 
     all.remove(get_ident());
@@ -129,33 +131,32 @@ BrowserComponentDiagram * BrowserComponentDiagram::add_component_diagram(Browser
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter component diagram's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter component diagram's name : "),
                                         UmlComponentDiagram, TRUE, FALSE))
         return new BrowserComponentDiagram(name, future_parent);
     else
         return 0;
 }
 
-void BrowserComponentDiagram::set_name(const char * s)
+void BrowserComponentDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
 
     if (window != 0)
-        window->setCaption(s);
+    {
+        window->setWindowTitle(s);
+    }
 }
 
 void BrowserComponentDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserComponentDiagram * d = imported.take(0);
-
-        (new ComponentDiagramWindow(d->full_name(), d, *it))->close(TRUE);
-        it = imported_ids.remove(it);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserComponentDiagram *d, imported) {
+        (new ComponentDiagramWindow(d->full_name(), d, *it))->close();
+        it = imported_ids.erase(it);
         d->is_modified = TRUE;
     }
+    imported.clear();
 }
 
 void BrowserComponentDiagram::renumber(int phase)
@@ -173,11 +174,11 @@ void BrowserComponentDiagram::delete_it()
 {
     if (window)
         delete window;
-
+    window = 0;
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserComponentDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserComponentDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserComponentDiagram * result = new BrowserComponentDiagram(this, p);
 
@@ -213,50 +214,53 @@ void BrowserComponentDiagram::draw_svg() const
 
 void BrowserComponentDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Show"), 0),
-                       TR("to show and edit the <i>component diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Show"), 0,
+                             QObject::tr("to show and edit the <i>component diagram</i>"));
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                           TR("to edit the <i>component diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                                 QObject::tr("to edit the <i>component diagram</i>"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 2),
-                               TR("to set how the <i>component diagram</i>'s items must be drawn"));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to duplicate the <i>component diagram</i>"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 2,
+                                     QObject::tr("to set how the <i>component diagram</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 3,
+                                     QObject::tr("to duplicate the <i>component diagram</i>"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 4),
-                                   TR("to delete the <i>component diagram</i>. \
-Note that you can undelete it after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 4,
+                                         QObject::tr("to delete the <i>component diagram</i>. \
+                                                     Note that you can undelete it after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the component diagram"), 90);
+        mark_menu(m, QObject::tr("the component diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>component diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>component diagram</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserComponentDiagram::exec_menu_choice(int rank)
@@ -267,7 +271,7 @@ void BrowserComponentDiagram::exec_menu_choice(int rank)
         return;
 
     case 1:
-        edit(TR("Component diagram"), its_default_stereotypes);
+        edit( QObject::tr("Component diagram"), its_default_stereotypes);
         return;
 
     case 2:
@@ -277,13 +281,13 @@ void BrowserComponentDiagram::exec_menu_choice(int rank)
     case 3: {
         QString name;
 
-        if (((BrowserNode *)parent())->enter_child_name(name, TR("enter component diagram's name : "),
-                UmlComponentDiagram, TRUE, FALSE))
+        if (((BrowserNode *)parent())->enter_child_name(name, QObject::tr("enter component diagram's name : "),
+                                                        UmlComponentDiagram, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
         else
             return;
     }
-    break;
+        break;
 
     case 4:
         delete_it();
@@ -307,7 +311,7 @@ void BrowserComponentDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserComponentDiagram::apply_shortcut(QString s)
+void BrowserComponentDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -350,7 +354,7 @@ void BrowserComponentDiagram::open(bool)
         window = new ComponentDiagramWindow(full_name(TRUE), this);
     else
         window->raise();
-
+    windowDestroyed = false;
     window->setFocus();
 }
 
@@ -362,10 +366,10 @@ void BrowserComponentDiagram::edit_settings()
 
         settings.complete(st, TRUE);
 
-        co[0].set(TR("note color"), &note_color);
-        co[1].set(TR("component color"), &component_color);
-        co[2].set(TR("package color"), &package_color);
-        co[3].set(TR("fragment color"), &fragment_color);
+        co[0].set( QObject::tr("note color"), &note_color);
+        co[1].set( QObject::tr("component color"), &component_color);
+        co[2].set( QObject::tr("package color"), &package_color);
+        co[3].set( QObject::tr("fragment color"), &fragment_color);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -403,7 +407,7 @@ UmlCode BrowserComponentDiagram::get_type() const
 
 QString BrowserComponentDiagram::get_stype() const
 {
-    return TR("component diagram");
+    return QObject::tr("component diagram");
 }
 
 int BrowserComponentDiagram::get_identifier() const
@@ -436,7 +440,7 @@ void BrowserComponentDiagram::get_componentdrawingsettings(ComponentDrawingSetti
 }
 
 void BrowserComponentDiagram::package_settings(BooL & name_in_tab,
-        ShowContextMode & show_context) const
+                                               ShowContextMode & show_context) const
 {
     name_in_tab = used_settings->package_name_in_tab == UmlYes;
     show_context = used_settings->show_context_mode;
@@ -464,8 +468,8 @@ UmlColor BrowserComponentDiagram::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 bool BrowserComponentDiagram::get_shadow() const
@@ -481,13 +485,13 @@ bool BrowserComponentDiagram::get_draw_all_relations() const
 void BrowserComponentDiagram::dont_draw_all_relations()
 {
     settings.draw_all_relations =
-        used_settings->draw_all_relations = UmlNo;
+            used_settings->draw_all_relations = UmlNo;
 }
 
 bool BrowserComponentDiagram::get_show_stereotype_properties() const
 {
     return used_settings->componentdrawingsettings.show_stereotype_properties
-           == UmlYes;
+            == UmlYes;
 }
 
 bool BrowserComponentDiagram::get_auto_label_position() const
@@ -510,11 +514,10 @@ bool BrowserComponentDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
-    return TRUE;
-
+        return TRUE;
     case saveInCmd:
         if (window != 0)
             com->write_ack(window->get_view()->save_pict(args, TRUE, FALSE));
@@ -525,35 +528,35 @@ bool BrowserComponentDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
 
         return TRUE;
-
     default:
         return (def->tool_cmd(com, args, this, comment) ||
                 BrowserNode::tool_cmd(com, args));
     }
 }
 
-void BrowserComponentDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * bn,
-        char const * kc,
-        char const * kr)
+void BrowserComponentDiagram::compute_referenced_by(QList<BrowserNode *> & l,
+                                                    BrowserNode * bn,
+                                                    char const * kc,
+                                                    char const * kr)
 {
     int id = bn->get_identifier();
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
+    while(it.hasNext()){
+        it.next();
+        if((d = it.value()) != 0) {
+            if (!d->deletedp() && (d->get_type() == UmlComponentDiagram)) {
+                if ((((BrowserComponentDiagram *) d)->window != 0)
+                        ? ((BrowserComponentDiagram *) d)->window->get_view()->is_present(bn)
+                        : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
+                    l.append((BrowserComponentDiagram *) d);
+            }
 
-    while ((d = it.current()) != 0) {
-        if (!d->deletedp() && (d->get_type() == UmlComponentDiagram)) {
-            if ((((BrowserComponentDiagram *) d)->window != 0)
-                ? ((BrowserComponentDiagram *) d)->window->get_view()->is_present(bn)
-                : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
-                l.append((BrowserComponentDiagram *) d);
         }
-
-        ++it;
     }
 }
 
@@ -597,7 +600,9 @@ void BrowserComponentDiagram::save(QTextStream & st, bool ref, QString & warning
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
@@ -622,11 +627,11 @@ BrowserComponentDiagram * BrowserComponentDiagram::read_ref(char *& st, char * k
 
     int id = read_id(st);
     BrowserComponentDiagram * result =
-        (BrowserComponentDiagram *) all[id];
+            (BrowserComponentDiagram *) all[id];
 
     return (result == 0)
-           ? new BrowserComponentDiagram(id)
-           : result;
+            ? new BrowserComponentDiagram(id)
+            : result;
 }
 
 BrowserComponentDiagram *
@@ -665,7 +670,7 @@ BrowserComponentDiagram::read(char *& st, char * k,
         r->is_defined = TRUE;
 
         r->is_read_only = (!in_import() && read_only_file()) ||
-                          ((user_id() != 0) && r->is_api_base());
+                ((user_id() != 0) && r->is_api_base());
 
         QFileInfo fi(BrowserView::get_dir(), QString::number(id) + ".diagram");
 
diff --git a/src/browser/BrowserComponentDiagram.h b/src/browser/BrowserComponentDiagram.h
index a51b8851d..5cdc0caab 100644
--- a/src/browser/BrowserComponentDiagram.h
+++ b/src/browser/BrowserComponentDiagram.h
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QPixmap;
 class ComponentDiagramWindow;
@@ -44,8 +44,8 @@ class BrowserComponentDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserComponentDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserComponentDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
 
     SimpleData * def;
@@ -63,18 +63,18 @@ class BrowserComponentDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserComponentDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserComponentDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserComponentDiagram();
 
     virtual void delete_it();
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
     virtual void draw_svg() const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual void on_close();
     virtual void read_session(char *& st);
@@ -83,7 +83,7 @@ class BrowserComponentDiagram : public BrowserDiagram
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
     virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
+    virtual void set_name(const QString & s);
     virtual UmlColor get_color(UmlCode) const;
     virtual bool get_shadow() const;
     virtual bool get_draw_all_relations() const;
@@ -112,7 +112,7 @@ class BrowserComponentDiagram : public BrowserDiagram
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 };
 
diff --git a/src/browser/BrowserComponentView.cpp b/src/browser/BrowserComponentView.cpp
index 43e069f25..21724ee73 100644
--- a/src/browser/BrowserComponentView.cpp
+++ b/src/browser/BrowserComponentView.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -56,7 +56,7 @@
 IdDict<BrowserComponentView> BrowserComponentView::all(__FILE__);
 QStringList BrowserComponentView::its_default_stereotypes;	// unicode
 
-BrowserComponentView::BrowserComponentView(QString s, BrowserNode * p, int id)
+BrowserComponentView::BrowserComponentView(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserComponentView>(all, id)
 {
     make();
@@ -91,7 +91,7 @@ BrowserComponentView::~BrowserComponentView()
     delete def;
 }
 
-BrowserNode * BrowserComponentView::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserComponentView::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserComponentView * result = new BrowserComponentView(this, p);
 
@@ -116,7 +116,7 @@ BrowserComponentView * BrowserComponentView::add_component_view(BrowserNode * fu
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter component view's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter component view's name : "),
                                         UmlComponentView, TRUE, FALSE))
         return new BrowserComponentView(name, future_parent);
     else
@@ -139,7 +139,7 @@ void BrowserComponentView::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
@@ -179,60 +179,62 @@ QString BrowserComponentView::full_name(bool rev, bool itself) const
 
 void BrowserComponentView::menu()
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu subm(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu subm(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only && (edition_number == 0)) {
-            m.setWhatsThis(m.insertItem(TR("New component diagram"), 0),
-                           TR("to add a <i>component diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New component"), 1),
-                           TR("to add a <i>component</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("New component diagram"), 0,
+                           QObject::tr("to add a <i>component diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("New component"), 1,
+                           QObject::tr("to add a <i>component</i>"));
+            m.addSeparator();
         }
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 3),
-                           TR("to edit the <i>component view</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("Edit"), 3,
+                           QObject::tr("to edit the <i>component view</i>"));
+            m.addSeparator();
 
             if (!is_read_only) {
-                /*m.setWhatsThis(m.insertItem("Edit component settings", 4),
+                /*MenuFactory::addItem(m, "Edit component settings", 4),
                 	       "to set the sub components's settings");*/
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 5),
-                               TR("to set how the sub <i>component diagrams</i>'s items must be drawn"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 5,
+                               QObject::tr("to set how the sub <i>component diagrams</i>'s items must be drawn"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 6),
-                                   TR("to delete the <i>component view</i> and its sub items. \
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 6,
+                                   QObject::tr("to delete the <i>component view</i> and its sub items. \
 Note that you can undelete them after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the component view"), 90);
+        mark_menu(m, QObject::tr("the component view"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            MenuFactory::insertItem(m, QObject::tr("Tool"), &toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 7),
-                       TR("undelete the <i>component view</i>. \
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 7,
+                       QObject::tr("undelete the <i>component view</i>. \
 Do not undelete its sub items"));
-        m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 8),
-                       TR("undelete the <i>component view</i> and its sub items"));
+        MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 8,
+                       QObject::tr("undelete the <i>component view</i> and its sub items"));
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserComponentView::exec_menu_choice(int rank)
@@ -256,7 +258,7 @@ void BrowserComponentView::exec_menu_choice(int rank)
     break;
 
     case 3:
-        edit(TR("Component view"), its_default_stereotypes);
+        edit(QObject::tr("Component view"), its_default_stereotypes);
         return;
 
         /*case 4:
@@ -270,10 +272,10 @@ void BrowserComponentView::exec_menu_choice(int rank)
 
             componentdiagram_settings.complete(st, FALSE);
 
-            co[0].set(TR("component color"), &component_color);
-            co[1].set(TR("note color"), &note_color);
-            co[2].set(TR("package color"), &package_color);
-            co[3].set(TR("fragment color"), &fragment_color);
+            co[0].set(QObject::tr("component color"), &component_color);
+            co[1].set(QObject::tr("note color"), &note_color);
+            co[2].set(QObject::tr("package color"), &package_color);
+            co[3].set(QObject::tr("fragment color"), &fragment_color);
 
             SettingsDialog dialog(&st, &co, FALSE);
 
@@ -318,7 +320,7 @@ void BrowserComponentView::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserComponentView::apply_shortcut(QString s)
+void BrowserComponentView::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -335,7 +337,7 @@ void BrowserComponentView::apply_shortcut(QString s)
                 choice = 3;
 
             if (!is_read_only) {
-                /*m.setWhatsThis(m.insertItem("Edit component settings", 4),
+                /*MenuFactory::addItem(m, "Edit component settings", 4),
                 	       "to set the sub components's settings");*/
                 if (s == "Edit drawing settings")
                     choice = 5;
@@ -365,7 +367,7 @@ void BrowserComponentView::apply_shortcut(QString s)
 void BrowserComponentView::open(bool)
 {
     if (!is_edited)
-        edit(TR("Component view"), its_default_stereotypes);
+        edit(QObject::tr("Component view"), its_default_stereotypes);
 }
 
 UmlCode BrowserComponentView::get_type() const
@@ -375,7 +377,7 @@ UmlCode BrowserComponentView::get_type() const
 
 QString BrowserComponentView::get_stype() const
 {
-    return TR("component view");
+    return QObject::tr("component view");
 }
 
 int BrowserComponentView::get_identifier() const
@@ -428,14 +430,13 @@ UmlColor BrowserComponentView::get_color(UmlCode who) const
 BrowserNodeList & BrowserComponentView::instances(BrowserNodeList & result)
 {
     IdIterator<BrowserComponentView> it(all);
+    while(it.hasNext()){
+        it.next();
+    if (it.value() != 0)
+        if (!it.value()->deletedp())
+            result.append(it.value());
 
-    while (it.current() != 0) {
-        if (!it.current()->deletedp())
-            result.append(it.current());
-
-        ++it;
     }
-
     result.sort_it();
 
     return result;
@@ -455,8 +456,9 @@ bool BrowserComponentView::tool_cmd(ToolCom * com, const char * args)
                 if (wrong_child_name(args, UmlComponentDiagram, TRUE, FALSE))
                     ok = FALSE;
                 else
+                {
                     (new BrowserComponentDiagram(args, this))->write_id(com);
-
+                }
                 break;
 
             case UmlComponent:
@@ -510,19 +512,17 @@ void BrowserComponentView::DragMoveInsideEvent(QDragMoveEvent * e)
         e->ignore();
 }
 
-bool BrowserComponentView::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserComponentView::may_contains_them(const QList<BrowserNode *> & l,
         BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlComponent:
             duplicable = FALSE;
 
             // no break
         case UmlComponentDiagram:
-            if (! may_contains(it.current(), FALSE))
+            if (! may_contains(node, FALSE))
                 return FALSE;
 
             break;
@@ -531,7 +531,7 @@ bool BrowserComponentView::may_contains_them(const Q3PtrList<BrowserNode> & l,
             return FALSE;
         }
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -545,7 +545,6 @@ void BrowserComponentView::DropEvent(QDropEvent * e)
 void BrowserComponentView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, UmlComponent)) != 0) ||
          (((bn = UmlDrag::decode(e, UmlComponentDiagram)) != 0))) &&
         (bn != after) && (bn != this)) {
@@ -555,7 +554,7 @@ void BrowserComponentView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if (after)
                 bn->moveItem(after);
             else {
-                bn->parent()->takeItem(bn);
+                bn->parent()->removeChild(bn);
                 insertItem(bn);
             }
 
@@ -567,7 +566,7 @@ void BrowserComponentView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             }
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -621,7 +620,7 @@ void BrowserComponentView::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -711,7 +710,6 @@ BrowserComponentView * BrowserComponentView::read(char *& st, char * k,
             while (BrowserComponentDiagram::read(st, k, r) ||
                    BrowserComponent::read(st, k, r))
                 k = read_keyword(st);
-
             if (strcmp(k, "end"))
                 wrong_keyword(k, "end");
         }
@@ -728,7 +726,6 @@ BrowserNode * BrowserComponentView::get_it(const char * k, int id)
         return all[id];
 
     BrowserNode * r;
-
     if ((r = BrowserComponentDiagram::get_it(k, id)) == 0)
         r = BrowserComponent::get_it(k, id);
 
diff --git a/src/browser/BrowserComponentView.h b/src/browser/BrowserComponentView.h
index 9cf208286..2825bdbdc 100644
--- a/src/browser/BrowserComponentView.h
+++ b/src/browser/BrowserComponentView.h
@@ -27,8 +27,9 @@
 
 #ifndef BROWSER_COMPONENTVIEW_H
 #define BROWSER_COMPONENTVIEW_H
-
+#ifdef habip
 #include <q3intdict.h>
+#endif
 //Added by qt3to4:
 #include <QPixmap>
 #include <QDropEvent>
@@ -63,23 +64,23 @@ class BrowserComponentView : public BrowserNode, public Labeled<BrowserComponent
     void exec_menu_choice(int rank);
 
 public:
-    BrowserComponentView(QString s, BrowserNode * p, int id = 0);
+    BrowserComponentView(const QString & s, BrowserNode * p, int id = 0);
     BrowserComponentView(const BrowserComponentView * model, BrowserNode * p);
     virtual ~BrowserComponentView();
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> &,
+    virtual bool may_contains_them(const QList<BrowserNode *> &,
                                    BooL & duplicable) const;
     virtual BasicData * get_data() const;
     virtual void get_componentdiagramsettings(ComponentDiagramSettings &) const;
diff --git a/src/browser/BrowserDeploymentDiagram.cpp b/src/browser/BrowserDeploymentDiagram.cpp
index 4dadc631b..b8b787984 100644
--- a/src/browser/BrowserDeploymentDiagram.cpp
+++ b/src/browser/BrowserDeploymentDiagram.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 
 #include "BrowserDeploymentDiagram.h"
@@ -54,11 +54,11 @@
 #include "mu.h"
 #include "translate.h"
 
-Q3PtrList<BrowserDeploymentDiagram> BrowserDeploymentDiagram::imported;
-Q3ValueList<int> BrowserDeploymentDiagram::imported_ids;
+QList<BrowserDeploymentDiagram *> BrowserDeploymentDiagram::imported;
+QList<int> BrowserDeploymentDiagram::imported_ids;
 QStringList BrowserDeploymentDiagram::its_default_stereotypes;	// unicode
 
-BrowserDeploymentDiagram::BrowserDeploymentDiagram(QString s, BrowserNode * p, int id)
+BrowserDeploymentDiagram::BrowserDeploymentDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -90,7 +90,9 @@ BrowserDeploymentDiagram::BrowserDeploymentDiagram(BrowserDeploymentDiagram * mo
     is_modified = TRUE;
 
     if (model->window != 0)
+    {
         model->window->duplicate(get_ident(), "diagram");
+    }
     else {
         char * diagram;
 
@@ -110,7 +112,7 @@ BrowserDeploymentDiagram::~BrowserDeploymentDiagram()
 
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
 
     all.remove(get_ident());
@@ -133,33 +135,32 @@ BrowserDeploymentDiagram * BrowserDeploymentDiagram::add_deployment_diagram(Brow
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter deployment diagram's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter deployment diagram's name : "),
                                         UmlDeploymentDiagram, TRUE, FALSE))
         return new BrowserDeploymentDiagram(name, future_parent);
     else
         return 0;
 }
 
-void BrowserDeploymentDiagram::set_name(const char * s)
+void BrowserDeploymentDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
 
     if (window != 0)
-        window->setCaption(s);
+    {
+        window->setWindowTitle(s);
+    }
 }
 
 void BrowserDeploymentDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserDeploymentDiagram * d = imported.take(0);
-
-        (new DeploymentDiagramWindow(d->full_name(), d, *it))->close(TRUE);
-        it = imported_ids.remove(it);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserDeploymentDiagram *d, imported) {
+        (new DeploymentDiagramWindow(d->full_name(), d, *it))->close();
+        it = imported_ids.erase(it);
         d->is_modified = TRUE;
     }
+    imported.clear();
 }
 
 void BrowserDeploymentDiagram::renumber(int phase)
@@ -177,11 +178,11 @@ void BrowserDeploymentDiagram::delete_it()
 {
     if (window)
         delete window;
-
+    window = 0;
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserDeploymentDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserDeploymentDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserDeploymentDiagram * result = new BrowserDeploymentDiagram(this, p);
 
@@ -216,50 +217,53 @@ void BrowserDeploymentDiagram::draw_svg() const
 
 void BrowserDeploymentDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Show"), 0),
-                       TR("to show and edit the <i>deployment diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Show"), 0,
+                             QObject::tr("to show and edit the <i>deployment diagram</i>"));
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                           TR("to edit the <i>deployment diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                                 QObject::tr("to edit the <i>deployment diagram</i>"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 2),
-                               TR("to set how the <i>deployment diagram</i>'s items must be drawn"));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to duplicate the <i>deployment diagram</i>"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 2,
+                                     QObject::tr("to set how the <i>deployment diagram</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 3,
+                                     QObject::tr("to duplicate the <i>deployment diagram</i>"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 4),
-                                   TR("to delete the <i>deployment diagram</i>. \
-Note that you can undelete it after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 4,
+                                         QObject::tr("to delete the <i>deployment diagram</i>. \
+                                                     Note that you can undelete it after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the deployment diagram"), 90);
+        mark_menu(m, QObject::tr("the deployment diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>deployment diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>deployment diagram</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserDeploymentDiagram::exec_menu_choice(int rank)
@@ -270,7 +274,7 @@ void BrowserDeploymentDiagram::exec_menu_choice(int rank)
         return;
 
     case 1:
-        edit(TR("Deployment diagram"), its_default_stereotypes);
+        edit( QObject::tr("Deployment diagram"), its_default_stereotypes);
         return;
 
     case 2:
@@ -280,13 +284,13 @@ void BrowserDeploymentDiagram::exec_menu_choice(int rank)
     case 3: {
         QString name;
 
-        if (((BrowserNode *)parent())->enter_child_name(name, TR("enter deployment diagram's name : "),
-                UmlDeploymentDiagram, TRUE, FALSE))
+        if (((BrowserNode *)parent())->enter_child_name(name, QObject::tr("enter deployment diagram's name : "),
+                                                        UmlDeploymentDiagram, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
         else
             return;
     }
-    break;
+        break;
 
     case 4:
         delete_it();
@@ -310,7 +314,7 @@ void BrowserDeploymentDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserDeploymentDiagram::apply_shortcut(QString s)
+void BrowserDeploymentDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -353,7 +357,7 @@ void BrowserDeploymentDiagram::open(bool)
         window = new DeploymentDiagramWindow(full_name(TRUE), this);
     else
         window->raise();
-
+    windowDestroyed = false;
     window->setFocus();
 }
 
@@ -365,12 +369,12 @@ void BrowserDeploymentDiagram::edit_settings()
 
         settings.complete(st, TRUE);
 
-        co[0].set(TR("note color"), &note_color);
-        co[1].set(TR("artifact color"), &artifact_color);
-        co[2].set(TR("node color"), &deploymentnode_color);
-        co[3].set(TR("component color"), &component_color);
-        co[4].set(TR("package color"), &package_color);
-        co[5].set(TR("fragment color"), &fragment_color);
+        co[0].set( QObject::tr("note color"), &note_color);
+        co[1].set( QObject::tr("artifact color"), &artifact_color);
+        co[2].set( QObject::tr("node color"), &deploymentnode_color);
+        co[3].set( QObject::tr("component color"), &component_color);
+        co[4].set( QObject::tr("package color"), &package_color);
+        co[5].set( QObject::tr("fragment color"), &fragment_color);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -408,7 +412,7 @@ UmlCode BrowserDeploymentDiagram::get_type() const
 
 QString BrowserDeploymentDiagram::get_stype() const
 {
-    return TR("deployment diagram");
+    return QObject::tr("deployment diagram");
 }
 
 int BrowserDeploymentDiagram::get_identifier() const
@@ -441,7 +445,7 @@ void BrowserDeploymentDiagram::get_componentdrawingsettings(ComponentDrawingSett
 }
 
 void BrowserDeploymentDiagram::package_settings(BooL & name_in_tab,
-        ShowContextMode & show_context) const
+                                                ShowContextMode & show_context) const
 {
     name_in_tab = used_settings->package_name_in_tab == UmlYes;
     show_context = used_settings->show_context_mode;
@@ -477,8 +481,8 @@ UmlColor BrowserDeploymentDiagram::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 bool BrowserDeploymentDiagram::get_shadow() const
@@ -494,13 +498,13 @@ bool BrowserDeploymentDiagram::get_draw_all_relations() const
 void BrowserDeploymentDiagram::dont_draw_all_relations()
 {
     settings.draw_all_relations =
-        used_settings->draw_all_relations = UmlNo;
+            used_settings->draw_all_relations = UmlNo;
 }
 
 bool BrowserDeploymentDiagram::get_show_stereotype_properties() const
 {
     return used_settings->componentdrawingsettings.show_stereotype_properties
-           == UmlYes;
+            == UmlYes;
 }
 
 bool BrowserDeploymentDiagram::get_auto_label_position() const
@@ -523,11 +527,10 @@ bool BrowserDeploymentDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
-    return TRUE;
-
+        return TRUE;
     case saveInCmd:
         if (window != 0)
             com->write_ack(window->get_view()->save_pict(args, TRUE, FALSE));
@@ -538,35 +541,36 @@ bool BrowserDeploymentDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
 
         return TRUE;
-
     default:
         return (def->tool_cmd(com, args, this, comment) ||
                 BrowserNode::tool_cmd(com, args));
     }
 }
 
-void BrowserDeploymentDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * bn,
-        char const * kc,
-        char const * kr)
+void BrowserDeploymentDiagram::compute_referenced_by(QList<BrowserNode *> & l,
+                                                     BrowserNode * bn,
+                                                     char const * kc,
+                                                     char const * kr)
 {
     int id = bn->get_identifier();
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
 
-    while ((d = it.current()) != 0) {
-        if (!d->deletedp() && (d->get_type() == UmlDeploymentDiagram)) {
-            if ((((BrowserDeploymentDiagram *) d)->window != 0)
-                ? ((BrowserDeploymentDiagram *) d)->window->get_view()->is_present(bn)
-                : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
-                l.append((BrowserDeploymentDiagram *) d);
+    while (it.hasNext()) {
+        it.next();
+        if((d = it.value()) != 0)
+        {
+            if (!d->deletedp() && (d->get_type() == UmlDeploymentDiagram)) {
+                if ((((BrowserDeploymentDiagram *) d)->window != 0)
+                        ? ((BrowserDeploymentDiagram *) d)->window->get_view()->is_present(bn)
+                        : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
+                    l.append((BrowserDeploymentDiagram *) d);
+            }
         }
-
-        ++it;
     }
 }
 
@@ -612,7 +616,9 @@ void BrowserDeploymentDiagram::save(QTextStream & st, bool ref, QString & warnin
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
@@ -633,16 +639,16 @@ void BrowserDeploymentDiagram::save(QTextStream & st, bool ref, QString & warnin
 BrowserDeploymentDiagram * BrowserDeploymentDiagram::read_ref(char *& st, const char * k)
 {
     if (strcmp(k, "deploymentdiagram_ref") &&
-        ((read_file_format() >= 20) || strcmp(k, "componentdiagram_ref")))
+            ((read_file_format() >= 20) || strcmp(k, "componentdiagram_ref")))
         wrong_keyword(k, "deploymentdiagram_ref");
 
     int id = read_id(st);
     BrowserDeploymentDiagram * result =
-        (BrowserDeploymentDiagram *) all[id];
+            (BrowserDeploymentDiagram *) all[id];
 
     return (result == 0)
-           ? new BrowserDeploymentDiagram(id)
-           : result;
+            ? new BrowserDeploymentDiagram(id)
+            : result;
 }
 
 BrowserDeploymentDiagram *
@@ -653,7 +659,7 @@ BrowserDeploymentDiagram::read(char *& st, char * k,
     int id;
 
     if (!strcmp(k, "deploymentdiagram_ref") ||
-        ((read_file_format() < 20) && !strcmp(k, "componentdiagram_ref"))) {
+            ((read_file_format() < 20) && !strcmp(k, "componentdiagram_ref"))) {
         if ((r = (BrowserDeploymentDiagram *) all[id = read_id(st)]) == 0)
             r = new BrowserDeploymentDiagram(id);
 
@@ -661,8 +667,8 @@ BrowserDeploymentDiagram::read(char *& st, char * k,
     }
 
     bool from_component =
-        // component -> artifact
-        (read_file_format() < 20) && !strcmp(k, "componentdiagram");
+            // component -> artifact
+            (read_file_format() < 20) && !strcmp(k, "componentdiagram");
 
     if (!strcmp(k, "deploymentdiagram") || from_component) {
         id = read_id(st);
@@ -687,7 +693,7 @@ BrowserDeploymentDiagram::read(char *& st, char * k,
         r->is_defined = TRUE;
 
         r->is_read_only = (!in_import() && read_only_file()) ||
-                          ((user_id() != 0) && r->is_api_base());
+                ((user_id() != 0) && r->is_api_base());
 
         QFileInfo fi(BrowserView::get_dir(), QString::number(id) + ".diagram");
 
diff --git a/src/browser/BrowserDeploymentDiagram.h b/src/browser/BrowserDeploymentDiagram.h
index 6417fc925..1654fddd9 100644
--- a/src/browser/BrowserDeploymentDiagram.h
+++ b/src/browser/BrowserDeploymentDiagram.h
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QPixmap;
 class DeploymentDiagramWindow;
@@ -44,8 +44,8 @@ class BrowserDeploymentDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserDeploymentDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserDeploymentDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
 
     SimpleData * def;
@@ -65,18 +65,18 @@ class BrowserDeploymentDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserDeploymentDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserDeploymentDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserDeploymentDiagram();
 
     virtual void delete_it();
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
     virtual void draw_svg() const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual void on_close();
     virtual void read_session(char *& st);
@@ -85,7 +85,7 @@ class BrowserDeploymentDiagram : public BrowserDiagram
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
     virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
+    virtual void set_name(const QString & s);
     virtual void package_settings(BooL & name_in_tab, ShowContextMode & show_context) const;
     virtual UmlColor get_color(UmlCode) const;
     virtual void update_drawing_settings();
@@ -114,7 +114,7 @@ class BrowserDeploymentDiagram : public BrowserDiagram
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 };
 
diff --git a/src/browser/BrowserDeploymentNode.cpp b/src/browser/BrowserDeploymentNode.cpp
index 46d3a3943..3509f4535 100644
--- a/src/browser/BrowserDeploymentNode.cpp
+++ b/src/browser/BrowserDeploymentNode.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -56,7 +56,7 @@
 IdDict<BrowserDeploymentNode> BrowserDeploymentNode::all(__FILE__);
 QStringList BrowserDeploymentNode::its_default_stereotypes;	// unicode
 
-BrowserDeploymentNode::BrowserDeploymentNode(QString s, BrowserNode * p, int id)
+BrowserDeploymentNode::BrowserDeploymentNode(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserDeploymentNode>(all, id)
 {
     def = new SimpleData;
@@ -66,7 +66,7 @@ BrowserDeploymentNode::BrowserDeploymentNode(QString s, BrowserNode * p, int id)
 }
 
 BrowserDeploymentNode::BrowserDeploymentNode(const BrowserDeploymentNode * model,
-        BrowserNode * p)
+                                             BrowserNode * p)
     : BrowserNode(model->name, p), Labeled<BrowserDeploymentNode>(all, 0)
 {
     def = new SimpleData(model->def);
@@ -90,7 +90,7 @@ BrowserDeploymentNode::~BrowserDeploymentNode()
     delete def;
 }
 
-BrowserNode * BrowserDeploymentNode::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserDeploymentNode::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserDeploymentNode * result = new BrowserDeploymentNode(this, p);
 
@@ -114,16 +114,15 @@ void BrowserDeploymentNode::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserDeploymentNode::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserDeploymentNode::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
-
     if (! ondelete)
         BrowserDeploymentDiagram::compute_referenced_by(l, this, "deploymentnodecanvas", "deploymentnode_ref");
 }
@@ -157,51 +156,53 @@ QString BrowserDeploymentNode::full_name(bool rev, bool) const
 
 void BrowserDeploymentNode::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
-
+    m.addSeparator();
     if (!deletedp()) {
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>node</i>, \
-a double click with the left mouse button does the same thing"));
-
-            if (!is_read_only && (edition_number == 0)) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Delete"), 1),
-                               TR("to delete the <i>node</i>. \
-Note that you can undelete it after"));
-            }
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>node</i>, \
+                                             a double click with the left mouse button does the same thing"));
+
+                                             if (!is_read_only && (edition_number == 0)) {
+                                                 m.addSeparator();
+                                                 MenuFactory::addItem(m, QObject::tr("Delete"), 1,
+                                                 QObject::tr("to delete the <i>node</i>. \
+                                                 Note that you can undelete it after"));
+                                             }
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 3),
-                       TR("to know who reference the <i>node</i> \
-through a relation"));
-        mark_menu(m, TR("the node"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 3,
+                             QObject::tr("to know who reference the <i>node</i> \
+                                         through a relation"));
+                                         mark_menu(m, QObject::tr("the node"), 90);
+                             ProfiledStereotypes::menu(m, this, 99990);
+
+                if ((edition_number == 0) &&
+                    Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 2),
-                       TR("to undelete the <i>node</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 2,
+                             QObject::tr("to undelete the <i>node</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserDeploymentNode::exec_menu_choice(int rank)
 {
     switch (rank) {
     case 0:
-        edit(TR("Node"), its_default_stereotypes);
+        edit( QObject::tr("Node"), its_default_stereotypes);
         return;
 
     case 1:
@@ -230,7 +231,7 @@ void BrowserDeploymentNode::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserDeploymentNode::apply_shortcut(QString s)
+void BrowserDeploymentNode::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -263,11 +264,11 @@ void BrowserDeploymentNode::apply_shortcut(QString s)
 void BrowserDeploymentNode::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited)
-        edit(TR("Node"), its_default_stereotypes);
+        edit( QObject::tr("Node"), its_default_stereotypes);
 }
 
 void BrowserDeploymentNode::DragMoveEvent(QDragMoveEvent * e)
@@ -285,7 +286,7 @@ void BrowserDeploymentNode::DragMoveEvent(QDragMoveEvent * e)
 void BrowserDeploymentNode::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)))
+            UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)))
         e->accept();
     else
         e->ignore();
@@ -299,16 +300,15 @@ void BrowserDeploymentNode::DropEvent(QDropEvent * e)
 void BrowserDeploymentNode::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if (((bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this))) != 0) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE)) {
             BrowserNode * old = ((BrowserNode *) bn->parent());
 
             if (after)
                 bn->moveItem(after);
             else {
-                bn->parent()->takeItem(bn);
+                bn->parent()->removeChild(bn);
                 insertItem(bn);
             }
 
@@ -322,7 +322,7 @@ void BrowserDeploymentNode::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             package_modified();
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical( QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -339,7 +339,7 @@ UmlCode BrowserDeploymentNode::get_type() const
 
 QString BrowserDeploymentNode::get_stype() const
 {
-    return TR("node");
+    return QObject::tr("node");
 }
 
 int BrowserDeploymentNode::get_identifier() const
@@ -358,7 +358,7 @@ BrowserDeploymentNode * BrowserDeploymentNode::get_deploymentnode(BrowserNode *
     QString name;
     BrowserNodeList nodes;
 
-    if (!future_parent->enter_child_name(name, TR("enter node's name : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter node's name : "),
                                          UmlDeploymentNode, instances(nodes),
                                          &old, TRUE, FALSE))
         return 0;
@@ -376,7 +376,7 @@ BrowserDeploymentNode * BrowserDeploymentNode::add_deploymentnode(BrowserNode *
 {
     QString name;
 
-    if (! future_parent->enter_child_name(name, TR("enter node's name : "),
+    if (! future_parent->enter_child_name(name, QObject::tr("enter node's name : "),
                                           UmlDeploymentNode, TRUE, FALSE))
         return 0;
 
@@ -391,28 +391,28 @@ BasicData * BrowserDeploymentNode::get_data() const
 }
 
 BrowserNodeList & BrowserDeploymentNode::instances(BrowserNodeList & result,
-        const char * st)
+                                                   const char * st)
 {
     IdIterator<BrowserDeploymentNode> it(all);
-
     if ((st == 0) || (*st == 0)) {
-        while (it.current() != 0) {
-            if (!it.current()->deletedp())
-                result.append(it.current());
+        while(it.hasNext()){
+            it.next();
+            if (it.value() != 0)
+                if (!it.value()->deletedp())
+                    result.append(it.value());
 
-            ++it;
         }
     }
     else {
-        while (it.current() != 0) {
-            if (!it.current()->deletedp() &&
-                !strcmp(it.current()->get_data()->get_stereotype(), st))
-                result.append(it.current());
+        while(it.hasNext()){
+            it.next();
+            if (it.value() != 0)
+                if (!it.value()->deletedp() &&
+                        !strcmp(it.value()->get_data()->get_stereotype(), st))
+                    result.append(it.value());
 
-            ++it;
         }
     }
-
     result.sort_it();
 
     return result;
@@ -424,7 +424,7 @@ BrowserNode * BrowserDeploymentNode::get_associated() const
 }
 
 void BrowserDeploymentNode::set_associated_diagram(BrowserDeploymentDiagram * dg,
-        bool on_read)
+                                                   bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -484,7 +484,7 @@ bool BrowserDeploymentNode::tool_cmd(ToolCom * com, const char * args)
                 UmlCode c;
 
                 if (!com->get_relation_kind(c, args) ||
-                    (c != UmlDependency))
+                        (c != UmlDependency))
                     ok = FALSE;
                 else {
                     BrowserNode * end = (BrowserNode *) com->get_id(args);
@@ -495,7 +495,7 @@ bool BrowserDeploymentNode::tool_cmd(ToolCom * com, const char * args)
                         ok = FALSE;
                 }
             }
-            break;
+                break;
 
             default:
                 ok = FALSE;
@@ -556,7 +556,7 @@ void BrowserDeploymentNode::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -592,12 +592,12 @@ BrowserDeploymentNode * BrowserDeploymentNode::read_ref(char *& st)
     BrowserDeploymentNode * result = all[id];
 
     return (result == 0)
-           ? new BrowserDeploymentNode(id)
-           : result;
+            ? new BrowserDeploymentNode(id)
+            : result;
 }
 
 BrowserDeploymentNode * BrowserDeploymentNode::read(char *& st, char * k,
-        BrowserNode * parent)
+                                                    BrowserNode * parent)
 {
     BrowserDeploymentNode * result;
     int id;
@@ -607,8 +607,8 @@ BrowserDeploymentNode * BrowserDeploymentNode::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserDeploymentNode(id)
-               : result;
+                ? new BrowserDeploymentNode(id)
+                : result;
     }
     else if (!strcmp(k, "deploymentnode")) {
         id = read_id(st);
@@ -632,7 +632,7 @@ BrowserDeploymentNode * BrowserDeploymentNode::read(char *& st, char * k,
         result->is_defined = TRUE;
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         k = read_keyword(st);
 
diff --git a/src/browser/BrowserDeploymentNode.h b/src/browser/BrowserDeploymentNode.h
index 9fa454fdb..5f104a04d 100644
--- a/src/browser/BrowserDeploymentNode.h
+++ b/src/browser/BrowserDeploymentNode.h
@@ -56,7 +56,7 @@ class BrowserDeploymentNode : public BrowserNode, public Labeled<BrowserDeployme
     void exec_menu_choice(int rank);
 
 public:
-    BrowserDeploymentNode(QString s, BrowserNode * p, int id = 0);
+    BrowserDeploymentNode(const QString & s, BrowserNode * p, int id = 0);
     BrowserDeploymentNode(const BrowserDeploymentNode * model, BrowserNode * p);
     BrowserDeploymentNode(int id);
     virtual ~BrowserDeploymentNode();
@@ -65,10 +65,10 @@ class BrowserDeploymentNode : public BrowserNode, public Labeled<BrowserDeployme
     void set_associated_diagram(BrowserDeploymentDiagram *, bool on_read = FALSE);
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool force_edit);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -92,7 +92,7 @@ class BrowserDeploymentNode : public BrowserNode, public Labeled<BrowserDeployme
     static void update_idmax_for_root();
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
 
     virtual const QPixmap * pixmap(int) const;
     virtual void iconChanged();
diff --git a/src/browser/BrowserDeploymentView.cpp b/src/browser/BrowserDeploymentView.cpp
index 0accd5788..92b321865 100644
--- a/src/browser/BrowserDeploymentView.cpp
+++ b/src/browser/BrowserDeploymentView.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -58,7 +58,7 @@
 IdDict<BrowserDeploymentView> BrowserDeploymentView::all(__FILE__);
 QStringList BrowserDeploymentView::its_default_stereotypes;	// unicode
 
-BrowserDeploymentView::BrowserDeploymentView(QString s, BrowserNode * p, int id)
+BrowserDeploymentView::BrowserDeploymentView(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserDeploymentView>(all, id)
 {
     make();
@@ -94,7 +94,7 @@ BrowserDeploymentView::~BrowserDeploymentView()
     delete def;
 }
 
-BrowserNode * BrowserDeploymentView::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserDeploymentView::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserDeploymentView * result = new BrowserDeploymentView(this, p);
 
@@ -121,7 +121,7 @@ BrowserDeploymentView * BrowserDeploymentView::add_deployment_view(BrowserNode *
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter deployment view's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter deployment view's name : "),
                                         UmlDeploymentView, TRUE, FALSE))
         return new BrowserDeploymentView(name, future_parent);
     else
@@ -146,7 +146,7 @@ void BrowserDeploymentView::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
@@ -186,47 +186,47 @@ QString BrowserDeploymentView::full_name(bool rev, bool itself) const
 
 void BrowserDeploymentView::menu()
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu subm(0);
-    Q3PopupMenu roundtripm(0);
-    Q3PopupMenu roundtripbodym(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu subm(0);
+    QMenu roundtripm(0);
+    QMenu roundtripbodym(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only && (edition_number == 0)) {
-            m.setWhatsThis(m.insertItem(TR("New deployment diagram"), 0),
-                           TR("to add a <i>deployment diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New node"), 1),
-                           TR("to add a <i>node</i>"));
-            m.setWhatsThis(m.insertItem(TR("New artifact"), 2),
-                           TR("to add an <i>artifact</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("New deployment diagram"), 0,
+                           QObject::tr("to add a <i>deployment diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("New node"), 1,
+                           QObject::tr("to add a <i>node</i>"));
+            MenuFactory::addItem(m, QObject::tr("New artifact"), 2,
+                           QObject::tr("to add an <i>artifact</i>"));
+            m.addSeparator();
         }
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 3),
-                           TR("to edit the <i>deployment view</i>"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 3,
+                           QObject::tr("to edit the <i>deployment view</i>"));
 
             if (!is_read_only) {
-                m.insertSeparator();
-                //m.setWhatsThis(m.insertItem("Edit node settings", 4),
+                m.addSeparator();
+                //MenuFactory::addItem(m, "Edit node settings", 4),
                 //		   "to set the sub node's settings");
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 5),
-                               TR("to set how the sub <i>deployment diagrams</i>'s items must be drawn"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 5,
+                               QObject::tr("to set how the sub <i>deployment diagrams</i>'s items must be drawn"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 6),
-                                   TR("to delete the <i>deployment view</i> and its sub items. \
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 6,
+                                   QObject::tr("to delete the <i>deployment view</i> and its sub items. \
 Note that you can undelete them after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the deployment view"), 90);
+        mark_menu(m, QObject::tr("the deployment view"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         bool cpp = GenerationSettings::cpp_get_default_defs();
@@ -236,68 +236,70 @@ Note that you can undelete them after"));
         bool idl = GenerationSettings::idl_get_default_defs();
 
         if (cpp || java || php || python || idl) {
-            m.insertSeparator();
-            m.insertItem(TR("Generate"), &subm);
+            m.addSeparator();
+            MenuFactory::insertItem(m ,QObject::tr("Generate"), &subm);
 
             if (cpp) {
-                subm.insertItem("C++", 10);
+                MenuFactory::addItem(subm,"C++", 10);
 
                 if ((edition_number == 0) && !is_read_only)
-                    roundtripm.insertItem("C++", 41);
+                    MenuFactory::addItem(roundtripm, "C++", 41);
             }
 
             if (java) {
-                subm.insertItem("Java", 11);
+                MenuFactory::addItem(subm, "Java", 11);
 
                 if ((edition_number == 0) && !is_read_only)
-                    roundtripm.insertItem("Java", 42);
+                    MenuFactory::addItem(roundtripm, "Java", 42);
             }
 
             if (php)
-                subm.insertItem("Php", 12);
+                MenuFactory::addItem(subm, "Php", 12);
 
             if (python)
-                subm.insertItem("Python", 14);
+                MenuFactory::addItem(subm, "Python", 14);
 
             if (idl)
-                subm.insertItem("Idl", 13);
+                MenuFactory::addItem(subm, "Idl", 13);
 
-            if (roundtripm.count() != 0)
-                m.insertItem(TR("Roundtrip"), &roundtripm);
+            if (roundtripm.actions().count() != 0)
+                MenuFactory::insertItem(m, QObject::tr("Roundtrip"), &roundtripm);
         }
 
         if (edition_number == 0) {
             if (preserve_bodies() && (cpp || java || php || python)) {
-                m.insertItem(TR("Roundtrip body"), &roundtripbodym);
+                MenuFactory::insertItem(m, QObject::tr("Roundtrip body"), &roundtripbodym);
 
                 if (cpp)
-                    roundtripbodym.insertItem("C++", 30);
+                    MenuFactory::addItem(roundtripbodym, "C++", 30);
 
                 if (java)
-                    roundtripbodym.insertItem("Java", 31);
+                    MenuFactory::addItem(roundtripbodym, "Java", 31);
 
                 if (php)
-                    roundtripbodym.insertItem("Php", 32);
+                    MenuFactory::addItem(roundtripbodym, "Php", 32);
 
                 if (python)
-                    roundtripbodym.insertItem("Python", 33);
+                    MenuFactory::addItem(roundtripbodym, "Python", 33);
             }
 
             if (Tool::menu_insert(&toolm, get_type(), 100)) {
-                m.insertSeparator();
-                m.insertItem(TR("Tool"), &toolm);
+                m.addSeparator();
+                MenuFactory::insertItem(m ,QObject::tr("Tool"), &toolm);
             }
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 7),
-                       TR("undelete the <i>deployment view</i>. \
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 7,
+                       QObject::tr("undelete the <i>deployment view</i>. \
 Do not undelete its sub items"));
-        m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 8),
-                       TR("undelete the <i>deployment view</i> and its sub items"));
+        MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 8,
+                       QObject::tr("undelete the <i>deployment view</i> and its sub items"));
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserDeploymentView::exec_menu_choice(int rank)
@@ -325,12 +327,15 @@ void BrowserDeploymentView::exec_menu_choice(int rank)
         BrowserArtifact * dn = BrowserArtifact::add_artifact(this);
 
         if (dn != 0)
+        {
             dn->select_in_browser();
+            dn->open(false);
+        }
     }
     break;
 
     case 3:
-        edit(TR("Deployment view"), its_default_stereotypes);
+        edit(QObject::tr("Deployment view"), its_default_stereotypes);
         return;
 
     case 4:
@@ -345,12 +350,12 @@ void BrowserDeploymentView::exec_menu_choice(int rank)
 
             deploymentdiagram_settings.complete(st, FALSE);
 
-            co[0].set(TR("node color"), &deploymentnode_color);
-            co[1].set(TR("artifact color"), &artifact_color);
-            co[2].set(TR("component color"), &component_color);
-            co[3].set(TR("note color"), &note_color);
-            co[4].set(TR("package color"), &package_color);
-            co[5].set(TR("fragment color"), &fragment_color);
+            co[0].set(QObject::tr("node color"), &deploymentnode_color);
+            co[1].set(QObject::tr("artifact color"), &artifact_color);
+            co[2].set(QObject::tr("component color"), &component_color);
+            co[3].set(QObject::tr("note color"), &note_color);
+            co[4].set(QObject::tr("package color"), &package_color);
+            co[5].set(QObject::tr("fragment color"), &fragment_color);
 
             SettingsDialog dialog(&st, &co, FALSE);
 
@@ -467,7 +472,7 @@ void BrowserDeploymentView::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserDeploymentView::apply_shortcut(QString s)
+void BrowserDeploymentView::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -486,7 +491,7 @@ void BrowserDeploymentView::apply_shortcut(QString s)
                 if (s == "Edit")
                     choice = 3;
                 else if (!is_read_only) {
-                    //m.setWhatsThis(m.insertItem("Edit node settings", 4),
+                    //MenuFactory::addItem(m, "Edit node settings", 4),
                     //		   "to set the sub node's settings");
                     if (s == "Edit drawing settings")
                         choice = 5;
@@ -544,7 +549,7 @@ void BrowserDeploymentView::apply_shortcut(QString s)
 void BrowserDeploymentView::open(bool)
 {
     if (!is_edited)
-        edit(TR("Deployment view"), its_default_stereotypes);
+        edit(QObject::tr("Deployment view"), its_default_stereotypes);
 }
 
 UmlCode BrowserDeploymentView::get_type() const
@@ -554,7 +559,7 @@ UmlCode BrowserDeploymentView::get_type() const
 
 QString BrowserDeploymentView::get_stype() const
 {
-    return TR("deployment view");
+    return QObject::tr("deployment view");
 }
 
 int BrowserDeploymentView::get_identifier() const
@@ -615,14 +620,13 @@ UmlColor BrowserDeploymentView::get_color(UmlCode who) const
 BrowserNodeList & BrowserDeploymentView::instances(BrowserNodeList & result)
 {
     IdIterator<BrowserDeploymentView> it(all);
+    while(it.hasNext()){
+        it.next();
+    if (it.value() != 0)
+        if (!it.value()->deletedp())
+            result.append(it.value());
 
-    while (it.current() != 0) {
-        if (!it.current()->deletedp())
-            result.append(it.current());
-
-        ++it;
     }
-
     result.sort_it();
 
     return result;
@@ -642,7 +646,9 @@ bool BrowserDeploymentView::tool_cmd(ToolCom * com, const char * args)
                 if (wrong_child_name(args, UmlDeploymentDiagram, TRUE, FALSE))
                     ok = FALSE;
                 else
+                {
                     (new BrowserDeploymentDiagram(args, this))->write_id(com);
+                }
 
                 break;
 
@@ -650,7 +656,9 @@ bool BrowserDeploymentView::tool_cmd(ToolCom * com, const char * args)
                 if (wrong_child_name(args, UmlDeploymentNode, FALSE, FALSE))
                     ok = FALSE;
                 else
+                {
                     (new BrowserDeploymentNode(args, this))->write_id(com);
+                }
 
                 break;
 
@@ -707,20 +715,18 @@ void BrowserDeploymentView::DragMoveInsideEvent(QDragMoveEvent * e)
         e->ignore();
 }
 
-bool BrowserDeploymentView::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserDeploymentView::may_contains_them(const QList<BrowserNode *> & l,
         BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlArtifact:
             duplicable = FALSE;
 
             // no break
         case UmlDeploymentNode:
         case UmlDeploymentDiagram:
-            if (! may_contains(it.current(), FALSE))
+            if (! may_contains(node, FALSE))
                 return FALSE;
 
             break;
@@ -729,7 +735,7 @@ bool BrowserDeploymentView::may_contains_them(const Q3PtrList<BrowserNode> & l,
             return FALSE;
         }
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -743,7 +749,6 @@ void BrowserDeploymentView::DropEvent(QDropEvent * e)
 void BrowserDeploymentView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, UmlArtifact)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlDeploymentNode)) != 0) ||
          (((bn = UmlDrag::decode(e, UmlDeploymentDiagram)) != 0))) &&
@@ -754,7 +759,7 @@ void BrowserDeploymentView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if (after)
                 bn->moveItem(after);
             else {
-                bn->parent()->takeItem(bn);
+                bn->parent()->removeChild(bn);
                 insertItem(bn);
             }
 
@@ -766,7 +771,7 @@ void BrowserDeploymentView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             }
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -822,7 +827,7 @@ void BrowserDeploymentView::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -923,7 +928,6 @@ BrowserDeploymentView * BrowserDeploymentView::read(char *& st, char * k,
                    BrowserDeploymentNode::read(st, k, r) ||
                    BrowserArtifact::read(st, k, r))
                 k = read_keyword(st);
-
             if (strcmp(k, "end"))
                 wrong_keyword(k, "end");
         }
@@ -940,10 +944,8 @@ BrowserNode * BrowserDeploymentView::get_it(const char * k, int id)
         return all[id];
 
     BrowserNode * r;
-
     if (((r = BrowserDeploymentDiagram::get_it(k, id)) == 0) &&
         ((r = BrowserDeploymentNode::get_it(k, id)) == 0))
         r = BrowserArtifact::get_it(k, id);
-
     return r;
 }
diff --git a/src/browser/BrowserDeploymentView.h b/src/browser/BrowserDeploymentView.h
index 3864d1093..adf71cb52 100644
--- a/src/browser/BrowserDeploymentView.h
+++ b/src/browser/BrowserDeploymentView.h
@@ -27,8 +27,9 @@
 
 #ifndef BROWSER_DEPLOYMENTVIEW_H
 #define BROWSER_DEPLOYMENTVIEW_H
-
+#ifdef habip
 #include <q3intdict.h>
+#endif
 //Added by qt3to4:
 #include <QPixmap>
 #include <QDropEvent>
@@ -64,23 +65,23 @@ class BrowserDeploymentView : public BrowserNode, public Labeled<BrowserDeployme
     void exec_menu_choice(int rank);
 
 public:
-    BrowserDeploymentView(QString s, BrowserNode * p, int id = 0);
+    BrowserDeploymentView(const QString & s, BrowserNode * p, int id = 0);
     BrowserDeploymentView(const BrowserDeploymentView * model, BrowserNode * p);
     virtual ~BrowserDeploymentView();
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> &,
+    virtual bool may_contains_them(const QList<BrowserNode *> &,
                                    BooL & duplicable) const;
     virtual BasicData * get_data() const;
     virtual void get_deploymentdiagramsettings(DeploymentDiagramSettings &) const;
diff --git a/src/browser/BrowserDiagram.cpp b/src/browser/BrowserDiagram.cpp
index 35199b023..ef84d5070 100644
--- a/src/browser/BrowserDiagram.cpp
+++ b/src/browser/BrowserDiagram.cpp
@@ -50,7 +50,7 @@
 // use the same extension for all the diagrams : must share dict
 IdDict<BrowserDiagram> BrowserDiagram::all(257, __FILE__);
 
-BrowserDiagram::BrowserDiagram(QString s, BrowserNode * parent, int id)
+BrowserDiagram::BrowserDiagram(const QString & s, BrowserNode * parent, int id)
     : BrowserNode(s, parent), Labeled<BrowserDiagram>(all, id)
 {
     canvas_size = UmlWindow::default_format();
@@ -59,7 +59,7 @@ BrowserDiagram::BrowserDiagram(QString s, BrowserNode * parent, int id)
         // delete files in case one re-use the id of
         // a previously deleted diagram
         QString fn =
-            BrowserView::get_dir().absFilePath(QString::number(get_ident()) + ".d");
+            BrowserView::get_dir().absoluteFilePath(QString::number(get_ident()) + ".d");
 
         QFile::remove(fn);
         QFile::remove(fn + "iagram");
@@ -80,12 +80,11 @@ BrowserNodeList & BrowserDiagram::instances(BrowserNodeList & result, bool sort)
 {
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
-
-    while ((d = it.current()) != 0) {
+    while(it.hasNext()){
+        it.next();
+    if ((d = it.value()) != 0)
         if (!d->deletedp())
             result.append(d);
-
-        ++it;
     }
 
     if (sort)
@@ -158,7 +157,7 @@ void BrowserDiagram::prepare_update_lib() const
     all.memo_id_oid(get_ident(), original_id);
 }
 
-void BrowserDiagram::support_file(Q3Dict<char> & files, bool add) const
+void BrowserDiagram::support_file(QHash<QString, char*> & files, bool add) const
 {
     QString s;
 
@@ -169,7 +168,7 @@ void BrowserDiagram::support_file(Q3Dict<char> & files, bool add) const
     else
         files.remove(s);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->support_file(files, add);
diff --git a/src/browser/BrowserDiagram.h b/src/browser/BrowserDiagram.h
index 7207e8959..90a971823 100644
--- a/src/browser/BrowserDiagram.h
+++ b/src/browser/BrowserDiagram.h
@@ -49,10 +49,10 @@ class BrowserDiagram : public BrowserNode, public Labeled<BrowserDiagram>
 
 
 public:
-    BrowserDiagram(QString s, BrowserNode * parent, int id);
+    BrowserDiagram(const QString & s, BrowserNode * parent, int id);
     virtual ~BrowserDiagram();
     void set_window_destroyed(){ windowDestroyed = true;}
-    virtual void package_modified();
+    virtual void package_modified() override;
     virtual void set_diagram_window(DiagramWindow*)
     {
     };
@@ -78,6 +78,7 @@ class BrowserDiagram : public BrowserNode, public Labeled<BrowserDiagram>
 
     static BrowserNodeList & instances(BrowserNodeList &, bool sort);
 
+    using BrowserNode::save;
     void save();
     static void read_stereotypes(char *& , char *& k);
     static void save_stereotypes(QTextStream &);
@@ -85,8 +86,8 @@ class BrowserDiagram : public BrowserNode, public Labeled<BrowserDiagram>
     static void clear(bool old);
     static void update_idmax_for_root();
     static void import();
-    virtual void prepare_update_lib() const;
-    virtual void support_file(Q3Dict<char> & files, bool add) const;
+    virtual void prepare_update_lib() const override;
+    virtual void support_file(QHash<QString,char*> & files, bool add) const override;
 
     static BrowserNode * read_diagram_ref(char *& st);
     static BrowserNode * read_any_ref(char *& st, char * k);
diff --git a/src/browser/BrowserExpansionNode.cpp b/src/browser/BrowserExpansionNode.cpp
index 6fdba57d9..4c1a50b3c 100644
--- a/src/browser/BrowserExpansionNode.cpp
+++ b/src/browser/BrowserExpansionNode.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -61,7 +61,7 @@
 IdDict<BrowserExpansionNode> BrowserExpansionNode::all(257, __FILE__);
 QStringList BrowserExpansionNode::its_default_stereotypes;	// unicode
 
-BrowserExpansionNode::BrowserExpansionNode(QString s, BrowserNode * p, int id)
+BrowserExpansionNode::BrowserExpansionNode(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserExpansionNode>(all, id),
       def(new ActivityObjectData)
 {
@@ -89,7 +89,7 @@ BrowserExpansionNode::get_expansionnode(BrowserNode * future_parent)
     BrowserNode * old = 0;
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter expansion node's \nname (may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter expansion node's \nname (may be empty) : "),
                                          UmlExpansionNode, TRUE, TRUE))
         return 0;
 
@@ -104,7 +104,7 @@ BrowserExpansionNode::get_expansionnode(BrowserNode * future_parent)
     return r;
 }
 
-BrowserNode * BrowserExpansionNode::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserExpansionNode::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserExpansionNode(this, p);
 
@@ -134,7 +134,7 @@ void BrowserExpansionNode::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
@@ -179,69 +179,72 @@ QString BrowserExpansionNode::may_connect(const BrowserNode * dest) const
     BrowserNode * container = dest->get_container(UmlActivity);
 
     if (container == 0)
-        return TR("illegal");
+        return QObject::tr("illegal");
 
     if (get_container(UmlActivity) != container)
-        return TR("not in the same activity");
+        return QObject::tr("not in the same activity");
 
     const BrowserActivityElement * elt =
-        dynamic_cast<const BrowserActivityElement *>(dest);
+            dynamic_cast<const BrowserActivityElement *>(dest);
 
     return (elt == 0)
-           ? TR("illegal")
-           : elt->connexion_from(def->get_is_control());
+            ? QObject::tr("illegal")
+            : elt->connexion_from(def->get_is_control());
 }
 
 QString BrowserExpansionNode::connexion_from(bool control) const
 {
     if (control != def->get_is_control())
         return (control)
-               ? TR("expansion node can't accept control flow (not 'is_control')")
-               : TR("expansion node can't accept data flow (is 'is_control')");
+                ? QObject::tr("expansion node can't accept control flow (not 'is_control')")
+                : QObject::tr("expansion node can't accept data flow (is 'is_control')");
     else
         return 0;
 }
 
 void BrowserExpansionNode::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited)
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>expansion node</i>, \
-a double click with the left mouse button does the same thing"));
-
-        if (!is_read_only && (edition_number == 0)) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 1),
-                           TR("to copy the <i>expansion node</i> in a new one"));
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                           TR("to delete the <i>expansion node</i>. \
-Note that you can undelete it after"));
-        }
-
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 4),
-                       TR("to know who reference the <i>expansion node</i> \
-through a flow"));
-        mark_menu(m, TR("the expansion node"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
-        }
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>expansion node</i>, \
+                                             a double click with the left mouse button does the same thing"));
+
+                                             if (!is_read_only && (edition_number == 0)) {
+                                                 MenuFactory::addItem(m, QObject::tr("Duplicate"), 1,
+                                                 QObject::tr("to copy the <i>expansion node</i> in a new one"));
+                                                 m.addSeparator();
+                                                 MenuFactory::addItem(m, QObject::tr("Delete"), 2,
+                                                 QObject::tr("to delete the <i>expansion node</i>. \
+                                                 Note that you can undelete it after"));
+                                             }
+
+                                             MenuFactory::addItem(m, QObject::tr("Referenced by"), 4,
+                                                                  QObject::tr("to know who reference the <i>expansion node</i> \
+                                                                              through a flow"));
+                                                                              mark_menu(m, QObject::tr("the expansion node"), 90);
+                                                                  ProfiledStereotypes::menu(m, this, 99990);
+
+                                             if ((edition_number == 0) &&
+                                                 Tool::menu_insert(&toolm, get_type(), 100)) {
+                                                 m.addSeparator();
+                                                 toolm.setTitle( QObject::tr("Tool"));
+                                                 m.addMenu(&toolm);
+                                             }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("to undelete the <i>expansion node</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 3,
+                             QObject::tr("to undelete the <i>expansion node</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserExpansionNode::exec_menu_choice(int rank)
@@ -254,11 +257,11 @@ void BrowserExpansionNode::exec_menu_choice(int rank)
     case 1: {
         QString name;
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter expansion node's \nname (may be empty) : "),
-                UmlExpansionNode, TRUE, TRUE))
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter expansion node's \nname (may be empty) : "),
+                                                         UmlExpansionNode, TRUE, TRUE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
     }
-    break;
+        break;
 
     case 2:
         delete_it();
@@ -287,7 +290,7 @@ void BrowserExpansionNode::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserExpansionNode::apply_shortcut(QString s)
+void BrowserExpansionNode::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -322,7 +325,7 @@ void BrowserExpansionNode::apply_shortcut(QString s)
 void BrowserExpansionNode::open(bool)
 {
     if (!is_edited)
-        def->edit(TR("Expansion Node"), its_default_stereotypes);
+        def->edit(QObject::tr("Expansion Node"), its_default_stereotypes);
 }
 
 void BrowserExpansionNode::modified()
@@ -338,7 +341,7 @@ UmlCode BrowserExpansionNode::get_type() const
 
 QString BrowserExpansionNode::get_stype() const
 {
-    return TR("expansion node");
+    return QObject::tr("expansion node");
 }
 
 int BrowserExpansionNode::get_identifier() const
@@ -366,7 +369,7 @@ QString BrowserExpansionNode::full_name(bool rev, bool) const
     return fullname(s, rev);
 }
 
-void BrowserExpansionNode::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserExpansionNode::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserFlow::compute_referenced_by(l, this);
@@ -375,20 +378,21 @@ void BrowserExpansionNode::referenced_by(Q3PtrList<BrowserNode> & l, bool ondele
         BrowserActivityDiagram::compute_referenced_by(l, this, "expansionnodecanvas", "expansionnode_ref");
 }
 
-void BrowserExpansionNode::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * target)
+void BrowserExpansionNode::compute_referenced_by(QList<BrowserNode *> & l,
+                                                 BrowserNode * target)
 {
     IdIterator<BrowserExpansionNode> it(all);
+    while(it.hasNext()){
+        it.next();
+        if(it.value()) {
+            if (!it.value()->deletedp()) {
+                const AType & t = it.value()->def->get_type();
+
+                if (t.type == target)
+                    l.append(it.value());
+            }
 
-    while (it.current()) {
-        if (!it.current()->deletedp()) {
-            const AType & t = it.current()->def->get_type();
-
-            if (t.type == target)
-                l.append(it.current());
         }
-
-        ++it;
     }
 }
 
@@ -417,7 +421,7 @@ bool BrowserExpansionNode::tool_cmd(ToolCom * com, const char * args)
                 else
                     ok = FALSE;
             }
-            break;
+                break;
 
             default:
                 ok = FALSE;
@@ -449,7 +453,7 @@ void BrowserExpansionNode::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 QString BrowserExpansionNode::drag_key() const
 {
     return QString::number(UmlParameter)
-           + "#" + QString::number((unsigned long) parent());
+            + "#" + QString::number((unsigned long) parent());
 }
 
 QString BrowserExpansionNode::drag_postfix() const
@@ -460,7 +464,7 @@ QString BrowserExpansionNode::drag_postfix() const
 QString BrowserExpansionNode::drag_key(BrowserNode * p)
 {
     return QString::number(UmlParameter)
-           + "#" + QString::number((unsigned long) p);
+            + "#" + QString::number((unsigned long) p);
 }
 
 void BrowserExpansionNode::init()
@@ -503,7 +507,7 @@ void BrowserExpansionNode::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -540,8 +544,8 @@ BrowserExpansionNode * BrowserExpansionNode::read_ref(char *& st)
     BrowserExpansionNode * result = all[id];
 
     return (result == 0)
-           ? new BrowserExpansionNode(id)
-           : result;
+            ? new BrowserExpansionNode(id)
+            : result;
 }
 
 BrowserExpansionNode *
@@ -595,7 +599,7 @@ BrowserExpansionNode::read(char *& st, char * k,
         }
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
         result->def->set_browser_node(result);
 
         return result;
diff --git a/src/browser/BrowserExpansionNode.h b/src/browser/BrowserExpansionNode.h
index b0f34a2ac..758d3e257 100644
--- a/src/browser/BrowserExpansionNode.h
+++ b/src/browser/BrowserExpansionNode.h
@@ -55,17 +55,17 @@ class BrowserExpansionNode : public BrowserNode, public Labeled<BrowserExpansion
     void exec_menu_choice(int rank);
 
 public:
-    BrowserExpansionNode(QString s, BrowserNode * p, int id = 0);
+    BrowserExpansionNode(const QString & s, BrowserNode * p, int id = 0);
     BrowserExpansionNode(const BrowserExpansionNode * model, BrowserNode * p);
     virtual ~BrowserExpansionNode();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -96,8 +96,8 @@ class BrowserExpansionNode : public BrowserNode, public Labeled<BrowserExpansion
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
     virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after);
     QString drag_key() const;
diff --git a/src/browser/BrowserExpansionRegion.cpp b/src/browser/BrowserExpansionRegion.cpp
index fc6bdb815..7e786987c 100644
--- a/src/browser/BrowserExpansionRegion.cpp
+++ b/src/browser/BrowserExpansionRegion.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 #include <QDragMoveEvent>
 #include <QDropEvent>
@@ -64,7 +64,7 @@
 IdDict<BrowserExpansionRegion> BrowserExpansionRegion::all(__FILE__);
 QStringList BrowserExpansionRegion::its_default_stereotypes;	// unicode
 
-BrowserExpansionRegion::BrowserExpansionRegion(QString s, BrowserNode * p, int id)
+BrowserExpansionRegion::BrowserExpansionRegion(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserExpansionRegion>(all, id),
       def(new ExpansionRegionData), associated_diagram(0)
 {
@@ -88,7 +88,7 @@ BrowserExpansionRegion::BrowserExpansionRegion(const BrowserExpansionRegion * mo
     comment = model->comment;
 }
 
-BrowserNode * BrowserExpansionRegion::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserExpansionRegion::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserExpansionRegion(this, p);
 
@@ -120,13 +120,13 @@ void BrowserExpansionRegion::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserExpansionRegion::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserExpansionRegion::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -160,7 +160,7 @@ BrowserExpansionRegion::add_expansionregion(BrowserNode * future_parent)
 {
     QString name;
 
-    return (!future_parent->enter_child_name(name, TR("enter expansion region's \nname (may be empty) : "),
+    return (!future_parent->enter_child_name(name, QObject::tr("enter expansion region's \nname (may be empty) : "),
             UmlExpansionRegion, TRUE, TRUE))
 
            ? 0
@@ -169,7 +169,7 @@ BrowserExpansionRegion::add_expansionregion(BrowserNode * future_parent)
 
 BrowserExpansionRegion *
 BrowserExpansionRegion::add_expansionregion(BrowserNode * future_parent,
-        const char * name)
+        QString name)
 {
     BrowserExpansionRegion * r = new BrowserExpansionRegion(name, future_parent);
 
@@ -183,7 +183,7 @@ BrowserExpansionRegion *
 BrowserExpansionRegion::get_expansionregion(BrowserNode * parent)
 {
     BrowserNodeList l;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = parent->firstChild(); child != 0; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp() &&
@@ -193,7 +193,7 @@ BrowserExpansionRegion::get_expansionregion(BrowserNode * parent)
     BrowserNode * old;
     QString name;
 
-    if (!parent->enter_child_name(name, TR("enter expansion region's \nname (may be empty) : "),
+    if (!parent->enter_child_name(name, QObject::tr("enter expansion region's \nname (may be empty) : "),
                                   UmlExpansionRegion, l, &old,
                                   TRUE, TRUE))
         return 0;
@@ -205,69 +205,72 @@ BrowserExpansionRegion::get_expansionregion(BrowserNode * parent)
 
 void BrowserExpansionRegion::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("New expansion node"), 0),
-                           TR("to add an <i>expansion node</i> to the <i>expansion region</i>"));
-            m.setWhatsThis(m.insertItem(TR("New nested expansion region"), 1),
-                           TR("to add a nested <i>expansion region</i>"));
-            m.setWhatsThis(m.insertItem(TR("New interruptible activity region"), 2),
-                           TR("to add an <i>interruptible activity region</i>"));
-            m.setWhatsThis(m.insertItem(TR("Add activity action"), 6),
-                           TR("to add an <i>activity action</i> to the <i>region</i>"));
-            m.setWhatsThis(m.insertItem(TR("Add object node"), 7),
-                           TR("to add an <i>activity object node</i> to the <i>region</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("New expansion node"), 0,
+                           QObject::tr("to add an <i>expansion node</i> to the <i>expansion region</i>"));
+            MenuFactory::addItem(m, QObject::tr("New nested expansion region"), 1,
+                           QObject::tr("to add a nested <i>expansion region</i>"));
+            MenuFactory::addItem(m, QObject::tr("New interruptible activity region"), 2,
+                           QObject::tr("to add an <i>interruptible activity region</i>"));
+            MenuFactory::addItem(m, QObject::tr("Add activity action"), 6,
+                           QObject::tr("to add an <i>activity action</i> to the <i>region</i>"));
+            MenuFactory::addItem(m, QObject::tr("Add object node"), 7,
+                           QObject::tr("to add an <i>activity object node</i> to the <i>region</i>"));
+            m.addSeparator();
         }
 
-        m.setWhatsThis(m.insertItem(TR("Edit"), 4),
-                       TR("to edit the <i>expansion region</i>, \
+        MenuFactory::addItem(m, QObject::tr("Edit"), 4,
+                       QObject::tr("to edit the <i>expansion region</i>, \
 a double click with the left mouse button does the same thing"));
 
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 5),
-                           TR("to copy the <i>expansion region</i> in a new one"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("Duplicate"), 5,
+                           QObject::tr("to copy the <i>expansion region</i> in a new one"));
+            m.addSeparator();
 
             if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 8),
-                               TR("to delete the <i>expansion region</i>. \
+                MenuFactory::addItem(m, QObject::tr("Delete"), 8,
+                               QObject::tr("to delete the <i>expansion region</i>. \
 Note that you can undelete it after"));
         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 3),
-                       TR("to know who reference the <i>region</i>"));
-        mark_menu(m, TR("the expansion region"), 90);
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 3,
+                       QObject::tr("to know who reference the <i>region</i>"));
+        mark_menu(m, QObject::tr("the expansion region"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 10),
-                       TR("to undelete the <i>expansion region</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 10,
+                       QObject::tr("to undelete the <i>expansion region</i>"));
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 11),
-                               TR("undelete the expansion region and its children"));
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 11,
+                               QObject::tr("undelete the expansion region and its children"));
                 break;
             }
         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserExpansionRegion::exec_menu_choice(int rank)
@@ -296,7 +299,7 @@ void BrowserExpansionRegion::exec_menu_choice(int rank)
     case 5: {
         QString name;
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter expansion region's \nname (may be empty) : "),
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter expansion region's \nname (may be empty) : "),
                 UmlExpansionRegion, TRUE, TRUE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
     }
@@ -354,7 +357,7 @@ void BrowserExpansionRegion::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserExpansionRegion::apply_shortcut(QString s)
+void BrowserExpansionRegion::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -396,7 +399,7 @@ void BrowserExpansionRegion::apply_shortcut(QString s)
         if (s == "Undelete")
             choice = 10;
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -416,7 +419,7 @@ BrowserExpansionRegion::add_expansionnode()
 {
     QString name;
 
-    if (enter_child_name(name, TR("enter expansion node's \nname (may be empty) : "),
+    if (enter_child_name(name, QObject::tr("enter expansion node's \nname (may be empty) : "),
                          UmlExpansionNode, TRUE, TRUE)) {
         BrowserExpansionNode * node = new BrowserExpansionNode(name, this);
 
@@ -456,7 +459,7 @@ UmlCode BrowserExpansionRegion::get_type() const
 
 QString BrowserExpansionRegion::get_stype() const
 {
-    return TR("expansion region");
+    return QObject::tr("expansion region");
 }
 
 int BrowserExpansionRegion::get_identifier() const
@@ -535,10 +538,10 @@ bool BrowserExpansionRegion::api_compatible(unsigned v) const
     return (v > 24);
 }
 
-Q3ValueList<BrowserExpansionNode *> BrowserExpansionRegion::get_nodes() const
+QList<BrowserExpansionNode *> BrowserExpansionRegion::get_nodes() const
 {
-    Q3ValueList<BrowserExpansionNode *> l;
-    Q3ListViewItem * child = firstChild();
+    QList<BrowserExpansionNode *> l;
+    BrowserNode * child = firstChild();
 
     while (child != 0) {
         if (!((BrowserNode *) child)->deletedp() &&
@@ -619,17 +622,16 @@ bool BrowserExpansionRegion::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-bool BrowserExpansionRegion::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserExpansionRegion::may_contains_them(const QList<BrowserNode *> & l,
         BooL & duplicable) const
 {
     BrowserNode * activity = get_container(UmlActivity);
-    Q3PtrListIterator<BrowserNode> it(l);
 
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlInterruptibleActivityRegion:
         case UmlExpansionRegion:
-            if (((const BrowserNode *) it.current()->get_container(UmlActivity)) != activity)
+            if (((const BrowserNode *) node->get_container(UmlActivity)) != activity)
                 return FALSE;
 
             break;
@@ -644,7 +646,7 @@ bool BrowserExpansionRegion::may_contains_them(const Q3PtrList<BrowserNode> & l,
         case MergeAN:
         case ForkAN:
         case JoinAN:
-            if (((const BrowserNode *) it.current()->get_container(UmlActivity)) != activity)
+            if (((const BrowserNode *) node->get_container(UmlActivity)) != activity)
                 return FALSE;
 
             break;
@@ -653,10 +655,10 @@ bool BrowserExpansionRegion::may_contains_them(const Q3PtrList<BrowserNode> & l,
             return FALSE;
         }
 
-        if (! may_contains(it.current(), TRUE))
+        if (! may_contains(node, TRUE))
             return FALSE;
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -710,14 +712,16 @@ void BrowserExpansionRegion::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if ((after == 0) &&
                 ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
                 // have choice
-                Q3PopupMenu m(0);
+                QMenu m(0);
 
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In ") + QString(get_name()), 1);
+                MenuFactory::addItem(m,QObject::tr("After ") + QString(get_name()), 2);
 
-                switch (m.exec(QCursor::pos())) {
+                QAction *retAction = m.exec(QCursor::pos());
+                if(retAction)
+                switch (retAction->data().toInt()) {
                 case 1:
                     break;
 
@@ -734,7 +738,7 @@ void BrowserExpansionRegion::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             move(bn, after);
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -799,7 +803,7 @@ void BrowserExpansionRegion::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
diff --git a/src/browser/BrowserExpansionRegion.h b/src/browser/BrowserExpansionRegion.h
index 1cb5c615a..a6fef3fb0 100644
--- a/src/browser/BrowserExpansionRegion.h
+++ b/src/browser/BrowserExpansionRegion.h
@@ -34,7 +34,7 @@
 #include <QPixmap>
 #include <QDropEvent>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QDragMoveEvent>
 
 class QPixmap;
@@ -59,24 +59,24 @@ class BrowserExpansionRegion : public BrowserNode, public Labeled<BrowserExpansi
     void exec_menu_choice(int rank);
 
 public:
-    BrowserExpansionRegion(QString s, BrowserNode * p, int id = 0);
+    BrowserExpansionRegion(const QString & s, BrowserNode * p, int id = 0);
     BrowserExpansionRegion(const BrowserExpansionRegion * model, BrowserNode * p);
     virtual ~BrowserExpansionRegion();
 
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> & l,
+    virtual bool may_contains_them(const QList<BrowserNode *> & l,
                                    BooL & duplicable) const;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserExpansionRegion * add_expansionregion(BrowserNode * future_parent);
-    static BrowserExpansionRegion * add_expansionregion(BrowserNode * future_parent, const char * name);
+    static BrowserExpansionRegion * add_expansionregion(BrowserNode * future_parent, QString name);
     static BrowserExpansionRegion * get_expansionregion(BrowserNode * parent);
-    Q3ValueList<BrowserExpansionNode *> get_nodes() const;
+    QList<BrowserExpansionNode *> get_nodes() const;
     BrowserNode * add_expansionnode();
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -101,7 +101,7 @@ class BrowserExpansionRegion : public BrowserNode, public Labeled<BrowserExpansi
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
diff --git a/src/browser/BrowserExtraMember.cpp b/src/browser/BrowserExtraMember.cpp
index 99bb883ba..8e2bf0f7c 100644
--- a/src/browser/BrowserExtraMember.cpp
+++ b/src/browser/BrowserExtraMember.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -53,7 +53,7 @@
 
 IdDict<BrowserExtraMember> BrowserExtraMember::all(__FILE__);
 
-BrowserExtraMember::BrowserExtraMember(QString s, BrowserNode * p, ExtraMemberData * d, int id)
+BrowserExtraMember::BrowserExtraMember(const QString & s, BrowserNode * p, ExtraMemberData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserExtraMember>(all, id), def(d)
 {
 }
@@ -73,7 +73,7 @@ BrowserExtraMember::BrowserExtraMember(const BrowserExtraMember * model, Browser
     comment = model->comment;
 }
 
-BrowserExtraMember * BrowserExtraMember::new_one(QString s, BrowserNode * p)
+BrowserExtraMember * BrowserExtraMember::new_one(const QString & s, BrowserNode * p)
 {
     ExtraMemberData * d = new ExtraMemberData();
     BrowserExtraMember * result = new BrowserExtraMember(s, p, d);
@@ -83,13 +83,14 @@ BrowserExtraMember * BrowserExtraMember::new_one(QString s, BrowserNode * p)
     return result;
 }
 
-BrowserNode * BrowserExtraMember::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserExtraMember::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserExtraMember(this, p);
 
     result->set_name((name.isEmpty()) ? get_name() : name);
     result->update_stereotype();
-
+//    move(result, this);
+//    result->select_in_browser();
     return result;
 }
 
@@ -124,57 +125,61 @@ const QPixmap * BrowserExtraMember::pixmap(int) const
 {
     if (deletedp())
         return DeletedExtraMemberIcon;
-
     const QPixmap * px = ProfiledStereotypes::browserPixmap(def->get_stereotype());
 
     if (px != 0)
         return px;
+
     else if (is_marked && text(0).isEmpty())
         return ExtraMemberMarkedIcon;
+
     else
         return ExtraMemberIcon;
 }
 
 void BrowserExtraMember::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>extra member</i>, \
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                           QObject::tr("to edit the <i>extra member</i>, \
 a double click with the left mouse button does the same thing"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to copy the <i>extra member</i> in a new one"));
-                m.insertSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 3,
+                               QObject::tr("to copy the <i>extra member</i> in a new one"));
+                m.addSeparator();
 
                 if (edition_number == 0)
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 1),
-                                   TR("to delete the <i>extra member</i>. \
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 1,
+                                   QObject::tr("to delete the <i>extra member</i>. \
 Note that you can undelete it after"));
             }
         }
 
-        mark_menu(m, TR("the extra member"), 90);
+        mark_menu(m, QObject::tr("the extra member"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 2),
-                       TR("to undelete the <i>extra member</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 2,
+                       QObject::tr("to undelete the <i>extra member</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserExtraMember::exec_menu_choice(int rank)
@@ -193,13 +198,18 @@ void BrowserExtraMember::exec_menu_choice(int rank)
         break;
 
     case 3:
-        ((BrowserClass *) parent())->add_extra_member(this);
+    {
+        BrowserNode * extraDuplicate = ((BrowserClass *) parent())->add_extra_member(this);
+        move(extraDuplicate, this);
+        extraDuplicate->select_in_browser();
         return;
+    }
 
     default:
         if (rank >= 99990)
             ProfiledStereotypes::choiceManagement(this, rank - 99990);
-        else if (rank >= 100)
+        else
+            if (rank >= 100)
             ToolCom::run(Tool::command(rank - 100), this);
         else
             mark_management(rank - 90);
@@ -211,7 +221,7 @@ void BrowserExtraMember::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserExtraMember::apply_shortcut(QString s)
+void BrowserExtraMember::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -261,7 +271,7 @@ UmlCode BrowserExtraMember::get_type() const
 
 QString BrowserExtraMember::get_stype() const
 {
-    return TR("extra member");
+    return QObject::tr("extra member");
 }
 
 int BrowserExtraMember::get_identifier() const
@@ -279,7 +289,7 @@ BasicData * BrowserExtraMember::get_data() const
     return def;
 }
 
-void BrowserExtraMember::set_name(const char * s)
+void BrowserExtraMember::set_name(const QString & s)
 {
     if (name != s) {
         name = s;
diff --git a/src/browser/BrowserExtraMember.h b/src/browser/BrowserExtraMember.h
index 9f6ad4e8e..889368010 100644
--- a/src/browser/BrowserExtraMember.h
+++ b/src/browser/BrowserExtraMember.h
@@ -51,45 +51,45 @@ class BrowserExtraMember : public BrowserNode, public Labeled<BrowserExtraMember
     void exec_menu_choice(int rank);
 
 public:
-    BrowserExtraMember(QString s, BrowserNode * p, ExtraMemberData * d, int id = 0);
+    BrowserExtraMember(const QString & s, BrowserNode * p, ExtraMemberData * d, int id = 0);
     BrowserExtraMember(const BrowserExtraMember * model, BrowserNode * p);
     virtual ~BrowserExtraMember();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
-
-    virtual const QPixmap * pixmap(int) const;
-
-    virtual void menu();
-    virtual void apply_shortcut(QString s);
-    virtual void open(bool);
-    virtual UmlCode get_type() const;
-    virtual QString get_stype() const;
-    virtual int get_identifier() const;
-    virtual const char * help_topic() const;
-    virtual void modified();
-    virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
-    virtual bool same_name(const QString & s, UmlCode type) const;
-    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
+                                    const QString & name = QString()) override;
+
+    virtual const QPixmap * pixmap(int) const override;
+
+    virtual void menu() override;
+    virtual void apply_shortcut(const QString & s) override;
+    virtual void open(bool) override;
+    virtual UmlCode get_type() const override;
+    virtual QString get_stype() const override;
+    virtual int get_identifier() const override;
+    virtual const char * help_topic() const override;
+    virtual void modified() override;
+    virtual BasicData * get_data() const override;
+    virtual void set_name(const QString & s) override;
+    virtual bool same_name(const QString & s, UmlCode type) const override;
+    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const override;
     virtual void member_cpp_def(const QString & prefix, const QString &,
-                                QString & s, bool templ) const;
-    virtual bool allow_empty() const;
+                                QString & s, bool templ) const override;
+    virtual bool allow_empty() const override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning);
+    virtual void save(QTextStream &, bool ref, QString & warning) override;
     static BrowserExtraMember * read(char *& , char *, BrowserNode *);
     static BrowserNode * get_it(const char * k, int id);
 
-    static BrowserExtraMember * new_one(QString s, BrowserNode * p);
+    static BrowserExtraMember * new_one(const QString & s, BrowserNode * p);
 
     static void clear(bool old);
     static void update_idmax_for_root();
-    virtual void renumber(int phase);
-    virtual void prepare_update_lib() const;
+    virtual void renumber(int phase) override;
+    virtual void prepare_update_lib() const override;
 
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 
-    virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after);
+    virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after) override;
 };
 
 #endif
diff --git a/src/browser/BrowserFlow.cpp b/src/browser/BrowserFlow.cpp
index b7e33ca40..95cfb6447 100644
--- a/src/browser/BrowserFlow.cpp
+++ b/src/browser/BrowserFlow.cpp
@@ -29,15 +29,13 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
-#include <q3painter.h>
-#include <q3ptrdict.h>
+#include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
 #include <QPixmap>
-
 #include "BrowserFlow.h"
 #include "FlowData.h"
 #include "ReferenceDialog.h"
@@ -53,7 +51,7 @@
 #include "mu.h"
 #include "BrowserActivityDiagram.h"
 #include "translate.h"
-
+#include <QAction>
 IdDict<BrowserFlow> BrowserFlow::all(1021, __FILE__);
 QStringList BrowserFlow::its_default_stereotypes;	// unicode
 
@@ -96,7 +94,7 @@ BrowserFlow::~BrowserFlow()
         delete def;
 }
 
-BrowserNode * BrowserFlow::duplicate(BrowserNode * p, QString)
+BrowserNode * BrowserFlow::duplicate(BrowserNode * p, const QString &)
 {
     BrowserFlow * result = new BrowserFlow(this, p);
 
@@ -113,10 +111,10 @@ bool BrowserFlow::undelete(bool, QString & warning, QString & renamed)
         return FALSE;
 
     if (def->get_start_node()->deletedp() ||
-        def->get_end_node()->deletedp()) {
-        warning += QString("<li><b>") + quote(name) + "</b> " + TR("from") + " <b>" +
-                   def->get_start_node()->full_name() +
-                   "</b> " + TR("to") + " <b>" + def->get_end_node()->full_name() + "</b>\n";
+            def->get_end_node()->deletedp()) {
+        warning += QString("<li><b>") + quote(name) + "</b> " + QObject::tr("from") + " <b>" +
+                def->get_start_node()->full_name() +
+                "</b> " + QObject::tr("to") + " <b>" + def->get_end_node()->full_name() + "</b>\n";
         return FALSE;
     }
 
@@ -129,7 +127,7 @@ bool BrowserFlow::undelete(bool, QString & warning, QString & renamed)
     return TRUE;
 }
 
-void BrowserFlow::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserFlow::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -137,17 +135,18 @@ void BrowserFlow::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
         BrowserActivityDiagram::compute_referenced_by(l, this, "flowcanvas", "flow_ref");
 }
 
-void BrowserFlow::compute_referenced_by(Q3PtrList<BrowserNode> & l,
+void BrowserFlow::compute_referenced_by(QList<BrowserNode *> & l,
                                         const BrowserNode * target)
 {
     IdIterator<BrowserFlow> it(all);
+    while(it.hasNext()){
+        it.next();
+        if(it.value()) {
+            if (!it.value()->deletedp() &&
+                    (it.value()->def->get_end_node() == target))
+                l.append(it.value());
 
-    while (it.current()) {
-        if (!it.current()->deletedp() &&
-            (it.current()->def->get_end_node() == target))
-            l.append(it.current());
-
-        ++it;
+        }
     }
 }
 
@@ -183,7 +182,7 @@ void BrowserFlow::update_stereotype(bool)
 
         if (show_stereotypes && stereotype[0]) {
             QString s = toUnicode(stereotype);
-            int index = s.find(':');
+            int index = s.indexOf(':');
 
             setText(0,
                     "<<" + ((index == -1) ? s : s.mid(index + 1))
@@ -206,25 +205,25 @@ const QPixmap * BrowserFlow::pixmap(int) const
 
 void BrowserFlow::menu()
 {
-    Q3PopupMenu m(0, "flow");
-    Q3PopupMenu toolm(0);
+    QMenu m("flow",0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!in_edition()) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>flow</i>, \
-a double click with the left mouse button does the same thing"));
+            MenuFactory::addItem(m,QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>flow</i>, \
+                                             a double click with the left mouse button does the same thing"));
 
-            if (!is_read_only && (edition_number == 0)) {
-                m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                               TR("to delete the <i>flow</i>. \
-Note that you can undelete it after"));
-            }
+                                             if (!is_read_only && (edition_number == 0)) {
+                                                 MenuFactory::addItem(m,QObject::tr("Delete"), 2,
+                                                 QObject::tr("to delete the <i>flow</i>. \
+                                                 Note that you can undelete it after"));
+                                             }
 
-            m.insertSeparator();
+                                             m.addSeparator();
         }
 
         QString s = def->get_end_node()->get_name();
@@ -232,30 +231,36 @@ Note that you can undelete it after"));
         if (s.isEmpty())
             s = stringify(def->get_end_node()->get_type());
 
-        m.setWhatsThis(m.insertItem(TR("Select ") + s, 7),
-                       TR("to select the destination"));
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 4),
-                       TR("to know who reference the <i>region</i>"));
-        mark_menu(m, TR("the flow"), 90);
+        MenuFactory::addItem(m,QObject::tr("Select ") + s, 7,
+                             QObject::tr("to select the destination"));
+        MenuFactory::addItem(m,QObject::tr("Referenced by"), 4,
+                             QObject::tr("to know who reference the <i>region</i>"));
+        mark_menu(m, QObject::tr("the flow"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0)
-            && Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                && Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("undelete the <i>flow</i> \
-(except if the other side is also deleted)"));
-
-        if (def->get_start_node()->deletedp() ||
-            def->get_end_node()->deletedp())
-            m.setItemEnabled(3, FALSE);
+        MenuFactory::addItem(m,QObject::tr("Undelete"), 3,
+                             QObject::tr("undelete the <i>flow</i> \
+                                         (except if the other side is also deleted)"));
+                                         if (def->get_start_node()->deletedp() ||
+                                             def->get_end_node()->deletedp())
+        {
+                                             QAction* action = MenuFactory::findAction(m, 3);
+                                             if(action)
+                                             action->setEnabled(false);
+                                         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserFlow::exec_menu_choice(int rank)
@@ -296,7 +301,7 @@ void BrowserFlow::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserFlow::apply_shortcut(QString s)
+void BrowserFlow::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -352,7 +357,7 @@ UmlCode BrowserFlow::get_type() const
 
 QString BrowserFlow::get_stype() const
 {
-    return TR("flow");
+    return QObject::tr("flow");
 }
 
 int BrowserFlow::get_identifier() const
@@ -431,7 +436,7 @@ void BrowserFlow::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 QString BrowserFlow::drag_key() const
 {
     return QString::number(UmlFlow)
-           + "#" + QString::number((unsigned long) parent());
+            + "#" + QString::number((unsigned long) parent());
 }
 
 QString BrowserFlow::drag_postfix() const
@@ -442,7 +447,7 @@ QString BrowserFlow::drag_postfix() const
 QString BrowserFlow::drag_key(BrowserNode * p)
 {
     return QString::number(UmlFlow)
-           + "#" + QString::number((unsigned long) p);
+            + "#" + QString::number((unsigned long) p);
 }
 
 void BrowserFlow::save_stereotypes(QTextStream & st)
@@ -493,8 +498,8 @@ BrowserFlow * BrowserFlow::read_ref(char *& st)
     BrowserFlow * result = all[id];
 
     return (result == 0)
-           ? new BrowserFlow(id)
-           : result;
+            ? new BrowserFlow(id)
+            : result;
 }
 
 BrowserFlow * BrowserFlow::read(char *& st, char * k, BrowserNode * parent)
@@ -534,7 +539,7 @@ BrowserFlow * BrowserFlow::read(char *& st, char * k, BrowserNode * parent)
         result->is_defined = TRUE;
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         result->BrowserNode::read(st, k, id);
 
diff --git a/src/browser/BrowserFlow.h b/src/browser/BrowserFlow.h
index 7c95612ee..3c7802cf7 100644
--- a/src/browser/BrowserFlow.h
+++ b/src/browser/BrowserFlow.h
@@ -60,7 +60,7 @@ class BrowserFlow : public BrowserNode, public Labeled<BrowserFlow>
 
     virtual bool undelete(bool rec, QString & warning, QString & renamed);
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
 
@@ -68,7 +68,7 @@ class BrowserFlow : public BrowserNode, public Labeled<BrowserFlow>
     virtual bool same_name(const QString & s, UmlCode type) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual bool in_edition() const;
     virtual UmlCode get_type() const;
@@ -91,8 +91,8 @@ class BrowserFlow : public BrowserNode, public Labeled<BrowserFlow>
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, const BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
+    static void compute_referenced_by(QList<BrowserNode *> &, const BrowserNode *);
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
diff --git a/src/browser/BrowserInterruptibleActivityRegion.cpp b/src/browser/BrowserInterruptibleActivityRegion.cpp
index c38e741ff..400e79877 100644
--- a/src/browser/BrowserInterruptibleActivityRegion.cpp
+++ b/src/browser/BrowserInterruptibleActivityRegion.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -63,7 +63,7 @@
 IdDict<BrowserInterruptibleActivityRegion> BrowserInterruptibleActivityRegion::all(__FILE__);
 QStringList BrowserInterruptibleActivityRegion::its_default_stereotypes;	// unicode
 
-BrowserInterruptibleActivityRegion::BrowserInterruptibleActivityRegion(QString s, BrowserNode * p, int id)
+BrowserInterruptibleActivityRegion::BrowserInterruptibleActivityRegion(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserInterruptibleActivityRegion>(all, id),
       def(new SimpleData), associated_diagram(0)
 {
@@ -86,7 +86,7 @@ BrowserInterruptibleActivityRegion::BrowserInterruptibleActivityRegion(const Bro
     comment = model->comment;
 }
 
-BrowserNode * BrowserInterruptibleActivityRegion::duplicate(BrowserNode * p, QString s)
+BrowserNode * BrowserInterruptibleActivityRegion::duplicate(BrowserNode * p, const QString & s)
 {
     BrowserNode * result = new BrowserInterruptibleActivityRegion(this, p);
 
@@ -116,13 +116,13 @@ void BrowserInterruptibleActivityRegion::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserInterruptibleActivityRegion::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserInterruptibleActivityRegion::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -156,19 +156,19 @@ BrowserInterruptibleActivityRegion::add_interruptibleactivityregion(BrowserNode
 {
     QString name;
 
-    return (!future_parent->enter_child_name(name, TR("enter interruptible activity \nregion's name (may be empty) : "),
-            UmlInterruptibleActivityRegion, TRUE, TRUE))
+    return (!future_parent->enter_child_name(name, QObject::tr("enter interruptible activity \nregion's name (may be empty) : "),
+                                             UmlInterruptibleActivityRegion, TRUE, TRUE))
 
-           ? 0
-           : add_interruptibleactivityregion(future_parent, name);
+            ? 0
+            : add_interruptibleactivityregion(future_parent, name);
 }
 
 BrowserInterruptibleActivityRegion *
 BrowserInterruptibleActivityRegion::add_interruptibleactivityregion(BrowserNode * future_parent,
-        const char * name)
+                                                                    QString name)
 {
     BrowserInterruptibleActivityRegion * r =
-        new BrowserInterruptibleActivityRegion(name, future_parent);
+            new BrowserInterruptibleActivityRegion(name, future_parent);
 
     future_parent->setOpen(TRUE);
     future_parent->package_modified();
@@ -180,17 +180,17 @@ BrowserInterruptibleActivityRegion *
 BrowserInterruptibleActivityRegion::get_interruptibleactivityregion(BrowserNode * parent)
 {
     BrowserNodeList l;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = parent->firstChild(); child != 0; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlInterruptibleActivityRegion))
+                (((BrowserNode *) child)->get_type() == UmlInterruptibleActivityRegion))
             l.append((BrowserNode *) child);
 
     BrowserNode * old;
     QString name;
 
-    if (!parent->enter_child_name(name, TR(" enter interruptible activity \nregion's name (may be empty) : "),
+    if (!parent->enter_child_name(name, QObject::tr(" enter interruptible activity \nregion's name (may be empty) : "),
                                   UmlInterruptibleActivityRegion, l, &old,
                                   TRUE, TRUE))
         return 0;
@@ -199,7 +199,7 @@ BrowserInterruptibleActivityRegion::get_interruptibleactivityregion(BrowserNode
         return ((BrowserInterruptibleActivityRegion *) old);
 
     BrowserInterruptibleActivityRegion * r =
-        new BrowserInterruptibleActivityRegion(name, parent);
+            new BrowserInterruptibleActivityRegion(name, parent);
 
     parent->setOpen(TRUE);
     parent->package_modified();
@@ -209,67 +209,70 @@ BrowserInterruptibleActivityRegion::get_interruptibleactivityregion(BrowserNode
 
 void BrowserInterruptibleActivityRegion::menu()
 {
-    Q3PopupMenu m(0, "interruptible activity region");
-    Q3PopupMenu toolm(0);
+    QMenu m("interruptible activity region",0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("New nested interruptible activity region"), 0),
-                           TR("to add a nested <i>interruptible activity region</i>"));
-            m.setWhatsThis(m.insertItem(TR("New expansion region"), 1),
-                           TR("to add a nested <i>expansion region</i>"));
-            m.setWhatsThis(m.insertItem(TR("Add activity action"), 6),
-                           TR("to add an <i>activity action</i> to the <i>region</i>"));
-            m.setWhatsThis(m.insertItem(TR("Add object node"), 7),
-                           TR("to add an <i>activity object node</i> to the <i>region</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("New nested interruptible activity region"), 0,
+                                 QObject::tr("to add a nested <i>interruptible activity region</i>"));
+            MenuFactory::addItem(m, QObject::tr("New expansion region"), 1,
+                                 QObject::tr("to add a nested <i>expansion region</i>"));
+            MenuFactory::addItem(m, QObject::tr("Add activity action"), 6,
+                                 QObject::tr("to add an <i>activity action</i> to the <i>region</i>"));
+            MenuFactory::addItem(m, QObject::tr("Add object node"), 7,
+                                 QObject::tr("to add an <i>activity object node</i> to the <i>region</i>"));
+            m.addSeparator();
         }
 
-        m.setWhatsThis(m.insertItem(TR("Edit"), 4),
-                       TR("to edit the <i>interruptible activity region</i>, \
-a double click with the left mouse button does the same thing"));
+        MenuFactory::addItem(m, QObject::tr("Edit"), 4,
+                             QObject::tr("to edit the <i>interruptible activity region</i>, \
+                                         a double click with the left mouse button does the same thing"));
 
-        if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 5),
-                           TR("to copy the <i>interruptible activity region</i> in a new one"));
-            m.insertSeparator();
+                                         if (!is_read_only) {
+                                             MenuFactory::addItem(m, QObject::tr("Duplicate"), 5,
+                                             QObject::tr("to copy the <i>interruptible activity region</i> in a new one"));
+                                             m.addSeparator();
 
-            if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 8),
-                               TR("to delete the <i>interruptible activity region</i>. \
-Note that you can undelete it after"));
-        }
+                                             if (edition_number == 0)
+                                             MenuFactory::addItem(m, QObject::tr("Delete"), 8,
+                                             QObject::tr("to delete the <i>interruptible activity region</i>. \
+                                             Note that you can undelete it after"));
+                                         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 3),
-                       TR("to know who reference the <i>region</i>"));
-        mark_menu(m, TR("the interruptible activity region"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
+                                         MenuFactory::addItem(m, QObject::tr("Referenced by"), 3,
+                                                              QObject::tr("to know who reference the <i>region</i>"));
+                             mark_menu(m, QObject::tr("the interruptible activity region"), 90);
+                ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 9),
-                       TR("to undelete the <i>interruptible activity region</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 9,
+                             QObject::tr("to undelete the <i>interruptible activity region</i>"));
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 10),
-                               TR("undelete the interruptible activity region and its children"));
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 10,
+                                     QObject::tr("undelete the interruptible activity region and its children"));
                 break;
             }
         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserInterruptibleActivityRegion::exec_menu_choice(int rank)
@@ -294,31 +297,31 @@ void BrowserInterruptibleActivityRegion::exec_menu_choice(int rank)
     case 5: {
         QString name;
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter interruptible activity \nregion's name (may be empty) : "),
-                UmlActivity, TRUE, TRUE))
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter interruptible activity \nregion's name (may be empty) : "),
+                                                         UmlActivity, TRUE, TRUE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
     }
-    break;
+        break;
 
     case 6: {
         BrowserActivityAction * r =
-            BrowserActivityAction::add_activityaction(this, 0);
+                BrowserActivityAction::add_activityaction(this, 0);
 
         if (r != 0)
             r->select_in_browser();
     }
 
-    return;
+        return;
 
     case 7: {
         BrowserActivityObject * r =
-            BrowserActivityObject::add_activityobject(this, 0);
+                BrowserActivityObject::add_activityobject(this, 0);
 
         if (r != 0)
             r->select_in_browser();
     }
 
-    return;
+        return;
 
     case 8:
         delete_it();
@@ -347,7 +350,7 @@ void BrowserInterruptibleActivityRegion::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserInterruptibleActivityRegion::apply_shortcut(QString s)
+void BrowserInterruptibleActivityRegion::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -385,7 +388,7 @@ void BrowserInterruptibleActivityRegion::apply_shortcut(QString s)
         if (s == "Undelete")
             choice = 9;
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -403,8 +406,8 @@ void BrowserInterruptibleActivityRegion::apply_shortcut(QString s)
 void BrowserInterruptibleActivityRegion::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited) {
         static QSize previous_size;
@@ -430,7 +433,7 @@ UmlCode BrowserInterruptibleActivityRegion::get_type() const
 
 QString BrowserInterruptibleActivityRegion::get_stype() const
 {
-    return TR("interruptible activity region");
+    return QObject::tr("interruptible activity region");
 }
 
 int BrowserInterruptibleActivityRegion::get_identifier() const
@@ -469,7 +472,7 @@ BrowserNode * BrowserInterruptibleActivityRegion::get_associated() const
 }
 
 void BrowserInterruptibleActivityRegion::set_associated_diagram(BrowserActivityDiagram * dg,
-        bool on_read)
+                                                                bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -561,17 +564,16 @@ bool BrowserInterruptibleActivityRegion::tool_cmd(ToolCom * com, const char * ar
     }
 }
 
-bool BrowserInterruptibleActivityRegion::may_contains_them(const Q3PtrList<BrowserNode> & l,
-        BooL & duplicable) const
+bool BrowserInterruptibleActivityRegion::may_contains_them(const QList<BrowserNode *> & l,
+                                                           BooL & duplicable) const
 {
     BrowserNode * activity = get_container(UmlActivity);
-    Q3PtrListIterator<BrowserNode> it(l);
 
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlInterruptibleActivityRegion:
         case UmlExpansionRegion:
-            if (((const BrowserNode *) it.current()->get_container(UmlActivity)) != activity)
+            if (((const BrowserNode *) node->get_container(UmlActivity)) != activity)
                 return FALSE;
 
             break;
@@ -585,7 +587,7 @@ bool BrowserInterruptibleActivityRegion::may_contains_them(const Q3PtrList<Brows
         case MergeAN:
         case ForkAN:
         case JoinAN:
-            if (((const BrowserNode *) it.current()->get_container(UmlActivity)) != activity)
+            if (((const BrowserNode *) node->get_container(UmlActivity)) != activity)
                 return FALSE;
 
             break;
@@ -594,10 +596,10 @@ bool BrowserInterruptibleActivityRegion::may_contains_them(const Q3PtrList<Brows
             return FALSE;
         }
 
-        if (! may_contains(it.current(), TRUE))
+        if (! may_contains(node, TRUE))
             return FALSE;
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -606,9 +608,9 @@ bool BrowserInterruptibleActivityRegion::may_contains_them(const Q3PtrList<Brows
 void BrowserInterruptibleActivityRegion::DragMoveEvent(QDragMoveEvent * e)
 {
     if (UmlDrag::canDecode(e, BrowserActivityNode::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserActivityAction::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserExpansionRegion::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserInterruptibleActivityRegion::drag_key(this))) {
+            UmlDrag::canDecode(e, BrowserActivityAction::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserExpansionRegion::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserInterruptibleActivityRegion::drag_key(this))) {
         if (!is_read_only)
             e->accept();
         else
@@ -626,10 +628,10 @@ void BrowserInterruptibleActivityRegion::DropEvent(QDropEvent * e)
 void BrowserInterruptibleActivityRegion::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        (UmlDrag::canDecode(e, BrowserActivityNode::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserActivityAction::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserInterruptibleActivityRegion::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserExpansionRegion::drag_key(this))))
+            (UmlDrag::canDecode(e, BrowserActivityNode::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserActivityAction::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserInterruptibleActivityRegion::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserExpansionRegion::drag_key(this))))
         e->accept();
     else
         e->ignore();
@@ -643,36 +645,38 @@ void BrowserInterruptibleActivityRegion::DropAfterEvent(QDropEvent * e, BrowserN
          ((bn = UmlDrag::decode(e, BrowserActivityAction::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserExpansionRegion::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserInterruptibleActivityRegion::drag_key(this))) != 0)) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn, TRUE)) {
             if ((after == 0) &&
-                ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
+                    ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
                 // have choice
-                Q3PopupMenu m(0);
+                QMenu m(0);
 
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In ") + QString(get_name()), 1);
+                MenuFactory::addItem(m, QObject::tr("After ") + QString(get_name()), 2);
 
-                switch (m.exec(QCursor::pos())) {
-                case 1:
-                    break;
+                QAction *retAction = m.exec(QCursor::pos());
+                if(retAction)
+                    switch (retAction->data().toInt()) {
+                    case 1:
+                        break;
 
-                case 2:
-                    ((BrowserNode *) parent())->DropAfterEvent(e, this);
-                    return;
+                    case 2:
+                        ((BrowserNode *) parent())->DropAfterEvent(e, this);
+                        return;
 
-                default:
-                    e->ignore();
-                    return;
-                }
+                    default:
+                        e->ignore();
+                        return;
+                    }
             }
 
             move(bn, after);
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical( QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -685,7 +689,7 @@ void BrowserInterruptibleActivityRegion::DropAfterEvent(QDropEvent * e, BrowserN
 QString BrowserInterruptibleActivityRegion::drag_key() const
 {
     return QString::number(UmlInterruptibleActivityRegion)
-           + "#" + QString::number((unsigned long) get_container(UmlActivity));
+            + "#" + QString::number((unsigned long) get_container(UmlActivity));
 }
 
 QString BrowserInterruptibleActivityRegion::drag_postfix() const
@@ -696,7 +700,7 @@ QString BrowserInterruptibleActivityRegion::drag_postfix() const
 QString BrowserInterruptibleActivityRegion::drag_key(BrowserNode * p)
 {
     return QString::number(UmlInterruptibleActivityRegion)
-           + "#" + QString::number((unsigned long) p->get_container(UmlActivity));
+            + "#" + QString::number((unsigned long) p->get_container(UmlActivity));
 }
 
 void BrowserInterruptibleActivityRegion::save_stereotypes(QTextStream & st)
@@ -737,7 +741,7 @@ void BrowserInterruptibleActivityRegion::save(QTextStream & st, bool ref, QStrin
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -781,13 +785,13 @@ BrowserInterruptibleActivityRegion::read_ref(char *& st)
     BrowserInterruptibleActivityRegion * result = all[id];
 
     return (result == 0)
-           ? new BrowserInterruptibleActivityRegion(id)
-           : result;
+            ? new BrowserInterruptibleActivityRegion(id)
+            : result;
 }
 
 BrowserInterruptibleActivityRegion *
 BrowserInterruptibleActivityRegion::read(char *& st, char * k,
-        BrowserNode * parent)
+                                         BrowserNode * parent)
 {
     BrowserInterruptibleActivityRegion * result;
     int id;
@@ -797,8 +801,8 @@ BrowserInterruptibleActivityRegion::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserInterruptibleActivityRegion(id)
-               : result;
+                ? new BrowserInterruptibleActivityRegion(id)
+                : result;
     }
     else if (!strcmp(k, "interruptibleactivityregion")) {
         id = read_id(st);
@@ -832,7 +836,7 @@ BrowserInterruptibleActivityRegion::read(char *& st, char * k,
         result->BrowserNode::read(st, k, id);
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         if (strcmp(k, "end")) {
             while (BrowserActivityNode::read(st, k, result) ||
@@ -855,6 +859,6 @@ BrowserInterruptibleActivityRegion::read(char *& st, char * k,
 BrowserNode * BrowserInterruptibleActivityRegion::get_it(const char * k, int id)
 {
     return (!strcmp(k, "interruptibleactivityregion_ref"))
-           ? all[id]
-           : 0;
+            ? all[id]
+              : 0;
 }
diff --git a/src/browser/BrowserInterruptibleActivityRegion.h b/src/browser/BrowserInterruptibleActivityRegion.h
index b7dc777ae..054c5bb63 100644
--- a/src/browser/BrowserInterruptibleActivityRegion.h
+++ b/src/browser/BrowserInterruptibleActivityRegion.h
@@ -58,22 +58,22 @@ class BrowserInterruptibleActivityRegion : public BrowserNode, public Labeled<Br
     void exec_menu_choice(int rank);
 
 public:
-    BrowserInterruptibleActivityRegion(QString s, BrowserNode * p, int id = 0);
+    BrowserInterruptibleActivityRegion(const QString & s, BrowserNode * p, int id = 0);
     BrowserInterruptibleActivityRegion(const BrowserInterruptibleActivityRegion * model, BrowserNode * p);
     virtual ~BrowserInterruptibleActivityRegion();
 
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> & l,
+    virtual bool may_contains_them(const QList<BrowserNode *> & l,
                                    BooL & duplicable) const;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserInterruptibleActivityRegion * add_interruptibleactivityregion(BrowserNode * future_parent);
-    static BrowserInterruptibleActivityRegion * add_interruptibleactivityregion(BrowserNode * future_parent, const char * name);
+    static BrowserInterruptibleActivityRegion * add_interruptibleactivityregion(BrowserNode * future_parent, QString name);
     static BrowserInterruptibleActivityRegion * get_interruptibleactivityregion(BrowserNode * parent);
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -98,7 +98,7 @@ class BrowserInterruptibleActivityRegion : public BrowserNode, public Labeled<Br
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp
index d5384eaf5..4b3c498a0 100644
--- a/src/browser/BrowserNode.cpp
+++ b/src/browser/BrowserNode.cpp
@@ -31,17 +31,17 @@
 //
 // *************************************************************************
 
-#include <q3dragobject.h>
+//#include <q3dragobject.h>
 #include <qcursor.h>
-#include <q3ptrdict.h>
+//#include <q3ptrdict.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qapplication.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDragMoveEvent>
 #include <QDropEvent>
-#include <Q3PtrCollection>
+//
 
 #include "BrowserView.h"
 #include "BrowserNode.h"
@@ -79,11 +79,11 @@
 #include "OperationData.h"
 #include "translate.h"
 #include "../Logging/QsLog.h"
-
+#include "ui/menufactory.h"
 QList<UmlCode> BrowserNode::generatable_types;
-Q3PtrList<BrowserNode> BrowserNode::marked_list;
+QList<BrowserNode *> BrowserNode::marked_list;
 
-static BrowserPackage * UndefinedNodePackage;
+static BrowserPackage * UndefinedNodePackage = 0;
 
 bool BrowserNode::show_stereotypes = TRUE;
 unsigned BrowserNode::edition_number;
@@ -97,30 +97,72 @@ int BrowserNode::must_be_saved_counter;
 int BrowserNode::already_saved;
 
 // to accelerate sorting
-Q3PtrDict<QString> SynonymousPath(259);
+QHash<void*,QString*> SynonymousPath;
 
 // to accelerate full_name
 QString BrowserNode::FullPathPrefix = "   [";
 QString BrowserNode::FullPathPostfix = "]";
 QString BrowserNode::FullPathDotDot = "::";
+BrowserView* BrowserNode::viewptr = 0;
+
 
-BrowserNode::BrowserNode(QString s, BrowserView * parent)
-    : Q3ListViewItem(parent, s),
-      name(s), original_id(0), is_new(TRUE), is_deleted(FALSE),
-      is_modified(FALSE), is_read_only(FALSE), is_edited(FALSE),
-      is_marked(FALSE), is_defined(FALSE)
+
+class BrowserItemNameValidator: public QValidator{
+public:
+    BrowserItemNameValidator(BrowserNode* node, UmlCode type,
+                             bool allow_spaces, bool allow_empty)
+        : m_type(type)
+        , m_allow_spaces(allow_spaces)
+        , m_allow_empty(allow_empty)
+        , m_node(node)
+    {
+    }
+
+private:
+    mutable QString infoMessage;
+    UmlCode m_type;
+    bool m_allow_spaces;
+    bool m_allow_empty;
+    BrowserNode* m_node;
+
+    // QValidator interface
+public:
+    virtual State validate(QString &str, int &) const override;
+    virtual void fixup(QString &) const override;
+};
+
+BrowserItemNameValidator::State BrowserItemNameValidator::validate(QString &str, int &) const
 {
+    if (!m_node->wrong_child_name(str, m_type, m_allow_spaces, m_allow_empty, &infoMessage))
+    {
+        infoMessage = tr("Ok");
+        return Acceptable;
+    }
+    return Invalid;
 }
 
-BrowserNode::BrowserNode(QString s, BrowserNode * parent)
-    : Q3ListViewItem(parent, s),
-      name(s), original_id(0), is_new(TRUE), is_deleted(FALSE),
-      is_modified(FALSE), is_read_only(FALSE), is_edited(FALSE),
-      is_marked(FALSE), is_defined(FALSE)
+void BrowserItemNameValidator::fixup(QString &str) const
+{
+    str = infoMessage;
+}
+
+BrowserNode::BrowserNode(const QString & s, BrowserView * parent)
+    : QTreeWidgetItem(parent),
+      name(s)
+{
+    this->setData(0, Qt::DisplayRole, name);
+    viewptr = parent;
+}
+
+BrowserNode::BrowserNode(const QString & s, BrowserNode * parent)
+    :      QTreeWidgetItem(parent),
+      name(s)
 {
 
+    this->setData(0, Qt::DisplayRole, name);
     // move it at end
-    Q3ListViewItem * child = parent->firstChild();
+    //already appends it to last pos
+    BrowserNode * child = parent->firstChild();
 
     while (child->nextSibling())
         child = child->nextSibling();
@@ -130,17 +172,23 @@ BrowserNode::BrowserNode(QString s, BrowserNode * parent)
 }
 
 BrowserNode::BrowserNode()
-    : Q3ListViewItem(UndefinedNodePackage, "<not yet read>"),
-      original_id(0), is_new(TRUE), is_deleted(FALSE),
-      is_modified(FALSE), is_read_only(FALSE), is_edited(FALSE),
-      is_marked(FALSE), is_defined(FALSE)
+    : QTreeWidgetItem(UndefinedNodePackage)
 {
+    name = "<not yet read>";
+    this->setData(0, Qt::DisplayRole, name);
+}
+
+BrowserNode::BrowserNode(BrowserView * view)
+    : QTreeWidgetItem(view)
+{
+    name = "<not yet read>";
+    this->setData(0, Qt::DisplayRole, name);
 }
 
 BrowserNode::~BrowserNode()
 {
     if (is_marked)
-        marked_list.removeRef(this);
+        marked_list.removeOne(this);
 }
 
 bool BrowserNode::is_undefined() const
@@ -156,7 +204,7 @@ void BrowserNode::delete_it()
             QString warning;
 
             if (!delete_internal(warning)) {
-                warning = full_name() + TR(" cannot be deleted because :") + warning;
+                warning = full_name() + QObject::tr(" cannot be deleted because :") + warning;
 
                 warn(warning);
             }
@@ -177,7 +225,7 @@ void BrowserNode::delete_it()
             is_deleted = TRUE;
 
             if (is_marked) {
-                marked_list.removeRef(this);
+                marked_list.removeOne(this);
                 is_marked = FALSE;
             }
 
@@ -188,8 +236,7 @@ void BrowserNode::delete_it()
                 get_data()->delete_it();
 
             // delete the sub elts
-            Q3ListViewItem * child;
-
+            BrowserNode * child;
             for (child = firstChild(); child != 0; child = child->nextSibling())
                 if (!((BrowserNode *) child)->deletedp())
                     ((BrowserNode *) child)->delete_it();
@@ -200,17 +247,26 @@ void BrowserNode::delete_it()
     }
 }
 
+void BrowserNode::set_deleted(bool value)
+{
+    if(value)
+        delete_it();
+    else
+        undelete(true);
+
+}
+
 bool BrowserNode::delete_internal(QString & warning)
 {
     if (deletedp())
         return TRUE;
 
     if (!is_writable() && !root_permission() && !is_from_lib()) {
-        warning += "\n    " + TR("%1 is read-only", full_name());
+        warning += "\n    " + QObject::tr("%1 is read-only").arg(full_name());
         return FALSE;
     }
 
-    static Q3PtrList<BrowserNode> targetof;
+    static QList<BrowserNode *> targetof;
     static bool made = FALSE;
     bool made_here;
 
@@ -225,30 +281,25 @@ bool BrowserNode::delete_internal(QString & warning)
     bool ro = FALSE;
 
     if (!root_permission()) {
-        Q3PtrListIterator<BrowserNode> it(targetof);
-        BrowserNode * r;
-
-        while ((r = it.current()) != 0) {
+        foreach (BrowserNode *r, targetof) {
             if (!r->is_writable() && !r->is_from_lib()) {
                 ro = TRUE;
                 warning += "\n    ";
 
                 switch (r->get_type()) {
                 case UmlComponent:
-                    warning += TR("%1 referenced by the read-only component %2", full_name(), r->full_name());
+                    warning += QObject::tr("%1 referenced by the read-only component %2").arg(full_name()).arg(r->full_name());
                     break;
 
                 case UmlArtifact:
-                    warning += TR("%1 referenced by the read-only artifact %2", full_name(), r->full_name());
+                    warning += QObject::tr("%1 referenced by the read-only artifact %2").arg(full_name()).arg(r->full_name());
                     break;
 
                 default:
-                    warning += TR("%1 is the target of the read-only relation %2", full_name(), r->full_name());
+                    warning += QObject::tr("%1 is the target of the read-only relation %2").arg(full_name()).arg( r->full_name());
                     break;
                 }
             }
-
-            ++it;
         }
     }
 
@@ -261,7 +312,7 @@ bool BrowserNode::delete_internal(QString & warning)
         return FALSE;
 
     // sub elts
-    Q3ListViewItem * child;
+    BrowserNode * child;
     bool ok = TRUE;
 
     for (child = firstChild(); child != 0; child = child->nextSibling())
@@ -271,7 +322,7 @@ bool BrowserNode::delete_internal(QString & warning)
         is_deleted = TRUE;
 
         if (is_marked) {
-            marked_list.removeRef(this);
+            marked_list.removeOne(this);
             is_marked = FALSE;
         }
 
@@ -283,17 +334,17 @@ bool BrowserNode::delete_internal(QString & warning)
     return ok;
 }
 
-const char * BrowserNode::get_comment() const
+QString BrowserNode::get_comment() const
 {
-    return comment.operator const char *();
+    return comment;
 }
 
-void BrowserNode::set_comment(QString c)
+void BrowserNode::set_comment(const QString & c)
 {
     comment = c;
 }
 
-void BrowserNode::referenced_by(Q3PtrList<BrowserNode> & l, bool)
+void BrowserNode::referenced_by(QList<BrowserNode *> & l, bool)
 {
     BrowserSimpleRelation::compute_referenced_by(l, this);
 }
@@ -317,26 +368,26 @@ const char * BrowserNode::help_topic() const
 
 // undelete entry operation
 
-void BrowserNode::undelete(bool rec)
+void BrowserNode::undelete(bool recursive)
 {
     QString warning;
     QString renamed;
 
-    if (undelete(rec, warning, renamed) && rec) {
+    if (undelete(recursive, warning, renamed) && recursive) {
         // Redo it because now all classes are undeleted but it is
         // possible that some relations was not undeleted because
         // at least one of the two extremities was not undeleted
         warning = QString();
-        undelete(rec, warning, renamed);
+        undelete(recursive, warning, renamed);
     }
 
     if (!warning.isEmpty())
-        warning = "<p>" + TR("Some items cannot be undeleted") + " :\n<ul>"
-                  + warning + "</ul></p>";
+        warning = "<p>" + QObject::tr("Some items cannot be undeleted") + " :\n<ul>"
+                + warning + "</ul></p>";
 
     if (! renamed.isEmpty()) {
-        warning += "<p>" + TR("Some items are renamed") + " :\n<ul>"
-                   + renamed + "</ul></p>";
+        warning += "<p>" + QObject::tr("Some items are renamed") + " :\n<ul>"
+                + renamed + "</ul></p>";
     }
 
     if (!warning.isEmpty())
@@ -378,15 +429,13 @@ bool BrowserNode::undelete(bool rec, QString & warning, QString & renamed)
 
     if (rec) {
         // undelete the sub elts
-        Q3ListViewItem * child;
+        BrowserNode  * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             result |= ((BrowserNode *) child)->undelete(rec, warning, renamed);
     }
-
     if (result)
         repaint();
-
     return result;
 }
 
@@ -412,14 +461,15 @@ bool BrowserNode::is_writable() const
     return !is_read_only;
 }
 
-void BrowserNode::set_name(QString  s)
+void BrowserNode::set_name(const QString & s)
 {
     bool firsttime = name.isEmpty();
     name = s;
+    this->setData(0, Qt::DisplayRole, name);
 
-        if (! firsttime)
-            // else set by BrowserNode::post_load()
-            update_stereotype();
+    if (! firsttime)
+        // else set by BrowserNode::post_load()
+        update_stereotype();
 }
 
 //
@@ -427,13 +477,12 @@ void BrowserNode::set_name(QString  s)
 void BrowserNode::update_stereotype(bool rec)
 {
     BasicData * data = get_data();
-
     if (data != 0) {
         const char * stereotype = data->get_stereotype();
 
         if (show_stereotypes && stereotype[0]) {
             QString s = toUnicode(stereotype);
-            int index = s.find(':');
+            int index = s.indexOf(':');
 
             QString str = ((index == -1) ? s : s.mid(index + 1));
             setText(0, "<<" + str + ">> " + name);
@@ -443,7 +492,7 @@ void BrowserNode::update_stereotype(bool rec)
     }
 
     if (rec) {
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             ((BrowserNode *) child)->update_stereotype(TRUE);
@@ -475,66 +524,62 @@ void BrowserNode::iconChanged()
 QString BrowserNode::stereotypes_properties() const
 {
     const char * stereotype = get_data()->get_stereotype();
-
     if (show_stereotypes &&
-        stereotype[0] &&
-        ProfiledStereotypes::isModeled(stereotype)) {
+            stereotype[0] &&
+            ProfiledStereotypes::isModeled(stereotype)) {
         int nk = (int) get_n_keys();
         QString nl("\n");
         QString result;
 
         for (int ik = 0; ik != nk; ik += 1) {
-            const char * k =  get_key(ik);
-            const char * p;
-            unsigned nseps = 0;
-
-            for (p = k; *p; p += 1) {
-                if (*p == ':') {
-                    nseps += 1;
-                    k = p + 1;
-                }
-            }
 
-            if (nseps == 2) {
-                p = get_value(ik);
+            QString v;
+            QString k =  get_key(ik);
+            QStringList p = k.split(':');
+
+            if(p.count() == 3){
+                v = get_value(ik);
 
-                if (p && *p)
-                    result += nl + k + QString("=") + p;
+                if (!v.isEmpty())
+                    result += nl + p.at(2) + QString("=") + v;
             }
         }
 
         if (! result.isEmpty())
             return QString("<<") + get_data()->get_short_stereotype() +
-                   QString(">>") + result;
+                    QString(">>") + result;
     }
-
     return QString();
 }
 
-void BrowserNode::paintCell(QPainter * p, const QColorGroup & cg, int column,
-                            int width, int alignment)
+QVariant BrowserNode::data(int column, int role) const
 {
-    const QColor & bg = p->backgroundColor();
-
-    if (is_marked) {
-        p->setBackgroundMode(::Qt::OpaqueMode);
-        p->setBackgroundColor(UmlRedColor);
+    if(role == Qt::DecorationRole)
+    {
+        const QPixmap *pix = pixmap(column);
+        if(pix)
+            return QIcon(*pix);
     }
-
-    p->setFont((is_writable()) ? BoldFont : NormalFont);
-    Q3ListViewItem::paintCell(p, cg, column, width, alignment);
-
-    if (is_marked) {
-        p->setBackgroundMode(::Qt::TransparentMode);
-        p->setBackgroundColor(bg);
+    else if(role == Qt::BackgroundColorRole)
+    {
+        if(is_marked)
+            return UmlRedColor;
+        else
+            return QColor(Qt::transparent);
     }
-
+    else if(role == Qt::FontRole)
+    {
+        if(is_writable())
+            return BoldFont;
+        else
+            return NormalFont;
+    }
+    return QTreeWidgetItem::data(column, role);
 }
-
 void BrowserNode::pre_load()
 {
     UndefinedNodePackage =
-        new BrowserPackage("<temporary package>", BrowserView::get_project(), -1);
+            new BrowserPackage("<temporary package>", BrowserView::get_project(), -1);
 }
 
 void BrowserNode::post_load(bool light)
@@ -543,14 +588,13 @@ void BrowserNode::post_load(bool light)
 
     signal_unconsistencies();
 
-    bool redo;
+    bool redo = TRUE;
 
     do {
         BrowserClass::post_load();
         BrowserClassInstance::post_load();
         BrowserActivityPartition::post_load(); // must be call after other ones
-
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         redo = FALSE;
 
@@ -582,25 +626,38 @@ void BrowserNode::post_load(bool light)
 void BrowserNode::must_be_deleted()
 {
     if (parent() != UndefinedNodePackage) {
-        parent()->takeItem(this);
-        UndefinedNodePackage->insertItem(this);
+
+        parent()->takeChild(parent()->indexOfChild(this));
+        UndefinedNodePackage->addChild(this);
         UmlWindow::historic_forget(this);
     }
 }
 
-void BrowserNode::set_parent(Q3ListViewItem * p)
+void BrowserNode::set_parent(BrowserNode * p)
 {
-    parent()->takeItem(this);
-    p->insertItem(this);
+
+    parent()->removeChild(this);
+    //p->insertChild(0,this);
+    //p->insertItem(this);
 
     // move it at end
-    Q3ListViewItem * child = p->firstChild();
+    BrowserNode * child = p->firstChild();
 
-    while (child->nextSibling())
-        child = child->nextSibling();
+    if(child)
+    {
+        while (child->nextSibling())
+            child = child->nextSibling();
 
-    if (child != this)
-        moveItem(child);
+        if (child != this)
+        {
+            //moveItem(child);
+            child->parent()->insertChild(child->parent()->indexOfChild(child), this);
+        }
+    }
+    else
+    {
+        p->addChild(this);
+    }
 }
 
 void BrowserNode::on_close()
@@ -608,6 +665,11 @@ void BrowserNode::on_close()
     // does nothing
 }
 
+uint BrowserNode::TypeID()
+{
+    return TypeIdentifier<BrowserNode>::id();
+}
+
 BrowserNode * BrowserNode::get_container(UmlCode k) const
 {
     BrowserNode * p  = (BrowserNode *) this;
@@ -699,6 +761,16 @@ UmlVisibility BrowserNode::get_visibility(UmlCode who) const
     return ((BrowserNode *) parent())->get_visibility(who);
 }
 
+QString BrowserNode::visibility_as_string() const
+{
+    return stringify(get_visibility());
+}
+
+UmlVisibility BrowserNode::encode_visibility(const QString & val)
+{
+    return visibility(val);
+}
+
 void BrowserNode::package_settings(BooL &, ShowContextMode &) const
 {
     // never called
@@ -734,7 +806,7 @@ void BrowserNode::DragMoveInsideEvent(QDragMoveEvent * e)
 void BrowserNode::DropAfterEvent(QDropEvent * e, BrowserNode *)
 {
     e->ignore();
-    msg_critical(TR("Error"), TR("Forbidden"));
+    msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
 }
 
 BrowserNode *BrowserNode::get_first_generatable_node()
@@ -743,7 +815,7 @@ BrowserNode *BrowserNode::get_first_generatable_node()
     BrowserNode * testSubject = this;
     while(!generatable_types.contains(testSubject->get_type()))
     {
-        testSubject = (BrowserNode *)this->parent();
+        testSubject = (BrowserNode *)testSubject->parent();
         if(testSubject == 0)
         {
             break;
@@ -756,14 +828,11 @@ BrowserNode *BrowserNode::get_first_generatable_node()
 QList<BrowserNode *> BrowserNode::get_generation_list()
 {
     QList<BrowserNode *> result;
-    if(marked_list.count() > 0)
+    if (marked_list.count() > 0)
     {
-        Q3PtrListIterator<BrowserNode> it(marked_list);
-
-        for (; it.current() != 0; ++it)
-        {
-            BrowserNode * temp = it.current()->get_first_generatable_node();
-            if(temp != 0 && !result.contains(temp))
+        foreach (BrowserNode *current, marked_list) {
+            BrowserNode * temp = current->get_first_generatable_node();
+            if (temp != 0 && !result.contains(temp))
                 result << temp;
         }
     }
@@ -772,16 +841,29 @@ QList<BrowserNode *> BrowserNode::get_generation_list()
     return result;
 }
 
+BrowserNode *BrowserNode::nextSibling()
+{
+    if(parent()){
+      return (BrowserNode *) parent()->child(parent()->indexOfChild(this)+1);
+    }
+    else {
+      QTreeWidget *tWidget = treeWidget();
+      return (BrowserNode *) tWidget->topLevelItem(tWidget->indexOfTopLevelItem(this)+1);
+    }
+}
+
 //
 
-void BrowserNode::open(bool)
+void BrowserNode::open(bool state)
 {
     // does nothing
+    setExpanded(state);
 }
 
 BasicData * BrowserNode::add_relation(UmlCode t, BrowserNode * end)
 {
     SimpleRelationData * d = new SimpleRelationData(t);
+
     BrowserSimpleRelation * br = new BrowserSimpleRelation(this, d);
 
     d->set_start_end(br, end);
@@ -791,24 +873,25 @@ BasicData * BrowserNode::add_relation(UmlCode t, BrowserNode * end)
     return d;
 }
 
-void BrowserNode::edit(const char * s, const QStringList & default_stereotypes)
+void BrowserNode::edit(const QString & s, const QStringList & default_stereotypes)
 {
+
     if (!is_edited) {
         static QSize previous_size[BrowserNodeSup];
 
         (new BasicDialog(get_data(), s, default_stereotypes,
-                         previous_size[get_type()]))
-        ->show();
+                         previous_size[get_type()]))->show();
     }
+
 }
 
 //
 
 // returns all parents for NON class
-Q3PtrList<BrowserNode> BrowserNode::parents() const
+QList<BrowserNode *> BrowserNode::parents() const
 {
-    Q3PtrList<BrowserNode> l;
-    Q3ListViewItem * child;
+    QList<BrowserNode *> l;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling()) {
         BrowserNode * ch = ((BrowserNode *) child);
@@ -823,37 +906,32 @@ Q3PtrList<BrowserNode> BrowserNode::parents() const
             break;
         }
     }
-
     return l;
 }
 
 // check inheritance
 QString BrowserNode::check_inherit(const BrowserNode * new_parent) const
 {
-    Q3PtrList<BrowserNode> all_parents;
-    Q3PtrList<BrowserNode> notyet = parents();
+    QList<BrowserNode *> all_parents;
+    QList<BrowserNode *> notyet = parents();
 
-    if (notyet.findRef(new_parent) != -1)
-        return TR("already generalize / realize");
+    if (notyet.contains(const_cast<BrowserNode *>(new_parent)))
+        return QObject::tr("already generalize / realize");
 
-    notyet.append(new_parent);
+    notyet.append(const_cast<BrowserNode *>(new_parent));
 
     do {
-        BrowserNode * cl = notyet.getFirst();
-
-        notyet.removeFirst();
+        BrowserNode *cl = notyet.takeFirst();
 
         if (cl == this)
-            return TR("can't have circular generalization / realization");
+            return QObject::tr("can't have circular generalization / realization");
 
-        if (all_parents.findRef(cl) == -1) {
+        if (! all_parents.contains(cl)) {
             all_parents.append(cl);
 
-            Q3PtrList<BrowserNode> grand_parents = cl->parents();
-
-            for (cl = grand_parents.first(); cl; cl = grand_parents.next())
-                if (notyet.findRef(cl) == -1)
-                    notyet.append(cl);
+            foreach (BrowserNode *parent, cl->parents())
+                if (! notyet.contains(parent))
+                    notyet.append(parent);
         }
     }
     while (! notyet.isEmpty());
@@ -861,7 +939,7 @@ QString BrowserNode::check_inherit(const BrowserNode * new_parent) const
     return 0;
 }
 
-bool BrowserNode::may_contains_them(const Q3PtrList<BrowserNode> & ,
+bool BrowserNode::may_contains_them(const QList<BrowserNode *> & ,
                                     BooL & ) const
 {
     //for inheritance
@@ -872,11 +950,11 @@ bool BrowserNode::may_contains_it(BrowserNode * bn) const
 {
     // for the type point of view bn is legal for 'this'
     UmlCode type = bn->get_type();
-    QString s = (const char *) bn->name;
+    QString s = bn->name;
 
-    for (Q3ListViewItem * child = firstChild(); child; child = child->nextSibling()) {
+    for (BrowserNode * child = firstChild(); child; child = child->nextSibling()) {
         if (!((BrowserNode *) child)->deletedp() &&
-            ((BrowserNode *) child)->same_name(s, type))
+                ((BrowserNode *) child)->same_name(s, type))
             return FALSE;
     }
 
@@ -889,24 +967,22 @@ bool BrowserNode::may_contains_it(BrowserNode * bn) const
 // recurssively :
 #define SIMPLE_DUPLICATION
 
-void BrowserNode::mark_menu(Q3PopupMenu & m, const char * s, int bias) const
+void BrowserNode::mark_menu(QMenu & m, QString s, int bias) const
 {
+
     if (! is_marked) {
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Mark"), bias),
-                       TR("to mark %1", s));
+        m.addSeparator();
+        MenuFactory::addItem(m,("Mark"), bias,
+                             QString("to mark %1").arg(s));
 
-        if (!marked_list.isEmpty())
-        {
+        if (!marked_list.isEmpty()) {
             bool parents_marked = FALSE;
             const BrowserNode * bn = this;
 
-            while (bn != BrowserView::get_project())
-            {
+            while (bn != BrowserView::get_project()) {
                 bn = (BrowserNode *) bn->parent();
 
-                if (bn->is_marked)
-                {
+                if (bn->is_marked) {
                     parents_marked = TRUE;
                     break;
                 }
@@ -916,20 +992,17 @@ void BrowserNode::mark_menu(Q3PopupMenu & m, const char * s, int bias) const
 #ifndef SIMPLE_DUPLICATION
             bool rec = FALSE;
 #endif
-            Q3PtrListIterator<BrowserNode> it(marked_list);
             bool moveInsideSameClass = true;
-            for (; (bn = it.current()) != 0; ++it)
-            {
-                if(bn->parent() != this->parent())
+            foreach (BrowserNode *node, marked_list) {
+                if(node->parent() != this->parent())
                     moveInsideSameClass = false;
-                if ((bn == BrowserView::get_project()) ||
-                    !((BrowserNode *) bn->parent())->is_writable())
-                {
+                if ((node == BrowserView::get_project()) ||
+                        !((BrowserNode *) node->parent())->is_writable()) {
                     moveable = FALSE;
 #ifndef SIMPLE_DUPLICATION
                 }
 
-                if (bn->firstChild() != 0) {
+                if (node->firstChild() != 0) {
                     rec = TRUE;
 #else
                     break;
@@ -942,60 +1015,65 @@ void BrowserNode::mark_menu(Q3PopupMenu & m, const char * s, int bias) const
             bool canContain = may_contains_them(marked_list, duplicable_into);
             bool into = canContain && is_writable();
             bool thisIsntProject = this != BrowserView::get_project();
-            bool isWritable = ((BrowserNode *) parent())->is_writable();
-            bool parentCanContain = ((BrowserNode *) parent())->may_contains_them(marked_list, duplicable_after);
+            bool isWritable = true;
+            bool parentCanContain = false;
+            if(((BrowserNode *) parent()) != 0) {
+                isWritable = ((BrowserNode *) parent())->is_writable();
+                parentCanContain = ((BrowserNode *) parent())->may_contains_them(marked_list, duplicable_after);
+            }
             bool after = thisIsntProject && isWritable &&  ( parentCanContain || moveInsideSameClass);
 
-            if (!parents_marked)
-            {
+            if (!parents_marked) {
                 if (moveable) {
                     if (into)
-                        m.setWhatsThis(m.insertItem(TR("Move marked into"), bias + 3),
-                                       TR("to move the marked items into %1", s));
+                        MenuFactory::addItem(m,("Move marked into"), bias + 3,
+                                             QString("to move the marked items into %1").arg(s));
 
                     if (after)
-                        m.setWhatsThis(m.insertItem(TR("Move marked after"), bias + 4),
-                                       TR("to move the marked items after %1", s));
+                        MenuFactory::addItem(m,("Move marked after"), bias + 4,
+                                             QString("to move the marked items after %1").arg( s));
+                    m.addSeparator();
                 }
             }
 
             if (into && duplicable_into) {
-                m.setWhatsThis(m.insertItem(TR("Duplicate marked into"), bias + 5),
-                               TR("to duplicate the marked items into %1", s));
+                MenuFactory::addItem(m,("Duplicate marked into"), bias + 5,
+                                     QString("to duplicate the marked items into %1").arg( s));
 #ifndef SIMPLE_DUPLICATION
 
                 if (rec && !parents_marked)
-                    m.setWhatsThis(m.insertItem(TR("Duplicate recursivelly marked into"), bias + 6),
-                                   TR("to recurcivelly duplicate the marked items into %1", s));
+                    MenuFactory::addItem(m,("Duplicate recursivelly marked into"), bias + 6,
+                            QObject::tr("to recurcivelly duplicate the marked items into %1", s));
 
 #endif
             }
 
             if (after && duplicable_after) {
-                m.setWhatsThis(m.insertItem(TR("Duplicate marked after"), bias + 7),
-                               TR("to duplicate the marked items after %1", s));
+                MenuFactory::addItem(m,("Duplicate marked after"), bias + 7,
+                                     QString("to duplicate the marked items after %1").arg( s));
 #ifndef SIMPLE_DUPLICATION
 
                 if (rec && !parents_marked)
-                    m.setWhatsThis(m.insertItem(TR("Duplicate marked recursivelly after"), bias + 8),
-                                   TR("to recurcivelly duplicate the marked items after %1", s));
+                    MenuFactory::addItem(m,("Duplicate marked recursivelly after"), bias + 8,
+                            QObject::tr("to recurcivelly duplicate the marked items after %1", s));
 
 #endif
             }
         }
     }
     else {
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Unmark"), bias + 1),
-                       TR("to unmark %1", s));
+        m.addSeparator();
+        MenuFactory::addItem(m,("Unmark"), bias + 1,
+                             QObject::tr("to unmark %1").arg(s));
 
         if (!marked_list.isEmpty())
-            m.setWhatsThis(m.insertItem(TR("Unmark all"), bias + 2),
-                           QString(TR("to unmark all the marked items")));
+            MenuFactory::addItem(m,("Unmark all"), bias + 2,
+                                 QObject::tr("to unmark all the marked items"));
     }
+
 }
 
-void BrowserNode::mark_shortcut(QString s, int & index, int bias)
+void BrowserNode::mark_shortcut(const QString & s, int & index, int bias)
 {
     if (! is_marked) {
         if (s == "Mark")
@@ -1027,10 +1105,8 @@ void BrowserNode::mark_management(int choice)
         return;
 
     case 3:	// move into
-        for (bn = marked_list.last();
-             bn != 0;
-             bn = marked_list.prev())
-        {
+        for (int i = marked_list.size() - 1; i >= 0; --i) {
+            bn = marked_list[i];
             if (bn->get_type() == UmlAttribute )
             {
                 BrowserAttribute* asAttribute =  dynamic_cast<BrowserAttribute*>(bn);
@@ -1056,35 +1132,26 @@ void BrowserNode::mark_management(int choice)
     case 4: {	// move after
         BrowserNode * p = (BrowserNode *) parent();
 
-        for (bn = marked_list.last();
-             bn != 0;
-             bn = marked_list.prev())
-        {
-            //BrowserView::removeItem(p->get_)
-//            BrowserAttribute* asAttribute = ((BrowserAttribute *) bn);
-//            if(p != (BrowserNode *) bn->parent() && asAttribute != 0)
-//            {
-//                p->move(((BrowserNode *) asAttribute->get_get_oper()), this);
-//                p->move(((BrowserNode *) asAttribute->get_set_oper()), this);
-//            }
+        for (int i = marked_list.size() - 1; i >= 0; --i) {
+            bn = marked_list[i];
 
             if(p != (BrowserNode *) bn->parent())
             {
                 if (bn->get_type() == UmlAttribute )
                 {
                     BrowserAttribute* asAttribute =  dynamic_cast<BrowserAttribute*>(bn);
-                    if(((BrowserNode *) asAttribute->get_get_oper()))
-                        p->move(((BrowserNode *) asAttribute->get_get_oper()), this);
-                    if(((BrowserNode *) asAttribute->get_set_oper()))
-                        p->move(((BrowserNode *) asAttribute->get_set_oper()), this);
+                    if ((BrowserNode *) asAttribute->get_get_oper())
+                        p->move((BrowserNode *) asAttribute->get_get_oper(), this);
+                    if ((BrowserNode *) asAttribute->get_set_oper())
+                        p->move((BrowserNode *) asAttribute->get_set_oper(), this);
                 }
                 else if (bn->get_type() >= UmlAggregation &&  bn->get_type() <= UmlDirectionalAggregationByValue)
                 {
                     BrowserRelation* asRelation =  dynamic_cast<BrowserRelation*>(bn);
-                    if(((BrowserNode *) asRelation->get_get_oper()))
-                        p->move(((BrowserNode *) asRelation->get_get_oper()), this);
-                    if(((BrowserNode *) asRelation->get_set_oper()))
-                        p->move(((BrowserNode *) asRelation->get_set_oper()), this);
+                    if ((BrowserNode *) asRelation->get_get_oper())
+                        p->move((BrowserNode *) asRelation->get_get_oper(), this);
+                    if ((BrowserNode *) asRelation->get_set_oper())
+                        p->move((BrowserNode *) asRelation->get_set_oper(), this);
                 }
             }
 
@@ -1092,30 +1159,46 @@ void BrowserNode::mark_management(int choice)
 
         }
     }
-    break;
+        break;
 
     case 5:	// duplicate into
-        for (bn = marked_list.last();
-             bn != 0;
-             bn = marked_list.prev())
+        for (int i = marked_list.size() - 1; i >= 0; --i)
         {
+            bn = marked_list[i];
             BrowserNode* getOperCopy = nullptr;
             BrowserNode* setOperCopy = nullptr;
             if((BrowserNode *) bn->parent()  != this)
             {
                 BrowserNode* nodeCopy = bn->duplicate(this);
-                move(nodeCopy, 0);
+                nodeCopy->set_n_keys(bn->get_n_keys());
+                for(unsigned i = 0; i != bn->get_n_keys(); i++)
+                {
+                    nodeCopy->set_key(i, bn->get_key(i));
+                    nodeCopy->set_value(i, bn->get_value(i));
+                }
+
+                //move(nodeCopy, this);
+                nodeCopy->select_in_browser();
 
                 if (nodeCopy->get_type() == UmlAttribute)
                 {
                     BrowserAttribute* asAttribute =  dynamic_cast<BrowserAttribute*>(bn);
-                    getOperCopy = ((BrowserNode *) asAttribute->get_get_oper())->duplicate(this);
-                    setOperCopy = ((BrowserNode *) asAttribute->get_set_oper())->duplicate(this);
-                    move(getOperCopy, 0);
-                    move(setOperCopy, 0);
-
-                    ((BrowserAttribute *) nodeCopy)->set_get_oper((BrowserOperation *) getOperCopy);
-                    ((BrowserAttribute *) nodeCopy)->set_set_oper((BrowserOperation *) setOperCopy);
+                    BrowserNode* getOper=((BrowserNode *) asAttribute->get_get_oper());
+                    BrowserNode* setOper=((BrowserNode *) asAttribute->get_get_oper());
+                    if(getOper)
+                        getOperCopy = getOper->duplicate(this);
+                    if(setOper)
+                        setOperCopy = setOper->duplicate(this);
+                    if(getOperCopy)
+                    {
+                        move(getOperCopy, 0);
+                        ((BrowserRelation *) nodeCopy)->set_get_oper((BrowserOperation *) getOperCopy);
+                    }
+                    if(setOperCopy)
+                    {
+                        move(setOperCopy, 0);
+                        ((BrowserRelation *) nodeCopy)->set_set_oper((BrowserOperation *) setOperCopy);
+                    }
                 }
                 else if(bn->get_type() >= UmlAggregation &&  bn->get_type() <= UmlDirectionalAggregationByValue)
                 {
@@ -1160,12 +1243,22 @@ void BrowserNode::mark_management(int choice)
     case 7: {	// duplicate after
         BrowserNode * p = (BrowserNode *) parent();
 
-        for (bn = marked_list.last();
-             bn != 0;
-             bn = marked_list.prev())
-            p->move(bn->duplicate(p), this);
+        for (int i = marked_list.size() - 1; i >= 0; --i) {
+            bn = marked_list[i];
+            {
+                BrowserNode* nodeCopy = bn->duplicate(p);
+                nodeCopy->set_n_keys(bn->get_n_keys());
+                for(unsigned i = 0; i != bn->get_n_keys(); i++)
+                {
+                    nodeCopy->set_key(i, bn->get_key(i));
+                    nodeCopy->set_value(i, bn->get_value(i));
+                }
+                p->move(nodeCopy, this);
+            }
+
+        }
     }
-    break;
+        break;
 #ifndef SIMPLE_DUPLICATION
 
     case 8:	// duplicate recursivelly after
@@ -1176,11 +1269,8 @@ void BrowserNode::mark_management(int choice)
 
 void BrowserNode::unmark_all()
 {
-    BrowserNode * bn;
 
-    for (bn = marked_list.first();
-         bn != 0;
-         bn = marked_list.next()) {
+    foreach (BrowserNode * bn, marked_list) {
         bn->is_marked = FALSE;
         bn->repaint();
     }
@@ -1192,12 +1282,19 @@ void BrowserNode::unmark_all()
 
     if (ReferenceDialog::get() != 0)
         ReferenceDialog::get()->update();
+
+    if(marked_list.count() != 0)
+        UmlWindow::set_marked_generation();
+    else
+        UmlWindow::set_selected_generation();
+    if(viewptr)
+        viewptr->send_marked(get_marked_nodes());
+
 }
 
 void BrowserNode::move(BrowserNode * bn, BrowserNode * after)
 {
     BrowserNode * old_parent = (BrowserNode *) bn->parent();
-
     if (after)
         bn->moveItem(after);
     else {
@@ -1215,9 +1312,10 @@ void BrowserNode::move(BrowserNode * bn, BrowserNode * after)
 
 void BrowserNode::toggle_mark()
 {
+
     if (is_marked) {
         is_marked = FALSE;
-        marked_list.removeRef(this);
+        marked_list.removeOne(this);
     }
     else {
         is_marked = TRUE;
@@ -1235,12 +1333,39 @@ void BrowserNode::toggle_mark()
         UmlWindow::set_marked_generation();
     else
         UmlWindow::set_selected_generation();
+    if(viewptr)
+        viewptr->send_marked(get_marked_nodes());
+
+}
+
+void BrowserNode::set_marked(bool value)
+{
+    is_marked = value;
+    if (value)
+        marked_list.append(this);
+    else
+        marked_list.removeOne(this);
+
+    //repaint();
+
+    //    if (BrowserSearchDialog::get() != 0)
+    //        BrowserSearchDialog::get()->update();
+
+    //    if (ReferenceDialog::get() != 0)
+    //        ReferenceDialog::get()->update();
+    if(marked_list.count() != 0)
+        UmlWindow::set_marked_generation();
+    else
+        UmlWindow::set_selected_generation();
+    if(viewptr)
+        viewptr->send_marked(get_marked_nodes());
+
 }
 
 void BrowserNode::setup_generatable_types()
 {
     generatable_types << UmlClass << UmlComponent << UmlDeploymentNode << UmlArtifact
-                         << UmlClassView << UmlComponentView << UmlDeploymentView << UmlPackage << UmlProject;
+                      << UmlClassView << UmlComponentView << UmlDeploymentView << UmlPackage << UmlProject;
 }
 
 //
@@ -1250,20 +1375,18 @@ bool BrowserNode::may_contains(BrowserNode * bn, bool rec) const
     // for the type point of view bn is legal for 'this'
     if (((BrowserNode *) bn->parent()) == this)
         return TRUE;
-
-    QString s = (const char *) bn->name;
+    QString s =  bn->name;
 
     if (! s.isEmpty()) {
         UmlCode type = bn->get_type();
 
-        for (Q3ListViewItem * child = firstChild(); child; child = child->nextSibling()) {
+        for (BrowserNode * child = firstChild(); child; child = child->nextSibling()) {
             if (!((BrowserNode *) child)->deletedp() &&
-                // case already check : (child != bn) &&
-                ((BrowserNode *) child)->same_name(s, type))
+                    // case already check : (child != bn) &&
+                    ((BrowserNode *) child)->same_name(s, type))
                 return FALSE;
         }
     }
-
     if (!rec)
         return TRUE;
 
@@ -1285,7 +1408,7 @@ bool BrowserNode::may_contains(BrowserNode * bn, bool rec) const
 void BrowserNode::children(BrowserNodeList & nodes,
                            UmlCode kind1, UmlCode kind2) const
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child; child = child->nextSibling())
     {
@@ -1300,16 +1423,38 @@ void BrowserNode::children(BrowserNodeList & nodes,
 
 }
 
+QList<BrowserNode*> BrowserNode::children(QList<UmlCode> searchTypes, bool includeDeleted) const
+{
+    QList<BrowserNode*> items;
+    BrowserNode * child;
+
+    for (child = firstChild(); child; child = child->nextSibling())
+    {
+        bool isAlive = !((BrowserNode *) child)->is_deleted;
+        UmlCode type = ((BrowserNode *) child)->get_type();
+        //QLOG_INFO() << stringify(type);
+        bool validType = searchTypes.contains(type);
+        if ( (isAlive || includeDeleted) && validType)
+            items.append((BrowserNode *) child);
+    }
+
+    return items;
+}
+
 bool BrowserNode::enter_child_name(QString & r, const QString & msg, UmlCode type,
                                    bool allow_spaces, bool allow_empty)
 {
     for (;;) {
         BooL ok = FALSE;
-        r = MyInputDialog::getText("Uml", msg, QString(), ok);
+        BrowserItemNameValidator vl(this, type, allow_spaces, allow_empty);
+        r = MyInputDialog::getTextWithOnlineValidator("Uml", msg, r, ok, &vl);
 
         if (ok) {
-            if (wrong_child_name(r, type, allow_spaces, allow_empty))
-                msg_critical(TR("Error"), r + "\n\n" + TR("illegal name or already used"));
+            QString cause;
+            if (wrong_child_name(r, type, allow_spaces, allow_empty, &cause))
+            {
+                msg_critical(QObject::tr("Error"), r + "\n\n" + cause);
+            }
             else
                 return TRUE;
         }
@@ -1325,7 +1470,7 @@ bool BrowserNode::enter_child_name(QString & r, const QString & msg, UmlCode typ
 {
 
     if (existing && nodes.isEmpty()) {
-        msg_warning(TR("Error"), TR("nothing available"));
+        msg_warning(QObject::tr("Error"), QObject::tr("nothing available"));
         return FALSE;
     }
 
@@ -1335,19 +1480,19 @@ bool BrowserNode::enter_child_name(QString & r, const QString & msg, UmlCode typ
     list.prepend(QString());
 
     *old = 0;
-
+    BrowserItemNameValidator vl(this, type, allow_spaces, allow_empty);
     for (;;) {
         BooL ok = FALSE;
 
         r = (list.count() == 1)
-            ? MyInputDialog::getText("Uml", msg, QString(), ok)
-            : MyInputDialog::getText("Uml", msg, list, QString(), existing, ok);
+                ? MyInputDialog::getTextWithOnlineValidator("Uml", msg, QString(), ok, &vl)
+                : MyInputDialog::getText("Uml", msg, list,  QString(), existing, ok, &vl);
 
         if (! ok)
             return FALSE;
 
         if (!r.isEmpty()) {
-            int index = list.findIndex(r);
+            int index = list.indexOf(r);
 
             if (index != -1) {
                 *old = nodes.at(index - 1);
@@ -1356,25 +1501,37 @@ bool BrowserNode::enter_child_name(QString & r, const QString & msg, UmlCode typ
         }
 
         if (wrong_child_name(r, type, allow_spaces, allow_empty))
-            msg_critical(TR("Error"), r + "\n\n" + TR("illegal name or already used"));
+            msg_critical(QObject::tr("Error"), r + "\n\n" + QObject::tr("illegal name or already used"));
         else
             return TRUE;
     }
 }
 
-bool BrowserNode::wrong_child_name(const QString & s, UmlCode type,
-                                   bool allow_spaces, bool allow_empty) const
+bool BrowserNode::wrong_child_name( const QString & s, UmlCode type,
+                                    bool allow_spaces, bool allow_empty, QString *cause) const
 {
     if (s.isEmpty())
+    {
+        if(cause && !allow_empty)
+        {
+            *cause = QObject::tr("Empty name");
+        }
         return !allow_empty;
+    }
 
-    const char * str = s;
+    QByteArray sArray = s.toLatin1();
+    const char * str = sArray.constData();
 
-    bool nonUnicodeName = str != fromUnicode(s);
+    bool nonUnicodeName = fromUnicode(s) != str  ;
     bool controllable = type >= UmlAssociation && type <= UmlClass;
     if (nonUnicodeName && controllable)
+    {
+        if(cause)
+        {
+            *cause = QObject::tr("Nonunicode name");
+        }
         return true;
-
+    }
     if (allow_empty)
         // synonymous allowed
         return FALSE;
@@ -1385,33 +1542,49 @@ bool BrowserNode::wrong_child_name(const QString & s, UmlCode type,
         case ' ' :
         case '\t':
         case '\r':
+            if(cause)
+            {
+                *cause = QObject::tr("Name starting with witespace");
+            }
             return TRUE;
 
         default:
             // synonymous allowed
             return FALSE;
         }
-
     default:
         if (type <= UmlClass) {
-            while (*str) {
-                char c = *str++;
+
+            for (QString::const_iterator it = s.begin(); it != s.end(); ++it) {
+                char c = (*it).toLatin1();
 
                 if (((c >= 'a') && (c <= 'z')) ||
-                    ((c >= 'A') && (c <= 'Z')) ||
-                    ((c >= '0') && (c <= '9')) ||
-                    (c == '_'))
+                        ((c >= 'A') && (c <= 'Z')) ||
+                        ((c >= '0') && (c <= '9')) ||
+                        (c == '_'))
                     ;
                 else if ((strchr("()&^[]%|!+-*/=>", c) != 0) ||
                          (((c == ' ') || (c == '\t') || (c == '\r')) &&
                           !allow_spaces))
+                {
+                    if(cause)
+                    {
+                        *cause = QObject::tr("Name containing illegal character: ") + c;
+                    }
                     return TRUE;
+                }
                 else if (c == '<') {
                     if (type == UmlClass)
                         // suppose it is a valid template
                         break;
                     else
+                    {
+                        if(cause)
+                        {
+                            *cause = QObject::tr("Name containing illegal character: ") + c;
+                        }
                         return TRUE;
+                    }
                 }
             }
         }
@@ -1419,10 +1592,19 @@ bool BrowserNode::wrong_child_name(const QString & s, UmlCode type,
 
     // check unicity
 
-    for (Q3ListViewItem * child = firstChild(); child; child = child->nextSibling())
+    for (BrowserNode * child = firstChild(); child; child = child->nextSibling())
+    {
         if (!((BrowserNode *) child)->deletedp() &&
-            ((BrowserNode *) child)->same_name(s, type))
+                ((BrowserNode *) child)->same_name(s, type))
+        {
+            if(cause)
+            {
+                *cause = QObject::tr("Name already used");
+            }
             return TRUE;
+        }
+    }
+
 
     return FALSE;
 }
@@ -1444,7 +1626,9 @@ bool BrowserNode::same_name(const QString & s, UmlCode type) const
 
 void BrowserNode::select_in_browser()
 {
+
     BrowserView::select(this);
+
 }
 
 // unicode
@@ -1463,7 +1647,9 @@ BrowserNode * BrowserNode::get_associated() const
 
 void BrowserNode::package_modified()
 {
-    ((BrowserNode *) parent())->package_modified();
+    //check if parent exists. added for crash during roundtrip
+    if(parent())
+        ((BrowserNode *) parent())->package_modified();
 }
 
 bool BrowserNode::api_compatible(unsigned) const
@@ -1498,21 +1684,22 @@ bool BrowserNode::tool_cmd(ToolCom * com, const char * args)
     case childrenCmd: {
         unsigned v = com->api_format(true);
         unsigned n = 0;
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             if (!((BrowserNode *) child)->deletedp() &&
-                ((BrowserNode *) child)->api_compatible(v))
+                    ((BrowserNode *) child)->api_compatible(v))
                 n += 1;
 
         com->write_unsigned(n);
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             if (!((BrowserNode *) child)->deletedp() &&
-                ((BrowserNode *) child)->api_compatible(v))
+                    ((BrowserNode *) child)->api_compatible(v))
                 ((BrowserNode *) child)->write_id(com);
+
     }
-    break;
+        break;
 
     case getDefCmd:
     case getUmlDefCmd:
@@ -1533,7 +1720,9 @@ bool BrowserNode::tool_cmd(ToolCom * com, const char * args)
         return ((BrowserNode *) parent())->tool_cmd(com, args);
 
     case isOpenCmd:
-        com->write_bool(isOpen());
+
+        com->write_bool(isExpanded());
+
         break;
 
     case referencedByCmd: {
@@ -1543,20 +1732,20 @@ bool BrowserNode::tool_cmd(ToolCom * com, const char * args)
         // remove duplicats
         targetof.sort_it();
 
-        BrowserNode * bn;
-
-        targetof.first();
-
-        while ((bn = targetof.current()) != 0)
-            if (bn == targetof.next())
-                targetof.remove();
-
-        com->write_unsigned(targetof.count());
+        BrowserNode *prevNode = 0;
+        foreach (BrowserNode *bn, targetof) {
+            if (bn == prevNode) {
+                targetof.clear();
+                break;
+            }
+            prevNode = bn;
+        }
 
-        for (bn = targetof.first(); bn != 0; bn = targetof.next())
+        com->write_unsigned(targetof.size());
+        foreach (BrowserNode *bn, targetof)
             bn->write_id(com);
     }
-    break;
+        break;
 
     case setCoupleValueCmd:
         if (is_read_only && !root_permission())
@@ -1587,8 +1776,8 @@ bool BrowserNode::tool_cmd(ToolCom * com, const char * args)
         else {
             if (name != args) {
                 if (((BrowserNode *) parent())->wrong_child_name(args, get_type(),
-                        allow_spaces(),
-                        allow_empty())) {
+                                                                 allow_spaces(),
+                                                                 allow_empty())) {
                     com->write_ack(FALSE);
                     return TRUE;
                 }
@@ -1703,6 +1892,7 @@ bool BrowserNode::tool_cmd(ToolCom * com, const char * args)
         else {
             ProfiledStereotypes::applyStereotype(this); // call package_modified() if needed
             com->write_ack(TRUE);
+
         }
 
         break;
@@ -1727,26 +1917,28 @@ void BrowserNode::write_id(ToolCom * com)
 
 void BrowserNode::init_save_counter()
 {
+
     if (! deletedp()) {
         must_be_saved_counter += 1;
-
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         while (child != 0) {
             ((BrowserNode *) child)->init_save_counter();
             child = child->nextSibling();
         }
     }
+
 }
 
 bool BrowserNode::save_open_list(QTextStream & st)
 {
-    if (!isOpen())
+
+    if (!isExpanded())
         return FALSE;
 
     bool have_open_child = FALSE;
 
-    for (Q3ListViewItem * child = firstChild(); child != 0; child = child->nextSibling()) {
+    for (BrowserNode * child = firstChild(); child != 0; child = child->nextSibling()) {
         BrowserNode * ch = ((BrowserNode *) child);
 
         if (!ch->deletedp())
@@ -1772,7 +1964,7 @@ void BrowserNode::save_progress_closed()
 void BrowserNode::save(QTextStream & st) const
 {
     if (save_progress != 0)
-        save_progress->setProgress(already_saved++);
+        save_progress->setValue(already_saved++);
 
     if (original_id != 0) {
         nl_indent(st);
@@ -1805,33 +1997,28 @@ void BrowserNode::read(char *& st, char *& k, int id)
         is_read_only = TRUE;
         k = read_keyword(st);
     }
-
     HaveKeyValueData::read(st, k);
-
     if (!strcmp(k, "comment")) {
-        comment = QString(QTextCodec::codecForName(codec())->fromUnicode(read_string(st)));
+        comment = read_string(st);
         k = read_keyword(st);
     }
-
     is_new = FALSE;
 }
 
 BrowserNode * BrowserNode::read_any_ref(char *& st, char * k)
 {
     BrowserNode * r;
-
     if (((r = BrowserActivity::read_any_ref(st, k)) == 0) &&
-        ((r = BrowserState::read_any_ref(st, k)) == 0) &&
-        ((r = BrowserClass::read_any_ref(st, k)) == 0) &&
-        ((r = BrowserDiagram::read_any_ref(st, k)) == 0) &&
-        ((r = BrowserPackage::read(st, k, 0, FALSE)) == 0) &&
-        ((r = BrowserUseCase::read(st, k, 0)) == 0) &&
-        ((r = BrowserClassInstance::read(st, k, 0)) == 0) &&
-        ((r = BrowserComponent::read(st, k, 0)) == 0) &&
-        ((r = BrowserArtifact::read(st, k, 0)) == 0) &&
-        ((r = BrowserDeploymentNode::read(st, k, 0)) == 0))
+            ((r = BrowserState::read_any_ref(st, k)) == 0) &&
+            ((r = BrowserClass::read_any_ref(st, k)) == 0) &&
+            ((r = BrowserDiagram::read_any_ref(st, k)) == 0) &&
+            ((r = BrowserPackage::read(st, k, 0, FALSE)) == 0) &&
+            ((r = BrowserUseCase::read(st, k, 0)) == 0) &&
+            ((r = BrowserClassInstance::read(st, k, 0)) == 0) &&
+            ((r = BrowserComponent::read(st, k, 0)) == 0) &&
+            ((r = BrowserArtifact::read(st, k, 0)) == 0) &&
+            ((r = BrowserDeploymentNode::read(st, k, 0)) == 0))
         r = BrowserSimpleRelation::read(st, k, 0);
-
     return r;
 }
 
@@ -1875,56 +2062,59 @@ void BrowserNode::read_stereotypes(char *& st,
 
 void BrowserNode::renumber(int phase)
 {
-    for (Q3ListViewItem * child = firstChild();
+
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->renumber(phase);
+
 }
 
-void BrowserNode::support_file(Q3Dict<char> & files, bool add) const
+void BrowserNode::support_file(QHash<QString, char*> & files, bool add) const
 {
-    for (Q3ListViewItem * child = firstChild();
+
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->support_file(files, add);
+
 }
 
 // manage unconsistencies
 
 static QString UnconsistencyDeletedMsg;
 static QString UnconsistencyFixedMsg;
-static Q3PtrList<BrowserNode> ModifiedPackages;
+static QList<BrowserNode *> ModifiedPackages;
 
 void BrowserNode::signal_unconsistencies()
 {
     QString pfix =
-        TR("<p><b>Warning, the model is not consistent because some elements have\n"
-           "the same internal identifier.</b></p>\n"
-           "<p>Users working on the same project have the same use identifier,\n"
-           "or you had change the model files, or used Project synchro\n"
-           "without following the mandatory rules</p>\n");
+            QObject::tr("<p><b>Warning, the model is not consistent because some elements have\n"
+                        "the same internal identifier.</b></p>\n"
+                        "<p>Users working on the same project have the same use identifier,\n"
+                        "or you had change the model files, or used Project synchro\n"
+                        "without following the mandatory rules</p>\n");
     QString msg;
 
     if (!UnconsistencyDeletedMsg.isEmpty())
-        msg = pfix + "<p>" + TR("These elements was <b>removed</b>") + " :</p>\n <ul>"
-              + UnconsistencyDeletedMsg + "</ul>\n";
+        msg = pfix + "<p>" + QObject::tr("These elements was <b>removed</b>") + " :</p>\n <ul>"
+                + UnconsistencyDeletedMsg + "</ul>\n";
 
     if (!UnconsistencyFixedMsg.isEmpty()) {
         if (UnconsistencyDeletedMsg.isEmpty())
             msg = pfix;
 
         msg += "<p>"
-               + TR("The internal identifier of these elements was changed,\n"
-                    "but <u>I can't garantee the references to them are the right one</u>,\n"
-                    "check your model")
-               + " :</p>\n<ul>" + UnconsistencyFixedMsg + "</ul>\n";
+                + QObject::tr("The internal identifier of these elements was changed,\n"
+                              "but <u>I can't garantee the references to them are the right one</u>,\n"
+                              "check your model")
+                + " :</p>\n<ul>" + UnconsistencyFixedMsg + "</ul>\n";
 
         do_change_shared_ids();
 
-        do
-            ModifiedPackages.take(0)->is_modified = TRUE;
-
-        while (! ModifiedPackages.isEmpty());
+        foreach (BrowserNode *node, ModifiedPackages)
+            node->is_modified = TRUE;
+        ModifiedPackages.clear();
     }
 
     if (! msg.isEmpty()) {
@@ -1935,51 +2125,198 @@ void BrowserNode::signal_unconsistencies()
 
 void BrowserNode::unconsistent_fixed(const char * what, BrowserNode * newone)
 {
+
     UnconsistencyFixedMsg += QString("<li>") + what + QString(" <i>") +
-                             quote(full_name()) + QString("</i> and <i>") +
-                             quote(newone->full_name()) + QString("</i></li>\n");
+            quote(full_name()) + QString("</i> and <i>") +
+            quote(newone->full_name()) + QString("</i></li>\n");
 
     BrowserNode * bn = this;
 
     while (bn->get_type() != UmlPackage)
         bn = (BrowserNode *) bn->parent();
 
-    if (ModifiedPackages.findRef(bn) == -1)
+    if (!ModifiedPackages.contains(bn))
         ModifiedPackages.append(bn);
 }
 
 void BrowserNode::unconsistent_removed(const char * what, BrowserNode * newone)
 {
+
     UnconsistencyDeletedMsg += QString("<li>") + what + QString(" <i>") +
-                               quote(full_name()) + QString("</i> and <i>") +
-                               quote(newone->full_name()) + QString("</i></li>\n");
+            quote(full_name()) + QString("</i> and <i>") +
+            quote(newone->full_name()) + QString("</i></li>\n");
+
 
     // deletion managed elsewhere
 }
 
+BrowserNode *BrowserNode::itemAbove()
+{
+    BrowserNode* parent = (BrowserNode*)this->parent();
+    for(int i = 0; i < parent->childCount(); i++)
+    {
+        if(parent->child(i) == this)
+        {
+            if(i>0)
+            {
+                return (BrowserNode *)parent->child(i-1);
+            }
+            break;
+        }
+    }
+    return parent;
+}
+
+BrowserNode *BrowserNode::itemBelow()
+{
+    if(childCount())
+    {
+        return (BrowserNode *)child(0);
+    }
+    else if(nextSibling())
+    {
+        return (BrowserNode *)nextSibling();
+    }
+    else
+    {
+        BrowserNode* parent = (BrowserNode*)this->parent();
+        while(1)
+        {
+            if(parent)
+            {
+                if(parent->nextSibling())
+                    return (BrowserNode* )parent->nextSibling();
+                parent = (BrowserNode*)parent->parent();
+            }
+            else
+            {
+                return NULL;
+            }
+        }
+    }
+}
+
+int BrowserNode::depth()
+{
+    QTreeWidgetItem *parent = this->parent();
+    int i = 0;
+    while(parent->parent())
+    {
+        parent = parent->parent();
+        i++;
+    }
+    return i;
+}
+
+void BrowserNode::moveItem(BrowserNode *after)
+{
+    if(this->parent())
+    {
+        this->parent()->removeChild(this);
+        if(after->parent())
+        {
+            after->parent()->insertChild(after->parent()->indexOfChild(after)+1, this);
+        }
+    }
+}
+
+void BrowserNode::takeItem(BrowserNode *node)
+{
+    removeChild(node);
+}
+
+void BrowserNode::insertItem(BrowserNode *node)
+{
+    addChild(node);
+}
+
+void BrowserNode::expandAll()
+{
+    int numChildren = childCount();
+    setExpanded(true);
+    for(int i = 0; i < numChildren; i++)
+    {
+        BrowserNode * node = static_cast <BrowserNode *>(child(i));
+        if(node)
+            node->expandAll();
+    }
+}
+
+void BrowserNode::collapseAll()
+{
+    int numChildren = childCount();
+    setExpanded(false);
+    for(int i = 0; i < numChildren; i++)
+    {
+        BrowserNode * node = static_cast <BrowserNode *>(child(i));
+        if(node)
+            node->collapseAll();
+    }
+}
 //
 
 void BrowserNodeList::sort_it()
 {
     if (count() > 1000)
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
     BrowserPackage::prepare_for_sort();
 
     sort();
 
-    SynonymousPath.setAutoDelete(TRUE);
+    //SynonymousPath.setAutoDelete(TRUE);
+    QList<QString*> strs = SynonymousPath.values();
     SynonymousPath.clear();
 
     if (count() > 1000)
         QApplication::restoreOverrideCursor();
 }
 
+void BrowserNodeList::sort()
+{
+    std::sort(begin(), end(), lessThan);
+}
+
+bool BrowserNodeList::lessThan(BrowserNode *a, BrowserNode *b)
+{
+    QString s1 = ((BrowserNode *) a)->get_name();
+    QString s2 = ((BrowserNode *) b)->get_name();
+
+    if (s1 != s2) {
+        s1 += " ";
+        s2 += " ";
+    }
+    else {
+        QString * ps1 = SynonymousPath[(BrowserNode *) a];
+        QString * ps2 = SynonymousPath[(BrowserNode *) b];
+
+        if (ps1 == 0) {
+            s1 = ((BrowserNode *) a)->full_name(TRUE);
+            ps1 = new QString(s1);
+
+            SynonymousPath.insert((BrowserNode *) a, ps1);
+        }
+        else
+            s1 = *ps1;
+
+        if (ps2 == 0) {
+            s2 = ((BrowserNode *) b)->full_name(TRUE);
+            ps2 = new QString(s2);
+
+            SynonymousPath.insert((BrowserNode *) b, ps2);
+        }
+        else
+            s2 = *ps2;
+    }
+
+    return s1 < s2;
+}
+
 void BrowserNodeList::search(BrowserNode * bn, UmlCode k, const QString & s,
                              bool cs, bool even_deleted, bool for_name,
                              bool for_stereotype)
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = bn->firstChild(); child != 0; child = child->nextSibling()) {
         if (even_deleted || !((BrowserNode *) child)->deletedp()) {
@@ -1989,12 +2326,12 @@ void BrowserNodeList::search(BrowserNode * bn, UmlCode k, const QString & s,
                  ((k == UmlRelations)
                   ? IsaRelation(ch->get_type())
                   : (ch->get_type() == k))) &&
-                (s.isEmpty() ||
-                 (QString((for_name)
-                          ? ch->get_name()
-                          : ((for_stereotype) ? QString(ch->get_stereotype())
-                             : QString(ch->get_comment())))
-                  .find(s, 0, cs) != -1)))
+                    (s.isEmpty() ||
+                     (QString((for_name)
+                              ? ch->get_name()
+                              : ((for_stereotype) ? QString(ch->get_stereotype())
+                                 : QString(ch->get_comment())))
+                      .indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1)))
                 append((BrowserNode *) child);
 
             search((BrowserNode *) child, k, s, cs, even_deleted,
@@ -2006,7 +2343,7 @@ void BrowserNodeList::search(BrowserNode * bn, UmlCode k, const QString & s,
 void BrowserNodeList::search_ddb(BrowserNode * bn, UmlCode k, const QString & s,
                                  bool cs, bool even_deleted)
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = bn->firstChild(); child != 0; child = child->nextSibling()) {
         if (even_deleted || !((BrowserNode *) child)->deletedp()) {
@@ -2016,8 +2353,8 @@ void BrowserNodeList::search_ddb(BrowserNode * bn, UmlCode k, const QString & s,
                  ((k == UmlRelations)
                   ? IsaRelation(ch->get_type())
                   : (ch->get_type() == k))) &&
-                (s.isEmpty() ||
-                 ch->get_data()->decldefbody_contain(s, cs, ch)))
+                    (s.isEmpty() ||
+                     ch->get_data()->decldefbody_contain(s, cs, ch)))
                 append(ch);
 
             search_ddb(ch, k, s, cs, even_deleted);
@@ -2025,52 +2362,13 @@ void BrowserNodeList::search_ddb(BrowserNode * bn, UmlCode k, const QString & s,
     }
 }
 
-int BrowserNodeList::compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2)
-{
-    QString s1 = ((BrowserNode *) item1)->get_name();
-    QString s2 = ((BrowserNode *) item2)->get_name();
-
-    if (s1 != s2) {
-        s1 += " ";
-        s2 += " ";
-    }
-    else {
-        QString * ps1 = SynonymousPath[(BrowserNode *) item1];
-        QString * ps2 = SynonymousPath[(BrowserNode *) item2];
-
-        if (ps1 == 0) {
-            s1 = ((BrowserNode *) item1)->full_name(TRUE);
-            ps1 = new QString(s1);
-
-            SynonymousPath.insert((BrowserNode *) item1, ps1);
-        }
-        else
-            s1 = *ps1;
-
-        if (ps2 == 0) {
-            s2 = ((BrowserNode *) item2)->full_name(TRUE);
-            ps2 = new QString(s2);
-
-            SynonymousPath.insert((BrowserNode *) item2, ps2);
-        }
-        else
-            s2 = *ps2;
-    }
-
-    return s1.compare(s2);
-}
-
 void BrowserNodeList::names(QStringList & list) const
 {
     list.clear();
 
-    Q3PtrListIterator<BrowserNode> it(*this);
-
-    while (it.current() != 0) {
-        const char * s = it.current()->get_name();
-
-        list.append(((s == 0) || (*s == 0)) ? "<anonymous>" : s);
-        ++it;
+    foreach (BrowserNode *node, *this) {
+        QString s = node->get_name();
+        list.append(s.isEmpty() ? "<anonymous>" : s);
     }
 }
 
@@ -2078,22 +2376,14 @@ void BrowserNodeList::full_names(QStringList & list) const
 {
     list.clear();
 
-    Q3PtrListIterator<BrowserNode> it(*this);
-
-    while (it.current() != 0) {
-        list.append(it.current()->full_name(TRUE));
-        ++it;
-    }
+    foreach (BrowserNode *node, *this)
+        list.append(node->full_name(true));
 }
 
 void BrowserNodeList::full_defs(QStringList & list) const
 {
     list.clear();
 
-    Q3PtrListIterator<BrowserNode> it(*this);
-
-    while (it.current() != 0) {
-        list.append(it.current()->get_data()->definition(TRUE, FALSE));
-        ++it;
-    }
+    foreach (BrowserNode *node, *this)
+        list.append(node->get_data()->definition(true, false));
 }
diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h
index 0d7db3f02..252449a99 100644
--- a/src/browser/BrowserNode.h
+++ b/src/browser/BrowserNode.h
@@ -27,26 +27,29 @@
 
 #ifndef BROWSER_NODE_H
 #define BROWSER_NODE_H
-
+#include <QMenu>
 #include <QTextStream>
-#include <qlist.h>
-#include <q3listview.h>
+#include <QList>
+//#include <q3listview.h>
 #include <qstringlist.h>
-#include <q3dict.h>
+//
 //Added by qt3to4:
 #include <QDragMoveEvent>
 #include <QDropEvent>
-#include <Q3PopupMenu>
-#include <Q3PtrCollection>
+//#include <Q3PopupMenu>
+//
+#include <QTreeWidgetItem>
 
 #include "UmlEnum.h"
 #include "HaveKeyValueData.h"
 #include "mystr.h"
 #include "Editable.h"
 #include "AType.h"
-
+#include "misc/TypeIdentifier.h"
+#include <QListView>
+#include <QListWidgetItem>
+#include <QStandardItem>
 class QDragMoveEvent;
-class Q3PopupMenu;
 template <class K> class Q3PtrDict;
 
 class BrowserView;
@@ -67,29 +70,29 @@ class SimpleClassDiagramSettings;
 class BrowserNodeList;
 class ToolCom;
 class SaveProgress;
-
 /* This class is the base for every node presented in the tree-view on the left */
-class BrowserNode : public Q3ListViewItem,
-    public HaveKeyValueData,
+class BrowserNode : public QTreeWidgetItem,
+   public HaveKeyValueData,
     public Editable
 {
 protected:
     QString name;
-    WrapperStr comment;
+    QString comment;
     QByteArray tempBa;
-    int original_id;	// from project library
-    BooL is_new;	// backup file useless
-    BooL is_deleted;
-    bool is_modified : 1;
-    bool is_read_only : 1;
-    bool is_edited : 1;
-    bool is_marked : 1;
-    bool is_defined : 1;	// to indicate unconsistency due to projectSynchro
+    friend class BrowserView;
+    int original_id = 0;	// from project library
+    bool is_new = true;	// backup file useless
+    bool is_deleted = false;
+    bool is_modified = false;
+    bool is_read_only = false;
+    bool is_edited = false;
+    bool is_marked = false;
+    bool is_defined = false;	// to indicate unconsistency due to projectSynchro
     // pre condition not followed
 
     static bool show_stereotypes;
     static unsigned edition_number;
-    static Q3PtrList<BrowserNode> marked_list;
+    static QList<BrowserNode *> marked_list;
     static bool popup_menu_active;
     static QList<UmlCode> generatable_types;
     static SaveProgress * save_progress;
@@ -99,40 +102,50 @@ class BrowserNode : public Q3ListViewItem,
     static QString FullPathPrefix;
     static QString FullPathPostfix;
     static QString FullPathDotDot;
+    static BrowserView* viewptr;
 
     BrowserNode();
+    BrowserNode(BrowserView *);
 
-    void set_parent(Q3ListViewItem * parent);
+    void set_parent(BrowserNode * parent);
     virtual bool delete_internal(QString & warning);
 
 public:
-    BrowserNode(QString s, BrowserView * parent);
-    BrowserNode(QString s, BrowserNode * parent);
+    BrowserNode* firstChild() const {
+        return static_cast<BrowserNode*>(child(0));
+    }
+    BrowserNode(const QString & s, BrowserView * parent);
+    BrowserNode(const QString & s, BrowserNode * parent);
     virtual ~BrowserNode();
 
     virtual bool is_undefined() const;
 
-   QString get_name() const {
+    virtual QString get_name() const {
         return name;
     }
-    virtual void set_name(QString s);
-    virtual void update_stereotype(bool rec = FALSE);
+    virtual void set_name(const QString & s);
+    virtual void update_stereotype(bool rec = false);
 
     static bool edition_active() {
         return edition_number != 0;
-    };
-    virtual void edit_start();
-    virtual void edit_end();
+    }
+    virtual void edit_start() override;
+    virtual void edit_end() override;
     virtual bool in_edition() const;
 
-    void mark_menu(Q3PopupMenu & m, const char *, int bias) const;
-    void mark_shortcut(QString s, int & index, int bias);
+    void mark_menu(QMenu & m, QString, int bias) const;
+    void mark_shortcut(const QString & s, int & index, int bias);
     void mark_management(int choice);
     void toggle_mark();
+    void set_marked(bool value);
     bool markedp() const {
         return is_marked;
     }
-    static const Q3PtrList<BrowserNode> & marked_nodes() {
+    static const QList<BrowserNode *> & marked_nodes() {
+        return marked_list;
+    }
+    static const QList<BrowserNode*>  get_marked_nodes()
+    {
         return marked_list;
     }
 
@@ -143,28 +156,29 @@ class BrowserNode : public Q3ListViewItem,
         return original_id != 0;
     }
     virtual void prepare_update_lib() const = 0;
-    virtual void support_file(Q3Dict<char> & files, bool add) const;
+    virtual void support_file(QHash<QString, char *> &files, bool add) const;
 
-    virtual bool is_writable() const;	// file writable & not api base
+    virtual bool is_writable() const override; // file writable & not api base
     virtual void delete_it();
+    virtual void set_deleted(bool);
     bool deletedp() const {
         return is_deleted;
-    };
-    void undelete(bool rec);
+    }
+    void undelete(bool recursive);
     virtual bool undelete(bool rec, QString & warning, QString & renamed);
     void must_be_deleted(); // deleted after load time
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString()) = 0;
+                                    const QString & name = QString()) = 0;
 
     bool nestedp() const {
         return ((BrowserNode *) parent())->get_type() == get_type();
-    };
-    virtual const char * get_comment() const;
-    virtual void set_comment(QString c);
+    }
+    virtual QString get_comment() const;
+    virtual void set_comment(const QString & c);
     const char * get_stereotype() const;
     virtual QString stereotypes_properties() const;
     bool may_contains(BrowserNode *, bool rec) const;
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> &,
+    virtual bool may_contains_them(const QList<BrowserNode *> &,
                                    BooL & duplicable) const;
     bool may_contains_it(BrowserNode * bn) const;
     virtual void move(BrowserNode *, BrowserNode * after);
@@ -173,26 +187,29 @@ class BrowserNode : public Q3ListViewItem,
     bool enter_child_name(QString & r, const QString & msg, UmlCode type,
                           BrowserNodeList & nodes, BrowserNode ** old,
                           bool allow_spaces, bool allow_empty,
-                          bool exiting = FALSE);
+                          bool exiting = false);
     bool wrong_child_name(const QString & s, UmlCode type,
-                          bool allow_spaces, bool allow_empty) const;
+                          bool allow_spaces, bool allow_empty, QString *cause = NULL) const;
     virtual bool allow_spaces() const;
     virtual bool allow_empty() const;
     virtual bool same_name(const QString & s, UmlCode type) const;
     void select_in_browser();
-    void edit(const char *, const QStringList & default_stereotypes);
+    void edit(const QString & s, const QStringList & default_stereotypes);
     void children(BrowserNodeList & nodes,
                   UmlCode kind1, UmlCode kind2 = UmlRelations) const;
+    QList<BrowserNode*> children(QList<UmlCode>, bool includeDeleted = true) const;
 
-    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
+    virtual QString full_name(bool rev = false, bool itself = true) const;
     QString fullname(bool rev) const;
-    QString fullname(QString & s, bool rev) const;
+    QString fullname(const QString & s, bool rev) const;
     virtual void menu() = 0;
-    virtual void apply_shortcut(QString s) = 0;
+    virtual void apply_shortcut(const QString & s) = 0;
     /* Open a Diagram Window */
+    virtual const QPixmap * pixmap(int) const = 0;
     virtual void open(bool force_edit);
     virtual void on_close();
     virtual UmlCode get_type() const = 0;
+    virtual uint TypeID();
     virtual QString get_stype() const = 0;
     virtual int get_identifier() const = 0;
     virtual const char * help_topic() const;
@@ -201,11 +218,11 @@ class BrowserNode : public Q3ListViewItem,
         return is_modified;
     }
     void unmodified() {
-        is_modified = FALSE;
+        is_modified = false;
     }
     bool modifiedp() const {
         return is_modified;
-    };
+    }
     virtual void on_delete();
     virtual BasicData * get_data() const = 0;
     virtual QString drag_key() const;
@@ -223,11 +240,19 @@ class BrowserNode : public Q3ListViewItem,
     virtual void get_activitydiagramsettings(ActivityDiagramSettings &) const;
     virtual UmlColor get_color(UmlCode) const;
     virtual UmlVisibility get_visibility(UmlCode) const;
+    virtual UmlVisibility get_visibility() const {
+        return UmlDefaultVisibility;
+    }
+    //stringifies visibility of this node
+    QString visibility_as_string() const;
+    //converts visibility from string to enum representation
+    static UmlVisibility encode_visibility(const QString & val);
+
     virtual void package_settings(BooL & name_in_tab, ShowContextMode & show_context) const;
     virtual const QStringList & default_stereotypes(UmlCode, const BrowserNode *) const; // non class rel
     virtual BrowserNode * get_associated() const;
     virtual BasicData * add_relation(UmlCode, BrowserNode *);
-    virtual Q3PtrList<BrowserNode> parents() const;
+    virtual QList<BrowserNode *> parents() const;
     BrowserNode * get_container(UmlCode) const;
     virtual BrowserNode * container(UmlCode) const; // container for class, state machine and activity
     virtual QString check_inherit(const BrowserNode * parent) const;
@@ -237,7 +262,7 @@ class BrowserNode : public Q3ListViewItem,
     virtual void member_cpp_def(const QString & prefix,
                                 const QString & prefix_tmplop,
                                 QString & s, bool templ) const;
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = false);
     virtual AType class_association() const;
     virtual const char * constraint() const;
 
@@ -245,6 +270,9 @@ class BrowserNode : public Q3ListViewItem,
     void save(QTextStream &) const;
     static void save_progress_closed();
     virtual void init_save_counter();
+#ifndef QT_NO_DATASTREAM
+    using QTreeWidgetItem::read;
+#endif
     void read(char *& , char *& k, int id);
     static BrowserNode * read_any_ref(char *& , char *);
     static void save_stereotypes(QTextStream & st,
@@ -254,8 +282,6 @@ class BrowserNode : public Q3ListViewItem,
 
     static bool toggle_show_stereotypes();
     virtual void iconChanged();
-    virtual void paintCell(QPainter * p, const QColorGroup & cg, int column,
-                           int width, int alignment);
 
     void unconsistent_fixed(const char * what, BrowserNode * newone);
     void unconsistent_removed(const char * what, BrowserNode * newone);
@@ -281,23 +307,36 @@ class BrowserNode : public Q3ListViewItem,
 
     BrowserNode* get_first_generatable_node();
     QList<BrowserNode*> get_generation_list();
+    void setOpen(bool isOpen){this->setExpanded(isOpen);}
+    BrowserNode* nextSibling();
+    void repaint(){ /*doldurulacak*/}
+    virtual QVariant data(int column, int role) const override;
+    BrowserNode * itemAbove();
+    BrowserNode * itemBelow ();
+    int depth();
+    void moveItem(BrowserNode *after);
+    void takeItem(BrowserNode *node);
+    void insertItem(BrowserNode *node);
+    void expandAll();
+    void collapseAll();
 };
 
 inline QString BrowserNode::fullname(bool rev) const
 {
-    QString p = ((BrowserNode *) parent())->full_name(FALSE, FALSE);
+
+    QString p = ((BrowserNode *) parent())->full_name(false, false);
 
     if (p.isEmpty())
-        return QString((const char *) name);
+        return QString(name);
     else if (rev)
         return name + (FullPathPrefix + p + FullPathPostfix);
     else
         return p + (FullPathDotDot + name);
 }
 
-inline QString BrowserNode::fullname(QString & s, bool rev) const
+inline QString BrowserNode::fullname(const QString & s, bool rev) const
 {
-    QString p = ((BrowserNode *) parent())->full_name(FALSE, FALSE);
+    QString p = ((BrowserNode *) parent())->full_name(false, false);
 
     if (p.isEmpty())
         return s;
@@ -309,11 +348,8 @@ inline QString BrowserNode::fullname(QString & s, bool rev) const
 
 // a sortable list of BrowserNode
 
-class BrowserNodeList : public Q3PtrList<BrowserNode>
+class BrowserNodeList : public QList<BrowserNode *>
 {
-protected:
-    virtual int compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2);
-
 public:
     void search(BrowserNode * bn, UmlCode k, const QString & s,
                 bool cs, bool even_deleted, bool for_name,
@@ -325,6 +361,10 @@ class BrowserNodeList : public Q3PtrList<BrowserNode>
     void full_names(QStringList & list) const;
     void full_defs(QStringList & list) const;
     void sort_it();
+    void sort();
+
+private:
+    static bool lessThan(BrowserNode *a, BrowserNode *b);
 };
 
 
diff --git a/src/browser/BrowserNodeDummy.cpp b/src/browser/BrowserNodeDummy.cpp
new file mode 100644
index 000000000..a70cc4230
--- /dev/null
+++ b/src/browser/BrowserNodeDummy.cpp
@@ -0,0 +1,5 @@
+#include "browser/BrowserNodeDummy.h"
+
+BrowserNodeDummy::~BrowserNodeDummy()
+{}
+
diff --git a/src/browser/BrowserNodeDummy.h b/src/browser/BrowserNodeDummy.h
new file mode 100644
index 000000000..84e4cf32a
--- /dev/null
+++ b/src/browser/BrowserNodeDummy.h
@@ -0,0 +1,24 @@
+#ifndef BROWSERNODEDUMMY_H
+#define BROWSERNODEDUMMY_H
+
+#include "browser/BrowserNode.h"
+
+class BrowserNodeDummy : public BrowserNode
+{
+public:
+    BrowserNodeDummy(BrowserView* view) : BrowserNode(view) {}
+    virtual ~BrowserNodeDummy();
+    virtual BrowserNode * duplicate(BrowserNode *,
+                                    const QString &) override {return 0;}
+    virtual void menu() override {}
+    virtual void apply_shortcut(const QString &) override {}
+    virtual UmlCode get_type() const override {return UmlAssociation;}
+    virtual QString get_stype() const override {return QString();}
+    virtual int get_identifier() const override {return 0;}
+    virtual void save(QTextStream &, bool, QString &) override {}
+    virtual BasicData * get_data() const override {return 0;}
+    virtual void prepare_update_lib() const override {}
+    virtual const QPixmap * pixmap(int) const override {return 0;}
+};
+
+#endif // BROWSERNODEDUMMY_H
diff --git a/src/browser/BrowserObjectDiagram.cpp b/src/browser/BrowserObjectDiagram.cpp
index 7b9ec9d8d..1eb3fd257 100644
--- a/src/browser/BrowserObjectDiagram.cpp
+++ b/src/browser/BrowserObjectDiagram.cpp
@@ -25,18 +25,11 @@
 //
 // *************************************************************************
 
-
-
-
-
-#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
-//Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
-
 #include "BrowserObjectDiagram.h"
 #include "SimpleData.h"
 #include "RelationData.h"
@@ -54,11 +47,11 @@
 #include "mu.h"
 #include "translate.h"
 
-Q3PtrList<BrowserObjectDiagram> BrowserObjectDiagram::imported;
-Q3ValueList<int> BrowserObjectDiagram::imported_ids;
+QList<BrowserObjectDiagram *> BrowserObjectDiagram::imported;
+QList<int> BrowserObjectDiagram::imported_ids;
 QStringList BrowserObjectDiagram::its_default_stereotypes;	// unicode
 
-BrowserObjectDiagram::BrowserObjectDiagram(QString s, BrowserNode * p, int id)
+BrowserObjectDiagram::BrowserObjectDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -88,7 +81,9 @@ BrowserObjectDiagram::BrowserObjectDiagram(BrowserObjectDiagram * model, Browser
     is_modified = TRUE;
 
     if (model->window != 0)
+    {
         model->window->duplicate(get_ident(), "diagram");
+    }
     else {
         char * diagram;
 
@@ -108,11 +103,11 @@ BrowserObjectDiagram::~BrowserObjectDiagram()
 
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
     on_close();
-//    if(window)
-//        window->set_browser_diagram(0);
+    //    if(window)
+    //        window->set_browser_diagram(0);
 
     all.remove(get_ident());
     delete def;
@@ -137,34 +132,33 @@ BrowserObjectDiagram * BrowserObjectDiagram::add_object_diagram(BrowserNode * fu
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter object diagram's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter object diagram's name : "),
                                         UmlObjectDiagram, TRUE, FALSE))
         return new BrowserObjectDiagram(name, future_parent);
     else
         return 0;
 }
 
-void BrowserObjectDiagram::set_name(const char * s)
+void BrowserObjectDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
 
     if (window != 0)
-        window->setCaption(s);
+    {
+        window->setWindowTitle(s);
+    }
 }
 
 void BrowserObjectDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserObjectDiagram * d = imported.take(0);
-
-        (new ObjectDiagramWindow(d->full_name(), d, *it))->close(TRUE);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserObjectDiagram *d, imported) {
+        (new ObjectDiagramWindow(d->full_name(), d, *it))->close();
         d->set_diagram_window(nullptr);
-        it = imported_ids.remove(it);
+        it = imported_ids.erase(it);
         d->is_modified = TRUE;
     }
+    imported.clear();
 }
 
 void BrowserObjectDiagram::renumber(int phase)
@@ -182,11 +176,11 @@ void BrowserObjectDiagram::delete_it()
 {
     if (window)
         delete window;
-
+    window = 0;
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserObjectDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserObjectDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserObjectDiagram * result = new BrowserObjectDiagram(this, p);
 
@@ -218,50 +212,53 @@ void BrowserObjectDiagram::draw_svg() const
 
 void BrowserObjectDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Show"), 0),
-                       TR("to show and edit the <i>object diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Show"), 0,
+                             QObject::tr("to show and edit the <i>object diagram</i>"));
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                           TR("to edit the <i>object diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                                 QObject::tr("to edit the <i>object diagram</i>"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 2),
-                               TR("to set how the <i>object diagram</i>'s items must be drawn"));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to duplicate the <i>object diagram</i>"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 2,
+                                     QObject::tr("to set how the <i>object diagram</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 3,
+                                     QObject::tr("to duplicate the <i>object diagram</i>"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 4),
-                                   TR("to delete the <i>object diagram</i>. \
-Note that you can undelete it after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 4,
+                                         QObject::tr("to delete the <i>object diagram</i>. \
+                                                     Note that you can undelete it after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the object diagram"), 90);
+        mark_menu(m, QObject::tr("the object diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>object diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>object diagram</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserObjectDiagram::exec_menu_choice(int rank)
@@ -272,7 +269,7 @@ void BrowserObjectDiagram::exec_menu_choice(int rank)
         break;
 
     case 1:
-        edit(TR("Object diagram"), its_default_stereotypes);
+        edit( QObject::tr("Object diagram"), its_default_stereotypes);
         return;
 
     case 2:
@@ -282,13 +279,13 @@ void BrowserObjectDiagram::exec_menu_choice(int rank)
     case 3: {
         QString name;
 
-        if (((BrowserNode *)parent())->enter_child_name(name, TR("enter object diagram's name : "),
-                UmlObjectDiagram, TRUE, FALSE))
+        if (((BrowserNode *)parent())->enter_child_name(name, QObject::tr("enter object diagram's name : "),
+                                                        UmlObjectDiagram, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
         else
             return;
     }
-    break;
+        break;
 
     case 4:
         delete_it();
@@ -312,7 +309,7 @@ void BrowserObjectDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserObjectDiagram::apply_shortcut(QString s)
+void BrowserObjectDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -355,7 +352,7 @@ void BrowserObjectDiagram::open(bool)
         window = new ObjectDiagramWindow(full_name(TRUE), this);
     else
         window->raise();
-
+    windowDestroyed = false;
     window->setFocus();
 }
 
@@ -367,10 +364,10 @@ void BrowserObjectDiagram::edit_settings()
 
         settings.complete(st, TRUE);
 
-        co[0].set(TR("package color"), &package_color);
-        co[1].set(TR("fragment color"), &fragment_color);
-        co[2].set(TR("note color"), &note_color);
-        co[3].set(TR("class instance \ncolor"), &class_instance_color);
+        co[0].set( QObject::tr("package color"), &package_color);
+        co[1].set( QObject::tr("fragment color"), &fragment_color);
+        co[2].set( QObject::tr("note color"), &note_color);
+        co[3].set( QObject::tr("class instance \ncolor"), &class_instance_color);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -409,7 +406,7 @@ UmlCode BrowserObjectDiagram::get_type() const
 
 QString BrowserObjectDiagram::get_stype() const
 {
-    return TR("Object diagram");
+    return QObject::tr("Object diagram");
 }
 
 int BrowserObjectDiagram::get_identifier() const
@@ -437,7 +434,7 @@ void BrowserObjectDiagram::get_objectdiagramsettings(ObjectDiagramSettings & r)
 }
 
 void BrowserObjectDiagram::package_settings(BooL & name_in_tab,
-        ShowContextMode & show_context) const
+                                            ShowContextMode & show_context) const
 {
     name_in_tab = used_settings->package_name_in_tab == UmlYes;
     show_context = used_settings->show_class_pack_context_mode;
@@ -465,8 +462,8 @@ UmlColor BrowserObjectDiagram::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 bool BrowserObjectDiagram::get_auto_label_position() const
@@ -487,7 +484,7 @@ bool BrowserObjectDiagram::get_draw_all_relations() const
 void BrowserObjectDiagram::dont_draw_all_relations()
 {
     settings.draw_all_relations =
-        used_settings->draw_all_relations = UmlNo;
+            used_settings->draw_all_relations = UmlNo;
 }
 
 bool BrowserObjectDiagram::get_show_stereotype_properties() const
@@ -520,11 +517,10 @@ bool BrowserObjectDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
-    return TRUE;
-
+        return TRUE;
     case saveInCmd:
         if (window != 0)
             com->write_ack(window->get_view()->save_pict(args, TRUE, FALSE));
@@ -535,38 +531,38 @@ bool BrowserObjectDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
 
         return TRUE;
-
     default:
         return (def->tool_cmd(com, args, this, comment) ||
                 BrowserNode::tool_cmd(com, args));
     }
 }
 
-void BrowserObjectDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * bn,
-        char const * kc,
-        char const * kr)
+void BrowserObjectDiagram::compute_referenced_by(QList<BrowserNode *> & l,
+                                                 BrowserNode * bn,
+                                                 char const * kc,
+                                                 char const * kr)
 {
     int id = (IsaRelation(bn->get_type()))
-             ? ((RelationData *) bn->get_data())->get_ident()
-             : bn->get_identifier();
+            ? ((RelationData *) bn->get_data())->get_ident()
+            : bn->get_identifier();
 
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
-
-    while ((d = it.current()) != 0) {
-        if (!d->deletedp() && (d->get_type() == UmlObjectDiagram)) {
-            if ((((BrowserObjectDiagram *) d)->window != 0)
-                ? ((BrowserObjectDiagram *) d)->window->get_view()->is_present(bn)
-                : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
-                l.append((BrowserObjectDiagram *) d);
+    while (it.hasNext()) {
+        it.next();
+        if((d = it.value()) != 0)
+        {
+            if (!d->deletedp() && (d->get_type() == UmlObjectDiagram)) {
+                if ((((BrowserObjectDiagram *) d)->window != 0)
+                        ? ((BrowserObjectDiagram *) d)->window->get_view()->is_present(bn)
+                        : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
+                    l.append((BrowserObjectDiagram *) d);
+            }
         }
-
-        ++it;
     }
 }
 
@@ -615,7 +611,9 @@ void BrowserObjectDiagram::save(QTextStream & st, bool ref, QString & warning)
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
@@ -640,15 +638,15 @@ BrowserObjectDiagram * BrowserObjectDiagram::read_ref(char *& st, char * k)
 
     int id = read_id(st);
     BrowserObjectDiagram * result =
-        (BrowserObjectDiagram *) all[id];
+            (BrowserObjectDiagram *) all[id];
 
     return (result == 0)
-           ? new BrowserObjectDiagram(id)
-           : result;
+            ? new BrowserObjectDiagram(id)
+            : result;
 }
 
 BrowserObjectDiagram * BrowserObjectDiagram::read(char *& st, char * k,
-        BrowserNode * parent)
+                                                  BrowserNode * parent)
 {
     BrowserObjectDiagram * r;
     int id;
@@ -682,7 +680,7 @@ BrowserObjectDiagram * BrowserObjectDiagram::read(char *& st, char * k,
         r->is_defined = TRUE;
 
         r->is_read_only = (!in_import() && read_only_file()) ||
-                          ((user_id() != 0) && r->is_api_base());
+                ((user_id() != 0) && r->is_api_base());
 
         QFileInfo fi(BrowserView::get_dir(), QString::number(id) + ".diagram");
 
diff --git a/src/browser/BrowserObjectDiagram.h b/src/browser/BrowserObjectDiagram.h
index a4e8e93df..717f68226 100644
--- a/src/browser/BrowserObjectDiagram.h
+++ b/src/browser/BrowserObjectDiagram.h
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QPixmap;
 class ObjectDiagramWindow;
@@ -44,8 +44,8 @@ class BrowserObjectDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserObjectDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserObjectDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
 
     SimpleData * def;
@@ -63,19 +63,19 @@ class BrowserObjectDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserObjectDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserObjectDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserObjectDiagram();
     virtual void set_diagram_window(DiagramWindow*);
 
     virtual void delete_it();
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
     virtual void draw_svg() const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual void on_close();
     virtual void read_session(char *& st);
@@ -84,7 +84,7 @@ class BrowserObjectDiagram : public BrowserDiagram
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
     virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
+    virtual void set_name(const QString & s);
     virtual void update_drawing_settings();
     virtual void get_objectdiagramsettings(ObjectDiagramSettings &) const;
     virtual bool get_auto_label_position() const;
@@ -116,7 +116,7 @@ class BrowserObjectDiagram : public BrowserDiagram
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 };
 
diff --git a/src/browser/BrowserOperation.cpp b/src/browser/BrowserOperation.cpp
index 33e7d462f..705acddb6 100644
--- a/src/browser/BrowserOperation.cpp
+++ b/src/browser/BrowserOperation.cpp
@@ -29,11 +29,11 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qfileinfo.h>
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3ptrdict.h>
+#include <qhash.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QPixmap>
@@ -85,7 +85,7 @@ BrowserOperation::BrowserOperation(int id)
     // not yet read
 }
 
-BrowserOperation::BrowserOperation(QString s, BrowserNode * p, OperationData * d, int id)
+BrowserOperation::BrowserOperation(const QString & s, BrowserNode * p, OperationData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserOperation>(all, id), def(d),
       get_of(0), set_of(0)
 {
@@ -121,10 +121,11 @@ BrowserOperation::BrowserOperation(const BrowserOperation * model, BrowserNode *
         def->new_body(b, 'y');
 }
 
-BrowserNode * BrowserOperation::duplicate(BrowserNode * p, QString n)
+BrowserNode * BrowserOperation::duplicate(BrowserNode * p, const QString & nInit)
 {
     BrowserOperation * result = new BrowserOperation(this, p);
 
+    QString n = nInit;
     if (n.isEmpty()) {
         if (get_name()[0] == '~')
             // destructor, change the name
@@ -145,7 +146,8 @@ BrowserNode * BrowserOperation::duplicate(BrowserNode * p, QString n)
 
     result->set_name(n);
     result->update_stereotype();
-
+    //move(result, this);
+    //result->select_in_browser();
     return result;
 }
 
@@ -168,13 +170,14 @@ void BrowserOperation::post_duplicate()
         return;
 
     // search for attribute/relation
-    const char * s = x_of->get_name();
+
+    QString s = x_of->get_name();
     UmlCode k = x_of->get_type();
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
-    for (child = parent()->firstChild(); child != 0; child = child->nextSibling()) {
+    for (child = ((BrowserNode *)parent())->firstChild(); child != 0; child = child->nextSibling()) {
         if ((((BrowserNode *) child)->get_type() == k) &&
-                !strcmp(((BrowserNode *) child)->get_name(), s)) {
+                ((BrowserNode *) child)->get_name() == s) {
             // this one
             (this->*set_x_of)((BrowserNode *) child);
             break;
@@ -218,7 +221,7 @@ bool BrowserOperation::delete_internal(QString &)
     is_deleted = TRUE;
 
     if (is_marked) {
-        marked_list.removeRef(this);
+        marked_list.removeOne(this);
         is_marked = FALSE;
     }
 
@@ -232,7 +235,7 @@ void BrowserOperation::AddConstructorInitalizer()
 {
     ConstructorInitializerDialog ciDialog;
     BrowserClass* container = static_cast<BrowserClass*>(get_container(UmlClass));
-    Q3PtrList<BrowserNode> parents = container->parents();
+    QList<BrowserNode *> parents = container->parents();
     QString initializerDummy(" : ");
     for(BrowserNode* parent : parents)
     {
@@ -245,6 +248,7 @@ void BrowserOperation::AddConstructorInitalizer()
     QString constructorPrototype = static_cast<OperationData*>(this->get_data())->get_cppdef();
 
     QString constructorActual = TagManagers::Cpp::updated_def(static_cast<OperationData*>(this->get_data()));
+
     QString initializer(this->get_value("constructor-initializer"));
     if(initializer.trimmed().isEmpty())
         ciDialog.ui->edInitializer->setText(initializerDummy);
@@ -268,11 +272,10 @@ void BrowserOperation::AddConstructorInitalizer()
 
 void BrowserOperation::renumber(int phase)
 {
-    static Q3PtrDict<char> cpp;
-    static Q3PtrDict<char> java;
-    static Q3PtrDict<char> php;
-    static Q3PtrDict<char> python;
-
+    static QHash<void*,char*> cpp;
+    static QHash<void*,char*> java;
+    static QHash<void*,char*> php;
+    static QHash<void*,char*> python;
     char * b;
 
     if (phase == -1) {
@@ -336,6 +339,44 @@ BrowserOperation * BrowserOperation::new_one(QString s, BrowserNode * p)
 
     d->set_browser_node(result, TRUE);
 
+
+    QString nameOfClassNode = p->get_name();
+
+    //if constructor
+    int lastIndexOfConstructor = 0;
+    //leave members other then operations and attributes in place
+    while(BrowserNode *node = (BrowserNode *)p->child(lastIndexOfConstructor))
+    {
+        if(UmlOperation != node->get_type() && UmlAttribute != node->get_type())
+        {
+            lastIndexOfConstructor++;
+        }
+        else
+            break;
+    }
+    while(BrowserNode *node = (BrowserNode *)p->child(lastIndexOfConstructor))
+    {
+        if(nameOfClassNode == node->get_name())
+        {
+            lastIndexOfConstructor++;
+        }
+        else
+            break;
+    }
+    if(nameOfClassNode == s)
+    {
+        p->removeChild(result);
+        p->insertChild(lastIndexOfConstructor,result);
+    }
+    //destructor
+    else if(("~" + nameOfClassNode) == s)
+    {
+
+        p->removeChild(result);
+        p->insertChild(lastIndexOfConstructor,result);
+    }
+
+
     return result;
 }
 
@@ -344,11 +385,12 @@ void BrowserOperation::instances(BrowserNodeList & result)
     IdIterator<BrowserOperation> it(all);
     BrowserOperation * op;
 
-    while ((op = it.current()) != 0) {
-        if (!op->deletedp())
-            result.append(op);
+    while(it.hasNext()){
+        it.next();
+        if ((op = it.value()) != 0)
+            if (!op->deletedp())
+                result.append(op);
 
-        ++it;
     }
 
     result.sort_it();
@@ -381,16 +423,14 @@ void BrowserOperation::set_set_of(BrowserNode * o)
 static QString substr_name(QString s, const QString & a)
 {
     int index;
-
-    if ((index = s.find("${name}")) != -1)
+    if ((index = s.indexOf("${name}")) != -1)
         s.replace(index, 7, a);
-    else if ((index = s.find("${Name}")) != -1)
+    else if ((index = s.indexOf("${Name}")) != -1)
         s.replace(index, 7, capitalize(a));
-    else if ((index = s.find("${NAME}")) != -1)
-        s.replace(index, 7, a.upper());
-    else if ((index = s.find("${nAME}")) != -1)
-        s.replace(index, 7, a.lower());
-
+    else if ((index = s.indexOf("${NAME}")) != -1)
+        s.replace(index, 7, a.toUpper());
+    else if ((index = s.indexOf("${nAME}")) != -1)
+        s.replace(index, 7, a.toLower());
     return s;
 }
 
@@ -495,7 +535,7 @@ QString BrowserOperation::get_of_name() const
 
     int index;
 
-    return ((index = result.find(" ")) != -1)
+    return ((index = result.indexOf(" ")) != -1)
             ? result.left(index)
             : result;
 }
@@ -519,9 +559,9 @@ QString BrowserOperation::compute_name(const char * name_spec) const
         QString s = name_spec;
         int index;
 
-        if ((index = s.find("${name}")) != -1)
+        if ((index = s.indexOf("${name}")) != -1)
             s.replace(index, 7, get_of_name());
-        else if ((index = s.find("${Name}")) != -1)
+        else if ((index = s.indexOf("${Name}")) != -1)
             s.replace(index, 7, capitalize(get_of_name()));
 
         return s;
@@ -539,7 +579,6 @@ const QPixmap * BrowserOperation::pixmap(int) const
 {
     if (deletedp())
         return DeletedOperationIcon;
-
     const QPixmap * px = ProfiledStereotypes::browserPixmap(def->get_stereotype());
 
     if (px != 0)
@@ -560,140 +599,145 @@ const QPixmap * BrowserOperation::pixmap(int) const
     }
 }
 
-void BrowserOperation::paintCell(QPainter * p, const QColorGroup & cg, int column,
-                                 int width, int alignment)
+QVariant BrowserOperation::data(int column, int role) const
 {
-    const QColor & bg = p->backgroundColor();
-
-    if (is_marked) {
-        p->setBackgroundMode(Qt::OpaqueMode);
-        p->setBackgroundColor(UmlRedColor);
-    }
-
-    if (def->get_isa_class_operation())
-        p->setFont((is_writable()) ? BoldUnderlineFont : UnderlineFont);
-    else if (def->get_is_abstract())
-        p->setFont((is_writable()) ? BoldItalicFont : ItalicFont);
-    else
-        p->setFont((is_writable()) ? BoldFont : NormalFont);
-
-    Q3ListViewItem::paintCell(p, cg, column, width, alignment);
-
-    if (is_marked) {
-        p->setBackgroundMode(Qt::TransparentMode);
-        p->setBackgroundColor(bg);
+    if(role == Qt::FontRole)
+    {
+        if(def->get_isa_class_operation())
+        {
+            if(is_writable())
+                return BoldUnderlineFont;
+            else
+                return UnderlineFont;
+        }
+        else if(def->get_is_abstract())
+        {
+            if(is_writable())
+                return BoldItalicFont;
+            else
+                return ItalicFont;
+        }
+        else
+        {
+            if(is_writable())
+                return BoldFont;
+            else
+                return NormalFont;
+        }
     }
+    return BrowserNode::data(column, role);
 }
-
-static Q3PtrList<BrowserNode> ImplBy;
+static QList<BrowserNode *> ImplBy;
 static const int add_constructor_initializer = 35;
 static const int go_up = 36;
 
 void BrowserOperation::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu implbym(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu implbym(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited) {
             if (get_container(UmlClass) != 0)
-                m.setWhatsThis(m.insertItem(TR("Up"), go_up),
-                               TR("to return to parent node"));
+                MenuFactory::addItem(m, QObject::tr("Up"), go_up,
+                                     QObject::tr("to return to parent node"));
 
             QString nameOfNode = ((BrowserNode *) parent())->get_name();
             if(name == nameOfNode)
-                MenuFactory::addItem(m, TR("Add constructor initializer"),
+                MenuFactory::addItem(m, QObject::tr("Add constructor initializer"),
                                      add_constructor_initializer,
-                                     TR("to edit the <i>operation</i>,"
-                                        "a double click with the left mouse button does the same thing"));
+                                     QObject::tr("to edit the <i>operation</i>,"
+                                                 "a double click with the left mouse button does the same thing"));
 
 
 
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>operation</i>,"
-                              "a double click with the left mouse button does the same thing"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>operation</i>,"
+                                             "a double click with the left mouse button does the same thing"));
 
             if (GenerationSettings::cpp_get_default_defs() &&
                     (strstr(def->get_cppdef(), "${body}") != 0))
-                m.setWhatsThis(m.insertItem(TR("Edit C++ body"), 4),
-                               TR("to edit the <i>operation</i> and its C++ body"));
+                MenuFactory::addItem(m, QObject::tr("Edit C++ body"), 4,
+                                     QObject::tr("to edit the <i>operation</i> and its C++ body"));
 
             if (GenerationSettings::java_get_default_defs() &&
                     (strstr(def->get_javadef(), "${body}") != 0))
-                m.setWhatsThis(m.insertItem(TR("Edit Java body"), 5),
-                               TR("to edit the <i>operation</i> and its Java body"));
+                MenuFactory::addItem(m, QObject::tr("Edit Java body"), 5,
+                                     QObject::tr("to edit the <i>operation</i> and its Java body"));
 
             if (GenerationSettings::php_get_default_defs() &&
                     (strstr(def->get_phpdef(), "${body}") != 0))
-                m.setWhatsThis(m.insertItem(TR("Edit Php body"), 6),
-                               TR("to edit the <i>operation</i> and its Php body"));
+                MenuFactory::addItem(m, QObject::tr("Edit Php body"), 6,
+                                     QObject::tr("to edit the <i>operation</i> and its Php body"));
 
             if (GenerationSettings::python_get_default_defs() &&
                     (strstr(def->get_pythondef(), "${body}") != 0))
-                m.setWhatsThis(m.insertItem(TR("Edit Python body"), 7),
-                               TR("to edit the <i>operation</i> and its Python body"));
+                MenuFactory::addItem(m, QObject::tr("Edit Python body"), 7,
+                                     QObject::tr("to edit the <i>operation</i> and its Python body"));
 
             if (((BrowserClass *) parent())->is_writable()) {
                 if ((get_of == 0) && (set_of == 0))
-                    m.setWhatsThis(m.insertItem(TR("Duplicate"), 1),
-                                   TR("to copy the <i>operation</i> in a new one"));
+                    MenuFactory::addItem(m, QObject::tr("Duplicate"), 1,
+                                         QObject::tr("to copy the <i>operation</i> in a new one"));
 
-                m.setWhatsThis(m.insertItem(TR("Add implementing activity"), 9),
-                               TR("to add a new <i>activity</i> implementing the <i>operation</i>"));
-                m.setWhatsThis(m.insertItem(TR("Add implementing state"), 10),
-                               TR("to add a new <i>state</i> implementing the <i>operation</i>"));
+                MenuFactory::addItem(m, QObject::tr("Add implementing activity"), 9,
+                                     QObject::tr("to add a new <i>activity</i> implementing the <i>operation</i>"));
+                MenuFactory::addItem(m, QObject::tr("Add implementing state"), 10,
+                                     QObject::tr("to add a new <i>state</i> implementing the <i>operation</i>"));
             }
 
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Referenced by"), 8),
-                           TR("to know who reference the <i>operation</i>"));
+            m.addSeparator();
+            MenuFactory::addItem(m, QObject::tr("Referenced by"), 8,
+                                 QObject::tr("to know who reference the <i>operation</i>"));
 
             ImplBy.clear();
             BrowserActivity::compute_referenced_by(ImplBy, this);
             BrowserState::compute_referenced_by(ImplBy, this);
 
             if (! ImplBy.isEmpty()) {
-                m.setWhatsThis(m.insertItem(TR("Select implementing behavior"), &implbym),
-                               TR("to select a <i>state</i> or <i>activity</i> implementing the <i>operation</i>"));
+                MenuFactory::insertItem(m, QObject::tr("Select implementing behavior"), &implbym,
+                                        QObject::tr("to select a <i>state</i> or <i>activity</i> implementing the <i>operation</i>"));
 
-                MenuFactory::createTitle(implbym, TR("Choose behavior"));
-                implbym.insertSeparator();
+                MenuFactory::createTitle(implbym, QObject::tr("Choose behavior"));
+                implbym.addSeparator();
 
-                BrowserNode * beh;
                 int rank = 10000;
 
-                for (beh = ImplBy.first(); beh != 0; beh = ImplBy.next())
-                    implbym.insertItem(beh->full_name(TRUE), rank);
+                foreach (BrowserNode * beh, ImplBy)
+                    MenuFactory::addItem(implbym, beh->full_name(TRUE), rank);
             }
 
             if (!is_read_only && (edition_number == 0)) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                               TR("to delete the <i>operation</i>. \
-                                  Note that you can undelete it after"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Delete"), 2,
+                                     QObject::tr("to delete the <i>operation</i>. \
+                                                 Note that you can undelete it after"));
             }
         }
 
-        mark_menu(m, TR("the operation"), 90);
+        mark_menu(m, QObject::tr("the operation"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
                 Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0) &&
              ((get_of == 0) || !get_of->deletedp()) &&
              ((set_of == 0) || !set_of->deletedp()))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("to undelete the <i>operation</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 3,
+                             QObject::tr("to undelete the <i>operation</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserOperation::exec_menu_choice(int rank)
@@ -706,7 +750,11 @@ void BrowserOperation::exec_menu_choice(int rank)
 
     case 1:
         if ((get_of == 0) && (set_of == 0))
-            ((BrowserClass *) parent())->add_operation(this);
+        {
+            BrowserNode * operDuplicate = ((BrowserClass *) parent())->duplicate_operation(this);
+            move(operDuplicate, this);
+            operDuplicate->select_in_browser();
+        }
 
         ImplBy.clear();
         return;
@@ -746,7 +794,6 @@ void BrowserOperation::exec_menu_choice(int rank)
 
     case 9: {
         BrowserNode * bn = this;
-
         do {
             bn = (BrowserNode *) bn->parent();
         }
@@ -770,7 +817,6 @@ void BrowserOperation::exec_menu_choice(int rank)
             bn = (BrowserNode *) bn->parent();
         }
         while (bn->get_type() == UmlClass);
-
         BrowserState * st = BrowserState::add_state(bn, TRUE);
 
         if (st != 0) {
@@ -791,19 +837,16 @@ void BrowserOperation::exec_menu_choice(int rank)
         return;
     }
 
-
-        ImplBy.clear();
-        return;
-
     default:
         if (rank >= 99990)
             ProfiledStereotypes::choiceManagement(this, rank - 99990);
-        else if (rank >= 10000)
-            ImplBy.at(rank - 10000)->select_in_browser();
-        else if (rank >= 100)
-            ToolCom::run(Tool::command(rank - 100), this);
-        else if (rank >= 90)
-            mark_management(rank - 90);
+        else
+            if (rank >= 10000)
+                ImplBy.at(rank - 10000)->select_in_browser();
+            else if (rank >= 100)
+                ToolCom::run(Tool::command(rank - 100), this);
+            else if (rank >= 90)
+                mark_management(rank - 90);
 
         ImplBy.clear();
         return;
@@ -814,7 +857,7 @@ void BrowserOperation::exec_menu_choice(int rank)
     ImplBy.clear();
 }
 
-void BrowserOperation::apply_shortcut(QString s)
+void BrowserOperation::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -874,7 +917,9 @@ void BrowserOperation::open(bool)
 void BrowserOperation::modified()
 {
     repaint();
-    ((BrowserNode *) parent())->modified();
+    //check if parent exists. added for crash during roundtrip
+    if(parent())
+        ((BrowserNode *) parent())->modified();
 }
 
 UmlCode BrowserOperation::get_type() const
@@ -882,9 +927,14 @@ UmlCode BrowserOperation::get_type() const
     return UmlOperation;
 }
 
+uint BrowserOperation::TypeID()
+{
+    return TypeIdentifier<BrowserOperation>::id();
+}
+
 QString BrowserOperation::get_stype() const
 {
-    return TR("operation");
+    return QObject::tr("operation");
 }
 
 int BrowserOperation::get_identifier() const
@@ -892,6 +942,11 @@ int BrowserOperation::get_identifier() const
     return get_ident();
 }
 
+UmlVisibility BrowserOperation::get_visibility() const
+{
+    return def->get_uml_visibility();
+}
+
 BasicData * BrowserOperation::get_data() const
 {
     return def;
@@ -935,20 +990,22 @@ void BrowserOperation::member_cpp_def(const QString & prefix,
     }
 }
 
-void BrowserOperation::compute_referenced_by(Q3PtrList<BrowserNode> & l,
+void BrowserOperation::compute_referenced_by(QList<BrowserNode *> & l,
                                              BrowserClass * target)
 {
     IdIterator<BrowserOperation> it(all);
 
-    while (it.current()) {
-        if (!it.current()->deletedp() && it.current()->def->reference(target))
-            l.append(it.current());
+    while(it.hasNext()){
+        it.next();
+        if (it.value()) {
+        if (!it.value()->deletedp() && it.value()->def->reference(target))
+            l.append(it.value());
 
-        ++it;
+}
     }
 }
 
-void BrowserOperation::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserOperation::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -963,17 +1020,16 @@ void BrowserOperation::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
 
 QString BrowserOperation::python_init_self(BrowserNode * cl)
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = cl->firstChild(); child; child = child->nextSibling()) {
         if ((((BrowserNode *) child)->get_type() == UmlOperation) &&
-                !strcmp(((BrowserNode *) child)->get_name(), "__init__")) {
+                ((BrowserNode *) child)->get_name() == "__init__") {
             return (((BrowserOperation *) child)->def->get_n_params() != 0)
                     ? ((BrowserOperation *) child)->def->get_param_name(0)
                     : "self";
         }
     }
-
     // not find
     return "self";
 }
@@ -988,16 +1044,12 @@ bool BrowserOperation::tool_cmd(ToolCom * com, const char * args)
         return TRUE;
 
     case sideCmd: {
-        Q3PtrList<BrowserNode> l;
-
+        QList<BrowserNode *> l;
         BrowserActivity::compute_referenced_by(l, this);
         BrowserState::compute_referenced_by(l, this);
-
         com->write_unsigned(l.count());
 
-        BrowserNode * bn;
-
-        for (bn = l.first(); bn != 0; bn = l.next())
+        foreach (BrowserNode * bn, l)
             bn->write_id(com);
     }
 
@@ -1065,7 +1117,9 @@ void BrowserOperation::post_load()
     IdIterator<BrowserOperation> it(all);
     BrowserOperation * op;
 
-    while ((op = it.current()) != 0) {
+    while(it.hasNext()){
+        it.next();
+        if((op = it.value()) != 0) {
         if (op->def->get_or_set()) {
             if (op->get_of != 0) {
                 if (op->get_of->deletedp() || op->get_of->is_undefined())
@@ -1078,8 +1132,7 @@ void BrowserOperation::post_load()
             else
                 op->delete_it();
         }
-
-        ++it;
+}
     }
 }
 
diff --git a/src/browser/BrowserOperation.h b/src/browser/BrowserOperation.h
index ead594685..b34a09764 100644
--- a/src/browser/BrowserOperation.h
+++ b/src/browser/BrowserOperation.h
@@ -43,6 +43,8 @@ class BrowserClass;
 class BrowserOperation : public BrowserNode, public Labeled<BrowserOperation>
 {
     friend class StereotypesDialog;
+    friend class BrowserOperationAttribute;
+    friend class QuickEdit;
 
 protected:
     static IdDict<BrowserOperation> all;
@@ -58,13 +60,13 @@ class BrowserOperation : public BrowserNode, public Labeled<BrowserOperation>
     void exec_menu_choice(int rank);
 
 public:
-    BrowserOperation(QString s, BrowserNode * p, OperationData * d, int id = 0);
+    BrowserOperation(const QString & s, BrowserNode * p, OperationData * d, int id = 0);
     BrowserOperation(const BrowserOperation * model, BrowserNode * p);
     virtual ~BrowserOperation();
 
     virtual bool undelete(bool rec, QString & warning, QString & renamed);
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     void post_duplicate();
 
     BrowserNode * get_get_of() {
@@ -91,14 +93,15 @@ class BrowserOperation : public BrowserNode, public Labeled<BrowserOperation>
     QString compute_name(const char * name_spec) const;
 
     virtual const QPixmap * pixmap(int) const;
-    virtual void paintCell(QPainter *, const QColorGroup &, int, int, int);
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
+    virtual uint TypeID();
     virtual QString get_stype() const;
     virtual int get_identifier() const;
+    virtual UmlVisibility get_visibility() const;
     virtual const char * help_topic() const;
     virtual void modified();
     virtual BasicData * get_data() const;
@@ -123,8 +126,8 @@ class BrowserOperation : public BrowserNode, public Labeled<BrowserOperation>
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserClass *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserClass *);
 
     static QString python_init_self(BrowserNode * cl);
 
@@ -139,13 +142,14 @@ class BrowserOperation : public BrowserNode, public Labeled<BrowserOperation>
     static const QStringList & default_stereotypes();
     static void read_stereotypes(char *& , char *& k);
     static void save_stereotypes(QTextStream &);
+    virtual QVariant	data(int column, int role) const;
 
 protected:
     virtual bool delete_internal(QString & warning);
 
     void AddConstructorInitalizer();
 };
-extern bool CompareAgainstTag(QString & currentTag, QString tagToCompare, const char * p);
+extern bool CompareAgainstTag(QString & currentTag, const QString & tagToCompare, const char * p);
 extern bool insert_template(const QString & tm, const char *& p, QString & s, const QString & indent);
 #endif
 
diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp
new file mode 100644
index 000000000..0d31ba6bb
--- /dev/null
+++ b/src/browser/BrowserOperationAttribute.cpp
@@ -0,0 +1,189 @@
+#include "browser/BrowserOperationAttribute.h"
+#include "browserfunctions/operationfuncs.h"
+#include "BrowserView.h"
+#include "BrowserClass.h"
+#include "OperationData.h"
+#include "UmlPixmap.h"
+
+static QStringList DirList;
+static void  FIllDirList()
+{
+    if (DirList.count() == 0)
+    {
+        // Made DirList without be linked with the items order
+        DirList.append(QString());
+        DirList.append(QString());
+        DirList.append(QString());
+        DirList[UmlInOut] = stringify(UmlInOut);
+        DirList[UmlIn] = stringify(UmlIn);
+        DirList[UmlOut] = stringify(UmlOut);
+        // can't be return
+    }
+}
+
+BrowserOperationAttribute::BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, std::shared_ptr<ParamData> _data): BrowserNodeAbstractRemove(view), operation(_operation), param(_data)
+{
+
+}
+
+BrowserOperationAttribute::~BrowserOperationAttribute()
+{
+    set_marked(false);
+}
+
+void BrowserOperationAttribute::set_name(const QString & value)
+{
+    param->set_name(value);
+}
+
+QString BrowserOperationAttribute::get_name() const
+{
+    return param->get_name();
+}
+
+void BrowserOperationAttribute::set_direction(const QString & value)
+{
+    FIllDirList();
+    UmlParamDirection dir = static_cast<UmlParamDirection>(DirList.indexOf(value));
+    param->set_dir(dir);
+}
+
+QString BrowserOperationAttribute::get_direction() const
+{
+    return stringify(param->get_dir());
+}
+
+void BrowserOperationAttribute::set_param_type(const QString & value)
+{
+    QStringList list;
+    BrowserNodeList nodes;
+    BrowserClass::instances(nodes);
+    nodes.full_names(list);
+
+//    oper->set_param_dir(index, (UmlParamDirection) DirList.findIndex(text(index, 0)));
+
+//    oper->set_param_name(index, text(index, 1).trimmed());
+
+    AType t;
+    if (!value.isEmpty())
+    {
+        int rank = list.indexOf(value);
+
+        if (rank != -1)
+            t.type = (BrowserClass *) nodes.at(rank);
+        else
+            t.explicit_type = value;
+    }
+    param->set_type(t);
+}
+
+AType BrowserOperationAttribute::get_param_type() const
+{
+    return param->get_type();
+}
+
+void BrowserOperationAttribute::set_default_value(const QString & value)
+{
+    param->set_default_value(value);
+}
+
+QString BrowserOperationAttribute::get_default_value() const
+{
+    return param->get_default_value();
+}
+
+void BrowserOperationAttribute::set_passage_type(const QString & value, int position)
+{
+    OperationData* data = (OperationData*)operation->get_data();
+    data->set_cppdecl(OperationFuncs::set_pointer(position, data->get_cppdecl(), value));
+}
+
+QString BrowserOperationAttribute::get_passage_type(int position) const
+{
+    OperationData* data = (OperationData*)operation->get_data();
+    return OperationFuncs::extract_pointer(position, data->get_cppdecl());
+}
+
+const QPixmap *BrowserOperationAttribute::pixmap(int) const
+{
+    if(!isDeleted)
+        return PublicAttributeIcon;
+    return DeletedAttributeIcon;
+}
+
+
+BrowserOperationReturnType::BrowserOperationReturnType(BrowserView* view, BrowserOperation* _operation): BrowserNodeAbstractRemove(view), operation(_operation)
+{
+    data = (OperationData*)operation->get_data();
+}
+
+void BrowserOperationReturnType::set_param_type(const QString & value)
+{
+    QStringList list;
+    BrowserNodeList nodes;
+    BrowserClass::instances(nodes);
+    nodes.full_names(list);
+
+    AType t;
+    if (!value.isEmpty())
+    {
+        int rank = list.indexOf(value);
+
+        if (rank != -1)
+            t.type = (BrowserClass *) nodes.at(rank);
+        else
+            t.explicit_type = value;
+    }
+    data->set_return_type(t);
+}
+
+AType BrowserOperationReturnType::get_param_type() const
+{
+    return data->get_return_type();
+}
+
+
+BrowserNodeAbstractRemove::BrowserNodeAbstractRemove(BrowserView* view) : BrowserNode(QString(), view)
+{
+}
+
+uint BrowserOperationAttribute::TypeID()
+{
+    return TypeIdentifier<BrowserOperationAttribute>::id();
+}
+
+bool BrowserOperationAttribute::deletedp() const
+{
+    return isDeleted;
+}
+
+void BrowserOperationAttribute::set_deleted(bool value, int position)
+{
+    OperationData* data = (OperationData*)operation->get_data();
+    if(value)
+    {
+        data->remove_param(param);
+        OperationFuncs::delete_param(position, data);
+        isDeleted = true;
+    }
+    else
+    {
+        data->insert_param(position, param);
+        OperationFuncs::recompute_param(operation, position, true);
+
+        isDeleted = false;
+    }
+
+}
+
+QString BrowserOperationAttribute::get_specifier(int position) const
+{
+    OperationData* data = (OperationData*)operation->get_data();
+    return OperationFuncs::extract_specifier(position, data->get_cppdecl());
+}
+
+void BrowserOperationAttribute::set_specifier(const QString & value, int position)
+{
+    OperationData* data = (OperationData*)operation->get_data();
+    data->set_cppdecl(OperationFuncs::set_specifier(position, data->get_cppdecl(), value));
+}
diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h
new file mode 100644
index 000000000..3ef514fc1
--- /dev/null
+++ b/src/browser/BrowserOperationAttribute.h
@@ -0,0 +1,83 @@
+#ifndef BROWSEROPERATIONATTRIBUTE_H
+#define BROWSEROPERATIONATTRIBUTE_H
+#include "BrowserNode.h"
+#include "BrowserOperation.h"
+#include "OperationData.h"
+#include "ParamData.h"
+#include "Labeled.h"
+
+class BrowserView;
+
+class BrowserNodeAbstractRemove : public BrowserNode
+{
+
+protected:
+    BrowserNodeAbstractRemove(BrowserView* view);
+    virtual BrowserNode * duplicate(BrowserNode * , const QString &) override {return 0;}
+    virtual void prepare_update_lib() const override {}
+    virtual void menu() override {}
+    virtual void apply_shortcut(const QString &) override {}
+    virtual UmlCode get_type() const override {return UmlAssociation;}
+    virtual QString get_stype() const override {return QString();}
+    virtual int get_identifier() const override {return -1;}
+    virtual BasicData * get_data() const override {return 0;}
+    virtual void save(QTextStream &, bool , QString & ) override {}
+    virtual const QPixmap * pixmap(int) const override {return NULL;}
+};
+
+
+class BrowserOperationAttribute: public BrowserNodeAbstractRemove
+{
+    BrowserOperation* operation = nullptr;
+    std::shared_ptr<ParamData> param;
+
+public:
+    BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, std::shared_ptr<ParamData> _data);
+    ~BrowserOperationAttribute();
+    BrowserOperation* get_operation() {return operation;}
+    virtual void set_name(const QString &) override;
+    virtual QString get_name() const override;
+    void set_direction(const QString &);
+    QString get_direction() const;
+    void set_param_type(const QString &);
+    AType get_param_type() const;
+    void set_default_value(const QString &);
+    QString get_default_value() const;
+
+    virtual bool is_writable() const override
+    {
+        if(operation)
+            return operation->is_writable();
+        return false;
+    }
+    bool is_get_set()
+    {
+        return ((OperationData*)operation->get_data())->get_or_set();
+    }
+    virtual void modified() override {operation->package_modified();}
+    virtual const QPixmap * pixmap(int) const override;
+    virtual uint TypeID() override;
+    bool deletedp() const;
+    using BrowserNodeAbstractRemove::set_deleted;
+    void set_deleted(bool value, int position = 0);
+    std::shared_ptr<ParamData> get_param() {return param;}
+
+    QString get_specifier(int position) const;
+    void set_specifier(const QString & value, int position);
+    void set_passage_type(const QString &, int position);
+    QString get_passage_type(int position) const;
+
+    bool isDeleted = false;
+};
+
+class BrowserOperationReturnType: public BrowserNodeAbstractRemove
+{
+    BrowserOperation* operation = nullptr;
+    OperationData* data;
+public:
+    BrowserOperationReturnType(BrowserView* view, BrowserOperation* _operation);
+    void set_param_type(const QString &);
+    AType get_param_type() const;
+};
+
+#endif // BROWSEROPERATIONATTRIBUTE_H
diff --git a/src/browser/BrowserPackage.cpp b/src/browser/BrowserPackage.cpp
index c5db30282..152ed4c78 100644
--- a/src/browser/BrowserPackage.cpp
+++ b/src/browser/BrowserPackage.cpp
@@ -24,26 +24,19 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-
-
-
-
-
-#include <q3popupmenu.h>
 #include <qfile.h>
 #include <qcursor.h>
 #include <qapplication.h>
-#include <q3filedialog.h>
-//Added by qt3to4:
+#include <qfiledialog.h>
 #include <QPixmap>
 #include <QTextStream>
 #include <QDropEvent>
+#include <QFileDialog>
 #include <QDragMoveEvent>
-
 #include "BrowserPackage.h"
 #include "PackageData.h"
-#include "BrowserClassView.h"
 #include "BrowserUseCaseView.h"
+#include "BrowserClassView.h"
 #include "BrowserClassDiagram.h"
 #include "BrowserActivityDiagram.h"
 #include "BrowserColDiagram.h"
@@ -58,55 +51,57 @@
 #include "BrowserView.h"
 #include "BrowserAttribute.h"
 #include "BrowserOperation.h"
-#include "BrowserComponent.h"
 #include "BrowserArtifact.h"
-#include "BrowserDeploymentNode.h"
 #include "BrowserComponentView.h"
+#include "BrowserComponent.h"
 #include "BrowserDeploymentView.h"
+#include "BrowserDeploymentNode.h"
 #include "BrowserSimpleRelation.h"
 #include "BrowserState.h"
 #include "BrowserPseudoState.h"
 #include "BrowserStateAction.h"
 #include "BrowserActivity.h"
+#include "BrowserActivityAction.h"
+#include "SettingsDialog.h"
 #include "BrowserFlow.h"
 #include "BrowserInterruptibleActivityRegion.h"
 #include "BrowserExpansionRegion.h"
 #include "BrowserActivityPartition.h"
 #include "BrowserParameter.h"
 #include "BrowserParameterSet.h"
-#include "BrowserActivityNode.h"
-#include "BrowserActivityAction.h"
 #include "BrowserActivityObject.h"
 #include "BrowserPin.h"
-#include "SimpleRelationData.h"
-#include "UmlPixmap.h"
-#include "UmlDrag.h"
-#include "SettingsDialog.h"
 #include "RevSettingsDialog.h"
+#include "UmlDrag.h"
+#include "BrowserActivityNode.h"
 #include "StereotypesDialog.h"
+#include "SimpleRelationData.h"
+#include "UmlPixmap.h"
 #include "GenerationSettings.h"
 #include "myio.h"
 #include "ToolCom.h"
 #include "Tool.h"
-#include "ui/menufactory.h"
+#include "mu.h"
+#include "UmlGlobal.h"
 #include "UmlWindow.h"
+#include "strutil.h"
+#include "ui/menufactory.h"
 #include "ReferenceDialog.h"
-#include "UmlGlobal.h"
-#include "mu.h"
-#include "SaveProgress.h"
 #include "DialogUtil.h"
-#include "err.h"
-#include "strutil.h"
+#include "SaveProgress.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "err.h"
+#include <QMessageBox>
+#include "DialogUtil.h"
 IdDict<BrowserPackage> BrowserPackage::all(__FILE__);
-Q3PtrList<BrowserPackage> BrowserPackage::removed;
+
+QList<BrowserPackage *> BrowserPackage::removed;
 
 QStringList BrowserPackage::its_default_stereotypes;	// unicode
 QStringList BrowserPackage::relation_default_stereotypes;	// unicode
 
-BrowserPackage::BrowserPackage(QString s, BrowserView * parent, int id)
+BrowserPackage::BrowserPackage(const QString & s, BrowserView * parent, int id)
     : BrowserNode(s, parent), Labeled<BrowserPackage>(all, id),
       def(new PackageData), associated_diagram(0), is_imported(FALSE)
 {
@@ -244,9 +239,10 @@ BrowserPackage::BrowserPackage(QString s, BrowserView * parent, int id)
     activitypartition_color = UmlTransparent;
     activityaction_color = UmlTransparent;
     parameterpin_color = UmlWhite;
+
 }
 
-BrowserPackage::BrowserPackage(QString s, BrowserNode * parent, int id)
+BrowserPackage::BrowserPackage(const QString & s, BrowserNode * parent, int id)
     : BrowserNode(s, parent), Labeled<BrowserPackage>(all, id),
       def(new PackageData), associated_diagram(0), is_imported(FALSE)
 {
@@ -254,12 +250,14 @@ BrowserPackage::BrowserPackage(QString s, BrowserNode * parent, int id)
     is_modified = (id == 0);
     revision = 1;
     owner = -1;
+    setIcon(0, QIcon(*pixmap(0)));
 }
 
 BrowserPackage::BrowserPackage(const BrowserPackage * model,
                                BrowserNode * p)
     : BrowserNode(model->name, p), Labeled<BrowserPackage>(all, 0)
 {
+
     def = new PackageData(model->def);
     def->set_browser_node(this);
     comment = model->comment;
@@ -322,10 +320,9 @@ BrowserPackage::~BrowserPackage()
 
             QDir d = BrowserView::get_dir();
 
-            QFile::remove(d.absFilePath(fn));
+            QFile::remove(d.absoluteFilePath(fn));
         }
-
-        removed.remove(this);
+        removed.removeOne(this);
         all.remove(get_ident());
     }
 
@@ -334,6 +331,7 @@ BrowserPackage::~BrowserPackage()
 
 void BrowserPackage::make()
 {
+
     def->set_browser_node(this);
 
     class_color = UmlDefaultColor;
@@ -356,7 +354,7 @@ void BrowserPackage::make()
     parameterpin_color = UmlDefaultColor;
 }
 
-BrowserNode * BrowserPackage::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserPackage::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserPackage * result = new BrowserPackage(this, p);
 
@@ -368,16 +366,16 @@ BrowserNode * BrowserPackage::duplicate(BrowserNode * p, QString name)
 
 void BrowserPackage::clear(bool old)
 {
+
     if (! old)
         set_user_id(-1);
 
     all.clear(old);
-    BrowserClassView::clear(old);
     BrowserUseCaseView::clear(old);
+    BrowserClassView::clear(old);
     BrowserComponentView::clear(old);
     BrowserDeploymentView::clear(old);
     BrowserDiagram::clear(old);
-
     if (! old)
         check_ids_cleared();
 }
@@ -385,8 +383,9 @@ void BrowserPackage::clear(bool old)
 void BrowserPackage::update_idmax_for_root()
 {
     all.update_idmax_for_root();
-    BrowserClassView::update_idmax_for_root();
     BrowserUseCaseView::update_idmax_for_root();
+    BrowserClassView::update_idmax_for_root();
+
     BrowserComponentView::update_idmax_for_root();
     BrowserDeploymentView::update_idmax_for_root();
     BrowserDiagram::update_idmax_for_root();
@@ -395,14 +394,13 @@ void BrowserPackage::update_idmax_for_root()
 void BrowserPackage::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
-
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserPackage::support_file(Q3Dict<char> & files, bool add) const
+void BrowserPackage::support_file(QHash<QString,char*>  & files, bool add) const
 {
     QString s;
 
@@ -413,17 +411,19 @@ void BrowserPackage::support_file(Q3Dict<char> & files, bool add) const
     else
         files.remove(s);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->support_file(files, add);
+
 }
 
-void BrowserPackage::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserPackage::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
     if (! ondelete) {
+
         BrowserActivityDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref");
         BrowserClassDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref");
         BrowserColDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref");
@@ -438,6 +438,7 @@ void BrowserPackage::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
 
 const QPixmap * BrowserPackage::pixmap(int) const
 {
+
     if (this == BrowserView::get_project())
         return 0;
 
@@ -456,12 +457,14 @@ const QPixmap * BrowserPackage::pixmap(int) const
 
 void BrowserPackage::iconChanged()
 {
+
     repaint();
     def->modified();
 }
 
 void BrowserPackage::update_stereotype(bool rec)
 {
+
     if (def != 0) {
         const char * stereotype = def->get_stereotype();
 
@@ -469,18 +472,19 @@ void BrowserPackage::update_stereotype(bool rec)
                 stereotype[0] &&
                 (strcmp(stereotype, "profile") != 0)) {
             QString s = QString(QLatin1String(stereotype));
-            int index = s.find(':');
-
+            int index = s.indexOf(':');
             setText(0,
                     "<<" + ((index == -1) ? s : s.mid(index + 1))
                     + ">> " + name);
         }
         else
+        {
             setText(0, name);
+        }
     }
 
     if (rec) {
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             ((BrowserNode *) child)->update_stereotype(TRUE);
@@ -509,18 +513,19 @@ QString BrowserPackage::full_name(bool rev, bool) const
 
 void BrowserPackage::prepare_for_sort()
 {
-    IdIterator<BrowserPackage> it(all);
 
-    while (it.current() != 0) {
-        it.current()->full_path = QString();
-        ++it;
+    IdIterator<BrowserPackage> it(all);
+    while (it.hasNext()) {
+        it.next();
+        if(it.value())
+            it.value()->full_path = QString();
     }
 }
 
 // just check if the inheritance already exist
 QString BrowserPackage::check_inherit(const BrowserNode * new_parent) const
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = firstChild(); child != 0; child = child->nextSibling()) {
         BrowserNode * ch = ((BrowserNode *) child);
@@ -528,122 +533,134 @@ QString BrowserPackage::check_inherit(const BrowserNode * new_parent) const
         if ((ch->get_type() == UmlInherit) &&
                 ((((SimpleRelationData *) ch->get_data())->get_end_node())
                  == new_parent))
-            return TR("already exist");
+            return QObject::tr("already exist");
     }
 
-    return (new_parent != this) ? QString() : TR("circular inheritance");
+    return (new_parent != this) ? QString() : QObject::tr("circular inheritance");
 }
 
 static int phase_renumerotation = -1;
 
 void BrowserPackage::menu()
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu genm(0);
-    Q3PopupMenu revm(0);
-    Q3PopupMenu roundtripm(0);
-    Q3PopupMenu roundtripbodym(0);
-    Q3PopupMenu toolm(0);
-    Q3PopupMenu importm(0);
+
+    QMenu m(0);
+    QMenu genm(0);
+    QMenu revm(0);
+    QMenu roundtripm(0);
+    QMenu roundtripbodym(0);
+    QMenu toolm(0);
+    QMenu importm(0);
     bool isprofile = (strcmp(def->get_stereotype(), "profile") == 0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only && (edition_number == 0)) {
-            m.setWhatsThis(m.insertItem(TR("New package"), 0),
-                           TR("to add a new sub <i>package</i>"));
-            m.setWhatsThis(m.insertItem(TR("New use case view"), 1),
-                           TR("to add a new <i>use case view</i>"));
+            QAction* action;
+            action = m.addAction(QObject::tr("New package"));
+            action->setWhatsThis(QObject::tr("to add a new sub <i>package</i>"));
+            action->setData(0);
+
+            action = m.addAction(QObject::tr("New use case view"));
+            action->setWhatsThis(QObject::tr("to add a new <i>use case view</i>"));
+            action->setData(1);
 
             if (isprofile)
-                m.setWhatsThis(m.insertItem(TR("New class/stereotype view"), 2),
-                               TR("to add a new <i>class/stereotype view</i>"));
+            {
+                MenuFactory::addItem(m, ("New class/stereotype view"), 2,
+                                     ("to add a new <i>class/stereotype view</i>"));
+            }
             else {
-                m.setWhatsThis(m.insertItem(TR("New class view"), 2),
-                               TR("to add a new <i>class view</i>"));
-                m.setWhatsThis(m.insertItem(TR("New component view"), 3),
-                               TR("to add a new <i>class view</i>"));
-                m.setWhatsThis(m.insertItem(TR("New deployment view"), 4),
-                               TR("to add a new <i>deployment view</i>"));
+                MenuFactory::addItem(m, ("New class view"), 2,
+                                     ("to add a new <i>class view</i>"));
+                MenuFactory::addItem(m, ("New component view"), 3,
+                                     ("to add a new <i>class view</i>"));
+                MenuFactory::addItem(m, ("New deployment view"), 4,
+                                     ("to add a new <i>deployment view</i>"));
             }
+            MenuFactory::addItem(m, ("New profile"), 15,
+                                 ("to add a new <i>profile</i>"));
+            m.addSeparator();
+            MenuFactory::addItem(m, ("Import project"), 14,
+                                 ("to import the contents of a <i>project</i> under \
+                                  the current <i>package</i>"));
+                                  MenuFactory::addItem(m, ("Import project as library"), 16,
+                                                       ("to import the contents of a <i>project</i> under \
+                                                        the current <i>package</i> and to be able later to reimport it to update it"));
 
-            m.setWhatsThis(m.insertItem(TR("New profile"), 15),
-                           TR("to add a new <i>profile</i>"));
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Import project"), 14),
-                           TR("to import the contents of a <i>project</i> under \
-                              the current <i>package</i>"));
-                              m.setWhatsThis(m.insertItem(TR("Import project as library"), 16),
-                                             TR("to import the contents of a <i>project</i> under \
-                                                the current <i>package</i> and to be able later to reimport it to update it"));
         }
-
         if (!is_edited) {
             if ((edition_number == 0) &&
                     is_from_lib() &&
                     !((BrowserPackage *) parent())->is_from_lib()) {
-                m.setWhatsThis(m.insertItem(TR("Update imported library"), 17),
-                               TR("to update the previously imported <i>project</i>"));
-                m.insertSeparator();
+                MenuFactory::addItem(m, ("Update imported library"), 17,
+                                     ("to update the previously imported <i>project</i>"));
+                m.addSeparator();
             }
 
-            m.setWhatsThis(m.insertItem(TR("Edit"), 5),
-                           TR("to edit the package"));
+            MenuFactory::addItem(m, ("Edit"), 5,
+                                 ("to edit the package"));
 
             if (!is_read_only) {
-                m.insertSeparator();
+                m.addSeparator();
 
                 if (this == BrowserView::get_project()) {
-                    m.setWhatsThis(m.insertItem(TR("Edit generation settings"), 8),
-                                   TR("to set how an Uml type is compiled in C++ etc..., \
-                                      to set the default parameter passing, to set the default code \
-                                      produced for an attribute etc..., and to set the root directories"));
-                                      m.setWhatsThis(m.insertItem(TR("Edit reverse/roundtrip settings"), 18),
-                                                     TR("to specify directory/file to not reverse/roundtrip them"));
-                                   m.setWhatsThis(m.insertItem(TR("Edit default stereotypes"), 6),
-                                                  TR("to set the default stereotypes list"));
+                    MenuFactory::addItem(m, ("Edit generation settings"), 8,
+                                         QObject::tr("to set how an Uml type is compiled in C++ etc...,"
+                                          "to set the default parameter passing, to set the default code"
+                                          "produced for an attribute etc..., and to set the root directories"));
+                    MenuFactory::addItem(m, ("Edit reverse/roundtrip settings"), 18,
+                                                               ("to specify directory/file to not reverse/roundtrip them"));
+                    MenuFactory::addItem(m, ("Edit default stereotypes"), 6,
+                                                              ("to set the default stereotypes list"));
                 }
 
-                m.setWhatsThis(m.insertItem(TR("Edit class settings"), 7),
-                               TR("to set the sub classes's settings"));
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 9),
-                               TR("to set how the sub <i>diagrams</i>'s items must be drawn"));
+                MenuFactory::addItem(m, ("Edit class settings"), 7,
+                                     ("to set the sub classes's settings"));
+                MenuFactory::addItem(m, ("Edit drawing settings"), 9,
+                                     ("to set how the sub <i>diagrams</i>'s items must be drawn"));
 
                 if (this == BrowserView::get_project()) {
-                    m.insertItem(TR("Import"), &importm);
-                    m.setWhatsThis(importm.insertItem(TR("Generation settings"), 28),
-                                   TR("to import the generation settings from an other project, \
-                                      note that the root directories are not imported"));
-                                      m.setWhatsThis(importm.insertItem(TR("Default stereotypes"), 29),
-                                                     TR("to import the default stereotypes from an other project"));
+                    importm.setTitle(("Import"));
+                    m.addMenu(&importm);
+                    MenuFactory::addItem(importm, ("Generation settings"), 28,
+                                         ("to import the generation settings from an other project, \
+                                          note that the root directories are not imported"));
+                                          //m.setWhatsThis(importm.insertItem(("Default stereotypes"), 29,
+                                          //("to import the default stereotypes from an other project"));
+
+
+                                          MenuFactory::addItem(importm, ("Default stereotypes"), 29,
+                                                               ("to import the default stereotypes from an other project"));
                 }
 
                 if ((edition_number == 0) && (this != BrowserView::get_project())) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 10),
-                                   TR("to delete the <i>package</i> and its sub items. \
-                                      Note that you can undelete it after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m, ("Delete"), 10,
+                                         ("to delete the <i>package</i> and its sub items. \
+                                          Note that you can undelete it after"));
                 }
             }
             else if ((edition_number == 0) &&
                      is_from_lib() &&
                      !((BrowserPackage *) parent())->is_from_lib() &&
                      !((BrowserPackage *) parent())->is_read_only) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Delete"), 10),
-                               TR("to delete the <i>package</i> and its sub items. \
-                                  Note that you can undelete it after"));
+                m.addSeparator();
+                MenuFactory::addItem(m, ("Delete"), 10,
+                                     ("to delete the <i>package</i> and its sub items. \
+                                      Note that you can undelete it after"));
             }
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 13),
-                       TR("to know who reference the <i>package</i> \
-                          through a relation"));
-                          mark_menu(m, TR("the package"), 90);
-                       ProfiledStereotypes::menu(m, this, 99990);
+        m.addSeparator();
+        MenuFactory::addItem(m, ("Referenced by"), 13,
+                             ("to know who reference the <i>package</i> \
+                              through a relation"));
+                              mark_menu(m, QString(QObject::tr("the package")), 90);
+                             ProfiledStereotypes::menu(m, this, 99990);
+
 
                 if (! isprofile) {
             bool cpp = GenerationSettings::cpp_get_default_defs();
@@ -653,65 +670,70 @@ void BrowserPackage::menu()
             bool idl = GenerationSettings::idl_get_default_defs();
 
             if (cpp || java || php || python || idl) {
-                m.insertSeparator();
-                m.insertItem(TR("Generate"), &genm);
+                m.addSeparator();
+                genm.setTitle(QObject::tr("Generate"));
+                m.addMenu(&genm);
 
                 if (cpp)
-                    genm.insertItem("C++", 20);
+                    MenuFactory::addItem(genm,"C++", 20);
 
                 if (java)
-                    genm.insertItem("Java", 21);
+                    MenuFactory::addItem(genm,"Java", 21);
 
                 if (php)
-                    genm.insertItem("Php", 22);
+                    MenuFactory::addItem(genm,"Php", 22);
 
                 if (python)
-                    genm.insertItem("Python", 34);
+                    MenuFactory::addItem(genm,"Python", 34);
 
                 if (idl)
-                    genm.insertItem("Idl", 23);
+                    MenuFactory::addItem(genm,"Idl", 23);
             }
 
             if (edition_number == 0) {
                 if (!is_read_only && (cpp || java || php || python)) {
-                    m.insertItem(TR("Reverse"), &revm);
+                    revm.setTitle(QObject::tr("Reverse"));
+                    m.addMenu(&revm);
 
                     if (cpp)
-                        revm.insertItem("C++", 24);
+                        MenuFactory::addItem(revm,"C++", 24);
 
                     if (java) {
-                        revm.insertItem("Java", 25);
-                        revm.insertItem("Java Catalog", 26);
+                        MenuFactory::addItem(revm,"Java", 25);
+                        MenuFactory::addItem(revm,"Java Catalog", 26);
                     }
 
                     if (php)
-                        revm.insertItem("Php", 32);
+                        MenuFactory::addItem(revm,"Php", 32);
 
-//#warning reverse python
+                    //#warning reverse python
 
 
                     if (java || cpp) {
-                        m.insertItem(TR("Roundtrip"), &roundtripm);
+                        roundtripm.setTitle(QObject::tr("Roundtrip"));
+                        m.addMenu(&roundtripm);
 
-                        if (cpp) roundtripm.insertItem("C++", 38);
+                        if (cpp) MenuFactory::addItem(roundtripm,"C++", 38);
 
-                        if (java) roundtripm.insertItem("Java", 37);
+                        if (java) MenuFactory::addItem(roundtripm,"Java", 37);
                     }
 
                     if (preserve_bodies()) {
-                        m.insertItem(TR("Roundtrip body"), &roundtripbodym);
+
+                        roundtripbodym.setTitle(QObject::tr("Roundtrip body"));
+                        m.addMenu( &roundtripbodym);
 
                         if (cpp)
-                            roundtripbodym.insertItem("C++", 30);
+                            MenuFactory::addItem(roundtripbodym,"C++", 30);
 
                         if (java)
-                            roundtripbodym.insertItem("Java", 31);
+                            MenuFactory::addItem(roundtripbodym,"Java", 31);
 
                         if (php)
-                            roundtripbodym.insertItem("Php", 33);
+                            MenuFactory::addItem(roundtripbodym,"Php", 33);
 
                         if (python)
-                            roundtripbodym.insertItem("Python", 36);
+                            MenuFactory::addItem(roundtripbodym,"Python", 36);
                     }
                 }
             }
@@ -720,47 +742,50 @@ void BrowserPackage::menu()
         if (Tool::menu_insert(&toolm,
                               (this == BrowserView::get_project()) ? UmlProject : UmlPackage,
                               100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 11),
-                       TR("undelete the <i>package</i>. Do not undelete its sub items"));
-        m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 12),
-                       TR("undelete the <i>package</i> and its sub items"));
+        MenuFactory::addItem(m, ("Undelete"), 11,
+                             ("undelete the <i>package</i>. Do not undelete its sub items"));
+        MenuFactory::addItem(m, ("Undelete recursively"), 12,
+                             "undelete the <i>package</i> and its sub items");
     }
 
     if (user_id() == 0) {
-        m.insertSeparator();
-        m.insertSeparator();
-        m.insertSeparator();
-        m.insertSeparator();
-        m.insertSeparator();
+        m.addSeparator();
+        m.addSeparator();
+        m.addSeparator();
+        m.addSeparator();
+        m.addSeparator();
 
         switch (phase_renumerotation) {
         case -1:
             if (this == BrowserView::get_project())
-                m.insertItem("PREPARE la renumerotation", 27);
+                MenuFactory::addItem(m,"PREPARE la renumerotation", 27);
 
             break;
 
         case 0:
-            m.insertItem("Renumerotation BASE", 27);
+            MenuFactory::addItem(m,"Renumerotation BASE", 27);
             break;
 
         case 1:
-            m.insertItem("Renumerotation USER", 27);
+            MenuFactory::addItem(m,"Renumerotation USER", 27);
             break;
         }
     }
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 
-    exec_menu_choice(m.exec(QCursor::pos()));
 }
 
 static bool contain_profile(BrowserPackage * p)
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = p->firstChild(); child != 0; child = child->nextSibling()) {
         if (!((BrowserNode *) child)->deletedp() &&
@@ -771,15 +796,14 @@ static bool contain_profile(BrowserPackage * p)
                 return TRUE;
         }
     }
-
     return FALSE;
 }
 
 void BrowserPackage::exec_menu_choice(int rank)
 {
+
     bool preserve = preserve_bodies();
     bool isprofile = (strcmp(def->get_stereotype(), "profile") == 0);
-
     switch (rank) {
     case 0:
         add_package(FALSE);
@@ -793,6 +817,7 @@ void BrowserPackage::exec_menu_choice(int rank)
             return;
 
         v->select_in_browser();
+
     }
         break;
 
@@ -819,6 +844,7 @@ void BrowserPackage::exec_menu_choice(int rank)
             return;
 
         v->select_in_browser();
+
     }
         break;
 
@@ -859,8 +885,8 @@ void BrowserPackage::exec_menu_choice(int rank)
 
     case 10:
         if (!strcmp(get_data()->get_stereotype(), "profile")) {
-            bool propag = (msg_warning(TR("Question"),
-                                       TR("Propagate the removal of the profile ?"),
+            bool propag = (msg_warning(QObject::tr("Question"),
+                                       QObject::tr("Propagate the removal of the profile ?"),
                                        1, 2)
                            == 1);
             ProfiledStereotypes::deleted(this, propag);
@@ -871,12 +897,12 @@ void BrowserPackage::exec_menu_choice(int rank)
                     contain_profile(this);
 
             delete_it();
-
             if (recomp)
                 ProfiledStereotypes::recompute(FALSE);
         }
 
         ((BrowserNode *) parent())->package_modified();
+
         break;
 
     case 11:
@@ -1053,10 +1079,11 @@ void BrowserPackage::exec_menu_choice(int rank)
     default:
         if (rank >= 99990)
             ProfiledStereotypes::choiceManagement(this, rank - 99990);
-        else if (rank >= 100)
-            ToolCom::run(Tool::command(rank - 100), this);
         else
-            mark_management(rank - 90);
+            if (rank >= 100)
+                ToolCom::run(Tool::command(rank - 100), this);
+            else
+                mark_management(rank - 90);
 
         return;
     }
@@ -1064,7 +1091,7 @@ void BrowserPackage::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserPackage::apply_shortcut(QString s)
+void BrowserPackage::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -1144,6 +1171,7 @@ void BrowserPackage::apply_shortcut(QString s)
             if ((choice == -1) && (edition_number == 0))
                 Tool::shortcut(s, choice, get_type(), 100);
         }
+
     }
     else if (!is_read_only && (edition_number == 0)) {
         if (s == "Undelete")
@@ -1190,6 +1218,7 @@ void BrowserPackage::edit_class_settings()
 
 void BrowserPackage::edit_drawing_settings()
 {
+
     for (;;) {
         StateSpecVector st;
         ColorSpecVector co(18);
@@ -1204,24 +1233,24 @@ void BrowserPackage::edit_drawing_settings()
         statediagram_settings.complete(st, FALSE);
         activitydiagram_settings.complete(st, FALSE);
 
-        co[0].set(TR("class color"), &class_color);
-        co[1].set(TR("note color"), &note_color);
-        co[2].set(TR("package color"), &package_color);
-        co[3].set(TR("fragment color"), &fragment_color);
-        co[4].set(TR("subject color"), &subject_color);
-        co[5].set(TR("use case color"), &usecase_color);
-        co[6].set(TR("duration color"), &duration_color);
-        co[7].set(TR("continuation color"), &continuation_color);
-        co[8].set(TR("component color"), &component_color);
-        co[9].set(TR("artifact color"), &artifact_color);
-        co[10].set(TR("node color"), &deploymentnode_color);
-        co[11].set(TR("state color"), &state_color);
-        co[12].set(TR("state action color"), &stateaction_color);
-        co[13].set(TR("activity color"), &activity_color);
-        co[14].set(TR("activity region color"), &activityregion_color);
-        co[15].set(TR("activity partition color"), &activitypartition_color);
-        co[16].set(TR("activity action color"), &activityaction_color);
-        co[17].set(TR("parameter and pin color"), &parameterpin_color);
+        co[0].set (QObject::tr("class color"), &class_color);
+        co[1].set (QObject::tr("note color"), &note_color);
+        co[2].set (QObject::tr("package color"), &package_color);
+        co[3].set (QObject::tr("fragment color"), &fragment_color);
+        co[4].set (QObject::tr("subject color"), &subject_color);
+        co[5].set (QObject::tr("use case color"), &usecase_color);
+        co[6].set (QObject::tr("duration color"), &duration_color);
+        co[7].set (QObject::tr("continuation color"), &continuation_color);
+        co[8].set (QObject::tr("component color"), &component_color);
+        co[9].set (QObject::tr("artifact color"), &artifact_color);
+        co[10].set (QObject::tr("node color"), &deploymentnode_color);
+        co[11].set (QObject::tr("state color"), &state_color);
+        co[12].set (QObject::tr("state action color"), &stateaction_color);
+        co[13].set (QObject::tr("activity color"), &activity_color);
+        co[14].set (QObject::tr("activity region color"), &activityregion_color);
+        co[15].set (QObject::tr("activity partition color"), &activitypartition_color);
+        co[16].set (QObject::tr("activity action color"), &activityaction_color);
+        co[17].set (QObject::tr("parameter and pin color"), &parameterpin_color);
 
         SettingsDialog dialog(&st, &co, this == BrowserView::get_project());
 
@@ -1235,24 +1264,25 @@ void BrowserPackage::edit_drawing_settings()
         if (!dialog.redo())
             break;
     }
+
 }
 
 
 BrowserNodeList & BrowserPackage::instances(BrowserNodeList & result)
 {
-    IdIterator<BrowserPackage> it(all);
 
-    while (it.current() != 0) {
-        if (!it.current()->deletedp()) {
-            it.current()->full_path = QString();
-            result.append(it.current());
-        }
+    IdIterator<BrowserPackage> it(all);
 
-        ++it;
+    while (it.hasNext()) {
+        it.next();
+        if(it.value() != 0)
+            if (!it.value()->deletedp()) {
+                it.value()->full_path = QString();
+                result.append(it.value());
+            }
     }
 
     result.sort_it();
-
     return result;
 }
 
@@ -1261,25 +1291,21 @@ BrowserPackage * BrowserPackage::get_package()
     if (BrowserView::get_project()->firstChild() == 0)
         // only the prj
         return 0;
-
     BrowserNode * old;
     QString dummy;
     BrowserNodeList nodes;
-
-    BrowserView::get_project()->enter_child_name(dummy, TR("choose existing package : "),
+    BrowserView::get_project()->enter_child_name(dummy, QObject::tr("choose existing package : "),
                                                  UmlPackage, instances(nodes), &old,
                                                  FALSE, TRUE, TRUE);
-
     return ((BrowserPackage *) old);
 }
 
 void BrowserPackage::add_package(bool profile)
 {
     QString name;
-
     if (enter_child_name(name,
-                         (profile) ? TR("enter profile's name : ")
-                         : TR("enter package's name : "),
+                         (profile) ? QObject::tr("enter profile's name : ")
+                         : QObject::tr("enter package's name : "),
                          UmlPackage, TRUE, FALSE)) {
         BrowserPackage * p = new BrowserPackage(name, this);
 
@@ -1290,45 +1316,43 @@ void BrowserPackage::add_package(bool profile)
 
         if ((owner != -1) &&
                 (msg_warning("Douml",
-                             TR("Do you want to be the owner of this new package ?\n"
-                                "(other users can't modify it while you are the owner)"),
+                             QObject::tr("Do you want to be the owner of this new package ?\n"
+                                         "(other users can't modify it while you are the owner)"),
                              QMessageBox::Yes, QMessageBox::No)
                  == QMessageBox::Yes))
             p->owner = owner;
     }
 }
 
-BrowserPackage * BrowserPackage::import_project(QString fn, bool aslib, int id)
+BrowserPackage * BrowserPackage::import_project(const QString & fnInit, bool aslib, int id)
 {
+    QString fn = fnInit;
+    
     bool manual = fn.isEmpty();
-
     if (manual) {
-        fn = Q3FileDialog::getOpenFileName(last_used_directory(), "*.prj");
+        fn = QFileDialog::getOpenFileName(0, "import project", last_used_directory(), "*.prj");
 
         if (fn.isEmpty())
             return 0;
     }
 
     set_last_used_directory(fn);
-
     QFileInfo fi(fn);
 
     if (!fi.exists() ||
             !fi.isFile() ||
-            (fi.extension(FALSE).lower() != "prj"))
+            (/*fi.extension(FALSE).lower()*/!fi.fileName().endsWith("prj", Qt::CaseInsensitive)))
         return 0;
 
     QString bname = my_baseName(fi);
-
     if (wrong_child_name(bname, UmlPackage, TRUE, FALSE)) {
         if (manual)
-            msg_critical(TR("Error"), TR("illegal name or already used"));
+            msg_critical(QObject::tr("Error"), QObject::tr("illegal name or already used"));
 
         return 0;
     }
-
-    QApplication::setOverrideCursor(Qt::waitCursor);
-    QDir di(fi.dirPath(TRUE));
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    QDir di(fi.dir());
 
     BrowserPackage * p = new BrowserPackage(bname, this, id);
     bool err = FALSE;
@@ -1370,19 +1394,19 @@ BrowserPackage * BrowserPackage::import_project(QString fn, bool aslib, int id)
         package_modified();
 
     QApplication::restoreOverrideCursor();
-
     return p;
 }
 
 void BrowserPackage::update_lib()
 {
+
     if (must_be_saved()) {
         if (msg_warning("Douml",
-                        TR("The project is modified and need to be saved first.\n"
-                           "If you don't want to save your modifications reload\n"
-                           "the project then ask again for the update\n"
-                           "\n"
-                           "Save it to perform update ?\n"),
+                        QObject::tr("The project is modified and need to be saved first.\n"
+                                    "If you don't want to save your modifications reload\n"
+                                    "the project then ask again for the update\n"
+                                    "\n"
+                                    "Save it to perform update ?\n"),
                         QMessageBox::Yes, QMessageBox::Cancel)
                 != QMessageBox::Yes)
             return;
@@ -1390,28 +1414,27 @@ void BrowserPackage::update_lib()
         UmlWindow::save_it();
     }
 
-    Q3Dict<char> files;
+    QHash<QString, char*> files;
 
     support_file(files, TRUE);
 
-    Q3DictIterator<char> it(files);
+    QHashIterator<QString,char*> it(files);
     QDir d = BrowserView::get_dir();
 
-    while (it.current()) {
-        QFileInfo fi(d, it.currentKey());
+    while (it.hasNext()) {
+        it.next();
+        QFileInfo fi(d, it.key());
 
         if (!fi.exists())
-            files.remove(it.currentKey()); // update it
+            files.remove(it.key()); // update it
         else if (!fi.isWritable()) {
-            msg_critical(TR("Error"), TR("file '%1' is read only, update aborted", it.currentKey()));
+            msg_critical (QObject::tr("Error"), QObject::tr("file '%1' is read only, update aborted").arg(it.key()));
             files.clear();
             return;
         }
-        else
-            ++it;
     }
 
-    QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), name + ".prj");
+    QString fn = QFileDialog::getOpenFileName(0, "", last_used_directory(), name + ".prj");
 
     if (fn.isEmpty())
         return;
@@ -1419,13 +1442,13 @@ void BrowserPackage::update_lib()
     QFileInfo fi(fn);
 
     if (my_baseName(fi) != name) {
-        msg_critical(TR("Error"), TR("you didn't select project '%1'", name));
+        msg_critical (QObject::tr("Error"), QObject::tr("you didn't select project '%1'").arg(name));
         return;
     }
 
     BrowserPackage * container = (BrowserPackage *) parent();
-    Q3ListViewItem * previous = 0;
-    Q3ListViewItem * child = container->firstChild();
+    BrowserNode * previous = 0;
+    BrowserNode * child = container->firstChild();
 
     while (this != child) {
         previous = child;
@@ -1433,26 +1456,39 @@ void BrowserPackage::update_lib()
     }
 
     prepare_update_lib();
-    container->takeItem(this);
+    container->removeChild(this);
 
     BrowserPackage * updated = container->import_project(fn, TRUE, get_ident());
 
     updated->original_id = original_id;
     updated->support_file(files, FALSE);
-    it.toFirst();
+    it.toFront();
 
-    for (; it.current(); ++it)
-        QFile::remove(d.absFilePath(it.currentKey()));
+    for (; it.value(); it.next())
+        QFile::remove(d.absoluteFilePath(it.key()));
 
     if (previous != 0)
-        updated->moveItem(previous);
+    {
+        //updated->moveItem(previous);
+        QTreeWidgetItem *parentOfUpdated = updated->parent();
+        parentOfUpdated->removeChild(updated);
+        parentOfUpdated->insertChild(parentOfUpdated->indexOfChild(previous), updated);
+        //updated->moveItem(previous);
+    }
     else
-        container->insertItem(updated);
+    {
+        QTreeWidgetItem *parentOfContainer = container->parent();
+        //container->insertItem(updated);
+        parentOfContainer->insertChild(parentOfContainer->indexOfChild(updated), container);
+    }
 
     updated->select_in_browser();
 
     UmlWindow::save_it();
-    container->insertItem(this);
+    //container->insertItem(this);
+    QTreeWidgetItem *parentOfContainer = container->parent();
+    parentOfContainer->insertChild(parentOfContainer->indexOfChild(updated), this);
+
     UmlWindow::reload_it();
 }
 
@@ -1463,7 +1499,7 @@ UmlCode BrowserPackage::get_type() const
 
 QString BrowserPackage::get_stype() const
 {
-    return TR("package");
+    return QObject::tr("package");
 }
 
 int BrowserPackage::get_identifier() const
@@ -1481,6 +1517,7 @@ const char * BrowserPackage::help_topic() const
 BasicData * BrowserPackage::get_data() const
 {
     return def;
+
 }
 
 void BrowserPackage::get_classdiagramsettings(ClassDiagramSettings & r) const
@@ -1497,48 +1534,63 @@ void BrowserPackage::get_sequencediagramsettings(SequenceDiagramSettings & r) co
 
 void BrowserPackage::get_collaborationdiagramsettings(CollaborationDiagramSettings & r) const
 {
+
     if (! collaborationdiagram_settings.complete(r))
         ((BrowserNode *) parent())->get_collaborationdiagramsettings(r);
+
 }
 
 void BrowserPackage::get_objectdiagramsettings(ObjectDiagramSettings & r) const
 {
+
     if (! objectdiagram_settings.complete(r))
         ((BrowserNode *) parent())->get_objectdiagramsettings(r);
+
 }
 
 void BrowserPackage::get_usecasediagramsettings(UseCaseDiagramSettings & r) const
 {
+
     if (! usecasediagram_settings.complete(r))
         ((BrowserNode *) parent())->get_usecasediagramsettings(r);
+
 }
 
 void BrowserPackage::get_componentdiagramsettings(ComponentDiagramSettings & r) const
 {
+
     if (! componentdiagram_settings.complete(r))
         ((BrowserNode *) parent())->get_componentdiagramsettings(r);
+
 }
 
 void BrowserPackage::get_deploymentdiagramsettings(DeploymentDiagramSettings & r) const
 {
+
     if (! deploymentdiagram_settings.complete(r))
         ((BrowserNode *) parent())->get_deploymentdiagramsettings(r);
+
 }
 
 void BrowserPackage::get_statediagramsettings(StateDiagramSettings & r) const
 {
+
     if (! statediagram_settings.complete(r))
         ((BrowserNode *) parent())->get_statediagramsettings(r);
+
 }
 
 void BrowserPackage::get_activitydiagramsettings(ActivityDiagramSettings & r) const
 {
+
     if (! activitydiagram_settings.complete(r))
         ((BrowserNode *) parent())->get_activitydiagramsettings(r);
+
 }
 
 UmlColor BrowserPackage::get_color(UmlCode who) const
 {
+
     UmlColor c;
 
     switch (who) {
@@ -1627,8 +1679,10 @@ UmlVisibility BrowserPackage::get_visibility(UmlCode who) const
 {
     UmlVisibility v;
 
+
     switch (who) {
     case UmlAttribute:
+
         v = class_settings.attribute_visibility;
         break;
 
@@ -1644,6 +1698,7 @@ UmlVisibility BrowserPackage::get_visibility(UmlCode who) const
     return (v != UmlDefaultVisibility)
             ? v
             : ((BrowserNode *) parent())->get_visibility(who);
+
 }
 
 void BrowserPackage::open(bool force_edit)
@@ -1668,6 +1723,7 @@ BrowserNode * BrowserPackage::get_associated() const
 void BrowserPackage::set_associated_diagram(BrowserNode * dg,
                                             bool on_read)
 {
+
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
             QObject::disconnect(associated_diagram->get_data(), SIGNAL(deleted()),
@@ -1680,6 +1736,7 @@ void BrowserPackage::set_associated_diagram(BrowserNode * dg,
         if (! on_read)
             package_modified();
     }
+
 }
 
 void BrowserPackage::on_delete()
@@ -1715,7 +1772,7 @@ QString BrowserPackage::may_connect(UmlCode & l, const BrowserNode * dest) const
             return check_inherit(dest);
 
         default:
-            return TR("illegal");
+            return QObject::tr("illegal");
         }
 
     case UmlActivity:
@@ -1733,11 +1790,11 @@ QString BrowserPackage::may_connect(UmlCode & l, const BrowserNode * dest) const
             return 0;
 
         default:
-            return TR("illegal");
+            return QObject::tr("illegal");
         }
 
     default:
-        return TR("illegal");
+        return QObject::tr("illegal");
     }
 }
 
@@ -1748,13 +1805,13 @@ bool BrowserPackage::tool_cmd(ToolCom * com, const char * args)
         QString fn;
 
         if (this == BrowserView::get_project())
-            fn = name +"s.prj" ;
+            fn = name +".prj" ;
         else
             fn.setNum(get_ident());
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
         return TRUE;
@@ -1970,7 +2027,6 @@ bool BrowserPackage::tool_global_cmd(ToolCom * com, const char * args)
 
     return TRUE;
 }
-
 BrowserPackage *
 BrowserPackage::find_it(const char * s,
                         const WrapperStr & (PackageData::* pf)() const)
@@ -1981,7 +2037,7 @@ BrowserPackage::find_it(const char * s,
             return this;
         }
         else {
-            for (Q3ListViewItem * child = firstChild();
+            for (BrowserNode * child = firstChild();
                  child != 0;
                  child = child->nextSibling()) {
                 if (((BrowserNode *) child)->get_type() == UmlPackage) {
@@ -1992,13 +2048,13 @@ BrowserPackage::find_it(const char * s,
                         return p;
                 }
             }
+
         }
     }
 
     return 0;
 }
 
-
 void BrowserPackage::DragMoveEvent(QDragMoveEvent * e)
 {
     bool rel = UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this));
@@ -2035,13 +2091,11 @@ void BrowserPackage::DragMoveInsideEvent(QDragMoveEvent * e)
         e->ignore();
 }
 
-bool BrowserPackage::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserPackage::may_contains_them(const QList<BrowserNode *> & l,
                                        BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlPackage:
         case UmlUseCaseView:
         case UmlClassView:
@@ -2050,14 +2104,14 @@ bool BrowserPackage::may_contains_them(const Q3PtrList<BrowserNode> & l,
             break;
 
         default:
-            if (!IsaSimpleRelation(it.current()->get_type()) ||
-                    (((const BrowserNode *) it.current()->parent()) != this))
+            if (!IsaSimpleRelation(node->get_type()) ||
+                    (((const BrowserNode *) node->parent()) != this))
                 return FALSE;
         }
 
         duplicable = FALSE;
 
-        if (! may_contains(it.current(), FALSE))
+        if (! may_contains(node, FALSE))
             return FALSE;
     }
 
@@ -2091,28 +2145,32 @@ void BrowserPackage::DropAfterEvent(QDropEvent * e, BrowserNode * after)
                     (parent() != 0) &&
                     ((BrowserNode *) parent())->may_contains(bn, what == UmlPackage)) {
                 // have choice
-                Q3PopupMenu m(0);
+                QMenu m(0);
 
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
 
                 if (!is_read_only)
-                    m.insertItem(TR("In ") + QString(get_name()), 1);
-
-                m.insertItem(TR("After ") + QString(get_name()), 2);
+                    MenuFactory::addItem(m, QObject::tr("In ") + QString(get_name()), 1);
 
-                switch (m.exec(QCursor::pos())) {
-                case 1:
-                    break;
-
-                case 2:
-                    after = this;
-                    x = (BrowserNode *) parent();
-                    break;
+                MenuFactory::addItem(m, QObject::tr("After ") + QString(get_name()), 2);
 
-                default:
-                    e->ignore();
-                    return;
+                QAction *retAction = m.exec(QCursor::pos());
+                if(retAction)
+                {
+                    switch (retAction->data().toInt()) {
+                    case 1:
+                        break;
+
+                    case 2:
+                        after = this;
+                        x = (BrowserNode *) parent();
+                        break;
+
+                    default:
+                        e->ignore();
+                        return;
+                    }
                 }
             }
 
@@ -2127,8 +2185,8 @@ void BrowserPackage::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if (after)
                 bn->moveItem(after);
             else {
-                old_parent->takeItem(bn);
-                x->insertItem(bn);
+                old_parent->removeChild(bn);
+                x->addChild(bn);
             }
 
             if (old_parent != x) {
@@ -2146,7 +2204,7 @@ void BrowserPackage::DropAfterEvent(QDropEvent * e, BrowserNode * after)
         else if ((parent() != 0) && (after == 0))
             ((BrowserNode *) parent())->DropAfterEvent(e, this);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical (QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -2186,15 +2244,14 @@ void BrowserPackage::init()
 
 void BrowserPackage::save_stereotypes()
 {
-    QSharedPointer<QByteArray> newdef(new QByteArray());
-    QTextStream st(newdef.data(), QIODevice::WriteOnly);
-    //  QLOG_INFO() << newdef->data();
-    st.setEncoding(QTextStream::Latin1);
-    //  QLOG_INFO() << newdef->data();
+
+    QString newdef;
+    QTextStream st(&newdef, QIODevice::WriteOnly);
+    st.setCodec("UTF-8");
     nl_indent(st);
     st << "package_stereotypes ";
     st.flush();
-    QLOG_INFO() << newdef->data();
+    QLOG_INFO() << newdef;
     save_unicode_string_list(its_default_stereotypes, st);
     nl_indent(st);
     st << "  " << stringify(UmlDependency);
@@ -2202,7 +2259,6 @@ void BrowserPackage::save_stereotypes()
     nl_indent(st);
     st << "end";
     nl_indent(st);
-
     BrowserClass::save_stereotypes(st);
     BrowserUseCase::save_stereotypes(st);
     BrowserArtifact::save_stereotypes(st);
@@ -2230,11 +2286,11 @@ void BrowserPackage::save_stereotypes()
     BrowserDeploymentView::save_stereotypes(st);
     BrowserDiagram::save_stereotypes(st);
     st << "\nend\n";
-
     st << '\000';
     st.flush();
-    QLOG_INFO() << newdef->data();
+    QLOG_INFO() << newdef;
     save_if_needed("stereotypes", newdef);
+
 }
 
 void BrowserPackage::read_stereotypes(char *& st, char *& k)
@@ -2247,16 +2303,17 @@ void BrowserPackage::read_stereotypes(char *& st, char *& k)
         k = read_keyword(st);
 
         // force profile
-        if (its_default_stereotypes.findIndex("profile") == -1)
+        if (its_default_stereotypes.indexOf("profile") == -1)
             its_default_stereotypes.append("profile");
+
     }
     else
         init();
 }
 
-bool BrowserPackage::read_stereotypes(const char * f)
+bool BrowserPackage::read_stereotypes(QString f)
 {
-    char * s = read_file((f == 0) ? "stereotypes" : f);
+    char * s = read_file((f.isEmpty()) ? "stereotypes" : f);
 
     if (s != 0) {
         PRE_TRY;
@@ -2267,6 +2324,7 @@ bool BrowserPackage::read_stereotypes(const char * f)
 
             read_stereotypes(st, k);				// updates k
             BrowserClass::read_stereotypes(st, k);		// updates k
+
             BrowserUseCase::read_stereotypes(st, k);		// updates k
             BrowserArtifact::read_stereotypes(st, k);		// updates k
             BrowserAttribute::read_stereotypes(st, k);	// updates k
@@ -2292,6 +2350,7 @@ bool BrowserPackage::read_stereotypes(const char * f)
             BrowserComponentView::read_stereotypes(st, k);	// updates k
             BrowserDeploymentView::read_stereotypes(st, k);	// updates k
             BrowserDiagram::read_stereotypes(st, k);		// updates k
+
         }
         catch (int) {
             ;
@@ -2307,13 +2366,13 @@ bool BrowserPackage::read_stereotypes(const char * f)
 
 bool BrowserPackage::import_stereotypes()
 {
-    QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), "stereotypes");
+    QString fn = QFileDialog::getOpenFileName(0, "stereotypes", last_used_directory() );
 
     if (fn.isEmpty())
         return FALSE;
 
     set_last_used_directory(fn);
-    return read_stereotypes((const char *) fn);
+    return read_stereotypes((const char *) fn.toLatin1().constData());
 }
 
 // save / restore
@@ -2336,39 +2395,43 @@ void BrowserPackage::save_all(bool modified_only)
 {
     IdIterator<BrowserPackage> itcpt(all);
 
+
     must_be_saved_counter = 0;
     already_saved = 0;
 
-    while (itcpt.current()) {
-        BrowserPackage * pack = itcpt.current();
+    while (itcpt.hasNext()) {
+        itcpt.next();
+        BrowserPackage * pack = itcpt.value();
 
-        if (!pack->deletedp() &&
+        if (pack&&
+                !pack->deletedp() &&
                 (!modified_only ||
                  (pack->is_modified &&
                   (pack->is_imported || !pack->is_read_only))))
             pack->BrowserNode::init_save_counter();
 
-        ++itcpt;
+        //++itcpt;
+
     }
 
     if (must_be_saved_counter == 0)
         return;
-
     save_progress = new SaveProgress(must_be_saved_counter);
-
+    save_progress->show();
     IdIterator<BrowserPackage> it(all);
     QDir d = BrowserView::get_dir();
     QString warning;
 
-    while (it.current()) {
-        BrowserPackage * pack = it.current();
+    while (it.hasNext()) {
+        it.next();
+        BrowserPackage * pack = it.value();
         bool prj = (pack == BrowserView::get_project());
         QString fn;
 
         if (prj)
-            fn = ((const char *) pack->name) + QString(".prj");
+            fn = pack->name + QString(".prj");
         else
-            fn.setNum(it.currentKey());
+            fn.setNum(it.key());
 
         if (pack->deletedp()) {
             pack->is_modified = FALSE;
@@ -2380,18 +2443,18 @@ void BrowserPackage::save_all(bool modified_only)
             backup(d, fn);
 
             for (;;) {
-                QFile fp(d.absFilePath(fn));
+                QFile fp(d.absoluteFilePath(fn));
 
                 while (!fp.open(QIODevice::WriteOnly))
-                    (void) msg_critical(TR("Error"), TR("Cannot create file\n") + fn,
+                    (void) msg_critical(QObject::tr("Error"), QObject::tr("Cannot create file\n") + fn,
                                         QMessageBox::Retry);
 
                 if (prj)
-                    UmlWindow::historic_add(fp.name());
+                    UmlWindow::historic_add(fp.fileName());
 
                 QTextStream st(&fp);
 
-                st.setEncoding(QTextStream::Latin1);
+                st.setCodec("UTF-8");
 
                 // saves the package own data
 
@@ -2401,7 +2464,7 @@ void BrowserPackage::save_all(bool modified_only)
                 save_string(pack->name, st);
 
                 if (!prj)
-                    st << " // " << (const char *) pack->full_name();
+                    st << " // " << pack->full_name();
 
                 indent(+1);
 
@@ -2409,7 +2472,7 @@ void BrowserPackage::save_all(bool modified_only)
                 st << "revision " << pack->revision;
                 nl_indent(st);
                 st << "modified_by " << user_id()
-                   << " \"" << (const char *) user_name() << '"';
+                   << " \"" << QString::fromLatin1(user_name()) << '"';
 
                 if (pack->owner != -1) {
                     // owner specified, the save is done => owner is current user !
@@ -2509,7 +2572,7 @@ void BrowserPackage::save_all(bool modified_only)
 
                 // saves the package's sub elts
 
-                Q3ListViewItem * child = pack->firstChild();
+                BrowserNode * child = pack->firstChild();
 
                 if (child != 0) {
                     for (;;) {
@@ -2539,7 +2602,7 @@ void BrowserPackage::save_all(bool modified_only)
 
                 fp.close();
 
-                if (static_cast<uint>(fp.status()) == IO_Ok) {
+                if (fp.error() == QFile::NoError) {
                     pack->is_imported = pack->is_modified = FALSE;
 
                     // for saveAs
@@ -2549,14 +2612,13 @@ void BrowserPackage::save_all(bool modified_only)
                     // all done
                     break;
                 }
-
-                (void) msg_critical(TR("Error"),
-                                    TR("Error while writting in\n%1\nmay be your disk is full", fn),
+                (void) msg_critical(QObject::tr("Error"),
+                                    QObject::tr("Error while writting in\n%1\nmay be your disk is full").arg(fn),
                                     QMessageBox::Retry);
             }
         }
 
-        ++it;
+        //it.next();
     }
 
     if (save_progress != 0)
@@ -2572,15 +2634,16 @@ bool BrowserPackage::must_be_saved()
 {
     IdIterator<BrowserPackage> it(all);
 
-    while (it.current()) {
-        if (it.current()->is_modified &&
-                !it.current()->deletedp() &&
-                !it.current()->is_read_only)
+    while (it.hasNext()) {
+        it.next();
+        if (it.value()&&
+                it.value()->is_modified &&
+                !it.value()->deletedp() &&
+                !it.value()->is_read_only)
             return TRUE;
 
-        ++it;
+        // ++it;
     }
-
     return FALSE;
 }
 
@@ -2592,20 +2655,18 @@ void BrowserPackage::save_session(QTextStream & st)
     QString warning;
 
     if (! marked_list.isEmpty()) {
-        Q3PtrListIterator<BrowserNode> it(marked_list);
-
         st << "marked\n";
 
-        for (; it.current() != 0; ++it) {
+        foreach (BrowserNode *node, marked_list) {
             st << "  ";
-            it.current()->save(st, TRUE, warning);
+            node->save(st, TRUE, warning);
             st << '\n';
         }
 
         st << "end\n";
     }
 
-    BrowserNode * sel = (BrowserNode *) listView()->currentItem();
+    BrowserNode * sel = (BrowserNode *) treeWidget()->currentItem();
 
     if ((sel != 0) && !sel->deletedp()) {
         st << "selected ";
@@ -2613,8 +2674,8 @@ void BrowserPackage::save_session(QTextStream & st)
         st << '\n';
     }
 
-    if (isOpen()) {
-        Q3ListViewItem * child;
+    if (isExpanded()) {
+        BrowserNode * child;
 
         st << "open\n";
 
@@ -2634,11 +2695,11 @@ void BrowserPackage::save_session(QTextStream & st)
     st << "end\n";
 }
 
-static void open_it(Q3ListViewItem * bn)
+static void open_it(BrowserNode * bn)
 {
-    if (bn && !bn->isOpen()) {
-        open_it(bn->parent());
-        bn->setOpen(TRUE);
+    if (bn && !bn->isExpanded()) {
+        open_it((BrowserNode *)bn->parent());
+        bn->setExpanded(TRUE);
     }
 }
 
@@ -2697,7 +2758,7 @@ void BrowserPackage::read_session(char *& st, const char * k)
         k = read_keyword(st);
     }
 
-    BrowserNode * sel;
+    BrowserNode * sel = 0;
 
     if (! strcmp(k, "selected")) {
         k = read_keyword(st);
@@ -2724,10 +2785,11 @@ void BrowserPackage::read_session(char *& st, const char * k)
         set_completion(TRUE);
 
     if (sel != 0) {
-        listView()->setSelected(sel, TRUE);
-        listView()->ensureItemVisible(sel);
-    }
+        sel->setSelected(true);
+        //treeWidget()->setsel(sel, TRUE);
+        treeWidget()->scrollToItem(sel, QAbstractItemView::EnsureVisible);
 
+    }
     // don't check old 'scroll n> <n>' or new 'end'
 }
 
@@ -2737,56 +2799,62 @@ BrowserNode * BrowserPackage::get_it(const char * k, int id)
         return all[id];
 
     BrowserNode * r;
+    if (((r = BrowserUseCaseView::get_it(k, id)) == 0)
 
-    if (((r = BrowserUseCaseView::get_it(k, id)) == 0) &&
+            &&
             ((r = BrowserClassView::get_it(k, id)) == 0) &&
             ((r = BrowserComponentView::get_it(k, id)) == 0) &&
-            ((r = BrowserDeploymentView::get_it(k, id)) == 0))
+            ((r = BrowserDeploymentView::get_it(k, id)) == 0
+             )
+            )
         r = BrowserSimpleRelation::get_it(k, id);
-
     return r;
 }
 
 // id is the old package's ident in case of an import
 unsigned BrowserPackage::load(bool recursive, int id)
 {
-    unsigned result = ~0;
+
+    unsigned  result = ~0;
     QString fn;
+
     bool prj = (this == BrowserView::get_project()) ||
             (this == BrowserView::get_imported_project());
 
     if (prj) {
         //const char * tName = name.operator WrapperStr();
         ///QByteArray ba = QString("test").toLatin1();
-        const char * tName = this->name;
-        fn.sprintf("%s.prj", tName);
+        //const char * tName = this->name.toLatin1().constData();
+        //fn.sprintf("%s.prj", tName);
+        fn = this->name + ".prj";
         QLOG_INFO() << fn;
     }
     else
         fn.setNum((id == -1) ? get_ident() : id);
 
     QFile fp((in_import())
-             ? BrowserView::get_import_dir().absFilePath(fn)
-             : BrowserView::get_dir().absFilePath(fn));
-    int sz;
+             ? BrowserView::get_import_dir().absoluteFilePath(fn)
+             : BrowserView::get_dir().absoluteFilePath(fn));
+    qint64 sz;
+    //QString filename = fp.fileName();
 
     ReadContext context = current_context();
 
     if ((sz = open_file(fp, QIODevice::ReadOnly)) != -1) {
         char * s = new char[sz + 1];
-        int offset = 0;
-        int nread;
+        qint64 offset = 0;
+        qint64 nread;
 
         is_read_only = (!in_import() && read_only_file()) ||
                 ((user_id() != 0) && is_api_base());
 
         do {
-            if ((nread = fp.readBlock(s + offset, sz - offset)) == -1) {
-                msg_critical(TR("Error"),
-                             BrowserView::get_dir().absFilePath(fn)
-                             + TR("cannot be read"));
+            if ((nread = fp.read(s + offset, sz - offset)) == -1) {
+                msg_critical(QObject::tr("Error"),
+                             BrowserView::get_dir().absoluteFilePath(fn)
+                             + QObject::tr("cannot be read"));
                 delete [] s;
-                THROW_ERROR 0;
+                throw 0;
             }
 
             offset += nread;
@@ -2808,7 +2876,7 @@ unsigned BrowserPackage::load(bool recursive, int id)
 
             if (read_file_format() > api_format(true)) {
                 msg_critical("Error",
-                             TR("Your version of DOUML is too old to read this project"));
+                             QObject::tr("Your version of DOUML is too old to read this project"));
                 throw 0;
             }
 
@@ -2817,8 +2885,8 @@ unsigned BrowserPackage::load(bool recursive, int id)
                 result = read_file_format();
 
                 if (read_file_format() <= 21) {
-                    msg_critical(TR("Error"),
-                                 TR(
+                    msg_critical(QObject::tr("Error"),
+                                 QObject::tr(
                                      "Sorry, the imported project has a too old format.\n"
                                      "To change its format : load this project and save it."));
                     throw 0;
@@ -2867,6 +2935,7 @@ unsigned BrowserPackage::load(bool recursive, int id)
 
                     if (read_file_format() <= 7) {
                         read_stereotypes(st, k);			// updates k
+
                         BrowserClass::read_stereotypes(st, k);	// updates k
                         BrowserUseCase::read_stereotypes(st, k);	// updates k
                         BrowserAttribute::read_stereotypes(st, k);	// updates k
@@ -2881,19 +2950,19 @@ unsigned BrowserPackage::load(bool recursive, int id)
                         Tool::read(st, k);				// updates k
                     }
                 }
-
                 if (read_file_format() <= 9)
                     def->read(st, k);			// updates k
 
                 class_settings.read(st, k);		// updates k
+
                 classdiagram_settings.read(st, k);	// updates k
+
                 usecasediagram_settings.read(st, k);	// updates k
                 sequencediagram_settings.read(st, k);	// updates k
                 collaborationdiagram_settings.read(st, k); // updates k
 
                 if (read_file_format() >= 25)
                     objectdiagram_settings.read(st, k);	// updates k
-
                 componentdiagram_settings.read(st, k);	// updates k
                 deploymentdiagram_settings.read(st, k);	// updates k
 
@@ -2902,7 +2971,6 @@ unsigned BrowserPackage::load(bool recursive, int id)
 
                 if (read_file_format() >= 26)
                     activitydiagram_settings.read(st, k);	// updates k
-
                 if (this == BrowserView::get_project()) {
                     // old version
                     if (classdiagram_settings.auto_label_position == UmlDefaultState)
@@ -2958,7 +3026,7 @@ unsigned BrowserPackage::load(bool recursive, int id)
                         UmlWindow::set_default_format(IsoA4);
 
                     if (!strcmp(k, "image_root_dir")) {
-                        UmlWindow::set_images_root_dir(toUnicode(read_string(st)));
+                        UmlWindow::set_images_root_dir(read_string(st));
                         k = read_keyword(st);
                     }
                     else
@@ -2969,7 +3037,6 @@ unsigned BrowserPackage::load(bool recursive, int id)
 
                     k = read_keyword(st);
                 }
-
                 def->read(st, k);			// updates k
             }
             else if (prj)
@@ -2992,13 +3059,14 @@ unsigned BrowserPackage::load(bool recursive, int id)
 
             if (strcmp(k, "end"))
             {
-                while (BrowserPackage::read(st, k, this, recursive) ||
+                while (BrowserPackage::read(st, k, this, recursive)||
                        BrowserUseCaseView::read(st, k, this, recursive) ||
                        BrowserClassView::read(st, k, this, recursive) ||
                        ((read_file_format() >= 20) &&
                         BrowserComponentView::read(st, k, this, recursive)) ||
                        BrowserDeploymentView::read(st, k, this, recursive) ||
-                       BrowserSimpleRelation::read(st, k, this))
+                       BrowserSimpleRelation::read(st, k, this)
+                       )
                     k = read_keyword(st);
 
                 if (!strcmp(k, "preserve_bodies"))
@@ -3066,23 +3134,26 @@ unsigned BrowserPackage::load(bool recursive, int id)
     return result;
 }
 
-bool BrowserPackage::load_version(QString fn)
+bool BrowserPackage::load_version(const QString & fnInit)
 {
+    QString fn = fnInit;
     QFileInfo any_fi(fn);
-    QDir d(any_fi.dirPath(TRUE));
-    const QFileInfoList l = d.entryInfoList("*.prj"); // [lgfreitas] entryInfoList does not return a pointer anymore
+    QDir d(any_fi.absoluteFilePath());
+    QStringList patternList;
+    patternList<<"*.prj";
+    const QFileInfoList l = d.entryInfoList(patternList); // [lgfreitas] entryInfoList does not return a pointer anymore
 
     if (!l.empty()) {
         QListIterator<QFileInfo> it(l);
         QFileInfo fi = it.next(); // [lgfreitas] there is no it.current anymore to QList. Java-style iterators
 
         if (fi.exists()) {
-            fn = fi.absFilePath();
+            fn = fi.absoluteFilePath();
 
             char * s = read_file(fn);
 
             if (s == 0) {
-                msg_critical(TR("Error"), TR("can't read project file"));
+                msg_critical (QObject::tr("Error"), QObject::tr("can't read project file"));
                 return FALSE;
             }
 
@@ -3097,8 +3168,8 @@ bool BrowserPackage::load_version(QString fn)
                 set_read_file_format(read_unsigned(st));
 
                 if (read_file_format() > api_format(true)) {
-                    msg_critical(TR("Error"),
-                                 TR("Your version of DOUML is too old to read this project"));
+                    msg_critical (QObject::tr("Error"),
+                                  QObject::tr("Your version of DOUML is too old to read this project"));
                     throw 0;
                 }
             }
@@ -3114,8 +3185,7 @@ bool BrowserPackage::load_version(QString fn)
         }
     }
 
-    msg_critical(TR("Error"), TR("can't find project file"));
-
+    msg_critical (QObject::tr("Error"), QObject::tr("can't find project file"));
     return FALSE;
 }
 
@@ -3208,7 +3278,8 @@ void BrowserPackage::renumber(int phase)
 
     case 2: {
         QDir dir = BrowserView::get_dir();
-        QString filter = "_*";
+        QStringList filter;
+        filter<<"_*";
         const QFileInfoList l = dir.entryInfoList(filter); //[lgfreitas] QList has changed...
 
         if (!l.empty()) {
@@ -3218,7 +3289,7 @@ void BrowserPackage::renumber(int phase)
             // [lgfreitas] QList has changed
             while (it.hasNext()) {
                 fi = it.next();
-                QFile::remove(fi.absFilePath());
+                QFile::remove(fi.absoluteFilePath());
                 //++it;
             }
         }
diff --git a/src/browser/BrowserPackage.h b/src/browser/BrowserPackage.h
index df31f4984..8bc9bc7ad 100644
--- a/src/browser/BrowserPackage.h
+++ b/src/browser/BrowserPackage.h
@@ -28,7 +28,7 @@
 #ifndef BROWSER_PACKAGE_H
 #define BROWSER_PACKAGE_H
 
-#include <q3intdict.h>
+//#include <q3intdict.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDragMoveEvent>
@@ -42,22 +42,22 @@
 class PackageData;
 class BrowserClassDiagram;
 class StereotypesDialog;
-
 class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
 {
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserPackage> removed;
+    static QList<BrowserPackage *> removed;
+
     static IdDict<BrowserPackage> all;
 
     static QStringList its_default_stereotypes;
     static QStringList relation_default_stereotypes;
-
     PackageData * def;
     BrowserNode * associated_diagram;
-    ClassDiagramSettings classdiagram_settings;
     ClassSettings class_settings;
+
+    ClassDiagramSettings classdiagram_settings;
     UseCaseDiagramSettings usecasediagram_settings;
     SequenceDiagramSettings sequencediagram_settings;
     CollaborationDiagramSettings collaborationdiagram_settings;
@@ -66,6 +66,7 @@ class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
     DeploymentDiagramSettings deploymentdiagram_settings;
     StateDiagramSettings statediagram_settings;
     ActivityDiagramSettings activitydiagram_settings;
+
     UmlColor class_color;
     UmlColor package_color;
     UmlColor note_color;
@@ -84,6 +85,7 @@ class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
     UmlColor activitypartition_color;
     UmlColor activityaction_color;
     UmlColor parameterpin_color;
+
     bool is_imported;
     unsigned revision;
     int owner;
@@ -96,8 +98,8 @@ class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
     void exec_menu_choice(int rank);
 
 public:
-    BrowserPackage(QString s, BrowserNode * parent, int id = 0);
-    BrowserPackage(QString s, BrowserView * parent, int id = 0);
+    BrowserPackage(const QString & s, BrowserNode * parent, int id = 0);
+    BrowserPackage(const QString & s, BrowserView * parent, int id = 0);
     BrowserPackage(const BrowserPackage * model, BrowserNode * p);
     virtual ~BrowserPackage();
 
@@ -105,17 +107,17 @@ class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
     void set_associated_diagram(BrowserNode *, bool on_read = FALSE);
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool force_edit);
     virtual void on_close();
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> &,
+    virtual bool may_contains_them(const QList<BrowserNode *> &,
                                    BooL & duplicable) const;
     virtual BasicData * get_data() const;
     virtual const QStringList & default_stereotypes(UmlCode, const BrowserNode *) const; // non class rel
@@ -134,7 +136,7 @@ class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
     virtual QString check_inherit(const BrowserNode * parent) const;
     QString may_connect(UmlCode & l, const BrowserNode * dest) const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
     static bool tool_global_cmd(ToolCom * com, const char * args);
@@ -162,7 +164,7 @@ class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
 
     void add_package(bool profile);
     unsigned load(bool recursive, int id = -1);
-    BrowserPackage * import_project(QString fn, bool aslib = FALSE, int id = 0);
+    BrowserPackage * import_project(const QString & fn, bool aslib = FALSE, int id = 0);
 
     static BrowserNodeList & instances(BrowserNodeList &);
     static BrowserPackage * get_package();
@@ -170,7 +172,7 @@ class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
     static void init();
     static const QStringList & default_stereotypes();
     static void read_stereotypes(char *& , char *&);
-    static bool read_stereotypes(const char * = 0);
+    static bool read_stereotypes(QString = QString());
     static bool import_stereotypes();
     static void save_stereotypes();
 
@@ -179,16 +181,17 @@ class BrowserPackage : public BrowserNode, public Labeled<BrowserPackage>
     static void save_all(bool modified_only);
     static bool must_be_saved();
     virtual void init_save_counter();
-    static bool load_version(QString fn);
+    static bool load_version(const QString & fn);
 
     static void clear(bool old);
     static void update_idmax_for_root();
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
-    virtual void support_file(Q3Dict<char> & files, bool add) const;
+    virtual void support_file(QHash<QString,char*> & files, bool add) const;
     void update_lib();
 
     static void prepare_for_sort();
+
 };
 
 #endif
diff --git a/src/browser/BrowserParameter.cpp b/src/browser/BrowserParameter.cpp
index 2af86da64..ebfe3c52d 100644
--- a/src/browser/BrowserParameter.cpp
+++ b/src/browser/BrowserParameter.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -64,7 +64,7 @@
 IdDict<BrowserParameter> BrowserParameter::all(257, __FILE__);
 QStringList BrowserParameter::its_default_stereotypes;	// unicode
 
-BrowserParameter::BrowserParameter(QString s, BrowserNode * p, int id)
+BrowserParameter::BrowserParameter(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserParameter>(all, id),
       def(new ParameterData)
 {
@@ -86,7 +86,7 @@ BrowserParameter::BrowserParameter(const BrowserParameter * model, BrowserNode *
     comment = model->comment;
 }
 
-BrowserNode * BrowserParameter::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserParameter::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserParameter(this, p);
 
@@ -116,7 +116,7 @@ void BrowserParameter::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
@@ -153,7 +153,7 @@ QString BrowserParameter::may_start() const
         return 0;
 
     default:
-        return TR("can't have outgoing flow");
+        return QObject::tr("can't have outgoing flow");
     }
 }
 
@@ -163,71 +163,74 @@ QString BrowserParameter::may_connect(const BrowserNode * dest) const
     BrowserNode * container = dest->get_container(UmlActivity);
 
     if (container == 0)
-        return TR("illegal");
+        return QObject::tr("illegal");
 
     if (get_container(UmlActivity) != container)
-        return TR("not in the same activity");
+        return QObject::tr("not in the same activity");
 
     const BrowserActivityElement * elt =
-        dynamic_cast<const BrowserActivityElement *>(dest);
+            dynamic_cast<const BrowserActivityElement *>(dest);
 
     return (elt == 0)
-           ? TR("illegal")
-           : elt->connexion_from(def->get_is_control());
+            ? QObject::tr("illegal")
+            : elt->connexion_from(def->get_is_control());
 }
 
 QString BrowserParameter::connexion_from(bool control) const
 {
     if (def->get_dir() == UmlIn)
-        return TR("an input parameter can't have incoming flows");
+        return QObject::tr("an input parameter can't have incoming flows");
     else if (def->get_is_control() != control)
         return (control)
-               ? TR("parameter can't accept control flow (not 'is_control')")
-               : TR("parameter can't accept data flow (is 'is_control')");
+                ? QObject::tr("parameter can't accept control flow (not 'is_control')")
+                : QObject::tr("parameter can't accept data flow (is 'is_control')");
     else
         return 0;
 }
 
 void BrowserParameter::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited)
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>parameter</i>, \
-a double click with the left mouse button does the same thing"));
-
-        if (!is_read_only && (edition_number == 0)) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 1),
-                           TR("to copy the <i>parameter</i> in a new one"));
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                           TR("to delete the <i>parameter</i>. \
-Note that you can undelete it after"));
-        }
-
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 4),
-                       TR("to know who reference the <i>parameter</i> \
-through a flow"));
-        mark_menu(m, TR("the parameter"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
-        }
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>parameter</i>, \
+                                             a double click with the left mouse button does the same thing"));
+
+                                             if (!is_read_only && (edition_number == 0)) {
+                                                 MenuFactory::addItem(m, QObject::tr("Duplicate"), 1,
+                                                 QObject::tr("to copy the <i>parameter</i> in a new one"));
+                                                 m.addSeparator();
+                                                 MenuFactory::addItem(m, QObject::tr("Delete"), 2,
+                                                 QObject::tr("to delete the <i>parameter</i>. \
+                                                 Note that you can undelete it after"));
+                                             }
+
+                                             MenuFactory::addItem(m, QObject::tr("Referenced by"), 4,
+                                                                  QObject::tr("to know who reference the <i>parameter</i> \
+                                                                              through a flow"));
+                                                                              mark_menu(m, QObject::tr("the parameter"), 90);
+                                                                  ProfiledStereotypes::menu(m, this, 99990);
+
+                                             if ((edition_number == 0) &&
+                                                 Tool::menu_insert(&toolm, get_type(), 100)) {
+                                                 m.addSeparator();
+                                                 toolm.setTitle( QObject::tr("Tool"));
+                                                 m.addMenu(&toolm);
+                                             }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("to undelete the <i>parameter</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 3,
+                             QObject::tr("to undelete the <i>parameter</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserParameter::exec_menu_choice(int rank)
@@ -268,7 +271,7 @@ void BrowserParameter::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserParameter::apply_shortcut(QString s)
+void BrowserParameter::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -318,7 +321,7 @@ UmlCode BrowserParameter::get_type() const
 
 QString BrowserParameter::get_stype() const
 {
-    return TR("parameter");
+    return QObject::tr("parameter");
 }
 
 int BrowserParameter::get_identifier() const
@@ -336,7 +339,7 @@ QString BrowserParameter::full_name(bool rev, bool) const
     return fullname(rev);
 }
 
-void BrowserParameter::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserParameter::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserFlow::compute_referenced_by(l, this);
@@ -345,20 +348,20 @@ void BrowserParameter::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
         BrowserActivityDiagram::compute_referenced_by(l, this, "parametercanvas", "parameter_ref");
 }
 
-void BrowserParameter::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * target)
+void BrowserParameter::compute_referenced_by(QList<BrowserNode *> & l,
+                                             BrowserNode * target)
 {
     IdIterator<BrowserParameter> it(all);
-
-    while (it.current()) {
-        if (!it.current()->deletedp()) {
-            const AType & t = it.current()->def->get_type();
+    while(it.hasNext()){
+        it.next();
+        if(it.value()) {
+        if (!it.value()->deletedp()) {
+            const AType & t = it.value()->def->get_type();
 
             if (t.type == target)
-                l.append(it.current());
+                l.append(it.value());
         }
-
-        ++it;
+}
     }
 }
 
@@ -388,7 +391,7 @@ bool BrowserParameter::tool_cmd(ToolCom * com, const char * args)
                 else
                     ok = FALSE;
             }
-            break;
+                break;
 
             default:
                 ok = FALSE;
@@ -429,7 +432,7 @@ void BrowserParameter::DropEvent(QDropEvent * e)
 void BrowserParameter::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        UmlDrag::canDecode(e, BrowserFlow::drag_key(this)))
+            UmlDrag::canDecode(e, BrowserFlow::drag_key(this)))
         e->accept();
     else
         e->ignore();
@@ -440,11 +443,11 @@ void BrowserParameter::DropAfterEvent(QDropEvent * e, BrowserNode * after)
     BrowserNode * bn;
 
     if (((bn = UmlDrag::decode(e, BrowserFlow::drag_key(this))) != 0) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE))
             move(bn, after);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical( QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -457,7 +460,7 @@ void BrowserParameter::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 QString BrowserParameter::drag_key() const
 {
     return QString::number(UmlParameter)
-           + "#" + QString::number((unsigned long) parent());
+            + "#" + QString::number((unsigned long) parent());
 }
 
 QString BrowserParameter::drag_postfix() const
@@ -468,7 +471,7 @@ QString BrowserParameter::drag_postfix() const
 QString BrowserParameter::drag_key(BrowserNode * p)
 {
     return QString::number(UmlParameter)
-           + "#" + QString::number((unsigned long) p);
+            + "#" + QString::number((unsigned long) p);
 }
 
 void BrowserParameter::init()
@@ -511,7 +514,7 @@ void BrowserParameter::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -548,12 +551,12 @@ BrowserParameter * BrowserParameter::read_ref(char *& st)
     BrowserParameter * result = all[id];
 
     return (result == 0)
-           ? new BrowserParameter(id)
-           : result;
+            ? new BrowserParameter(id)
+            : result;
 }
 
 BrowserParameter * BrowserParameter::read(char *& st, char * k,
-        BrowserNode * parent)
+                                          BrowserNode * parent)
 {
     BrowserParameter * result;
     int id;
@@ -602,7 +605,7 @@ BrowserParameter * BrowserParameter::read(char *& st, char * k,
         }
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
         result->def->set_browser_node(result);
 
         if (strcmp(k, "end"))
diff --git a/src/browser/BrowserParameter.h b/src/browser/BrowserParameter.h
index 156254892..427f97069 100644
--- a/src/browser/BrowserParameter.h
+++ b/src/browser/BrowserParameter.h
@@ -56,12 +56,12 @@ class BrowserParameter : public BrowserNode, public Labeled<BrowserParameter>, p
     void exec_menu_choice(int rank);
 
 public:
-    BrowserParameter(QString s, BrowserNode * p, int id = 0);
+    BrowserParameter(const QString & s, BrowserNode * p, int id = 0);
     BrowserParameter(const BrowserParameter * model, BrowserNode * p);
     virtual ~BrowserParameter();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual BasicData * add_relation(UmlCode, BrowserNode * end);
     QString may_start() const;
@@ -71,7 +71,7 @@ class BrowserParameter : public BrowserNode, public Labeled<BrowserParameter>, p
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -90,8 +90,8 @@ class BrowserParameter : public BrowserNode, public Labeled<BrowserParameter>, p
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
diff --git a/src/browser/BrowserParameterSet.cpp b/src/browser/BrowserParameterSet.cpp
index 3f55107fa..ce6a80357 100644
--- a/src/browser/BrowserParameterSet.cpp
+++ b/src/browser/BrowserParameterSet.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -56,7 +56,7 @@
 IdDict<BrowserParameterSet> BrowserParameterSet::all(257, __FILE__);
 QStringList BrowserParameterSet::its_default_stereotypes;	// unicode
 
-BrowserParameterSet::BrowserParameterSet(QString s, BrowserNode * p, ParameterSetData * d, int id)
+BrowserParameterSet::BrowserParameterSet(const QString & s, BrowserNode * p, ParameterSetData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserParameterSet>(all, id), def(d)
 {
 }
@@ -87,7 +87,7 @@ BrowserParameterSet * BrowserParameterSet::new_one(const char * s,
     return result;
 }
 
-BrowserNode * BrowserParameterSet::duplicate(BrowserNode * p, QString)
+BrowserNode * BrowserParameterSet::duplicate(BrowserNode * p, const QString &)
 {
     BrowserNode * result = new BrowserParameterSet(this, p);
 
@@ -118,7 +118,7 @@ void BrowserParameterSet::prepare_update_lib() const
     all.memo_id_oid(get_ident(), original_id);
 }
 
-void BrowserParameterSet::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserParameterSet::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -149,43 +149,46 @@ const QPixmap * BrowserParameterSet::pixmap(int) const
 
 void BrowserParameterSet::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited)
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>parameter set</i>, \
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                           QObject::tr("to edit the <i>parameter set</i>, \
 a double click with the left mouse button does the same thing"));
 
         if (!is_read_only && (edition_number == 0)) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 1),
-                           TR("to copy the <i>parameter set</i> in a new one"));
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                           TR("to delete the <i>parameter set</i>. \
+            MenuFactory::addItem(m, QObject::tr("Duplicate"), 1,
+                           QObject::tr("to copy the <i>parameter set</i> in a new one"));
+            m.addSeparator();
+            MenuFactory::addItem(m, QObject::tr("Delete"), 2,
+                           QObject::tr("to delete the <i>parameter set</i>. \
 Note that you can undelete it after"));
         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 4),
-                       TR("to know who reference the <i>parameter set</i>"));
-        mark_menu(m, TR("the parameter set"), 90);
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 4,
+                       QObject::tr("to know who reference the <i>parameter set</i>"));
+        mark_menu(m, QObject::tr("the parameter set"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("to undelete the <i>parameter set</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 3,
+                       QObject::tr("to undelete the <i>parameter set</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserParameterSet::exec_menu_choice(int rank)
@@ -226,7 +229,7 @@ void BrowserParameterSet::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserParameterSet::apply_shortcut(QString s)
+void BrowserParameterSet::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -276,7 +279,7 @@ UmlCode BrowserParameterSet::get_type() const
 
 QString BrowserParameterSet::get_stype() const
 {
-    return TR("parameter set");
+    return QObject::tr("parameter set");
 }
 
 int BrowserParameterSet::get_identifier() const
diff --git a/src/browser/BrowserParameterSet.h b/src/browser/BrowserParameterSet.h
index 1e92c9873..c7ea40e17 100644
--- a/src/browser/BrowserParameterSet.h
+++ b/src/browser/BrowserParameterSet.h
@@ -54,17 +54,17 @@ class BrowserParameterSet : public BrowserNode, public Labeled<BrowserParameterS
     void exec_menu_choice(int rank);
 
 public:
-    BrowserParameterSet(QString s, BrowserNode * p, ParameterSetData * d, int id = 0);
+    BrowserParameterSet(const QString & s, BrowserNode * p, ParameterSetData * d, int id = 0);
     BrowserParameterSet(const BrowserParameterSet * model, BrowserNode * p);
     virtual ~BrowserParameterSet();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -81,7 +81,7 @@ class BrowserParameterSet : public BrowserNode, public Labeled<BrowserParameterS
 
     static BrowserParameterSet * new_one(const char *, BrowserNode * p);
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
 
     static void clear(bool old);
     static void update_idmax_for_root();
diff --git a/src/browser/BrowserPin.cpp b/src/browser/BrowserPin.cpp
index e5a6f50d4..7a07934ea 100644
--- a/src/browser/BrowserPin.cpp
+++ b/src/browser/BrowserPin.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -62,7 +62,7 @@
 IdDict<BrowserPin> BrowserPin::all(257, __FILE__);
 QStringList BrowserPin::its_default_stereotypes;	// unicode
 
-BrowserPin::BrowserPin(QString s, BrowserNode * p, PinData * d, int id)
+BrowserPin::BrowserPin(const QString & s, BrowserNode * p, PinData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserPin>(all, id), def(d)
 {
 }
@@ -82,7 +82,7 @@ BrowserPin::BrowserPin(const BrowserPin * model, BrowserNode * p)
     comment = model->comment;
 }
 
-BrowserNode * BrowserPin::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserPin::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserPin(this, p);
 
@@ -112,7 +112,7 @@ void BrowserPin::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
@@ -139,7 +139,7 @@ const QPixmap * BrowserPin::pixmap(int) const
         return PinIcon;
 }
 
-void BrowserPin::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserPin::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -147,25 +147,26 @@ void BrowserPin::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
         BrowserActivityDiagram::compute_referenced_by(l, this, "pincanvas", "pin_ref");
 }
 
-void BrowserPin::compute_referenced_by(Q3PtrList<BrowserNode> & l,
+void BrowserPin::compute_referenced_by(QList<BrowserNode *> & l,
                                        BrowserNode * target)
 {
     IdIterator<BrowserPin> it(all);
-
-    while (it.current()) {
-        if (!it.current()->deletedp()) {
-            const AType & t = it.current()->def->get_type();
+    while(it.hasNext()){
+        it.next();
+        if(it.value()) {
+        if (!it.value()->deletedp()) {
+            const AType & t = it.value()->def->get_type();
 
             if (t.type == target)
-                l.append(it.current());
+                l.append(it.value());
         }
 
-        ++it;
+}
     }
 }
 
 void BrowserPin::new_one(BrowserNode * future_parent,
-                         const char * name, const PinParamData & pd)
+                         QString name, const PinParamData & pd)
 {
     PinData * d = new PinData(pd);
     BrowserPin * r = new BrowserPin(name, future_parent, d);
@@ -187,7 +188,7 @@ BrowserPin * BrowserPin::add_pin(BrowserPin * pin, BrowserNode * future_parent)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter pin's name\n(may be empty) : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter pin's name\n(may be empty) : "),
                                          UmlActivityPin, TRUE, TRUE))
         return 0;
 
@@ -223,7 +224,7 @@ QString BrowserPin::may_start() const
         return 0;
 
     default:
-        return TR("can't have outgoing flow");
+        return QObject::tr("can't have outgoing flow");
     }
 }
 
@@ -233,76 +234,79 @@ QString BrowserPin::may_connect(const BrowserNode * dest) const
     BrowserNode * container = dest->get_container(UmlActivity);
 
     if (container == 0)
-        return TR("illegal");
+        return QObject::tr("illegal");
 
     if (get_container(UmlActivity) != container)
-        return TR("not in the same activity");
+        return QObject::tr("not in the same activity");
 
     const BrowserActivityElement * elt =
         dynamic_cast<const BrowserActivityElement *>(dest);
 
     return (elt == 0)
-           ? TR("illegal")
+           ? QObject::tr("illegal")
            : elt->connexion_from(def->get_is_control());
 }
 
 QString BrowserPin::connexion_from(bool control) const
 {
     if (def->get_dir() != UmlIn)
-        return TR("target pin can't have incoming flow");
+        return QObject::tr("target pin can't have incoming flow");
 
     if (def->get_is_control() != control)
         return (control)
-               ? TR("target pin can't accept control flow (not 'is_control')")
-               : TR("target pin can't accept data flow (is 'is_control')");
+               ? QObject::tr("target pin can't accept control flow (not 'is_control')")
+               : QObject::tr("target pin can't accept data flow (is 'is_control')");
     else
         return 0;
 }
 
 void BrowserPin::menu()
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_edited)
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>pin</i>, \
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                           QObject::tr("to edit the <i>pin</i>, \
 a double click with the left mouse button does the same thing"));
 
         if (!is_read_only && (edition_number == 0)) {
             if (((ActivityActionData *)((BrowserNode *) parent())->get_data())->may_add_pin()) {
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 1),
-                               TR("to copy the <i>pin</i> in a new one"));
-                m.insertSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 1,
+                               QObject::tr("to copy the <i>pin</i> in a new one"));
+                m.addSeparator();
             }
 
-            m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                           TR("to delete the <i>pin</i>. \
+            MenuFactory::addItem(m, QObject::tr("Delete"), 2,
+                           QObject::tr("to delete the <i>pin</i>. \
 Note that you can undelete it after"));
         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 4),
-                       TR("to know who reference the <i>pin</i>"));
-        mark_menu(m, TR("the pin"), 90);
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 4,
+                       QObject::tr("to know who reference the <i>pin</i>"));
+        mark_menu(m, QObject::tr("the pin"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only &&
              (edition_number == 0) &&
              ((ActivityActionData *)((BrowserNode *) parent())->get_data())->may_add_pin())
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("to undelete the <i>pin</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 3,
+                       QObject::tr("to undelete the <i>pin</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserPin::exec_menu_choice(int rank)
@@ -343,7 +347,7 @@ void BrowserPin::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserPin::apply_shortcut(QString s)
+void BrowserPin::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -398,7 +402,7 @@ UmlCode BrowserPin::get_type() const
 
 QString BrowserPin::get_stype() const
 {
-    return TR("pin");
+    return QObject::tr("pin");
 }
 
 int BrowserPin::get_identifier() const
@@ -537,7 +541,7 @@ void BrowserPin::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
diff --git a/src/browser/BrowserPin.h b/src/browser/BrowserPin.h
index d6178845a..d4f40d556 100644
--- a/src/browser/BrowserPin.h
+++ b/src/browser/BrowserPin.h
@@ -56,17 +56,17 @@ class BrowserPin : public BrowserNode, public Labeled<BrowserPin>, public Browse
     void exec_menu_choice(int rank);
 
 public:
-    BrowserPin(QString s, BrowserNode * p, PinData * d, int id = 0);
+    BrowserPin(const QString & s, BrowserNode * p, PinData * d, int id = 0);
     BrowserPin(const BrowserPin * model, BrowserNode * p);
     virtual ~BrowserPin();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -81,7 +81,7 @@ class BrowserPin : public BrowserNode, public Labeled<BrowserPin>, public Browse
     static BrowserPin * read(char *& , char *, BrowserNode *);
     static BrowserNode * get_it(const char * k, int id);
 
-    static void new_one(BrowserNode * future_parent, const char * name, const PinParamData & pd);
+    static void new_one(BrowserNode * future_parent, QString name, const PinParamData & pd);
     static BrowserPin * new_one(BrowserNode * future_parent, const char * name);
     static BrowserPin * add_pin(BrowserPin * pin, BrowserNode * future_parent);
     virtual BasicData * add_relation(UmlCode, BrowserNode * end);
@@ -97,8 +97,8 @@ class BrowserPin : public BrowserNode, public Labeled<BrowserPin>, public Browse
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
     virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after);
     QString drag_key() const;
diff --git a/src/browser/BrowserPseudoState.cpp b/src/browser/BrowserPseudoState.cpp
index 93e6a0a47..8294fd6a2 100644
--- a/src/browser/BrowserPseudoState.cpp
+++ b/src/browser/BrowserPseudoState.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -62,7 +62,7 @@
 IdDict<BrowserPseudoState> BrowserPseudoState::all(257, __FILE__);
 QStringList BrowserPseudoState::its_default_stereotypes;	// unicode
 
-BrowserPseudoState::BrowserPseudoState(UmlCode c, QString s, BrowserNode * p,
+BrowserPseudoState::BrowserPseudoState(UmlCode c, const QString & s, BrowserNode * p,
                                        PseudoStateData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserPseudoState>(all, id), kind(c), def(d)
 {
@@ -85,7 +85,7 @@ BrowserPseudoState::BrowserPseudoState(const BrowserPseudoState * model, Browser
     kind = model->kind;
 }
 
-BrowserNode * BrowserPseudoState::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserPseudoState::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserPseudoState(this, p);
 
@@ -116,17 +116,16 @@ void BrowserPseudoState::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserPseudoState::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserPseudoState::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserTransition::compute_referenced_by(l, this);
-
     if (! ondelete)
         BrowserStateDiagram::compute_referenced_by(l, this, "pseudostatecanvas", "pseudostate_ref");
 }
@@ -258,7 +257,7 @@ QString BrowserPseudoState::may_start() const
     switch (get_type()) {
     case FinalPS:
     case TerminatePS:
-        return TR("can't have transition");
+        return  QObject::tr("can't have transition");
 
     case InitialPS:
     case DeepHistoryPS:
@@ -266,12 +265,12 @@ QString BrowserPseudoState::may_start() const
     case JoinPS:
         // only one transition is allowed
     {
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling())
             if ((((BrowserNode *) child)->get_type() == UmlTransition) &&
                 (!((BrowserNode *) child)->deletedp()))
-                return TR("can't have several transition");
+                return  QObject::tr("can't have several transition");
     }
 
     return 0;
@@ -289,17 +288,17 @@ QString BrowserPseudoState::may_connect(const BrowserNode * dest) const
     // note if this is an entry point, dest must be a child of this->parent()
     switch (dest->get_type()) {
     case InitialPS:
-        return TR("can't have a transition to initial pseudo state");
+        return  QObject::tr("can't have a transition to initial pseudo state");
 
     case ForkPS:
         // only one transition is allowed from dest
     {
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = dest->firstChild(); child != 0; child = child->nextSibling())
             if ((((BrowserNode *) child)->get_type() == UmlTransition) &&
                 (!((BrowserNode *) child)->deletedp()))
-                return TR("fork can't have several input transitions");
+                return  QObject::tr("fork can't have several input transitions");
     }
 
     return 0;
@@ -326,13 +325,13 @@ BrowserPseudoState::add_pseudostate(BrowserNode * future_parent,
 {
     QString name;
     QString s = stringify(c);
-    int index = s.find("_");
+    int index = s.indexOf("_");
 
     if (index != -1)
         s.replace(index, 1, " ");
 
     if (!allow_empty(c) &&
-        !future_parent->enter_child_name(name, TR("enter " + s + "'s name : "),
+        !future_parent->enter_child_name(name,  QObject::tr("enter ") + s +  QObject::tr("'s name : "),
                                          UmlState, TRUE, FALSE))
 
         return 0;
@@ -342,7 +341,7 @@ BrowserPseudoState::add_pseudostate(BrowserNode * future_parent,
 
 BrowserPseudoState *
 BrowserPseudoState::add_pseudostate(BrowserNode * future_parent,
-                                    UmlCode c, const char * name)
+                                    UmlCode c, QString name)
 {
     return new BrowserPseudoState(c, name, future_parent, new PseudoStateData());
 }
@@ -350,7 +349,7 @@ BrowserPseudoState::add_pseudostate(BrowserNode * future_parent,
 BrowserPseudoState * BrowserPseudoState::get_pseudostate(BrowserNode * future_parent, UmlCode c)
 {
     BrowserNodeList l;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = future_parent->firstChild(); child != 0; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp() &&
@@ -360,13 +359,13 @@ BrowserPseudoState * BrowserPseudoState::get_pseudostate(BrowserNode * future_pa
     BrowserNode * old = 0;
     QString name;
     QString s = stringify(c);
-    int index = s.find("_");
+    int index = s.indexOf("_");
 
     if (index != -1)
         s.replace(index, 1, " ");
 
     if (!allow_empty(c) &&
-        !future_parent->enter_child_name(name, TR("enter " + s + "'s name : "),
+        !future_parent->enter_child_name(name,  QObject::tr("enter " )+ s +  QObject::tr("'s name : "),
                                          UmlState, l, &old, TRUE, FALSE))
         return 0;
 
@@ -376,7 +375,7 @@ BrowserPseudoState * BrowserPseudoState::get_pseudostate(BrowserNode * future_pa
     switch (c) {
     case DeepHistoryPS:
         if (! l.isEmpty()) {
-            msg_critical("Douml", TR("already have a deep history"));
+            msg_critical("Douml",  QObject::tr("already have a deep history"));
             return 0;
         }
 
@@ -384,7 +383,7 @@ BrowserPseudoState * BrowserPseudoState::get_pseudostate(BrowserNode * future_pa
 
     case ShallowHistoryPS:
         if (! l.isEmpty()) {
-            msg_critical("Douml",  TR("already have a shallow history"));
+            msg_critical("Douml",   QObject::tr("already have a shallow history"));
             return 0;
         }
 
@@ -407,51 +406,53 @@ BrowserPseudoState * BrowserPseudoState::get_pseudostate(BrowserNode * future_pa
 void BrowserPseudoState::menu()
 {
     QString s = stringify(kind);
-    int index = s.find("_");
+    int index = s.indexOf("_");
 
     if (index != -1)
         s.replace(index, 1, " ");
-
-    Q3PopupMenu m(0, "pseudo state");
-    Q3PopupMenu toolm(0);
+    QMenu m("pseudo state",0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                       TR("to edit the <i>" + s + "</i>, \
-a double click with the left mouse button does the same thing"));
+        MenuFactory::addItem(m,  QObject::tr("Edit"), 1,
+                        QObject::tr("to edit the <i>%1</i>, \
+a double click with the left mouse button does the same thing").arg(s));
 
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 2),
-                           TR("to copy the <i>" + s + "</i> in a new one"));
-            m.insertSeparator();
+            MenuFactory::addItem(m,  QObject::tr("Duplicate"), 2,
+                            QObject::tr("to copy the <i>%1</i> in a new one").arg(s));
+            m.addSeparator();
 
             if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 3),
-                               TR("to delete the <i>" + s + "</i>. \
-Note that you can undelete it after"));
+                MenuFactory::addItem(m,  QObject::tr("Delete"), 3,
+                                QObject::tr("to delete the <i>%1</i>. \
+Note that you can undelete it after").arg(s));
         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 5),
-                       TR("to know who reference the <i>" + s + "</i> \
-through a transition"));
-        mark_menu(m, TR("the " + s), 90);
+        MenuFactory::addItem(m,  QObject::tr("Referenced by"), 5,
+                        QObject::tr("to know who reference the <i>%1</i> \
+through a transition").arg(s));
+        mark_menu(m,  QObject::tr("the ").arg(s), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 4),
-                       TR("to undelete the <i>" + s + "</i>"));
+        MenuFactory::addItem(m,  QObject::tr("Undelete"), 4,
+                        QObject::tr("to undelete the <i>%1</i>").arg(s));
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserPseudoState::exec_menu_choice(int rank)
@@ -464,13 +465,13 @@ void BrowserPseudoState::exec_menu_choice(int rank)
     case 2: {
         QString name;
         QString s = stringify(kind);
-        int index = s.find("_");
+        int index = s.indexOf("_");
 
         if (index != -1)
             s.replace(index, 1, " ");
 
         if (allow_empty() ||
-            ((BrowserNode *) parent())->enter_child_name(name, TR("enter " + s + "'s name : "),
+            ((BrowserNode *) parent())->enter_child_name(name,  QObject::tr("enter ") + s +  QObject::tr("'s name : "),
                     get_type(), allow_spaces(),
                     FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
@@ -504,7 +505,7 @@ void BrowserPseudoState::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserPseudoState::apply_shortcut(QString s)
+void BrowserPseudoState::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -559,12 +560,12 @@ UmlCode BrowserPseudoState::get_type() const
 QString BrowserPseudoState::get_stype() const
 {
     QString s = stringify(kind);
-    int index = s.find("_");
+    int index = s.indexOf("_");
 
     if (index != -1)
         s.replace(index, 1, " ");
 
-    return TR(s);
+    return s;// QObject::tr(s);
 }
 
 int BrowserPseudoState::get_identifier() const
@@ -689,13 +690,12 @@ void BrowserPseudoState::DragMoveInsideEvent(QDragMoveEvent * e)
 void BrowserPseudoState::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, BrowserTransition::drag_key(this))) != 0)) &&
         (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE))
             move(bn, after);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"),  QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -760,7 +760,7 @@ void BrowserPseudoState::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -821,12 +821,12 @@ BrowserPseudoState * BrowserPseudoState::read(char *& st, char * k,
         result = all[id];
 
         if (result == 0)
-            result = new BrowserPseudoState(c, (allow_empty(c)) ? "" : (const char *) read_string(st),
+            result = new BrowserPseudoState(c, (allow_empty(c)) ? "" : read_string(st),
                                             parent, new PseudoStateData, id);
         else if (result->is_defined) {
             BrowserPseudoState * already_exist = result;
 
-            result = new BrowserPseudoState(c, (allow_empty(c)) ? "" : (const char *) read_string(st),
+            result = new BrowserPseudoState(c, (allow_empty(c)) ? "" : read_string(st),
                                             parent, new PseudoStateData, id);
 
             already_exist->must_change_id(all);
diff --git a/src/browser/BrowserPseudoState.h b/src/browser/BrowserPseudoState.h
index f878445d8..59a8d9367 100644
--- a/src/browser/BrowserPseudoState.h
+++ b/src/browser/BrowserPseudoState.h
@@ -57,15 +57,15 @@ class BrowserPseudoState : public BrowserNode, public Labeled<BrowserPseudoState
     void exec_menu_choice(int rank);
 
 public:
-    BrowserPseudoState(UmlCode c, QString s, BrowserNode * p, PseudoStateData * d, int id = 0);
+    BrowserPseudoState(UmlCode c, const QString & s, BrowserNode * p, PseudoStateData * d, int id = 0);
     BrowserPseudoState(const BrowserPseudoState * model, BrowserNode * p);
     virtual ~BrowserPseudoState();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserPseudoState * add_pseudostate(BrowserNode * future_parent, UmlCode c);
     static BrowserPseudoState * add_pseudostate(BrowserNode * future_parent,
-            UmlCode c, const char * name);
+            UmlCode c, QString name);
     static BrowserPseudoState * get_pseudostate(BrowserNode * future_parent, UmlCode c);
     virtual BasicData * add_relation(UmlCode, BrowserNode * end);
     BrowserTransition * add_transition(BrowserNode * end);
@@ -75,7 +75,7 @@ class BrowserPseudoState : public BrowserNode, public Labeled<BrowserPseudoState
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -96,8 +96,8 @@ class BrowserPseudoState : public BrowserNode, public Labeled<BrowserPseudoState
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserPseudoState *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserPseudoState *);
 
     bool allow_empty() const;
     static bool allow_empty(UmlCode c);
diff --git a/src/browser/BrowserRegion.cpp b/src/browser/BrowserRegion.cpp
index e9cd803bb..1de0aea51 100644
--- a/src/browser/BrowserRegion.cpp
+++ b/src/browser/BrowserRegion.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -58,7 +58,7 @@
 IdDict<BrowserRegion> BrowserRegion::all(__FILE__);
 QStringList BrowserRegion::its_default_stereotypes;	// unicode
 
-BrowserRegion::BrowserRegion(QString s, BrowserNode * p, BasicData * d, int id)
+BrowserRegion::BrowserRegion(const QString & s, BrowserNode * p, BasicData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserRegion>(all, id), def(d)
 {
     def->set_browser_node(this);
@@ -95,7 +95,7 @@ void BrowserRegion::delete_it()
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserRegion::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserRegion::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserRegion * result = new BrowserRegion(this, p);
 
@@ -119,7 +119,7 @@ void BrowserRegion::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
@@ -157,55 +157,58 @@ BrowserRegion * BrowserRegion::add_region(BrowserNode * future_parent,
 
 void BrowserRegion::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name, 0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("New state"), 1),
-                           TR("to add a <i>state</i> to the <i>region</i>"));
+            MenuFactory::addItem(m, QObject::tr("New state"), 1,
+                           QObject::tr("to add a <i>state</i> to the <i>region</i>"));
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Edit"), 3),
-                       TR("to edit the <i>region</i>, \
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Edit"), 3,
+                       QObject::tr("to edit the <i>region</i>, \
 a double click with the left mouse button does the same thing"));
 
         if (!is_read_only && (edition_number == 0)) {
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Delete"), 7),
-                           TR("to delete the <i>region</i>. \
+            m.addSeparator();
+            MenuFactory::addItem(m, QObject::tr("Delete"), 7,
+                           QObject::tr("to delete the <i>region</i>. \
 Note that you can undelete it after"));
         }
 
-        mark_menu(m, TR("the region"), 90);
+        mark_menu(m, QObject::tr("the region"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr(("Tool")));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 8),
-                       TR("to undelete the <i>region</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 8,
+                       QObject::tr("to undelete the <i>region</i>"));
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 9),
-                               TR("undelete the region and its children"));
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 9,
+                               QObject::tr("undelete the region and its children"));
                 break;
             }
         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserRegion::exec_menu_choice(int rank)
@@ -248,7 +251,7 @@ void BrowserRegion::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserRegion::apply_shortcut(QString s)
+void BrowserRegion::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -275,7 +278,7 @@ void BrowserRegion::apply_shortcut(QString s)
         if (s == "Undelete")
             choice = 8;
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -293,7 +296,7 @@ void BrowserRegion::apply_shortcut(QString s)
 void BrowserRegion::open(bool)
 {
     if (!is_edited)
-        edit(TR("Region"), its_default_stereotypes);
+        edit(QObject::tr("Region"), its_default_stereotypes);
 }
 
 void BrowserRegion::modified()
@@ -309,7 +312,7 @@ UmlCode BrowserRegion::get_type() const
 
 QString BrowserRegion::get_stype() const
 {
-    return TR("Region");
+    return QObject::tr("Region");
 }
 
 int BrowserRegion::get_identifier() const
@@ -414,13 +417,11 @@ bool BrowserRegion::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-bool BrowserRegion::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserRegion::may_contains_them(const QList<BrowserNode *> & l,
                                       BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlState:
             break;
 
@@ -435,16 +436,16 @@ bool BrowserRegion::may_contains_them(const Q3PtrList<BrowserNode> & l,
         case ChoicePS:
         case ForkPS:
         case JoinPS:
-            return (((const BrowserNode *) it.current()->parent()) == this);
+            return (((const BrowserNode *) node->parent()) == this);
 
         default:
             return FALSE;
         }
 
-        if (! may_contains(it.current(), FALSE))
+        if (! may_contains(node, FALSE))
             return FALSE;
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -485,7 +486,6 @@ void BrowserRegion::DragMoveInsideEvent(QDragMoveEvent * e)
 void BrowserRegion::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, BrowserPseudoState::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserStateAction::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserState::drag_key(this))) != 0)) &&
@@ -494,14 +494,15 @@ void BrowserRegion::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if ((after == 0) &&
                 ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
                 // have choice
-                Q3PopupMenu m(0);
-
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
-
-                switch (m.exec(QCursor::pos())) {
+                QMenu m(0);
+
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In %1").arg(QString(get_name())), 1);
+                MenuFactory::addItem(m, QObject::tr("After %1").arg(QString(get_name())), 2);
+                        QAction *retAction = m.exec(QCursor::pos());
+                if(retAction)
+                switch (retAction->data().toInt()) {
                 case 1:
                     break;
 
@@ -518,7 +519,7 @@ void BrowserRegion::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             move(bn, after);
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -577,7 +578,7 @@ void BrowserRegion::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
diff --git a/src/browser/BrowserRegion.h b/src/browser/BrowserRegion.h
index d3713283b..4f2f06767 100644
--- a/src/browser/BrowserRegion.h
+++ b/src/browser/BrowserRegion.h
@@ -57,11 +57,11 @@ class BrowserRegion : public BrowserNode, public Labeled<BrowserRegion>
     void exec_menu_choice(int rank);
 
 public:
-    BrowserRegion(QString s, BrowserNode * p, BasicData * d, int id = 0);
+    BrowserRegion(const QString & s, BrowserNode * p, BasicData * d, int id = 0);
     BrowserRegion(const BrowserRegion * model, BrowserNode * p);
     virtual ~BrowserRegion();
 
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> & l,
+    virtual bool may_contains_them(const QList<BrowserNode *> & l,
                                    BooL & duplicable) const;
     static BrowserRegion * add_region(BrowserNode * future_parent,
                                       const char * s = "region");
@@ -70,7 +70,7 @@ class BrowserRegion : public BrowserNode, public Labeled<BrowserRegion>
 
     virtual void delete_it();
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -78,7 +78,7 @@ class BrowserRegion : public BrowserNode, public Labeled<BrowserRegion>
     virtual void modified();
     virtual BasicData * get_data() const;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
 
     virtual void save(QTextStream &, bool ref, QString & warning);
diff --git a/src/browser/BrowserRelation.cpp b/src/browser/BrowserRelation.cpp
index f44d4ad50..c0b41ca1b 100644
--- a/src/browser/BrowserRelation.cpp
+++ b/src/browser/BrowserRelation.cpp
@@ -29,10 +29,10 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3ptrdict.h>
+#include <qhash.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QPixmap>
@@ -61,7 +61,7 @@
 #include "translate.h"
 
 IdDict<BrowserRelation> BrowserRelation::all(1021, __FILE__);
-static Q3PtrList<BrowserRelation> Unconsistent;
+static QList<BrowserRelation *> Unconsistent;
 
 BrowserRelation::BrowserRelation(BrowserNode * p, RelationData * d, int id)
     : BrowserNode(d->get_name(), p), Labeled<BrowserRelation>(all, id),
@@ -99,7 +99,7 @@ bool BrowserRelation::is_undefined() const
     return ((BrowserNode *) parent())->is_undefined();
 }
 
-BrowserNode * BrowserRelation::duplicate(BrowserNode * p, QString)
+BrowserNode * BrowserRelation::duplicate(BrowserNode * p, const QString &)
 {
     BrowserRelation * result = new BrowserRelation(this, p);
 
@@ -112,7 +112,8 @@ BrowserNode * BrowserRelation::duplicate(BrowserNode * p, QString)
     }
 
     result->update_stereotype();
-
+    //move(result, this);
+    //result->select_in_browser();
     return result;
 }
 
@@ -145,15 +146,15 @@ bool BrowserRelation::undelete(bool, QString & warning, QString & renamed)
         return FALSE;
 
     if (def->get_start_class()->deletedp() ||
-        def->get_end_class()->deletedp()) {
+            def->get_end_class()->deletedp()) {
         if (def->is_a(this))
-            warning += QString("<li><b>") + quote(def->get_name(this)) + "</b> " + TR("from") + " <b>" +
-                       def->get_start_class()->full_name() +
-                       "</b> " + TR("to") + " <b>" + def->get_end_class()->full_name() + "</b>\n";
+            warning += QString("<li><b>") + quote(def->get_name(this)) + "</b> " + QObject::tr("from") + " <b>" +
+                    def->get_start_class()->full_name() +
+                    "</b> " + QObject::tr("to") + " <b>" + def->get_end_class()->full_name() + "</b>\n";
         else
-            warning += QString("<li><b>") + def->get_name(this) + "</b> " + TR("from") + " <b>" +
-                       def->get_end_class()->full_name() +
-                       "</b> " + TR("to") + " <b>" + quote(def->get_start_class()->full_name()) + "</b>\n";
+            warning += QString("<li><b>") + def->get_name(this) + "</b> " + QObject::tr("from") + " <b>" +
+                    def->get_end_class()->full_name() +
+                    "</b> " + QObject::tr("to") + " <b>" + quote(def->get_start_class()->full_name()) + "</b>\n";
 
         return FALSE;
     }
@@ -163,13 +164,12 @@ bool BrowserRelation::undelete(bool, QString & warning, QString & renamed)
         case UmlRealize:
             if (!def->get_start_class()->check_inherit(def->get_end_class()).isEmpty()) {
                 warning += QString("<li><b>") + quote(def->get_name(this)) + "</b> "
-                           + TR("because <b>%1</b> cannot (or already) inherit on <b>%2</b>",
-                                def->get_start_class()->full_name(),
-                                def->get_end_class()->full_name())
-                           + "\n";
+                        + QObject::tr("because <b>%1</b> cannot (or already) inherit on <b>%2</b>")
+                        .arg(def->get_start_class()->full_name())
+                        .arg(def->get_end_class()->full_name())
+                        + "\n";
                 return FALSE;
             }
-
             break;
 
         default:
@@ -181,26 +181,26 @@ bool BrowserRelation::undelete(bool, QString & warning, QString & renamed)
         renamed += QString("<li><b>") + full_name() + "</b>\n";
         modified();
     }
-
     if (RelationData::isa_inherit(get_type()) &&
-        !strcmp(def->get_start_class()->get_data()->get_stereotype(), "stereotype") &&
-        !strcmp(def->get_end_class()->get_data()->get_stereotype(), "stereotype"))
+            !strcmp(def->get_start_class()->get_data()->get_stereotype(), "stereotype") &&
+            !strcmp(def->get_end_class()->get_data()->get_stereotype(), "stereotype"))
         ProfiledStereotypes::recompute(TRUE);
 
     package_modified();
+
     repaint();
 
     return TRUE;
 }
 
-const char * BrowserRelation::get_comment() const
+QString BrowserRelation::get_comment() const
 {
     return (def->is_a(this))
-           ? def->get_comment_a()
-           : def->get_comment_b();
+            ? def->get_comment_a()
+            : def->get_comment_b();
 }
 
-void BrowserRelation::set_comment(const char * c)
+void BrowserRelation::set_comment(const QString & c)
 {
     if (def->is_a(this))
         def->set_comment_a(c);
@@ -208,25 +208,32 @@ void BrowserRelation::set_comment(const char * c)
         def->set_comment_b(c);
 }
 
-void BrowserRelation::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserClass * target)
+UmlVisibility BrowserRelation::get_visibility() const
+{
+    return def->get_uml_visibility_a();
+}
+
+void BrowserRelation::compute_referenced_by(QList<BrowserNode *> & l,
+                                            BrowserClass * target)
 {
     IdIterator<BrowserRelation> it(all);
     BrowserRelation * r;
 
-    while ((r = it.current()) != 0) {
+    while(it.hasNext()){
+        it.next();
+        if ((r = it.value()) != 0) {
         if (!r->deletedp() &&
-            (((r->def->is_a(it.current()))
-              ? (r->def->get_end_class() == target)
-              : (r->def->get_start_class() == target))
-             || (r->def->get_association().type == target)))
+                (((r->def->is_a(it.value()))
+                  ? (r->def->get_end_class() == target)
+                  : (r->def->get_start_class() == target))
+                 || (r->def->get_association().type == target)))
             l.append(r);
 
-        ++it;
+}
     }
 }
 
-void BrowserRelation::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserRelation::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserClassInstance::compute_referenced_by(l, this);
@@ -241,8 +248,7 @@ void BrowserRelation::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
 BrowserRelation * BrowserRelation::temporary(RelationData * d)
 {
     BrowserRelation * result = new BrowserRelation(-1);
-
-    result->parent()->takeItem(result);
+    result->parent()->removeChild(result);
     BrowserClass::temporary()->insertItem(result);
 
     result->def = d;
@@ -384,11 +390,11 @@ void BrowserRelation::update_stereotype(bool)
             else
                 latterPart = def->get_start_class()->get_name();
 
-            const char * tName = def->get_name(this);
+            QString tName = def->get_name(this);
             n = tName + QString(" ") + latterPart;
 
         }
-        break;
+            break;
 
         default:
             n = this->get_name();
@@ -398,8 +404,7 @@ void BrowserRelation::update_stereotype(bool)
 
         if (show_stereotypes && stereotype[0]) {
             QString s = stereotype;
-            int index = s.find(':');
-
+            int index = s.indexOf(':');
             setText(0,
                     "<<" + ((index == -1) ? s : s.mid(index + 1))
                     + ">> " + n);
@@ -421,12 +426,12 @@ QString BrowserRelation::stereotypes_properties() const
         sta += "\n";
 
         return (!stb.isEmpty())
-               ? sta + stb
-               : sta + QString("<<") + def->get_short_stereotype() + QString(">>");
+                ? sta + stb
+                : sta + QString("<<") + def->get_short_stereotype() + QString(">>");
     }
     else if (!stb.isEmpty())
         return QString("<<") + def->get_short_stereotype() +
-               QString(">>\n") + stb;
+                QString(">>\n") + stb;
     else
         return QString();
 }
@@ -439,7 +444,7 @@ AType BrowserRelation::class_association() const
 const char * BrowserRelation::constraint() const
 {
     return (def->is_a(this) ? def->get_constraint_a()
-            : def->get_constraint_b());
+                            : def->get_constraint_b());
 }
 
 const QPixmap * BrowserRelation::pixmap(int) const
@@ -447,12 +452,10 @@ const QPixmap * BrowserRelation::pixmap(int) const
     if (deletedp())
         return DeletedRelationIcon;
 
-
     const QPixmap * px = ProfiledStereotypes::browserPixmap(def->get_stereotype());
 
     if (px != 0)
         return px ;
-
     switch (def->is_a(this) ? def->get_uml_visibility_a()
             : def->get_uml_visibility_b()) {
     case UmlPublic:
@@ -469,104 +472,111 @@ const QPixmap * BrowserRelation::pixmap(int) const
     }
 }
 
-void BrowserRelation::paintCell(QPainter * p, const QColorGroup & cg, int column,
-                                int width, int alignment)
+QVariant BrowserRelation::data(int column, int role) const
 {
-    bool class_relation = def->is_a(this)
-                          ? def->get_isa_class_relation_a() : def->get_isa_class_relation_b();
-
-    const QColor & bg = p->backgroundColor();
-
-    if (is_marked) {
-        p->setBackgroundMode(Qt::OpaqueMode);
-        p->setBackgroundColor(UmlRedColor);
-    }
-
-    p->setFont((class_relation)
-               ? ((is_writable()) ? BoldUnderlineFont : UnderlineFont)
-                   : ((is_writable()) ? BoldFont : NormalFont));
-    Q3ListViewItem::paintCell(p, cg, column, width, alignment);
-
-    if (is_marked) {
-        p->setBackgroundMode(Qt::TransparentMode);
-        p->setBackgroundColor(bg);
+    if(role == Qt::FontRole)
+    {
+        bool class_relation = def->is_a(this)
+                ? def->get_isa_class_relation_a() : def->get_isa_class_relation_b();
+        if(class_relation)
+        {
+            if(is_writable())
+                return BoldUnderlineFont;
+            else
+                return UnderlineFont;
+        }
+        else
+        {
+            if(is_writable())
+                return BoldFont;
+            else
+                return NormalFont;
+        }
     }
+    return BrowserNode::data(column, role);
 }
-
 void BrowserRelation::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!in_edition()) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>relation</i>, \
-a double click with the left mouse button does the same thing"));
-
-            if (!is_read_only && (edition_number == 0)) {
-                if (RelationData::isa_association(def->get_type())) {
-                    m.setWhatsThis(m.insertItem(TR("Duplicate"), 1),
-                                   TR("to copy the <i>relation</i> in a new one"));
-
-                    if (get_oper == 0)
-                        m.setWhatsThis(m.insertItem(TR("New get operation"), 4),
-                                       TR("to auto define the <i>get operation</i>"));
-
-                    if (set_oper == 0)
-                        m.setWhatsThis(m.insertItem(TR("New set operation"), 5),
-                                       TR("to auto define the <i>set operation</i>"));
-
-                    if ((get_oper == 0) && (set_oper == 0))
-                        m.setWhatsThis(m.insertItem(TR("New get and set operation"), 6),
-                                       TR("to auto define the <i>get</i> and <i>set operation</i>s"));
-
-                    m.insertSeparator();
-                }
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>relation</i>, \
+                                             a double click with the left mouse button does the same thing"));
+
+                                             if (!is_read_only && (edition_number == 0)) {
+                                                 if (RelationData::isa_association(def->get_type())) {
+                                                     MenuFactory::addItem(m, QObject::tr("Duplicate"), 1,
+                                                     QObject::tr("to copy the <i>relation</i> in a new one"));
+
+                                                     if (get_oper == 0)
+                                                     MenuFactory::addItem(m, QObject::tr("New get operation"), 4,
+                                                     QObject::tr("to auto define the <i>get operation</i>"));
+
+                                                     if (set_oper == 0)
+                                                     MenuFactory::addItem(m, QObject::tr("New set operation"), 5,
+                                                     QObject::tr("to auto define the <i>set operation</i>"));
+
+                                                     if ((get_oper == 0) && (set_oper == 0))
+                                                     MenuFactory::addItem(m, QObject::tr("New get and set operation"), 6,
+                                                     QObject::tr("to auto define the <i>get</i> and <i>set operation</i>s"));
+
+                                                     m.addSeparator();
+                                                 }
+                                             }
+
+                                             MenuFactory::addItem(m, QObject::tr("Referenced by"), 8,
+                                                                  QObject::tr("to know who reference the <i>relation</i>"));
+                                 m.addSeparator();
+
+                    if (!is_read_only && (edition_number == 0)) {
+                MenuFactory::addItem(m, QObject::tr("Delete"), 2,
+                                     QObject::tr("to delete the <i>relation</i>. \
+                                                 Note that you can undelete it after"));
             }
 
-            m.setWhatsThis(m.insertItem(TR("Referenced by"), 8),
-                           TR("to know who reference the <i>relation</i>"));
-            m.insertSeparator();
-
-            if (!is_read_only && (edition_number == 0)) {
-                m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                               TR("to delete the <i>relation</i>. \
-Note that you can undelete it after"));
-            }
-
-            m.insertSeparator();
+            m.addSeparator();
         }
 
-        m.setWhatsThis(m.insertItem(QString(TR("select ")) +
-                                    ((def->is_a(this))
-                                     ? def->get_end_class()
-                                     : def->get_start_class())->get_name(),
-                                    7),
-                       TR("to select the destination class"));
-        mark_menu(m, TR("the relation"), 90);
+        MenuFactory::addItem(m, QString(QObject::tr("select ")) +
+                             ((def->is_a(this))
+                              ? def->get_end_class()
+                              : def->get_start_class())->get_name(),
+                             7,
+                             QObject::tr("to select the destination class"));
+        mark_menu(m, QObject::tr("the relation"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0)
-            && Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                && Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            MenuFactory::insertItem(m, QObject::tr("Tool"), &toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("undelete the <i>relation</i> \
-(except if the class at the other side is also deleted)"));
-
-        if (def->get_start_class()->deletedp() ||
-            def->get_end_class()->deletedp())
-            m.setItemEnabled(3, FALSE);
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 3,
+                             QObject::tr("undelete the <i>relation</i> \
+                                         (except if the class at the other side is also deleted)"));
+
+                                         if (def->get_start_class()->deletedp() ||
+                                             def->get_end_class()->deletedp())
+        {
+                                             QAction *action = MenuFactory::findAction(m, 3);
+                                             if(action)
+                                             action->setEnabled(false);
+                                            // m.setItemEnabled(3, FALSE);
+                                         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
+
 }
 
 void BrowserRelation::exec_menu_choice(int rank)
@@ -582,24 +592,21 @@ void BrowserRelation::exec_menu_choice(int rank)
 
     case 2:
         delete_it();
-
         if (RelationData::isa_inherit(get_type()) &&
-            !strcmp(def->get_start_class()->get_data()->get_stereotype(),
-                    "stereotype") &&
-            !strcmp(def->get_end_class()->get_data()->get_stereotype(),
-                    "stereotype"))
+                !strcmp(def->get_start_class()->get_data()->get_stereotype(),
+                        "stereotype") &&
+                !strcmp(def->get_end_class()->get_data()->get_stereotype(),
+                        "stereotype"))
             ProfiledStereotypes::recompute(TRUE);
 
         break;
 
     case 3:
         BrowserNode::undelete(FALSE);
-
         if (RelationData::isa_inherit(get_type()) &&
-            !strcmp(def->get_start_class()->get_data()->get_stereotype(), "stereotype") &&
-            !strcmp(def->get_end_class()->get_data()->get_stereotype(), "stereotype"))
+                !strcmp(def->get_start_class()->get_data()->get_stereotype(), "stereotype") &&
+                !strcmp(def->get_end_class()->get_data()->get_stereotype(), "stereotype"))
             ProfiledStereotypes::recompute(TRUE);
-
         break;
 
     case 4:
@@ -616,7 +623,7 @@ void BrowserRelation::exec_menu_choice(int rank)
 
     case 7:
         ((def->is_a(this)) ? def->get_end_class()
-         : def->get_start_class())->select_in_browser();
+                           : def->get_start_class())->select_in_browser();
         return;
 
     case 8:
@@ -630,7 +637,6 @@ void BrowserRelation::exec_menu_choice(int rank)
             ToolCom::run(Tool::command(rank - 100), this);
         else
             mark_management(rank - 90);
-
         return;
     }
 
@@ -638,7 +644,7 @@ void BrowserRelation::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserRelation::apply_shortcut(QString s)
+void BrowserRelation::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -701,11 +707,10 @@ void BrowserRelation::open(bool)
 
 void BrowserRelation::modified()
 {
-    const char * newName = def->get_name(this);
+    QString newName = def->get_name(this);
     set_name(newName);
     update_stereotype(FALSE);
     repaint();
-
     if (get_oper != 0)
         update_get_oper();
 
@@ -718,13 +723,13 @@ void BrowserRelation::modified()
 UmlCode BrowserRelation::get_type() const
 {
     return (def == 0)
-           ? UmlRelations	// legal case to manage get/set operation read
-           : def->get_type();
+            ? UmlRelations	// legal case to manage get/set operation read
+            : def->get_type();
 }
 
 QString BrowserRelation::get_stype() const
 {
-    return TR("relation");
+    return QObject::tr("relation");
 }
 
 int BrowserRelation::get_identifier() const
@@ -750,7 +755,7 @@ bool BrowserRelation::same_name(const QString & s, UmlCode t) const
         if (role[0] != '(')
             // role have name, compare with the role name
             // followed by " " then '(' then the relation's name
-            return (s == role.left(role.find(" ")));
+            return (s == role.left(role.indexOf(" ")));
     }
 
     return FALSE;
@@ -859,7 +864,7 @@ void BrowserRelation::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 QString BrowserRelation::drag_key() const
 {
     return QString::number(UmlRelations)
-           + "#" + QString::number((unsigned long) parent());
+            + "#" + QString::number((unsigned long) parent());
 }
 
 QString BrowserRelation::drag_postfix() const
@@ -870,7 +875,7 @@ QString BrowserRelation::drag_postfix() const
 QString BrowserRelation::drag_key(BrowserNode * p)
 {
     return QString::number(UmlRelations)
-           + "#" + QString::number((unsigned long) p);
+            + "#" + QString::number((unsigned long) p);
 }
 
 // Removes the relation from its parent tree, delete it
@@ -879,7 +884,6 @@ QString BrowserRelation::drag_key(BrowserNode * p)
 BrowserNode * BrowserRelation::extract()
 {
     BrowserNode * p = ((BrowserNode *) parent());
-
     p->takeItem(this);
     def = 0;
 
@@ -892,7 +896,6 @@ BrowserNode * BrowserRelation::extract()
         p->takeItem(set_oper);
         delete set_oper;
     }
-
     delete this;
     return p;
 }
@@ -946,11 +949,12 @@ void BrowserRelation::save(QTextStream & st, bool ref, QString & warning)
 void BrowserRelation::post_load()
 {
     RelationData::post_load();
-
     IdIterator<BrowserRelation> it(all);
     BrowserRelation * br;
 
-    while ((br = it.current()) != 0) {
+    while(it.hasNext()){
+        it.next();
+        if ((br = it.value()) != 0) {
         if (!br->is_undefined()) {
             // not yet moved in UndefinedNodePackage
 
@@ -991,30 +995,33 @@ void BrowserRelation::post_load()
             }
         }
 
-        ++it;
+  }
     }
 
-    while (!Unconsistent.isEmpty()) {
-        br = Unconsistent.take(0);
+    foreach (BrowserRelation *br, Unconsistent) {
         br->def->set_unconsistent();
         br->def = 0;
         br->must_be_deleted();
     }
+    Unconsistent.clear();
 
     if (RelationData::has_unconsistencies()) {
         IdIterator<BrowserRelation> it2(all);
 
-        while ((br = it2.current()) != 0) {
+        while(it2.hasNext()){
+            it2.next();
+            if ((br = it2.value()) != 0) {
             if ((br->def != 0) && br->def->unconsistentp()) {
                 br->def = 0; // to not call garbage
                 br->must_be_deleted();
             }
 
-            ++it2;
+}
         }
 
         RelationData::delete_unconsistent();
     }
+
 }
 
 // Created for a relation data ref read before its definition
@@ -1040,8 +1047,8 @@ BrowserRelation * BrowserRelation::read_ref(char *& st, char * k)
     BrowserRelation * result = all[id];
 
     return (result == 0)
-           ? new BrowserRelation(id)
-           : result;
+            ? new BrowserRelation(id)
+            : result;
 }
 
 BrowserRelation * BrowserRelation::read(char *& st, char * k,
@@ -1078,7 +1085,9 @@ BrowserRelation * BrowserRelation::read(char *& st, char * k,
                 delete result->def;
 
             result->def = d;
+
             result->set_parent(parent);
+
             result->set_name(d->get_name(result));
         }
 
@@ -1092,7 +1101,7 @@ BrowserRelation * BrowserRelation::read(char *& st, char * k,
 
         result->is_defined = TRUE;
         result->is_read_only = !parent->is_writable() ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         if (!strcmp(k, "get_oper")) {
             BrowserOperation * oper = BrowserOperation::read_ref(st);
@@ -1131,19 +1140,19 @@ BrowserNode * BrowserRelation::get_it(const char * k, int id)
 }
 
 //elt isa class
-void BrowserRelation::get_relating(BrowserNode * elt, Q3PtrDict<BrowserNode> & d,
+void BrowserRelation::get_relating(BrowserNode * elt, QHash<BrowserNode *,BrowserNode*> & d,
                                    BrowserNodeList & newones,
                                    bool inh, bool dep, bool assoc)
 {
     IdIterator<BrowserRelation> it(all);
     BrowserRelation * r;
 
-    for (; (r = it.current()) != 0; ++it) {
+    for (; it.hasNext()&&((r = it.value()) != 0); it.next()) {
         if (!r->deletedp() &&
-            (r->def->get_end_class() == elt)) {
+                (r->def->get_end_class() == elt)) {
             BrowserNode * src = r->def->get_start_class();
 
-            if (d[src] == 0) {
+            if (d.value(src) == 0) {
                 switch (r->get_type()) {
                 case UmlDependency:
                     if (! dep)
diff --git a/src/browser/BrowserRelation.h b/src/browser/BrowserRelation.h
index a256511d7..86c6f6258 100644
--- a/src/browser/BrowserRelation.h
+++ b/src/browser/BrowserRelation.h
@@ -44,6 +44,7 @@ class BrowserOperation;
 
 class BrowserRelation : public BrowserNode, public Labeled<BrowserRelation>
 {
+friend class QuickEdit;
 protected:
     static IdDict<BrowserRelation> all;
 
@@ -60,15 +61,17 @@ class BrowserRelation : public BrowserNode, public Labeled<BrowserRelation>
     BrowserRelation(const BrowserRelation * model, BrowserNode * p);
     virtual ~BrowserRelation();
 
-    virtual bool is_undefined() const;
+    virtual bool is_undefined() const override;
 
-    virtual void delete_it();
-    virtual bool undelete(bool rec, QString & warning, QString & renamed);
+    virtual void delete_it() override;
+    virtual bool undelete(bool rec, QString & warning, QString & renamed) override;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString()) override;
 
-    virtual const char * get_comment() const;
-    virtual void set_comment(const char * c);
+    virtual QString get_comment() const override;
+    virtual void set_comment(const QString & c) override;
+
+    virtual UmlVisibility get_visibility() const override;
 
     BrowserOperation * get_get_oper() {
         return get_oper;
@@ -83,32 +86,31 @@ class BrowserRelation : public BrowserNode, public Labeled<BrowserRelation>
     void add_get_oper();
     void add_set_oper();
 
-    virtual const QPixmap * pixmap(int) const;
-    virtual void paintCell(QPainter *, const QColorGroup &, int, int, int);
+    virtual const QPixmap * pixmap(int) const override;
     BrowserNode * extract();
     static BrowserRelation * reinsert(BrowserNode * p, RelationData * d);
 
-    virtual void menu();
-    virtual void apply_shortcut(QString s);
-    virtual void open(bool);
-    virtual bool in_edition() const;
-    virtual UmlCode get_type() const;
-    virtual QString get_stype() const;
-    virtual int get_identifier() const;
-    virtual const char * help_topic() const;
-    virtual void modified();
-    virtual BasicData * get_data() const;
-    virtual bool same_name(const QString & s, UmlCode type) const;
-    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
+    virtual void menu() override;
+    virtual void apply_shortcut(const QString & s) override;
+    virtual void open(bool) override;
+    virtual bool in_edition() const override;
+    virtual UmlCode get_type() const override;
+    virtual QString get_stype() const override;
+    virtual int get_identifier() const override;
+    virtual const char * help_topic() const override;
+    virtual void modified() override;
+    virtual BasicData * get_data() const override;
+    virtual bool same_name(const QString & s, UmlCode type) const override;
+    virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const override;
     virtual void member_cpp_def(const QString & prefix, const QString &,
-                                QString & s, bool templ) const;
-    virtual void update_stereotype(bool = FALSE);
-    virtual QString stereotypes_properties() const;
-    virtual AType class_association() const;
-    virtual const char * constraint() const;
-
-    virtual void write_id(ToolCom * com);
-    virtual void save(QTextStream &, bool ref, QString & warning);
+                                QString & s, bool templ) const override;
+    virtual void update_stereotype(bool = FALSE) override;
+    virtual QString stereotypes_properties() const override;
+    virtual AType class_association() const override;
+    virtual const char * constraint() const override;
+
+    virtual void write_id(ToolCom * com) override;
+    virtual void save(QTextStream &, bool ref, QString & warning) override;
     static BrowserRelation * read(char *& , char *, BrowserNode *, bool force = TRUE);
     static BrowserRelation * read_ref(char *& st);
     static BrowserRelation * read_ref(char *& , char * k);
@@ -119,22 +121,23 @@ class BrowserRelation : public BrowserNode, public Labeled<BrowserRelation>
 
     static void clear(bool old);
     static void update_idmax_for_root();
-    virtual void renumber(int phase);
-    virtual void prepare_update_lib() const;
+    virtual void renumber(int phase) override;
+    virtual void prepare_update_lib() const override;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserClass *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE) override;
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserClass *);
 
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 
     static QString drag_key(BrowserNode * p);
-    virtual QString drag_key() const;
-    virtual QString drag_postfix() const;
-    virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after);
+    virtual QString drag_key() const override;
+    virtual QString drag_postfix() const override;
+    virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after) override;
 
-    static void get_relating(BrowserNode *, Q3PtrDict<BrowserNode> & d,
+    static void get_relating(BrowserNode *, QHash<BrowserNode *, BrowserNode *> &d,
                              BrowserNodeList & newones,
                              bool inh, bool dep, bool assoc);
+    virtual QVariant data(int column, int role) const override;
 };
 
 #endif
diff --git a/src/browser/BrowserSeqDiagram.cpp b/src/browser/BrowserSeqDiagram.cpp
index ce6d754f7..d3a6ef1d1 100644
--- a/src/browser/BrowserSeqDiagram.cpp
+++ b/src/browser/BrowserSeqDiagram.cpp
@@ -25,16 +25,12 @@
 //
 // *************************************************************************
 
-
-
-
-
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 
 #include "BrowserSeqDiagram.h"
@@ -53,13 +49,13 @@
 #include "mu.h"
 #include "translate.h"
 
-Q3PtrList<BrowserSeqDiagram> BrowserSeqDiagram::imported;
-Q3ValueList<int> BrowserSeqDiagram::imported_ids;
+QList<BrowserSeqDiagram *> BrowserSeqDiagram::imported;
+QList<int> BrowserSeqDiagram::imported_ids;
 QStringList BrowserSeqDiagram::its_default_stereotypes;	// unicode
 QStringList BrowserSeqDiagram::message_default_stereotypes;	// unicode
 
 
-BrowserSeqDiagram::BrowserSeqDiagram(QString s, BrowserNode * p, int id)
+BrowserSeqDiagram::BrowserSeqDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -89,7 +85,6 @@ BrowserSeqDiagram::BrowserSeqDiagram(BrowserSeqDiagram * model, BrowserNode * p)
     overlapping_bars = model->overlapping_bars;
     canvas_size = model->canvas_size;
     is_modified = TRUE;
-
     if (model->window != 0)
         model->window->duplicate(get_ident(), "diagram");
     else {
@@ -111,7 +106,7 @@ BrowserSeqDiagram::~BrowserSeqDiagram()
 
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
 
 #if 0
@@ -141,33 +136,30 @@ BrowserSeqDiagram * BrowserSeqDiagram::add_sequence_diagram(BrowserNode * future
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter sequence diagram's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter sequence diagram's name : "),
                                         UmlSeqDiagram, TRUE, FALSE))
         return new BrowserSeqDiagram(name, future_parent);
     else
         return 0;
 }
 
-void BrowserSeqDiagram::set_name(const char * s)
+void BrowserSeqDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
-
     if (window != 0)
-        window->setCaption(s);
+        window->setWindowTitle(s);
 }
 
 void BrowserSeqDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserSeqDiagram * d = imported.take(0);
-
-        (new SeqDiagramWindow(d->full_name(), d, *it))->close(TRUE);
-        it = imported_ids.remove(it);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserSeqDiagram *d, imported) {
+        (new SeqDiagramWindow(d->full_name(), d, *it))->close();
+        it = imported_ids.erase(it);
         d->is_modified = TRUE;
     }
+
+    imported.clear();
 }
 
 void BrowserSeqDiagram::renumber(int phase)
@@ -185,11 +177,11 @@ void BrowserSeqDiagram::delete_it()
 {
     if (window)
         delete window;
-
+    window = 0;
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserSeqDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserSeqDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserSeqDiagram * result = new BrowserSeqDiagram(this, p);
 
@@ -230,50 +222,53 @@ void BrowserSeqDiagram::draw_svg() const
 
 void BrowserSeqDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Show"), 0),
-                       TR("to show and edit the <i>sequence diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Show"), 0,
+                             QObject::tr("to show and edit the <i>sequence diagram</i>"));
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                           TR("to edit the <i>sequence diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                                 QObject::tr("to edit the <i>sequence diagram</i>"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 2),
-                               TR("to set how the <i>sequence diagram</i>'s items must be drawn"));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to duplicate the <i>sequence diagram</i>"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 2,
+                                     QObject::tr("to set how the <i>sequence diagram</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 3,
+                                     QObject::tr("to duplicate the <i>sequence diagram</i>"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 4),
-                                   TR("to delete the <i>sequence diagram</i>. \
-Note that you can undelete it after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 4,
+                                         QObject::tr("to delete the <i>sequence diagram</i>. \
+                                                     Note that you can undelete it after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the sequence diagram"), 90);
+        mark_menu(m, QObject::tr("the sequence diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>sequence diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>sequence diagram</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserSeqDiagram::exec_menu_choice(int rank)
@@ -284,7 +279,7 @@ void BrowserSeqDiagram::exec_menu_choice(int rank)
         break;
 
     case 1:
-        edit(TR("Sequence diagram"), its_default_stereotypes);
+        edit(QObject::tr("Sequence diagram"), its_default_stereotypes);
         return;
 
     case 2:
@@ -294,13 +289,13 @@ void BrowserSeqDiagram::exec_menu_choice(int rank)
     case 3: {
         QString name;
 
-        if (((BrowserNode *)parent())->enter_child_name(name, TR("enter sequence diagram's name : "),
-                UmlSeqDiagram, TRUE, FALSE))
+        if (((BrowserNode *)parent())->enter_child_name(name, QObject::tr("enter sequence diagram's name : "),
+                                                        UmlSeqDiagram, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
         else
             return;
     }
-    break;
+        break;
 
     case 4:
         delete_it();
@@ -324,7 +319,7 @@ void BrowserSeqDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserSeqDiagram::apply_shortcut(QString s)
+void BrowserSeqDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -367,8 +362,9 @@ void BrowserSeqDiagram::open(bool)
         window = new SeqDiagramWindow(full_name(TRUE), this);
     else
         window->raise();
-
+    windowDestroyed = false;
     window->setFocus();
+
 }
 
 void BrowserSeqDiagram::edit_settings()
@@ -379,11 +375,11 @@ void BrowserSeqDiagram::edit_settings()
 
         settings.complete(st, TRUE);
 
-        co[0].set(TR("note color"), &note_color);
-        co[1].set(TR("class instance \ncolor"), &class_instance_color);
-        co[2].set(TR("duration color"), &duration_color);
-        co[3].set(TR("continuation color"), &continuation_color);
-        co[4].set(TR("fragment color"), &fragment_color);
+        co[0].set(QObject::tr("note color"), &note_color);
+        co[1].set(QObject::tr("class instance \ncolor"), &class_instance_color);
+        co[2].set(QObject::tr("duration color"), &duration_color);
+        co[3].set(QObject::tr("continuation color"), &continuation_color);
+        co[4].set(QObject::tr("fragment color"), &fragment_color);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -422,7 +418,7 @@ UmlCode BrowserSeqDiagram::get_type() const
 
 QString BrowserSeqDiagram::get_stype() const
 {
-    return TR("Sequence diagram");
+    return QObject::tr("Sequence diagram");
 }
 
 int BrowserSeqDiagram::get_identifier() const
@@ -480,8 +476,8 @@ UmlColor BrowserSeqDiagram::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 bool BrowserSeqDiagram::get_shadow() const
@@ -503,7 +499,7 @@ bool BrowserSeqDiagram::get_draw_all_relations() const
 void BrowserSeqDiagram::dont_draw_all_relations()
 {
     settings.draw_all_relations =
-        used_settings->draw_all_relations = UmlNo;
+            used_settings->draw_all_relations = UmlNo;
 }
 
 bool BrowserSeqDiagram::get_show_stereotype_properties() const
@@ -536,10 +532,10 @@ bool BrowserSeqDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
-    return TRUE;
+        return TRUE;
 
     case saveInCmd:
         if (window != 0)
@@ -551,9 +547,8 @@ bool BrowserSeqDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
-
         return TRUE;
 
     case sideCmd:
@@ -564,9 +559,8 @@ bool BrowserSeqDiagram::tool_cmd(ToolCom * com, const char * args)
 
             ((SeqDiagramView *) w->get_view())->send(com);
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
-
         return TRUE;
 
     default:
@@ -575,24 +569,25 @@ bool BrowserSeqDiagram::tool_cmd(ToolCom * com, const char * args)
     }
 }
 
-void BrowserSeqDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * bn,
-        char const * kc,
-        char const * kr)
+void BrowserSeqDiagram::compute_referenced_by(QList<BrowserNode *> & l,
+                                              BrowserNode * bn,
+                                              char const * kc,
+                                              char const * kr)
 {
     int id = bn->get_identifier();
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
+    while (it.hasNext()) {
+        it.next();
+        if ((d = it.value()) != 0) {
+            if (!d->deletedp() && (d->get_type() == UmlSeqDiagram)) {
+                if ((((BrowserSeqDiagram *) d)->window != 0)
+                        ? ((BrowserSeqDiagram *) d)->window->get_view()->is_present(bn)
+                        : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
+                    l.append((BrowserSeqDiagram *) d);
+            }
 
-    while ((d = it.current()) != 0) {
-        if (!d->deletedp() && (d->get_type() == UmlSeqDiagram)) {
-            if ((((BrowserSeqDiagram *) d)->window != 0)
-                ? ((BrowserSeqDiagram *) d)->window->get_view()->is_present(bn)
-                : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
-                l.append((BrowserSeqDiagram *) d);
         }
-
-        ++it;
     }
 }
 
@@ -655,7 +650,9 @@ void BrowserSeqDiagram::save(QTextStream & st, bool ref, QString & warning)
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
@@ -678,7 +675,7 @@ void BrowserSeqDiagram::save(QTextStream & st, bool ref, QString & warning)
 }
 
 BrowserSeqDiagram * BrowserSeqDiagram::read(char *& st, char * k,
-        BrowserNode * parent)
+                                            BrowserNode * parent)
 {
     BrowserSeqDiagram * r;
     int id;
@@ -712,7 +709,7 @@ BrowserSeqDiagram * BrowserSeqDiagram::read(char *& st, char * k,
         r->is_defined = TRUE;
 
         r->is_read_only = (!in_import() && read_only_file()) ||
-                          ((user_id() != 0) && r->is_api_base());
+                ((user_id() != 0) && r->is_api_base());
 
         QFileInfo fi(BrowserView::get_dir(), QString::number(id) + ".diagram");
 
diff --git a/src/browser/BrowserSeqDiagram.h b/src/browser/BrowserSeqDiagram.h
index 28a988b3a..e8d915ec2 100644
--- a/src/browser/BrowserSeqDiagram.h
+++ b/src/browser/BrowserSeqDiagram.h
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QPixmap;
 class SeqDiagramWindow;
@@ -44,8 +44,8 @@ class BrowserSeqDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserSeqDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserSeqDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
     static QStringList message_default_stereotypes;
 
@@ -66,40 +66,40 @@ class BrowserSeqDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserSeqDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserSeqDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserSeqDiagram();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
-
-    virtual const QPixmap * pixmap(int) const;
-    virtual void draw_svg() const;
-
-    virtual void menu();
-    virtual void apply_shortcut(QString s);
-    virtual void open(bool);
-    virtual void on_close();
-    virtual void read_session(char *& st);
-    virtual UmlCode get_type() const;
-    virtual QString get_stype() const;
-    virtual int get_identifier() const;
-    virtual const char * help_topic() const;
-    virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
-    virtual void update_drawing_settings();
-    virtual void get_sequencediagramsettings(SequenceDiagramSettings &) const;
+                                    const QString & name = QString()) override;
+
+    virtual const QPixmap * pixmap(int) const override;
+    virtual void draw_svg() const override;
+
+    virtual void menu() override;
+    virtual void apply_shortcut(const QString & s) override;
+    virtual void open(bool) override;
+    virtual void on_close() override;
+    virtual void read_session(char *& st) override;
+    virtual UmlCode get_type() const override;
+    virtual QString get_stype() const override;
+    virtual int get_identifier() const override;
+    virtual const char * help_topic() const override;
+    virtual BasicData * get_data() const override;
+    virtual void set_name(const QString & s) override;
+    virtual void update_drawing_settings() override;
+    virtual void get_sequencediagramsettings(SequenceDiagramSettings &) const override;
     void get_sequencediagramsettings_msg(SequenceDiagramSettings &) const;
-    virtual UmlColor get_color(UmlCode) const;
-    virtual bool get_shadow() const;
-    virtual bool get_draw_all_relations() const;
-    virtual void dont_draw_all_relations();
-    virtual bool get_auto_label_position() const;
-    virtual bool get_show_stereotype_properties() const;
-    virtual bool get_classinstwritehorizontally() const;
-    virtual ShowContextMode get_classinstshowmode() const;
-    virtual bool tool_cmd(ToolCom * com, const char * args);
-    virtual void save(QTextStream &, bool ref, QString & warning);
+    virtual UmlColor get_color(UmlCode) const override;
+    virtual bool get_shadow() const override;
+    virtual bool get_draw_all_relations() const override;
+    virtual void dont_draw_all_relations() override;
+    virtual bool get_auto_label_position() const override;
+    virtual bool get_show_stereotype_properties() const override;
+    virtual bool get_classinstwritehorizontally() const override;
+    virtual ShowContextMode get_classinstshowmode() const override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
+    virtual void save(QTextStream &, bool ref, QString & warning) override;
     static BrowserSeqDiagram * read(char *& , char *, BrowserNode *);
     static BrowserNode * get_it(const char * k, int id);
 
@@ -118,11 +118,11 @@ class BrowserSeqDiagram : public BrowserDiagram
     static void read_stereotypes(char *& , char *& k);
     static void save_stereotypes(QTextStream &);
 
-    virtual void renumber(int phase);
+    virtual void renumber(int phase) override;
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 };
 
diff --git a/src/browser/BrowserSimpleRelation.cpp b/src/browser/BrowserSimpleRelation.cpp
index a5b19b020..1d8077092 100644
--- a/src/browser/BrowserSimpleRelation.cpp
+++ b/src/browser/BrowserSimpleRelation.cpp
@@ -29,10 +29,10 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
-#include <q3painter.h>
-#include <q3ptrdict.h>
+
+#include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -72,7 +72,7 @@ BrowserSimpleRelation::BrowserSimpleRelation(BrowserNode * p, SimpleRelationData
 }
 
 BrowserSimpleRelation::BrowserSimpleRelation(const BrowserSimpleRelation * model,
-        BrowserNode * p)
+                                             BrowserNode * p)
     : BrowserNode(model->def->definition(FALSE, FALSE), p),
       Labeled<BrowserSimpleRelation>(all, 0)
 {
@@ -98,7 +98,7 @@ BrowserSimpleRelation::~BrowserSimpleRelation()
         delete def;
 }
 
-BrowserNode * BrowserSimpleRelation::duplicate(BrowserNode * p, QString)
+BrowserNode * BrowserSimpleRelation::duplicate(BrowserNode * p, const QString &)
 {
     BrowserSimpleRelation * result = new BrowserSimpleRelation(this, p);
 
@@ -115,10 +115,10 @@ bool BrowserSimpleRelation::undelete(bool, QString & warning, QString & renamed)
         return FALSE;
 
     if (def->get_start_node()->deletedp() ||
-        def->get_end_node()->deletedp()) {
-        warning += QString("<li><b>") + quote(def->definition(FALSE, FALSE)) + "</b> " + TR("from") + " <b>" +
-                   def->get_start_node()->full_name() +
-                   "</b> " + TR("to") + " <b>" + def->get_end_node()->full_name() + "</b>\n";
+            def->get_end_node()->deletedp()) {
+        warning += QString("<li><b>") + quote(def->definition(FALSE, FALSE)) + "</b> " + QObject::tr("from") + " <b>" +
+                def->get_start_node()->full_name() +
+                "</b> " + QObject::tr("to") + " <b>" + def->get_end_node()->full_name() + "</b>\n";
         return FALSE;
     }
     else {
@@ -128,10 +128,9 @@ bool BrowserSimpleRelation::undelete(bool, QString & warning, QString & renamed)
             // use case
             if (!def->get_start_node()->check_inherit(def->get_end_node()).isEmpty()) {
                 warning += QString("<li><b>") + quote(def->definition(FALSE, FALSE)) + "</b> "
-                           + TR("because <b>%1</b> cannot (or already) inherit on <b>%2</b>",
-                                def->get_start_node()->full_name(),
-                                def->get_end_node()->full_name())
-                           + "\n";
+                        + QObject::tr("because <b>%1</b> cannot (or already) inherit on <b>%2</b>")
+                                              .arg(def->get_start_node()->full_name()).arg(def->get_end_node()->full_name())
+                                              + "\n";
                 return FALSE;
             }
 
@@ -151,7 +150,7 @@ bool BrowserSimpleRelation::undelete(bool, QString & warning, QString & renamed)
     return TRUE;
 }
 
-void BrowserSimpleRelation::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserSimpleRelation::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
@@ -168,17 +167,19 @@ void BrowserSimpleRelation::referenced_by(Q3PtrList<BrowserNode> & l, bool ondel
     }
 }
 
-void BrowserSimpleRelation::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * target)
+void BrowserSimpleRelation::compute_referenced_by(QList<BrowserNode *> & l,
+                                                  BrowserNode * target)
 {
     IdIterator<BrowserSimpleRelation> it(all);
 
-    while (it.current()) {
-        if (!it.current()->deletedp() &&
-            (it.current()->def->get_end_node() == target))
-            l.append(it.current());
+    while (it.hasNext()) {
+        it.next();
+        if(it.value()) {
+            if (!it.value()->deletedp() &&
+                    (it.value()->def->get_end_node() == target))
+                l.append(it.value());
 
-        ++it;
+        }
     }
 }
 
@@ -207,12 +208,12 @@ void BrowserSimpleRelation::update_stereotype(bool)
 {
     if (def != 0) {
         QString n = def->definition(FALSE, FALSE) + " " +
-                    def->get_end_node()->get_name();
+                def->get_end_node()->get_name();
         const char * stereotype = def->get_stereotype();
 
         if (show_stereotypes && stereotype[0]) {
             QString s = toUnicode(stereotype);
-            int index = s.find(':');
+            int index = s.indexOf(':');
 
             setText(0,
                     "<<" + ((index == -1) ? s : s.mid(index + 1))
@@ -227,7 +228,6 @@ const QPixmap * BrowserSimpleRelation::pixmap(int) const
 {
     if (deletedp())
         return DeletedRelationIcon;
-
     const QPixmap * px = ProfiledStereotypes::browserPixmap(def->get_stereotype());
 
     return (px != 0) ? px : SimpleRelationIcon;
@@ -235,53 +235,61 @@ const QPixmap * BrowserSimpleRelation::pixmap(int) const
 
 void BrowserSimpleRelation::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!in_edition()) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>relation</i>, \
-a double click with the left mouse button does the same thing"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                                 QObject::tr("to edit the <i>relation</i>, \
+                                             a double click with the left mouse button does the same thing"));
 
-            if (!is_read_only && (edition_number == 0)) {
-                m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                               TR("to delete the <i>relation</i>. \
-Note that you can undelete it after"));
-            }
+                                             if (!is_read_only && (edition_number == 0)) {
+                                                 MenuFactory::addItem(m, QObject::tr("Delete"), 2,
+                                                 QObject::tr("to delete the <i>relation</i>. \
+                                                 Note that you can undelete it after"));
+                                             }
 
-            m.insertSeparator();
+                                             m.addSeparator();
         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 8),
-                       TR("to know who reference the <i>relation</i>"));
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 8,
+                             QObject::tr("to know who reference the <i>relation</i>"));
 
-        m.setWhatsThis(m.insertItem(QString(TR("select ")) + def->get_end_node()->get_name(),
-                                    7),
-                       TR("to select the destination"));
-        mark_menu(m, TR("the relation"), 90);
+        MenuFactory::addItem(m, QString(QObject::tr("select ")) + def->get_end_node()->get_name(),
+                             7,
+                             QObject::tr("to select the destination"));
+        mark_menu(m, QObject::tr("the relation"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0)
-            && Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                && Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("undelete the <i>relation</i> \
-(except if the other side is also deleted)"));
-
-        if (def->get_start_node()->deletedp() ||
-            def->get_end_node()->deletedp())
-            m.setItemEnabled(3, FALSE);
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 3,
+                             QObject::tr("undelete the <i>relation</i> \
+                                         (except if the other side is also deleted)"));
+
+                                         if (def->get_start_node()->deletedp() ||
+                                             def->get_end_node()->deletedp())
+        {
+                                             QAction *act = MenuFactory::findAction(m, 3);
+                                             if(act)
+                                             act->setEnabled(false);
+                                             //m.setItemEnabled(3, FALSE);
+                                         }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserSimpleRelation::exec_menu_choice(int rank)
@@ -314,7 +322,6 @@ void BrowserSimpleRelation::exec_menu_choice(int rank)
             ToolCom::run(Tool::command(rank - 100), this);
         else
             mark_management(rank - 90);
-
         return;
     }
 
@@ -322,7 +329,7 @@ void BrowserSimpleRelation::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserSimpleRelation::apply_shortcut(QString s)
+void BrowserSimpleRelation::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -380,7 +387,7 @@ UmlCode BrowserSimpleRelation::get_type() const
 
 QString BrowserSimpleRelation::get_stype() const
 {
-    return TR("relation");
+    return QObject::tr("relation");
 }
 
 int BrowserSimpleRelation::get_identifier() const
@@ -420,7 +427,7 @@ void BrowserSimpleRelation::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 QString BrowserSimpleRelation::drag_key() const
 {
     return QString::number(UmlSimpleRelations)
-           + "#" + QString::number((unsigned long) parent());
+            + "#" + QString::number((unsigned long) parent());
 }
 
 QString BrowserSimpleRelation::drag_postfix() const
@@ -431,7 +438,7 @@ QString BrowserSimpleRelation::drag_postfix() const
 QString BrowserSimpleRelation::drag_key(BrowserNode * p)
 {
     return QString::number(UmlSimpleRelations)
-           + "#" + QString::number((unsigned long) p);
+            + "#" + QString::number((unsigned long) p);
 }
 
 void BrowserSimpleRelation::save(QTextStream & st, bool ref,
@@ -466,8 +473,8 @@ BrowserSimpleRelation * BrowserSimpleRelation::read_ref(char *& st)
     BrowserSimpleRelation * result = all[id];
 
     return (result == 0)
-           ? new BrowserSimpleRelation(id)
-           : result;
+            ? new BrowserSimpleRelation(id)
+            : result;
 }
 
 BrowserSimpleRelation *
@@ -479,8 +486,8 @@ BrowserSimpleRelation::read(char *& st, char * k,
         BrowserSimpleRelation * result = all[id];
 
         return (result == 0)
-               ? new BrowserSimpleRelation(id)
-               : result;
+                ? new BrowserSimpleRelation(id)
+                : result;
     }
     else if (!strcmp(k, "simplerelation")) {
         int id = read_id(st);
@@ -511,7 +518,7 @@ BrowserSimpleRelation::read(char *& st, char * k,
         result->is_defined = TRUE;
 
         result->is_read_only = !parent->is_writable() ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         k = read_keyword(st);
 
@@ -533,38 +540,43 @@ BrowserNode * BrowserSimpleRelation::get_it(const char * k, int id)
     return (!strcmp(k, "simplerelation_ref")) ? all[id] : 0;
 }
 
-void BrowserSimpleRelation::get_relating(BrowserNode * elt, Q3PtrDict<BrowserNode> & d,
-        BrowserNodeList & newones, bool inh,
-        bool dep, bool sametype, UmlCode k)
+void BrowserSimpleRelation::get_relating(BrowserNode * elt, QHash<BrowserNode *, BrowserNode *> &d,
+                                         BrowserNodeList & newones, bool inh,
+                                         bool dep, bool sametype, UmlCode k)
 {
     IdIterator<BrowserSimpleRelation> it(all);
     BrowserSimpleRelation * r;
 
-    for (; (r = it.current()) != 0; ++it) {
-        if (!r->deletedp() &&
-            (r->def->get_end_node() == elt)) {
-            BrowserNode * src = r->def->get_start_node();
+    while(it.hasNext()) {
+        it.next();
+        r = it.value();
+        if(r != 0)
+        {
+            if (!r->deletedp() &&
+                    (r->def->get_end_node() == elt)) {
+                BrowserNode * src = r->def->get_start_node();
 
-            if ((!sametype || (src->get_type() == k)) && (d[src] == 0)) {
-                switch (r->get_type()) {
-                case UmlDependOn:
-                    if (! dep)
-                        continue;
+                if ((!sametype || (src->get_type() == k)) && (d[src] == 0)) {
+                    switch (r->get_type()) {
+                    case UmlDependOn:
+                        if (! dep)
+                            continue;
 
-                    break;
+                        break;
 
-                case UmlInherit:
-                    if (! inh)
-                        continue;
+                    case UmlInherit:
+                        if (! inh)
+                            continue;
 
-                    break;
+                        break;
 
-                default:
-                    continue;
-                }
+                    default:
+                        continue;
+                    }
 
-                d.insert(src, src);
-                newones.append(src);
+                    d.insert(src, src);
+                    newones.append(src);
+                }
             }
         }
     }
diff --git a/src/browser/BrowserSimpleRelation.h b/src/browser/BrowserSimpleRelation.h
index 57cb94ab3..9e9498ce1 100644
--- a/src/browser/BrowserSimpleRelation.h
+++ b/src/browser/BrowserSimpleRelation.h
@@ -58,12 +58,12 @@ class BrowserSimpleRelation : public BrowserNode, public Labeled<BrowserSimpleRe
 
     virtual bool undelete(bool rec, QString & warning, QString & renamed);
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual bool in_edition() const;
     virtual UmlCode get_type() const;
@@ -86,8 +86,8 @@ class BrowserSimpleRelation : public BrowserNode, public Labeled<BrowserSimpleRe
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
 
@@ -96,7 +96,7 @@ class BrowserSimpleRelation : public BrowserNode, public Labeled<BrowserSimpleRe
     virtual QString drag_postfix() const;
     virtual void DropAfterEvent(QDropEvent * e, BrowserNode * after);
 
-    static void get_relating(BrowserNode *, Q3PtrDict<BrowserNode> & d,
+    static void get_relating(BrowserNode *, QHash<BrowserNode*,BrowserNode*> & d,
                              BrowserNodeList & newones, bool inh,
                              bool dep, bool sametype, UmlCode k);
 };
diff --git a/src/browser/BrowserState.cpp b/src/browser/BrowserState.cpp
index f5cda2dff..6ab848083 100644
--- a/src/browser/BrowserState.cpp
+++ b/src/browser/BrowserState.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+#include <QMenu>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -63,7 +63,7 @@
 IdDict<BrowserState> BrowserState::all(257, __FILE__);
 QStringList BrowserState::its_default_stereotypes;	// unicode
 
-BrowserState::BrowserState(QString s, BrowserNode * p, StateData * d, int id)
+BrowserState::BrowserState(const QString & s, BrowserNode * p, StateData * d, int id)
     : BrowserNode(s, p), Labeled<BrowserState>(all, id),
       def(d), associated_diagram(0)
 {
@@ -85,7 +85,7 @@ BrowserState::BrowserState(const BrowserState * model, BrowserNode * p)
     comment = model->comment;
 }
 
-BrowserNode * BrowserState::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserState::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserState(this, p);
 
@@ -123,13 +123,13 @@ void BrowserState::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserState::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserState::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserTransition::compute_referenced_by(l, this);
@@ -139,29 +139,32 @@ void BrowserState::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
         BrowserStateDiagram::compute_referenced_by(l, this, "statecanvas", "state_ref");
 
         IdIterator<BrowserState> it(all);
+        while (it.hasNext()) {
+            it.next();
+            if(it.value()) {
+            if (!it.value()->deletedp() &&
+                    (it.value()->def->get_reference() == this))
+                l.append(it.value());
 
-        while (it.current()) {
-            if (!it.current()->deletedp() &&
-                (it.current()->def->get_reference() == this))
-                l.append(it.current());
-
-            ++it;
+}
         }
     }
 }
 
 // callers suppose this only take specification into acount
-void BrowserState::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserOperation * op)
+void BrowserState::compute_referenced_by(QList<BrowserNode *> & l,
+                                         BrowserOperation * op)
 {
     IdIterator<BrowserState> it(all);
 
-    while (it.current()) {
-        if (!it.current()->deletedp() &&
-            (it.current()->def->get_specification() == op))
-            l.append(it.current());
+    while (it.hasNext()) {
+        it.next();
+        if(it.value()) {
+        if (!it.value()->deletedp() &&
+                (it.value()->def->get_specification() == op))
+            l.append(it.value());
 
-        ++it;
+}
     }
 }
 
@@ -172,7 +175,7 @@ bool BrowserState::is_ref() const
 
 bool BrowserState::can_reference() const
 {
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling()) {
         switch (((BrowserNode *) child)->get_type()) {
@@ -238,7 +241,7 @@ BrowserState * BrowserState::add_state(BrowserNode * future_parent,
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter state's name : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter state's name : "),
                                          UmlState, TRUE, FALSE))
 
         return 0;
@@ -261,17 +264,17 @@ BrowserState * BrowserState::add_state(BrowserNode * future_parent,
 BrowserState * BrowserState::get_state(BrowserNode * parent)
 {
     BrowserNodeList l;
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = parent->firstChild(); child != 0; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlState))
+                (((BrowserNode *) child)->get_type() == UmlState))
             l.append((BrowserNode *) child);
 
     BrowserNode * old;
     QString name;
 
-    if (!parent->enter_child_name(name, TR("enter state's name : "),
+    if (!parent->enter_child_name(name, QObject::tr("enter state's name : "),
                                   UmlState, l, &old,
                                   TRUE, FALSE))
         return 0;
@@ -304,8 +307,8 @@ static bool is_machine(const BrowserState * s)
 
 void BrowserState::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
     QString what;
     bool ref = is_ref();
     bool mach = is_machine(this);
@@ -316,93 +319,96 @@ void BrowserState::menu()
         what = "state machine";
     else
         what = (!strcmp(get_stereotype(), "submachine"))
-               ? "state submachine" : "state";
+                ? "state submachine" : "state";
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only && !ref) {
-            m.setWhatsThis(m.insertItem(TR("New state diagram"), 0),
-                           TR("to add a <i>state diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("New state diagram"), 0,
+                                 QObject::tr("to add a <i>state diagram</i>"));
 
             if (mach) {
-                m.setWhatsThis(m.insertItem(TR("New submachine"), 1),
-                               TR("to add a <i>submachine</i> to the <i>machine</i>"));
-                m.setWhatsThis(m.insertItem(TR("New state"), 2),
-                               TR("to add a <i>state</i> to the <i>machine</i>"));
+                MenuFactory::addItem(m, QObject::tr("New submachine"), 1,
+                                     QObject::tr("to add a <i>submachine</i> to the <i>machine</i>"));
+                MenuFactory::addItem(m, QObject::tr("New state"), 2,
+                                     QObject::tr("to add a <i>state</i> to the <i>machine</i>"));
             }
             else if (what == "state")
-                m.setWhatsThis(m.insertItem(TR("New nested state"), 2),
-                               TR("to add a <i>nested state</i> to the <i>state</i>"));
+                MenuFactory::addItem(m, QObject::tr("New nested state"), 2,
+                                     QObject::tr("to add a <i>nested state</i> to the <i>state</i>"));
             else
-                m.setWhatsThis(m.insertItem(TR("New state"), 2),
-                               TR("to add a <i>state</i> to the <i>submachine</i>"));
+                MenuFactory::addItem(m, QObject::tr("New state"), 2,
+                                     QObject::tr("to add a <i>state</i> to the <i>submachine</i>"));
 
-            m.setWhatsThis(m.insertItem(TR("New region"), 11),
-                           TR("to add a <i>region</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("New region"), 11,
+                                 QObject::tr("to add a <i>region</i>"));
+            m.addSeparator();
         }
 
-        m.setWhatsThis(m.insertItem(TR("Edit"), 3),
-                       TR("to edit the <i>" + what + "</i>, \
-a double click with the left mouse button does the same thing"));
-
-        if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 4),
-                           TR("to copy the <i>" + what + "</i> in a new one"));
-            m.insertSeparator();
-
-            if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 7),
-                               TR("to delete the <i>" + what + "</i>. \
-Note that you can undelete it after"));
-        }
-
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 10),
-                       TR("to know who reference the <i>state</i> \
-through a transition or a reference"));
-        mark_menu(m, TR("the " + what), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
-        }
+        MenuFactory::addItem(m, QObject::tr("Edit"), 3,
+                             QObject::tr("to edit the <i>%1</i>, \
+                                         a double click with the left mouse button does the same thing").arg(what));
+
+                                         if (!is_read_only) {
+                                             MenuFactory::addItem(m, QObject::tr("Duplicate"), 4,
+                                             QObject::tr("to copy the <i>%1</i> in a new one").arg(what));
+                                             m.addSeparator();
+
+                                             if (edition_number == 0)
+                                             MenuFactory::addItem(m, QObject::tr("Delete"), 7,
+                                             QObject::tr("to delete the <i>%1</i>. \
+                                             Note that you can undelete it after").arg(what));
+                                         }
+
+                                         MenuFactory::addItem(m, QObject::tr("Referenced by"), 10,
+                                                              QObject::tr("to know who reference the <i>state</i> \
+                                                                          through a transition or a reference"));
+                                                                          mark_menu(m, QObject::tr("the %1").arg(what), 90);
+                                                              ProfiledStereotypes::menu(m, this, 99990);
+
+                                         if ((edition_number == 0) &&
+                                             Tool::menu_insert(&toolm, get_type(), 100)) {
+                                             m.addSeparator();
+                                             toolm.setTitle(QObject::tr("Tool"));
+                                             m.addMenu(&toolm);
+                                         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 8),
-                       TR("to undelete the <i>" + what + "</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 8,
+                             QObject::tr("to undelete the <i>%1</i>").arg(what));
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
-                m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 9),
-                               TR("undelete the " + what + " and its children"));
+                MenuFactory::addItem(m, QObject::tr("Undelete recursively"), 9,
+                                     QObject::tr("undelete the %1 and its children").arg(what));
                 break;
             }
         }
     }
-
-    exec_menu_choice(m.exec(QCursor::pos()), mach);
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt(), mach);
 }
 
 void BrowserState::exec_menu_choice(int rank,
                                     bool mach)
 {
     switch (rank) {
-    case 0: {
+    case 0:
+    {
         BrowserStateDiagram * d =
-            BrowserStateDiagram::add_state_diagram(this);
+                BrowserStateDiagram::add_state_diagram(this);
 
         if (d == 0)
             return;
 
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 1:
         add_state(this, (bool) TRUE);
@@ -421,17 +427,17 @@ void BrowserState::exec_menu_choice(int rank,
         QString what;
 
         if (mach)
-            what = TR("state machine");
+            what = QObject::tr("state machine");
         else
             what = (!strcmp(get_stereotype(), "submachine"))
-                   ? TR("state submachine")
-                   : TR("state");
+                    ? QObject::tr("state submachine")
+                    : QObject::tr("state");
 
-        if (((BrowserNode *) parent())->enter_child_name(name, TR("enter " + what + "'s name : "),
-                UmlState, TRUE, FALSE))
+        if (((BrowserNode *) parent())->enter_child_name(name, QObject::tr("enter ") + what + QObject::tr("'s name : "),
+                                                         UmlState, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
     }
-    break;
+        break;
 
     case 7:
         delete_it();
@@ -468,7 +474,7 @@ void BrowserState::exec_menu_choice(int rank,
     package_modified();
 }
 
-void BrowserState::apply_shortcut(QString s)
+void BrowserState::apply_shortcut(const QString & s)
 {
     int choice = -1;
     bool ref = is_ref();
@@ -514,7 +520,7 @@ void BrowserState::apply_shortcut(QString s)
         if (s == "Undelete")
             choice = 8;
 
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = firstChild(); child != 0; child = child->nextSibling()) {
             if (((BrowserNode *) child)->deletedp()) {
@@ -532,8 +538,8 @@ void BrowserState::apply_shortcut(QString s)
 void BrowserState::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited)
         def->edit();
@@ -555,11 +561,11 @@ UmlCode BrowserState::get_type() const
 QString BrowserState::get_stype() const
 {
     if (is_ref())
-        return TR("state machine reference");
+        return QObject::tr("state machine reference");
     else if (is_machine(this))
-        return TR("state machine");
+        return QObject::tr("state machine");
     else
-        return TR("state");
+        return QObject::tr("state");
 }
 
 int BrowserState::get_identifier() const
@@ -586,14 +592,13 @@ BrowserNodeList & BrowserState::instances(BrowserNodeList & result, bool sort)
 {
     IdIterator<BrowserState> it(all);
     BrowserState * st;
+    while(it.hasNext()){
+        it.next();
+        if ((st = it.value()) != 0)
+            if (!st->deletedp())
+                result.append(st);
 
-    while ((st = it.current()) != 0) {
-        if (!st->deletedp())
-            result.append(st);
-
-        ++it;
     }
-
     if (sort)
         result.sort_it();
 
@@ -606,7 +611,7 @@ BrowserNode * BrowserState::get_associated() const
 }
 
 void BrowserState::set_associated_diagram(BrowserStateDiagram * dg,
-        bool on_read)
+                                          bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -668,7 +673,6 @@ bool BrowserState::tool_cmd(ToolCom * com, const char * args)
                     ok = FALSE;
                 else
                     (new BrowserStateDiagram(args, this))->write_id(com);
-
                 break;
 
             case UmlState:
@@ -689,13 +693,13 @@ bool BrowserState::tool_cmd(ToolCom * com, const char * args)
                 k = end->get_type();
 
                 if ((k == UmlState) ||
-                    (k == UmlStateAction) ||
-                    IsaPseudoState(k))
+                        (k == UmlStateAction) ||
+                        IsaPseudoState(k))
                     (add_transition(end))->write_id(com);
                 else
                     ok = FALSE;
             }
-            break;
+                break;
 
             case UmlStateAction:
                 BrowserStateAction::add_stateaction(this)->write_id(com);
@@ -703,8 +707,8 @@ bool BrowserState::tool_cmd(ToolCom * com, const char * args)
 
             default:
                 if (IsaPseudoState(k) &&
-                    !wrong_child_name(args, k, TRUE,
-                                      BrowserPseudoState::allow_empty(k)))
+                        !wrong_child_name(args, k, TRUE,
+                                          BrowserPseudoState::allow_empty(k)))
                     BrowserPseudoState::add_pseudostate(this, k, args)->write_id(com);
                 else
                     ok = FALSE;
@@ -754,14 +758,13 @@ BrowserState * BrowserState::get_machine(const BrowserNode * bn)
     }
 }
 
-bool BrowserState::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserState::may_contains_them(const QList<BrowserNode *> & l,
                                      BooL & duplicable) const
 {
     BrowserNode * machine = get_machine(this);
-    Q3PtrListIterator<BrowserNode> it(l);
 
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlTransition:
 
             // no break !
@@ -787,7 +790,7 @@ bool BrowserState::may_contains_them(const Q3PtrList<BrowserNode> & l,
             // no break
         case EntryPointPS:
         case ExitPointPS:
-            if (get_machine(it.current()) != machine)
+            if (get_machine(node) != machine)
                 return FALSE;
 
             break;
@@ -796,10 +799,10 @@ bool BrowserState::may_contains_them(const Q3PtrList<BrowserNode> & l,
             return FALSE;
         }
 
-        if (! BrowserNode::may_contains(it.current(), TRUE))
+        if (! BrowserNode::may_contains(node, TRUE))
             return FALSE;
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -839,11 +842,11 @@ bool BrowserState::may_contains(UmlCode k) const
 void BrowserState::DragMoveEvent(QDragMoveEvent * e)
 {
     if (UmlDrag::canDecode(e, BrowserState::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserRegion::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserPseudoState::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserStateAction::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserStateDiagram::drag_key(this)) ||
-        UmlDrag::canDecode(e, BrowserTransition::drag_key(this))) {
+            UmlDrag::canDecode(e, BrowserRegion::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserPseudoState::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserStateAction::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserStateDiagram::drag_key(this)) ||
+            UmlDrag::canDecode(e, BrowserTransition::drag_key(this))) {
         if (!is_read_only)
             e->accept();
         else
@@ -861,13 +864,13 @@ void BrowserState::DropEvent(QDropEvent * e)
 void BrowserState::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        (UmlDrag::canDecode(e, UmlState) ||
-         UmlDrag::canDecode(e, BrowserState::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserRegion::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserPseudoState::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserStateAction::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserStateDiagram::drag_key(this)) ||
-         UmlDrag::canDecode(e, BrowserTransition::drag_key(this))))
+            (UmlDrag::canDecode(e, UmlState) ||
+             UmlDrag::canDecode(e, BrowserState::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserRegion::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserPseudoState::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserStateAction::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserStateDiagram::drag_key(this)) ||
+             UmlDrag::canDecode(e, BrowserTransition::drag_key(this))))
         e->accept();
     else
         e->ignore();
@@ -877,7 +880,6 @@ void BrowserState::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
     bool free_move = TRUE;
-
     if ((((bn = UmlDrag::decode(e, UmlState)) != 0) ||
          (free_move = FALSE, (bn = UmlDrag::decode(e, BrowserState::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserPseudoState::drag_key(this))) != 0) ||
@@ -885,31 +887,32 @@ void BrowserState::DropAfterEvent(QDropEvent * e, BrowserNode * after)
          ((bn = UmlDrag::decode(e, BrowserRegion::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserStateDiagram::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, BrowserTransition::drag_key(this))) != 0)) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         if (may_contains(bn->get_type()) && BrowserNode::may_contains(bn, TRUE))  {
             if ((after == 0) &&
-                free_move &&
-                ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
+                    free_move &&
+                    ((BrowserNode *) parent())->may_contains(bn, TRUE)) {
                 // have choice
-                Q3PopupMenu m(0);
-
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
-
-                switch (m.exec(QCursor::pos())) {
-                case 1:
-                    break;
+                QMenu m(0);
+
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In ") + QString(get_name()), 1);
+                MenuFactory::addItem(m, QObject::tr("After ") + QString(get_name()), 2);
+                QAction *retAction =m.exec(QCursor::pos());
+                if(retAction)
+                    switch (retAction->data().toInt()) {
+                    case 1:
+                        break;
 
-                case 2:
-                    ((BrowserNode *) parent())->DropAfterEvent(e, this);
-                    return;
+                    case 2:
+                        ((BrowserNode *) parent())->DropAfterEvent(e, this);
+                        return;
 
-                default:
-                    e->ignore();
-                    return;
-                }
+                    default:
+                        e->ignore();
+                        return;
+                    }
             }
 
             move(bn, after);
@@ -918,7 +921,7 @@ void BrowserState::DropAfterEvent(QDropEvent * e, BrowserNode * after)
                 ((BrowserState *) bn)->def->set_stereotype("submachine");
         }
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -933,7 +936,7 @@ static void get_under(const BrowserNode * bn, Q3PtrList<const BrowserNode> & l)
 {
     l.append(bn);
 
-    for (Q3ListViewItem * child = bn->firstChild();
+    for (BrowserNode * child = bn->firstChild();
          child != 0;
          child = child->nextSibling())
         if (((BrowserNode *) child)->get_type() != UmlTransition)
@@ -945,12 +948,12 @@ static bool check_trans(const BrowserNode * bn, Q3PtrList<const BrowserNode> & l
 {
     under |= (bn == st);
 
-    for (Q3ListViewItem * child = bn->firstChild();
+    for (BrowserNode * child = bn->firstChild();
          child != 0;
          child = child->nextSibling()) {
         if (((BrowserNode *) child)->get_type() == UmlTransition) {
             if (under !=
-                (l.find(((TransitionData *)(((BrowserNode *) child)->get_data()))->get_end_node()) != -1))
+                    (l.find(((TransitionData *)(((BrowserNode *) child)->get_data()))->get_end_node()) != -1))
                 return FALSE;
 
         }
@@ -980,9 +983,9 @@ QString BrowserState::drag_key() const
     BrowserState * m = get_machine(this);
 
     return (m == this)
-           ? QString::number(UmlState)
-           : QString::number(UmlState)
-           + "#" + QString::number((unsigned long) m);
+            ? QString::number(UmlState)
+            : QString::number(UmlState)
+              + "#" + QString::number((unsigned long) m);
 }
 
 QString BrowserState::drag_postfix() const
@@ -990,14 +993,14 @@ QString BrowserState::drag_postfix() const
     BrowserState * m = get_machine(this);
 
     return (m == this)
-           ? QString()
-           : "#" + QString::number((unsigned long) m);
+            ? QString()
+            : "#" + QString::number((unsigned long) m);
 }
 
 QString BrowserState::drag_key(BrowserNode * p)
 {
     return QString::number(UmlState)
-           + "#" + QString::number((unsigned long) get_machine(p));
+            + "#" + QString::number((unsigned long) get_machine(p));
 }
 
 void BrowserState::save_stereotypes(QTextStream & st)
@@ -1038,7 +1041,7 @@ void BrowserState::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -1075,8 +1078,8 @@ BrowserState * BrowserState::read_ref(char *& st)
     BrowserState * result = all[id];
 
     return (result == 0)
-           ? new BrowserState(id)
-           : result;
+            ? new BrowserState(id)
+            : result;
 }
 
 BrowserState * BrowserState::read(char *& st, char * k,
@@ -1090,8 +1093,8 @@ BrowserState * BrowserState::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserState(id)
-               : result;
+                ? new BrowserState(id)
+                : result;
     }
     else if (!strcmp(k, "state")) {
         id = read_id(st);
@@ -1126,7 +1129,7 @@ BrowserState * BrowserState::read(char *& st, char * k,
         result->BrowserNode::read(st, k, id);
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         if (strcmp(k, "end")) {
             while (BrowserState::read(st, k, result) ||
@@ -1152,9 +1155,9 @@ BrowserNode * BrowserState::read_any_ref(char *& st, char * k)
     BrowserNode * r;
 
     if (((r = BrowserState::read(st, k, 0)) == 0) &&
-        ((r = BrowserRegion::read(st, k, 0)) == 0) &&
-        ((r = BrowserPseudoState::read(st, k, 0)) == 0) &&
-        ((r = BrowserStateAction::read(st, k, 0)) == 0))
+            ((r = BrowserRegion::read(st, k, 0)) == 0) &&
+            ((r = BrowserPseudoState::read(st, k, 0)) == 0) &&
+            ((r = BrowserStateAction::read(st, k, 0)) == 0))
         r = BrowserTransition::read(st, k, 0);
 
     return r;
@@ -1168,9 +1171,12 @@ BrowserNode * BrowserState::get_it(const char * k, int id)
     BrowserNode * r;
 
     if (((r = BrowserRegion::get_it(k, id)) == 0) &&
-        ((r = BrowserPseudoState::get_it(k, id)) == 0) &&
-        ((r = BrowserStateAction::get_it(k, id)) == 0) &&
-        ((r = BrowserStateDiagram::get_it(k, id)) == 0))
+            ((r = BrowserPseudoState::get_it(k, id)) == 0) &&
+            ((r = BrowserStateAction::get_it(k, id)) == 0)
+            &&
+            ((r = BrowserStateDiagram::get_it(k, id)) == 0)
+            )
+
         r = BrowserTransition::get_it(k, id);
 
     return r;
diff --git a/src/browser/BrowserState.h b/src/browser/BrowserState.h
index 5ccee0cfc..4f909514d 100644
--- a/src/browser/BrowserState.h
+++ b/src/browser/BrowserState.h
@@ -60,15 +60,15 @@ class BrowserState : public BrowserNode, public Labeled<BrowserState>
     void exec_menu_choice(int rank, bool mach);
 
 public:
-    BrowserState(QString s, BrowserNode * p, StateData * d, int id = 0);
+    BrowserState(const QString & s, BrowserNode * p, StateData * d, int id = 0);
     BrowserState(const BrowserState * model, BrowserNode * p);
     virtual ~BrowserState();
 
     bool may_contains(UmlCode k) const;
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> & l,
+    virtual bool may_contains_them(const QList<BrowserNode *> & l,
                                    BooL & duplicable) const;
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserNodeList & instances(BrowserNodeList &, bool sort);
     static BrowserState * add_state(BrowserNode * future_parent, bool machine);
     static BrowserState * add_state(BrowserNode * future_parent, QString name);
@@ -79,7 +79,7 @@ class BrowserState : public BrowserNode, public Labeled<BrowserState>
     virtual const QPixmap * pixmap(int) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -107,8 +107,8 @@ class BrowserState : public BrowserNode, public Labeled<BrowserState>
     virtual bool tool_cmd(ToolCom * com, const char * args);
     virtual bool api_compatible(unsigned v) const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserOperation *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserOperation *);
 
     bool is_ref() const;
     bool can_reference() const;
diff --git a/src/browser/BrowserStateAction.cpp b/src/browser/BrowserStateAction.cpp
index d60a48571..77eed7f43 100644
--- a/src/browser/BrowserStateAction.cpp
+++ b/src/browser/BrowserStateAction.cpp
@@ -29,8 +29,8 @@
 
 
 
-#include <q3popupmenu.h>
-#include <q3painter.h>
+//#include <q3popupmenu.h>
+#include <qpainter.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -83,7 +83,7 @@ BrowserStateAction::BrowserStateAction(const BrowserStateAction * model, Browser
     comment = model->comment;
 }
 
-BrowserNode * BrowserStateAction::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserStateAction::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserNode * result = new BrowserStateAction(this, p);
 
@@ -113,17 +113,16 @@ void BrowserStateAction::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserStateAction::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserStateAction::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
     BrowserTransition::compute_referenced_by(l, this);
-
     if (! ondelete)
         BrowserStateDiagram::compute_referenced_by(l, this, "stateactioncanvas", "stateaction_ref");
 }
@@ -212,47 +211,49 @@ void BrowserStateAction::menu()
         s = "send-signal action";
     else
         s = "action";
-
-    Q3PopupMenu m(0, "action");
-    Q3PopupMenu toolm(0);
+    QMenu m("action", 0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                       TR("to edit the <i>" + s + "</i>, \
-a double click with the left mouse button does the same thing"));
+        MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                       QObject::tr("to edit the <i>%1</i>, \
+a double click with the left mouse button does the same thing").arg(s));
 
         if (!is_read_only) {
-            m.setWhatsThis(m.insertItem(TR("Duplicate"), 2),
-                           TR("to copy the <i>" + s + "</i> in a new one"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, QObject::tr("Duplicate"), 2,
+                           QObject::tr("to copy the <i>%1</i> in a new one").arg(s));
+            m.addSeparator();
 
             if (edition_number == 0)
-                m.setWhatsThis(m.insertItem(TR("Delete"), 3),
-                               TR("to delete the <i>" + s + "</i>. \
-Note that you can undelete it after"));
+                MenuFactory::addItem(m, QObject::tr("Delete"), 3,
+                               QObject::tr("to delete the <i>%1</i>. \
+Note that you can undelete it after").arg(s));
         }
 
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 5),
-                       TR("to know who reference the <i>" + s + "</i> \
-through a transition"));
-        mark_menu(m, TR("the " + s), 90);
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 5,
+                       QObject::tr("to know who reference the <i>%1</i> \
+through a transition").arg(s));
+        mark_menu(m, QObject::tr("the %1").arg(s), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
             Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 4),
-                       TR("to undelete the <i>" + s + "</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 4,
+                       QObject::tr("to undelete the <i>%1</i>").arg(s));
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserStateAction::exec_menu_choice(int rank)
@@ -293,7 +294,7 @@ void BrowserStateAction::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserStateAction::apply_shortcut(QString s)
+void BrowserStateAction::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -351,11 +352,11 @@ QString BrowserStateAction::get_stype() const
     const char * st = def->get_stereotype();
 
     if (!strcmp(st, "receive-signal"))
-        return TR("receive-signal action");
+        return QObject::tr("receive-signal action");
     else if (!strcmp(st, "send-signal"))
-        return TR("send-signal action");
+        return QObject::tr("send-signal action");
     else
-        return TR("state action");
+        return QObject::tr("state action");
 }
 
 int BrowserStateAction::get_identifier() const
@@ -388,7 +389,7 @@ QString BrowserStateAction::full_name(bool rev, bool) const
         if (s.isEmpty())
             s = "<anonymous state action>";
         else
-            s = "<anonymous " + s + ">";
+            s = "<anonymous %1>";
     }
 
     return fullname(s, rev);
@@ -480,13 +481,12 @@ void BrowserStateAction::DragMoveInsideEvent(QDragMoveEvent * e)
 void BrowserStateAction::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, BrowserTransition::drag_key(this))) != 0)) &&
         (bn != after) && (bn != this)) {
         if (may_contains(bn, FALSE))
             move(bn, after);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -543,7 +543,7 @@ void BrowserStateAction::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -603,7 +603,6 @@ BrowserStateAction * BrowserStateAction::read(char *& st, char * k,
         result = all[id];
 
         BrowserStateAction * already_exist = 0;
-
         if (result == 0)
             result = new BrowserStateAction(parent, new StateActionData, id);
         else if (result->is_defined) {
@@ -615,7 +614,6 @@ BrowserStateAction * BrowserStateAction::read(char *& st, char * k,
 
         k = read_keyword(st);
         result->def->read(st, k);
-
         if (already_exist != 0) {
             already_exist->must_change_id(all);
             already_exist->unconsistent_fixed("state action", result);
diff --git a/src/browser/BrowserStateAction.h b/src/browser/BrowserStateAction.h
index b75313dd1..a50778fef 100644
--- a/src/browser/BrowserStateAction.h
+++ b/src/browser/BrowserStateAction.h
@@ -61,7 +61,7 @@ class BrowserStateAction : public BrowserNode, public Labeled<BrowserStateAction
     virtual ~BrowserStateAction();
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     static BrowserStateAction * add_stateaction(BrowserNode * future_parent);
     virtual BasicData * add_relation(UmlCode, BrowserNode * end);
     BrowserTransition * add_transition(BrowserNode * end);
@@ -70,7 +70,7 @@ class BrowserStateAction : public BrowserNode, public Labeled<BrowserStateAction
     virtual void iconChanged();
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
@@ -92,8 +92,8 @@ class BrowserStateAction : public BrowserNode, public Labeled<BrowserStateAction
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> &, bool ondelete = FALSE);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserStateAction *);
+    virtual void referenced_by(QList<BrowserNode *> &, bool ondelete = FALSE);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserStateAction *);
 
     bool allow_empty() const;
 
diff --git a/src/browser/BrowserStateDiagram.cpp b/src/browser/BrowserStateDiagram.cpp
index aa55cb461..ea27f178f 100644
--- a/src/browser/BrowserStateDiagram.cpp
+++ b/src/browser/BrowserStateDiagram.cpp
@@ -25,26 +25,19 @@
 //
 // *************************************************************************
 
-
-
-
-
-#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
-//Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 #include <QDropEvent>
-
 #include "BrowserStateDiagram.h"
 #include "SimpleData.h"
 #include "BrowserState.h"
 #include "StateDiagramWindow.h"
+#include "DiagramView.h"
 #include "UmlPixmap.h"
 #include "SettingsDialog.h"
-#include "DiagramView.h"
 #include "myio.h"
 #include "strutil.h"
 #include "ToolCom.h"
@@ -55,11 +48,11 @@
 #include "mu.h"
 #include "translate.h"
 
-Q3PtrList<BrowserStateDiagram> BrowserStateDiagram::imported;
-Q3ValueList<int> BrowserStateDiagram::imported_ids;
+QList<BrowserStateDiagram *> BrowserStateDiagram::imported;
+QList<int> BrowserStateDiagram::imported_ids;
 QStringList BrowserStateDiagram::its_default_stereotypes;	// unicode
 
-BrowserStateDiagram::BrowserStateDiagram(QString s, BrowserNode * p, int id)
+BrowserStateDiagram::BrowserStateDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -82,7 +75,9 @@ BrowserStateDiagram::BrowserStateDiagram(BrowserStateDiagram * model, BrowserNod
     is_modified = TRUE;
 
     if (model->window != 0)
+    {
         model->window->duplicate(get_ident(), "diagram");
+    }
     else {
         char * diagram;
 
@@ -110,7 +105,7 @@ BrowserStateDiagram::~BrowserStateDiagram()
 
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
 
     all.remove(get_ident());
@@ -132,33 +127,32 @@ BrowserStateDiagram * BrowserStateDiagram::add_state_diagram(BrowserNode * futur
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter state diagram's name : "),
+    if (future_parent->enter_child_name(name,  QObject::tr("enter state diagram's name : "),
                                         UmlStateDiagram, TRUE, FALSE))
         return new BrowserStateDiagram(name, future_parent);
     else
         return 0;
 }
 
-void BrowserStateDiagram::set_name(const char * s)
+void BrowserStateDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
 
     if (window != 0)
-        window->setCaption(s);
+    {
+        window->setWindowTitle(s);
+    }
 }
 
 void BrowserStateDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserStateDiagram * d = imported.take(0);
-
-        (new StateDiagramWindow(d->full_name(), d, *it))->close(TRUE);
-        it = imported_ids.remove(it);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserStateDiagram *d, imported) {
+        (new StateDiagramWindow(d->full_name(), d, *it))->close();
+        it = imported_ids.erase(it);
         d->is_modified = TRUE;
     }
+    imported.clear();
 }
 
 void BrowserStateDiagram::renumber(int phase)
@@ -176,11 +170,11 @@ void BrowserStateDiagram::delete_it()
 {
     if (window)
         delete window;
-
+    window = 0;
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserStateDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserStateDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserStateDiagram * result = new BrowserStateDiagram(this, p);
 
@@ -220,50 +214,52 @@ void BrowserStateDiagram::draw_svg() const
 
 void BrowserStateDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Show"), 0),
-                       TR("to show and edit the <i>state diagram</i>"));
+        MenuFactory::addItem(m,  QObject::tr("Show"), 0,
+                             QObject::tr("to show and edit the <i>state diagram</i>"));
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                           TR("to edit the <i>state diagram</i>"));
+            MenuFactory::addItem(m,  QObject::tr("Edit"), 1,
+                                 QObject::tr("to edit the <i>state diagram</i>"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 2),
-                               TR("to set how the <i>state diagram</i>'s items must be drawn"));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to duplicate the <i>state diagram</i>"));
+                MenuFactory::addItem(m,  QObject::tr("Edit drawing settings"), 2,
+                                     QObject::tr("to set how the <i>state diagram</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m,  QObject::tr("Duplicate"), 3,
+                                     QObject::tr("to duplicate the <i>state diagram</i>"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 4),
-                                   TR("to delete the <i>state diagram</i>. \
-Note that you can undelete it after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m,  QObject::tr("Delete"), 4,
+                                         QObject::tr("to delete the <i>state diagram</i>. \
+                                                     Note that you can undelete it after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the state diagram"), 90);
+        mark_menu(m,  QObject::tr("the state diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            MenuFactory::insertItem(m, QObject::tr("Tool"), &toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>state diagram</i>"));
+        MenuFactory::addItem(m,  QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>state diagram</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserStateDiagram::exec_menu_choice(int rank)
@@ -274,7 +270,7 @@ void BrowserStateDiagram::exec_menu_choice(int rank)
         return;
 
     case 1:
-        edit(TR("State diagram"), its_default_stereotypes);
+        edit( QObject::tr("State diagram"), its_default_stereotypes);
         return;
 
     case 2:
@@ -284,13 +280,13 @@ void BrowserStateDiagram::exec_menu_choice(int rank)
     case 3: {
         QString name;
 
-        if (((BrowserNode *)parent())->enter_child_name(name, TR("enter state diagram's name : "),
-                UmlStateDiagram, TRUE, FALSE))
+        if (((BrowserNode *)parent())->enter_child_name(name,  QObject::tr("enter state diagram's name : "),
+                                                        UmlStateDiagram, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
         else
             return;
     }
-    break;
+        break;
 
     case 4:
         delete_it();
@@ -314,7 +310,7 @@ void BrowserStateDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserStateDiagram::apply_shortcut(QString s)
+void BrowserStateDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -357,7 +353,7 @@ void BrowserStateDiagram::open(bool)
         window = new StateDiagramWindow(full_name(TRUE), this);
     else
         window->raise();
-
+    windowDestroyed = false;
     window->setFocus();
 }
 
@@ -369,11 +365,11 @@ void BrowserStateDiagram::edit_settings()
 
         settings.complete(st, TRUE);
 
-        co[0].set(TR("state color"), &state_color);
-        co[1].set(TR("state action color"), &stateaction_color);
-        co[2].set(TR("note color"), &note_color);
-        co[3].set(TR("package color"), &package_color);
-        co[4].set(TR("fragment color"), &fragment_color);
+        co[0].set( QObject::tr("state color"), &state_color);
+        co[1].set( QObject::tr("state action color"), &stateaction_color);
+        co[2].set( QObject::tr("note color"), &note_color);
+        co[3].set( QObject::tr("package color"), &package_color);
+        co[4].set( QObject::tr("fragment color"), &fragment_color);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -411,7 +407,7 @@ UmlCode BrowserStateDiagram::get_type() const
 
 QString BrowserStateDiagram::get_stype() const
 {
-    return TR("state diagram");
+    return  QObject::tr("state diagram");
 }
 
 int BrowserStateDiagram::get_identifier() const
@@ -444,7 +440,7 @@ void BrowserStateDiagram::get_statedrawingsettings(StateDrawingSettings & r) con
 }
 
 void BrowserStateDiagram::package_settings(BooL & name_in_tab,
-        ShowContextMode & show_context) const
+                                           ShowContextMode & show_context) const
 {
     name_in_tab = used_settings->package_name_in_tab == UmlYes;
     show_context = used_settings->show_context_mode;
@@ -496,8 +492,8 @@ UmlColor BrowserStateDiagram::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 bool BrowserStateDiagram::get_shadow() const
@@ -513,7 +509,7 @@ bool BrowserStateDiagram::get_draw_all_relations() const
 void BrowserStateDiagram::dont_draw_all_relations()
 {
     settings.draw_all_relations =
-        used_settings->draw_all_relations = UmlNo;
+            used_settings->draw_all_relations = UmlNo;
 }
 
 bool BrowserStateDiagram::get_show_stereotype_properties() const
@@ -536,11 +532,10 @@ bool BrowserStateDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
-    return TRUE;
-
+        return TRUE;
     case saveInCmd:
         if (window != 0)
             com->write_ack(window->get_view()->save_pict(args, TRUE, FALSE));
@@ -551,11 +546,10 @@ bool BrowserStateDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
 
         return TRUE;
-
     default:
         return (def->tool_cmd(com, args, this, comment) ||
                 BrowserNode::tool_cmd(com, args));
@@ -573,7 +567,7 @@ void BrowserStateDiagram::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 QString BrowserStateDiagram::drag_key() const
 {
     return QString::number(UmlStateDiagram)
-           + "#" + QString::number((unsigned long) parent());
+            + "#" + QString::number((unsigned long) parent());
 }
 
 QString BrowserStateDiagram::drag_postfix() const
@@ -584,7 +578,7 @@ QString BrowserStateDiagram::drag_postfix() const
 QString BrowserStateDiagram::drag_key(BrowserNode * p)
 {
     return QString::number(UmlStateDiagram)
-           + "#" + QString::number((unsigned long) p);
+            + "#" + QString::number((unsigned long) p);
 }
 
 const QStringList & BrowserStateDiagram::default_stereotypes()
@@ -592,24 +586,25 @@ const QStringList & BrowserStateDiagram::default_stereotypes()
     return its_default_stereotypes;
 }
 
-void BrowserStateDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * bn,
-        char const * kc,
-        char const * kr)
+void BrowserStateDiagram::compute_referenced_by(QList<BrowserNode *> & l,
+                                                BrowserNode * bn,
+                                                char const * kc,
+                                                char const * kr)
 {
     int id = bn->get_identifier();
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
+    while (it.hasNext()) {
+        it.next();
+        if((d = it.value()) != 0) {
+            if (!d->deletedp() && (d->get_type() == UmlStateDiagram)) {
+                if ((((BrowserStateDiagram *) d)->window != 0)
+                        ? ((BrowserStateDiagram *) d)->window->get_view()->is_present(bn)
+                        : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
+                    l.append((BrowserStateDiagram *) d);
+            }
 
-    while ((d = it.current()) != 0) {
-        if (!d->deletedp() && (d->get_type() == UmlStateDiagram)) {
-            if ((((BrowserStateDiagram *) d)->window != 0)
-                ? ((BrowserStateDiagram *) d)->window->get_view()->is_present(bn)
-                : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
-                l.append((BrowserStateDiagram *) d);
         }
-
-        ++it;
     }
 }
 
@@ -654,7 +649,9 @@ void BrowserStateDiagram::save(QTextStream & st, bool ref, QString & warning)
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
@@ -681,12 +678,12 @@ BrowserStateDiagram * BrowserStateDiagram::read_ref(char *& st, char * k)
     BrowserStateDiagram * result = (BrowserStateDiagram *) all[id];
 
     return (result == 0)
-           ? new BrowserStateDiagram(id)
-           : result;
+            ? new BrowserStateDiagram(id)
+            : result;
 }
 
 BrowserStateDiagram * BrowserStateDiagram::read(char *& st, char * k,
-        BrowserNode * parent)
+                                                BrowserNode * parent)
 {
     BrowserStateDiagram * r;
     int id;
@@ -720,7 +717,7 @@ BrowserStateDiagram * BrowserStateDiagram::read(char *& st, char * k,
         r->is_defined = TRUE;
 
         r->is_read_only = (!in_import() && read_only_file()) ||
-                          ((user_id() != 0) && r->is_api_base());
+                ((user_id() != 0) && r->is_api_base());
 
         QFileInfo fi(BrowserView::get_dir(), QString::number(id) + ".diagram");
 
diff --git a/src/browser/BrowserStateDiagram.h b/src/browser/BrowserStateDiagram.h
index b32b850cd..89566408d 100644
--- a/src/browser/BrowserStateDiagram.h
+++ b/src/browser/BrowserStateDiagram.h
@@ -34,7 +34,7 @@
 #include <QPixmap>
 #include <QDropEvent>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QPixmap;
 class StateDiagramWindow;
@@ -45,8 +45,8 @@ class BrowserStateDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserStateDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserStateDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
 
     SimpleData * def;
@@ -65,18 +65,18 @@ class BrowserStateDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserStateDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserStateDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserStateDiagram();
 
     virtual void delete_it();
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
     virtual void draw_svg() const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual void on_close();
     virtual void read_session(char *& st);
@@ -85,7 +85,7 @@ class BrowserStateDiagram : public BrowserDiagram
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
     virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
+    virtual void set_name(const QString & s);
     virtual void update_drawing_settings();
     virtual void get_statediagramsettings(StateDiagramSettings &) const;
     virtual void get_statedrawingsettings(StateDrawingSettings &) const;
@@ -117,7 +117,7 @@ class BrowserStateDiagram : public BrowserDiagram
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 
     static QString drag_key(BrowserNode * p);
diff --git a/src/browser/BrowserTransition.cpp b/src/browser/BrowserTransition.cpp
index 486ff98e6..bcb136c16 100644
--- a/src/browser/BrowserTransition.cpp
+++ b/src/browser/BrowserTransition.cpp
@@ -29,10 +29,10 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
-#include <q3painter.h>
-#include <q3ptrdict.h>
+
+#include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -95,7 +95,7 @@ BrowserTransition::~BrowserTransition()
         delete def;
 }
 
-BrowserNode * BrowserTransition::duplicate(BrowserNode * p, QString)
+BrowserNode * BrowserTransition::duplicate(BrowserNode * p, const QString &)
 {
     BrowserTransition * result = new BrowserTransition(this, p);
 
@@ -113,9 +113,9 @@ bool BrowserTransition::undelete(bool, QString & warning, QString & renamed)
 
     if (def->get_start_node()->deletedp() ||
         def->get_end_node()->deletedp()) {
-        warning += QString("<li><b>") + quote(name) + "</b> " + TR("from") + " <b>" +
+        warning += QString("<li><b>") + quote(name) + "</b> " + QObject::tr("from") + " <b>" +
                    def->get_start_node()->full_name() +
-                   "</b> " + TR("to") + " <b>" + def->get_end_node()->full_name() + "</b>\n";
+                   "</b> " + QObject::tr("to") + " <b>" + def->get_end_node()->full_name() + "</b>\n";
         return FALSE;
     }
 
@@ -128,25 +128,25 @@ bool BrowserTransition::undelete(bool, QString & warning, QString & renamed)
     return TRUE;
 }
 
-void BrowserTransition::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserTransition::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
-
     if (! ondelete)
         BrowserStateDiagram::compute_referenced_by(l, this, "transitioncanvas", "transition_ref");
 }
 
-void BrowserTransition::compute_referenced_by(Q3PtrList<BrowserNode> & l,
+void BrowserTransition::compute_referenced_by(QList<BrowserNode *> & l,
         BrowserNode * target)
 {
     IdIterator<BrowserTransition> it(all);
+    while (it.hasNext()) {
+        it.next();
+        if(it.value()) {
+        if (!it.value()->deletedp() &&
+            (it.value()->def->get_end_node() == target))
+            l.append(it.value());
 
-    while (it.current()) {
-        if (!it.current()->deletedp() &&
-            (it.current()->def->get_end_node() == target))
-            l.append(it.current());
-
-        ++it;
+}
     }
 }
 
@@ -182,7 +182,7 @@ void BrowserTransition::update_stereotype(bool)
 
         if (show_stereotypes && stereotype[0]) {
             QString s = toUnicode(stereotype);
-            int index = s.find(':');
+            int index = s.indexOf(':');
 
             setText(0,
                     "<<" + ((index == -1) ? s : s.mid(index + 1))
@@ -210,25 +210,24 @@ QString BrowserTransition::str(bool horiz, DrawingLanguage lg) const
 
 void BrowserTransition::menu()
 {
-    Q3PopupMenu m(0, "transition");
-    Q3PopupMenu toolm(0);
+    QMenu m("transition",0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
-
+    m.addSeparator();
     if (!deletedp()) {
         if (!in_edition()) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 0),
-                           TR("to edit the <i>transition</i>, \
+            MenuFactory::addItem(m, QObject::tr("Edit"), 0,
+                           QObject::tr("to edit the <i>transition</i>, \
 a double click with the left mouse button does the same thing"));
 
             if (!is_read_only && (edition_number == 0)) {
-                m.setWhatsThis(m.insertItem(TR("Delete"), 2),
-                               TR("to delete the <i>transition</i>. \
+                MenuFactory::addItem(m, QObject::tr("Delete"), 2,
+                               QObject::tr("to delete the <i>transition</i>. \
 Note that you can undelete it after"));
             }
 
-            m.insertSeparator();
+            m.addSeparator();
         }
 
         QString s = def->get_end_node()->get_name();
@@ -236,30 +235,38 @@ Note that you can undelete it after"));
         if (s.isEmpty())
             s = stringify(def->get_end_node()->get_type());
 
-        m.setWhatsThis(m.insertItem(TR("Select ") + s, 7),
-                       TR("to select the destination"));
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 4),
-                       TR("to know who reference the <i>transition</i>"));
-        mark_menu(m, TR("the transition"), 90);
+        MenuFactory::addItem(m, QObject::tr("Select ") + s, 7,
+                       QObject::tr("to select the destination"));
+        MenuFactory::addItem(m, QObject::tr("Referenced by"), 4,
+                       QObject::tr("to know who reference the <i>transition</i>"));
+        mark_menu(m, QObject::tr("the transition"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0)
             && Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+            m.addSeparator();
+            toolm.setTitle( QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 3),
-                       TR("undelete the <i>transition</i> \
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 3,
+                       QObject::tr("undelete the <i>transition</i> \
 (except if the other side is also deleted)"));
 
         if (def->get_start_node()->deletedp() ||
             def->get_end_node()->deletedp())
-            m.setItemEnabled(3, FALSE);
+        {
+                                       QAction *act = MenuFactory::findAction(m, 3);
+                                       if(act)
+                                        act->setEnabled(false);
+            //m.setItemEnabled(3, FALSE);
+                                   }
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserTransition::exec_menu_choice(int rank)
@@ -300,7 +307,7 @@ void BrowserTransition::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserTransition::apply_shortcut(QString s)
+void BrowserTransition::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -356,7 +363,7 @@ UmlCode BrowserTransition::get_type() const
 
 QString BrowserTransition::get_stype() const
 {
-    return TR("transition");
+    return QObject::tr("transition");
 }
 
 int BrowserTransition::get_identifier() const
diff --git a/src/browser/BrowserTransition.h b/src/browser/BrowserTransition.h
index 5646a9d41..ff7d96cc8 100644
--- a/src/browser/BrowserTransition.h
+++ b/src/browser/BrowserTransition.h
@@ -57,7 +57,7 @@ class BrowserTransition : public BrowserNode, public Labeled<BrowserTransition>
 
     virtual bool undelete(bool rec, QString & warning, QString & renamed);
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
 
@@ -65,7 +65,7 @@ class BrowserTransition : public BrowserNode, public Labeled<BrowserTransition>
     virtual bool same_name(const QString & s, UmlCode type) const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual bool in_edition() const;
     virtual UmlCode get_type() const;
@@ -88,8 +88,8 @@ class BrowserTransition : public BrowserNode, public Labeled<BrowserTransition>
     virtual void renumber(int phase);
     virtual void prepare_update_lib() const;
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
-    static void compute_referenced_by(Q3PtrList<BrowserNode> &, BrowserNode *);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
+    static void compute_referenced_by(QList<BrowserNode *> &, BrowserNode *);
 
     virtual bool tool_cmd(ToolCom * com, const char * args);
 
diff --git a/src/browser/BrowserUseCase.cpp b/src/browser/BrowserUseCase.cpp
index 1d51f6275..564cca23c 100644
--- a/src/browser/BrowserUseCase.cpp
+++ b/src/browser/BrowserUseCase.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -67,7 +67,7 @@ IdDict<BrowserUseCase> BrowserUseCase::all(257, __FILE__);
 QStringList BrowserUseCase::its_default_stereotypes;	// unicode
 QStringList BrowserUseCase::relations_default_stereotypes[UmlRelations];	// unicode
 
-BrowserUseCase::BrowserUseCase(QString s, BrowserNode * p, int id)
+BrowserUseCase::BrowserUseCase(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserUseCase>(all, id)
 {
     make();
@@ -142,7 +142,7 @@ void BrowserUseCase::make()
     class_color = UmlDefaultColor;
 }
 
-BrowserNode * BrowserUseCase::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserUseCase::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserUseCase * result = new BrowserUseCase(this, p);
 
@@ -168,18 +168,20 @@ void BrowserUseCase::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
 }
 
-void BrowserUseCase::referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete)
+void BrowserUseCase::referenced_by(QList<BrowserNode *> & l, bool ondelete)
 {
     BrowserNode::referenced_by(l, ondelete);
 
     if (! ondelete)
+    {
         BrowserUseCaseDiagram::compute_referenced_by(l, this, "usecasecanvas", "usecase_ref");
+    }
 }
 
 void BrowserUseCase::renumber(int phase)
@@ -207,80 +209,84 @@ QString BrowserUseCase::full_name(bool rev, bool) const
 
 void BrowserUseCase::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only && (edition_number == 0)) {
-            m.setWhatsThis(m.insertItem(TR("New use case diagram"), 0),
-                           TR("to add a <i>use case diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New sequence diagram"), 1),
-                           TR("to add a <i>sequence diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New communication diagram"), 2),
-                           TR("to add a <i>communication diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New class diagram"), 11),
-                           TR("to add a <i>class diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New object diagram"), 13),
-                           TR("to add a <i>object diagram</i>"));
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("New use case"), 3),
-                           TR("to add a <i>use case</i>"));
-            m.setWhatsThis(m.insertItem(TR("New actor"), 4),
-                           TR("to add an <i>actor</i>"));
-            m.setWhatsThis(m.insertItem(TR("New class"), 5),
-                           TR("to add a <i>class</i>"));
-            m.setWhatsThis(m.insertItem(TR("New class instance"), 14),
-                           TR("to add a <i>class instance</i>"));
-            m.setWhatsThis(m.insertItem(TR("New state machine"), 15),
-                           TR("to add a <i>state machine</i>"));
-            m.setWhatsThis(m.insertItem(TR("New activity"), 16),
-                           TR("to add an <i>activity</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m,  QObject::tr("New use case diagram"), 0,
+                                 QObject::tr("to add a <i>use case diagram</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New sequence diagram"), 1,
+                                 QObject::tr("to add a <i>sequence diagram</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New communication diagram"), 2,
+                                 QObject::tr("to add a <i>communication diagram</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New class diagram"), 11,
+                                 QObject::tr("to add a <i>class diagram</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New object diagram"), 13,
+                                 QObject::tr("to add a <i>object diagram</i>"));
+            m.addSeparator();
+            MenuFactory::addItem(m,  QObject::tr("New use case"), 3,
+                                 QObject::tr("to add a <i>use case</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New actor"), 4,
+                                 QObject::tr("to add an <i>actor</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New class"), 5,
+                                 QObject::tr("to add a <i>class</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New class instance"), 14,
+                                 QObject::tr("to add a <i>class instance</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New state machine"), 15,
+                                 QObject::tr("to add a <i>state machine</i>"));
+            MenuFactory::addItem(m,  QObject::tr("New activity"), 16,
+                                 QObject::tr("to add an <i>activity</i>"));
+            m.addSeparator();
         }
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 6),
-                           TR("to edit the <i>use case</i>"));
+            MenuFactory::addItem(m,  QObject::tr("Edit"), 6,
+                                 QObject::tr("to edit the <i>use case</i>"));
 
             if (!is_read_only) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 7),
-                               TR("to set how the sub <i>diagrams</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m,  QObject::tr("Edit drawing settings"), 7,
+                                     QObject::tr("to set how the sub <i>diagrams</i>'s items must be drawn"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 8),
-                                   TR("to delete the <i>use case and its sub items</i>. \
-Note that you can undelete them after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m,  QObject::tr("Delete"), 8,
+                                         QObject::tr("to delete the <i>use case and its sub items</i>. \
+                                                     Note that you can undelete them after"));
                 }
             }
         }
 
-        m.insertSeparator();
-        m.setWhatsThis(m.insertItem(TR("Referenced by"), 12),
-                       TR("to know who reference the <i>use case</i> \
-through a relation"));
-        mark_menu(m, TR("the use case"), 90);
-        ProfiledStereotypes::menu(m, this, 99990);
-
-        if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+        m.addSeparator();
+        MenuFactory::addItem(m,  QObject::tr("Referenced by"), 12,
+                             QObject::tr("to know who reference the <i>use case</i> \
+                                         through a relation"));
+                                         mark_menu(m,  QObject::tr("the use case"), 90);
+                             ProfiledStereotypes::menu(m, this, 99990);
+
+                if ((edition_number == 0) &&
+                    Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu( &toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 9),
-                       TR("undelete the <i>use case</i>. \
-Do not undelete its sub items"));
-        m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 10),
-                       TR("undelete the <i>use case</i> and its sub items"));
+        MenuFactory::addItem(m,  QObject::tr("Undelete"), 9,
+                             QObject::tr("undelete the <i>use case</i>. \
+                                         Do not undelete its sub items"));
+                                         MenuFactory::addItem(m,  QObject::tr("Undelete recursively"), 10,
+                                                              QObject::tr("undelete the <i>use case</i> and its sub items"));
     }
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserUseCase::exec_menu_choice(int rank)
@@ -288,36 +294,40 @@ void BrowserUseCase::exec_menu_choice(int rank)
     switch (rank) {
     case 0: {
         BrowserUseCaseDiagram * d =
-            BrowserUseCaseDiagram::add_use_case_diagram(this);
+                BrowserUseCaseDiagram::add_use_case_diagram(this);
 
         if (d == 0)
             return;
 
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 1: {
         BrowserSeqDiagram * d =
-            BrowserSeqDiagram::add_sequence_diagram(this);
+                BrowserSeqDiagram::add_sequence_diagram(this);
 
         if (d == 0)
             return;
-
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 2: {
         BrowserColDiagram * d =
-            BrowserColDiagram::add_collaboration_diagram(this);
+                BrowserColDiagram::add_collaboration_diagram(this);
 
         if (d == 0)
             return;
-
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 3: {
         BrowserUseCase * uc = add_use_case(this);
@@ -325,7 +335,7 @@ void BrowserUseCase::exec_menu_choice(int rank)
         if (uc != 0)
             uc->select_in_browser();
     }
-    break;
+        break;
 
     case 4: {
         BrowserClass * a = BrowserClass::add_class(FALSE, this);
@@ -336,7 +346,7 @@ void BrowserUseCase::exec_menu_choice(int rank)
         a->get_data()->set_stereotype("actor");
         a->select_in_browser();
     }
-    break;
+        break;
 
     case 5: {
         BrowserClass * cl = BrowserClass::add_class(FALSE, this);
@@ -344,7 +354,7 @@ void BrowserUseCase::exec_menu_choice(int rank)
         if (cl != 0)
             cl->select_in_browser();
     }
-    break;
+        break;
 
     case 6:
         def->edit();
@@ -363,21 +373,21 @@ void BrowserUseCase::exec_menu_choice(int rank)
             statediagram_settings.complete(st, FALSE);
             activitydiagram_settings.complete(st, FALSE);
 
-            co[0].set(TR("note color"), &note_color);
-            co[1].set(TR("use case color"), &usecase_color);
-            co[2].set(TR("package color"), &package_color);
-            co[3].set(TR("fragment color"), &fragment_color);
-            co[4].set(TR("subject color"), &subject_color);
-            co[5].set(TR("duration color"), &duration_color);
-            co[6].set(TR("continuation color"), &continuation_color);
-            co[7].set(TR("state color"), &state_color);
-            co[8].set(TR("state action color"), &stateaction_color);
-            co[9].set(TR("activity color"), &activity_color);
-            co[10].set(TR("activity region color"), &activityregion_color);
-            co[11].set(TR("activity partition color"), &activitypartition_color);
-            co[12].set(TR("activity action color"), &activityaction_color);
-            co[13].set(TR("parameter and pin color"), &parameterpin_color);
-            co[14].set(TR("class color"), &class_color);
+            co[0].set(QObject::tr("note color"), &note_color);
+            co[1].set(QObject::tr("use case color"), &usecase_color);
+            co[2].set(QObject::tr("package color"), &package_color);
+            co[3].set(QObject::tr("fragment color"), &fragment_color);
+            co[4].set(QObject::tr("subject color"), &subject_color);
+            co[5].set(QObject::tr("duration color"), &duration_color);
+            co[6].set(QObject::tr("continuation color"), &continuation_color);
+            co[7].set(QObject::tr("state color"), &state_color);
+            co[8].set(QObject::tr("state action color"), &stateaction_color);
+            co[9].set(QObject::tr("activity color"), &activity_color);
+            co[10].set(QObject::tr("activity region color"), &activityregion_color);
+            co[11].set(QObject::tr("activity partition color"), &activitypartition_color);
+            co[12].set(QObject::tr("activity action color"), &activityaction_color);
+            co[13].set(QObject::tr("parameter and pin color"), &parameterpin_color);
+            co[14].set(QObject::tr("class color"), &class_color);
 
             SettingsDialog dialog(&st, &co, FALSE);
 
@@ -410,14 +420,15 @@ void BrowserUseCase::exec_menu_choice(int rank)
 
     case 11: {
         BrowserClassDiagram * d =
-            BrowserClassDiagram::add_class_diagram(this);
+                BrowserClassDiagram::add_class_diagram(this);
 
         if (d == 0)
             return;
-
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 12:
         ReferenceDialog::show(this);
@@ -425,24 +436,25 @@ void BrowserUseCase::exec_menu_choice(int rank)
 
     case 13: {
         BrowserObjectDiagram * d =
-            BrowserObjectDiagram::add_object_diagram(this);
+                BrowserObjectDiagram::add_object_diagram(this);
 
         if (d == 0)
             return;
-
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 14: {
         BrowserClassInstance * c =
-            BrowserClassInstance::add_classinstance(this);
+                BrowserClassInstance::add_classinstance(this);
 
         if (c != 0)
             c->select_in_browser();
     }
 
-    return; // package_modified called
+        return; // package_modified called
 
     case 15: {
         BrowserState * st = BrowserState::add_state(this, (bool) TRUE);
@@ -452,7 +464,7 @@ void BrowserUseCase::exec_menu_choice(int rank)
 
         st->select_in_browser();
     }
-    break;
+        break;
 
     case 16: {
         BrowserActivity * a = BrowserActivity::add_activity(this);
@@ -461,7 +473,7 @@ void BrowserUseCase::exec_menu_choice(int rank)
             a->select_in_browser();
     }
 
-    return; // package_modified called
+        return; // package_modified called
 
     default:
         if (rank >= 99990)
@@ -477,7 +489,7 @@ void BrowserUseCase::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserUseCase::apply_shortcut(QString s)
+void BrowserUseCase::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -544,15 +556,14 @@ BrowserNodeList & BrowserUseCase::instances(BrowserNodeList & result)
 {
     IdIterator<BrowserUseCase> it(all);
 
-    while (it.current() != 0) {
-        if (!it.current()->deletedp())
-            result.append(it.current());
-
-        ++it;
+    while(it.hasNext()){
+        it.next();
+        if (it.value() != 0)
+                if (!it.value()->deletedp())
+                result.append(it.value());
     }
 
     result.sort_it();
-
     return result;
 }
 
@@ -560,7 +571,7 @@ BrowserUseCase * BrowserUseCase::add_use_case(BrowserNode * future_parent)
 {
     QString name;
 
-    if (!future_parent->enter_child_name(name, TR("enter use case's name : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter use case's name : "),
                                          UmlUseCase, TRUE, FALSE))
         return 0;
 
@@ -576,7 +587,7 @@ BrowserNode * BrowserUseCase::get_use_case(BrowserNode * future_parent)
     QString name;
     BrowserNodeList nodes;
 
-    if (!future_parent->enter_child_name(name, TR("enter use case's name : "),
+    if (!future_parent->enter_child_name(name, QObject::tr("enter use case's name : "),
                                          UmlUseCase, instances(nodes),
                                          &old, TRUE, FALSE))
         return 0;
@@ -592,8 +603,8 @@ BrowserNode * BrowserUseCase::get_use_case(BrowserNode * future_parent)
 void BrowserUseCase::open(bool force_edit)
 {
     if (!force_edit &&
-        (associated_diagram != 0) &&
-        !associated_diagram->deletedp())
+            (associated_diagram != 0) &&
+            !associated_diagram->deletedp())
         associated_diagram->open(FALSE);
     else if (!is_edited)
         def->edit();
@@ -614,7 +625,7 @@ UmlCode BrowserUseCase::get_type() const
 
 QString BrowserUseCase::get_stype() const
 {
-    return TR("use case");
+    return QObject::tr("use case");
 }
 
 int BrowserUseCase::get_identifier() const
@@ -743,8 +754,8 @@ UmlColor BrowserUseCase::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 BrowserNode * BrowserUseCase::get_associated() const
@@ -753,7 +764,7 @@ BrowserNode * BrowserUseCase::get_associated() const
 }
 
 void BrowserUseCase::set_associated_diagram(BrowserUseCaseDiagram * dg,
-        bool on_read)
+                                            bool on_read)
 {
     if (associated_diagram != dg) {
         if (associated_diagram != 0)
@@ -871,7 +882,7 @@ bool BrowserUseCase::tool_cmd(ToolCom * com, const char * args)
                         ok = FALSE;
                 }
             }
-            break;
+                break;
 
             case UmlState:
                 if (wrong_child_name(args, UmlState, TRUE, FALSE))
@@ -923,17 +934,17 @@ bool BrowserUseCase::tool_cmd(ToolCom * com, const char * args)
 void BrowserUseCase::DragMoveEvent(QDragMoveEvent * e)
 {
     if (UmlDrag::canDecode(e, UmlUseCase) ||
-        UmlDrag::canDecode(e, UmlUseCaseDiagram) ||
-        UmlDrag::canDecode(e, UmlSeqDiagram) ||
-        UmlDrag::canDecode(e, UmlColDiagram) ||
-        UmlDrag::canDecode(e, UmlClassDiagram) ||
-        UmlDrag::canDecode(e, UmlObjectDiagram) ||
-        UmlDrag::canDecode(e, UmlState) ||
-        UmlDrag::canDecode(e, UmlActivity) ||
-        UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))) {
+            UmlDrag::canDecode(e, UmlUseCaseDiagram) ||
+            UmlDrag::canDecode(e, UmlSeqDiagram) ||
+            UmlDrag::canDecode(e, UmlColDiagram) ||
+            UmlDrag::canDecode(e, UmlClassDiagram) ||
+            UmlDrag::canDecode(e, UmlObjectDiagram) ||
+            UmlDrag::canDecode(e, UmlState) ||
+            UmlDrag::canDecode(e, UmlActivity) ||
+            UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))) {
         if (!is_read_only ||
-            (((BrowserNode *) parent())->is_writable() &&
-             (((BrowserNode *) parent())->get_type() != UmlPackage)))
+                (((BrowserNode *) parent())->is_writable() &&
+                 (((BrowserNode *) parent())->get_type() != UmlPackage)))
             e->accept();
         else
             e->ignore();
@@ -945,29 +956,27 @@ void BrowserUseCase::DragMoveEvent(QDragMoveEvent * e)
 void BrowserUseCase::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        (UmlDrag::canDecode(e, UmlUseCaseDiagram) ||
-         UmlDrag::canDecode(e, UmlSeqDiagram) ||
-         UmlDrag::canDecode(e, UmlColDiagram) ||
-         UmlDrag::canDecode(e, UmlClassDiagram) ||
-         UmlDrag::canDecode(e, UmlObjectDiagram) ||
-         UmlDrag::canDecode(e, UmlUseCase) ||
-         UmlDrag::canDecode(e, UmlClass) ||
-         UmlDrag::canDecode(e, UmlClassInstance) ||
-         UmlDrag::canDecode(e, UmlState) ||
-         UmlDrag::canDecode(e, UmlActivity) ||
-         UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))))
+            (UmlDrag::canDecode(e, UmlUseCaseDiagram) ||
+             UmlDrag::canDecode(e, UmlSeqDiagram) ||
+             UmlDrag::canDecode(e, UmlColDiagram) ||
+             UmlDrag::canDecode(e, UmlClassDiagram) ||
+             UmlDrag::canDecode(e, UmlObjectDiagram) ||
+             UmlDrag::canDecode(e, UmlUseCase) ||
+             UmlDrag::canDecode(e, UmlClass) ||
+             UmlDrag::canDecode(e, UmlClassInstance) ||
+             UmlDrag::canDecode(e, UmlState) ||
+             UmlDrag::canDecode(e, UmlActivity) ||
+             UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this))))
         e->accept();
     else
         e->ignore();
 }
 
-bool BrowserUseCase::may_contains_them(const Q3PtrList<BrowserNode> & l,
+bool BrowserUseCase::may_contains_them(const QList<BrowserNode *> & l,
                                        BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlUseCaseDiagram:
         case UmlSeqDiagram:
         case UmlColDiagram:
@@ -981,17 +990,17 @@ bool BrowserUseCase::may_contains_them(const Q3PtrList<BrowserNode> & l,
             break;
 
         default:
-            if (!IsaSimpleRelation(it.current()->get_type()) ||
-                (((const BrowserNode *) it.current()->parent()) != this))
+            if (!IsaSimpleRelation(node->get_type()) ||
+                    (((const BrowserNode *) node->parent()) != this))
                 return FALSE;
 
             duplicable = FALSE;
         }
 
-        if (! may_contains(it.current(), FALSE))
+        if (! may_contains(node, FALSE))
             return FALSE;
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -1005,7 +1014,6 @@ void BrowserUseCase::DropEvent(QDropEvent * e)
 void BrowserUseCase::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, UmlUseCaseDiagram)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlSeqDiagram)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlColDiagram)) != 0) ||
@@ -1017,36 +1025,37 @@ void BrowserUseCase::DropAfterEvent(QDropEvent * e, BrowserNode * after)
          ((bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this))) != 0) ||
          ((bn = UmlDrag::decode(e, UmlState)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlActivity)) != 0)) &&
-        (bn != after) && (bn != this)) {
+            (bn != after) && (bn != this)) {
         bool uc = bn->get_type() == UmlUseCase;
 
         if (may_contains(bn, uc)) {
             BrowserNode * x = this;
 
             if ((after == 0) &&
-                (((BrowserNode *) parent())->get_type() != UmlPackage) &&
-                ((BrowserNode *) parent())->may_contains(bn, uc)) {
+                    (((BrowserNode *) parent())->get_type() != UmlPackage) &&
+                    ((BrowserNode *) parent())->may_contains(bn, uc)) {
                 // have choice
-                Q3PopupMenu m(0);
-
-                MenuFactory::createTitle(m, TR("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
-
-                switch (m.exec(QCursor::pos())) {
-                case 1:
-                    break;
+                QMenu m(0);
+
+                MenuFactory::createTitle(m, QObject::tr("move ") + bn->get_name());
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In %1").arg(QString(get_name())), 1);
+                MenuFactory::addItem(m, QObject::tr("After %1").arg(QString(get_name())), 2);
+                QAction *retAction = m.exec(QCursor::pos());
+                if(retAction)
+                    switch (retAction->data().toInt()) {
+                    case 1:
+                        break;
 
-                case 2:
-                    after = this;
-                    x = (BrowserNode *) parent();
-                    break;
+                    case 2:
+                        after = this;
+                        x = (BrowserNode *) parent();
+                        break;
 
-                default:
-                    e->ignore();
-                    return;
-                }
+                    default:
+                        e->ignore();
+                        return;
+                    }
             }
 
             BrowserNode * old_parent = (BrowserNode *) bn->parent();
@@ -1054,7 +1063,7 @@ void BrowserUseCase::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if (after)
                 bn->moveItem(after);
             else {
-                bn->parent()->takeItem(bn);
+                bn->parent()->removeChild(bn);
                 x->insertItem(bn);
             }
 
@@ -1068,7 +1077,7 @@ void BrowserUseCase::DropAfterEvent(QDropEvent * e, BrowserNode * after)
         else if (after == 0)
             ((BrowserNode *) parent())->DropAfterEvent(e, this);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -1212,7 +1221,7 @@ void BrowserUseCase::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -1248,8 +1257,8 @@ BrowserUseCase * BrowserUseCase::read_ref(char *& st)
     BrowserUseCase * result = all[id];
 
     return (result == 0)
-           ? new BrowserUseCase(id)
-           : result;
+            ? new BrowserUseCase(id)
+            : result;
 }
 
 BrowserUseCase * BrowserUseCase::read(char *& st, char * k,
@@ -1263,8 +1272,8 @@ BrowserUseCase * BrowserUseCase::read(char *& st, char * k,
         result = all[id];
 
         return (result == 0)
-               ? new BrowserUseCase(id)
-               : result;
+                ? new BrowserUseCase(id)
+                : result;
     }
     else if (!strcmp(k, "usecase")) {
         id = read_id(st);
@@ -1288,7 +1297,7 @@ BrowserUseCase * BrowserUseCase::read(char *& st, char * k,
         result->is_defined = TRUE;
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         k = read_keyword(st);
         result->def->read(st, k);				// updates k
@@ -1355,9 +1364,10 @@ BrowserUseCase * BrowserUseCase::read(char *& st, char * k,
                    BrowserSeqDiagram::read(st, k, result) ||
                    BrowserColDiagram::read(st, k, result) ||
                    BrowserUseCaseDiagram::read(st, k, result) ||
-                   BrowserSimpleRelation::read(st, k, result) ||
+                   BrowserSimpleRelation::read(st, k, result)||
                    BrowserState::read(st, k, result) ||
-                   BrowserActivity::read(st, k, result))
+                   BrowserActivity::read(st, k, result)
+                   )
                 k = read_keyword(st);
 
             if (strcmp(k, "end"))
@@ -1376,10 +1386,8 @@ BrowserNode * BrowserUseCase::get_it(const char * k, int id)
         return all[id];
 
     BrowserNode * r;
-
     if ((r = BrowserUseCaseDiagram::get_it(k, id)) == 0)
         // state and activity managed in class view
         r = BrowserSimpleRelation::get_it(k, id);
-
     return r;
 }
diff --git a/src/browser/BrowserUseCase.h b/src/browser/BrowserUseCase.h
index c579b4013..843de35a3 100644
--- a/src/browser/BrowserUseCase.h
+++ b/src/browser/BrowserUseCase.h
@@ -83,7 +83,7 @@ class BrowserUseCase : public BrowserNode, public Labeled<BrowserUseCase>
     void exec_menu_choice(int rank);
 
 public:
-    BrowserUseCase(QString s, BrowserNode * p, int id = 0);
+    BrowserUseCase(const QString & s, BrowserNode * p, int id = 0);
     BrowserUseCase(const BrowserUseCase * model, BrowserNode * p);
     virtual ~BrowserUseCase();
 
@@ -91,17 +91,17 @@ class BrowserUseCase : public BrowserNode, public Labeled<BrowserUseCase>
     void set_associated_diagram(BrowserUseCaseDiagram *, bool on_read = FALSE);
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const;
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool force_edit);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
     virtual void modified();
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> &,
+    virtual bool may_contains_them(const QList<BrowserNode *> &,
                                    BooL & duplicable) const;
     virtual BasicData * get_data() const;
     virtual void get_usecasediagramsettings(UseCaseDiagramSettings &) const;
@@ -129,7 +129,7 @@ class BrowserUseCase : public BrowserNode, public Labeled<BrowserUseCase>
     static void read_stereotypes(char *& , char *& k);
     static void save_stereotypes(QTextStream &);
 
-    virtual void referenced_by(Q3PtrList<BrowserNode> & l, bool ondelete);
+    virtual void referenced_by(QList<BrowserNode *> & l, bool ondelete);
 
     static void clear(bool old);
     static void update_idmax_for_root();
diff --git a/src/browser/BrowserUseCaseDiagram.cpp b/src/browser/BrowserUseCaseDiagram.cpp
index ad291a53a..b1e21693f 100644
--- a/src/browser/BrowserUseCaseDiagram.cpp
+++ b/src/browser/BrowserUseCaseDiagram.cpp
@@ -29,19 +29,20 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qfileinfo.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
-
+#include <QGraphicsItem>
 #include "BrowserUseCaseDiagram.h"
 #include "RelationData.h"
 #include "SimpleData.h"
 #include "UseCaseDiagramWindow.h"
 #include "BrowserUseCaseView.h"
+#include <QGraphicsItem>
 #include "UseCaseDiagramView.h"
 #include "UmlPixmap.h"
 #include "SettingsDialog.h"
@@ -54,12 +55,13 @@
 #include "ProfiledStereotypes.h"
 #include "mu.h"
 #include "translate.h"
+#include <QList>
 
-Q3PtrList<BrowserUseCaseDiagram> BrowserUseCaseDiagram::imported;
-Q3ValueList<int> BrowserUseCaseDiagram::imported_ids;
+QList<BrowserUseCaseDiagram *> BrowserUseCaseDiagram::imported;
+QList<int> BrowserUseCaseDiagram::imported_ids;
 QStringList BrowserUseCaseDiagram::its_default_stereotypes;	// unicode
 
-BrowserUseCaseDiagram::BrowserUseCaseDiagram(QString s, BrowserNode * p, int id)
+BrowserUseCaseDiagram::BrowserUseCaseDiagram(const QString & s, BrowserNode * p, int id)
     : BrowserDiagram(s, p, id), window(0), used_settings(0)
 {
     make();
@@ -91,7 +93,9 @@ BrowserUseCaseDiagram::BrowserUseCaseDiagram(BrowserUseCaseDiagram * model, Brow
     is_modified = TRUE;
 
     if (model->window != 0)
+    {
         model->window->duplicate(get_ident(), "diagram");
+    }
     else {
         char * diagram;
 
@@ -111,7 +115,7 @@ BrowserUseCaseDiagram::~BrowserUseCaseDiagram()
 
         QDir d = BrowserView::get_dir();
 
-        QFile::remove(d.absFilePath(fn));
+        QFile::remove(d.absoluteFilePath(fn));
     }
 
 #if 0
@@ -141,33 +145,29 @@ BrowserUseCaseDiagram * BrowserUseCaseDiagram::add_use_case_diagram(BrowserNode
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter use case diagram's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter use case diagram's name : "),
                                         UmlUseCaseDiagram, TRUE, FALSE))
         return new BrowserUseCaseDiagram(name, future_parent);
     else
         return 0;
 }
 
-void BrowserUseCaseDiagram::set_name(const char * s)
+void BrowserUseCaseDiagram::set_name(const QString & s)
 {
     BrowserDiagram::set_name(s);
-
     if (window != 0)
-        window->setCaption(s);
+        window->setWindowTitle(s);
 }
 
 void BrowserUseCaseDiagram::import()
 {
-    Q3ValueList<int>::Iterator it = imported_ids.begin();
-
-    while (!imported.isEmpty()) {
-        QString warning;
-        BrowserUseCaseDiagram * d = imported.take(0);
-
-        (new UseCaseDiagramWindow(d->full_name(), d, *it))->close(TRUE);
-        it = imported_ids.remove(it);
+    QList<int>::Iterator it = imported_ids.begin();
+    foreach (BrowserUseCaseDiagram *d, imported) {
+        (new UseCaseDiagramWindow(d->full_name(), d, *it))->close();
+        /*it = */imported_ids.removeOne(*it);
         d->is_modified = TRUE;
     }
+    imported.clear();
 }
 
 void BrowserUseCaseDiagram::renumber(int phase)
@@ -185,11 +185,11 @@ void BrowserUseCaseDiagram::delete_it()
 {
     if (window)
         delete window;
-
+    window = 0;
     BrowserNode::delete_it();
 }
 
-BrowserNode * BrowserUseCaseDiagram::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserUseCaseDiagram::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserUseCaseDiagram * result = new BrowserUseCaseDiagram(this, p);
 
@@ -225,50 +225,53 @@ void BrowserUseCaseDiagram::draw_svg() const
 
 void BrowserUseCaseDiagram::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name,0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
-        m.setWhatsThis(m.insertItem(TR("Show"), 0),
-                       TR("to show and edit the <i>use case diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Show"), 0,
+                             QObject::tr("to show and edit the <i>use case diagram</i>"));
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 1),
-                           TR("to edit the <i>use case diagram</i>"));
+            MenuFactory::addItem(m, QObject::tr("Edit"), 1,
+                                 QObject::tr("to edit the <i>use case diagram</i>"));
 
             if (!is_read_only) {
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 2),
-                               TR("to set how the <i>use case diagram</i>'s items must be drawn"));
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Duplicate"), 3),
-                               TR("to duplicate the <i>use case diagram</i>"));
+                MenuFactory::addItem(m, QObject::tr("Edit drawing settings"), 2,
+                                     QObject::tr("to set how the <i>use case diagram</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("Duplicate"), 3,
+                                     QObject::tr("to duplicate the <i>use case diagram</i>"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 4),
-                                   TR("to delete the <i>use case diagram</i>. \
-Note that you can undelete it after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m, QObject::tr("Delete"), 4,
+                                         QObject::tr("to delete the <i>use case diagram</i>. \
+                                                     Note that you can undelete it after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the use case diagram"), 90);
+        mark_menu(m, QObject::tr("the use case diagram"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0))
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 5),
-                       TR("to undelete the <i>use case diagram</i>"));
+        MenuFactory::addItem(m, QObject::tr("Undelete"), 5,
+                             QObject::tr("to undelete the <i>use case diagram</i>"));
 
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        exec_menu_choice(retAction->data().toInt());
 }
 
 void BrowserUseCaseDiagram::exec_menu_choice(int rank)
@@ -279,7 +282,7 @@ void BrowserUseCaseDiagram::exec_menu_choice(int rank)
         return;
 
     case 1:
-        edit(TR("Use Case diagram"), its_default_stereotypes);
+        edit( QObject::tr("Use Case diagram"), its_default_stereotypes);
         return;
 
     case 2:
@@ -289,13 +292,13 @@ void BrowserUseCaseDiagram::exec_menu_choice(int rank)
     case 3: {
         QString name;
 
-        if (((BrowserNode *)parent())->enter_child_name(name, TR("enter use case diagram's name : "),
-                UmlUseCaseDiagram, TRUE, FALSE))
+        if (((BrowserNode *)parent())->enter_child_name(name, QObject::tr("enter use case diagram's name : "),
+                                                        UmlUseCaseDiagram, TRUE, FALSE))
             duplicate((BrowserNode *) parent(), name)->select_in_browser();
         else
             return;
     }
-    break;
+        break;
 
     case 4:
         delete_it();
@@ -319,7 +322,7 @@ void BrowserUseCaseDiagram::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserUseCaseDiagram::apply_shortcut(QString s)
+void BrowserUseCaseDiagram::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -359,10 +362,13 @@ void BrowserUseCaseDiagram::apply_shortcut(QString s)
 void BrowserUseCaseDiagram::open(bool)
 {
     if (window == 0 || windowDestroyed)
+    {
         window = new UseCaseDiagramWindow(full_name(TRUE), this);
+        window->raise();
+    }
     else
         window->raise();
-
+    windowDestroyed = false;
     window->setFocus();
 }
 
@@ -374,12 +380,12 @@ void BrowserUseCaseDiagram::edit_settings()
 
         settings.complete(st, TRUE);
 
-        co[0].set(TR("note color"), &note_color);
-        co[1].set(TR("use case color"), &usecase_color);
-        co[2].set(TR("package color"), &package_color);
-        co[3].set(TR("fragment color"), &fragment_color);
-        co[4].set(TR("subject color"), &subject_color);
-        co[5].set(TR("class color"), &class_color);
+        co[0].set( QObject::tr("note color"), &note_color);
+        co[1].set( QObject::tr("use case color"), &usecase_color);
+        co[2].set( QObject::tr("package color"), &package_color);
+        co[3].set( QObject::tr("fragment color"), &fragment_color);
+        co[4].set( QObject::tr("subject color"), &subject_color);
+        co[5].set( QObject::tr("class color"), &class_color);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -408,6 +414,7 @@ void BrowserUseCaseDiagram::on_close()
 void BrowserUseCaseDiagram::read_session(char *& st)
 {
     window->read_session(st);
+
 }
 
 UmlCode BrowserUseCaseDiagram::get_type() const
@@ -417,7 +424,7 @@ UmlCode BrowserUseCaseDiagram::get_type() const
 
 QString BrowserUseCaseDiagram::get_stype() const
 {
-    return TR("Use Case diagram");
+    return QObject::tr("Use Case diagram");
 }
 
 int BrowserUseCaseDiagram::get_identifier() const
@@ -450,7 +457,7 @@ void BrowserUseCaseDiagram::get_simpleclassdiagramsettings(SimpleClassDiagramSet
 }
 
 void BrowserUseCaseDiagram::package_settings(BooL & name_in_tab,
-        ShowContextMode & show_context) const
+                                             ShowContextMode & show_context) const
 {
     name_in_tab = used_settings->package_name_in_tab == UmlYes;
     show_context = used_settings->show_context_mode;
@@ -486,8 +493,8 @@ UmlColor BrowserUseCaseDiagram::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 bool BrowserUseCaseDiagram::get_shadow() const
@@ -503,7 +510,7 @@ bool BrowserUseCaseDiagram::get_draw_all_relations() const
 void BrowserUseCaseDiagram::dont_draw_all_relations()
 {
     settings.draw_all_relations =
-        used_settings->draw_all_relations = UmlNo;
+            used_settings->draw_all_relations = UmlNo;
 }
 
 bool BrowserUseCaseDiagram::get_show_stereotype_properties() const
@@ -531,12 +538,12 @@ bool BrowserUseCaseDiagram::tool_cmd(ToolCom * com, const char * args)
 
         QDir d = BrowserView::get_dir();
 
-        com->write_string(d.absFilePath(fn));
+        com->write_string(d.absoluteFilePath(fn));
     }
 
-    return TRUE;
-
+        return TRUE;
     case saveInCmd:
+
         if (window != 0)
             com->write_ack(window->get_view()->save_pict(args, TRUE, FALSE));
         else {
@@ -546,7 +553,7 @@ bool BrowserUseCaseDiagram::tool_cmd(ToolCom * com, const char * args)
                                                     !w->get_view()->has_preferred_size_zoom(),
                                                     TRUE));
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
 
         return TRUE;
@@ -559,37 +566,38 @@ bool BrowserUseCaseDiagram::tool_cmd(ToolCom * com, const char * args)
 
             ((UseCaseDiagramView *) w->get_view())->send(com);
             w->dont_save();
-            w->close(TRUE);
+            w->close();
         }
 
         return TRUE;
-
     default:
         return (def->tool_cmd(com, args, this, comment) ||
                 BrowserNode::tool_cmd(com, args));
     }
 }
 
-void BrowserUseCaseDiagram::compute_referenced_by(Q3PtrList<BrowserNode> & l,
-        BrowserNode * bn,
-        char const * kc,
-        char const * kr)
+void BrowserUseCaseDiagram::compute_referenced_by(QList<BrowserNode *> & l,
+                                                  BrowserNode * bn,
+                                                  char const * kc,
+                                                  char const * kr)
 {
     int id = (IsaRelation(bn->get_type()))
-             ? ((RelationData *) bn->get_data())->get_ident()
-             : bn->get_identifier();
+            ? ((RelationData *) bn->get_data())->get_ident()
+            : bn->get_identifier();
     IdIterator<BrowserDiagram> it(all);
     BrowserDiagram * d;
-
-    while ((d = it.current()) != 0) {
-        if (!d->deletedp() && (d->get_type() == UmlUseCaseDiagram)) {
-            if ((((BrowserUseCaseDiagram *) d)->window != 0)
-                ? ((BrowserUseCaseDiagram *) d)->window->get_view()->is_present(bn)
-                : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
-                l.append((BrowserUseCaseDiagram *) d);
+    while (it.hasNext()) {
+        it.next();
+        d = it.value();
+        if(d !=0)
+        {
+            if (!d->deletedp() && (d->get_type() == UmlUseCaseDiagram)) {
+                if ((((BrowserUseCaseDiagram *) d)->window != 0)
+                        ? ((BrowserUseCaseDiagram *) d)->window->get_view()->is_present(bn)
+                        : is_referenced(read_definition(d->get_ident(), "diagram"), id, kc, kr))
+                    l.append((BrowserUseCaseDiagram *) d);
+            }
         }
-
-        ++it;
     }
 }
 
@@ -635,7 +643,9 @@ void BrowserUseCaseDiagram::save(QTextStream & st, bool ref, QString & warning)
             is_modified = FALSE;
 
             if (window)
+            {
                 window->save("diagram", warning, is_new);
+            }
             else
                 BrowserDiagram::save();
         }
@@ -661,15 +671,15 @@ BrowserUseCaseDiagram * BrowserUseCaseDiagram::read_ref(char *& st, const char *
 
     int id = read_id(st);
     BrowserUseCaseDiagram * result =
-        (BrowserUseCaseDiagram *) all[id];
+            (BrowserUseCaseDiagram *) all[id];
 
     return (result == 0)
-           ? new BrowserUseCaseDiagram(id)
-           : result;
+            ? new BrowserUseCaseDiagram(id)
+            : result;
 }
 
 BrowserUseCaseDiagram * BrowserUseCaseDiagram::read(char *& st, char * k,
-        BrowserNode * parent)
+                                                    BrowserNode * parent)
 {
     BrowserUseCaseDiagram * r;
     int id;
@@ -703,7 +713,7 @@ BrowserUseCaseDiagram * BrowserUseCaseDiagram::read(char *& st, char * k,
         r->is_defined = TRUE;
 
         r->is_read_only = (!in_import() && read_only_file()) ||
-                          ((user_id() != 0) && r->is_api_base());
+                ((user_id() != 0) && r->is_api_base());
 
         QFileInfo fi(BrowserView::get_dir(), QString::number(id) + ".diagram");
 
diff --git a/src/browser/BrowserUseCaseDiagram.h b/src/browser/BrowserUseCaseDiagram.h
index 9e0474e92..bbd7dc7c8 100644
--- a/src/browser/BrowserUseCaseDiagram.h
+++ b/src/browser/BrowserUseCaseDiagram.h
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QPixmap>
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QPixmap;
 class UseCaseDiagramWindow;
@@ -44,8 +44,8 @@ class BrowserUseCaseDiagram : public BrowserDiagram
     friend class StereotypesDialog;
 
 protected:
-    static Q3PtrList<BrowserUseCaseDiagram> imported;
-    static Q3ValueList<int> imported_ids;
+    static QList<BrowserUseCaseDiagram *> imported;
+    static QList<int> imported_ids;
     static QStringList its_default_stereotypes;
 
     SimpleData * def;
@@ -65,18 +65,18 @@ class BrowserUseCaseDiagram : public BrowserDiagram
     void exec_menu_choice(int rank);
 
 public:
-    BrowserUseCaseDiagram(QString s, BrowserNode * p, int id = 0);
+    BrowserUseCaseDiagram(const QString & s, BrowserNode * p, int id = 0);
     virtual ~BrowserUseCaseDiagram();
 
     virtual void delete_it();
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
 
     virtual const QPixmap * pixmap(int) const;
     virtual void draw_svg() const;
 
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual void on_close();
     virtual void read_session(char *& st);
@@ -85,7 +85,7 @@ class BrowserUseCaseDiagram : public BrowserDiagram
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
     virtual BasicData * get_data() const;
-    virtual void set_name(const char * s);
+    virtual void set_name(const QString & s);
     virtual UmlColor get_color(UmlCode) const;
     virtual bool get_shadow() const;
     virtual bool get_draw_all_relations() const;
@@ -114,7 +114,7 @@ class BrowserUseCaseDiagram : public BrowserDiagram
     static void open_all();
     static void import();
 
-    static void compute_referenced_by(Q3PtrList<BrowserNode> & l, BrowserNode *,
+    static void compute_referenced_by(QList<BrowserNode *> & l, BrowserNode *,
                                       const char * kc, char const * kr);
 };
 
diff --git a/src/browser/BrowserUseCaseView.cpp b/src/browser/BrowserUseCaseView.cpp
index 507b843fc..2273f57d6 100644
--- a/src/browser/BrowserUseCaseView.cpp
+++ b/src/browser/BrowserUseCaseView.cpp
@@ -25,18 +25,11 @@
 //
 // *************************************************************************
 
-
-
-
-
-#include <q3popupmenu.h>
 #include <qcursor.h>
-//Added by qt3to4:
 #include <QTextStream>
 #include <QPixmap>
 #include <QDragMoveEvent>
 #include <QDropEvent>
-
 #include "BrowserUseCaseView.h"
 #include "SimpleData.h"
 #include "BrowserUseCase.h"
@@ -50,8 +43,8 @@
 #include "BrowserState.h"
 #include "BrowserActivity.h"
 #include "SettingsDialog.h"
-#include "UmlPixmap.h"
 #include "UmlDrag.h"
+#include "UmlPixmap.h"
 #include "myio.h"
 #include "ToolCom.h"
 #include "Tool.h"
@@ -64,7 +57,7 @@
 IdDict<BrowserUseCaseView> BrowserUseCaseView::all(__FILE__);
 QStringList BrowserUseCaseView::its_default_stereotypes;	// unicode
 
-BrowserUseCaseView::BrowserUseCaseView(QString s, BrowserNode * p, int id)
+BrowserUseCaseView::BrowserUseCaseView(const QString & s, BrowserNode * p, int id)
     : BrowserNode(s, p), Labeled<BrowserUseCaseView>(all, id)
 {
     def = new SimpleData;
@@ -122,7 +115,7 @@ BrowserUseCaseView::~BrowserUseCaseView()
     delete def;
 }
 
-BrowserNode * BrowserUseCaseView::duplicate(BrowserNode * p, QString name)
+BrowserNode * BrowserUseCaseView::duplicate(BrowserNode * p, const QString & name)
 {
     BrowserUseCaseView * result = new BrowserUseCaseView(this, p);
 
@@ -136,7 +129,7 @@ BrowserUseCaseView * BrowserUseCaseView::add_use_case_view(BrowserNode * future_
 {
     QString name;
 
-    if (future_parent->enter_child_name(name, TR("enter use case view's name : "),
+    if (future_parent->enter_child_name(name, QObject::tr("enter use case view's name : "),
                                         UmlUseCaseView, TRUE, FALSE))
         return new BrowserUseCaseView(name, future_parent);
     else
@@ -159,7 +152,7 @@ void BrowserUseCaseView::prepare_update_lib() const
 {
     all.memo_id_oid(get_ident(), original_id);
 
-    for (Q3ListViewItem * child = firstChild();
+    for (BrowserNode * child = firstChild();
          child != 0;
          child = child->nextSibling())
         ((BrowserNode *) child)->prepare_update_lib();
@@ -185,78 +178,80 @@ const QPixmap * BrowserUseCaseView::pixmap(int) const
 
 void BrowserUseCaseView::menu()
 {
-    Q3PopupMenu m(0, name);
-    Q3PopupMenu toolm(0);
+    QMenu m(name, 0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, def->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (!deletedp()) {
         if (!is_read_only && (edition_number == 0)) {
-            m.setWhatsThis(m.insertItem(TR("New use case diagram"), 0),
-                           TR("to add a <i>use case diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New sequence diagram"), 1),
-                           TR("to add a <i>sequence diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New communication diagram"), 2),
-                           TR("to add a <i>communication diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New class diagram"), 17),
-                           TR("to add a <i>class diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New object diagram"), 13),
-                           TR("to add a <i>object diagram</i>"));
-            m.setWhatsThis(m.insertItem(TR("New use case"), 3),
-                           TR("to add a <i>use case</i>"));
-            m.setWhatsThis(m.insertItem(TR("New actor"), 4),
-                           TR("to add an <i>actor</i>"));
-            m.setWhatsThis(m.insertItem(TR("New class"), 5),
-                           TR("to add a <i>class</i>"));
-            m.setWhatsThis(m.insertItem(TR("New class instance"), 14),
-                           TR("to add a <i>class instance</i>"));
-            m.setWhatsThis(m.insertItem(TR("New state machine"), 15),
-                           TR("to add a <i>state machine</i>"));
-            m.setWhatsThis(m.insertItem(TR("New activity"), 16),
-                           TR("to add an <i>activity</i>"));
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("New sub use case view"), 6),
-                           TR("to add a sub <i>use case view</i>"));
-            m.insertSeparator();
+            MenuFactory::addItem(m, ("New use case diagram"), 0,
+                                 ("to add a <i>use case diagram</i>"));
+            MenuFactory::addItem(m,(("New sequence diagram")), 1,
+                                 ("to add a <i>sequence diagram</i>"));
+            MenuFactory::addItem(m,("New communication diagram"), 2,
+                                 ("to add a <i>communication diagram</i>"));
+            MenuFactory::addItem(m,("New class diagram"), 17,
+                                 ("to add a <i>class diagram</i>"));
+            MenuFactory::addItem(m,("New object diagram"), 13,
+                                 ("to add a <i>object diagram</i>"));
+            MenuFactory::addItem(m,("New use case"), 3,
+                                 ("to add a <i>use case</i>"));
+            MenuFactory::addItem(m,("New actor"), 4,
+                                 ("to add an <i>actor</i>"));
+            MenuFactory::addItem(m,("New class"), 5,
+                                 ("to add a <i>class</i>"));
+            MenuFactory::addItem(m,("New class instance"), 14,
+                                 ("to add a <i>class instance</i>"));
+            MenuFactory::addItem(m,("New state machine"), 15,
+                                 ("to add a <i>state machine</i>"));
+            MenuFactory::addItem(m,("New activity"), 16,
+                                 ("to add an <i>activity</i>"));
+            m.addSeparator();
+            MenuFactory::addItem(m,("New sub use case view"), 6,
+                                 ("to add a sub <i>use case view</i>"));
+            m.addSeparator();
         }
 
         if (!is_edited) {
-            m.setWhatsThis(m.insertItem(TR("Edit"), 8),
-                           TR("to edit the <i>use case view</i>"));
+            MenuFactory::addItem(m,("Edit"), 8,
+                                 ("to edit the <i>use case view</i>"));
 
             if (!is_read_only) {
-                m.insertSeparator();
-                m.setWhatsThis(m.insertItem(TR("Edit drawing settings"), 9),
-                               TR("to set how the sub <i>diagrams</i>'s items must be drawn"));
+                m.addSeparator();
+                MenuFactory::addItem(m,("Edit drawing settings"), 9,
+                                     ("to set how the sub <i>diagrams</i>'s items must be drawn"));
 
                 if (edition_number == 0) {
-                    m.insertSeparator();
-                    m.setWhatsThis(m.insertItem(TR("Delete"), 10),
-                                   TR("to delete the <i>use case view</i> and its sub items. \
-Note that you can undelete them after"));
+                    m.addSeparator();
+                    MenuFactory::addItem(m,("Delete"), 10,
+                                         ("to delete the <i>use case view</i> and its sub items. \
+                                          Note that you can undelete them after"));
                 }
             }
         }
 
-        mark_menu(m, TR("the use case view"), 90);
+        mark_menu(m, QObject::tr("the use case view"), 90);
         ProfiledStereotypes::menu(m, this, 99990);
 
         if ((edition_number == 0) &&
-            Tool::menu_insert(&toolm, get_type(), 100)) {
-            m.insertSeparator();
-            m.insertItem(TR("Tool"), &toolm);
+                Tool::menu_insert(&toolm, get_type(), 100)) {
+            m.addSeparator();
+            toolm.setTitle(QObject::tr("Tool"));
+            m.addMenu(&toolm);
         }
     }
     else if (!is_read_only && (edition_number == 0)) {
-        m.setWhatsThis(m.insertItem(TR("Undelete"), 11),
-                       TR("undelete the <i>use case view</i>. \
-Do not undelete its sub items"));
-        m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 12),
-                       TR("undelete the <i>use case view</i> and its sub items"));
+        MenuFactory::addItem(m,("Undelete"), 11,
+                             ("undelete the <i>use case view</i>. \
+                              Do not undelete its sub items"));
+                              MenuFactory::addItem(m,("Undelete recursively"), 12,
+                                                   ("undelete the <i>use case view</i> and its sub items"));
     }
-
-    exec_menu_choice(m.exec(QCursor::pos()));
+    QAction *resultAction = m.exec(QCursor::pos());
+    if(resultAction)
+        exec_menu_choice(resultAction->data().toInt());
 }
 
 void BrowserUseCaseView::exec_menu_choice(int rank)
@@ -264,36 +259,42 @@ void BrowserUseCaseView::exec_menu_choice(int rank)
     switch (rank) {
     case 0: {
         BrowserUseCaseDiagram * d =
-            BrowserUseCaseDiagram::add_use_case_diagram(this);
+                BrowserUseCaseDiagram::add_use_case_diagram(this);
 
         if (d == 0)
             return;
 
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 1: {
         BrowserSeqDiagram * d =
-            BrowserSeqDiagram::add_sequence_diagram(this);
+                BrowserSeqDiagram::add_sequence_diagram(this);
 
         if (d == 0)
             return;
 
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 2: {
         BrowserColDiagram * d =
-            BrowserColDiagram::add_collaboration_diagram(this);
+                BrowserColDiagram::add_collaboration_diagram(this);
 
         if (d == 0)
             return;
 
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 3: {
         BrowserUseCase  * uc = BrowserUseCase::add_use_case(this);
@@ -303,7 +304,7 @@ void BrowserUseCaseView::exec_menu_choice(int rank)
 
         uc->select_in_browser();
     }
-    break;
+        break;
 
     case 4: {
         BrowserClass * a = BrowserClass::add_class(FALSE, this);
@@ -314,7 +315,7 @@ void BrowserUseCaseView::exec_menu_choice(int rank)
         a->get_data()->set_stereotype("actor");
         a->select_in_browser();
     }
-    break;
+        break;
 
     case 5: {
         BrowserClass * c = BrowserClass::add_class(FALSE, this);
@@ -322,21 +323,21 @@ void BrowserUseCaseView::exec_menu_choice(int rank)
         if (c != 0)
             c->select_in_browser();
     }
-    break;
+        break;
 
     case 6: {
         BrowserUseCaseView * v =
-            BrowserUseCaseView::add_use_case_view(this);
+                BrowserUseCaseView::add_use_case_view(this);
 
         if (v == 0)
             return;
 
         v->select_in_browser();
     }
-    break;
+        break;
 
     case 8:
-        edit(TR("Use case view"), its_default_stereotypes);
+        edit(QObject::tr("Use case view"), its_default_stereotypes);
         return;
 
     case 9:
@@ -352,21 +353,21 @@ void BrowserUseCaseView::exec_menu_choice(int rank)
             statediagram_settings.complete(st, FALSE);
             activitydiagram_settings.complete(st, FALSE);
 
-            co[0].set(TR("note color"), &note_color);
-            co[1].set(TR("use case color"), &usecase_color);
-            co[2].set(TR("package color"), &package_color);
-            co[3].set(TR("fragment color"), &fragment_color);
-            co[4].set(TR("subject color"), &subject_color);
-            co[5].set(TR("duration color"), &duration_color);
-            co[6].set(TR("continuation color"), &continuation_color);
-            co[7].set(TR("class color"), &class_color);
-            co[8].set(TR("state color"), &state_color);
-            co[9].set(TR("state action color"), &stateaction_color);
-            co[10].set(TR("activity color"), &activity_color);
-            co[11].set(TR("activity region color"), &activityregion_color);
-            co[12].set(TR("activity partition color"), &activitypartition_color);
-            co[13].set(TR("activity action color"), &activityaction_color);
-            co[14].set(TR("parameter and pin color"), &parameterpin_color);
+            co[0].set(QObject::tr("note color"), &note_color);
+            co[1].set(QObject::tr("use case color"), &usecase_color);
+            co[2].set(QObject::tr("package color"), &package_color);
+            co[3].set(QObject::tr("fragment color"), &fragment_color);
+            co[4].set(QObject::tr("subject color"), &subject_color);
+            co[5].set(QObject::tr("duration color"), &duration_color);
+            co[6].set(QObject::tr("continuation color"), &continuation_color);
+            co[7].set(QObject::tr("class color"), &class_color);
+            co[8].set(QObject::tr("state color"), &state_color);
+            co[9].set(QObject::tr("state action color"), &stateaction_color);
+            co[10].set(QObject::tr("activity color"), &activity_color);
+            co[11].set(QObject::tr("activity region color"), &activityregion_color);
+            co[12].set(QObject::tr("activity partition color"), &activitypartition_color);
+            co[13].set(QObject::tr("activity action color"), &activityaction_color);
+            co[14].set(QObject::tr("parameter and pin color"), &parameterpin_color);
 
             SettingsDialog dialog(&st, &co, FALSE);
 
@@ -399,24 +400,26 @@ void BrowserUseCaseView::exec_menu_choice(int rank)
 
     case 13: {
         BrowserObjectDiagram * d =
-            BrowserObjectDiagram::add_object_diagram(this);
+                BrowserObjectDiagram::add_object_diagram(this);
 
         if (d == 0)
             return;
 
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     case 14: {
         BrowserClassInstance * c =
-            BrowserClassInstance::add_classinstance(this);
+                BrowserClassInstance::add_classinstance(this);
 
         if (c != 0)
             c->select_in_browser();
     }
 
-    return; // package_modified called
+        return; // package_modified called
 
     case 15: {
         BrowserState * st = BrowserState::add_state(this, (bool) TRUE);
@@ -425,28 +428,32 @@ void BrowserUseCaseView::exec_menu_choice(int rank)
             return;
 
         st->select_in_browser();
+
     }
-    break;
+        break;
 
     case 16: {
         BrowserActivity * a = BrowserActivity::add_activity(this);
 
         if (a != 0)
             a->select_in_browser();
+
     }
 
-    return; // package_modified called
+        return; // package_modified called
 
     case 17: {
         BrowserClassDiagram * d =
-            BrowserClassDiagram::add_class_diagram(this);
+                BrowserClassDiagram::add_class_diagram(this);
 
         if (d == 0)
             return;
 
+        removeChild(d);
+        insertChild(0,d);
         d->select_in_browser();
     }
-    break;
+        break;
 
     default:
         if (rank >= 99990)
@@ -462,7 +469,7 @@ void BrowserUseCaseView::exec_menu_choice(int rank)
     package_modified();
 }
 
-void BrowserUseCaseView::apply_shortcut(QString s)
+void BrowserUseCaseView::apply_shortcut(const QString & s)
 {
     int choice = -1;
 
@@ -527,7 +534,7 @@ void BrowserUseCaseView::apply_shortcut(QString s)
 void BrowserUseCaseView::open(bool)
 {
     if (!is_edited)
-        edit(TR("Use case view"), its_default_stereotypes);
+        edit(QObject::tr("Use case view"), its_default_stereotypes);
 }
 
 UmlCode BrowserUseCaseView::get_type() const
@@ -537,7 +544,7 @@ UmlCode BrowserUseCaseView::get_type() const
 
 QString BrowserUseCaseView::get_stype() const
 {
-    return TR("Use case view");
+    return QObject::tr("Use case view");
 }
 
 int BrowserUseCaseView::get_identifier() const
@@ -666,8 +673,8 @@ UmlColor BrowserUseCaseView::get_color(UmlCode who) const
     }
 
     return (c != UmlDefaultColor)
-           ? c
-           : ((BrowserNode *) parent())->get_color(who);
+            ? c
+            : ((BrowserNode *) parent())->get_color(who);
 }
 
 bool BrowserUseCaseView::tool_cmd(ToolCom * com, const char * args)
@@ -693,7 +700,6 @@ bool BrowserUseCaseView::tool_cmd(ToolCom * com, const char * args)
                     ok = FALSE;
                 else
                     (new BrowserUseCaseDiagram(args, this))->write_id(com);
-
                 break;
 
             case UmlUseCaseView:
@@ -709,7 +715,6 @@ bool BrowserUseCaseView::tool_cmd(ToolCom * com, const char * args)
                     ok = FALSE;
                 else
                     (new BrowserSeqDiagram(args, this))->write_id(com);
-
                 break;
 
             case UmlColDiagram:
@@ -717,7 +722,6 @@ bool BrowserUseCaseView::tool_cmd(ToolCom * com, const char * args)
                     ok = FALSE;
                 else
                     (new BrowserColDiagram(args, this))->write_id(com);
-
                 break;
 
             case UmlClassDiagram:
@@ -725,7 +729,6 @@ bool BrowserUseCaseView::tool_cmd(ToolCom * com, const char * args)
                     ok = FALSE;
                 else
                     (new BrowserClassDiagram(args, this))->write_id(com);
-
                 break;
 
             case UmlObjectDiagram:
@@ -733,7 +736,6 @@ bool BrowserUseCaseView::tool_cmd(ToolCom * com, const char * args)
                     ok = FALSE;
                 else
                     (new BrowserObjectDiagram(args, this))->write_id(com);
-
                 break;
 
             case UmlClass:
@@ -754,7 +756,6 @@ bool BrowserUseCaseView::tool_cmd(ToolCom * com, const char * args)
                 else
                     // force QString(args) else call add_state(BrowserNode, bool) !
                     (BrowserState::add_state(this, QString(args)))->write_id(com);
-
                 break;
 
             case UmlActivity:
@@ -762,7 +763,6 @@ bool BrowserUseCaseView::tool_cmd(ToolCom * com, const char * args)
                     ok = FALSE;
                 else
                     (BrowserActivity::add_activity(this, args))->write_id(com);
-
                 break;
 
             default:
@@ -790,19 +790,19 @@ void BrowserUseCaseView::DragMoveEvent(QDragMoveEvent * e)
     bool ucv = UmlDrag::canDecode(e, UmlUseCaseView);
 
     if (ucv ||
-        UmlDrag::canDecode(e, UmlClass) ||
-        UmlDrag::canDecode(e, UmlClassInstance) ||
-        UmlDrag::canDecode(e, UmlUseCase) ||
-        UmlDrag::canDecode(e, UmlUseCaseDiagram) ||
-        UmlDrag::canDecode(e, UmlSeqDiagram) ||
-        UmlDrag::canDecode(e, UmlColDiagram) ||
-        UmlDrag::canDecode(e, UmlClassDiagram) ||
-        UmlDrag::canDecode(e, UmlObjectDiagram) ||
-        UmlDrag::canDecode(e, UmlState) ||
-        UmlDrag::canDecode(e, UmlActivity)) {
+            UmlDrag::canDecode(e, UmlClass) ||
+            UmlDrag::canDecode(e, UmlClassInstance) ||
+            UmlDrag::canDecode(e, UmlUseCase) ||
+            UmlDrag::canDecode(e, UmlUseCaseDiagram) ||
+            UmlDrag::canDecode(e, UmlSeqDiagram) ||
+            UmlDrag::canDecode(e, UmlColDiagram) ||
+            UmlDrag::canDecode(e, UmlClassDiagram) ||
+            UmlDrag::canDecode(e, UmlObjectDiagram) ||
+            UmlDrag::canDecode(e, UmlState) ||
+            UmlDrag::canDecode(e, UmlActivity)) {
         if (!is_read_only ||
-            (((BrowserNode *) parent())->is_writable() &&
-             (ucv || (((BrowserNode *) parent())->get_type() == UmlUseCaseView))))
+                (((BrowserNode *) parent())->is_writable() &&
+                 (ucv || (((BrowserNode *) parent())->get_type() == UmlUseCaseView))))
             e->accept();
         else
             e->ignore();
@@ -814,29 +814,27 @@ void BrowserUseCaseView::DragMoveEvent(QDragMoveEvent * e)
 void BrowserUseCaseView::DragMoveInsideEvent(QDragMoveEvent * e)
 {
     if (!is_read_only &&
-        (UmlDrag::canDecode(e, UmlClass) ||
-         UmlDrag::canDecode(e, UmlClassInstance) ||
-         UmlDrag::canDecode(e, UmlUseCase) ||
-         UmlDrag::canDecode(e, UmlUseCaseDiagram) ||
-         UmlDrag::canDecode(e, UmlSeqDiagram) ||
-         UmlDrag::canDecode(e, UmlColDiagram) ||
-         UmlDrag::canDecode(e, UmlClassDiagram) ||
-         UmlDrag::canDecode(e, UmlObjectDiagram) ||
-         UmlDrag::canDecode(e, UmlUseCaseView) ||
-         UmlDrag::canDecode(e, UmlState) ||
-         UmlDrag::canDecode(e, UmlActivity)))
+            (UmlDrag::canDecode(e, UmlClass) ||
+             UmlDrag::canDecode(e, UmlClassInstance) ||
+             UmlDrag::canDecode(e, UmlUseCase) ||
+             UmlDrag::canDecode(e, UmlUseCaseDiagram) ||
+             UmlDrag::canDecode(e, UmlSeqDiagram) ||
+             UmlDrag::canDecode(e, UmlColDiagram) ||
+             UmlDrag::canDecode(e, UmlClassDiagram) ||
+             UmlDrag::canDecode(e, UmlObjectDiagram) ||
+             UmlDrag::canDecode(e, UmlUseCaseView) ||
+             UmlDrag::canDecode(e, UmlState) ||
+             UmlDrag::canDecode(e, UmlActivity)))
         e->accept();
     else
         e->ignore();
 }
 
-bool BrowserUseCaseView::may_contains_them(const Q3PtrList<BrowserNode> & l,
-        BooL & duplicable) const
+bool BrowserUseCaseView::may_contains_them(const QList<BrowserNode *> & l,
+                                           BooL & duplicable) const
 {
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    for (; it.current(); ++it) {
-        switch (it.current()->get_type()) {
+    foreach (BrowserNode *node, l) {
+        switch (node->get_type()) {
         case UmlUseCaseView:
             duplicable = FALSE;
 
@@ -851,7 +849,7 @@ bool BrowserUseCaseView::may_contains_them(const Q3PtrList<BrowserNode> & l,
         case UmlObjectDiagram:
         case UmlState:
         case UmlActivity:
-            if (! may_contains(it.current(), FALSE))
+            if (! may_contains(node, FALSE))
                 return FALSE;
 
             break;
@@ -860,7 +858,7 @@ bool BrowserUseCaseView::may_contains_them(const Q3PtrList<BrowserNode> & l,
             return FALSE;
         }
 
-        duplicable = may_contains_it(it.current());
+        duplicable = may_contains_it(node);
     }
 
     return TRUE;
@@ -870,8 +868,8 @@ BrowserNode * BrowserUseCaseView::container(UmlCode c) const
 {
     // currently only for class, state machine and activity
     return (c == UmlClass)
-           ? (BrowserNode *) this
-           : ((BrowserNode *) parent())->container(c);
+            ? (BrowserNode *) this
+            : ((BrowserNode *) parent())->container(c);
 }
 
 void BrowserUseCaseView::DropEvent(QDropEvent * e)
@@ -882,7 +880,6 @@ void BrowserUseCaseView::DropEvent(QDropEvent * e)
 void BrowserUseCaseView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
 {
     BrowserNode * bn;
-
     if ((((bn = UmlDrag::decode(e, UmlClass)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlClassInstance)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlUseCase)) != 0) ||
@@ -894,36 +891,37 @@ void BrowserUseCaseView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
          ((bn = UmlDrag::decode(e, UmlUseCaseView)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlState)) != 0) ||
          ((bn = UmlDrag::decode(e, UmlActivity)) != 0)) &&
-        (bn != this) && (bn != this)) {
+            (bn != this) && (bn != this)) {
         bool ucv = bn->get_type() == UmlUseCaseView;
 
         if (may_contains(bn, ucv)) {
             BrowserNode * x = this;
 
             if ((after == 0) &&
-                (((BrowserNode *) parent())->get_type() == UmlUseCaseView) &&
-                ((BrowserNode *) parent())->may_contains(bn, ucv)) {
+                    (((BrowserNode *) parent())->get_type() == UmlUseCaseView) &&
+                    ((BrowserNode *) parent())->may_contains(bn, ucv)) {
                 // have choice
-                Q3PopupMenu m(0);
+                QMenu m(0);
 
                 MenuFactory::createTitle(m, QString("move ") + bn->get_name());
-                m.insertSeparator();
-                m.insertItem(TR("In ") + QString(get_name()), 1);
-                m.insertItem(TR("After ") + QString(get_name()), 2);
-
-                switch (m.exec(QCursor::pos())) {
-                case 1:
-                    break;
-
-                case 2:
-                    after = this;
-                    x = (BrowserNode *) parent();
-                    break;
-
-                default:
-                    e->ignore();
-                    return;
-                }
+                m.addSeparator();
+                MenuFactory::addItem(m, QObject::tr("In %1").arg(QString(get_name())), 1);
+                MenuFactory::addItem(m, QObject::tr("After %1").arg(QString(get_name())), 2);
+                QAction *retAction = m.exec(QCursor::pos());
+                if(retAction)
+                    switch (retAction->data().toInt()) {
+                    case 1:
+                        break;
+
+                    case 2:
+                        after = this;
+                        x = (BrowserNode *) parent();
+                        break;
+
+                    default:
+                        e->ignore();
+                        return;
+                    }
             }
 
             BrowserNode * old_parent = (BrowserNode *) bn->parent();
@@ -931,7 +929,7 @@ void BrowserUseCaseView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
             if (after)
                 bn->moveItem(after);
             else {
-                bn->parent()->takeItem(bn);
+                bn->parent()->removeChild(bn);
                 x->insertItem(bn);
             }
 
@@ -945,7 +943,7 @@ void BrowserUseCaseView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
         else if (after == 0)
             ((BrowserNode *) parent())->DropAfterEvent(e, this);
         else {
-            msg_critical(TR("Error"), TR("Forbidden"));
+            msg_critical(QObject::tr("Error"), QObject::tr("Forbidden"));
             e->ignore();
         }
     }
@@ -953,6 +951,7 @@ void BrowserUseCaseView::DropAfterEvent(QDropEvent * e, BrowserNode * after)
         ((BrowserNode *) parent())->DropAfterEvent(e, this);
     else
         e->ignore();
+
 }
 
 void BrowserUseCaseView::save_stereotypes(QTextStream & st)
@@ -1025,7 +1024,7 @@ void BrowserUseCaseView::save(QTextStream & st, bool ref, QString & warning)
 
         // saves the sub elts
 
-        Q3ListViewItem * child = firstChild();
+        BrowserNode * child = firstChild();
 
         if (child != 0) {
             for (;;) {
@@ -1059,13 +1058,13 @@ void BrowserUseCaseView::save(QTextStream & st, bool ref, QString & warning)
 }
 
 BrowserUseCaseView * BrowserUseCaseView::read(char *& st, char * k,
-        BrowserNode * parent, bool recursive)
+                                              BrowserNode * parent, bool recursive)
 {
     if (!strcmp(k, "usecaseview")) {
         int id = read_id(st);
         BrowserUseCaseView * already_exist = all[id];
         BrowserUseCaseView * result =
-            new BrowserUseCaseView(read_string(st), parent, id);
+                new BrowserUseCaseView(read_string(st), parent, id);
 
         if (already_exist != 0) {
             already_exist->must_change_id(all);
@@ -1073,7 +1072,7 @@ BrowserUseCaseView * BrowserUseCaseView::read(char *& st, char * k,
         }
 
         result->is_read_only = (!in_import() && read_only_file()) ||
-                               ((user_id() != 0) && result->is_api_base());
+                ((user_id() != 0) && result->is_api_base());
 
         k = read_keyword(st);
 
@@ -1121,17 +1120,19 @@ BrowserUseCaseView * BrowserUseCaseView::read(char *& st, char * k,
         result->BrowserNode::read(st, k, id);	// updates k
 
         if (strcmp(k, "end")) {
-            while (BrowserUseCaseDiagram::read(st, k, result) ||
+            while (
+                   BrowserUseCaseDiagram::read(st, k, result) ||
                    BrowserUseCase::read(st, k, result) ||
                    BrowserUseCaseView::read(st, k, result, recursive) ||
-                   BrowserClass::read(st, k, result) ||
+                   BrowserClass::read(st, k, result)||
                    BrowserClassInstance::read(st, k, result) ||
                    BrowserSeqDiagram::read(st, k, result) ||
                    BrowserColDiagram::read(st, k, result) ||
                    BrowserClassDiagram::read(st, k, result) ||
                    BrowserObjectDiagram::read(st, k, result) ||
                    BrowserState::read(st, k, result) ||
-                   BrowserActivity::read(st, k, result))
+                   BrowserActivity::read(st, k, result)
+                   )
                 k = read_keyword(st);
 
             if (strcmp(k, "end"))
@@ -1150,10 +1151,8 @@ BrowserNode * BrowserUseCaseView::get_it(const char * k, int id)
         return all[id];
 
     BrowserNode * r;
-
     if ((r = BrowserUseCaseDiagram::get_it(k, id)) == 0)
         // class, seq diag, col diag, state and activity managed in class view
         r = BrowserUseCase::get_it(k, id);
-
     return r;
 }
diff --git a/src/browser/BrowserUseCaseView.h b/src/browser/BrowserUseCaseView.h
index 24dfa6978..fc57e7653 100644
--- a/src/browser/BrowserUseCaseView.h
+++ b/src/browser/BrowserUseCaseView.h
@@ -27,8 +27,10 @@
 
 #ifndef BROWSER_USECASEVIEW_H
 #define BROWSER_USECASEVIEW_H
-
+#ifdef habip
 #include <q3intdict.h>
+#endif
+
 //Added by qt3to4:
 #include <QPixmap>
 #include <QDropEvent>
@@ -80,22 +82,22 @@ class BrowserUseCaseView : public BrowserNode, public Labeled<BrowserUseCaseView
     void exec_menu_choice(int rank);
 
 public:
-    BrowserUseCaseView(QString s, BrowserNode * p, int id = 0);
+    BrowserUseCaseView(const QString & s, BrowserNode * p, int id = 0);
     BrowserUseCaseView(const BrowserUseCaseView * model, BrowserNode * p);
     virtual ~BrowserUseCaseView();
 
     virtual const QPixmap * pixmap(int) const;
 
     virtual BrowserNode * duplicate(BrowserNode * p,
-                                    QString name = QString());
+                                    const QString & name = QString());
     virtual void menu();
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s);
     virtual void open(bool);
     virtual UmlCode get_type() const;
     virtual QString get_stype() const;
     virtual int get_identifier() const;
     virtual const char * help_topic() const;
-    virtual bool may_contains_them(const Q3PtrList<BrowserNode> &,
+    virtual bool may_contains_them(const QList<BrowserNode *> &,
                                    BooL & duplicable) const;
     virtual BrowserNode * container(UmlCode) const; // container for class, state machine and activity
     virtual BasicData * get_data() const;
diff --git a/src/browserfunctions/operationfuncs.cpp b/src/browserfunctions/operationfuncs.cpp
new file mode 100644
index 000000000..2c7441fd6
--- /dev/null
+++ b/src/browserfunctions/operationfuncs.cpp
@@ -0,0 +1,586 @@
+// *************************************************************************
+//
+//
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#include "operationfuncs.h"
+#include "BrowserOperation.h"
+#include "BrowserClass.h"
+#include "OperationData.h"
+#include "DialogUtil.h"
+#include "GenerationSettings.h"
+
+namespace OperationFuncs
+{
+
+void add_param(BrowserOperation* oper, QString& form, int rank, const QString& sInit)
+{
+    int index = param_begin(form, rank);
+
+    if (index == -1)
+        return;
+
+    QString s = sInit;
+    if (rank == 0) {
+        // first param, index point to '}' ending ${(}
+        OperationData* data = static_cast<OperationData*>(oper->get_data());
+        if (data->get_n_params() != 1)
+            s += ", ";
+
+        index += 1;
+    }
+    else
+        // index point to ',' or '$' starting ${)}
+        s = ", " + s;
+
+    form.insert(index, s);
+}
+
+void replace_param(QString& form, int rank, const QString& s)
+{
+    int index_start = param_begin(form, rank);
+
+    if (index_start == -1)
+        return;
+
+    const char * p = form.toLatin1().constData();
+
+    switch (p[index_start]) {
+    case '$':
+        // '$' starting ${)}, param not yet present, not first one,
+        // not possible except if user remove it in language form
+        form.insert(index_start, ", " + s);
+        return;
+
+    case ',':
+        index_start += (p[index_start + 1] == ' ') ? 2 : 1;
+        break;
+
+    default:
+        // first param, index point to '}' ending ${(}
+        index_start += 1;
+    }
+
+    int index_sup = supOf(p, index_start);
+
+    switch (p[index_sup]) {
+    case ',':
+    case '$': // ${)}
+        break;
+
+    default:
+        // error
+        return;
+    }
+
+    form.replace(index_start, index_sup - index_start, s);
+}
+
+void recompute_param(BrowserOperation* oper, int rank, bool recompute)
+{
+    char t[16];
+    char p[16];
+    char v[16];
+
+
+    sprintf(t, "${t%d}", rank);
+    sprintf(p, "${p%d}", rank);
+    sprintf(v, "${v%d}", rank);
+
+    QStringList list;
+    BrowserNodeList nodes;
+
+    nodes.clear();
+    list.clear();
+    BrowserClass::instances(nodes);
+    nodes.full_names(list);
+
+    OperationData* data = static_cast<OperationData*>(oper->get_data());
+    AType theType = data->get_param_type(rank);
+    UmlParamDirection dir = data->get_param_dir(rank);
+
+        QString theo =
+            GenerationSettings::cpp(theType, dir, rank);
+
+        QString cppDecl = data->get_cppdecl();
+
+        if ((cppDecl.indexOf(t) == -1) && (cppDecl.indexOf(p) == -1))
+            add_param(oper, cppDecl, rank, theo + QString(v));
+        else if (recompute)
+            replace_param(cppDecl, rank, theo + QString(v));
+        data->set_cppdecl(cppDecl);
+
+        QString cppDef =  data->get_cppdef();
+
+        if ((cppDef.indexOf(t) == -1) && (cppDef.indexOf(p) == -1))
+            add_param(oper, cppDef, rank, theo);
+        else if (recompute)
+            replace_param(cppDef, rank, theo);
+        data->set_cppdef(cppDef);
+
+
+        QString javaDef =  data->get_javadef();
+        if ((javaDef.indexOf(t) == -1) && (javaDef.indexOf(p) == -1))
+        {
+            add_param(oper, javaDef, rank, QString(t) + QString(" ") + QString(p));
+            data->set_javadef(javaDef);
+        }
+        QString phpDef =  data->get_phpdef();
+
+        if (phpDef.indexOf(p) == -1)
+        {
+            add_param(oper, phpDef, rank, QString(p) + QString(v));
+            data->set_phpdef(phpDef);
+        }
+        QString pythonDef =  data->get_pythondef();
+
+        if (pythonDef.indexOf(p) == -1) {
+            add_param(oper, pythonDef, rank, QString(p) + QString(v));
+            data->set_pythondef(pythonDef);
+        }
+        QString idlDecl =  data->get_idldecl();
+        if ((idlDecl.indexOf(t) == -1) && (idlDecl.indexOf(p) == -1)) {
+            char d[16];
+
+            sprintf(d, "${d%d}", rank);
+            add_param(oper, idlDecl, rank, QString(d) + QString(" ") + QString(t) + QString(" ") + QString(p));
+            data->set_idldecl(idlDecl);
+        }
+}
+
+// automatic add / remove param when only one language is set
+
+int bypass_string(const char * s, int index)
+{
+    // index is just after the "
+    for (;;) {
+        switch (s[index]) {
+        case '"':
+            return index + 1;
+
+        case '\\':
+            if (s[index + 1] == 0)
+                return index + 1;
+
+            index += 2;
+            break;
+
+        case 0:
+            return index;
+
+        default:
+            index += 1;
+        }
+    }
+}
+
+int bypass_char(const char * s, int index)
+{
+    // index is just after the '
+    for (;;) {
+        switch (s[index]) {
+        case '\'':
+            return index + 1;
+
+        case '\\':
+            if (s[index + 1] == 0)
+                return index + 1;
+
+            index += 2;
+            break;
+
+        case 0:
+            return index;
+
+        default:
+            index += 1;
+        }
+    }
+}
+
+int bypass_cpp_comment(const char * s, int index)
+{
+    // index is just after the //
+    const char * p = strchr(s, '\n');
+
+    return (p == 0)
+           ? index + strlen(s + index)
+           : p - s;
+}
+
+int bypass_c_comment(const char * s, int index)
+{
+    // index is just after the /*
+    for (;;) {
+        switch (s[index]) {
+        case '*':
+            if (s[index + 1] == '/')
+                return index + 2;
+
+            break;
+
+        case 0:
+            return index;
+        }
+
+        index += 1;
+    }
+}
+
+int supOf(const char * s, int index)
+{
+    // return the index after of the parameter form
+    // s at least contains ${)}
+    int ouvr = 0;
+
+    for (;;) {
+        switch (s[index]) {
+        case '$':
+            if (strncmp(s + index, "${)}", 4) == 0)
+                return index;
+
+            index += 1;
+            break;
+
+        case '(':
+        case '[':
+        case '{':
+            ouvr += 1;
+            index += 1;
+            break;
+
+        case ')':
+        case ']':
+        case '}':
+            ouvr -= 1;
+            index += 1;
+            break;
+
+        case '"':
+            index = bypass_string(s, index + 1);
+            break;
+
+        case '\'':
+            index = bypass_char(s, index + 1);
+            break;
+
+        case '/':
+            switch (s[index + 1]) {
+            case '/':
+                index = bypass_cpp_comment(s, index + 2);
+                break;
+
+            case '*':
+                index = bypass_c_comment(s, index + 2);
+                break;
+
+            default:
+                index += 1;
+            }
+
+            break;
+
+        case 0:
+            // in case ${)} is in a comment etc ...
+            return index;
+
+        case ',':
+            if (ouvr == 0)
+                return index;
+
+            // no break
+        default:
+            index += 1;
+        }
+    }
+}
+
+int param_begin(const QString& s, int rank)
+{
+    // return position of ',' or '}' (inside ${(}),
+    // or '$' (inside ${)}) or -1 on error
+    const char * p = s.toLatin1().constData();
+    const char * b = strstr(p, "${(}");
+
+    if ((b == 0) || (strstr(b + 4, "${)}") == 0))
+        return -1;
+
+    int index  = (b - p) + 3;	// '}'
+
+    while (rank != 0) {
+        int end = supOf(p, index + 1);
+
+        switch (p[end]) {
+        case ',':
+            index = end;
+            break;
+
+        case '$': // ${)}
+            return (rank == 1) ? end : -1;
+
+        default:
+            return -1;
+        }
+
+        rank -= 1;
+    }
+
+    return index;
+}
+
+void renumber(QString& form, int rank,
+              int delta, bool equal)
+{
+    int index = form.indexOf("${(}");
+
+    if (index == -1)
+        return;
+
+    index += 4;
+
+    int index_sup = form.indexOf("${)}", index);
+
+    while (index < index_sup) {
+        index = form.indexOf("${", index);
+
+        if (index == -1)
+            break;
+
+        int index2 = form.indexOf('}', index + 3);
+        QString n = form.mid(index + 3, index2 - index - 3);
+        bool ok = FALSE;
+        int r = n.toInt(&ok);
+
+        if (!ok || ((equal) ? (r != rank) : (r < rank)))
+            index = index2 + 1;
+        else {
+            char nn[16];
+
+            sprintf(nn, "%d", r + delta);
+            form.replace(index + 3, n.length(), nn);
+            index = form.indexOf('}', index + 3) + 1;
+        }
+    }
+}
+
+void delete_param(int rank, OperationData* data)
+{
+    // remove and renumber
+    data->set_cppdecl(delete_param(rank, data->get_cppdecl()));
+    data->set_cppdef(delete_param(rank, data->get_cppdef()));
+    data->set_javadef(delete_param(rank, data->get_javadef()));
+    data->set_phpdef(delete_param(rank, data->get_phpdef()));
+    data->set_pythondef(delete_param(rank, data->get_pythondef()));
+    data->set_idldecl(delete_param(rank, data->get_idldecl()));
+}
+
+QString delete_param(int rank, const QString& text)
+{
+    // remove
+    QString form = text;
+    int index = param_begin(form, rank);
+
+    if (index == -1)
+        return "";
+
+    const char * p = form.toLatin1().constData();
+    int index_sup;
+
+    switch (p[index]) {
+    case '$':
+        // '$' starting ${)}, param not yet present, not first one,
+        // not possible except if user remove it in language form
+        return "";
+
+    case ',':
+        index_sup = supOf(p, index + 1);
+        break;
+
+    default: // first param, index point to '}' ending ${(}
+        index += 1;
+        index_sup = supOf(p, index);
+        break;
+    }
+
+    QString result;
+
+    switch (p[index_sup]) {
+    case ',':
+        if (p[index] == ',') {
+            if (p[index + 1] == ' ')
+                result = form.mid(index + 2, index_sup - index - 2);
+            else
+                result = form.mid(index + 1, index_sup - index - 1);
+        }
+        else {
+            // first param
+            result = form.mid(index, index_sup - index);
+            index_sup += (p[index_sup + 1] == ' ') ? 2 : 1;
+        }
+
+        break;
+
+    case '$': // ${)}
+        if (p[index] == ',') {
+            if (p[index + 1] == ' ')
+                result = form.mid(index + 2, index_sup - index - 2);
+            else
+                result = form.mid(index + 1, index_sup - index - 1);
+        }
+        else {
+            // alone param
+            result = form.mid(index, index_sup - index);
+        }
+
+        break;
+
+    default:
+        // error
+        return "";
+    }
+
+    form.remove(index, index_sup - index);
+
+    // renumber
+    renumber(form, rank, -1);
+    return form;
+}
+
+QString extract_specifier(int position, const QString& s)
+{
+    // s at least contains ${)}
+    QRegExp rxStart(QRegExp::escape("${(}"));
+    QRegExp rxPrev(QRegExp::escape("${v" + QString::number(position - 1) +  "}"));
+    int startIndex;
+    if(position == 0)
+        startIndex = rxStart.indexIn(s) + 4 ;
+    else
+        startIndex = rxPrev.indexIn(s) + 4 + QString::number(position).length();
+    if(s.at(startIndex) == ',')
+        startIndex++;
+
+    QRegExp rxType(QRegExp::escape("${t" + QString::number(position)));
+    int tIndex = rxType.indexIn(s);
+    int length = tIndex -(startIndex);
+    QString specifier;
+    if(length > 0)
+        specifier = s.mid(startIndex, length);
+    return specifier;
+}
+
+QString extract_pointer(int position, const QString& s)
+{
+    // s at least contains ${)}
+    QRegExp rxStart(QRegExp::escape("${t" + QString::number(position) +  "}"));
+    int startIndex;
+    startIndex = rxStart.indexIn(s) + 4 + QString::number(position).length();
+
+    QRegExp rxEnd(QRegExp::escape("${p" + QString::number(position)+  "}"));
+    int tIndex = rxEnd.indexIn(s);
+    int length = tIndex -(startIndex);
+    QString ptrType;
+    if(length > 0)
+        ptrType = s.mid(startIndex, length);
+    return ptrType;
+}
+
+QString set_specifier(int position, const QString& s, const QString& newValue)
+{
+    // s at least contains ${)}
+    QRegExp rxStart(QRegExp::escape("${(}"));
+    QRegExp rxPrev(QRegExp::escape("${v" + QString::number(position - 1) +  "}"));
+    int startIndex;
+    if(position == 0)
+        startIndex = rxStart.indexIn(s) + 4 ;
+    else
+        startIndex = rxPrev.indexIn(s) + 4 + QString::number(position).length();
+
+    QRegExp rxType(QRegExp::escape("${t" + QString::number(position)));
+    int tIndex = rxType.indexIn(s);
+
+    QString sRet = s.left(startIndex) + newValue + s.right(s.length() - tIndex);
+    return sRet;
+}
+
+QString set_pointer(int position, const QString& s, const QString& newValue)
+{
+    // s at least contains ${)}
+    QRegExp rxStart(QRegExp::escape("${t" + QString::number(position) +  "}"));
+    int startIndex;
+    startIndex = rxStart.indexIn(s) + 4 + QString::number(position).length();
+
+    QRegExp rxEnd(QRegExp::escape("${p" + QString::number(position)+  "}"));
+    int tIndex = rxEnd.indexIn(s);
+
+    QString sRet = s.left(startIndex) + newValue + s.right(s.length() - tIndex);
+    return sRet;
+}
+
+//void move_param(int old_rank, int new_rank)
+//{
+//    switch (unique) {
+//    case CppView:
+//        move_param(old_rank, new_rank, cppTab->ui->edCppDeclProto);
+//        move_param(old_rank, new_rank, cppTab->ui->edCppDefProto);
+//        break;
+
+//    case JavaView:
+//        move_param(old_rank, new_rank, edjavadef);
+//        break;
+
+//    case PhpView:
+//        move_param(old_rank, new_rank, edphpdef);
+//        break;
+
+//    case PythonView:
+//        move_param(old_rank, new_rank, edpythondef);
+//        break;
+
+//    case IdlView:
+//        move_param(old_rank, new_rank, edidldecl);
+//        break;
+
+//    default:
+//        break;
+//    }
+//}
+
+//void move_param(int old_rank, int new_rank,
+//                                 QString proto)
+//{
+//    QString s = delete_param(old_rank, ed);
+
+//    if (s.isEmpty())
+//        return;
+
+//    s = "${(}" + s + "${)}";
+//    renumber(s, old_rank, new_rank - old_rank, TRUE);
+
+//    QString form = ed->text();
+
+//    renumber(form, new_rank, 1);
+//    add_param(form, new_rank, s.mid(4, s.length() - 8));
+
+//    ed->setText(form);
+//}
+
+} // namespace OperationFuncs
diff --git a/src/browserfunctions/operationfuncs.h b/src/browserfunctions/operationfuncs.h
new file mode 100644
index 000000000..3652576ab
--- /dev/null
+++ b/src/browserfunctions/operationfuncs.h
@@ -0,0 +1,62 @@
+// *************************************************************************
+//
+//
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+
+#ifndef OPERATIONFUNCS_H
+#define OPERATIONFUNCS_H
+
+#include <QString>
+
+class BrowserOperation;
+class OperationData;
+
+namespace OperationFuncs
+{
+
+void add_param(BrowserOperation* oper, QString& form, int rank, const QString& s);
+void replace_param(QString & form, int rank, const QString& s);
+void recompute_param(BrowserOperation* oper, int rank, bool recompute);
+// automatic add / remove param when only one language is set
+int bypass_string(const char* s, int index);
+int bypass_char(const char* s, int index);
+int bypass_cpp_comment(const char* s, int index);
+int bypass_c_comment(const char* s, int index);
+int supOf(const char* s, int index);
+int param_begin(const QString& s, int rank);
+void renumber(QString& form, int rank,
+              int delta, bool equal = FALSE);
+
+void delete_param(int rank, OperationData* data);
+QString delete_param(int rank, const QString& text);
+void move_param(int old_rank, int new_rank);
+void move_param(int old_rank, int new_rank,
+                const QString& proto);
+
+QString extract_specifier(int position, const QString& s);
+QString extract_pointer(int position, const QString& s);
+QString set_specifier(int position, const QString& s, const QString& newValue);
+QString set_pointer(int position, const QString& s, const QString& newValue);
+
+} // namespace OperationFuncs
+
+#endif // OPERATIONFUNCS_H
diff --git a/src/data/AType.cpp b/src/data/AType.cpp
index 2a0e6bd77..c59f0968d 100644
--- a/src/data/AType.cpp
+++ b/src/data/AType.cpp
@@ -30,15 +30,18 @@
 
 
 #include <QTextStream>
-
 #include "AType.h"
 #include "BrowserClass.h"
 #include "ToolCom.h"
 #include "myio.h"
 
-const char * AType::get_type() const
+QString AType::get_type() const
 {
-    return (type != 0) ? type->get_name() : explicit_type.operator QString();
+    QString result;
+    if(type != 0)
+        result = type->get_name();
+    result = explicit_type.operator QString();
+    return result;
 }
 
 QString AType::get_type(ShowContextMode mode) const
@@ -103,7 +106,7 @@ void AType::read(char *& st, const char * t, const char * ex)
         explicit_type = read_string(st);
     }
     else
-        wrong_keyword(k, QString(t) + '/' + ex);
+        wrong_keyword(k, QString("%1%2%3").arg(t).arg('/').arg(ex).toLatin1().constData());
 }
 
 void AType::read(char *& st, const char * t, const char * ex, const char * k)
@@ -117,7 +120,7 @@ void AType::read(char *& st, const char * t, const char * ex, const char * k)
         explicit_type = read_string(st);
     }
     else
-        wrong_keyword(k, QString(t) + '/' + ex);
+        wrong_keyword(k, QString("%1%2%3").arg(t).arg('/').arg(ex).toLatin1().constData());
 }
 bool operator==(const AType & s1, const AType & s2)
 {
@@ -130,7 +133,7 @@ bool operator==(const AType & s1, const AType & s2)
             return false;
         else if(s2.type == nullptr)
             return false;
-         typeResult = *s1.type->get_name() == *s2.type->get_name();
+         typeResult = s1.type->get_name() == s2.type->get_name();
     }
 
 
diff --git a/src/data/AType.h b/src/data/AType.h
index 977002e36..9db997339 100644
--- a/src/data/AType.h
+++ b/src/data/AType.h
@@ -44,8 +44,10 @@ class AType
     BrowserClass * type = nullptr;
 
 public:
-    AType() : type(0) {};
-    const char * get_type() const;
+    AType(){}
+    QString get_type() const;
+    void set_explicit_type(QString value){explicit_type = value;}
+    void set_type(BrowserClass* value){type = value;}
     QString get_type(ShowContextMode mode) const;
     QString get_full_type() const;
 
diff --git a/src/data/ActivityActionData.cpp b/src/data/ActivityActionData.cpp
index e5e2954bc..7f0eec942 100644
--- a/src/data/ActivityActionData.cpp
+++ b/src/data/ActivityActionData.cpp
@@ -32,7 +32,7 @@
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "BrowserActivityAction.h"
 #include "ActivityActionData.h"
@@ -145,7 +145,7 @@ QString ActivityActionData::str(DrawingLanguage lang) const
 
 void ActivityActionData::edit()
 {
-    setName(browser_node->get_name());
+    setObjectName(browser_node->get_name());
 
     (new ActivityActionDialog(this))->show();
 }
@@ -474,10 +474,10 @@ AnyAction::~AnyAction()
 {
 }
 
-Q3ValueList<PinDescr> AnyAction::pins() const
+QList<PinDescr> AnyAction::pins() const
 {
     // no pins by default
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
 
     return r;
 }
@@ -494,7 +494,7 @@ QString AnyAction::str(DrawingLanguage, QString name) const
 
         int index = 0;
 
-        while ((index = name.find('_', index)) != -1)
+        while ((index = name.indexOf('_', index)) != -1)
             name.replace(index, 1, " ");
     }
 
@@ -573,7 +573,7 @@ QString OpaqueAction::str(DrawingLanguage lang, QString name) const
 
     return (s.isEmpty())
            ? AnyAction::str(lang, name)
-           : toUnicode(s);
+           : s;
 }
 
 void OpaqueAction::save(QTextStream & st, QString &) const
@@ -823,11 +823,11 @@ AnyAction * AccessVariableValueAction::duplicate(AccessVariableValueAction * r)
     return r;
 }
 
-Q3ValueList<PinDescr> AccessVariableValueAction::pins(UmlParamDirection dir,
+QList<PinDescr> AccessVariableValueAction::pins(UmlParamDirection dir,
         const char * str) const
 {
     // [in/out] <str> : le type de la variable
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
 
     if (variable != 0) {
         PinDescr p;
@@ -959,11 +959,11 @@ AnyAction * ChangeVariableValueAction::duplicate(ChangeVariableValueAction * r)
     return r;
 }
 
-Q3ValueList<PinDescr> ChangeVariableValueAction::pins(const char * str) const
+QList<PinDescr> ChangeVariableValueAction::pins(const char * str) const
 {
     // [in] "value" : le type de la variable
     // [in] <str> : UnlimitedNatural
-    Q3ValueList<PinDescr> r = AccessVariableValueAction::pins(UmlIn, "value");
+    QList<PinDescr> r = AccessVariableValueAction::pins(UmlIn, "value");
 
     if (! r.isEmpty()) {
         r.first().multiplicity = "";
@@ -1048,7 +1048,7 @@ UmlActionKind ReadVariableValueAction::kind() const
     return UmlReadVariableValueAction;
 }
 
-Q3ValueList<PinDescr> ReadVariableValueAction::pins() const
+QList<PinDescr> ReadVariableValueAction::pins() const
 {
     return AccessVariableValueAction::pins(UmlOut, "result");
 }
@@ -1093,7 +1093,7 @@ UmlActionKind WriteVariableValueAction::kind() const
     return UmlWriteVariableValueAction;
 }
 
-Q3ValueList<PinDescr> WriteVariableValueAction::pins() const
+QList<PinDescr> WriteVariableValueAction::pins() const
 {
     return AccessVariableValueAction::pins(UmlIn, "value");
 }
@@ -1118,7 +1118,7 @@ UmlActionKind AddVariableValueAction::kind() const
     return UmlAddVariableValueAction;
 }
 
-Q3ValueList<PinDescr> AddVariableValueAction::pins() const
+QList<PinDescr> AddVariableValueAction::pins() const
 {
     return ChangeVariableValueAction::pins("insertAt");
 }
@@ -1153,7 +1153,7 @@ UmlActionKind RemoveVariableValueAction::kind() const
     return UmlRemoveVariableValueAction;
 }
 
-Q3ValueList<PinDescr> RemoveVariableValueAction::pins() const
+QList<PinDescr> RemoveVariableValueAction::pins() const
 {
     return ChangeVariableValueAction::pins("removeAt");
 }
@@ -1194,15 +1194,15 @@ UmlActionKind CallBehaviorAction::kind() const
     return UmlCallBehaviorAction;
 }
 
-Q3ValueList<PinDescr> CallBehaviorAction::pins() const
+QList<PinDescr> CallBehaviorAction::pins() const
 {
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
 
     if ((behavior != 0) && (behavior->get_type() == UmlActivity)) {
         // [any]* : depend on activity's parameter
-        Q3ValueList<BrowserParameter *> l =
+        QList<BrowserParameter *> l =
             ((BrowserActivity *) behavior)->get_params();
-        Q3ValueList<BrowserParameter *>::ConstIterator iter;
+        QList<BrowserParameter *>::ConstIterator iter;
 
         for (iter = l.begin(); iter != l.end(); ++iter) {
             PinParamData * model = (ParameterData *)(*iter)->get_data();
@@ -1367,11 +1367,11 @@ UmlActionKind CallOperationAction::kind() const
     return UmlCallOperationAction;
 }
 
-Q3ValueList<PinDescr> CallOperationAction::pins() const
+QList<PinDescr> CallOperationAction::pins() const
 {
     // [in] "target" : instance,
     // [any]* : other depend on operation's params&result&exception
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
 
     if (operation != 0) {
         OperationData * d = (OperationData *) operation->get_data();
@@ -1436,7 +1436,7 @@ QString CallOperationAction::str(DrawingLanguage lang, QString name) const
     else if (name.isEmpty())
         return operation->get_name();
     else
-        return toUnicode(name);
+        return name;
 }
 
 BasicData * CallOperationAction::depend_on()
@@ -1539,12 +1539,12 @@ UmlActionKind SendObjectAction::kind() const
     return UmlSendObjectAction;
 }
 
-Q3ValueList<PinDescr> SendObjectAction::pins() const
+QList<PinDescr> SendObjectAction::pins() const
 {
     // [in] "request" : the sent object
     // [in] "target" : target object,
     // [in]* : arguments (pin addable et removables)
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlIn;
@@ -1598,11 +1598,11 @@ UmlActionKind SendSignalAction::kind() const
     return UmlSendSignalAction;
 }
 
-Q3ValueList<PinDescr> SendSignalAction::pins() const
+QList<PinDescr> SendSignalAction::pins() const
 {
     // [in] "target"
     // [*] signal params
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlIn;
@@ -1722,10 +1722,10 @@ UmlActionKind BroadcastSignalAction::kind() const
     return UmlBroadcastSignalAction;
 }
 
-Q3ValueList<PinDescr> BroadcastSignalAction::pins() const
+QList<PinDescr> BroadcastSignalAction::pins() const
 {
     // [*] signal params
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
 
     return r;
 }
@@ -1750,11 +1750,11 @@ UmlActionKind UnmarshallAction::kind() const
     return UmlUnmarshallAction;
 }
 
-Q3ValueList<PinDescr> UnmarshallAction::pins() const
+QList<PinDescr> UnmarshallAction::pins() const
 {
     // [in] "object" : the unmashalled object
     // [out]* : the objects (pin addable et removables)
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlIn;
@@ -1805,10 +1805,10 @@ UmlActionKind ValueSpecificationAction::kind() const
     return UmlValueSpecificationAction;
 }
 
-Q3ValueList<PinDescr> ValueSpecificationAction::pins() const
+QList<PinDescr> ValueSpecificationAction::pins() const
 {
     // [out] : the value
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlOut;
@@ -1932,10 +1932,10 @@ UmlActionKind AcceptCallAction::kind() const
     return UmlAcceptCallAction;
 }
 
-Q3ValueList<PinDescr> AcceptCallAction::pins() const
+QList<PinDescr> AcceptCallAction::pins() const
 {
     // [out] : returnInformation
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlOut;
@@ -2055,10 +2055,10 @@ UmlActionKind ReplyAction::kind() const
     return UmlReplyAction;
 }
 
-Q3ValueList<PinDescr> ReplyAction::pins() const
+QList<PinDescr> ReplyAction::pins() const
 {
     // [in] : returnInformation
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlIn;
@@ -2176,10 +2176,10 @@ UmlActionKind CreateObjectAction::kind() const
     return UmlCreateObjectAction;
 }
 
-Q3ValueList<PinDescr> CreateObjectAction::pins() const
+QList<PinDescr> CreateObjectAction::pins() const
 {
     // [out] : return
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlOut;
@@ -2256,10 +2256,10 @@ UmlActionKind DestroyObjectAction::kind() const
     return UmlDestroyObjectAction;
 }
 
-Q3ValueList<PinDescr> DestroyObjectAction::pins() const
+QList<PinDescr> DestroyObjectAction::pins() const
 {
     // [in] : target
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlIn;
@@ -2351,12 +2351,12 @@ UmlActionKind TestIdentityAction::kind() const
     return UmlTestIdentityAction;
 }
 
-Q3ValueList<PinDescr> TestIdentityAction::pins() const
+QList<PinDescr> TestIdentityAction::pins() const
 {
     // [in] : first
     // [in] : second
     // [out] : result
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlIn;
@@ -2414,10 +2414,10 @@ UmlActionKind RaiseExceptionAction::kind() const
     return UmlRaiseExceptionAction;
 }
 
-Q3ValueList<PinDescr> RaiseExceptionAction::pins() const
+QList<PinDescr> RaiseExceptionAction::pins() const
 {
     // [in] : exception
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlIn;
@@ -2478,11 +2478,11 @@ bool ReduceAction::may_add_pin() const
     return FALSE;
 }
 
-Q3ValueList<PinDescr> ReduceAction::pins() const
+QList<PinDescr> ReduceAction::pins() const
 {
     // [in] : collection
     // [out] : result
-    Q3ValueList<PinDescr> r;
+    QList<PinDescr> r;
     PinDescr p;
 
     p.dir = UmlIn;
diff --git a/src/data/ActivityActionData.h b/src/data/ActivityActionData.h
index 424202639..dd8810dde 100644
--- a/src/data/ActivityActionData.h
+++ b/src/data/ActivityActionData.h
@@ -34,7 +34,7 @@
 #include "UmlEnum.h"
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class QTextStream;
 
@@ -44,12 +44,12 @@ class BrowserOperation;
 class BrowserPin;
 
 struct PinDescr : public PinParamData {
-    const char * name;
+    QString name;
 
-    PinDescr() : name(0) {}
+    PinDescr() : name(QString()) {}
 
-    virtual void do_connect(BrowserClass *);
-    virtual void do_disconnect(BrowserClass *);
+    virtual void do_connect(BrowserClass *) override;
+    virtual void do_disconnect(BrowserClass *) override;
 };
 
 struct AnyAction {
@@ -57,7 +57,7 @@ struct AnyAction {
     virtual ~AnyAction();
     virtual AnyAction * duplicate() const = 0;
     virtual UmlActionKind kind() const = 0;
-    virtual Q3ValueList<PinDescr> pins() const;	// no pins by default
+    virtual QList<PinDescr> pins() const;	// no pins by default
     virtual bool may_add_pin() const; // true by default
     virtual QString str(DrawingLanguage lang, QString name) const;
     virtual BasicData * depend_on();
@@ -79,14 +79,14 @@ struct OpaqueAction : public AnyAction {
 
     OpaqueAction();
     virtual ~OpaqueAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual QString str(DrawingLanguage lang, QString name) const;
-
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QString str(DrawingLanguage lang, QString name) const override;
+
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct AcceptEventAction : public AnyAction {
@@ -100,13 +100,13 @@ struct AcceptEventAction : public AnyAction {
 
     AcceptEventAction();
     virtual ~AcceptEventAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct AccessVariableValueAction : public AnyAction {
@@ -116,17 +116,19 @@ struct AccessVariableValueAction : public AnyAction {
 
     AccessVariableValueAction();
     virtual ~AccessVariableValueAction();
+    using AnyAction::duplicate;
     AnyAction * duplicate(AccessVariableValueAction * r) const;
-    Q3ValueList<PinDescr> pins(UmlParamDirection, const char * str) const;
+    using AnyAction::pins;
+    QList<PinDescr> pins(UmlParamDirection, const char * str) const;
     // [in/out] <str> : le type de la variable
-    virtual BasicData * depend_on();
-    virtual void on_delete();
-    virtual BrowserNode * referenced(const char *&) const;
+    virtual BasicData * depend_on() override;
+    virtual void on_delete() override;
+    virtual BrowserNode * referenced(const char *&) const override;
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 
     void set_variable(BrowserNode * v) {
         variable = v;
@@ -138,8 +140,8 @@ struct ClearVariableValueAction : public AccessVariableValueAction {
 
     ClearVariableValueAction();
     virtual ~ClearVariableValueAction();
-    AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
 };
 
 struct ReadVariableValueAction : public AccessVariableValueAction {
@@ -147,9 +149,9 @@ struct ReadVariableValueAction : public AccessVariableValueAction {
 
     ReadVariableValueAction();
     virtual ~ReadVariableValueAction();
-    AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [out] "result" : le type de la variable
 };
 
@@ -158,9 +160,9 @@ struct WriteVariableValueAction : public AccessVariableValueAction {
 
     WriteVariableValueAction();
     virtual ~WriteVariableValueAction();
-    AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    Q3ValueList<PinDescr> pins() const;
+    AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] "value" : le type de la variable
 };
 
@@ -171,15 +173,19 @@ struct ChangeVariableValueAction : public AccessVariableValueAction {
 
     ChangeVariableValueAction();
     virtual ~ChangeVariableValueAction();
+    using AccessVariableValueAction::duplicate;
     AnyAction * duplicate(ChangeVariableValueAction * r) const;
-    Q3ValueList<PinDescr> pins(const char * str) const;
+    using AccessVariableValueAction::pins;
+    QList<PinDescr> pins(const char * str) const;
     // [in] "value" : le type de la variable
     // [in] <str>: UnlimitedNatural / uint
 
+    using AccessVariableValueAction::save;
     void save(QTextStream & st, QString & warning, const char * str) const;
+    using AccessVariableValueAction::read;
     void read(char *& st, char *& k, const char * str);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct AddVariableValueAction : public ChangeVariableValueAction {
@@ -187,14 +193,14 @@ struct AddVariableValueAction : public ChangeVariableValueAction {
 
     AddVariableValueAction();
     virtual ~AddVariableValueAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] "value" : le type de la variable
     // [in] "insertAt" : UnlimitedNatural / uint
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
 };
 
 struct RemoveVariableValueAction : public ChangeVariableValueAction {
@@ -202,14 +208,14 @@ struct RemoveVariableValueAction : public ChangeVariableValueAction {
 
     RemoveVariableValueAction();
     virtual ~RemoveVariableValueAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] "value" : le type de la variable
     // [in] "removeAt" : UnlimitedNatural / uint
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
 };
 
 struct CallBehaviorAction : public AnyAction {
@@ -220,18 +226,18 @@ struct CallBehaviorAction : public AnyAction {
 
     CallBehaviorAction();
     virtual ~CallBehaviorAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [any]* : depend on activity's parameter
-    virtual BasicData * depend_on();
-    virtual void on_delete();
-    virtual BrowserNode * referenced(const char *&) const;
+    virtual BasicData * depend_on() override;
+    virtual void on_delete() override;
+    virtual BrowserNode * referenced(const char *&) const override;
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 
     void set_behavior(BrowserNode * beh) {
         behavior = beh;
@@ -246,20 +252,20 @@ struct CallOperationAction : public AnyAction {
 
     CallOperationAction();
     virtual ~CallOperationAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] "target" : instance,
     // [any]* : other depend on operation's params&result&exception
-    virtual QString str(DrawingLanguage lang, QString name) const;
-    virtual BasicData * depend_on();
-    virtual void on_delete();
-    virtual BrowserNode * referenced(const char *&) const;
+    virtual QString str(DrawingLanguage lang, QString name) const override;
+    virtual BasicData * depend_on() override;
+    virtual void on_delete() override;
+    virtual BrowserNode * referenced(const char *&) const override;
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 
     void set_operation(BrowserOperation * oper) {
         operation = oper;
@@ -271,16 +277,16 @@ struct SendObjectAction : public AnyAction {
 
     SendObjectAction();
     virtual ~SendObjectAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] "request" : the sent object
     // [in] "target" : target object,
     // [in]* : arguments (pin addable et removables)
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
 };
 
 struct SendSignalAction : public AnyAction {
@@ -292,16 +298,16 @@ struct SendSignalAction : public AnyAction {
 
     SendSignalAction();
     virtual ~SendSignalAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] "target"
     // [*] depend on signal parameters
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct BroadcastSignalAction : public SendSignalAction {
@@ -309,9 +315,9 @@ struct BroadcastSignalAction : public SendSignalAction {
 
     BroadcastSignalAction();
     virtual ~BroadcastSignalAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
 };
 
 struct UnmarshallAction : public AnyAction {
@@ -319,15 +325,15 @@ struct UnmarshallAction : public AnyAction {
 
     UnmarshallAction();
     virtual ~UnmarshallAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] "object" : the unmashalled object
     // [out]* : the objects (pin addable et removables)
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
 };
 
 struct ValueSpecificationAction : public AnyAction {
@@ -339,16 +345,16 @@ struct ValueSpecificationAction : public AnyAction {
 
     ValueSpecificationAction();
     virtual ~ValueSpecificationAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [out] : the value
-    virtual bool may_add_pin() const;
+    virtual bool may_add_pin() const override;
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct AcceptCallAction : public AnyAction {
@@ -360,15 +366,15 @@ struct AcceptCallAction : public AnyAction {
 
     AcceptCallAction();
     virtual ~AcceptCallAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [out] : returnInformation
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct ReplyAction : public AnyAction {
@@ -380,15 +386,15 @@ struct ReplyAction : public AnyAction {
 
     ReplyAction();
     virtual ~ReplyAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] : returnInformation
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct CreateObjectAction : public AnyAction {
@@ -398,15 +404,15 @@ struct CreateObjectAction : public AnyAction {
 
     CreateObjectAction();
     virtual ~CreateObjectAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [out] : result
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct DestroyObjectAction : public AnyAction {
@@ -417,16 +423,16 @@ struct DestroyObjectAction : public AnyAction {
 
     DestroyObjectAction();
     virtual ~DestroyObjectAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] : result
-    virtual bool may_add_pin() const;
+    virtual bool may_add_pin() const override;
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 struct TestIdentityAction : public AnyAction {
@@ -434,17 +440,17 @@ struct TestIdentityAction : public AnyAction {
 
     TestIdentityAction();
     virtual ~TestIdentityAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] : first
     // [in] : second
     // [out] : result
-    virtual bool may_add_pin() const;
+    virtual bool may_add_pin() const override;
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
 };
 
 struct RaiseExceptionAction : public AnyAction {
@@ -452,15 +458,15 @@ struct RaiseExceptionAction : public AnyAction {
 
     RaiseExceptionAction();
     virtual ~RaiseExceptionAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] : exception
-    virtual bool may_add_pin() const;
+    virtual bool may_add_pin() const override;
 
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
 };
 
 struct ReduceAction : public AnyAction {
@@ -471,20 +477,20 @@ struct ReduceAction : public AnyAction {
 
     ReduceAction();
     virtual ~ReduceAction();
-    virtual AnyAction * duplicate() const;
-    virtual UmlActionKind kind() const;
-    virtual Q3ValueList<PinDescr> pins() const;
+    virtual AnyAction * duplicate() const override;
+    virtual UmlActionKind kind() const override;
+    virtual QList<PinDescr> pins() const override;
     // [in] : collection
     // [out] : result
-    virtual bool may_add_pin() const;
-    virtual BasicData * depend_on();
-    virtual void on_delete();
-    virtual BrowserNode * referenced(const char *&) const;
-
-    void save(QTextStream & st, QString & warning) const;
-    void read(char *& st, char *& k);
-    void send_def(ToolCom * com, DrawingLanguage);
-    virtual bool tool_cmd(ToolCom * com, const char * args);
+    virtual bool may_add_pin() const override;
+    virtual BasicData * depend_on() override;
+    virtual void on_delete() override;
+    virtual BrowserNode * referenced(const char *&) const override;
+
+    virtual void save(QTextStream & st, QString & warning) const override;
+    virtual void read(char *& st, char *& k) override;
+    virtual void send_def(ToolCom * com, DrawingLanguage) override;
+    virtual bool tool_cmd(ToolCom * com, const char * args) override;
 };
 
 class ActivityActionData : public SimpleData
@@ -501,9 +507,9 @@ class ActivityActionData : public SimpleData
     AnyAction * action;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
 
 public:
     ActivityActionData();
@@ -514,7 +520,7 @@ class ActivityActionData : public SimpleData
     QString get_precond(DrawingLanguage) const;
     QString get_postcond(DrawingLanguage) const;
     QString str(DrawingLanguage lang) const;
-    const char * get_constraint() const {
+    QString get_constraint() const {
         return constraint;
     }
     UmlActionKind get_action_kind() const {
@@ -534,7 +540,7 @@ class ActivityActionData : public SimpleData
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/ActivityData.cpp b/src/data/ActivityData.cpp
index a24b36589..f46be96cd 100644
--- a/src/data/ActivityData.cpp
+++ b/src/data/ActivityData.cpp
@@ -117,9 +117,9 @@ void ActivityData::on_delete()
 
 void ActivityData::edit()
 {
-    setName(browser_node->get_name());
-
+    setObjectName(browser_node->get_name());
     (new ActivityDialog(this))->show();
+
 }
 
 //
diff --git a/src/data/ActivityData.h b/src/data/ActivityData.h
index 5c3d7974e..5dbb6b3c8 100644
--- a/src/data/ActivityData.h
+++ b/src/data/ActivityData.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef ACTIVITYDATA_H
-#define ACTIVITIDATA_H
+#define ACTIVITYDATA_H
 
 #include "SimpleData.h"
 #include "InfoData.h"
@@ -57,9 +57,9 @@ class ActivityData : public SimpleData
     BrowserOperation * specification;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
 
 public:
     ActivityData();
@@ -88,7 +88,7 @@ class ActivityData : public SimpleData
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/ActivityObjectData.cpp b/src/data/ActivityObjectData.cpp
index e3872ffa4..a1eb619b1 100644
--- a/src/data/ActivityObjectData.cpp
+++ b/src/data/ActivityObjectData.cpp
@@ -49,10 +49,9 @@ ActivityObjectData::ActivityObjectData(ActivityObjectData * model, BrowserNode *
     browser_node = bn;
 }
 
-void ActivityObjectData::edit(const char * what, QStringList & st)
+void ActivityObjectData::edit(QString what, QStringList & st)
 {
-    setName(browser_node->get_name());
-
+    setObjectName(browser_node->get_name());
     (new ActivityObjectDialog(this, what, st))->show();
 }
 
diff --git a/src/data/ActivityObjectData.h b/src/data/ActivityObjectData.h
index 8a2e5dccc..1fbec0c25 100644
--- a/src/data/ActivityObjectData.h
+++ b/src/data/ActivityObjectData.h
@@ -43,17 +43,17 @@ class ActivityObjectData : public SimpleData, public ObjectData
     ActivityObjectData();
     ActivityObjectData(ActivityObjectData * model, BrowserNode * bn);
 
-    virtual void do_connect(BrowserClass * c);
-    virtual void do_disconnect(BrowserClass * c);
+    virtual void do_connect(BrowserClass * c) override;
+    virtual void do_disconnect(BrowserClass * c) override;
 
-    void edit(const char * what, QStringList & st);
+    void edit(QString what, QStringList & st);
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& , char *&);
diff --git a/src/data/ActivityPartitionData.h b/src/data/ActivityPartitionData.h
index d1007852b..ff693bacc 100644
--- a/src/data/ActivityPartitionData.h
+++ b/src/data/ActivityPartitionData.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef ACTIVITYPARTITIONDATA_H
-#define ACTIVITIPARTITIONDATA_H
+#define ACTIVITYPARTITIONDATA_H
 
 #include "SimpleData.h"
 #include "InfoData.h"
@@ -48,7 +48,7 @@ class ActivityPartitionData : public SimpleData
     BrowserNode * represents;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
+                              const QString & comment) override;
 
 public:
     ActivityPartitionData();
@@ -66,7 +66,7 @@ class ActivityPartitionData : public SimpleData
     }
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/ArtifactData.cpp b/src/data/ArtifactData.cpp
index d42a8ae5d..afc9a6880 100644
--- a/src/data/ArtifactData.cpp
+++ b/src/data/ArtifactData.cpp
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QTextStream>
 
-#include <Q3ValueList>
+#include <QList>
 
 #include "ArtifactData.h"
 #include "BrowserClass.h"
@@ -69,9 +69,9 @@ ArtifactData::ArtifactData(ArtifactData * model, BrowserNode * bn)
 
         Q3PtrDictIterator<BrowserArtifact> it(*(model->associated));
 
-        while (it.current()) {
-            associated->insert(it.current(), it.current());
-            connect(it.current()->get_data(), SIGNAL(deleted()),
+        while (it.value()) {
+            associated->insert(it.value(), it.value());
+            connect(it.value()->get_data(), SIGNAL(deleted()),
                     this, SLOT(on_delete()));
             ++it;
         }
@@ -88,7 +88,7 @@ ArtifactData::~ArtifactData()
 
 void ArtifactData::edit()
 {
-    setName(browser_node->get_name());
+    setObjectName(browser_node->get_name());
     static  ArtifactDialog* dialog = nullptr;
     QSize size;
     if(dialog != nullptr)
@@ -137,11 +137,10 @@ void ArtifactData::send_uml_def(ToolCom * com, BrowserNode * bn,
                                 const QString & comment)
 {
     BasicData::send_uml_def(com, bn, comment);
-
-    const Q3ValueList<BrowserClass *> & l =
+    const QList<BrowserClass *> & l =
         ((BrowserArtifact *) browser_node)->get_associated_classes();
-    Q3ValueList<BrowserClass *>::ConstIterator itl;
-    Q3ValueList<BrowserClass *>::ConstIterator end = l.end();
+    QList<BrowserClass *>::ConstIterator itl;
+    QList<BrowserClass *>::ConstIterator end = l.end();
     unsigned n;
 
     n = 0;
@@ -161,28 +160,29 @@ void ArtifactData::send_uml_def(ToolCom * com, BrowserNode * bn,
     if (associated == 0)
         com->write_unsigned(0);
     else {
-        Q3PtrDictIterator<BrowserArtifact> itd(*associated);
+        QHashIterator<void*, BrowserArtifact*> itd(*associated);
 
         n = 0;
 
-        while (itd.current()) {
-            if (! itd.current()->deletedp())
+        while (itd.hasNext()) {
+            itd.next();
+            if(itd.value())
+            if (! itd.value()->deletedp())
                 n += 1;
-
-            ++itd;
         }
 
         com->write_unsigned(n);
 
-        itd.toFirst();
+        itd.toFront();
 
-        while (itd.current()) {
-            if (! itd.current()->deletedp())
-                itd.current()->write_id(com);
-
-            ++itd;
+        while (itd.hasNext()) {
+            itd.next();
+            if(itd.value())
+            if (! itd.value()->deletedp())
+                itd.value()->write_id(com);
         }
     }
+
 }
 
 void ArtifactData::send_cpp_def(ToolCom * com)
@@ -259,19 +259,21 @@ bool ArtifactData::tool_cmd(ToolCom * com, const char * args,
             break;
 
             case removeAllAssocArtifactsCmd:
+
                 if (associated != 0) {
-                    Q3PtrDictIterator<BrowserArtifact> it(*associated);
+                    QHashIterator<void*, BrowserArtifact*> it(*associated);
 
-                    while (it.current()) {
-                        disconnect(it.current()->get_data(), SIGNAL(deleted()),
+                    while (it.hasNext()) {
+                        it.next();
+                        if(it.value())
+                        disconnect(it.value()->get_data(), SIGNAL(deleted()),
                                    this, SLOT(on_delete()));
-                        ++it;
+                        //++it;
                     }
 
                     delete associated;
                     associated = 0;
                 }
-
                 break;
 
             default:
@@ -295,17 +297,19 @@ void ArtifactData::on_delete()
 {
     if (associated != 0) {
         bool modp = FALSE;
-        Q3PtrDictIterator<BrowserArtifact> it(*associated);
+        QHashIterator<void*, BrowserArtifact*> it(*associated);
 
-        while (it.current()) {
-            if (it.current()->deletedp()) {
+        while (it.hasNext()) {
+            it.next();
+            if(it.value())
+            if (it.value()->deletedp()) {
                 modp = TRUE;
-                associated->remove(it.current()); // update it
+                associated->remove(it.value()); // update it
             }
+            /*
             else
-                ++it;
+                ++it;*/
         }
-
         if (modp)
             modified();
     }
@@ -316,21 +320,21 @@ void ArtifactData::on_delete()
 bool ArtifactData::decldefbody_contain(const QString & s, bool cs,
                                        BrowserNode *)
 {
-    return ((QString(get_cpp_h()).find(s, 0, cs) != -1) ||
-            (QString(get_cpp_src()).find(s, 0, cs) != -1) ||
-            (QString(get_java_src()).find(s, 0, cs) != -1) ||
-            (QString(get_php_src()).find(s, 0, cs) != -1) ||
-            (QString(get_python_src()).find(s, 0, cs) != -1) ||
-            (QString(get_idl_src()).find(s, 0, cs) != -1));
+    return ((QString(get_cpp_h()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_cpp_src()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_java_src()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_php_src()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_python_src()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_idl_src()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1));
 }
 
 void ArtifactData::associate(BrowserArtifact * other)
 {
-    if ((associated == 0) || (associated->find(other) == 0)) {
+    if ((associated == 0) || (associated->find(other) == associated->end())) {
         connect(other->get_data(), SIGNAL(deleted()), this, SLOT(on_delete()));
 
         if (associated == 0)
-            associated = new Q3PtrDict<BrowserArtifact>;
+            associated = new QHash<void*, BrowserArtifact*>;
 
         associated->insert(other, other);
         browser_node->modified();
@@ -348,38 +352,43 @@ void ArtifactData::unassociate(BrowserArtifact * other)
     modified();
 }
 
-void ArtifactData::update_associated(Q3PtrDict<BrowserArtifact> & d)
+void ArtifactData::update_associated(QHash<void*,BrowserArtifact*> & d)
 {
     if (associated != 0) {
-        Q3PtrDictIterator<BrowserArtifact> it(*associated);
+        QHashIterator<void*, BrowserArtifact*> it(*associated);
 
-        while (it.current()) {
-            if (d.find(it.current()) == 0) {
-                disconnect(it.current()->get_data(), SIGNAL(deleted()),
+        while (it.hasNext()) {
+            it.next();
+            if(it.value())
+            if (d.find(it.value()) == d.end()) {
+                disconnect(it.value()->get_data(), SIGNAL(deleted()),
                            this, SLOT(on_delete()));
-                associated->remove(it.current());
+                associated->remove(it.value());
             }
+            /*
             else
-                ++it;
+                ++it;*/
         }
     }
     else
-        associated = new Q3PtrDict<BrowserArtifact>((d.count() >> 4) + 1);
+        associated = new QHash<void*, BrowserArtifact*>(); //((d.count() >> 4) + 1);
 
-    Q3PtrDictIterator<BrowserArtifact> it(d);
+    QHashIterator<void*, BrowserArtifact*> it(d);
 
-    while (it.current()) {
-        if (associated->find(it.current()) == 0) {
-            associated->insert(it.current(), it.current());
+    while (it.hasNext()) {
+        it.next();
+        if(it.value())
+        if (associated->find(it.value()) == associated->end()) {
+            associated->insert(it.value(), it.value());
 
             if (associated->size() < (associated->count() >> 4))
-                associated->resize((associated->count() >> 4) + 1);
+                associated->reserve((associated->count() >> 4) + 1);
 
-            connect(it.current()->get_data(), SIGNAL(deleted()),
+            connect(it.value()->get_data(), SIGNAL(deleted()),
                     this, SLOT(on_delete()));
         }
 
-        ++it;
+        //++it;
     }
 }
 
@@ -449,15 +458,17 @@ void ArtifactData::save(QTextStream & st, QString & warning) const
         nl_indent(st);
         st << "associated_artifacts";
         indent(+1);
+        QHashIterator<void*, BrowserArtifact*>it(*associated);
 
-        Q3PtrDictIterator<BrowserArtifact> it(*associated);
-
-        while (it.current()) {
+        while (it.hasNext()) {
+            it.next();
+            if(it.value())
+            {
             nl_indent(st);
-            it.current()->save(st, TRUE, warning);
-            ++it;
+            it.value()->save(st, TRUE, warning);
+            }
+            //++it;
         }
-
         indent(-1);
         nl_indent(st);
         st << "end";
@@ -520,7 +531,8 @@ void ArtifactData::read(char *& st, char *& k)
     }
     else if (!strcmp(k, "associated_artifacts") ||
              ((read_file_format() < 20) && !strcmp(k, "associated_components"))) {
-        associated = new Q3PtrDict<BrowserArtifact>();
+
+        associated = new QHash<void*,BrowserArtifact*>();
 
         while (strcmp(k = read_keyword(st), "end")) {
             BrowserArtifact * c =
@@ -532,7 +544,7 @@ void ArtifactData::read(char *& st, char *& k)
         }
 
         if (associated->size() < (associated->count() >> 4))
-            associated->resize((associated->count() >> 4) + 1);
+            associated->reserve((associated->count() >> 4) + 1);
 
         k = read_keyword(st);
     }
diff --git a/src/data/ArtifactData.h b/src/data/ArtifactData.h
index 6488db115..1fc09dc82 100644
--- a/src/data/ArtifactData.h
+++ b/src/data/ArtifactData.h
@@ -28,7 +28,7 @@
 #ifndef ARTIFACTDATA_H
 #define ARTIFACTDATA_H
 
-#include <q3ptrdict.h>
+#include <qhash.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -44,7 +44,7 @@ class ArtifactData : public SimpleData
 
 protected:
     // for the non <<source>>:
-    Q3PtrDict<BrowserArtifact> * associated;
+    QHash<void*, BrowserArtifact*> * associated;
 
     // for the <<sources>> (the majority of artifacts) :
 
@@ -65,14 +65,14 @@ class ArtifactData : public SimpleData
     WrapperStr idl_src;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
-    virtual void send_php_def(ToolCom * com);
-    virtual void send_python_def(ToolCom * com);
-    virtual void send_idl_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
+    virtual void send_php_def(ToolCom * com) override;
+    virtual void send_python_def(ToolCom * com) override;
+    virtual void send_idl_def(ToolCom * com) override;
 
-    void update_associated(Q3PtrDict<BrowserArtifact> & d);
+    void update_associated(QHash<void *, BrowserArtifact *> &d);
 
 public:
     ArtifactData();
@@ -108,18 +108,18 @@ class ArtifactData : public SimpleData
     };
     void use_default_idl_src();
 
-    const Q3PtrDict<BrowserArtifact> * get_associated() {
+    const QHash<void*, BrowserArtifact*> * get_associated() {
         return associated;
     };
     void associate(BrowserArtifact *);
     void unassociate(BrowserArtifact *);
 
-    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *);
+    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *) override;
 
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/AttributeData.cpp b/src/data/AttributeData.cpp
index ab2510c3d..2d9671b8a 100644
--- a/src/data/AttributeData.cpp
+++ b/src/data/AttributeData.cpp
@@ -38,9 +38,9 @@
 #include "BrowserClass.h"
 #include "ClassData.h"
 #include "ClassDialog.h"
+#include "AttributeDialog.h"
 #include "BrowserAttribute.h"
 #include "BrowserOperation.h"
-#include "AttributeDialog.h"
 #include "GenerationSettings.h"
 #include "myio.h"
 #include "ToolCom.h"
@@ -108,7 +108,6 @@ void AttributeData::set_browser_node(BrowserAttribute * a, bool update,
                                      bool enum_item)
 {
     BasicData::set_browser_node(a);
-
     if (update) {
         if (enum_item)
             type.type = (BrowserClass *) a->parent();
@@ -172,16 +171,14 @@ void AttributeData::set_browser_node(BrowserAttribute * a, bool update,
 QString AttributeData::definition(bool full, bool with_kind) const
 {
     QString r;
-
     if (with_kind)
         r = "[" + browser_node->get_stype() + "] ";
 
     if (! full)
         r += browser_node->get_name();
     else
-        r += ((const char *) browser_node->get_name())
-             + QString(" : ") + ((const char *) type.get_type());
-
+        r.append(browser_node->get_name()
+             + QString(" : ") + type.get_type());
     return r;
 }
 
@@ -191,7 +188,7 @@ QString AttributeData::definition(bool full, bool mult, bool init,
 {
     switch (language) {
     case UmlView: {
-        QString r = ((const char *) browser_node->get_name());
+        QString r = browser_node->get_name();
 
         if (is_derived)
             r = "/" + r;
@@ -289,11 +286,11 @@ QString AttributeData::definition(bool full, bool mult, bool init,
 bool AttributeData::decldefbody_contain(const QString & s, bool cs,
                                         BrowserNode *)
 {
-    return ((QString(get_cppdecl()).find(s, 0, cs) != -1) ||
-            (QString(get_javadecl()).find(s, 0, cs) != -1) ||
-            (QString(get_phpdecl()).find(s, 0, cs) != -1) ||
-            (QString(get_pythondecl()).find(s, 0, cs) != -1) ||
-            (QString(get_idldecl()).find(s, 0, cs) != -1));
+    return ((QString(get_cppdecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_javadecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_phpdecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_pythondecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_idldecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1));
 }
 
 UmlVisibility AttributeData::get_visibility(BrowserNode *)
@@ -306,6 +303,11 @@ void AttributeData::set_visibility(UmlVisibility v)
     uml_visibility = v;
 }
 
+void AttributeData::set_visibility(int v)
+{
+    uml_visibility = static_cast<UmlVisibility>(v);
+}
+
 void AttributeData::set_type(const AType & t)
 {
     if (type.type != t.type) {
@@ -322,6 +324,26 @@ void AttributeData::set_type(const AType & t)
     type.explicit_type = t.explicit_type;
 }
 
+void AttributeData::set_type(const QString &value)
+{
+    QStringList list;
+    BrowserNodeList nodes;
+    BrowserClass::instances(nodes);
+    nodes.full_names(list);
+
+    AType t;
+    if (!value.isEmpty())
+    {
+        int rank = list.indexOf(value);
+
+        if (rank != -1)
+            t.type = (BrowserClass *) nodes.at(rank);
+        else
+            t.explicit_type = value;
+    }
+    set_type(t);
+}
+
 void AttributeData::on_delete()
 {
     if (type.type && type.type->deletedp()) {
@@ -332,14 +354,14 @@ void AttributeData::on_delete()
     modified();
 }
 
-const char * AttributeData::get_idlcase() const
+QString AttributeData::get_idlcase() const
 {
     return (idl_case != 0)
-           ? ((const char *) idl_case->get_name())
-           : ((const char *) idl_explicit_case);
+           ? idl_case->get_name()
+           : idl_explicit_case;
 }
 
-void AttributeData::set_idlcase(BrowserAttribute * a, const char * e)
+void AttributeData::set_idlcase(BrowserAttribute * a, QString e)
 {
     if (idl_case != a) {
         if (idl_case != 0)
@@ -819,7 +841,7 @@ void AttributeData::read(char *& st, char *& k)
         multiplicity = 0;
 
     if (!strcmp(k, "init_value")) {
-        init_value = QString(QTextCodec::codecForName(codec())->fromUnicode(read_string(st)));
+        init_value = read_string(st);
 //        init_value = read_string(st);
         k = read_keyword(st);
     }
diff --git a/src/data/AttributeData.h b/src/data/AttributeData.h
index e19eac46c..84b7ca9e4 100644
--- a/src/data/AttributeData.h
+++ b/src/data/AttributeData.h
@@ -75,32 +75,33 @@ class AttributeData : public ClassMemberData
 
     // Idl
     BrowserAttribute * idl_case;	// exclusive with idl_explicit_case
-    WrapperStr idl_explicit_case;
+    QString idl_explicit_case;
     WrapperStr idl_decl;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
-    virtual void send_php_def(ToolCom * com);
-    virtual void send_python_def(ToolCom * com);
-    virtual void send_idl_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
+    virtual void send_php_def(ToolCom * com) override;
+    virtual void send_python_def(ToolCom * com) override;
+    virtual void send_idl_def(ToolCom * com) override;
 
 public:
     AttributeData();
     AttributeData(const AttributeData * model, BrowserNode *);
     virtual ~AttributeData();
 
-    virtual bool deletedp() const;
-    virtual void set_deletedp(bool y);
+    virtual bool deletedp() const override;
+    virtual void set_deletedp(bool y) override;
 
+    using ClassMemberData::set_browser_node;
     void set_browser_node(BrowserAttribute *, bool update, bool enum_item);
 
-    virtual QString definition(bool full, bool with_kind) const;
+    virtual QString definition(bool full, bool with_kind) const override;
     QString definition(bool full, bool mult, bool init, bool modif,
                        DrawingLanguage language, ShowContextMode mode = noContext) const;
 
-    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *);
+    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *) override;
 
     const char * get_constraint() const {
         return constraint;
@@ -113,6 +114,9 @@ class AttributeData : public ClassMemberData
     bool get_isa_class_attribute() const {
         return isa_class_attribute;
     }
+    void set_isa_class_attribute(bool value){
+        isa_class_attribute = value;
+    }
 
     bool get_isa_const_attribute() const {
         return isa_const_attribute;
@@ -137,20 +141,25 @@ class AttributeData : public ClassMemberData
     UmlVisibility get_uml_visibility() const {
         return uml_visibility;
     }
-    virtual UmlVisibility get_visibility(BrowserNode *);
+    virtual UmlVisibility get_visibility(BrowserNode *) override;
     UmlVisibility get_cpp_visibility() const {
         return cpp_visibility;
     }
     void set_visibility(UmlVisibility v);
+    void set_visibility(int v);
 
     const AType & get_type() const {
         return type;
     }
     void set_type(const AType & t);
+    void set_type(const QString & t);
 
-    const char * get_init_value() const {
+    QString  get_init_value() const {
         return init_value;
     }
+    void set_init_value(QString value) {
+         init_value = value;
+    }
     QString get_init_value_qstring() const {
         return init_value;
     }
@@ -174,13 +183,13 @@ class AttributeData : public ClassMemberData
     const char * get_idldecl() const {
         return idl_decl;
     }
-    const char * get_idlcase() const;
-    void set_idlcase(BrowserAttribute * a, const char * e);
+    QString get_idlcase() const;
+    void set_idlcase(BrowserAttribute * a, QString e);
 
     void edit(bool new_st_attr);
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/BasicData.cpp b/src/data/BasicData.cpp
index 0f075d5de..b20a2c854 100644
--- a/src/data/BasicData.cpp
+++ b/src/data/BasicData.cpp
@@ -38,8 +38,6 @@
 
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
-
 BasicParent BasicParent::the;
 
 void BasicParent::insertChild(QObject *)
@@ -54,7 +52,7 @@ void BasicParent::removeChild(QObject *)
 
 //
 
-Q3PtrList<BasicData> BasicData::removed;
+QList<BasicData *> BasicData::removed;
 
 BasicData::BasicData(const BasicData * model)
     : QObject(&BasicParent::the), browser_node(0)
@@ -81,16 +79,14 @@ void BasicData::undelete(QString &, QString &)
     if (deletedp()) {
         set_deletedp(FALSE);
         emit changed();
-        removed.removeRef(this);
+        removed.removeOne(this);
     }
 }
 
 void BasicData::resignal_deleted()
 {
-    BasicData * d;
-
-    for (d = removed.last(); d != 0; d = removed.prev())
-        d->redelete_it();
+    for (int i = removed.size() - 1; i >= 0; --i)
+        removed[i]->redelete_it();
 }
 
 void BasicData::on_delete()
diff --git a/src/data/BasicData.h b/src/data/BasicData.h
index 10fd3435d..0ada7dc1d 100644
--- a/src/data/BasicData.h
+++ b/src/data/BasicData.h
@@ -33,7 +33,7 @@
 
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 #include "mystr.h"
 
@@ -67,14 +67,14 @@ class BasicData : public QObject
     Q_OBJECT
 
 protected:
-    static Q3PtrList<BasicData> removed;
+    static QList<BasicData *> removed;
 
     WrapperStr stereotype;
     BrowserNode * browser_node;
-
     void redelete_it() {
         emit deleted();
     };
+    QString m_name;
 
 public:
     BasicData() : QObject(&BasicParent::the), browser_node(0) {};
@@ -119,6 +119,16 @@ class BasicData : public QObject
     virtual void send_python_def(ToolCom * com);
     virtual void send_idl_def(ToolCom * com);
 
+    QString name() const
+    {
+        return m_name;
+    }
+
+    void setName(const QString &value)
+    {
+        m_name = value;
+    }
+
 protected slots:
     void on_delete();
 public slots:
diff --git a/src/data/ClassData.cpp b/src/data/ClassData.cpp
index a28199e0e..68dad412f 100644
--- a/src/data/ClassData.cpp
+++ b/src/data/ClassData.cpp
@@ -32,10 +32,6 @@
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-
-//Added by qt3to4:
-#include <Q3PtrList>
-
 #include "BrowserClass.h"
 #include "ClassData.h"
 #include "ClassDialog.h"
@@ -44,6 +40,7 @@
 #include "ActualParamData.h"
 #include "FormalParamData.h"
 #include "RelationData.h"
+
 #include "GenerationSettings.h"
 #include "myio.h"
 #include "ToolCom.h"
@@ -100,11 +97,9 @@ ClassData::ClassData(const ClassData * model, BrowserNode * bn)
             formals[index] = mformals[index];
     }
 
-    Q3PtrListIterator<ActualParamData> it(model->actuals);
     BrowserClass * cl = 0;
-
-    for (; it.current(); ++it) {
-        ActualParamData * actual = new ActualParamData(*(it.current()));
+    foreach (ActualParamData *data, model->actuals) {
+        ActualParamData * actual = new ActualParamData(*data);
 
         if (actual->get_class() != cl) {
             cl = actual->get_class();
@@ -151,9 +146,11 @@ ClassData::~ClassData()
     if (formals != 0)
         delete [] formals;
 
-    while (! actuals.isEmpty()) {
+    while (! actuals.isEmpty())
+    {
         delete actuals.at(0);
-        actuals.remove(0u);
+        actuals[0] = nullptr;
+        actuals.removeAt(0u);
     }
 }
 
@@ -183,33 +180,30 @@ void ClassData::inherit_or_instantiate(BrowserClass *)
 }
 
 void ClassData::update_actuals(BrowserClass * parent,
-                               Q3PtrList<ActualParamData> & new_actuals,
-                               Q3PtrList<ActualParamData> & managed)
+                               QList<ActualParamData *> & new_actuals,
+                               QList<ActualParamData *> & managed)
 {
     if (((BrowserNode *) parent->parent())->get_type() == UmlClass)
         update_actuals((BrowserClass *) parent->parent(), new_actuals, managed);
 
-    ActualParamData * actual;
     int n = ((ClassData *) parent->get_data())->nformals;
 
     if (n != 0) {
         // search the first associated actual
-        for (actual = actuals.first(); actual != 0; actual = actuals.next()) {
-            if ((actual->get_class() == parent) &&
-                (managed.findRef(actual) == -1))
-                // find;
-                break;
-        }
+        int i;
+        for (i = 0; i < actuals.size(); ++i)
+            if ((actuals[i]->get_class() == parent) && !managed.contains(actuals[i]))
+                break; // did find;
 
         int nth = 0;
 
         // progress on still present formals
-        while (actual && (nth < n) && (actual->get_class() == parent)) {
+        while (i < actuals.size() && (nth < n) && (actuals[i]->get_class() == parent))  {
             // actual ok
-            new_actuals.append(actual);
-            managed.append(actual);
+            new_actuals.append(actuals[i]);
+            managed.append(actuals[i]);
 
-            actual = actuals.next();
+            ++i;
             nth += 1;
         }
 
@@ -237,22 +231,16 @@ void ClassData::update_actuals()
     if (DontUpdateActuals)
         return;
 
-    // an inherited parent was modified/deleted, updates all actuals
-    Q3PtrList<BrowserNode> parents = browser_node->parents();
-    Q3PtrList<ActualParamData> new_actuals;
-    Q3PtrList<ActualParamData> managed;
-    BrowserClass * parent;
+    QList<ActualParamData *> new_actuals;
+    QList<ActualParamData *> managed;
 
-    for (parent = (BrowserClass *) parents.first();
-         parent != 0;
-         parent = (BrowserClass *) parents.next())
-        update_actuals(parent, new_actuals, managed);
+    // an inherited parent was modified/deleted, updates all actuals
+    foreach (BrowserNode * parent, browser_node->parents())
+        update_actuals((BrowserClass *)parent, new_actuals, managed);
 
     if (!(actuals == new_actuals)) {
-        ActualParamData * actual;
-
-        for (actual = actuals.first(); actual != 0; actual = actuals.next())
-            if (new_actuals.findRef(actual) == -1)
+        foreach (ActualParamData * actual, actuals)
+            if (!new_actuals.contains(actual))
                 delete actual;
 
         actuals = new_actuals;
@@ -264,19 +252,19 @@ void ClassData::update_actuals()
     emit actuals_changed();
 }
 
-void ClassData::get_actuals(Q3PtrList<ActualParamData> & l, BrowserClass * parent)
+void ClassData::get_actuals(QList<ActualParamData *> & l, BrowserClass * parent)
 {
     if (((BrowserNode *) parent->parent())->get_type() == UmlClass)
         get_actuals(l, (BrowserClass *) parent->parent());
 
-    ActualParamData * actual;
     int n = ((ClassData *) parent->get_data())->nformals;
 
     if (n != 0) {
         // search the first associated actual
-        for (actual = actuals.first(); actual != 0; actual = actuals.next()) {
-            if ((actual->get_class() == parent) &&
-                (l.findRef(actual) == -1))
+        int i;
+        for (i = 0; i < actuals.size(); ++i) {
+            ActualParamData * actual = actuals[i];
+            if ((actual->get_class() == parent) && !l.contains(actual))
                 // find;
                 break;
         }
@@ -284,11 +272,10 @@ void ClassData::get_actuals(Q3PtrList<ActualParamData> & l, BrowserClass * paren
         int nth = 0;
 
         // progress on still present formals
-        while (actual && (nth < n) && (actual->get_class() == parent)) {
+        while (i < actuals.size() && (nth < n) && (actuals[i]->get_class() == parent)) {
             // actual ok
-            l.append(actual);
-
-            actual = actuals.next();
+            l.append(actuals[i]);
+            ++i;
             nth += 1;
         }
     }
@@ -297,23 +284,18 @@ void ClassData::get_actuals(Q3PtrList<ActualParamData> & l, BrowserClass * paren
 // returns the actuals forms associated to inheritence of 'parent'
 QString ClassData::get_actuals(BrowserClass * parent)
 {
-    Q3PtrList<ActualParamData> l;
+    QList<ActualParamData *> l;
 
     get_actuals(l, parent);
 
-    Q3PtrList<BrowserNode> parents = parent->parents();
-
-    for (parent = (BrowserClass *) parents.first();
-         parent != 0;
-         parent = (BrowserClass *) parents.next())
-        get_actuals(l, parent);
+    foreach (BrowserNode *grandpa, parent->parents())
+        get_actuals(l, (BrowserClass *)grandpa);
 
     QString s;
     const char * sep = "<";
-    ActualParamData * actual;
     QString arrow = "->";
 
-    for (actual = l.first(); actual != 0; actual = l.next()) {
+    foreach (ActualParamData * actual, l) {
         QString v = actual->get_value().get_type();
 
         if (!v.isEmpty()) {
@@ -441,7 +423,7 @@ void ClassData::addFormals(QStringList & l)
     for (int index = 0; index != nformals; index += 1) {
         const char * s = formals[index].get_name();
 
-        if (l.findIndex(s) == -1)
+        if (l.indexOf(s) == -1)
             l.prepend(s);
     }
 
@@ -526,11 +508,9 @@ bool ClassData::reference(BrowserClass * target) const
             (formals[i].get_extends().type == target))
             return TRUE;
 
-    Q3PtrListIterator<ActualParamData> ita(actuals);
-
-    for (; ita.current(); ++ita)
-        if (ita.current()->get_value().type == target)
-            return TRUE;
+    foreach (ActualParamData *data, actuals)
+        if (data->get_value().type == target)
+            return true;
 
     return FALSE;
 }
@@ -540,11 +520,11 @@ bool ClassData::reference(BrowserClass * target) const
 bool ClassData::decldefbody_contain(const QString & s, bool cs,
                                     BrowserNode *)
 {
-    return ((QString(get_cppdecl()).find(s, 0, cs) != -1) ||
-            (QString(get_javadecl()).find(s, 0, cs) != -1) ||
-            (QString(get_phpdecl()).find(s, 0, cs) != -1) ||
-            (QString(get_pythondecl()).find(s, 0, cs) != -1) ||
-            (QString(get_idldecl()).find(s, 0, cs) != -1));
+    return ((QString(get_cppdecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_javadecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_phpdecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_pythondecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+            (QString(get_idldecl()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1));
 }
 
 //
@@ -554,6 +534,11 @@ void ClassData::set_uml_visibility(UmlVisibility v)
     uml_visibility = v;
 }
 
+void ClassData::set_uml_visibility(int v)
+{
+    uml_visibility = static_cast<UmlVisibility>(v);
+}
+
 void ClassData::set_cpp_visibility(UmlVisibility v)
 {
     cpp_visibility = v;
@@ -798,7 +783,7 @@ bool ClassData::tool_cmd(ToolCom * com, const char * args,
             case replaceActualCmd: {
                 unsigned rank = com->get_unsigned(args);
 
-                if (rank < actuals.count()) {
+                if ((int)rank < actuals.count()) {
                     AType t;
 
                     com->get_type(t, args);
@@ -835,7 +820,7 @@ bool ClassData::tool_cmd(ToolCom * com, const char * args,
         case actualsCmd: {
             com->write_unsigned((unsigned) actuals.count());
 
-            for (ActualParamData * a = actuals.first(); a != 0; a = actuals.next())
+            foreach (ActualParamData *a, actuals)
                 a->send_uml_def(com);
         }
         break;
@@ -852,17 +837,9 @@ bool ClassData::tool_cmd(ToolCom * com, const char * args,
 
 void ClassData::edit()
 {
-    setName(browser_node->get_name());
-
-    // edition must be modal
-    //An<EdgeMenuFactory> factory;
+    setObjectName(browser_node->get_name());
     ClassDialog::Instance(this)->show();
-    //dialog->setModal(false);
-    //QObject::connect(dialog.data(), SIGNAL(edgeMenuRequested(uint)),factory.getData(), SLOT(OnEdgeMenuRequested(uint)));
-    //dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-    //dialog->move(QCursor::pos().x() + 15, QCursor::pos().y());
-    //factory->SpawnEdgeMenu(TypeIdentifier<ClassDialog>::id());
-    //dialog->show();
+    ClassDialog::Instance(this)->raise();
 
 }
 
@@ -1025,10 +1002,9 @@ void ClassData::save(QTextStream & st, QString & warning) const
 
     if (actuals.count() != 0) {
         st << "nactuals " << actuals.count();
-        Q3PtrListIterator<ActualParamData> ita(actuals);
 
-        for (; ita.current(); ++ita)
-            ita.current()->save(st, warning);
+        foreach (ActualParamData *data, actuals)
+            data->save(st, warning);
 
         nl_indent(st);
     }
diff --git a/src/data/ClassData.h b/src/data/ClassData.h
index 128714416..ada84cd10 100644
--- a/src/data/ClassData.h
+++ b/src/data/ClassData.h
@@ -38,7 +38,7 @@
 //Added by qt3to4:
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 class ActualParamData;
 class FormalParamData;
@@ -49,11 +49,12 @@ class ClassData : public BasicData
 
     friend class ClassDialog;
     friend class ActualParamsTable;
+    //friend class QuickEdit;
 
 protected:
     WrapperStr constraint;
     FormalParamData * formals;		// remark : do NOT use QArray
-    Q3PtrList<ActualParamData> actuals;
+    QList<ActualParamData *> actuals;
     AType base_type;			// typedef
     unsigned char nformals;
     bool is_deleted : 1;
@@ -96,25 +97,25 @@ class ClassData : public BasicData
     //
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
-    virtual void send_php_def(ToolCom * com);
-    virtual void send_python_def(ToolCom * com);
-    virtual void send_idl_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
+    virtual void send_php_def(ToolCom * com) override;
+    virtual void send_python_def(ToolCom * com) override;
+    virtual void send_idl_def(ToolCom * com) override;
 
     void update_actuals(BrowserClass *,
-                        Q3PtrList<ActualParamData> & new_actuals,
-                        Q3PtrList<ActualParamData> & managed);
-    void get_actuals(Q3PtrList<ActualParamData> & l, BrowserClass * parent);
+                        QList<ActualParamData *> & new_actuals,
+                        QList<ActualParamData *> & managed);
+    void get_actuals(QList<ActualParamData *> & l, BrowserClass * parent);
 
 public:
     ClassData();
     ClassData(const ClassData * model, BrowserNode * bn);
     virtual ~ClassData();
 
-    virtual bool deletedp() const;
-    virtual void set_deletedp(bool y);
+    virtual bool deletedp() const override;
+    virtual void set_deletedp(bool y) override;
 
     void edit();
 
@@ -122,7 +123,7 @@ class ClassData : public BasicData
         return constraint;
     }
 
-    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *);
+    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *) override;
 
     bool get_is_abstract() const {
         return is_abstract;
@@ -149,6 +150,7 @@ class ClassData : public BasicData
         return cpp_visibility;
     }
     void set_uml_visibility(UmlVisibility v);
+    void set_uml_visibility(int v);
     void set_cpp_visibility(UmlVisibility v);
 
     int get_n_formalparams() const {
@@ -182,6 +184,9 @@ class ClassData : public BasicData
     bool cpp_is_external() const {
         return cpp_external;
     }
+    void set_cpp_is_external(bool value) {
+        cpp_external = value;
+    }
 
     const char * get_javadecl() const {
         return java_decl;
@@ -233,7 +238,7 @@ class ClassData : public BasicData
     bool reference(BrowserClass *) const;
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/ClassInstanceData.cpp b/src/data/ClassInstanceData.cpp
index 3c82652bb..2550d8bf9 100644
--- a/src/data/ClassInstanceData.cpp
+++ b/src/data/ClassInstanceData.cpp
@@ -32,9 +32,9 @@
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 #include "ClassInstanceData.h"
 #include "BrowserClassInstance.h"
@@ -93,9 +93,7 @@ void ClassInstanceData::edit()
     // to take into account deleted class instances being
     // the value of relations
     check_rels();
-
-    setName(browser_node->get_name());
-
+    setObjectName(browser_node->get_name());
     (new ClassInstanceDialog(this))->show();
 }
 
@@ -103,7 +101,7 @@ void ClassInstanceData::edit()
 
 void ClassInstanceData::init_other_side()
 {
-    Q3ValueList<SlotRel>::Iterator it_rel = relations.begin();
+    QList<SlotRel>::Iterator it_rel = relations.begin();
 
     while (it_rel != relations.end()) {
         const SlotRel & slot_rel = *it_rel;
@@ -112,7 +110,7 @@ void ClassInstanceData::init_other_side()
             ->get_type() == UmlPackage) {
             // placed in temporary package
             // relation doesn't exist
-            it_rel = relations.remove(it_rel);
+            it_rel = relations.erase(it_rel);
             continue;
         }
 
@@ -120,9 +118,9 @@ void ClassInstanceData::init_other_side()
             !RelationData::uni_directional(slot_rel.rel->get_type())) {
             ClassInstanceData * other_data =
                 (ClassInstanceData *) slot_rel.value->get_data();
-            Q3ValueList<SlotRel> & other_rels =
+            QList<SlotRel> & other_rels =
                 other_data->relations;
-            Q3ValueList<SlotRel>::Iterator it_rel_other;
+            QList<SlotRel>::Iterator it_rel_other;
 
             for (it_rel_other = other_rels.begin();
                  it_rel_other != other_rels.end();
@@ -141,7 +139,7 @@ void ClassInstanceData::init_other_side()
 
                 BasicData * d = slot_rel.rel->get_end_class()->get_data();
 
-                if (other_data->connect_list.findRef(d) == -1) {
+                if (! other_data->connect_list.contains(d)) {
                     other_data->connect_list.append(d);
                     connect(d, SIGNAL(changed()), other_data, SLOT(check()));
                     connect(d, SIGNAL(deleted()), other_data, SLOT(check()));
@@ -163,29 +161,29 @@ void ClassInstanceData::check()
         browser_node->delete_it();
     else if (!attributes.isEmpty() || !relations.isEmpty()) {
         bool modif = FALSE;
-        Q3PtrList<BrowserClass> l;
+        QList<BrowserClass *> l;
 
         cl->get_all_parents(l);
         l.append(cl);
 
         // check attributes
 
-        Q3ValueList<SlotAttr>::Iterator it_attr = attributes.begin();
+        QList<SlotAttr>::Iterator it_attr = attributes.begin();
 
         while (it_attr != attributes.end()) {
             const SlotAttr & slot_attr = *it_attr;
 
             if (slot_attr.att->deletedp() ||
-                (l.findRef((BrowserClass *) slot_attr.att->parent())  == -1)) {
+                (! l.contains((BrowserClass *) slot_attr.att->parent()))) {
                 // must be removed
-                it_attr = attributes.remove(it_attr);
+                it_attr = attributes.erase(it_attr);
                 modif = TRUE;
             }
             else {
                 // change on attribute modify class => memorize classes only
                 BasicData * cld = ((BrowserNode *) slot_attr.att->parent())->get_data();
 
-                if (connect_list.findRef(cld) == -1) {
+                if (! connect_list.contains(cld)) {
                     connect_list.append(cld);
                     connect(cld, SIGNAL(changed()), this, SLOT(check()));
                     connect(cld, SIGNAL(deleted()), this, SLOT(check()));
@@ -197,7 +195,7 @@ void ClassInstanceData::check()
 
         // check relations (only this side, check also called on other class instance)
 
-        Q3ValueList<SlotRel>::Iterator it_rel = relations.begin();
+        QList<SlotRel>::Iterator it_rel = relations.begin();
 
         while (it_rel != relations.end()) {
             const SlotRel & slot_rel = *it_rel;
@@ -212,16 +210,16 @@ void ClassInstanceData::check()
 
             if (br == 0) {
                 // relation deleted, must be removed
-                it_rel = relations.remove(it_rel);
+                it_rel = relations.erase(it_rel);
                 modif = TRUE;
             }
-            else if (l.findRef((BrowserClass *) br->parent()) == -1) {
+            else if (!l.contains((BrowserClass *) br->parent())) {
                 // new instance type, must be removed in both side
                 if (slot_rel.value->get_data() != this) {
                     // not reflexive
-                    Q3ValueList<SlotRel> & other_rels =
+                    QList<SlotRel> & other_rels =
                         ((ClassInstanceData *) slot_rel.value->get_data())->relations;
-                    Q3ValueList<SlotRel>::Iterator it_rel_other;
+                    QList<SlotRel>::Iterator it_rel_other;
 
                     for (it_rel_other = other_rels.begin();
                          it_rel_other != other_rels.end();
@@ -230,13 +228,13 @@ void ClassInstanceData::check()
 
                         if ((other_slot_rel.value == browser_node) &&
                             (other_slot_rel.rel == slot_rel.rel)) {
-                            other_rels.remove(it_rel_other);
+                            it_rel_other = other_rels.erase(it_rel_other);
                             break;
                         }
                     }
                 }
 
-                it_rel = relations.remove(it_rel);
+                it_rel = relations.erase(it_rel);
                 modif = TRUE;
             }
             else {
@@ -245,7 +243,7 @@ void ClassInstanceData::check()
 
                 d = ((BrowserNode *) br->parent())->get_data();
 
-                if (connect_list.findRef(d) == -1) {
+                if (! connect_list.contains(d)) {
                     connect_list.append(d);
                     connect(d, SIGNAL(changed()), this, SLOT(check()));
                     connect(d, SIGNAL(deleted()), this, SLOT(check()));
@@ -253,7 +251,7 @@ void ClassInstanceData::check()
 
                 d = slot_rel.value->get_data();
 
-                if (connect_list.findRef(d) == -1) {
+                if (! connect_list.contains(d)) {
                     connect_list.append(d);
                     connect(d, SIGNAL(changed()), this, SLOT(check_rels()));
                     connect(d, SIGNAL(deleted()), this, SLOT(check_rels()));
@@ -274,7 +272,7 @@ void ClassInstanceData::check()
 void ClassInstanceData::check_rels()
 {
     bool modif = FALSE;
-    Q3ValueList<SlotRel>::Iterator it_rel = relations.begin();
+    QList<SlotRel>::Iterator it_rel = relations.begin();
 
     while (it_rel != relations.end()) {
         const SlotRel & slot_rel = *it_rel;
@@ -293,15 +291,15 @@ void ClassInstanceData::check_rels()
                 remove = TRUE;
             }
             else if (cl != other) {
-                Q3PtrList<BrowserClass> l;
+                QList<BrowserClass *> l;
 
                 cl->get_all_parents(l);
-                remove |= (l.findRef(other) == -1);
+                remove |= (! l.contains(other));
             }
         }
 
         if (remove) {
-            it_rel = relations.remove(it_rel);
+            it_rel = relations.erase(it_rel);
             modif = TRUE;
         }
         else
@@ -310,6 +308,7 @@ void ClassInstanceData::check_rels()
 
     if (modif)
         modified();
+
 }
 
 // returns true if the relation rd exist between this and other
@@ -317,7 +316,7 @@ void ClassInstanceData::check_rels()
 bool ClassInstanceData::exist(BrowserClassInstance * other,
                               RelationData * rd) const
 {
-    Q3ValueList<SlotRel>::ConstIterator it;
+    QList<SlotRel>::ConstIterator it;
 
     for (it = relations.begin(); it != relations.end(); ++it) {
         const SlotRel & slot_rel = *it;
@@ -326,7 +325,7 @@ bool ClassInstanceData::exist(BrowserClassInstance * other,
             return TRUE;
     }
 
-    const Q3ValueList<SlotRel> & rels =
+    const QList<SlotRel> & rels =
         ((ClassInstanceData *) other->get_data())->relations;
 
     for (it = rels.begin(); it != rels.end(); ++it) {
@@ -345,7 +344,7 @@ void ClassInstanceData::add(BrowserClassInstance * other,
                             RelationData * rd)
 {
     // check if already exist
-    Q3ValueList<SlotRel>::Iterator it;
+    QList<SlotRel>::Iterator it;
 
     for (it = relations.begin(); it != relations.end(); ++it) {
         SlotRel & slot_rel = *it;
@@ -361,7 +360,7 @@ void ClassInstanceData::add(BrowserClassInstance * other,
 
     BasicData * d = rd->get_start_class()->get_data();
 
-    if (connect_list.findRef(d) == -1) {
+    if (! connect_list.contains(d)) {
         connect_list.append(d);
         connect(d, SIGNAL(changed()), this, SLOT(check()));
         connect(d, SIGNAL(deleted()), this, SLOT(check()));
@@ -374,7 +373,7 @@ void ClassInstanceData::add(BrowserClassInstance * other,
 
         d = rd->get_end_class()->get_data();
 
-        if (od->connect_list.findRef(d) == -1) {
+        if (! od->connect_list.contains(d)) {
             od->connect_list.append(d);
             connect(d, SIGNAL(changed()), od, SLOT(check()));
             connect(d, SIGNAL(deleted()), od, SLOT(check()));
@@ -391,7 +390,7 @@ void ClassInstanceData::replace_internal(BrowserClassInstance * other,
         bool current_isa,
         bool future_isa)
 {
-    Q3ValueList<SlotRel>::Iterator it;
+    QList<SlotRel>::Iterator it;
 
     for (it = relations.begin(); it != relations.end(); ++it) {
         SlotRel & slot_rel = *it;
@@ -401,7 +400,7 @@ void ClassInstanceData::replace_internal(BrowserClassInstance * other,
             (slot_rel.is_a == current_isa)) {
             if ((future == 0) ||
                 (!future_isa && RelationData::uni_directional(future->get_type())))
-                relations.remove(it);
+                it = relations.erase(it);
             else {
                 slot_rel.rel = future;
                 slot_rel.is_a = future_isa;
@@ -410,7 +409,7 @@ void ClassInstanceData::replace_internal(BrowserClassInstance * other,
                     ((BrowserNode *) future->get_start()->parent())
                     ->get_data();
 
-                if (connect_list.findRef(d) == -1) {
+                if (! connect_list.contains(d)) {
                     connect_list.append(d);
                     connect(d, SIGNAL(changed()), this, SLOT(check()));
                     connect(d, SIGNAL(deleted()), this, SLOT(check()));
@@ -428,7 +427,7 @@ void ClassInstanceData::replace_internal(BrowserClassInstance * other,
 
         BasicData * d = future->get_start_class()->get_data();
 
-        if (connect_list.findRef(d) == -1) {
+        if (! connect_list.contains(d)) {
             connect_list.append(d);
             connect(d, SIGNAL(changed()), this, SLOT(check()));
             connect(d, SIGNAL(deleted()), this, SLOT(check()));
@@ -440,7 +439,7 @@ void ClassInstanceData::remove_clone(BrowserClassInstance * other,
                                      RelationData * rd, bool isa)
 {
     bool find = FALSE;
-    Q3ValueList<SlotRel>::Iterator it;
+    QList<SlotRel>::Iterator it;
 
     for (it = relations.begin(); it != relations.end(); ++it) {
         SlotRel & slot_rel = *it;
@@ -450,7 +449,7 @@ void ClassInstanceData::remove_clone(BrowserClassInstance * other,
             (slot_rel.is_a == isa)) {
             if (find) {
                 // a clone
-                relations.remove(it);
+                it = relations.erase(it);
                 return;
             }
             else
@@ -491,8 +490,9 @@ void ClassInstanceData::set_class(BrowserClass * t)
             replace(slot_rel.value, slot_rel.rel, 0, slot_rel.is_a, FALSE);
         }
 
-        while (!connect_list.isEmpty())
-            disconnect(connect_list.take(0), 0, this, 0);
+        foreach (BasicData *data, connect_list)
+            disconnect(data, 0, this, 0);
+        connect_list.clear();
 
         BasicData * cld = cl->get_data();
 
@@ -532,7 +532,7 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args,
             case setAttributeCmd: {
                 BrowserAttribute * at = (BrowserAttribute *) com->get_id(args);
                 bool find = FALSE;
-                Q3ValueList<SlotAttr>::Iterator it_attr;
+                QList<SlotAttr>::Iterator it_attr;
 
                 for (it_attr = attributes.begin(); it_attr != attributes.end(); ++it_attr) {
                     SlotAttr & slot_attr = *it_attr;
@@ -542,7 +542,7 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args,
 
                         if (*args == 0)
                             // remove it
-                            attributes.remove(it_attr);
+                            it_attr = attributes.erase(it_attr);
                         else
                             // replace it
                             slot_attr.value = args;
@@ -553,13 +553,13 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args,
 
                 if (! find) {
                     // add it
-                    Q3PtrList<BrowserClass> l;
+                    QList<BrowserClass *> l;
 
                     cl->get_all_parents(l);
                     l.append(cl);
 
                     if (at->deletedp() ||
-                        (l.findRef((BrowserClass *) at->parent())  == -1)) {
+                        (! l.contains((BrowserClass *)at->parent()))) {
                         // illegal
                         com->write_ack(FALSE);
                         return TRUE;
@@ -598,7 +598,7 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args,
             if (args[0] == 0) {
                 com->write_unsigned(attributes.count());
 
-                Q3ValueList<SlotAttr>::Iterator it;
+                QList<SlotAttr>::Iterator it;
 
                 for (it = attributes.begin(); it != attributes.end(); ++it) {
                     const SlotAttr & slot = *it;
@@ -610,13 +610,12 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args,
             else {
                 // get all available attributes
                 BrowserNodeList l;
-                BrowserNode * bn;
 
                 cl->get_attrs(l);
                 com->write_unsigned(l.count());
 
-                for (bn = l.first(); bn != 0; bn = l.next())
-                    bn->write_id(com);
+                foreach (BrowserNode * node, l)
+                    node->write_id(com);
             }
 
             break;
@@ -628,7 +627,7 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args,
             if (other == 0) {
                 com->write_unsigned(relations.count());
 
-                Q3ValueList<SlotRel>::Iterator it;
+                QList<SlotRel>::Iterator it;
 
                 for (it = relations.begin(); it != relations.end(); ++it) {
                     const SlotRel & slot = *it;
@@ -640,13 +639,12 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args,
             }
             else {
                 // get all available relations
-                Q3PtrList<BrowserRelation> l;
-                BrowserRelation * r;
+                QList<BrowserRelation *> l;
 
                 cl->get_rels(((ClassInstanceData *)other->get_data())->cl, l);
                 com->write_unsigned(l.count());
 
-                for (r = l.first(); r != 0; r = l.next())
+                foreach (BrowserRelation *r, l)
                     r->write_id(com);
             }
         }
@@ -656,7 +654,6 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args,
             return BasicData::tool_cmd(com, args, bn, comment);
         }
     }
-
     return TRUE;
 }
 
@@ -674,7 +671,7 @@ bool ClassInstanceData::change_rel(ToolCom * com, const char * args,
     }
 
     RelationData * rd = (RelationData *) r->get_data();
-    Q3ValueList<SlotRel>::Iterator it;
+    QList<SlotRel>::Iterator it;
 
     for (it = relations.begin(); it != relations.end(); ++it) {
         const SlotRel & slot_rel = *it;
@@ -687,11 +684,11 @@ bool ClassInstanceData::change_rel(ToolCom * com, const char * args,
     if (isadd) {
         if (it == relations.end()) {
             // not yet present
-            Q3PtrList<BrowserRelation> l;
+            QList<BrowserRelation *> l;
 
             cl->get_rels(((ClassInstanceData *)other->get_data())->cl, l);
 
-            if ((l.findRef(r) == -1) ||
+            if ((! l.contains(r)) ||
                 (!other->is_writable() && !root_permission())) {
                 // illegal
                 com->write_ack(FALSE);
@@ -731,7 +728,7 @@ void ClassInstanceData::save(QTextStream & st, QString & warning) const
     nl_indent(st);
     st << "attributes";
 
-    Q3ValueList<SlotAttr>::ConstIterator it_attr = attributes.begin();
+    QList<SlotAttr>::ConstIterator it_attr = attributes.begin();
 
     while (it_attr != attributes.end()) {
         const SlotAttr & slot_attr = *it_attr;
@@ -750,7 +747,7 @@ void ClassInstanceData::save(QTextStream & st, QString & warning) const
     nl_indent(st);
     st << "relations";
 
-    Q3ValueList<SlotRel>::ConstIterator it_rel = relations.begin();
+    QList<SlotRel>::ConstIterator it_rel = relations.begin();
 
     while (it_rel != relations.end()) {
         const SlotRel & slot_rel = *it_rel;
diff --git a/src/data/ClassInstanceData.h b/src/data/ClassInstanceData.h
index a937677ec..e536b01fa 100644
--- a/src/data/ClassInstanceData.h
+++ b/src/data/ClassInstanceData.h
@@ -28,12 +28,12 @@
 #ifndef CLASSINSTANCEDATA_H
 #define CLASSINSTANCEDATA_H
 
-#include <q3ptrdict.h>
+//#include <q3ptrdict.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 #include "SimpleData.h"
 
@@ -73,13 +73,13 @@ class ClassInstanceData : public SimpleData
 
 private:
     BrowserClass * cl;	// type of instance
-    Q3ValueList<SlotAttr> attributes;
-    Q3ValueList<SlotRel> relations;
-    Q3PtrList<BasicData> connect_list;	// ClassData and ClassInstanceData
+    QList<SlotAttr> attributes;
+    QList<SlotRel> relations;
+    QList<BasicData *> connect_list;	// ClassData and ClassInstanceData
 
 protected:
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
+                              const QString & comment) override;
     void replace_internal(BrowserClassInstance * other,
                           RelationData * current, RelationData * future,
                           bool current_isa, bool future_isa);
@@ -94,9 +94,9 @@ class ClassInstanceData : public SimpleData
 
     void edit();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
@@ -107,10 +107,10 @@ class ClassInstanceData : public SimpleData
     }
     void set_class(BrowserClass * t);
 
-    const Q3ValueList<SlotAttr> & get_attributes() const {
+    const QList<SlotAttr> & get_attributes() const {
         return attributes;
     }
-    const Q3ValueList<SlotRel> & get_relations() const {
+    const QList<SlotRel> & get_relations() const {
         return relations;
     }
 
diff --git a/src/data/ExpansionRegionData.cpp b/src/data/ExpansionRegionData.cpp
index fafa83621..934748472 100644
--- a/src/data/ExpansionRegionData.cpp
+++ b/src/data/ExpansionRegionData.cpp
@@ -59,7 +59,7 @@ ExpansionRegionData::~ExpansionRegionData()
 
 void ExpansionRegionData::edit()
 {
-    setName(browser_node->get_name());
+    setObjectName(browser_node->get_name());
 
     (new ExpansionRegionDialog(this))->show();
 }
diff --git a/src/data/ExpansionRegionData.h b/src/data/ExpansionRegionData.h
index 1b2d90505..c54e67f66 100644
--- a/src/data/ExpansionRegionData.h
+++ b/src/data/ExpansionRegionData.h
@@ -47,7 +47,7 @@ class ExpansionRegionData : public SimpleData
     UmlExpansionKind mode;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
+                              const QString & comment) override;
 
 public:
     ExpansionRegionData();
@@ -64,7 +64,7 @@ class ExpansionRegionData : public SimpleData
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/ExtraMemberData.cpp b/src/data/ExtraMemberData.cpp
index 3d22a74cf..20f472f89 100644
--- a/src/data/ExtraMemberData.cpp
+++ b/src/data/ExtraMemberData.cpp
@@ -36,7 +36,6 @@
 #include "myio.h"
 #include "ToolCom.h"
 #include "mu.h"
-//Added by qt3to4:
 #include <QTextStream>
 
 ExtraMemberData::ExtraMemberData()
@@ -83,7 +82,7 @@ QString ExtraMemberData::definition(bool, bool with_kind) const
 
 void ExtraMemberData::edit()
 {
-    setName(browser_node->get_name());
+    setObjectName(browser_node->get_name());
 
     (new ExtraMemberDialog(this))->show();
 }
diff --git a/src/data/ExtraMemberData.h b/src/data/ExtraMemberData.h
index 8768be049..f2aa1c985 100644
--- a/src/data/ExtraMemberData.h
+++ b/src/data/ExtraMemberData.h
@@ -60,21 +60,21 @@ class ExtraMemberData : public BasicData
     // Idl
     WrapperStr idl_decl;
 
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
-    virtual void send_php_def(ToolCom * com);
-    virtual void send_python_def(ToolCom * com);
-    virtual void send_idl_def(ToolCom * com);
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
+    virtual void send_php_def(ToolCom * com) override;
+    virtual void send_python_def(ToolCom * com) override;
+    virtual void send_idl_def(ToolCom * com) override;
 
 public:
     ExtraMemberData();
     ExtraMemberData(const ExtraMemberData * model, BrowserNode *);
     virtual ~ExtraMemberData();
 
-    virtual bool deletedp() const;
-    virtual void set_deletedp(bool y);
+    virtual bool deletedp() const override;
+    virtual void set_deletedp(bool y) override;
 
-    virtual QString definition(bool full, bool with_kind) const;
+    virtual QString definition(bool full, bool with_kind) const override;
 
     const char * get_cpp_decl() const {
         return cpp_decl;
@@ -105,7 +105,7 @@ class ExtraMemberData : public BasicData
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/FlowData.cpp b/src/data/FlowData.cpp
index 33121c1c8..5fd7649dc 100644
--- a/src/data/FlowData.cpp
+++ b/src/data/FlowData.cpp
@@ -319,7 +319,7 @@ void FlowDef::save(QTextStream & st, WrapperStr lang) const
 
 void FlowDef::read(char *& st, char *& k, WrapperStr lang)
 {
-    int ln = strlen(lang);
+    size_t ln = strlen(lang);
 
     if (!strncmp(k, lang, ln) && !strcmp(k + ln, "_weight")) {
         weight = read_string(st);
diff --git a/src/data/FlowData.h b/src/data/FlowData.h
index 751a6cd86..ff16f3fc2 100644
--- a/src/data/FlowData.h
+++ b/src/data/FlowData.h
@@ -65,16 +65,16 @@ class FlowData : public SimpleData
     FlowDef java;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
 
 public:
     FlowData();
     FlowData(const BrowserFlow * model, BrowserFlow * r);
     virtual ~FlowData();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void set_start_end(BrowserFlow * s, BrowserNode * e);
     void edit();
@@ -90,7 +90,7 @@ class FlowData : public SimpleData
     QString transformation(DrawingLanguage) const;
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     static FlowData * read(char *& , char *& k);
diff --git a/src/data/HaveKeyValueData.cpp b/src/data/HaveKeyValueData.cpp
index e9b69215f..5cf4757a1 100644
--- a/src/data/HaveKeyValueData.cpp
+++ b/src/data/HaveKeyValueData.cpp
@@ -1,214 +1,214 @@
-// *************************************************************************
-//
-// Copyright 2004-2010 Bruno PAGES  .
-// Copyright 2012-2013 Nikolai Marchenko.
-// Copyright 2012-2013 Leonardo Guilherme.
-//
-// This file is part of the DOUML Uml Toolkit.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License Version 3.0 as published by
-// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
-//  packaging of this file.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License Version 3.0 for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// e-mail : doumleditor@gmail.com
-// home   : http://sourceforge.net/projects/douml
-//
-// *************************************************************************
-
-
-
-
-
-#include <QTextStream>
-
-#include "HaveKeyValueData.h"
-#include "KeyValueData.h"
-#include "myio.h"
-#include "ToolCom.h"
-
-HaveKeyValueData::HaveKeyValueData() : keyvalues(0), nkeyvalues(0)
-{
-}
-
-HaveKeyValueData::~HaveKeyValueData()
-{
-    if (keyvalues)
-        delete [] keyvalues;
-}
-
-const char * HaveKeyValueData::get_key(int rank) const
-{
-    return keyvalues[rank].get_key();
-}
-
-void HaveKeyValueData::set_key(int rank, const char * k)
-{
-    keyvalues[rank].set_key(k);
-}
-
-const char * HaveKeyValueData::get_value(int rank) const
-{
-    return keyvalues[rank].get_value();
-}
-
-const char * HaveKeyValueData::get_value(const char * k) const
-{
-    unsigned index;
-
-    for (index = 0; index != nkeyvalues; index += 1)
-        if (strcmp(keyvalues[index].get_key(), k) == 0)
-            return keyvalues[index].get_value();
-
-    return 0;
-}
-
-void HaveKeyValueData::set_value(int rank, const char * v)
-{
-    keyvalues[rank].set_value(v);
-}
-
-int HaveKeyValueData::has_key(const char * v)
-{
-    unsigned index;
-
-    for (index = 0; index != nkeyvalues; index += 1)
-        if (strcmp(keyvalues[index].get_key(), v) == 0)
-            return index;
-
-    return -1;
-}
-
-void HaveKeyValueData::remove_key_value(unsigned index)
-{
-    nkeyvalues -= 1;
-    keyvalues[index].set_key(keyvalues[nkeyvalues].get_key());
-    keyvalues[index].set_value(keyvalues[nkeyvalues].get_value());
-}
-
-void HaveKeyValueData::remove_key_value(const char * k)
-{
-    unsigned index;
-
-    for (index = 0; index != nkeyvalues; index += 1) {
-        if (strcmp(keyvalues[index].get_key(), k) == 0) {
-            nkeyvalues -= 1;
-            keyvalues[index].set_key(keyvalues[nkeyvalues].get_key());
-            keyvalues[index].set_value(keyvalues[nkeyvalues].get_value());
-            break;
-        }
-    }
-}
-
-void HaveKeyValueData::set_n_keys(unsigned n)
-{
-    if (n > nkeyvalues) {
-        if (keyvalues)
-            delete [] keyvalues;
-
-        keyvalues = new KeyValueData[n];
-    }
-
-    nkeyvalues = n;
-}
-
-void HaveKeyValueData::resize_n_keys(unsigned n, bool realloc)
-{
-    if (realloc) {
-        KeyValueData * kv = new KeyValueData[n];
-
-        if (keyvalues) {
-            for (unsigned index = 0; index != nkeyvalues; index += 1) {
-                kv[index].set_key(keyvalues[index].get_key());
-                kv[index].set_value(keyvalues[index].get_value());
-            }
-
-            delete [] keyvalues;
-        }
-
-        keyvalues = kv;
-    }
-
-    nkeyvalues = n;
-}
-
-void HaveKeyValueData::send_def(ToolCom * com) const
-{
-    com->write_unsigned(nkeyvalues);
-
-    for (unsigned index = 0; index != nkeyvalues; index += 1) {
-        com->write_string(keyvalues[index].get_key());
-        com->write_string(keyvalues[index].get_value());
-    }
-}
-
-void HaveKeyValueData::set_value(const char * k, const char * v)
-{
-    unsigned index;
-
-    for (index = 0; index != nkeyvalues; index += 1) {
-        if (strcmp(keyvalues[index].get_key(), k) == 0) {
-            keyvalues[index].set_value(v);
-            return;
-        }
-    }
-
-    // value must be added
-    KeyValueData * t = new KeyValueData[nkeyvalues + 1];
-
-    for (index = 0; index != nkeyvalues; index += 1) {
-        t[index].set_key(keyvalues[index].get_key());
-        t[index].set_value(keyvalues[index].get_value());
-    }
-
-    t[index].set_key(k);
-    t[index].set_value(v);
-
-    delete [] keyvalues;
-    keyvalues = t;
-    nkeyvalues += 1;
-}
-
-void HaveKeyValueData::save(QTextStream & st) const
-{
-    if (nkeyvalues) {
-        nl_indent(st);
-        st << "ncouples " << nkeyvalues;
-
-        for (unsigned i = 0; i != nkeyvalues; i += 1) {
-            nl_indent(st);
-            st << "key ";
-            save_string(keyvalues[i].get_key(), st);
-            st << " value ";
-            qDebug() << keyvalues[i].get_value();
-            save_string(keyvalues[i].get_value(), st);
-        }
-    }
-}
-
-void HaveKeyValueData::read(char *& st, char *& k)
-{
-    if (!strcmp(k, "ncouples")) {
-        set_n_keys(read_unsigned(st));
-
-        for (unsigned i = 0; i != nkeyvalues; i += 1) {
-            read_keyword(st, "key");
-            keyvalues[i].set_key(read_string(st));
-            read_keyword(st, "value");
-            keyvalues[i].set_value(read_string(st));
-        }
-
-        k = read_keyword(st);
-    }
-    else
-        set_n_keys(0);
-}
+// *************************************************************************
+//
+// Copyright 2004-2010 Bruno PAGES  .
+// Copyright 2012-2013 Nikolai Marchenko.
+// Copyright 2012-2013 Leonardo Guilherme.
+//
+// This file is part of the DOUML Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+// home   : http://sourceforge.net/projects/douml
+//
+// *************************************************************************
+
+
+
+
+
+#include <QTextStream>
+
+#include "HaveKeyValueData.h"
+#include "KeyValueData.h"
+#include "myio.h"
+#include "ToolCom.h"
+
+HaveKeyValueData::HaveKeyValueData() : keyvalues(0), nkeyvalues(0)
+{
+}
+
+HaveKeyValueData::~HaveKeyValueData()
+{
+    if (keyvalues)
+        delete [] keyvalues;
+}
+
+QString HaveKeyValueData::get_key(int rank) const
+{
+    return keyvalues[rank].get_key();
+}
+
+void HaveKeyValueData::set_key(int rank, QString k)
+{
+    keyvalues[rank].set_key(k);
+}
+
+QString HaveKeyValueData::get_value(int rank) const
+{
+    return keyvalues[rank].get_value();
+}
+
+QString HaveKeyValueData::get_value(QString k) const
+{
+    unsigned index;
+
+    for (index = 0; index != nkeyvalues; index += 1)
+        if (keyvalues[index].get_key() == k)
+            return keyvalues[index].get_value();
+
+    return 0;
+}
+
+void HaveKeyValueData::set_value(int rank, QString v)
+{
+    keyvalues[rank].set_value(v);
+}
+
+int HaveKeyValueData::has_key(QString v)
+{
+    unsigned index;
+
+    for (index = 0; index != nkeyvalues; index += 1)
+        if (keyvalues[index].get_key() == v)
+            return index;
+
+    return -1;
+}
+
+void HaveKeyValueData::remove_key_value(unsigned index)
+{
+    nkeyvalues -= 1;
+    keyvalues[index].set_key(keyvalues[nkeyvalues].get_key());
+    keyvalues[index].set_value(keyvalues[nkeyvalues].get_value());
+}
+
+void HaveKeyValueData::remove_key_value(QString k)
+{
+    unsigned index;
+
+    for (index = 0; index != nkeyvalues; index += 1) {
+        if (keyvalues[index].get_key() == k) {
+            nkeyvalues -= 1;
+            keyvalues[index].set_key(keyvalues[nkeyvalues].get_key());
+            keyvalues[index].set_value(keyvalues[nkeyvalues].get_value());
+            break;
+        }
+    }
+}
+
+void HaveKeyValueData::set_n_keys(unsigned n)
+{
+    if (n > nkeyvalues) {
+        if (keyvalues)
+            delete [] keyvalues;
+
+        keyvalues = new KeyValueData[n];
+    }
+
+    nkeyvalues = n;
+}
+
+void HaveKeyValueData::resize_n_keys(unsigned n, bool realloc)
+{
+    if (realloc) {
+        KeyValueData * kv = new KeyValueData[n];
+
+        if (keyvalues) {
+            for (unsigned index = 0; index != nkeyvalues; index += 1) {
+                kv[index].set_key(keyvalues[index].get_key());
+                kv[index].set_value(keyvalues[index].get_value());
+            }
+
+            delete [] keyvalues;
+        }
+
+        keyvalues = kv;
+    }
+
+    nkeyvalues = n;
+}
+
+void HaveKeyValueData::send_def(ToolCom * com) const
+{
+    com->write_unsigned(nkeyvalues);
+
+    for (unsigned index = 0; index != nkeyvalues; index += 1) {
+        com->write_string(keyvalues[index].get_key());
+        com->write_string(keyvalues[index].get_value());
+    }
+}
+
+void HaveKeyValueData::set_value(QString k, QString v)
+{
+    unsigned index;
+
+    for (index = 0; index != nkeyvalues; index += 1) {
+        if (keyvalues[index].get_key() == k) {
+            keyvalues[index].set_value(v);
+            return;
+        }
+    }
+
+    // value must be added
+    KeyValueData * t = new KeyValueData[nkeyvalues + 1];
+
+    for (index = 0; index != nkeyvalues; index += 1) {
+        t[index].set_key(keyvalues[index].get_key());
+        t[index].set_value(keyvalues[index].get_value());
+    }
+
+    t[index].set_key(k);
+    t[index].set_value(v);
+
+    delete [] keyvalues;
+    keyvalues = t;
+    nkeyvalues += 1;
+}
+
+void HaveKeyValueData::save(QTextStream & st) const
+{
+    if (nkeyvalues) {
+        nl_indent(st);
+        st << "ncouples " << nkeyvalues;
+
+        for (unsigned i = 0; i != nkeyvalues; i += 1) {
+            nl_indent(st);
+            st << "key ";
+            save_string(keyvalues[i].get_key(), st);
+            st << " value ";
+            qDebug() << keyvalues[i].get_value();
+            save_string(keyvalues[i].get_value(), st);
+        }
+    }
+}
+
+void HaveKeyValueData::read(char *& st, char *& k)
+{
+    if (!strcmp(k, "ncouples")) {
+        set_n_keys(read_unsigned(st));
+
+        for (unsigned i = 0; i != nkeyvalues; i += 1) {
+            read_keyword(st, "key");
+            keyvalues[i].set_key(read_string(st));
+            read_keyword(st, "value");
+            keyvalues[i].set_value(read_string(st));
+        }
+
+        k = read_keyword(st);
+    }
+    else
+        set_n_keys(0);
+}
diff --git a/src/data/HaveKeyValueData.h b/src/data/HaveKeyValueData.h
index f82cf5d79..427aad30b 100644
--- a/src/data/HaveKeyValueData.h
+++ b/src/data/HaveKeyValueData.h
@@ -1,73 +1,73 @@
-// *************************************************************************
-//
-// Copyright 2004-2010 Bruno PAGES  .
-// Copyright 2012-2013 Nikolai Marchenko.
-// Copyright 2012-2013 Leonardo Guilherme.
-//
-// This file is part of the DOUML Uml Toolkit.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License Version 3.0 as published by
-// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
-//  packaging of this file.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License Version 3.0 for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// e-mail : doumleditor@gmail.com
-// home   : http://sourceforge.net/projects/douml
-//
-// *************************************************************************
-
-#ifndef HAVEKEYVALUEDATA_H
-#define HAVEKEYVALUEDATA_H
-
-#include <qstring.h>
-//Added by qt3to4:
-#include <QTextStream>
-
-class QTextStream;
-class KeyValueData;
-class ToolCom;
-
-// this class manage a table of couple key-value
-
-class HaveKeyValueData
-{
-protected:
-    KeyValueData * keyvalues;	// remark : do NOT use QArray
-    unsigned nkeyvalues;
-
-public:
-    HaveKeyValueData();
-    virtual ~HaveKeyValueData();
-
-    const char * get_key(int rank) const;
-
-    void set_key(int rank, const char * k);
-    const char * get_value(int rank) const;
-    const char * get_value(const char * k) const;
-    void set_value(int rank, const char * v);
-    int has_key(const char*);
-    unsigned get_n_keys() const {
-        return nkeyvalues;
-    };
-    void remove_key_value(unsigned index);
-    void remove_key_value(const char * k);
-    void set_n_keys(unsigned n);	// the old key-values are lost
-    void resize_n_keys(unsigned n, bool realloc); // the old key-values are not lost
-
-    void send_def(ToolCom * com) const;
-    void set_value(const char * k, const char * v);
-
-    void save(QTextStream &) const;
-    void read(char *& , char *& k);
-};
-
-#endif
+// *************************************************************************
+//
+// Copyright 2004-2010 Bruno PAGES  .
+// Copyright 2012-2013 Nikolai Marchenko.
+// Copyright 2012-2013 Leonardo Guilherme.
+//
+// This file is part of the DOUML Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+// home   : http://sourceforge.net/projects/douml
+//
+// *************************************************************************
+
+#ifndef HAVEKEYVALUEDATA_H
+#define HAVEKEYVALUEDATA_H
+
+#include <qstring.h>
+//Added by qt3to4:
+#include <QTextStream>
+
+class QTextStream;
+class KeyValueData;
+class ToolCom;
+
+// this class manage a table of couple key-value
+
+class HaveKeyValueData
+{
+protected:
+    KeyValueData * keyvalues;	// remark : do NOT use QArray
+    unsigned nkeyvalues;
+
+public:
+    HaveKeyValueData();
+    virtual ~HaveKeyValueData();
+
+    QString get_key(int rank) const;
+
+    void set_key(int rank, QString k);
+    QString get_value(int rank) const;
+    QString get_value(QString k) const;
+    void set_value(int rank, QString v);
+    int has_key(QString);
+    unsigned get_n_keys() const {
+        return nkeyvalues;
+    };
+    void remove_key_value(unsigned index);
+    void remove_key_value(QString k);
+    void set_n_keys(unsigned n);	// the old key-values are lost
+    void resize_n_keys(unsigned n, bool realloc); // the old key-values are not lost
+
+    void send_def(ToolCom * com) const;
+    void set_value(QString k, QString v);
+
+    void save(QTextStream &) const;
+    void read(char *& , char *& k);
+};
+
+#endif
diff --git a/src/data/KeyValueData.cpp b/src/data/KeyValueData.cpp
index b4c1dc2ff..998799906 100644
--- a/src/data/KeyValueData.cpp
+++ b/src/data/KeyValueData.cpp
@@ -31,12 +31,12 @@
 
 #include "KeyValueData.h"
 
-void KeyValueData::set_key(const char * s)
+void KeyValueData::set_key(QString s)
 {
     key = s;
 }
 
-void KeyValueData::set_value(const char * s)
+void KeyValueData::set_value(QString s)
 {
     value = s;
 }
diff --git a/src/data/KeyValueData.h b/src/data/KeyValueData.h
index 023fb90fe..ba19bc9c4 100644
--- a/src/data/KeyValueData.h
+++ b/src/data/KeyValueData.h
@@ -33,19 +33,19 @@
 class KeyValueData
 {
 protected:
-    WrapperStr key;
-    WrapperStr value;
+    QString key;
+    QString value;
 
 public:
     KeyValueData() {};
 
-    void set_key(const char *);
-    const char * get_key() {
+    void set_key(QString);
+    QString get_key() {
         return key;
     };
 
-    void set_value(const char *);
-    const char * get_value() {
+    void set_value(QString);
+    QString get_value() {
         return value;
     };
 };
diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp
index 446eb12a4..b6a01b83d 100644
--- a/src/data/OperationData.cpp
+++ b/src/data/OperationData.cpp
@@ -34,7 +34,6 @@
 //Added by qt3to4:
 #include <QTextStream>
 
-
 #include "OperationData.h"
 #include "ClassData.h"
 #include "ParamData.h"
@@ -42,8 +41,8 @@
 #include "KeyValueData.h"
 #include "BrowserClass.h"
 #include "OperationDialog.h"
-#include "BrowserOperation.h"
 #include "ClassDialog.h"
+#include "BrowserOperation.h"
 #include "GenerationSettings.h"
 #include "myio.h"
 #include "translate.h"
@@ -66,13 +65,18 @@ OperationData::OperationData(int id)
       isa_class_operation(FALSE), is_abstract(FALSE),
       force_body_gen(FALSE), is_volatile(FALSE),
       cpp_const(FALSE), cpp_friend(FALSE), cpp_virtual(FALSE),
-      cpp_inline(FALSE), cpp_get_set_frozen(FALSE), cpp_indent_body(TRUE),
+      cpp_inline(FALSE),
+      cpp_default(FALSE),
+      cpp_delete(FALSE),
+      cpp_override(FALSE),
+      cpp_final(FALSE),
+      cpp_get_set_frozen(FALSE), cpp_indent_body(TRUE),
       java_final(FALSE), java_synchronized(FALSE),
       java_get_set_frozen(FALSE), java_indent_body(TRUE),
       php_final(FALSE), php_get_set_frozen(FALSE), php_indent_body(TRUE),
       python_get_set_frozen(FALSE), python_indent_body(TRUE),
       idl_oneway(FALSE), idl_get_set_frozen(FALSE),
-      nparams(0), nexceptions(0), params(0), exceptions(0)
+      nparams(0), nexceptions(0), exceptions(0)
 {
 }
 
@@ -89,6 +93,10 @@ OperationData::OperationData(OperationData * model, BrowserNode * bn)
       cpp_friend(model->cpp_friend),
       cpp_virtual(model->cpp_virtual),
       cpp_inline(model->cpp_inline),
+      cpp_default(model->cpp_default),
+      cpp_delete(model->cpp_delete),
+      cpp_override(model->cpp_override),
+      cpp_final(model->cpp_final),
       cpp_get_set_frozen(FALSE),
       cpp_indent_body(model->cpp_indent_body),
       java_final(model->java_final),
@@ -119,17 +127,19 @@ OperationData::OperationData(OperationData * model, BrowserNode * bn)
     return_type = model->return_type;
     depend_on(return_type.type);
 
-    if (nparams == 0)
-        params = 0;
-    else {
-        params = new ParamData[nparams];
 
-        for (unsigned i = 0; i != nparams; i += 1) {
-            params[i] = model->params[i];
-            depend_on(params[i].get_type().type);
+    if(nparams > 0)
+    {
+        for(int i(0); i < nparams; ++i)
+        {
+            params << std::shared_ptr<ParamData>(new ParamData());
+            *params[i] = *model->params[i];
+            depend_on(params[i]->get_type().type);
         }
     }
 
+
+
     if (nexceptions == 0)
         exceptions = 0;
     else {
@@ -144,8 +154,6 @@ OperationData::OperationData(OperationData * model, BrowserNode * bn)
 
 OperationData::~OperationData()
 {
-    if (params)
-        delete [] params;
 
     if (exceptions)
         delete [] exceptions;
@@ -168,24 +176,28 @@ void OperationData::PropagateFrom(const OperationData * model, bool goBack, QLis
     uml_visibility=model->uml_visibility;
     cpp_visibility=UmlDefaultVisibility;
     //is_abstract = model->is_abstract;
-    force_body_gen = model->force_body_gen;
+    //force_body_gen = model->force_body_gen;
     is_volatile = model->is_volatile;
     cpp_const = model->cpp_const;
     cpp_friend = model->cpp_friend;
     cpp_virtual = model->cpp_virtual;
-    cpp_inline = model->cpp_inline;
+    cpp_default = model->cpp_default;
+    cpp_delete = model->cpp_delete;
+    cpp_override = model->cpp_override;
+    cpp_final = model->cpp_final;
+    //cpp_inline = model->cpp_inline;
     cpp_get_set_frozen = model->cpp_get_set_frozen;
-    cpp_indent_body = model->cpp_indent_body;
-    java_final = model->java_final;
-    java_synchronized = model->java_synchronized;
+    //cpp_indent_body = model->cpp_indent_body;
+    //java_final = model->java_final;
+    //java_synchronized = model->java_synchronized;
     java_get_set_frozen = model->java_get_set_frozen;
     java_indent_body = model->java_indent_body;
-    php_final = model->php_final;
+    //php_final = model->php_final;
     php_get_set_frozen = model->php_get_set_frozen;
     php_indent_body = model->php_indent_body;
     python_get_set_frozen = model->python_get_set_frozen;
 
-    python_indent_body = model->python_indent_body;
+    //python_indent_body = model->python_indent_body;
     idl_oneway = model->idl_oneway;
     idl_get_set_frozen = model->idl_get_set_frozen;
 
@@ -193,7 +205,7 @@ void OperationData::PropagateFrom(const OperationData * model, bool goBack, QLis
     {
         for (unsigned i = 0; i != nparams; i += 1)
         {
-            no_longer_depend_on(params[i].get_type().type);
+            no_longer_depend_on(params[i]->get_type().type);
         }
     }
     if (nexceptions != 0)
@@ -207,27 +219,24 @@ void OperationData::PropagateFrom(const OperationData * model, bool goBack, QLis
     nexceptions = model->nexceptions;
     constraint = model->constraint;
     cpp_decl = model->cpp_decl;
-    java_annotation = model->java_annotation;
+    //java_annotation = model->java_annotation; todo
     python_decorator = model->python_decorator;
     idl_decl = model->idl_decl;
 
-    cpp_def.assign((const char *) model->cpp_def, FALSE);
-    java_def.assign((const char *) model->java_def, FALSE);
-    php_def.assign((const char *) model->php_def, FALSE);
-    python_def.assign((const char *) model->python_def, FALSE);
+    cpp_def =  model->cpp_def;
+    java_def = model->java_def;
+    php_def = model->php_def;
+    python_def =model->python_def;
     return_type = model->return_type;
     depend_on(return_type.type);
 
-    if (nparams == 0)
-        params = 0;
-    else
+    if(nparams > 0)
     {
-        params = new ParamData[nparams];
-
-        for (unsigned i = 0; i != nparams; i += 1)
+        for(int i(0); i < nparams; ++i)
         {
-            params[i] = model->params[i];
-            depend_on(params[i].get_type().type);
+            params << std::shared_ptr<ParamData>(new ParamData());
+            *params[i] = *model->params[i];
+            depend_on(params[i]->get_type().type);
         }
     }
 
@@ -271,6 +280,18 @@ void OperationData::set_deletedp(bool y)
         create_modified_body_file();
 }
 
+void OperationData::remove_param(std::shared_ptr<ParamData> param)
+{
+    nparams = nparams - 1;
+    params.removeAll(param);
+}
+
+void OperationData::insert_param(int position, std::shared_ptr<ParamData> param)
+{
+    nparams = nparams + 1;
+    params.insert(position, param);
+}
+
 void OperationData::clear(bool old)
 {
     all.clear(old);
@@ -293,22 +314,22 @@ bool OperationData::is_template_operation() const
 
 bool OperationData::is_template_operation(QString def) const
 {
-    int index1 = def.find("${class}");
+    int index1 = def.indexOf("${class}");
 
     if (index1 == -1)
         return FALSE;
 
-    int index2 = def.find("${name}", index1 + 8);
+    int index2 = def.indexOf("${name}", index1 + 8);
 
     if (index2 == -1)
         return FALSE;
 
     def = def.mid(index1 + 8, index2 - index1 - 8);
 
-    if ((index1 = def.find('<')) == -1)
+    if ((index1 = def.indexOf('<')) == -1)
         return FALSE;
 
-    return (def.find('>') > index1);
+    return (def.indexOf('>') > index1);
 }
 
 void OperationData::depend_on(BrowserClass * cl)
@@ -343,13 +364,13 @@ void OperationData::on_delete()
     unsigned short i;
 
     for (i = 0; i != nparams; i += 1) {
-        AType t = params[i].get_type();
+        AType t = params[i]->get_type();
 
         if (t.type && t.type->deletedp()) {
             t.explicit_type = t.type->get_name();
             t.type = 0;
 
-            params[i].set_type(t);
+            params[i]->set_type(t);
         }
     }
 
@@ -376,22 +397,22 @@ QString OperationData::default_cpp_decl(const QString & name)
         // constructor or destructor
         int index;
 
-        if ((index = s.find("${friend}")) != -1)
+        if ((index = s.indexOf("${friend}")) != -1)
             s.remove(index, 9);
 
-        if ((index = s.find("${static}")) != -1)
+        if ((index = s.indexOf("${static}")) != -1)
             s.remove(index, 9);
 
-        if ((index = s.find("${type}")) != -1)
+        if ((index = s.indexOf("${type}")) != -1)
             s.remove(index, (s.at(index + 7) == QChar(' ')) ? 8 : 7);
 
-        if ((index = s.find("${const}")) != -1)
+        if ((index = s.indexOf("${const}")) != -1)
             s.remove(index, 8);
 
-        if ((index = s.find("${abstract}")) != -1)
+        if ((index = s.indexOf("${abstract}")) != -1)
             s.remove(index, 11);
 
-        if ((name.at(0) != QChar('~')) && ((index = s.find("${virtual}")) != -1))
+        if ((name.at(0) != QChar('~')) && ((index = s.indexOf("${virtual}")) != -1))
             s.remove(index, 10);
     }
 
@@ -407,13 +428,13 @@ QString OperationData::default_cpp_def(const QString & name)
         // constructor or destructor
         int index;
 
-        if ((index = s.find("${type}")) != -1)
+        if ((index = s.indexOf("${type}")) != -1)
             s.remove(index, (s.at(index + 7) == QChar(' ')) ? 8 : 7);
 
-        if ((index = s.find("${const}")) != -1)
+        if ((index = s.indexOf("${const}")) != -1)
             s.remove(index, 8);
 
-        if ((index = s.find("${staticnl}")) != -1)
+        if ((index = s.indexOf("${staticnl}")) != -1)
             s.replace(index, 11, " ");
     }
 
@@ -429,23 +450,23 @@ QString OperationData::default_java_def(const QString & name)
         // constructor
         int index;
 
-        if ((index = s.find("${static}")) != -1)
+        if ((index = s.indexOf("${static}")) != -1)
             s.remove(index, 9);
 
-        if ((index = s.find("${abstract}")) != -1)
+        if ((index = s.indexOf("${abstract}")) != -1)
             s.remove(index, 11);
 
-        if ((index = s.find("${type}")) != -1)
+        if ((index = s.indexOf("${type}")) != -1)
             s.remove(index, (s.at(index + 7) == QChar(' ')) ? 8 : 7);
 
-        if ((index = s.find("${staticnl}")) != -1)
+        if ((index = s.indexOf("${staticnl}")) != -1)
             s.replace(index, 11, " ");
     }
     else {
         for (const char * cpponly = "()&^[]%|!+-*/=<>~";
              *cpponly;
              cpponly += 1) {
-            if (name.find(*cpponly) != -1) {
+            if (name.indexOf(*cpponly) != -1) {
                 // operator or destructor
                 return QString();
             }
@@ -465,12 +486,12 @@ QString OperationData::default_php_def(const QString & name, bool nobody)
         // constructor destructor
         int index;
 
-        if ((index = s.find("${static}")) != -1)
+        if ((index = s.indexOf("${static}")) != -1)
             s.remove(index, 9);
     }
 
     if (nobody) {
-        int index = s.find("${)}");
+        int index = s.indexOf("${)}");
 
         if (index != -1)
             s = s.left(index + 4) + ";";
@@ -482,7 +503,7 @@ QString OperationData::default_php_def(const QString & name, bool nobody)
 QString OperationData::default_python_def(const QString & name)
 {
     if (name == "__init__") {
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = ((BrowserNode *) browser_node->parent())->firstChild();
              child != 0;
@@ -498,14 +519,13 @@ QString OperationData::default_python_def(const QString & name)
         }
 
         QString s = GenerationSettings::python_default_oper_def();
-        int index = s.find("${(}");
+        int index = s.indexOf("${(}");
 
         if (index != -1) {
             s.insert(index + 4, "${p0}${v0}");
             return s;
         }
     }
-
     return GenerationSettings::python_default_oper_def();
 }
 
@@ -516,21 +536,21 @@ QString OperationData::default_idl_decl(const QString & name)
 
     if (name == parent_name) {
         // constructor
-        int index = s.find("${name}");
+        int index = s.indexOf("${name}");
 
         if ((index != -1) &&
-            (s.find("factory") == -1) &&
-            (s.find("finder") == -1))
+            (s.indexOf("factory") == -1) &&
+            (s.indexOf("finder") == -1))
             s.insert(index, "factory init_");
 
-        if ((index = s.find("${type}")) != -1)
+        if ((index = s.indexOf("${type}")) != -1)
             s.remove(index, (s.at(index + 7) == QChar(' ')) ? 8 : 7);
     }
     else {
         for (const char * cpponly = "()&^[]%|!+-*/=<>~";
              *cpponly;
              cpponly += 1) {
-            if (name.find(*cpponly) != -1) {
+            if (name.indexOf(*cpponly) != -1) {
                 // operator or destructor
                 return QString();
             }
@@ -543,7 +563,6 @@ QString OperationData::default_idl_decl(const QString & name)
 void OperationData::set_browser_node(BrowserOperation * o, bool update)
 {
     BasicData::set_browser_node(o);
-
     if (update) {
         if (uml_visibility == UmlDefaultVisibility)
             uml_visibility =
@@ -574,10 +593,12 @@ void OperationData::set_browser_node(BrowserOperation * o, bool update)
             python_def.assign(default_python_def(browser_node->get_name()),
                               TRUE);
 
-            if (!strcmp(browser_node->get_name(), "__init__")) {
+            if (browser_node->get_name() == "__init__") {
                 nparams = 1;
-                params = new ParamData[1];
-                params[0].set_name("self");
+                //params = new ParamData[1];
+                params.clear();
+                params << std::shared_ptr<ParamData>(new ParamData());
+                params[0]->set_name("self");
             }
         }
 
@@ -588,6 +609,7 @@ void OperationData::set_browser_node(BrowserOperation * o, bool update)
                 idl_decl = "";
         }
     }
+
 }
 
 QString OperationData::definition(bool full, bool with_kind) const
@@ -618,7 +640,7 @@ QString OperationData::definition(bool full, bool withdir,
 
             for (index = 0; index != nparams; index += 1) {
                 result += sep;
-                result += params[index].definition(withdir, withname, mode);
+                result += params[index]->definition(withdir, withname, mode);
                 sep = ", ";
             }
 
@@ -643,7 +665,6 @@ QString OperationData::definition(bool full, DrawingLanguage language,
     switch (language) {
     case UmlView:
         return definition(full, withdir, withname, mode);
-
     case CppView:
         if (full)
             return OperationDialog::cpp_decl((BrowserOperation *) browser_node,
@@ -694,16 +715,17 @@ QString OperationData::definition(bool full, DrawingLanguage language,
 bool OperationData::decldefbody_contain(const QString & s, bool cs,
                                         BrowserNode *)
 {
-    return ((QString(get_cppdecl()).find(s, 0, cs) != -1) ||
-            (QString(get_cppdef()).find(s, 0, cs) != -1) ||
-            (QString(get_javadef()).find(s, 0, cs) != -1) ||
-            (QString(get_phpdef()).find(s, 0, cs) != -1) ||
-            (QString(get_pythondef()).find(s, 0, cs) != -1) ||
-            (QString(get_idldecl()).find(s, 0, cs) != -1) ||
-            (QString(get_body('c')).find(s, 0, cs) != -1) ||
-            (QString(get_body('j')).find(s, 0, cs) != -1) ||
-            (QString(get_body('y')).find(s, 0, cs) != -1) ||
-            (QString(get_body('p')).find(s, 0, cs) != -1));
+    Qt::CaseSensitivity csx = (Qt::CaseSensitivity)cs;
+    return ((QString(get_cppdecl()).indexOf(s, 0, csx) != -1) ||
+            (QString(get_cppdef()).indexOf(s, 0, csx) != -1) ||
+            (QString(get_javadef()).indexOf(s, 0, csx) != -1) ||
+            (QString(get_phpdef()).indexOf(s, 0, csx) != -1) ||
+            (QString(get_pythondef()).indexOf(s, 0, csx) != -1) ||
+            (QString(get_idldecl()).indexOf(s, 0, csx) != -1) ||
+            (QString(get_body('c')).indexOf(s, 0, csx) != -1) ||
+            (QString(get_body('j')).indexOf(s, 0, csx) != -1) ||
+            (QString(get_body('y')).indexOf(s, 0, csx) != -1) ||
+            (QString(get_body('p')).indexOf(s, 0, csx) != -1));
 }
 
 UmlVisibility OperationData::get_visibility(BrowserNode *)
@@ -711,6 +733,15 @@ UmlVisibility OperationData::get_visibility(BrowserNode *)
     return uml_visibility;
 }
 
+void OperationData::set_uml_visibility(UmlVisibility v)
+{
+    uml_visibility = v;
+}
+//UmlVisibility OperationData::get_visibility()
+//{
+//    return uml_visibility;
+//}
+
 void OperationData::set_is_abstract(bool yes)
 {
     is_abstract = yes;
@@ -725,9 +756,9 @@ void OperationData::set_is_abstract(bool yes)
         QString d = get_phpdef();
         int index;
 
-        if (!d.isEmpty() && ((index = d.find("${)};")) != -1)) {
+        if (!d.isEmpty() && ((index = d.indexOf("${)};")) != -1)) {
             QString dd = GenerationSettings::php_default_oper_def();
-            int index2 = dd.find("${)}");
+            int index2 = dd.indexOf("${)}");
 
             if (index2 != -1) {
                 d = d.left(index) + dd.mid(index2);
@@ -749,9 +780,33 @@ void OperationData::set_return_type(const AType & t)
     return_type.explicit_type = t.explicit_type;
 }
 
-const char * OperationData::get_param_name(int rank) const
+void OperationData::set_return_type(const QString &value)
+{
+    QStringList list;
+    BrowserNodeList nodes;
+    BrowserClass::instances(nodes);
+    nodes.full_names(list);
+
+//    oper->set_param_dir(index, (UmlParamDirection) DirList.indexOfIndex(text(index, 0)));
+
+//    oper->set_param_name(index, text(index, 1).trimmed());
+
+    AType t;
+    if (!value.isEmpty())
+    {
+        int rank = list.indexOf(value);
+
+        if (rank != -1)
+            t.type = (BrowserClass *) nodes.at(rank);
+        else
+            t.explicit_type = value;
+    }
+    return_type = t;
+}
+
+QString OperationData::get_param_name(int rank) const
 {
-    return params[rank].get_name();
+    return params[rank]->get_name();
 }
 
 QStringList OperationData::get_param_names() const
@@ -759,7 +814,7 @@ QStringList OperationData::get_param_names() const
     QStringList result;
     for(int i(0); i < nparams; i++)
     {
-        result.append(params[i].get_name());
+        result.append(params[i]->get_name());
     }
     return result;
 }
@@ -769,7 +824,7 @@ QStringList OperationData::get_param_types() const
     QStringList result;
     for(int i(0); i < nparams; i++)
     {
-        result.append(params[i].get_type().get_type());
+        result.append(params[i]->get_type().get_type());
     }
     return result;
 }
@@ -779,44 +834,44 @@ QStringList OperationData::get_param_default_values() const
     QStringList result;
     for(int i(0); i < nparams; i++)
     {
-        result.append(params[i].get_default_value());
+        result.append(params[i]->get_default_value());
     }
     return result;
 }
 
 void OperationData::set_param_name(int rank, const char * str)
 {
-    params[rank].set_name(str);
+    params[rank]->set_name(str);
 }
 
 UmlParamDirection OperationData::get_param_dir(int rank) const
 {
-    return params[rank].get_dir();
+    return params[rank]->get_dir();
 }
 
 void OperationData::set_param_dir(int rank, UmlParamDirection dir)
 {
-    params[rank].set_dir(dir);
+    params[rank]->set_dir(dir);
 }
 
 const AType & OperationData::get_param_type(int rank) const
 {
-    return params[rank].get_type();
+    return params[rank]->get_type();
 }
 
 const char * OperationData::get_param_default_value(int rank) const
 {
-    return params[rank].get_default_value();
+    return params[rank]->get_default_value();
 }
 
 void OperationData::set_param_default_value(int rank, const char * str)
 {
-    params[rank].set_default_value(str);
+    params[rank]->set_default_value(str);
 }
 
 void OperationData::set_param_type(int rank, const AType & t)
 {
-    const AType & old = params[rank].get_type();
+    const AType & old = params[rank]->get_type();
 
     if (old.type != t.type) {
         if ((old.type != 0) && unsubscribe(old.type->get_data()))
@@ -825,19 +880,22 @@ void OperationData::set_param_type(int rank, const AType & t)
         depend_on(t.type);
     }
 
-    params[rank].set_type(t);
+    params[rank]->set_type(t);
 }
 
 void OperationData::set_n_params(unsigned n)
 {
-    if (n > nparams) {
-        if (params)
-            delete [] params;
-
-        params = new ParamData[n];
+    int add_count = 0;
+    add_count = n - params.count();
+    if(add_count > 0)
+    {
+        for(int i(0); i < add_count; ++i)
+            params << std::shared_ptr<ParamData>(new ParamData());
     }
-
-    nparams = n;
+    else if (add_count < 0)
+        for(int i(0); i < qAbs(add_count); ++i)
+            params.pop_back();
+    nparams = params.count();
 }
 
 const AType & OperationData::get_exception(int rank) const
@@ -874,7 +932,6 @@ void OperationData::set_n_exceptions(unsigned n)
 void OperationData::edit(DrawingLanguage l)
 {
     setName(browser_node->get_name());
-
     //(new OperationDialog(this, l))->show();
     OperationDialog::Instance(this, l)->show();
 }
@@ -902,35 +959,35 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
                                       QString multiplicity, bool isStatic)
 {
     remove_comments(attcpp_decl);
-    attcpp_decl = attcpp_decl.stripWhiteSpace();
+    attcpp_decl = attcpp_decl.trimmed();
 
     int index;
 
-    if ((index = attcpp_decl.find("${comment}")) != -1)
+    if ((index = attcpp_decl.indexOf("${comment}")) != -1)
         attcpp_decl.remove(index, 10);
 
-    if ((index = attcpp_decl.find("${description}")) != -1)
+    if ((index = attcpp_decl.indexOf("${description}")) != -1)
         attcpp_decl.remove(index, 14);
 
-    if ((index = attcpp_decl.find("${visibility}")) != -1)
+    if ((index = attcpp_decl.indexOf("${visibility}")) != -1)
         attcpp_decl.remove(index, 13);
 
-    if ((index = attcpp_decl.find("${static}")) != -1)
+    if ((index = attcpp_decl.indexOf("${static}")) != -1)
         attcpp_decl.remove(index, 9);
 
-    if ((index = attcpp_decl.find("${mutable}")) != -1)
+    if ((index = attcpp_decl.indexOf("${mutable}")) != -1)
         attcpp_decl.remove(index, 10);
 
-    if ((index = attcpp_decl.find("${volatile}")) != -1)
+    if ((index = attcpp_decl.indexOf("${volatile}")) != -1)
         attcpp_decl.remove(index, 11);
 
-    if ((index = attcpp_decl.find("${value}")) != -1)
+    if ((index = attcpp_decl.indexOf("${value}")) != -1)
         attcpp_decl.truncate(index);
 
-    if ((index = attcpp_decl.find("${h_value}")) != -1)
+    if ((index = attcpp_decl.indexOf("${h_value}")) != -1)
         attcpp_decl.truncate(index);
 
-    if ((index = attcpp_decl.find(";")) != -1)
+    if ((index = attcpp_decl.indexOf(";")) != -1)
         attcpp_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attcpp_decl);
@@ -946,20 +1003,20 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
         QString next_mult;
         QString type_spec_name_spec = attcpp_decl;
         QString type_spec_name;
-        bool has_stereotype = (attcpp_decl.find("${stereotype}") != -1);
+        bool has_stereotype = (attcpp_decl.indexOf("${stereotype}") != -1);
 
-        type_spec_name_spec.replace(type_spec_name_spec.find(attr_name_spec),
+        type_spec_name_spec.replace(type_spec_name_spec.indexOf(attr_name_spec),
                                     attr_name_spec.length(), "${name}");
 
-        if ((index = type_spec_name_spec.find("${multiplicity}")) != -1) {
+        if ((index = type_spec_name_spec.indexOf("${multiplicity}")) != -1) {
             type_spec_name_spec.remove(index, 15);
 
             if (! multiplicity.isEmpty()) {
                 next_mult = "${const})";
 
-                if (*((const char *) multiplicity) != '[')
+                if (*((const char *) multiplicity.toLatin1().constData()) != '[')
                     multiplicity = "[" + multiplicity + "]";
-                else if (((index = multiplicity.find(']')) != -1) &&
+                else if (((index = multiplicity.indexOf(']')) != -1) &&
                          (index != (int)(multiplicity.length() - 1)))
                     // several dims
                     next_mult += multiplicity.mid(index + 1);
@@ -968,7 +1025,7 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
             }
         }
 
-        if ((index = type_spec_name_spec.find("${const}")) != -1) {
+        if ((index = type_spec_name_spec.indexOf("${const}")) != -1) {
             if (attis_const || GenerationSettings::cpp_default_get_value_const()) {
                 if (has_multiplicity) {
                     const_mult_value = TRUE;
@@ -985,7 +1042,7 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
 
         QString type_spec_oper_name = type_spec_name_spec;
 
-        if ((index = type_spec_oper_name.find("${name}")) != -1) {
+        if ((index = type_spec_oper_name.indexOf("${name}")) != -1) {
             if (const_mult_value) {
                 if (type_spec_oper_name[index].isLetterOrNumber()) {
                     type_spec_oper_name = type_spec_name_spec.insert(index, " const ");
@@ -1004,7 +1061,7 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
 
         if (((index = d.find("${type}")) != -1) &&
             ((index2 = d.find("${name}", index + 1)) != -1)) {
-            d.replace(index, index2 - index + 7, type_spec_oper_name);
+            d.replace(index, index2 - index + 7, type_spec_oper_name.toLatin1().constData());
 
             if ((index = d.find("${abstract}")) != -1)
                 d.remove(index, 11);
@@ -1018,7 +1075,7 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
                     d.remove(index, 8);
 
                 if ((index = d.find("${)}")) != -1) {
-                    d.insert(index + 4, (const char *) next_mult);
+                    d.insert(index + 4, (const char *) next_mult.toLatin1().constData());
                 }
                 else
                     d = 0;
@@ -1033,7 +1090,7 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
 
         type_spec_name = type_spec_name_spec;
 
-        if ((index = type_spec_name.find("${name}")) != -1)
+        if ((index = type_spec_name.indexOf("${name}")) != -1)
             type_spec_name.replace(index, 7,
                                    (has_multiplicity)
                                    ? "(* ${class}::$$"
@@ -1044,11 +1101,11 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
 
         if (((index = d.find("${type}")) != -1) &&
             ((index2 = d.find("${name}", index + 1)) != -1)) {
-            d.replace(index, index2 - index + 7, type_spec_name);
+            d.replace(index, index2 - index + 7, type_spec_name.toLatin1().constData());
 
             QString attr_full_name = attr_name_spec;
 
-            if ((index = attr_full_name.find("${name}")) != -1)
+            if ((index = attr_full_name.indexOf("${name}")) != -1)
                 attr_full_name.replace(index, 7, attr_name);
 
             if ((index = d.find("$$")) != -1)
@@ -1059,7 +1116,7 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
                     d.remove(index, 8);
 
                 if ((index = d.find("${)}")) != -1)
-                    d.insert(index + 4, (const char *) next_mult);
+                    d.insert(index + 4, (const char *) next_mult.toLatin1().constData());
                 else
                     d = 0;
             }
@@ -1071,7 +1128,7 @@ void OperationData::update_cpp_get_of(WrapperStr & decl, WrapperStr & def,
                 if (d[index - 1] == '\n')
                     indent = "  ";
 
-                d.replace(index, 7, indent + "return " + attr_full_name + end);
+                d.replace(index, 7, QString(indent + "return " + attr_full_name + end).toLatin1().constData());
             }
 
             def = d;
@@ -1085,41 +1142,41 @@ void OperationData::update_java_get_of(WrapperStr & def, const QString & attr_na
                                        QString attjava_decl, QString multiplicity)
 {
     remove_comments(attjava_decl);
-    attjava_decl = attjava_decl.stripWhiteSpace();
+    attjava_decl = attjava_decl.trimmed();
 
     int index;
 
-    if ((index = attjava_decl.find("${comment}")) != -1)
+    if ((index = attjava_decl.indexOf("${comment}")) != -1)
         attjava_decl.remove(index, 10);
 
-    if ((index = attjava_decl.find("${@}")) != -1)
+    if ((index = attjava_decl.indexOf("${@}")) != -1)
         attjava_decl.remove(index, 4);
 
-    if ((index = attjava_decl.find("${description}")) != -1)
+    if ((index = attjava_decl.indexOf("${description}")) != -1)
         attjava_decl.remove(index, 14);
 
-    if ((index = attjava_decl.find("${visibility}")) != -1)
+    if ((index = attjava_decl.indexOf("${visibility}")) != -1)
         attjava_decl.remove(index, 13);
 
-    if ((index = attjava_decl.find("${static}")) != -1)
+    if ((index = attjava_decl.indexOf("${static}")) != -1)
         attjava_decl.remove(index, 9);
 
-    if ((index = attjava_decl.find("${final}")) != -1)
+    if ((index = attjava_decl.indexOf("${final}")) != -1)
         attjava_decl.remove(index, 8);
 
-    if ((index = attjava_decl.find("${transient}")) != -1)
+    if ((index = attjava_decl.indexOf("${transient}")) != -1)
         attjava_decl.remove(index, 12);
 
-    if ((index = attjava_decl.find("${volatile}")) != -1)
+    if ((index = attjava_decl.indexOf("${volatile}")) != -1)
         attjava_decl.remove(index, 11);
 
-    if ((index = attjava_decl.find("=")) != -1)
+    if ((index = attjava_decl.indexOf("=")) != -1)
         attjava_decl.truncate(index);
 
-    if ((index = attjava_decl.find("${value}")) != -1)
+    if ((index = attjava_decl.indexOf("${value}")) != -1)
         attjava_decl.truncate(index);
 
-    if ((index = attjava_decl.find(";")) != -1)
+    if ((index = attjava_decl.indexOf(";")) != -1)
         attjava_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attjava_decl);
@@ -1131,23 +1188,23 @@ void OperationData::update_java_get_of(WrapperStr & def, const QString & attr_na
         WrapperStr d = (const char *) GenerationSettings::java_default_oper_def();
         QString type_spec_name = attjava_decl;
 
-        type_spec_name.replace(type_spec_name.find(attr_name_spec),
+        type_spec_name.replace(type_spec_name.indexOf(attr_name_spec),
                                attr_name_spec.length(), "$$");
 
         if (((index = d.find("${type}")) != -1) &&
             ((index2 = d.find("${name}", index + 1)) != -1)) {
-            d.replace(index, index2 - index + 7, type_spec_name);
+            d.replace(index, index2 - index + 7, type_spec_name.toLatin1().constData());
 
             QString attr_full_name = attr_name_spec;
 
-            if ((index = attr_full_name.find("${name}")) != -1)
+            if ((index = attr_full_name.indexOf("${name}")) != -1)
                 attr_full_name.replace(index, 7, attr_name);
 
             if ((index = d.find("$$")) != -1)
                 d.replace(index, 2, "${name}");
 
             if ((index = d.find("${multiplicity}")) != -1)
-                d.replace(index, 15, java_multiplicity(multiplicity));
+                d.replace(index, 15, java_multiplicity(multiplicity).toLatin1().constData());
 
             if ((index = d.find("${body}")) != -1) {
                 QString indent;
@@ -1156,7 +1213,7 @@ void OperationData::update_java_get_of(WrapperStr & def, const QString & attr_na
                 if (d[index - 1] == '\n')
                     indent = "  ";
 
-                d.replace(index, 7, indent + "return " + attr_full_name + end);
+                d.replace(index, 7, QString(indent + "return " + attr_full_name + end).toLatin1().constData());
             }
 
             def = d;
@@ -1170,32 +1227,32 @@ void OperationData::update_php_get_of(WrapperStr & def, const QString & attr_nam
                                       QString attphp_decl)
 {
     remove_comments(attphp_decl);
-    attphp_decl = attphp_decl.stripWhiteSpace();
+    attphp_decl = attphp_decl.trimmed();
 
     int index;
 
-    if ((index = attphp_decl.find("${comment}")) != -1)
+    if ((index = attphp_decl.indexOf("${comment}")) != -1)
         attphp_decl.remove(index, 10);
 
-    if ((index = attphp_decl.find("${description}")) != -1)
+    if ((index = attphp_decl.indexOf("${description}")) != -1)
         attphp_decl.remove(index, 14);
 
-    if ((index = attphp_decl.find("${visibility}")) != -1)
+    if ((index = attphp_decl.indexOf("${visibility}")) != -1)
         attphp_decl.remove(index, 13);
 
-    if ((index = attphp_decl.find("${static}")) != -1)
+    if ((index = attphp_decl.indexOf("${static}")) != -1)
         attphp_decl.remove(index, 9);
 
-    if ((index = attphp_decl.find("${var}")) != -1)
+    if ((index = attphp_decl.indexOf("${var}")) != -1)
         attphp_decl.remove(index, 6);
 
-    if ((index = attphp_decl.find("${const}")) != -1)
+    if ((index = attphp_decl.indexOf("${const}")) != -1)
         attphp_decl.remove(index, 8);
 
-    if ((index = attphp_decl.find("${value}")) != -1)
+    if ((index = attphp_decl.indexOf("${value}")) != -1)
         attphp_decl.truncate(index);
 
-    if ((index = attphp_decl.find(";")) != -1)
+    if ((index = attphp_decl.indexOf(";")) != -1)
         attphp_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attphp_decl);
@@ -1206,15 +1263,15 @@ void OperationData::update_php_get_of(WrapperStr & def, const QString & attr_nam
         WrapperStr d = (const char *) GenerationSettings::php_default_oper_def();
         QString type_spec_name = attphp_decl;
 
-        type_spec_name.replace(type_spec_name.find(attr_name_spec),
+        type_spec_name.replace(type_spec_name.indexOf(attr_name_spec),
                                attr_name_spec.length(), "$$");
 
         if ((index = d.find("${name}")) != -1) {
-            d.replace(index, 7, type_spec_name);
+            d.replace(index, 7, type_spec_name.toLatin1().constData());
 
             QString attr_full_name = attr_name_spec;
 
-            if ((index = attr_full_name.find("${name}")) != -1)
+            if ((index = attr_full_name.indexOf("${name}")) != -1)
                 attr_full_name.replace(index, 7, attr_name);
 
             if ((index = d.find("$$")) != -1)
@@ -1227,7 +1284,7 @@ void OperationData::update_php_get_of(WrapperStr & def, const QString & attr_nam
                 if (d[index - 1] == '\n')
                     indent = "  ";
 
-                d.replace(index, 7, indent + "return $this->" + attr_full_name + end);
+                d.replace(index, 7, QString(indent + "return $this->" + attr_full_name + end).toLatin1().constData());
             }
 
             def = d;
@@ -1241,34 +1298,34 @@ void OperationData::update_python_get_of(WrapperStr & def, const QString & attr_
         QString attpython_decl, bool attis_class_member)
 {
     remove_python_comments(attpython_decl);
-    attpython_decl = attpython_decl.stripWhiteSpace();
+    attpython_decl = attpython_decl.trimmed();
 
     int index;
 
-    if ((index = attpython_decl.find("${comment}")) != -1)
+    if ((index = attpython_decl.indexOf("${comment}")) != -1)
         attpython_decl.remove(index, 10);
 
-    if ((index = attpython_decl.find("${description}")) != -1)
+    if ((index = attpython_decl.indexOf("${description}")) != -1)
         attpython_decl.remove(index, 14);
 
-    if ((index = attpython_decl.find("${self}")) != -1)
+    if ((index = attpython_decl.indexOf("${self}")) != -1)
         attpython_decl.remove(index, 7);
 
-    if ((index = attpython_decl.find("${stereotype}")) != -1)
+    if ((index = attpython_decl.indexOf("${stereotype}")) != -1)
         attpython_decl.remove(index, 13);
 
-    if ((index = attpython_decl.find("${multiplicity}")) != -1)
+    if ((index = attpython_decl.indexOf("${multiplicity}")) != -1)
         attpython_decl.remove(index, 15);
 
-    if ((index = attpython_decl.find("${value}")) != -1)
+    if ((index = attpython_decl.indexOf("${value}")) != -1)
         attpython_decl.remove(index, 8);
 
-    if ((index = attpython_decl.find("${type}")) != -1)
+    if ((index = attpython_decl.indexOf("${type}")) != -1)
         attpython_decl.truncate(index);
 
-    if ((index = attpython_decl.find(" =")) != -1)
+    if ((index = attpython_decl.indexOf(" =")) != -1)
         attpython_decl.truncate(index);
-    else if ((index = attpython_decl.find("=")) != -1)
+    else if ((index = attpython_decl.indexOf("=")) != -1)
         attpython_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attpython_decl);
@@ -1279,15 +1336,15 @@ void OperationData::update_python_get_of(WrapperStr & def, const QString & attr_
         WrapperStr d = (const char *) GenerationSettings::python_default_oper_def();
         QString type_spec_name = attpython_decl;
 
-        type_spec_name.replace(type_spec_name.find(attr_name_spec),
+        type_spec_name.replace(type_spec_name.indexOf(attr_name_spec),
                                attr_name_spec.length(), "$$");
 
         if ((index = d.find("${name}")) != -1) {
-            d.replace(index, 7, type_spec_name);
+            d.replace(index, 7, type_spec_name.toLatin1().constData());
 
             QString attr_full_name = attr_name_spec;
 
-            if ((index = attr_full_name.find("${name}")) != -1)
+            if ((index = attr_full_name.indexOf("${name}")) != -1)
                 attr_full_name.replace(index, 7, attr_name);
 
             if ((index = d.find("$$")) != -1)
@@ -1295,8 +1352,9 @@ void OperationData::update_python_get_of(WrapperStr & def, const QString & attr_
 
             if ((index = d.find("${body}")) != -1) {
                 d.replace(index, 7,
+                          QString(
                           ((attis_class_member) ? "return " : "return self.")
-                          + attr_full_name);
+                          + attr_full_name).toLatin1().constData());
             }
 
             if (!attis_class_member && (index = d.find("${(}")) != -1)
@@ -1313,36 +1371,36 @@ void OperationData::update_idl_get_of(WrapperStr & decl, QString attidl_decl,
                                       QString multiplicity)
 {
     remove_comments(attidl_decl);
-    attidl_decl = attidl_decl.stripWhiteSpace();
+    attidl_decl = attidl_decl.trimmed();
 
     int index;
 
-    if ((index = attidl_decl.find("${comment}")) != -1)
+    if ((index = attidl_decl.indexOf("${comment}")) != -1)
         attidl_decl.remove(index, 10);
 
-    if ((index = attidl_decl.find("${description}")) != -1)
+    if ((index = attidl_decl.indexOf("${description}")) != -1)
         attidl_decl.remove(index, 14);
 
-    if ((index = attidl_decl.find("${visibility}")) != -1)
+    if ((index = attidl_decl.indexOf("${visibility}")) != -1)
         attidl_decl.remove(index, 13);
 
-    if ((index = attidl_decl.find("${readonly}")) != -1)
+    if ((index = attidl_decl.indexOf("${readonly}")) != -1)
         attidl_decl.remove(index, 11);
 
-    if ((index = attidl_decl.find("${attribut}")) != -1)
+    if ((index = attidl_decl.indexOf("${attribut}")) != -1)
         // old version
         attidl_decl.remove(index, 11);
 
-    if ((index = attidl_decl.find("${attribute}")) != -1)
+    if ((index = attidl_decl.indexOf("${attribute}")) != -1)
         attidl_decl.remove(index, 12);
 
-    if ((index = attidl_decl.find("const ")) != -1)
+    if ((index = attidl_decl.indexOf("const ")) != -1)
         attidl_decl.remove(index, 6);
 
-    if ((index = attidl_decl.find("${value}")) != -1)
+    if ((index = attidl_decl.indexOf("${value}")) != -1)
         attidl_decl.truncate(index);
 
-    if ((index = attidl_decl.find(";")) != -1)
+    if ((index = attidl_decl.indexOf(";")) != -1)
         attidl_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attidl_decl);
@@ -1355,18 +1413,18 @@ void OperationData::update_idl_get_of(WrapperStr & decl, QString attidl_decl,
         QString mult;
         QString type_spec_name = attidl_decl;
 
-        type_spec_name.replace(type_spec_name.find(attr_name_spec),
+        type_spec_name.replace(type_spec_name.indexOf(attr_name_spec),
                                attr_name_spec.length(), "$$");
 
         if (((index = d.find("${type}")) != -1) &&
             ((index2 = d.find("${name}", index + 1)) != -1)) {
-            d.replace(index, index2 - index + 7, type_spec_name);
+            d.replace(index, index2 - index + 7, type_spec_name.toLatin1().constData());
 
             if ((index = d.find("$$")) != -1)
                 d.replace(index, 2, "${name}");
 
             if ((index = d.find("${multiplicity}")) != -1)
-                d.replace(index, 15, multiplicity);
+                d.replace(index, 15, multiplicity.toLatin1().constData());
 
             decl = d;
         }
@@ -1385,7 +1443,7 @@ void OperationData::update_get_of(const QString & attr_name,
 {
     set_return_type(cl);
     isa_class_operation = attis_class_member;
-    stereotype = relstereotype.stripWhiteSpace();
+    stereotype = relstereotype.trimmed();
     is_get_or_set = TRUE;
 
     if (create)
@@ -1420,7 +1478,9 @@ void OperationData::update_get_of(const QString & attr_name,
             else
                 cpp_def.assign(def, FALSE);
         }
-        else {
+        else
+
+        {
             cpp_decl = "";
             cpp_def.assign(0, TRUE);
         }
@@ -1485,7 +1545,9 @@ void OperationData::update_get_of(const QString & attr_name,
             update_idl_get_of(decl, attidl_decl, multiplicity);
             idl_decl = decl;
         }
-        else {
+        else
+
+        {
             idl_decl = "";
         }
     }
@@ -1571,32 +1633,32 @@ void OperationData::update_cpp_set_of(WrapperStr & decl, WrapperStr & def,
                                       QString multiplicity)
 {
     remove_comments(attcpp_decl);
-    attcpp_decl = attcpp_decl.stripWhiteSpace();
+    attcpp_decl = attcpp_decl.trimmed();
 
     int index;
 
-    if ((index = attcpp_decl.find("${comment}")) != -1)
+    if ((index = attcpp_decl.indexOf("${comment}")) != -1)
         attcpp_decl.remove(index, 10);
 
-    if ((index = attcpp_decl.find("${description}")) != -1)
+    if ((index = attcpp_decl.indexOf("${description}")) != -1)
         attcpp_decl.remove(index, 14);
 
-    if ((index = attcpp_decl.find("${static}")) != -1)
+    if ((index = attcpp_decl.indexOf("${static}")) != -1)
         attcpp_decl.remove(index, 9);
 
-    if ((index = attcpp_decl.find("${mutable}")) != -1)
+    if ((index = attcpp_decl.indexOf("${mutable}")) != -1)
         attcpp_decl.remove(index, 10);
 
-    if ((index = attcpp_decl.find("${volatile}")) != -1)
+    if ((index = attcpp_decl.indexOf("${volatile}")) != -1)
         attcpp_decl.remove(index, 11);
 
-    if ((index = attcpp_decl.find("${value}")) != -1)
+    if ((index = attcpp_decl.indexOf("${value}")) != -1)
         attcpp_decl.truncate(index);
 
-    if ((index = attcpp_decl.find("${h_value}")) != -1)
+    if ((index = attcpp_decl.indexOf("${h_value}")) != -1)
         attcpp_decl.truncate(index);
 
-    if ((index = attcpp_decl.find(";")) != -1)
+    if ((index = attcpp_decl.indexOf(";")) != -1)
         attcpp_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attcpp_decl);
@@ -1606,15 +1668,15 @@ void OperationData::update_cpp_set_of(WrapperStr & decl, WrapperStr & def,
         def = 0;
     }
     else {
-        bool has_stereotype = (attcpp_decl.find("${stereotype}") != -1);
+        bool has_stereotype = (attcpp_decl.indexOf("${stereotype}") != -1);
         bool byref = GenerationSettings::cpp_default_set_param_ref();
         QString arg_spec = attcpp_decl;
         QString elt_type;
         bool has_multiplicity = FALSE;
 
-        if ((index = arg_spec.find("${multiplicity}")) != -1) {
+        if ((index = arg_spec.indexOf("${multiplicity}")) != -1) {
             if (! multiplicity.isEmpty()) {
-                if (*((const char *) multiplicity) != '[')
+                if (*((const char *) multiplicity.toLatin1().constData()) != '[')
                     multiplicity = "[" + multiplicity + "]";
 
                 elt_type = arg_spec;
@@ -1624,25 +1686,25 @@ void OperationData::update_cpp_set_of(WrapperStr & decl, WrapperStr & def,
             }
         }
 
-        if (byref && ((index = arg_spec.find("${type}")) != -1)) {
+        if (byref && ((index = arg_spec.indexOf("${type}")) != -1)) {
             // don't add ref for a pointer or a ref
-            int index2 = arg_spec.find("${name}", index + 7);
+            int index2 = arg_spec.indexOf("${name}", index + 7);
 
             if (index2 != -1) {
                 QString modifiers = arg_spec.mid(index + 7, index2 - index - 7);
 
-                byref = (modifiers.find("*") == -1) && (modifiers.find("&") == -1);
+                byref = (modifiers.indexOf("*") == -1) && (modifiers.indexOf("&") == -1);
             }
         }
 
-        arg_spec.replace(arg_spec.find(attr_name_spec),
+        arg_spec.replace(arg_spec.indexOf(attr_name_spec),
                          attr_name_spec.length(),
                          (has_stereotype || byref) ? "& ${p0}" : "${p0}");
 
-        if ((index = arg_spec.find("${type}")) != -1)
+        if ((index = arg_spec.indexOf("${type}")) != -1)
             arg_spec.replace(index, 7, "${t0}");
 
-        if ((index = arg_spec.find("${const}")) != -1) {
+        if ((index = arg_spec.indexOf("${const}")) != -1) {
             if (attis_const || GenerationSettings::cpp_default_set_param_const())
                 arg_spec.replace(index, 8, "const ");
             else
@@ -1650,20 +1712,20 @@ void OperationData::update_cpp_set_of(WrapperStr & decl, WrapperStr & def,
         }
 
         if (has_multiplicity) {
-            elt_type.replace(elt_type.find(attr_name_spec),
+            elt_type.replace(elt_type.indexOf(attr_name_spec),
                              attr_name_spec.length(), "(* $$)");
 
-            if ((index = elt_type.find("${type}")) != -1)
+            if ((index = elt_type.indexOf("${type}")) != -1)
                 elt_type.replace(index, 7, "${t0}");
 
-            if ((index = elt_type.find("${const}")) != -1)
+            if ((index = elt_type.indexOf("${const}")) != -1)
                 elt_type.remove(index, 8);
         }
 
         WrapperStr d = (const char *) GenerationSettings::cpp_default_oper_decl();
 
         if ((index = d.find("${)}")) != -1) {
-            d.insert(index, (const char *) arg_spec);
+            d.insert(index, (const char *) arg_spec.toLatin1().constData());
 
             if ((index = d.find("${abstract}")) != -1)
                 d.remove(index, 11);
@@ -1678,11 +1740,11 @@ void OperationData::update_cpp_set_of(WrapperStr & decl, WrapperStr & def,
         d = (const char *) GenerationSettings::cpp_default_oper_def();
 
         if ((index = d.find("${)}")) != -1) {
-            d.insert(index, (const char *) arg_spec);
+            d.insert(index, (const char *) arg_spec.toLatin1().constData());
 
             QString attr_full_name = attr_name_spec;
 
-            if ((index = attr_full_name.find("${name}")) != -1)
+            if ((index = attr_full_name.indexOf("${name}")) != -1)
                 attr_full_name.replace(index, 7, attr_name);
 
             if ((index = d.find("${body}")) != -1) {
@@ -1695,7 +1757,7 @@ void OperationData::update_cpp_set_of(WrapperStr & decl, WrapperStr & def,
                         int index2 = index;
 
                         while (index2 != 0) {
-                            char c = d[index2 - 1].toAscii();
+                            char c = d[index2 - 1].toLatin1();
 
                             if ((c != ' ') && (c != '\t'))
                                 break;
@@ -1730,7 +1792,7 @@ void OperationData::update_cpp_set_of(WrapperStr & decl, WrapperStr & def,
                     d.replace(index, 7,
                               cpp_copy(
                                   WrapperStr(c_attr_full_name),
-                                  params[0].get_name(),
+                                  params[0]->get_name(),
                                   WrapperStr(c_multiplicity),
                                   WrapperStr(c_elt_type),
                                   WrapperStr(c_indent)));
@@ -1757,41 +1819,41 @@ void OperationData::update_java_set_of(WrapperStr & def, const QString & attr_na
                                        QString attjava_decl, QString multiplicity)
 {
     remove_comments(attjava_decl);
-    attjava_decl = attjava_decl.stripWhiteSpace();
+    attjava_decl = attjava_decl.trimmed();
 
     int index;
 
-    if ((index = attjava_decl.find("${comment}")) != -1)
+    if ((index = attjava_decl.indexOf("${comment}")) != -1)
         attjava_decl.remove(index, 10);
 
-    if ((index = attjava_decl.find("${@}")) != -1)
+    if ((index = attjava_decl.indexOf("${@}")) != -1)
         attjava_decl.remove(index, 4);
 
-    if ((index = attjava_decl.find("${description}")) != -1)
+    if ((index = attjava_decl.indexOf("${description}")) != -1)
         attjava_decl.remove(index, 14);
 
-    if ((index = attjava_decl.find("${visibility}")) != -1)
+    if ((index = attjava_decl.indexOf("${visibility}")) != -1)
         attjava_decl.remove(index, 13);
 
-    if ((index = attjava_decl.find("${static}")) != -1)
+    if ((index = attjava_decl.indexOf("${static}")) != -1)
         attjava_decl.remove(index, 9);
 
-    if ((index = attjava_decl.find("${final}")) != -1)
+    if ((index = attjava_decl.indexOf("${final}")) != -1)
         attjava_decl.remove(index, 8);
 
-    if ((index = attjava_decl.find("${transient}")) != -1)
+    if ((index = attjava_decl.indexOf("${transient}")) != -1)
         attjava_decl.remove(index, 12);
 
-    if ((index = attjava_decl.find("${volatile}")) != -1)
+    if ((index = attjava_decl.indexOf("${volatile}")) != -1)
         attjava_decl.remove(index, 11);
 
-    if ((index = attjava_decl.find("=")) != -1)
+    if ((index = attjava_decl.indexOf("=")) != -1)
         attjava_decl.truncate(index);
 
-    if ((index = attjava_decl.find("${value}")) != -1)
+    if ((index = attjava_decl.indexOf("${value}")) != -1)
         attjava_decl.truncate(index);
 
-    if ((index = attjava_decl.find(";")) != -1)
+    if ((index = attjava_decl.indexOf(";")) != -1)
         attjava_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attjava_decl);
@@ -1801,13 +1863,13 @@ void OperationData::update_java_set_of(WrapperStr & def, const QString & attr_na
     else {
         QString arg_spec = attjava_decl;
 
-        arg_spec.replace(arg_spec.find(attr_name_spec),
+        arg_spec.replace(arg_spec.indexOf(attr_name_spec),
                          attr_name_spec.length(), "${p0}");
 
-        if ((index = arg_spec.find("${type}")) != -1)
+        if ((index = arg_spec.indexOf("${type}")) != -1)
             arg_spec.replace(index, 7, "${t0}");
 
-        if ((index = arg_spec.find("${final}")) != -1) {
+        if ((index = arg_spec.indexOf("${final}")) != -1) {
             if (GenerationSettings::java_default_set_param_final())
                 arg_spec.replace(index, 8, "final ");
             else
@@ -1817,15 +1879,15 @@ void OperationData::update_java_set_of(WrapperStr & def, const QString & attr_na
         WrapperStr d = (const char *) GenerationSettings::java_default_oper_def();
 
         if ((index = d.find("${)}")) != -1) {
-            d.insert(index, (const char *) arg_spec);
+            d.insert(index, (const char *) arg_spec.toLatin1().constData());
 
             QString attr_full_name = attr_name_spec;
 
-            if ((index = attr_full_name.find("${name}")) != -1)
+            if ((index = attr_full_name.indexOf("${name}")) != -1)
                 attr_full_name.replace(index, 7, attr_name);
 
             if ((index = d.find("${multiplicity}")) != -1)
-                d.replace(index, 15, java_multiplicity(multiplicity));
+                d.replace(index, 15, java_multiplicity(multiplicity).toLatin1().constData());
 
             if ((index = d.find("${body}")) != -1) {
                 QString indent;
@@ -1834,7 +1896,7 @@ void OperationData::update_java_set_of(WrapperStr & def, const QString & attr_na
                 if (d[index - 1] == '\n')
                     indent = "  ";
 
-                d.replace(index, 7, indent + attr_full_name + " = ${p0}" + end);
+                d.replace(index, 7, QString(indent + attr_full_name + " = ${p0}" + end).toLatin1().constData());
 
                 def = d;
             }
@@ -1851,32 +1913,32 @@ void OperationData::update_php_set_of(WrapperStr & def,
                                       QString attphp_decl)
 {
     remove_comments(attphp_decl);
-    attphp_decl = attphp_decl.stripWhiteSpace();
+    attphp_decl = attphp_decl.trimmed();
 
     int index;
 
-    if ((index = attphp_decl.find("${comment}")) != -1)
+    if ((index = attphp_decl.indexOf("${comment}")) != -1)
         attphp_decl.remove(index, 10);
 
-    if ((index = attphp_decl.find("${description}")) != -1)
+    if ((index = attphp_decl.indexOf("${description}")) != -1)
         attphp_decl.remove(index, 14);
 
-    if ((index = attphp_decl.find("${visibility}")) != -1)
+    if ((index = attphp_decl.indexOf("${visibility}")) != -1)
         attphp_decl.remove(index, 13);
 
-    if ((index = attphp_decl.find("${static}")) != -1)
+    if ((index = attphp_decl.indexOf("${static}")) != -1)
         attphp_decl.remove(index, 9);
 
-    if ((index = attphp_decl.find("${var}")) != -1)
+    if ((index = attphp_decl.indexOf("${var}")) != -1)
         attphp_decl.remove(index, 6);
 
-    if ((index = attphp_decl.find("${const}")) != -1)
+    if ((index = attphp_decl.indexOf("${const}")) != -1)
         attphp_decl.remove(index, 8);
 
-    if ((index = attphp_decl.find("${value}")) != -1)
+    if ((index = attphp_decl.indexOf("${value}")) != -1)
         attphp_decl.truncate(index);
 
-    if ((index = attphp_decl.find(";")) != -1)
+    if ((index = attphp_decl.indexOf(";")) != -1)
         attphp_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attphp_decl);
@@ -1886,21 +1948,21 @@ void OperationData::update_php_set_of(WrapperStr & def,
     else {
         QString arg_spec = attphp_decl;
 
-        arg_spec.replace(arg_spec.find(attr_name_spec),
+        arg_spec.replace(arg_spec.indexOf(attr_name_spec),
                          attr_name_spec.length(), "${p0}");
 
-        if ((index = arg_spec.find("${final}")) != -1) {
+        if ((index = arg_spec.indexOf("${final}")) != -1) {
             arg_spec.remove(index, 8);
         }
 
         WrapperStr d = (const char *) GenerationSettings::php_default_oper_def();
 
         if ((index = d.find("${)}")) != -1) {
-            d.insert(index, (const char *) arg_spec);
+            d.insert(index, (const char *) arg_spec.toLatin1().constData());
 
             QString attr_full_name = attr_name_spec;
 
-            if ((index = attr_full_name.find("${name}")) != -1)
+            if ((index = attr_full_name.indexOf("${name}")) != -1)
                 attr_full_name.replace(index, 7, attr_name);
 
             if ((index = d.find("${body}")) != -1) {
@@ -1910,7 +1972,7 @@ void OperationData::update_php_set_of(WrapperStr & def,
                 if (d[index - 1] == '\n')
                     indent = "  ";
 
-                d.replace(index, 7, indent + "$this->" + attr_full_name + " = ${p0}" + end);
+                d.replace(index, 7, QString(indent + "$this->" + attr_full_name + " = ${p0}" + end).toLatin1().constData());
 
                 def = d;
             }
@@ -1928,34 +1990,34 @@ void OperationData::update_python_set_of(WrapperStr & def,
         bool attis_class_member)
 {
     remove_python_comments(attpython_decl);
-    attpython_decl = attpython_decl.stripWhiteSpace();
+    attpython_decl = attpython_decl.trimmed();
 
     int index;
 
-    if ((index = attpython_decl.find("${comment}")) != -1)
+    if ((index = attpython_decl.indexOf("${comment}")) != -1)
         attpython_decl.remove(index, 10);
 
-    if ((index = attpython_decl.find("${description}")) != -1)
+    if ((index = attpython_decl.indexOf("${description}")) != -1)
         attpython_decl.remove(index, 14);
 
-    if ((index = attpython_decl.find("${self}")) != -1)
+    if ((index = attpython_decl.indexOf("${self}")) != -1)
         attpython_decl.remove(index, 7);
 
-    if ((index = attpython_decl.find("${stereotype}")) != -1)
+    if ((index = attpython_decl.indexOf("${stereotype}")) != -1)
         attpython_decl.remove(index, 13);
 
-    if ((index = attpython_decl.find("${multiplicity}")) != -1)
+    if ((index = attpython_decl.indexOf("${multiplicity}")) != -1)
         attpython_decl.remove(index, 15);
 
-    if ((index = attpython_decl.find("${value}")) != -1)
+    if ((index = attpython_decl.indexOf("${value}")) != -1)
         attpython_decl.truncate(index);
 
-    if ((index = attpython_decl.find("${type}")) != -1)
+    if ((index = attpython_decl.indexOf("${type}")) != -1)
         attpython_decl.truncate(index);
 
-    if ((index = attpython_decl.find(" =")) != -1)
+    if ((index = attpython_decl.indexOf(" =")) != -1)
         attpython_decl.truncate(index);
-    else if ((index = attpython_decl.find("=")) != -1)
+    else if ((index = attpython_decl.indexOf("=")) != -1)
         attpython_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attpython_decl);
@@ -1965,7 +2027,7 @@ void OperationData::update_python_set_of(WrapperStr & def,
     else {
         QString arg_spec = attpython_decl;
 
-        arg_spec.replace(arg_spec.find(attr_name_spec),
+        arg_spec.replace(arg_spec.indexOf(attr_name_spec),
                          attr_name_spec.length(), "${p0}");
 
         WrapperStr d = (const char *) GenerationSettings::python_default_oper_def();
@@ -1976,11 +2038,11 @@ void OperationData::update_python_set_of(WrapperStr & def,
                 index += 6;
             }
 
-            d.insert(index, (const char *) arg_spec);
+            d.insert(index, (const char *) arg_spec.toLatin1().constData());
 
             QString attr_full_name = attr_name_spec;
 
-            if ((index = attr_full_name.find("${name}")) != -1)
+            if ((index = attr_full_name.indexOf("${name}")) != -1)
                 attr_full_name.replace(index, 7, attr_name);
 
             if ((index = d.find("${body}")) != -1) {
@@ -1989,7 +2051,7 @@ void OperationData::update_python_set_of(WrapperStr & def,
                 if (!attis_class_member)
                     s = "self.";
 
-                d.replace(index, 7, s + attr_full_name + " = ${p0}");
+                d.replace(index, 7, QString(s + attr_full_name + " = ${p0}").toLatin1().constData());
                 def = d;
             }
             else
@@ -2004,37 +2066,37 @@ void OperationData::update_idl_set_of(WrapperStr & decl, QString attidl_decl,
                                       QString multiplicity)
 {
     remove_comments(attidl_decl);
-    attidl_decl = attidl_decl.stripWhiteSpace();
+    attidl_decl = attidl_decl.trimmed();
 
     int index;
     QString arg_spec;
 
-    if ((index = attidl_decl.find("${comment}")) != -1)
+    if ((index = attidl_decl.indexOf("${comment}")) != -1)
         attidl_decl.remove(index, 10);
 
-    if ((index = attidl_decl.find("${description}")) != -1)
+    if ((index = attidl_decl.indexOf("${description}")) != -1)
         attidl_decl.remove(index, 14);
 
-    if ((index = attidl_decl.find("${visibility}")) != -1)
+    if ((index = attidl_decl.indexOf("${visibility}")) != -1)
         attidl_decl.remove(index, 13);
 
-    if ((index = attidl_decl.find("${readonly}")) != -1)
+    if ((index = attidl_decl.indexOf("${readonly}")) != -1)
         attidl_decl.remove(index, 11);
 
-    if ((index = attidl_decl.find("${attribut}")) != -1)
+    if ((index = attidl_decl.indexOf("${attribut}")) != -1)
         // old version
         attidl_decl.remove(index, 11);
 
-    if ((index = attidl_decl.find("${attribute}")) != -1)
+    if ((index = attidl_decl.indexOf("${attribute}")) != -1)
         attidl_decl.remove(index, 12);
 
-    if ((index = attidl_decl.find("const ")) != -1)
+    if ((index = attidl_decl.indexOf("const ")) != -1)
         attidl_decl.remove(index, 6);
 
-    if ((index = attidl_decl.find("${value}")) != -1)
+    if ((index = attidl_decl.indexOf("${value}")) != -1)
         attidl_decl.truncate(index);
 
-    if ((index = attidl_decl.find(";")) != -1)
+    if ((index = attidl_decl.indexOf(";")) != -1)
         attidl_decl.truncate(index);
 
     QString attr_name_spec = extract_name(attidl_decl);
@@ -2044,10 +2106,10 @@ void OperationData::update_idl_set_of(WrapperStr & decl, QString attidl_decl,
     else {
         QString arg_spec = attidl_decl;
 
-        arg_spec.replace(arg_spec.find(attr_name_spec),
+        arg_spec.replace(arg_spec.indexOf(attr_name_spec),
                          attr_name_spec.length(), "${p0}");
 
-        if ((index = arg_spec.find("${type}")) != -1)
+        if ((index = arg_spec.indexOf("${type}")) != -1)
             arg_spec.replace(index, 7, "${t0}");
 
         WrapperStr d = (const char *) GenerationSettings::idl_default_oper_decl();
@@ -2055,16 +2117,17 @@ void OperationData::update_idl_set_of(WrapperStr & decl, QString attidl_decl,
         if ((index = d.find("${)}")) == -1)
             decl = 0;
         else {
-            d.insert(index, (const char *) arg_spec);
+            d.insert(index, (const char *) arg_spec.toLatin1().constData());
 
             if ((index = d.find("${multiplicity}")) != -1)
-                d.replace(index, 15, multiplicity);
+                d.replace(index, 15, multiplicity.toLatin1().constData());
 
             decl = d;
         }
     }
 }
 
+
 void OperationData::update_set_of(const QString & attr_name,
                                   QString attcpp_decl, QString attjava_decl,
                                   QString attphp_decl, QString attpython_decl,
@@ -2075,7 +2138,7 @@ void OperationData::update_set_of(const QString & attr_name,
 {
 //#warning warning si attis_const;
 
-    stereotype = relstereotype.stripWhiteSpace();
+    stereotype = relstereotype.trimmed();
     return_type.type = 0;
     return_type.explicit_type = "void";
     isa_class_operation = attis_class_member;
@@ -2119,7 +2182,9 @@ void OperationData::update_set_of(const QString & attr_name,
             else
                 cpp_def.assign(def, FALSE);
         }
-        else {
+        else
+
+        {
             cpp_decl = "";
             cpp_def.assign(0, TRUE);
         }
@@ -2188,7 +2253,9 @@ void OperationData::update_set_of(const QString & attr_name,
             update_idl_set_of(decl, attidl_decl, multiplicity);
             idl_decl = decl;
         }
-        else {
+        else
+
+        {
             idl_decl = "";
         }
     }
@@ -2204,7 +2271,7 @@ bool OperationData::reference(BrowserClass * target) const
     unsigned i;
 
     for (i = 0; i != nparams; i += 1)
-        if (params[i].get_type().type == target)
+        if (params[i]->get_type().type == target)
             return TRUE;
 
     for (i = 0; i != nexceptions; i += 1)
@@ -2228,8 +2295,8 @@ void OperationData::replace(BrowserClass * old, BrowserClass * nw)
     unsigned i;
 
     for (i = 0; i != nparams; i += 1)
-        if (params[i].get_type().type == old)
-            params[i].set_type(t);
+        if (params[i]->get_type().type == old)
+            params[i]->set_type(t);
 
     for (i = 0; i != nexceptions; i += 1)
         if (exceptions[i].get_type().type == old)
@@ -2264,12 +2331,14 @@ void OperationData::send_uml_def(ToolCom * com, BrowserNode * bn,
         com->write_bool(force_body_gen);
 
     unsigned n;
-    ParamData * p;
-
-    com->write_unsigned(nparams);
 
-    for (p = params, n = nparams; n; p += 1, n -= 1)
-        p->send_uml_def(com);
+    com->write_unsigned(params.count());
+    n = nparams;
+    for(auto& param : params)
+    {
+        param->send_uml_def(com);
+        n -= 1;
+    }
 
     ExceptionData * ep;
 
@@ -2703,27 +2772,15 @@ bool OperationData::tool_cmd(ToolCom * com, const char * args,
                 WrapperStr name = com->get_string(args);
                 WrapperStr dflt = com->get_string(args);
                 AType t;
-                ParamData * new_params = new ParamData[nparams + 1];
-                unsigned index;
 
                 com->get_type(t, args);
 
-                for (index = 0; index != rank; index += 1)
-                    new_params[index] = params[index];
-
-                new_params[index].set_name(name);
-                new_params[index].set_dir(dir);
-                new_params[index].set_default_value((dflt.isEmpty()) ? "" : (const char *) dflt);
-                new_params[index].set_type(t);
+                params.insert(rank, std::shared_ptr<ParamData> (new ParamData()));
+                params[rank]->set_name(name);
+                params[rank]->set_dir(dir);
+                params[rank]->set_default_value((dflt.isEmpty()) ? "" : (const char *) dflt);
+                params[rank]->set_type(t);
                 depend_on(t.type);
-
-                while (index != nparams) {
-                    new_params[index + 1] = params[index];
-                    index += 1;
-                }
-
-                delete [] params;
-                params = new_params;
                 nparams += 1;
             }
             break;
@@ -2744,9 +2801,9 @@ bool OperationData::tool_cmd(ToolCom * com, const char * args,
 
                 com->get_type(t, args);
 
-                params[rank].set_name(name);
-                params[rank].set_dir(dir);
-                params[rank].set_default_value((dflt.isEmpty()) ? "" : (const char *) dflt);
+                params[rank]->set_name(name);
+                params[rank]->set_dir(dir);
+                params[rank]->set_default_value((dflt.isEmpty()) ? "" : (const char *) dflt);
                 set_param_type(rank, t);
             }
             break;
@@ -2760,7 +2817,7 @@ bool OperationData::tool_cmd(ToolCom * com, const char * args,
                 }
 
                 while (++rank != nparams)
-                    params[rank - 1] = params[rank];
+                    *params[rank - 1] = *params[rank];
 
                 nparams -= 1;
             }
@@ -2935,7 +2992,8 @@ char * OperationData::set_bodies_info(BrowserClass * cl, int id)
     cl->set_bodies_read(TRUE);
 
     // no bodies by default
-    for (Q3ListViewItem * child = cl->firstChild(); child; child = child->nextSibling()) {
+
+    for (BrowserNode * child = cl->firstChild(); child; child = child->nextSibling()) {
         if (((BrowserNode *) child)->get_type() == UmlOperation) {
             OperationData * d = (OperationData *)((BrowserNode *) child)->get_data();
 
@@ -2945,7 +3003,6 @@ char * OperationData::set_bodies_info(BrowserClass * cl, int id)
             d->php_body.length = 0;
         }
     }
-
     char * s = read_file(QString::number(id) + ".bodies");
 
     if (s == 0)
@@ -3076,19 +3133,19 @@ void OperationData::create_modified_body_file()
             char * old = read_file(QString::number(cl->get_ident()) + ".bodies");
 
             if (old != 0) {
-                fp.writeBlock(old, strlen(old));
+                fp.write(old, strlen(old));
                 delete [] old;
             }
             else {
                 QString header =
                     QString("class ") + cl->get_data()->definition(TRUE, FALSE) + '\n';
 
-                fp.writeBlock(header, header.length());
+                fp.write(header.toLatin1(), header.length());
             }
 
             fp.close();
 
-            if (static_cast<uint>(fp.status()) == IO_Ok)
+            if (fp.error() == QFile::NoError)
                 // all is ok
                 return;
 
@@ -3159,10 +3216,12 @@ void OperationData::new_body(QString s, int who)
         key = ".python!!!\t";
     }
 
-    if (!((BrowserClass *) browser_node->parent())->get_bodies_read())
+    BrowserClass * cl = (BrowserClass *) browser_node->parent();
+    if(cl)
+    {
+        if (!cl->get_bodies_read())
         set_bodies_info();
 
-    BrowserClass * cl = (BrowserClass *) browser_node->parent();
     QString fn = abs_file_path(cl->get_ident(), "b");
 
     for (;;) {
@@ -3174,18 +3233,18 @@ void OperationData::new_body(QString s, int who)
 
         cl->set_bodies_modified(TRUE);
 
-        if (fp.at() == 0) {
+        if (fp.pos() == 0) {
             char * old = read_file(QString::number(cl->get_ident()) + ".bodies");
 
             if (old != 0) {
-                fp.writeBlock(old, strlen(old));
+                fp.write(old, strlen(old));
                 delete [] old;
             }
             else {
                 QString header =
                     QString("class ") + cl->get_data()->definition(TRUE, FALSE) + '\n';
 
-                fp.writeBlock(header, header.length());
+                fp.write(header.toLatin1(), header.length());
             }
         }
 
@@ -3196,17 +3255,17 @@ void OperationData::new_body(QString s, int who)
             QString op_header = QString("!!!") + QString::number(get_ident()) +
                                 key + definition(TRUE, FALSE) + "\n";
 
-            fp.writeBlock(op_header, op_header.length());
+            fp.write(op_header.toLatin1(), op_header.length());
 
-            body_info->offset = fp.at();
+            body_info->offset = fp.pos();
             body_info->length = s.length();
 
-            fp.writeBlock(s, s.length());
+            fp.write(s.toLatin1(), s.length());
         }
         else
             body_info->length = 0;
 
-        if (static_cast<uint>(fp.status()) == IO_Ok)
+        if (fp.error() == QFile::NoError)
             // all is ok
             return;
 
@@ -3215,6 +3274,7 @@ void OperationData::new_body(QString s, int who)
                             QMessageBox::Retry);
     }
 }
+}
 
 void OperationData::save_body(QFile & qf, QString & filename,
                               bool dobackup, char * modified_bodies,
@@ -3255,7 +3315,7 @@ void OperationData::save_body(QFile & qf, QString & filename,
             if (dobackup)
                 backup(d, filename);
 
-            qf.setName(filename);
+            qf.setFileName(filename);
 
             while (!qf.open(QIODevice::WriteOnly))
                 (void) msg_critical("Error", QString("Cannot create file\n") + filename,
@@ -3264,17 +3324,17 @@ void OperationData::save_body(QFile & qf, QString & filename,
             QString header =
                 QString("class ") + cl->get_data()->definition(TRUE, FALSE) + '\n';
 
-            qf.writeBlock(header, header.length());
+            qf.write(header.toLatin1(), header.length());
         }
 
         QString op_header = QString("!!!") + QString::number(get_ident()) +
                             key + definition(TRUE, FALSE) + "\n";
 
-        qf.writeBlock(op_header, op_header.length());
+        qf.write(op_header.toLatin1(), op_header.length());
 
-        int new_offset = qf.at();
+        qint64 new_offset = qf.pos();
 
-        qf.writeBlock(modified_bodies + body_info->offset,
+        qf.write(modified_bodies + body_info->offset,
                       body_info->length);
         body_info->offset = new_offset;
     }
@@ -3301,8 +3361,7 @@ void OperationData::import(BrowserClass * cl, int id)
     for (;;) {
         QFile qf;
         QString filename;
-
-        for (Q3ListViewItem * child = cl->firstChild(); child; child = child->nextSibling()) {
+        for (BrowserNode * child = cl->firstChild(); child; child = child->nextSibling()) {
             if (((BrowserNode *) child)->get_type() == UmlOperation) {
                 OperationData * d = (OperationData *)((BrowserNode *) child)->get_data();
 
@@ -3312,14 +3371,13 @@ void OperationData::import(BrowserClass * cl, int id)
                 d->save_body(qf, filename, dobackup, s, 'y');
             }
         }
-
         if (filename.isEmpty())
             // no body
             break;
 
         qf.close();
 
-        if (static_cast<uint>(qf.status()) == IO_Ok)
+        if (qf.error() == QFile::NoError)
             // all is ok
             break;
 
@@ -3363,7 +3421,7 @@ void OperationData::save(QTextStream & st, bool ref, QString & warning) const
         if (cpp_const)
             st << "const ";
 
-        QSettings settings("settings.ini", QSettings::IniFormat);
+        QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
         settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
         if(settings.value("Main/compatibility_save").toInt() != 1)
         {
@@ -3406,7 +3464,7 @@ void OperationData::save(QTextStream & st, bool ref, QString & warning) const
 
 
         for (unsigned i = 0; i != nparams; i += 1)
-            params[i].save(st, warning);
+            params[i]->save(st, warning);
 
         if (nexceptions != 0) {
             nl_indent(st);
@@ -3432,7 +3490,7 @@ void OperationData::save(QTextStream & st, bool ref, QString & warning) const
             save_string(cpp_decl, st);
         }
 
-        if (!is_abstract && !cpp_def.isEmpty()) {
+        if (/*!is_abstract &&*/ !cpp_def.isEmpty()) {
             nl_indent(st);
             st << "cpp_def ";
             save_string(cpp_def, st);
@@ -3551,10 +3609,10 @@ OperationData * OperationData::read_ref(char *& st)
 
 void OperationData::read(char *& st, char *& k)
 {
-    cpp_body.length = -1;
-    java_body.length = -1;
-    python_body.length = -1;
-    php_body.length = -1;
+    cpp_body.length = 0;
+    java_body.length = 0;
+    python_body.length = 0;
+    php_body.length = 0;
 
     k = read_keyword(st);
     BasicData::read(st, k);	// updates k
@@ -3682,7 +3740,7 @@ void OperationData::read(char *& st, char *& k)
 
     if(strcmp(k, "nparams"))
     {
-        msg_critical(TR("Error"),  TR("Expected nparams instead of " + QString(k)));
+        msg_critical(tr("Error"),  QObject::tr("Expected nparams instead of ")+QString(k));
         THROW_ERROR 0;
     }
 
@@ -3698,8 +3756,8 @@ void OperationData::read(char *& st, char *& k)
     k = read_keyword(st);
 
     for (unsigned i = 0; i != n; i += 1) {
-        params[i].read(st, k);	// updates k
-        depend_on(params[i].get_type().type);
+        params[i]->read(st, k);	// updates k
+        depend_on(params[i]->get_type().type);
     }
 
     if (!strcmp(k, "nexceptions")) {
@@ -3738,9 +3796,9 @@ void OperationData::read(char *& st, char *& k)
         cpp_decl = "";
 
     if (!strcmp(k, "cpp_def")) {
-        char * d = read_string(st);
+        QString d = read_string(st);
 
-        cpp_def.assign(d, (is_abstract || (strstr(d, "${body}") != 0)));
+        cpp_def.assign(d, (is_abstract || (d.contains("${body}"))));
         k = read_keyword(st);
     }
     else
@@ -3785,12 +3843,12 @@ void OperationData::read(char *& st, char *& k)
         java_synchronized = FALSE;
 
     if (!strcmp(k, "java_def")) {
-        char * d = read_string(st);
+        QString d = read_string(st);
         QString ste = GenerationSettings::java_class_stereotype(stereotype);
 
         java_def.assign(d,
                         is_abstract ||
-                        (strstr(d, "${body}") != 0) ||
+                        d.contains("${body}") ||
                         (ste == "interface") ||
                         (ste == "@interface"));
         k = read_keyword(st);
@@ -3837,12 +3895,12 @@ void OperationData::read(char *& st, char *& k)
         php_final = FALSE;
 
     if (!strcmp(k, "php_def")) {
-        char * d = read_string(st);
+        QString d = read_string(st);
         QString ste = GenerationSettings::php_class_stereotype(stereotype);
 
         php_def.assign(d,
                        is_abstract ||
-                       (strstr(d, "${body}") != 0) ||
+                       d.contains("${body}") ||
                        (ste == "interface"));
         k = read_keyword(st);
     }
@@ -3881,9 +3939,9 @@ void OperationData::read(char *& st, char *& k)
         python_decorator = "";
 
     if (!strcmp(k, "python_def")) {
-        char * d = read_string(st);
+        QString d = read_string(st);
 
-        python_def.assign(d, (strstr(d, "${body}") != 0));
+        python_def.assign(d, d.contains("${body}"));
         k = read_keyword(st);
     }
     else
@@ -3932,17 +3990,24 @@ void OperationData::read(char *& st, char *& k)
 }
 bool operator==(const OperationData & origin, const OperationData & another)
 {
-    bool paramsResult = false;
-    if(!origin.params && !another.params)
-        paramsResult = true;
-    else if(origin.params != another.params)
+    bool paramsResult = true;
+
+    if(origin.params.size() != another.params.size())
+        paramsResult = false;
+    else
     {
-        if(origin.params == nullptr)
-            return false;
-        else if(another.params == nullptr)
-            return false;
-         paramsResult = *origin.params == *another.params;
+        int i = -1;
+        auto it = origin.params.begin();
+        while(it != origin.params.end())
+        {
+            it++;i++;
+            if(*origin.params[i].get() == *another.params[i].get() )
+                continue;
+            paramsResult = false;
+            break;
+        }
     }
+
     if(!paramsResult)
         return false;
     if(origin.uml_visibility != another.uml_visibility ||
@@ -4016,3 +4081,137 @@ bool operator==(const OperationData & origin, const OperationData & another)
 
 
 }
+#include <algorithm>
+bool PropagationEquality(const OperationData & origin, const OperationData & another)
+{
+    bool paramsResult = true;
+
+    if(origin.params.size() != another.params.size())
+        paramsResult = false;
+    else
+    {
+        int i = -1;
+        auto it = origin.params.begin();
+        while(it != origin.params.end())
+        {
+            it++;i++;
+            if(*origin.params[i].get() == *another.params[i].get() )
+                continue;
+            paramsResult = false;
+            break;
+        }
+    }
+    //origin.params != another.params;
+
+    if(!paramsResult)
+        return false;
+    if(origin.uml_visibility != another.uml_visibility ||
+     origin.cpp_visibility!= another.cpp_visibility ||
+     origin.is_deleted != another.is_deleted ||
+     origin.is_get_or_set != another.is_get_or_set ||
+     origin.isa_class_operation!= another.isa_class_operation ||
+     origin.is_volatile != another.is_volatile ||
+     origin.cpp_const != another.cpp_const ||
+     origin.cpp_friend!= another. cpp_friend||
+     origin.cpp_virtual!= another.cpp_virtual ||
+     //origin.cpp_inline!= another.cpp_inline ||
+    origin.cpp_default!= another.cpp_default ||
+    origin.cpp_delete!= another.cpp_delete ||
+    origin.cpp_override != another. cpp_override||
+    origin.cpp_final != another.cpp_final ||
+     origin.cpp_get_set_frozen != another.cpp_get_set_frozen ||
+     origin.java_synchronized != another. java_synchronized||
+     origin.java_get_set_frozen!= another. java_get_set_frozen||
+     origin.php_get_set_frozen != another. php_get_set_frozen||
+
+     origin.python_get_set_frozen != another. python_get_set_frozen||
+     origin.idl_oneway != another.idl_oneway ||
+     origin.idl_get_set_frozen != another.idl_get_set_frozen ||
+
+     origin.nexceptions!= another.nexceptions ||
+     origin.return_type!= another.return_type ||
+     origin.originClass!= another.originClass ||
+     origin.exceptions!= another.exceptions ||
+     origin.constraint!= another.constraint||
+
+
+    origin.cpp_body.offset!= another.cpp_body.offset ||
+    origin.cpp_body.length!= another.cpp_body.length ||
+    origin.cpp_decl!= another.cpp_decl ||
+    //origin.cpp_def!= another.cpp_def ||
+    origin.cpp_name_spec!= another.cpp_name_spec||
+
+
+    origin.java_body.offset!= another.java_body.offset ||
+    origin.java_body.length!= another.java_body.length ||
+    origin.java_def!= another.java_def ||
+    origin.java_name_spec!= another.java_name_spec ||
+
+
+    origin.php_body.offset!= another.php_body.offset||
+    origin.php_body.length!= another.php_body.length||
+    origin.php_def!= another.php_def ||
+    origin.php_name_spec!= another.php_name_spec||
+
+
+    origin.python_body.offset!= another. python_body.offset||
+    origin.python_body.length!= another. python_body.length||
+    origin.python_def!= another.python_def ||
+    origin.python_name_spec!= another. python_name_spec||
+    origin.python_decorator!= another.python_decorator ||
+    origin.idl_decl!= another.idl_decl ||
+    origin.idl_name_spec != another. idl_name_spec)
+         return false;
+     return true;
+
+
+
+     //origin.java_annotation!= another. java_annotation||
+     //     origin.cpp_default!= another.cpp_default ||
+     //     origin.cpp_delete!= another.cpp_delete ||
+     //     origin.cpp_override != another. cpp_override||
+     //     origin.cpp_final != another.cpp_final ||
+
+     //origin.cpp_indent_body != another.cpp_indent_body ||
+     //origin.java_final != another. java_final||
+
+     //origin.java_indent_body != another.java_indent_body ||
+     //origin.php_final != another.php_final ||
+
+     //origin.php_indent_body != another. php_indent_body||
+
+
+     //origin.python_indent_body != another.python_indent_body ||
+
+//     bool constraint = origin.constraint != another.constraint;
+//     bool uml_visibility = origin.uml_visibility != another.uml_visibility;
+//     bool cpp_visibility = origin.cpp_visibility != another.cpp_visibility;
+//     bool is_deleted = origin.is_deleted != another.is_deleted;
+//     bool is_get_or_set = origin.is_get_or_set != another.is_get_or_set;
+//     bool isa_class_operation = origin.isa_class_operation != another.isa_class_operation;
+//     bool is_volatile = origin.is_volatile != another.is_volatile;
+//     bool cpp_const = origin.cpp_const != another.cpp_const;
+//     bool cpp_friend = origin.cpp_friend != another.cpp_friend;
+//     bool cpp_virtual = origin.cpp_virtual != another.cpp_virtual;
+//     bool cpp_inline = origin.cpp_inline != another.cpp_inline;
+//     bool cpp_get_set_frozen = origin.cpp_get_set_frozen != another.cpp_get_set_frozen;
+//     bool nexceptions = origin.nexceptions != another.nexceptions;
+//     bool return_type = origin.return_type != another.return_type;
+//     bool originClass = origin.originClass != another.originClass;
+//     bool exceptions = origin.exceptions != another.exceptions;
+//     bool java_synchronized = origin.java_synchronized != another.java_synchronized;
+//     bool java_get_set_frozen = origin.java_get_set_frozen != another.java_get_set_frozen;
+//     bool php_get_set_frozen = origin.php_get_set_frozen != another.php_get_set_frozen;
+//     bool python_get_set_frozen = origin.python_get_set_frozen != another.python_get_set_frozen;
+//     bool idl_oneway = origin.idl_oneway != another.idl_oneway;
+//     bool idl_get_set_frozen = origin.idl_get_set_frozen != another.idl_get_set_frozen;
+//     bool cpp_bodyoffset = origin.cpp_body.offset != another.cpp_body.offset;
+//     bool cpp_bodylength = origin.cpp_body.length != another.cpp_body.length;
+//     bool cpp_decl = origin.cpp_decl != another.cpp_decl;
+//     bool cpp_def = origin.cpp_def != another.cpp_def;
+}
+
+void OperationData::set_cpp_visibility(int v)
+{
+    cpp_visibility = static_cast<UmlVisibility>(v);
+}
diff --git a/src/data/OperationData.h b/src/data/OperationData.h
index 9017a41e5..561f915a3 100644
--- a/src/data/OperationData.h
+++ b/src/data/OperationData.h
@@ -28,9 +28,10 @@
 #ifndef OPERATIONDATA_H
 #define OPERATIONDATA_H
 
-#include <q3memarray.h>
+//#include <q3memarray.h>
 //Added by qt3to4:
 #include <QTextStream>
+#include  <memory>
 
 
 #include "UmlEnum.h"
@@ -45,12 +46,14 @@ class ExceptionData;
 class KeyValueData;
 class BrowserClass;
 class BrowserOperation;
-
+class BrowserOperationAttribute;
+class BrowserOperationReturnType;
+class QuickEdit;
 class OperationBody
 {
 public:
-    int offset;	// offset in the file
-    int length;	// body length, 0 if empty, -1 if unknown (file not yet read)
+    qint64 offset;	// offset in the file
+    qint64 length;	// body length, 0 if empty, -1 if unknown (file not yet read)
 
     OperationBody() : offset(0), length(0) {};
 };
@@ -62,6 +65,10 @@ class OperationData : public ClassMemberData,
     Q_OBJECT
 
     friend class OperationDialog;
+    friend class BrowserOperation;
+    friend class QuickEdit;
+    friend class BrowserOperationAttribute;
+    friend class BrowserOperationReturnType;
 
 protected:
     static IdDict<OperationData> all;
@@ -100,7 +107,8 @@ class OperationData : public ClassMemberData,
     unsigned short nexceptions;
     AType return_type;
     WrapperStr originClass = QString("0");
-    ParamData * params = nullptr;			// remark : do NOT use QArray
+    QList<std::shared_ptr<ParamData>> params;
+    //ParamData * params = nullptr;			// remark : do NOT use QArray
     ExceptionData * exceptions;
     WrapperStr constraint;
 
@@ -132,40 +140,46 @@ class OperationData : public ClassMemberData,
     WrapperStr idl_name_spec;	// get_${name}
 
     friend bool operator==(const OperationData & , const OperationData & );
+    friend bool PropagationEquality(const OperationData & origin, const OperationData & another);
 
     void depend_on(BrowserClass * cl);
     void no_longer_depend_on(BrowserClass * cl);
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
-    virtual void send_php_def(ToolCom * com);
-    virtual void send_python_def(ToolCom * com);
-    virtual void send_idl_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
+    virtual void send_php_def(ToolCom * com) override;
+    virtual void send_python_def(ToolCom * com) override;
+    virtual void send_idl_def(ToolCom * com) override;
 
     void set_bodies_info();
     static char * set_bodies_info(BrowserClass * cl, int id);
 
+
 public:
     OperationData(int id = 0);
     OperationData(OperationData * model, BrowserNode *);
     virtual ~OperationData();
     void PropagateFrom(const OperationData*, bool goBack = true, QList<const OperationData *> passed = QList<const OperationData *>());
 
-    virtual bool deletedp() const;
-    virtual void set_deletedp(bool y);
+    virtual bool deletedp() const override;
+    virtual void set_deletedp(bool y) override;
+
+    void remove_param(std::shared_ptr<ParamData>);
+    void insert_param(int position, std::shared_ptr<ParamData> param);
 
+    using ClassMemberData::set_browser_node;
     void set_browser_node(BrowserOperation *, bool update);
 
-    virtual QString definition(bool full, bool with_kind) const;
+    virtual QString definition(bool full, bool with_kind) const override;
     QString definition(bool full, bool withdir, bool withname,
                        ShowContextMode mode = noContext) const;
     QString definition(bool full, DrawingLanguage language,
                        bool withdir, bool withname,
                        ShowContextMode mode = noContext) const;
 
-    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *);
+    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *) override;
 
     const char * get_constraint() const {
         return constraint;
@@ -174,6 +188,9 @@ class OperationData : public ClassMemberData,
     bool get_isa_class_operation() const {
         return isa_class_operation;
     };
+    void set_isa_class_operation(bool value) {
+        isa_class_operation = value;
+    };
 
     bool get_is_abstract() const {
         return is_abstract;
@@ -182,8 +199,10 @@ class OperationData : public ClassMemberData,
 
     bool get_is_volatile() const {
         return is_volatile;
-    };
-
+    }
+    void set_is_volatile(bool value){
+        is_volatile = value;
+    }
     bool body_generation_forced() const {
         return force_body_gen;
     };
@@ -191,69 +210,109 @@ class OperationData : public ClassMemberData,
     bool get_cpp_const() const {
         return cpp_const;
     };
-
+    void set_cpp_const(bool value){
+        cpp_const = value;
+    }
     bool get_cpp_friend() const {
         return cpp_friend;
     };
-
+    void set_cpp_friend(bool value){
+        cpp_friend = value;
+    }
     bool get_cpp_virtual() const {
         return cpp_virtual;
     };
-
+    void set_cpp_virtual(bool value){
+        cpp_virtual = value;
+    }
     bool get_cpp_inline() const {
         return cpp_inline;
     };
-
+    void set_cpp_inline(bool value){
+        cpp_inline = value;
+    }
     bool get_cpp_default() const {
         return cpp_default;
     };
+    void set_cpp_default(bool value){
+        cpp_default = value;
+    }
     bool get_cpp_delete() const {
         return cpp_delete;
-    };
+    }
+    void set_cpp_delete(bool value){
+        cpp_delete = value;
+    }
     bool get_cpp_override() const {
         return cpp_override;
     };
+    void set_cpp_override(bool value){
+        cpp_override = value;
+    }
     bool get_cpp_final() const {
         return cpp_final;
     };
+    void set_cpp_final(bool value){
+        cpp_final = value;
+    }
     QString get_cpp_name_spec() const {
         return cpp_name_spec;
-    };
+    }
+    void set_cpp_pass_type(QString value)
+    {
+        value = value;
+        //do nothing, yet
+    }
+    QString get_cpp_pass_type() const
+    {
+        return QString();
+    }
 
     bool get_java_final() const {
         return java_final;
     };
-
+    void set_java_final(bool value){
+        java_final = value;
+    }
     bool get_java_synchronized() const {
         return java_synchronized;
     };
-
+    void set_java_synchronized(bool value){
+        java_synchronized = value;
+    }
     bool get_php_final() const {
         return php_final;
     };
+    void set_php_final(bool value){
+        php_final = value;
+    }
 
     bool get_idl_oneway() const {
         return idl_oneway;
     };
-
+    void set_idl_oneway(bool value){
+        idl_oneway = value;
+    }
     WrapperStr get_origin_class() { return originClass;}
 
     UmlVisibility get_uml_visibility() const {
         return uml_visibility;
     };
-    virtual UmlVisibility get_visibility(BrowserNode *);
+    virtual UmlVisibility get_visibility(BrowserNode *) override;
     UmlVisibility get_cpp_visibility() const {
         return cpp_visibility;
     };
     void set_uml_visibility(UmlVisibility v);
     void set_cpp_visibility(UmlVisibility v);
+    void set_cpp_visibility(int v);
     void set_origin_class(WrapperStr value){originClass = value;}
     const AType & get_return_type() const {
         return return_type;
     };
     void set_return_type(const AType & t);
+    void set_return_type(const QString & value);
 
-    const char * get_param_name(int rank) const;
+    QString get_param_name(int rank) const;
     QStringList get_param_names() const;
     QStringList get_param_types() const;
     QStringList get_param_default_values() const;
@@ -276,34 +335,41 @@ class OperationData : public ClassMemberData,
     };
     void set_n_exceptions(unsigned n);	// the old exceptions are lost
 
-    const char * get_cppdecl() const {
+    const char * get_cppdecl() const
+    {
         return cpp_decl;
     };
-    const char * get_cppdef() const {
-        return cpp_def;
+    const char * get_cppdef() const
+    {
+            return cpp_def;
     };
     void set_cppdef(QString value){cpp_def = value;}
+    void set_cppdecl(QString value){cpp_decl = value;}
     QString default_cpp_decl(const QString & name);
     QString default_cpp_def(const QString & name);
 
     const char * get_javadef() const {
         return java_def;
     };
+    void set_javadef(QString value){java_def = value;}
     QString default_java_def(const QString & name);
 
     const char * get_phpdef() const {
         return php_def;
     };
+    void set_phpdef(QString value){php_def = value;}
     QString default_php_def(const QString & name, bool nobody);
 
     const char * get_pythondef() const {
         return python_def;
     };
+    void set_pythondef(QString value){python_def = value;}
     QString default_python_def(const QString & name);
 
     const char * get_idldecl() const {
         return idl_decl;
     };
+    void set_idldecl(QString value){idl_decl = value;}
     QString default_idl_decl(const QString & name);
 
     void edit(DrawingLanguage);
@@ -331,7 +397,7 @@ class OperationData : public ClassMemberData,
     void copy_getset(const OperationData * model);
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     bool reference(BrowserClass *) const;
 
@@ -387,6 +453,7 @@ protected slots:
 };
 
 bool operator==(const OperationData & s1, const OperationData & s2);
+bool PropagationEquality(const OperationData & origin, const OperationData & another);
 //bool operator!=(const OperationData & s1, const OperationData & s2);
 #endif
 
diff --git a/src/data/PackageData.cpp b/src/data/PackageData.cpp
index 856348574..86ae68fc2 100644
--- a/src/data/PackageData.cpp
+++ b/src/data/PackageData.cpp
@@ -68,8 +68,8 @@ PackageData::~PackageData()
 void PackageData::edit()
 {
     setName(browser_node->get_name());
-
     (new PackageDialog(this))->show();
+
 }
 
 //
diff --git a/src/data/PackageData.h b/src/data/PackageData.h
index 5fbd4eba9..5ea01ca2f 100644
--- a/src/data/PackageData.h
+++ b/src/data/PackageData.h
@@ -55,11 +55,11 @@ class PackageData : public SimpleData
     WrapperStr python_package;
     WrapperStr idl_module;
 
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
-    virtual void send_php_def(ToolCom * com);
-    virtual void send_python_def(ToolCom * com);
-    virtual void send_idl_def(ToolCom * com);
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
+    virtual void send_php_def(ToolCom * com) override;
+    virtual void send_python_def(ToolCom * com) override;
+    virtual void send_idl_def(ToolCom * com) override;
 
 public:
     PackageData();
@@ -104,7 +104,7 @@ class PackageData : public SimpleData
     };
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/ParamData.cpp b/src/data/ParamData.cpp
index 79241698d..233f60dd6 100644
--- a/src/data/ParamData.cpp
+++ b/src/data/ParamData.cpp
@@ -40,7 +40,7 @@ ParamData::ParamData() : dir(UmlInOut)
 {
 }
 
-void ParamData::set_name(const char * s)
+void ParamData::set_name(QString s)
 {
     name = s;
 }
@@ -55,7 +55,7 @@ void ParamData::set_type(const AType & t)
     type = t;
 }
 
-void ParamData::set_default_value(const char * str)
+void ParamData::set_default_value(const WrapperStr & str)
 {
     default_value = str;
 }
@@ -80,7 +80,7 @@ QString ParamData::definition(bool withdir, bool withname,
 
         QString v = default_value;
 
-        v = v.simplifyWhiteSpace();
+        v = v.simplified();
 
         return ((dir == UmlOut) || v.isEmpty())
                ? r
diff --git a/src/data/ParamData.h b/src/data/ParamData.h
index c8b9dcfb8..ff50fd777 100644
--- a/src/data/ParamData.h
+++ b/src/data/ParamData.h
@@ -44,8 +44,8 @@ class ParamData
 public:
     ParamData();
 
-    void set_name(const char *);
-    const char * get_name() const {
+    void set_name(QString);
+    QString get_name() const {
         return name;
     };
     UmlParamDirection get_dir() const {
@@ -56,10 +56,10 @@ class ParamData
         return type;
     };
     void set_type(const AType & t);
-    const char * get_default_value() const {
+    WrapperStr get_default_value() const {
         return default_value;
     };
-    void set_default_value(const char * s);
+    void set_default_value(const WrapperStr & s);
 
     QString definition(bool withdir, bool withname,
                        ShowContextMode mode = noContext) const;
diff --git a/src/data/ParameterData.cpp b/src/data/ParameterData.cpp
index 12f23a81c..8370c45e2 100644
--- a/src/data/ParameterData.cpp
+++ b/src/data/ParameterData.cpp
@@ -52,8 +52,7 @@ ParameterData::ParameterData(ParameterData * model, BrowserNode * bn)
 
 void ParameterData::edit()
 {
-    setName(browser_node->get_name());
-
+    setObjectName(browser_node->get_name());
     (new ParameterDialog(this))->show();
 }
 
diff --git a/src/data/ParameterData.h b/src/data/ParameterData.h
index 584cfb77b..4fe29f6fb 100644
--- a/src/data/ParameterData.h
+++ b/src/data/ParameterData.h
@@ -45,8 +45,8 @@ class ParameterData : public SimpleData, public PinParamData
     ParameterData();
     ParameterData(ParameterData * model, BrowserNode * bn);
 
-    virtual void do_connect(BrowserClass * c);
-    virtual void do_disconnect(BrowserClass * c);
+    virtual void do_connect(BrowserClass * c) override;
+    virtual void do_disconnect(BrowserClass * c) override;
 
     const char * get_default_value() const {
         return default_value;
@@ -55,11 +55,11 @@ class ParameterData : public SimpleData, public PinParamData
     void edit();
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
+                              const QString & comment) override;
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                          BrowserNode * bn, const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& , char *&);
diff --git a/src/data/ParameterSetData.cpp b/src/data/ParameterSetData.cpp
index d968cefed..cc8129b30 100644
--- a/src/data/ParameterSetData.cpp
+++ b/src/data/ParameterSetData.cpp
@@ -32,8 +32,7 @@
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
-
+#include <QList>
 #include "ParameterSetData.h"
 #include "ParameterSetDialog.h"
 #include "BrowserPin.h"
@@ -52,9 +51,9 @@ ParameterSetData::ParameterSetData(ParameterSetData * model, BrowserNode * bn)
     set_pins(model->pins);
 }
 
-void ParameterSetData::set_pins(const Q3ValueList<BrowserPin *> & l)
+void ParameterSetData::set_pins(const QList<BrowserPin *> & l)
 {
-    Q3ValueList<BrowserPin *>::Iterator iter;
+    QList<BrowserPin *>::Iterator iter;
 
     // disconnect old pins
     for (iter = pins.begin(); iter != pins.end(); iter++)
@@ -70,18 +69,18 @@ void ParameterSetData::set_pins(const Q3ValueList<BrowserPin *> & l)
 void ParameterSetData::check()
 {
     // remove deleted items, note : can't disconnect
-    Q3ValueList<BrowserPin *>::Iterator iter = pins.begin();
+    QList<BrowserPin *>::Iterator iter = pins.begin();
 
     while (iter != pins.end())
         if ((*iter)->deletedp())
-            iter = pins.remove(iter);
+            /*iter = */pins.removeOne(*iter);
         else
             iter++;
 }
 
 void ParameterSetData::edit()
 {
-    setName(browser_node->get_name());
+    setObjectName(browser_node->get_name());
 
     (new ParameterSetDialog(this))->show();
 }
@@ -92,7 +91,7 @@ void ParameterSetData::send_uml_def(ToolCom * com, BrowserNode * bn,
     SimpleData::send_uml_def(com, bn, comment);
     com->write_unsigned(pins.count());
 
-    Q3ValueList<BrowserPin *>::ConstIterator iter = pins.begin();
+    QList<BrowserPin *>::ConstIterator iter = pins.begin();
 
     for (iter = pins.begin(); iter != pins.end(); iter++)
         (*iter)->write_id(com);
@@ -111,7 +110,7 @@ bool ParameterSetData::tool_cmd(ToolCom * com, const char * args,
                 // replace all the pins
             {
                 unsigned n = com->get_unsigned(args);
-                Q3ValueList<BrowserPin *> l;
+                QList<BrowserPin *> l;
 
                 while (n--)
                     l.append((BrowserPin *) com->get_id(args));
@@ -144,7 +143,7 @@ void ParameterSetData::save(QTextStream & st, QString & warning) const
     st << "pins";
     indent(+1);
 
-    Q3ValueList<BrowserPin *>::ConstIterator iter = pins.begin();
+    QList<BrowserPin *>::ConstIterator iter = pins.begin();
 
     for (iter = pins.begin(); iter != pins.end(); iter++) {
         nl_indent(st);
@@ -163,7 +162,7 @@ void ParameterSetData::read(char *& st, char *& k)
     if (strcmp(k, "pins"))
         wrong_keyword(k, "pins");
 
-    Q3ValueList<BrowserPin *> l;
+    QList<BrowserPin *> l;
 
     while (strcmp((k = read_keyword(st)), "end")) {
         BrowserPin * pa = BrowserPin::read(st, k, 0);
diff --git a/src/data/ParameterSetData.h b/src/data/ParameterSetData.h
index 0a0c0c28b..64ee433c8 100644
--- a/src/data/ParameterSetData.h
+++ b/src/data/ParameterSetData.h
@@ -29,7 +29,7 @@
 #define PARAMETERSETDATA_H
 
 #include <QTextStream>
-#include <q3valuelist.h>
+#include <QList>
 
 #include "SimpleData.h"
 
@@ -44,13 +44,13 @@ class ParameterSetData : public SimpleData
     friend class ParameterSetDialog;
 
 protected:
-    Q3ValueList<BrowserPin *> pins;
+    QList<BrowserPin *> pins;
 
 public:
     ParameterSetData();
     ParameterSetData(ParameterSetData * model, BrowserNode * bn);
 
-    const Q3ValueList<BrowserPin *> & get_pins() const {
+    const QList<BrowserPin *> & get_pins() const {
         return pins;
     }
 
@@ -65,7 +65,7 @@ class ParameterSetData : public SimpleData
     void read(char *& , char *&);
 
 protected:
-    void set_pins(const Q3ValueList<BrowserPin *> & l);
+    void set_pins(const QList<BrowserPin *> & l);
 
 protected slots:
     void check();
diff --git a/src/data/PinData.cpp b/src/data/PinData.cpp
index 45c548dad..ed51e4486 100644
--- a/src/data/PinData.cpp
+++ b/src/data/PinData.cpp
@@ -56,7 +56,7 @@ PinData::PinData(PinData * model, BrowserNode * bn)
 
 void PinData::edit()
 {
-    setName(browser_node->get_name());
+    setObjectName(browser_node->get_name());
 
     (new PinDialog(this))->show();
 }
diff --git a/src/data/PinData.h b/src/data/PinData.h
index 7c3d4c829..31cd737cc 100644
--- a/src/data/PinData.h
+++ b/src/data/PinData.h
@@ -41,17 +41,17 @@ class PinData : public SimpleData, public PinParamData
     PinData(const PinParamData & pd);
     PinData(PinData * model, BrowserNode * bn);
 
-    virtual void do_connect(BrowserClass *);
-    virtual void do_disconnect(BrowserClass *);
+    virtual void do_connect(BrowserClass *) override;
+    virtual void do_disconnect(BrowserClass *) override;
 
     void edit();
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& , char *&);
diff --git a/src/data/PseudoStateData.cpp b/src/data/PseudoStateData.cpp
index 669bccd6f..816323093 100644
--- a/src/data/PseudoStateData.cpp
+++ b/src/data/PseudoStateData.cpp
@@ -61,7 +61,7 @@ PseudoStateData::~PseudoStateData()
 
 void PseudoStateData::edit()
 {
-    setName(browser_node->get_name());
+    setObjectName(browser_node->get_name());
 
     (new PseudoStateDialog(this))->show();
 }
diff --git a/src/data/PseudoStateData.h b/src/data/PseudoStateData.h
index 9c230ec2e..ff5b135fe 100644
--- a/src/data/PseudoStateData.h
+++ b/src/data/PseudoStateData.h
@@ -27,11 +27,7 @@
 
 #ifndef PSEUDOSTATEDATA_H
 #define PSEUDOSTATEDATA_H
-
-#include <q3ptrdict.h>
-//Added by qt3to4:
 #include <QTextStream>
-
 #include "SimpleData.h"
 
 class BrowserPseudoState;
@@ -46,7 +42,7 @@ class PseudoStateData : public SimpleData
     BrowserPseudoState * reference;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
+                              const QString & comment) override;
 public:
     PseudoStateData();
     PseudoStateData(PseudoStateData * model, BrowserNode *);
@@ -60,7 +56,7 @@ class PseudoStateData : public SimpleData
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/RelationData.cpp b/src/data/RelationData.cpp
index 17d8f01ce..aaee2f5e0 100644
--- a/src/data/RelationData.cpp
+++ b/src/data/RelationData.cpp
@@ -31,18 +31,14 @@
 
 #include <QTextStream>
 #include <qcursor.h>
-//Added by qt3to4:
-
-//Added by qt3to4:
-#include <Q3PtrList>
-
 #include "RelationData.h"
 #include "BrowserRelation.h"
 #include "BrowserAttribute.h"
 #include "BrowserOperation.h"
 #include "RelationDialog.h"
-#include "BrowserClass.h"
+#include "DialogUtil.h"
 #include "ClassDialog.h"
+#include "BrowserClass.h"
 #include "ClassData.h"
 #include "myio.h"
 #include "ToolCom.h"
@@ -52,10 +48,10 @@
 #include "Logging/QsLog.h"
 
 IdDict<RelationData> RelationData::all(1023, __FILE__);
-Q3PtrList<RelationData> RelationData::Unconsistent;
+QList<RelationData *> RelationData::Unconsistent;
 
 // file format < 56
-static Q3PtrList<RelationData> IncludeToHeaderIfExternal;
+static QList<RelationData *> IncludeToHeaderIfExternal;
 
 RelationData::RelationData(UmlCode e, int id)
     : Labeled<RelationData>(all, id), is_deleted(FALSE), is_unconsistent(FALSE), type(e)
@@ -75,7 +71,8 @@ RelationData::RelationData(UmlCode e, int id)
     a.idl_truncatable_inheritance = b.idl_truncatable_inheritance = FALSE;
     a.idl_case = b.idl_case = 0;
     name = default_name(e);
-    start = end = 0;
+    SetStart(0);
+    SetEnd(0);
     end_removed_from = 0;
     original_id = 0;
 }
@@ -96,30 +93,30 @@ RelationData::RelationData(const BrowserRelation * model,
     original_id = 0;
 
     if (md->start == model) {
-        start = r;
+        SetStart(r);
 
         if (md->end_removed_from == 0) {
             // bi dir, self to model became self to r
-            end = new BrowserRelation((md->get_end_class() == (BrowserClass *) model->parent())
-                                      ? (BrowserClass *) r->parent() : md->get_end_class(),
-                                      this);
+            SetEnd(new BrowserRelation((md->get_end_class() == (BrowserClass *) model->parent())
+                                       ? (BrowserClass *) r->parent() : md->get_end_class(),
+                                       this));
             end_removed_from = 0;
         }
         else {
             // uni dir
-            end = 0;
+            SetEnd(0);
             end_removed_from = (md->end_removed_from == (BrowserClass *) model->parent())
-                               ? (BrowserClass *) r->parent() : md->end_removed_from;
+                    ? (BrowserClass *) r->parent() : md->end_removed_from;
             connect(end_removed_from->get_data(), SIGNAL(deleted()),
                     this, SLOT(end_deleted()));
         }
     }
     else {
         // bi dir, self to model became self to r
-        end = r;
-        start = new BrowserRelation((md->get_start_class() == (BrowserClass *) model->parent())
-                                    ? (BrowserClass *) r->parent() : md->get_start_class(),
-                                    this);
+        SetEnd(r);
+        SetStart(new BrowserRelation((md->get_start_class() == (BrowserClass *) model->parent())
+                                     ? (BrowserClass *) r->parent() : md->get_start_class(),
+                                     this));
         end_removed_from = 0;
     }
 
@@ -148,17 +145,17 @@ void RelationData::copy(RelationData * model)
 void RelationData::garbage(BrowserRelation * r)
 {
     if (r == start) {
-        start = 0;
+        SetStart(0);
 
         if ((end == 0) ||
-            (end->get_data() == 0)) // bi-dir rel, reverse rel wasn't read
+                (end->get_data() == 0)) // bi-dir rel, reverse rel wasn't read
             delete this;
     }
     else if (start == 0)
         // end -> start read, but start -> end not read
         delete this;
     else {
-        end = 0;
+        SetEnd(0);
 
         if (start == 0)
             delete this;
@@ -256,7 +253,7 @@ static void default_decls(RoleData & r, UmlCode type, QString cl_stereotype)
     if (GenerationSettings::cpp_get_default_defs()) {
         if (ClassDialog::cpp_stereotype(cl_stereotype) != "enum")
             r.cpp_decl =
-                GenerationSettings::cpp_default_rel_decl(type, QString());
+                    GenerationSettings::cpp_default_rel_decl(type, QString());
         else
             r.cpp_decl = "";
     }
@@ -286,10 +283,9 @@ static void default_decls(RoleData & r, UmlCode type, QString cl_stereotype)
 
 BrowserRelation * RelationData::set_start_end(BrowserRelation * s, BrowserClass * e)
 {
-    start = s;
-
+    SetStart(s);
     if (! uni_directional(type))
-        end = new BrowserRelation(e, this);
+        SetEnd(new BrowserRelation(e, this));
     else {
         end_removed_from = e;
         connect(e->get_data(), SIGNAL(deleted()), this, SLOT(end_deleted()));
@@ -305,7 +301,7 @@ BrowserRelation * RelationData::set_start_end(BrowserRelation * s, BrowserClass
 
             if (GenerationSettings::cpp_get_default_defs())
                 a.cpp_decl = (ClassDialog::cpp_stereotype(st) != "enum")
-                             ? "${type}" : "";
+                        ? "${type}" : "";
 
             if (GenerationSettings::java_get_default_defs())
                 a.java_decl = "${type}";
@@ -318,7 +314,7 @@ BrowserRelation * RelationData::set_start_end(BrowserRelation * s, BrowserClass
 
             if (GenerationSettings::idl_get_default_defs())
                 a.idl_decl = (ClassDialog::idl_stereotype(st) != "enum")
-                             ? "${type}" : "";
+                        ? "${type}" : "";
 
             break;
 
@@ -336,7 +332,7 @@ BrowserRelation * RelationData::set_start_end(BrowserRelation * s, BrowserClass
 
         default:
             a.uml_visibility =
-                ((BrowserNode *) start->parent())->get_visibility(UmlRelations);
+                    ((BrowserNode *) start->parent())->get_visibility(UmlRelations);
             default_decls(a, type,
                           ((BrowserNode *) start->parent())->get_data()->get_stereotype());
         }
@@ -362,16 +358,16 @@ QString RelationData::get_name(BrowserRelation * cl) const
     if (cl == start) {
         if (!a.role.isEmpty()) {
             const char * role = a.role;
-            const char * tName = get_name();
+            QString tName = get_name();
             result = QString(role + QString(" (") + tName + ")");
             return result;
         }
     }
     else if (cl == end) {
         if (!b.role.isEmpty()) {
-        QLOG_INFO() << "Returning name for relation: " << QString((const char *) b.role) + " (" + get_name() + ")";
+            QLOG_INFO() << "Returning name for relation: " << QString((const char *) b.role) + " (" + get_name() + ")";
             const char * role = b.role;
-            const char * tName = get_name();
+            QString tName = get_name();
             result = QString(role + QString(" (") + tName + ")");
             return QString(role + QString(" (") + tName + ")");
         }
@@ -391,15 +387,15 @@ QString RelationData::get_name(BrowserRelation * cl) const
 QString RelationData::definition(bool, bool with_kind) const
 {
     return (with_kind)
-            ? ("[" + TR("relation") + "] " + this->name).operator QString()
-           : this->name.WrapperStr::operator QString();
+            ? ("[" + QObject::tr("relation") + "] " + this->name).operator QString()
+            : this->name.WrapperStr::operator QString();
 }
 
 UmlVisibility RelationData::get_visibility(BrowserNode * bn)
 {
     return (bn == start)
-           ? a.uml_visibility
-           : b.uml_visibility;
+            ? a.uml_visibility
+            : b.uml_visibility;
 }
 
 void RelationData::set_association(const AType & t)
@@ -485,21 +481,24 @@ bool RelationData::set_stereotype(const char * s)
 bool RelationData::decldefbody_contain(const QString & s, bool cs,
                                        BrowserNode * br)
 {
+
     return (is_a((BrowserRelation *) br))
-           ? ((QString(get_cppdecl_a()).find(s, 0, cs) != -1) ||
-              (QString(get_javadecl_a()).find(s, 0, cs) != -1) ||
-              (QString(get_pythondecl_a()).find(s, 0, cs) != -1) ||
-              (QString(get_phpdecl_a()).find(s, 0, cs) != -1) ||
-              (QString(get_idldecl_a()).find(s, 0, cs) != -1))
-           : ((QString(get_cppdecl_b()).find(s, 0, cs) != -1) ||
-              (QString(get_javadecl_b()).find(s, 0, cs) != -1) ||
-              (QString(get_phpdecl_b()).find(s, 0, cs) != -1) ||
-              (QString(get_pythondecl_b()).find(s, 0, cs) != -1) ||
-              (QString(get_idldecl_b()).find(s, 0, cs) != -1));
+            ? ((QString(get_cppdecl_a()).indexOf(s, 0,(Qt::CaseSensitivity) cs) != -1) ||
+               (QString(get_javadecl_a()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+               (QString(get_pythondecl_a()).indexOf(s, 0,(Qt::CaseSensitivity) cs) != -1) ||
+               (QString(get_phpdecl_a()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+               (QString(get_idldecl_a()).indexOf(s, 0,(Qt::CaseSensitivity) cs) != -1))
+            : ((QString(get_cppdecl_b()).indexOf(s, 0,(Qt::CaseSensitivity) cs) != -1) ||
+               (QString(get_javadecl_b()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+               (QString(get_phpdecl_b()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+               (QString(get_pythondecl_b()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1) ||
+               (QString(get_idldecl_b()).indexOf(s, 0, (Qt::CaseSensitivity)cs) != -1));
 }
 
 bool RelationData::wrong_role_a_name(const QString & s)
 {
+
+    QString aRole = a.role;
     return (!s.isEmpty() &&
             (s != a.role) &&
             ((BrowserNode *) start->parent())->wrong_child_name(s, type, FALSE, FALSE));
@@ -523,7 +522,7 @@ bool RelationData::check_end_visibility()
     if (!navigable(end)) {
         if (end_removed_from == 0) {
             end_removed_from = end->extract();
-            end = 0;
+            SetEnd(0);
             connect(end_removed_from->get_data(), SIGNAL(deleted()),
                     this, SLOT(end_deleted()));
         }
@@ -534,7 +533,7 @@ bool RelationData::check_end_visibility()
     if (end_removed_from != 0) {
         disconnect(end_removed_from->get_data(), SIGNAL(deleted()),
                    this, SLOT(end_deleted()));
-        end = BrowserRelation::reinsert(end_removed_from, this);
+        SetEnd(BrowserRelation::reinsert(end_removed_from, this));
         end_removed_from = 0;
         end->update_stereotype();
     }
@@ -653,8 +652,8 @@ BrowserClass * RelationData::get_start_class() const
 BrowserClass * RelationData::get_end_class() const
 {
     return (end_removed_from != 0)
-           ? ((BrowserClass *) end_removed_from)
-           : ((BrowserClass *) end->parent());
+            ? ((BrowserClass *) end_removed_from)
+            : ((BrowserClass *) end->parent());
 }
 
 void RelationData::unidir_change_dest(BrowserNode * e)
@@ -677,13 +676,13 @@ void RelationData::select_in_browser(bool prefer_start) const
 
 //
 
-const char * RelationData::get_idlcase(const RoleData & role)
+QString RelationData::get_idlcase(const RoleData & role)
 {
     return (role.idl_case != 0) ? role.idl_case->get_name() : role.idl_explicit_case.operator QString();
 }
 
 void RelationData::set_idlcase(RoleData & role, BrowserAttribute * at,
-                               const char * e)
+                               QString e)
 {
     if (role.idl_case != at) {
         // do not disconnect because don't check the other side
@@ -961,7 +960,7 @@ bool RelationData::tool_cmd(ToolCom * com, BrowserRelation * rel,
                     start->write_id(com);
             }
 
-            return TRUE;
+                return TRUE;
 
             case setNameCmd:
                 name = args;
@@ -989,7 +988,7 @@ bool RelationData::tool_cmd(ToolCom * com, BrowserRelation * rel,
 
                 r.uml_visibility = v;
             }
-            break;
+                break;
 
             case setConstraintCmd:
                 r.constraint = args;
@@ -1013,7 +1012,7 @@ bool RelationData::tool_cmd(ToolCom * com, BrowserRelation * rel,
 
                 r.java_annotation = s;
             }
-            break;
+                break;
 
             case setPhpDeclCmd:
                 r.php_decl = args;
@@ -1037,7 +1036,7 @@ bool RelationData::tool_cmd(ToolCom * com, BrowserRelation * rel,
 
                 r.cpp_visibility = v;
             }
-            break;
+                break;
 
             case setIsReadOnlyCmd:
                 r.isa_const_relation = (*args != 0);
@@ -1049,7 +1048,7 @@ bool RelationData::tool_cmd(ToolCom * com, BrowserRelation * rel,
 
             case setRoleNameCmd:
                 if ((rel == start) ? wrong_role_a_name(args)
-                    : wrong_role_b_name(args)) {
+                        : wrong_role_b_name(args)) {
                     com->write_ack(FALSE);
                     return TRUE;
                 }
@@ -1078,7 +1077,7 @@ bool RelationData::tool_cmd(ToolCom * com, BrowserRelation * rel,
 
                 set_idlcase(r, at, args);
             }
-            break;
+                break;
 
             case setDerivedCmd:
                 switch (*args) {
@@ -1134,7 +1133,7 @@ bool RelationData::tool_cmd(ToolCom * com, BrowserRelation * rel,
                     modified();
                 }
             }
-            break;
+                break;
 
             default:
                 return FALSE;
@@ -1426,8 +1425,8 @@ RelationData * RelationData::read_ref(char *& st, bool complete,
 
         if (complete) {
             // must create a valid temporary relation
-            result->start = BrowserRelation::temporary(result);
-            result->end = BrowserRelation::temporary(result);
+            result->SetStart(BrowserRelation::temporary(result));
+            result->SetEnd(BrowserRelation::temporary(result));
         }
     }
 
@@ -1682,13 +1681,13 @@ RelationData * RelationData::read(char *& st, char *& k,
             wrong_keyword(k, "a");
 
         read_role(result->a, assoc, st, k, result);		// updates k
-        result->start = BrowserRelation::read_ref(st, k);
+        result->SetStart(BrowserRelation::read_ref(st, k));
 
         read_keyword(st, "b");
 
         if (!RelationData::uni_directional(result->type)) {
             read_role(result->b, assoc, st, k, result);	// updates k
-            result->end = BrowserRelation::read_ref(st, k);
+            result->SetEnd(BrowserRelation::read_ref(st, k));
             // 'end' may be read before 'start' : relation's type was unknown
             result->end->set_name(0);
             result->end->set_name(result->name);
@@ -1708,10 +1707,10 @@ RelationData * RelationData::read(char *& st, char *& k,
 
             result->end_removed_from = BrowserClass::read_ref(st);
             result->b.uml_visibility =
-                ((BrowserNode *) result->end_removed_from->parent())->get_visibility(UmlRelations);
+                    ((BrowserNode *) result->end_removed_from->parent())->get_visibility(UmlRelations);
             connect(result->end_removed_from->get_data(), SIGNAL(deleted()),
                     result, SLOT(end_deleted()));
-            result->end = 0;
+            result->SetEnd(0);;
 
             // manage old declarations
             switch (result->type) {
@@ -1752,7 +1751,7 @@ RelationData * RelationData::read(char *& st, char *& k,
         AType t;
 
         if (!strcmp(k, "association_type") ||
-            !strcmp(k, "association_explicit_type")) {
+                !strcmp(k, "association_explicit_type")) {
             t.read(st, "association_type", "association_explicit_type", k);
             result->set_association(t);
             k = read_keyword(st);
@@ -1781,16 +1780,15 @@ void RelationData::set_unconsistent()
 
 void RelationData::delete_unconsistent()
 {
-    while (! Unconsistent.isEmpty()) {
-        RelationData * d = Unconsistent.take(0);
-
-        d->start = d->end = 0;
-
+    foreach (RelationData *d, Unconsistent) {
+        d->SetStart(0);
+        d->SetEnd(0);
         if (!d->deletedp())
             d->BasicData::delete_it();
 
         delete d;
     }
+    Unconsistent.clear();
 }
 
 // for file < 56, modify import from source to header
@@ -1798,12 +1796,41 @@ void RelationData::delete_unconsistent()
 
 void RelationData::post_load()
 {
-    while (! IncludeToHeaderIfExternal.isEmpty()) {
-        RelationData * rd = IncludeToHeaderIfExternal.take(0);
-
+    foreach (RelationData *rd, IncludeToHeaderIfExternal) {
         if ((rd->end_removed_from != 0) &&
-            (rd->end_removed_from->get_type() == UmlClass) &&
-            ((ClassData *) rd->end_removed_from->get_data())->cpp_is_external())
+                (rd->end_removed_from->get_type() == UmlClass) &&
+                ((ClassData *) rd->end_removed_from->get_data())->cpp_is_external())
             rd->a.cpp_decl = "#include in header";
     }
+    IncludeToHeaderIfExternal.clear();
+}
+
+void RelationData::IndexStartEnd()
+{
+    dataForClass.clear();
+    if(start)
+    {
+        BrowserNode *bNode = static_cast<BrowserNode*>(start->parent());
+        if(bNode)
+            dataForClass.insert(((BrowserNode*)start->parent())->get_name(), &a);
+    }
+    if(end && end->parent())
+        dataForClass.insert(((BrowserNode*)end->parent())->get_name(), &b);
+
+}
+
+void RelationData::SetStart(BrowserRelation * relStart)
+{
+    start = relStart;
+    //!!!!!!!!!
+    dataForClass.clear();
+    //IndexStartEnd();
+}
+
+void RelationData::SetEnd(BrowserRelation * relEnd)
+{
+    end = relEnd;
+    //!!!!!!!!!!
+    dataForClass.clear();
+    //IndexStartEnd();
 }
diff --git a/src/data/RelationData.h b/src/data/RelationData.h
index 3c7b24bf1..426a8720b 100644
--- a/src/data/RelationData.h
+++ b/src/data/RelationData.h
@@ -31,11 +31,8 @@
 #include "ClassMemberData.h"
 #include "Labeled.h"
 #include "AType.h"
-//Added by qt3to4:
 #include <QTextStream>
-
-//Added by qt3to4:
-#include <Q3PtrList>
+#include <QHash>
 
 class QTextStream;
 
@@ -89,10 +86,11 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     Q_OBJECT
 
     friend class RelationDialog;
+    friend class QuickEdit;
 
 protected:
     static IdDict<RelationData> all;
-    static Q3PtrList<RelationData> Unconsistent;
+    static QList<RelationData *> Unconsistent;
 
     // Uml
     bool is_deleted : 8;	// 1 useless here, 8 faster than 1 ?
@@ -101,12 +99,20 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     WrapperStr name;
     RoleData a;
     RoleData b;
-    BrowserRelation * start;
-    BrowserRelation * end;
+    BrowserRelation * start  = nullptr;
+    BrowserRelation * end = nullptr;
     BrowserNode * end_removed_from;
     AType association;		// class association
     int original_id;	// from project library
 
+    QHash<QString, RoleData*> dataForClass;
+
+    using ClassMemberData::send_uml_def;
+    using ClassMemberData::send_cpp_def;
+    using ClassMemberData::send_java_def;
+    using ClassMemberData::send_php_def;
+    using ClassMemberData::send_python_def;
+    using ClassMemberData::send_idl_def;
     virtual void send_uml_def(ToolCom * com, BrowserRelation * rel);
     virtual void send_cpp_def(ToolCom * com, BrowserRelation * rel);
     virtual void send_java_def(ToolCom * com, BrowserRelation * rel);
@@ -118,13 +124,25 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     RelationData(UmlCode e, int id = 0);
     RelationData(const BrowserRelation * model, BrowserRelation * r);
     virtual ~RelationData();
+    void IndexStartEnd();
+
+    void SetStart(BrowserRelation*);
+    void SetEnd(BrowserRelation*);
+    RoleData* GetDataForClass(const QString & node)
+    {
+        if (dataForClass.contains(node))
+            return dataForClass[node];
+
+        return NULL;
+    }
+
     void garbage(BrowserRelation * r);
     void copy(RelationData * model);
 
-    virtual bool deletedp() const;
-    virtual void set_deletedp(bool y);
-    virtual void delete_it();
-    virtual void undelete(QString & warning, QString & renamed);
+    virtual bool deletedp() const override;
+    virtual void set_deletedp(bool y) override;
+    virtual void delete_it() override;
+    virtual void undelete(QString & warning, QString & renamed) override;
     bool undelete(QString & warning, QString & renamed,
                   BrowserRelation * rel, BooL & br_deleted);
 
@@ -152,12 +170,12 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     }
     QString get_name(BrowserRelation *) const;
     void set_name(const QString &);
-    virtual QString definition(bool full, bool with_kind) const;
-    virtual bool set_stereotype(const QString &);
-    virtual bool set_stereotype(const WrapperStr &);
-    virtual bool set_stereotype(const char *);
+    virtual QString definition(bool full, bool with_kind) const override;
+    virtual bool set_stereotype(const QString &) override;
+    virtual bool set_stereotype(const WrapperStr &) override;
+    virtual bool set_stereotype(const char *) override;
 
-    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *);
+    virtual bool decldefbody_contain(const QString & s, bool cs, BrowserNode *) override;
 
     bool is_a(const BrowserRelation * br) const {
         return br == start;
@@ -232,7 +250,7 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     UmlVisibility get_uml_visibility_b() const {
         return b.uml_visibility;
     }
-    virtual UmlVisibility get_visibility(BrowserNode *);
+    virtual UmlVisibility get_visibility(BrowserNode *) override;
 
     const char * get_comment_a() const {
         return a.comment;
@@ -240,10 +258,10 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     const char * get_comment_b() const {
         return b.comment;
     }
-    void  set_comment_a(const char * s) {
+    void  set_comment_a(const WrapperStr & s) {
         a.comment = s;
     }
-    void set_comment_b(const char * s) {
+    void set_comment_b(const WrapperStr & s) {
         b.comment = s;
     }
 
@@ -253,10 +271,10 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     const char * get_constraint_b() const {
         return b.constraint;
     }
-    void  set_constraint_a(const char * s) {
+    void  set_constraint_a(const WrapperStr & s) {
         a.constraint = s;
     }
-    void set_constraint_b(const char * s) {
+    void set_constraint_b(const WrapperStr & s) {
         b.constraint = s;
     }
 
@@ -305,8 +323,8 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     const char * get_idldecl_b() const {
         return b.idl_decl;
     }
-    static const char * get_idlcase(const RoleData & role);
-    void set_idlcase(RoleData & role, BrowserAttribute * a, const char * e);
+    static QString get_idlcase(const RoleData & role);
+    void set_idlcase(RoleData & role, BrowserAttribute * a, QString e);
     bool get_idl_truncatable() const {
         return a.idl_truncatable_inheritance;
     }
@@ -323,6 +341,7 @@ class RelationData : public ClassMemberData, public Labeled<RelationData>
     static bool isa_association(UmlCode e);
     static bool isa_inherit(UmlCode e);
 
+    using ClassMemberData::tool_cmd;
     bool tool_cmd(ToolCom * com, BrowserRelation * rel, const char * args);
 
     static void clear(bool old);
diff --git a/src/data/SimpleData.h b/src/data/SimpleData.h
index 07f105735..69e06fdb4 100644
--- a/src/data/SimpleData.h
+++ b/src/data/SimpleData.h
@@ -41,8 +41,8 @@ class SimpleData : public BasicData
     SimpleData() : BasicData(), is_deleted(FALSE) {};
     SimpleData(BasicData * model) : BasicData(model), is_deleted(FALSE) {};
 
-    virtual bool deletedp() const;
-    virtual void set_deletedp(bool y);
+    virtual bool deletedp() const override;
+    virtual void set_deletedp(bool y) override;
 };
 
 #endif
diff --git a/src/data/SimpleRelationData.h b/src/data/SimpleRelationData.h
index d82fde35d..cd0619ebd 100644
--- a/src/data/SimpleRelationData.h
+++ b/src/data/SimpleRelationData.h
@@ -49,14 +49,14 @@ class SimpleRelationData : public SimpleData
     BrowserNode * end;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
+                              const QString & comment) override;
 
 public:
     SimpleRelationData(UmlCode e);
     SimpleRelationData(const BrowserSimpleRelation * model, BrowserSimpleRelation * r);
     virtual ~SimpleRelationData();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void set_start_end(BrowserSimpleRelation * s, BrowserNode * e);
     void edit();
@@ -73,7 +73,7 @@ class SimpleRelationData : public SimpleData
     }
     void set_type(UmlCode e);
 
-    virtual QString definition(bool full, bool with_kind) const;
+    virtual QString definition(bool full, bool with_kind) const override;
 
     void save(QTextStream &, QString & warning) const;
     static SimpleRelationData * read(char *&);
diff --git a/src/data/StateActionData.h b/src/data/StateActionData.h
index 75b167d8a..9cfe4957a 100644
--- a/src/data/StateActionData.h
+++ b/src/data/StateActionData.h
@@ -47,9 +47,9 @@ class StateActionData : public SimpleData
     WrapperStr java;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
 
 public:
     StateActionData();
@@ -61,7 +61,7 @@ class StateActionData : public SimpleData
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/StateData.cpp b/src/data/StateData.cpp
index b27dd907e..d44a7ebe2 100644
--- a/src/data/StateData.cpp
+++ b/src/data/StateData.cpp
@@ -118,8 +118,7 @@ void StateData::on_delete()
 
 void StateData::edit()
 {
-    setName(browser_node->get_name());
-
+    setObjectName(browser_node->get_name());
     (new StateDialog(this))->show();
 }
 
@@ -394,7 +393,7 @@ void StateBehavior::save(QTextStream & st, const char * lang) const
 
 void StateBehavior::read(char *& st, char *& k, const char * lang)
 {
-    int ln = strlen(lang);
+    size_t ln = strlen(lang);
 
     if (!strncmp(k, lang, ln) && !strcmp(k + ln, "_on_entry")) {
         on_entry = read_string(st);
diff --git a/src/data/StateData.h b/src/data/StateData.h
index 5dcc6456b..d0dd06ee0 100644
--- a/src/data/StateData.h
+++ b/src/data/StateData.h
@@ -52,7 +52,7 @@ struct StateBehavior {
 
 class StateData : public SimpleData
 {
-    Q_OBJECT
+    //Q_OBJECT
 
     friend class StateDialog;
 
@@ -65,9 +65,9 @@ class StateData : public SimpleData
     BrowserState * reference;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
 
 public:
     StateData();
@@ -90,7 +90,7 @@ class StateData : public SimpleData
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/data/TransitionData.cpp b/src/data/TransitionData.cpp
index 18ecf4efd..47d5ed4f0 100644
--- a/src/data/TransitionData.cpp
+++ b/src/data/TransitionData.cpp
@@ -297,7 +297,7 @@ void TransDef::save(QTextStream & st, const char * lang) const
 
 void TransDef::read(char *& st, char *& k, const char * lang)
 {
-    int ln = strlen(lang);
+    size_t ln = strlen(lang);
 
     if (!strncmp(k, lang, ln) && !strcmp(k + ln, "_trigger")) {
         trigger = read_string(st);
diff --git a/src/data/TransitionData.h b/src/data/TransitionData.h
index d3c936132..767f44059 100644
--- a/src/data/TransitionData.h
+++ b/src/data/TransitionData.h
@@ -64,16 +64,16 @@ class TransitionData : public SimpleData
     TransDef java;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
-    virtual void send_cpp_def(ToolCom * com);
-    virtual void send_java_def(ToolCom * com);
+                              const QString & comment) override;
+    virtual void send_cpp_def(ToolCom * com) override;
+    virtual void send_java_def(ToolCom * com) override;
 
 public:
     TransitionData();
     TransitionData(const BrowserTransition * model, BrowserTransition * r);
     virtual ~TransitionData();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void set_start_end(BrowserTransition * s, BrowserNode * e);
     void edit();
@@ -93,7 +93,7 @@ class TransitionData : public SimpleData
     QString str(bool horiz, DrawingLanguage) const;
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     static TransitionData * read(char *& , char *& k);
diff --git a/src/data/UseCaseData.cpp b/src/data/UseCaseData.cpp
index a8bbaf86b..6260225e5 100644
--- a/src/data/UseCaseData.cpp
+++ b/src/data/UseCaseData.cpp
@@ -61,9 +61,10 @@ UseCaseData::~UseCaseData()
 
 void UseCaseData::edit()
 {
-    setName(browser_node->get_name());
+    setObjectName(browser_node->get_name());
 
     (new UseCaseDialog(this))->show();
+
 }
 
 void UseCaseData::set_extension_points(QString s)
@@ -103,11 +104,6 @@ bool UseCaseData::tool_cmd(ToolCom * com, const char * args,
             default:
                 return BasicData::tool_cmd(com, args, bn, comment);
             }
-
-            // ok case
-            bn->modified();
-            modified();
-            com->write_ack(TRUE);
         }
     }
     else
@@ -132,7 +128,7 @@ void UseCaseData::save(QTextStream & st, QString & warning) const
 void UseCaseData::read(char *& st, char *& k)
 {
     if (!strcmp(k, "extension_points")) {
-        extension_points = toUnicode(read_string(st));
+        extension_points = read_string(st);
         k = read_keyword(st);
     }
 
diff --git a/src/data/UseCaseData.h b/src/data/UseCaseData.h
index c2287c6f4..31d15719d 100644
--- a/src/data/UseCaseData.h
+++ b/src/data/UseCaseData.h
@@ -27,11 +27,7 @@
 
 #ifndef USECASEDATA_H
 #define USECASEDATA_H
-
-#include <q3ptrdict.h>
-//Added by qt3to4:
 #include <QTextStream>
-
 #include "SimpleData.h"
 
 class BrowserUseCase;
@@ -46,7 +42,7 @@ class UseCaseData : public SimpleData
     QString extension_points;
 
     virtual void send_uml_def(ToolCom * com, BrowserNode * bn,
-                              const QString & comment);
+                              const QString & comment) override;
 public:
     UseCaseData();
     UseCaseData(UseCaseData * model, BrowserNode *);
@@ -60,7 +56,7 @@ class UseCaseData : public SimpleData
     void edit();
 
     virtual bool tool_cmd(ToolCom * com, const char * args,
-                          BrowserNode * bn, const QString & comment);
+                          BrowserNode * bn, const QString & comment) override;
 
     void save(QTextStream &, QString & warning) const;
     void read(char *& st, char *& k);
diff --git a/src/diagram/ActivityActionCanvas.cpp b/src/diagram/ActivityActionCanvas.cpp
index e44dfe208..88cc837b6 100644
--- a/src/diagram/ActivityActionCanvas.cpp
+++ b/src/diagram/ActivityActionCanvas.cpp
@@ -29,13 +29,13 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
-#include <Q3PointArray>
+#include <QList>
+#include <QPolygon>
 
 #include "ActivityActionCanvas.h"
 #include "ActivityActionData.h"
@@ -115,17 +115,17 @@ void ActivityActionCanvas::delete_it()
 
     DiagramCanvas::delete_it();
 
-    Q3ValueList<PinCanvas *>::Iterator iter;
+    QList<PinCanvas *>::Iterator iter;
 
     for (iter = pins.begin(); iter != pins.end(); ++iter)
         // don't empty pins to manage undo
         (*iter)->delete_it();
 
-    Q3ValueList<ParameterSetCanvas *>::Iterator iterps = paramsets.begin();
+    QList<ParameterSetCanvas *>::Iterator iterps = paramsets.begin();
 
     while (! paramsets.isEmpty()) {
         (*iterps)->delete_it();
-        iterps = paramsets.remove(iterps);
+        iterps = paramsets.erase(iterps);
     }
 
     if (pre != 0)
@@ -146,12 +146,12 @@ void ActivityActionCanvas::deleted()
 
 void ActivityActionCanvas::deleted(PinCanvas * pa)
 {
-    pins.remove(pa);
+    pins.removeOne(pa);
 }
 
 void ActivityActionCanvas::deleted(ParameterSetCanvas * ps)
 {
-    paramsets.remove(ps);
+    paramsets.removeOne(ps);
 }
 
 void ActivityActionCanvas::remove(bool from_model)
@@ -184,7 +184,7 @@ void ActivityActionCanvas::update()
 
     s = data->str((opaquedef) ? used_settings.drawing_language
                   : DefaultDrawingLanguage);
-    s = s.stripWhiteSpace();
+    s = s.trimmed();
 
     QString st = data->get_short_stereotype();
 
@@ -193,7 +193,7 @@ void ActivityActionCanvas::update()
         align = (int) ::Qt::AlignCenter | ::Qt::TextWordWrap;
     }
     else
-        align = (s.find('\n') != -1)
+        align = (s.indexOf('\n') != -1)
                 ? (int) ::Qt::AlignLeft | ::Qt::AlignVCenter
                 : (int) ::Qt::AlignCenter | ::Qt::TextWordWrap;
 
@@ -205,18 +205,18 @@ bool ActivityActionCanvas::force_inside()
 {
     // if its parent is present, force inside it
 
-    Q3CanvasItemList all = the_canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = the_canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     BrowserNode * parent = (BrowserNode *) browser_node->parent();
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&
-                IsaActivityContainer(di->type()) &&
+                IsaActivityContainer(di->typeUmlCode()) &&
                 (((ActivityContainerCanvas *) di)->get_bn() == parent)) {
-                ((ActivityContainerCanvas *) di)->force_inside(this, this);
+                ((ActivityContainerCanvas *) di)->force_inside(this, TRUE);
                 return TRUE;
             }
         }
@@ -230,13 +230,13 @@ void ActivityActionCanvas::moveBy(double dx, double dy)
     DiagramCanvas::moveBy(dx, dy);
 
     // update pins position
-    Q3ValueList<PinCanvas *>::Iterator iter;
+    QList<PinCanvas *>::Iterator iter;
 
     for (iter = pins.begin(); iter != pins.end(); ++iter)
         (*iter)->do_moveBy(dx, dy);
 
     // update parameter sets position
-    Q3ValueList<ParameterSetCanvas *>::Iterator iterps;
+    QList<ParameterSetCanvas *>::Iterator iterps;
 
     for (iterps = paramsets.begin(); iterps != paramsets.end(); ++iterps)
         (*iterps)->do_moveBy(dx, dy);
@@ -254,7 +254,7 @@ void ActivityActionCanvas::moveBy(double dx, double dy)
 
 void ActivityActionCanvas::check_parameter_sets_position()
 {
-    Q3ValueList<ParameterSetCanvas *>::Iterator iterps;
+    QList<ParameterSetCanvas *>::Iterator iterps;
 
     for (iterps = paramsets.begin(); iterps != paramsets.end(); ++iterps)
         (*iterps)->check_position();
@@ -262,16 +262,16 @@ void ActivityActionCanvas::check_parameter_sets_position()
 
 void ActivityActionCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     double scale = the_canvas()->zoom();
 
-    setSize((int)(width_scale100 * scale) | 1,
+    setRect(0,0,(int)(width_scale100 * scale) | 1,
             (int)(height_scale100 * scale) | 1);
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 
     // update pins position
-    Q3ValueList<PinCanvas *>::Iterator iter;
+    QList<PinCanvas *>::Iterator iter;
 
     for (iter = pins.begin(); iter != pins.end(); ++iter)
         (*iter)->do_change_scale();
@@ -345,9 +345,9 @@ bool ActivityActionCanvas::move_with_its_package() const
 
 void ActivityActionCanvas::set_z(double z)
 {
-    setZ(z);
+    setZValue(z);
 
-    Q3ValueList<ParameterSetCanvas *>::Iterator iterps;
+    QList<ParameterSetCanvas *>::Iterator iterps;
 
     for (iterps = paramsets.begin(); iterps != paramsets.end(); ++iterps)
         (*iterps)->set_z(z);
@@ -355,7 +355,7 @@ void ActivityActionCanvas::set_z(double z)
     // pins have z+1 to be upper the parameter sets
     z += 1;
 
-    Q3ValueList<PinCanvas *>::Iterator iter;
+    QList<PinCanvas *>::Iterator iter;
 
     for (iter = pins.begin(); iter != pins.end(); ++iter)
         (*iter)->set_z(z);
@@ -363,7 +363,7 @@ void ActivityActionCanvas::set_z(double z)
 
 void ActivityActionCanvas::force_pins_arround()
 {
-    Q3ValueList<PinCanvas *>::Iterator iter;
+    QList<PinCanvas *>::Iterator iter;
 
     for (iter = pins.begin(); iter != pins.end(); ++iter)
         (*iter)->check_position();
@@ -372,12 +372,12 @@ void ActivityActionCanvas::force_pins_arround()
 void ActivityActionCanvas::check_parametersets()
 {
     // add missing parameter sets
-    const Q3ValueList<BrowserParameterSet *> brps =
+    const QList<BrowserParameterSet *> brps =
         ((BrowserActivityAction *) browser_node)->get_parametersets();
-    Q3ValueList<BrowserParameterSet *>::ConstIterator iter;
+    QList<BrowserParameterSet *>::ConstIterator iter;
 
     for (iter = brps.begin(); iter != brps.end(); ++iter) {
-        Q3ValueList<ParameterSetCanvas *>::ConstIterator itershown;
+        QList<ParameterSetCanvas *>::ConstIterator itershown;
 
         for (itershown = paramsets.begin(); itershown != paramsets.end(); ++itershown)
             if ((*itershown)->get_bn() == *iter)
@@ -398,9 +398,9 @@ void ActivityActionCanvas::check_parametersets()
 void ActivityActionCanvas::check_pins()
 {
     // add missing pins
-    const Q3ValueList<BrowserPin *> brpins =
+    const QList<BrowserPin *> brpins =
         ((BrowserActivityAction *) browser_node)->get_pins();
-    Q3ValueList<BrowserPin *>::ConstIterator iter;
+    QList<BrowserPin *>::ConstIterator iter;
     double zoom = the_canvas()->zoom();
     int sz = (int)(zoom * PIN_SIZE);
     int six = (int)(zoom * 6);
@@ -414,7 +414,7 @@ void ActivityActionCanvas::check_pins()
     sz += six;
 
     for (iter = brpins.begin(); iter != brpins.end(); ++iter) {
-        Q3ValueList<PinCanvas *>::ConstIterator itershown;
+        QList<PinCanvas *>::ConstIterator itershown;
 
         for (itershown = pins.begin(); itershown != pins.end(); ++itershown)
             if ((*itershown)->get_bn() == *iter)
@@ -472,7 +472,7 @@ void ActivityActionCanvas::check_conditions_constraint()
                 int cdx = (int) x() - margin;
                 int cdy = (int) y() - pre->height() - margin;
 
-                pre->move((cdx < 0) ? 0 : cdx, (cdy < 0) ? 0 : cdy);
+                pre->moveBy((cdx < 0) ? 0 : cdx, (cdy < 0) ? 0 : cdy);
                 pre->show();
                 (new ArrowCanvas(the_canvas(), this, pre, UmlAnchor, 0, FALSE, -1.0, -1.0))
                 ->show();
@@ -495,7 +495,7 @@ void ActivityActionCanvas::check_conditions_constraint()
             if (post == 0) {
                 post = new InfoCanvas(the_canvas(), this, s);
                 post->upper();
-                post->move(x() + margin, y() + height() + margin);
+                post->moveBy(x() + margin, y() + height() + margin);
                 post->show();
                 (new ArrowCanvas(the_canvas(), this, post, UmlAnchor, 0, FALSE, -1.0, -1.0))
                 ->show();
@@ -516,7 +516,7 @@ void ActivityActionCanvas::check_conditions_constraint()
             if (constraint == 0) {
                 constraint = new InfoCanvas(the_canvas(), this, s);
                 constraint->upper();
-                constraint->move(x() + width() + margin, y());
+                constraint->moveBy(x() + width() + margin, y());
                 constraint->show();
                 (new ArrowCanvas(the_canvas(), this, constraint, UmlAnchor, 0, FALSE, -1.0, -1.0))
                 ->show();
@@ -552,12 +552,13 @@ int ActivityActionCanvas::shadow_margin() const
 
 void ActivityActionCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
+    QBrush backBrush = p.background();
 
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode
@@ -565,7 +566,8 @@ void ActivityActionCanvas::draw(QPainter & p)
 
     QColor co = color(used_color);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     const ActivityActionData * data =
         (ActivityActionData *) browser_node->get_data();
@@ -620,7 +622,7 @@ void ActivityActionCanvas::draw(QPainter & p)
 
             margin = ((r.height() < r.width()) ? r.height() : r.width()) / 4;
 
-            Q3PointArray a(6);
+            QPolygon a(6);
 
             a.setPoint(0, r.x(), r.y());
             a.setPoint(1, r.right(), r.y());
@@ -637,7 +639,7 @@ void ActivityActionCanvas::draw(QPainter & p)
             }
             else {
                 if (shadow != 0) {
-                    Q3PointArray b(6);
+                    QPolygon b(6);
 
                     b.setPoint(0, r.x() + shadow, r.y() + shadow);
                     b.setPoint(1, r.right() + shadow, r.y() + shadow);
@@ -647,7 +649,7 @@ void ActivityActionCanvas::draw(QPainter & p)
                     b.setPoint(5, r.x() + shadow, r.y() + shadow);
                     p.setBrush(::Qt::darkGray);
                     p.setPen(::Qt::NoPen);
-                    p.drawPolygon(b, TRUE, 0, 5);
+                    p.drawPolygon(b/*, TRUE, 0, 5*/);
                     p.setPen(::Qt::SolidLine);
 
                     if (fp != 0)
@@ -655,7 +657,7 @@ void ActivityActionCanvas::draw(QPainter & p)
                 }
 
                 p.setBrush(co);
-                p.drawPolygon(a, TRUE, 0, 5);
+                p.drawPolygon(a/*, TRUE, 0, 5*/);
 
                 if (fp != 0)
                     draw_poly(fp, a, used_color);
@@ -676,7 +678,7 @@ void ActivityActionCanvas::draw(QPainter & p)
 
         margin = ((r.height() < r.width()) ? r.height() : r.width()) / 4;
 
-        Q3PointArray a(6);
+        QPolygon a(6);
 
         a.setPoint(0, r.x(), r.y());
         a.setPoint(1, r.right() - margin, r.y());
@@ -693,7 +695,7 @@ void ActivityActionCanvas::draw(QPainter & p)
         }
         else {
             if (shadow != 0) {
-                Q3PointArray b(6);
+                QPolygon b(6);
 
                 b.setPoint(0, r.x() + shadow, r.y() + shadow);
                 b.setPoint(1, r.right() - margin + shadow, r.y() + shadow);
@@ -703,7 +705,7 @@ void ActivityActionCanvas::draw(QPainter & p)
                 b.setPoint(5, r.x() + shadow, r.y() + shadow);
                 p.setBrush(::Qt::darkGray);
                 p.setPen(::Qt::NoPen);
-                p.drawPolygon(b, TRUE, 0, 5);
+                p.drawPolygon(b/*, TRUE, 0, 5*/);
                 p.setPen(::Qt::SolidLine);
 
                 if (fp != 0)
@@ -711,7 +713,7 @@ void ActivityActionCanvas::draw(QPainter & p)
             }
 
             p.setBrush(co);
-            p.drawPolygon(a, TRUE, 0, 5);
+            p.drawPolygon(a/*, TRUE, 0, 5*/);
 
             if (fp != 0)
                 draw_poly(fp, a, used_color);
@@ -804,14 +806,23 @@ void ActivityActionCanvas::draw(QPainter & p)
                   align, s, p.font(), fp);
     }
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, rect());
 }
 
-UmlCode ActivityActionCanvas::type() const
+void ActivityActionCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ActivityActionCanvas::typeUmlCode() const
 {
     return UmlActivityAction;
 }
@@ -840,44 +851,44 @@ void ActivityActionCanvas::open()
 void ActivityActionCanvas::menu(const QPoint &)
 {
     ActivityActionData * data = (ActivityActionData *) browser_node->get_data();
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, data->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable() && data->may_add_pin()) {
-        m.insertItem(TR("Add pin"), 7);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Add pin"), 7);
+        m.addSeparator();
     }
 
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit activity action"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit activity action"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     const char * what;
     BrowserNode * who = data->get_action()->referenced(what);
     BrowserNode * diag = 0;
 
     if (who != 0)
-        m.insertItem(TR("Select %1 in browser", QString(what)), 10);
+        MenuFactory::addItem(m, tr("Select %1 in browser").arg(what), 10);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
             (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (data->get_action_kind() == UmlCallBehaviorAction) {
             BasicData * d = data->get_action()->depend_on();
@@ -887,28 +898,31 @@ void ActivityActionCanvas::menu(const QPoint &)
 
                 if ((diag != 0) &&
                     (diag != (BrowserNode *) the_canvas()->browser_diagram()))
-                    m.insertItem(TR("Set associated diagram from behavior"), 11);
+                    MenuFactory::addItem(m, tr("Set associated diagram from behavior"), 11);
             }
         }
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 12);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 12);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 8);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 8);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 9);
+        MenuFactory::addItem(m, tr("Delete from model"), 9);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlActivityAction, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
     int index;
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index = retAction->data().toInt()) {
     case 0:
         upper();
         modified();	// call package_modified()
@@ -986,9 +1000,10 @@ void ActivityActionCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 }
 
-void ActivityActionCanvas::apply_shortcut(QString s)
+void ActivityActionCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -1021,10 +1036,10 @@ void ActivityActionCanvas::edit_drawing_settings()
         StateSpecVector st(1);
         ColorSpecVector co(1);
 
-        st[0].set(TR("show opaque definition"), &show_opaque_action_definition);
+        st[0].set(tr("show opaque definition"), &show_opaque_action_definition);
         settings.complete(st, TRUE);
 
-        co[0].set(TR("action color"), &itscolor);
+        co[0].set(tr("action color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -1043,7 +1058,7 @@ bool ActivityActionCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ActivityActionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ActivityActionCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(1);
@@ -1052,28 +1067,27 @@ void ActivityActionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         UmlColor itscolor;
         ActivityDrawingSettings settings;
 
-        st[0].set(TR("show opaque definition"), &show_opaque_action_definition);
+        st[0].set(tr("show opaque definition"), &show_opaque_action_definition);
         settings.complete(st, TRUE);
 
-        co[0].set(TR("action color"), &itscolor);
+        co[0].set(tr("action color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                ActivityActionCanvas *canvas = (ActivityActionCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((ActivityActionCanvas *) it.current())->show_opaque_action_definition =
+                    canvas->show_opaque_action_definition =
                         show_opaque_action_definition;
 
                 if (!co[0].name.isEmpty())
-                    ((ActivityActionCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((ActivityActionCanvas *) it.current())->settings.set(st, 1);
-                ((ActivityActionCanvas *) it.current())->modified();	// call package_modified()
+                canvas->settings.set(st, 1);
+                canvas->modified();
             }
         }
 
@@ -1082,20 +1096,13 @@ void ActivityActionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ActivityActionCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ActivityActionCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ActivityActionCanvas * x = (ActivityActionCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ActivityActionCanvas * o = (ActivityActionCanvas *) it.current();
-
-        o->show_opaque_action_definition = x->show_opaque_action_definition;
-        o->itscolor = x->itscolor;
-        o->settings = x->settings;
-        o->modified();	// call package_modified()
-    }
+    ActivityActionCanvas *srcCanvas = (ActivityActionCanvas *)src;
+    show_opaque_action_definition = srcCanvas->show_opaque_action_definition;
+    itscolor = srcCanvas->itscolor;
+    settings = srcCanvas->settings;
+    modified();
 }
 
 bool ActivityActionCanvas::get_show_stereotype_properties() const
@@ -1124,7 +1131,7 @@ QString ActivityActionCanvas::may_connect(UmlCode & l, const DiagramItem * dest)
     if (l == UmlAnchor)
         return dest->may_start(l);
     else if (dest->get_bn() == 0)
-        return TR("illegal");
+        return tr("illegal");
     else
         return ((BrowserActivityAction *) browser_node)->may_connect(l, dest->get_bn());
 }
@@ -1173,7 +1180,7 @@ void ActivityActionCanvas::save(QTextStream & st, bool ref, QString & warning) c
             st << "pins";
             indent(+1);
 
-            Q3ValueList<PinCanvas *>::ConstIterator iter;
+            QList<PinCanvas *>::ConstIterator iter;
 
             for (iter = pins.begin(); iter != pins.end(); ++iter)
                 (*iter)->save(st, FALSE, warning);
@@ -1188,7 +1195,7 @@ void ActivityActionCanvas::save(QTextStream & st, bool ref, QString & warning) c
             st << "parameter_sets";
             indent(+1);
 
-            Q3ValueList<ParameterSetCanvas *>::ConstIterator iterps;
+            QList<ParameterSetCanvas *>::ConstIterator iterps;
 
             for (iterps = paramsets.begin(); iterps != paramsets.end(); ++iterps)
                 (*iterps)->save(st, FALSE, warning);
@@ -1333,7 +1340,7 @@ void ActivityActionCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
@@ -1342,7 +1349,7 @@ void ActivityActionCanvas::history_load(QBuffer & b)
 
 void ActivityActionCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
diff --git a/src/diagram/ActivityActionCanvas.h b/src/diagram/ActivityActionCanvas.h
index 029fd31bc..e5226ca75 100644
--- a/src/diagram/ActivityActionCanvas.h
+++ b/src/diagram/ActivityActionCanvas.h
@@ -33,10 +33,8 @@
 
 
 #include <qobject.h>
-#include <q3valuelist.h>
-//Added by qt3to4:
+#include <QList>
 #include <QTextStream>
-
 #include "DiagramCanvas.h"
 #include "Settings.h"
 
@@ -51,8 +49,8 @@ class ActivityActionCanvas : public QObject, public DiagramCanvas
     Q_OBJECT
 
 protected:
-    Q3ValueList<PinCanvas *> pins;
-    Q3ValueList<ParameterSetCanvas *> paramsets;
+    QList<PinCanvas *> pins;
+    QList<ParameterSetCanvas *> paramsets;
     InfoCanvas * pre;
     InfoCanvas * post;
     InfoCanvas * constraint;
@@ -71,11 +69,12 @@ class ActivityActionCanvas : public QObject, public DiagramCanvas
     void check_parametersets();
     void check_conditions_constraint();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ActivityActionCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~ActivityActionCanvas();
 
-    Q3ValueList<PinCanvas *> get_pins() {
+    QList<PinCanvas *> get_pins() {
         return pins;
     }
     void add(PinCanvas * p) {
@@ -88,47 +87,48 @@ class ActivityActionCanvas : public QObject, public DiagramCanvas
 
     int shadow_margin() const;
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    void update();
+    virtual void update() override;
     void deleted(PinCanvas *);
     void deleted(ParameterSetCanvas *);
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void set_z(double z);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual bool move_with_its_package() const;
-    virtual void moveBy(double dx, double dy);
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void set_z(double z) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual bool move_with_its_package() const override;
+    virtual void moveBy(double dx, double dy) override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ActivityActionCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/ActivityCanvas.cpp b/src/diagram/ActivityCanvas.cpp
index c62818ba5..f79636fbe 100644
--- a/src/diagram/ActivityCanvas.cpp
+++ b/src/diagram/ActivityCanvas.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "ActivityCanvas.h"
 #include "ActivityData.h"
@@ -98,7 +98,7 @@ void ActivityCanvas::delete_it()
 
     DiagramCanvas::delete_it();
 
-    Q3ValueList<ParameterCanvas *>::Iterator iter;
+    QList<ParameterCanvas *>::Iterator iter;
 
     for (iter = params.begin();  iter != params.end(); ++iter)
         // don't empty params to manage undo
@@ -116,7 +116,7 @@ void ActivityCanvas::deleted()
 
 void ActivityCanvas::deleted(ParameterCanvas * pa)
 {
-    params.remove(pa);
+    params.removeOne(pa);
 }
 
 void ActivityCanvas::remove(bool from_model)
@@ -172,7 +172,7 @@ void ActivityCanvas::compute_size()
         pre = data->get_precond(st.drawing_language);
 
         if (! pre.isEmpty()) {
-            pre = toUnicode(pre);
+            pre = toUnicode(pre.toLatin1());
             pre_offset.setX(x0);
             pre_offset.setY(y0);
 
@@ -189,7 +189,7 @@ void ActivityCanvas::compute_size()
         post = data->get_postcond(st.drawing_language);
 
         if (! post.isEmpty()) {
-            post = toUnicode(post);
+            post = toUnicode(post.toLatin1().constData());
             post_offset.setX(x0);
             post_offset.setY(y0);
 
@@ -212,16 +212,15 @@ void ActivityCanvas::compute_size()
     min_height = y0 + margin + fm.height();
 
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlActivity)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlActivity)
+            : itscolor;
 
     DiagramCanvas::resize((width() > min_width) ? width() : min_width,
                           (height() > min_height) ? height() : min_height);
 
     if (! the_canvas()->do_zoom()) {
         // update parameters position
-        Q3ValueList<ParameterCanvas *>::Iterator iter;
-
+        QList<ParameterCanvas *>::Iterator iter;
         for (iter = params.begin(); iter != params.end(); ++iter)
             (*iter)->check_position();
     }
@@ -232,7 +231,7 @@ void ActivityCanvas::moveBy(double dx, double dy)
     DiagramCanvas::moveBy(dx, dy);
 
     // update parameters position
-    Q3ValueList<ParameterCanvas *>::Iterator iter;
+    QList<ParameterCanvas *>::Iterator iter;
 
     for (iter = params.begin(); iter != params.end(); ++iter)
         (*iter)->do_moveBy(dx, dy);
@@ -243,16 +242,16 @@ void ActivityCanvas::moveBy(double dx, double dy)
 
 void ActivityCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     double scale = the_canvas()->zoom();
 
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     compute_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 
     // update parameters position
-    Q3ValueList<ParameterCanvas *>::Iterator iter;
+    QList<ParameterCanvas *>::Iterator iter;
 
     for (iter = params.begin(); iter != params.end(); ++iter)
         (*iter)->do_change_scale();
@@ -298,11 +297,11 @@ bool ActivityCanvas::move_with_its_package() const
 
 void ActivityCanvas::set_z(double z)
 {
-    setZ(z);
+    setZValue(z);
 
     z += 1;
 
-    Q3ValueList<ParameterCanvas *>::Iterator iter;
+    QList<ParameterCanvas *>::Iterator iter;
 
     for (iter = params.begin(); iter != params.end(); ++iter)
         (*iter)->set_z(z);
@@ -314,21 +313,21 @@ void ActivityCanvas::force_sub_inside(bool resize_it)
     // except the parameters whose are in the border
     // and the diagram icon
     // or resize it to contains sub elts if resize_it
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     BooL need_sub_upper = FALSE;
 
     if (resize_it) {
         resize_to_contain(all, need_sub_upper);
 
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible()/* && !(*cit)->selected()*/) {
+            if ((*cit)->isVisible()/* && !(*cit)->selected()*/) {
                 DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
                 if ((di != 0) &&
-                    (di->type() == UmlParameter) &&
-                    (di->get_bn() != 0) &&
-                    (((BrowserNode *) di->get_bn())->parent() == browser_node)) {
+                        (di->typeUmlCode() == UmlParameter) &&
+                        (di->get_bn() != 0) &&
+                        (((BrowserNode *) di->get_bn())->parent() == browser_node)) {
                     ((ParameterCanvas *) di)->check_position();
                 }
             }
@@ -344,14 +343,14 @@ void ActivityCanvas::force_sub_inside(bool resize_it)
 void ActivityCanvas::check_params()
 {
     // add missing params
-    const Q3ValueList<BrowserParameter *> brparams =
-        ((BrowserActivity *) browser_node)->get_params();
-    Q3ValueList<BrowserParameter *>::ConstIterator iter;
+    const QList<BrowserParameter *> brparams =
+            ((BrowserActivity *) browser_node)->get_params();
+    QList<BrowserParameter *>::ConstIterator iter;
     int dy = (int)(the_canvas()->zoom() * PARAMETER_CANVAS_MIN_HEIGHT);
     int rank;
 
     for (iter = brparams.begin(), rank = 0; iter != brparams.end(); ++iter, rank += 1) {
-        Q3ValueList<ParameterCanvas *>::ConstIterator itershown;
+        QList<ParameterCanvas *>::ConstIterator itershown;
 
         for (itershown = params.begin(); itershown != params.end(); ++itershown)
             if ((*itershown)->get_bn() == *iter)
@@ -405,7 +404,7 @@ void ActivityCanvas::check_params()
             }
 
             ParameterCanvas * pc =
-                new ParameterCanvas(*iter, the_canvas(), px, py, 0, this);
+                    new ParameterCanvas(*iter, the_canvas(), px, py, 0, this);
 
             params.append(pc);
             pc->show();
@@ -431,10 +430,10 @@ void ActivityCanvas::check_constraint()
             if (constraint == 0) {
                 constraint = new InfoCanvas(the_canvas(), this, s);
                 constraint->upper();
-                constraint->move(x() + width() + margin, y());
+                constraint->moveBy(x() + width() + margin, y());
                 constraint->show();
                 (new ArrowCanvas(the_canvas(), this, constraint, UmlAnchor, 0, FALSE, -1.0, -1.0))
-                ->show();
+                        ->show();
             }
             else
                 constraint->set(s);
@@ -449,12 +448,13 @@ void ActivityCanvas::check_constraint()
 }
 void ActivityCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
+    QBrush backBrush = p.background();
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     int margin = (int)(24 * the_canvas()->zoom());
     FILE * fp = svg();
 
@@ -467,7 +467,8 @@ void ActivityCanvas::draw(QPainter & p)
 
     QColor co = color(used_color);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
@@ -478,12 +479,12 @@ void ActivityCanvas::draw(QPainter & p)
     if (fp != 0) {
         if (used_color != UmlTransparent)
             fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"10\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"10\" />\n",
                     svg_color(used_color),
                     r.left(), r.top(), r.width() - 1, r.height() - 1);
         else
             fprintf(fp, "\t<rect fill=\"none\" stroke=\"black\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"10\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"10\" />\n",
                     r.left(), r.top(), r.width() - 1, r.height() - 1);
     }
 
@@ -572,14 +573,23 @@ void ActivityCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("</g>\n", fp);
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode ActivityCanvas::type() const
+void ActivityCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ActivityCanvas::typeUmlCode() const
 {
     return UmlActivity;
 }
@@ -607,128 +617,132 @@ void ActivityCanvas::open()
 
 void ActivityCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
-        m.insertItem(TR("Add parameter"), 9);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Add parameter"), 9);
+        m.addSeparator();
     }
 
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit activity"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit activity"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
-            (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+                (BrowserNode *) the_canvas()->browser_diagram())
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 10);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 10);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlActivity, 20))
-        m.insertItem(TR("Tool"), &toolm);
-
-    switch (index = m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
-
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
-
-    case 13:
-        z_up();
-        modified();	// call package_modified()
-        return;
-
-    case 14:
-        z_down();
-        modified();	// call package_modified()
-        return;
-
-    case 2:
-        edit_drawing_settings();
-        return;
-
-    case 3:
-        browser_node->open(TRUE);
-        return;
-
-    case 4:
-        browser_node->select_in_browser();
-        return;
-
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (index = retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
 
-    case 6:
-        ((BrowserActivity *) browser_node)
-        ->set_associated_diagram((BrowserActivityDiagram *)
-                                 the_canvas()->browser_diagram());
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
 
-    case 10:
-        ((BrowserActivity *) browser_node)
-        ->set_associated_diagram(0);
-        return;
+        case 13:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 7:
-        //remove from diagram
-        delete_it();
-        break;
+        case 14:
+            z_down();
+            modified();	// call package_modified()
+            return;
+
+        case 2:
+            edit_drawing_settings();
+            return;
+
+        case 3:
+            browser_node->open(TRUE);
+            return;
+
+        case 4:
+            browser_node->select_in_browser();
+            return;
+
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
+
+        case 6:
+            ((BrowserActivity *) browser_node)
+                    ->set_associated_diagram((BrowserActivityDiagram *)
+                                             the_canvas()->browser_diagram());
+            return;
+
+        case 10:
+            ((BrowserActivity *) browser_node)
+                    ->set_associated_diagram(0);
+            return;
+
+        case 7:
+            //remove from diagram
+            delete_it();
+            break;
 
-    case 8:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 8:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    case 9:
-        ((BrowserActivity *) browser_node)->add_parameter(0);
-        modified();
+        case 9:
+            ((BrowserActivity *) browser_node)->add_parameter(0);
+            modified();
 
-    default:
-        if (index >= 20)
-            ToolCom::run(Tool::command(index - 20), browser_node);
+        default:
+            if (index >= 20)
+                ToolCom::run(Tool::command(index - 20), browser_node);
 
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void ActivityCanvas::apply_shortcut(QString s)
+void ActivityCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -761,10 +775,10 @@ void ActivityCanvas::edit_drawing_settings()
         StateSpecVector st(2);
         ColorSpecVector co(1);
 
-        st[0].set(TR("show conditions"), &settings.show_infonote);
-        st[1].set(TR("drawing language"), &settings.drawing_language);
+        st[0].set(tr("show conditions"), &settings.show_infonote);
+        st[1].set(tr("drawing language"), &settings.drawing_language);
 
-        co[0].set(TR("activity color"), &itscolor);
+        co[0].set(tr("activity color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -783,7 +797,7 @@ bool ActivityCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ActivityCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ActivityCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(2);
@@ -792,29 +806,28 @@ void ActivityCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         DrawingLanguage drawing_language;
         UmlColor itscolor;
 
-        st[0].set(TR("show conditions"), &show_infonote);
-        st[1].set(TR("drawing language"), &drawing_language);
+        st[0].set(tr("show conditions"), &show_infonote);
+        st[1].set(tr("drawing language"), &drawing_language);
 
-        co[0].set(TR("activity color"), &itscolor);
+        co[0].set(tr("activity color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                ActivityCanvas *canvas = (ActivityCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((ActivityCanvas *) it.current())->settings.show_infonote = show_infonote;
+                    canvas->settings.show_infonote = show_infonote;
 
                 if (!st[1].name.isEmpty())
-                    ((ActivityCanvas *) it.current())->settings.drawing_language = drawing_language;
+                    canvas->settings.drawing_language = drawing_language;
 
                 if (!co[0].name.isEmpty())
-                    ((ActivityCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((ActivityCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();
             }
         }
 
@@ -823,18 +836,11 @@ void ActivityCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ActivityCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ActivityCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ActivityCanvas * x = (ActivityCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ActivityCanvas * o = (ActivityCanvas *) it.current();
-
-        o->settings = x->settings;
-        o->modified();	// call package_modified()
-    }
+    const ActivityCanvas * x = (const ActivityCanvas *) src;
+    settings = x->settings;
+    modified();
 }
 
 bool ActivityCanvas::get_show_stereotype_properties() const
@@ -853,7 +859,7 @@ bool ActivityCanvas::get_show_stereotype_properties() const
 
 QString ActivityCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlFlow) ? TR("illegal") : QString();
+    return (l == UmlFlow) ? tr("illegal") : QString();
 }
 
 QString ActivityCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
@@ -861,7 +867,7 @@ QString ActivityCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     if (l == UmlAnchor)
         return dest->may_start(l);
     else if (dest->get_bn() == 0)
-        return TR("illegal");
+        return tr("illegal");
     else
         // dependency
         return ((BrowserActivity *) browser_node)->may_connect(dest->get_bn());
@@ -907,7 +913,7 @@ void ActivityCanvas::save(QTextStream & st, bool ref, QString & warning) const
             st << "params";
             indent(+1);
 
-            Q3ValueList<ParameterCanvas *>::ConstIterator iter;
+            QList<ParameterCanvas *>::ConstIterator iter;
 
             for (iter = params.begin(); iter != params.end(); ++iter)
                 (*iter)->save(st, FALSE, warning);
@@ -1017,7 +1023,7 @@ void ActivityCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
@@ -1026,7 +1032,7 @@ void ActivityCanvas::history_load(QBuffer & b)
 
 void ActivityCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
diff --git a/src/diagram/ActivityCanvas.h b/src/diagram/ActivityCanvas.h
index d33cb2658..584d1f8ac 100644
--- a/src/diagram/ActivityCanvas.h
+++ b/src/diagram/ActivityCanvas.h
@@ -33,10 +33,8 @@
 
 
 #include <qobject.h>
-#include <q3valuelist.h>
-//Added by qt3to4:
+#include <QList>
 #include <QTextStream>
-
 #include "ActivityContainerCanvas.h"
 #include "Settings.h"
 
@@ -63,7 +61,7 @@ class ActivityCanvas : public QObject, public ActivityContainerCanvas
     QPoint pre_offset;
     QPoint post_offset;
     int post_width;
-    Q3ValueList<ParameterCanvas *> params;
+    QList<ParameterCanvas *> params;
     InfoCanvas * constraint;
 
 protected:
@@ -72,54 +70,56 @@ class ActivityCanvas : public QObject, public ActivityContainerCanvas
     void check_params();
     void check_constraint();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ActivityCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~ActivityCanvas();
 
-    Q3ValueList<ParameterCanvas *> get_params() {
+    QList<ParameterCanvas *> get_params() {
         return params;
     }
     void force_sub_inside(bool rz);
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void compute_size();
     void deleted(ParameterCanvas *);
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void set_z(double z);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual bool move_with_its_package() const;
-    virtual void moveBy(double dx, double dy);
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
-
-    virtual void apply_shortcut(QString s);
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void set_z(double z) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using ActivityContainerCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual bool move_with_its_package() const override;
+    virtual void moveBy(double dx, double dy) override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
+
+    virtual void apply_shortcut(const QString & s) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ActivityCanvas * read(char *& , UmlCanvas *, char *);
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/ActivityContainerCanvas.cpp b/src/diagram/ActivityContainerCanvas.cpp
index 785d3d7eb..2e8aad035 100644
--- a/src/diagram/ActivityContainerCanvas.cpp
+++ b/src/diagram/ActivityContainerCanvas.cpp
@@ -37,7 +37,7 @@
 #include "ExpansionNodeCanvas.h"
 #include "ArrowPointCanvas.h"
 
-void ActivityContainerCanvas::force_inside(DiagramItem * di, Q3CanvasItem * ci,
+void ActivityContainerCanvas::force_inside(DiagramItem * di, QGraphicsItem * ci,
         BooL & need_sub_upper)
 {
     QRect r = rect();
@@ -62,14 +62,14 @@ void ActivityContainerCanvas::force_inside(DiagramItem * di, Q3CanvasItem * ci,
     if ((dx != 0) || (dy != 0))
         ci->moveBy(dx, dy);
 
-    need_sub_upper |= (ci->z() <= z());
+    need_sub_upper |= (ci->zValue() <= zValue());
 }
 
 // resize this to contain its sub elements
-void ActivityContainerCanvas::resize_to_contain(Q3CanvasItemList & all,
+void ActivityContainerCanvas::resize_to_contain(QList<QGraphicsItem*> & all,
         BooL & need_sub_upper)
 {
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*>::Iterator cit;
     BrowserNode * browser_node = get_bn();
     QRect r = rect();
     int resize_left = 0;
@@ -78,7 +78,7 @@ void ActivityContainerCanvas::resize_to_contain(Q3CanvasItemList & all,
     int resize_bottom = 0;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible() && !(*cit)->selected()) {
+        if ((*cit)->isVisible() && !(*cit)->isSelected()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&
@@ -86,7 +86,7 @@ void ActivityContainerCanvas::resize_to_contain(Q3CanvasItemList & all,
                 (((BrowserNode *) di->get_bn())->parent() == browser_node)) {
                 // must look at the type because some canvas items have browser_node
                 // attr equals to the diagram and the parent of the diagram is the activity
-                switch (di->type()) {
+                switch (di->typeUmlCode()) {
                 case UmlActivityObject:
                 case UmlActivityAction:
                 case UmlActivityPartition:
@@ -132,7 +132,7 @@ void ActivityContainerCanvas::resize_to_contain(Q3CanvasItemList & all,
                     }
                 }
 
-                need_sub_upper |= ((*cit)->z() <= z());
+                need_sub_upper |= ((*cit)->zValue() <= zValue());
                 break;
 
                 default:
@@ -173,14 +173,14 @@ void ActivityContainerCanvas::resize_to_contain(Q3CanvasItemList & all,
 }
 
 // update sub nodes position to be inside this
-void ActivityContainerCanvas::force_sub_inside(Q3CanvasItemList & all,
+void ActivityContainerCanvas::force_sub_inside(QList<QGraphicsItem*> & all,
         BooL & need_sub_upper)
 {
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*>::Iterator cit;
     BrowserNode * browser_node = get_bn();
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()/* && !(*cit)->selected()*/) {
+        if ((*cit)->isVisible()/* && !(*cit)->isSelected()*/) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&
@@ -188,7 +188,7 @@ void ActivityContainerCanvas::force_sub_inside(Q3CanvasItemList & all,
                 (((BrowserNode *) di->get_bn())->parent() == browser_node)) {
                 // must look at the type because some canvas items have browser_node
                 // attr equals to the diagram and the parent of the diagram is the activity
-                switch (di->type()) {
+                switch (di->typeUmlCode()) {
                 case UmlActivityObject:
                 case UmlActivityAction:
                 case UmlActivityPartition:
@@ -213,13 +213,13 @@ void ActivityContainerCanvas::force_sub_inside(Q3CanvasItemList & all,
 }
 
 // update sub nodes to be upper this, recursively
-void ActivityContainerCanvas::force_sub_upper(Q3CanvasItemList & all)
+void ActivityContainerCanvas::force_sub_upper(QList<QGraphicsItem*> & all)
 {
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*>::Iterator cit;
     BrowserNode * browser_node = get_bn();
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&
@@ -227,7 +227,7 @@ void ActivityContainerCanvas::force_sub_upper(Q3CanvasItemList & all)
                 (((BrowserNode *) di->get_bn())->parent() == browser_node)) {
                 // must look at the type because some canvas items have browser_node
                 // attr equals to the diagram and the parent of the diagram is the activity
-                switch (di->type()) {
+                switch (di->typeUmlCode()) {
                 case UmlActivityObject:
                 case UmlActivityAction:
                 case UmlActivityPartition:
@@ -240,7 +240,7 @@ void ActivityContainerCanvas::force_sub_upper(Q3CanvasItemList & all)
                 case MergeAN:
                 case ForkAN:
                 case JoinAN:
-                    if ((*cit)->z() <= z())
+                    if ((*cit)->zValue() <= zValue())
                         ((DiagramCanvas *) di)->upper();
 
                     {
@@ -264,16 +264,16 @@ void ActivityContainerCanvas::force_sub_upper(Q3CanvasItemList & all)
 bool ActivityContainerCanvas::force_inside(DiagramCanvas * elt, bool part)
 {
     // if its parent is present, force inside it
-    Q3CanvasItemList all = elt->the_canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = elt->the_canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     BrowserNode * parent = (BrowserNode *) elt->get_bn()->parent();
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&
-                IsaActivityContainer(di->type(), part) &&
+                IsaActivityContainer(di->typeUmlCode(), part) &&
                 (((ActivityContainerCanvas *) di)->get_bn() == parent)) {
                 BooL under = FALSE;
 
@@ -294,18 +294,16 @@ bool ActivityContainerCanvas::force_inside(DiagramCanvas * elt, bool part)
 // only for pin & parameter & expansion node
 static bool indirectly_selected(DiagramItem * di)
 {
-    switch (di->type()) {
-    case UmlActivityPin:
-        return ((PinCanvas *) di)->action_selected();
-
+    switch (di->typeUmlCode()) {
     case UmlParameter:
         return ((ParameterCanvas *) di)->activity_selected();
-
+    case UmlActivityPin:
+        return ((PinCanvas *) di)->action_selected();
     case UmlExpansionNode:
         return ((ExpansionNodeCanvas *) di)->region_selected();
-
     default:
         return FALSE;
+
     }
 }
 
@@ -313,12 +311,12 @@ void ActivityContainerCanvas::prepare_for_move(bool on_resize)
 {
     if (! on_resize) {
         // select all sub nodes
-        Q3CanvasItemList all = canvas()->allItems();
-        Q3CanvasItemList::Iterator cit;
+        QList<QGraphicsItem*> all = canvas()->items();
+        QList<QGraphicsItem*>::Iterator cit;
         UmlCanvas * canvas = the_canvas();
 
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible() && !(*cit)->selected()) {
+            if ((*cit)->isVisible() && !(*cit)->isSelected()) {
                 DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
                 if ((di != 0) &&
@@ -326,7 +324,7 @@ void ActivityContainerCanvas::prepare_for_move(bool on_resize)
                     (((BrowserNode *) di->get_bn()->parent()) == browser_node)) {
                     // must look at the type because some canvas items have browser_node
                     // attr set to the diagram and the parent of the diagram is the activity
-                    switch (di->type()) {
+                    switch (di->typeUmlCode()) {
                     case UmlActivityObject:
                     case UmlActivityAction:
                     case UmlActivityPartition:
@@ -353,7 +351,7 @@ void ActivityContainerCanvas::prepare_for_move(bool on_resize)
         // select points on lines having the two extremities selected or
         // connecting pin/parameter/expansion node of element selected
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible() && !(*cit)->selected() && isa_arrow(*cit)) {
+            if ((*cit)->isVisible() && !(*cit)->isSelected() && isa_arrow(*cit)) {
                 ArrowCanvas * ar = (ArrowCanvas *) *cit;
                 DiagramItem * b;
                 DiagramItem * e;
@@ -366,7 +364,7 @@ void ActivityContainerCanvas::prepare_for_move(bool on_resize)
 
                     if ((start->isSelected() || indirectly_selected(start)) &&
                         (dest->isSelected() || indirectly_selected(dest))) {
-                        while (b->type() == UmlArrowPoint) {
+                        while (b->typeUmlCode() == UmlArrowPoint) {
                             canvas->select((ArrowPointCanvas *) b);
                             ar = ((ArrowPointCanvas *) b)->get_other(ar);
                             ar->extremities(b, e);
@@ -375,7 +373,7 @@ void ActivityContainerCanvas::prepare_for_move(bool on_resize)
                         ar = (ArrowCanvas *) *cit;
                         ar->extremities(b, e);
 
-                        while (e->type() == UmlArrowPoint) {
+                        while (e->typeUmlCode() == UmlArrowPoint) {
                             canvas->select((ArrowPointCanvas *) e);
                             ar = ((ArrowPointCanvas *) e)->get_other(ar);
                             ar->extremities(b, e);
diff --git a/src/diagram/ActivityContainerCanvas.h b/src/diagram/ActivityContainerCanvas.h
index a21e14f3e..0fcd7d4f7 100644
--- a/src/diagram/ActivityContainerCanvas.h
+++ b/src/diagram/ActivityContainerCanvas.h
@@ -47,11 +47,11 @@ class ActivityContainerCanvas : public DiagramCanvas
         : DiagramCanvas(bn, canvas, x, y, w, h, id) {
     }
 
-    void force_inside(DiagramItem * di, Q3CanvasItem * ci, BooL & need_sub_upper);
-    void force_sub_inside(Q3CanvasItemList & all, BooL & need_sub_upper);
-    void resize_to_contain(Q3CanvasItemList & all, BooL & need_sub_upper);
-    void force_sub_upper(Q3CanvasItemList & all);
-    virtual void prepare_for_move(bool on_resize);
+    void force_inside(DiagramItem * di, QGraphicsItem * ci, BooL & need_sub_upper);
+    void force_sub_inside(QList<QGraphicsItem*> & all, BooL & need_sub_upper);
+    void resize_to_contain(QList<QGraphicsItem*> & all, BooL & need_sub_upper);
+    void force_sub_upper(QList<QGraphicsItem*> & all);
+    virtual void prepare_for_move(bool on_resize) override;
     static bool force_inside(DiagramCanvas * elt, bool part);
 };
 
diff --git a/src/diagram/ActivityDiagramView.cpp b/src/diagram/ActivityDiagramView.cpp
index d0a508b5f..53cf9711e 100644
--- a/src/diagram/ActivityDiagramView.cpp
+++ b/src/diagram/ActivityDiagramView.cpp
@@ -31,13 +31,10 @@
 
 #include <qcursor.h>
 #include <qfont.h>
-#include <q3popupmenu.h>
-//Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
 #include <QMouseEvent>
 #include <QDragEnterEvent>
-
 #include "ActivityDiagramWindow.h"
 #include "ActivityDiagramView.h"
 #include "ActivityCanvas.h"
@@ -83,9 +80,9 @@ ActivityDiagramView::ActivityDiagramView(QWidget * parent, UmlCanvas * canvas, i
 
 void ActivityDiagramView::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Activity diagram menu"));
+    MenuFactory::createTitle(m, tr("Activity diagram menu"));
 
     switch (default_menu(m, 30)) {
     case EDIT_DRAWING_SETTING_CMD:
@@ -104,18 +101,20 @@ void ActivityDiagramView::menu(const QPoint &)
 
 BrowserNode * ActivityDiagramView::container(const QPoint & p, bool part)
 {
-    Q3CanvasItem * ci = the_canvas()->collision(p);
+    QGraphicsItem * ci = the_canvas()->collision(p);
     DiagramItem * di;
 
     return ((ci != 0) &&
             ((di = QCanvasItemToDiagramItem(ci)) != 0) &&
-            IsaActivityContainer(di->type(), part))
+            IsaActivityContainer(di->typeUmlCode(), part))
            ? ((ActivityContainerCanvas *) di)->get_bn()
            : (BrowserNode *) window()->browser_diagram()->parent();
 }
 
-void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void ActivityDiagramView::mousePressEvent(QMouseEvent * e)
 {
+    QPoint diagramPoint(e->x(), e->y());
+    QPointF scenePoint = mapToScene(diagramPoint);
     if (!window()->frozen()) {
         UmlCode action = window()->buttonOn();
 
@@ -131,13 +130,13 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
 
             if (b != 0) {
                 if (the_canvas()->already_drawn(b)) {
-                    msg_information("Douml", TR("already drawn"));
+                    msg_information("Douml", tr("already drawn"));
                     history_protected = FALSE;
                     return;
                 }
 
                 ActivityCanvas * c =
-                    new ActivityCanvas(b, the_canvas(), e->x(), e->y());
+                    new ActivityCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 c->upper();
@@ -154,19 +153,19 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            BrowserNode * parent = container(e->pos());
+            BrowserNode * parent = container(scenePoint.toPoint());
             BrowserNode * b =
                 BrowserInterruptibleActivityRegion::get_interruptibleactivityregion(parent);
 
             if (b != 0) {
                 if (the_canvas()->already_drawn(b)) {
-                    msg_information("Douml", TR("already drawn"));
+                    msg_information("Douml", tr("already drawn"));
                     history_protected = FALSE;
                     return;
                 }
 
                 InterruptibleActivityRegionCanvas * c =
-                    new InterruptibleActivityRegionCanvas(b, the_canvas(), e->x(), e->y());
+                    new InterruptibleActivityRegionCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
                 bool rz;
 
                 c->show();
@@ -185,19 +184,19 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            BrowserNode * parent = container(e->pos());
+            BrowserNode * parent = container(scenePoint.toPoint());
             BrowserNode * b =
                 BrowserExpansionRegion::get_expansionregion(parent);
 
             if (b != 0) {
                 if (the_canvas()->already_drawn(b)) {
-                    msg_information("Douml", TR("already drawn"));
+                    msg_information("Douml", tr("already drawn"));
                     history_protected = FALSE;
                     return;
                 }
 
                 ExpansionRegionCanvas * c =
-                    new ExpansionRegionCanvas(b, the_canvas(), e->x(), e->y());
+                    new ExpansionRegionCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
                 bool rz;
 
                 c->show();
@@ -222,13 +221,13 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            BrowserNode * parent = container(e->pos());
+            BrowserNode * parent = container(scenePoint.toPoint());
             BrowserNode * b = BrowserActivityNode::get_activitynode(parent, action);
 
             if (b != 0) {
                 // a new element, don't check already drawn
                 ActivityNodeCanvas * c =
-                    new ActivityNodeCanvas(b, the_canvas(), e->x(), e->y());
+                    new ActivityNodeCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 (void) ActivityContainerCanvas::force_inside(c, FALSE);
@@ -244,20 +243,20 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            BrowserNode * parent = container(e->pos());
+            BrowserNode * parent = container(scenePoint.toPoint());
             BrowserNode * b = BrowserActivityAction::get_activityaction(parent);
 
             if (b != 0) {
                 history_protected = TRUE;
 
                 if (the_canvas()->already_drawn(b)) {
-                    msg_information("Douml", TR("already drawn"));
+                    msg_information("Douml", tr("already drawn"));
                     history_protected = FALSE;
                     return;
                 }
 
                 ActivityActionCanvas * c =
-                    new ActivityActionCanvas(b, the_canvas(), e->x(), e->y());
+                    new ActivityActionCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 (void) ActivityContainerCanvas::force_inside(c, FALSE);
@@ -274,12 +273,12 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            BrowserNode * parent = container(e->pos());
+            BrowserNode * parent = container(scenePoint.toPoint());
             BrowserNode * b = BrowserActivityObject::get_activityobject(parent);
 
             if (b != 0) {
                 if (the_canvas()->already_drawn(b)) {
-                    msg_information("Douml", TR("already drawn"));
+                    msg_information("Douml", tr("already drawn"));
                     history_protected = FALSE;
                     return;
                 }
@@ -287,7 +286,7 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
                 history_protected = TRUE;
 
                 ActivityObjectCanvas * c =
-                    new ActivityObjectCanvas(b, the_canvas(), e->x(), e->y());
+                    new ActivityObjectCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 (void) ActivityContainerCanvas::force_inside(c, FALSE);
@@ -304,19 +303,19 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            BrowserNode * parent = container(e->pos(), TRUE);
+            BrowserNode * parent = container(scenePoint.toPoint(), TRUE);
             BrowserNode * b =
                 BrowserActivityPartition::get_activitypartition(parent);
 
             if (b != 0) {
                 if (the_canvas()->already_drawn(b)) {
-                    msg_information("Douml", TR("already drawn"));
+                    msg_information("Douml", tr("already drawn"));
                     history_protected = FALSE;
                     return;
                 }
 
                 ActivityPartitionCanvas * c =
-                    new ActivityPartitionCanvas(b, the_canvas(), e->x(), e->y());
+                    new ActivityPartitionCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
                 bool rz;
 
                 c->show();
@@ -330,7 +329,7 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
         break;
 
         default:
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
             return;
         }
 
@@ -338,7 +337,7 @@ void ActivityDiagramView::contentsMousePressEvent(QMouseEvent * e)
         history_protected = FALSE;
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
 void ActivityDiagramView::dragEnterEvent(QDragEnterEvent * e)
@@ -371,27 +370,66 @@ void ActivityDiagramView::dragEnterEvent(QDragEnterEvent * e)
          UmlDrag::canDecode(e, UmlState, FALSE, TRUE)))
         e->accept();
     else
+    {
         // don't accept Parameter & ParameterSet
         e->ignore();
+    }
+}
+void ActivityDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+    if (!window()->frozen() &&
+            (UmlDrag::canDecode(e, UmlActivity, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlInterruptibleActivityRegion, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlExpansionRegion, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityPartition, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlFlow, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlSimpleRelations, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityNode, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityAction, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityObject, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlOperation, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlAttribute, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlRelations, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClass, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClassInstance, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlState, FALSE, TRUE)))
+        e->accept();
+    else
+    {
+        // don't accept Parameter & ParameterSet
+        e->ignore();
+    }
 }
-
 void ActivityDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
+    QPointF p = mapToScene(e->pos());
 
     if ((bn = UmlDrag::decode(e, UmlActivity, TRUE)) != 0) {
-        Q3PopupMenu m(0);
+        QMenu m(0);
 
-        MenuFactory::createTitle(m, TR("Choose"));
-        m.insertSeparator();
+        MenuFactory::createTitle(m, tr("Choose"));
+        m.addSeparator();
 
         if (!the_canvas()->already_drawn(bn))
-            m.insertItem(TR("Draw activity"), 0);
+            MenuFactory::addItem(m, tr("Draw activity"), 0);
 
-        m.insertItem(TR("Add a call behavior"), 1);
+        MenuFactory::addItem(m, tr("Add a call behavior"), 1);
 
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0: {
             history_save();
             history_protected = TRUE;
@@ -412,7 +450,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
         break;
 
         case 1: {
-            bn = BrowserActivityAction::add_call_behavior(container(p), bn);
+            bn = BrowserActivityAction::add_call_behavior(container(p.toPoint()), bn);
 
             if (bn != 0) {
                 history_save();
@@ -436,6 +474,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
         default:
             break;
         }
+        }
     }
     else if ((bn = UmlDrag::decode(e, UmlPackage)) != 0) {
         history_save();
@@ -452,7 +491,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlActivityNode, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else {
             history_save();
 
@@ -471,7 +510,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlInterruptibleActivityRegion, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else {
             history_save();
 
@@ -495,7 +534,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlExpansionRegion, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else {
             history_save();
 
@@ -519,7 +558,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlActivityPartition, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else {
             history_save();
 
@@ -543,7 +582,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlActivityAction, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else {
             history_save();
             history_protected = TRUE;
@@ -563,7 +602,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlActivityObject, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else {
             history_save();
             history_protected = TRUE;
@@ -620,7 +659,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
         window()->package_modified();
     }
     else if ((bn = UmlDrag::decode(e, UmlOperation)) != 0) {
-        bn = BrowserActivityAction::add_call_operation(container(p), (BrowserOperation *) bn);
+        bn = BrowserActivityAction::add_call_operation(container(p.toPoint()), (BrowserOperation *) bn);
 
         if (bn != 0) {
             history_save();
@@ -641,40 +680,44 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
     }
     else if (((bn = UmlDrag::decode(e, UmlAttribute)) != 0) ||
              ((bn = UmlDrag::decode(e, UmlRelations, TRUE)) != 0)) {
-        Q3PopupMenu m(0);
-
-        MenuFactory::createTitle(m, TR("Choose"));
-        m.insertSeparator();
-        m.insertItem(TR("Add a read variable value action"), 0);
-        m.insertItem(TR("Add a clear variable value action"), 1);
-        m.insertItem(TR("Add a write variable value action"), 2);
-        m.insertItem(TR("Add a add variable value action"), 3);
-        m.insertItem(TR("Add a remove variable value action"), 4);
-
-        switch (m.exec(QCursor::pos())) {
+        QMenu m(0);
+
+        MenuFactory::createTitle(m, tr("Choose"));
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Add a read variable value action"), 0);
+        MenuFactory::addItem(m, tr("Add a clear variable value action"), 1);
+        MenuFactory::addItem(m, tr("Add a write variable value action"), 2);
+        MenuFactory::addItem(m, tr("Add a add variable value action"), 3);
+        MenuFactory::addItem(m, tr("Add a remove variable value action"), 4);
+
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0:
-            bn = BrowserActivityAction::add_read_variable_value(container(p), bn);
+            bn = BrowserActivityAction::add_read_variable_value(container(p.toPoint()), bn);
             break;
 
         case 1:
-            bn = BrowserActivityAction::add_clear_variable_value(container(p), bn);
+            bn = BrowserActivityAction::add_clear_variable_value(container(p.toPoint()), bn);
             break;
 
         case 2:
-            bn = BrowserActivityAction::add_write_variable_value(container(p), bn);
+            bn = BrowserActivityAction::add_write_variable_value(container(p.toPoint()), bn);
             break;
 
         case 3:
-            bn = BrowserActivityAction::add_add_variable_value(container(p), bn);
+            bn = BrowserActivityAction::add_add_variable_value(container(p.toPoint()), bn);
             break;
 
         case 4:
-            bn = BrowserActivityAction::add_remove_variable_value(container(p), bn);
+            bn = BrowserActivityAction::add_remove_variable_value(container(p.toPoint()), bn);
             break;
 
         default:
             return;
         }
+        }
 
         if (bn != 0) {
             history_save();
@@ -697,7 +740,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
         history_protected = FALSE;
 
         BrowserActivityObject * obj =
-            BrowserActivityObject::add_activityobject(container(p), 0);
+            BrowserActivityObject::add_activityobject(container(p.toPoint()), 0);
 
         if (obj != 0) {
             ((ActivityObjectData *) obj->get_data())->set_type((BrowserClass *) bn);
@@ -722,7 +765,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
         history_protected = FALSE;
 
         BrowserActivityObject * obj =
-            BrowserActivityObject::add_activityobject(container(p), bn->get_name());
+            BrowserActivityObject::add_activityobject(container(p.toPoint()), bn->get_name());
 
         if (obj != 0) {
             ((ActivityObjectData *) obj->get_data())
@@ -747,7 +790,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
     else if ((bn = UmlDrag::decode(e, UmlState, TRUE)) != 0) {
         history_protected = FALSE;
 
-        bn = BrowserActivityAction::add_call_behavior(container(p), bn);
+        bn = BrowserActivityAction::add_call_behavior(container(p.toPoint()), bn);
 
         if (bn != 0) {
             history_save();
@@ -770,8 +813,7 @@ void ActivityDiagramView::dropEvent(QDropEvent * e)
 void ActivityDiagramView::save(QTextStream & st, QString & warning,
                                bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
+    DiagramItemList items(canvas()->items());
 
     if (!copy)
         // sort is useless for a copy
@@ -781,8 +823,8 @@ void ActivityDiagramView::save(QTextStream & st, QString & warning,
 
     // save first activity, activity nodes, actions, objects, packages, fragments, notes and icons
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlActivity:
         case UmlInterruptibleActivityRegion:
         case UmlExpansionRegion:
@@ -815,8 +857,8 @@ void ActivityDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves relations
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlFlow:
         case UmlDependOn:
             if (!copy || di->copyable())
@@ -829,8 +871,8 @@ void ActivityDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    foreach (DiagramItem *di, items)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
 
     if (!copy && (preferred_zoom != 0)) {
@@ -848,7 +890,8 @@ void ActivityDiagramView::read(char * st, char * k)
     // reads first state package icons notes text and image
     UmlCanvas * canvas = the_canvas();
 
-    while (ActivityCanvas::read(st, canvas, k) ||
+    while (
+           ActivityCanvas::read(st, canvas, k) ||
            InterruptibleActivityRegionCanvas::read(st, canvas, k) ||
            ExpansionRegionCanvas::read(st, canvas, k) ||
            ActivityPartitionCanvas::read(st, canvas, k) ||
diff --git a/src/diagram/ActivityDiagramView.h b/src/diagram/ActivityDiagramView.h
index a33ed2587..8fbf0e799 100644
--- a/src/diagram/ActivityDiagramView.h
+++ b/src/diagram/ActivityDiagramView.h
@@ -48,9 +48,9 @@ class ActivityDiagramView : public DiagramView
     ActivityDiagramView(QWidget * parent, UmlCanvas * canvas, int id);
 
     BrowserNode * container(const QPoint & p, bool part = FALSE);
-    virtual void menu(const QPoint &);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+    virtual void menu(const QPoint &) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
 private:
     ActivityDiagramWindow * window() {
@@ -58,9 +58,10 @@ class ActivityDiagramView : public DiagramView
     };
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent * e) override;
 };
 
 #endif
diff --git a/src/diagram/ActivityDiagramWindow.cpp b/src/diagram/ActivityDiagramWindow.cpp
index 8efafa81a..b3631df40 100644
--- a/src/diagram/ActivityDiagramWindow.cpp
+++ b/src/diagram/ActivityDiagramWindow.cpp
@@ -30,13 +30,12 @@
 
 
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+#include <QMdiArea>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qspinbox.h>
-
 #include "UmlWindow.h"
 #include "ActivityDiagramWindow.h"
 #include "ActivityDiagramView.h"
@@ -44,25 +43,26 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
+#include "toolbarfactory.h"
 
 QString addactivityText()
 {
-    return TR("Click this button to add an <i>activity</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add an <i>activity</i> in the diagram. <br><br>"
               "You can also drop the activity from the <b>browser</b>.");
 }
 QString addinterruptibleactivityregionText()
 {
-    return TR("Click this button to add an <i>interruptible activity region</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add an <i>interruptible activity region</i> in the diagram. <br><br>"
               "You can also drop the interruptible activity region from the <b>browser</b>.");
 }
 QString addexpansionregionText()
 {
-    return TR("Click this button to add an <i>expansion region</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add an <i>expansion region</i> in the diagram. <br><br>"
               "You can also drop the expansion region from the <b>browser</b>.");
 }
 QString addactivitypartitionText()
 {
-    return TR("Click this button to add an <i>activity partition</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add an <i>activity partition</i> in the diagram. <br><br>"
               "You can also drop the activity partition from the <b>browser</b>.");
 }
 extern QString addpackageText();
@@ -73,42 +73,42 @@ extern QString textText();
 extern QString dependencyText();
 static QString addinitialText()
 {
-    return TR("Click this button to add an <i>initial node</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add an <i>initial node</i> in the diagram. <br><br>"
               "You can also drop the <i>initial node</i> from the <b>browser</b>.");
 }
 static QString addactivityfinalText()
 {
-    return TR("Click this button to add an <i>activity final node</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add an <i>activity final node</i> in the diagram. <br><br>"
               "You can also drop the <i>activity final node</i> from the <b>browser</b>.");
 }
 static QString addflowfinalText()
 {
-    return TR("Click this button to add a <i>flow final node</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add a <i>flow final node</i> in the diagram. <br><br>"
               "You can also drop the <i>flow final node</i> from the <b>browser</b>.");
 }
 static QString adddecisionText()
 {
-    return TR("Click this button to add a <i>decision node</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add a <i>decision node</i> in the diagram. <br><br>"
               "You can also drop the <i>decision node</i> from the <b>browser</b>.");
 }
 static QString addmergeText()
 {
-    return TR("Click this button to add a <i>merge node</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add a <i>merge node</i> in the diagram. <br><br>"
               "You can also drop the <i>merge node</i> from the <b>browser</b>.");
 }
 extern QString addforkText();
 extern QString addjoinText();
 static QString addactionText()
 {
-    return TR("Click this button to add an <i>action</i> in the diagram.");
+    return  QObject::tr("Click this button to add an <i>action</i> in the diagram.");
 }
 static QString addobjectText()
 {
-    return TR("Click this button to add an <i>object node</i> in the diagram.");
+    return  QObject::tr("Click this button to add an <i>object node</i> in the diagram.");
 }
 QString addflowText()
 {
-    return TR("Click this button to add a <i>flow</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add a <i>flow</i> in the diagram. <br><br>"
               "You can also drop the <i>flow</i> from the <b>browser</b>.");
 }
 extern QString imageText();
@@ -117,152 +117,154 @@ extern QString imageText();
 ActivityDiagramWindow::ActivityDiagramWindow(const QString & s, BrowserActivityDiagram * b, int id)
     : DiagramWindow(b, s), view(0)
 {
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "activity operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
+    QToolBar * toolbar = new QToolBar( "activity operations", this);
+    toolbar->setMinimumHeight(50);
+    toolbar->setOrientation(Qt::Horizontal);
+    addToolBar(Qt::TopToolBarArea, toolbar);
 
     add_edit_button(toolbar);
 
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton, tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar, "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
+    select->setCheckable(TRUE);
+    select->setChecked(TRUE);
     current_button = UmlSelect;
 
     addPackage
-        = new QToolButton(*packageButton, TR("New Package"), QString(),
+        = ToolBarFactory::createToolButton(*packageButton, tr("New Package"), QString(),
                           this, SLOT(hit_package()), toolbar, "add package");
-    addPackage->setToggleButton(TRUE);
-    Q3WhatsThis::add(addPackage, addpackageText());
+    addPackage->setCheckable(TRUE);
+    addPackage->setWhatsThis(addpackageText());
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("New Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton, tr("New Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar, "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis( addfragmentText());
 
     addActivity =
-        new QToolButton(*activityButton, TR("New Activity"), QString(),
+        ToolBarFactory::createToolButton(*activityButton, tr("New Activity"), QString(),
                         this, SLOT(hit_activity()), toolbar, "add activity");
-    addActivity->setToggleButton(TRUE);
-    Q3WhatsThis::add(addActivity, addactivityText());
+    addActivity->setCheckable(TRUE);
+    addActivity->setWhatsThis( addactivityText());
 
     addInterruptibleActivityRegion =
-        new QToolButton(*interruptibleactivityregionButton,
-                        TR("New Interruptible Activity Region"), QString(),
+        ToolBarFactory::createToolButton(*interruptibleactivityregionButton,
+                        tr("New Interruptible Activity Region"), QString(),
                         this, SLOT(hit_interruptibleactivityregion()),
                         toolbar, "add interruptible activity region");
-    addInterruptibleActivityRegion->setToggleButton(TRUE);
-    Q3WhatsThis::add(addInterruptibleActivityRegion,
+    addInterruptibleActivityRegion->setCheckable(TRUE);
+    addActivity->setWhatsThis(
                      addinterruptibleactivityregionText());
 
     addExpansionRegion =
-        new QToolButton(*expansionregionButton,
-                        TR("New Expansion Region"), QString(),
+        ToolBarFactory::createToolButton(*expansionregionButton,
+                        tr("New Expansion Region"), QString(),
                         this, SLOT(hit_expansionregion()),
                         toolbar, "add expansion region");
-    addExpansionRegion->setToggleButton(TRUE);
-    Q3WhatsThis::add(addExpansionRegion,
+    addExpansionRegion->setCheckable(TRUE);
+    addActivity->setWhatsThis(
                      addexpansionregionText());
 
     addActivityPartition =
-        new QToolButton(*activitypartitionButton,
-                        TR("New Activity Partition"), QString(),
+        ToolBarFactory::createToolButton(*activitypartitionButton,
+                        tr("New Activity Partition"), QString(),
                         this, SLOT(hit_activitypartition()),
                         toolbar, "add activity partition");
-    addActivityPartition->setToggleButton(TRUE);
-    Q3WhatsThis::add(addActivityPartition,
+    addActivityPartition->setCheckable(TRUE);
+    addActivityPartition->setWhatsThis(
                      addactivitypartitionText());
 
     addAction =
-        new QToolButton(*activityactionButton, TR("New Action"), QString(),
+        ToolBarFactory::createToolButton(*activityactionButton, tr("New Action"), QString(),
                         this, SLOT(hit_action()), toolbar, "add action");
-    addAction->setToggleButton(TRUE);
-    Q3WhatsThis::add(addAction, addactionText());
+    addAction->setCheckable(TRUE);
+    addAction->setWhatsThis( addactionText());
 
     addObject =
-        new QToolButton(*actionButton, TR("New Object Node"), QString(),
+        ToolBarFactory::createToolButton(*actionButton, tr("New Object Node"), QString(),
                         this, SLOT(hit_object()), toolbar, "add object node");
-    addObject->setToggleButton(TRUE);
-    Q3WhatsThis::add(addObject, addobjectText());
+    addObject->setCheckable(TRUE);
+    addObject->setWhatsThis( addobjectText());
 
     addInitial =
-        new QToolButton(*initialButton, TR("New Initial node"), QString(),
+        ToolBarFactory::createToolButton(*initialButton, tr("New Initial node"), QString(),
                         this, SLOT(hit_initial()), toolbar, "add initial");
-    addInitial->setToggleButton(TRUE);
-    Q3WhatsThis::add(addInitial, addinitialText());
+    addInitial->setCheckable(TRUE);
+    addInitial->setWhatsThis( addinitialText());
 
     addActivityFinal =
-        new QToolButton(*finalButton, TR("New Activity Final"), QString(),
+        ToolBarFactory::createToolButton(*finalButton, tr("New Activity Final"), QString(),
                         this, SLOT(hit_activityfinal()), toolbar, "add activity final");
-    addActivityFinal->setToggleButton(TRUE);
-    Q3WhatsThis::add(addActivityFinal, addactivityfinalText());
+    addActivityFinal->setCheckable(TRUE);
+    addActivityFinal->setWhatsThis( addactivityfinalText());
 
     addFlowFinal =
-        new QToolButton(*exitpointButton, TR("New Flow Final"), QString(),
+        ToolBarFactory::createToolButton(*exitpointButton, tr("New Flow Final"), QString(),
                         this, SLOT(hit_flowfinal()), toolbar, "add flow final");
-    addFlowFinal->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFlowFinal, addflowfinalText());
+    addFlowFinal->setCheckable(TRUE);
+    addFlowFinal->setWhatsThis( addflowfinalText());
 
     addMerge =
-        new QToolButton(*mergeButton, TR("New Merge"), QString(),
+        ToolBarFactory::createToolButton(*mergeButton, tr("New Merge"), QString(),
                         this, SLOT(hit_merge()), toolbar, "add merge");
-    addMerge->setToggleButton(TRUE);
-    Q3WhatsThis::add(addMerge, addmergeText());
+    addMerge->setCheckable(TRUE);
+    addMerge->setWhatsThis( addmergeText());
 
     addDecision =
-        new QToolButton(*decisionButton, TR("New Decision"), QString(),
+        ToolBarFactory::createToolButton(*decisionButton, tr("New Decision"), QString(),
                         this, SLOT(hit_decision()), toolbar, "add decision");
-    addDecision->setToggleButton(TRUE);
-    Q3WhatsThis::add(addDecision, adddecisionText());
+    addDecision->setCheckable(TRUE);
+    addDecision->setWhatsThis( adddecisionText());
 
     addFork =
-        new QToolButton(*forkButton, TR("New Fork"), QString(),
+        ToolBarFactory::createToolButton(*forkButton, tr("New Fork"), QString(),
                         this, SLOT(hit_fork()), toolbar, "add fork");
-    addFork->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFork, addforkText());
+    addFork->setCheckable(TRUE);
+    addFork->setWhatsThis( addforkText());
 
     addJoin =
-        new QToolButton(*joinButton, TR("New Join"), QString(),
+        ToolBarFactory::createToolButton(*joinButton, tr("New Join"), QString(),
                         this, SLOT(hit_join()), toolbar, "add join");
-    addJoin->setToggleButton(TRUE);
-    Q3WhatsThis::add(addJoin, addjoinText());
+    addJoin->setCheckable(TRUE);
+    addJoin->setWhatsThis( addjoinText());
 
     addFlow =
-        new QToolButton(*directionalAssociationButton, TR("New Flow"), QString(),
+        ToolBarFactory::createToolButton(*directionalAssociationButton, tr("New Flow"), QString(),
                         this, SLOT(hit_flow()), toolbar, "add flow");
-    addFlow->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFlow, addflowText());
+    addFlow->setCheckable(TRUE);
+    addFlow->setWhatsThis( addflowText());
 
     dependency =
-        new QToolButton(*dependencyButton, TR("Dependency"), QString(),
+        ToolBarFactory::createToolButton(*dependencyButton, tr("Dependency"), QString(),
                         this, SLOT(hit_dependency()), toolbar, "dependency");
-    dependency->setToggleButton(TRUE);
-    Q3WhatsThis::add(dependency, dependencyText());
+    dependency->setCheckable(TRUE);
+    dependency->setWhatsThis( dependencyText());
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton, tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar, "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis( noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton, tr("Anchor"), QString(),
                         this, SLOT(hit_anchor()), toolbar, "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis( anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton, tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar, "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis( textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton, tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+    image->setWhatsThis( imageText());
 
     toolbar->addSeparator();
 
@@ -276,9 +278,9 @@ ActivityDiagramWindow::ActivityDiagramWindow(const QString & s, BrowserActivityD
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
+    QMdiArea * w = UmlWindow::get_workspace();
 
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -316,30 +318,30 @@ void ActivityDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
 
-    select->setOn(FALSE);
-    addPackage->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    addActivity->setOn(FALSE);
-    addInterruptibleActivityRegion->setOn(FALSE);
-    addExpansionRegion->setOn(FALSE);
-    addActivityPartition->setOn(FALSE);
-    addInitial->setOn(FALSE);
-    addActivityFinal->setOn(FALSE);
-    addFlowFinal->setOn(FALSE);
-    addDecision->setOn(FALSE);
-    addMerge->setOn(FALSE);
-    addFork->setOn(FALSE);
-    addJoin->setOn(FALSE);
-    addAction->setOn(FALSE);
-    addObject->setOn(FALSE);
-    addFlow->setOn(FALSE);
-    dependency->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addPackage->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    addActivity->setChecked(FALSE);
+    addInterruptibleActivityRegion->setChecked(FALSE);
+    addExpansionRegion->setChecked(FALSE);
+    addActivityPartition->setChecked(FALSE);
+    addInitial->setChecked(FALSE);
+    addActivityFinal->setChecked(FALSE);
+    addFlowFinal->setChecked(FALSE);
+    addDecision->setChecked(FALSE);
+    addMerge->setChecked(FALSE);
+    addFork->setChecked(FALSE);
+    addJoin->setChecked(FALSE);
+    addAction->setChecked(FALSE);
+    addObject->setChecked(FALSE);
+    addFlow->setChecked(FALSE);
+    dependency->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/ActivityDiagramWindow.h b/src/diagram/ActivityDiagramWindow.h
index a12350769..6401aca1b 100644
--- a/src/diagram/ActivityDiagramWindow.h
+++ b/src/diagram/ActivityDiagramWindow.h
@@ -68,9 +68,9 @@ class ActivityDiagramWindow : public DiagramWindow
     ActivityDiagramWindow(const QString & s, BrowserActivityDiagram * b, int id = -1);
     virtual ~ActivityDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_activity();
diff --git a/src/diagram/ActivityNodeCanvas.cpp b/src/diagram/ActivityNodeCanvas.cpp
index 7f27bf3c6..942eb318d 100644
--- a/src/diagram/ActivityNodeCanvas.cpp
+++ b/src/diagram/ActivityNodeCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -108,18 +108,18 @@ bool ActivityNodeCanvas::force_inside()
 {
     // if its activity is present, force inside it
 
-    Q3CanvasItemList all = the_canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = the_canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     BrowserNode * parent = (BrowserNode *) browser_node->parent();
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&
-                IsaActivityContainer(di->type()) &&
-                (((ActivityContainerCanvas *) di)->get_bn() == parent)) {
-                ((ActivityContainerCanvas *) di)->force_inside(this, this);
+                    IsaActivityContainer(di->typeUmlCode()) &&
+                    (((ActivityContainerCanvas *) di)->get_bn() == parent)) {
+                ((ActivityContainerCanvas *) di)->force_inside(this, TRUE);
                 return TRUE;
             }
         }
@@ -148,16 +148,16 @@ void ActivityNodeCanvas::set_xpm()
     case DecisionAN:
     case MergeAN:
         xpm = (the_canvas()->shadow() == 0)
-              ? ((big) ? choiceBigPixmap : choicePixmap)
-                  : ((big) ? choiceShadowBigPixmap : choiceShadowPixmap);
+                ? ((big) ? choiceBigPixmap : choicePixmap)
+                : ((big) ? choiceShadowBigPixmap : choiceShadowPixmap);
         break;
 
     case ForkAN:
     case JoinAN:
         if (!manual_size) {
             xpm = (horiz)
-                  ? ((big) ? joinForkHorizBigPixmap : joinForkHorizPixmap)
-                      : ((big) ? joinForkBigPixmap : joinForkPixmap);
+                    ? ((big) ? joinForkHorizBigPixmap : joinForkHorizPixmap)
+                    : ((big) ? joinForkBigPixmap : joinForkPixmap);
             break;
         }
 
@@ -167,12 +167,12 @@ void ActivityNodeCanvas::set_xpm()
         return;
     }
 
-    setSize(xpm->width(), xpm->height());
+    setRect(0,0,xpm->width(), xpm->height());
 }
 
 void ActivityNodeCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
 
     if (manual_size) {
         double scale = the_canvas()->zoom();
@@ -183,7 +183,7 @@ void ActivityNodeCanvas::change_scale()
             if (w < MIN_FORK_JOIN_LARGESIDE)
                 w = MIN_FORK_JOIN_LARGESIDE;
 
-            setSize(w | 1, FORK_JOIN_SMALLSIDE);
+            setRect(0,0,w | 1, FORK_JOIN_SMALLSIDE);
         }
         else {
             int h = (int)(height_scale100 * scale);
@@ -191,7 +191,7 @@ void ActivityNodeCanvas::change_scale()
             if (h < MIN_FORK_JOIN_LARGESIDE)
                 h = MIN_FORK_JOIN_LARGESIDE;
 
-            setSize(FORK_JOIN_SMALLSIDE, h | 1);
+            setRect(0,0,FORK_JOIN_SMALLSIDE, h | 1);
         }
 
         DiagramCanvas::resize(width(), height());
@@ -201,7 +201,7 @@ void ActivityNodeCanvas::change_scale()
         set_xpm();
 
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 aCorner ActivityNodeCanvas::on_resize_point(const QPoint & p)
@@ -297,7 +297,7 @@ void ActivityNodeCanvas::post_loaded()
 
 void ActivityNodeCanvas::draw(QPainter & p)
 {
-    if (!visible() || ((xpm == 0) && !manual_size)) return;
+    if (!isVisible() || ((xpm == 0) && !manual_size)) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
@@ -349,18 +349,18 @@ void ActivityNodeCanvas::draw(QPainter & p)
         case ActivityFinalAN:
             if (big) {
                 fprintf(fp, "<g>\n"
-                        "\t<ellipse fill=\"white\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"11.5\" ry=\"11.5\" />\n",
+                            "\t<ellipse fill=\"white\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"11.5\" ry=\"11.5\" />\n",
                         px + 12, py + 12);
                 fprintf(fp, "\t<ellipse fill=\"black\" cx=\"%d\" cy=\"%d\" rx=\"8.5\" ry=\"8.5\" />\n"
-                        "</g>\n",
+                            "</g>\n",
                         px + 12, py + 12);
             }
             else {
                 fprintf(fp, "<g>\n"
-                        "\t<ellipse fill=\"white\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"7.5\" ry=\"7.5\" />\n",
+                            "\t<ellipse fill=\"white\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"7.5\" ry=\"7.5\" />\n",
                         px + 8, py + 8);
                 fprintf(fp, "\t<ellipse fill=\"black\" cx=\"%d\" cy=\"%d\" rx=\"4.5\" ry=\"4.5\" />\n"
-                        "</g>\n",
+                            "</g>\n",
                         px + 8, py + 8);
             }
 
@@ -369,22 +369,22 @@ void ActivityNodeCanvas::draw(QPainter & p)
         case FlowFinalAN:
             if (big) {
                 fprintf(fp, "<g>\n"
-                        "\t<ellipse fill=\"white\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"8.5\" ry=\"8.5\" />\n",
+                            "\t<ellipse fill=\"white\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"8.5\" ry=\"8.5\" />\n",
                         px + 9, py + 9);
                 fprintf(fp, "\t<line stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                         px + 4, py + 4, px + 14, py + 14);
                 fprintf(fp, "\t<line stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
-                        "</g>\n",
+                            "</g>\n",
                         px + 14, py + 4, px + 4, py + 14);
             }
             else {
                 fprintf(fp, "<g>\n"
-                        "\t<ellipse fill=\"white\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"5.5\" ry=\"5.5\" />\n",
+                            "\t<ellipse fill=\"white\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"5.5\" ry=\"5.5\" />\n",
                         px + 7, py + 7);
                 fprintf(fp, "\t<line stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                         px + 4, py + 4, px + 10, py + 10);
                 fprintf(fp, "\t<line stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
-                        "</g>\n",
+                            "</g>\n",
                         px + 10, py + 4, px + 4, py + 10);
             }
 
@@ -436,7 +436,15 @@ void ActivityNodeCanvas::draw(QPainter & p)
     }
 }
 
-UmlCode ActivityNodeCanvas::type() const
+void ActivityNodeCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ActivityNodeCanvas::typeUmlCode() const
 {
     return browser_node->get_type();
 }
@@ -464,122 +472,126 @@ void ActivityNodeCanvas::open()
 
 void ActivityNodeCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
 
     switch (browser_node->get_type()) {
     case ForkAN:
     case JoinAN:
-        m.insertItem((horiz) ? TR("draw vertically") : TR("draw horizontally"), 2);
-        m.insertSeparator();
+        MenuFactory::addItem(m, (horiz) ? tr("draw vertically") : tr("draw horizontally"), 2);
+        m.addSeparator();
         break;
 
     default:
         break;
     }
 
-    /*m.insertItem("Edit drawing settings", 2);
-    m.insertSeparator();*/
-    m.insertItem(TR("Edit activity node"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    /*MenuFactory::addItem(m, "Edit drawing settings", 2);
+    m.addSeparator();*/
+    MenuFactory::addItem(m, tr("Edit activity node"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
     /*if (browser_node->is_writable())
       if (browser_node->get_associated() !=
     (BrowserNode *) the_canvas()->browser_diagram())
-        m.insertItem("Set associated diagram",6);
-    m.insertSeparator();*/
-    m.insertItem(TR("Remove from diagram"), 7);
+        MenuFactory::addItem(m, "Set associated diagram",6);
+    m.addSeparator();*/
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, browser_node->get_type(), 20))
-        m.insertItem(TR("Tool"), &toolm);
-
-    switch (index = m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
-
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
-
-    case 13:
-        z_up();
-        modified();	// call package_modified()
-        return;
-
-    case 14:
-        z_down();
-        modified();	// call package_modified()
-        return;
-
-    case 2:
-        horiz ^= TRUE;
-
-        if (!manual_size)
-            set_xpm();
-        else {
-            setSize(height(), width());
-            DiagramCanvas::resize(width(), height());
-        }
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (index = retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
+
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
+
+        case 13:
+            z_up();
+            modified();	// call package_modified()
+            return;
+
+        case 14:
+            z_down();
+            modified();	// call package_modified()
+            return;
+
+        case 2:
+            horiz ^= TRUE;
+
+            if (!manual_size)
+                set_xpm();
+            else {
+                setRect(0,0,height(), width());
+                DiagramCanvas::resize(width(), height());
+            }
 
-        modified();	// call package_modified()
-        return;
+            modified();	// call package_modified()
+            return;
 
-    case 3:
-        browser_node->open(TRUE);
-        return;
+        case 3:
+            browser_node->open(TRUE);
+            return;
 
-    case 4:
-        browser_node->select_in_browser();
-        return;
+        case 4:
+            browser_node->select_in_browser();
+            return;
 
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    case 7:
-        //remove from diagram
-        delete_it();
-        break;
+        case 7:
+            //remove from diagram
+            delete_it();
+            break;
 
-    case 8:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 8:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    default:
-        if (index >= 20)
-            ToolCom::run(Tool::command(index - 20), browser_node);
+        default:
+            if (index >= 20)
+                ToolCom::run(Tool::command(index - 20), browser_node);
 
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void ActivityNodeCanvas::apply_shortcut(QString s)
+void ActivityNodeCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -609,7 +621,7 @@ QString ActivityNodeCanvas::may_start(UmlCode & l) const
         return ((BrowserActivityNode *) browser_node)->may_start();
 
     case UmlDependOn:
-        return TR("illegal");
+        return tr("illegal");
 
     default: // anchor
         return 0;
@@ -621,7 +633,7 @@ QString ActivityNodeCanvas::may_connect(UmlCode & l, const DiagramItem * dest) c
     if (l == UmlAnchor)
         return dest->may_start(l);
     else if (dest->get_bn() == 0)
-        return TR("illegal");
+        return tr("illegal");
     else
         return ((BrowserActivityNode *) browser_node)->may_connect(dest->get_bn());
 }
@@ -669,7 +681,7 @@ void ActivityNodeCanvas::save(QTextStream & st, bool ref, QString & warning) con
 }
 
 ActivityNodeCanvas * ActivityNodeCanvas::read(char *& st, UmlCanvas * canvas,
-        char * k)
+                                              char * k)
 {
     if (!strcmp(k, "activitynodecanvas_ref"))
         return ((ActivityNodeCanvas *) dict_get(read_id(st), "ActivityNodeCanvas", canvas));
@@ -738,7 +750,7 @@ ActivityNodeCanvas * ActivityNodeCanvas::read(char *& st, UmlCanvas * canvas,
 
 void ActivityNodeCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), 0, this, 0);
 }
 
@@ -772,7 +784,7 @@ void ActivityNodeCanvas::history_load(QBuffer & b)
 
         ::load(w, b);
         ::load(h, b);
-        Q3CanvasRectangle::setSize(w, h);
+        QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
     }
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
diff --git a/src/diagram/ActivityNodeCanvas.h b/src/diagram/ActivityNodeCanvas.h
index ec87200f7..e457daad7 100644
--- a/src/diagram/ActivityNodeCanvas.h
+++ b/src/diagram/ActivityNodeCanvas.h
@@ -52,38 +52,40 @@ class ActivityNodeCanvas : public QObject, public DiagramCanvas
     ActivityNodeCanvas(UmlCanvas * canvas, int id);
     void set_xpm();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ActivityNodeCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~ActivityNodeCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-
-    virtual void apply_shortcut(QString s);
-
-    virtual void history_load(QBuffer &);
-    virtual void history_save(QBuffer & b) const;
-    virtual void history_hide();
-
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+
+    virtual void apply_shortcut(const QString & s) override;
+
+    virtual void history_load(QBuffer &) override;
+    virtual void history_save(QBuffer & b) const override;
+    virtual void history_hide() override;
+
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ActivityNodeCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
     bool force_inside();
 
diff --git a/src/diagram/ActivityObjectCanvas.cpp b/src/diagram/ActivityObjectCanvas.cpp
index 4696cc5c0..001b3e867 100644
--- a/src/diagram/ActivityObjectCanvas.cpp
+++ b/src/diagram/ActivityObjectCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -268,18 +268,18 @@ bool ActivityObjectCanvas::force_inside()
 {
     // if its parent is present, force inside it
 
-    Q3CanvasItemList all = the_canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = the_canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     BrowserNode * parent = (BrowserNode *) browser_node->parent();
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&
-                IsaActivityContainer(di->type()) &&
+                IsaActivityContainer(di->typeUmlCode()) &&
                 (((ActivityContainerCanvas *) di)->get_bn() == parent)) {
-                ((ActivityContainerCanvas *) di)->force_inside(this, this);
+                ((ActivityContainerCanvas *) di)->force_inside(this, TRUE);
                 return TRUE;
             }
         }
@@ -312,7 +312,7 @@ void ActivityObjectCanvas::check_selection()
                 int cdx = (int) x() - margin;
                 int cdy = (int) y() - selection->height() - margin;
 
-                selection->move((cdx < 0) ? 0 : cdx, (cdy < 0) ? 0 : cdy);
+                selection->moveBy((cdx < 0) ? 0 : cdx, (cdy < 0) ? 0 : cdy);
                 selection->show();
                 (new ArrowCanvas(the_canvas(), this, selection, UmlAnchor,
                                  0, FALSE, -1.0, -1.0))
@@ -369,15 +369,15 @@ void ActivityObjectCanvas::moveBy(double dx, double dy)
 
 void ActivityObjectCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     compute_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void ActivityObjectCanvas::draw(QPainter & p)
 {
-    if (visible()) {
+    if (isVisible()) {
         QRect r = rect();
         FILE * fp = svg();
         p.setRenderHint(QPainter::Antialiasing, true);
@@ -385,7 +385,8 @@ void ActivityObjectCanvas::draw(QPainter & p)
         if (fp != 0)
             fputs("<g>\n", fp);
 
-        QColor bckgrnd = p.backgroundColor();
+        QBrush backBrush = p.background();
+        QColor bckgrnd = p.background().color();
         const QPixmap * px =
             ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(), the_canvas()->zoom());
 
@@ -441,7 +442,8 @@ void ActivityObjectCanvas::draw(QPainter & p)
             else
                 p.setBackgroundMode(::Qt::OpaqueMode);
 
-            p.setBackgroundColor(co);
+            backBrush.setColor(co);
+            p.setBackground(backBrush);
 
             if (used_color != UmlTransparent) {
                 p.fillRect(r, co);
@@ -474,7 +476,8 @@ void ActivityObjectCanvas::draw(QPainter & p)
         else if (fp != 0)
             fputs("</g>\n", fp);
 
-        p.setBackgroundColor(bckgrnd);
+        backBrush.setColor(bckgrnd);
+        p.setBackground(backBrush);
         p.setFont(the_canvas()->get_font(UmlNormalFont));
 
         if (selected())
@@ -482,7 +485,15 @@ void ActivityObjectCanvas::draw(QPainter & p)
     }
 }
 
-UmlCode ActivityObjectCanvas::type() const
+void ActivityObjectCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ActivityObjectCanvas::typeUmlCode() const
 {
     return UmlActivityObject;
 }
@@ -497,53 +508,56 @@ void ActivityObjectCanvas::menu(const QPoint &)
     BrowserClass * cl =
         ((ActivityObjectData *) browser_node->get_data())->get_type().type;
 
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit activity object"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit activity object"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (cl != 0)
-        m.insertItem(TR("Select class in browser"), 9);
+        MenuFactory::addItem(m, tr("Select class in browser"), 9);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
             (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 10);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 10);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlActivityObject, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
     int index;
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index = retAction->data().toInt()) {
     case 0:
         upper();
         modified();	// call package_modified
@@ -612,9 +626,10 @@ void ActivityObjectCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 }
 
-void ActivityObjectCanvas::apply_shortcut(QString s)
+void ActivityObjectCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -647,10 +662,10 @@ void ActivityObjectCanvas::edit_drawing_settings()
         StateSpecVector st(1);
         ColorSpecVector co(1);
 
-        st[0].set(TR("write name:type \nhorizontally"), &write_horizontally);
+        st[0].set(tr("write name:type \nhorizontally"), &write_horizontally);
         settings.complete(st, TRUE);
 
-        co[0].set(TR("activity object color"), &itscolor);
+        co[0].set(tr("activity object color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -671,7 +686,7 @@ bool ActivityObjectCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ActivityObjectCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ActivityObjectCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(1);
@@ -680,28 +695,27 @@ void ActivityObjectCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         UmlColor itscolor;
         ActivityDrawingSettings settings;
 
-        st[0].set(TR("write name:type \nhorizontally"), &write_horizontally);
+        st[0].set(tr("write name:type \nhorizontally"), &write_horizontally);
         settings.complete(st, TRUE);
 
-        co[0].set(TR("activity object color"), &itscolor);
+        co[0].set(tr("activity object color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                ActivityObjectCanvas *canvas = (ActivityObjectCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((ActivityObjectCanvas *) it.current())->write_horizontally =
+                    canvas->write_horizontally =
                         write_horizontally;
 
                 if (!co[0].name.isEmpty())
-                    ((ActivityObjectCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((ActivityObjectCanvas *) it.current())->settings.set(st, 1);
-                ((ActivityObjectCanvas *) it.current())->modified();	// call package_modified()
+                canvas->settings.set(st, 1);
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -710,20 +724,13 @@ void ActivityObjectCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ActivityObjectCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ActivityObjectCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ActivityObjectCanvas * x = (ActivityObjectCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ActivityObjectCanvas * o = (ActivityObjectCanvas *) it.current();
-
-        o->write_horizontally = x->write_horizontally;
-        o->itscolor = x->itscolor;
-        o->settings = x->settings;
-        o->modified();	// call package_modified()
-    }
+    const ActivityObjectCanvas * x = (const ActivityObjectCanvas *) src;
+    write_horizontally = x->write_horizontally;
+    itscolor = x->itscolor;
+    settings = x->settings;
+    modified();
 }
 
 bool ActivityObjectCanvas::get_show_stereotype_properties() const
@@ -768,7 +775,7 @@ QString ActivityObjectCanvas::may_connect(UmlCode & l, const DiagramItem * dest)
     if (l == UmlAnchor)
         return dest->may_start(l);
     else if (dest->get_bn() == 0)
-        return TR("illegal");
+        return tr("illegal");
     else
         return ((BrowserActivityObject *) browser_node)->may_connect(l, dest->get_bn());
 }
@@ -902,7 +909,7 @@ ActivityObjectCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
 void ActivityObjectCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), 0, this, 0);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
diff --git a/src/diagram/ActivityObjectCanvas.h b/src/diagram/ActivityObjectCanvas.h
index f820f2d79..32e89300a 100644
--- a/src/diagram/ActivityObjectCanvas.h
+++ b/src/diagram/ActivityObjectCanvas.h
@@ -60,45 +60,46 @@ class ActivityObjectCanvas : public QObject, public DiagramCanvas
     ActivityObjectCanvas(UmlCanvas * canvas, int id);
     void check_selection();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ActivityObjectCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~ActivityObjectCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
+    virtual void change_scale() override;
 
     void compute_size();
     bool force_inside();
 
-    virtual UmlCode type() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual bool move_with_its_package() const;
-    virtual void moveBy(double dx, double dy);
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
-
-    virtual void apply_shortcut(QString s);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual bool move_with_its_package() const override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
+
+    virtual void apply_shortcut(const QString & s) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static ActivityObjectCanvas * read(char *& , UmlCanvas * canvas, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/ActivityPartitionCanvas.cpp b/src/diagram/ActivityPartitionCanvas.cpp
index 080f05ae8..38a499244 100644
--- a/src/diagram/ActivityPartitionCanvas.cpp
+++ b/src/diagram/ActivityPartitionCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -52,7 +52,7 @@
 #include "translate.h"
 
 ActivityPartitionCanvas::ActivityPartitionCanvas(BrowserNode * bn, UmlCanvas * canvas,
-        int x, int y)
+                                                 int x, int y)
     : ActivityContainerCanvas(0, canvas, x, y,
                               ACTIVITY_PARTITION_CANVAS_MIN_SIZE,
                               ACTIVITY_PARTITION_CANVAS_MIN_SIZE, 0)
@@ -63,11 +63,11 @@ ActivityPartitionCanvas::ActivityPartitionCanvas(BrowserNode * bn, UmlCanvas * c
     BrowserNode * parent = (BrowserNode *) browser_node->parent();
 
     if (parent->get_type() == UmlActivityPartition) {
-        Q3CanvasItemList all = the_canvas()->allItems();
-        Q3CanvasItemList::Iterator cit;
+        QList<QGraphicsItem*> all = the_canvas()->items();
+        QList<QGraphicsItem*>::Iterator cit;
 
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible()) {
+            if ((*cit)->isVisible()) {
                 DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
                 if ((di != 0) && (di->get_bn() == parent)) {
@@ -87,7 +87,7 @@ ActivityPartitionCanvas::ActivityPartitionCanvas(BrowserNode * bn, UmlCanvas * c
     check_stereotypeproperties();
 
     ActivityPartitionData * data =
-        (ActivityPartitionData *) browser_node->get_data();
+            (ActivityPartitionData *) browser_node->get_data();
 
     connect(data, SIGNAL(changed()), this, SLOT(modified()));
     connect(data, SIGNAL(deleted()), this, SLOT(deleted()));
@@ -134,7 +134,7 @@ void ActivityPartitionCanvas::remove(bool from_model)
 void ActivityPartitionCanvas::check_size()
 {
     ActivityPartitionData * data =
-        (ActivityPartitionData *) browser_node->get_data();
+            (ActivityPartitionData *) browser_node->get_data();
 
     if (data->get_represents() != 0) {
         BasicData * d = data->get_represents()->get_data();
@@ -157,9 +157,9 @@ void ActivityPartitionCanvas::check_size()
     QString s;
 
     if (!(s = browser_node->get_name()).isEmpty() ||
-        ((data->get_represents() != 0) &&
-         !data->get_represents()->deletedp() &&
-         !(s = data->get_represents()->get_name()).isEmpty())) {
+            ((data->get_represents() != 0) &&
+             !data->get_represents()->deletedp() &&
+             !(s = data->get_represents()->get_name()).isEmpty())) {
         w2 = fm.width(s);
 
         if (w2 > w1)
@@ -194,19 +194,19 @@ void ActivityPartitionCanvas::check_size()
                           (height() > min_height) ? height() : min_height);
 
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlActivityPartition)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlActivityPartition)
+            : itscolor;
 }
 
 void ActivityPartitionCanvas::change_scale()
 {
     double scale = the_canvas()->zoom();
 
-    Q3CanvasRectangle::setVisible(FALSE);
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    QGraphicsRectItem::setVisible(FALSE);
+    setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     check_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void ActivityPartitionCanvas::modified()
@@ -257,7 +257,7 @@ void ActivityPartitionCanvas::force_sub_inside(bool resize_it)
 {
     // update sub nodes position to be inside of the activity region
     // or resize it to contains sub elts if resize_it
-    Q3CanvasItemList all = canvas()->allItems();
+    QList<QGraphicsItem*> all = canvas()->items();
     BooL need_sub_upper = FALSE;
 
     if (resize_it)
@@ -271,21 +271,23 @@ void ActivityPartitionCanvas::force_sub_inside(bool resize_it)
 
 void ActivityPartitionCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
 
     QRect r = rect();
     FILE * fp = svg();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     QColor co = color(used_color);
 
+    QBrush backBrush = p.background();
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode
                         : ::Qt::OpaqueMode);
 
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.fillRect(r, co);
@@ -297,7 +299,7 @@ void ActivityPartitionCanvas::draw(QPainter & p)
 
     if (fp != 0) {
         fprintf(fp, "<g>\n\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                 svg_color(used_color),
                 r.x(), r.y(), r.width() - 1, r.height() - 1);
     }
@@ -313,7 +315,7 @@ void ActivityPartitionCanvas::draw(QPainter & p)
             p.restore();
 
             if (fp != 0) {
-                int index = str.find('\n');
+                int index = str.indexOf('\n');
 
                 if (index == -1)
                     draw_rotate_text(r.x() + h / 2, r.y() + r.height() / 2,
@@ -334,7 +336,7 @@ void ActivityPartitionCanvas::draw(QPainter & p)
 
         if (fp) {
             fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                     r.left(), r.top(), r.left(), r.bottom());
             fputs("</g>\n", fp);
         }
@@ -354,19 +356,28 @@ void ActivityPartitionCanvas::draw(QPainter & p)
 
         if (fp) {
             fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                     r.left(), r.top(), r.right(), r.top());
             fputs("</g>\n", fp);
         }
     }
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
 
     if (selected())
         show_mark(p, rect());
 }
 
-UmlCode ActivityPartitionCanvas::type() const
+void ActivityPartitionCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ActivityPartitionCanvas::typeUmlCode() const
 {
     return UmlActivityPartition;
 }
@@ -394,118 +405,122 @@ void ActivityPartitionCanvas::open()
 
 void ActivityPartitionCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem((horiz) ? TR("draw vertically") : TR("draw horizontally"), 10);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit activity partition"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, (horiz) ? tr("draw vertically") : tr("draw horizontally"), 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit activity partition"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
-            (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+                (BrowserNode *) the_canvas()->browser_diagram())
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 9);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 9);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlActivityPartition, 20))
-        m.insertItem(TR("Tool"), &toolm);
-
-    switch (index = m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
-
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
-
-    case 13:
-        z_up();
-        modified();	// call package_modified()
-        return;
-
-    case 14:
-        z_down();
-        modified();	// call package_modified()
-        return;
-
-    case 2:
-        edit_drawing_settings();
-        return;
-
-    case 3:
-        browser_node->open(TRUE);
-        return;
-
-    case 4:
-        browser_node->select_in_browser();
-        return;
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (index = retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
 
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
 
-    case 6:
-        ((BrowserActivityPartition *) browser_node)
-        ->set_associated_diagram((BrowserActivityDiagram *)
-                                 the_canvas()->browser_diagram());
-        return;
+        case 13:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 7:
-        //remove from diagram
-        delete_it();
-        break;
+        case 14:
+            z_down();
+            modified();	// call package_modified()
+            return;
+
+        case 2:
+            edit_drawing_settings();
+            return;
+
+        case 3:
+            browser_node->open(TRUE);
+            return;
+
+        case 4:
+            browser_node->select_in_browser();
+            return;
+
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
+
+        case 6:
+            ((BrowserActivityPartition *) browser_node)
+                    ->set_associated_diagram((BrowserActivityDiagram *)
+                                             the_canvas()->browser_diagram());
+            return;
+
+        case 7:
+            //remove from diagram
+            delete_it();
+            break;
 
-    case 8:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 8:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    case 9:
-        ((BrowserActivityPartition *) browser_node)
-        ->set_associated_diagram(0);
-        return;
+        case 9:
+            ((BrowserActivityPartition *) browser_node)
+                    ->set_associated_diagram(0);
+            return;
 
-    case 10:
-        turn(-1000, -1000);
-        break;
+        case 10:
+            turn(-1000, -1000);
+            break;
 
-    default:
-        if (index >= 20)
-            ToolCom::run(Tool::command(index - 20), browser_node);
+        default:
+            if (index >= 20)
+                ToolCom::run(Tool::command(index - 20), browser_node);
 
-        return;
+            return;
+        }
     }
 
     package_modified();
@@ -514,7 +529,7 @@ void ActivityPartitionCanvas::menu(const QPoint &)
 void ActivityPartitionCanvas::turn(int cx100, int cy100)
 {
     horiz ^= TRUE;
-    setSize(height(), width());
+    setRect(0,0,height(), width());
 
     if (cx100 == -1000) {
         // first turn partition
@@ -538,23 +553,23 @@ void ActivityPartitionCanvas::turn(int cx100, int cy100)
     recenter();
     DiagramCanvas::resize(width(), height());
 
-    Q3CanvasItemList all = the_canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = the_canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             ActivityPartitionCanvas * p = dynamic_cast<ActivityPartitionCanvas *>(*cit);
 
             if ((p != 0) &&
-                (p->get_bn()->parent() == browser_node) &&
-                (p->horiz != horiz)) {
+                    (p->get_bn()->parent() == browser_node) &&
+                    (p->horiz != horiz)) {
                 p->turn(cx100, cy100);
             }
         }
     }
 }
 
-void ActivityPartitionCanvas::apply_shortcut(QString s)
+void ActivityPartitionCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -586,7 +601,7 @@ void ActivityPartitionCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("activity partition color"), &itscolor);
+        co[0].set(tr("activity partition color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -605,24 +620,23 @@ bool ActivityPartitionCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ActivityPartitionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ActivityPartitionCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("activity partition color"), &itscolor);
+        co[0].set(tr("activity partition color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((ActivityPartitionCanvas *) it.current())->itscolor = itscolor;
-                ((ActivityPartitionCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ActivityPartitionCanvas *canvas = (ActivityPartitionCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -631,35 +645,28 @@ void ActivityPartitionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ActivityPartitionCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ActivityPartitionCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ActivityPartitionCanvas * x = (ActivityPartitionCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ActivityPartitionCanvas * o = (ActivityPartitionCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const ActivityPartitionCanvas * x = (const ActivityPartitionCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString ActivityPartitionCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString ActivityPartitionCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 void ActivityPartitionCanvas::connexion(UmlCode action, DiagramItem * dest,
                                         const QPoint &, const QPoint &)
 {
     ArrowCanvas * a =
-        new ArrowCanvas(the_canvas(), this, dest, action, 0, FALSE, -1.0, -1.0);
+            new ArrowCanvas(the_canvas(), this, dest, action, 0, FALSE, -1.0, -1.0);
 
     a->show();
     the_canvas()->select(a);
@@ -708,9 +715,9 @@ ActivityPartitionCanvas::read(char *& st, UmlCanvas * canvas,
     else if (!strcmp(k, "activitypartitioncanvas")) {
         int id = read_id(st);
         BrowserActivityPartition * br =
-            BrowserActivityPartition::read_ref(st);
+                BrowserActivityPartition::read_ref(st);
         ActivityPartitionCanvas * result =
-            new ActivityPartitionCanvas(canvas, id);
+                new ActivityPartitionCanvas(canvas, id);
 
         result->browser_node = br;
         connect(br->get_data(), SIGNAL(changed()), result, SLOT(modified()));
@@ -772,13 +779,13 @@ void ActivityPartitionCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     ::load(h, b);
     horiz = (h != 0);
 
     ActivityPartitionData * data =
-        (ActivityPartitionData *) browser_node->get_data();
+            (ActivityPartitionData *) browser_node->get_data();
 
     connect(data, SIGNAL(changed()), this, SLOT(modified()));
     connect(data, SIGNAL(deleted()), this, SLOT(deleted()));
@@ -794,13 +801,13 @@ void ActivityPartitionCanvas::history_load(QBuffer & b)
 
 void ActivityPartitionCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
 
     ActivityPartitionData * data =
-        (ActivityPartitionData *) browser_node->get_data();
+            (ActivityPartitionData *) browser_node->get_data();
 
     disconnect(data, 0, this, 0);
 
diff --git a/src/diagram/ActivityPartitionCanvas.h b/src/diagram/ActivityPartitionCanvas.h
index 14978c169..859308c60 100644
--- a/src/diagram/ActivityPartitionCanvas.h
+++ b/src/diagram/ActivityPartitionCanvas.h
@@ -28,15 +28,9 @@
 #ifndef ACTIVITYPARTITIONCANVAS_H
 #define ACTIVITYPARTITIONCANVAS_H
 
-
-
-
-
 #include <qobject.h>
-#include <q3valuelist.h>
-//Added by qt3to4:
+#include <QList>
 #include <QTextStream>
-
 #include "ActivityContainerCanvas.h"
 
 #define ACTIVITY_PARTITION_CANVAS_MIN_SIZE 100
@@ -56,48 +50,50 @@ class ActivityPartitionCanvas : public QObject, public ActivityContainerCanvas
 protected:
     ActivityPartitionCanvas(UmlCanvas * canvas, int id);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ActivityPartitionCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~ActivityPartitionCanvas();
 
     void force_sub_inside(bool rz);
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void check_size();
     void turn(int cx100, int cy100);
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual bool move_with_its_package() const;
-    virtual void change_scale();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using ActivityContainerCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual bool move_with_its_package() const override;
+    virtual void change_scale() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ActivityPartitionCanvas * read(char *& , UmlCanvas *, char *);
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/ArrowCanvas.cpp b/src/diagram/ArrowCanvas.cpp
index 3f64a2bcd..e6b00c532 100644
--- a/src/diagram/ArrowCanvas.cpp
+++ b/src/diagram/ArrowCanvas.cpp
@@ -30,7 +30,7 @@
 
 
 #include <math.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -60,20 +60,22 @@
 #include "geometry_vh.xpm"
 #include "geometry_hvh.xpm"
 #include "geometry_vhv.xpm"
-
+#include <QPolygon>
 ArrowCanvas::ArrowCanvas(UmlCanvas * canvas, DiagramItem * b,
                          DiagramItem * e, UmlCode t,
                          int id, bool own_brk, float dbegin, float dend)
-    : Q3CanvasPolygon(canvas), DiagramItem(id, canvas), begin(b), end(e),
+    : QGraphicsPolygonItem(/*canvas*/), DiagramItem(id, canvas), begin(b), end(e),
       itstype(t), geometry(NoGeometry), fixed_geometry(FALSE),
       label(0), stereotype(0), decenter_begin(dbegin), decenter_end(dend)
 {
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
+    canvas->addItem(this);
     boundings.resize(4);
 
     double bz = begin->get_z();
     double ez = end->get_z();
 
-    setZ(((bz > ez) ? bz : ez) + 1);
+    setZValue(((bz > ez) ? bz : ez) + 1);
     b->add_line(this);
     e->add_line(this);
 
@@ -96,7 +98,7 @@ ArrowCanvas::~ArrowCanvas()
 void ArrowCanvas::cut_self()
 {
     // cut the line adding two points
-    QRect r = ((DiagramCanvas *) begin)->rect();
+    QRect r = ((DiagramCanvas *) begin)->sceneRect();
     QPoint pt(r.left() - ARROW_LENGTH * 3, r.top());
 
     ArrowPointCanvas * ap = brk(pt);
@@ -113,14 +115,14 @@ void ArrowCanvas::delete_it()
     if (begin != 0) {
         begin->remove_line(this);
 
-        if (begin->type() == UmlArrowPoint)
+        if (begin->typeUmlCode() == UmlArrowPoint)
             begin->delete_it();
     }
 
     if (end != 0) {
         end->remove_line(this);
 
-        if (end->type() == UmlArrowPoint)
+        if (end->typeUmlCode() == UmlArrowPoint)
             end->delete_it();
     }
 
@@ -144,7 +146,7 @@ void ArrowCanvas::unconnect()
 
 UmlCanvas * ArrowCanvas::the_canvas() const
 {
-    return ((UmlCanvas *) canvas());
+    return ((UmlCanvas *) scene());
 }
 
 static int iabs(int v)
@@ -163,22 +165,22 @@ void ArrowCanvas::update_pos()
 
     // calcul beginp & endp pour ne plus etre dans b_rct & e_rct
 
-    if (begin->type() == UmlArrowPoint)
-        beginp = begin->center();
+    if (begin->typeUmlCode() == UmlArrowPoint)
+        beginp = begin->sceneRect().center();
     else {
-        QRect r = begin->rect();
+        QRect r = begin->sceneRect();
 
-        if (r.contains(end->rect()))
-            begin->shift(beginp, end->center(), TRUE);
+        if (r.contains(end->sceneRect()))
+            begin->shift(beginp, end->sceneRect().center(), TRUE);
         else {
-            switch (end->type()) {
+            switch (end->typeUmlCode()) {
             case UmlArrowPoint:
             case UmlArrowJunction:
-                begin->shift(beginp, end->center(), FALSE);
+                begin->shift(beginp, end->sceneRect().center(), FALSE);
                 break;
 
             default: {
-                QRect endr = end->rect();
+                QRect endr = end->sceneRect();
 
                 if (endr.contains(r)) {
                     end->shift(end_computed, r.center(), TRUE);
@@ -208,17 +210,17 @@ void ArrowCanvas::update_pos()
         }
     }
 
-    switch (end->type()) {
+    switch (end->typeUmlCode()) {
     case UmlArrowPoint:
     case UmlArrowJunction:
-        endp = end->center();
+        endp = end->sceneRect().center();
         break;
 
     default: {
-        QRect r = end->rect();
+        QRect r = end->sceneRect();
 
         if (end_computed.isNull())
-            end->shift(endp, beginp, r.contains(begin->rect()));
+            end->shift(endp, beginp, r.contains(begin->sceneRect()));
         else
             endp = end_computed;
 
@@ -251,7 +253,7 @@ void ArrowCanvas::update_pos()
         boundings.setPoint(1, beginp.x() + 1, beginp.y());
         boundings.setPoint(2, beginp.x() + 1, beginp.y() + 1);
         boundings.setPoint(3, beginp.x(), beginp.y() + 1);
-        setPoints(boundings);
+        setPolygon(boundings);
         return;
     }
 
@@ -269,15 +271,13 @@ void ArrowCanvas::update_pos()
                        (int)(endp.y() + deltay - deltax / 1));
     boundings.setPoint(3, (int)(endp.x() - deltax + deltay / 1),
                        (int)(endp.y() - deltay - deltax / 1));
-
-    setPoints(boundings);
-
+    setPolygon(boundings);
     // points de la fleche
     // *3/5 pour diminuer la fleche et ne pas risquer de sortir de boundings
     deltax *= 3.0 / 5.0;
     deltay *= 3.0 / 5.0;
 
-    switch (end->type()) {
+    switch (end->typeUmlCode()) {
     case UmlArrowPoint:
         break;
 
@@ -334,7 +334,7 @@ void ArrowCanvas::update_pos()
         }
     }
 
-    if (begin->type() != UmlArrowPoint) {
+    if (begin->typeUmlCode() != UmlArrowPoint) {
         // aggregation's polygone
         switch (itstype) {
         case UmlAggregation:
@@ -356,19 +356,17 @@ void ArrowCanvas::update_pos()
             break;
         }
     }
-
     if (auto_pos) {
         // moves label dependent on old position
-        if ((label != 0) && !label->selected())
+        if ((label != 0) && !label->isSelected())
             label->moveBy((beginp.x() - old_beginp.x() + endp.x() - old_endp.x()) / 2.0,
                           (beginp.y() - old_beginp.y() + endp.y() - old_endp.y()) / 2.0);
 
         // moves stereotype dependent on old position
-        if ((stereotype != 0) && !stereotype->selected())
+        if ((stereotype != 0) && !stereotype->isSelected())
             stereotype->moveBy((beginp.x() - old_beginp.x() + endp.x() - old_endp.x()) / 2.0,
                                (beginp.y() - old_beginp.y() + endp.y() - old_endp.y()) / 2.0);
     }
-
     update_show_lines();
 
     if (need_update_geometry)
@@ -379,14 +377,16 @@ void ArrowCanvas::update_pos()
 void ArrowCanvas::move_outside(QRect r)
 {
     // check it is the first segment
-    if ((begin != 0) && (begin->type() != UmlArrowPoint)) {
+    if ((begin != 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
         QPoint c = r.center();
         ArrowCanvas * ar = this;
 
-        while ((ar->end != 0) && (ar->end->type() == UmlArrowPoint)) {
+        while ((ar->end != 0) && (ar->end->typeUmlCode() == UmlArrowPoint)) {
             ArrowPointCanvas * p = (ArrowPointCanvas *) ar->end;
             double px = p->x();
             double py = p->y();
+            double pxInitial = p->x();
+            double pyInitial = p->y();
 
             double dx = (px < c.x()) ? -10.0 : 10.0;
             double dy = (py < c.y()) ? -10.0 : 10.0;
@@ -396,8 +396,8 @@ void ArrowCanvas::move_outside(QRect r)
                 py += dy;
             }
 
-            p->move(px, py);
-
+            //delta displacement. Self relation update position wrong displacement
+            p->moveBy(px- pxInitial, py - pyInitial);
             ar = p->get_other(ar);
 
             if (ar == 0)
@@ -410,10 +410,10 @@ void ArrowCanvas::move_outside(QRect r)
 void ArrowCanvas::move_self_points(double dx, double dy)
 {
     // check it is the first segment
-    if ((begin != 0) && (begin->type() != UmlArrowPoint)) {
+    if ((begin != 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
         ArrowCanvas * a = this;
 
-        while ((a->end != 0) && (a->end->type() == UmlArrowPoint)) {
+        while ((a->end != 0) && (a->end->typeUmlCode() == UmlArrowPoint)) {
             ((ArrowPointCanvas *) a->end)->moveBy(dx, dy);
             a = ((ArrowPointCanvas *) a->end)->get_other(a);
 
@@ -432,16 +432,16 @@ void ArrowCanvas::change_scale()
 
     label = 0;
     stereotype = 0;
-    Q3CanvasPolygon::setVisible(FALSE);
+    QGraphicsPolygonItem::setVisible(FALSE);
     update_pos();
-    Q3CanvasPolygon::setVisible(TRUE);
+    QGraphicsPolygonItem::setVisible(TRUE);
     label = lab;
     stereotype = ste;
 }
 
 void ArrowCanvas::setVisible(bool yes)
 {
-    Q3CanvasPolygon::setVisible(yes);
+    QGraphicsPolygonItem::setVisible(yes);
 
     if (label != 0)
         label->setVisible(yes);
@@ -452,44 +452,44 @@ void ArrowCanvas::setVisible(bool yes)
 
 void ArrowCanvas::moveBy(double dx, double dy)
 {
-    if ((label != 0) && !label->selected())
+    if ((label != 0) && !label->isSelected())
         label->moveBy(dx, dy);
 
-    if ((stereotype != 0) && !stereotype->selected())
+    if ((stereotype != 0) && !stereotype->isSelected())
         stereotype->moveBy(dx, dy);
 }
 
 double ArrowCanvas::get_z() const
 {
-    return z();
+    return zValue();
 }
 
 void ArrowCanvas::set_z(double z)
 {
-    setZ(z);
+    setZValue(z);
 
     if (stereotype != 0)
-        stereotype->setZ(z);
+        stereotype->setZValue(z);
 
     if (label != 0)
-        label->setZ(z);
+        label->setZValue(z);
 
     if ((begin != 0) &&
-        (begin->type() == UmlArrowPoint) &&
-        (((ArrowPointCanvas *) begin)->z() < (z + 1)))
-        ((ArrowPointCanvas *) begin)->setZ(z + 1);
+        (begin->typeUmlCode() == UmlArrowPoint) &&
+        (((ArrowPointCanvas *) begin)->zValue() < (z + 1)))
+        ((ArrowPointCanvas *) begin)->setZValue(z + 1);
 
     if ((end != 0) &&
-        (end->type() == UmlArrowPoint) &&
-        (((ArrowPointCanvas *) end)->z() < (z + 1)))
-        ((ArrowPointCanvas *) end)->setZ(z + 1);
+        (end->typeUmlCode() == UmlArrowPoint) &&
+        (((ArrowPointCanvas *) end)->zValue() < (z + 1)))
+        ((ArrowPointCanvas *) end)->setZValue(z + 1);
 }
 
 void ArrowCanvas::go_up(double nz)
 {
     ArrowCanvas * a = this;
 
-    while ((a->begin != 0) && (a->begin->type() == UmlArrowPoint)) {
+    while ((a->begin != 0) && (a->begin->typeUmlCode() == UmlArrowPoint)) {
         a = ((ArrowPointCanvas *) a->begin)->get_other(a);
 
         if (a == 0)
@@ -498,25 +498,21 @@ void ArrowCanvas::go_up(double nz)
     }
 
     for (;;) {
-        if (a->z() < nz) {
-            a->setZ(nz);
+        if (a->zValue() < nz) {
+            a->setZValue(nz);
 
             if (a->stereotype != 0)
-                a->stereotype->setZ(nz);
+                a->stereotype->setZValue(nz);
 
             if (a->label != 0)
-                a->label->setZ(nz);
+                a->label->setZValue(nz);
         }
 
-        Q3PtrListIterator<ArrowCanvas> it(a->lines);
-
-        while (it.current()) {
-            it.current()->go_up(nz);
-            ++it;
-        }
+        foreach (ArrowCanvas *canvas, a->lines)
+            canvas->go_up(nz);
 
-        if ((a->end != 0) && (a->end->type() == UmlArrowPoint)) {
-            if (((ArrowPointCanvas *) a->end)->z() < (nz + 1))
+        if ((a->end != 0) && (a->end->typeUmlCode() == UmlArrowPoint)) {
+            if (((ArrowPointCanvas *) a->end)->zValue() < (nz + 1))
                 ((ArrowPointCanvas *) a->end)->set_z(nz + 1);
 
             a = ((ArrowPointCanvas *) a->end)->get_other(a);
@@ -532,12 +528,12 @@ void ArrowCanvas::go_up(double nz)
 
 bool ArrowCanvas::copyable() const
 {
-    return selected() && get_start()->copyable() && get_end()->copyable();
+    return isSelected() && get_start()->copyable() && get_end()->copyable();
 }
 
 void ArrowCanvas::drawShape(QPainter & p)
 {
-    if (! visible() || (beginp == endp))
+    if (! isVisible() || (beginp == endp))
         return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
@@ -554,7 +550,7 @@ void ArrowCanvas::drawShape(QPainter & p)
              ((TransitionData *) get_data())->internal())
             ? UmlDependency : itstype) {
     case UmlDirectionalAssociation:
-        if (end->type() != UmlArrowPoint) {
+        if (end->typeUmlCode() != UmlArrowPoint) {
             if (!strcmp(end->get_bn()->get_stereotype(), "metaclass") &&
                 !strcmp(get_start()->get_bn()->get_stereotype(), "stereotype")) {
                 // extend
@@ -596,7 +592,7 @@ void ArrowCanvas::drawShape(QPainter & p)
     case UmlContain:
     case UmlTransition:
     case UmlFlow:
-        if (end->type() != UmlArrowPoint) {
+        if (end->typeUmlCode() != UmlArrowPoint) {
             p.drawLine(endp, arrow[0]);
             p.drawLine(endp, arrow[1]);
 
@@ -623,7 +619,7 @@ void ArrowCanvas::drawShape(QPainter & p)
                     " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                     beginp.x(), beginp.y(), endp.x(), endp.y());
 
-        if (begin->type() != UmlArrowPoint) {
+        if (begin->typeUmlCode() != UmlArrowPoint) {
             switch (itstype) {
             case UmlAggregation:
             case UmlDirectionalAggregation: {
@@ -660,7 +656,7 @@ void ArrowCanvas::drawShape(QPainter & p)
 
     case UmlDependency:
     case UmlDependOn:
-        if (end->type() != UmlArrowPoint) {
+        if (end->typeUmlCode() != UmlArrowPoint) {
             p.drawLine(endp, arrow[0]);
             p.drawLine(endp, arrow[1]);
 
@@ -692,7 +688,7 @@ void ArrowCanvas::drawShape(QPainter & p)
         // no break
     case UmlGeneralisation:
     case UmlInherit:
-        if (end->type() != UmlArrowPoint) {
+        if (end->typeUmlCode() != UmlArrowPoint) {
             p.drawLine(beginp, arrow[2]);
             p.setPen(::Qt::SolidLine);
             p.drawLine(endp, arrow[0]);
@@ -740,7 +736,7 @@ void ArrowCanvas::drawShape(QPainter & p)
 
     case UmlRequired:
     case UmlProvided:
-        if (end->type() != UmlArrowPoint) {
+        if (end->typeUmlCode() != UmlArrowPoint) {
             p.drawLine(beginp, arrow[0]);
 
             if (fp != 0)
@@ -760,7 +756,7 @@ void ArrowCanvas::drawShape(QPainter & p)
         break;
 
     case UmlInner:
-        if (end->type() != UmlArrowPoint) {
+        if (end->typeUmlCode() != UmlArrowPoint) {
             p.drawLine(beginp, arrow[1]);
             p.drawPixmap(QPoint(arrow[0].x() - ARROW_LENGTH / 2,
                                 arrow[0].y() - ARROW_LENGTH / 2),
@@ -799,7 +795,7 @@ void ArrowCanvas::drawShape(QPainter & p)
     if (fp != 0)
         fputs("</g>\n", fp);
 
-    if (selected()) {
+    if (isSelected()) {
         p.fillRect(beginp.x() - SELECT_SQUARE_SIZE / 2,
                    beginp.y() - SELECT_SQUARE_SIZE / 2,
                    SELECT_SQUARE_SIZE, SELECT_SQUARE_SIZE, ::Qt::black);
@@ -809,7 +805,15 @@ void ArrowCanvas::drawShape(QPainter & p)
     }
 }
 
-UmlCode ArrowCanvas::type() const
+void ArrowCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    drawShape(*painter);
+}
+
+UmlCode ArrowCanvas::typeUmlCode() const
 {
     return itstype;
 }
@@ -836,7 +840,7 @@ void ArrowCanvas::remove(bool)
         if (the_canvas()->must_draw_all_relations()) {
             const ArrowCanvas * a = this;
 
-            while (a->begin->type() == UmlArrowPoint) {
+            while (a->begin->typeUmlCode() == UmlArrowPoint) {
                 a = ((ArrowPointCanvas *) a->begin)->get_other(a);
 
                 if (a == 0)
@@ -846,7 +850,7 @@ void ArrowCanvas::remove(bool)
             if (a && !a->begin->isSelected() && !a->begin->get_bn()->deletedp()) {
                 a = this;
 
-                while (a->end->type() == UmlArrowPoint) {
+                while (a->end->typeUmlCode() == UmlArrowPoint) {
                     a = ((ArrowPointCanvas *) a->end)->get_other(a);
 
                     if (a == 0)
@@ -854,7 +858,7 @@ void ArrowCanvas::remove(bool)
                 }
 
                 if (a && !a->end->isSelected() && !a->end->get_bn()->deletedp()) {
-                    msg_warning("Douml", TR("<i>Draw all relations</i> forced to <i>no</i>"));
+                    msg_warning("Douml", tr("<i>Draw all relations</i> forced to <i>no</i>"));
                     the_canvas()->dont_draw_all_relations();
                 }
             }
@@ -868,9 +872,12 @@ QRect ArrowCanvas::rect() const
 {
     QRect r(beginp, endp);
 
-    return r.normalize();
+    return r.normalized();
+}
+QRect ArrowCanvas::sceneRect() const
+{
+    return rect();
 }
-
 QPoint ArrowCanvas::center() const
 {
     return QPoint((beginp.x() + endp.x()) / 2,
@@ -879,7 +886,7 @@ QPoint ArrowCanvas::center() const
 
 bool ArrowCanvas::isSelected() const
 {
-    return selected();
+    return QGraphicsPolygonItem::isSelected();
 }
 
 bool ArrowCanvas::contains(int, int) const
@@ -889,12 +896,12 @@ bool ArrowCanvas::contains(int, int) const
 
 QString ArrowCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("a relation can't have a relation");
+    return (l == UmlAnchor) ? QString() : tr("a relation can't have a relation");
 }
 
 QString ArrowCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 void ArrowCanvas::connexion(UmlCode action, DiagramItem * dest,
@@ -921,8 +928,8 @@ bool ArrowCanvas::edit(const QStringList & defaults,
         st = pstereotype->stereotype->get_name();
 
     StereotypeDialog d(defaults, st, la,
-                       TR("stereotype/label dialog"),
-                       TR("label : "));
+                       tr("stereotype/label dialog"),
+                       tr("label : "));
 
     d.raise();
 
@@ -998,7 +1005,7 @@ void ArrowCanvas::open()
         if ((bn != 0) &&
             edit(bn->default_stereotypes(itstype, get_end()->get_bn()),
                  plabel, pstereotype)) {
-            canvas()->update();
+            scene()->update();
             package_modified();
         }
     }
@@ -1008,22 +1015,20 @@ void ArrowCanvas::default_label_position() const
 {
     QPoint c = center();
     QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
-
-    label->move(c.x() - fm.width(label->get_name()) / 2, c.y() - fm.height());
+    label->moveBy(c.x() - fm.width(label->get_name()) / 2, c.y() - fm.height());
 }
 
 void ArrowCanvas::default_stereotype_position() const
 {
     QPoint c = center();
     QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
-
-    stereotype->move(c.x() - fm.width(stereotype->get_name()) / 2, c.y());
+    stereotype->moveBy(c.x() - fm.width(stereotype->get_name()) / 2, c.y());
 }
 
 void ArrowCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu geo(0);
+    QMenu m(0);
+    QMenu geo(0);
     ArrowCanvas * plabel;
     ArrowCanvas * pstereotype;
 
@@ -1031,35 +1036,38 @@ void ArrowCanvas::menu(const QPoint &)
 
     MenuFactory::createTitle(m, ((plabel == 0) ||
                                  plabel->label->get_name().isEmpty())
-                             ? QString(TR("line")) : plabel->label->get_name());
+                             ? QString(tr("line")) : plabel->label->get_name());
 
     if (IsaRelation(itstype)) {
-        m.insertSeparator();
-        m.insertItem(TR("Edit"), 1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Edit"), 1);
     }
 
     if (pstereotype || plabel) {
-        m.insertSeparator();
-        m.insertItem(TR("Select stereotype and label"), 2);
-        m.insertItem(TR("Default stereotype and label position"), 3);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select stereotype and label"), 2);
+        MenuFactory::addItem(m, tr("Default stereotype and label position"), 3);
 
         if (plabel && (label == 0))
-            m.insertItem(TR("Attach label to this segment"), 4);
+            MenuFactory::addItem(m, tr("Attach label to this segment"), 4);
 
         if (pstereotype && (stereotype == 0))
-            m.insertItem(TR("Attach stereotype to this segment"), 5);
+            MenuFactory::addItem(m, tr("Attach stereotype to this segment"), 5);
     }
 
     if (get_start() != get_end()) {
-        m.insertSeparator();
+        m.addSeparator();
         init_geometry_menu(geo, 10);
-        m.insertItem(TR("Geometry (Ctrl+l)"), &geo);
+        MenuFactory::insertItem(m, tr("Geometry (Ctrl+l)"), &geo);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 6);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 6);
 
-    int choice = m.exec(QCursor::pos());
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    int choice = retAction->data().toInt();
 
     switch (choice) {
     case 1:
@@ -1120,61 +1128,57 @@ void ArrowCanvas::menu(const QPoint &)
 
         break;
     }
+    }
 
     package_modified();
 }
 
-void ArrowCanvas::init_geometry_menu(Q3PopupMenu & m, int first)
+void ArrowCanvas::init_geometry_menu(QMenu & m, int first)
 {
     QPixmap hv((const char **) geometry_hv);
     QPixmap vh((const char **) geometry_vh);
     QPixmap hvh((const char **) geometry_hvh);
     QPixmap vhv((const char **) geometry_vhv);
-
-    m.setCheckable(TRUE);
-
-    m.insertItem(TR("None"), first);
-    m.insertItem(hv, first + HVGeometry);
-    m.insertItem(vh, first + VHGeometry);
-    m.insertItem(hvh, first + HVHGeometry);
-    m.insertItem(vhv, first + VHVGeometry);
-
+    MenuFactory::addItem(m, tr("None"), first);
+    m.addAction(hv,"")->setData( first + HVGeometry);
+    m.addAction(vh,"")->setData( first + VHGeometry);
+    m.addAction(hvh,"")->setData( first + HVHGeometry);
+    m.addAction(vhv,"")->setData( first + VHVGeometry);
     switch (geometry) {
     case NoGeometry:
-        m.setItemChecked(first, TRUE);
+        MenuFactory::findAction(m ,first)->setChecked( TRUE);
         break;
 
     case HVGeometry:
     case HVrGeometry:
-        m.setItemChecked(first + HVGeometry, TRUE);
+        MenuFactory::findAction(m ,first + HVGeometry)->setChecked( TRUE);
         break;
 
     case VHGeometry:
     case VHrGeometry:
-        m.setItemChecked(first + VHGeometry, TRUE);
+        MenuFactory::findAction(m ,first + VHGeometry)->setChecked( TRUE);
         break;
 
     case HVHGeometry:
-        m.setItemChecked(first + HVHGeometry, TRUE);
+        MenuFactory::findAction(m ,first + HVHGeometry)->setChecked( TRUE);
         break;
 
     default:
         // VHVGeometry
-        m.setItemChecked(first + VHVGeometry, TRUE);
+        MenuFactory::findAction(m ,first + VHVGeometry)->setChecked( TRUE);
     }
-
     if (decenter_begin >= 0)
-        m.insertItem(TR("Recenter begin"), first + RecenterBegin);
+        MenuFactory::addItem(m, tr("Recenter begin"), first + RecenterBegin);
 
     if (decenter_end >= 0)
-        m.insertItem(TR("Recenter end"), first + RecenterEnd);
+        MenuFactory::addItem(m, tr("Recenter end"), first + RecenterEnd);
 }
 
 DiagramItem * ArrowCanvas::get_start() const
 {
     const ArrowCanvas * a = this;
 
-    while (a->begin->type() == UmlArrowPoint)
+    while (a->begin->typeUmlCode() == UmlArrowPoint)
         a = ((ArrowPointCanvas *) a->begin)->get_other(a);
 
     return a->begin;
@@ -1184,7 +1188,7 @@ DiagramItem * ArrowCanvas::get_end() const
 {
     const ArrowCanvas * a = this;
 
-    while (a->end->type() == UmlArrowPoint)
+    while (a->end->typeUmlCode() == UmlArrowPoint)
         a = ((ArrowPointCanvas *) a->end)->get_other(a);
 
     return a->end;
@@ -1207,7 +1211,7 @@ void ArrowCanvas::search_supports(ArrowCanvas *& plabel,
 
     p = this;
 
-    while (p->end->type() == UmlArrowPoint) {
+    while (p->end->typeUmlCode() == UmlArrowPoint) {
         if (p->label != 0) plabel = (ArrowCanvas *) p;
 
         if (p->stereotype != 0) pstereotype = (ArrowCanvas *) p;
@@ -1221,7 +1225,7 @@ void ArrowCanvas::search_supports(ArrowCanvas *& plabel,
 
     p = this;
 
-    while (p->begin->type() == UmlArrowPoint) {
+    while (p->begin->typeUmlCode() == UmlArrowPoint) {
         if (p->label != 0) plabel = (ArrowCanvas *) p;
 
         if (p->stereotype != 0) pstereotype = (ArrowCanvas *) p;
@@ -1239,7 +1243,7 @@ void ArrowCanvas::reverse()
 {
     ArrowCanvas * a = this;
 
-    while (a->begin->type() == UmlArrowPoint)
+    while (a->begin->typeUmlCode() == UmlArrowPoint)
         a = (ArrowCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
     for (;;) {
@@ -1253,7 +1257,7 @@ void ArrowCanvas::reverse()
         a->decenter_begin = a->decenter_end;
         a->decenter_end = decenter;
 
-        if (a->begin->type() != UmlArrowPoint)
+        if (a->begin->typeUmlCode() != UmlArrowPoint)
             break;
 
         a = (ArrowCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
@@ -1265,7 +1269,7 @@ ArrowPointCanvas * ArrowCanvas::brk(const QPoint & p)
     ArrowPointCanvas * ap =
         new ArrowPointCanvas(the_canvas(), p.x(), p.y());
 
-    ap->setZ(z() + 1);
+    ap->setZValue(zValue() + 1);
 
     DiagramItem * e = end;
 
@@ -1312,14 +1316,14 @@ bool ArrowCanvas::may_join() const
 
         a = this;
 
-        while (a->begin->type() == UmlArrowPoint) {
+        while (a->begin->typeUmlCode() == UmlArrowPoint) {
             npoint += 1;
             a = ((ArrowCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a));
         }
 
         a = this;
 
-        while (a->end->type() == UmlArrowPoint) {
+        while (a->end->typeUmlCode() == UmlArrowPoint) {
             npoint += 1;
             a = ((ArrowCanvas *)((ArrowPointCanvas *) a->end)->get_other(a));
         }
@@ -1343,7 +1347,7 @@ ArrowCanvas * ArrowCanvas::join(ArrowCanvas * other, ArrowPointCanvas * ap)
         end->add_line(this);	// add before remove in case end is
         end->remove_line(other, TRUE);	// an arrow junction and not del it
 
-        Q3PtrList<ArrowCanvas> olines = other->lines;
+        QList<ArrowCanvas *> olines = other->lines;
         LabelCanvas * olabel = other->label;
         LabelCanvas * ostereotype = other->stereotype;
 
@@ -1361,9 +1365,7 @@ ArrowCanvas * ArrowCanvas::join(ArrowCanvas * other, ArrowPointCanvas * ap)
         show();
 
         //gets other's lines (anchor to note)
-        while (! olines.isEmpty()) {
-            ArrowCanvas * l = olines.take();
-
+        foreach (ArrowCanvas *l, olines) {
             l->hide();
 
             if (l->begin == other)
@@ -1375,12 +1377,12 @@ ArrowCanvas * ArrowCanvas::join(ArrowCanvas * other, ArrowPointCanvas * ap)
             l->update_pos();
             l->show();
         }
+        olines.clear();
 
         //gets label and stereotype
         QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
         int h = fm.height();
         QPoint c = center();
-
         if (olabel) {
             ///tant que gere pas label sur n'importe qu el segment
             if (label != 0)
@@ -1389,14 +1391,13 @@ ArrowCanvas * ArrowCanvas::join(ArrowCanvas * other, ArrowPointCanvas * ap)
             //tq
 
             label = olabel;
-            label->move(c.x() - fm.width(label->get_name()) / 2, c.y() - h);
+            label->moveBy(c.x() - fm.width(label->get_name()) / 2, c.y() - h);
         }
 
         if (ostereotype) {
             stereotype = ostereotype;
-            stereotype->move(c.x() - fm.width(stereotype->get_name()) / 2, c.y());
+            stereotype->moveBy(c.x() - fm.width(stereotype->get_name()) / 2, c.y());
         }
-
         return this;
     }
     else
@@ -1425,7 +1426,7 @@ bool ArrowCanvas::cut_on_move(ArrowPointCanvas *& ap) const
     default:
         // get any point, this will be moved
         ap = (ArrowPointCanvas *)
-             ((begin->type() == UmlArrowPoint) ? begin : end);
+             ((begin->typeUmlCode() == UmlArrowPoint) ? begin : end);
         return FALSE;
     }
 }
@@ -1433,7 +1434,7 @@ bool ArrowCanvas::cut_on_move(ArrowPointCanvas *& ap) const
 bool ArrowCanvas::is_decenter(QPoint mousePressPos,
                               BooL & start, BooL & horiz) const
 {
-    switch (end->type()) {
+    switch (end->typeUmlCode()) {
     case UmlArrowPoint:
     case UmlArrowJunction:
         break;
@@ -1444,10 +1445,10 @@ bool ArrowCanvas::is_decenter(QPoint mousePressPos,
             // near end of line
             start = FALSE;
 
-            QRect r = end->rect();
+            QRect r = end->sceneRect();
             QPoint p = endp;
 
-            end->shift(p, beginp, r.contains(begin->rect()));
+            end->shift(p, beginp, r.contains(begin->sceneRect()));
             horiz = (iabs(endp.y() - r.top()) < 2) ||
                     (iabs(endp.y() - r.bottom()) < 2);
 
@@ -1455,16 +1456,16 @@ bool ArrowCanvas::is_decenter(QPoint mousePressPos,
         }
     }
 
-    if ((begin->type() != UmlArrowPoint) &&
+    if ((begin->typeUmlCode() != UmlArrowPoint) &&
         (iabs(beginp.x() - mousePressPos.x()) < 10) &&
         (iabs(beginp.y() - mousePressPos.y()) < 10)) {
         // near start of line
         start = TRUE;
 
-        QRect r = begin->rect();
+        QRect r = begin->sceneRect();
         QPoint p = beginp;
 
-        begin->shift(p, end->center(), r.contains(end->rect()));
+        begin->shift(p, end->center(), r.contains(end->sceneRect()));
 
         horiz = (iabs(beginp.y() - r.top()) < 2) ||
                 (iabs(beginp.y() - r.bottom()) < 2);
@@ -1478,7 +1479,7 @@ bool ArrowCanvas::is_decenter(QPoint mousePressPos,
 void ArrowCanvas::decenter(QPoint p, bool start, bool horiz)
 {
     float & decenter_it = (start) ? decenter_begin : decenter_end;
-    QRect r = (start) ? begin->rect() : end->rect();
+    QRect r = (start) ? begin->sceneRect() : end->sceneRect();
     int margin =
         // force the position to have more than 3 point to the edge
         // to not be < 2 and change the edge
@@ -1513,9 +1514,9 @@ void ArrowCanvas::decenter(QPoint p, bool start, bool horiz)
 
     propag_decenter(decenter_begin, decenter_end);
 
-    Q3CanvasPolygon::setVisible(FALSE);
+    QGraphicsPolygonItem::setVisible(FALSE);
     update_pos();
-    Q3CanvasPolygon::setVisible(TRUE);
+    QGraphicsPolygonItem::setVisible(TRUE);
 }
 
 void ArrowCanvas::propag_decenter(float db, float de)
@@ -1525,7 +1526,7 @@ void ArrowCanvas::propag_decenter(float db, float de)
 
     ArrowCanvas * a = this;
 
-    while (a->begin->type() == UmlArrowPoint) {
+    while (a->begin->typeUmlCode() == UmlArrowPoint) {
         a = ((ArrowPointCanvas *) a->begin)->get_other(a);
         a->decenter_begin = db;
         a->decenter_end = de;
@@ -1533,7 +1534,7 @@ void ArrowCanvas::propag_decenter(float db, float de)
 
     a = this;
 
-    while (a->end->type() == UmlArrowPoint) {
+    while (a->end->typeUmlCode() == UmlArrowPoint) {
         a = ((ArrowPointCanvas *) a->end)->get_other(a);
         a->decenter_begin = db;
         a->decenter_end = de;
@@ -1544,18 +1545,18 @@ void ArrowCanvas::set_decenter(float db, float de)
 {
     propag_decenter(db, de);
 
-    Q3CanvasPolygon::setVisible(FALSE);
+    QGraphicsPolygonItem::setVisible(FALSE);
 
     ArrowCanvas * a = this;
 
-    while (a->begin->type() == UmlArrowPoint) {
+    while (a->begin->typeUmlCode() == UmlArrowPoint) {
         a = ((ArrowPointCanvas *) a->begin)->get_other(a);
         a->update_pos();
     }
 
     a = this;
 
-    while (a->end->type() == UmlArrowPoint) {
+    while (a->end->typeUmlCode() == UmlArrowPoint) {
         a = ((ArrowPointCanvas *) a->end)->get_other(a);
         a->update_pos();
     }
@@ -1563,9 +1564,9 @@ void ArrowCanvas::set_decenter(float db, float de)
     update_pos();
     update_geometry();
 
-    Q3CanvasPolygon::setVisible(TRUE);
+    QGraphicsPolygonItem::setVisible(TRUE);
 
-    canvas()->update();
+    scene()->update();
 }
 
 void ArrowCanvas::propag_geometry(LineGeometry geo, bool fixed)
@@ -1575,7 +1576,7 @@ void ArrowCanvas::propag_geometry(LineGeometry geo, bool fixed)
 
     ArrowCanvas * a = this;
 
-    while (a->begin->type() == UmlArrowPoint) {
+    while (a->begin->typeUmlCode() == UmlArrowPoint) {
         a = ((ArrowPointCanvas *) a->begin)->get_other(a);
         a->geometry = geo;
         a->fixed_geometry = fixed;
@@ -1583,7 +1584,7 @@ void ArrowCanvas::propag_geometry(LineGeometry geo, bool fixed)
 
     a = this;
 
-    while (a->end->type() == UmlArrowPoint) {
+    while (a->end->typeUmlCode() == UmlArrowPoint) {
         a = ((ArrowPointCanvas *) a->end)->get_other(a);
         a->geometry = geo;
         a->fixed_geometry = fixed;
@@ -1603,11 +1604,11 @@ ArrowCanvas * ArrowCanvas::set_geometry(LineGeometry geo, bool fixed)
     // warning : after join() 'this' can't be used
     ArrowCanvas * ar = this;
 
-    while (ar->begin->type() == UmlArrowPoint)
+    while (ar->begin->typeUmlCode() == UmlArrowPoint)
         ar = ar->join(((ArrowPointCanvas *) ar->begin)->get_other(ar),
                       (ArrowPointCanvas *) ar->begin);
 
-    while (ar->end->type() == UmlArrowPoint)
+    while (ar->end->typeUmlCode() == UmlArrowPoint)
         ar = ar->join(((ArrowPointCanvas *) ar->end)->get_other(ar),
                       (ArrowPointCanvas *) ar->end);
 
@@ -1656,8 +1657,8 @@ ArrowCanvas * ArrowCanvas::set_geometry(LineGeometry geo, bool fixed)
     break;
 
     case HVHGeometry: {
-        QRect arect = a->rect();
-        QRect brect = b->rect();
+        QRect arect = a->sceneRect();
+        QRect brect = b->sceneRect();
         QPoint p(((ca.x() < cb.x()) ? (arect.right() + brect.left())
                   : (arect.left() + brect.right())) / 2
                  - ARROW_POINT_SIZE / 2,
@@ -1672,8 +1673,8 @@ ArrowCanvas * ArrowCanvas::set_geometry(LineGeometry geo, bool fixed)
     default:
         // VHVGeometry
     {
-        QRect arect = a->rect();
-        QRect brect = b->rect();
+        QRect arect = a->sceneRect();
+        QRect brect = b->sceneRect();
         QPoint p(ca.x() - ARROW_POINT_SIZE / 2,
                  ((ca.y() < cb.y()) ? (arect.bottom() + brect.top())
                   : (arect.top() + brect.bottom())) / 2
@@ -1725,10 +1726,10 @@ void ArrowCanvas::update_geometry()
     ArrowCanvas * first_segment = this;
     ArrowCanvas * last_segment = this;
 
-    while (first_segment->begin->type() == UmlArrowPoint)
+    while (first_segment->begin->typeUmlCode() == UmlArrowPoint)
         first_segment = ((ArrowPointCanvas *) first_segment->begin)->get_other(first_segment);
 
-    while (last_segment->end->type() == UmlArrowPoint)
+    while (last_segment->end->typeUmlCode() == UmlArrowPoint)
         last_segment = ((ArrowPointCanvas *) last_segment->end)->get_other(last_segment);
 
     DiagramItem * a = first_segment->begin;
@@ -1766,8 +1767,8 @@ void ArrowCanvas::update_geometry()
             // user moves just the middle line for the first time
             propag_geometry(geometry, FALSE);
 
-        QRect arect = a->rect();
-        QRect brect = b->rect();
+        QRect arect = a->sceneRect();
+        QRect brect = b->sceneRect();
         double nx;
 
         if (fixed_geometry)
@@ -1800,8 +1801,8 @@ void ArrowCanvas::update_geometry()
             // user moves just the middle line for the first time
             propag_geometry(geometry, FALSE);
 
-        QRect arect = a->rect();
-        QRect brect = b->rect();
+        QRect arect = a->sceneRect();
+        QRect brect = b->sceneRect();
         double ny;
 
         if (fixed_geometry)
@@ -1849,13 +1850,13 @@ ArrowCanvas * ArrowCanvas::next_geometry()
 
 void ArrowCanvas::select_associated()
 {
-    if (! selected()) {
+    if (! isSelected()) {
         the_canvas()->select(this);
 
-        if ((label != 0) && !label->selected())
+        if ((label != 0) && !label->isSelected())
             the_canvas()->select(label);
 
-        if ((stereotype != 0) && !stereotype->selected())
+        if ((stereotype != 0) && !stereotype->isSelected())
             the_canvas()->select(stereotype);
 
         DiagramItem::select_associated();
@@ -1868,20 +1869,20 @@ void ArrowCanvas::prepare_for_move(bool)
 {
     // the arrow is selected, select its labels to not
     // move them twice
-    if ((label != 0) && !label->selected())
+    if ((label != 0) && !label->isSelected())
         the_canvas()->select(label);
 
-    if ((stereotype != 0) && !stereotype->selected())
+    if ((stereotype != 0) && !stereotype->isSelected())
         the_canvas()->select(stereotype);
 }
 
 void ArrowCanvas::modified()
 {
-    if (visible()) {
+    if (isVisible()) {
         hide();
         update_pos();
         show();
-        canvas()->update();
+        scene()->update();
         package_modified();
     }
 }
@@ -1895,7 +1896,7 @@ void ArrowCanvas::save(QTextStream & st, bool ref, QString & warning) const
 {
     if (ref)
         st << "line_ref " << get_ident();
-    else if (begin->type() != UmlArrowPoint) {
+    else if (begin->typeUmlCode() != UmlArrowPoint) {
         nl_indent(st);
         st << "line " << get_ident() << " " << stringify(itstype);
 
@@ -1932,8 +1933,8 @@ const ArrowCanvas * ArrowCanvas::save_lines(QTextStream & st, bool with_label,
     const ArrowCanvas * ar = this;
     QString zs;
 
-    while (ar->end->type() == UmlArrowPoint) {
-        st << " z " << zs.setNum(z());
+    while (ar->end->typeUmlCode() == UmlArrowPoint) {
+        st << " z " << zs.setNum(zValue());
 
         if (with_label && ar->label) {
             st << " ";
@@ -1953,7 +1954,7 @@ const ArrowCanvas * ArrowCanvas::save_lines(QTextStream & st, bool with_label,
         st << "line " << ar->get_ident();
     }
 
-    st << " z " << zs.setNum(z());
+    st << " z " << zs.setNum(zValue());
 
     if (with_label && ar->label) {
         st << " ";
@@ -2007,12 +2008,12 @@ ArrowCanvas * ArrowCanvas::read_list(char *& st, UmlCanvas * canvas,
         k = read_keyword(st);
 
         if ((label = LabelCanvas::read(st, canvas, k)) != 0) {
-            label->setZ(z);
+            label->setZValue(z);
             k = read_keyword(st);
         }
 
         if (!strcmp(k, "stereotype")) {
-            k = read_string(st);
+            QString strk = read_string(st);
 
             if (read_file_format() < 5)
                 read_keyword(st, "xy");
@@ -2022,9 +2023,9 @@ ArrowCanvas * ArrowCanvas::read_list(char *& st, UmlCanvas * canvas,
             int x = (int) read_double(st);
 
             stereotype =
-                new LabelCanvas(k, canvas, x, (int) read_double(st));
+                new LabelCanvas(strk, canvas, x, (int) read_double(st));
 
-            stereotype->setZ((read_file_format() < 5) ? OLD_ARROW_Z
+            stereotype->setZValue((read_file_format() < 5) ? OLD_ARROW_Z
                              : read_double(st));
             k = read_keyword(st);
         }
@@ -2057,7 +2058,7 @@ ArrowCanvas * ArrowCanvas::read_list(char *& st, UmlCanvas * canvas,
         if (stereotype != 0)
             (result->stereotype = stereotype)->show();
 
-        if (di->type() != UmlArrowPoint)
+        if (di->typeUmlCode() != UmlArrowPoint)
             return result;
 
         bi = di;
@@ -2150,7 +2151,7 @@ void ArrowCanvas::history_save(QBuffer & b) const
     ::save(arrow[1], b);
     ::save(arrow[2], b);
     ::save(poly, b);
-    ::save(z(), b);
+    ::save(zValue(), b);
 }
 
 void ArrowCanvas::history_load(QBuffer & b)
@@ -2183,10 +2184,9 @@ void ArrowCanvas::history_load(QBuffer & b)
     ::load(arrow[1], b);
     ::load(arrow[2], b);
     ::load(poly, b);
-    setPoints(boundings);
-    Q3CanvasPolygon::setZ(load_double(b));
-    Q3CanvasItem::setSelected(FALSE);
-    Q3CanvasItem::setVisible(TRUE);
+    QGraphicsPolygonItem::setZValue(load_double(b));
+    QGraphicsItem::setSelected(FALSE);
+    QGraphicsItem::setVisible(TRUE);
 
     begin->add_line(this);
     end->add_line(this);
@@ -2196,41 +2196,33 @@ void ArrowCanvas::history_load(QBuffer & b)
 
 void ArrowCanvas::history_hide()
 {
-    Q3CanvasPolygon::setVisible(FALSE);
+    QGraphicsPolygonItem::setVisible(FALSE);
     unconnect();
 }
 
 //
 
-Q3PtrList<ArrowCanvas> ArrowCanvas::RelsToDel;
+QList<ArrowCanvas *> ArrowCanvas::RelsToDel;
 
 void ArrowCanvas::post_load()
 {
-    while (! RelsToDel.isEmpty()) {
-        ArrowCanvas * ar = RelsToDel.take(0);
-
-        if (ar->visible())
+    foreach (ArrowCanvas *ar, RelsToDel)
+        if (ar->isVisible())
             ar->delete_it();
-    }
+    RelsToDel.clear();
 }
 
 // to remove redondant relation made by release 2.22
-Q3PtrList<ArrowCanvas> ArrowCanvas::RelsToCheck;
+QList<ArrowCanvas *> ArrowCanvas::RelsToCheck;
 
 void ArrowCanvas::remove_redondant_rels()
 {
-    Q3PtrListIterator<ArrowCanvas> liter(RelsToCheck);
     // the key is <source address>_<browser node address>_<target address>
     QMap<QString, ArrowCanvas *> arrows;
     char s[128];
 
-    for (;;) {
-        ArrowCanvas * r = liter.current();
-
-        if (r == 0)
-            break;
-
-        if (r->visible()) {
+    foreach (ArrowCanvas *r, RelsToCheck) {
+        if (r->isVisible()) {
             sprintf(s, "%lx_%lx_%lx",
                     (long) r->get_start(),
                     (long) r->get_bn(),
@@ -2241,10 +2233,7 @@ void ArrowCanvas::remove_redondant_rels()
             else
                 arrows.insert(s, r);
         }
-
-        ++liter;
     }
-
     RelsToCheck.clear();
 }
 
@@ -2256,19 +2245,19 @@ void ArrowCanvas::write_uc_rel(ToolCom * com) const
     DiagramItem * from = get_start();
     DiagramItem * to = get_end();
 
-    if (from->type() == UmlUseCase) {
+    if (from->typeUmlCode() == UmlUseCase) {
         com->write_unsigned((unsigned) from->get_ident());
         to->get_bn()->write_id(com);
         com->write_bool((itstype == UmlDirectionalAssociation)
                         ? FALSE
-                        : (to->rect().center().x() < from->rect().center().x()));
+                        : (to->sceneRect().center().x() < from->sceneRect().center().x()));
     }
     else {
         com->write_unsigned((unsigned) to->get_ident());
         from->get_bn()->write_id(com);
         com->write_bool((itstype == UmlDirectionalAssociation)
                         ? TRUE
-                        : (to->rect().center().x() > from->rect().center().x()));
+                        : (to->sceneRect().center().x() > from->sceneRect().center().x()));
     }
 
     ArrowCanvas * plabel;
@@ -2299,3 +2288,8 @@ void ArrowCanvas::check_stereotypeproperties()
 {
     // does nothing
 }
+
+int ArrowCanvas::type() const
+{
+    return RTTI_ARROW;
+}
diff --git a/src/diagram/ArrowCanvas.h b/src/diagram/ArrowCanvas.h
index de015c35d..8c788f989 100644
--- a/src/diagram/ArrowCanvas.h
+++ b/src/diagram/ArrowCanvas.h
@@ -28,11 +28,12 @@
 #ifndef ARROWCANVAS_H
 #define ARROWCANVAS_H
 
-#include "q3canvas.h"
+#include "QGraphicsScene"
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
-#include <Q3PopupMenu>
+#include <QPolygon>
+#include <QGraphicsPolygonItem>
+////#include <QMenu>
 
 #include "DiagramItem.h"
 
@@ -43,15 +44,15 @@ class ToolCom;
 //#define ARROW_Z 1000
 #define OLD_ARROW_Z 0
 
-#define isa_arrow(x) ((x)->rtti() == RTTI_ARROW)
+#define isa_arrow(x) ((x)->type() == RTTI_ARROW)
 
 class DiagramCanvas;
 class ArrowPointCanvas;
 class LabelCanvas;
 class UmlCanvas;
-class Q3PopupMenu;
+class QMenu;
 
-class ArrowCanvas : public QObject, public Q3CanvasPolygon, public DiagramItem
+class ArrowCanvas : public QObject, public QGraphicsPolygonItem , public DiagramItem
 {
     Q_OBJECT
 
@@ -77,32 +78,33 @@ class ArrowCanvas : public QObject, public Q3CanvasPolygon, public DiagramItem
     LabelCanvas * stereotype;
     QPoint beginp;
     QPoint endp;
-    Q3PointArray boundings;
+    QPolygon boundings;
     QPoint arrow[3];	// les 2 extremites et le point milieu pour inherit
-    Q3PointArray poly;   // aggregations
+    QPolygon poly;   // aggregations
     float decenter_begin;	// not taken into account if
     float decenter_end;		// fixed geometry. < 0 means don't care
 
     // to remove temporary arrows
-    static Q3PtrList<ArrowCanvas> RelsToDel;
+    static QList<ArrowCanvas *> RelsToDel;
 
     // to remove redondant relation made by release 2.22
-    static Q3PtrList<ArrowCanvas> RelsToCheck;
+    static QList<ArrowCanvas *> RelsToCheck;
+
 
 public:
     ArrowCanvas(UmlCanvas * canvas, DiagramItem * b, DiagramItem * e,
                 UmlCode t, int id, bool own_brk, float d_start, float d_end);
     virtual ~ArrowCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
     virtual void unconnect();
 
     virtual void setVisible(bool yes);
-    virtual void moveBy(double dx, double dy);
+    virtual void moveBy(double dx, double dy) override;
     void move_self_points(double dx, double dy);
-    virtual void select_associated();
-    virtual bool isSelected() const;
-    virtual void prepare_for_move(bool on_resize);
+    virtual void select_associated() override;
+    virtual bool isSelected() const override;
+    virtual void prepare_for_move(bool on_resize) override;
 
     virtual void update_pos();
     void move_outside(QRect r);
@@ -122,35 +124,37 @@ class ArrowCanvas : public QObject, public Q3CanvasPolygon, public DiagramItem
     void reverse();
     virtual BasicData * get_data() const;
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void remove(bool);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void remove(bool) override;
     virtual int rtti() const;
-    virtual QPoint center() const;
-    virtual QRect rect() const;
-    virtual bool contains(int, int) const;
+    virtual QPoint center() const override;
+    virtual QRect rect() const override;
+    virtual QRect sceneRect() const override;
+    using QGraphicsPolygonItem::contains;
+    virtual bool contains(int, int) const override;
     QPoint get_point(int i) {
         return arrow[i];
     }
-    virtual void change_scale();
-    virtual void open();
+    virtual void change_scale() override;
+    virtual void open() override;
     bool edit(const QStringList & defaults, ArrowCanvas * plabel,
               ArrowCanvas * pstereotype);
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual double get_z() const;
-    virtual void set_z(double z);	// only called by upper() & lower()
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual double get_z() const override;
+    virtual void set_z(double z) override;	// only called by upper() & lower()
     void go_up(double nz);	// only called by upper(TRUE)
-    virtual bool copyable() const;
-    virtual UmlCanvas * the_canvas() const;
+    virtual bool copyable() const override;
+    virtual UmlCanvas * the_canvas() const override;
     ArrowCanvas * next_geometry();
     void update_geometry();
 
     void package_modified() const;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     const ArrowCanvas * save_lines(QTextStream  & st, bool with_label, bool with_stereotype, QString & warning) const;
     static ArrowCanvas * read(char *& st, UmlCanvas * canvas, char * k);
     static ArrowCanvas * read_list(char *& st, UmlCanvas * canvas,
@@ -159,16 +163,21 @@ class ArrowCanvas : public QObject, public Q3CanvasPolygon, public DiagramItem
                                    ArrowCanvas * (*pf)(UmlCanvas * canvas, DiagramItem * b,
                                            DiagramItem * e, UmlCode t,
                                            float dbegin, float dend, int id));
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
     static void remove_redondant_rels();
     static void post_load();
 
     void write_uc_rel(ToolCom * com) const;
 
-    virtual void check_stereotypeproperties();
+    virtual void check_stereotypeproperties() override;
+    virtual int type() const override;
+    QGraphicsScene* canvas() const
+    {
+        return scene();
+    }
 
 protected:
     void search_supports(ArrowCanvas *& plabel,
@@ -177,10 +186,11 @@ class ArrowCanvas : public QObject, public Q3CanvasPolygon, public DiagramItem
     void propag_decenter(float db, float de);
     void set_decenter(float db, float de);
     ArrowCanvas * set_geometry(LineGeometry geo, bool fixed);
-    void init_geometry_menu(Q3PopupMenu & m, int first);
+    void init_geometry_menu(QMenu & m, int first);
 
     virtual void drawShape(QPainter & p);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 protected slots:
     void modified();
     void drawing_settings_modified();
diff --git a/src/diagram/ArrowJunctionCanvas.cpp b/src/diagram/ArrowJunctionCanvas.cpp
index 9e124e22b..e7b3c6735 100644
--- a/src/diagram/ArrowJunctionCanvas.cpp
+++ b/src/diagram/ArrowJunctionCanvas.cpp
@@ -30,7 +30,7 @@
 
 
 #include <math.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -99,9 +99,9 @@ void ArrowJunctionCanvas::deleted()
 void ArrowJunctionCanvas::change_scale()
 {
     // the size is not modified
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void ArrowJunctionCanvas::draw(QPainter & p)
@@ -109,11 +109,10 @@ void ArrowJunctionCanvas::draw(QPainter & p)
     if (!visible())
         return;
 
-    ArrowCanvas * a;
     FILE * fp = svg();
 
-    for (a = lines.first(); a != 0; a = lines.next()) {
-        switch (a->type()) {
+    foreach (ArrowCanvas *a, lines) {
+        switch (a->typeUmlCode()) {
         case UmlRequired: {
             QRect r = rect();
             int wh = r.width() - 2;
@@ -140,7 +139,7 @@ void ArrowJunctionCanvas::draw(QPainter & p)
         break;
 
         case UmlProvided:
-            p.drawPixmap(QPoint((int) x(), (int) y()), *providedPixmap);
+            p.drawPixmap(QPoint((int) 0, (int) 0), *providedPixmap);
 
             if (fp != 0)
                 fprintf(fp, "<ellipse fill=\"none\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" cx=\"%d\" cy=\"%d\" rx=\"%d\" ry=\"%d\" />\n",
@@ -161,7 +160,15 @@ void ArrowJunctionCanvas::draw(QPainter & p)
         show_mark(p, rect());
 }
 
-UmlCode ArrowJunctionCanvas::type() const
+void ArrowJunctionCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ArrowJunctionCanvas::typeUmlCode() const
 {
     return UmlArrowJunction;
 }
@@ -183,11 +190,11 @@ void ArrowJunctionCanvas::menu(const QPoint &)
 #if 0
 
     if (lines.at(0)->may_join()) {
-        Q3PopupMenu m;
+        QMenu m;
 
         MenuFactory::createTitle(m, TR("Line break");
-                                 m.insertSeparator();
-                                 m.insertItem(TR("Remove from diagram"), 0);
+                                 m.addSeparator();
+                                 m.insertItem(TR("Remove from diagram"), 0));
 
         switch (m.exec(QCursor::pos())) {
     case 0:
@@ -207,12 +214,12 @@ void ArrowJunctionCanvas::menu(const QPoint &)
 
 QString ArrowJunctionCanvas::may_start(UmlCode &) const
 {
-    return TR("illegal");
+    return tr("illegal");
 }
 
 QString ArrowJunctionCanvas::may_connect(UmlCode &, const DiagramItem *) const
 {
-    return TR("illegal");
+    return tr("illegal");
 }
 
 bool ArrowJunctionCanvas::alignable() const
diff --git a/src/diagram/ArrowJunctionCanvas.h b/src/diagram/ArrowJunctionCanvas.h
index 9ba1c4864..f2a38f392 100644
--- a/src/diagram/ArrowJunctionCanvas.h
+++ b/src/diagram/ArrowJunctionCanvas.h
@@ -41,33 +41,34 @@ class ArrowJunctionCanvas : public QObject, public DiagramCanvas
 
 protected:
     BrowserClass * interface;
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ArrowJunctionCanvas(UmlCanvas * canvas, int x, int y,
                         BrowserClass * i, int id = -1);
     virtual ~ArrowJunctionCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
     virtual void unconnect();
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void change_scale();
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void change_scale() override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
     //virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
     //virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual void remove_line(ArrowCanvas * l, bool onbrkjoin);
+    virtual bool alignable() const override;
+    virtual void remove_line(ArrowCanvas * l, bool onbrkjoin) override;
     BrowserClass * get_interface() const {
         return interface;
     }
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static ArrowJunctionCanvas * read(char *& st, UmlCanvas * canvas, char * k);
 
 private slots:
diff --git a/src/diagram/ArrowPointCanvas.cpp b/src/diagram/ArrowPointCanvas.cpp
index ab87ac66e..11f9f56e0 100644
--- a/src/diagram/ArrowPointCanvas.cpp
+++ b/src/diagram/ArrowPointCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -37,11 +37,12 @@
 
 #include "ArrowPointCanvas.h"
 #include "ArrowCanvas.h"
+
 #include "RelationCanvas.h"
 #include "SimpleRelationCanvas.h"
-#include "TransitionCanvas.h"
-#include "FlowCanvas.h"
 #include "CodLinkCanvas.h"
+#include "FlowCanvas.h"
+#include "TransitionCanvas.h"
 #include "ObjectLinkCanvas.h"
 #include "AssocContainCanvas.h"
 #include "UmlCanvas.h"
@@ -55,6 +56,7 @@ ArrowPointCanvas::ArrowPointCanvas(UmlCanvas * canvas, int x, int y)
     : DiagramCanvas(0, canvas, x, y, ARROW_POINT_SIZE, ARROW_POINT_SIZE, -1)
 {
     browser_node = canvas->browser_diagram();
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
 }
 
 ArrowPointCanvas::~ArrowPointCanvas()
@@ -72,7 +74,7 @@ void ArrowPointCanvas::delete_it()
 void ArrowPointCanvas::delete_available(BooL &,
                                         BooL & out_model) const
 {
-    out_model |= lines.getFirst()->may_join();
+    out_model |= lines.first()->may_join();
 }
 
 // not produced in SVG file
@@ -80,9 +82,9 @@ void ArrowPointCanvas::delete_available(BooL &,
 void ArrowPointCanvas::change_scale()
 {
     // the size is not modified
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void ArrowPointCanvas::draw(QPainter & p)
@@ -102,7 +104,15 @@ void ArrowPointCanvas::draw(QPainter & p)
         show_mark(p, rect());
 }
 
-UmlCode ArrowPointCanvas::type() const
+void ArrowPointCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ArrowPointCanvas::typeUmlCode() const
 {
     return UmlArrowPoint;
 }
@@ -140,7 +150,6 @@ void ArrowPointCanvas::connexion(UmlCode action, DiagramItem * dest,
             the_canvas()->select(a);
             return;
         }
-
         break;
 
     case UmlDeploymentDiagram:
@@ -167,11 +176,9 @@ void ArrowPointCanvas::connexion(UmlCode action, DiagramItem * dest,
             the_canvas()->select(a);
             return;
         }
-
     default:	// to avoid warning
         break;
     }
-
     if (IsaSimpleRelation(action))
         a = new SimpleRelationCanvas(the_canvas(), this, dest, 0, action, 0, -1.0, -1.0);
     else
@@ -197,34 +204,36 @@ void ArrowPointCanvas::open()
 
 void ArrowPointCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m;
-
-    MenuFactory::createTitle(m, TR("Line break"));
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 0);
-    m.setItemEnabled(0, lines.at(0)->may_join());
-
-    switch (m.exec(QCursor::pos())) {
-    case 0:
-        // removes the point replacing the lines around it by a single line
-        lines.at(0)->join(lines.at(1), this);
-        break;
-
-    default:
-        return;
-    }
+    QMenu m;
+
+    MenuFactory::createTitle(m, QObject::tr("Line break"));
+    m.addSeparator();
+    MenuFactory::addItem(m,QObject::tr("Remove from diagram"), 0);
+    m.setEnabled(lines.at(0)->may_join());
+    // m.actions().at(0)->setItemEnabled(0, lines.at(0)->may_join());
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+        switch (retAction->data().toInt()) {
+        case 0:
+            // removes the point replacing the lines around it by a single line
+            lines.at(0)->join(lines.at(1), this);
+            break;
+
+        default:
+            return;
+        }
 
     package_modified();
 }
 
 QString ArrowPointCanvas::may_start(UmlCode &) const
 {
-    return TR("illegal");
+    return QObject::tr("illegal");
 }
 
 QString ArrowPointCanvas::may_connect(UmlCode &, const DiagramItem *) const
 {
-    return TR("illegal");
+    return QObject::tr("illegal");
 }
 
 bool ArrowPointCanvas::alignable() const
@@ -241,7 +250,7 @@ void ArrowPointCanvas::prepare_for_move(bool)
 
 ArrowCanvas * ArrowPointCanvas::get_other(const ArrowCanvas * l) const
 {
-    return (lines.getFirst() == l) ? lines.getLast() : lines.getFirst();
+    return (lines.first() == l) ? lines.last() : lines.first();
 }
 
 void ArrowPointCanvas::save(QTextStream & st, bool, QString &) const
@@ -250,7 +259,7 @@ void ArrowPointCanvas::save(QTextStream & st, bool, QString &) const
 }
 
 ArrowPointCanvas * ArrowPointCanvas::read(char *& st, UmlCanvas * canvas,
-        char * k)
+                                          char * k)
 {
     if (strcmp(k, "point"))
         return 0;
@@ -258,7 +267,7 @@ ArrowPointCanvas * ArrowPointCanvas::read(char *& st, UmlCanvas * canvas,
     int x = (int) read_double(st);
 
     ArrowPointCanvas * result =
-        new ArrowPointCanvas(canvas, x, (int) read_double(st));
+            new ArrowPointCanvas(canvas, x, (int) read_double(st));
 
     result->show();
 
diff --git a/src/diagram/ArrowPointCanvas.h b/src/diagram/ArrowPointCanvas.h
index e2b352e81..49064ff8f 100644
--- a/src/diagram/ArrowPointCanvas.h
+++ b/src/diagram/ArrowPointCanvas.h
@@ -40,24 +40,26 @@ class ArrowPointCanvas : public DiagramCanvas
     ArrowPointCanvas(UmlCanvas * canvas, int x, int y);
     virtual ~ArrowPointCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     ArrowCanvas * get_other(const ArrowCanvas *) const;
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void change_scale();
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual void prepare_for_move(bool on_resize);
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void change_scale() override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual void prepare_for_move(bool on_resize) override;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static ArrowPointCanvas * read(char *& st, UmlCanvas * canvas, char * k);
+protected:
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 };
 
 #endif
diff --git a/src/diagram/ArtifactCanvas.cpp b/src/diagram/ArtifactCanvas.cpp
index 6f0736f77..3b5db93f6 100644
--- a/src/diagram/ArtifactCanvas.cpp
+++ b/src/diagram/ArtifactCanvas.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
+#include <QPolygon>
 #include <QPixmap>
 
 #include "ArtifactCanvas.h"
@@ -115,8 +115,8 @@ void ArtifactCanvas::remove(bool from_model)
 void ArtifactCanvas::compute_size()
 {
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlArtifact)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlArtifact)
+            : itscolor;
 
     const BasicData * data = browser_node->get_data();
     QFontMetrics fm(the_canvas()->get_font(UmlNormalBoldFont));
@@ -124,8 +124,8 @@ void ArtifactCanvas::compute_size()
     int wi;
 
     const QPixmap * px =
-        ProfiledStereotypes::diagramPixmap(data->get_stereotype(),
-                                           the_canvas()->zoom());
+            ProfiledStereotypes::diagramPixmap(data->get_stereotype(),
+                                               the_canvas()->zoom());
 
     if (px != 0) {
         wi = fm.width(browser_node->get_name());
@@ -142,9 +142,9 @@ void ArtifactCanvas::compute_size()
         // name on font_height+4 points
         const int four = (int)(4 * the_canvas()->zoom());
         int stw = fm.width((data->get_stereotype()[0])
-                           ? (QString("<<") + toUnicode(data->get_short_stereotype()) + ">>")
-                           : QString("<<artifact>>"))
-                  + 3 * fm.height();
+                ? (QString("<<") + toUnicode(data->get_short_stereotype()) + ">>")
+                : QString("<<artifact>>"))
+                + 3 * fm.height();
 
 
         he = 3 * fm.height() + four;
@@ -174,10 +174,10 @@ void ArtifactCanvas::compute_size()
 
 void ArtifactCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     compute_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void ArtifactCanvas::modified()
@@ -230,8 +230,8 @@ void ArtifactCanvas::post_connexion(UmlCode action, DiagramItem * dest)
         canvas->freeze_draw_all_relations();
 
         ((ArtifactData *) browser_node->get_data())
-        ->associate((BrowserArtifact *)
-                    ((ArtifactCanvas *) dest)->browser_node);
+                ->associate((BrowserArtifact *)
+                            ((ArtifactCanvas *) dest)->browser_node);
 
         canvas->unfreeze_draw_all_relations();
     }
@@ -240,8 +240,8 @@ void ArtifactCanvas::post_connexion(UmlCode action, DiagramItem * dest)
 void ArtifactCanvas::unassociate(DiagramItem * other)
 {
     ((ArtifactData *) browser_node->get_data())
-    ->unassociate((BrowserArtifact *)
-                  ((ArtifactCanvas *) other)->browser_node);
+            ->unassociate((BrowserArtifact *)
+                          ((ArtifactCanvas *) other)->browser_node);
 }
 
 void ArtifactCanvas::draw_all_relations()
@@ -252,27 +252,23 @@ void ArtifactCanvas::draw_all_relations()
     else if (!DrawingSettings::just_modified() &&
              !on_load_diagram()) {
         // remove all association starting from 'this'
-        Q3PtrListIterator<ArrowCanvas> it(lines);
-
-        while (it.current()) {
-            if ((it.current()->type() == UmlContain) &&
-                (((AssocContainCanvas *) it.current())->get_start() == this))
-                it.current()->delete_it();
-            else
-                ++it;
+        foreach (ArrowCanvas *canvas, lines) {
+            if ((canvas->typeUmlCode() == UmlContain) &&
+                    (((AssocContainCanvas *) canvas)->get_start() == this))
+                canvas->delete_it();
         }
 
         // update non source artifact vis a vis 'this'
-        Q3CanvasItemList all = canvas()->allItems();
-        Q3CanvasItemList::Iterator cit;
+        QList<QGraphicsItem*> all = canvas()->items();
+        QList<QGraphicsItem*>::Iterator cit;
 
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible()) {
+            if ((*cit)->isVisible()) {
                 DiagramItem * adi = QCanvasItemToDiagramItem(*cit);
 
                 if ((adi != 0) &&		// an uml canvas item
-                    (adi->type() == UmlArtifact) &&
-                    strcmp(((ArtifactCanvas *) adi)->browser_node->get_stereotype(), "source"))
+                        (adi->typeUmlCode() == UmlArtifact) &&
+                        strcmp(((ArtifactCanvas *) adi)->browser_node->get_stereotype(), "source"))
                     ((ArtifactCanvas *) adi)->update_relations(this);
             }
         }
@@ -282,110 +278,105 @@ void ArtifactCanvas::draw_all_relations()
 void ArtifactCanvas::update_relations(ArtifactCanvas * other)
 {
     // 'this' is a non source, check association with 'other'
-    const Q3PtrDict<BrowserArtifact> * associated =
-        ((ArtifactData *) browser_node->get_data())->get_associated();
+    const QHash<void*, BrowserArtifact*> * associated =
+            ((ArtifactData *) browser_node->get_data())->get_associated();
     bool association_must_exist =
-        ((associated != 0) &&
-         (associated->find((BrowserArtifact *) other->browser_node) != 0));
-    Q3PtrListIterator<ArrowCanvas> it(lines);
+            ((associated != 0) &&
+             (associated->value((BrowserArtifact *) other->browser_node) != 0));
 
-    while (it.current()) {
-        if ((it.current()->type() == UmlContain) &&
-            (((AssocContainCanvas *) it.current())->get_end() == other)) {
+    foreach (ArrowCanvas *canvas, lines) {
+        if ((canvas->typeUmlCode() == UmlContain) &&
+                (((AssocContainCanvas *) canvas)->get_end() == other)) {
             if (! association_must_exist)
-                it.current()->delete_it();
+                canvas->delete_it();
 
             return;
         }
-
-        ++it;
     }
 
     // association not yet exist
 
     if (association_must_exist)
         (new AssocContainCanvas(the_canvas(), this, other, 0, -1.0, -1.0))
-        ->show();
+            ->show();
 }
 
 void ArtifactCanvas::update_relations()
 {
     // 'this' is a non source, check its associations
-    const Q3PtrDict<BrowserArtifact> * associated =
-        ((ArtifactData *) browser_node->get_data())->get_associated();
-    Q3PtrDict<BrowserArtifact> associations;
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if ((it.current()->type() == UmlContain) &&
-            (((AssocContainCanvas *) it.current())->get_start() == this)) {
-            DiagramItem * adi = ((AssocContainCanvas *) it.current())->get_end();
-
-            if ((adi->type() == UmlArtifact) &&
-                (associated != 0) &&
-                (associated->find((BrowserArtifact *)
-                                  ((ArtifactCanvas *) adi)->browser_node) != 0)) {
+    const QHash<void*, BrowserArtifact*> * associated =
+            ((ArtifactData *) browser_node->get_data())->get_associated();
+    QHash<void*, BrowserArtifact*> associations;
+    foreach (ArrowCanvas *canvas, lines) {
+        if ((canvas->typeUmlCode() == UmlContain) &&
+                (((AssocContainCanvas *)canvas)->get_start() == this)) {
+            DiagramItem * adi = ((AssocContainCanvas *) canvas)->get_end();
+
+            if ((adi->typeUmlCode() == UmlArtifact) &&
+                    (associated != 0) &&
+                    (associated->value((BrowserArtifact *)
+                                      ((ArtifactCanvas *) adi)->browser_node) != 0)) {
                 // association must exist
                 BrowserArtifact * c = (BrowserArtifact *)
-                                      ((ArtifactCanvas *) adi)->browser_node;
+                        ((ArtifactCanvas *) adi)->browser_node;
 
                 associations.insert(c, c);
-                ++it;
             }
             else
                 // association must not exist
-                it.current()->delete_it();
+                canvas->delete_it();
         }
-        else
-            ++it;
     }
 
     if (associated != 0) {
-        Q3PtrDictIterator<BrowserArtifact> it(*associated);
+        QHashIterator<void*, BrowserArtifact*> it(*associated);
 
-        while (it.current()) {
-            if (associations.find(it.current()) == 0) {
+        while (it.hasNext()) {
+            it.next();
+            if(it.value())
+            {
+            if (associations.value(it.value()) == 0) {
                 // the association to 'it.current()' is not yet drawn
 
                 // search 'it.current()' cancas
-                Q3CanvasItemList all = canvas()->allItems();
-                Q3CanvasItemList::Iterator cit;
+                QList<QGraphicsItem*> all = canvas()->items();
+                QList<QGraphicsItem*>::Iterator cit;
 
                 for (cit = all.begin(); cit != all.end(); ++cit) {
-                    if ((*cit)->visible()) {
+                    if ((*cit)->isVisible()) {
                         DiagramItem * adi = QCanvasItemToDiagramItem(*cit);
 
                         if ((adi != 0) &&		// an uml canvas item
-                            (adi->type() == UmlArtifact) &&
-                            (((ArtifactCanvas *) adi)->browser_node == it.current())) {
+                                (adi->typeUmlCode() == UmlArtifact) &&
+                                (((ArtifactCanvas *) adi)->browser_node == it.value())) {
                             // find
                             (new AssocContainCanvas(the_canvas(), this, adi, 0, -1.0, -1.0))
-                            ->show();
+                                    ->show();
                             break;
                         }
                     }
                 }
             }
-
-            ++it;
+            }
         }
     }
 }
 
 void ArtifactCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     const BasicData * data = browser_node->get_data();
     FILE * fp = svg();
+    QBrush backBrush = p.background();
 
     if (fp != 0)
         fputs("<g>\n", fp);
 
     const QPixmap * px =
-        ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(), the_canvas()->zoom());
+            ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(), the_canvas()->zoom());
 
     if (px != 0) {
         p.setBackgroundMode(::Qt::TransparentMode);
@@ -397,10 +388,10 @@ void ArtifactCanvas::draw(QPainter & p)
         if (fp != 0)
             // pixmap not really exported in SVG
             fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     svg_color(UmlBlack), lft, r.y(), px->width() - 1, px->height() - 1);
 
-        r.moveBy(0, px->height());
+        r.translate(0, px->height());
         p.setFont(the_canvas()->get_font(UmlNormalBoldFont));
         p.drawText(r, ::Qt::AlignHCenter, browser_node->get_name());
 
@@ -410,13 +401,14 @@ void ArtifactCanvas::draw(QPainter & p)
         }
     }
     else {
-        QColor bckgrnd = p.backgroundColor();
+        QColor bckgrnd = p.background().color();
 
         p.setBackgroundMode((used_color == UmlTransparent) ? ::Qt::TransparentMode : ::Qt::OpaqueMode);
 
         QColor co = color(used_color);
 
-        p.setBackgroundColor(co);
+        backBrush.setColor(co);
+        p.setBackground(backBrush);
 
         // <<artifact>>/stereotype on 2*font_height with the icon on the right
         // the icon height = 2*font_height
@@ -442,12 +434,12 @@ void ArtifactCanvas::draw(QPainter & p)
 
                 if (fp != 0) {
                     fprintf(fp, "\t<rect fill=\"#%06x\" stroke=\"none\" stroke-opacity=\"1\""
-                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                             QColor(::Qt::darkGray).rgb() & 0xffffff,
                             r.right(), r.top() + shadow, shadow - 1, r.height() - 1 - 1);
 
                     fprintf(fp, "\t<rect fill=\"#%06x\" stroke=\"none\" stroke-opacity=\"1\""
-                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                             QColor(::Qt::darkGray).rgb() & 0xffffff,
                             r.left() + shadow, r.bottom(), r.width() - 1 - 1, shadow - 1);
                 }
@@ -461,13 +453,13 @@ void ArtifactCanvas::draw(QPainter & p)
 
             if (fp != 0)
                 fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                         svg_color(used_color),
                         r.x(), r.y(), r.width() - 1, r.height() - 1);
         }
         else if (fp != 0)
             fprintf(fp, "\t<rect fill=\"none\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     r.x(), r.y(), r.width() - 1, r.height() - 1);
 
         p.drawRect(r);
@@ -492,7 +484,7 @@ void ArtifactCanvas::draw(QPainter & p)
                           p.font(), fp);
         }
 
-        r.moveBy(0, r.height());
+        r.translate(0, r.height());
         r.setHeight(he + four);
         p.setFont(the_canvas()->get_font(UmlNormalBoldFont));
         p.drawText(r, ::Qt::AlignCenter, browser_node->get_name());
@@ -509,7 +501,7 @@ void ArtifactCanvas::draw(QPainter & p)
         re.setTop(re.top() + four);
         re.setHeight(2 * (he - four));
 
-        Q3PointArray a(7);
+        QPolygon a(7);
         const int corner_size = re.width() / 3;
 
         a.setPoint(0, re.left(), re.top());
@@ -527,19 +519,28 @@ void ArtifactCanvas::draw(QPainter & p)
         if (fp != 0) {
             draw_poly(fp, a, UmlTransparent);
             fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
-                    "</g>\n",
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
+                        "</g>\n",
                     re.right() - corner_size, re.top(), re.right(), re.top() + corner_size);
         }
 
-        p.setBackgroundColor(bckgrnd);
+        backBrush.setColor(bckgrnd);
+        p.setBackground(backBrush);
     }
 
     if (selected())
         show_mark(p, rect());
 }
 
-UmlCode ArtifactCanvas::type() const
+void ArtifactCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ArtifactCanvas::typeUmlCode() const
 {
     return UmlArtifact;
 }
@@ -567,47 +568,47 @@ void ArtifactCanvas::open()
 
 void ArtifactCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu gensubm(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu gensubm(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 15);
-    m.insertItem(TR("Go down"), 16);
-    m.insertSeparator();
-    m.insertItem(TR("Add related elements"), 17);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit artifact"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 15);
+    MenuFactory::addItem(m, tr("Go down"), 16);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Add related elements"), 17);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit artifact"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
-            (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+                (BrowserNode *) the_canvas()->browser_diagram())
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 12);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 12);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     bool cpp = GenerationSettings::cpp_get_default_defs();
     bool java = GenerationSettings::java_get_default_defs();
@@ -616,121 +617,125 @@ void ArtifactCanvas::menu(const QPoint &)
     bool idl = GenerationSettings::idl_get_default_defs();
 
     if (cpp || java || php || python || idl)
-        m.insertItem(TR("Generate"), &gensubm);
+        MenuFactory::insertItem(m, tr("Generate"), &gensubm);
 
     if (Tool::menu_insert(&toolm, UmlArtifact, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
     if (cpp)
-        gensubm.insertItem("C++", 9);
+        MenuFactory::addItem(gensubm, "C++", 9);
 
     if (java)
-        gensubm.insertItem("Java", 10);
+        MenuFactory::addItem(gensubm, "Java", 10);
 
     if (php)
-        gensubm.insertItem("Php", 13);
+        MenuFactory::addItem(gensubm, "Php", 13);
 
     if (python)
-        gensubm.insertItem("Python", 14);
+        MenuFactory::addItem(gensubm, "Python", 14);
 
     if (idl)
-        gensubm.insertItem("Idl", 11);
-
-    switch (index = m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
+        MenuFactory::addItem(gensubm, "Idl", 11);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (index = retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
 
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
 
-    case 15:
-        z_up();
-        modified();	// call package_modified()
-        return;
+        case 15:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 16:
-        z_down();
-        modified();	// call package_modified()
-        return;
+        case 16:
+            z_down();
+            modified();	// call package_modified()
+            return;
 
-    case 2:
-        edit_drawing_settings();
-        return;
+        case 2:
+            edit_drawing_settings();
+            return;
 
-    case 3:
-        browser_node->open(TRUE);
-        return;
+        case 3:
+            browser_node->open(TRUE);
+            return;
 
-    case 4:
-        browser_node->select_in_browser();
-        return;
+        case 4:
+            browser_node->select_in_browser();
+            return;
 
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    case 6:
-        ((BrowserArtifact *) browser_node)
-        ->set_associated_diagram((BrowserDeploymentDiagram *)
-                                 the_canvas()->browser_diagram());
-        return;
+        case 6:
+            ((BrowserArtifact *) browser_node)
+                    ->set_associated_diagram((BrowserDeploymentDiagram *)
+                                             the_canvas()->browser_diagram());
+            return;
 
-    case 12:
-        ((BrowserArtifact *) browser_node)
-        ->set_associated_diagram(0);
-        return;
+        case 12:
+            ((BrowserArtifact *) browser_node)
+                    ->set_associated_diagram(0);
+            return;
 
-    case 7:
-        //remove from diagram
-        delete_it();
-        break;
+        case 7:
+            //remove from diagram
+            delete_it();
+            break;
 
-    case 8:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 8:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    case 9:
-        browser_node->apply_shortcut("Generate C++");
-        return;
+        case 9:
+            browser_node->apply_shortcut("Generate C++");
+            return;
 
-    case 10:
-        browser_node->apply_shortcut("Generate Java");
-        return;
+        case 10:
+            browser_node->apply_shortcut("Generate Java");
+            return;
 
-    case 11:
-        browser_node->apply_shortcut("Generate Idl");
-        return;
+        case 11:
+            browser_node->apply_shortcut("Generate Idl");
+            return;
 
-    case 13:
-        browser_node->apply_shortcut("Generate Php");
-        return;
+        case 13:
+            browser_node->apply_shortcut("Generate Php");
+            return;
 
-    case 14:
-        browser_node->apply_shortcut("Generate Python");
-        return;
+        case 14:
+            browser_node->apply_shortcut("Generate Python");
+            return;
 
-    case 17:
-        ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("artifact"), TRUE, FALSE);
-        return;
+        case 17:
+            ((UmlCanvas *) canvas())->get_view()
+                    ->add_related_elements(this, tr("artifact"), TRUE, FALSE);
+            return;
 
-    default:
-        if (index >= 20)
-            ToolCom::run(Tool::command(index - 20), browser_node);
+        default:
+            if (index >= 20)
+                ToolCom::run(Tool::command(index - 20), browser_node);
 
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void ArtifactCanvas::apply_shortcut(QString s)
+void ArtifactCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -750,7 +755,7 @@ void ArtifactCanvas::apply_shortcut(QString s)
     }
     else if (s == "Add related elements") {
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("artifact"), TRUE, FALSE);
+                ->add_related_elements(this, tr("artifact"), TRUE, FALSE);
         return;
     }
     else {
@@ -768,7 +773,7 @@ void ArtifactCanvas::edit_drawing_settings()
         StateSpecVector st;
         ColorSpecVector co(1);
 
-        co[0].set(TR("artifact color"), &itscolor);
+        co[0].set(tr("artifact color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -787,24 +792,23 @@ bool ArtifactCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ArtifactCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ArtifactCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("artifact color"), &itscolor);
+        co[0].set(tr("artifact color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((ArtifactCanvas *) it.current())->itscolor = itscolor;
-                ((ArtifactCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ArtifactCanvas *canvas = (ArtifactCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -813,18 +817,11 @@ void ArtifactCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ArtifactCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ArtifactCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ArtifactCanvas * x = (ArtifactCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ArtifactCanvas * o = (ArtifactCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const ArtifactCanvas * x = (const ArtifactCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString ArtifactCanvas::may_start(UmlCode & l) const
@@ -832,25 +829,25 @@ QString ArtifactCanvas::may_start(UmlCode & l) const
     switch (l) {
     case UmlContain:
         if (!browser_node->is_writable())
-            return TR("read only");
+            return tr("read only");
         else if (strcmp(browser_node->get_stereotype(), "source") == 0)
-            return TR("illegal for a source artifact");
+            return tr("illegal for a source artifact");
         else
             return 0;
 
     case UmlDependency:
         l = UmlDependOn;
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlGeneralisation:
         l = UmlInherit;
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlAnchor:
         return 0;
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -859,27 +856,27 @@ QString ArtifactCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlArtifact:
         switch (l) {
         case UmlContain:
         case UmlDependOn:
-            return (dest == this) ? TR("illegal") : QString();
+            return (dest == this) ? tr("illegal") : QString();
 
         case UmlInherit:
             return browser_node->check_inherit(dest->get_bn());;
 
         default:
-            return TR("illegal");
+            return tr("illegal");
         }
 
     case UmlPackage:
     case UmlComponent:
     case UmlDeploymentNode:
-        return (l == UmlDependOn) ? QString() : TR("illegal");
+        return (l == UmlDependOn) ? QString() : tr("illegal");
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -916,7 +913,7 @@ ArtifactCanvas * ArtifactCanvas::read(char *& st, UmlCanvas * canvas,
                                       char * k)
 {
     if (!strcmp(k, "artifactcanvas_ref") ||
-        ((read_file_format() < 20) && !strcmp(k, "componentcanvas_ref")))
+            ((read_file_format() < 20) && !strcmp(k, "componentcanvas_ref")))
         return ((ArtifactCanvas *) dict_get(read_id(st), "artifactcanvas", canvas));
     else if (!strcmp(k, "artifactcanvas") ||
              ((read_file_format() < 20) && !strcmp(k, "componentcanvas"))) {
diff --git a/src/diagram/ArtifactCanvas.h b/src/diagram/ArtifactCanvas.h
index b8237ced2..ee5b654e8 100644
--- a/src/diagram/ArtifactCanvas.h
+++ b/src/diagram/ArtifactCanvas.h
@@ -55,45 +55,46 @@ class ArtifactCanvas : public QObject, public DiagramCanvas
     void update_relations();
     void update_relations(ArtifactCanvas * other);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ArtifactCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~ArtifactCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void compute_size();
     void draw_all_relations();
-    virtual void unassociate(DiagramItem * other);
+    virtual void unassociate(DiagramItem * other) override;
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void post_connexion(UmlCode, DiagramItem *);
-    virtual bool move_with_its_package() const;
-
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
-
-    virtual void apply_shortcut(QString s);
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void post_connexion(UmlCode, DiagramItem *) override;
+    virtual bool move_with_its_package() const override;
+
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
+
+    virtual void apply_shortcut(const QString & s) override;
     void edit_drawing_settings();
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ArtifactCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/AssocContainCanvas.cpp b/src/diagram/AssocContainCanvas.cpp
index 210e9aa2c..8c151b098 100644
--- a/src/diagram/AssocContainCanvas.cpp
+++ b/src/diagram/AssocContainCanvas.cpp
@@ -30,7 +30,7 @@
 
 
 #include <qcursor.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -74,8 +74,8 @@ void AssocContainCanvas::open()
 
 void AssocContainCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu geo(0);
+    QMenu m(0);
+    QMenu geo(0);
     ArrowCanvas * aplabel;
     ArrowCanvas * apstereotype;
 
@@ -84,95 +84,99 @@ void AssocContainCanvas::menu(const QPoint &)
     AssocContainCanvas * plabel = (AssocContainCanvas *) aplabel;
     AssocContainCanvas * pstereotype = (AssocContainCanvas *) apstereotype;
 
-    MenuFactory::createTitle(m, TR("Association"));
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 1);
+    MenuFactory::createTitle(m, tr("Association"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 1);
 
     if (pstereotype || plabel) {
-        m.insertSeparator();
-        m.insertItem(TR("Select stereotype and label"), 2);
-        m.insertItem(TR("Default stereotype and label position"), 3);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select stereotype and label"), 2);
+        MenuFactory::addItem(m, tr("Default stereotype and label position"), 3);
 
         if (plabel && (label == 0))
-            m.insertItem(TR("Attach label to this segment"), 4);
+            MenuFactory::addItem(m, tr("Attach label to this segment"), 4);
 
         if (pstereotype && (stereotype == 0))
-            m.insertItem(TR("Attach stereotype to this segment"), 5);
+            MenuFactory::addItem(m, tr("Attach stereotype to this segment"), 5);
     }
 
     if (get_start() != get_end()) {
-        m.insertSeparator();
+        m.addSeparator();
         init_geometry_menu(geo, 10);
-        m.insertItem(TR("Geometry (Ctrl+l)"), &geo);
+        MenuFactory::insertItem(m, tr("Geometry (Ctrl+l)"), &geo);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 6);
-    m.insertItem(TR("Delete from model"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 6);
+    MenuFactory::addItem(m, tr("Delete from model"), 7);
 
-    int rank = m.exec(QCursor::pos());
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int rank = retAction->data().toInt();
 
-    switch (rank) {
-    case 1:
-        open();
-        return;
-
-    case 2:
-        the_canvas()->unselect_all();
-
-        if (plabel)
-            the_canvas()->select(plabel->label);
-
-        if (pstereotype)
-            the_canvas()->select(pstereotype->stereotype);
-
-        return;
-
-    case 3:
-        if (plabel)
-            plabel->default_label_position();
-
-        if (pstereotype)
-            pstereotype->default_stereotype_position();
+        switch (rank) {
+        case 1:
+            open();
+            return;
 
-        break;
+        case 2:
+            the_canvas()->unselect_all();
 
-    case 4:
-        label = plabel->label;
-        plabel->label = 0;
-        default_label_position();
-        break;
+            if (plabel)
+                the_canvas()->select(plabel->label);
 
-    case 5:
-        stereotype = pstereotype->stereotype;
-        pstereotype->stereotype = 0;
-        default_stereotype_position();
-        break;
+            if (pstereotype)
+                the_canvas()->select(pstereotype->stereotype);
 
-    case 6:
-        // not removed from the model : just hide it
-        remove(FALSE);
-        break;
+            return;
 
-    case 7:
-        get_start()->unassociate(get_end());	// line will be deleted
-        break;
-
-    default:
-        if (rank >= 10) {
-            rank -= 10;
-
-            if (rank == RecenterBegin)
-                set_decenter(-1.0, decenter_end);
-            else if (rank == RecenterEnd)
-                set_decenter(decenter_begin, -1.0);
-            else if (rank != (int) geometry)
-                set_geometry((LineGeometry) rank, TRUE);
+        case 3:
+            if (plabel)
+                plabel->default_label_position();
+
+            if (pstereotype)
+                pstereotype->default_stereotype_position();
+
+            break;
+
+        case 4:
+            label = plabel->label;
+            plabel->label = 0;
+            default_label_position();
+            break;
+
+        case 5:
+            stereotype = pstereotype->stereotype;
+            pstereotype->stereotype = 0;
+            default_stereotype_position();
+            break;
+
+        case 6:
+            // not removed from the model : just hide it
+            remove(FALSE);
+            break;
+
+        case 7:
+            get_start()->unassociate(get_end());	// line will be deleted
+            break;
+
+        default:
+            if (rank >= 10) {
+                rank -= 10;
+
+                if (rank == RecenterBegin)
+                    set_decenter(-1.0, decenter_end);
+                else if (rank == RecenterEnd)
+                    set_decenter(decenter_begin, -1.0);
+                else if (rank != (int) geometry)
+                    set_geometry((LineGeometry) rank, TRUE);
+                else
+                    return;
+            }
             else
                 return;
         }
-        else
-            return;
     }
 
     package_modified();
@@ -184,7 +188,7 @@ void AssocContainCanvas::remove(bool from_model)
         if (the_canvas()->must_draw_all_relations()) {
             const AssocContainCanvas * a = this;
 
-            while (a->begin->type() == UmlArrowPoint) {
+            while (a->begin->typeUmlCode() == UmlArrowPoint) {
                 a = (AssocContainCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
                 if (a == 0)
@@ -194,7 +198,7 @@ void AssocContainCanvas::remove(bool from_model)
             if (a && !a->begin->isSelected() && !a->begin->get_bn()->deletedp()) {
                 a = this;
 
-                while (a->end->type() == UmlArrowPoint) {
+                while (a->end->typeUmlCode() == UmlArrowPoint) {
                     a = (AssocContainCanvas *)((ArrowPointCanvas *) a->end)->get_other(a);
 
                     if (a == 0)
@@ -202,7 +206,7 @@ void AssocContainCanvas::remove(bool from_model)
                 }
 
                 if (a && !a->end->isSelected() && !a->end->get_bn()->deletedp()) {
-                    msg_warning("Douml", TR("<i>Draw all relations</i> forced to <i>no</i>"));
+                    msg_warning("Douml", tr("<i>Draw all relations</i> forced to <i>no</i>"));
                     the_canvas()->dont_draw_all_relations();
                 }
             }
@@ -223,13 +227,13 @@ void AssocContainCanvas::delete_available(BooL & in_model, BooL & out_model) con
 ArrowPointCanvas * AssocContainCanvas::brk(const QPoint & p)
 {
     ArrowPointCanvas * ap =
-        new ArrowPointCanvas(the_canvas(), p.x(), p.y());
+            new ArrowPointCanvas(the_canvas(), p.x(), p.y());
 
-    ap->setZ(z() + 1);
+    ap->setZValue(zValue() + 1);
 
     AssocContainCanvas * other =
-        new AssocContainCanvas(the_canvas(), ap, end, 0,
-                               decenter_begin, decenter_end);
+            new AssocContainCanvas(the_canvas(), ap, end, 0,
+                                   decenter_begin, decenter_end);
 
     ap->add_line(this);
     end->remove_line(this, TRUE);
@@ -250,7 +254,7 @@ void AssocContainCanvas::save(QTextStream & st, bool ref, QString & warning) con
 {
     if (ref)
         st << "containcanvas_ref " << get_ident();
-    else if (begin->type() != UmlArrowPoint) {
+    else if (begin->typeUmlCode() != UmlArrowPoint) {
         nl_indent(st);
         st << "containcanvas " << get_ident();
 
@@ -330,11 +334,11 @@ AssocContainCanvas * AssocContainCanvas::read(char *& st, UmlCanvas * canvas, ch
         unread_keyword(k, st);
 
         AssocContainCanvas * r = (AssocContainCanvas *)
-                                 read_list(st, canvas, UmlContain, geo, fixed, dbegin, dend, id, &make);
+                read_list(st, canvas, UmlContain, geo, fixed, dbegin, dend, id, &make);
 
         // remove association between components available in the
         // 2.0 deployment diagrams
-        if (r->begin->type() == UmlComponent)
+        if (r->begin->typeUmlCode() == UmlComponent)
             Undefined.append(r);
         else if (read_file_format() == 30)
             // to remove redondant transitions made by release 2.22
diff --git a/src/diagram/AssocContainCanvas.h b/src/diagram/AssocContainCanvas.h
index 7bd7a677a..1910bf131 100644
--- a/src/diagram/AssocContainCanvas.h
+++ b/src/diagram/AssocContainCanvas.h
@@ -34,19 +34,20 @@
 
 class AssocContainCanvas : public ArrowCanvas
 {
+    Q_OBJECT
 public:
     AssocContainCanvas(UmlCanvas * canvas, DiagramItem * b,
                        DiagramItem * e, int id, float d_start, float d_end);
     virtual ~AssocContainCanvas();
 
-    virtual ArrowPointCanvas * brk(const QPoint &);
+    virtual ArrowPointCanvas * brk(const QPoint &) override;
 
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual void remove(bool from_model);
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual void remove(bool from_model) override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
 
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static AssocContainCanvas * read(char *& st, UmlCanvas * canvas, char * k);
 };
 
diff --git a/src/diagram/BrowserView.cpp b/src/diagram/BrowserView.cpp
index a507c2be7..3aaf0c975 100644
--- a/src/diagram/BrowserView.cpp
+++ b/src/diagram/BrowserView.cpp
@@ -30,86 +30,92 @@
 
 
 #include <qapplication.h>
-#include <q3popupmenu.h>
-#include <q3dragobject.h>
-#include <q3header.h>
+//#include <q3popupmenu.h>
+//#include <q3dragobject.h>
+//#include <q3header.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QDragMoveEvent>
 #include <QDropEvent>
 #include <QMouseEvent>
 #include <QKeyEvent>
-
 #include "BrowserView.h"
 #include "UmlWindow.h"
 #include "BrowserPackage.h"
-#include "UmlDrag.h"
 #include "BrowserSearchDialog.h"
+#include "UmlDrag.h"
 #include "Shortcut.h"
 #include "myio.h"
 #include "mu.h"
 #include "translate.h"
 #include "ToolCom.h"
 #include "Tool.h"
-
+#include <QHeaderView>
+#include <QDrag>
+#include <QKeyEvent>
 BrowserPackage * BrowserView::project;
 BrowserPackage * BrowserView::imported_project;
 QDir BrowserView::dir;
 QDir BrowserView::import_dir;
 BrowserView * BrowserView::the;
 
-BrowserView::BrowserView(QWidget * parent) : Q3ListView(parent)
+BrowserView::BrowserView(QWidget * parent) : QTreeWidget(parent)
 {
+    setContextMenuPolicy(Qt::CustomContextMenu);
     the = this;
     BrowserNode::setup_generatable_types();
     project = 0;			// no project yet
     mousePressed = FALSE;
+    setSortingEnabled(false);		// manual sorting
+    setSelectionMode(QAbstractItemView::SingleSelection);
+
+    //addColumn(TR("browser          "));
+    setColumnCount(1);
+    headerItem()->setText(0, QObject::tr("browser          "));
 
-    setSorting(-1);		// manual sorting
-    setSelectionMode(Q3ListView::Single);
-    addColumn(TR("browser          "));
-    setTreeStepSize(18);
     //setSelectionMode(Extended);	// multi selection
-    header()->setClickEnabled(TRUE);
+    headerItem()->setFlags(headerItem()->flags()|Qt::ItemIsSelectable| Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
     setAcceptDrops(TRUE);
     viewport()->setAcceptDrops(TRUE);
-    setDragAutoScroll(TRUE);
-
-    connect(this, SIGNAL(rightButtonPressed(Q3ListViewItem *, const QPoint &, int)),
-            this, SLOT(rightPressed(Q3ListViewItem *)));
-
-    connect(this, SIGNAL(doubleClicked(Q3ListViewItem *)),
-            this, SLOT(doubleClick(Q3ListViewItem *)));
-
-    connect(header(), SIGNAL(clicked(int)), this, SLOT(menu()));
-
-    connect(this, SIGNAL(selectionChanged(Q3ListViewItem *)),
-            this, SLOT(selected(Q3ListViewItem *)));
+    this->header()->setSectionsClickable(true);
+    connect(this, SIGNAL(customContextMenuRequested(const QPoint&)),
+            this, SLOT(rightPressed(const QPoint&)));
+
+    connect(this, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
+            this, SLOT(doubleClick(QTreeWidgetItem*, int )));
+    connect(this->header(), SIGNAL(sectionClicked(int)), this, SLOT(menu()));
+    connect(this, SIGNAL(itemSelectionChanged()),
+            this, SLOT(onItemSelected()));
+    setDragDropMode(DragDrop);
 }
 
 void BrowserView::remove_temporary_files()
 {
     if (project) {
-        QString filter;
-
-        filter.sprintf("*_%d.*", user_id());
+        QStringList filter;
+        //filter.sprintf("*_%d.*", user_id());
+        filter.append(QString("*_%1.*").arg(user_id()));
 
         const QFileInfoList l = dir.entryInfoList(filter);
-
         if (!l.empty()) {
             QListIterator<QFileInfo> it(l);
             QFileInfo fi;
 
             while (it.hasNext()) {
                 fi = it.next();
-
-                if (fi.extension(FALSE).lower() != "prj")
-                    QFile::remove(fi.absFilePath());
+                if (!fi.fileName().endsWith( "prj", Qt::CaseInsensitive))
+                    QFile::remove(fi.absoluteFilePath());
             }
+
         }
     }
 }
 
+void BrowserView::send_marked(QList<BrowserNode *> list)
+{
+    emit marked_list(list);
+}
+
 BrowserView::~BrowserView()
 {
     remove_temporary_files();
@@ -120,16 +126,17 @@ void BrowserView::clear()
 {
     remove_temporary_files();
     set_user_id(-1);
-
-    Q3ListView::clear();
+    QTreeWidget::clear();
     project = 0;
 }
 
 void BrowserView::set_project(const QDir & di)
 {
     dir = di;
-    project = new BrowserPackage(dir.dirName(), the, PROJECT_ID);
-    setRootIsDecorated(TRUE/*FALSE*/);
+    project = new BrowserPackage(dir.dirName(), (BrowserView *) 0, PROJECT_ID);
+    the->addTopLevelItem(project);
+    the->setCurrentItem(project);
+    setRootIsDecorated(true);
 }
 
 void BrowserView::set_imported_project(const QDir & di,
@@ -142,9 +149,8 @@ void BrowserView::set_imported_project(const QDir & di,
 bool BrowserView::save_as(const QDir & new_dir)
 {
     // copy USER temporary files
-    QString filter;
-
-    filter.sprintf("*_%d.?", user_id());
+    QStringList filter;
+    filter.append(QString("*_%1.?").arg(user_id()));
 
     QFileInfoList l = dir.entryInfoList(filter); //[lgfreitas] Since Mr. Pagès uses l again, removing const from l
 
@@ -161,7 +167,9 @@ bool BrowserView::save_as(const QDir & new_dir)
     }
 
     // copy non package non temporary files
-    l = dir.entryInfoList("*.??*");
+    filter.clear();
+    filter<<"*.??*";
+    l = dir.entryInfoList(filter);
 
     if (!l.empty()) {
         QListIterator<QFileInfo> it(l);
@@ -170,9 +178,9 @@ bool BrowserView::save_as(const QDir & new_dir)
         while (it.hasNext()) {
             fi = it.next();
 
-            if ((fi.extension(FALSE) != "prj") &&
-                (fi.extension(FALSE) != "lock") &&
-                !copy_file(&fi, new_dir))
+            if ((!fi.fileName().endsWith( "prj", Qt::CaseInsensitive)) &&
+                    (!fi.fileName().endsWith("lock",Qt::CaseInsensitive)) &&
+                    !copy_file(&fi, new_dir))
                 return FALSE;
         }
     }
@@ -189,40 +197,53 @@ bool BrowserView::save_as(const QDir & new_dir)
     return TRUE;
 }
 
-void BrowserView::select(Q3ListViewItem * i)
+void BrowserView::select(QTreeWidgetItem * i)
 {
-    the->ensureItemVisible(i);
-    the->setSelected(i, TRUE);
+    //the->ensureVisible(i);
+    the->scrollToItem(i);
+    the->setCurrentItem(i/*, TRUE*/);
 }
 
-void BrowserView::deselect(Q3ListViewItem * i)
+void BrowserView::deselect(QTreeWidgetItem * i)
 {
-    the->setSelected(i, false);
+    the->setCurrentItem(i/*, false*/);
 }
 
-void BrowserView::force_visible(Q3ListViewItem * i)
+void BrowserView::force_visible(QTreeWidgetItem * i)
 {
-    the->ensureItemVisible(i);
+    the->scrollToItem(i);
 }
 
 BrowserNode * BrowserView::selected_item()
 {
-    return (BrowserNode *) the->selectedItem();
+    return (BrowserNode *) the->currentItem();
 }
-
-void BrowserView::rightPressed(Q3ListViewItem * item)
+void BrowserView::rightPressed(const QPoint &point)
 {
+    QTreeWidgetItem *item = this->itemAt(point);
     if (item &&
-        ((!((BrowserNode *) item)->deletedp()) ||
-         (!((BrowserNode *) item->parent())->deletedp())) &&
-        !BrowserNode::popupMenuActive()) {	// Qt bug
+            ((!((BrowserNode *) item)->deletedp()) ||
+             (!((BrowserNode *) item->parent())->deletedp())) &&
+            !BrowserNode::popupMenuActive()) {	// Qt bug
+        BrowserNode::setPopupMenuActive(TRUE);
+        ((BrowserNode *) item)->menu();
+        BrowserNode::setPopupMenuActive(FALSE);
+    }
+}
+void BrowserView::rightPressed(BrowserNode* node)
+{
+    BrowserNode *item = node;
+    if (item &&
+            ((!((BrowserNode *) item)->deletedp()) ||
+             (!((BrowserNode *) item->parent())->deletedp())) &&
+            !BrowserNode::popupMenuActive()) {	// Qt bug
         BrowserNode::setPopupMenuActive(TRUE);
         ((BrowserNode *) item)->menu();
         BrowserNode::setPopupMenuActive(FALSE);
     }
 }
 
-void BrowserView::doubleClick(Q3ListViewItem * item)
+void BrowserView::doubleClick(QTreeWidgetItem * item, int)
 {
     UmlWindow::abort_line_construction();
 
@@ -230,32 +251,64 @@ void BrowserView::doubleClick(Q3ListViewItem * item)
         ((BrowserNode *) item)->open(FALSE);
 }
 
-void BrowserView::contentsDragMoveEvent(QDragMoveEvent * e)
+void BrowserView::dragMoveEvent(QDragMoveEvent * e)
 {
     if (!BrowserNode::edition_active()) {
-        Q3ListViewItem * item = itemAt(contentsToViewport(e->pos()));
-
+        BrowserNode * item = (BrowserNode *)itemAt(e->pos());
         if (item && !((BrowserNode *) item)->deletedp())
             ((BrowserNode *) item)->DragMoveEvent(e);
     }
 }
 
-void BrowserView::contentsDropEvent(QDropEvent * e)
+void BrowserView::dropEvent(QDropEvent * e)
 {
     if (!BrowserNode::edition_active()) {
-        Q3ListViewItem * item = itemAt(contentsToViewport(e->pos()));
+        BrowserNode * item = (BrowserNode *)itemAt(e->pos());
 
         if (item && !((BrowserNode *) item)->deletedp())
             ((BrowserNode *) item)->DropEvent(e);
     }
+    //QTreeWidget::dropEvent(e);
+}
+
+void BrowserView::dragEnterEvent(QDragEnterEvent *event)
+{
+    event->setDropAction(Qt::MoveAction);
+    event->accept();
+    //QTreeWidget::dragEnterEvent(event);
 }
 
-void BrowserView::contentsMousePressEvent(QMouseEvent * e)
+void BrowserView::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    QTreeWidget::dragLeaveEvent(event);
+}
+
+void BrowserView::startDrag(Qt::DropActions supportedActions)
+{
+    Q_UNUSED(supportedActions);
+    
+    /*BrowserNode * item = (BrowserNode *)itemAt(e->pos());
+
+    if (item) {
+        UmlDrag * di = new UmlDrag((BrowserNode *) item, this);
+        QDrag *drag = new QDrag(this);
+        drag->setMimeData(di);
+        drag->setPixmap(*(item->pixmap(0)), QPoint(8, 8));
+        //drag->dragMove();
+        if (drag->exec(Qt::MoveAction) == Qt::MoveAction)
+        {
+
+        }
+    }*/
+    //QTreeWidget::startDrag(supportedActions);
+}
+
+void BrowserView::mousePressEvent(QMouseEvent * e)
 {
     UmlWindow::abort_line_construction();
 
-    QPoint p(contentsToViewport(e->pos()));
-    Q3ListViewItem * i = itemAt(p);
+    //QPoint p(contentsToViewport(e->pos()));
+    BrowserNode * i = (BrowserNode *)itemAt(e->pos());
 
     if (i != 0) {
         // to force update of comment else nothing done
@@ -265,12 +318,14 @@ void BrowserView::contentsMousePressEvent(QMouseEvent * e)
         selected(i);
 
         if (e->button() == ::Qt::LeftButton) {
-            if (!((BrowserNode *) i)->deletedp() && (i != project)) {
-                if (e->state() & ::Qt::ControlModifier)
+            if (!((BrowserNode *) i)->deletedp() && (i != project))
+            {
+                if (e->modifiers() & ::Qt::ControlModifier)
+                {
                     ((BrowserNode *) i)->toggle_mark();
-                else if (e->pos().x() > header()->cellPos(header()->mapToActual(0)) +
-                         treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) + itemMargin()/* ||
-											      p.x() < header()->cellPos(header()->mapToActual(0))*/) {
+                }
+                else if (i->parent()/* ||
+                                                           p.x() < header()->cellPos(header()->mapToActual(0))*/) {
                     // if the user clicked into the root decoration of the item, don't try to start a drag!
                     presspos = e->pos();
                     mousePressed = TRUE;
@@ -278,28 +333,31 @@ void BrowserView::contentsMousePressEvent(QMouseEvent * e)
             }
         }
     }
-
-    Q3ListView::contentsMousePressEvent(e);
+    QTreeView::mousePressEvent(e);
 }
 
-void BrowserView::contentsMouseMoveEvent(QMouseEvent * e)
+void BrowserView::mouseMoveEvent(QMouseEvent * e)
 {
     if (mousePressed &&
-        ((presspos - e->pos()).manhattanLength() > QApplication::startDragDistance())) {
+            ((presspos - e->pos()).manhattanLength() > QApplication::startDragDistance())) {
         mousePressed = FALSE;
-
-        Q3ListViewItem * item = itemAt(contentsToViewport(presspos));
+        BrowserNode * item = (BrowserNode *)itemAt(e->pos());
 
         if (item) {
             UmlDrag * di = new UmlDrag((BrowserNode *) item, this);
-
-            di->setPixmap(*(item->pixmap(0)), QPoint(8, 8));
-            di->dragMove();
+            QDrag *drag = new QDrag(this);
+            drag->setMimeData(di);
+            drag->setHotSpot( QPoint(8, 8));
+            drag->setPixmap(*(item->pixmap(0)));//, QPoint(8, 8));
+            //di->dragMove();
+            drag->exec(Qt::CopyAction | Qt::MoveAction);
         }
+
     }
+    //QTreeView::mouseMoveEvent(e);
 }
 
-void BrowserView::contentsMouseReleaseEvent(QMouseEvent *)
+void BrowserView::mouseReleaseEvent(QMouseEvent *)
 {
     mousePressed = FALSE;
 }
@@ -320,7 +378,6 @@ void BrowserView::OnGenerateCpp()
                      : ((preserve) ? "cpp_generator -p" : "cpp_generator"),
                      node);
     }
-
 }
 
 void BrowserView::OnGenerateJava()
@@ -389,11 +446,22 @@ void BrowserView::OnGenerateIdl()
     }
 }
 
+void BrowserView::OnUnmarkItem(QString name, int type)
+{
+    foreach (BrowserNode *node, BrowserNode::marked_list)
+        if(node->get_name() == name && node->get_type() == type)
+            node->toggle_mark();
+}
+
+void BrowserView::OnUnmarkAll()
+{
+    BrowserNode::unmark_all();
+}
+
 void BrowserView::keyPressEvent(QKeyEvent * e)
 {
     UmlWindow::abort_line_construction();
-
-    QString s = Shortcut::shortcut(e->key(), e->state());
+    QString s = Shortcut::shortcut(e->key(), e->modifiers());
 
     if (!s.isEmpty()) {
         e->accept();
@@ -417,35 +485,56 @@ void BrowserView::keyPressEvent(QKeyEvent * e)
                 if (s == "Menu")
                     rightPressed(bn);
                 else if (s == "Delete") {
-                    QApplication::setOverrideCursor(::Qt::waitCursor);
+                    QApplication::setOverrideCursor(::Qt::WaitCursor);
                     bn->apply_shortcut("Delete");
                     QApplication::restoreOverrideCursor();
                 }
+                else if(s == "Expand All")
+                {
+                    bn->expandAll();
+                }
+                else if(s == "Collapse All")
+                {
+                    bn->collapseAll();
+                }
                 else if ((s != "Move left") && (s != "Move right") &&
                          (s != "Move up") && (s != "Move down"))
                     bn->apply_shortcut(s);
                 else
-                    Q3ListView::keyPressEvent(e);
+                    QTreeWidget::keyPressEvent(e);
             }
         }
     }
     else {
         // no shortcut
-        Q3ListView::keyPressEvent(e);
+        QTreeWidget::keyPressEvent(e);
     }
 }
 
 void BrowserView::menu()
 {
+
     if (project != 0) {
         if (BrowserSearchDialog::get() == 0)
             (new BrowserSearchDialog())->show();
         else
+        {
+            BrowserSearchDialog::get()->show();
             BrowserSearchDialog::get()->raise();
+        }
+    }
+}
+
+void BrowserView::onItemSelected()
+{
+    if(selectedItems().count())
+    {
+        QTreeWidgetItem * b = selectedItems().at(0);
+        UmlWindow::set_commented((BrowserNode *) b);
     }
 }
 
-void BrowserView::selected(Q3ListViewItem * b)
+void BrowserView::selected(BrowserNode * b)
 {
     UmlWindow::set_commented((BrowserNode *) b);
 }
diff --git a/src/diagram/BrowserView.h b/src/diagram/BrowserView.h
index bc27c6e01..c4c801b59 100644
--- a/src/diagram/BrowserView.h
+++ b/src/diagram/BrowserView.h
@@ -28,7 +28,7 @@
 #ifndef BROWSERVIEW_H
 #define BROWSERVIEW_H
 
-#include <q3listview.h>
+//#include <q3listview.h>
 #include <qdir.h>
 //Added by qt3to4:
 #include <QMouseEvent>
@@ -37,7 +37,8 @@
 #include <QDragLeaveEvent>
 #include <QDropEvent>
 #include <QDragEnterEvent>
-
+#include <QTreeView>
+#include <QTreeWidgetItem>
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
@@ -47,9 +48,10 @@ class QKeyEvent;
 class BrowserNode;
 class BrowserPackage;
 
+
 // in fact it is a singleton => static members (except slots !)
 /* [lgfreitas] This class provides the tree view in the left side */
-class BrowserView : public Q3ListView
+class BrowserView : public QTreeWidget
 {
     Q_OBJECT
 
@@ -85,28 +87,39 @@ class BrowserView : public Q3ListView
     static QDir get_import_dir() {
         return import_dir;
     }
-    static void select(Q3ListViewItem *);
-    static void deselect(Q3ListViewItem *);
+    static void select(QTreeWidgetItem *);
+    static void deselect(QTreeWidgetItem *);
     static BrowserNode * selected_item();
-    static void force_visible(Q3ListViewItem *);
+    static void force_visible(QTreeWidgetItem *);
     static void remove_temporary_files();
+    void send_marked(QList<BrowserNode*>);
 
 
 
 protected:
-    void keyPressEvent(QKeyEvent * e);
+    virtual void keyPressEvent(QKeyEvent * e) override;
 
 protected slots:
-    void selected(Q3ListViewItem *);
-    void rightPressed(Q3ListViewItem *);
-    void doubleClick(Q3ListViewItem *);
+    void onItemSelected();
+    void selected(BrowserNode *b);
+    void rightPressed(const QPoint &point);
+    void rightPressed(BrowserNode* node);
+    void doubleClick(QTreeWidgetItem *, int);
+
     void menu();
 
-    void contentsDragMoveEvent(QDragMoveEvent * e);
-    void contentsDropEvent(QDropEvent * e);
-    void contentsMouseMoveEvent(QMouseEvent * e);
-    void contentsMousePressEvent(QMouseEvent * e);
-    void contentsMouseReleaseEvent(QMouseEvent * e);
+    virtual void dragMoveEvent(QDragMoveEvent * e) override;
+    virtual void dropEvent(QDropEvent * e) override;
+    virtual void dragEnterEvent(QDragEnterEvent *event) override;
+    virtual void dragLeaveEvent(QDragLeaveEvent *event) override;
+    virtual void startDrag(Qt::DropActions supportedActions) override;
+
+
+
+
+    virtual void mouseMoveEvent(QMouseEvent * e) override;
+    virtual void mousePressEvent(QMouseEvent * e) override;
+    virtual void mouseReleaseEvent(QMouseEvent * e) override;
 
 public slots:
     void OnGenerateCpp();
@@ -114,6 +127,10 @@ public slots:
     void OnGeneratePhp();
     void OnGeneratePython();
     void OnGenerateIdl();
+    void OnUnmarkItem(QString name, int type);
+    void OnUnmarkAll();
+signals:
+    void marked_list(QList<BrowserNode*>);
 };
 
 #endif
diff --git a/src/diagram/CdClassCanvas.cpp b/src/diagram/CdClassCanvas.cpp
index b61a3a5f3..417108837 100644
--- a/src/diagram/CdClassCanvas.cpp
+++ b/src/diagram/CdClassCanvas.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QPixmap>
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
 
 #include "CdClassCanvas.h"
@@ -43,6 +43,8 @@
 #include "SimpleRelationCanvas.h"
 #include "ArrowPointCanvas.h"
 #include "ConstraintCanvas.h"
+#include "HideShowDialog.h"
+#include "OperationListDialog.h"
 #include "BrowserClass.h"
 #include "BrowserOperation.h"
 #include "UmlPixmap.h"
@@ -55,12 +57,10 @@
 #include "PackageData.h"
 #include "DiagramView.h"
 #include "SettingsDialog.h"
-#include "HideShowDialog.h"
 #include "myio.h"
 #include "ToolCom.h"
 #include "Tool.h"
 #include "ui/menufactory.h"
-#include "OperationListDialog.h"
 #include "BrowserClassDiagram.h"
 #include "strutil.h"
 #include "GenerationSettings.h"
@@ -131,10 +131,8 @@ void CdClassCanvas::delete_it()
 
     if (templ)
         templ->delete_it();
-
     if (constraint)
         constraint->delete_it();
-
     DiagramCanvas::delete_it();
 }
 
@@ -170,7 +168,7 @@ void CdClassCanvas::check_size()
     const ClassData * data = ((ClassData *) browser_node->get_data());
     int wi =
         (data->get_is_abstract()) ? fbim.width(full_name) : fbm.width(full_name);
-    Q3ListViewItem * child;
+    BrowserNode * child;
     int natt = 0;
     int noper = 0;
     bool full_members = (used_settings.show_full_members_definition == UmlYes);
@@ -229,8 +227,8 @@ void CdClassCanvas::check_size()
 
                     if (hide_attrs ||
                         ((indicate_visible_attr)
-                         ? (hidden_visible_attributes.findIndex((BrowserNode *) child) == -1)
-                         : (hidden_visible_attributes.findIndex((BrowserNode *) child) != -1)))
+                         ? (hidden_visible_attributes.indexOf((BrowserNode *) child) == -1)
+                         : (hidden_visible_attributes.indexOf((BrowserNode *) child) != -1)))
                         continue;
 
                     s = ((AttributeData *) child_data)
@@ -261,8 +259,8 @@ void CdClassCanvas::check_size()
                     if (hide_opers ||
                         (hide_getset_opers && ((OperationData *) child_data)->get_or_set()) ||
                         ((indicate_visible_oper)
-                         ? (hidden_visible_operations.findIndex((BrowserNode *) child) == -1)
-                         : (hidden_visible_operations.findIndex((BrowserNode *) child) != -1)))
+                         ? (hidden_visible_operations.indexOf((BrowserNode *) child) == -1)
+                         : (hidden_visible_operations.indexOf((BrowserNode *) child) != -1)))
                         continue;
 
                     s = ((OperationData *) child_data)
@@ -334,22 +332,15 @@ void CdClassCanvas::check_size()
                     bool have_stprop = FALSE;
 
                     for (int ik = 0; ik != nk; ik += 1) {
-                        const char * k =  kv->get_key(ik);
-                        const char * p;
-                        unsigned nseps = 0;
-
-                        for (p = k; *p; p += 1) {
-                            if (*p == ':') {
-                                nseps += 1;
-                                k = p + 1;
-                            }
-                        }
+                        QString v;
+                        QString k =  kv->get_key(ik);
+                        QStringList p = k.split(':');
 
-                        if (nseps == 2) {
-                            p = kv->get_value(ik);
+                        if(p.count() == 3){
+                            v = kv->get_value(ik);
 
-                            if (p && *p) {
-                                s = k + QString("=") + p;
+                            if (!v.isEmpty()) {
+                                s = p.at(2) + QString("=") + v;
 
                                 if ((int) s.length() >= max_member_width)
                                     s = s.left(max_member_width) + "...";
@@ -526,32 +517,22 @@ void CdClassCanvas::post_loaded()
 
 void CdClassCanvas::check_inner()
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if (it.current()->type() == UmlInner) {
-            DiagramItem * b = ((ArrowCanvas *) it.current())->get_start();
-            DiagramItem * e = ((ArrowCanvas *) it.current())->get_end();
+    foreach (ArrowCanvas *canvas, lines) {
+        if (canvas->typeUmlCode() == UmlInner) {
+            DiagramItem * b = canvas->get_start();
+            DiagramItem * e = canvas->get_end();
 
             if (((BrowserNode *) b->get_bn()->parent()) != e->get_bn())
-                it.current()->delete_it();
-            else
-                ++it;
+                canvas->delete_it();
         }
-        else
-            ++it;
     }
 }
 bool CdClassCanvas::has_relation(BasicData * def) const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if (IsaRelation(it.current()->type()) &&
-            (((RelationCanvas *) it.current())->get_data() == def))
+    foreach (ArrowCanvas *canvas, lines) {
+        if (IsaRelation(canvas->typeUmlCode()) &&
+            (((RelationCanvas *) canvas)->get_data() == def))
             return TRUE;
-
-        ++it;
     }
 
     return FALSE;
@@ -559,14 +540,10 @@ bool CdClassCanvas::has_relation(BasicData * def) const
 
 bool CdClassCanvas::has_inner(DiagramItem * end) const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if ((it.current()->type() == UmlInner) &&
-            (((ArrowCanvas *) it.current())->get_end() == end))
+    foreach (ArrowCanvas *canvas, lines) {
+        if ((canvas->typeUmlCode() == UmlInner) &&
+            (canvas->get_end() == end))
             return TRUE;
-
-        ++it;
     }
 
     return FALSE;
@@ -574,9 +551,9 @@ bool CdClassCanvas::has_inner(DiagramItem * end) const
 
 void CdClassCanvas::draw_all_relations(CdClassCanvas * end)
 {
-    Q3ListViewItem * child;
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    BrowserNode * child;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (child = browser_node->firstChild(); child; child = child->nextSibling()) {
         if (!((BrowserNode *) child)->deletedp()) {
@@ -603,9 +580,9 @@ void CdClassCanvas::draw_all_relations(CdClassCanvas * end)
                             DiagramItem * adi = QCanvasItemToDiagramItem(*cit);
 
                             if ((adi != 0) &&		// an uml canvas item
-                                (adi->type() == UmlClass) &&
+                                (adi->typeUmlCode() == UmlClass) &&
                                 (((CdClassCanvas *) adi)->browser_node == end_class) &&
-                                ((((CdClassCanvas *) adi) == end) || (*cit)->visible())) {
+                                ((((CdClassCanvas *) adi) == end) || (*cit)->isVisible())) {
                                 // other class canvas find
                                 di = adi;
                                 break;
@@ -624,9 +601,9 @@ void CdClassCanvas::draw_all_relations(CdClassCanvas * end)
                     DiagramItem * adi = QCanvasItemToDiagramItem(*cit);
 
                     if ((adi != 0) &&		// an uml canvas item
-                        (adi->type() == UmlClass) &&
+                        (adi->typeUmlCode() == UmlClass) &&
                         (((CdClassCanvas *) adi)->browser_node == child) &&
-                        ((((CdClassCanvas *) adi) == end) || (*cit)->visible())) {
+                        ((((CdClassCanvas *) adi) == end) || (*cit)->isVisible())) {
                         if (!((CdClassCanvas *) adi)->has_inner(this))
                             (new ArrowCanvas(the_canvas(), adi, this, UmlInner, 0, FALSE, -1.0, -1.0))
                             ->show();
@@ -645,10 +622,10 @@ void CdClassCanvas::draw_all_relations(CdClassCanvas * end)
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&	// an uml canvas item
-                (di->type() == UmlClass) &&
+                (di->typeUmlCode() == UmlClass) &&
                 (((CdClassCanvas *) di) != this) &&
                 !((CdClassCanvas *) di)->browser_node->deletedp() &&
-                ((CdClassCanvas *) di)->visible()) {
+                ((CdClassCanvas *) di)->isVisible()) {
                 ((CdClassCanvas *) di)->draw_all_relations(this);
             }
         }
@@ -660,13 +637,13 @@ void CdClassCanvas::draw_all_relations(CdClassCanvas * end)
 
 void CdClassCanvas::draw_all_class_assoc()
 {
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible() &&
+        if ((*cit)->isVisible() &&
             isa_arrow(*cit) &&
-            IsaRelation(((ArrowCanvas *) *cit)->type())) {
+            IsaRelation(((ArrowCanvas *) *cit)->typeUmlCode())) {
             RelationCanvas * r = (RelationCanvas *) *cit;
             BrowserNode * assoc =
                 ((RelationData *) r->get_data())->get_association().type;
@@ -697,7 +674,7 @@ void CdClassCanvas::check_constraint()
             constraint = c;
             constraint->upper();
 
-            constraint->move((int)(x() + width() + the_canvas()->zoom() * 20),
+            constraint->moveBy((int)(x() + width() + the_canvas()->zoom() * 20),
                              (int) y() + height());
             constraint->show();
             (new ArrowCanvas(the_canvas(), this, constraint, UmlAnchor, 0, FALSE, -1.0, -1.0))->show();
@@ -726,12 +703,11 @@ bool CdClassCanvas::get_show_stereotype_properties() const
 
 void CdClassCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
 
     if (manual_size) {
         double scale = the_canvas()->zoom();
-
-        setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+        setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     }
 
     check_size();
@@ -740,7 +716,7 @@ void CdClassCanvas::change_scale()
     if (templ != 0)
         templ->update();
 
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void CdClassCanvas::moveBy(double dx, double dy)
@@ -749,7 +725,6 @@ void CdClassCanvas::moveBy(double dx, double dy)
 
     if (templ != 0)
         templ->update();
-
     if ((constraint != 0) && !constraint->selected())
         constraint->moveBy(dx, dy);
 }
@@ -761,7 +736,7 @@ bool CdClassCanvas::move_with_its_package() const
 
 void CdClassCanvas::set_z(double z)
 {
-    setZ(z);
+    setZValue(z);
 
     if (templ)
         templ->update();
@@ -775,21 +750,14 @@ void write_member_st_prop(QPainter & p, FILE * fp, QRect & r,
     int nk = (int) kv->get_n_keys();
 
     for (int ik = 0; ik != nk; ik += 1) {
-        const char * k =  kv->get_key(ik);
-        const char * ps;
-        unsigned nseps = 0;
-
-        for (ps = k; *ps; ps += 1) {
-            if (*ps == ':') {
-                nseps += 1;
-                k = ps + 1;
-            }
-        }
+        QString v;
+        QString k =  kv->get_key(ik);
+        QStringList ps = k.split(':');
 
-        if (nseps == 2) {
-            ps = kv->get_value(ik);
+        if(ps.count() == 3){
+            v = kv->get_value(ik);
 
-            if (ps && *ps) {
+            if (!v.isEmpty()) {
                 if (!stwritten) {
                     stwritten = TRUE;
                     st = "<<" + st + ">>";
@@ -801,7 +769,7 @@ void write_member_st_prop(QPainter & p, FILE * fp, QRect & r,
                     r.setTop(r.top() + he);
                 }
 
-                QString s = k + QString("=") + ps;
+                QString s = ps.at(2) + QString("=") + v;
 
                 if ((int) s.length() >= max_member_width)
                     s = s.left(max_member_width) + "...";
@@ -819,17 +787,17 @@ void write_member_st_prop(QPainter & p, FILE * fp, QRect & r,
 
 void CdClassCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
     QFontMetrics fbm(the_canvas()->get_font(UmlNormalBoldFont));
     QFontMetrics fbim(the_canvas()->get_font(UmlNormalBoldItalicFont));
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     double zoom = the_canvas()->zoom();
     FILE * fp = svg();
-
+    QBrush backBrush = p.background();
     if (fp != 0)
         fputs("<g>\n", fp);
 
@@ -867,7 +835,8 @@ void CdClassCanvas::draw(QPainter & p)
             }
         }
 
-        p.setBackgroundColor(co);
+        backBrush.setColor(co);
+        p.setBackground(backBrush);
 
         if (used_color != UmlTransparent) {
             p.fillRect(r, co);
@@ -1008,7 +977,7 @@ void CdClassCanvas::draw(QPainter & p)
     int left1 = left0 + (int)(4 * zoom);
     int left2 = left1 + fbim.width("#_");
     int space = fm.width("_");
-    Q3ListViewItem * child;
+    BrowserNode * child;
     bool full_members = (used_settings.show_full_members_definition == UmlYes);
     bool show_visibility = (used_settings.show_members_visibility == UmlYes);
     bool show_stereotype = (used_settings.show_members_stereotype == UmlYes);
@@ -1032,8 +1001,8 @@ void CdClassCanvas::draw(QPainter & p)
             if (!((BrowserNode *) child)->deletedp() &&
                 (((BrowserNode *) child)->get_type() == UmlAttribute) &&
                 ((indicate_visible_attr)
-                 ? (hidden_visible_attributes.findIndex((BrowserNode *) child) != -1)
-                 : (hidden_visible_attributes.findIndex((BrowserNode *) child) == -1))) {
+                 ? (hidden_visible_attributes.indexOf((BrowserNode *) child) != -1)
+                 : (hidden_visible_attributes.indexOf((BrowserNode *) child) == -1))) {
                 AttributeData * data =
                     ((AttributeData *)((BrowserNode *) child)->get_data());
                 QString s = data->definition(full_members, show_multiplicity, show_initialization,
@@ -1124,8 +1093,8 @@ void CdClassCanvas::draw(QPainter & p)
             if (!((BrowserNode *) child)->deletedp() &&
                 (((BrowserNode *) child)->get_type() == UmlOperation) &&
                 ((indicate_visible_oper)
-                 ? (hidden_visible_operations.findIndex((BrowserNode *) child) != -1)
-                 : (hidden_visible_operations.findIndex((BrowserNode *) child) == -1))) {
+                 ? (hidden_visible_operations.indexOf((BrowserNode *) child) != -1)
+                 : (hidden_visible_operations.indexOf((BrowserNode *) child) == -1))) {
                 OperationData * data =
                     ((OperationData *)((BrowserNode *) child)->get_data());
 
@@ -1206,13 +1175,22 @@ void CdClassCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("</g>\n", fp);
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
 
     if (selected())
         show_mark(p, rect());
 }
 
-UmlCode CdClassCanvas::type() const
+void CdClassCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode CdClassCanvas::typeUmlCode() const
 {
     return UmlClass;
 }
@@ -1248,11 +1226,11 @@ static CdClassCanvas * container_class_without_inner(CdClassCanvas * cln)
     if (p->get_type() != UmlClass)
         return 0;
 
-    Q3CanvasItemList all = cln->canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = cln->canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             CdClassCanvas * cn = dynamic_cast<CdClassCanvas *>(*cit);
 
             if ((cn != 0) && (cn->get_bn() == p))
@@ -1265,14 +1243,14 @@ static CdClassCanvas * container_class_without_inner(CdClassCanvas * cln)
 
 void CdClassCanvas::menu(const QPoint &)
 {
-    Q3PtrList<BrowserOperation> l =
+    QList<BrowserOperation *> l =
         ((BrowserClass *) browser_node)->inherited_operations(21);
-    Q3PopupMenu m(0);
-    Q3PopupMenu gensubm(0);
-    Q3PopupMenu attrsubm(0);
-    Q3PopupMenu opersubm(0);
-    Q3PopupMenu inhopersubm(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu gensubm(0);
+    QMenu attrsubm(0);
+    QMenu opersubm(0);
+    QMenu inhopersubm(0);
+    QMenu toolm(0);
     const char * stereotype = browser_node->get_data()->get_stereotype();
     CdClassCanvas * nesting_cl = container_class_without_inner(this);
     BrowserNodeList attributes;
@@ -1285,123 +1263,121 @@ void CdClassCanvas::menu(const QPoint &)
     browser_node->children(operations, UmlOperation);
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 21);
-    m.insertItem(TR("Go down"), 22);
-    m.insertSeparator();
-    m.insertItem(TR("Add related elements"), 5);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 21);
+    MenuFactory::addItem(m, tr("Go down"), 22);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Add related elements"), 5);
 
     if (nesting_cl != 0)
-        m.insertItem(TR("Show nesting relation"), 23);
+        MenuFactory::addItem(m, tr("Show nesting relation"), 23);
 
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
 
     if (attributes.count() != 0)
-        m.insertItem(TR("Individual attribute visibility"), 3);
+        MenuFactory::addItem(m, tr("Individual attribute visibility"), 3);
 
     if (operations.count() != 0)
-        m.insertItem(TR("Individual operation visibility"), 4);
+        MenuFactory::addItem(m, tr("Individual operation visibility"), 4);
 
-    m.insertSeparator();
-    m.insertItem(TR("Edit class"), 6);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit class"), 6);
 
     if (!strcmp(stereotype, "enum")) {
         if (browser_node->is_writable()) {
-            m.insertItem(TR("Add item"), 7);
-            m.insertItem(TR("Add attribute"), 9);
+            MenuFactory::addItem(m, tr("Add item"), 7);
+            MenuFactory::addItem(m, tr("Add attribute"), 9);
         }
 
         if (attributes.count() != 0)
-            m.insertItem(TR("Edit item or attribute"), &attrsubm);
+            MenuFactory::insertItem(m, tr("Edit item or attribute"), &attrsubm);
 
         if (browser_node->is_writable())
-            m.insertItem(TR("Add operation"), 8);
+            MenuFactory::addItem(m, tr("Add operation"), 8);
     }
     else if (!strcmp(stereotype, "enum_pattern")) {
         if (browser_node->is_writable()) {
-            m.insertItem(TR("Add item"), 7);
+            MenuFactory::addItem(m, tr("Add item"), 7);
         }
 
         if (attributes.count() != 0)
-            m.insertItem(TR("Edit item"), &attrsubm);
+            MenuFactory::insertItem(m, tr("Edit item"), &attrsubm);
     }
     else if (strcmp(stereotype, "typedef")) {
         if (browser_node->is_writable())
-            m.insertItem(TR("Add attribute"), 9);
+            MenuFactory::addItem(m, tr("Add attribute"), 9);
 
         if (attributes.count() != 0)
-            m.insertItem(TR("Edit attribute"), &attrsubm);
+            MenuFactory::insertItem(m, tr("Edit attribute"), &attrsubm);
 
         if (browser_node->is_writable())
-            m.insertItem(TR("Add operation"), 8);
+            MenuFactory::addItem(m, tr("Add operation"), 8);
 
         if (browser_node->is_writable() &&
             strcmp(stereotype, "union") &&
             (l.count() != 0)) {
             if (l.count() > 20)
-                m.insertItem(TR("Add inherited operation"), 2999);
+                MenuFactory::addItem(m, tr("Add inherited operation"), 2999);
             else {
-                BrowserOperation * oper;
-
-                MenuFactory::createTitle(inhopersubm, TR("Choose operation"));
-                inhopersubm.insertSeparator();
+                MenuFactory::createTitle(inhopersubm, tr("Choose operation"));
+                inhopersubm.addSeparator();
 
-                for (oper = l.first(), index = 3000;
-                     oper;
-                     oper = l.next(), index += 1) {
+                index = 3000;
+                foreach (BrowserOperation *oper, l) {
                     QString menuItemText = ((BrowserNode *) oper->parent())->get_name() +
                             QString("::") + oper->get_data()->definition(TRUE, FALSE);
                     if (((OperationData *) oper->get_data())->get_is_abstract())
                     {
                         QFont font = inhopersubm.font();
                         font.setItalic(true);
-                        inhopersubm.insertItem(menuItemText, index);
+                        MenuFactory::addItem(inhopersubm, menuItemText, index);
                         //somewhat hackish but seems to work
                         inhopersubm.actions().last()->setFont(font);
                     }
                     else
-                        inhopersubm.insertItem(menuItemText,index);
+                        MenuFactory::addItem(inhopersubm, menuItemText,index);
+                    ++index;
                 }
 
-                m.insertItem(TR("Add inherited operation"), &inhopersubm);
+                MenuFactory::insertItem(m, tr("Add inherited operation"), &inhopersubm);
             }
         }
 
         if (operations.count() != 0) {
             if (operations.count() <= 20)
-                m.insertItem(TR("Edit operation"), &opersubm);
+                MenuFactory::insertItem(m, tr("Edit operation"), &opersubm);
             else
-                m.insertItem(TR("Edit operation"), 1999);
+                MenuFactory::addItem(m, tr("Edit operation"), 1999);
         }
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 10);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 17);
+        MenuFactory::addItem(m, tr("Select linked items"), 17);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
             (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 11);
+            MenuFactory::addItem(m, tr("Set associated diagram"), 11);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 18);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 18);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 12);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 12);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 13);
+        MenuFactory::addItem(m, tr("Delete from model"), 13);
 
-    m.insertSeparator();
+    m.addSeparator();
     bool cpp = GenerationSettings::cpp_get_default_defs();
     bool java = GenerationSettings::java_get_default_defs();
     bool php = GenerationSettings::php_get_default_defs();
@@ -1409,25 +1385,25 @@ void CdClassCanvas::menu(const QPoint &)
     bool idl = GenerationSettings::idl_get_default_defs();
 
     if (cpp || java || php || python || idl)
-        m.insertItem(TR("Generate"), &gensubm);
+        MenuFactory::insertItem(m, tr("Generate"), &gensubm);
 
     if (Tool::menu_insert(&toolm, UmlClass, 30))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
     if (cpp)
-        gensubm.insertItem("C++", 14);
+        MenuFactory::addItem(gensubm, "C++", 14);
 
     if (java)
-        gensubm.insertItem("Java", 15);
+        MenuFactory::addItem(gensubm, "Java", 15);
 
     if (php)
-        gensubm.insertItem("Php", 19);
+        MenuFactory::addItem(gensubm, "Php", 19);
 
     if (python)
-        gensubm.insertItem("Python", 20);
+        MenuFactory::addItem(gensubm, "Python", 20);
 
     if (idl)
-        gensubm.insertItem("Idl", 16);
+        MenuFactory::addItem(gensubm, "Idl", 16);
 
     QStringList::Iterator it;
 
@@ -1436,7 +1412,7 @@ void CdClassCanvas::menu(const QPoint &)
         index = 1000;
 
         for (it = attributes_def.begin(); it != attributes_def.end(); ++it)
-            attrsubm.insertItem(*it, index++);
+            MenuFactory::addItem(attrsubm, *it, index++);
     }
 
     if ((operations.count() != 0) && (operations.count() <= 20)) {
@@ -1444,10 +1420,14 @@ void CdClassCanvas::menu(const QPoint &)
         index = 2000;
 
         for (it = operations_def.begin(); it != operations_def.end(); ++it)
-            opersubm.insertItem(*it, index++);
+            MenuFactory::addItem(opersubm,*it, index++);
     }
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int index = retAction->data().toInt();
+    switch ( index) {
     case 0:
         upper();
         break;
@@ -1496,7 +1476,7 @@ void CdClassCanvas::menu(const QPoint &)
 
     case 5:
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("class"), TRUE, TRUE);
+        ->add_related_elements(this, tr("class"), TRUE, TRUE);
         return;
 
     case 6:
@@ -1570,8 +1550,8 @@ void CdClassCanvas::menu(const QPoint &)
         break;
 
     case 1999: {
-        OperationListDialog dialog(TR("Choose operation to edit"),
-                                   (Q3PtrList<BrowserOperation> &) operations);
+        OperationListDialog dialog(QObject::tr("Choose operation to edit"),
+                                   (QList<BrowserOperation *> &) operations);
 
         dialog.raise();
 
@@ -1584,7 +1564,7 @@ void CdClassCanvas::menu(const QPoint &)
     case 2999: {
         l = ((BrowserClass *) browser_node)->inherited_operations(~0u);
 
-        OperationListDialog dialog(TR("Choose inherited operation to add it"), l);
+        OperationListDialog dialog(QObject::tr("Choose inherited operation to add it"), l);
 
         dialog.raise();
 
@@ -1609,12 +1589,13 @@ void CdClassCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     modified();
     package_modified();
 }
 
-void CdClassCanvas::apply_shortcut(QString s)
+void CdClassCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -1634,7 +1615,7 @@ void CdClassCanvas::apply_shortcut(QString s)
     }
     else if (s == "Add related elements") {
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("class"), TRUE, TRUE);
+        ->add_related_elements(this, tr("class"), TRUE, TRUE);
         return;
     }
     else {
@@ -1654,7 +1635,7 @@ void CdClassCanvas::edit_drawing_settings()
 
         settings.complete(st, UmlClass);
 
-        co[0].set(TR("class color"), &itscolor);
+        co[0].set(tr("class color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -1675,7 +1656,7 @@ bool CdClassCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void CdClassCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void CdClassCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st;
@@ -1685,22 +1666,21 @@ void CdClassCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
 
         settings.complete(st, UmlClass);
 
-        co[0].set(TR("class color"), &itscolor);
+        co[0].set(tr("class color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                CdClassCanvas *canvas = (CdClassCanvas *)item;
                 if (!co[0].name.isEmpty())
-                    ((CdClassCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((CdClassCanvas *) it.current())->settings.set(st, 0);
-                ((CdClassCanvas *) it.current())->modified();
-                ((CdClassCanvas *) it.current())->package_modified();
+                canvas->settings.set(st, 0);
+                canvas->modified();
+                canvas->package_modified();
             }
         }
 
@@ -1709,20 +1689,13 @@ void CdClassCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void CdClassCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void CdClassCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    CdClassCanvas * x = (CdClassCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        CdClassCanvas * o = (CdClassCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->settings = x->settings;
-        o->modified();
-        o->package_modified();
-    }
+    const CdClassCanvas * x = (const CdClassCanvas *) src;
+    itscolor = x->itscolor;
+    settings = x->settings;
+    modified();
+    package_modified();
 }
 
 QString CdClassCanvas::may_start(UmlCode & l) const
@@ -1733,27 +1706,27 @@ QString CdClassCanvas::may_start(UmlCode & l) const
 QString CdClassCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
     if (l == UmlAnchor)
-        return (IsaRelation(dest->type()))
+        return (IsaRelation(dest->typeUmlCode()))
                ? ((RelationCanvas *) dest)->may_connect(l, this)
                : dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlClass:
         return ((BrowserClass *) browser_node)
                ->may_connect(l, (BrowserClass *) dest->get_bn());
 
     case UmlArrowPoint:
-        return TR("illegal");
+        return tr("illegal");
 
     case UmlPackage:
         if (l != UmlDependency)
-            return TR("illegal");
+            return tr("illegal");
 
         l = UmlDependOn;
         return 0;
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -1761,7 +1734,7 @@ void CdClassCanvas::post_connexion(UmlCode l, DiagramItem * dest)
 {
     switch (l) {
     case UmlAnchor:
-        if (IsaRelation(dest->type()))
+        if (IsaRelation(dest->typeUmlCode()))
             ((RelationCanvas *) dest)->post_connexion(l, this);
 
         break;
@@ -1837,18 +1810,16 @@ void CdClassCanvas::resize(const QSize & sz, bool w, bool h)
 
 static void save_hidden_list(BrowserNode * bn, UmlCode c, QTextStream & st,
                              const char * s,
-                             const Q3ValueList<BrowserNode *> & hidden_visible)
+                             const QList<BrowserNode *> & hidden_visible)
 {
     BrowserNodeList l;
 
     bn->children(l, c);
 
-    Q3PtrListIterator<BrowserNode> it(l);
-
-    while (it.current() != 0) {
+    foreach (BrowserNode *node, l) {
         QString dummy;
 
-        if (hidden_visible.findIndex(it.current()) != -1) {
+        if (hidden_visible.indexOf(node) != -1) {
             if (s != 0) {
                 nl_indent(st);
                 st << s;
@@ -1857,10 +1828,8 @@ static void save_hidden_list(BrowserNode * bn, UmlCode c, QTextStream & st,
 
             nl_indent(st);
             st << "  ";
-            it.current()->save(st, TRUE, dummy);
+            node->save(st, TRUE, dummy);
         }
-
-        ++it;
     }
 
     if ((s != 0) && (*s == 'v')) {
@@ -1901,10 +1870,8 @@ void CdClassCanvas::save(QTextStream & st, bool ref, QString & warning) const
             save_xyzwh(st, this, "xyzwh");
         else
             save_xyz(st, this, "xyz");
-
         if (constraint != 0)
             constraint->save(st, FALSE, warning);
-
         save_stereotype_property(st, warning);
 
         indent(-1);
@@ -1953,7 +1920,7 @@ CdClassCanvas * CdClassCanvas::read(char *& st, UmlCanvas * canvas,
                    strcmp(k, "xyz")) {
                 BrowserNode * b = BrowserAttribute::read(st, k, 0, FALSE);
 
-                if ((b != 0) && (l.findRef(b) != -1))
+                if ((b != 0) && (l.contains(b)))
                     result->hidden_visible_attributes.append(b);
             }
         }
@@ -1968,7 +1935,7 @@ CdClassCanvas * CdClassCanvas::read(char *& st, UmlCanvas * canvas,
             while (strcmp(k = read_keyword(st), "xyzwh") && strcmp(k, "xyz")) {
                 BrowserNode * b = BrowserOperation::read(st, k, 0, FALSE);
 
-                if ((b != 0) && (l.findRef(b) != -1))
+                if ((b != 0) && (l.contains(b)))
                     result->hidden_visible_operations.append(b);
             }
         }
@@ -2049,7 +2016,7 @@ void CdClassCanvas::history_load(QBuffer & b)
 
         ::load(w, b);
         ::load(h, b);
-        Q3CanvasRectangle::setSize(w, h);
+        QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
     }
     else
         check_size();
@@ -2061,7 +2028,7 @@ void CdClassCanvas::history_load(QBuffer & b)
 
 void CdClassCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
diff --git a/src/diagram/CdClassCanvas.h b/src/diagram/CdClassCanvas.h
index d5bfd4d7a..322bedfff 100644
--- a/src/diagram/CdClassCanvas.h
+++ b/src/diagram/CdClassCanvas.h
@@ -35,7 +35,7 @@
 #include <qobject.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "DiagramCanvas.h"
 #include "MultipleDependency.h"
@@ -63,21 +63,22 @@ class CdClassCanvas : public QObject, public DiagramCanvas,
     int width_min;
     int height_min;
     QString full_name;
-    Q3ValueList<BrowserNode *> hidden_visible_attributes;
-    Q3ValueList<BrowserNode *> hidden_visible_operations;
+    QList<BrowserNode *> hidden_visible_attributes;
+    QList<BrowserNode *> hidden_visible_operations;
     ConstraintCanvas * constraint;
 
 protected:
     CdClassCanvas(UmlCanvas * canvas, int id);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     CdClassCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~CdClassCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void check_size();
-    virtual bool has_relation(BasicData *) const;
+    virtual bool has_relation(BasicData *) const override;
     bool has_inner(DiagramItem * end) const;
     void draw_all_relations(CdClassCanvas * end = 0);
     void draw_all_class_assoc();
@@ -88,40 +89,41 @@ class CdClassCanvas : public QObject, public DiagramCanvas,
     }
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void post_connexion(UmlCode, DiagramItem *);
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual bool move_with_its_package() const;
-    virtual void moveBy(double dx, double dy);
-    virtual void set_z(double z);	// only called by upper() & lower()
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void post_connexion(UmlCode, DiagramItem *) override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual bool move_with_its_package() const override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void set_z(double z) override;	// only called by upper() & lower()
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static CdClassCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/ClassDiagramView.cpp b/src/diagram/ClassDiagramView.cpp
index e7fb2810c..cac133095 100644
--- a/src/diagram/ClassDiagramView.cpp
+++ b/src/diagram/ClassDiagramView.cpp
@@ -31,7 +31,7 @@
 
 #include <qapplication.h>
 #include <qfont.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -69,29 +69,24 @@ ClassDiagramView::ClassDiagramView(QWidget * parent, UmlCanvas * canvas, int id)
 
 // class view contains class not already drawn ?
 static bool not_yet_drawn(BrowserNode * container,
-                          Q3PtrDict<DiagramItem> & drawn)
+                          QHash<BasicData *,DiagramItem*> & drawn)
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = container->firstChild(); child != 0; child = child->nextSibling()) {
         if (!((BrowserNode *) child)->deletedp() &&
             (((BrowserNode *) child)->get_type() == UmlClass))
-            if ((drawn[((BrowserNode *) child)->get_data()] == 0) ||
+            if ((drawn.value(((BrowserNode *) child)->get_data()) == 0) ||
                 not_yet_drawn((BrowserNode *) child, drawn))
                 return TRUE;
     }
-
     return FALSE;
 }
 
 // have marked elements not yet drawn ?
-static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
+static bool marked_not_yet_drawn(QHash<BasicData *,DiagramItem*> & drawn)
 {
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
-    Q3PtrListIterator<BrowserNode> it(l);
-    BrowserNode * bn;
-
-    for (; (bn = it.current()) != 0; ++it) {
+    foreach (BrowserNode * bn, BrowserNode::marked_nodes()) {
         UmlCode k = bn->get_type();
 
         switch (k) {
@@ -102,7 +97,7 @@ static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
             // no break
         case UmlClass:
         case UmlPackage:
-            if (drawn[bn->get_data()] == 0)
+            if (drawn.value( bn->get_data()) == 0)
                 return TRUE;
         }
     }
@@ -111,52 +106,50 @@ static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
 }
 
 static void get_drawn(DiagramItemList & items,
-                      Q3PtrDict<DiagramItem> & drawn)
+                      QHash<BasicData *,DiagramItem*>  & drawn)
 {
-    DiagramItem * di;
-
-    for (di = items.first(); di != 0; di = items.next()) {
-        UmlCode k = di->type();
+    foreach (DiagramItem * di, items) {
+        UmlCode k = di->typeUmlCode();
 
         switch (k) {
         case UmlClass:
         case UmlPackage:
-            drawn.replace(di->get_bn()->get_data(), di);
+            drawn.insert(di->get_bn()->get_data(), di);
             break;
 
         default:
             if (IsaRelation(k) || IsaSimpleRelation(k))
-                drawn.replace(((ArrowCanvas *) di)->get_data(), di);
+                drawn.insert(((ArrowCanvas *) di)->get_data(), di);
         }
     }
 }
 
 void ClassDiagramView::menu(const QPoint & p)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Class diagram menu"));
+    MenuFactory::createTitle(m, tr("Class diagram menu"));
 
     if ((((UmlCanvas *) canvas())->browser_diagram())->is_writable()) {
         BrowserNode * bn = BrowserView::selected_item();
-        DiagramItemList items(canvas()->allItems());
-        Q3PtrDict<DiagramItem> drawn;
+        DiagramItemList items(canvas()->items());
+        QHash<BasicData *,DiagramItem*> drawn;
 
         get_drawn(items, drawn);
 
         if ((bn != 0) && (bn->get_type() == UmlClassView)) {
             if (not_yet_drawn(bn, drawn)) {
-                m.insertItem(TR("Add classes of the selected class view"), 29);
+                MenuFactory::addItem(m, tr("Add classes of the selected class view"), 29);
 
                 if (marked_not_yet_drawn(drawn))
-                    m.insertItem(TR("Add marked elements"), 28);
+                    MenuFactory::addItem(m, tr("Add marked elements"), 28);
 
-                m.insertSeparator();
+                m.addSeparator();
             }
         }
         else if (marked_not_yet_drawn(drawn)) {
-            m.insertItem(TR("Add marked elements"), 28);
-            m.insertSeparator();
+            MenuFactory::addItem(m, tr("Add marked elements"), 28);
+            m.addSeparator();
         }
 
         switch (default_menu(m, 30)) {
@@ -188,9 +181,9 @@ void ClassDiagramView::menu(const QPoint & p)
 static const int Diagram_Margin = 20;
 
 void ClassDiagramView::add_classview_classes(BrowserNode * container, const QPoint & p,
-        Q3PtrDict<DiagramItem> & drawn)
+        QHash<BasicData *,DiagramItem*> & drawn)
 {
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
     history_save();
     history_protected = TRUE;
@@ -209,13 +202,12 @@ void ClassDiagramView::add_classview_classes(BrowserNode * container, const QPoi
 }
 
 void ClassDiagramView::add_classview_classes(BrowserNode * container,
-        Q3PtrDict<DiagramItem> & drawn,
+        QHash<BasicData *,DiagramItem*> & drawn,
         int & x, int & y, int & future_y)
 {
-    Q3ListViewItem * child;
+    BrowserNode * child;
     int xmax = canvas()->width() - Diagram_Margin;
     int ymax = canvas()->height() - Diagram_Margin;
-
     for (child = container->firstChild(); child != 0; child = child->nextSibling()) {
         if (!((BrowserNode *) child)->deletedp() &&
             (((BrowserNode *) child)->get_type() == UmlClass)) {
@@ -224,10 +216,10 @@ void ClassDiagramView::add_classview_classes(BrowserNode * container,
                     new CdClassCanvas((BrowserNode *) child, the_canvas(), x, y);
 
                 if ((x + cl->width()) > xmax)
-                    cl->move(x = Diagram_Margin, y = future_y);
+                    cl->moveBy(x = Diagram_Margin, y = future_y);
 
                 if (y + cl->height() > ymax) {
-                    cl->move(x = Diagram_Margin, y = Diagram_Margin);
+                    cl->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                     future_y = y + cl->height() + Diagram_Margin;
                 }
                 else {
@@ -249,9 +241,9 @@ void ClassDiagramView::add_classview_classes(BrowserNode * container,
 }
 
 void ClassDiagramView::add_marked_elements(const QPoint & p,
-        Q3PtrDict<DiagramItem> & drawn)
+        QHash<BasicData *,DiagramItem*> & drawn)
 {
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
     history_save();
     history_protected = TRUE;
@@ -261,11 +253,8 @@ void ClassDiagramView::add_marked_elements(const QPoint & p,
     int x = p.x();
     int y = p.y();
     int future_y = y;
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
-    Q3PtrListIterator<BrowserNode> it(l);
-    BrowserNode * bn;
 
-    for (; (bn = it.current()) != 0; ++it) {
+    foreach (BrowserNode * bn, BrowserNode::marked_nodes()) {
         if (drawn[bn->get_data()] == 0) {
             DiagramCanvas * dc;
 
@@ -282,13 +271,13 @@ void ClassDiagramView::add_marked_elements(const QPoint & p,
                 continue;
             }
 
-            drawn.replace(dc->get_bn()->get_data(), dc);
+            drawn.insert(dc->get_bn()->get_data(), dc);
 
             if ((x + dc->width()) > xmax)
-                dc->move(x = Diagram_Margin, y = future_y);
+                dc->moveBy(x = Diagram_Margin, y = future_y);
 
             if (y + dc->height() > ymax) {
-                dc->move(x = Diagram_Margin, y = Diagram_Margin);
+                dc->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                 future_y = y + dc->height() + Diagram_Margin;
             }
             else {
@@ -308,7 +297,7 @@ void ClassDiagramView::add_marked_elements(const QPoint & p,
     UmlCanvas * cnv = (UmlCanvas *) canvas();
 
     if (! cnv->must_draw_all_relations()) {
-        for (it.toFirst(); (bn = it.current()) != 0; ++it) {
+        foreach (BrowserNode * bn, BrowserNode::marked_nodes()) {
             if (drawn[bn->get_data()] == 0) {
                 UmlCode k = bn->get_type();
 
@@ -336,10 +325,10 @@ void ClassDiagramView::add_related_elements(DiagramItem  * di, QString what,
     dialog.raise();
 
     if ((dialog.exec() == QDialog::Accepted) && !l.isEmpty()) {
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
 
-        DiagramItemList items(canvas()->allItems());
-        Q3PtrDict<DiagramItem> drawn;
+        DiagramItemList items(canvas()->items());
+        QHash<BasicData *,DiagramItem*> drawn;
 
         get_drawn(items, drawn);
 
@@ -352,33 +341,31 @@ void ClassDiagramView::add_related_elements(DiagramItem  * di, QString what,
         int x = re.x();
         int y = re.bottom() + Diagram_Margin;
         int future_y = y;
-        Q3PtrListIterator<BrowserNode> it(l);
-        BrowserNode * bn;
 
-        for (; (bn = it.current()) != 0; ++it) {
-            if (drawn[bn->get_data()] == 0) {
+        foreach (BrowserNode *node, l) {
+            if (drawn[node->get_data()] == 0) {
                 DiagramCanvas * dc;
 
-                switch (bn->get_type()) {
+                switch (node->get_type()) {
                 case UmlClass:
-                    dc = new CdClassCanvas(bn, the_canvas(), x, y);
+                    dc = new CdClassCanvas(node, the_canvas(), x, y);
                     break;
 
                 case UmlPackage:
-                    dc = new PackageCanvas(bn, the_canvas(), x, y, 0);
+                    dc = new PackageCanvas(node, the_canvas(), x, y, 0);
                     break;
 
                 default:
                     continue;
                 }
 
-                drawn.replace(dc->get_bn()->get_data(), dc);
+                drawn.insert(dc->get_bn()->get_data(), dc);
 
                 if ((x + dc->width()) > xmax)
-                    dc->move(x = Diagram_Margin, y = future_y);
+                    dc->moveBy(x = Diagram_Margin, y = future_y);
 
                 if (y + dc->height() > ymax) {
-                    dc->move(x = Diagram_Margin, y = Diagram_Margin);
+                    dc->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                     future_y = y + dc->height() + Diagram_Margin;
                 }
                 else {
@@ -403,7 +390,7 @@ void ClassDiagramView::add_related_elements(DiagramItem  * di, QString what,
     }
 }
 
-void ClassDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void ClassDiagramView::mousePressEvent(QMouseEvent * e)
 {
     if (!window()->frozen()) {
         switch (window()->buttonOn()) {
@@ -432,12 +419,12 @@ void ClassDiagramView::contentsMousePressEvent(QMouseEvent * e)
         break;
 
         default:
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
             break;
         }
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
 void ClassDiagramView::dragEnterEvent(QDragEnterEvent * e)
@@ -460,11 +447,32 @@ void ClassDiagramView::dragEnterEvent(QDragEnterEvent * e)
     else
         e->ignore();
 }
+void ClassDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+
+    if (!window()->frozen() &&
+        (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlRelations, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSimpleRelations, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE)))
+        e->accept();
+    else
+        e->ignore();
+}
 
 void ClassDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
+    QPointF p = mapToScene(e->pos());
 
     if ((bn = UmlDrag::decode(e, UmlClass)) != 0) {
         history_save();
@@ -533,8 +541,7 @@ void ClassDiagramView::dropEvent(QDropEvent * e)
 void ClassDiagramView::save(QTextStream & st, QString & warning,
                             bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
+    DiagramItemList items(canvas()->items());
 
     if (!copy)
         // sort is useless for a copy
@@ -544,8 +551,8 @@ void ClassDiagramView::save(QTextStream & st, QString & warning,
 
     // save first the classes packages fragment notes and icons
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem * di, items) {
+        switch (di->typeUmlCode()) {
         case UmlClass:
         case UmlNote:
         case UmlText:
@@ -564,9 +571,9 @@ void ClassDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves relations
 
-    for (di = items.first(); di != 0; di = items.next()) {
+    foreach (DiagramItem * di, items) {
         if (!copy || di->copyable()) {
-            UmlCode k = di->type();
+            UmlCode k = di->typeUmlCode();
 
             if (IsaRelation(k) || IsaSimpleRelation(k) || (k == UmlInner))
                 di->save(st, FALSE, warning);
@@ -575,8 +582,8 @@ void ClassDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    foreach (DiagramItem * di, items)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
 
     if (!copy && (preferred_zoom != 0)) {
@@ -594,9 +601,9 @@ void ClassDiagramView::read(char * st, char * k)
     UmlCanvas * canvas = the_canvas();
 
     // reads first the classes package icons text notes and images
-    while (CdClassCanvas::read(st, canvas, k) ||
-           NoteCanvas::read(st, canvas, k) ||
+    while (NoteCanvas::read(st, canvas, k) ||
            TextCanvas::read(st, canvas, k) ||
+           CdClassCanvas::read(st, canvas, k) ||
            IconCanvas::read(st, canvas, k) ||
            PackageCanvas::read(st, canvas, k) ||
            FragmentCanvas::read(st, canvas, k) ||
diff --git a/src/diagram/ClassDiagramView.h b/src/diagram/ClassDiagramView.h
index da0f27cfd..4946adc45 100644
--- a/src/diagram/ClassDiagramView.h
+++ b/src/diagram/ClassDiagramView.h
@@ -41,33 +41,35 @@ class ClassDiagramWindow;
 class DiagramItem;
 class UmlCanvas;
 class BrowserNode;
-
+class BasicData;
 class ClassDiagramView : public DiagramView
 {
+    Q_OBJECT
 public:
     ClassDiagramView(QWidget * parent, UmlCanvas * canvas, int id);
 
-    virtual void menu(const QPoint &);
+    virtual void menu(const QPoint &) override;
     virtual void add_related_elements(DiagramItem *, QString what,
-                                      bool inh, bool assoc);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+                                      bool inh, bool assoc) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
 private:
     ClassDiagramWindow * window() {
         return (ClassDiagramWindow *) parent();
     };
     void add_classview_classes(BrowserNode *, const QPoint & p,
-                               Q3PtrDict<DiagramItem> & drawn);
-    void add_classview_classes(BrowserNode *, Q3PtrDict<DiagramItem> & drawn,
-                               int & x, int & y, int & future_y);
+                               QHash<BasicData *, DiagramItem *> &drawn);
+    void add_classview_classes(BrowserNode *, QHash<BasicData *,DiagramItem*> &drawn,
+                               int & x, int & y, int & future_yDiagramItem);
     void add_marked_elements(const QPoint & p,
-                             Q3PtrDict<DiagramItem> & drawn);
+                             QHash<BasicData *, DiagramItem *> &drawn);
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent *e) override;
 };
 
 #endif
diff --git a/src/diagram/ClassDiagramWindow.cpp b/src/diagram/ClassDiagramWindow.cpp
index 4ff56e851..3d4ec32b3 100644
--- a/src/diagram/ClassDiagramWindow.cpp
+++ b/src/diagram/ClassDiagramWindow.cpp
@@ -30,10 +30,10 @@
 
 
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+//#include <qworkspace.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 
 #include "UmlWindow.h"
@@ -43,15 +43,15 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
-
+#include "toolbarfactory.h"
 QString addclassText()
 {
-    return TR("Click this button to add a <i>class</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add a <i>class</i> in the diagram. <br><br>"
               "You can also drop the class from the <b>browser</b>.");
 }
 QString addpackageText()
 {
-    return TR("Click this button to add a <i>package</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add a <i>package</i> in the diagram. <br><br>"
               "You can also drop the package from the <b>browser</b>.");
 }
 extern QString addfragmentText();
@@ -60,32 +60,32 @@ extern QString noteText();
 extern QString anchorText();
 QString dependencyText()
 {
-    return TR("Click this button to create a <i>dependency</i>");
+    return  QObject::tr("Click this button to create a <i>dependency</i>");
 }
 extern QString associationText();
 QString directionalassociationextensionText()
 {
-    return TR("Click this button to create an <i>unidirectional association</i> or an <i>extension</i>");
+    return  QObject::tr("Click this button to create an <i>unidirectional association</i> or an <i>extension</i>");
 }
 QString aggregationText()
 {
-    return TR("Click this button to create an <i>aggregation</i>");
+    return  QObject::tr("Click this button to create an <i>aggregation</i>");
 }
 QString aggregationbyvalueText()
 {
-    return TR("Click this button to create a <i>composition</i>");
+    return  QObject::tr("Click this button to create a <i>composition</i>");
 }
 QString directionalaggregationText()
 {
-    return TR("Click this button to create a <i>directional aggregation</i>");
+    return  QObject::tr("Click this button to create a <i>directional aggregation</i>");
 }
 QString directionalaggregationbyvalueText()
 {
-    return TR("Click this button to create a <i>directional composition</i>");
+    return  QObject::tr("Click this button to create a <i>directional composition</i>");
 }
 QString realizeText()
 {
-    return TR("Click this button to create a <i>realization</i>");
+    return  QObject::tr("Click this button to create a <i>realization</i>");
 }
 extern QString textText();
 extern QString imageText();
@@ -94,113 +94,116 @@ extern QString imageText();
 ClassDiagramWindow::ClassDiagramWindow(const QString & s, BrowserClassDiagram * b, int id)
     : DiagramWindow(b, s), view(0)
 {
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "class diagram operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
+
+    QToolBar * toolbar = new QToolBar("class diagram operations",this);
+    toolbar->setMinimumHeight(50);
+    toolbar->setOrientation(Qt::Horizontal);
+    addToolBar(Qt::TopToolBarArea, toolbar);
 
     add_edit_button(toolbar);
 
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton,  QObject::tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar, "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
+    select->setCheckable(TRUE);
+    select->setChecked(TRUE);
     current_button = UmlSelect;
     b->set_diagram_window(this);
     addClass
-        = new QToolButton(*classButton, TR("Add Class"), QString(),
+        = ToolBarFactory::createToolButton(*classButton,  QObject::tr("Add Class"), QString(),
                           this, SLOT(hit_class()), toolbar, "add class");
-    addClass->setToggleButton(TRUE);
-    Q3WhatsThis::add(addClass, addclassText());
+    addClass->setCheckable(TRUE);
+    addClass->setWhatsThis( addclassText());
 
     addPackage
-        = new QToolButton(*packageButton, TR("Add Package"), QString(),
+        = ToolBarFactory::createToolButton(*packageButton,  QObject::tr("Add Package"), QString(),
                           this, SLOT(hit_package()), toolbar, "add package");
-    addPackage->setToggleButton(TRUE);
-    Q3WhatsThis::add(addPackage, addpackageText());
+    addPackage->setCheckable(TRUE);
+    addPackage->setWhatsThis( addpackageText());
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("Add Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton,  QObject::tr("Add Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar, "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis(addfragmentText());
 
     inherit =
-        new QToolButton(*generalisationButton, TR("Generalisation"), QString(),
+        ToolBarFactory::createToolButton(*generalisationButton,  QObject::tr("Generalisation"), QString(),
                         this, SLOT(hit_inherit()), toolbar, "generalisation");
-    inherit->setToggleButton(TRUE);
-    Q3WhatsThis::add(inherit, inheritText());
+    inherit->setCheckable(TRUE);
+    inherit->setWhatsThis( inheritText());
 
     realize =
-        new QToolButton(*realizeButton, TR("Realize"), QString(),
+        ToolBarFactory::createToolButton(*realizeButton,  QObject::tr("Realize"), QString(),
                         this, SLOT(hit_realize()), toolbar, "realize");
-    realize->setToggleButton(TRUE);
-    Q3WhatsThis::add(realize, realizeText());
+    realize->setCheckable(TRUE);
+    realize->setWhatsThis( realizeText());
 
     dependency =
-        new QToolButton(*dependencyButton, TR("Dependency"), QString(),
+        ToolBarFactory::createToolButton(*dependencyButton,  QObject::tr("Dependency"), QString(),
                         this, SLOT(hit_dependency()), toolbar, "dependency");
-    dependency->setToggleButton(TRUE);
-    Q3WhatsThis::add(dependency, dependencyText());
+    dependency->setCheckable(TRUE);
+    dependency->setWhatsThis( dependencyText());
 
     association =
-        new QToolButton(*associationButton, TR("Association"), QString(),
+        ToolBarFactory::createToolButton(*associationButton,  QObject::tr("Association"), QString(),
                         this, SLOT(hit_association()), toolbar, "association");
-    association->setToggleButton(TRUE);
-    Q3WhatsThis::add(association, associationText());
+    association->setCheckable(TRUE);
+    association->setWhatsThis( associationText());
 
     directionalassociation =
-        new QToolButton(*directionalAssociationExtensionButton, TR("Directional Association / Extension"), QString(),
+        ToolBarFactory::createToolButton(*directionalAssociationExtensionButton,  QObject::tr("Directional Association / Extension"), QString(),
                         this, SLOT(hit_directionalassociation()), toolbar, "directional association");
-    directionalassociation->setToggleButton(TRUE);
-    Q3WhatsThis::add(directionalassociation, directionalassociationextensionText());
+    directionalassociation->setCheckable(TRUE);
+    directionalassociation->setWhatsThis( directionalassociationextensionText());
 
     aggregation =
-        new QToolButton(*aggregationButton, TR("Aggregation"), QString(),
+        ToolBarFactory::createToolButton(*aggregationButton,  QObject::tr("Aggregation"), QString(),
                         this, SLOT(hit_aggregation()), toolbar, "aggregation");
-    aggregation->setToggleButton(TRUE);
-    Q3WhatsThis::add(aggregation, aggregationText());
+    aggregation->setCheckable(TRUE);
+    aggregation->setWhatsThis( aggregationText());
 
     aggregationbyvalue =
-        new QToolButton(*aggregationByValueButton, TR("Composition"), QString(),
+        ToolBarFactory::createToolButton(*aggregationByValueButton,  QObject::tr("Composition"), QString(),
                         this, SLOT(hit_aggregationbyvalue()), toolbar, "composition");
-    aggregationbyvalue->setToggleButton(TRUE);
-    Q3WhatsThis::add(aggregationbyvalue, aggregationbyvalueText());
+    aggregationbyvalue->setCheckable(TRUE);
+    aggregationbyvalue->setWhatsThis( aggregationbyvalueText());
 
     directionalaggregation =
-        new QToolButton(*directionalAggregationButton, TR("Directional Aggregation"), QString(),
+        ToolBarFactory::createToolButton(*directionalAggregationButton,  QObject::tr("Directional Aggregation"), QString(),
                         this, SLOT(hit_directionalaggregation()), toolbar, "directional aggregation");
-    directionalaggregation->setToggleButton(TRUE);
-    Q3WhatsThis::add(directionalaggregation, directionalaggregationText());
+    directionalaggregation->setCheckable(TRUE);
+    directionalaggregation->setWhatsThis( directionalaggregationText());
 
     directionalaggregationbyvalue =
-        new QToolButton(*directionalAggregationByValueButton, TR("Directional Composition"), QString(),
+        ToolBarFactory::createToolButton(*directionalAggregationByValueButton,  QObject::tr("Directional Composition"), QString(),
                         this, SLOT(hit_directionalaggregationbyvalue()), toolbar, "directional composition");
-    directionalaggregationbyvalue->setToggleButton(TRUE);
-    Q3WhatsThis::add(directionalaggregationbyvalue, directionalaggregationbyvalueText());
+    directionalaggregationbyvalue->setCheckable(TRUE);
+    directionalaggregationbyvalue->setWhatsThis( directionalaggregationbyvalueText());
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton,  QObject::tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar, "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis( noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor / Class association"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton,  QObject::tr("Anchor / Class association"), QString(),
                         this, SLOT(hit_anchor()), toolbar, "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis( anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton,  QObject::tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar, "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis( textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton,  QObject::tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+    image->setWhatsThis( imageText());
 
     toolbar->addSeparator();
 
@@ -214,9 +217,9 @@ ClassDiagramWindow::ClassDiagramWindow(const QString & s, BrowserClassDiagram *
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
+    QMdiArea * w = UmlWindow::get_workspace();
 
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -244,8 +247,8 @@ ClassDiagramWindow::~ClassDiagramWindow()
 //    if(browser_node)
 //        browser_node->set_diagram_window(0);
 
-//  if(browser_node)
-//    browser_node->on_close();
+  if(browser_node)
+    browser_node->on_close();
 }
 
 DiagramView * ClassDiagramWindow::get_view() const
@@ -256,26 +259,25 @@ DiagramView * ClassDiagramWindow::get_view() const
 void ClassDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
-
-    select->setOn(FALSE);
-    addClass->setOn(FALSE);
-    addPackage->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    inherit->setOn(FALSE);
-    dependency->setOn(FALSE);
-    association->setOn(FALSE);
-    directionalassociation->setOn(FALSE);
-    aggregation->setOn(FALSE);
-    aggregationbyvalue->setOn(FALSE);
-    directionalaggregation->setOn(FALSE);
-    directionalaggregationbyvalue->setOn(FALSE);
-    realize->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addClass->setChecked(FALSE);
+    addPackage->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    inherit->setChecked(FALSE);
+    dependency->setChecked(FALSE);
+    association->setChecked(FALSE);
+    directionalassociation->setChecked(FALSE);
+    aggregation->setChecked(FALSE);
+    aggregationbyvalue->setChecked(FALSE);
+    directionalaggregation->setChecked(FALSE);
+    directionalaggregationbyvalue->setChecked(FALSE);
+    realize->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/ClassDiagramWindow.h b/src/diagram/ClassDiagramWindow.h
index f862a1018..7b9843e2c 100644
--- a/src/diagram/ClassDiagramWindow.h
+++ b/src/diagram/ClassDiagramWindow.h
@@ -65,9 +65,9 @@ class ClassDiagramWindow : public DiagramWindow
     ClassDiagramWindow(const QString & s, BrowserClassDiagram *, int id = -1);
     virtual ~ClassDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_class();
diff --git a/src/diagram/ClassInstCanvas.cpp b/src/diagram/ClassInstCanvas.cpp
index bebebd80e..1b740d1fb 100644
--- a/src/diagram/ClassInstCanvas.cpp
+++ b/src/diagram/ClassInstCanvas.cpp
@@ -156,7 +156,7 @@ void ClassInstCanvas::draw(QPainter & p, UmlCanvas * canvas, QRect r)
     BrowserClass * cl = (BrowserClass *) get_type();
     QString iname = get_name();
 
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     p.setRenderHint(QPainter::Antialiasing, true);
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode :
@@ -168,8 +168,10 @@ void ClassInstCanvas::draw(QPainter & p, UmlCanvas * canvas, QRect r)
         fputs("<g>\n", fp);
 
     QColor co = color(used_color);
+    QBrush backBrush = p.background();
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent) {
         const int shadow = canvas->shadow();
@@ -260,7 +262,7 @@ void ClassInstCanvas::draw(QPainter & p, UmlCanvas * canvas, QRect r)
             draw_text(r1, ::Qt::AlignCenter, iname + ":",
                       p.font(), fp);
 
-        r1.moveBy(0, r.height() / 2);
+        r1.translate(0, r.height() / 2);
         p.drawText(r1, ::Qt::AlignCenter, cl->contextual_name(used_show_context_mode));
 
         if (fp != 0)
@@ -269,7 +271,8 @@ void ClassInstCanvas::draw(QPainter & p, UmlCanvas * canvas, QRect r)
     }
 
     p.setFont(canvas->get_font(UmlNormalFont));
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
 
     if (fp != 0)
         fputs("</g>\n", fp);
diff --git a/src/diagram/ClassInstCanvas.h b/src/diagram/ClassInstCanvas.h
index 092fab95c..e9b7afc5e 100644
--- a/src/diagram/ClassInstCanvas.h
+++ b/src/diagram/ClassInstCanvas.h
@@ -64,8 +64,8 @@ class ClassInstCanvas : public Instance
 
     QString full_name() const;
 
-    virtual BrowserNode * new_type();
-    virtual bool new_type_available();
+    virtual BrowserNode * new_type() override;
+    virtual bool new_type_available() override;
     virtual BrowserNode * container(UmlCode) const = 0;
     void compute_size(int & w, int & h, UmlCanvas *);
     void draw(QPainter & p, UmlCanvas * canvas, QRect r);
diff --git a/src/diagram/CodClassInstCanvas.cpp b/src/diagram/CodClassInstCanvas.cpp
index 5479328ff..f654d401f 100644
--- a/src/diagram/CodClassInstCanvas.cpp
+++ b/src/diagram/CodClassInstCanvas.cpp
@@ -24,17 +24,8 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-
-
-
-
-
-#include <q3popupmenu.h>
 #include <qcursor.h>
-//Added by qt3to4:
 #include <QTextStream>
-
-
 #include "CodClassInstCanvas.h"
 #include "CodSelfLinkCanvas.h"
 #include "BrowserClass.h"
@@ -147,6 +138,14 @@ void CodClassInstCanvas::draw(QPainter & p)
     }
 }
 
+void CodClassInstCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
 // all cases
 QString CodClassInstCanvas::get_name() const
 {
@@ -162,7 +161,7 @@ void CodClassInstCanvas::set_name(const QString & s)
 }
 
 // UmlClass or UmlClassInstance
-UmlCode CodClassInstCanvas::type() const
+UmlCode CodClassInstCanvas::typeUmlCode() const
 {
     return browser_node->get_type();
 }
@@ -231,47 +230,50 @@ void CodClassInstCanvas::open()
 
 void CodClassInstCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
     bool modelized = (browser_node->get_type() == UmlClassInstance);
 
     MenuFactory::createTitle(m, full_name());
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 3);
-    m.insertSeparator();
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 3);
+    m.addSeparator();
 
     if (modelized)
-        m.insertItem(TR("Select in browser"), 4);
+        MenuFactory::addItem(m, tr("Select in browser"), 4);
 
-    m.insertItem(TR("Select class in browser"), 5);
+    MenuFactory::addItem(m, tr("Select class in browser"), 5);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 6);
+        MenuFactory::addItem(m, tr("Select linked items"), 6);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (modelized)
-        m.insertItem(TR("Exit from model"), 9);
+        MenuFactory::addItem(m, tr("Exit from model"), 9);
     else {
         if (container(UmlClass)->is_writable())
-            m.insertItem(TR("Insert in model"), 10);
+            MenuFactory::addItem(m, tr("Insert in model"), 10);
 
-        m.insertItem(TR("Replace it"), 11);
+        MenuFactory::addItem(m, tr("Replace it"), 11);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (modelized && browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    switch (m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (retAction->data().toInt()) {
     case 0:
         upper();
         modified();	// call package_modified
@@ -375,11 +377,12 @@ void CodClassInstCanvas::menu(const QPoint &)
     default:
         return;
     }
+    }
 
     package_modified();
 }
 
-void CodClassInstCanvas::apply_shortcut(QString s)
+void CodClassInstCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -414,13 +417,13 @@ void CodClassInstCanvas::edit_drawing_settings()
         StateSpecVector st((browser_node->get_type() != UmlClass) ? 3 : 2);
         ColorSpecVector co(1);
 
-        st[0].set(TR("write name:type \nhorizontally"), &write_horizontally);
-        st[1].set(TR("show class context"), &show_context_mode);
+        st[0].set(tr("write name:type \nhorizontally"), &write_horizontally);
+        st[1].set(tr("show class context"), &show_context_mode);
 
         if (browser_node->get_type() != UmlClass)
-            st[2].set(TR("show stereotypes \nproperties"), &show_stereotype_properties);
+            st[2].set(tr("show stereotypes \nproperties"), &show_stereotype_properties);
 
-        co[0].set(TR("class instance color"), &itscolor);
+        co[0].set(tr("class instance color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -441,7 +444,7 @@ bool CodClassInstCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void CodClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void CodClassInstCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(2);
@@ -450,30 +453,29 @@ void CodClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         ShowContextMode show_context_mode;
         UmlColor itscolor;
 
-        st[0].set(TR("write name:type \nhorizontally"), &write_horizontally);
-        st[1].set(TR("show class context"), &show_context_mode);
-        co[0].set(TR("class instance color"), &itscolor);
+        st[0].set(tr("write name:type \nhorizontally"), &write_horizontally);
+        st[1].set(tr("show class context"), &show_context_mode);
+        co[0].set(tr("class instance color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                CodClassInstCanvas *canvas = (CodClassInstCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((CodClassInstCanvas *) it.current())->write_horizontally =
+                    canvas->write_horizontally =
                         write_horizontally;
 
                 if (!st[1].name.isEmpty())
-                    ((CodClassInstCanvas *) it.current())->show_context_mode =
+                    canvas->show_context_mode =
                         show_context_mode;
 
                 if (!co[0].name.isEmpty())
-                    ((CodClassInstCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((CodClassInstCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -482,20 +484,13 @@ void CodClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void CodClassInstCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void CodClassInstCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    CodClassInstCanvas * x = (CodClassInstCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        CodClassInstCanvas * o = (CodClassInstCanvas *) it.current();
-
-        o->write_horizontally = x->write_horizontally;
-        o->show_context_mode = x->show_context_mode;
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const CodClassInstCanvas * x = (const CodClassInstCanvas *) src;
+    write_horizontally = x->write_horizontally;
+    show_context_mode = x->show_context_mode;
+    itscolor = x->itscolor;
+    modified();
 }
 
 bool CodClassInstCanvas::get_show_stereotype_properties() const
@@ -592,7 +587,7 @@ CodClassInstCanvas * CodClassInstCanvas::read(char *& st, UmlCanvas * canvas,
         CodClassInstCanvas * result =
             new CodClassInstCanvas(icl, canvas, x, (int) read_double(st), id);
 
-        result->setZ(read_double(st));
+        result->setZValue(read_double(st));
 
         result->ClassInstCanvas::read(st, k);	// update k
 
@@ -620,7 +615,7 @@ CodClassInstCanvas * CodClassInstCanvas::read(char *& st, UmlCanvas * canvas,
 
 void CodClassInstCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), 0, this, 0);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
@@ -635,16 +630,16 @@ void CodClassInstCanvas::history_load(QBuffer & b)
 
 // for plug outs
 
-void CodClassInstCanvas::send(ToolCom * com, Q3CanvasItemList & all)
+void CodClassInstCanvas::send(ToolCom * com, QList<QGraphicsItem*> & all)
 {
-    Q3PtrList<CodClassInstCanvas> l;
-    Q3CanvasItemList::Iterator cit;
+    QList<CodClassInstCanvas *> l;
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
-        if ((di != 0) && (*cit)->visible()) {
-            switch (di->type()) {
+        if ((di != 0) && (*cit)->isVisible()) {
+            switch (di->typeUmlCode()) {
             case UmlClass:
             case UmlClassInstance:
                 l.append((CodClassInstCanvas *) di);
@@ -658,11 +653,7 @@ void CodClassInstCanvas::send(ToolCom * com, Q3CanvasItemList & all)
 
     com->write_unsigned(l.count());
 
-    Q3PtrListIterator<CodClassInstCanvas> it(l);
-
-    for (; it.current(); ++it) {
-        CodClassInstCanvas * i = it.current();
-
+    foreach (CodClassInstCanvas *i, l) {
         com->write_unsigned((unsigned) i->get_ident());
 
         if (i->browser_node->get_type() == UmlClass) {
diff --git a/src/diagram/CodClassInstCanvas.h b/src/diagram/CodClassInstCanvas.h
index c0cb34c34..8f18a658e 100644
--- a/src/diagram/CodClassInstCanvas.h
+++ b/src/diagram/CodClassInstCanvas.h
@@ -50,46 +50,47 @@ class CodClassInstCanvas : public QObject, public CodObjCanvas, public ClassInst
 protected:
     QString iname;	// useless if browser_node is a class instance rather than a class
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     CodClassInstCanvas(BrowserNode * t, UmlCanvas * canvas,
                        int x, int y, int id);
     virtual ~CodClassInstCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
 
     void compute_size();
-    virtual UmlCode type() const;	// -> class or classinstance
-    virtual QString get_name() const;	// all cases
-    virtual void set_name(const QString & s);	// out of model case
-    virtual BrowserNode * get_type() const;	// return class, all cases
-    void set_type(BrowserNode * t);	// out of model case
-    virtual BrowserNodeList & get_types(BrowserNodeList &) const;
-    BrowserClass * get_class() const;
-    virtual BrowserNode * container(UmlCode) const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString get_full_name() const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void remove(bool from_model);
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual bool get_show_stereotype_properties() const;
-
-    virtual void apply_shortcut(QString s);
+    virtual UmlCode typeUmlCode() const override;	// -> class or classinstance
+    virtual QString get_name() const override;	// all cases
+    virtual void set_name(const QString & s) override;	// out of model case
+    virtual BrowserNode * get_type() const override;	// return class, all cases
+    virtual void set_type(BrowserNode * t) override;	// out of model case
+    virtual BrowserNodeList & get_types(BrowserNodeList &) const override;
+    virtual BrowserClass * get_class() const override;
+    virtual BrowserNode * container(UmlCode) const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString get_full_name() const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void remove(bool from_model) override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
+    virtual bool get_show_stereotype_properties() const override;
+
+    virtual void apply_shortcut(const QString & s) override;
     void edit_drawing_settings();
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static CodClassInstCanvas * read(char *& , UmlCanvas * canvas, char *);
 
-    static void send(ToolCom * com, Q3CanvasItemList & all);
+    static void send(ToolCom * com, QList<QGraphicsItem*> & all);
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/CodDirsCanvas.cpp b/src/diagram/CodDirsCanvas.cpp
index c49f2b1b4..3f6be06ff 100644
--- a/src/diagram/CodDirsCanvas.cpp
+++ b/src/diagram/CodDirsCanvas.cpp
@@ -51,7 +51,7 @@ CodDirsCanvas::CodDirsCanvas(UmlCanvas * canvas, CodLinkCanvas * l, int id)
     : DiagramCanvas(0, canvas, 0, 0, COL_DIRS_SIZE, COL_DIRS_SIZE, id),
       angle(0), backward_label(0), link(l)
 {
-    setZ(COL_MSG_Z);
+    setZValue(COL_MSG_Z);
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
 
@@ -77,7 +77,7 @@ void CodDirsCanvas::remove_it(ColMsg * msg)
     if (unsubscribe(oper_data))
         disconnect(oper_data, 0, this, 0);
 
-    msgs.removeRef(msg);
+    msgs.removeOne(msg);
 }
 
 
@@ -106,7 +106,7 @@ void CodDirsCanvas::update_pos(const QPoint & link_start,
 
     r.moveCenter((link_start + link_end) / 2);
 
-    move(r.x(), r.y());
+    moveBy(r.x(), r.y());
 
     if (label != 0)
         update_label_pos(label, TRUE);
@@ -120,7 +120,7 @@ void CodDirsCanvas::update_pos(const QPoint & link_start,
 
 void CodDirsCanvas::update_label_pos(LabelCanvas * lbl, bool forward)
 {
-    if (!lbl->selected()) {
+    if (!lbl->isSelected()) {
         double a = angle + ((forward) ? 270 : 90);
         QRect r = rect();
         QPoint c = r.center();
@@ -140,19 +140,17 @@ void CodDirsCanvas::update_msgs()
     // cannot be modified in this case
     msgs.sort();
 
-    Q3PtrListIterator<ColMsg> it(msgs);
     QString nl = "\n";
     QString null;
     const QString * forward_pfix = &null;
     const QString * backward_pfix = &null;
     QString forward;
     QString backward;
-    ColMsg * msg;
     CollaborationDiagramSettings  dflt = settings;
 
     the_canvas()->browser_diagram()->get_collaborationdiagramsettings(dflt);
 
-    for (; (msg = it.current()) != 0; ++it) {
+    foreach (ColMsg *msg, msgs) {
         const BasicData * oper_data = msg->get_operation();
 
         if ((oper_data != 0) && subscribe(oper_data)) {
@@ -310,6 +308,13 @@ void CodDirsCanvas::draw(QPainter & p)
     p.restore();
 }
 
+void CodDirsCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
 bool CodDirsCanvas::edit_drawing_settings()
 {
     for (;;) {
@@ -331,7 +336,7 @@ bool CodDirsCanvas::edit_drawing_settings()
     }
 }
 
-UmlCode CodDirsCanvas::type() const
+UmlCode CodDirsCanvas::typeUmlCode() const
 {
     return UmlLinkDirs;
 }
@@ -354,13 +359,13 @@ void CodDirsCanvas::menu(const QPoint &)
 QString CodDirsCanvas::may_start(UmlCode &) const
 {
     // cannot be called
-    return TR("illegal");
+    return tr("illegal");
 }
 
 QString CodDirsCanvas::may_connect(UmlCode &, const DiagramItem *) const
 {
     // cannot be called
-    return TR("illegal");
+    return tr("illegal");
 }
 
 bool CodDirsCanvas::copyable() const
@@ -370,7 +375,7 @@ bool CodDirsCanvas::copyable() const
 
     link->get_start_end(from, to);
 
-    return link->selected() && from->copyable() && to->copyable();
+    return link->isSelected() && from->copyable() && to->copyable();
 }
 
 bool CodDirsCanvas::represents(BrowserNode * bn)
@@ -384,7 +389,7 @@ void CodDirsCanvas::save(QTextStream & st, bool ref, QString & warning) const
         st << "dirscanvas_ref " << get_ident();
     else {
         nl_indent(st);
-        st << "dirscanvas " << get_ident() << " z " << z() << " ";
+        st << "dirscanvas " << get_ident() << " z " << zValue() << " ";
         link->save(st, TRUE, warning);
 
         indent(+1);
@@ -429,7 +434,7 @@ CodDirsCanvas * CodDirsCanvas::read(char *& st, UmlCanvas * canvas, char *& k)
         CodDirsCanvas * result =
             new CodDirsCanvas(canvas, CodLinkCanvas::read(st, canvas, k), id);
 
-        result->setZ(z);
+        result->setZValue(z);
         result->link->set_dirs(result);
         result->link->update_pos();		// to place result
 
@@ -486,10 +491,7 @@ void CodDirsCanvas::history_load(QBuffer & b)
     ::load(angle, b);
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 
-    Q3PtrListIterator<ColMsg> it(msgs);
-    ColMsg * msg;
-
-    for (; (msg = it.current()) != 0; ++it) {
+    foreach (ColMsg *msg, msgs) {
         const BasicData * oper_data = msg->get_operation();
 
         if ((oper_data != 0) && subscribe(oper_data)) {
@@ -501,13 +503,10 @@ void CodDirsCanvas::history_load(QBuffer & b)
 
 void CodDirsCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 
-    Q3PtrListIterator<ColMsg> it(msgs);
-    ColMsg * msg;
-
-    for (; (msg = it.current()) != 0; ++it) {
+    foreach (ColMsg *msg, msgs) {
         const BasicData * oper_data = msg->get_operation();
 
         if ((oper_data != 0) && unsubscribe(oper_data)) {
@@ -516,3 +515,8 @@ void CodDirsCanvas::history_hide()
         }
     }
 }
+
+int CodDirsCanvas::type() const
+{
+    return (DiagramItemTypeStart+RTTI_COL_MSG);
+}
diff --git a/src/diagram/CodDirsCanvas.h b/src/diagram/CodDirsCanvas.h
index 7b9bff1e9..58a42b61e 100644
--- a/src/diagram/CodDirsCanvas.h
+++ b/src/diagram/CodDirsCanvas.h
@@ -42,7 +42,7 @@ class QTextStream;
 
 #define COL_DIRS_SIZE 50
 
-#define isa_col_msg_dirs(x) ((x)->rtti() == RTTI_COL_MSG)
+#define isa_col_msg_dirs(x) (((x)->type()-DiagramItemTypeStart) == RTTI_COL_MSG)
 
 class CodDirsCanvas : public QObject, public DiagramCanvas, public CodMsgSupport,
     public MultipleDependency<BasicData>
@@ -55,41 +55,44 @@ class CodDirsCanvas : public QObject, public DiagramCanvas, public CodMsgSupport
     LabelCanvas * backward_label;
     CodLinkCanvas * link;	// to get start & end
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     CodDirsCanvas(UmlCanvas * canvas, CodLinkCanvas * l, int id);
     virtual ~CodDirsCanvas();
 
-    virtual void delete_it();
-    virtual void remove_it(ColMsg * msg);
+    virtual void delete_it() override;
+    virtual void remove_it(ColMsg * msg) override;
 
     virtual void get_from_to(CodObjCanvas *& from, CodObjCanvas *& to,
-                             bool forward);
+                             bool forward) override;
 
-    virtual UmlCode type() const;
+    virtual UmlCode typeUmlCode() const override;
     virtual int rtti() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode &, const DiagramItem *) const;
-    virtual bool copyable() const;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode &, const DiagramItem *) const override;
+    virtual bool copyable() const override;
 
     void set_link(CodLinkCanvas * l) {
         link = l;
     };
     void update_pos(const QPoint & link_start, const QPoint & link_end);
     void update_label_pos(LabelCanvas *, bool forward);
-    virtual void update_msgs();
+    virtual void update_msgs() override;
+    using DiagramCanvas::edit_drawing_settings;
     bool edit_drawing_settings();
     virtual void draw(QPainter & p);
-    virtual void setVisible(bool yes);
+    virtual void setVisible(bool yes) override;
 
-    virtual bool represents(BrowserNode *);
+    virtual bool represents(BrowserNode *) override;
 
-    virtual void save(QTextStream & st, bool, QString & warning) const;
+    virtual void save(QTextStream & st, bool, QString & warning) const override;
     static CodDirsCanvas * read(char *& st, UmlCanvas * canvas, char *& k);
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+    virtual int type() const override;
 
 private slots:
     void modified();	// messages must be updated
diff --git a/src/diagram/CodLinkCanvas.cpp b/src/diagram/CodLinkCanvas.cpp
index 4f1b7690e..5f6ef3a31 100644
--- a/src/diagram/CodLinkCanvas.cpp
+++ b/src/diagram/CodLinkCanvas.cpp
@@ -30,7 +30,7 @@
 
 
 #include <qcursor.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -39,12 +39,12 @@
 #include "UmlCanvas.h"
 #include "LabelCanvas.h"
 #include "CodDirsCanvas.h"
-#include "CodObjCanvas.h"
-#include "ColDiagramView.h"
 #include "myio.h"
 #include "ToolCom.h"
 #include "CodAddMsgDialog.h"
 #include "CodEditMsgDialog.h"
+#include "CodObjCanvas.h"
+#include "ColDiagramView.h"
 #include "Tool.h"
 #include "ui/menufactory.h"
 #include "translate.h"
@@ -87,7 +87,7 @@ void CodLinkCanvas::setVisible(bool yes)
 
 void CodLinkCanvas::moveBy(double dx, double dy)
 {
-    if (selected())
+    if (isSelected())
         the_canvas()->unselect(this);
 
     ArrowCanvas::moveBy(dx, dy);
@@ -119,99 +119,101 @@ void CodLinkCanvas::menu(const QPoint &)
     else
         new_dirs = FALSE;
 
-    Q3PopupMenu m;
-    Q3PopupMenu geo;
+    QMenu m;
+    QMenu geo;
 
-    MenuFactory::createTitle(m, TR("Link"));
-    m.insertSeparator();
-    m.insertItem(TR("add messages to ") + from->get_full_name(), 1);
-    m.insertItem(TR("add messages to ") + to->get_full_name(), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit its messages"), 3);
-    m.insertItem(TR("Edit all the messages"), 4);
-    m.insertSeparator();
-    m.insertItem(TR("Select linked items"), 7);
-    m.insertSeparator();
+    MenuFactory::createTitle(m, tr("Link"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("add messages to ") + from->get_full_name(), 1);
+    MenuFactory::addItem(m, tr("add messages to ") + to->get_full_name(), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit its messages"), 3);
+    MenuFactory::addItem(m, tr("Edit all the messages"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select linked items"), 7);
+    m.addSeparator();
 
     if (!new_dirs) {
-        m.insertItem(TR("Edit drawing settings"), 5);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Edit drawing settings"), 5);
+        m.addSeparator();
     }
 
     if (get_start() != get_end()) {
         init_geometry_menu(geo, 10);
-        m.insertItem(TR("Geometry (Ctrl+l)"), &geo);
-        m.insertSeparator();
+        MenuFactory::insertItem(m, tr("Geometry (Ctrl+l)"), &geo);
+        m.addSeparator();
     }
 
-    m.insertItem(TR("Remove from diagram"), 6);
+    MenuFactory::addItem(m, tr("Remove from diagram"), 6);
 
-    int rank = m.exec(QCursor::pos());
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int rank = retAction->data().toInt();
 
-    switch (rank) {
-    case 1: {
-        CodAddMsgDialog dialog(to, from, d,
-                               (ColDiagramView *) the_canvas()->get_view(),
-                               FALSE);
+        switch (rank) {
+        case 1: {
+            CodAddMsgDialog dialog(to, from, d,
+                                   (ColDiagramView *) the_canvas()->get_view(),
+                                   FALSE);
 
-        dialog.raise();
+            dialog.raise();
 
-        if (dialog.exec() != QDialog::Accepted)
-            return;
-    }
-    break;
+            if (dialog.exec() != QDialog::Accepted)
+                return;
+        }
+
+            break;
+
+        case 2: {
+            CodAddMsgDialog dialog(from, to, d,
+                                   (ColDiagramView *) the_canvas()->get_view(),
+                                   TRUE);
+
+            dialog.raise();
 
-    case 2: {
-        CodAddMsgDialog dialog(from, to, d,
-                               (ColDiagramView *) the_canvas()->get_view(),
-                               TRUE);
+            if (dialog.exec() != QDialog::Accepted)
+                return;
+        }
+            break;
 
-        dialog.raise();
+        case 3:
+            CodEditMsgDialog::exec((ColDiagramView *) the_canvas()->get_view(), d->get_msgs());
+            return;
+        case 4:
+            CodEditMsgDialog::exec((ColDiagramView *) the_canvas()->get_view(),
+                                   ((ColDiagramView *) the_canvas()->get_view())->get_msgs());
+            return;
+        case 5:
+            if (d->edit_drawing_settings())
+                modified();
 
-        if (dialog.exec() != QDialog::Accepted)
             return;
-    }
-    break;
-
-    case 3:
-        CodEditMsgDialog::exec((ColDiagramView *) the_canvas()->get_view(), d->get_msgs());
-        return;
-
-    case 4:
-        CodEditMsgDialog::exec((ColDiagramView *) the_canvas()->get_view(),
-                               ((ColDiagramView *) the_canvas()->get_view())->get_msgs());
-        return;
-
-    case 5:
-        if (d->edit_drawing_settings())
-            modified();
-
-        return;
-
-    case 6:
-        delete_it();
-        ((ColDiagramView *) the_canvas()->get_view())->update_msgs();
-        break;
-
-    case 7:
-        select_associated();
-        return;
-
-    default:
-        if (rank >= 10) {
-            rank -= 10;
-
-            if (rank == RecenterBegin)
-                set_decenter(-1.0, decenter_end);
-            else if (rank == RecenterEnd)
-                set_decenter(decenter_begin, -1.0);
-            else if (rank != (int) geometry)
-                set_geometry((LineGeometry) rank, TRUE);
+
+        case 6:
+            delete_it();
+            ((ColDiagramView *) the_canvas()->get_view())->update_msgs();
+            break;
+        case 7:
+            select_associated();
+            return;
+
+        default:
+            if (rank >= 10) {
+                rank -= 10;
+
+                if (rank == RecenterBegin)
+                    set_decenter(-1.0, decenter_end);
+                else if (rank == RecenterEnd)
+                    set_decenter(decenter_begin, -1.0);
+                else if (rank != (int) geometry)
+                    set_geometry((LineGeometry) rank, TRUE);
+                else
+                    return;
+            }
             else
                 return;
         }
-        else
-            return;
     }
 
     package_modified();
@@ -230,12 +232,12 @@ void CodLinkCanvas::menu(const QPoint &)
 ArrowPointCanvas * CodLinkCanvas::brk(const QPoint & p)
 {
     ArrowPointCanvas * ap =
-        new ArrowPointCanvas(the_canvas(), p.x(), p.y());
+            new ArrowPointCanvas(the_canvas(), p.x(), p.y());
 
-    ap->setZ(z() + 1);
+    ap->setZValue(zValue() + 1);
 
     CodLinkCanvas * other =
-        new CodLinkCanvas(the_canvas(), ap, end, 0, decenter_begin, decenter_end);
+            new CodLinkCanvas(the_canvas(), ap, end, 0, decenter_begin, decenter_end);
 
     ap->add_line(this);
     end->remove_line(this, TRUE);
@@ -247,7 +249,7 @@ ArrowPointCanvas * CodLinkCanvas::brk(const QPoint & p)
     other->show();
 
     if (dirs &&
-        ((p - beginp).manhattanLength() < (p - endp).manhattanLength())) {
+            ((p - beginp).manhattanLength() < (p - endp).manhattanLength())) {
         other->dirs = dirs;
         dirs = 0;
         other->dirs->set_link(other);
@@ -287,14 +289,14 @@ void CodLinkCanvas::get_start_end(CodObjCanvas *& from, CodObjCanvas *& to)
 
     a = this;
 
-    while (a->begin->type() == UmlArrowPoint)
+    while (a->begin->typeUmlCode() == UmlArrowPoint)
         a = (CodLinkCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
     from = (CodObjCanvas *) a->begin;
 
     a = this;
 
-    while (a->end->type() == UmlArrowPoint)
+    while (a->end->typeUmlCode() == UmlArrowPoint)
         a = (CodLinkCanvas *)((ArrowPointCanvas *) a->end)->get_other(a);
 
     to = (CodObjCanvas *) a->end;
@@ -309,7 +311,7 @@ CodDirsCanvas * CodLinkCanvas::find_dirs() const
 
     a = this;
 
-    while (a->begin->type() == UmlArrowPoint) {
+    while (a->begin->typeUmlCode() == UmlArrowPoint) {
         a = (CodLinkCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
         if (a->dirs != 0)
@@ -318,7 +320,7 @@ CodDirsCanvas * CodLinkCanvas::find_dirs() const
 
     a = this;
 
-    while (a->end->type() == UmlArrowPoint) {
+    while (a->end->typeUmlCode() == UmlArrowPoint) {
         a = (CodLinkCanvas *)((ArrowPointCanvas *) a->end)->get_other(a);
 
         if (a->dirs != 0)
@@ -332,7 +334,7 @@ void CodLinkCanvas::save(QTextStream & st, bool ref, QString & warning) const
 {
     if (ref)
         st << "linkcanvas_ref " << get_ident();
-    else if (begin->type() != UmlArrowPoint) {
+    else if (begin->typeUmlCode() != UmlArrowPoint) {
         nl_indent(st);
         st << "linkcanvas " << get_ident();
 
@@ -412,7 +414,7 @@ CodLinkCanvas * CodLinkCanvas::read(char *& st, UmlCanvas * canvas, char *& k)
             result = new CodLinkCanvas(canvas, bi, ap, id, dbegin, dend);
 
             if (read_file_format() >= 5)
-                result->setZ(z);
+                result->setZValue(z);
 
             result->show();
             bi = ap;
@@ -422,8 +424,8 @@ CodLinkCanvas * CodLinkCanvas::read(char *& st, UmlCanvas * canvas, char *& k)
         }
 
         result =
-            new CodLinkCanvas(canvas, bi, dict_get(read_id(st), "", canvas),
-                              id, dbegin, dend);
+                new CodLinkCanvas(canvas, bi, dict_get(read_id(st), "", canvas),
+                                  id, dbegin, dend);
         result->show();
 
         k = read_keyword(st);
diff --git a/src/diagram/CodLinkCanvas.h b/src/diagram/CodLinkCanvas.h
index b27fe52de..8c9c9c09a 100644
--- a/src/diagram/CodLinkCanvas.h
+++ b/src/diagram/CodLinkCanvas.h
@@ -41,6 +41,7 @@ class ColMsg;
 
 class CodLinkCanvas : public ArrowCanvas
 {
+    Q_OBJECT
 protected:
     CodDirsCanvas * dirs;
 
@@ -49,17 +50,17 @@ class CodLinkCanvas : public ArrowCanvas
                   int id, float d_start, float d_end);
     virtual ~CodLinkCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    virtual void setVisible(bool yes);
-    virtual void moveBy(double dx, double dy);
+    virtual void setVisible(bool yes) override;
+    virtual void moveBy(double dx, double dy) override;
 
-    virtual void update_pos();
-    virtual ArrowPointCanvas * brk(const QPoint &);
-    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap);
+    virtual void update_pos() override;
+    virtual ArrowPointCanvas * brk(const QPoint &) override;
+    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap) override;
 
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
     void get_start_end(CodObjCanvas *& from, CodObjCanvas *& to);
     CodDirsCanvas * find_dirs() const;
@@ -67,10 +68,10 @@ class CodLinkCanvas : public ArrowCanvas
         dirs = d;
     };
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
 
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static CodLinkCanvas * read(char *& st, UmlCanvas * canvas, char *& k);
 };
 
diff --git a/src/diagram/CodMsgSupport.cpp b/src/diagram/CodMsgSupport.cpp
index f71655e06..cd1f65ef6 100644
--- a/src/diagram/CodMsgSupport.cpp
+++ b/src/diagram/CodMsgSupport.cpp
@@ -39,16 +39,15 @@ CodMsgSupport::~CodMsgSupport()
 
 void CodMsgSupport::delete_it(ColMsgList & top)
 {
-    while (msgs.getFirst() != 0)
-        msgs.getFirst()->delete_it(FALSE, top);	// remove msg
+    while (!msgs.isEmpty())
+        msgs.first()->delete_it(FALSE, top);	// remove msg
 }
 
 bool CodMsgSupport::supports(BrowserNode * bn)
 {
     BasicData * data = bn->get_data();
-    ColMsg * msg;
 
-    for (msg = msgs.first(); msg != 0; msg = msgs.next())
+    foreach (ColMsg *msg, msgs)
         if ((BasicData *) msg->get_operation() == data)
             return TRUE;
 
diff --git a/src/diagram/CodMsgSupport.h b/src/diagram/CodMsgSupport.h
index c9ea80817..1cb2d295d 100644
--- a/src/diagram/CodMsgSupport.h
+++ b/src/diagram/CodMsgSupport.h
@@ -28,7 +28,7 @@
 #ifndef CODMSGSUPPORT_H
 #define CODMSGSUPPORT_H
 
-#include <qlist.h>
+#include <QList>
 
 #include "Settings.h"
 #include "ColMsg.h"
diff --git a/src/diagram/CodObjCanvas.cpp b/src/diagram/CodObjCanvas.cpp
index 73303e127..75a67ccb5 100644
--- a/src/diagram/CodObjCanvas.cpp
+++ b/src/diagram/CodObjCanvas.cpp
@@ -85,15 +85,15 @@ void CodObjCanvas::moveBy(double dx, double dy)
 
 void CodObjCanvas::set_z(double z)
 {
-    setZ(z);
+    setZValue(z);
 
     if (self_link)
-        self_link->setZ(z - 0.5);
+        self_link->setZValue(z - 0.5);
 }
 
 QString CodObjCanvas::may_start(UmlCode & l) const
 {
-    return ((l != UmlSelfLink) || (self_link == 0)) ? QString() : TR("illegal");
+    return ((l != UmlSelfLink) || (self_link == 0)) ? QString() :  QObject::tr("illegal");
 }
 
 QString CodObjCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
@@ -101,13 +101,13 @@ QString CodObjCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlClass:
     case UmlClassInstance:
-        return (l == UmlLink) ? QString() : TR("illegal");
+        return (l == UmlLink) ? QString() :  QObject::tr("illegal");
 
     default:
-        return TR("illegal");
+        return  QObject::tr("illegal");
     }
 }
 
@@ -144,17 +144,15 @@ void CodObjCanvas::get_all_in_all_out(ColMsgList & all_in, ColMsgList & all_out)
         all_out = all_in;
     }
 
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    for (; it.current() != 0; ++it) {
+    foreach (ArrowCanvas *canvas, lines) {
         CodDirsCanvas * dirs;
 
-        if ((it.current()->type() == UmlLink) &&
-            ((dirs = ((CodLinkCanvas *) it.current())->find_dirs()) != 0)) {
+        if ((canvas->typeUmlCode() == UmlLink) &&
+            ((dirs = ((CodLinkCanvas *) canvas)->find_dirs()) != 0)) {
             CodObjCanvas * from;
             CodObjCanvas * to;
 
-            ((CodLinkCanvas *) it.current())->get_start_end(from, to);
+            ((CodLinkCanvas *) canvas)->get_start_end(from, to);
 
             if (this == to)
                 ColMsg::get_all_in_all_out(all_in, all_out, dirs->get_msgs());
@@ -170,4 +168,3 @@ CodObjCanvas * CodObjCanvas::read(char *& st, UmlCanvas * canvas)
 
     return CodClassInstCanvas::read(st, canvas, k);
 }
-
diff --git a/src/diagram/CodObjCanvas.h b/src/diagram/CodObjCanvas.h
index 3c055e8f6..2900a9c59 100644
--- a/src/diagram/CodObjCanvas.h
+++ b/src/diagram/CodObjCanvas.h
@@ -45,18 +45,18 @@ class CodObjCanvas : public DiagramCanvas
                  int x, int y, int w, int h, int id);
     virtual ~CodObjCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
 
-    virtual void moveBy(double dx, double dy);
-    virtual void set_z(double z);
+    virtual void moveBy(double dx, double dy) override;
+    virtual void set_z(double z) override;
 
     virtual BrowserClass * get_class() const;
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void change_scale();
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void change_scale() override;
 
     virtual QString get_full_name() const = 0;
     void get_all_in_all_out(ColMsgList & all_in, ColMsgList & all_out) const;
diff --git a/src/diagram/CodSelfLinkCanvas.cpp b/src/diagram/CodSelfLinkCanvas.cpp
index 7ed03e63f..9894d5497 100644
--- a/src/diagram/CodSelfLinkCanvas.cpp
+++ b/src/diagram/CodSelfLinkCanvas.cpp
@@ -31,7 +31,7 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -57,7 +57,7 @@ CodSelfLinkCanvas::CodSelfLinkCanvas(UmlCanvas * canvas, CodObjCanvas * o,
                     SELF_LINK_RADIUS * 2, id),
     obj(o)
 {
-    setZ(o->z() - 0.5);
+    setZValue(o->zValue() - 0.5);
     browser_node = canvas->browser_diagram();
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
     compute_pos(p);
@@ -85,7 +85,7 @@ void CodSelfLinkCanvas::remove_it(ColMsg * msg)
     if (unsubscribe(oper_data))
         disconnect(oper_data, 0, this, 0);
 
-    msgs.removeRef(msg);
+    msgs.removeOne(msg);
 }
 
 void CodSelfLinkCanvas::delete_available(BooL &, BooL & out_model) const
@@ -148,7 +148,7 @@ void CodSelfLinkCanvas::compute_pos(QPoint p)
 
 void CodSelfLinkCanvas::update_label_pos()
 {
-    if (!label->selected())
+    if (!label->isSelected())
         label->move_outside(rect(), angle);
 }
 
@@ -166,23 +166,22 @@ void CodSelfLinkCanvas::update_msgs()
 
         the_canvas()->browser_diagram()->get_collaborationdiagramsettings(dflt);
 
-        Q3PtrListIterator<ColMsg> it(msgs);
         QString nl = "\n";
         QString null;
         const QString * pfix = &null;
 
-        for (; it.current() != 0; ++it) {
-            const BasicData * oper_data = it.current()->get_operation();
+        foreach (ColMsg *msg, msgs) {
+            const BasicData *oper_data = msg->get_operation();
 
             if ((oper_data != 0) && subscribe(oper_data)) {
                 connect(oper_data, SIGNAL(changed()), this, SLOT(modified()));
                 connect(oper_data, SIGNAL(deleted()), this, SLOT(modified()));
             }
 
-            QString m = it.current()->def(dflt.show_hierarchical_rank == UmlYes,
-                                          dflt.show_full_operations_definition == UmlYes,
-                                          dflt.drawing_language,
-                                          dflt.show_msg_context_mode);
+            QString m = msg->def(dflt.show_hierarchical_rank == UmlYes,
+                                 dflt.show_full_operations_definition == UmlYes,
+                                 dflt.drawing_language,
+                                 dflt.show_msg_context_mode);
 
             if (!m.isEmpty()) {
                 s += *pfix + m;
@@ -230,7 +229,7 @@ void CodSelfLinkCanvas::draw(QPainter & p)
     if (! visible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
-    QPoint ce = center();
+    QPoint ce = rect().center();//center();
 
     p.save();
     p.translate(ce.x(), ce.y());
@@ -252,7 +251,15 @@ void CodSelfLinkCanvas::draw(QPainter & p)
     p.restore();
 }
 
-UmlCode CodSelfLinkCanvas::type() const
+void CodSelfLinkCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode CodSelfLinkCanvas::typeUmlCode() const
 {
     return UmlSelfLink;
 }
@@ -266,20 +273,23 @@ void CodSelfLinkCanvas::open()
 
 void CodSelfLinkCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m;
-
-    MenuFactory::createTitle(m, TR("Self link"));
-    m.insertSeparator();
-    m.insertItem(TR("Add messages"), 1);
-    m.insertSeparator();
-    m.insertItem(TR("Edit its messages"), 2);
-    m.insertItem(TR("Edit all the messages"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 4);
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 5);
-
-    switch (m.exec(QCursor::pos())) {
+    QMenu m;
+
+    MenuFactory::createTitle(m, tr("Self link"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Add messages"), 1);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit its messages"), 2);
+    MenuFactory::addItem(m, tr("Edit all the messages"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 5);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (retAction->data().toInt()) {
     case 1: {
         CodAddMsgDialog d(obj, obj, this, (ColDiagramView *) the_canvas()->get_view(),
                           TRUE);
@@ -323,18 +333,19 @@ void CodSelfLinkCanvas::menu(const QPoint &)
     default:
         return;
     }
+    }
 
     package_modified();
 }
 
 QString CodSelfLinkCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString CodSelfLinkCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 bool CodSelfLinkCanvas::copyable() const
@@ -403,7 +414,7 @@ CodSelfLinkCanvas * CodSelfLinkCanvas::read(char *& st, UmlCanvas * canvas,
             new CodSelfLinkCanvas(canvas, o, p, id);
 
         o->set_self_link(result);
-        result->setZ(o->z() - 0.5);
+        result->setZValue(o->zValue() - 0.5);
 
         k = read_keyword(st);
         result->settings.read(st, k);		// updates k
@@ -414,7 +425,7 @@ CodSelfLinkCanvas * CodSelfLinkCanvas::read(char *& st, UmlCanvas * canvas,
             if (read_file_format() < 5) {
                 read_keyword(st, "xy");
                 read_xy(st, result->label);
-                //result->label->setZ(OLD_LABEL_Z);
+                //result->label->setZValue(OLD_LABEL_Z);
             }
             else {
                 read_keyword(st, "xyz");
@@ -449,10 +460,8 @@ void CodSelfLinkCanvas::history_load(QBuffer & b)
     ::load(delta_y, b);
     ::load(angle, b);
 
-    Q3PtrListIterator<ColMsg> it(msgs);
-
-    for (; it.current() != 0; ++it) {
-        const BasicData * oper_data = it.current()->get_operation();
+    foreach (ColMsg *msg, msgs) {
+        const BasicData *oper_data = msg->get_operation();
 
         if ((oper_data != 0) && subscribe(oper_data)) {
             connect(oper_data, SIGNAL(changed()), this, SLOT(modified()));
@@ -466,13 +475,10 @@ void CodSelfLinkCanvas::history_hide()
     DiagramCanvas::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 
-    Q3PtrListIterator<ColMsg> it(msgs);
-
-    for (; it.current() != 0; ++it) {
-        const BasicData * oper_data = it.current()->get_operation();
+    foreach (ColMsg *msg, msgs) {
+        const BasicData * oper_data = msg->get_operation();
 
         if ((oper_data != 0) && unsubscribe(oper_data))
             disconnect(oper_data, 0, this, 0);
     }
 }
-
diff --git a/src/diagram/CodSelfLinkCanvas.h b/src/diagram/CodSelfLinkCanvas.h
index 11716bee5..5b4e963fd 100644
--- a/src/diagram/CodSelfLinkCanvas.h
+++ b/src/diagram/CodSelfLinkCanvas.h
@@ -51,6 +51,7 @@ class CodSelfLinkCanvas : public QObject, public DiagramCanvas, public CodMsgSup
     double angle;
     CodObjCanvas * obj;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     CodSelfLinkCanvas(UmlCanvas * canvas, CodObjCanvas * o,
                       const QPoint & p, int id);
@@ -59,29 +60,29 @@ class CodSelfLinkCanvas : public QObject, public DiagramCanvas, public CodMsgSup
     void update_pos();
     void compute_pos(QPoint p);
     void update_label_pos();
-    virtual void update_msgs();
+    virtual void update_msgs() override;
     virtual void get_from_to(CodObjCanvas *& from, CodObjCanvas *& to,
-                             bool forward);
-    virtual bool copyable() const;
+                             bool forward) override;
+    virtual bool copyable() const override;
 
-    virtual void delete_it();
-    virtual void remove_it(ColMsg * msg);
+    virtual void delete_it() override;
+    virtual void remove_it(ColMsg * msg) override;
 
     virtual void draw(QPainter & p);
-    virtual void moveBy(double dx, double dy);
+    virtual void moveBy(double dx, double dy) override;
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual bool represents(BrowserNode *);
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual bool represents(BrowserNode *) override;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static CodSelfLinkCanvas * read(char *& st, UmlCanvas * canvas, char *& k);
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 protected slots:
     void modified();
diff --git a/src/diagram/ColDiagramView.cpp b/src/diagram/ColDiagramView.cpp
index 7cf3e059e..a0ef73cd6 100644
--- a/src/diagram/ColDiagramView.cpp
+++ b/src/diagram/ColDiagramView.cpp
@@ -30,7 +30,7 @@
 
 
 #include <qfont.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -78,15 +78,15 @@ void ColDiagramView::update_msgs()
 
 void ColDiagramView::update_msg_supports()
 {
-    Q3CanvasItemList l = canvas()->allItems();
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> l = canvas()->items();
+    QList<QGraphicsItem*>::Iterator it;
 
     for (it = l.begin(); it != l.end(); ++it) {
-        if ((*it)->visible()) { // at least not deleted
+        if ((*it)->isVisible()) { // at least not deleted
             DiagramItem * di = QCanvasItemToDiagramItem(*it);
 
             if (di != 0) {
-                switch (di->type()) {
+                switch (di->typeUmlCode()) {
                 case UmlSelfLink:
                     ((CodSelfLinkCanvas *) di)->update_msgs();
                     break;
@@ -105,13 +105,13 @@ void ColDiagramView::update_msg_supports()
 
 void ColDiagramView::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Communication diagram menu"));
+    MenuFactory::createTitle(m, tr("Communication diagram menu"));
 
     if ((((UmlCanvas *) canvas())->browser_diagram())->is_writable()) {
-        m.insertSeparator();
-        m.insertItem(TR("Edit all the messages"), 29);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Edit all the messages"), 29);
     }
 
     switch (default_menu(m, 30)) {
@@ -134,11 +134,13 @@ void ColDiagramView::menu(const QPoint &)
     }
 }
 
-void ColDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void ColDiagramView::mousePressEvent(QMouseEvent * e)
 {
     if (!window()->frozen()) {
+        QPoint diagramPoint(e->x(), e->y());
+        QPointF scenePoint = mapToScene(diagramPoint);
         if (e->button() == ::Qt::RightButton)
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
         else {
             UmlCode c = window()->buttonOn();
 
@@ -157,7 +159,7 @@ void ColDiagramView::contentsMousePressEvent(QMouseEvent * e)
                 if (b != 0) {
                     CodClassInstCanvas * cl =
                         new CodClassInstCanvas(b, the_canvas(),
-                                               e->x(), e->y(), 0);
+                                               scenePoint.x(), scenePoint.y(), 0);
 
                     cl->show();
                     cl->upper();
@@ -182,7 +184,7 @@ void ColDiagramView::contentsMousePressEvent(QMouseEvent * e)
                 if (b != 0) {
                     CodClassInstCanvas * cl =
                         new CodClassInstCanvas(b, the_canvas(),
-                                               e->x(), e->y(), 0);
+                                               scenePoint.x(), scenePoint.y(), 0);
 
                     cl->show();
                     cl->upper();
@@ -199,7 +201,7 @@ void ColDiagramView::contentsMousePressEvent(QMouseEvent * e)
                 window()->selectOn();
                 history_save();
 
-                Q3CanvasItem * ci = the_canvas()->collision(e->pos());
+                QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint());
 
                 if (ci != 0) {
                     DiagramItem * i = QCanvasItemToDiagramItem(ci);
@@ -210,7 +212,7 @@ void ColDiagramView::contentsMousePressEvent(QMouseEvent * e)
                         if (!err.isEmpty())
                             msg_critical("Douml", err);
                         else {
-                            i->connexion(c, i, e->pos(), e->pos());
+                            i->connexion(c, i, scenePoint.toPoint(), scenePoint.toPoint());
                             window()->package_modified();
                         }
                     }
@@ -222,13 +224,13 @@ void ColDiagramView::contentsMousePressEvent(QMouseEvent * e)
             break;
 
             default:
-                DiagramView::contentsMousePressEvent(e);
+                DiagramView::mousePressEvent(e);
                 break;
             }
         }
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
 void ColDiagramView::dragEnterEvent(QDragEnterEvent * e)
@@ -251,11 +253,30 @@ void ColDiagramView::dragEnterEvent(QDragEnterEvent * e)
         e->ignore();
 }
 
+void ColDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+    if (!window()->frozen() &&
+        (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlClassInstance, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
+        e->accept();
+    else
+        e->ignore();
+}
+
 void ColDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
-
+    QPointF p = mapToScene(e->pos());
     if ((bn = UmlDrag::decode(e, UmlClassInstance)) != 0) {
         history_save();
 
@@ -320,8 +341,7 @@ void ColDiagramView::dropEvent(QDropEvent * e)
 void ColDiagramView::save(QTextStream & st, QString & warning,
                           bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
+    DiagramItemList items(canvas()->items());
 
     if (!copy)
         // sort is useless for a copy
@@ -331,8 +351,8 @@ void ColDiagramView::save(QTextStream & st, QString & warning,
 
     // save first the packages fragment, classes instances, notes, icons and text
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlPackage:
         case UmlFragment:
         case UmlClass:
@@ -352,8 +372,8 @@ void ColDiagramView::save(QTextStream & st, QString & warning,
 
     // then save links selflink and dirs (without messages)
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlLink:	// saves associated dirs
         case UmlSelfLink:
             if (!copy || di->copyable())
@@ -370,8 +390,8 @@ void ColDiagramView::save(QTextStream & st, QString & warning,
 
     // then save anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    foreach (DiagramItem *di, items)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
 
     if (!copy && (preferred_zoom != 0)) {
@@ -413,14 +433,14 @@ void ColDiagramView::read(char * st, char * k)
     k = read_keyword(st);
 
     // then show/update msgs
-    Q3CanvasItemList items = canvas->allItems();
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> items = canvas->items();
+    QList<QGraphicsItem*>::Iterator it;
 
     for (it = items.begin(); it != items.end(); ++it) {
         DiagramItem * di = QCanvasItemToDiagramItem(*it);
 
         if (di != 0) {
-            switch (di->type()) {
+            switch (di->typeUmlCode()) {
             case UmlSelfLink:
                 ((CodSelfLinkCanvas *) di)->update_msgs();
                 break;
@@ -454,7 +474,7 @@ void ColDiagramView::read(char * st, char * k)
 
 void ColDiagramView::send(ToolCom * com)
 {
-    Q3CanvasItemList l = canvas()->allItems();
+    QList<QGraphicsItem*> l = canvas()->items();
 
     //FragmentCanvas::send(com, l);
     CodClassInstCanvas::send(com, l);
diff --git a/src/diagram/ColDiagramView.h b/src/diagram/ColDiagramView.h
index b28bb9a79..ff9e04761 100644
--- a/src/diagram/ColDiagramView.h
+++ b/src/diagram/ColDiagramView.h
@@ -44,6 +44,7 @@ class ToolCom;
 
 class ColDiagramView : public DiagramView
 {
+    Q_OBJECT
 protected:
     ColMsgList msgs;
 
@@ -56,9 +57,9 @@ class ColDiagramView : public DiagramView
     void update_msgs();
     void update_msg_supports();
 
-    virtual void menu(const QPoint &);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+    virtual void menu(const QPoint &) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
     void send(ToolCom * com);
 
@@ -68,9 +69,10 @@ class ColDiagramView : public DiagramView
     };
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent *e) override;
 };
 
 #endif
diff --git a/src/diagram/ColDiagramWindow.cpp b/src/diagram/ColDiagramWindow.cpp
index 87d1f5ba7..ff98bc5a5 100644
--- a/src/diagram/ColDiagramWindow.cpp
+++ b/src/diagram/ColDiagramWindow.cpp
@@ -30,10 +30,10 @@
 
 
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+#include <QMdiArea>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qspinbox.h>
 
@@ -44,6 +44,7 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
+#include "toolbarfactory.h"
 
 extern QString addmodeledclassinstanceText();
 extern QString addclassinstanceText();
@@ -53,11 +54,11 @@ extern QString noteText();
 extern QString anchorText();
 static QString linkText()
 {
-    return TR("Click this button to add a <i>link</i>");
+    return  QObject::tr("Click this button to add a <i>link</i>");
 }
 static QString selflinkText()
 {
-    return TR("Click this button to add a <i>self link</i>");
+    return  QObject::tr("Click this button to add a <i>self link</i>");
 }
 extern QString textText();
 extern QString imageText();
@@ -66,77 +67,79 @@ extern QString imageText();
 ColDiagramWindow::ColDiagramWindow(const QString & s, BrowserColDiagram * b, int id)
     : DiagramWindow(b, s), view(0)
 {
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "communication diagram operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
+    QToolBar * toolbar = new QToolBar("communication diagram operations", this);
+    toolbar->setMinimumHeight(50);
+    toolbar->setOrientation(Qt::Horizontal);
+    addToolBar(Qt::TopToolBarArea, toolbar);
 
     add_edit_button(toolbar);
 
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton, tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar, "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
+    select->setCheckable(TRUE);
+    select->setChecked(TRUE);
     current_button = UmlSelect;
 
     addPackage
-        = new QToolButton(*packageButton, TR("Add Package"), QString(),
+        = ToolBarFactory::createToolButton(*packageButton, tr("Add Package"), QString(),
                           this, SLOT(hit_package()), toolbar, "add package");
-    addPackage->setToggleButton(TRUE);
-    Q3WhatsThis::add(addPackage, addpackageText());
+    addPackage->setCheckable(TRUE);
+    addPackage->setWhatsThis(addpackageText());
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("Add Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton, tr("Add Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar, "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis(addfragmentText());
 
     addClassInstance
-        = new QToolButton(*classinstanceButton, TR("Add modeled Class instance"), QString(),
+        = ToolBarFactory::createToolButton(*classinstanceButton, tr("Add modeled Class instance"), QString(),
                           this, SLOT(hit_classinstance()), toolbar, "add modeled class instance");
-    addClassInstance->setToggleButton(TRUE);
-    Q3WhatsThis::add(addClassInstance, addmodeledclassinstanceText());
+    addClassInstance->setCheckable(TRUE);
+    addClassInstance->setWhatsThis(addmodeledclassinstanceText());
 
     addClass
-        = new QToolButton(*classButton, TR("Add Class instance"), QString(),
+        = ToolBarFactory::createToolButton(*classButton, tr("Add Class instance"), QString(),
                           this, SLOT(hit_class()), toolbar, "add class instance");
-    addClass->setToggleButton(TRUE);
-    Q3WhatsThis::add(addClass, addclassinstanceText());
+    addClass->setCheckable(TRUE);
+    addClass->setWhatsThis(addclassinstanceText());
 
     addLink =
-        new QToolButton(*associationButton, TR("Add Link"), QString(),
+        ToolBarFactory::createToolButton(*associationButton, tr("Add Link"), QString(),
                         this, SLOT(hit_link()), toolbar, "add link");
-    addLink->setToggleButton(TRUE);
-    Q3WhatsThis::add(addLink, linkText());
+    addLink->setCheckable(TRUE);
+    addLink->setWhatsThis(linkText());
 
     addSelfLink =
-        new QToolButton(*selflinkButton, TR("Add Self Link"), QString(),
+        ToolBarFactory::createToolButton(*selflinkButton, tr("Add Self Link"), QString(),
                         this, SLOT(hit_selflink()), toolbar, "add self link");
-    addSelfLink->setToggleButton(TRUE);
-    Q3WhatsThis::add(addSelfLink, selflinkText());
+    addSelfLink->setCheckable(TRUE);
+    addSelfLink->setWhatsThis(selflinkText());
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton, tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar, "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis(noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton, tr("Anchor"), QString(),
                         this, SLOT(hit_anchor()), toolbar, "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis(anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton, tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar, "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis(textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton, tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+    image->setWhatsThis(imageText());
 
     toolbar->addSeparator();
 
@@ -150,9 +153,9 @@ ColDiagramWindow::ColDiagramWindow(const QString & s, BrowserColDiagram * b, int
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
+    QMdiArea * w = UmlWindow::get_workspace();
 
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -190,19 +193,19 @@ void ColDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
 
-    select->setOn(FALSE);
-    addPackage->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    addClass->setOn(FALSE);
-    addClassInstance->setOn(FALSE);
-    addLink->setOn(FALSE);
-    addSelfLink->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addPackage->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    addClass->setChecked(FALSE);
+    addClassInstance->setChecked(FALSE);
+    addLink->setChecked(FALSE);
+    addSelfLink->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/ColDiagramWindow.h b/src/diagram/ColDiagramWindow.h
index b8c6a0843..41051274d 100644
--- a/src/diagram/ColDiagramWindow.h
+++ b/src/diagram/ColDiagramWindow.h
@@ -57,9 +57,9 @@ class ColDiagramWindow : public DiagramWindow
     ColDiagramWindow(const QString & s, BrowserColDiagram *, int id = -1);
     virtual ~ColDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_class();
diff --git a/src/diagram/ColMsg.cpp b/src/diagram/ColMsg.cpp
index 7d7fc21e0..c203d3703 100644
--- a/src/diagram/ColMsg.cpp
+++ b/src/diagram/ColMsg.cpp
@@ -42,21 +42,24 @@
 #include "CodDirsCanvas.h"
 #include "myio.h"
 #include "ToolCom.h"
-//Added by qt3to4:
 #include <QTextStream>
-#include <Q3PtrCollection>
 
-int ColMsgList::compareItems(Q3PtrCollection::Item item1,
-                             Q3PtrCollection::Item item2)
+void ColMsgList::sort()
 {
-    unsigned r1 = ((ColMsg *) item1)->get_rank();
-    unsigned r2 = ((ColMsg *) item2)->get_rank();
+    std::sort(begin(), end(), compareItems);
+}
+
+bool ColMsgList::compareItems(ColMsg *a,
+                              ColMsg *b)
+{
+    unsigned r1 = ((ColMsg *) a)->get_rank();
+    unsigned r2 = ((ColMsg *) b)->get_rank();
 
     if (r1 == r2)
         // in case sort compare an item with itself
         return 0;
 
-    return (r1 > r2) ? 1 : -1;
+    return r1 > r2;
 }
 
 //
@@ -77,8 +80,8 @@ void ColMsg::delete_it(bool rec, ColMsgList & top)
         delete_it_internal();
     else {
         // moves sub messages at toplevel
-        while (msgs.first() != 0)
-            top.append(msgs.take());
+        top << msgs;
+        msgs.clear();
 
         // remove it from (self)link
         in->remove_it(this);
@@ -90,8 +93,9 @@ void ColMsg::delete_it(bool rec, ColMsgList & top)
 void ColMsg::delete_it_internal()
 {
     // delete sub msgs
-    while (!msgs.isEmpty())
-        msgs.take()->delete_it_internal();
+    foreach (ColMsg *msg, msgs)
+        msg->delete_it_internal();
+    msgs.clear();
 
     // remove it from (self)link
     in->remove_it(this);
@@ -104,18 +108,16 @@ void ColMsg::delete_it_internal()
 
 bool ColMsg::extract_it(ColMsgList & top)
 {
-    Q3PtrListIterator<ColMsg> it(top);
-    int index;
-
-    for (index = 0; it.current(); ++it, index += 1) {
-        if (it.current() == this) {
-            top.remove(index);
+    int index = 0;
+    foreach (ColMsg *msg, top) {
+        if (msg == this) {
+            top.removeAt(index);
             return TRUE;
         }
 
-        if (extract_it(it.current()->msgs))
+        if (extract_it(msg->msgs))
             return TRUE;
-
+        ++index;
     }
 
     return FALSE;
@@ -149,7 +151,7 @@ QString ColMsg::def(bool hierarchical, bool full,
 
 QString ColMsg::next_hierarchical_rank() const
 {
-    int index = hierarchical_rank.findRev('.');
+    int index = hierarchical_rank.lastIndexOf('.');
 
     return (index == -1)
            ? QString::number(hierarchical_rank.toUInt() + 1)
@@ -160,11 +162,11 @@ QString ColMsg::next_hierarchical_rank() const
 void ColMsg::update_ranks(ColMsgList & msgs)
 {
     unsigned rank = 0;
-    unsigned hi_rank;
-    Q3PtrListIterator<ColMsg> it(msgs);
-
-    for (hi_rank = 1; it.current() != 0; ++it, hi_rank += 1)
-        it.current()->update_ranks(rank, QString::number(hi_rank));	// rank is updated
+    unsigned hi_rank = 1;
+    foreach (ColMsg *msg, msgs) {
+        msg->update_ranks(rank, QString::number(hi_rank));	// rank is updated
+        ++hi_rank;
+    }
 }
 
 void ColMsg::update_ranks(unsigned & r, QString hr)
@@ -174,20 +176,19 @@ void ColMsg::update_ranks(unsigned & r, QString hr)
 
     hr += '.';
 
-    unsigned hi_rank;
-    Q3PtrListIterator<ColMsg> it(msgs);
-
-    for (hi_rank = 1; it.current() != 0; ++it, hi_rank += 1)
-        it.current()->update_ranks(r, hr + QString::number(hi_rank));
+    unsigned hi_rank = 1;
+    foreach (ColMsg *msg, msgs) {
+        msg->update_ranks(r, hr + QString::number(hi_rank));
+        ++hi_rank;
+    }
 }
 
 void ColMsg::update_rank(unsigned & r)
 {
     absolute_rank = ++r;
-    Q3PtrListIterator<ColMsg> it(msgs);
 
-    for (; it.current() != 0; ++it)
-        it.current()->update_rank(r);
+    foreach (ColMsg *msg, msgs)
+        msg->update_rank(r);
 }
 
 ColMsg * ColMsg::new_one(const OperationData * d, const QString & e, bool f,
@@ -202,15 +203,17 @@ ColMsg * ColMsg::new_one(const OperationData * d, const QString & e, bool f,
 
 void ColMsg::place_in_its_support()
 {
-    unsigned index;
-    Q3PtrListIterator<ColMsg> it(in->get_msgs());
-    const char * hr = hierarchical_rank;
 
-    for (index = 0; it.current() != 0; ++it, index += 1) {
-        if (!gt(hr, it.current()->hierarchical_rank)) {
+    QByteArray byteArray = hierarchical_rank.toLatin1();
+    const char * hr = byteArray.constData();
+
+    unsigned index = 0;
+    foreach (ColMsg *msg, in->get_msgs()) {
+        if (!gt(hr, msg->hierarchical_rank.toLatin1().constData())) {
             in->get_msgs().insert(index, this);
             return;
         }
+        ++index;
     }
 
     in->get_msgs().append(this);
@@ -223,10 +226,9 @@ void ColMsg::place_in(ColMsgList & l)
 
     // lazy implementation where all the objects's rank is updated
     unsigned r = 0;
-    Q3PtrListIterator<ColMsg> it(l);
 
-    for (; it.current() != 0; ++it)
-        it.current()->update_rank(r);
+    foreach (ColMsg *msg, l)
+        msg->update_rank(r);
 }
 
 void ColMsg::place_in_internal(ColMsgList & l)
@@ -235,13 +237,17 @@ void ColMsg::place_in_internal(ColMsgList & l)
     int ndots = hierarchical_rank.count('.'); //[lgfreitas] contains now returns a bool
 
     for (;;) {
-        Q3PtrListIterator<ColMsg> it(*pl);
-        ColMsg * m;
+        QListIterator<ColMsg *> it(*pl);
+        ColMsg * m = 0;
         unsigned index = pl->count();
 
-        for (it.toLast(), index = pl->count(); (m = it.current()) != 0; --it, index -= 1)
-            if (gt(hierarchical_rank, m->hierarchical_rank))
+        it.toBack();
+        while (it.hasPrevious()) {
+            m = it.previous();
+            if (gt(hierarchical_rank.toLatin1().constData(), m->hierarchical_rank.toLatin1().constData()))
                 break;
+            --index;
+        }
 
         if ((m == 0) || // must be the first one
             (m->hierarchical_rank.contains('.') == ndots)) {	// must be placed after m
@@ -257,30 +263,26 @@ void ColMsg::place_in_internal(ColMsgList & l)
 void ColMsg::get_all_in_all_out(ColMsgList & all_in, ColMsgList & all_out,
                                 const ColMsgList & msgs)
 {
-    Q3PtrListIterator<ColMsg> it(msgs);
-
-    for (; it.current() != 0; ++it) {
-        ColMsgList & l = (it.current()->is_forward) ? all_in : all_out;
-        const QString & hi = it.current()->hierarchical_rank;
+    foreach (ColMsg *msg, msgs) {
+        ColMsgList & l = (msg->is_forward) ? all_in : all_out;
+        const QString & hi = msg->hierarchical_rank;
 
-        unsigned index;
-        Q3PtrListIterator<ColMsg> it2(l);
-
-        for (index = 0; it2.current() != 0; index += 1, ++it2)
-            if (lt(hi, it2.current()->hierarchical_rank))
+        unsigned index = 0;
+        foreach (ColMsg *nestedMsg, l) {
+            if (lt(hi.toLatin1().constData(), nestedMsg->hierarchical_rank.toLatin1().constData()))
                 break;
+            ++index;
+        }
 
-        l.insert(index, it.current());
+        l.insert(index, msg);
     }
 }
 
 ColMsg * ColMsg::find(const QString & hi, ColMsgList & l)
 {
-    Q3PtrListIterator<ColMsg> it(l);
-
-    for (; it.current(); ++it)
-        if ((*it)->hierarchical_rank == hi)
-            return *it;
+    foreach (ColMsg *msg, l)
+        if (msg->hierarchical_rank == hi)
+            return msg;
 
     return 0;
 }
@@ -289,17 +291,17 @@ ColMsg * ColMsg::find(const QString & hi, ColMsgList & l)
 
 ColMsg * ColMsg::find_rec(const QString & hr, ColMsgList & top)
 {
-    Q3PtrListIterator<ColMsg> it(top);
-    int index;
+    int index = 0;
 
-    for (index = 0; it.current(); ++it, index += 1) {
-        if (it.current()->hierarchical_rank == hr)
-            return it.current();
+    foreach (ColMsg *msg, top) {
+        if (msg->hierarchical_rank == hr)
+            return msg;
 
-        ColMsg * result = find_rec(hr, it.current()->msgs);
+        ColMsg * result = find_rec(hr, msg->msgs);
 
         if (result != 0)
             return result;
+        ++index;
     }
 
     return 0;
@@ -311,7 +313,7 @@ unsigned ColMsg::last_rank(const ColMsgList & l)
     const ColMsgList * pl = &l;
 
     while (!pl->isEmpty()) {
-        ColMsg * m = pl->getLast();
+        ColMsg * m = pl->last();
 
         result = m->absolute_rank;
         pl = &m->msgs;
@@ -375,10 +377,7 @@ void ColMsg::save(QTextStream & st, const ColMsgList & l, bool copy,
     nl_indent(st);
 
     bool first_one = TRUE;
-    Q3PtrListIterator<ColMsg> it(l);
-    ColMsg * msg;
-
-    for (; (msg = it.current()) != 0; ++it) {
+    foreach (ColMsg *msg, l) {
         if (copy && !msg->in->copyable())
             continue;
 
@@ -501,11 +500,9 @@ void ColMsg::read(char *& st, ColMsgList & l, UmlCanvas * canvas)
 
 void ColMsg::get_all(const ColMsgList & l, ColMsgList & r)
 {
-    Q3PtrListIterator<ColMsg> it(l);
-
-    for (; it.current(); ++it) {
-        r.append(it.current());
-        get_all(it.current()->msgs, r);
+    foreach (ColMsg *msg, l) {
+        r.append(msg);
+        get_all(msg->msgs, r);
     }
 }
 
@@ -518,9 +515,7 @@ void ColMsg::send(ToolCom * com, const ColMsgList & l)
 
     com->write_unsigned(lm.count());
 
-    ColMsg * msg;
-
-    for (msg = lm.first(); msg != 0; msg = lm.next()) {
+    foreach (ColMsg *msg, lm) {
         if (msg->operation == 0) {
             com->write_id(0);
             com->write_string(msg->explicit_operation);
@@ -540,6 +535,6 @@ void ColMsg::send(ToolCom * com, const ColMsgList & l)
         com->write_unsigned((unsigned) to->get_ident());
 
         com->write_unsigned(msg->absolute_rank);
-        com->write_string((const char *) msg->hierarchical_rank);
+        com->write_string((const char *) msg->hierarchical_rank.toLatin1().constData());
     }
 }
diff --git a/src/diagram/ColMsg.h b/src/diagram/ColMsg.h
index 66f1b0703..989c0a901 100644
--- a/src/diagram/ColMsg.h
+++ b/src/diagram/ColMsg.h
@@ -29,7 +29,7 @@
 #define COLMSG_H
 
 #include <qstring.h>
-#include <qlist.h>
+#include <QList>
 
 #include "UmlEnum.h"
 
@@ -44,14 +44,16 @@ class ToolCom;
 
 class ColMsg;
 //[lgfreitas] replacing qcollection by q3ptrcollection
-#include <q3ptrcollection.h>
+//#include <q3ptrcollection.h>
 //[lgfreitas] q3ptrlist needed
-#include <q3ptrlist.h>
+//
 
-class ColMsgList : public Q3PtrList<ColMsg>
+class ColMsgList : public QList<ColMsg *>
 {
+public:
+    void sort();
 protected:
-    virtual int compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2);
+    static bool compareItems(ColMsg *a, ColMsg *b);
 };
 
 
diff --git a/src/diagram/ComponentCanvas.cpp b/src/diagram/ComponentCanvas.cpp
index e54827ed2..ccb963105 100644
--- a/src/diagram/ComponentCanvas.cpp
+++ b/src/diagram/ComponentCanvas.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 #include <QPixmap>
 
 #include "ComponentCanvas.h"
@@ -164,9 +164,9 @@ void ComponentCanvas::compute_size()
             min_width = w;
 
         BrowserComponent * comp = (BrowserComponent *) browser_node;
-        const Q3ValueList<BrowserClass *> & pr = comp->get_provided_classes();
-        const Q3ValueList<BrowserClass *> & rq = comp->get_required_classes();
-        const Q3ValueList<BrowserClass *> & rz = comp->get_realizing_classes();
+        const QList<BrowserClass *> & pr = comp->get_provided_classes();
+        const QList<BrowserClass *> & rq = comp->get_required_classes();
+        const QList<BrowserClass *> & rz = comp->get_realizing_classes();
         int lh = fm.height() + four;	// line height
 
         if (req_prov && (!pr.isEmpty() || !rq.isEmpty())) {
@@ -180,7 +180,7 @@ void ComponentCanvas::compute_size()
                 if (min_width < w)
                     min_width = w;
 
-                for (Q3ValueList<BrowserClass *>::ConstIterator it = pr.begin();
+                for (QList<BrowserClass *>::ConstIterator it = pr.begin();
                      it != pr.end();
                      it++) {
                     // add a left margin of 14, a right of 2
@@ -202,7 +202,7 @@ void ComponentCanvas::compute_size()
                 if (min_width < w)
                     min_width = w;
 
-                for (Q3ValueList<BrowserClass *>::ConstIterator it = rq.begin();
+                for (QList<BrowserClass *>::ConstIterator it = rq.begin();
                      it != rq.end();
                      it++) {
                     // add a left margin of 14, a right of 2
@@ -228,7 +228,7 @@ void ComponentCanvas::compute_size()
             if (min_width < w)
                 min_width = w;
 
-            for (Q3ValueList<BrowserClass *>::ConstIterator it = rz.begin();
+            for (QList<BrowserClass *>::ConstIterator it = rz.begin();
                  it != rz.end();
                  it++) {
                 // add a left margin of 12
@@ -298,24 +298,24 @@ void ComponentCanvas::compute_size()
 
 void ComponentCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
 
     if (!as_icon) {
         double scale = the_canvas()->zoom();
 
-        setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+        setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     }
 
     compute_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 bool ComponentCanvas::valid(ArrowCanvas * a) const
 {
-    Q3ValueList<BrowserClass *> l;
+    QList<BrowserClass *> l;
 
-    switch (a->type()) {
+    switch (a->typeUmlCode()) {
     case UmlRequired:
         ((BrowserComponent *) browser_node)->get_all_required_classes(l, FALSE);
         break;
@@ -328,7 +328,7 @@ bool ComponentCanvas::valid(ArrowCanvas * a) const
         return TRUE;
     }
 
-    return (l.findIndex(((ArrowJunctionCanvas *) a->get_end())->get_interface()) != -1);
+    return (l.indexOf(((ArrowJunctionCanvas *) a->get_end())->get_interface()) != -1);
 }
 
 void ComponentCanvas::modified()
@@ -342,17 +342,9 @@ void ComponentCanvas::modified()
     check_stereotypeproperties();
 
     // remove required/provided arrow if needed
-    ArrowCanvas * a = lines.first();
-
-    while (a != 0) {
-        if (! valid(a)) {
-            // class removed from required/provided
-            a->delete_it();
-            a = lines.current();
-        }
-        else
-            a = lines.next();
-    }
+    foreach (ArrowCanvas *a, lines)
+        if (! valid(a))
+            a->delete_it(); // class removed from required/provided
 
     if (the_canvas()->must_draw_all_relations())
         draw_all_simple_relations();
@@ -378,21 +370,21 @@ void ComponentCanvas::check_line(ArrowCanvas * l)
 bool ComponentCanvas::connexion(UmlCode action, const QPoint &, const QPoint & p)
 {
     BrowserComponent * comp = (BrowserComponent *) browser_node;
-    Q3ValueList<BrowserClass *> l;
+    QList<BrowserClass *> l;
 
     if (action == UmlProvided)
         comp->get_all_provided_classes(l, TRUE);
     else
         comp->get_all_required_classes(l, TRUE);
 
-    ClassListDialog dialog(TR("Choose class"), l);
+    ClassListDialog dialog(tr("Choose class"), l);
 
     if (dialog.exec() != QDialog::Accepted)
         return FALSE;
 
-    Q3ValueList<BrowserClass *>::ConstIterator it = l.at(dialog.choosen());
+    BrowserClass * it = l.at(dialog.choosen());
     ArrowJunctionCanvas * aj =
-        new ArrowJunctionCanvas(the_canvas(), p.x(), p.y(), *it, 0);
+        new ArrowJunctionCanvas(the_canvas(), p.x(), p.y(), it, 0);
 
     aj->show();
     aj->upper();
@@ -444,17 +436,17 @@ void ComponentCanvas::prepare_for_move(bool on_resize)
     if (! on_resize) {
         DiagramCanvas::prepare_for_move(on_resize);
 
-        Q3CanvasItemList l = collisions(TRUE);
-        Q3CanvasItemList::ConstIterator it;
-        Q3CanvasItemList::ConstIterator end = l.end();
+        QList<QGraphicsItem*> l = collidingItems();
+        QList<QGraphicsItem*>::ConstIterator it;
+        QList<QGraphicsItem*>::ConstIterator end = l.end();
         DiagramItem * di;
         BrowserNode * p = get_bn();
 
         for (it = l.begin(); it != end; ++it) {
-            if ((*it)->visible() && // at least not deleted
-                !(*it)->selected() &&
+            if ((*it)->isVisible() && // at least not deleted
+                !(*it)->isSelected() &&
                 ((di = QCanvasItemToDiagramItem(*it)) != 0) &&
-                (di->type() == UmlComponent) &&
+                (di->typeUmlCode() == UmlComponent) &&
                 (di->get_bn()->parent() == p)) {
                 the_canvas()->select(*it);
                 di->prepare_for_move(FALSE);
@@ -470,16 +462,17 @@ bool ComponentCanvas::move_with_its_package() const
 
 void ComponentCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     const BasicData * data = browser_node->get_data();
     QRect r = rect();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     QColor co = color(used_color);
     const QPixmap * px = 0;
     double zoom = the_canvas()->zoom();
     FILE * fp = svg();
+    QBrush backBrush = p.background();
 
     if (fp != 0)
         fputs("<g>\n", fp);
@@ -495,7 +488,8 @@ void ComponentCanvas::draw(QPainter & p)
         QFontMetrics fm(the_canvas()->get_font(UmlNormalBoldFont));
         const int he = fm.height();
 
-        p.setBackgroundColor(co);
+        backBrush.setColor(co);
+        p.setBackground(backBrush);
 
         if (used_color != UmlTransparent) {
             const int shadow = the_canvas()->shadow();
@@ -558,7 +552,7 @@ void ComponentCanvas::draw(QPainter & p)
                           p.font(), fp);
         }
 
-        r.moveBy(0, r.height());
+        r.translate(0, r.height());
         r.setHeight(he + four);
         p.setFont(the_canvas()->get_font(UmlNormalBoldFont));
         p.drawText(r, ::Qt::AlignCenter, browser_node->get_name());
@@ -600,7 +594,7 @@ void ComponentCanvas::draw(QPainter & p)
                     svg_color(used_color),
                     r2.x(), r2.y(), r2.width() - 1, r2.height() - 1);
 
-        r2.moveBy(0, r.width() >> 1);
+        r2.translate(0, r.width() >> 1);
         p.fillRect(r2, co);
         p.drawRect(r2);
 
@@ -613,9 +607,9 @@ void ComponentCanvas::draw(QPainter & p)
         // compartments
 
         BrowserComponent * comp = (BrowserComponent *) browser_node;
-        const Q3ValueList<BrowserClass *> & pr = comp->get_provided_classes();
-        const Q3ValueList<BrowserClass *> & rq = comp->get_required_classes();
-        const Q3ValueList<BrowserClass *> & rz = comp->get_realizing_classes();
+        const QList<BrowserClass *> & pr = comp->get_provided_classes();
+        const QList<BrowserClass *> & rq = comp->get_required_classes();
+        const QList<BrowserClass *> & rz = comp->get_realizing_classes();
         int lh = fm.height() + four;	// line height
 
         r = re;
@@ -646,7 +640,7 @@ void ComponentCanvas::draw(QPainter & p)
                 r.setLeft(left2);
                 r.setTop(r.top() + lh);
 
-                for (Q3ValueList<BrowserClass *>::ConstIterator it = pr.begin();
+                for (QList<BrowserClass *>::ConstIterator it = pr.begin();
                      it != pr.end();
                      it++) {
                     p.drawText(r, ::Qt::AlignLeft + ::Qt::AlignTop, (*it)->get_name());
@@ -670,7 +664,7 @@ void ComponentCanvas::draw(QPainter & p)
                 r.setLeft(left2);
                 r.setTop(r.top() + lh);
 
-                for (Q3ValueList<BrowserClass *>::ConstIterator it = rq.begin();
+                for (QList<BrowserClass *>::ConstIterator it = rq.begin();
                      it != rq.end();
                      it++) {
                     p.drawText(r, ::Qt::AlignLeft + ::Qt::AlignTop, (*it)->get_name());
@@ -705,7 +699,7 @@ void ComponentCanvas::draw(QPainter & p)
             r.setLeft(left2);
             r.setTop(r.top() + lh);
 
-            for (Q3ValueList<BrowserClass *>::ConstIterator it = rz.begin();
+            for (QList<BrowserClass *>::ConstIterator it = rz.begin();
                  it != rz.end();
                  it++) {
                 p.drawText(r, ::Qt::AlignLeft + ::Qt::AlignTop, (*it)->get_name());
@@ -732,7 +726,7 @@ void ComponentCanvas::draw(QPainter & p)
                     " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     svg_color(UmlBlack), lft, r.y(), px->width() - 1, px->height() - 1);
 
-        r.moveBy(0, px->height());
+        r.translate(0, px->height());
         p.setFont(the_canvas()->get_font(UmlNormalBoldFont));
         p.drawText(r, ::Qt::AlignHCenter, browser_node->get_name());
 
@@ -743,7 +737,8 @@ void ComponentCanvas::draw(QPainter & p)
         p.setFont(the_canvas()->get_font(UmlNormalFont));
     }
     else {
-        p.setBackgroundColor(co);
+        backBrush.setColor(co);
+        p.setBackground(backBrush);
 
         int he = r.height();
 
@@ -773,7 +768,7 @@ void ComponentCanvas::draw(QPainter & p)
                           QString("<<") + toUnicode(data->get_short_stereotype()) + ">>",
                           p.font(), fp);
 
-            r.moveBy(0, he / 2);
+            r.translate(0, he / 2);
         }
 
         p.setFont(the_canvas()->get_font(UmlNormalBoldFont));
@@ -798,7 +793,7 @@ void ComponentCanvas::draw(QPainter & p)
                     svg_color((used_color != UmlTransparent) ? used_color : UmlWhite),
                     r.x(), r.y(), r.width() - 1, r.height() - 1);
 
-        r.moveBy(0, (he * 4) / 13);
+        r.translate(0, (he * 4) / 13);
         p.fillRect(r, co);
         p.drawRect(r);
 
@@ -812,13 +807,22 @@ void ComponentCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("</g>\n", fp);
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
 
-    if (selected())
+    if (isSelected())
         show_mark(p, rect());
 }
 
-UmlCode ComponentCanvas::type() const
+void ComponentCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ComponentCanvas::typeUmlCode() const
 {
     return UmlComponent;
 }
@@ -836,7 +840,7 @@ bool ComponentCanvas::alignable() const
 
 bool ComponentCanvas::copyable() const
 {
-    return selected();
+    return isSelected();
 }
 
 void ComponentCanvas::open()
@@ -846,51 +850,54 @@ void ComponentCanvas::open()
 
 void ComponentCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Add related elements"), 10);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit component"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Add related elements"), 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit component"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
             (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 9);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 9);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlComponent, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index =retAction->data().toInt()) {
     case 0:
         upper();
         modified();	// call package_modified()
@@ -951,7 +958,7 @@ void ComponentCanvas::menu(const QPoint &)
 
     case 10:
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("component"), TRUE, FALSE);
+        ->add_related_elements(this, tr("component"), TRUE, FALSE);
         return;
 
     default:
@@ -960,11 +967,12 @@ void ComponentCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void ComponentCanvas::apply_shortcut(QString s)
+void ComponentCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -984,7 +992,7 @@ void ComponentCanvas::apply_shortcut(QString s)
     }
     else if (s == "Add related elements") {
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("component"), TRUE, FALSE);
+        ->add_related_elements(this, tr("component"), TRUE, FALSE);
         return;
     }
     else {
@@ -1002,11 +1010,11 @@ void ComponentCanvas::edit_drawing_settings()
         StateSpecVector st(4);
         ColorSpecVector co(1);
 
-        st[0].set(TR("drawn as icon"), &settings.draw_component_as_icon);
-        st[1].set(TR("show required and provided interfaces"), &settings.show_component_req_prov);
-        st[2].set(TR("show realizations"), &settings.show_component_rea);
-        st[3].set(TR("show stereotype properties"), &settings.show_stereotype_properties);
-        co[0].set(TR("component color"), &itscolor);
+        st[0].set(tr("drawn as icon"), &settings.draw_component_as_icon);
+        st[1].set(tr("show required and provided interfaces"), &settings.show_component_req_prov);
+        st[2].set(tr("show realizations"), &settings.show_component_rea);
+        st[3].set(tr("show stereotype properties"), &settings.show_stereotype_properties);
+        co[0].set(tr("component color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -1023,7 +1031,7 @@ bool ComponentCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ComponentCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ComponentCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(4);
@@ -1034,34 +1042,34 @@ void ComponentCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         Uml3States show_stereotype_properties;
         UmlColor itscolor;
 
-        st[0].set(TR("drawn as icon"), &draw_component_as_icon);
-        st[1].set(TR("show required and provided interfaces"), &show_component_req_prov);
-        st[2].set(TR("show realizations"), &show_component_rea);
-        st[3].set(TR("show stereotype properties"), &show_stereotype_properties);
-        co[0].set(TR("component color"), &itscolor);
+        st[0].set(tr("drawn as icon"), &draw_component_as_icon);
+        st[1].set(tr("show required and provided interfaces"), &show_component_req_prov);
+        st[2].set(tr("show realizations"), &show_component_rea);
+        st[3].set(tr("show stereotype properties"), &show_stereotype_properties);
+        co[0].set(tr("component color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
 
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                ComponentCanvas *canvas = (ComponentCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((ComponentCanvas *) it.current())->settings.draw_component_as_icon = draw_component_as_icon;
+                    canvas->settings.draw_component_as_icon = draw_component_as_icon;
 
                 if (!st[1].name.isEmpty())
-                    ((ComponentCanvas *) it.current())->settings.show_component_req_prov = show_component_req_prov;
+                    canvas->settings.show_component_req_prov = show_component_req_prov;
 
                 if (!st[2].name.isEmpty())
-                    ((ComponentCanvas *) it.current())->settings.show_component_rea = show_component_rea;
+                    canvas->settings.show_component_rea = show_component_rea;
 
                 if (!st[3].name.isEmpty())
-                    ((ComponentCanvas *) it.current())->settings.show_stereotype_properties = show_stereotype_properties;
+                    canvas->settings.show_stereotype_properties = show_stereotype_properties;
 
                 if (!co[0].name.isEmpty())
-                    ((ComponentCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((ComponentCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();
             }
         }
 
@@ -1070,19 +1078,12 @@ void ComponentCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ComponentCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ComponentCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ComponentCanvas * x = (ComponentCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ComponentCanvas * o = (ComponentCanvas *) it.current();
-
-        o->settings = x->settings;
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const ComponentCanvas * x = (const ComponentCanvas *) src;
+    settings = x->settings;
+    itscolor = x->itscolor;
+    modified();
 }
 
 bool ComponentCanvas::get_show_stereotype_properties() const
@@ -1104,25 +1105,25 @@ QString ComponentCanvas::may_start(UmlCode & l) const
     switch (l) {
     case UmlDependency:
         l = UmlDependOn;
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlGeneralisation:
         l = UmlInherit;
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlProvided: {
-        Q3ValueList<BrowserClass *> ll;
+        QList<BrowserClass *> ll;
 
         ((BrowserComponent *) browser_node)->get_all_provided_classes(ll, FALSE);
-        return (!ll.isEmpty()) ? QString() : TR("no provided interfaces");
+        return (!ll.isEmpty()) ? QString() : tr("no provided interfaces");
     }
     break;
 
     case UmlRequired: {
-        Q3ValueList<BrowserClass *> ll;
+        QList<BrowserClass *> ll;
 
         ((BrowserComponent *) browser_node)->get_all_required_classes(ll, FALSE);
-        return (!ll.isEmpty()) ? QString() : TR("no required interfaces");
+        return (!ll.isEmpty()) ? QString() : tr("no required interfaces");
     }
     break;
 
@@ -1130,7 +1131,7 @@ QString ComponentCanvas::may_start(UmlCode & l) const
         return 0;
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -1151,7 +1152,7 @@ QString ComponentCanvas::may_connect(UmlCode & l, const DiagramItem * dest) cons
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlComponent:
         switch (l) {
         case UmlDependOn:
@@ -1161,33 +1162,33 @@ QString ComponentCanvas::may_connect(UmlCode & l, const DiagramItem * dest) cons
             return browser_node->check_inherit(dest->get_bn());
 
         default:
-            return TR("illegal");
+            return tr("illegal");
         }
 
     case UmlArrowJunction:
         switch (l) {
         case UmlRequired: {
-            Q3ValueList<BrowserClass *> ll;
+            QList<BrowserClass *> ll;
 
             ((BrowserComponent *) browser_node)->get_all_required_classes(ll, FALSE);
-            return (ll.findIndex(((ArrowJunctionCanvas *) dest)->get_interface()) != -1)
-                   ? QString() : TR("not required");
+            return (ll.indexOf(((ArrowJunctionCanvas *) dest)->get_interface()) != -1)
+                   ? QString() : tr("not required");
         }
 
         case UmlProvided: {
-            Q3ValueList<BrowserClass *> ll;
+            QList<BrowserClass *> ll;
 
             ((BrowserComponent *) browser_node)->get_all_provided_classes(ll, FALSE);
-            return (ll.findIndex(((ArrowJunctionCanvas *) dest)->get_interface()) != -1)
-                   ? QString() : TR("not provided");
+            return (ll.indexOf(((ArrowJunctionCanvas *) dest)->get_interface()) != -1)
+                   ? QString() : tr("not provided");
         }
 
         default:
-            return TR("illegal");
+            return tr("illegal");
         }
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -1284,7 +1285,7 @@ void ComponentCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
diff --git a/src/diagram/ComponentCanvas.h b/src/diagram/ComponentCanvas.h
index 27cf085c2..d6ac2a136 100644
--- a/src/diagram/ComponentCanvas.h
+++ b/src/diagram/ComponentCanvas.h
@@ -61,51 +61,53 @@ class ComponentCanvas : public QObject, public DiagramCanvas,
     ComponentCanvas(UmlCanvas * canvas, int id);
     bool valid(ArrowCanvas * a) const;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ComponentCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~ComponentCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void compute_size();
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual bool may_connect(UmlCode l) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual bool connexion(UmlCode action, const QPoint &, const QPoint &);
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void check_line(ArrowCanvas * l);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void prepare_for_move(bool on_resize);
-    virtual bool move_with_its_package() const;
-
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual bool may_connect(UmlCode l) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual bool connexion(UmlCode action, const QPoint &, const QPoint &) override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void check_line(ArrowCanvas * l) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void prepare_for_move(bool on_resize) override;
+    virtual bool move_with_its_package() const override;
+
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ComponentCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/ComponentDiagramView.cpp b/src/diagram/ComponentDiagramView.cpp
index e09390134..5f66ce8cb 100644
--- a/src/diagram/ComponentDiagramView.cpp
+++ b/src/diagram/ComponentDiagramView.cpp
@@ -31,7 +31,7 @@
 
 #include <qapplication.h>
 #include <qfont.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -66,13 +66,9 @@ ComponentDiagramView::ComponentDiagramView(QWidget * parent, UmlCanvas * canvas,
 }
 
 // have marked elements not yet drawn ?
-static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
+static bool marked_not_yet_drawn(QHash<BasicData*, DiagramItem*> & drawn)
 {
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
-    Q3PtrListIterator<BrowserNode> it(l);
-    BrowserNode * bn;
-
-    for (; (bn = it.current()) != 0; ++it) {
+    foreach (BrowserNode *bn, BrowserNode::marked_nodes()) {
         UmlCode k = bn->get_type();
 
         switch (k) {
@@ -92,40 +88,38 @@ static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
 }
 
 static void get_drawn(DiagramItemList & items,
-                      Q3PtrDict<DiagramItem> & drawn)
+                      QHash<BasicData*, DiagramItem*> & drawn)
 {
-    DiagramItem * di;
-
-    for (di = items.first(); di != 0; di = items.next()) {
-        UmlCode k = di->type();
+    foreach (DiagramItem *di, items) {
+        UmlCode k = di->typeUmlCode();
 
         switch (k) {
         case UmlComponent:
         case UmlPackage:
-            drawn.replace(di->get_bn()->get_data(), di);
+            drawn.insert(di->get_bn()->get_data(), di);
             break;
 
         default:
             if (IsaSimpleRelation(k))
-                drawn.replace(((ArrowCanvas *) di)->get_data(), di);
+                drawn.insert(((ArrowCanvas *) di)->get_data(), di);
         }
     }
 }
 
 void ComponentDiagramView::menu(const QPoint & p)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Component diagram menu"));
+    MenuFactory::createTitle(m, tr("Component diagram menu"));
 
     if ((((UmlCanvas *) canvas())->browser_diagram())->is_writable()) {
-        DiagramItemList items(canvas()->allItems());
-        Q3PtrDict<DiagramItem> drawn;
+        DiagramItemList items(canvas()->items());
+        QHash<BasicData*, DiagramItem*> drawn;
 
         get_drawn(items, drawn);
 
         if (marked_not_yet_drawn(drawn))
-            m.insertItem(TR("Add marked elements"), 28);
+            MenuFactory::addItem(m, tr("Add marked elements"), 28);
 
         switch (default_menu(m, 30)) {
         case EDIT_DRAWING_SETTING_CMD:
@@ -152,9 +146,9 @@ void ComponentDiagramView::menu(const QPoint & p)
 static const int Diagram_Margin = 20;
 
 void ComponentDiagramView::add_marked_elements(const QPoint & p,
-        Q3PtrDict<DiagramItem> & drawn)
+        QHash<BasicData*, DiagramItem*> & drawn)
 {
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
 
     history_save();
     history_protected = TRUE;
@@ -164,11 +158,8 @@ void ComponentDiagramView::add_marked_elements(const QPoint & p,
     int x = p.x();
     int y = p.y();
     int future_y = y;
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
-    Q3PtrListIterator<BrowserNode> it(l);
-    BrowserNode * bn;
 
-    for (; (bn = it.current()) != 0; ++it) {
+    foreach (BrowserNode *bn, BrowserNode::marked_nodes()) {
         if (drawn[bn->get_data()] == 0) {
             DiagramCanvas * dc;
 
@@ -185,13 +176,13 @@ void ComponentDiagramView::add_marked_elements(const QPoint & p,
                 continue;
             }
 
-            drawn.replace(dc->get_bn()->get_data(), dc);
+            drawn.insert(dc->get_bn()->get_data(), dc);
 
             if ((x + dc->width()) > xmax)
-                dc->move(x = Diagram_Margin, y = future_y);
+                dc->moveBy(x = Diagram_Margin, y = future_y);
 
             if (y + dc->height() > ymax) {
-                dc->move(x = Diagram_Margin, y = Diagram_Margin);
+                dc->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                 future_y = y + dc->height() + Diagram_Margin;
             }
             else {
@@ -211,7 +202,7 @@ void ComponentDiagramView::add_marked_elements(const QPoint & p,
     UmlCanvas * cnv = (UmlCanvas *) canvas();
 
     if (! cnv->must_draw_all_relations()) {
-        for (it.toFirst(); (bn = it.current()) != 0; ++it) {
+        foreach (BrowserNode *bn, BrowserNode::marked_nodes()) {
             if ((drawn[bn->get_data()] == 0) &&
                 IsaSimpleRelation(bn->get_type()))
                 SimpleRelationCanvas::drop(bn, cnv, drawn);
@@ -234,10 +225,10 @@ void ComponentDiagramView::add_related_elements(DiagramItem  * di, QString what,
     dialog.raise();
 
     if (dialog.exec() == QDialog::Accepted) {
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
 
-        DiagramItemList items(canvas()->allItems());
-        Q3PtrDict<DiagramItem> drawn;
+        DiagramItemList items(canvas()->items());
+        QHash<BasicData*, DiagramItem*> drawn;
 
         get_drawn(items, drawn);
         history_save();
@@ -249,10 +240,7 @@ void ComponentDiagramView::add_related_elements(DiagramItem  * di, QString what,
         int x = re.x();
         int y = re.bottom() + Diagram_Margin;
         int future_y = y;
-        Q3PtrListIterator<BrowserNode> it(l);
-        BrowserNode * bn;
-
-        for (; (bn = it.current()) != 0; ++it) {
+        foreach (BrowserNode *bn, l) {
             if (drawn[bn->get_data()] == 0) {
                 DiagramCanvas * dc;
 
@@ -269,13 +257,13 @@ void ComponentDiagramView::add_related_elements(DiagramItem  * di, QString what,
                     continue;
                 }
 
-                drawn.replace(dc->get_bn()->get_data(), dc);
+                drawn.insert(dc->get_bn()->get_data(), dc);
 
                 if ((x + dc->width()) > xmax)
-                    dc->move(x = Diagram_Margin, y = future_y);
+                    dc->moveBy(x = Diagram_Margin, y = future_y);
 
                 if (y + dc->height() > ymax) {
-                    dc->move(x = Diagram_Margin, y = Diagram_Margin);
+                    dc->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                     future_y = y + dc->height() + Diagram_Margin;
                 }
                 else {
@@ -300,9 +288,11 @@ void ComponentDiagramView::add_related_elements(DiagramItem  * di, QString what,
     }
 }
 
-void ComponentDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void ComponentDiagramView::mousePressEvent(QMouseEvent * e)
 {
     if (!window()->frozen()) {
+        QPoint diagramPoint(e->x(), e->y());
+        QPointF scenePoint = mapToScene(diagramPoint);
         UmlCode action = window()->buttonOn();
 
         switch (action) {
@@ -317,7 +307,7 @@ void ComponentDiagramView::contentsMousePressEvent(QMouseEvent * e)
 
             if (b != 0) {
                 ComponentCanvas * c =
-                    new ComponentCanvas(b, the_canvas(), e->x(), e->y());
+                    new ComponentCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 c->upper();
@@ -330,12 +320,12 @@ void ComponentDiagramView::contentsMousePressEvent(QMouseEvent * e)
         break;
 
         default:
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
             break;
         }
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
 void ComponentDiagramView::dragEnterEvent(QDragEnterEvent * e)
@@ -358,11 +348,29 @@ void ComponentDiagramView::dragEnterEvent(QDragEnterEvent * e)
         e->ignore();
 }
 
+void ComponentDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+    if (!window()->frozen() &&
+        (UmlDrag::canDecode(e, UmlComponent, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSimpleRelations, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
+        e->accept();
+    else
+        e->ignore();
+}
 void ComponentDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
-
+    QPointF p = mapToScene(e->pos());
     if ((bn = UmlDrag::decode(e, UmlComponent)) != 0) {
         history_save();
 
@@ -421,8 +429,7 @@ void ComponentDiagramView::dropEvent(QDropEvent * e)
 void ComponentDiagramView::save(QTextStream & st, QString & warning,
                                 bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
+    DiagramItemList items(canvas()->items());
 
     if (!copy)
         // sort is useless for a copy
@@ -432,8 +439,8 @@ void ComponentDiagramView::save(QTextStream & st, QString & warning,
 
     // save first component packages fragment notes junctions and icons
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlComponent:
         case UmlNote:
         case UmlText:
@@ -453,8 +460,8 @@ void ComponentDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves relations
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlInherit:
         case UmlDependency:
         case UmlDependOn:
@@ -470,8 +477,8 @@ void ComponentDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    foreach (DiagramItem *di, items)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
 
     if (!copy && (preferred_zoom != 0)) {
diff --git a/src/diagram/ComponentDiagramView.h b/src/diagram/ComponentDiagramView.h
index 437ced1fd..89626abb5 100644
--- a/src/diagram/ComponentDiagramView.h
+++ b/src/diagram/ComponentDiagramView.h
@@ -29,7 +29,6 @@
 #define COMPONENTDIAGRAMVIEW_H
 
 #include "DiagramView.h"
-//Added by qt3to4:
 #include <QTextStream>
 #include <QMouseEvent>
 #include <QDropEvent>
@@ -40,7 +39,7 @@ template <class K> class Q3PtrDict;
 class ComponentDiagramWindow;
 class DiagramItem;
 class UmlCanvas;
-
+class BasicData;
 class ComponentDiagramView : public DiagramView
 {
     Q_OBJECT
@@ -48,23 +47,24 @@ class ComponentDiagramView : public DiagramView
 public:
     ComponentDiagramView(QWidget * parent, UmlCanvas * canvas, int id);
 
-    virtual void menu(const QPoint &);
+    virtual void menu(const QPoint &) override;
     virtual void add_related_elements(DiagramItem *, QString what,
-                                      bool inh, bool assoc);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+                                      bool inh, bool assoc) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
 private:
     ComponentDiagramWindow * window() {
         return (ComponentDiagramWindow *) parent();
     }
     void add_marked_elements(const QPoint & p,
-                             Q3PtrDict<DiagramItem> & drawn);
+                             QHash<BasicData *, DiagramItem *> &drawn);
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent *e) override;
 };
 
 #endif
diff --git a/src/diagram/ComponentDiagramWindow.cpp b/src/diagram/ComponentDiagramWindow.cpp
index 3b35e5764..be5bc0d86 100644
--- a/src/diagram/ComponentDiagramWindow.cpp
+++ b/src/diagram/ComponentDiagramWindow.cpp
@@ -30,13 +30,12 @@
 
 
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+#include <QMdiArea>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qspinbox.h>
-
 #include "UmlWindow.h"
 #include "ComponentDiagramWindow.h"
 #include "ComponentDiagramView.h"
@@ -44,10 +43,11 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
+#include "toolbarfactory.h"
 
 QString addcomponentText()
 {
-    return TR("Click this button to add a <i>component</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>component</i> in the diagram. <br><br>"
               "You can also drop the component from the <b>browser</b>.");
 }
 extern QString addpackageText();
@@ -59,11 +59,11 @@ extern QString anchorText();
 extern QString textText();
 static QString requiredText()
 {
-    return TR("Click this button to show an interface required by a <i>component</i>.");
+    return  QObject::tr("Click this button to show an interface required by a <i>component</i>.");
 }
 static QString providedText()
 {
-    return TR("Click this button to show an interface provided by a <i>component</i>.");
+    return  QObject::tr("Click this button to show an interface provided by a <i>component</i>.");
 }
 extern QString imageText();
 
@@ -71,83 +71,85 @@ extern QString imageText();
 ComponentDiagramWindow::ComponentDiagramWindow(const QString & s, BrowserComponentDiagram * b, int id)
     : DiagramWindow(b, s), view(0)
 {
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "component operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
+    QToolBar * toolbar = new QToolBar("component operations", this);
+    toolbar->setMinimumHeight(50);
+    toolbar->setOrientation(Qt::Horizontal);
+    addToolBar(Qt::TopToolBarArea, toolbar);
 
     add_edit_button(toolbar);
 
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton, tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar, "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
+    select->setCheckable(TRUE);
+    select->setChecked(TRUE);
     current_button = UmlSelect;
 
     addPackage
-        = new QToolButton(*packageButton, TR("Add Package"), QString(),
+        = ToolBarFactory::createToolButton(*packageButton, tr("Add Package"), QString(),
                           this, SLOT(hit_package()), toolbar, "add package");
-    addPackage->setToggleButton(TRUE);
-    Q3WhatsThis::add(addPackage, addpackageText());
+    addPackage->setCheckable(TRUE);
+    addPackage->setWhatsThis(addpackageText());
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("Add Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton, tr("Add Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar, "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis(addfragmentText());
 
     addComponent =
-        new QToolButton(*componentButton, TR("Add Component"), QString(),
+        ToolBarFactory::createToolButton(*componentButton, tr("Add Component"), QString(),
                         this, SLOT(hit_component()), toolbar, "add component");
-    addComponent->setToggleButton(TRUE);
-    Q3WhatsThis::add(addComponent, addcomponentText());
+    addComponent->setCheckable(TRUE);
+    addComponent->setWhatsThis(addcomponentText());
 
     inherit =
-        new QToolButton(*generalisationButton, TR("Inheritance"), QString(),
+        ToolBarFactory::createToolButton(*generalisationButton, tr("Inheritance"), QString(),
                         this, SLOT(hit_inherit()), toolbar, "inheritance");
-    inherit->setToggleButton(TRUE);
-    Q3WhatsThis::add(inherit, inheritText());
+    inherit->setCheckable(TRUE);
+    inherit->setWhatsThis(inheritText());
 
     dependency =
-        new QToolButton(*dependencyButton, TR("Dependency"), QString(),
+        ToolBarFactory::createToolButton(*dependencyButton, tr("Dependency"), QString(),
                         this, SLOT(hit_dependency()), toolbar, "dependency");
-    dependency->setToggleButton(TRUE);
-    Q3WhatsThis::add(dependency, dependencyText());
+    dependency->setCheckable(TRUE);
+    dependency->setWhatsThis(dependencyText());
 
     required =
-        new QToolButton(*requiredButton, TR("Required interface"), QString(),
+        ToolBarFactory::createToolButton(*requiredButton, tr("Required interface"), QString(),
                         this, SLOT(hit_required()), toolbar, "required interface");
-    required->setToggleButton(TRUE);
-    Q3WhatsThis::add(required, requiredText());
+    required->setCheckable(TRUE);
+    required->setWhatsThis(requiredText());
 
     provided =
-        new QToolButton(*providedButton, TR("Provided interface"), QString(),
+        ToolBarFactory::createToolButton(*providedButton, tr("Provided interface"), QString(),
                         this, SLOT(hit_provided()), toolbar, "provided interface");
-    provided->setToggleButton(TRUE);
-    Q3WhatsThis::add(provided, providedText());
+    provided->setCheckable(TRUE);
+    provided->setWhatsThis(providedText());
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton, tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar, "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis(noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton, tr("Anchor"), QString(),
                         this, SLOT(hit_anchor()), toolbar, "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis(anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton, tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar, "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis(textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton, tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+    image->setWhatsThis(imageText());
 
     toolbar->addSeparator();
 
@@ -161,9 +163,9 @@ ComponentDiagramWindow::ComponentDiagramWindow(const QString & s, BrowserCompone
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
+    QMdiArea * w = UmlWindow::get_workspace();
 
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -201,20 +203,20 @@ void ComponentDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
 
-    select->setOn(FALSE);
-    addPackage->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    addComponent->setOn(FALSE);
-    inherit->setOn(FALSE);
-    dependency->setOn(FALSE);
-    required->setOn(FALSE);
-    provided->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addPackage->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    addComponent->setChecked(FALSE);
+    inherit->setChecked(FALSE);
+    dependency->setChecked(FALSE);
+    required->setChecked(FALSE);
+    provided->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/ComponentDiagramWindow.h b/src/diagram/ComponentDiagramWindow.h
index 14d5f52f1..9acce24e7 100644
--- a/src/diagram/ComponentDiagramWindow.h
+++ b/src/diagram/ComponentDiagramWindow.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef COMPONENTDIAGRAMWINDOW_H
-#define COMPONENTDISGRAMWINDOW_H
+#define COMPONENTDIAGRAMWINDOW_H
 
 #include "DiagramWindow.h"
 
@@ -58,9 +58,9 @@ class ComponentDiagramWindow : public DiagramWindow
     ComponentDiagramWindow(const QString & s, BrowserComponentDiagram * b, int id = -1);
     virtual ~ComponentDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_component();
diff --git a/src/diagram/ConstraintCanvas.cpp b/src/diagram/ConstraintCanvas.cpp
index a301a4b61..8049bec90 100644
--- a/src/diagram/ConstraintCanvas.cpp
+++ b/src/diagram/ConstraintCanvas.cpp
@@ -30,12 +30,9 @@
 
 
 #include <qcursor.h>
-#include <q3painter.h>
-#include <q3popupmenu.h>
-//Added by qt3to4:
+#include <qpainter.h>
 #include <QTextStream>
-#include <Q3ValueList>
-
+#include <QList>
 #include "ConstraintCanvas.h"
 #include "ConstraintDialog.h"
 #include "BasicData.h"
@@ -84,7 +81,7 @@ ConstraintCanvas::ConstraintCanvas(UmlCanvas * canvas, CdClassCanvas * a, QStrin
         h = height();
 
     DiagramCanvas::resize(w, h);
-    setZ(a->get_z());
+    setZValue(a->get_z());
 
     width_scale100 = w;
     height_scale100 = h;
@@ -99,7 +96,7 @@ void ConstraintCanvas::delete_it()
 {
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(update()));
 
-    Q3ValueList<BasicData *>::Iterator iter;
+    QList<BasicData *>::Iterator iter;
 
     for (iter = connect_list.begin(); iter != connect_list.end(); ++iter)
         disconnect(*iter, 0, this, 0);
@@ -107,7 +104,7 @@ void ConstraintCanvas::delete_it()
     NoteCanvas::delete_it();
 }
 
-UmlCode ConstraintCanvas::type() const
+UmlCode ConstraintCanvas::typeUmlCode() const
 {
     return UmlConstraint;
 }
@@ -137,93 +134,97 @@ void ConstraintCanvas::open()
 
 void ConstraintCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu fontsubm(0);
-
-    MenuFactory::createTitle(m, TR("Constraint"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 5);
-    m.insertItem(TR("Go down"), 6);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Font"), &fontsubm);
+    QMenu m(0);
+    QMenu fontsubm(0);
+
+    MenuFactory::createTitle(m, tr("Constraint"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 5);
+    MenuFactory::addItem(m, tr("Go down"), 6);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::insertItem(m, tr("Font"), &fontsubm);
     init_font_menu(fontsubm, the_canvas(), 10);
-    m.insertItem(TR("Edit drawing settings"), 3);
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 4);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select linked items"), 4);
     }
 
-    m.insertSeparator();
+    m.addSeparator();
 
-    int index = m.exec(QCursor::pos());
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int index = retAction->data().toInt();
 
-    switch (index) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
+        switch (index) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
 
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
 
-    case 5:
-        z_up();
-        modified();	// call package_modified()
-        return;
+        case 5:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 6:
-        z_down();
-        modified();	// call package_modified()
-        return;
+        case 6:
+            z_down();
+            modified();	// call package_modified()
+            return;
 
-    case 2:
-        open();
-        return;
+        case 2:
+            open();
+            return;
 
-    case 3:
-        for (;;) {
-            ColorSpecVector co(1);
+        case 3:
+            for (;;) {
+                ColorSpecVector co(1);
 
-            co[0].set(TR("note color"), &itscolor);
+                co[0].set(tr("note color"), &itscolor);
 
-            SettingsDialog dialog(0, &co, FALSE);
+                SettingsDialog dialog(0, &co, FALSE);
 
-            dialog.raise();
+                dialog.raise();
 
-            if (dialog.exec() == QDialog::Accepted)
-                modified();
+                if (dialog.exec() == QDialog::Accepted)
+                    modified();
 
-            if (!dialog.redo())
-                return;
-        }
+                if (!dialog.redo())
+                    return;
+            }
 
-        break;
+            break;
 
-    case 4:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 4:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    default:
-        if (index >= 10) {
-            itsfont = (UmlFont)(index - 10);
-            modified();	// call package_modified()
-        }
+        default:
+            if (index >= 10) {
+                itsfont = (UmlFont)(index - 10);
+                modified();	// call package_modified()
+            }
 
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void ConstraintCanvas::apply_shortcut(QString s)
+void ConstraintCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -245,24 +246,23 @@ bool ConstraintCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ConstraintCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ConstraintCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("note color"), &itscolor);
+        co[0].set(tr("note color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((ConstraintCanvas *) it.current())->itscolor = itscolor;
-                ((ConstraintCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ConstraintCanvas *canvas = (ConstraintCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -271,18 +271,11 @@ void ConstraintCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ConstraintCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ConstraintCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ConstraintCanvas * x = (ConstraintCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ConstraintCanvas * o = (ConstraintCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const ConstraintCanvas * x = (const ConstraintCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 // warning : don't remove connect because may be called
@@ -292,18 +285,17 @@ ConstraintCanvas::compute(UmlCanvas * canvas,
                           CdClassCanvas * cl,
                           ConstraintCanvas * current)
 {
-    Q3ValueList<BasicData *> list;
+    QList<BasicData *> list;
     BrowserNodeList elts;
 
     ((BrowserClass *) cl->get_bn())->get_tree(elts);
 
     QString s;
     QString constraint;
-    BrowserNode * bn;
 
     if (current == 0) {
         // get all
-        for (bn = elts.first(); bn != 0; bn = elts.next()) {
+        foreach (BrowserNode *bn, elts) {
             if (bn->get_type() == UmlClass)
                 // change on class's members modify class => memorize classes only
                 list.append(bn->get_data());
@@ -315,10 +307,10 @@ ConstraintCanvas::compute(UmlCanvas * canvas,
         }
     }
     else if (current->indicate_visible) {
-        Q3ValueList<BrowserNode *> & visible = current->hidden_visible;
+        QList<BrowserNode *> & visible = current->hidden_visible;
 
-        for (bn = elts.first(); bn != 0; bn = elts.next()) {
-            if (visible.findIndex(bn) != -1) {
+        foreach (BrowserNode *bn, elts) {
+            if (visible.indexOf(bn) != -1) {
                 if (bn->get_type() == UmlClass)
                     // change on class's members modify class => memorize classes only
                     list.append(bn->get_data());
@@ -331,10 +323,10 @@ ConstraintCanvas::compute(UmlCanvas * canvas,
         }
     }
     else {
-        Q3ValueList<BrowserNode *> & hidden = current->hidden_visible;
+        QList<BrowserNode *> & hidden = current->hidden_visible;
 
-        for (bn = elts.first(); bn != 0; bn = elts.next()) {
-            if (hidden.findIndex(bn) == -1) {
+        foreach (BrowserNode *bn, elts) {
+            if (hidden.indexOf(bn) == -1) {
                 if (bn->get_type() == UmlClass)
                     // change on class's members modify class => memorize classes only
                     list.append(bn->get_data());
@@ -358,10 +350,10 @@ ConstraintCanvas::compute(UmlCanvas * canvas,
 
     current->elements = elts;
 
-    Q3ValueList<BasicData *> & old_list = current->connect_list;
+    QList<BasicData *> & old_list = current->connect_list;
 
-    for (Q3ValueList<BasicData *>::Iterator iterd = list.begin(); iterd != list.end(); ++iterd) {
-        if (old_list.findIndex(*iterd) == -1) {
+    for (QList<BasicData *>::Iterator iterd = list.begin(); iterd != list.end(); ++iterd) {
+        if (old_list.indexOf(*iterd) == -1) {
             old_list.append(*iterd);
             connect(*iterd, SIGNAL(changed()), current, SLOT(update()));
             connect(*iterd, SIGNAL(deleted()), current, SLOT(update()));
@@ -390,7 +382,7 @@ void ConstraintCanvas::save(QTextStream & st, bool ref, QString & warning) const
         st << ((indicate_visible)  ? "visible" : "hidden");
         indent(+1);
 
-        Q3ValueList<BrowserNode *>::ConstIterator iter;
+        QList<BrowserNode *>::ConstIterator iter;
 
         for (iter = hidden_visible.begin(); iter != hidden_visible.end(); iter++) {
             nl_indent(st);
@@ -407,7 +399,7 @@ void ConstraintCanvas::save(QTextStream & st, bool ref, QString & warning) const
 }
 
 ConstraintCanvas * ConstraintCanvas::read(char *& st, UmlCanvas * canvas,
-        char * k, CdClassCanvas * cl)
+                                          char * k, CdClassCanvas * cl)
 {
     if (!strcmp(k, "constraint_ref"))
         return (ConstraintCanvas *) dict_get(read_id(st), "constraint", canvas);
@@ -422,9 +414,9 @@ ConstraintCanvas * ConstraintCanvas::read(char *& st, UmlCanvas * canvas,
             BrowserNode * bn;
 
             if (((bn = BrowserClass::read(st, k, 0, FALSE)) != 0) ||
-                ((bn = BrowserOperation::read(st, k, 0, FALSE)) != 0) ||
-                ((bn = BrowserAttribute::read(st, k, 0, FALSE)) != 0) ||
-                ((bn = BrowserRelation::read(st, k, 0, FALSE)) != 0))
+                    ((bn = BrowserOperation::read(st, k, 0, FALSE)) != 0) ||
+                    ((bn = BrowserAttribute::read(st, k, 0, FALSE)) != 0) ||
+                    ((bn = BrowserRelation::read(st, k, 0, FALSE)) != 0))
                 result->hidden_visible.append(bn);
         }
 
@@ -438,10 +430,10 @@ ConstraintCanvas * ConstraintCanvas::read(char *& st, UmlCanvas * canvas,
 
 void ConstraintCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(update()));
 
-    Q3ValueList<BasicData *>::Iterator iter;
+    QList<BasicData *>::Iterator iter;
 
     for (iter = connect_list.begin(); iter != connect_list.end(); ++iter)
         disconnect(*iter, 0, this, 0);
@@ -452,7 +444,7 @@ void ConstraintCanvas::history_load(QBuffer & b)
     NoteCanvas::history_load(b);
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(update()));
 
-    Q3ValueList<BasicData *>::Iterator iter;
+    QList<BasicData *>::Iterator iter;
 
     for (iter = connect_list.begin(); iter != connect_list.end(); ++iter) {
         connect(*iter, SIGNAL(changed()), this, SLOT(update()));
diff --git a/src/diagram/ConstraintCanvas.h b/src/diagram/ConstraintCanvas.h
index 5f85c8419..9ba152017 100644
--- a/src/diagram/ConstraintCanvas.h
+++ b/src/diagram/ConstraintCanvas.h
@@ -32,7 +32,7 @@
 #include "BrowserNode.h"
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class CdClassCanvas;
 
@@ -46,8 +46,8 @@ class ConstraintCanvas : public NoteCanvas
 protected:
     bool indicate_visible;
     CdClassCanvas * cl;
-    Q3ValueList<BrowserNode *> hidden_visible;
-    Q3ValueList<BasicData *> connect_list;	// class only
+    QList<BrowserNode *> hidden_visible;
+    QList<BasicData *> connect_list;	// class only
     BrowserNodeList elements;
 
 public:
@@ -55,22 +55,22 @@ class ConstraintCanvas : public NoteCanvas
     ConstraintCanvas(UmlCanvas * canvas, CdClassCanvas *, QString);
     virtual ~ConstraintCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool copyable() const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool copyable() const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
-    virtual void apply_shortcut(QString s);
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual void apply_shortcut(const QString & s) override;
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ConstraintCanvas * read(char *& , UmlCanvas *, char *, CdClassCanvas *);
 
     static ConstraintCanvas * compute(UmlCanvas * canvas,
@@ -78,7 +78,7 @@ class ConstraintCanvas : public NoteCanvas
                                       ConstraintCanvas * current);
 
 public slots:
-    void update();
+    virtual void update() override;
 };
 
 #endif
diff --git a/src/diagram/DeploymentDiagramView.cpp b/src/diagram/DeploymentDiagramView.cpp
index 940affd75..6254a403c 100644
--- a/src/diagram/DeploymentDiagramView.cpp
+++ b/src/diagram/DeploymentDiagramView.cpp
@@ -31,7 +31,7 @@
 
 #include <qapplication.h>
 #include <qfont.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -71,13 +71,9 @@ DeploymentDiagramView::DeploymentDiagramView(QWidget * parent, UmlCanvas * canva
 }
 
 // have marked elements not yet drawn ?
-static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
+static bool marked_not_yet_drawn(QHash<BasicData*, DiagramItem*> & drawn)
 {
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
-    Q3PtrListIterator<BrowserNode> it(l);
-    BrowserNode * bn;
-
-    for (; (bn = it.current()) != 0; ++it) {
+    foreach (BrowserNode *bn, BrowserNode::marked_nodes()) {
         UmlCode k = bn->get_type();
 
         switch (k) {
@@ -99,42 +95,40 @@ static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
 }
 
 static void get_drawn(DiagramItemList & items,
-                      Q3PtrDict<DiagramItem> & drawn)
+                      QHash<BasicData*, DiagramItem*> & drawn)
 {
-    DiagramItem * di;
-
-    for (di = items.first(); di != 0; di = items.next()) {
-        UmlCode k = di->type();
+    foreach (DiagramItem *di, items) {
+        UmlCode k = di->typeUmlCode();
 
         switch (k) {
         case UmlComponent:
         case UmlDeploymentNode:
         case UmlArtifact:
         case UmlPackage:
-            drawn.replace(di->get_bn()->get_data(), di);
+            drawn.insert(di->get_bn()->get_data(), di);
             break;
 
         default:
             if (IsaSimpleRelation(k))
-                drawn.replace(((ArrowCanvas *) di)->get_data(), di);
+                drawn.insert(((ArrowCanvas *) di)->get_data(), di);
         }
     }
 }
 
 void DeploymentDiagramView::menu(const QPoint & p)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Deployment diagram menu"));
+    MenuFactory::createTitle(m, tr("Deployment diagram menu"));
 
     if ((((UmlCanvas *) canvas())->browser_diagram())->is_writable()) {
-        DiagramItemList items(canvas()->allItems());
-        Q3PtrDict<DiagramItem> drawn;
+        DiagramItemList items(canvas()->items());
+        QHash<BasicData*, DiagramItem*> drawn;
 
         get_drawn(items, drawn);
 
         if (marked_not_yet_drawn(drawn))
-            m.insertItem(TR("Add marked elements"), 28);
+            MenuFactory::addItem(m, tr("Add marked elements"), 28);
 
         switch (default_menu(m, 30)) {
         case EDIT_DRAWING_SETTING_CMD:
@@ -161,9 +155,9 @@ void DeploymentDiagramView::menu(const QPoint & p)
 static const int Diagram_Margin = 20;
 
 void DeploymentDiagramView::add_marked_elements(const QPoint & p,
-        Q3PtrDict<DiagramItem> & drawn)
+        QHash<BasicData *, DiagramItem *> &drawn)
 {
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(Qt::WaitCursor);
 
     history_save();
     history_protected = TRUE;
@@ -173,11 +167,8 @@ void DeploymentDiagramView::add_marked_elements(const QPoint & p,
     int x = p.x();
     int y = p.y();
     int future_y = y;
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
-    Q3PtrListIterator<BrowserNode> it(l);
-    BrowserNode * bn;
 
-    for (; (bn = it.current()) != 0; ++it) {
+    foreach (BrowserNode *bn, BrowserNode::marked_nodes()) {
         if (drawn[bn->get_data()] == 0) {
             DiagramCanvas * dc;
 
@@ -202,13 +193,13 @@ void DeploymentDiagramView::add_marked_elements(const QPoint & p,
                 continue;
             }
 
-            drawn.replace(dc->get_bn()->get_data(), dc);
+            drawn.insert(dc->get_bn()->get_data(), dc);
 
             if ((x + dc->width()) > xmax)
-                dc->move(x = Diagram_Margin, y = future_y);
+                dc->moveBy(x = Diagram_Margin, y = future_y);
 
             if (y + dc->height() > ymax) {
-                dc->move(x = Diagram_Margin, y = Diagram_Margin);
+                dc->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                 future_y = y + dc->height() + Diagram_Margin;
             }
             else {
@@ -228,7 +219,7 @@ void DeploymentDiagramView::add_marked_elements(const QPoint & p,
     UmlCanvas * cnv = (UmlCanvas *) canvas();
 
     if (! cnv->must_draw_all_relations()) {
-        for (it.toFirst(); (bn = it.current()) != 0; ++it) {
+        foreach (BrowserNode *bn, BrowserNode::marked_nodes()) {
             if ((drawn[bn->get_data()] == 0) &&
                 IsaSimpleRelation(bn->get_type()))
                 SimpleRelationCanvas::drop(bn, cnv, drawn);
@@ -251,10 +242,10 @@ void DeploymentDiagramView::add_related_elements(DiagramItem * di, QString what,
     dialog.raise();
 
     if (dialog.exec() == QDialog::Accepted) {
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
 
-        DiagramItemList items(canvas()->allItems());
-        Q3PtrDict<DiagramItem> drawn;
+        DiagramItemList items(canvas()->items());
+        QHash<BasicData*, DiagramItem*> drawn;
 
         get_drawn(items, drawn);
         history_save();
@@ -266,10 +257,8 @@ void DeploymentDiagramView::add_related_elements(DiagramItem * di, QString what,
         int x = re.x();
         int y = re.bottom() + Diagram_Margin;
         int future_y = y;
-        Q3PtrListIterator<BrowserNode> it(l);
-        BrowserNode * bn;
 
-        for (; (bn = it.current()) != 0; ++it) {
+        foreach (BrowserNode *bn, l) {
             if (drawn[bn->get_data()] == 0) {
                 DiagramCanvas * dc;
 
@@ -294,13 +283,13 @@ void DeploymentDiagramView::add_related_elements(DiagramItem * di, QString what,
                     continue;
                 }
 
-                drawn.replace(dc->get_bn()->get_data(), dc);
+                drawn.insert(dc->get_bn()->get_data(), dc);
 
                 if ((x + dc->width()) > xmax)
-                    dc->move(x = Diagram_Margin, y = future_y);
+                    dc->moveBy(x = Diagram_Margin, y = future_y);
 
                 if (y + dc->height() > ymax) {
-                    dc->move(x = Diagram_Margin, y = Diagram_Margin);
+                    dc->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                     future_y = y + dc->height() + Diagram_Margin;
                 }
                 else {
@@ -325,9 +314,11 @@ void DeploymentDiagramView::add_related_elements(DiagramItem * di, QString what,
     }
 }
 
-void DeploymentDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void DeploymentDiagramView::mousePressEvent(QMouseEvent * e)
 {
     if (!window()->frozen()) {
+        QPoint diagramPoint(e->x(), e->y());
+        QPointF scenePoint = mapToScene(diagramPoint);
         UmlCode action = window()->buttonOn();
 
         switch (action) {
@@ -342,7 +333,7 @@ void DeploymentDiagramView::contentsMousePressEvent(QMouseEvent * e)
 
             if (b != 0) {
                 DeploymentNodeCanvas * d =
-                    new DeploymentNodeCanvas(b, the_canvas(), e->x(), e->y(), 0);
+                    new DeploymentNodeCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
                 d->show();
                 d->upper();
@@ -363,7 +354,7 @@ void DeploymentDiagramView::contentsMousePressEvent(QMouseEvent * e)
 
             if (b != 0) {
                 ComponentCanvas * c =
-                    new ComponentCanvas(b, the_canvas(), e->x(), e->y());
+                    new ComponentCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 c->upper();
@@ -384,7 +375,7 @@ void DeploymentDiagramView::contentsMousePressEvent(QMouseEvent * e)
 
             if (b != 0) {
                 ArtifactCanvas * c =
-                    new ArtifactCanvas(b, the_canvas(), e->x(), e->y());
+                    new ArtifactCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 c->upper();
@@ -399,7 +390,7 @@ void DeploymentDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            HubCanvas * h = new HubCanvas(the_canvas(), e->x(), e->y(), 0);
+            HubCanvas * h = new HubCanvas(the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
             h->show();
             h->upper();
@@ -408,7 +399,7 @@ void DeploymentDiagramView::contentsMousePressEvent(QMouseEvent * e)
         break;
 
         default:
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
             return;
         }
 
@@ -416,7 +407,7 @@ void DeploymentDiagramView::contentsMousePressEvent(QMouseEvent * e)
         history_protected = FALSE;
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
 void DeploymentDiagramView::dragEnterEvent(QDragEnterEvent * e)
@@ -443,10 +434,33 @@ void DeploymentDiagramView::dragEnterEvent(QDragEnterEvent * e)
         e->ignore();
 }
 
+void DeploymentDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+    abort_line_construction();
+
+    if (!window()->frozen() &&
+        (UmlDrag::canDecode(e, UmlDeploymentNode, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlComponent, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlArtifact, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSimpleRelations, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
+        e->accept();
+    else
+        e->ignore();
+}
 void DeploymentDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
+    QPointF p = mapToScene(e->pos());
 
     if ((bn = UmlDrag::decode(e, UmlDeploymentNode)) != 0) {
         history_save();
@@ -534,8 +548,7 @@ void DeploymentDiagramView::dropEvent(QDropEvent * e)
 void DeploymentDiagramView::save(QTextStream & st, QString & warning,
                                  bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
+    DiagramItemList items(canvas()->items());
 
     if (!copy)
         // sort is useless for a copy
@@ -545,8 +558,8 @@ void DeploymentDiagramView::save(QTextStream & st, QString & warning,
 
     // save first package fragment deploymentnode component hub notes text and icons
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlDeploymentNode:
         case UmlArtifact:
         case UmlComponent:
@@ -568,8 +581,8 @@ void DeploymentDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves relations
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlInherit:
         case UmlDependency:
         case UmlDependOn:
@@ -585,8 +598,8 @@ void DeploymentDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    foreach (DiagramItem *di, items)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
 
     if (!copy && (preferred_zoom != 0)) {
diff --git a/src/diagram/DeploymentDiagramView.h b/src/diagram/DeploymentDiagramView.h
index 324dc296b..bde4de03c 100644
--- a/src/diagram/DeploymentDiagramView.h
+++ b/src/diagram/DeploymentDiagramView.h
@@ -35,12 +35,12 @@
 #include <QDropEvent>
 #include <QDragEnterEvent>
 
-template <class K> class Q3PtrDict;
+//template <class K> class Q3PtrDict;
 
 class DeploymentDiagramWindow;
 class DiagramItem;
 class UmlCanvas;
-
+class BasicData;
 class DeploymentDiagramView : public DiagramView
 {
     Q_OBJECT
@@ -48,23 +48,24 @@ class DeploymentDiagramView : public DiagramView
 public:
     DeploymentDiagramView(QWidget * parent, UmlCanvas * canvas, int id);
 
-    virtual void menu(const QPoint &);
+    virtual void menu(const QPoint &) override;
     virtual void add_related_elements(DiagramItem *, QString what,
-                                      bool inh, bool assoc);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+                                      bool inh, bool assoc) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
 private:
     DeploymentDiagramWindow * window() {
         return (DeploymentDiagramWindow *) parent();
     }
     void add_marked_elements(const QPoint & p,
-                             Q3PtrDict<DiagramItem> & drawn);
+                             QHash<BasicData*, DiagramItem*> & drawn);
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent *e) override;
 };
 
 #endif
diff --git a/src/diagram/DeploymentDiagramWindow.cpp b/src/diagram/DeploymentDiagramWindow.cpp
index 5abef00a1..898e4ded7 100644
--- a/src/diagram/DeploymentDiagramWindow.cpp
+++ b/src/diagram/DeploymentDiagramWindow.cpp
@@ -30,13 +30,12 @@
 
 
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+#include <QMdiArea>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qspinbox.h>
-
 #include "UmlWindow.h"
 #include "DeploymentDiagramWindow.h"
 #include "DeploymentDiagramView.h"
@@ -44,25 +43,26 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
+#include "toolbarfactory.h"
 
 QString adddeploymentnodeText()
 {
-    return TR("Click this button to add a <i>node</i> in the diagram. <br><br>"
+    return  QObject::tr("Click this button to add a <i>node</i> in the diagram. <br><br>"
               "You can also drop the node from the <b>browser</b>.");
 }
 extern QString addpackageText();
 extern QString addfragmentText();
 QString networkText()
 {
-    return TR("Click this button to add a <i>network</i> in the diagram.");
+    return  QObject::tr("Click this button to add a <i>network</i> in the diagram.");
 }
 QString hubText()
 {
-    return TR("Click this button to add a <i>network connexion/ending</i> in the diagram.");
+    return  QObject::tr("Click this button to add a <i>network connexion/ending</i> in the diagram.");
 }
 QString addartifactText()
 {
-    return TR("Click this button to add an <i>artifact</i> in the diagram.");
+    return  QObject::tr("Click this button to add an <i>artifact</i> in the diagram.");
 }
 extern QString addcomponentText();
 extern QString dependencyText();
@@ -77,101 +77,103 @@ extern QString imageText();
 DeploymentDiagramWindow::DeploymentDiagramWindow(const QString & s, BrowserDeploymentDiagram * b, int id)
     : DiagramWindow(b, s), view(0)
 {
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "deployment operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
+    QToolBar * toolbar = new QToolBar("deployment operations", this);
+    toolbar->setMinimumHeight(50);
+    toolbar->setOrientation(Qt::Horizontal);
+    addToolBar(Qt::TopToolBarArea, toolbar);
 
     add_edit_button(toolbar);
 
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton, tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar, "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
+    select->setCheckable(TRUE);
+    select->setChecked(TRUE);
     current_button = UmlSelect;
 
     addPackage
-        = new QToolButton(*packageButton, TR("Add Package"), QString(),
+        = ToolBarFactory::createToolButton(*packageButton, tr("Add Package"), QString(),
                           this, SLOT(hit_package()), toolbar, "add package");
-    addPackage->setToggleButton(TRUE);
-    Q3WhatsThis::add(addPackage, addpackageText());
+    addPackage->setCheckable(TRUE);
+    addPackage->setWhatsThis(addpackageText());
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("Add Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton, tr("Add Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar, "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis(addfragmentText());
 
     addDeploymentNode =
-        new QToolButton(*deploymentNodeButton, TR("Add Deployment Node"), QString(),
+        ToolBarFactory::createToolButton(*deploymentNodeButton, tr("Add Deployment Node"), QString(),
                         this, SLOT(hit_deploymentnode()), toolbar, "add deployment node");
-    addDeploymentNode->setToggleButton(TRUE);
-    Q3WhatsThis::add(addDeploymentNode, adddeploymentnodeText());
+    addDeploymentNode->setCheckable(TRUE);
+    addDeploymentNode->setWhatsThis(adddeploymentnodeText());
 
     addArtifact =
-        new QToolButton(*artifactButton, TR("Add Artifact"), QString(),
+        ToolBarFactory::createToolButton(*artifactButton, tr("Add Artifact"), QString(),
                         this, SLOT(hit_artifact()), toolbar, "add artifact");
-    addArtifact->setToggleButton(TRUE);
-    Q3WhatsThis::add(addArtifact, addartifactText());
+    addArtifact->setCheckable(TRUE);
+    addArtifact->setWhatsThis(addartifactText());
 
     addComponent =
-        new QToolButton(*componentButton, TR("Add Component"), QString(),
+        ToolBarFactory::createToolButton(*componentButton, tr("Add Component"), QString(),
                         this, SLOT(hit_component()), toolbar, "add component");
-    addComponent->setToggleButton(TRUE);
-    Q3WhatsThis::add(addComponent, addcomponentText());
+    addComponent->setCheckable(TRUE);
+    addComponent->setWhatsThis(addcomponentText());
 
     hub =
-        new QToolButton(*hubButton, TR("Network connexion/ending"), QString(),
+        ToolBarFactory::createToolButton(*hubButton, tr("Network connexion/ending"), QString(),
                         this, SLOT(hit_hub()), toolbar, "network connexion/ending");
-    hub->setToggleButton(TRUE);
-    Q3WhatsThis::add(hub, hubText());
+    hub->setCheckable(TRUE);
+    hub->setWhatsThis(hubText());
 
     network =
-        new QToolButton(*associationButton, TR("Network"), QString(),
+        ToolBarFactory::createToolButton(*associationButton, tr("Network"), QString(),
                         this, SLOT(hit_network()), toolbar, "network");
-    network->setToggleButton(TRUE);
-    Q3WhatsThis::add(network, networkText());
+    network->setCheckable(TRUE);
+    network->setWhatsThis(networkText());
 
     inherit =
-        new QToolButton(*generalisationButton, TR("Inheritance"), QString(),
+        ToolBarFactory::createToolButton(*generalisationButton, tr("Inheritance"), QString(),
                         this, SLOT(hit_inherit()), toolbar, "inheritance");
-    inherit->setToggleButton(TRUE);
-    Q3WhatsThis::add(inherit, inheritText());
+    inherit->setCheckable(TRUE);
+    inherit->setWhatsThis(inheritText());
 
     association =
-        new QToolButton(*directionalAssociationButton, TR("Association"), QString(),
+        ToolBarFactory::createToolButton(*directionalAssociationButton, tr("Association"), QString(),
                         this, SLOT(hit_association()), toolbar, "association");
-    association->setToggleButton(TRUE);
-    Q3WhatsThis::add(association, associationText());
+    association->setCheckable(TRUE);
+    association->setWhatsThis(associationText());
 
     dependency =
-        new QToolButton(*dependencyButton, TR("Dependency"), QString(),
+        ToolBarFactory::createToolButton(*dependencyButton, tr("Dependency"), QString(),
                         this, SLOT(hit_dependency()), toolbar, "dependency");
-    dependency->setToggleButton(TRUE);
-    Q3WhatsThis::add(dependency, dependencyText());
+    dependency->setCheckable(TRUE);
+    dependency->setWhatsThis(dependencyText());
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton, tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar, "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis(noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton, tr("Anchor"), QString(),
                         this, SLOT(hit_anchor()), toolbar, "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis(anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton, tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar, "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis(textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton, tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+    image->setWhatsThis(imageText());
 
     toolbar->addSeparator();
 
@@ -185,9 +187,9 @@ DeploymentDiagramWindow::DeploymentDiagramWindow(const QString & s, BrowserDeplo
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
+    QMdiArea * w = UmlWindow::get_workspace();
 
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -225,23 +227,23 @@ void DeploymentDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
 
-    select->setOn(FALSE);
-    addPackage->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    addDeploymentNode->setOn(FALSE);
-    addArtifact->setOn(FALSE);
-    addComponent->setOn(FALSE);
-    hub->setOn(FALSE);
-    network->setOn(FALSE);
-    inherit->setOn(FALSE);
-    association->setOn(FALSE);
-    dependency->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addPackage->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    addDeploymentNode->setChecked(FALSE);
+    addArtifact->setChecked(FALSE);
+    addComponent->setChecked(FALSE);
+    hub->setChecked(FALSE);
+    network->setChecked(FALSE);
+    inherit->setChecked(FALSE);
+    association->setChecked(FALSE);
+    dependency->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/DeploymentDiagramWindow.h b/src/diagram/DeploymentDiagramWindow.h
index 624122c24..fafda33f1 100644
--- a/src/diagram/DeploymentDiagramWindow.h
+++ b/src/diagram/DeploymentDiagramWindow.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef DEPLOYMENTDIAGRAMWINDOW_H
-#define DEPLOYMENTDISGRAMWINDOW_H
+#define DEPLOYMENTDIAGRAMWINDOW_H
 
 #include "DiagramWindow.h"
 
@@ -61,9 +61,9 @@ class DeploymentDiagramWindow : public DiagramWindow
     DeploymentDiagramWindow(const QString & s, BrowserDeploymentDiagram * b, int id = -1);
     virtual ~DeploymentDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_package();
diff --git a/src/diagram/DeploymentNodeCanvas.cpp b/src/diagram/DeploymentNodeCanvas.cpp
index f1d2f653f..9d8ce6fdf 100644
--- a/src/diagram/DeploymentNodeCanvas.cpp
+++ b/src/diagram/DeploymentNodeCanvas.cpp
@@ -31,10 +31,10 @@
 
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
+#include <QPolygon>
 #include <QPixmap>
 
 #include "DeploymentNodeCanvas.h"
@@ -56,10 +56,10 @@
 #include "translate.h"
 
 DeploymentNodeCanvas::DeploymentNodeCanvas(BrowserNode * bn, UmlCanvas * canvas,
-        int x, int y, int id)
+                                           int x, int y, int id)
     : DiagramCanvas(0, canvas, x, y, DEPLOYMENTNODE_CANVAS_MIN_SIZE,
                     DEPLOYMENTNODE_CANVAS_MIN_SIZE, id),
-    itscolor(UmlDefaultColor), used_color(UmlDefaultColor)
+      itscolor(UmlDefaultColor), used_color(UmlDefaultColor)
 {
     browser_node = bn;
     write_horizontally = UmlDefaultState;
@@ -135,17 +135,17 @@ void DeploymentNodeCanvas::set_type(BrowserNode * t)
 BrowserNode * DeploymentNodeCanvas::new_type()
 {
     BrowserNode * container = (BrowserNode *)
-                              the_canvas()->browser_diagram()->parent();
+            the_canvas()->browser_diagram()->parent();
 
     return (container->is_writable())
-           ? BrowserDeploymentNode::add_deploymentnode(container)
-           : 0;
+            ? BrowserDeploymentNode::add_deploymentnode(container)
+            : 0;
 }
 
 bool DeploymentNodeCanvas::new_type_available()
 {
     BrowserNode * container = (BrowserNode *)
-                              the_canvas()->browser_diagram()->parent();
+            the_canvas()->browser_diagram()->parent();
 
     return container->is_writable();
 }
@@ -181,8 +181,8 @@ int DeploymentNodeCanvas::min_width()
     int min_w = (int)(DEPLOYMENTNODE_CANVAS_MIN_SIZE * the_canvas()->zoom());
 
     return (wi < min_w)
-           ? min_w
-           : wi;
+            ? min_w
+            : wi;
 }
 
 int DeploymentNodeCanvas::min_height()
@@ -204,8 +204,8 @@ int DeploymentNodeCanvas::min_height()
     int min_h = (int)(DEPLOYMENTNODE_CANVAS_MIN_SIZE * the_canvas()->zoom());
 
     return (he < min_h)
-           ? min_h
-           : he;
+            ? min_h
+            : he;
 }
 
 void DeploymentNodeCanvas::check_size()
@@ -218,8 +218,8 @@ void DeploymentNodeCanvas::check_size()
     show_properties = (dflt.componentdrawingsettings.show_stereotype_properties == UmlYes);
 
     const QPixmap * px =
-        ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(),
-                                           the_canvas()->zoom());
+            ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(),
+                                               the_canvas()->zoom());
 
     if (px != 0) {
         QFontMetrics fm(the_canvas()->get_font(UmlNormalBoldFont));
@@ -260,11 +260,11 @@ void DeploymentNodeCanvas::change_scale()
 {
     double scale = the_canvas()->zoom();
 
-    Q3CanvasRectangle::setVisible(FALSE);
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    QGraphicsRectItem::setVisible(FALSE);
+    setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     check_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void DeploymentNodeCanvas::draw(QPainter & p)
@@ -274,14 +274,15 @@ void DeploymentNodeCanvas::draw(QPainter & p)
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     FILE * fp = svg();
+    QBrush backBrush = p.background();
 
     if (fp != 0)
         fputs("<g>\n", fp);
 
     const int three = (int)(3 * the_canvas()->zoom());
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     const QPixmap * px =
-        ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(), the_canvas()->zoom());
+            ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(), the_canvas()->zoom());
 
     if (px != 0) {
         p.setBackgroundMode(::Qt::TransparentMode);
@@ -293,7 +294,7 @@ void DeploymentNodeCanvas::draw(QPainter & p)
         if (fp != 0)
             // pixmap not really exported in SVG
             fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     svg_color(UmlBlack), lft, r.y(), px->width() - 1, px->height() - 1);
 
         r.setTop(r.top() + px->height());
@@ -313,7 +314,7 @@ void DeploymentNodeCanvas::draw(QPainter & p)
 
         QColor co = color(c);
         const int added = (int)(DEPLOYMENTNODE_CANVAS_ADDED * the_canvas()->zoom());
-        Q3PointArray a(7);
+        QPolygon a(7);
 
         r.setTop(r.top() + added);
         r.setRight(r.right() - added);
@@ -328,12 +329,13 @@ void DeploymentNodeCanvas::draw(QPainter & p)
 
         if (c == UmlTransparent) {
             p.setBackgroundMode(::Qt::TransparentMode);
-            p.setBackgroundColor(co);
+            backBrush.setColor(co);
+            p.setBackground(backBrush);
             p.drawPolyline(a);
 
             if (fp != 0) {
                 fprintf(fp, "\t<rect fill=\"none\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                         r.x(), r.y(), r.width() - 1, r.height() - 1);
                 draw_poly(fp, a, UmlTransparent);
             }
@@ -344,13 +346,15 @@ void DeploymentNodeCanvas::draw(QPainter & p)
             p.setBackgroundMode(::Qt::OpaqueMode);
             p.fillRect(r, co);
             p.setBrush(co);
-            p.drawPolygon(a, TRUE, 0, 6);
+            //p.drawPolygon(a, TRUE, 0, 6);
+            p.drawPolygon(a);
             p.setBrush(brsh);
-            p.setBackgroundColor(co);
+            backBrush.setColor(co);
+            p.setBackground(backBrush);
 
             if (fp != 0) {
                 fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                         svg_color(c),
                         r.x(), r.y(), r.width() - 1, r.height() - 1);
                 draw_poly(fp, a, c);
@@ -362,7 +366,7 @@ void DeploymentNodeCanvas::draw(QPainter & p)
 
         if (fp != 0)
             fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                     r.right(), r.top(), a.point(2).x(), a.point(2).y());
 
         QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
@@ -410,8 +414,8 @@ void DeploymentNodeCanvas::draw(QPainter & p)
     }
 
     p.setFont(the_canvas()->get_font(UmlNormalFont));
-    p.setBackgroundColor(bckgrnd);
-
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     if (fp != 0)
         fputs("</g>\n", fp);
 
@@ -419,7 +423,15 @@ void DeploymentNodeCanvas::draw(QPainter & p)
         show_mark(p, rect());
 }
 
-UmlCode DeploymentNodeCanvas::type() const
+void DeploymentNodeCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode DeploymentNodeCanvas::typeUmlCode() const
 {
     return UmlDeploymentNode;
 }
@@ -451,8 +463,8 @@ void DeploymentNodeCanvas::open()
 void DeploymentNodeCanvas::modified()
 {
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlDeploymentNode)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlDeploymentNode)
+            : itscolor;
     // force son reaffichage
     hide();
     check_size();
@@ -465,103 +477,107 @@ void DeploymentNodeCanvas::modified()
 
 void DeploymentNodeCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Add related elements"), 10);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select node in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Add related elements"), 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select node in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
-    m.insertItem(TR("Set node associated diagram"), 6);
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
-    m.insertSeparator();
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Set node associated diagram"), 6);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlDeploymentNode, 20))
-        m.insertItem(TR("Tool"), &toolm);
-
-    int rank = m.exec(QCursor::pos());
-
-    switch (rank) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
-
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
-
-    case 13:
-        z_up();
-        modified();	// call package_modified()
-        return;
-
-    case 14:
-        z_down();
-        modified();	// call package_modified()
-        return;
-
-    case 2:
-        open();
-        return;
-
-    case 3:
-        edit_drawing_settings();
-        return;
-
-    case 4:
-        browser_node->select_in_browser();
-        return;
-
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int rank = retAction->data().toInt();
+
+        switch (rank) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
+
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
+
+        case 13:
+            z_up();
+            modified();	// call package_modified()
+            return;
+
+        case 14:
+            z_down();
+            modified();	// call package_modified()
+            return;
+
+        case 2:
+            open();
+            return;
+
+        case 3:
+            edit_drawing_settings();
+            return;
+
+        case 4:
+            browser_node->select_in_browser();
+            return;
+
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
+
+        case 6:
+            ((BrowserDeploymentNode *) browser_node)
+                    ->set_associated_diagram((BrowserDeploymentDiagram *)
+                                             the_canvas()->browser_diagram());
+            return;
+
+        case 7:
+            // remove from diagram
+            delete_it();
+            break;
 
-    case 6:
-        ((BrowserDeploymentNode *) browser_node)
-        ->set_associated_diagram((BrowserDeploymentDiagram *)
-                                 the_canvas()->browser_diagram());
-        return;
+        case 10:
+            ((UmlCanvas *) canvas())->get_view()
+                    ->add_related_elements(this, tr("node"), FALSE, FALSE);
+            return;
 
-    case 7:
-        // remove from diagram
-        delete_it();
-        break;
+        default:
+            if (rank >= 20)
+                ToolCom::run(Tool::command(rank - 20), browser_node);
 
-    case 10:
-        ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("node"), FALSE, FALSE);
-        return;
-
-    default:
-        if (rank >= 20)
-            ToolCom::run(Tool::command(rank - 20), browser_node);
-
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void DeploymentNodeCanvas::apply_shortcut(QString s)
+void DeploymentNodeCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -581,7 +597,7 @@ void DeploymentNodeCanvas::apply_shortcut(QString s)
     }
     else if (s == "Add related elements") {
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("node"), FALSE, FALSE);
+                ->add_related_elements(this, tr("node"), FALSE, FALSE);
         return;
     }
     else {
@@ -598,9 +614,9 @@ void DeploymentNodeCanvas::edit_drawing_settings()
         StateSpecVector st(2);
         ColorSpecVector co(1);
 
-        st[0].set(TR("write node instance \nhorizontally"), &write_horizontally);
-        st[1].set(TR("show stereotype \nproperties"), &show_stereotype_properties);
-        co[0].set(TR("Node color"), &itscolor);
+        st[0].set(tr("write node instance \nhorizontally"), &write_horizontally);
+        st[1].set(tr("show stereotype \nproperties"), &show_stereotype_properties);
+        co[0].set(tr("Node color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -619,7 +635,7 @@ bool DeploymentNodeCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void DeploymentNodeCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void DeploymentNodeCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(2);
@@ -628,30 +644,29 @@ void DeploymentNodeCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         Uml3States show_stereotype_properties;
         UmlColor itscolor;
 
-        st[0].set(TR("write node instance \nhorizontally"), &write_horizontally);
-        st[1].set(TR("show stereotype \nproperties"), &show_stereotype_properties);
-        co[0].set(TR("Node color"), &itscolor);
+        st[0].set(tr("write node instance \nhorizontally"), &write_horizontally);
+        st[1].set(tr("show stereotype \nproperties"), &show_stereotype_properties);
+        co[0].set(tr("Node color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                DeploymentNodeCanvas *canvas = (DeploymentNodeCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((DeploymentNodeCanvas *) it.current())->write_horizontally =
-                        write_horizontally;
+                    canvas->write_horizontally =
+                            write_horizontally;
 
                 if (!st[1].name.isEmpty())
-                    ((DeploymentNodeCanvas *) it.current())->show_stereotype_properties =
-                        show_stereotype_properties;
+                    canvas->show_stereotype_properties =
+                            show_stereotype_properties;
 
                 if (!co[0].name.isEmpty())
-                    ((DeploymentNodeCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((DeploymentNodeCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();
             }
         }
 
@@ -660,20 +675,13 @@ void DeploymentNodeCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void DeploymentNodeCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void DeploymentNodeCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    DeploymentNodeCanvas * x = (DeploymentNodeCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        DeploymentNodeCanvas * o = (DeploymentNodeCanvas *) it.current();
-
-        o->write_horizontally = x->write_horizontally;
-        o->show_stereotype_properties = x->show_stereotype_properties;
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const DeploymentNodeCanvas * x = (const DeploymentNodeCanvas *) src;
+    write_horizontally = x->write_horizontally;
+    show_stereotype_properties = x->show_stereotype_properties;
+    itscolor = x->itscolor;
+    modified();
 }
 
 bool DeploymentNodeCanvas::get_show_stereotype_properties() const
@@ -695,14 +703,14 @@ QString DeploymentNodeCanvas::may_start(UmlCode & l) const
     switch (l) {
     case UmlDependency:
         l = UmlDependOn;
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlAssociation:
     case UmlAnchor:
         return 0;
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -711,15 +719,15 @@ QString DeploymentNodeCanvas::may_connect(UmlCode & l, const DiagramItem * dest)
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlDeploymentNode:
         return 0;
 
     case UmlHub:
-        return (l == UmlAssociation) ? QString() : TR("illegal");
+        return (l == UmlAssociation) ? QString() : tr("illegal");
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -740,10 +748,10 @@ void DeploymentNodeCanvas::connexion(UmlCode action, DiagramItem * dest,
 aCorner DeploymentNodeCanvas::on_resize_point(const QPoint & p)
 {
     return (ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(),
-            the_canvas()->zoom())
+                                               the_canvas()->zoom())
             != 0)
-           ? NoCorner
-           : ::on_resize_point(p, rect());
+            ? NoCorner
+            : ::on_resize_point(p, rect());
 }
 
 void DeploymentNodeCanvas::resize(aCorner c, int dx, int dy, QPoint & o)
@@ -815,7 +823,7 @@ DeploymentNodeCanvas * DeploymentNodeCanvas::read(char *& st, UmlCanvas * canvas
         }
 
         if (!strcmp(k, "write_horizontally") ||
-            !strcmp(k, "write_horizontaly")) {
+                !strcmp(k, "write_horizontaly")) {
             write_horizontally = state(read_keyword(st));
             k = read_keyword(st);
         }
@@ -834,7 +842,7 @@ DeploymentNodeCanvas * DeploymentNodeCanvas::read(char *& st, UmlCanvas * canvas
 
         int x = (int) read_double(st);
         DeploymentNodeCanvas * result =
-            new DeploymentNodeCanvas(br, canvas, x, (int) read_double(st), id);
+                new DeploymentNodeCanvas(br, canvas, x, (int) read_double(st), id);
 
         read_zwh(st, result);
 
@@ -863,7 +871,7 @@ DeploymentNodeCanvas * DeploymentNodeCanvas::read(char *& st, UmlCanvas * canvas
 
 void DeploymentNodeCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
     disconnect(browser_node->get_data(), 0, this, 0);
 }
@@ -887,7 +895,7 @@ void DeploymentNodeCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
diff --git a/src/diagram/DeploymentNodeCanvas.h b/src/diagram/DeploymentNodeCanvas.h
index 69eefd591..9b7e5f505 100644
--- a/src/diagram/DeploymentNodeCanvas.h
+++ b/src/diagram/DeploymentNodeCanvas.h
@@ -50,57 +50,59 @@ class DeploymentNodeCanvas
     bool show_properties;
     QString iname;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     DeploymentNodeCanvas(BrowserNode * bn, UmlCanvas * canvas,
                          int x, int y, int id);
     virtual ~DeploymentNodeCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual bool move_with_its_package() const;
-    virtual void change_scale();
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual bool move_with_its_package() const override;
+    virtual void change_scale() override;
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static DeploymentNodeCanvas * read(char *& , UmlCanvas * canvas, char *);
 
     void check_size();
     int min_width();
     int min_height();
 
-    virtual QString get_name() const;
-    virtual void set_name(const QString & s);
+    virtual QString get_name() const override;
+    virtual void set_name(const QString & s) override;
 
-    virtual BrowserNode * get_type() const;
-    virtual BrowserNode * new_type();
-    virtual bool new_type_available();
-    virtual BrowserNodeList & get_types(BrowserNodeList & r) const;
-    virtual void set_type(BrowserNode * t);
+    virtual BrowserNode * get_type() const override;
+    virtual BrowserNode * new_type() override;
+    virtual bool new_type_available() override;
+    virtual BrowserNodeList & get_types(BrowserNodeList & r) const override;
+    virtual void set_type(BrowserNode * t) override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/DiagramCanvas.cpp b/src/diagram/DiagramCanvas.cpp
index a5494a510..c3c7266b6 100644
--- a/src/diagram/DiagramCanvas.cpp
+++ b/src/diagram/DiagramCanvas.cpp
@@ -38,13 +38,13 @@
 #include "BrowserDiagram.h"
 #include "ArrowCanvas.h"
 #include "LabelCanvas.h"
+#include "FlowCanvas.h"
+#include "TransitionCanvas.h"
+#include "StereotypePropertiesCanvas.h"
 #include "SimpleRelationCanvas.h"
 #include "SimpleRelationData.h"
-#include "FlowCanvas.h"
 #include "FlowData.h"
-#include "TransitionCanvas.h"
 #include "TransitionData.h"
-#include "StereotypePropertiesCanvas.h"
 #include "UmlWindow.h"
 #include "Settings.h"
 #include "UmlGlobal.h"
@@ -52,11 +52,13 @@
 
 DiagramCanvas::DiagramCanvas(BrowserNode * bn, UmlCanvas * canvas,
                              int x, int y, int wi, int he, int id)
-    : Q3CanvasRectangle(canvas), DiagramItem(id, canvas),
+    : QGraphicsRectItem(0,0,wi,he), DiagramItem(id, canvas),
       browser_node(bn), label(0), stereotypeproperties(0)
 {
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
     double zoom = canvas->zoom();
-
+    canvas->addItem(this);
+    setPos(x,y);
     if (wi >= 0) {
         width_scale100 = wi;
         wi  = (int)(wi * zoom + 0.5);
@@ -74,8 +76,8 @@ DiagramCanvas::DiagramCanvas(BrowserNode * bn, UmlCanvas * canvas,
         he = -he;
         height_scale100 = he;
     }
-
-    setSize(wi, he);
+    //no need to set. it is already set in constructor
+    setRect(0,0,wi, he);
     setX(x);
     setY(y);
 
@@ -87,23 +89,23 @@ DiagramCanvas::DiagramCanvas(BrowserNode * bn, UmlCanvas * canvas,
     if (bn != 0) {
         // must be created after setX/Y whose call moveBy
         QFontMetrics fm(canvas->get_font(UmlNormalFont));
-
         label = new LabelCanvas(bn->get_name(), canvas,
                                 x + (wi - fm.width(bn->get_name())) / 2,
                                 y + he);
     }
 
-    setZ(DIAGRAMCANVAS_Z);
+    setZValue(DIAGRAMCANVAS_Z);
 
     if (canvas->paste())
         canvas->select(this);
 }
 
 DiagramCanvas::DiagramCanvas(UmlCanvas * canvas, int id)
-    : Q3CanvasRectangle(canvas), DiagramItem(id, canvas),
+    : QGraphicsRectItem(QRectF()), DiagramItem(id, canvas),
       browser_node(0), label(0), stereotypeproperties(0)
 {
-
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
+    canvas->addItem(this);
     if (canvas->paste())
         canvas->select(this);
 }
@@ -119,10 +121,8 @@ void DiagramCanvas::delete_it()
 
     if (label != 0)
         ((UmlCanvas *) canvas())->del(label);
-
     if (stereotypeproperties != 0)
         ((UmlCanvas *) canvas())->del(stereotypeproperties);
-
     ((UmlCanvas *) canvas())->del(this);
 }
 
@@ -138,8 +138,7 @@ UmlCanvas * DiagramCanvas::the_canvas() const
 
 void DiagramCanvas::setVisible(bool yes)
 {
-    Q3CanvasRectangle::setVisible(yes);
-
+    QGraphicsRectItem::setVisible(yes);
     if (label)
         label->setVisible(yes);
 
@@ -151,10 +150,10 @@ void DiagramCanvas::change_scale()
 {
     double scale = the_canvas()->zoom();
 
-    Q3CanvasRectangle::setVisible(FALSE);
-    setSize((int)(width_scale100 * scale + 0.5), (int)(height_scale100 * scale + 0.5));
+    QGraphicsRectItem::setVisible(FALSE);
+    setRect(this->rect().x(), rect().y(),(int)(width_scale100 * scale + 0.5), (int)(height_scale100 * scale + 0.5));
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void DiagramCanvas::recenter()
@@ -162,7 +161,7 @@ void DiagramCanvas::recenter()
     double scale = the_canvas()->zoom();
     QPoint c = center();
 
-    Q3CanvasRectangle::moveBy(center_x_scale100 * scale - c.x(),
+    QGraphicsRectItem::moveBy(center_x_scale100 * scale - c.x(),
                               center_y_scale100 * scale - c.y());
 }
 
@@ -179,31 +178,23 @@ void DiagramCanvas::moveBy(double dx, double dy)
 {
     hide_lines();
 
-    Q3CanvasRectangle::moveBy(dx, dy);
+    QGraphicsRectItem::moveBy(dx, dy);
 
     if (!((UmlCanvas *) canvas())->do_zoom())
         set_center100();
-
-    if ((label != 0) && !label->selected())
+    if ((label != 0) && !label->isSelected())
         label->moveBy(dx, dy);
-
     if ((stereotypeproperties != 0) && !stereotypeproperties->selected())
         stereotypeproperties->moveBy(dx, dy);
-
     update_show_lines();
 }
 
 void DiagramCanvas::moveSelfRelsBy(double dx, double dy)
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if (it.current()->get_start() == it.current()->get_end())
+    foreach (ArrowCanvas *canvas, lines)
+        if (canvas->get_start() == canvas->get_end())
             // self relation
-            it.current()->move_self_points(dx, dy); // move only if first segment => not done 2 times
-
-        ++it;
-    }
+            canvas->move_self_points(dx, dy); // move only if first segment => not done 2 times
 }
 
 void DiagramCanvas::setSelected(bool yes)
@@ -215,20 +206,18 @@ void DiagramCanvas::setSelected(bool yes)
             UmlWindow::set_commented(0);
     }
 
-    Q3CanvasRectangle::setSelected(yes);
+    QGraphicsRectItem::setSelected(yes);
 }
 
 void DiagramCanvas::select_associated()
 {
     if (!selected()) {
         the_canvas()->select(this);
-
-        if ((label != 0) && !label->selected())
+        if ((label != 0) && !label->isSelected())
             the_canvas()->select(label);
 
         if ((stereotypeproperties != 0) && !stereotypeproperties->selected())
             the_canvas()->select(stereotypeproperties);
-
         DiagramItem::select_associated();
     }
 }
@@ -241,17 +230,23 @@ QPoint DiagramCanvas::center() const
 
 QRect DiagramCanvas::rect() const
 {
-    return Q3CanvasRectangle::rect();
+    return QGraphicsRectItem::rect().toRect();
+}
+
+QRect DiagramCanvas::sceneRect() const
+{
+    QRectF retRect = QGraphicsRectItem::sceneBoundingRect();
+    return retRect.toRect();
 }
 
 bool DiagramCanvas::isSelected() const
 {
-    return selected();
+    return QGraphicsRectItem::isSelected();
 }
 
 bool DiagramCanvas::contains(int x, int y) const
 {
-    return rect().contains(x, y);
+    return sceneBoundingRect().contains(x, y);
 }
 
 void DiagramCanvas::connexion(UmlCode action, DiagramItem * dest,
@@ -266,8 +261,7 @@ void DiagramCanvas::connexion(UmlCode action, DiagramItem * dest,
 
 void DiagramCanvas::resize(int wi, int he)
 {
-    setSize(wi, he);
-
+    setRect(this->rect().x(), rect().y(),wi, he);
     if (!((UmlCanvas *) canvas())->do_zoom()) {
         double zoom = the_canvas()->zoom();
 
@@ -291,7 +285,7 @@ void DiagramCanvas::resize(aCorner c, int dx, int dy, QPoint & o,
 
     switch (c) {
     case UmlTopLeft:
-        Q3CanvasRectangle::moveBy(dx, dy);
+        QGraphicsRectItem::moveBy(dx, dy);
         moveSelfRelsBy(dx, dy);
         dx = -dx;
         dy = -dy;
@@ -299,11 +293,11 @@ void DiagramCanvas::resize(aCorner c, int dx, int dy, QPoint & o,
 
     case UmlTopRight:
         if (stay_centered) {
-            Q3CanvasRectangle::moveBy(-dx, dy);
+            QGraphicsRectItem::moveBy(-dx, dy);
             moveSelfRelsBy(-dx, dy);
         }
         else {
-            Q3CanvasRectangle::moveBy(0, dy);
+            QGraphicsRectItem::moveBy(0, dy);
             moveSelfRelsBy(0, dy);
         }
 
@@ -312,11 +306,11 @@ void DiagramCanvas::resize(aCorner c, int dx, int dy, QPoint & o,
 
     case UmlBottomLeft:
         if (stay_centered) {
-            Q3CanvasRectangle::moveBy(dx, -dy);
+            QGraphicsRectItem::moveBy(dx, -dy);
             moveSelfRelsBy(dx, -dy);
         }
         else {
-            Q3CanvasRectangle::moveBy(dx, 0);
+            QGraphicsRectItem::moveBy(dx, 0);
             moveSelfRelsBy(dx, 0);
         }
 
@@ -325,7 +319,7 @@ void DiagramCanvas::resize(aCorner c, int dx, int dy, QPoint & o,
 
     default:
         if (stay_centered) {
-            Q3CanvasRectangle::moveBy(-dx, -dy);
+            QGraphicsRectItem::moveBy(-dx, -dy);
             moveSelfRelsBy(-dx, -dy);
         }
 
@@ -426,14 +420,10 @@ void DiagramCanvas::prepare_for_move(bool on_resize)
 {
     if (! on_resize) {
         // select self relations
-        Q3PtrListIterator<ArrowCanvas> it(lines);
-
-        while (it.current()) {
-            if (it.current()->get_start() == it.current()->get_end())
+        foreach (ArrowCanvas *canvas, lines) {
+            if (canvas->get_start() == canvas->get_end())
                 // note : selected 2 times (from the start and the end)
-                it.current()->select_associated();
-
-            ++it;
+                canvas->select_associated();
         }
     }
 }
@@ -452,80 +442,72 @@ bool DiagramCanvas::move_with(UmlCode k) const
 
 void DiagramCanvas::force_self_rel_visible()
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-    QRect r = rect();
+    QRect r = sceneRect(); //rect();
 
     // add a marging
     r.setLeft(r.left() - 5);
     r.setRight(r.right() + 5);
     r.setTop(r.top() - 5);
     r.setBottom(r.bottom() + 5);
-
-    while (it.current()) {
-        if (it.current()->get_start() == it.current()->get_end())
+    foreach (ArrowCanvas *canvas, lines) {
+        if (canvas->get_start() == canvas->get_end())
             // self relation
-            it.current()->move_outside(r);
-
-        ++it;
+            canvas->move_outside(r);
     }
 }
 
 void DiagramCanvas::upper()
 {
-    double max_z = 0;
-    Q3CanvasItemList l = collisions(FALSE);
-    Q3CanvasItemList::Iterator it;
 
+    double max_z = 0;
+    QList<QGraphicsItem*> l = collidingItems();
+    QList<QGraphicsItem*>::Iterator it;
     for (it = l.begin(); it != l.end(); it++)
         if (!isa_alien(*it) &&
             (*it != this) &&
-            (*it)->visible() &&
-            ((*it)->z() > max_z))
-            max_z = (*it)->z();
+            (*it)->isVisible() &&
+            ((*it)->zValue() > max_z))
+            max_z = (*it)->zValue();
 
-    if ((z() - max_z) < 5) {
+    if ((zValue() - max_z) < 5) {
         double nz = ((int) max_z) + 5;	// (int) to manage Template & label
 
         set_z(nz);
 
         nz += 1;
-
-        Q3PtrListIterator<ArrowCanvas> it(lines);
-
-        while (it.current()) {
-            it.current()->go_up(nz);
-            ++it;
+        foreach (ArrowCanvas *canvas, lines) {
+            canvas->go_up(nz);
         }
     }
+
 }
 
 void DiagramCanvas::lower()
 {
-    Q3CanvasItemList l = collisions(FALSE);
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> l = collidingItems();
+    QList<QGraphicsItem*>::Iterator it;
     double min_z = 1e100;
-
     for (it = l.begin(); it != l.end(); it++)
         if ((QCanvasItemToDiagramItem(*it) != 0) &&
             (*it != this) &&
-            (*it)->visible() &&
-            ((*it)->z() < min_z))
-            min_z = (*it)->z();
+            (*it)->isVisible() &&
+            ((*it)->zValue() < min_z))
+            min_z = (*it)->zValue();
 
-    if (z() < min_z)
+    if (zValue() < min_z)
         // already ok
         ;
     else if (min_z > 15)
         set_z(((int) min_z) - 5);	// (int) to manage Template & labels
     else {
         // other canvas go up
-        double incr = ((int) z()) + 5;
+        double incr = ((int) zValue()) - min_z + 5;
 
         for (it = l.begin(); it != l.end(); it++) {
             DiagramItem * di = QCanvasItemToDiagramItem(*it);
 
             if ((di != 0) && (*it != this))
-                di->set_z((*it)->z() + incr);
+                di->set_z((*it)->zValue() + incr);
         }
     }
 }
@@ -533,19 +515,19 @@ void DiagramCanvas::lower()
 void DiagramCanvas::z_up()
 {
     double next_z = 2e100;
-    Q3CanvasItemList l = collisions(FALSE);
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> l = collidingItems();
+    QList<QGraphicsItem*>::Iterator it;
 
     // search for the lowest z > this->z
     for (it = l.begin(); it != l.end(); it++) {
         if (!isa_alien(*it) &&
-            (*it)->visible() &&
-            ((*it)->z() > z()) &&
-            ((*it)->z() < next_z)) {
+            (*it)->isVisible() &&
+            ((*it)->zValue() > zValue()) &&
+            ((*it)->zValue() < next_z)) {
             DiagramCanvas * e = QCanvasItemToDiagramCanvas(*it);
 
             if ((e != 0) && e->primaryItem())
-                next_z = (*it)->z();
+                next_z = (*it)->zValue();
         }
     }
 
@@ -553,42 +535,38 @@ void DiagramCanvas::z_up()
         // not at top, echange z with elements at next_z
         for (it = l.begin(); it != l.end(); it++) {
             if (!isa_alien(*it) &&
-                (*it)->visible() &&
-                ((*it)->z() == next_z)) {
+                (*it)->isVisible() &&
+                ((*it)->zValue() == next_z)) {
                 DiagramCanvas * e = QCanvasItemToDiagramCanvas(*it);
 
                 if ((e != 0) && e->primaryItem())
-                    e->set_z(z());
+                    e->set_z(zValue());
             }
         }
 
         set_z(next_z);
-
-        Q3PtrListIterator<ArrowCanvas> it(lines);
-
-        while (it.current()) {
-            it.current()->go_up(next_z);
-            ++it;
-        }
+        foreach (ArrowCanvas *canvas, lines)
+            canvas->go_up(next_z);
     }
+
 }
 
 void DiagramCanvas::z_down()
 {
     double next_z = 0;
-    Q3CanvasItemList l = collisions(FALSE);
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> l = collidingItems();
+    QList<QGraphicsItem*>::Iterator it;
 
     // search for the highest z < this->z
     for (it = l.begin(); it != l.end(); it++) {
         if (!isa_alien(*it) &&
-            (*it)->visible() &&
-            ((*it)->z() < z()) &&
-            ((*it)->z() > next_z)) {
+            (*it)->isVisible() &&
+            ((*it)->zValue() < zValue()) &&
+            ((*it)->zValue() > next_z)) {
             DiagramCanvas * e = QCanvasItemToDiagramCanvas(*it);
 
             if ((e != 0) && e->primaryItem())
-                next_z = (*it)->z();
+                next_z = (*it)->zValue();
         }
     }
 
@@ -596,12 +574,12 @@ void DiagramCanvas::z_down()
         // not at bottom, echange z with elements at next_z
         for (it = l.begin(); it != l.end(); it++) {
             if (!isa_alien(*it) &&
-                (*it)->visible() &&
-                ((*it)->z() == next_z)) {
+                (*it)->isVisible() &&
+                ((*it)->zValue() == next_z)) {
                 DiagramCanvas * e = QCanvasItemToDiagramCanvas(*it);
 
                 if ((e != 0) && e->primaryItem())
-                    e->set_z(z());
+                    e->set_z(zValue());
             }
         }
 
@@ -616,15 +594,14 @@ bool DiagramCanvas::primaryItem() const
 
 double DiagramCanvas::get_z() const
 {
-    return z();
+    return zValue();
 }
 
 void DiagramCanvas::set_z(double z)
 {
-    setZ(z);
-
+    setZValue(z);
     if (label != 0)
-        label->setZ(z + 0.5);
+        label->setZValue(z + 0.5);
 }
 
 void DiagramCanvas::package_modified() const
@@ -834,16 +811,23 @@ double DiagramCanvas::compute_angle(double delta_x, double delta_y)
     }
 }
 
-bool DiagramCanvas::has_simple_relation(BasicData * def) const
+QRectF DiagramCanvas::boundingRect() const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
+    return rect();
+}
 
-    while (it.current()) {
-        if (IsaSimpleRelation(it.current()->type()) &&
-            (((SimpleRelationCanvas *) it.current())->get_data() == def))
-            return TRUE;
+int DiagramCanvas::type() const
+{
 
-        ++it;
+    return (DiagramItemTypeStart + 1);
+}
+
+bool DiagramCanvas::has_simple_relation(BasicData * def) const
+{
+    foreach (ArrowCanvas *canvas, lines) {
+        if (IsaSimpleRelation(canvas->typeUmlCode()) &&
+            (((SimpleRelationCanvas *) canvas)->get_data() == def))
+            return TRUE;
     }
 
     return FALSE;
@@ -851,9 +835,9 @@ bool DiagramCanvas::has_simple_relation(BasicData * def) const
 
 void DiagramCanvas::draw_all_simple_relations(DiagramCanvas * end)
 {
-    Q3ListViewItem * child;
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    BrowserNode * child;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (child = browser_node->firstChild(); child; child = child->nextSibling()) {
         if (IsaSimpleRelation(((BrowserNode *) child)->get_type()) &&
@@ -878,14 +862,13 @@ void DiagramCanvas::draw_all_simple_relations(DiagramCanvas * end)
 
                         if ((dc != 0) &&
                             (dc->browser_node == end_node) &&
-                            ((dc == end) || (*cit)->visible())) {
+                            ((dc == end) || (*cit)->isVisible())) {
                             // other diagram canvas find
                             di = dc;
                             break;
                         }
                     }
                 }
-
                 if (di != 0)
                     (new SimpleRelationCanvas(the_canvas(), this, di,
                                               (BrowserNode *) child,
@@ -905,7 +888,7 @@ void DiagramCanvas::draw_all_simple_relations(DiagramCanvas * end)
                 (dc != this) &&
                 (dc->browser_node != 0) &&
                 !dc->browser_node->deletedp() &&
-                dc->visible())
+                dc->isVisible())
                 dc->draw_all_simple_relations(this);
         }
     }
@@ -913,24 +896,19 @@ void DiagramCanvas::draw_all_simple_relations(DiagramCanvas * end)
 
 bool DiagramCanvas::has_flow(BasicData * def) const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if ((it.current()->type() == UmlFlow) &&
-            (((FlowCanvas *) it.current())->get_data() == def))
+    foreach (ArrowCanvas *canvas, lines) {
+        if ((canvas->typeUmlCode() == UmlFlow) &&
+            (((FlowCanvas *) canvas)->get_data() == def))
             return TRUE;
-
-        ++it;
     }
-
     return FALSE;
 }
 
 void DiagramCanvas::draw_all_flows(DiagramCanvas * end)
 {
-    Q3ListViewItem * child;
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    BrowserNode * child;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (child = browser_node->firstChild(); child; child = child->nextSibling()) {
         if ((((BrowserNode *) child)->get_type() == UmlFlow) &&
@@ -955,14 +933,13 @@ void DiagramCanvas::draw_all_flows(DiagramCanvas * end)
 
                         if ((dc != 0) &&
                             (dc->browser_node == end_node) &&
-                            ((dc == end) || (*cit)->visible())) {
+                            ((dc == end) || (*cit)->isVisible())) {
                             // other diagram canvas find
                             di = dc;
                             break;
                         }
                     }
                 }
-
                 if (di != 0)
                     (new FlowCanvas(the_canvas(), this, di,
                                     (BrowserNode *) child,
@@ -981,7 +958,7 @@ void DiagramCanvas::draw_all_flows(DiagramCanvas * end)
                 (dc != this) &&
                 (dc->browser_node != 0) &&
                 !dc->browser_node->deletedp() &&
-                dc->visible())
+                dc->isVisible())
                 dc->draw_all_flows(this);
         }
     }
@@ -989,24 +966,19 @@ void DiagramCanvas::draw_all_flows(DiagramCanvas * end)
 
 bool DiagramCanvas::has_transition(BasicData * def) const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if ((it.current()->type() == UmlTransition) &&
-            (((TransitionCanvas *) it.current())->get_data() == def))
+    foreach (ArrowCanvas *canvas, lines) {
+        if ((canvas->typeUmlCode() == UmlTransition) &&
+            (((TransitionCanvas *) canvas)->get_data() == def))
             return TRUE;
-
-        ++it;
     }
-
     return FALSE;
 }
 
 void DiagramCanvas::draw_all_transitions(DiagramCanvas * end)
 {
-    Q3ListViewItem * child;
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    BrowserNode * child;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (child = browser_node->firstChild(); child; child = child->nextSibling()) {
         if ((((BrowserNode *) child)->get_type() == UmlTransition) &&
@@ -1031,14 +1003,13 @@ void DiagramCanvas::draw_all_transitions(DiagramCanvas * end)
 
                         if ((dc != 0) &&
                             (dc->browser_node == end_node) &&
-                            ((dc == end) || (*cit)->visible())) {
+                            ((dc == end) || (*cit)->isVisible())) {
                             // other diagram canvas find
                             di = dc;
                             break;
                         }
                     }
                 }
-
                 if (di != 0)
                     (new TransitionCanvas(the_canvas(), this, di,
                                           (BrowserNode *) child,
@@ -1057,7 +1028,7 @@ void DiagramCanvas::draw_all_transitions(DiagramCanvas * end)
                 (dc != this) &&
                 (dc->browser_node != 0) &&
                 !dc->browser_node->deletedp() &&
-                dc->visible())
+                dc->isVisible())
                 dc->draw_all_transitions(this);
         }
     }
@@ -1076,7 +1047,6 @@ void DiagramCanvas::check_stereotypeproperties()
 {
     if (browser_node != 0) {
         QString s = browser_node->stereotypes_properties();
-
         if (!s.isEmpty() && get_show_stereotype_properties())
             StereotypePropertiesCanvas::needed(the_canvas(), this, s,
                                                stereotypeproperties, center());
@@ -1111,7 +1081,7 @@ void DiagramCanvas::history_save(QBuffer & b) const
     ::save(center_y_scale100, b);
     ::save(x(), b);
     ::save(y(), b);
-    ::save(z(), b);
+    ::save(zValue(), b);
 }
 
 void DiagramCanvas::history_load(QBuffer & b)
@@ -1121,14 +1091,14 @@ void DiagramCanvas::history_load(QBuffer & b)
 
     double dx = load_double(b) - x();
 
-    Q3CanvasRectangle::moveBy(dx, load_double(b) - y());
-    Q3CanvasRectangle::setZ(load_double(b));
+    QGraphicsRectItem::moveBy(dx, load_double(b) - y());
+    QGraphicsRectItem::setZValue(load_double(b));
 
-    Q3CanvasItem::setSelected(FALSE);
-    Q3CanvasItem::setVisible(TRUE);
+    QGraphicsItem::setSelected(FALSE);
+    QGraphicsItem::setVisible(TRUE);
 }
 
 void DiagramCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 }
diff --git a/src/diagram/DiagramCanvas.h b/src/diagram/DiagramCanvas.h
index 3cca9cfc4..c85125fb8 100644
--- a/src/diagram/DiagramCanvas.h
+++ b/src/diagram/DiagramCanvas.h
@@ -40,8 +40,9 @@ class BrowserNode;
 class LabelCanvas;
 class StereotypePropertiesCanvas;
 
-class DiagramCanvas : public Q3CanvasRectangle, public DiagramItem
+class DiagramCanvas : public QGraphicsRectItem, public DiagramItem
 {
+
 protected:
     BrowserNode * browser_node;
     LabelCanvas * label;
@@ -59,43 +60,46 @@ class DiagramCanvas : public Q3CanvasRectangle, public DiagramItem
                   int x, int y, int w, int h, int id);
     virtual ~DiagramCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    virtual BrowserNode * get_bn() const;
+    virtual BrowserNode * get_bn() const override;
 
     virtual void upper();
     virtual void lower();
     virtual void z_up();
     virtual void z_down();
     virtual bool primaryItem() const;
-    virtual double get_z() const;
-    virtual void set_z(double z);	// only called by upper() & lower()
+    virtual double get_z() const override;
+    virtual void set_z(double z) override;	// only called by upper() & lower()
 
     virtual void setVisible(bool yes);
-    virtual void moveBy(double dx, double dy);
+    virtual void moveBy(double dx, double dy) override;
     virtual void setSelected(bool yes);
-    virtual void select_associated();
-    virtual bool isSelected() const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void prepare_for_move(bool on_resize);
-    virtual bool move_with(UmlCode) const;
+    virtual void select_associated() override;
+    virtual bool isSelected() const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void prepare_for_move(bool on_resize) override;
+    virtual bool move_with(UmlCode) const override;
     void force_self_rel_visible();
     void moveSelfRelsBy(double dx, double dy);
 
-    virtual void change_scale();
-    virtual QPoint center() const;
-    virtual QRect rect() const;
+    virtual void change_scale() override;
+    virtual QPoint center() const override;
+    virtual QRect rect() const override;
+    virtual QRect sceneRect() const override;
     void recenter();
     void set_center100();
-    virtual bool contains(int, int) const;
+    using QGraphicsRectItem::contains;
+    virtual bool contains(int, int) const override;
 
+    using DiagramItem::resize;
     void resize(aCorner c, int dx, int dy, QPoint &, int min_width, int min_height,
                 bool odd = FALSE, bool stay_centered = FALSE);
     bool resize(const QSize & sz, bool w, bool h,
                 int min_width, int min_height,
                 bool odd = FALSE, bool stay_centered = FALSE);
     virtual void resize(int w, int h);
-    virtual UmlCanvas * the_canvas() const;
+    virtual UmlCanvas * the_canvas() const override;
     void package_modified() const;
 
     bool has_simple_relation(BasicData * def) const;
@@ -107,11 +111,11 @@ class DiagramCanvas : public Q3CanvasRectangle, public DiagramItem
     bool has_transition(BasicData * def) const;
     void draw_all_transitions(DiagramCanvas * end = 0);
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void check_stereotypeproperties();
+    virtual void check_stereotypeproperties() override;
     virtual bool get_show_stereotype_properties() const;
     void save_stereotype_property(QTextStream & st, QString &) const;
     void read_stereotype_property(char *& st, char *& k);
@@ -126,6 +130,13 @@ class DiagramCanvas : public Q3CanvasRectangle, public DiagramItem
     static void draw_control_icon(QPainter & p, QRect & r,
                                   UmlColor used_color, double zoom);
     static double compute_angle(double delta_x, double delta_y);
+    bool visible()const {return isVisible();}
+    bool selected() const { return isSelected();}
+    int width()const { return rect().width();}
+    int height() const {return rect().height();}
+    QGraphicsScene* canvas() const { return scene();}
+    virtual QRectF boundingRect() const override;
+    virtual int type() const override;
 };
 
 #define CLASS_ICON_SIZE 20
diff --git a/src/diagram/DiagramItem.cpp b/src/diagram/DiagramItem.cpp
index 0b735b9e1..c2d47a58a 100644
--- a/src/diagram/DiagramItem.cpp
+++ b/src/diagram/DiagramItem.cpp
@@ -30,9 +30,9 @@
 
 
 #include <qpainter.h>
-#include <q3intdict.h>
+//#include <q3intdict.h>
 //Added by qt3to4:
-#include <Q3PtrCollection>
+//
 
 #include "DiagramItem.h"
 #include "DiagramCanvas.h"
@@ -43,7 +43,7 @@
 #include "myio.h"
 #include "translate.h"
 
-Q3PtrList<DiagramItem> DiagramItem::Undefined;
+QList<DiagramItem *> DiagramItem::Undefined;
 
 DiagramItem::DiagramItem(int id, UmlCanvas * canvas)
     : Labeled<DiagramItem>(canvas->get_all_items(), id)
@@ -70,26 +70,22 @@ void DiagramItem::remove(bool)
 
 void DiagramItem::hide_lines()
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    for (; it.current(); ++it)
-        it.current()->hide();
+    foreach (ArrowCanvas *canvas, lines)
+        canvas->hide();
 }
 
 void DiagramItem::update_show_lines()
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    for (; it.current(); ++it) {
-        it.current()->update_pos();
-        it.current()->show();
-        it.current()->update_geometry();
+    foreach (ArrowCanvas *canvas, lines) {
+        canvas->update_pos();
+        canvas->show();
+        canvas->update_geometry();
     }
 }
 
 void DiagramItem::remove_line(ArrowCanvas * l, bool)
 {
-    lines.remove(l);
+    lines.removeOne(l);
 }
 
 void DiagramItem::check_line(ArrowCanvas *)
@@ -99,10 +95,8 @@ void DiagramItem::check_line(ArrowCanvas *)
 
 bool DiagramItem::attached_to(const ArrowCanvas * l) const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    for (; it.current(); ++it)
-        if (it.current() == l)
+    foreach (ArrowCanvas *canvas, lines)
+        if (canvas == l)
             return TRUE;
 
     return FALSE;
@@ -167,29 +161,31 @@ void DiagramItem::post_connexion(UmlCode, DiagramItem *)
 
 void DiagramItem::remove_if_already_present()
 {
-    const UmlCode k = type();
+    const UmlCode k = typeUmlCode();
     const BrowserNode * bn = get_bn();
     IdIterator<DiagramItem> it(the_canvas()->get_all_items());
     DiagramItem * di;
-
-    while ((di = it.current()) != 0) {
-        if ((di->type() == k) && (di->get_bn() == bn) && (di != this)) {
+    while (it.hasNext()) {
+        it.next();
+        if((di = it.value()) != 0)
+        {
+        if ((di->typeUmlCode() == k) && (di->get_bn() == bn) && (di != this)) {
             // already present
             if (Undefined.isEmpty())
-                msg_warning("Douml", TR("some elements already present in the diagram are NOT paste"));
+                msg_warning("Douml", QObject::tr("some elements already present in the diagram are NOT paste"));
 
             Undefined.append(this);
             return;
         }
-
-        ++it;
+        }
     }
 }
 
 void DiagramItem::post_load()
 {
-    while (! Undefined.isEmpty())
-        Undefined.take()->delete_it();
+    foreach (DiagramItem *item, Undefined)
+        item->delete_it();
+    Undefined.clear();
 }
 
 BasicData * DiagramItem::add_relation(UmlCode t, DiagramItem * end)
@@ -208,31 +204,18 @@ BasicData * DiagramItem::add_relation(UmlCode t, DiagramItem * end)
 bool DiagramItem::has_relation(BasicData * def) const
 {
     // manage only SimpleRelations
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if (IsaSimpleRelation(it.current()->type()) &&
-            (it.current()->get_data() == def))
+    foreach (ArrowCanvas *canvas, lines)
+        if (IsaSimpleRelation(canvas->typeUmlCode()) && (canvas->get_data() == def))
             return TRUE;
-
-        ++it;
-    }
-
     return FALSE;
 }
 
 bool DiagramItem::has_relation(UmlCode t, BasicData * def) const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if ((it.current()->type() == t) &&
-            (it.current()->get_data() == def))
+    foreach (ArrowCanvas *canvas, lines) {
+        if ((canvas->typeUmlCode() == t) && (canvas->get_data() == def))
             return TRUE;
-
-        ++it;
     }
-
     return FALSE;
 }
 
@@ -253,10 +236,8 @@ bool DiagramItem::move_with(UmlCode) const
 
 void DiagramItem::select_associated()
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    for (; it.current(); ++it)
-        it.current()->select_associated();
+    foreach (ArrowCanvas *canvas, lines)
+        canvas->select_associated();
 }
 
 void DiagramItem::unassociate(DiagramItem *)
@@ -267,7 +248,7 @@ void DiagramItem::unassociate(DiagramItem *)
 
 bool DiagramItem::represents(BrowserNode * bn)
 {
-    return ((type() == bn->get_type()) && (get_bn() == bn));
+    return ((typeUmlCode() == bn->get_type()) && (get_bn() == bn));
 }
 
 void show_mark(QPainter & p, const QRect & r)
@@ -300,8 +281,9 @@ aCorner on_resize_point(const QPoint & p, const QRect & r)
     return NoCorner;
 }
 
-DiagramItem * QCanvasItemToDiagramItem(Q3CanvasItem * ci)
+DiagramItem * QCanvasItemToDiagramItem(QGraphicsItem * ci)
 {
+
     if (isa_arrow(ci))
         return ((ArrowCanvas *) ci);
     else if (isa_label(ci))
@@ -312,7 +294,7 @@ DiagramItem * QCanvasItemToDiagramItem(Q3CanvasItem * ci)
                : ((DiagramCanvas *) ci);
 }
 
-DiagramCanvas * QCanvasItemToDiagramCanvas(Q3CanvasItem * ci)
+DiagramCanvas * QCanvasItemToDiagramCanvas(QGraphicsItem * ci)
 {
     return (isa_arrow(ci) || isa_label(ci) || isa_alien(ci))
            ? 0
@@ -341,7 +323,7 @@ static inline int iabs(int v)
 
 void DiagramItem::shift(QPoint & p, QPoint other, bool contains_other) const
 {
-    QRect r = rect();
+    QRect r = sceneRect();
 
     p = r.center();
 
@@ -400,31 +382,32 @@ bool DiagramItem::has_drawing_settings() const
     return FALSE;
 }
 
-void DiagramItem::edit_drawing_settings(Q3PtrList<DiagramItem> &)
+void DiagramItem::edit_drawing_settings(QList<DiagramItem *> &)
 {
     // never called
 }
 
-void DiagramItem::same_drawing_settings(Q3PtrList<DiagramItem> &)
+void DiagramItem::clone_drawing_settings(const DiagramItem *src)
 {
+    Q_UNUSED(src);
     // never called
 }
 
 //
 
-void DiagramItem::apply_shortcut(QString)
+void DiagramItem::apply_shortcut(const QString &)
 {
     // do nothing
 }
 
 //
 
-DiagramItemList::DiagramItemList(Q3CanvasItemList l)
+DiagramItemList::DiagramItemList(QList<QGraphicsItem*> l)
 {
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*>::Iterator it;
 
     for (it = l.begin(); it != l.end(); ++it) {
-        if ((*it)->visible()) {
+        if ((*it)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*it);
 
             if (di != 0)
@@ -437,11 +420,13 @@ DiagramItemList::~DiagramItemList()
 {
 }
 
-int DiagramItemList::compareItems(Q3PtrCollection::Item i1,
-                                  Q3PtrCollection::Item i2)
+void DiagramItemList::sort()
+{
+    std::sort(begin(), end(), lessThan);
+}
+
+bool DiagramItemList::lessThan(DiagramItem *a, DiagramItem *b)
 {
-    // i1 <> i2 !
-    return (((DiagramItem *) i1)->get_ident() >
-            ((DiagramItem *) i2)->get_ident())
-           ? 1 : -1;
+    // a <> b !
+    return a->get_ident() > b->get_ident();
 }
diff --git a/src/diagram/DiagramItem.h b/src/diagram/DiagramItem.h
index 962e91554..d53c873f8 100644
--- a/src/diagram/DiagramItem.h
+++ b/src/diagram/DiagramItem.h
@@ -28,24 +28,23 @@
 #ifndef DIAGRAMITEM_H
 #define DIAGRAMITEM_H
 
-#include <qlist.h>
+#include <QList>
 #include <qstring.h>
 #include <qpoint.h>
 #include <QTextStream>
-#include <q3ptrdict.h>
+//#include <q3ptrdict.h>
 //Added by qt3to4:
-#include <Q3PtrCollection>
+//
 
 #include "Labeled.h"
 #include "UmlEnum.h"
 
 #define SELECT_SQUARE_SIZE 6
 
-class Q3CanvasItem;
-class Q3CanvasItemList;
+class QGraphicsItem;
+//class QList<QGraphicsItem*>;
 class QBuffer;
 class QPoint;
-
 class DiagramCanvas;
 class LabelCanvas;
 class ArrowCanvas;
@@ -53,14 +52,14 @@ class BrowserNode;
 class BrowserClass;
 class BasicData;
 class UmlCanvas;
-#include <q3ptrlist.h> // [lgfreitas] added for q3ptrlist
+// // [lgfreitas] added for q3ptrlist
 
 class DiagramItem : public Labeled<DiagramItem>
 {
 protected:
-    Q3PtrList<ArrowCanvas> lines;
+    QList<ArrowCanvas *> lines;
 
-    static Q3PtrList<DiagramItem> Undefined;
+    static QList<DiagramItem *> Undefined;
 
 public:
     DiagramItem(int id, UmlCanvas * canvas);
@@ -78,13 +77,14 @@ class DiagramItem : public Labeled<DiagramItem>
     virtual void check_line(ArrowCanvas * l);
     bool attached_to(const ArrowCanvas *) const;
 
-    virtual UmlCode type() const = 0;
+    virtual UmlCode typeUmlCode() const = 0;
     virtual void delete_available(BooL & in_model, BooL & out_model) const;
     virtual void remove(bool from_model);
     virtual BrowserNode * get_bn() const;
     virtual UmlCanvas * the_canvas() const = 0;
     virtual QPoint center() const = 0;
     virtual QRect rect() const = 0;
+    virtual QRect sceneRect() const = 0;
     virtual bool contains(int, int) const = 0;
     virtual void open() = 0;
     virtual void menu(const QPoint &) = 0;
@@ -133,10 +133,10 @@ class DiagramItem : public Labeled<DiagramItem>
     }
 
     virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual void edit_drawing_settings(QList<DiagramItem *> &);
+    virtual void clone_drawing_settings(const DiagramItem *src);
 
-    virtual void apply_shortcut(QString);
+    virtual void apply_shortcut(const QString &);
 
     virtual void check_stereotypeproperties() = 0;
 
@@ -144,14 +144,17 @@ class DiagramItem : public Labeled<DiagramItem>
     void remove_if_already_present();
 
     virtual bool represents(BrowserNode *);
+    virtual void moveBy(double dx, double dy) = 0;
 };
 
-class DiagramItemList : public Q3PtrList<DiagramItem>
+class DiagramItemList : public QList<DiagramItem *>
 {
 public:
-    DiagramItemList(Q3CanvasItemList);
+    DiagramItemList(QList<QGraphicsItem*>);
     virtual ~DiagramItemList();
-    virtual int compareItems(Q3PtrCollection::Item, Q3PtrCollection::Item);
+
+    void sort();
+    static bool lessThan(DiagramItem *a, DiagramItem *b);
 };
 
 
@@ -160,10 +163,10 @@ extern aCorner on_resize_point(const QPoint & p, const QRect & r);
 
 // not a diagram item : a Qt object
 #define TOP_Z 1e101
-#define isa_alien(x) ((x)->z() == TOP_Z)
+#define isa_alien(x) ((x)->zValue() == TOP_Z)
 
-extern DiagramItem * QCanvasItemToDiagramItem(Q3CanvasItem * ci);
-extern DiagramCanvas * QCanvasItemToDiagramCanvas(Q3CanvasItem * ci);
+extern DiagramItem * QCanvasItemToDiagramItem(QGraphicsItem * ci);
+extern DiagramCanvas * QCanvasItemToDiagramCanvas(QGraphicsItem * ci);
 
 #endif
 
diff --git a/src/diagram/DiagramView.cpp b/src/diagram/DiagramView.cpp
index 18c4d0cad..2e0c7a41f 100644
--- a/src/diagram/DiagramView.cpp
+++ b/src/diagram/DiagramView.cpp
@@ -34,11 +34,9 @@
 #include <qprinter.h>
 #endif
 #include <qcursor.h>
-#include <q3popupmenu.h>
 #include <qapplication.h>
 #include <qclipboard.h>
-#include <q3paintdevicemetrics.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qbuffer.h>
 #if defined(WIN32) || (QT_VERSION != 230)
 #include <qtimer.h>
@@ -46,7 +44,7 @@
 #include <QWheelEvent>
 #include <QPixmap>
 #include <QMouseEvent>
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
 #include <QKeyEvent>
 
@@ -59,20 +57,21 @@
 #include "RelationData.h"
 #include "RelationCanvas.h"
 #include "SimpleRelationCanvas.h"
-#include "TransitionCanvas.h"
 #include "FlowCanvas.h"
-#include "CodLinkCanvas.h"
+#include "TransitionCanvas.h"
 #include "ObjectLinkCanvas.h"
+#include "CodLinkCanvas.h"
 #include "AssocContainCanvas.h"
+#include "FragmentCanvas.h"
+#include "PackageCanvas.h"
+#include "ImageCanvas.h"
+#include "TextCanvas.h"
+#include "SelectAreaCanvas.h"
+#include "ArrowCanvas.h"
 #include "ArrowPointCanvas.h"
 #include "LabelCanvas.h"
 #include "NoteCanvas.h"
-#include "TextCanvas.h"
-#include "ImageCanvas.h"
 #include "BrowserPackage.h"
-#include "PackageCanvas.h"
-#include "FragmentCanvas.h"
-#include "SelectAreaCanvas.h"
 #include "BrowserDiagram.h"
 #include "UmlWindow.h"
 #include "Shortcut.h"
@@ -81,7 +80,7 @@
 #include "myio.h"
 #include "err.h"
 #include "translate.h"
-
+#include <QScrollBar>
 #include "align_top.xpm"
 #include "align_bottom.xpm"
 #include "align_left.xpm"
@@ -89,12 +88,14 @@
 #include "align_center.xpm"
 #include "align_vcenter.xpm"
 #include "align_hcenter.xpm"
+#include <QGraphicsScene>
+#include <QImage>
 
 WrapperStr DiagramView::clipboard;
 UmlCode DiagramView::copied_from;
 
 DiagramView::DiagramView(QWidget * parent, UmlCanvas * canvas, int i)
-    : Q3CanvasView(canvas, parent), id(i), pressedButton(-1), selectArea(0), start(0),
+    : QGraphicsView(canvas, parent), id(i), pressedButton(-1), selectArea(0), start(0),
       line(0), arrowBeginning(0), preferred_zoom(0), draw_line(FALSE),
       do_resize(NoCorner), history_protected(FALSE), history_frozen(FALSE),
       first_move(FALSE), on_arrow_decenter(FALSE), history_index(~0u)
@@ -102,19 +103,18 @@ DiagramView::DiagramView(QWidget * parent, UmlCanvas * canvas, int i)
     // enableClipper(TRUE); => probleme d'affichage
     preferred_size.setWidth(0);
     preferred_size.setHeight(0);
-    setStaticBackground(TRUE);
     setAcceptDrops(TRUE);
-    setDragAutoScroll(TRUE);
-    setVScrollBarMode(Auto);
-    setHScrollBarMode(Auto);
+    setDragMode(QGraphicsView::ScrollHandDrag);
     setFocusPolicy(Qt::StrongFocus);
     //setFocusPolicy(QWidget::WheelFocus);
-    canvas->setBackgroundColor(::Qt::white);
-    canvas->setDoubleBuffering(TRUE);
-
+    QBrush backBrush = canvas->backgroundBrush();
+    backBrush.setColor(::Qt::white);
+    canvas->setBackgroundBrush(backBrush);
+    setCacheMode(QGraphicsView::CacheBackground);
     canvas->set_view(this);
-
-    history.setAutoDelete(TRUE);
+    ensureVisible(0,0,1,1);
+    //to set the default cursor
+    this->viewport()->unsetCursor();
 }
 
 void DiagramView::init()
@@ -124,18 +124,23 @@ void DiagramView::init()
 
 UmlCanvas * DiagramView::the_canvas() const
 {
-    return (UmlCanvas *) canvas();
+    return (UmlCanvas *) scene();
 }
 
-void DiagramView::contentsMouseDoubleClickEvent(QMouseEvent * e)
+QGraphicsScene* DiagramView::canvas() const
+{
+    return scene();
+}
+
+void DiagramView::mouseDoubleClickEvent(QMouseEvent * e)
 {
     setFocus();
     unselect_all();
-
+    QPointF scenePoint = mapToScene(e->pos());
     if (draw_line)
         abort_line_construction();
     else {
-        Q3CanvasItem * ci = the_canvas()->collision(e->pos());
+        QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint());
 
         if (ci != 0) {
             DiagramItem * di = QCanvasItemToDiagramItem(ci);
@@ -147,11 +152,11 @@ void DiagramView::contentsMouseDoubleClickEvent(QMouseEvent * e)
 }
 
 bool DiagramView::multiple_selection_for_menu(BooL & in_model, BooL & out_model,
-        BooL & alignable, int & n_resize,
-        Q3PtrList<DiagramItem> & l_drawing_settings,
-        const Q3CanvasItemList & selected)
+                                              BooL & alignable, int & n_resize,
+                                              QList<DiagramItem *> & l_drawing_settings,
+                                              const QList<QGraphicsItem*> & selected)
 {
-    Q3CanvasItemList::ConstIterator it;
+    QList<QGraphicsItem*>::ConstIterator it;
     int n_targets = 0;
     UmlCode k = UmlCodeSup;
 
@@ -175,7 +180,7 @@ bool DiagramView::multiple_selection_for_menu(BooL & in_model, BooL & out_model,
                 switch (k) {
                 case UmlCodeSup:
                     // first case
-                    k = item->type();
+                    k = item->typeUmlCode();
                     l_drawing_settings.append(item);
                     break;
 
@@ -184,7 +189,7 @@ bool DiagramView::multiple_selection_for_menu(BooL & in_model, BooL & out_model,
                     break;
 
                 default:
-                    if (item->type() == k)
+                    if (item->typeUmlCode() == k)
                         l_drawing_settings.append(item);
                     else {
                         // several types
@@ -198,32 +203,34 @@ bool DiagramView::multiple_selection_for_menu(BooL & in_model, BooL & out_model,
                 n_resize += 1;
         }
     }
-
     return (n_targets > 1);
 }
 
-void DiagramView::contentsMousePressEvent(QMouseEvent * e)
+void DiagramView::mousePressEvent(QMouseEvent * e)
 {
     first_move = TRUE;
     pressedButton = e->button();
     setFocus();
+    QPoint diagramPoint(e->x(), e->y());
+    QPointF scenePoint = mapToScene(diagramPoint);
+
 
     if (pressedButton == ::Qt::MidButton) {
-        mousePressPos = e->pos();
-        QApplication::setOverrideCursor(::Qt::sizeAllCursor);
+        mousePressPos = scenePoint.toPoint();
+        QApplication::setOverrideCursor(QCursor(::Qt::SizeAllCursor));
     }
     else if (!window()->frozen()) {
-        Q3CanvasItem * ci = the_canvas()->collision(e->pos());
+        QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint());
 
         if (pressedButton == ::Qt::RightButton) {
             // menu on several objects (excluding labels)
 
             if (! draw_line) {
-                const Q3CanvasItemList selected = selection();
+                const QList<QGraphicsItem*> selected = selection();
                 BooL in_model;
                 BooL out_model;
                 BooL alignable;
-                Q3PtrList<DiagramItem> l_drawing_settings;
+                QList<DiagramItem *> l_drawing_settings;
                 int n_resize;
 
                 if (multiple_selection_for_menu(in_model, out_model, alignable,
@@ -245,12 +252,11 @@ void DiagramView::contentsMousePressEvent(QMouseEvent * e)
                     DiagramItem * di = QCanvasItemToDiagramItem(ci);
 
                     if (di != 0)
-                        di->menu(e->pos());
-
+                        di->menu(scenePoint.toPoint());
                     BrowserNode::setPopupMenuActive(FALSE);
                 }
                 else  {
-                    menu(e->pos());
+                    menu(scenePoint.toPoint());
                     BrowserNode::setPopupMenuActive(FALSE);
                     // here the window & view may be deleted
                     return;
@@ -266,18 +272,19 @@ void DiagramView::contentsMousePressEvent(QMouseEvent * e)
 
             switch (action) {
             case UmlSelect:
-                mousePressPos = e->pos();
+                mousePressPos = scenePoint.toPoint();
 
                 if (ci == 0) {
                     // ne designe pas d objet, vide la selection
                     unselect_all();
                 }
                 else {
-                    const Q3CanvasItemList selected = selection();
-                    Q3CanvasItemList::ConstIterator it = selected.find(ci);
+                    const QList<QGraphicsItem*> selected = selection();
+                    //QList<QGraphicsItem*>::ConstIterator it = selected.find(ci);
+                    bool isContaining = selected.contains(ci);
 
-                    if ((e->state() & ::Qt::ControlModifier) == 0) {
-                        if (it == selected.end()) {
+                    if ((e->modifiers() & ::Qt::ControlModifier) == 0) {
+                        if (/*it == selected.end()*/!isContaining) {
                             // ne designe pas un objet selectionne, vide la selection
                             unselect_all();
 
@@ -288,17 +295,19 @@ void DiagramView::contentsMousePressEvent(QMouseEvent * e)
                         // sinon on ne fait rien, l utilisateur veut probablement
                         // deplacer les objets selectionnes
                     }
-                    else if (it != selected.end())
+                    else if (/*it != selected.end()*/isContaining)
                         // l objet etait selectionne
                         unselect(ci);
                     else
                         // l objet n etait pas selectionne
                         select(ci);
-
                     DiagramItem * di = QCanvasItemToDiagramItem(ci);
 
                     if (di != 0)
-                        do_resize = di->on_resize_point(e->pos());
+                    {
+                        QPointF itemPoint = ci->mapFromScene(scenePoint.toPoint());
+                        do_resize = di->on_resize_point(itemPoint.toPoint());
+                    }
                 }
 
                 break;
@@ -307,39 +316,35 @@ void DiagramView::contentsMousePressEvent(QMouseEvent * e)
                 unselect_all();
                 window()->selectOn();
                 history_save();
-
                 NoteCanvas * note =
-                    new NoteCanvas(the_canvas(), e->x(), e->y(), 0);
+                        new NoteCanvas(the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
                 note->show();
                 note->upper();
                 note->open();
                 window()->package_modified();
             }
-            break;
+                break;
 
             case UmlText: {
                 unselect_all();
                 window()->selectOn();
                 history_save();
-
                 TextCanvas * text =
-                    new TextCanvas(the_canvas(), e->x(), e->y(), 0);
+                        new TextCanvas(the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
                 text->show();
                 text->upper();
                 text->open();
                 window()->package_modified();
             }
-            break;
+                break;
 
             case UmlImage: {
                 unselect_all();
                 window()->selectOn();
-
                 history_save();
-
-                ImageCanvas * image = ImageCanvas::add(the_canvas(), e->x(), e->y());
+                ImageCanvas * image = ImageCanvas::add(the_canvas(), scenePoint.x(), scenePoint.y());
 
                 if (image != 0) {
                     image->show();
@@ -347,59 +352,56 @@ void DiagramView::contentsMousePressEvent(QMouseEvent * e)
                     window()->package_modified();
                 }
             }
-            break;
+                break;
 
             case UmlPackage:
                 unselect_all();
                 window()->selectOn();
-                {
-                    BrowserPackage * p = BrowserPackage::get_package();
-
-                    if (p != 0) {
-                        history_save();
+            {
+                BrowserPackage * p = BrowserPackage::get_package();
 
-                        PackageCanvas * pk =
-                            new PackageCanvas(p, the_canvas(), e->x(), e->y(), 0);
+                if (p != 0) {
+                    history_save();
+                    PackageCanvas * pk =
+                            new PackageCanvas(p, the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
-                        pk->show();
-                        pk->upper();
-                        window()->package_modified();
-                    }
+                    pk->show();
+                    pk->upper();
+                    window()->package_modified();
                 }
+            }
                 break;
 
             case UmlFragment: {
                 unselect_all();
                 window()->selectOn();
                 history_save();
-
                 FragmentCanvas * f =
-                    new FragmentCanvas(the_canvas(), e->x(), e->y(), 0);
+                        new FragmentCanvas(the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
                 f->show();
                 f->upper();
                 window()->package_modified();
             }
-            break;
+                break;
 
             case UmlFoundSyncMsg:
             case UmlFoundAsyncMsg:
                 unselect_all();
                 history_save();
-                setCursor(::Qt::pointingHandCursor);
+                this->viewport()->setCursor(QCursor(::Qt::PointingHandCursor));
                 arrowBeginning = start = 0;
                 draw_line = TRUE;
-                mousePressPos = e->pos();
+                mousePressPos = scenePoint.toPoint();
                 break;
 
             default:
                 // lines
                 unselect_all();
-
                 if ((ci != 0) && isa_label(ci))
-                    ci = the_canvas()->collision(e->pos(), RTTI_LABEL);
-
+                    ci = the_canvas()->collision(scenePoint.toPoint(), RTTI_LABEL);
                 if (ci != 0) {
+
                     DiagramItem * i = QCanvasItemToDiagramItem(ci);
 
                     if (i != 0) {
@@ -411,11 +413,12 @@ void DiagramView::contentsMousePressEvent(QMouseEvent * e)
                         }
                         else {
                             history_save();
-                            setCursor(::Qt::pointingHandCursor);
+                            this->viewport()->setCursor(QCursor(::Qt::PointingHandCursor));
                             arrowBeginning = start = i;
                             draw_line = TRUE;
-                            mousePressPos = e->pos();
+                            mousePressPos = scenePoint.toPoint();
                         }
+
                     }
                     else
                         window()->selectOn();
@@ -432,16 +435,17 @@ void DiagramView::contentsMousePressEvent(QMouseEvent * e)
              ! BrowserNode::popupMenuActive()) {	// Qt bug
         BrowserNode::setPopupMenuActive(TRUE);
 
-        menu(e->pos());
+        menu(scenePoint.toPoint());
         BrowserNode::setPopupMenuActive(FALSE);
     }
 }
 
-void DiagramView::contentsMouseReleaseEvent(QMouseEvent * e)
+void DiagramView::mouseReleaseEvent(QMouseEvent * e)
 {
     int button = pressedButton;
-
     pressedButton = -1;
+    QPoint diagramPoint(e->x(), e->y());
+    QPointF scenePoint = mapToScene(diagramPoint);
 
     if (button == ::Qt::MidButton)
         QApplication::restoreOverrideCursor();
@@ -457,7 +461,7 @@ void DiagramView::contentsMouseReleaseEvent(QMouseEvent * e)
             the_canvas()->del(line);
             line = 0;
 
-            Q3CanvasItem * ci = the_canvas()->collision(e->pos(), RTTI_LABEL);
+            QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint(), RTTI_LABEL);
             UmlCode action = window()->buttonOn();
 
             if (ci != 0) {
@@ -467,11 +471,11 @@ void DiagramView::contentsMouseReleaseEvent(QMouseEvent * e)
                     if (start == 0) {
                         if (i->may_connect(action)) {
                             // sequence diagram found msg
-                            if (i->connexion(action, mousePressPos, e->pos())) {
+                            if (i->connexion(action, mousePressPos, scenePoint.toPoint())) {
                                 window()->package_modified();
                                 temp.clear();
                                 draw_line = FALSE;
-                                unsetCursor();
+                                this->viewport()->unsetCursor();
                             }
                             else
                                 abort_line_construction();
@@ -487,26 +491,26 @@ void DiagramView::contentsMouseReleaseEvent(QMouseEvent * e)
                             if ((theo != action) && (start != arrowBeginning))
                                 relation_to_simplerelation(action);
 
-                            start->connexion(action, i, mousePressPos, e->pos());
+                            start->connexion(action, i, mousePressPos, scenePoint.toPoint());
                             window()->package_modified();
                             temp.clear();
                             draw_line = FALSE;
-                            unsetCursor();
+                            this->viewport()->unsetCursor();
                             arrowBeginning->post_connexion(action, i);
                         }
                         else if (start->may_connect(action)) {
                             // component required/provided interface
                             // sequence diagram lost msg
-                            if (start->connexion(action, mousePressPos, e->pos())) {
+                            if (start->connexion(action, mousePressPos, scenePoint.toPoint())) {
                                 window()->package_modified();
                                 temp.clear();
                                 draw_line = FALSE;
-                                unsetCursor();
+                                this->viewport()->unsetCursor();
                             }
                             else
                                 abort_line_construction();
                         }
-                        else if (err != TR("illegal")) {
+                        else if (err != QObject::tr("illegal")) {
                             msg_critical("Douml", err);
                             abort_line_construction();
                         }
@@ -517,6 +521,7 @@ void DiagramView::contentsMouseReleaseEvent(QMouseEvent * e)
                         else
                             abort_line_construction();
                     }
+
                 }
                 else
                     abort_line_construction();
@@ -527,11 +532,11 @@ void DiagramView::contentsMouseReleaseEvent(QMouseEvent * e)
             else if (start->may_connect(action)) {
                 // component required/provided interface
                 // sequence diagram lost msg
-                if (start->connexion(action, mousePressPos, e->pos())) {
+                if (start->connexion(action, mousePressPos, scenePoint.toPoint())) {
                     window()->package_modified();
                     temp.clear();
                     draw_line = FALSE;
-                    unsetCursor();
+                    this->viewport()->unsetCursor();
                 }
                 else
                     abort_line_construction();
@@ -550,20 +555,39 @@ void DiagramView::contentsMouseReleaseEvent(QMouseEvent * e)
         }
         else if ((button == ::Qt::LeftButton) && (selectArea != 0)) {
             // selectionne les objets dans la zone de selection
-            QRect r = selectArea->boundingRect();
+            QRectF r = selectArea->sceneBoundingRect();
+            //possible Qt bug with negative width and heigth values
+            if(r.width()<0)
+            {
+                qreal w = r.width();
+                r.setX(r.x() + w);
+                r.setWidth(-w);
+            }
+            if(r.height()<0)
+            {
+                qreal h = r.height();
+                r.setY(r.y() + h);
+                r.setHeight(-h);
+            }
 
             the_canvas()->del(selectArea);
             selectArea = 0;
 
-            Q3CanvasItemList l = canvas()->collisions(r);
-            Q3CanvasItemList::Iterator it;
+            QList<QGraphicsItem*> l = canvas()->items(r);
+            QList<QGraphicsItem*>::Iterator it;
+            //habip
+            if(l.count()<3)
+                printf("not selected\r\n");
+
 
             for (it = l.begin(); it != l.end(); ++it)
-                if (r.contains((*it)->boundingRect(), TRUE) && // completement inclus
-                    !isa_alien(*it) &&		// DiagramItem
-                    (*it)->visible() &&		// pas en attente de destruction
-                    !(*it)->selected())   	// pas deja selectionne
+            {
+                if (r.contains((*it)->sceneBoundingRect()/*, TRUE*/) && // completement inclus
+                        !isa_alien(*it) &&		// DiagramItem
+                        (*it)->isVisible() &&		// pas en attente de destruction
+                        !(*it)->isSelected())   	// pas deja selectionne
                     select(*it);
+            }
 
             history_protected = TRUE;
             canvas()->update();
@@ -572,13 +596,16 @@ void DiagramView::contentsMouseReleaseEvent(QMouseEvent * e)
     }
 }
 
-void DiagramView::contentsWheelEvent(QWheelEvent * e)
+void DiagramView::wheelEvent(QWheelEvent * e)
 {
-    switch (e->state()) {
+    int currentVal;
+    switch (e->modifiers()) {
     case ::Qt::ShiftModifier:
         // note : direction doesn't exist with Qt2.3 and to
         // force direction to horizontal doesn't work with Qt3
-        scrollBy(e->delta() / -10, 0);
+        currentVal = horizontalScrollBar()->value();
+        currentVal += e->delta() / -10;
+        horizontalScrollBar()->setValue(currentVal);
         e->accept();
         break;
 
@@ -590,7 +617,9 @@ void DiagramView::contentsWheelEvent(QWheelEvent * e)
     default:
         // not use QCanvasView::contentsWheelEvent(e)
         // to have the same speed in horiz and vert
-        scrollBy(0, e->delta() / -10);
+        currentVal = verticalScrollBar()->value();
+        currentVal += e->delta() / -10;
+        verticalScrollBar()->setValue(currentVal);
         e->accept();
         break;
     }
@@ -599,10 +628,11 @@ void DiagramView::contentsWheelEvent(QWheelEvent * e)
 void DiagramView::add_point(QMouseEvent * e)
 {
     // adds an ArrowPoint and the line to it
+    QPoint diagramPoint(e->x(), e->y());
+    QPointF scenePoint = mapToScene(diagramPoint);
     history_protected = TRUE;
-
     ArrowPointCanvas * ap =
-        new ArrowPointCanvas(the_canvas(), e->x(), e->y());
+            new ArrowPointCanvas(the_canvas(), scenePoint.x(), scenePoint.y());
     UmlCode action = window()->buttonOn();
     UmlCode t = window()->browser_diagram()->get_type();
     ArrowCanvas * a;
@@ -612,10 +642,10 @@ void DiagramView::add_point(QMouseEvent * e)
 
     if ((t == UmlClassDiagram) && IsaRelation(action))
         a = new RelationCanvas(the_canvas(), start, ap, 0, action, 0, -1.0, -1.0);
-    else if ((t == UmlColDiagram) && (action == UmlLink))
-        a = new CodLinkCanvas(the_canvas(), start, ap, 0, -1.0, -1.0);
     else if ((t == UmlObjectDiagram) && (action == UmlObjectLink))
         a = new ObjectLinkCanvas(the_canvas(), start, ap, UmlObjectLink, 0, -1.0, -1.0);
+    else if ((t == UmlColDiagram) && (action == UmlLink))
+        a = new CodLinkCanvas(the_canvas(), start, ap, 0, -1.0, -1.0);
     else if (((t == UmlComponentDiagram) || (t == UmlDeploymentDiagram))
              && (action == UmlContain))
         a = new AssocContainCanvas(the_canvas(), start, ap, 0, -1.0, -1.0);
@@ -627,7 +657,6 @@ void DiagramView::add_point(QMouseEvent * e)
         a = new SimpleRelationCanvas(the_canvas(), start, ap, 0, action, 0, -1.0, -1.0);
     else
         a = new ArrowCanvas(the_canvas(), start, ap, action, 0, FALSE, -1.0, -1.0);
-
     temp.append(a);		// before the point, see abort_line_construction()
     temp.append(ap);
 
@@ -637,10 +666,10 @@ void DiagramView::add_point(QMouseEvent * e)
     draw_line = TRUE;
     mousePressPos = e->pos();
     start = ap;
-    line = new Q3CanvasLine(canvas());
-    line->setZ(TOP_Z);
-    line->setPoints(e->pos().x(), e->pos().y(),
-                    e->pos().x(), e->pos().y());
+    canvas()->addItem(line = new QGraphicsLineItem());
+    line->setZValue(TOP_Z);
+    line->setLine(scenePoint.x(), scenePoint.y(),
+                    scenePoint.x(), scenePoint.y());
     line->setPen(::Qt::DotLine);
     line->show();
     line->setPen(::Qt::SolidLine);
@@ -650,26 +679,29 @@ void DiagramView::add_point(QMouseEvent * e)
     window()->package_modified();
 
     // remark : mouse tracking does not work (?)
-    setCursor(::Qt::pointingHandCursor);
+    this->viewport()->setCursor(::Qt::PointingHandCursor);
 }
 
-void DiagramView::contentsMouseMoveEvent(QMouseEvent * e)
+void DiagramView::mouseMoveEvent(QMouseEvent * e)
 {
+    QPoint diagramPoint(e->x(), e->y());
+    QPointF scenePoint = mapToScene(diagramPoint);
     if (pressedButton == ::Qt::MidButton) {
-        scrollBy(mousePressPos.x() - e->pos().x(),
-                 mousePressPos.y() - e->pos().y());
+        scroll(mousePressPos.x() - scenePoint.x(),
+               mousePressPos.y() - scenePoint.y());
+
 
-        mousePressPos = e->pos();
+        mousePressPos = scenePoint.toPoint();
     }
     else if (!window()->frozen()) {
         if (pressedButton == ::Qt::LeftButton) {
-            ensureVisible(e->x(), e->y(), 30, 30);
+            ensureVisible(scenePoint.x(),scenePoint.y(), 10, 10);
 
             history_protected = TRUE;
 
-            int dx = e->pos().x() - mousePressPos.x();
-            int dy = e->pos().y() - mousePressPos.y();
-            Q3CanvasItemList selected = selection();
+            int dx = scenePoint.x() - mousePressPos.x();
+            int dy = scenePoint.y() - mousePressPos.y();
+            QList<QGraphicsItem*> selected = selection();
 
             if (! selected.isEmpty()) {
                 // deplace/redimentionne les objets selectionnes
@@ -678,13 +710,13 @@ void DiagramView::contentsMouseMoveEvent(QMouseEvent * e)
                     ArrowPointCanvas * ap;
 
                     if (on_arrow_decenter) {
-                        a->decenter(e->pos(), decenter_start, decenter_horiz);
+                        a->decenter(scenePoint.toPoint(), decenter_start, decenter_horiz);
                         window()->package_modified();
                     }
                     else if (a->is_decenter(mousePressPos, decenter_start, decenter_horiz)) {
                         on_arrow_decenter = TRUE;
                         history_save();
-                        a->decenter(e->pos(), decenter_start, decenter_horiz);
+                        a->decenter(scenePoint.toPoint(), decenter_start, decenter_horiz);
                         window()->package_modified();
                     }
                     else if (a->cut_on_move(ap)) {
@@ -692,7 +724,7 @@ void DiagramView::contentsMouseMoveEvent(QMouseEvent * e)
                         // becomes the alone selected item allowing to move it
                         history_save();
                         unselect(a);
-                        select(a->brk(e->pos()));
+                        select(a->brk(scenePoint.toPoint()));
                         window()->package_modified();
                         first_move = FALSE;
                     }
@@ -722,26 +754,27 @@ void DiagramView::contentsMouseMoveEvent(QMouseEvent * e)
                         moveSelected(dx, dy, FALSE);
                 }
 
-                mousePressPos = e->pos();
+                mousePressPos = scenePoint.toPoint();
             }
             else if (draw_line) {
                 if (line == 0) {
                     // premier deplacement : cree la ligne
-                    line = new Q3CanvasLine(canvas());
-                    line->setZ(TOP_Z);
+                    canvas()->addItem(line = new QGraphicsLineItem());
+                    line->setZValue(TOP_Z);
 
                     switch ((arrowBeginning == 0)
                             ? DiagramItem::Horizontal
                             : arrowBeginning->allowed_direction(window()->buttonOn())) {
                     case DiagramItem::Horizontal:
                         // horizontal line
-                        line->setPoints(mousePressPos.x(), mousePressPos.y(),
-                                        e->pos().x(), mousePressPos.y());
+                        line->setLine(mousePressPos.x(), mousePressPos.y(),
+                                      scenePoint.x(), scenePoint.y());
                         break;
 
                     default:
-                        line->setPoints(mousePressPos.x(), mousePressPos.y(),
-                                        e->pos().x(), e->pos().y());
+                        line->setLine(mousePressPos.x(), mousePressPos.y(),
+                                      scenePoint.x(), scenePoint.y());
+                        break;
                     }
 
                     line->setPen(::Qt::DotLine);
@@ -749,18 +782,18 @@ void DiagramView::contentsMouseMoveEvent(QMouseEvent * e)
                     line->setPen(::Qt::SolidLine);
                 }
                 else {
-                    QPoint st = line->startPoint();
+                    QPoint st = line->line().p1().toPoint();
 
                     switch ((arrowBeginning == 0)
                             ? DiagramItem::Horizontal
                             : arrowBeginning->allowed_direction(window()->buttonOn())) {
                     case DiagramItem::Horizontal:
                         // horizontal line
-                        line->setPoints(st.x(), st.y(), e->pos().x(), st.y());
+                        line->setLine(st.x(), st.y(), scenePoint.x(), scenePoint.y());
                         break;
 
                     default:
-                        line->setPoints(st.x(), st.y(), e->pos().x(), e->pos().y());
+                        line->setLine(st.x(), st.y(), scenePoint.x(), scenePoint.y());
                     }
                 }
             }
@@ -770,14 +803,14 @@ void DiagramView::contentsMouseMoveEvent(QMouseEvent * e)
                 if (selectArea == 0) {
                     // premier deplacement : cree la zone
                     selectArea =
-                        new SelectAreaCanvas(mousePressPos.x(), mousePressPos.y(), dx, dy, canvas());
+                            new SelectAreaCanvas(mousePressPos.x(), mousePressPos.y(), dx, dy, canvas());
 
-                    selectArea->setZ(TOP_Z);
+                    selectArea->setZValue(TOP_Z);
                     selectArea->show();
                 }
                 else {
                     // redimensionne la zone
-                    selectArea->setSize(dx, dy);
+                    selectArea->setRect(scenePoint.x()-dx,scenePoint.y()-dy, dx, dy);
                 }
             }
 
@@ -792,7 +825,7 @@ void DiagramView::abort_line_construction()
     if (draw_line) {
         draw_line = FALSE;
         history_protected = TRUE;
-        unsetCursor();
+        this->viewport()->unsetCursor();
 
         if (line != 0) {
             the_canvas()->del(line);
@@ -800,16 +833,15 @@ void DiagramView::abort_line_construction()
         }
 
         if (! temp.isEmpty()) {
-            Q3CanvasItemList::Iterator it = temp.begin();
+            QList<QGraphicsItem*>::Iterator it = temp.begin();
 
             // remove the line in the start item
             arrowBeginning->remove_line(((ArrowCanvas *) *it));
-
-            do {
+           do{
                 the_canvas()->del(*it);
-                it = temp.remove(it);
+                /*it = */temp.removeOne(*it);
             }
-            while (it != temp.end());
+            while (++it != temp.end());
         }
 
         canvas()->update();
@@ -819,32 +851,31 @@ void DiagramView::abort_line_construction()
 
 void DiagramView::relation_to_simplerelation(UmlCode k)
 {
-    Q3CanvasItemList::Iterator it = temp.begin();
+    QList<QGraphicsItem*>::Iterator it = temp.begin();
 
     // remove the line in the start item
     arrowBeginning->remove_line(((ArrowCanvas *) *it));
 
     start = arrowBeginning;
-
     do {
         // *it = arrow, (*it+1) = arrowpoint
         the_canvas()->del(*it);
-        it = temp.remove(it);
+        it = temp.erase(it);
 
         ArrowPointCanvas * ap =
-            new ArrowPointCanvas(the_canvas(), (int)(*it)->x(), (int)(*it)->y());
+                new ArrowPointCanvas(the_canvas(), (int)(*it)->x(), (int)(*it)->y());
 
         ap->upper();
 
         ArrowCanvas * a =
-            new SimpleRelationCanvas(the_canvas(), start, ap, 0, k, 0, -1.0, -1.0);
+                new SimpleRelationCanvas(the_canvas(), start, ap, 0, k, 0, -1.0, -1.0);
 
         ap->show();
         a->show();
         start = ap;
 
         the_canvas()->del(*it);
-        it = temp.remove(it);
+        it = temp.erase(it);
     }
     while (it != temp.end());
 }
@@ -858,14 +889,13 @@ void DiagramView::delete_them(bool in_model)
 {
     if (!in_model)
         history_save();
-
     for (;;) {
-        const Q3CanvasItemList & selected = selection();
+        const QList<QGraphicsItem*> & selected = selection();
 
         if (selected.isEmpty())
             break;
 
-        Q3CanvasItemList::ConstIterator it = selected.begin();
+        QList<QGraphicsItem*>::ConstIterator it = selected.begin();
         DiagramItem * item = QCanvasItemToDiagramItem(*it);
         BooL in = FALSE;
         BooL out = FALSE;
@@ -886,59 +916,98 @@ void DiagramView::delete_them(bool in_model)
 
 void DiagramView::alignLeft()
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it = selected.begin();
-    double ref = (*it)->x();
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it = selected.begin();
+    double ref = (*it)->sceneBoundingRect().left();
 
     while ((++it)  != selected.end())
-        (*it)->moveBy(ref - (*it)->x(), 0);
+    {
+        DiagramItem *dItem =  QCanvasItemToDiagramItem((*it));
+        if(dItem)
+        {
+            dItem->moveBy(ref - (*it)->sceneBoundingRect().left(), 0);
+        }
+        else
+            (*it)->moveBy(ref - (*it)->sceneBoundingRect().left(), 0);
+    }
 }
 
 void DiagramView::alignRight()
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it = selected.begin();
-    double ref = (*it)->boundingRectAdvanced().right();
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it = selected.begin();
+    double ref = (*it)->sceneBoundingRect().right();
 
     while ((++it)  != selected.end())
-        (*it)->moveBy(ref - (*it)->boundingRectAdvanced().right(), 0);
+    {
+        DiagramItem *dItem =  QCanvasItemToDiagramItem((*it));
+        if(dItem)
+        {
+            dItem->moveBy(ref - (*it)->sceneBoundingRect().right(), 0);
+        }
+        else
+            (*it)->moveBy(ref - (*it)->sceneBoundingRect().right(), 0);
+    }
 
     window()->package_modified();
 }
 
 void DiagramView::alignTop()
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it = selected.begin();
-    double ref = (*it)->y();
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it = selected.begin();
+    double ref = (*it)->sceneBoundingRect().top();
 
     while ((++it)  != selected.end())
-        (*it)->moveBy(0, ref - (*it)->y());
+    {
+        DiagramItem *dItem =  QCanvasItemToDiagramItem((*it));
+        if(dItem)
+        {
+            dItem->moveBy(0, ref - (*it)->sceneBoundingRect().top());
+        }
+        else
+            (*it)->moveBy(0, ref - (*it)->sceneBoundingRect().top());
+    }
 }
 
 void DiagramView::alignBottom()
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it = selected.begin();
-    double ref = (*it)->boundingRectAdvanced().bottom();
 
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it = selected.begin();
+    double ref = (*it)->sceneBoundingRect().bottom();
     while ((++it)  != selected.end())
-        (*it)->moveBy(0, ref - (*it)->boundingRectAdvanced().bottom());
+    {
+        DiagramItem *dItem =  QCanvasItemToDiagramItem((*it));
+        if(dItem)
+        {
+            dItem->moveBy(0, ref - (*it)->sceneBoundingRect().bottom());
+        }
+        else
+            (*it)->moveBy(0, ref - (*it)->sceneBoundingRect().bottom());
+    }
 
     window()->package_modified();
+
 }
 
 void DiagramView::alignHorizontaly()
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it = selected.begin();
-    QRect r = (*it)->boundingRectAdvanced();
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it = selected.begin();
+    QRectF r = (*it)->sceneBoundingRect();
     double ref = (r.top() + r.bottom()) / 2;
 
     while ((++it)  != selected.end()) {
-        r = (*it)->boundingRectAdvanced();
+        r = (*it)->sceneBoundingRect();
 
-        (*it)->moveBy(0, ref - (r.top() + r.bottom()) / 2);
+        DiagramItem *dItem =  QCanvasItemToDiagramItem((*it));
+        if(dItem)
+        {
+            dItem->moveBy(0, ref - (r.top() + r.bottom()) / 2);
+        }
+        else
+            (*it)->moveBy(0, ref - (r.top() + r.bottom()) / 2);
     }
 
     window()->package_modified();
@@ -946,15 +1015,21 @@ void DiagramView::alignHorizontaly()
 
 void DiagramView::alignVerticaly()
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it = selected.begin();
-    QRect r = (*it)->boundingRectAdvanced();
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it = selected.begin();
+    QRectF r = (*it)->sceneBoundingRect();
     double ref = (r.left() + r.right()) / 2;
 
     while ((++it)  != selected.end()) {
-        r = (*it)->boundingRectAdvanced();
+        r = (*it)->sceneBoundingRect();
 
-        (*it)->moveBy(ref - (r.left() + r.right()) / 2, 0);
+        DiagramItem *dItem =  QCanvasItemToDiagramItem((*it));
+        if(dItem)
+        {
+            dItem->moveBy(ref - (r.left() + r.right()) / 2, 0);
+        }
+        else
+            (*it)->moveBy(ref - (r.left() + r.right()) / 2, 0);
     }
 
     window()->package_modified();
@@ -962,15 +1037,22 @@ void DiagramView::alignVerticaly()
 
 void DiagramView::alignCenter()
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it = selected.begin();
-    QRect r = (*it)->boundingRectAdvanced();
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it = selected.begin();
+    QRectF r = (*it)->sceneBoundingRect();
     double refx = (r.left() + r.right()) / 2;
     double refy = (r.top() + r.bottom()) / 2;
 
     while ((++it)  != selected.end()) {
-        r = (*it)->boundingRectAdvanced();
+        r = (*it)->sceneBoundingRect();
 
+        DiagramItem *dItem =  QCanvasItemToDiagramItem((*it));
+        if(dItem)
+        {
+            dItem->moveBy(refx - (r.left() + r.right()) / 2,
+                          refy - (r.top() + r.bottom()) / 2);
+        }
+        else
         (*it)->moveBy(refx - (r.left() + r.right()) / 2,
                       refy - (r.top() + r.bottom()) / 2);
     }
@@ -981,11 +1063,10 @@ void DiagramView::alignCenter()
 
 void DiagramView::same_size(bool w, bool h)
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it;
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it;
     bool first = TRUE;
     QSize sz;
-
     for (it = selected.begin(); it != selected.end(); ++it) {
         if (!isa_label(*it)) {
             DiagramItem * item = QCanvasItemToDiagramItem(*it);
@@ -1006,26 +1087,25 @@ void DiagramView::same_size(bool w, bool h)
 }
 
 void DiagramView::multiple_selection_menu(bool in_model, bool out_model,
-        bool alignable, int n_resize,
-        Q3PtrList<DiagramItem> & l_drawing_settings)
+                                          bool alignable, int n_resize,
+                                          QList<DiagramItem *> & l_drawing_settings)
 {
-    const Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it;
-    Q3PopupMenu m(0);
-
-    MenuFactory::createTitle(m, TR("Multiple selection menu"));
-    m.insertSeparator();
+    const QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it;
+    QMenu m(0);
+    MenuFactory::createTitle(m, QObject::tr("Multiple selection menu"));
+    m.addSeparator();
 
     for (it = selected.begin(); it != selected.end(); ++it) {
         if (QCanvasItemToDiagramItem(*it)->linked()) {
-            m.insertItem(TR("Select linked items"), 1);
-            m.insertSeparator();
+            MenuFactory::addItem(m, tr("Select linked items"), 1);
+            m.addSeparator();
             break;
         }
     }
 
-    Q3PopupMenu al(0);
-    Q3PopupMenu sz(0);
+    QMenu al(0);
+    QMenu sz(0);
 
     if (alignable) {
         QPixmap top((const char **) align_top);
@@ -1035,48 +1115,50 @@ void DiagramView::multiple_selection_menu(bool in_model, bool out_model,
         QPixmap center((const char **) align_center);
         QPixmap vcenter((const char **) align_vcenter);
         QPixmap hcenter((const char **) align_hcenter);
-
-        al.insertItem(QIcon(top), TR("align top"), 4);
-        al.insertItem(QIcon(bottom), TR("align bottom"), 5);
-        al.insertItem(QIcon(left), TR("align left"), 6);
-        al.insertItem(QIcon(right), TR("align right"), 7);
-        al.insertItem(QIcon(center), TR("align center"), 8);
-        al.insertItem(QIcon(vcenter), TR("align center verticaly"), 9);
-        al.insertItem(QIcon(hcenter), TR("align center horizontaly"), 10);
-
-        m.insertItem(TR("Align"), &al);
+        al.addAction(QIcon(top), QObject::tr("align top"))->setData(4);
+        al.addAction(QIcon(bottom), QObject::tr("align bottom"))->setData(5);
+        al.addAction(QIcon(left), QObject::tr("align left"))->setData(6);
+        al.addAction(QIcon(right), QObject::tr("align right"))->setData(7);
+        al.addAction(QIcon(center), QObject::tr("align center"))->setData(8);
+        al.addAction(QIcon(vcenter), QObject::tr("align center verticaly"))->setData(9);
+        al.addAction(QIcon(hcenter), QObject::tr("align center horizontaly"))->setData(10);
+
+        MenuFactory::insertItem(m, tr("Align"), &al);
     }
 
     if (n_resize > 1) {
-        sz.insertItem(TR("same width"), 14);
-        sz.insertItem(TR("same height"), 15);
-        sz.insertItem(TR("same width and height"), 16);
+        MenuFactory::addItem(sz, tr("same width"), 14);
+        MenuFactory::addItem(sz, tr("same height"), 15);
+        MenuFactory::addItem(sz, tr("same width and height"), 16);
 
-        m.insertItem(TR("Size"), &sz);
-        m.insertSeparator();
+        MenuFactory::insertItem(m, tr("Size"), &sz);
+        m.addSeparator();
     }
     else if (alignable)
-        m.insertSeparator();
+        m.addSeparator();
 
-    m.insertItem(TR("Copy selected (Ctrl+c)"), 11);
+    MenuFactory::addItem(m, tr("Copy selected (Ctrl+c)"), 11);
 
     if (out_model) {
-        m.insertItem(TR("Cut selected (Ctrl+x, remove from diagram)"), 12);
-        m.insertItem(TR("Remove selected from view (Suppr)"), 2);
+        MenuFactory::addItem(m, tr("Cut selected (Ctrl+x, remove from diagram)"), 12);
+        MenuFactory::addItem(m, tr("Remove selected from view (Suppr)"), 2);
     }
 
     if (in_model)
-        m.insertItem(TR("Delete selected (Ctrl+d)"), 3);
+        MenuFactory::addItem(m, tr("Delete selected (Ctrl+d)"), 3);
 
     if (l_drawing_settings.count() > 1) {
-        m.insertSeparator();
-        m.insertItem(TR("Edit drawing settings"), 13);
-        m.insertItem(TR("Same drawing settings"), 17);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Edit drawing settings"), 13);
+        MenuFactory::addItem(m, tr("Same drawing settings"), 17);
     }
 
     history_protected = TRUE;
 
-    switch (m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (retAction->data().toInt()) {
     case 1:
         unselect_all();
 
@@ -1160,11 +1242,16 @@ void DiagramView::multiple_selection_menu(bool in_model, bool out_model,
 
     case 17:
         history_protected = FALSE;
-        l_drawing_settings.first()->same_drawing_settings(l_drawing_settings);
+        if (!l_drawing_settings.isEmpty()) {
+            const DiagramItem *source = l_drawing_settings[0];
+            for (int i = 1, n = l_drawing_settings.size(); i < n; ++i)
+                l_drawing_settings[i]->clone_drawing_settings(source);
+        }
 
     default:
         return;
     }
+    }
 
     canvas()->update();
     history_protected = FALSE;
@@ -1172,28 +1259,25 @@ void DiagramView::multiple_selection_menu(bool in_model, bool out_model,
 
 void DiagramView::moveSelected(int dx, int dy, bool first)
 {
-    Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it;
-
+    QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it;
     if (first) {
         for (it = selected.begin(); it != selected.end(); ++it)
             QCanvasItemToDiagramItem(*it)
-            ->prepare_for_move(do_resize != NoCorner);
+                    ->prepare_for_move(do_resize != NoCorner);
 
         selected = selection();
     }
 
     for (it = selected.begin(); it != selected.end(); ++it)
-        (*it)->moveBy(dx, dy);
-
+            QCanvasItemToDiagramItem(*it)->moveBy(dx, dy); //arrow canvas bagli item ile de move ediliyor
     window()->package_modified();
 }
 
 void DiagramView::resizeSelected(int dx, int dy)
 {
-    Q3CanvasItemList selected = selection();
-    Q3CanvasItemList::ConstIterator it;
-
+    QList<QGraphicsItem*> selected = selection();
+    QList<QGraphicsItem*>::ConstIterator it;
     if (previousResizeCorrection.isEmpty()) {
         QPoint p(0, 0);
 
@@ -1201,7 +1285,7 @@ void DiagramView::resizeSelected(int dx, int dy)
             previousResizeCorrection.append(p);
     }
 
-    Q3ValueList<QPoint>::Iterator it2;
+    QList<QPoint>::Iterator it2;
 
     for (it = selected.begin(), it2 = previousResizeCorrection.begin();
          it != selected.end();
@@ -1218,7 +1302,7 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
         e->ignore();
     }
     else if (!window()->frozen()) {
-        QString s = Shortcut::shortcut(e->key(), e->state());
+        QString s = Shortcut::shortcut(e->key(), e->modifiers());
 
         if (!s.isEmpty()) {
             e->accept();
@@ -1289,7 +1373,7 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                 history_protected = TRUE;
 
                 if (!clipboard.isEmpty() &&
-                    (copied_from == window()->browser_diagram()->get_type()))
+                        (copied_from == window()->browser_diagram()->get_type()))
                     paste();
             }
             else if (s == "Cut") {
@@ -1351,10 +1435,9 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
             else if (s == "Arrow geometry") {
                 history_protected = TRUE;
 
-                const Q3CanvasItemList selected = selection();
-                Q3CanvasItemList::ConstIterator it;
-                Q3CanvasItemList l;
-
+                const QList<QGraphicsItem*> selected = selection();
+                QList<QGraphicsItem*>::ConstIterator it;
+                QList<QGraphicsItem*> l;
                 // search for arrow beginning
                 for (it = selected.begin(); it != selected.end(); ++it) {
                     if (isa_arrow(*it)) {
@@ -1362,15 +1445,14 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                         DiagramItem * b;
                         DiagramItem * e;
 
-                        while (ar->extremities(b, e), b->type() == UmlArrowPoint)
+                        while (ar->extremities(b, e), b->typeUmlCode() == UmlArrowPoint)
                             ar = ((ArrowPointCanvas *) b)->get_other(ar);
 
                         if ((ar->get_start() != ((ArrowCanvas *) *it)->get_end()) &&
-                            (l.find(ar) == l.end()))
+                                (!l.contains(ar)))
                             l.append(ar);
                     }
                 }
-
                 unselect_all();
 
                 for (it = l.begin(); it != l.end(); ++it) {
@@ -1412,7 +1494,7 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                 return;
             }
             else {
-                const Q3CanvasItemList selected = selection();
+                const QList<QGraphicsItem*> selected = selection();
                 int nselected = selected.count();
 
                 if (nselected > 1) {
@@ -1420,16 +1502,15 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                         history_protected = TRUE;
                         unselect_all();
 
-                        Q3CanvasItemList::ConstIterator it;
-
+                        QList<QGraphicsItem*>::ConstIterator it;
                         for (it = selected.begin(); it != selected.end(); ++it)
                             QCanvasItemToDiagramItem(*it)->select_associated();
                     }
                     else if ((s == "Edit drawing settings") ||
                              (s == "Same drawing settings")) {
-                        Q3CanvasItemList::ConstIterator it;
+                        QList<QGraphicsItem*>::ConstIterator it;
                         UmlCode k = UmlCodeSup;
-                        Q3PtrList<DiagramItem> l;
+                        QList<DiagramItem *> l;
 
                         for (it = selected.begin(); it != selected.end(); ++it) {
                             if (! isa_label(*it)) {
@@ -1440,7 +1521,7 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                                     switch (k) {
                                     case UmlCodeSup:
                                         // first case
-                                        k = item->type();
+                                        k = item->typeUmlCode();
                                         l.append(item);
                                         break;
 
@@ -1449,7 +1530,7 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                                         break;
 
                                     default:
-                                        if (item->type() == k)
+                                        if (item->typeUmlCode() == k)
                                             l.append(item);
                                         else {
                                             // several types
@@ -1475,8 +1556,14 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
 
                             if (s == "Edit drawing settings")
                                 l.first()->edit_drawing_settings(l);
-                            else
-                                l.first()->same_drawing_settings(l);
+                            else {
+                                history_protected = FALSE;
+                                if (!l.isEmpty()) {
+                                    const DiagramItem *source = l[0];
+                                    for (int i = 1, n = l.size(); i < n; ++i)
+                                        l[i]->clone_drawing_settings(source);
+                                }
+                            }
                         }
                     }
                     else if (s == "Align bottom") {
@@ -1533,7 +1620,7 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                         BooL in_model;
                         BooL out_model;
                         BooL alignable;
-                        Q3PtrList<DiagramItem> l_drawing_settings;
+                        QList<DiagramItem *> l_drawing_settings;
                         int n_resize;
 
                         if (multiple_selection_for_menu(in_model, out_model, alignable,
@@ -1545,8 +1632,9 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                     }
                 }
                 else if (nselected == 1) {
+
                     DiagramItem * item =
-                        QCanvasItemToDiagramItem(selected.first());
+                            QCanvasItemToDiagramItem(selected.first());
 
                     if (item != 0) {
                         if (s == "Select linked items") {
@@ -1596,7 +1684,6 @@ void DiagramView::keyPressEvent(QKeyEvent * e)
                     return;
                 }
             }
-
             canvas()->update();
             history_protected = FALSE;
         }
@@ -1614,13 +1701,13 @@ void DiagramView::keyReleaseEvent(QKeyEvent *)
 
 void DiagramView::select_all()
 {
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         if ((QCanvasItemToDiagramItem(*cit) != 0) && // an uml canvas item
-            !(*cit)->selected() &&
-            (*cit)->visible())
+                !(*cit)->isSelected() &&
+                (*cit)->isVisible())
             select(*cit);
     }
 
@@ -1637,29 +1724,29 @@ void DiagramView::set_zoom(double zoom)
     ((UmlCanvas *) canvas())->show_limits(FALSE);
     ((UmlCanvas *) canvas())->set_zoom(zoom);
 
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     // hack to freeze arrow's labels position : select all
-    Q3CanvasItemList selected = selection();
+    QList<QGraphicsItem*> selected = selection();
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         if ((QCanvasItemToDiagramItem(*cit) != 0) && // an uml canvas item
-            !(*cit)->selected() &&
-            (*cit)->visible())
+                !(*cit)->isSelected() &&
+                (*cit)->isVisible())
             select(*cit);
     }
 
     DiagramItem * di;
 
     for (cit = all.begin(); cit != all.end(); ++cit)
-        if ((*cit)->visible() &&
-            !isa_arrow(*cit) &&
-            ((di = QCanvasItemToDiagramItem(*cit)) != 0))
+        if ((*cit)->isVisible() &&
+                !isa_arrow(*cit) &&
+                ((di = QCanvasItemToDiagramItem(*cit)) != 0))
             di->change_scale();
 
     for (cit = all.begin(); cit != all.end(); ++cit)
-        if ((*cit)->visible() && isa_arrow(*cit))
+        if ((*cit)->isVisible() && isa_arrow(*cit))
             ((ArrowCanvas *) *cit)->change_scale();
 
     // hack end
@@ -1672,30 +1759,38 @@ void DiagramView::set_zoom(double zoom)
     ((UmlCanvas *) canvas())->show_limits(TRUE);
 
     canvas()->update();
+
 }
 
-void DiagramView::needed_width_height(int & maxx, int & maxy) const
+void DiagramView::needed_width_height(int & maxx, int & maxy, int &minx, int &miny) const
 {
     // search the max used x and y
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     maxx = 0;
     maxy = 0;
+    minx = 10000;
+    miny = 10000;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * di;
 
-        if ((*cit)->visible() &&
-            ((di = QCanvasItemToDiagramItem(*cit)) != 0)) {
-            if (di->type() != UmlLifeLine) {
-                QRect r = (*cit)->boundingRect();
+        if ((*cit)->isVisible() &&
+                ((di = QCanvasItemToDiagramItem(*cit)) != 0)) {
+            if (di->typeUmlCode() != UmlLifeLine) {
+                QRect r = (*cit)->sceneBoundingRect().toRect();
 
                 if (r.right() > maxx)
                     maxx = r.right();
 
                 if (r.bottom() > maxy)
                     maxy = r.bottom();
+
+                if(r.left() < minx)
+                    minx = r.left();
+                if(r.top()<miny)
+                    miny = r.top();
             }
         }
     }
@@ -1708,11 +1803,12 @@ void DiagramView::fit_scale()
 
     int maxx;
     int maxy;
+    int miny;
+    int minx;
 
-    needed_width_height(maxx, maxy);
-
-    double scale = the_canvas()->zoom() * visibleWidth() / maxx;
-    double scale_y = the_canvas()->zoom() * visibleHeight() / maxy;
+    needed_width_height(maxx, maxy, minx, miny);
+    double scale = the_canvas()->zoom() * viewport()->width() / maxx;
+    double scale_y = the_canvas()->zoom() * viewport()->height() / maxy;
 
     if (scale > scale_y)
         scale = scale_y;
@@ -1728,7 +1824,6 @@ void DiagramView::do_optimal_window_size()
 {
     if (draw_line)
         abort_line_construction();
-
     history_protected = TRUE;
     optimal_window_size();
     canvas()->update();
@@ -1744,11 +1839,12 @@ void DiagramView::optimal_window_size()
 {
     int maxx;
     int maxy;
+    int minx;
+    int miny;
 
-    needed_width_height(maxx, maxy);
-
-    window()->resize(maxx + 10 + window()->width() - visibleWidth(),
-                     maxy + 10 + window()->height() - visibleHeight());
+    needed_width_height(maxx, maxy, minx, miny);
+    window()->resize(maxx + 10 + window()->width() - viewport()->width(),
+                     maxy + 10 + window()->height() - viewport()->height());
 }
 
 void DiagramView::preferred_size_zoom()
@@ -1769,7 +1865,7 @@ void DiagramView::set_format(int f)
     }
 }
 
-static bool find_browser_element(Q3Canvas * canvas, Q3CanvasItemList & r)
+static bool find_browser_element(QGraphicsScene * canvas, QList<QGraphicsItem*> & r)
 {
     BrowserNode * bn = BrowserView::selected_item();
 
@@ -1778,8 +1874,8 @@ static bool find_browser_element(Q3Canvas * canvas, Q3CanvasItemList & r)
 
     BasicData * d = bn->get_data();
     UmlCode k = bn->get_type();
-    Q3CanvasItemList l = canvas->allItems();
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> l = canvas->items();
+    QList<QGraphicsItem*>::Iterator it;
 
     switch (k) {
     case UmlClassDiagram:
@@ -1798,10 +1894,10 @@ static bool find_browser_element(Q3Canvas * canvas, Q3CanvasItemList & r)
     }
 
     for (it = l.begin(); it != l.end(); ++it) {
-        if ((*it)->visible()) {
+        if ((*it)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*it);
 
-            if ((di != 0) && (di->type() == k)) {
+            if ((di != 0) && (di->typeUmlCode() == k)) {
                 if (di->get_bn() == bn)
                     r.append(*it);
                 else {
@@ -1813,239 +1909,247 @@ static bool find_browser_element(Q3Canvas * canvas, Q3CanvasItemList & r)
             }
         }
     }
-
     return !r.isEmpty();
 }
 
-int DiagramView::default_menu(Q3PopupMenu & m, int f)
+int DiagramView::default_menu(QMenu & m, int f)
 {
     bool wr = (((UmlCanvas *) canvas())->browser_diagram())->is_writable();
 
     if (draw_line)
         abort_line_construction();
 
-    Q3PopupMenu formatm(0);
-    Q3PopupMenu formatlandscapem(0);
-    Q3CanvasItemList l;
+    QMenu formatm(0);
+    QMenu formatlandscapem(0);
+    QList<QGraphicsItem*> l;
 
     if (wr) {
-        m.insertItem(TR("Edit drawing settings"), EDIT_DRAWING_SETTING_CMD);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Edit drawing settings"), EDIT_DRAWING_SETTING_CMD);
+        m.addSeparator();
     }
 
-    m.insertItem(TR("Select diagram in browser"), 1);
+    MenuFactory::addItem(m, tr("Select diagram in browser"), 1);
 
     if (wr)
-        m.insertItem(TR("Select all (Ctrl+a)"), 2);
+        MenuFactory::addItem(m, tr("Select all (Ctrl+a)"), 2);
 
     if (find_browser_element(canvas(), l))
-        m.insertItem(TR("Find selected browser element"), 19);
+        MenuFactory::addItem(m, tr("Find selected browser element"), 19);
 
-    m.insertSeparator();
-    m.insertItem(TR("Copy optimal picture part"), 13);
-    m.insertItem(TR("Copy visible picture part"), 3);
-    m.insertItem(TR("Save optimal picture part (png)"), 14);
-    m.insertItem(TR("Save visible picture part (png)"), 10);
-    m.insertItem(TR("Save optimal picture part (svg)"), 15);
-    m.insertItem(TR("Save visible picture part (svg)"), 16);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Copy optimal picture part"), 13);
+    MenuFactory::addItem(m, tr("Copy visible picture part"), 3);
+    MenuFactory::addItem(m, tr("Save optimal picture part (png)"), 14);
+    MenuFactory::addItem(m, tr("Save visible picture part (png)"), 10);
+    MenuFactory::addItem(m, tr("Save optimal picture part (svg)"), 15);
+    MenuFactory::addItem(m, tr("Save visible picture part (svg)"), 16);
 
     if (wr && !clipboard.isEmpty() &&
-        (copied_from == window()->browser_diagram()->get_type()))
-        m.insertItem(TR("Paste copied items (Ctrl+v)"), 9);
+            (copied_from == window()->browser_diagram()->get_type()))
+        MenuFactory::addItem(m, tr("Paste copied items (Ctrl+v)"), 9);
 
-    m.insertSeparator();
-    m.insertItem(TR("Optimal scale"), 7);
-    m.insertItem(TR("Optimal window size"), 8);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Optimal scale"), 7);
+    MenuFactory::addItem(m, tr("Optimal window size"), 8);
 
     if (wr) {
-        m.insertItem(TR("Set preferred size and scale"), 4);
-        m.insertItem(TR("Set preferred scale (size unset)"), 17);
+        MenuFactory::addItem(m, tr("Set preferred size and scale"), 4);
+        MenuFactory::addItem(m, tr("Set preferred scale (size unset)"), 17);
 
         if (preferred_zoom != 0) {
             if (preferred_size.width() != 0) {
-                m.insertItem(TR("Restore preferred size and scale"), 5);
-                m.insertItem(TR("Unset preferred size and scale"), 18);
+                MenuFactory::addItem(m, tr("Restore preferred size and scale"), 5);
+                MenuFactory::addItem(m, tr("Unset preferred size and scale"), 18);
             }
             else {
-                m.insertItem(TR("Restore preferred scale"), 5);
-                m.insertItem(TR("Unset preferred scale"), 18);
+                MenuFactory::addItem(m, tr("Restore preferred scale"), 5);
+                MenuFactory::addItem(m, tr("Unset preferred scale"), 18);
             }
         }
 
         init_format_menu(formatm, formatlandscapem, f);
-        m.insertItem(TR("Format"), &formatm);
-        m.insertSeparator();
-        m.insertItem(TR("Undo all changes"), RELOAD_CMD);
+        MenuFactory::insertItem(m, tr("Format"), &formatm);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Undo all changes"), RELOAD_CMD);
 
         if (available_undo())
-            m.insertItem(TR("Undo (Ctrl+z or Ctrl+u)"), 11);
+            MenuFactory::addItem(m, tr("Undo (Ctrl+z or Ctrl+u)"), 11);
 
         if (available_redo())
-            m.insertItem(TR("Redo (Ctrl+y or Ctrl+r)"), 12);
+            MenuFactory::addItem(m, tr("Redo (Ctrl+y or Ctrl+r)"), 12);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Close"), 20);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Close"), 20);
 
-    int choice = m.exec(QCursor::pos());
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int choice = retAction->data().toInt();
 
-    switch (choice) {
-    case 1:
-        history_protected = TRUE;
-        the_canvas()->browser_diagram()->select_in_browser();
-        break;
+        switch (choice) {
+        case 1:
+            history_protected = TRUE;
+            the_canvas()->browser_diagram()->select_in_browser();
+            break;
 
-    case 2:
-        select_all();
-        break;
+        case 2:
+            select_all();
+            break;
 
-    case 19:
-        history_protected = TRUE;
-        unselect_all();
+        case 19:
+            history_protected = TRUE;
+            unselect_all();
 
         {
-            Q3CanvasItemList::Iterator it;
+            QList<QGraphicsItem*>::Iterator it;
 
             for (it = l.begin(); it != l.end(); ++it)
                 select(*it);
         }
 
-        ensureVisible((int) l.first()->x(), (int) l.first()->y());
-        canvas()->update();
-        break;
+            ensureVisible((int) l.first()->x(), (int) l.first()->y(),1,1);
+            canvas()->update();
+            break;
 
-    case 3:
-        copy_in_clipboard(FALSE, FALSE);
-        break;
+        case 3:
+            copy_in_clipboard(FALSE, FALSE);
+            break;
 
-    case 13:
-        copy_in_clipboard(TRUE, FALSE);
-        break;
+        case 13:
+            copy_in_clipboard(TRUE, FALSE);
+            break;
 
-    case 4:
-        history_protected = TRUE;
-        preferred_zoom = the_canvas()->zoom();
-        preferred_size.setWidth(window()->width());
-        preferred_size.setHeight(window()->height());
-        window()->package_modified();
-        break;
+        case 4:
+            history_protected = TRUE;
+            preferred_zoom = the_canvas()->zoom();
+            preferred_size.setWidth(window()->width());
+            preferred_size.setHeight(window()->height());
+            window()->package_modified();
+            break;
 
-    case 17:
-        history_protected = TRUE;
-        preferred_zoom = the_canvas()->zoom();
-        preferred_size.setWidth(0);
-        preferred_size.setHeight(0);
-        window()->package_modified();
-        break;
+        case 17:
+            history_protected = TRUE;
+            preferred_zoom = the_canvas()->zoom();
+            preferred_size.setWidth(0);
+            preferred_size.setHeight(0);
+            window()->package_modified();
+            break;
 
-    case 18:
-        history_protected = TRUE;
-        preferred_zoom = 0;
-        preferred_size.setWidth(0);
-        preferred_size.setHeight(0);
-        window()->package_modified();
-        break;
+        case 18:
+            history_protected = TRUE;
+            preferred_zoom = 0;
+            preferred_size.setWidth(0);
+            preferred_size.setHeight(0);
+            window()->package_modified();
+            break;
 
-    case 5:
-        preferred_size_zoom();
-        break;
+        case 5:
+            preferred_size_zoom();
+            break;
 
-    case 7:
-        window()->fit_scale();
-        break;
+        case 7:
+            window()->fit_scale();
+            break;
 
-    case 8:
-        do_optimal_window_size();
-        break;
+        case 8:
+            do_optimal_window_size();
+            break;
 
-    case 9:
-        history_protected = TRUE;
-        history_save();
-        paste();
-        break;
+        case 9:
+            history_protected = TRUE;
+            history_save();
+            paste();
+            break;
 
-    case 10:
-        history_protected = TRUE;
-        save_picture(FALSE, FALSE);
-        break;
+        case 10:
+            history_protected = TRUE;
+            save_picture(FALSE, FALSE);
+            break;
 
-    case 14:
-        history_protected = TRUE;
-        save_picture(TRUE, FALSE);
-        break;
+        case 14:
+            history_protected = TRUE;
+            save_picture(TRUE, FALSE);
+            break;
 
-    case 15:
-        history_protected = TRUE;
-        save_picture(TRUE, TRUE);
-        break;
+        case 15:
+            history_protected = TRUE;
+            save_picture(TRUE, TRUE);
+            break;
 
-    case 16:
-        history_protected = TRUE;
-        save_picture(FALSE, TRUE);
-        break;
+        case 16:
+            history_protected = TRUE;
+            save_picture(FALSE, TRUE);
+            break;
 
-    case 11:
-        undo();
-        break;
+        case 11:
+            undo();
+            break;
 
-    case 12:
-        redo();
-        break;
+        case 12:
+            redo();
+            break;
 
-    case 20:
-        window()->close(FALSE);
-        break;
+        case 20:
+            window()->close();
+            break;
 
-    case EDIT_DRAWING_SETTING_CMD:
-    case RELOAD_CMD:
-        // to be sure they are not reused
-        break;
+        case EDIT_DRAWING_SETTING_CMD:
+        case RELOAD_CMD:
+            // to be sure they are not reused
+            break;
 
-    default:
-        if (choice >= f) {
-            set_format(choice - f);
-            window()->package_modified();
+        default:
+            if (choice >= f) {
+                set_format(choice - f);
+                window()->package_modified();
+            }
         }
-    }
 
-    return choice;
+
+        return choice;
+    }
+    return -1;
 }
 
-void DiagramView::init_format_menu(Q3PopupMenu & m, Q3PopupMenu & lm,
+void DiagramView::init_format_menu(QMenu & m, QMenu & lm,
                                    int f) const
 {
-    m.setCheckable(TRUE);
-    lm.setCheckable(TRUE);
-
     int i;
 
     for (i = 0; i <= IsoA5; i += 1)
-        m.insertItem(QString("Iso ") + stringify((CanvasFormat) i), f + i);
+        MenuFactory::addItem(m, QString("Iso ") + stringify((CanvasFormat) i), f + i);
 
     for (; i <= UsE; i += 1)
-        m.insertItem(QString("Ansi ") + stringify((CanvasFormat) i), f + i);
+        MenuFactory::addItem(m, QString("Ansi ") + stringify((CanvasFormat) i), f + i);
 
     for (; i != IsoA0Landscape; i += 1)
-        m.insertItem(stringify((CanvasFormat) i), f + i);
+        MenuFactory::addItem(m, stringify((CanvasFormat) i), f + i);
 
-    m.insertSeparator();
-    m.insertItem(TR("Landscape formats"), &lm);
+    m.addSeparator();
+    foreach (QAction* act, m.actions()) {
+        act->setCheckable(true);
+    }
+    MenuFactory::insertItem(m, tr("Landscape formats"), &lm);
 
     for (; i <= IsoA5Landscape; i += 1)
-        lm.insertItem(QString("Iso ") + stringify((CanvasFormat) i), f + i);
+        MenuFactory::addItem(lm, QString("Iso ") + stringify((CanvasFormat) i), f + i);
 
     for (; i <= UsELandscape; i += 1)
-        lm.insertItem(QString("Ansi ") + stringify((CanvasFormat) i), f + i);
+        MenuFactory::addItem(lm, QString("Ansi ") + stringify((CanvasFormat) i), f + i);
 
     for (; i != CanvasFormatSup; i += 1)
-        lm.insertItem(stringify((CanvasFormat) i), f + i);
+        MenuFactory::addItem(lm, stringify((CanvasFormat) i), f + i);
 
+    foreach (QAction* act, lm.actions()) {
+        act->setCheckable(true);
+    }
     int current = (int) window()->browser_diagram()->get_format();
 
     if (current < (int) IsoA0Landscape)
-        m.setItemChecked(f + current, TRUE);
+        MenuFactory::findAction(m,f + current)->setChecked( TRUE);
     else
-        lm.setItemChecked(f + current, TRUE);
+        MenuFactory::findAction(lm,f + current)->setChecked( TRUE);
 }
 
 void DiagramView::load(const char * pfix)
@@ -2054,28 +2158,27 @@ void DiagramView::load(const char * pfix)
     unselect_all();
     preferred_zoom = 0;
     set_on_load_diagram(TRUE);
-
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator it;
     DiagramItem * di;
 
     for (it = all.begin(); it != all.end(); ++it)
         if (((di = QCanvasItemToDiagramItem(*it)) != 0) && // an uml canvas item
-            (*it)->visible())
+                (*it)->isVisible())
             di->delete_it();
 
     ((UmlCanvas *) canvas())->set_zoom(1);
     ((UmlCanvas *) canvas())->zoom_end();
 
     // load
+//recreating  UndefinedNodePackage will cause crash
     BrowserNode::pre_load();
-
     PRE_TRY;
 
     try {
         QString t = pfix;
 
-        t += " diagram " + ((QWidget *) parent())->caption();
+        t += " diagram " + ((QWidget *) parent())->windowTitle();
 
         read_in(t);
         read();
@@ -2091,13 +2194,13 @@ void DiagramView::load(const char * pfix)
     DiagramItem::post_load();
 
     // to managed deleted items present in the browser
-    all = canvas()->allItems();
+    all = canvas()->items();
 
     for (it = all.begin(); it != all.end(); ++it) {
-        if ((*it)->visible() &&
-            ((di = QCanvasItemToDiagramItem(*it)) != 0) &&
-            (di->get_bn() != 0) && // do not manage relations here
-            di->get_bn()->deletedp())
+        if ((*it)->isVisible() &&
+                ((di = QCanvasItemToDiagramItem(*it)) != 0) &&
+                (di->get_bn() != 0) && // do not manage relations here
+                di->get_bn()->deletedp())
             di->delete_it();
     }
 
@@ -2110,11 +2213,11 @@ void DiagramView::load(const char * pfix)
 
     canvas()->update();
 
-    all = canvas()->allItems();
+    all = canvas()->items();
 
     for (it = all.begin(); it != all.end(); ++it)
-        if ((*it)->visible() &&
-            ((di = QCanvasItemToDiagramItem(*it)) != 0))
+        if ((*it)->isVisible() &&
+                ((di = QCanvasItemToDiagramItem(*it)) != 0))
             di->post_loaded();
 
     canvas()->update();
@@ -2171,7 +2274,6 @@ void DiagramView::paste()
 {
     history_protected = TRUE;
     set_on_load_diagram(TRUE);
-
     double old_zoom = ((UmlCanvas *) canvas())->zoom();
     char * s = new char[clipboard.length() + 1];
 
@@ -2214,8 +2316,8 @@ void DiagramView::paste()
 
     // to managed deleted items present in the browser
     // compute rect containing all the paste items
-    Q3CanvasItemList l = selection();
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> l = selection();
+    QList<QGraphicsItem*>::Iterator it;
     DiagramItem * di;
     double minx = 1e10;
     double maxx = 0;
@@ -2223,31 +2325,31 @@ void DiagramView::paste()
     double maxy = 0;
 
     for (it = l.begin(); it != l.end(); ++it) {
-        if ((*it)->visible() &&
-            ((di = QCanvasItemToDiagramItem(*it)) != 0) &&
-            (di->get_bn() != 0) && // do not manage relations here
-            di->get_bn()->deletedp())
+        if ((*it)->isVisible() &&
+                ((di = QCanvasItemToDiagramItem(*it)) != 0) &&
+                (di->get_bn() != 0) && // do not manage relations here
+                di->get_bn()->deletedp())
             di->delete_it();
         else {
-            QRect r = (*it)->boundingRect();
+            QRectF r = (*it)->sceneBoundingRect();
 
-            if (r.x() < minx)
-                minx = r.x();
+            if (r.left() < minx)
+                minx = r.left();
 
-            if (r.y() < miny)
-                miny = r.y();
+            if (r.top() < miny)
+                miny = r.top();
 
-            if (r.x() > maxx)
+            if (r.left() > maxx)
                 maxx = r.right();
 
-            if (r.y() > maxy)
+            if (r.top() > maxy)
                 maxy = r.bottom();
         }
     }
 
     // place all paste items in the center of the viewport
-    double dx = contentsX() + width() / 2 - (minx + maxx) / 2;
-    double dy = contentsY() + height() / 2 - (miny + maxy) / 2;
+    double dx = /*contentsX() +*/ width() / 2 - (minx + maxx) / 2;
+    double dy = /*contentsY() + */height() / 2 - (miny + maxy) / 2;
 
     l = selection();
 
@@ -2262,11 +2364,11 @@ void DiagramView::paste()
     set_zoom(old_zoom);
     canvas()->update();
 
-    l = canvas()->allItems();
+    l = canvas()->items();
 
     for (it = l.begin(); it != l.end(); ++it)
-        if ((*it)->visible() &&
-            ((di = QCanvasItemToDiagramItem(*it)) != 0))
+        if ((*it)->isVisible() &&
+                ((di = QCanvasItemToDiagramItem(*it)) != 0))
             di->post_loaded();
 
     canvas()->update();
@@ -2278,18 +2380,17 @@ void DiagramView::paste()
 
 bool DiagramView::is_present(BrowserNode * bn)
 {
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator it;
 
     for (it = all.begin(); it != all.end(); ++it) {
-        if ((*it)->visible()) {
+        if ((*it)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*it);
 
             if ((di != 0) && di->represents(bn))
                 return TRUE;
         }
     }
-
     return FALSE;
 }
 
@@ -2302,18 +2403,18 @@ bool DiagramView::save_pict(const char * f, bool optimal, bool temporary)
 {
     QFileInfo fi(f);
 
-    return (fi.extension(FALSE).lower() == "svg")
-           ? svg_save_in(f, optimal, temporary)
-           : save_in(f, optimal, temporary);
+    return (fi.fileName().right(3).toLower() == "svg")
+            ? svg_save_in(f, optimal, temporary)
+            : save_in(f, optimal, temporary);
 }
 
-bool DiagramView::save_in(const char * f, bool optimal, bool temporary)
+bool DiagramView::save_in(QString f, bool optimal, bool temporary)
 {
     if (the_canvas()->selection().count() != 0) {
         // unselect element and redraw them to remove selection mark
         history_protected = TRUE;
         unselect_all();
-        the_canvas()->setAllChanged();
+        the_canvas()->update();
         canvas()->update();
         history_protected = TRUE;
     }
@@ -2321,24 +2422,33 @@ bool DiagramView::save_in(const char * f, bool optimal, bool temporary)
     the_canvas()->show_limits(FALSE);
 
     bool r;
-
     if (optimal) {
-        int x0 = contentsX();
-        int y0 = contentsY();
+        //int x0 = 0;//center();
+        //int y0 = 0; //contentsY();
 
-        setContentsPos(0, 0);
+        //setContentsPos(0, 0);
 
         int maxx;
         int maxy;
+        int minx;
+        int miny;
 
-        needed_width_height(maxx, maxy);
-        maxx += 10;
+        needed_width_height(maxx, maxy, minx, miny);
+        maxx += 30;
         maxy += 10;
 
+
+        QPoint minP = mapFromScene(minx, miny);
+        QPoint maxP = mapFromScene(maxx, maxy);
+        minx = minP.x();
+        miny = minP.y();
+
+        maxx = maxP.x();
+        maxy = maxP.y();
+
         // add a large margin to be sure to see all in one shot contrarilly
         // to the optimal_window_size whose must have the pretty size
-
-        if ((visibleWidth() >= (maxx + 90)) && (visibleHeight() >= (maxy + 90)))
+        if ((viewport()->width() >= (maxx + 90)) && (viewport()->height() >= (maxy + 90)))
             r = QPixmap::grabWidget(viewport(), 0, 0, maxx, maxy).save(f, "PNG");
         else {
 
@@ -2353,51 +2463,50 @@ bool DiagramView::save_in(const char * f, bool optimal, bool temporary)
             r = QPixmap::grabWidget(viewport(), 0, 0, maxx, maxy).save(f, "PNG");
 
             if (! temporary) {
-
-
-
                 window()->resize(saved_w, saved_h);
-
             }
         }
 
         if (! temporary)
-            setContentsPos(x0, y0);
+        {
+           // setContentsPos(x0, y0);
+        }
     }
     else
         r = QPixmap::grabWidget(viewport()).save(f, "PNG");
 
     the_canvas()->show_limits(TRUE);
+
     return r;
 }
 
-bool DiagramView::svg_save_in(const char * f, bool optimal, bool temporary)
+bool DiagramView::svg_save_in(QString f, bool optimal, bool temporary)
 {
     bool result = FALSE;
-
     the_canvas()->show_limits(FALSE);
-
     if (optimal) {
-        int x0 = contentsX();
-        int y0 = contentsY();
+        //int x0 = 0; //contentsX();
+        //int y0 = 0;//contentsY();
 
-        setContentsPos(0, 0);
+        //setContentsPos(0, 0);
 
         int maxx;
         int maxy;
+        int minx;
+        int miny;
 
-        needed_width_height(maxx, maxy);
-        maxx += 10;
+        needed_width_height(maxx, maxy, minx, miny);
+        maxx += 30;
         maxy += 10;
 
         // add a large margin to be sure to see all in one shot contrarilly
         // to the optimal_window_size whose must have the pretty size
 
-        if ((visibleWidth() >= (maxx + 90)) && (visibleHeight() >= (maxy + 90))) {
+        if ((viewport()->width() >= (maxx + 90)) && (viewport()->height() >= (maxy + 90))) {
             if (start_svg(f, maxx, maxy)) {
                 result = TRUE;
                 history_protected = TRUE;
-                the_canvas()->setAllChanged();
+                the_canvas()->update();
                 canvas()->update();
                 history_protected = FALSE;
                 end_svg();
@@ -2416,7 +2525,7 @@ bool DiagramView::svg_save_in(const char * f, bool optimal, bool temporary)
             if (start_svg(f, maxx, maxy)) {
                 result = TRUE;
                 history_protected = TRUE;
-                the_canvas()->setAllChanged();
+                the_canvas()->update();
                 canvas()->update();
                 history_protected = FALSE;
                 end_svg();
@@ -2432,19 +2541,19 @@ bool DiagramView::svg_save_in(const char * f, bool optimal, bool temporary)
         }
 
         if (! temporary)
-            setContentsPos(x0, y0);
+        {
+            //setContentsPos(x0, y0);
+        }
     }
-    else if (start_svg(f, visibleWidth(), visibleHeight())) {
+    else if (start_svg(f, viewport()->width(), viewport()->height())) {
         result = TRUE;
         history_protected = TRUE;
-        the_canvas()->setAllChanged();
+        the_canvas()->update();
         canvas()->update();
         history_protected = FALSE;
         end_svg();
     }
-
     the_canvas()->show_limits(TRUE);
-
     return result;
 }
 
@@ -2454,32 +2563,43 @@ void DiagramView::copy_in_clipboard(bool optimal, bool temporary)
         // unselect element and redraw them to remove selection mark
         history_protected = TRUE;
         unselect_all();
-        the_canvas()->setAllChanged();
+        the_canvas()->update();
         canvas()->update();
     }
-
     history_protected = TRUE;
     the_canvas()->show_limits(FALSE);
 
     if (optimal) {
-        int x0 = contentsX();
-        int y0 = contentsY();
+        //int x0 = 0;// contentsX();
+        //int y0 = 0; //contentsY();
 
-        setContentsPos(0, 0);
+        //setContentsPos(0, 0);
 
         int maxx;
         int maxy;
+        int minx;
+        int miny;
 
-        needed_width_height(maxx, maxy);
-        maxx += 10;
+        needed_width_height(maxx, maxy, minx, miny);
+        maxx += 30;
         maxy += 10;
 
+        QPoint minP = mapFromScene(minx, miny);
+        QPoint maxP = mapFromScene(maxx, maxy);
+        minx = minP.x();
+        miny = minP.y();
+
+        maxx = maxP.x();
+        maxy = maxP.y();
+
+
         // add a large margin to be sure to see all in one shot contrarilly
         // to the optimal_window_size whose must have the pretty size
 
-        if ((visibleWidth() >= (maxx + 90)) && (visibleHeight() >= (maxy + 90)))
+        if ((viewport()->width() >= (maxx + 90)) && (viewport()->height() >= (maxy + 90))) {
             QApplication::clipboard()
-            ->setPixmap(QPixmap::grabWidget(viewport(), 0, 0, maxx, maxy));
+                    ->setPixmap(QPixmap::grabWidget(viewport(), 0, 0, maxx, maxy));
+        }
         else {
 
             int saved_w;
@@ -2492,7 +2612,7 @@ void DiagramView::copy_in_clipboard(bool optimal, bool temporary)
             history_protected = TRUE;
             canvas()->update();
             QApplication::clipboard()
-            ->setPixmap(QPixmap::grabWidget(viewport(), 0, 0, maxx, maxy));
+                    ->setPixmap(QPixmap::grabWidget(viewport(), 0, 0 , maxx,  maxy));
 
             if (! temporary) {
 
@@ -2504,7 +2624,9 @@ void DiagramView::copy_in_clipboard(bool optimal, bool temporary)
         }
 
         if (! temporary)
-            setContentsPos(x0, y0);
+        {
+            //setContentsPos(x0, y0);
+        }
     }
     else
         QApplication::clipboard()->setPixmap(QPixmap::grabWidget(viewport()));
@@ -2524,21 +2646,21 @@ void DiagramView::restore_window_size()
 void DiagramView::save_picture(bool optimal, bool svg)
 {
     QString filename =
-        Q3FileDialog::getSaveFileName(last_used_directory(),
-                                      (svg) ? TR("SVG file (*.svg)") : TR("PNG file (*.png)"),
-                                      this);
+            QFileDialog::getSaveFileName(this,
+                                          (svg) ? QObject::tr("SVG file (*.svg)") : QObject::tr("PNG file (*.png)"),
+                                         last_used_directory());
 
     if (!filename.isNull()) {
         set_last_used_directory(filename);
 
         if (svg) {
-            if (filename.right(4).lower() != ".svg")
+            if (filename.right(4).toLower() != ".svg")
                 filename += ".svg";
 
             svg_save_in(filename, optimal, FALSE);
         }
         else {
-            if (filename.right(4).lower() != ".png")
+            if (filename.right(4).toLower() != ".png")
                 filename += ".png";
 
             save_in(filename, optimal, FALSE);
@@ -2551,18 +2673,16 @@ void DiagramView::print(QPrinter & printer, int div)
 {
     if (the_canvas()->selection().count() != 0)
         unselect_all();
-
     double old_zoom = ((UmlCanvas *) canvas())->zoom();
 
     if (old_zoom < 1)
         set_zoom(1);
-
     QPainter paint(&printer);
-    Q3PaintDeviceMetrics m(paint.device());
-    int devw = m.width();
-    int devh = m.height();
-    double w = contentsWidth();
-    double h = contentsHeight();
+    //Q3PaintDeviceMetrics m(paint.device());
+    int devw = printer.width();
+    int devh = printer.height();
+    double w = viewport()->width();
+    double h = viewport()->height();
     double zoom = devh / h;
 
     if (devw / w < zoom)
@@ -2580,7 +2700,8 @@ void DiagramView::print(QPrinter & printer, int div)
         int j = 0;
 
         for (;;) {
-            drawContents(&paint, (int)(i * w), (int)(j * h), (int) w, (int) h);
+            //drawContents(&paint, (int)(i * w), (int)(j * h), (int) w, (int) h);
+            this->render(&paint, QRectF(i*w,j*h, w, h));
 
             if (++j == div)
                 break;
@@ -2595,7 +2716,6 @@ void DiagramView::print(QPrinter & printer, int div)
         printer.newPage();
         paint.translate(-w, h * (div - 1));
     }
-
     ((UmlCanvas *) canvas())->show_limits(TRUE);
 
     if (old_zoom < 1)
@@ -2622,15 +2742,13 @@ void DiagramView::read_session(char *& st)
     canvas()->update();
     (void) read_unsigned(st); // set_format((int) read_unsigned(st));
     {
-        extern QApplication * theApp;
-        theApp->processEvents(/*500*/);
+        qApp->processEvents(/*500*/);
     }
     verticalScrollBar()->setValue(read_unsigned(st));
     horizontalScrollBar()->setValue(read_unsigned(st));
     canvas()->update();
     {
-        extern QApplication * theApp;
-        theApp->processEvents(/*500*/);
+        qApp->processEvents(/*500*/);
     }
 }
 
@@ -2650,8 +2768,8 @@ void DiagramView::history_save(bool on_undo)
         return;
 
     // get current state
-    QByteArray * ba = new QByteArray();
-    QBuffer b(ba);
+    QByteArray ba;
+    QBuffer b(&ba);
 
     b.open(QIODevice::WriteOnly);
 
@@ -2660,12 +2778,11 @@ void DiagramView::history_save(bool on_undo)
 
     b.writeBlock((char *) &z, sizeof(z));
     */
+    DiagramItemList items(canvas()->items());
 
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
-
-    for (di = items.first(); di != 0; di = items.next())
+    foreach (DiagramItem * di, items) {
         di->history_save(b);
+    }
 
     b.close();
 
@@ -2675,19 +2792,15 @@ void DiagramView::history_save(bool on_undo)
         history_index = 0;
     }
     else {
-        QByteArray * current = history.at(history_index);
+        const QByteArray &current = history.at(history_index);
 
         if (! on_undo) {
             // remove redo
-            while (history.getLast() != current)
+            while (history.last() != current)
                 history.removeLast();
         }
 
-        if (*ba == *current) {
-            // nothing new
-            delete ba;
-        }
-        else {
+        if (ba != current) {
             history.append(ba);
 
             // limit history depth to 20
@@ -2706,17 +2819,15 @@ void DiagramView::history_load()
 
     // unselect and hide all
     unselect_all();
-
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
-
-    for (di = items.first(); di != 0; di = items.next()) {
+    DiagramItemList items(canvas()->items());
+    foreach (DiagramItem *di, items) {
         di->history_hide();
         di->post_history_hide();
     }
 
     // load history
-    QBuffer b((history.at(history_index))); // [lgfreitas] now qbuffer receives a pointer to a bytearray
+    QByteArray &ba = history[history_index];
+    QBuffer b(&ba); // [lgfreitas] now qbuffer receives a pointer to a bytearray
 
     b.open(QIODevice::ReadOnly);
 
@@ -2743,7 +2854,6 @@ void DiagramView::undo()
     history_index -= 1;
     history_load();
 }
-
 // want to be the state following the state indicated by history_index
 void DiagramView::redo()
 {
diff --git a/src/diagram/DiagramView.h b/src/diagram/DiagramView.h
index 6c6f186bf..66636fca3 100644
--- a/src/diagram/DiagramView.h
+++ b/src/diagram/DiagramView.h
@@ -27,15 +27,16 @@
 
 #ifndef DIAGRAMVIEW_H
 #define DIAGRAMVIEW_H
-
-#include <q3canvas.h>
+#include <QList>
+#include <QGraphicsView>
+#include <QGraphicsItem>
 #include <QTextStream>
 //Added by qt3to4:
 
 #include <QWheelEvent>
-#include <Q3ValueList>
+#include <QList>
 #include <QMouseEvent>
-#include <Q3PopupMenu>
+////#include <QMenu>
 #include <QKeyEvent>
 
 #include "UmlEnum.h"
@@ -45,7 +46,7 @@
 class QPrinter;
 #endif
 class QKeyEvent;
-class Q3PopupMenu;
+class QMenu;
 class QBuffer;
 
 class DiagramItem;
@@ -54,7 +55,7 @@ class DiagramWindow;
 #define EDIT_DRAWING_SETTING_CMD 0
 #define RELOAD_CMD 6
 
-class DiagramView : public Q3CanvasView
+class DiagramView : public QGraphicsView
 {
     Q_OBJECT
 
@@ -62,11 +63,11 @@ class DiagramView : public Q3CanvasView
     int id;
     int pressedButton;
     QPoint mousePressPos;	// mouse position when it is pressed or moved
-    Q3CanvasRectangle * selectArea;
+    QGraphicsRectItem * selectArea;
     DiagramItem * start;	// last added line part start
-    Q3CanvasLine * line;
+    QGraphicsLineItem * line;
     DiagramItem * arrowBeginning;// broken line start
-    Q3CanvasItemList temp;
+    QList<QGraphicsItem*> temp;
     QSize preferred_size;
     double preferred_zoom;
     bool draw_line;
@@ -77,9 +78,9 @@ class DiagramView : public Q3CanvasView
     bool on_arrow_decenter;
     BooL decenter_start;
     BooL decenter_horiz;
-    Q3ValueList<QPoint> previousResizeCorrection;
-    Q3PtrList<QByteArray> history;
-    unsigned history_index;
+    QList<QPoint> previousResizeCorrection;
+    QList<QByteArray> history;
+    int history_index;
 
 
 
@@ -94,13 +95,13 @@ class DiagramView : public Q3CanvasView
     void unselect_all() {
         the_canvas()->unselect_all();
     };
-    const Q3CanvasItemList & selection() {
+    const QList<QGraphicsItem*> & selection() {
         return the_canvas()->selection();
     };
-    void select(Q3CanvasItem * i) {
+    void select(QGraphicsItem * i) {
         the_canvas()->select(i);
     };
-    void unselect(Q3CanvasItem * i) {
+    void unselect(QGraphicsItem * i) {
         the_canvas()->unselect(i);
     };
     void abort_line_construction();
@@ -112,12 +113,13 @@ class DiagramView : public Q3CanvasView
         return preferred_zoom != 0;
     }
     void multiple_selection_menu(bool in_model, bool out_model, bool alignable,
-                                 int n_resize, Q3PtrList<DiagramItem> & l_drawing_settings);
+                                 int n_resize, QList<DiagramItem *> & l_drawing_settings);
     bool is_present(BrowserNode * bn);
     virtual void add_related_elements(DiagramItem *, QString what,
                                       bool inh, bool assoc);
 
     virtual UmlCanvas * the_canvas() const;
+    QGraphicsScene *canvas() const;
 
     virtual void menu(const QPoint &) = 0;
 
@@ -152,8 +154,8 @@ class DiagramView : public Q3CanvasView
 
     void copy_in_clipboard(bool optimal, bool temporary);
     bool save_pict(const char * f, bool optimal, bool temporary);
-    bool save_in(const char * f, bool optimal, bool temporary);
-    bool svg_save_in(const char * f, bool optimal, bool temporary);
+    bool save_in(QString f, bool optimal, bool temporary);
+    bool svg_save_in(QString f, bool optimal, bool temporary);
 
     void renumber(int ident);
 
@@ -165,23 +167,23 @@ class DiagramView : public Q3CanvasView
     };
 
 protected:
-    virtual void contentsMouseDoubleClickEvent(QMouseEvent *);
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void contentsMouseReleaseEvent(QMouseEvent *);
-    virtual void contentsMouseMoveEvent(QMouseEvent *);
-    virtual void contentsWheelEvent(QWheelEvent *);
+    virtual void mouseDoubleClickEvent(QMouseEvent *);
+    virtual void mousePressEvent(QMouseEvent *);
+    virtual void mouseReleaseEvent(QMouseEvent *);
+    virtual void mouseMoveEvent(QMouseEvent *);
+    virtual void wheelEvent(QWheelEvent *);
     void moveSelected(int dx, int dy, bool first);
     void resizeSelected(int dx, int dy);
     void add_point(QMouseEvent * e);
     bool multiple_selection_for_menu(BooL & in_model, BooL & out_model,
                                      BooL & alignable, int & n_resize,
-                                     Q3PtrList<DiagramItem> & l_drawing_settings,
-                                     const Q3CanvasItemList & selected);
+                                     QList<DiagramItem *> & l_drawing_settings,
+                                     const QList<QGraphicsItem*> & selected);
 
     void set_format(int);
-    void init_format_menu(Q3PopupMenu &, Q3PopupMenu &, int) const;
-    int default_menu(Q3PopupMenu & m, int f);
-    void needed_width_height(int & maxx, int & maxy) const;
+    void init_format_menu(QMenu &, QMenu &, int) const;
+    int default_menu(QMenu & m, int f);
+    void needed_width_height(int & maxx, int & maxy, int & minx, int & miny) const;
 
     void save_picture(bool optimal, bool svg);
 
diff --git a/src/diagram/DiagramWindow.cpp b/src/diagram/DiagramWindow.cpp
index beb7a4d95..7f060c8c4 100644
--- a/src/diagram/DiagramWindow.cpp
+++ b/src/diagram/DiagramWindow.cpp
@@ -31,14 +31,13 @@
 
 
 
-
-#include <qworkspace.h>
+#include <QMdiArea>
 #include <qnamespace.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
-#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlabel.h>
 #include <qcursor.h>
 //Added by qt3to4:
@@ -51,47 +50,52 @@
 #include "BrowserDiagram.h"
 #include "DiagramWindow.h"
 #include "DiagramView.h"
-#include "UmlWindow.h"
 #include "UmlCanvas.h"
+#include "UmlWindow.h"
 #include "myio.h"
 #include "UmlPixmap.h"
 #include "translate.h"
+#include <QLayout>
+#include "toolbarfactory.h"
 
 static QString zoomText()
 {
-    return TR("Enter a new scale value or use the arrows to change the <i>scale</i>");
+    return QObject::tr("Enter a new scale value or use the arrows to change the <i>scale</i>");
 }
 static QString fitzoomText()
 {
-    return TR("Click this button to compute the <i>fit scale</i> allowing to try to show all the diagram");
+    return QObject::tr("Click this button to compute the <i>fit scale</i> allowing to try to show all the diagram");
 }
 static QString optwinsizeText()
 {
-    return TR("Click this button to compute the smallest window size allowing to show all the diagram");
+    return QObject::tr("Click this button to compute the smallest window size allowing to show all the diagram");
 }
 static QString editText()
 {
-    return TR("Click this button to call the diagram menu like on a right mouse click"
+    return QObject::tr("Click this button to call the diagram menu like on a right mouse click"
               " done out of any element");
 }
 
 DiagramWindow::DiagramWindow(BrowserDiagram * br, const QString & s)
-    : Q3MainWindow(0, (const char *) s, Qt::WDestructiveClose),
+    : QMainWindow(0 /*,(const char *) s, Qt::WA_DeleteOnClose*/),
       no_save(FALSE), browser_node(br)
 {
-    setCaption(s);
+    setWindowTitle(s);
+    setAttribute(Qt::WA_DeleteOnClose);
     canvas = new UmlCanvas(br->get_format(), br);
-
     setFocusPolicy(Qt::StrongFocus);
     /* [lgfreitas] Fixing bug 3153814 and 3153824 where MDI config was lost and artifact outline were lost */
-    UmlWindow::get_workspace()->addWindow(this); // workspace now needs to have windows added
+    m_containingSubWindow = UmlWindow::get_workspace()->addSubWindow(this); // workspace now needs to have windows added
+    if(UmlWindow::get_workspace()->currentSubWindow() && !UmlWindow::get_workspace()->currentSubWindow()->isMaximized())
+        UmlWindow::get_workspace()->cascadeSubWindows();
+    //sw->resize(300, 300);
 }
 
 DiagramWindow::~DiagramWindow()
 {
     browser_node->set_window_destroyed();
+    m_containingSubWindow->deleteLater();
     delete canvas;
-    this->setParent(0);
 }
 
 void DiagramWindow::call_menu()
@@ -108,7 +112,7 @@ void DiagramWindow::raise()
 
 void DiagramWindow::selectOn()
 {
-    select->setOn(TRUE);
+    select->setEnabled(TRUE);
     hit_select();
 }
 
@@ -117,36 +121,53 @@ void DiagramWindow::hit_select()
     hit_button(UmlSelect, select);
 }
 
-void DiagramWindow::add_edit_button(Q3ToolBar * toolbar)
+void DiagramWindow::add_edit_button(QToolBar * toolbar)
 {
-    edit = new QToolButton(*editButton, TR("edit"), QString(),
-                           this, SLOT(call_menu()), toolbar, "edit");
-    Q3WhatsThis::add(edit, editText());
-
-    edit->setToggleButton(FALSE);
+    //edit = new QToolButton(*editButton, QObject::tr("edit"), QString(),
+      //                     this, SLOT(call_menu()), toolbar, "edit");
+    edit = new QToolButton(toolbar);
+    edit->setIcon(QIcon(*editButton));
+    edit->setText(tr("edit"));
+    edit->setObjectName("edit");
+    connect(edit, SIGNAL(clicked()), this, SLOT(call_menu()));
+    edit->setWhatsThis(editText());
+
+    edit->setCheckable(FALSE);
+    toolbar->addWidget(edit);
 }
 
-void DiagramWindow::add_scale_cmd(Q3ToolBar * toolbar)
+void DiagramWindow::add_scale_cmd(QToolBar *toolbar)
 {
-    sb_zoom = new QSpinBox(SCALE_MIN, SCALE_MAX, 10, toolbar, TR("scale"));
+    sb_zoom = new QSpinBox( /*SCALE_MAX, 10, */toolbar/*, QObject::tr("scale")*/);
+    sb_zoom->setMinimum(SCALE_MIN);
+    sb_zoom->setMaximum(SCALE_MAX);
+    sb_zoom->setSingleStep(10);
+    sb_zoom->setObjectName(tr("scale"));
     //sb_zoom->setPrefix("scale ");
     sb_zoom->setSuffix("%");
     sb_zoom->setValue(100);
     connect(sb_zoom, SIGNAL(valueChanged(int)), this, SLOT(new_scale(int)));
-    Q3WhatsThis::add(sb_zoom, zoomText());
+    sb_zoom->setWhatsThis(zoomText());
+    toolbar->addWidget(sb_zoom);
+    //Q3WhatsThis::add(sb_zoom, zoomText());
 
     QToolButton * fitscale =
-        new QToolButton(*fitscaleButton, TR("optimal scale"), QString(),
+        ToolBarFactory::createToolButton(*fitscaleButton, QObject::tr("optimal scale"), QString(),
                         this, SLOT(fit_scale()), toolbar, "optimal scale");
-    Q3WhatsThis::add(fitscale, fitzoomText());
+
+    fitscale->setWhatsThis(fitzoomText());
+    //Q3WhatsThis::add(fitscale, fitzoomText());
 
     //
 
-    optwinsize = new QToolButton(*optwindowsizeButton, TR("optimal window size"), QString(),
+    optwinsize = ToolBarFactory::createToolButton(*optwindowsizeButton, QObject::tr("optimal window size"), QString(),
                                  this, SLOT(optimal_window_size()), toolbar, "optimal window size");
-    Q3WhatsThis::add(optwinsize, optwinsizeText());
 
-    optwinsize->setToggleButton(FALSE);
+
+    optwinsize->setWhatsThis(optwinsizeText());
+    //Q3WhatsThis::add(optwinsize, optwinsizeText());
+
+    optwinsize->setCheckable(FALSE);
 }
 
 void DiagramWindow::new_scale(int percent)
@@ -194,11 +215,11 @@ void DiagramWindow::save_session(QTextStream & st)
 {
     // can't access to the window position, even through geometry
     QString warning;
-
     st << "  ";
     ((BrowserNode *) browser_node)->save(st, TRUE, warning);
     st << "\n    " << width() << " " << height() << " ";
     get_view()->save_session(st);
+
 }
 
 void DiagramWindow::read_session(char *& st)
@@ -233,7 +254,8 @@ void DiagramWindow::save(const char * ext, QString & warning,
         get_view()->set_zoom(1);
 
     QString diagram_def;
-    QTextStream st(&diagram_def, IO_WriteOnly);
+    QTextStream st(&diagram_def, QIODevice::WriteOnly);
+    st.setCodec("UTF-8");
     int current_indent = indent();
 
     indent0();
@@ -256,7 +278,8 @@ void DiagramWindow::duplicate(int dest_id, const char * ext) const
         get_view()->set_zoom(1);
 
     QString diagram_def;
-    QTextStream st(&diagram_def, IO_WriteOnly); //[lgfreitas] it was nothing but some inlines to do this
+    QTextStream st(&diagram_def, QIODevice::WriteOnly); //[lgfreitas] it was nothing but some inlines to do this
+    st.setCodec("UTF-8");
     int current_indent = indent();
     BooL is_new = TRUE;
 
@@ -273,14 +296,16 @@ void DiagramWindow::duplicate(int dest_id, const char * ext) const
 
 QString DiagramWindow::copy_selected() const
 {
+    QString diagram_def;
     QString warning;
     double zm  = canvas->zoom();
 
     if (zm != 1)
         get_view()->set_zoom(1);
 
-    QString diagram_def;
-    QTextStream st(&diagram_def, IO_WriteOnly);
+
+    QTextStream st(&diagram_def, QIODevice::WriteOnly);
+    st.setCodec("UTF-8");
 
     indent0();
     get_view()->save(st, warning, TRUE);
@@ -288,7 +313,6 @@ QString DiagramWindow::copy_selected() const
 
     if (zm != 1)
         get_view()->set_zoom(zm);
-
     return diagram_def;
 }
 
diff --git a/src/diagram/DiagramWindow.h b/src/diagram/DiagramWindow.h
index d2f780dc4..40c536e12 100644
--- a/src/diagram/DiagramWindow.h
+++ b/src/diagram/DiagramWindow.h
@@ -27,18 +27,16 @@
 
 #ifndef DIAGRAMWINDOW_H
 #define DIAGRAMWINDOW_H
-
-#include <q3canvas.h>
-#include <q3mainwindow.h>
+#include <qmainwindow.h>
 #include <QTextStream>
-
 #include "UmlEnum.h"
+#include <QMdiSubWindow>
 
 class QPrinter;
 class QToolButton;
 class QSpinBox;
 class QComboBox;
-class Q3ToolBar;
+class QToolBar;
 
 class BrowserDiagram;
 class UmlCanvas;
@@ -48,7 +46,7 @@ class DiagramView;
 #define SCALE_MAX 200
 
 /* This represents a window that is a diagram, have a canvas and a toolbox */
-class DiagramWindow : public Q3MainWindow
+class DiagramWindow : public QMainWindow
 {
     Q_OBJECT
 
@@ -64,6 +62,7 @@ class DiagramWindow : public Q3MainWindow
     QToolButton * optwinsize;
     QComboBox * viewmode;
     QToolButton * edit;
+    QMdiSubWindow *m_containingSubWindow;
 
 
 
@@ -73,7 +72,6 @@ class DiagramWindow : public Q3MainWindow
 public:
     DiagramWindow(BrowserDiagram * br, const QString & s);
     virtual ~DiagramWindow();
-
     virtual DiagramView * get_view() const = 0;
 
     void raise();
@@ -84,8 +82,8 @@ class DiagramWindow : public Q3MainWindow
         return current_button;
     };
 
-    void add_edit_button(Q3ToolBar *);
-    void add_scale_cmd(Q3ToolBar *);
+    void add_edit_button(QToolBar *);
+    void add_scale_cmd(QToolBar *);
     void change_zoom(int);
 
     BrowserDiagram * browser_diagram() const {
diff --git a/src/diagram/ExpansionNodeCanvas.cpp b/src/diagram/ExpansionNodeCanvas.cpp
index afd4f74a4..81edd8148 100644
--- a/src/diagram/ExpansionNodeCanvas.cpp
+++ b/src/diagram/ExpansionNodeCanvas.cpp
@@ -32,7 +32,7 @@
 #include <math.h>
 
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -68,7 +68,7 @@ ExpansionNodeCanvas::ExpansionNodeCanvas(BrowserNode * bn, UmlCanvas * canvas,
     if (id == 0) {
         // not on read
         update();
-        setZ(r->z() + 2);	// 2 to have lines upper region's z
+        setZValue(r->zValue() + 2);	// 2 to have lines upper region's z
 
         if (canvas->must_draw_all_relations())
             draw_all_flows();
@@ -141,13 +141,13 @@ void ExpansionNodeCanvas::update()
 
 void ExpansionNodeCanvas::check_position()
 {
-    QRect act_rect = region->rect();
-    QPoint ce = center();
+    QRect act_rect = region->sceneRect();
+    QPoint ce = sceneRect().center();
 
-    double dxl = fabs(act_rect.left() - ce.x());
-    double dxr = fabs(act_rect.right() - ce.x());
-    double dyt = fabs(act_rect.top() - ce.y());
-    double dyb = fabs(act_rect.bottom() - ce.y());
+    double dxl = fabs((double)act_rect.left() - ce.x());
+    double dxr = fabs((double)act_rect.right() - ce.x());
+    double dyt = fabs((double)act_rect.top() - ce.y());
+    double dyb = fabs((double)act_rect.bottom() - ce.y());
 
     if ((dxr == 0) || (dxl == 0)) {
         if (ce.y() < act_rect.top())
@@ -198,15 +198,15 @@ void ExpansionNodeCanvas::change_scale()
 
 void ExpansionNodeCanvas::do_change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     double scale = the_canvas()->zoom();
 
-    setSize((int)(width_scale100 * scale) | 1,
+    setRect(0,0,(int)(width_scale100 * scale) | 1,
             (int)(height_scale100 * scale) | 1);
     recenter();
     // expansion region already in position, can check
     check_position();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void ExpansionNodeCanvas::moveBy(double dx, double dy)
@@ -234,8 +234,9 @@ void ExpansionNodeCanvas::draw(QPainter & p)
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
 
+    QBrush backBrush = p.background();
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode
                         : ::Qt::OpaqueMode);
@@ -243,7 +244,9 @@ void ExpansionNodeCanvas::draw(QPainter & p)
     QColor co = color(used_color);
     FILE * fp = svg();
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
+
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
@@ -280,14 +283,23 @@ void ExpansionNodeCanvas::draw(QPainter & p)
         fputs("</g>\n", fp);
     }
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode ExpansionNodeCanvas::type() const
+void ExpansionNodeCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ExpansionNodeCanvas::typeUmlCode() const
 {
     return UmlExpansionNode;
 }
@@ -309,37 +321,40 @@ void ExpansionNodeCanvas::open()
 
 void ExpansionNodeCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit expansion node"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit expansion node"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlExpansionNode, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index = retAction->data().toInt()) {
     case 0:
         region->upper();
         modified();	// call package_modified()
@@ -388,11 +403,12 @@ void ExpansionNodeCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void ExpansionNodeCanvas::apply_shortcut(QString s)
+void ExpansionNodeCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -424,7 +440,7 @@ void ExpansionNodeCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("expansion node color"), &itscolor);
+        co[0].set(tr("expansion node color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -443,24 +459,23 @@ bool ExpansionNodeCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ExpansionNodeCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ExpansionNodeCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("expansion node color"), &itscolor);
+        co[0].set(tr("expansion node color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((ExpansionNodeCanvas *) it.current())->itscolor = itscolor;
-                ((ExpansionNodeCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ExpansionNodeCanvas *canvas = (ExpansionNodeCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -469,18 +484,11 @@ void ExpansionNodeCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ExpansionNodeCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ExpansionNodeCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ExpansionNodeCanvas * x = (ExpansionNodeCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ExpansionNodeCanvas * o = (ExpansionNodeCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const ExpansionNodeCanvas * x = (const ExpansionNodeCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString ExpansionNodeCanvas::may_start(UmlCode & l) const
@@ -494,7 +502,7 @@ QString ExpansionNodeCanvas::may_start(UmlCode & l) const
 
     default:
         // dependency
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -503,7 +511,7 @@ QString ExpansionNodeCanvas::may_connect(UmlCode & l, const DiagramItem * dest)
     if (l == UmlAnchor)
         return dest->may_start(l);
     else if (dest->get_bn() == 0)
-        return TR("illegal");
+        return tr("illegal");
     else
         return ((BrowserExpansionNode *) browser_node)->may_connect(dest->get_bn());
 }
@@ -626,7 +634,7 @@ ExpansionNodeCanvas * ExpansionNodeCanvas::read(char *& st, UmlCanvas * canvas,
 
 void ExpansionNodeCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     disconnect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
@@ -651,7 +659,7 @@ void ExpansionNodeCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
diff --git a/src/diagram/ExpansionNodeCanvas.h b/src/diagram/ExpansionNodeCanvas.h
index 39f2f54cb..c642afd3d 100644
--- a/src/diagram/ExpansionNodeCanvas.h
+++ b/src/diagram/ExpansionNodeCanvas.h
@@ -46,47 +46,48 @@ class ExpansionNodeCanvas : public QObject, public DiagramCanvas
     UmlColor itscolor;
     UmlColor used_color;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ExpansionNodeCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y,
                         int id, ExpansionRegionCanvas * r);
     virtual ~ExpansionNodeCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    void update();
+    virtual void update() override;
     void check_position();
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void change_scale();
-    virtual void moveBy(double dx, double dy);
+    virtual UmlCode typeUmlCode() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void change_scale() override;
+    virtual void moveBy(double dx, double dy) override;
     void do_moveBy(double dx, double dy);
     void do_change_scale();
 
     bool region_selected() const;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static ExpansionNodeCanvas * read(char *& , UmlCanvas *, char *, ExpansionRegionCanvas *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/ExpansionRegionCanvas.cpp b/src/diagram/ExpansionRegionCanvas.cpp
index 2b403caf9..00ae42b2e 100644
--- a/src/diagram/ExpansionRegionCanvas.cpp
+++ b/src/diagram/ExpansionRegionCanvas.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "ExpansionRegionCanvas.h"
 #include "ExpansionRegionData.h"
@@ -55,7 +55,7 @@
 #include "translate.h"
 
 ExpansionRegionCanvas::ExpansionRegionCanvas(BrowserNode * bn, UmlCanvas * canvas,
-        int x, int y)
+                                             int x, int y)
     : ActivityContainerCanvas(0, canvas, x, y,
                               EXPANSION_REGION_CANVAS_MIN_SIZE * 4,
                               EXPANSION_REGION_CANVAS_MIN_SIZE * 4, 0)
@@ -93,7 +93,7 @@ void ExpansionRegionCanvas::delete_it()
 
     DiagramCanvas::delete_it();
 
-    Q3ValueList<ExpansionNodeCanvas *>::Iterator iter;
+    QList<ExpansionNodeCanvas *>::Iterator iter;
 
     for (iter = nodes.begin(); iter != nodes.end(); ++iter)
         // don't empty nodes to manage undo
@@ -108,7 +108,7 @@ void ExpansionRegionCanvas::deleted()
 
 void ExpansionRegionCanvas::deleted(ExpansionNodeCanvas * n)
 {
-    nodes.remove(n);
+    nodes.removeOne(n);
 }
 
 void ExpansionRegionCanvas::remove(bool from_model)
@@ -122,8 +122,8 @@ void ExpansionRegionCanvas::remove(bool from_model)
 void ExpansionRegionCanvas::compute_size()
 {
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlExpansionRegion)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlExpansionRegion)
+            : itscolor;
 
     QString s;
 
@@ -169,7 +169,7 @@ void ExpansionRegionCanvas::moveBy(double dx, double dy)
     DiagramCanvas::moveBy(dx, dy);
 
     // update expansion nodes position
-    Q3ValueList<ExpansionNodeCanvas *>::Iterator iter;
+    QList<ExpansionNodeCanvas *>::Iterator iter;
 
     for (iter = nodes.begin(); iter != nodes.end(); ++iter)
         (*iter)->do_moveBy(dx, dy);
@@ -177,16 +177,16 @@ void ExpansionRegionCanvas::moveBy(double dx, double dy)
 
 void ExpansionRegionCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     double scale = the_canvas()->zoom();
 
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     compute_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 
     // update expansion nodes position
-    Q3ValueList<ExpansionNodeCanvas *>::Iterator iter;
+    QList<ExpansionNodeCanvas *>::Iterator iter;
 
     for (iter = nodes.begin(); iter != nodes.end(); ++iter)
         (*iter)->do_change_scale();
@@ -235,11 +235,11 @@ bool ExpansionRegionCanvas::move_with_its_package() const
 
 void ExpansionRegionCanvas::set_z(double z)
 {
-    setZ(z);
+    setZValue(z);
 
     z += 1;
 
-    Q3ValueList<ExpansionNodeCanvas *>::Iterator iter;
+    QList<ExpansionNodeCanvas *>::Iterator iter;
 
     for (iter = nodes.begin(); iter != nodes.end(); ++iter)
         (*iter)->set_z(z);
@@ -250,7 +250,7 @@ void ExpansionRegionCanvas::force_sub_inside(bool resize_it)
     // update sub nodes position to be inside of the region
     // except the expansion nodes whose are in the border
     // or resize it to contains sub elts if resize_it
-    Q3CanvasItemList all = canvas()->allItems();
+    QList<QGraphicsItem*> all = canvas()->items();
     BooL need_sub_upper = FALSE;
 
     if (resize_it)
@@ -265,9 +265,9 @@ void ExpansionRegionCanvas::force_sub_inside(bool resize_it)
 void ExpansionRegionCanvas::check_nodes()
 {
     // add missing nodes
-    const Q3ValueList<BrowserExpansionNode *> brnodes =
-        ((BrowserExpansionRegion *) browser_node)->get_nodes();
-    Q3ValueList<BrowserExpansionNode *>::ConstIterator iter;
+    const QList<BrowserExpansionNode *> brnodes =
+            ((BrowserExpansionRegion *) browser_node)->get_nodes();
+    QList<BrowserExpansionNode *>::ConstIterator iter;
     double zoom = the_canvas()->zoom();
     QRect r = rect();
     int cx = (int)(x() + (width() - zoom * EXPANSIONNODE_WIDTH) / 2);
@@ -280,7 +280,7 @@ void ExpansionRegionCanvas::check_nodes()
     // are valid, ie not ouside
 
     for (iter = brnodes.begin(), rank = 0; iter != brnodes.end(); ++iter, rank += 1) {
-        Q3ValueList<ExpansionNodeCanvas *>::ConstIterator itershown;
+        QList<ExpansionNodeCanvas *>::ConstIterator itershown;
 
         for (itershown = nodes.begin(); itershown != nodes.end(); ++itershown)
             if ((*itershown)->get_bn() == *iter)
@@ -323,7 +323,7 @@ void ExpansionRegionCanvas::check_nodes()
             }
 
             ExpansionNodeCanvas * pc =
-                new ExpansionNodeCanvas(*iter, the_canvas(), px, py, 0, this);
+                    new ExpansionNodeCanvas(*iter, the_canvas(), px, py, 0, this);
 
             nodes.append(pc);
             pc->show();
@@ -333,7 +333,7 @@ void ExpansionRegionCanvas::check_nodes()
 
 void ExpansionRegionCanvas::force_nodes_arround()
 {
-    Q3ValueList<ExpansionNodeCanvas *>::Iterator iter;
+    QList<ExpansionNodeCanvas *>::Iterator iter;
 
     for (iter = nodes.begin(); iter != nodes.end(); ++iter)
         (*iter)->check_position();
@@ -346,7 +346,8 @@ void ExpansionRegionCanvas::draw(QPainter & p)
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
+    QBrush backBrush = p.background();
 
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode
@@ -354,7 +355,8 @@ void ExpansionRegionCanvas::draw(QPainter & p)
 
     QColor co = color(used_color);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
@@ -366,8 +368,8 @@ void ExpansionRegionCanvas::draw(QPainter & p)
 
     if (fp != 0)
         fprintf(fp, "<g>\n"
-                "\t<rect fill=\"%s\" stroke=\"black\" stroke-dasharray=\"4,4\" stroke-opacity=\"1\""
-                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"10\" />\n",
+                    "\t<rect fill=\"%s\" stroke=\"black\" stroke-dasharray=\"4,4\" stroke-opacity=\"1\""
+                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"10\" />\n",
                 svg_color(used_color),
                 r.left(), r.top(), r.width() - 1, r.height() - 1);
 
@@ -403,14 +405,23 @@ void ExpansionRegionCanvas::draw(QPainter & p)
     }
 
     p.setPen(::Qt::SolidLine);
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, rect());
 }
 
-UmlCode ExpansionRegionCanvas::type() const
+void ExpansionRegionCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ExpansionRegionCanvas::typeUmlCode() const
 {
     return UmlExpansionRegion;
 }
@@ -438,130 +449,134 @@ void ExpansionRegionCanvas::open()
 
 void ExpansionRegionCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
-        m.insertItem(TR("Add expansion node"), 9);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Add expansion node"), 9);
+        m.addSeparator();
     }
 
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit expansion region"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit expansion region"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
-            (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+                (BrowserNode *) the_canvas()->browser_diagram())
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 10);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 10);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlExpansionRegion, 20))
-        m.insertItem(TR("Tool"), &toolm);
-
-    switch (index = m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
-
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
-
-    case 13:
-        z_up();
-        modified();	// call package_modified()
-        return;
-
-    case 14:
-        z_down();
-        modified();	// call package_modified()
-        return;
-
-    case 2:
-        edit_drawing_settings();
-        return;
-
-    case 3:
-        browser_node->open(TRUE);
-        return;
-
-    case 4:
-        browser_node->select_in_browser();
-        return;
-
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (index = retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
 
-    case 6:
-        ((BrowserExpansionRegion *) browser_node)
-        ->set_associated_diagram((BrowserActivityDiagram *)
-                                 the_canvas()->browser_diagram());
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
 
-    case 10:
-        ((BrowserExpansionRegion *) browser_node)
-        ->set_associated_diagram(0);
-        return;
+        case 13:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 7:
-        //remove from diagram
-        delete_it();
-        break;
+        case 14:
+            z_down();
+            modified();	// call package_modified()
+            return;
+
+        case 2:
+            edit_drawing_settings();
+            return;
+
+        case 3:
+            browser_node->open(TRUE);
+            return;
+
+        case 4:
+            browser_node->select_in_browser();
+            return;
+
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
+
+        case 6:
+            ((BrowserExpansionRegion *) browser_node)
+                    ->set_associated_diagram((BrowserActivityDiagram *)
+                                             the_canvas()->browser_diagram());
+            return;
+
+        case 10:
+            ((BrowserExpansionRegion *) browser_node)
+                    ->set_associated_diagram(0);
+            return;
+
+        case 7:
+            //remove from diagram
+            delete_it();
+            break;
 
-    case 8:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 8:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    case 9:
-        if (((BrowserExpansionRegion *) browser_node)->add_expansionnode() != 0)
-            modified();
+        case 9:
+            if (((BrowserExpansionRegion *) browser_node)->add_expansionnode() != 0)
+                modified();
 
-        break;
+            break;
 
-    default:
-        if (index >= 20)
-            ToolCom::run(Tool::command(index - 20), browser_node);
+        default:
+            if (index >= 20)
+                ToolCom::run(Tool::command(index - 20), browser_node);
 
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void ExpansionRegionCanvas::apply_shortcut(QString s)
+void ExpansionRegionCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -593,7 +608,7 @@ void ExpansionRegionCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("expansion region color"), &itscolor);
+        co[0].set(tr("expansion region color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -612,24 +627,23 @@ bool ExpansionRegionCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ExpansionRegionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ExpansionRegionCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("expansion region color"), &itscolor);
+        co[0].set(tr("expansion region color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((ExpansionRegionCanvas *) it.current())->itscolor = itscolor;
-                ((ExpansionRegionCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ExpansionRegionCanvas *canvas = (ExpansionRegionCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -638,35 +652,28 @@ void ExpansionRegionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ExpansionRegionCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ExpansionRegionCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ExpansionRegionCanvas * x = (ExpansionRegionCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ExpansionRegionCanvas * o = (ExpansionRegionCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const ExpansionRegionCanvas * x = (const ExpansionRegionCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString ExpansionRegionCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString ExpansionRegionCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 void ExpansionRegionCanvas::connexion(UmlCode action, DiagramItem * dest,
                                       const QPoint &, const QPoint &)
 {
     ArrowCanvas * a =
-        new ArrowCanvas(the_canvas(), this, dest, action, 0, FALSE, -1.0, -1.0);
+            new ArrowCanvas(the_canvas(), this, dest, action, 0, FALSE, -1.0, -1.0);
 
     a->show();
     the_canvas()->select(a);
@@ -697,7 +704,7 @@ void ExpansionRegionCanvas::save(QTextStream & st, bool ref, QString & warning)
             st << "nodes";
             indent(+1);
 
-            Q3ValueList<ExpansionNodeCanvas *>::ConstIterator iter;
+            QList<ExpansionNodeCanvas *>::ConstIterator iter;
 
             for (iter = nodes.begin(); iter != nodes.end(); ++iter)
                 (*iter)->save(st, FALSE, warning);
@@ -794,7 +801,7 @@ void ExpansionRegionCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
@@ -803,7 +810,7 @@ void ExpansionRegionCanvas::history_load(QBuffer & b)
 
 void ExpansionRegionCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
diff --git a/src/diagram/ExpansionRegionCanvas.h b/src/diagram/ExpansionRegionCanvas.h
index c95c7c7ed..2e03d0ee5 100644
--- a/src/diagram/ExpansionRegionCanvas.h
+++ b/src/diagram/ExpansionRegionCanvas.h
@@ -33,8 +33,7 @@
 
 
 #include <qobject.h>
-#include <q3valuelist.h>
-//Added by qt3to4:
+#include <QList>
 #include <QTextStream>
 
 #include "ActivityContainerCanvas.h"
@@ -52,18 +51,19 @@ class ExpansionRegionCanvas : public QObject, public ActivityContainerCanvas
     UmlColor used_color;
     int min_width;
     int min_height;
-    Q3ValueList<ExpansionNodeCanvas *> nodes;
+    QList<ExpansionNodeCanvas *> nodes;
 
 protected:
     ExpansionRegionCanvas(UmlCanvas * canvas, int id);
 
     void check_nodes();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ExpansionRegionCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~ExpansionRegionCanvas();
 
-    Q3ValueList<ExpansionNodeCanvas *> get_nodes() {
+    QList<ExpansionNodeCanvas *> get_nodes() {
         return nodes;
     }
     void add(ExpansionNodeCanvas * p) {
@@ -73,44 +73,45 @@ class ExpansionRegionCanvas : public QObject, public ActivityContainerCanvas
 
     void force_sub_inside(bool rz);
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void compute_size();
     void deleted(ExpansionNodeCanvas * n);
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void set_z(double z);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual bool move_with_its_package() const;
-    virtual void moveBy(double dx, double dy);
-
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void set_z(double z) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using ActivityContainerCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual bool move_with_its_package() const override;
+    virtual void moveBy(double dx, double dy) override;
+
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ExpansionRegionCanvas * read(char *& , UmlCanvas *, char *);
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/FlowCanvas.cpp b/src/diagram/FlowCanvas.cpp
index 33719cbb7..429838c3f 100644
--- a/src/diagram/FlowCanvas.cpp
+++ b/src/diagram/FlowCanvas.cpp
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QTextStream>
 #include <math.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 
 #include "FlowCanvas.h"
 #include "ArrowPointCanvas.h"
@@ -63,12 +63,12 @@ FlowCanvas::FlowCanvas(UmlCanvas * canvas, DiagramItem * b,
       transformation(0), stereotypeproperties(0),
       write_horizontally(UmlDefaultState)
 {
-    if ((e->type() != UmlArrowPoint) && (bb == 0)) {
+    if ((e->typeUmlCode() != UmlArrowPoint) && (bb == 0)) {
         // end of line construction
         update_begin(e);
     }
     else if (d != 0) {
-        if (e->type() != UmlArrowPoint)
+        if (e->typeUmlCode() != UmlArrowPoint)
             check_stereotypeproperties();
 
         connect(d, SIGNAL(changed()), this, SLOT(modified()));
@@ -134,7 +134,7 @@ void FlowCanvas::remove(bool from_model)
         if (the_canvas()->must_draw_all_relations()) {
             const FlowCanvas * a = this;
 
-            while (a->begin->type() == UmlArrowPoint) {
+            while (a->begin->typeUmlCode() == UmlArrowPoint) {
                 a = (FlowCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
                 if (a == 0)
@@ -144,7 +144,7 @@ void FlowCanvas::remove(bool from_model)
             if (a && !a->begin->isSelected() && !a->begin->get_bn()->deletedp()) {
                 a = this;
 
-                while (a->end->type() == UmlArrowPoint) {
+                while (a->end->typeUmlCode() == UmlArrowPoint) {
                     a = (FlowCanvas *)((ArrowPointCanvas *) a->end)->get_other(a);
 
                     if (a == 0)
@@ -152,7 +152,7 @@ void FlowCanvas::remove(bool from_model)
                 }
 
                 if (a && !a->end->isSelected() && !a->end->get_bn()->deletedp()) {
-                    msg_warning("Douml", TR("<i>Draw all relations</i> forced to <i>no</i>"));
+                    msg_warning("Douml", tr("<i>Draw all relations</i> forced to <i>no</i>"));
                     the_canvas()->dont_draw_all_relations();
                 }
             }
@@ -172,7 +172,7 @@ BrowserNode * FlowCanvas::update_begin(DiagramItem * cnend)
     // static to be updated in all the cases
     static FlowData * d = 0;
 
-    if (begin->type() == UmlArrowPoint) {
+    if (begin->typeUmlCode() == UmlArrowPoint) {
         FlowCanvas * other =
             ((FlowCanvas *)((ArrowPointCanvas *) begin)->get_other(this));
 
@@ -197,7 +197,7 @@ void FlowCanvas::propagate_drawing_settings()
 
     t = this;
 
-    while (t->begin->type() == UmlArrowPoint) {
+    while (t->begin->typeUmlCode() == UmlArrowPoint) {
         t = ((FlowCanvas *)((ArrowPointCanvas *) t->begin)->get_other(t));
         t->settings = settings;
         t->used_settings = used_settings;
@@ -206,7 +206,7 @@ void FlowCanvas::propagate_drawing_settings()
 
     t = this;
 
-    while (t->end->type() == UmlArrowPoint) {
+    while (t->end->typeUmlCode() == UmlArrowPoint) {
         t = ((FlowCanvas *)((ArrowPointCanvas *) t->end)->get_other(t));
         t->settings = settings;
         t->used_settings = used_settings;
@@ -236,48 +236,51 @@ void FlowCanvas::menu(const QPoint &)
             pstereotype = (FlowCanvas *) apstereotype;
         }
 
-        Q3PopupMenu m(0);
-        Q3PopupMenu geo(0);
-        Q3PopupMenu toolm(0);
+        QMenu m(0);
+        QMenu geo(0);
+        QMenu toolm(0);
 
         MenuFactory::createTitle(m, data->definition(FALSE, TRUE));
-        m.insertSeparator();
-        m.insertItem(TR("Edit"), 0);
-        m.insertSeparator();
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Edit"), 0);
+        m.addSeparator();
 
-        m.insertItem(TR("Select in browser"), 2);
+        MenuFactory::addItem(m, tr("Select in browser"), 2);
 
         if (plabel || pstereotype) {
-            m.insertSeparator();
-            m.insertItem(TR("Edit drawing settings"), 1);
-            m.insertItem(TR("Select labels"), 3);
-            m.insertItem(TR("Labels default position"), 4);
+            m.addSeparator();
+            MenuFactory::addItem(m, tr("Edit drawing settings"), 1);
+            MenuFactory::addItem(m, tr("Select labels"), 3);
+            MenuFactory::addItem(m, tr("Labels default position"), 4);
 
             if (plabel && (label == 0))
-                m.insertItem(TR("Attach flow label to this segment"), 5);
+                MenuFactory::addItem(m, tr("Attach flow label to this segment"), 5);
 
             if (pstereotype && (stereotype == 0))
-                m.insertItem(TR("Attach stereotype to this segment"), 6);
+                MenuFactory::addItem(m, tr("Attach stereotype to this segment"), 6);
         }
 
         if (get_start() != get_end()) {
-            m.insertSeparator();
+            m.addSeparator();
             init_geometry_menu(geo, 10);
-            m.insertItem(TR("Geometry (Ctrl+l)"), &geo);
+            MenuFactory::insertItem(m, tr("Geometry (Ctrl+l)"), &geo);
         }
 
-        m.insertSeparator();
-        m.insertItem(TR("Remove from diagram"), 7);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
         if (data->get_start()->is_writable())
-            m.insertItem(TR("Delete from model"), 8);
+            MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-        m.insertSeparator();
+        m.addSeparator();
 
         if (Tool::menu_insert(&toolm, itstype, 20))
-            m.insertItem(TR("Tool"), &toolm);
+            MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-        int rank = m.exec(QCursor::pos());
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        int rank = retAction->data().toInt();
 
         switch (rank) {
         case 0:
@@ -357,16 +360,16 @@ void FlowCanvas::menu(const QPoint &)
             else
                 return;
         }
+        }
 
         package_modified();
     }
 }
 
-void FlowCanvas::apply_shortcut(QString s)
+void FlowCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         data->get_start()->select_in_browser();
-        return;
     }
     else if (s == "Edit drawing settings") {
         ArrowCanvas * aplabel;
@@ -376,16 +379,10 @@ void FlowCanvas::apply_shortcut(QString s)
 
         if ((aplabel != 0) || (apstereotype != 0))
             edit_drawing_settings();
-
-        return;
     }
     else {
         data->get_start()->apply_shortcut(s);
-        return;
     }
-
-    modified();
-    package_modified();
 }
 
 void FlowCanvas::edit_drawing_settings()
@@ -393,12 +390,12 @@ void FlowCanvas::edit_drawing_settings()
     for (;;) {
         StateSpecVector st(1);
 
-        st[0].set(TR("write horizontally"), &write_horizontally);
+        st[0].set(tr("write horizontally"), &write_horizontally);
         settings.complete(st, TRUE);
 
         SettingsDialog dialog(&st, 0, FALSE);
 
-        dialog.setCaption(TR("Flow Drawing Settings dialog"));
+        dialog.setWindowTitle(tr("Flow Drawing Settings dialog"));
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
@@ -420,32 +417,31 @@ bool FlowCanvas::has_drawing_settings() const
     return ((aplabel != 0) || (apstereotype != 0));
 }
 
-void FlowCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void FlowCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(1);
         Uml3States write_horizontally;
         ActivityDrawingSettings settings;
 
-        st[0].set(TR("write horizontally"), &write_horizontally);
+        st[0].set(tr("write horizontally"), &write_horizontally);
         settings.complete(st, TRUE);
 
         SettingsDialog dialog(&st, 0, FALSE, TRUE);
 
-        dialog.setCaption(TR("Flow Drawing Settings dialog"));
+        dialog.setWindowTitle(tr("Flow Drawing Settings dialog"));
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                FlowCanvas *canvas = (FlowCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((FlowCanvas *) it.current())->write_horizontally =
+                    canvas->write_horizontally =
                         write_horizontally;
 
-                ((FlowCanvas *) it.current())->settings.set(st, 1);
-                ((FlowCanvas *) it.current())->propagate_drawing_settings();
-                ((FlowCanvas *) it.current())->modified();
+                canvas->settings.set(st, 1);
+                canvas->propagate_drawing_settings();
+                canvas->modified();
             }
         }
 
@@ -454,20 +450,13 @@ void FlowCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void FlowCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void FlowCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    FlowCanvas * x = (FlowCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        FlowCanvas * o = (FlowCanvas *) it.current();
-
-        o->write_horizontally = x->write_horizontally;
-        o->settings = x->settings;
-        o->propagate_drawing_settings();
-        o->modified();
-    }
+    const FlowCanvas * x = (const FlowCanvas *) src;
+    write_horizontally = x->write_horizontally;
+    settings = x->settings;
+    propagate_drawing_settings();
+    modified();
 }
 
 ArrowPointCanvas * FlowCanvas::brk(const QPoint & p)
@@ -475,7 +464,7 @@ ArrowPointCanvas * FlowCanvas::brk(const QPoint & p)
     ArrowPointCanvas * ap =
         new ArrowPointCanvas(the_canvas(), p.x(), p.y());
 
-    ap->setZ(z() + 1);
+    ap->setZValue(zValue() + 1);
 
     FlowCanvas * other =
         // do not give data to not call update()
@@ -522,13 +511,13 @@ ArrowCanvas * FlowCanvas::join(ArrowCanvas * other, ArrowPointCanvas * ap)
 
 void FlowCanvas::modified()
 {
-    if (visible()) {
+    if (isVisible()) {
         hide();
         update(TRUE);
         show();
         check_sel_trans();
 
-        if (begin->type() != UmlArrowPoint)
+        if (begin->typeUmlCode() != UmlArrowPoint)
             check_stereotypeproperties();
 
         canvas()->update();
@@ -570,9 +559,9 @@ void FlowCanvas::update(bool updatepos)
             if (s == "interrupt")
                 s = LabelCanvas::Zigzag;
             else if (s != LabelCanvas::Zigzag)
-                s = QString("<<") + toUnicode(s) + ">>";
+                s = QString("<<") + s + ">>";
 
-            if ((pstereotype == 0) && (begin->type() != UmlArrowPoint)) {
+            if ((pstereotype == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
                 // adds relation's stereotype
                 stereotype = new LabelCanvas(s, the_canvas(), 0, 0);
                 update_label = (label != 0);
@@ -605,9 +594,9 @@ void FlowCanvas::update(bool updatepos)
 
         if (! s.isEmpty()) {
             if (n != "<flow>")
-                s = n + ((horiz) ? " " : "\n") + toUnicode(s);
+                s = n + ((horiz) ? " " : "\n") + toUnicode(s.toLatin1().constData());
             else
-                s = toUnicode(s);
+                s = toUnicode(s.toLatin1().constData());
         }
         else if (n != "<flow>")
             s = n;
@@ -619,7 +608,7 @@ void FlowCanvas::update(bool updatepos)
                 plabel->label = 0;
             }
         }
-        else if ((plabel == 0) && (begin->type() != UmlArrowPoint)) {
+        else if ((plabel == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
             // adds relation's name
             label = new LabelCanvas(s, the_canvas(), 0, 0);
             default_label_position();
@@ -644,7 +633,7 @@ void FlowCanvas::check_sel_trans()
     // update must be called before
     if (used_settings.show_infonote == UmlYes) {
         // selection and transformation are placed on the first segment
-        if (begin->type() != UmlArrowPoint) {
+        if (begin->typeUmlCode() != UmlArrowPoint) {
             int margin = (int)(the_canvas()->zoom() * 15);
             QString s;
 
@@ -665,7 +654,7 @@ void FlowCanvas::check_sel_trans()
 
                     int cdy = beginp.y() - selection->height() - margin;
 
-                    selection->move(beginp.x(), (cdy < 0) ? 0 : cdy);
+                    selection->moveBy(beginp.x(), (cdy < 0) ? 0 : cdy);
                     selection->show();
                     (new ArrowCanvas(the_canvas(), this, selection,
                                      UmlAnchor, 0, FALSE, -1.0, -1.0))
@@ -692,14 +681,14 @@ void FlowCanvas::check_sel_trans()
 
                     int cdy = beginp.y() + margin;
 
-                    transformation->move(beginp.x(), (cdy < 0) ? 0 : cdy);
+                    transformation->moveBy(beginp.x(), (cdy < 0) ? 0 : cdy);
                     transformation->show();
                     (new ArrowCanvas(the_canvas(), this, transformation,
                                      UmlAnchor, 0, FALSE, -1.0, -1.0))
                     ->show();
                 }
                 else
-                    transformation->set(s);
+                    transformation->set(s.toLatin1());
             }
         }
     }
@@ -723,7 +712,7 @@ void FlowCanvas::default_label_position() const
     QString s = label->get_name();
     QSize sz = fm.size(0, s);
 
-    label->move(c.x() - sz.width() / 2,
+    label->moveBy(c.x() - sz.width() / 2,
                 c.y() - ((stereotype != 0) ? sz.height() : sz.height() / 2));
     package_modified();
 }
@@ -746,12 +735,12 @@ void FlowCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
     BrowserNode * to = def->get_end_node();
     DiagramItem * difrom = 0;
     DiagramItem * dito = 0;
-    Q3CanvasItemList all = canvas->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     // the two extremities are drawn ?
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if (di != 0) {
@@ -774,7 +763,7 @@ void FlowCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
 
     if ((difrom != 0) && (dito != 0)) {
         if (difrom->has_relation(UmlFlow, def))
-            msg_information("Douml", TR("flow already drawn"));
+            msg_information("Douml", tr("flow already drawn"));
         else {
             FlowCanvas * tr =
                 new FlowCanvas(canvas, difrom, dito, from, 0, -1.0, -1.0, def);
@@ -799,14 +788,14 @@ void FlowCanvas::moveBy(double dx, double dy)
 {
     ArrowCanvas::moveBy(dx, dy);
 
-    if ((stereotypeproperties != 0) && !stereotypeproperties->selected())
+    if ((stereotypeproperties != 0) && !stereotypeproperties->isSelected())
         stereotypeproperties->moveBy(dx, dy);
 }
 
 void FlowCanvas::select_associated()
 {
-    if (!selected()) {
-        if ((stereotypeproperties != 0) && !stereotypeproperties->selected())
+    if (!isSelected()) {
+        if ((stereotypeproperties != 0) && !stereotypeproperties->isSelected())
             the_canvas()->select(stereotypeproperties);
 
         ArrowCanvas::select_associated();
@@ -816,7 +805,7 @@ void FlowCanvas::select_associated()
 void FlowCanvas::check_stereotypeproperties()
 {
     // the note is memorized by the first segment
-    if (begin->type() == UmlArrowPoint)
+    if (begin->typeUmlCode() == UmlArrowPoint)
         ((FlowCanvas *)((ArrowPointCanvas *) begin)->get_other(this))
         ->check_stereotypeproperties();
     else {
@@ -844,7 +833,7 @@ void FlowCanvas::save(QTextStream & st, bool ref, QString & warning) const
 {
     if (ref)
         st << "flowcanvas_ref " << get_ident();
-    else if (begin->type() != UmlArrowPoint) {
+    else if (begin->typeUmlCode() != UmlArrowPoint) {
         // relation canvas start
         nl_indent(st);
         st << "flowcanvas " << get_ident() << " ";
@@ -872,7 +861,7 @@ void FlowCanvas::save(QTextStream & st, bool ref, QString & warning) const
         }
 
         nl_indent(st);
-        (const FlowCanvas *) ArrowCanvas::save_lines(st, TRUE, TRUE, warning);
+        save_lines(st, TRUE, TRUE, warning);
         settings.save(st);
         st << " write_horizontally " << stringify(write_horizontally);
 
@@ -961,7 +950,7 @@ FlowCanvas * FlowCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
             if ((label = LabelCanvas::read(st, canvas, k)) != 0) {
                 // the flow name can't be empty
-                label->setZ(z);
+                label->setZValue(z);
                 k = read_keyword(st);
             }
 
@@ -982,10 +971,10 @@ FlowCanvas * FlowCanvas::read(char *& st, UmlCanvas * canvas, char * k)
                     if (s == "interrupt")
                         s = LabelCanvas::Zigzag;
                     else
-                        s = QString("<<") + toUnicode(s) + ">>";
+                        s = QString("<<") + toUnicode(s.toLatin1().constData()) + ">>";
 
                     stereotype = new LabelCanvas(s, canvas, x, y);
-                    stereotype->setZ(read_double(st));
+                    stereotype->setZValue(read_double(st));
                 }
 
                 k = read_keyword(st);
@@ -1032,7 +1021,7 @@ FlowCanvas * FlowCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
             result->show();
 
-            if (di->type() != UmlArrowPoint)
+            if (di->typeUmlCode() != UmlArrowPoint)
                 break;
 
             bi = di;
@@ -1095,7 +1084,7 @@ FlowCanvas * FlowCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
 void FlowCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     unconnect();
 }
 
diff --git a/src/diagram/FlowCanvas.h b/src/diagram/FlowCanvas.h
index ae4cbe029..1e4bc4b1d 100644
--- a/src/diagram/FlowCanvas.h
+++ b/src/diagram/FlowCanvas.h
@@ -61,46 +61,47 @@ class FlowCanvas : public ArrowCanvas
                FlowData * d = 0);
     virtual ~FlowCanvas();
 
-    virtual void delete_it();
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void remove(bool from_model);
-    virtual void unconnect();
+    virtual void delete_it() override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void remove(bool from_model) override;
+    virtual void unconnect() override;
 
-    virtual ArrowPointCanvas * brk(const QPoint &);
-    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap);
+    virtual ArrowPointCanvas * brk(const QPoint &) override;
+    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap) override;
 
-    virtual void default_label_position() const;
+    virtual void default_label_position() const override;
     void stereotype_default_position() const;
 
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
 
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
     static FlowCanvas * read(char *& st, UmlCanvas * canvas, char *);
-    virtual BasicData * get_data() const;
+    virtual BasicData * get_data() const override;
 
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
-    virtual void setVisible(bool yes);
-    virtual void moveBy(double dx, double dy);
-    virtual void select_associated();
-    virtual void check_stereotypeproperties();
+    virtual void setVisible(bool yes) override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void select_associated() override;
+    virtual void check_stereotypeproperties() override;
 
     static void drop(BrowserNode *, UmlCanvas *);
 
-    virtual bool represents(BrowserNode *);
+    virtual bool represents(BrowserNode *) override;
 
 protected:
     BrowserNode * update_begin(DiagramItem * cnend);
+    using DiagramItem::update;
     void update(bool updatepos);
     void propagate_drawing_settings();
 
diff --git a/src/diagram/FragmentCanvas.cpp b/src/diagram/FragmentCanvas.cpp
index 651a4f8b9..2d93aa2ee 100644
--- a/src/diagram/FragmentCanvas.cpp
+++ b/src/diagram/FragmentCanvas.cpp
@@ -31,10 +31,10 @@
 
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
+#include <QPolygon>
 
 
 #include "FragmentCanvas.h"
@@ -79,12 +79,13 @@ void FragmentCanvas::delete_it()
 
 void FragmentCanvas::remove_it(FragmentSeparatorCanvas * sp)
 {
-    separators.remove(sp);
+    separators.removeOne(sp);
 }
 
 void FragmentCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
+    QBrush backBrush = p.background();
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
@@ -100,7 +101,7 @@ void FragmentCanvas::draw(QPainter & p)
     int x1 = rname.right() + h1;
     int y1 = rname.bottom() - h1;
 
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
 
     p.setBackgroundMode((used_color == UmlTransparent) ? ::Qt::TransparentMode : ::Qt::OpaqueMode);
 
@@ -110,13 +111,14 @@ void FragmentCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("<g>\n", fp);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
     p.setFont(the_canvas()->get_font(UmlNormalFont));
 
     if (used_color != UmlTransparent)
         p.fillRect(r, co);
     else if (!name.isEmpty()) {
-        Q3PointArray a(6);
+        QPolygon a(6);
         QBrush brsh = p.brush();
 
         a.setPoint(0, rname.left(), rname.top());
@@ -127,7 +129,7 @@ void FragmentCanvas::draw(QPainter & p)
         a.setPoint(5, rname.left(), rname.top());
 
         p.setBrush(UmlWhiteColor);
-        p.drawPolygon(a, TRUE, 0, 5);
+        p.drawPolygon(a);
         p.setBrush(brsh);
 
         if (fp != 0)
@@ -178,13 +180,22 @@ void FragmentCanvas::draw(QPainter & p)
         fputs("</g>\n", fp);
     }
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
 
-    if (selected())
+    if (isSelected())
         show_mark(p, r);
 }
 
-UmlCode FragmentCanvas::type() const
+void FragmentCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode FragmentCanvas::typeUmlCode() const
 {
     return UmlFragment;
 }
@@ -201,27 +212,23 @@ bool FragmentCanvas::alignable() const
 
 bool FragmentCanvas::copyable() const
 {
-    return selected();
+    return isSelected();
 }
 
 void FragmentCanvas::moveBy(double dx, double dy)
 {
     DiagramCanvas::moveBy(dx, dy);
 
-    Q3PtrListIterator<FragmentSeparatorCanvas> it(separators);
-
-    for (; it.current(); ++it)
-        it.current()->update();
+    foreach (FragmentSeparatorCanvas *canvas, separators)
+        canvas->update();
 }
 
 void FragmentCanvas::set_z(double z)
 {
-    setZ(z);
-
-    Q3PtrListIterator<FragmentSeparatorCanvas> it(separators);
+    setZValue(z);
 
-    for (; it.current(); ++it)
-        it.current()->update();
+    foreach (FragmentSeparatorCanvas *canvas, separators)
+        canvas->update();
 }
 
 void FragmentCanvas::open()
@@ -313,16 +320,15 @@ void FragmentCanvas::change_scale()
 {
     double scale = the_canvas()->zoom();
 
-    Q3CanvasRectangle::setVisible(FALSE);
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    QGraphicsRectItem::setVisible(FALSE);
+    //setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     check_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 
-    Q3PtrListIterator<FragmentSeparatorCanvas> it(separators);
-
-    for (; it.current(); ++it)
-        it.current()->update();
+    foreach (FragmentSeparatorCanvas *canvas, separators)
+        canvas->update();
 }
 
 void FragmentCanvas::modified()
@@ -343,34 +349,37 @@ void FragmentCanvas::modified()
 
 void FragmentCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Fragment"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 7);
-    m.insertItem(TR("Go down"), 8);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertItem(TR("Add separator"), 6);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 3);
+    MenuFactory::createTitle(m, tr("Fragment"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 7);
+    MenuFactory::addItem(m, tr("Go down"), 8);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    MenuFactory::addItem(m, tr("Add separator"), 6);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 4);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select linked items"), 4);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 5);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 5);
 
     if ((refer != 0) && !refer->deletedp()) {
-        m.insertSeparator();
-        m.insertItem(TR("Show referenced diagram"), 9);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Show referenced diagram"), 9);
     }
 
-    int index = m.exec(QCursor::pos());
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    int index = retAction->data().toInt();
 
     switch (index) {
     case 0:
@@ -428,11 +437,12 @@ void FragmentCanvas::menu(const QPoint &)
     default:
         return;
     }
+    }
 
     package_modified();
 }
 
-void FragmentCanvas::apply_shortcut(QString s)
+void FragmentCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -462,7 +472,7 @@ void FragmentCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("fragment color"), &itscolor);
+        co[0].set(tr("fragment color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -481,24 +491,22 @@ bool FragmentCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void FragmentCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void FragmentCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("fragment color"), &itscolor);
+        co[0].set(tr("fragment color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((FragmentCanvas *) it.current())->itscolor = itscolor;
-                ((FragmentCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ((FragmentCanvas *) item)->itscolor = itscolor;
+                ((FragmentCanvas *) item)->modified(); // call package_modified()
             }
         }
 
@@ -507,28 +515,21 @@ void FragmentCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void FragmentCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void FragmentCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    FragmentCanvas * x = (FragmentCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        FragmentCanvas * o = (FragmentCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const FragmentCanvas * x = (const FragmentCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString FragmentCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString FragmentCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 aCorner FragmentCanvas::on_resize_point(const QPoint & p)
@@ -540,19 +541,15 @@ void FragmentCanvas::resize(aCorner c, int dx, int dy, QPoint & o)
 {
     DiagramCanvas::resize(c, dx, dy, o, min_width, min_height);
 
-    Q3PtrListIterator<FragmentSeparatorCanvas> it(separators);
-
-    for (; it.current(); ++it)
-        it.current()->update();
+    foreach (FragmentSeparatorCanvas *canvas, separators)
+        canvas->update();
 }
 
 void FragmentCanvas::resize(const QSize & sz, bool w, bool h)
 {
     if (DiagramCanvas::resize(sz, w, h, min_width, min_height)) {
-        Q3PtrListIterator<FragmentSeparatorCanvas> it(separators);
-
-        for (; it.current(); ++it)
-            it.current()->update();
+        foreach (FragmentSeparatorCanvas *canvas, separators)
+            canvas->update();
     }
 }
 
@@ -562,14 +559,14 @@ void FragmentCanvas::prepare_for_move(bool on_resize)
         DiagramCanvas::prepare_for_move(on_resize);
 
         QRect r = rect();
-        Q3CanvasItemList l = collisions(TRUE);
-        Q3CanvasItemList::ConstIterator it;
-        Q3CanvasItemList::ConstIterator end = l.end();
+        QList<QGraphicsItem*> l = collidingItems();
+        QList<QGraphicsItem*>::ConstIterator it;
+        QList<QGraphicsItem*>::ConstIterator end = l.end();
         DiagramItem * di;
 
         for (it = l.begin(); it != end; ++it) {
-            if ((*it)->visible() && // at least not deleted
-                !(*it)->selected() &&
+            if ((*it)->isVisible() && // at least not deleted
+                !(*it)->isSelected() &&
                 ((di = QCanvasItemToDiagramItem(*it)) != 0) &&
                 r.contains(di->rect(), TRUE) &&
                 di->move_with(UmlFragment)) {
@@ -610,10 +607,8 @@ void FragmentCanvas::save(QTextStream & st, bool ref, QString & warning) const
 
         save_xyzwh(st, this, "xyzwh");
 
-        Q3PtrListIterator<FragmentSeparatorCanvas> it(separators);
-
-        for (; it.current(); ++it)
-            it.current()->save(st, FALSE, warning);
+        foreach (FragmentSeparatorCanvas *canvas, separators)
+            canvas->save(st, false, warning);
 
         indent(-1);
         nl_indent(st);
@@ -655,12 +650,10 @@ FragmentCanvas * FragmentCanvas::read(char *& st, UmlCanvas * canvas, char * k)
         result->height_scale100 = result->height();
         result->set_center100();
         result->show();
-
         if (read_file_format() >= 28) {
             while (strcmp(k = read_keyword(st), "end"))
                 result->separators.append(FragmentSeparatorCanvas::read(st, canvas, k, result));
         }
-
         return result;
     }
     else
@@ -680,10 +673,9 @@ void FragmentCanvas::history_save(QBuffer & b) const
 
     ::save((int) separators.count(), b);
 
-    Q3PtrListIterator<FragmentSeparatorCanvas> it(separators);
 
-    for (; it.current(); ++it)
-        ::save(it.current(), b);
+    foreach (FragmentSeparatorCanvas *canvas, separators)
+        ::save(canvas, b);
 }
 
 void FragmentCanvas::history_load(QBuffer & b)
@@ -698,7 +690,7 @@ void FragmentCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     int l;
 
@@ -730,24 +722,22 @@ void FragmentCanvas::history_hide()
 
 // for plug outs
 
-void FragmentCanvas::send(ToolCom * com, Q3CanvasItemList & all,
-                          Q3PtrList<FragmentCanvas> & fragments,
-                          Q3PtrList<FragmentCanvas> & refs)
+void FragmentCanvas::send(ToolCom * com, QList<QGraphicsItem*> & all,
+                          QList<FragmentCanvas *> & fragments,
+                          QList<FragmentCanvas *> & refs)
 {
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
-        if ((di != 0) && (*cit)->visible() && (di->type() == UmlFragment))
+        if ((di != 0) && (*cit)->isVisible() && (di->typeUmlCode() == UmlFragment))
             fragments.append((FragmentCanvas *) di);
     }
 
     com->write_unsigned(fragments.count());
 
-    FragmentCanvas * f;
-
-    for (f = fragments.first(); f != 0; f = fragments.next()) {
+    foreach (FragmentCanvas * f, fragments) {
         WrapperStr s = fromUnicode(f->name);
 
         com->write_string((const char *) s);
@@ -760,11 +750,11 @@ void FragmentCanvas::send(ToolCom * com, Q3CanvasItemList & all,
             com->write_unsigned(1);
         else {
             FragmentSeparatorCanvas ** v = new FragmentSeparatorCanvas *[sz];
-            unsigned index;
-            Q3PtrListIterator<FragmentSeparatorCanvas> it(f->separators);
-
-            for (index = 0; it.current(); ++it, index += 1)
-                v[index] = it.current();
+            unsigned index = 0;
+            foreach (FragmentSeparatorCanvas *canvas, f->separators) {
+                v[index] = canvas;
+                ++index;
+            }
 
             bool modified;
 
diff --git a/src/diagram/FragmentCanvas.h b/src/diagram/FragmentCanvas.h
index 175d12616..f1235be90 100644
--- a/src/diagram/FragmentCanvas.h
+++ b/src/diagram/FragmentCanvas.h
@@ -47,58 +47,60 @@ class FragmentCanvas : public QObject, public DiagramCanvas
     QString name;
     int min_width;
     int min_height;
-    Q3PtrList<FragmentSeparatorCanvas> separators;
+    QList<FragmentSeparatorCanvas *> separators;
     BrowserNode * refer;
     QString form;
 
     void check_size();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     FragmentCanvas(UmlCanvas * canvas, int x, int y, int id);
     virtual ~FragmentCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void remove_it(FragmentSeparatorCanvas *);
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual aCorner on_resize_point(const QPoint &);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void change_scale();
-    virtual void prepare_for_move(bool on_resize);
-    virtual void moveBy(double dx, double dy);
-    virtual void set_z(double z);	// only called by upper() & lower()
-
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual aCorner on_resize_point(const QPoint &) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void change_scale() override;
+    virtual void prepare_for_move(bool on_resize) override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void set_z(double z) override;	// only called by upper() & lower()
+
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static FragmentCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
     QString arguments() {
         return form;
     }
 
-    static void send(ToolCom * com, Q3CanvasItemList & all,
-                     Q3PtrList<FragmentCanvas> & fragments,
-                     Q3PtrList<FragmentCanvas> & refs);
+    static void send(ToolCom * com, QList<QGraphicsItem*> & all,
+                     QList<FragmentCanvas *> & fragments,
+                     QList<FragmentCanvas *> & refs);
 
 private slots:
     void modified();
diff --git a/src/diagram/FragmentSeparatorCanvas.cpp b/src/diagram/FragmentSeparatorCanvas.cpp
index 7d4ade6b1..d1c0e078e 100644
--- a/src/diagram/FragmentSeparatorCanvas.cpp
+++ b/src/diagram/FragmentSeparatorCanvas.cpp
@@ -31,10 +31,7 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
-//Added by qt3to4:
 #include <QTextStream>
-
 #include "FragmentSeparatorCanvas.h"
 #include "FragmentCanvas.h"
 #include "ui/menufactory.h"
@@ -81,9 +78,9 @@ void FragmentSeparatorCanvas::compute_position()
     else if (new_y >= fy + fh - 1)
         new_y = fy + fh - 2;
 
-    setZ(fragment->z() + 1);
-    setSize(fragment->width(), (int)(LIFE_LINE_HEIGHT * zoom));
-    Q3CanvasRectangle::moveBy(new_x - x(), new_y - offset - y());
+    setZValue(fragment->zValue() + 1);
+    setRect(0,0,fragment->width(), (int)(LIFE_LINE_HEIGHT * zoom));
+    QGraphicsRectItem::moveBy(new_x - x(), new_y - offset - y());
 }
 
 void FragmentSeparatorCanvas::update()
@@ -103,12 +100,12 @@ void FragmentSeparatorCanvas::drawShape(QPainter & p)
 {
     p.setBackgroundMode(::Qt::TransparentMode);
     p.setRenderHint(QPainter::Antialiasing, true);
-    p.setPen(::Qt::DashLine);
+    p.setPen(::Qt::DashDotLine/*DashLine*/);
 
-    int m = (int)(fragment->y() + fragment->height() * vpos);
+    int m = 0;//(int)(/*fragment->y() + */fragment->height() * vpos);
 
-    p.drawLine((int) fragment->x(), m,
-               (int) fragment->x() + fragment->width() - 1, m);
+    p.drawLine((int) /*fragment->x()*/0, m,
+               (int) /*fragment->x() + */fragment->width() - 1, m);
 
     p.setPen(::Qt::SolidLine);
 
@@ -125,6 +122,14 @@ void FragmentSeparatorCanvas::drawShape(QPainter & p)
         show_mark(p, rect());
 }
 
+void FragmentSeparatorCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    drawShape(*painter);
+}
+
 void FragmentSeparatorCanvas::moveBy(double, double dy)
 {
     // moved by user
@@ -141,11 +146,11 @@ void FragmentSeparatorCanvas::moveBy(double, double dy)
             new_y = fy + fh - 2;
 
         vpos = (new_y - fy) / fh;
-        Q3CanvasRectangle::moveBy(0, new_y - offset - y());
+        QGraphicsRectItem::moveBy(0, new_y - offset - y());
     }
 }
 
-UmlCode FragmentSeparatorCanvas::type() const
+UmlCode FragmentSeparatorCanvas::typeUmlCode() const
 {
     return UmlFragmentSeparator;
 }
@@ -162,12 +167,12 @@ DiagramItem::LineDirection FragmentSeparatorCanvas::allowed_direction(UmlCode)
 
 QString FragmentSeparatorCanvas::may_start(UmlCode &) const
 {
-    return TR("illegal");
+    return QObject::tr("illegal");
 }
 
 QString FragmentSeparatorCanvas::may_connect(UmlCode &, const DiagramItem *) const
 {
-    return TR("illegal");
+    return  QObject::tr("illegal");
 }
 
 void FragmentSeparatorCanvas::connexion(UmlCode, DiagramItem *,
@@ -182,16 +187,21 @@ void FragmentSeparatorCanvas::open()
 
 void FragmentSeparatorCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Separator"));
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 1);
+    MenuFactory::createTitle(m,  QObject::tr("Separator"));
+    m.addSeparator();
+    MenuFactory::addItem(m,  QObject::tr("Remove from diagram"), 1);
 
-    if (m.exec(QCursor::pos()) == 1) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    int index = retAction->data().toInt();
+    if (index== 1) {
         delete_it();
         package_modified();
     }
+    }
 }
 
 void FragmentSeparatorCanvas::save(QTextStream & st, bool, QString &) const
diff --git a/src/diagram/FragmentSeparatorCanvas.h b/src/diagram/FragmentSeparatorCanvas.h
index 09f747054..28c8077e9 100644
--- a/src/diagram/FragmentSeparatorCanvas.h
+++ b/src/diagram/FragmentSeparatorCanvas.h
@@ -40,34 +40,35 @@ class FragmentSeparatorCanvas : public DiagramCanvas
     FragmentCanvas * fragment;
     double vpos;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     FragmentSeparatorCanvas(UmlCanvas * canvas, FragmentCanvas * f, double vp = 0.5);
     virtual ~FragmentSeparatorCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void compute_position();
-    void update();
+    virtual void update() override;
 
     virtual void drawShape(QPainter & p);
-    virtual void moveBy(double dx, double dy);
+    virtual void moveBy(double dx, double dy) override;
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual LineDirection allowed_direction(UmlCode);
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual void change_scale();
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode &, const DiagramItem *) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual LineDirection allowed_direction(UmlCode) override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual void change_scale() override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode &, const DiagramItem *) const override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static FragmentSeparatorCanvas * read(char *& , UmlCanvas *,
                                           char * k, FragmentCanvas * f);
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
 };
 
 #endif
diff --git a/src/diagram/HubCanvas.cpp b/src/diagram/HubCanvas.cpp
index c857c5680..9617aa9e8 100644
--- a/src/diagram/HubCanvas.cpp
+++ b/src/diagram/HubCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -71,9 +71,9 @@ bool HubCanvas::copyable() const
 void HubCanvas::change_scale()
 {
     // the size is not modified
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void HubCanvas::draw(QPainter & p)
@@ -98,7 +98,7 @@ void HubCanvas::draw(QPainter & p)
         show_mark(p, r);
 }
 
-UmlCode HubCanvas::type() const
+UmlCode HubCanvas::typeUmlCode() const
 {
     return UmlHub;
 }
@@ -109,13 +109,15 @@ void HubCanvas::open()
 
 void HubCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m;
+    QMenu m;
 
-    MenuFactory::createTitle(m, TR("Network connexion"));
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 0);
+    MenuFactory::createTitle(m, QObject::tr("Network connexion"));
+    m.addSeparator();
+    MenuFactory::addItem(m, QObject::tr("Remove from diagram"), 0);
 
-    switch (m.exec(QCursor::pos())) {
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    switch (retAction->data().toInt()) {
     case 0:
         delete_it();
         break;
@@ -135,7 +137,7 @@ QString HubCanvas::may_start(UmlCode & l) const
         return 0;
 
     default:
-        return TR("illegal");
+        return QObject::tr("illegal");
     }
 }
 
@@ -144,13 +146,13 @@ QString HubCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlDeploymentNode:
     case UmlHub:
-        return (l == UmlAssociation) ? QString() : TR("illegal");
+        return (l == UmlAssociation) ? QString() : QObject::tr("illegal");
 
     default:
-        return TR("illegal");
+        return QObject::tr("illegal");
     }
 }
 
@@ -183,7 +185,7 @@ HubCanvas * HubCanvas::read(char *& st, UmlCanvas * canvas,
     HubCanvas * result =
         new HubCanvas(canvas, x, (int) read_double(st), id);
 
-    result->setZ(read_double(st));
+    result->setZValue(read_double(st));
     result->show();
 
     return result;
diff --git a/src/diagram/HubCanvas.h b/src/diagram/HubCanvas.h
index e65177027..042b94339 100644
--- a/src/diagram/HubCanvas.h
+++ b/src/diagram/HubCanvas.h
@@ -42,16 +42,16 @@ class HubCanvas : public DiagramCanvas
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void change_scale();
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void change_scale() override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static HubCanvas * read(char *& st, UmlCanvas * canvas, char * k);
 };
 
diff --git a/src/diagram/IconCanvas.cpp b/src/diagram/IconCanvas.cpp
index 71ee3c22a..40834ffea 100644
--- a/src/diagram/IconCanvas.cpp
+++ b/src/diagram/IconCanvas.cpp
@@ -31,7 +31,7 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QPixmap>
@@ -107,15 +107,23 @@ void IconCanvas::draw(QPainter & p)
     }
 }
 
+void IconCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
 void IconCanvas::change_scale()
 {
     // defined to not change size
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
-UmlCode IconCanvas::type() const
+UmlCode IconCanvas::typeUmlCode() const
 {
     return UmlIcon;
 }
@@ -128,85 +136,89 @@ void IconCanvas::open()
 
 void IconCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, browser_node->get_name() + TR("\nshort cut"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 6);
-    m.insertItem(TR("Go down"), 7);
-    m.insertSeparator();
+    MenuFactory::createTitle(m, browser_node->get_name() + tr("\nshort cut"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 6);
+    MenuFactory::addItem(m, tr("Go down"), 7);
+    m.addSeparator();
 
     if (! browser_node->deletedp()) {
-        m.insertItem(TR("Open"), 2);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Open"), 2);
+        m.addSeparator();
     }
 
-    m.insertItem(TR("Select diagram in browser"), 3);
-    m.insertItem(TR("Select linked items"), 4);
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 5);
-
-    switch (m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        // force son reaffichage
-        hide();
-        show();
-        canvas()->update();
-        break;
-
-    case 1:
-        lower();
-        // force son reaffichage
-        hide();
-        show();
-        canvas()->update();
-        break;
-
-    case 6:
-        z_up();
-        // force son reaffichage
-        hide();
-        show();
-        canvas()->update();
-        break;
-
-    case 7:
-        z_down();
-        // force son reaffichage
-        hide();
-        show();
-        canvas()->update();
-        break;
-
-    case 2:
-        browser_node->open(FALSE);
-        return;
-
-    case 3:
-        browser_node->select_in_browser();
-        return;
-
-    case 4:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
-
-    case 5:
-        // delete
-        delete_it();
-        break;
-
-    default:
-        return;
+    MenuFactory::addItem(m, tr("Select diagram in browser"), 3);
+    MenuFactory::addItem(m, tr("Select linked items"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 5);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (retAction->data().toInt()) {
+        case 0:
+            upper();
+            // force son reaffichage
+            hide();
+            show();
+            canvas()->update();
+            break;
+
+        case 1:
+            lower();
+            // force son reaffichage
+            hide();
+            show();
+            canvas()->update();
+            break;
+
+        case 6:
+            z_up();
+            // force son reaffichage
+            hide();
+            show();
+            canvas()->update();
+            break;
+
+        case 7:
+            z_down();
+            // force son reaffichage
+            hide();
+            show();
+            canvas()->update();
+            break;
+
+        case 2:
+            browser_node->open(FALSE);
+            return;
+
+        case 3:
+            browser_node->select_in_browser();
+            return;
+
+        case 4:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
+
+        case 5:
+            // delete
+            delete_it();
+            break;
+
+        default:
+            return;
+        }
     }
 
     package_modified();
 }
 
-void IconCanvas::apply_shortcut(QString s)
+void IconCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -235,12 +247,12 @@ void IconCanvas::apply_shortcut(QString s)
 
 QString IconCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString IconCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 bool IconCanvas::alignable() const
@@ -287,7 +299,7 @@ IconCanvas * IconCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
 void IconCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
 }
 
diff --git a/src/diagram/IconCanvas.h b/src/diagram/IconCanvas.h
index 4d08d7c22..37914a73b 100644
--- a/src/diagram/IconCanvas.h
+++ b/src/diagram/IconCanvas.h
@@ -44,23 +44,25 @@ class IconCanvas : public QObject, public DiagramCanvas
     virtual ~IconCanvas();
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
+    virtual void change_scale() override;
 
-    virtual UmlCode type() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual bool represents(BrowserNode *);
-    virtual void apply_shortcut(QString s);
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual bool represents(BrowserNode *) override;
+    virtual void apply_shortcut(const QString & s) override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static IconCanvas * read(char *& , UmlCanvas *, char *);
 
+protected:
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 private slots:
     void deleted();	// the browser_node is deleted
 };
diff --git a/src/diagram/ImageCanvas.cpp b/src/diagram/ImageCanvas.cpp
index 70d11eedf..2fad8e322 100644
--- a/src/diagram/ImageCanvas.cpp
+++ b/src/diagram/ImageCanvas.cpp
@@ -31,7 +31,7 @@
 
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QPixmap>
@@ -51,8 +51,8 @@ ImageCanvas::ImageCanvas(UmlCanvas * canvas, int x, int y, QString pa, int id)
         width_scale100 = px->width();
         height_scale100 = px->height();
 
-        px = get_pixmap(path, canvas->zoom());
-        setSize(px->width(), px->height());
+        px = get_pixmap(path);
+        setRect(rect().x(), rect().y(), px->width(), px->height());
         set_center100();
     }
 }
@@ -70,21 +70,29 @@ void ImageCanvas::draw(QPainter & p)
     if (px == 0)
         p.fillRect(rect(), ::Qt::darkGray);
     else
-        p.drawPixmap((int) x(), (int) y(), *px);
+        p.drawPixmap((int) /*x()*/0, (int) /*y()*/0, *px);
 
     FILE * fp = svg();
 
     if (fp != 0)
         // pixmap not really exported in SVG
         fprintf(fp, "<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
-                svg_color(UmlBlack), (int) x(), (int) y(), width() - 1, height() - 1);
+                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                svg_color(UmlBlack), (int) /*x()*/0, (int) /*y()*/0, width() - 1, height() - 1);
 
     if (selected())
         show_mark(p, rect());
 }
 
-UmlCode ImageCanvas::type() const
+void ImageCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ImageCanvas::typeUmlCode() const
 {
     return UmlImage;
 }
@@ -110,8 +118,8 @@ void ImageCanvas::open()
     ImageDialog d(s);
 
     if ((d.exec() == QDialog::Accepted) &&
-        !s.isEmpty() &&
-        (s != path)) {
+            !s.isEmpty() &&
+            (s != path)) {
         QPixmap * p = get_pixmap(s);
 
         if (p != 0) {
@@ -122,7 +130,8 @@ void ImageCanvas::open()
 
             hide();
             hide_lines();
-            setSize(px->width(), px->height());
+            setRect(rect().x(), rect().y(), px->width(), px->height());
+
             recenter();
             show();
             update_show_lines();
@@ -158,77 +167,81 @@ void ImageCanvas::modified()
 
 void ImageCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     px = get_pixmap(path, the_canvas()->zoom());
-    setSize(px->width(), px->height());
+    setRect(rect().x(), rect().y(), px->width(), px->height());
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void ImageCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu fontsubm(0);
-
-    MenuFactory::createTitle(m, TR("Image"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 2);
-    m.insertItem(TR("Go down"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 4);
+    QMenu m(0);
+    QMenu fontsubm(0);
+
+    MenuFactory::createTitle(m,  QObject::tr("Image"));
+    m.addSeparator();
+    MenuFactory::addItem(m, QObject::tr("Upper"), 0);
+    MenuFactory::addItem(m, QObject::tr("Lower"), 1);
+    MenuFactory::addItem(m, QObject::tr("Go up"), 2);
+    MenuFactory::addItem(m, QObject::tr("Go down"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, QObject::tr("Edit"), 4);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 5);
+        m.addSeparator();
+        MenuFactory::addItem(m, QObject::tr("Select linked items"), 5);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 6);
-
-    int index = m.exec(QCursor::pos());
-
-    switch (index) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
-
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
-
-    case 2:
-        z_up();
-        modified();	// call package_modified()
-        return;
-
-    case 3:
-        z_down();
-        modified();	// call package_modified()
-        return;
-
-    case 4:
-        open();
-        // all done by open
-        return;
-
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
-
-    case 6:
-        delete_it();
-        break;
+    m.addSeparator();
+    MenuFactory::addItem(m, QObject::tr("Remove from diagram"), 6);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int index = retAction->data().toInt();
+
+        switch (index) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
+
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
+
+        case 2:
+            z_up();
+            modified();	// call package_modified()
+            return;
+
+        case 3:
+            z_down();
+            modified();	// call package_modified()
+            return;
+
+        case 4:
+            open();
+            // all done by open
+            return;
+
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
+
+        case 6:
+            delete_it();
+            break;
+        }
     }
 
     package_modified();
 }
 
-void ImageCanvas::apply_shortcut(QString s)
+void ImageCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -250,12 +263,12 @@ void ImageCanvas::apply_shortcut(QString s)
 
 QString ImageCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() :  QObject::tr("illegal");
 }
 
 QString ImageCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) :  QObject::tr("illegal");
 }
 
 void ImageCanvas::save(QTextStream & st, bool ref, QString &) const
@@ -279,7 +292,7 @@ ImageCanvas * ImageCanvas::read(char *& st, UmlCanvas * canvas, char * k)
         return (ImageCanvas *) dict_get(read_id(st), "image", canvas);
     else if (!strcmp(k, "image")) {
         int id = read_id(st);
-        QString pa = toUnicode(read_string(st));
+        QString pa = read_string(st);
         ImageCanvas * result = new ImageCanvas(canvas, 0, 0, pa, id);
 
         read_keyword(st, "xyz");
@@ -297,7 +310,7 @@ ImageCanvas * ImageCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
 void ImageCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 }
 
 void ImageCanvas::history_save(QBuffer & b) const
@@ -319,5 +332,5 @@ void ImageCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 }
diff --git a/src/diagram/ImageCanvas.h b/src/diagram/ImageCanvas.h
index 1ca0be52c..d77df7238 100644
--- a/src/diagram/ImageCanvas.h
+++ b/src/diagram/ImageCanvas.h
@@ -41,6 +41,7 @@ class ImageCanvas : public DiagramCanvas
 
     void modified();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ImageCanvas(UmlCanvas * canvas, int x, int y, QString pa, int id);
     virtual ~ImageCanvas();
@@ -49,22 +50,22 @@ class ImageCanvas : public DiagramCanvas
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void open();
-    virtual void change_scale();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void open() override;
+    virtual void change_scale() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static ImageCanvas * read(char *& , UmlCanvas *, char *);
 
     static ImageCanvas * add(UmlCanvas *, int x, int y);
diff --git a/src/diagram/InfoCanvas.cpp b/src/diagram/InfoCanvas.cpp
index de17ca042..5a7117245 100644
--- a/src/diagram/InfoCanvas.cpp
+++ b/src/diagram/InfoCanvas.cpp
@@ -30,8 +30,8 @@
 
 
 #include <qcursor.h>
-#include <q3painter.h>
-#include <q3popupmenu.h>
+#include <qpainter.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -72,8 +72,9 @@ InfoCanvas::InfoCanvas(UmlCanvas * canvas, DiagramItem * a, QString s)
     if (h < height())
         h = height();
 
-    setSize(w, h);
-    setZ(a->get_z());
+    //setSize(w, h);
+    setRect(0,0,w, h);
+    setZValue(a->get_z());
 
     width_scale100 = w;
     height_scale100 = h;
@@ -84,7 +85,7 @@ InfoCanvas::~InfoCanvas()
 {
 }
 
-UmlCode InfoCanvas::type() const
+UmlCode InfoCanvas::typeUmlCode() const
 {
     return UmlInfo;
 }
@@ -107,8 +108,6 @@ void InfoCanvas::open()
 
 void InfoCanvas::set(QString s)
 {
-    s = toUnicode(s);
-
     if (s != note) {
         note = s;
         modified();
@@ -117,30 +116,32 @@ void InfoCanvas::set(QString s)
 
 void InfoCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu fontsubm(0);
-
-    MenuFactory::createTitle(m, TR("Information"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 5);
-    m.insertItem(TR("Go down"), 6);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Font"), &fontsubm);
+    QMenu m(0);
+    QMenu fontsubm(0);
+
+    MenuFactory::createTitle(m, tr("Information"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 5);
+    MenuFactory::addItem(m, tr("Go down"), 6);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::insertItem(m, tr("Font"), &fontsubm);
     init_font_menu(fontsubm, the_canvas(), 10);
-    m.insertItem(TR("Edit drawing settings"), 3);
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 4);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select linked items"), 4);
     }
 
-    m.insertSeparator();
-
-    int index = m.exec(QCursor::pos());
+    m.addSeparator();
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    int index = retAction->data().toInt();
 
     switch (index) {
     case 0:
@@ -171,7 +172,7 @@ void InfoCanvas::menu(const QPoint &)
         for (;;) {
             ColorSpecVector co(1);
 
-            co[0].set(TR("note color"), &itscolor);
+            co[0].set(tr("note color"), &itscolor);
 
             SettingsDialog dialog(0, &co, FALSE);
 
@@ -199,11 +200,12 @@ void InfoCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void InfoCanvas::apply_shortcut(QString s)
+void InfoCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -225,24 +227,23 @@ bool InfoCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void InfoCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void InfoCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("note color"), &itscolor);
+        co[0].set(tr("note color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((InfoCanvas *) it.current())->itscolor = itscolor;
-                ((InfoCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                InfoCanvas *canvas = (InfoCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -251,18 +252,11 @@ void InfoCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void InfoCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void InfoCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    InfoCanvas * x = (InfoCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        InfoCanvas * o = (InfoCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const InfoCanvas * x = (const InfoCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 void InfoCanvas::save(QTextStream & st, bool ref, QString &) const
diff --git a/src/diagram/InfoCanvas.h b/src/diagram/InfoCanvas.h
index 953c32220..45e648227 100644
--- a/src/diagram/InfoCanvas.h
+++ b/src/diagram/InfoCanvas.h
@@ -36,6 +36,8 @@ class DiagramItem;
 
 class InfoCanvas : public NoteCanvas
 {
+    Q_OBJECT
+    
 protected:
     DiagramItem * who;
 
@@ -44,18 +46,18 @@ class InfoCanvas : public NoteCanvas
     InfoCanvas(UmlCanvas * canvas, DiagramItem *, QString);
     virtual ~InfoCanvas();
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool copyable() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool copyable() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
-    virtual void apply_shortcut(QString s);
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual void apply_shortcut(const QString & s) override;
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static InfoCanvas * read(char *& , UmlCanvas *, char *, DiagramItem *);
 
     void set(QString s);
diff --git a/src/diagram/InterruptibleActivityRegionCanvas.cpp b/src/diagram/InterruptibleActivityRegionCanvas.cpp
index 5227a2cd9..1863d4b15 100644
--- a/src/diagram/InterruptibleActivityRegionCanvas.cpp
+++ b/src/diagram/InterruptibleActivityRegionCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -159,7 +159,7 @@ void InterruptibleActivityRegionCanvas::force_sub_inside(bool resize_it)
 {
     // update sub nodes position to be inside of the activity region
     // or resize it to contains sub elts if resize_it
-    Q3CanvasItemList all = canvas()->allItems();
+    QList<QGraphicsItem*> all = canvas()->items();
     BooL need_sub_upper = FALSE;
 
     if (resize_it)
@@ -178,7 +178,8 @@ void InterruptibleActivityRegionCanvas::draw(QPainter & p)
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
+    QBrush backBrush = p.background();
 
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode
@@ -186,7 +187,8 @@ void InterruptibleActivityRegionCanvas::draw(QPainter & p)
 
     QColor co = color(used_color);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
@@ -204,14 +206,23 @@ void InterruptibleActivityRegionCanvas::draw(QPainter & p)
                 r.left(), r.top(), r.width() - 1, r.height() - 1);
 
     p.setPen(::Qt::SolidLine);
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode InterruptibleActivityRegionCanvas::type() const
+void InterruptibleActivityRegionCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode InterruptibleActivityRegionCanvas::typeUmlCode() const
 {
     return UmlInterruptibleActivityRegion;
 }
@@ -239,49 +250,52 @@ void InterruptibleActivityRegionCanvas::open()
 
 void InterruptibleActivityRegionCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit interruptible activity region"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit interruptible activity region"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
             (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 9);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 9);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlInterruptibleActivityRegion, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index = retAction->data().toInt()) {
     case 0:
         upper();
         modified();	// call package_modified()
@@ -346,11 +360,12 @@ void InterruptibleActivityRegionCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void InterruptibleActivityRegionCanvas::apply_shortcut(QString s)
+void InterruptibleActivityRegionCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -382,7 +397,7 @@ void InterruptibleActivityRegionCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("interruptible activity region color"), &itscolor);
+        co[0].set(tr("interruptible activity region color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -401,24 +416,23 @@ bool InterruptibleActivityRegionCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void InterruptibleActivityRegionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void InterruptibleActivityRegionCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("interruptible activity region color"), &itscolor);
+        co[0].set(tr("interruptible activity region color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((InterruptibleActivityRegionCanvas *) it.current())->itscolor = itscolor;
-                ((InterruptibleActivityRegionCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                InterruptibleActivityRegionCanvas *canvas = (InterruptibleActivityRegionCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -427,28 +441,21 @@ void InterruptibleActivityRegionCanvas::edit_drawing_settings(Q3PtrList<DiagramI
     }
 }
 
-void InterruptibleActivityRegionCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void InterruptibleActivityRegionCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    InterruptibleActivityRegionCanvas * x = (InterruptibleActivityRegionCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        InterruptibleActivityRegionCanvas * o = (InterruptibleActivityRegionCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const InterruptibleActivityRegionCanvas * x = (const InterruptibleActivityRegionCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString InterruptibleActivityRegionCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString InterruptibleActivityRegionCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 void InterruptibleActivityRegionCanvas::connexion(UmlCode action, DiagramItem * dest,
@@ -555,7 +562,7 @@ void InterruptibleActivityRegionCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
@@ -564,7 +571,7 @@ void InterruptibleActivityRegionCanvas::history_load(QBuffer & b)
 
 void InterruptibleActivityRegionCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
diff --git a/src/diagram/InterruptibleActivityRegionCanvas.h b/src/diagram/InterruptibleActivityRegionCanvas.h
index 2bf4519e0..fc74b4a63 100644
--- a/src/diagram/InterruptibleActivityRegionCanvas.h
+++ b/src/diagram/InterruptibleActivityRegionCanvas.h
@@ -33,10 +33,8 @@
 
 
 #include <qobject.h>
-#include <q3valuelist.h>
-//Added by qt3to4:
+#include <QList>
 #include <QTextStream>
-
 #include "ActivityContainerCanvas.h"
 
 #define INTERRUPTIBLE_ACTIVITY_REGION_CANVAS_MIN_SIZE 40
@@ -52,46 +50,48 @@ class InterruptibleActivityRegionCanvas : public QObject, public ActivityContain
 protected:
     InterruptibleActivityRegionCanvas(UmlCanvas * canvas, int id);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     InterruptibleActivityRegionCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~InterruptibleActivityRegionCanvas();
 
     void force_sub_inside(bool rz);
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    void update();
+    virtual void update() override;
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual bool move_with_its_package() const;
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using ActivityContainerCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual bool move_with_its_package() const override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static InterruptibleActivityRegionCanvas * read(char *& , UmlCanvas *, char *);
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/LabelCanvas.cpp b/src/diagram/LabelCanvas.cpp
index ebe476ee8..9fab8e1f4 100644
--- a/src/diagram/LabelCanvas.cpp
+++ b/src/diagram/LabelCanvas.cpp
@@ -38,14 +38,17 @@
 #include "DiagramCanvas.h"
 #include "myio.h"
 #include "translate.h"
+#include <QStyleOptionGraphicsItem>
 
 const char * LabelCanvas::Triangle = "^^^";
 const char * LabelCanvas::Zigzag = "~~~";
 
 LabelCanvas::LabelCanvas(const QString & n, UmlCanvas * canvas, int x, int y,
                          bool bold, bool italic, bool underlined, bool mlcentered)
-    : Q3CanvasText(n, canvas), DiagramItem(-1, canvas)
+    : QGraphicsSimpleTextItem(n/*, canvas*/), DiagramItem(-1, canvas)
 {
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
+    canvas->addItem(this);
     if (bold)
         setFont((italic) ? ((UmlCanvas *) canvas)->get_font(UmlNormalBoldItalicFont)
                 : ((UmlCanvas *) canvas)->get_font(UmlNormalBoldFont));
@@ -58,7 +61,7 @@ LabelCanvas::LabelCanvas(const QString & n, UmlCanvas * canvas, int x, int y,
     multi_lines_centered = mlcentered;
     setX(x);
     setY(y);
-    setZ(LABEL_Z);
+    setZValue(LABEL_Z);
     set_center100();
 
     if (canvas->paste())
@@ -71,12 +74,12 @@ LabelCanvas::~LabelCanvas()
 
 void LabelCanvas::delete_it()
 {
-    ((UmlCanvas *) canvas())->del(this);
+    ((UmlCanvas *) scene())->del(this);
 }
 
 UmlCanvas * LabelCanvas::the_canvas() const
 {
-    return ((UmlCanvas *) canvas());
+    return ((UmlCanvas *) scene());
 }
 
 void LabelCanvas::set_name(const QString & s)
@@ -86,30 +89,30 @@ void LabelCanvas::set_name(const QString & s)
     setText(s);
 
     if (font().strikeOut())
-        setFont(((UmlCanvas *) canvas())->get_font(UmlNormalFont));
+        setFont(((UmlCanvas *) scene())->get_font(UmlNormalFont));
 
     show();
-    canvas()->update();
+    scene()->update();
 }
 
 void LabelCanvas::set_strikeout(bool yes)
 {
     if (yes) {
         if (!font().strikeOut())
-            setFont(((UmlCanvas *) canvas())->get_font(UmlNormalStrikeOutFont));
+            setFont(((UmlCanvas *) scene())->get_font(UmlNormalStrikeOutFont));
     }
     else if (font().strikeOut())
-        setFont(((UmlCanvas *) canvas())->get_font(UmlNormalFont));
+        setFont(((UmlCanvas *) scene())->get_font(UmlNormalFont));
 }
 
 void LabelCanvas::set_underlined(bool yes)
 {
     if (yes) {
         if (!font().underline())
-            setFont(((UmlCanvas *) canvas())->get_font(UmlNormalUnderlinedFont));
+            setFont(((UmlCanvas *) scene())->get_font(UmlNormalUnderlinedFont));
     }
     else if (font().underline())
-        setFont(((UmlCanvas *) canvas())->get_font(UmlNormalFont));
+        setFont(((UmlCanvas *) scene())->get_font(UmlNormalFont));
 }
 
 void LabelCanvas::change_scale()
@@ -117,15 +120,15 @@ void LabelCanvas::change_scale()
     hide();
 
     if (font().bold())
-        setFont((font().italic()) ? ((UmlCanvas *) canvas())->get_font(UmlNormalBoldItalicFont)
-                : ((UmlCanvas *) canvas())->get_font(UmlNormalBoldFont));
+        setFont((font().italic()) ? ((UmlCanvas *) scene())->get_font(UmlNormalBoldItalicFont)
+                : ((UmlCanvas *) scene())->get_font(UmlNormalBoldFont));
     else if (font().italic())
-        setFont(((UmlCanvas *) canvas())->get_font(UmlNormalItalicFont));
+        setFont(((UmlCanvas *) scene())->get_font(UmlNormalItalicFont));
     else if (font().underline())
-        setFont(((UmlCanvas *) canvas())->get_font(UmlNormalUnderlinedFont));
+        setFont(((UmlCanvas *) scene())->get_font(UmlNormalUnderlinedFont));
     else
-        setFont((font().strikeOut()) ? ((UmlCanvas *) canvas())->get_font(UmlNormalStrikeOutFont)
-                : ((UmlCanvas *) canvas())->get_font(UmlNormalFont));
+        setFont((font().strikeOut()) ? ((UmlCanvas *) scene())->get_font(UmlNormalStrikeOutFont)
+                : ((UmlCanvas *) scene())->get_font(UmlNormalFont));
 
     recenter();
 
@@ -137,7 +140,7 @@ void LabelCanvas::recenter()
     double scale = the_canvas()->zoom();
     QPoint c = center();
 
-    Q3CanvasText::moveBy(((int)(center_x_scale100 * scale + 0.5)) - c.x(),
+    QGraphicsSimpleTextItem::moveBy(((int)(center_x_scale100 * scale + 0.5)) - c.x(),
                          ((int)(center_y_scale100 * scale + 0.5)) - c.y());
 }
 
@@ -152,7 +155,7 @@ void LabelCanvas::set_center100()
 
 void LabelCanvas::moveBy(double dx, double dy)
 {
-    Q3CanvasText::moveBy(dx, dy);
+    QGraphicsSimpleTextItem::moveBy(dx, dy);
 
     if (! the_canvas()->do_zoom())
         set_center100();
@@ -182,20 +185,19 @@ void LabelCanvas::move_outside(QRect r, double angle)
         lbl_r.moveCenter(p);
     }
     while (lbl_r.intersects(r));
-
-    move(lbl_r.x(), lbl_r.y());
+    moveBy(lbl_r.x(), lbl_r.y());
 }
 
 void LabelCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     p.setBackgroundMode(::Qt::TransparentMode);
 
-    QRect r = boundingRect();
+    QRectF r = boundingRect();
     FILE * fp = svg();
-    int index = text().find(Triangle);
+    int index = text().indexOf(Triangle);
 
     if (fp != 0)
         fputs("<g>\n", fp);
@@ -245,7 +247,7 @@ void LabelCanvas::draw(QPainter & p)
     }
     else if (text() != Zigzag) {
         // no triangle nor zigzag
-        if (text().find('\n') != -1) {
+        if (text().indexOf('\n') != -1) {
             p.setFont(font());
 
             int flg = (multi_lines_centered) ? ::Qt::AlignHCenter : 0;
@@ -257,7 +259,8 @@ void LabelCanvas::draw(QPainter & p)
                           p.font(), fp);
         }
         else {
-            Q3CanvasText::draw(p);
+            QStyleOptionGraphicsItem option;
+            QGraphicsSimpleTextItem::paint(&p,&option,0);
 
             if (fp != 0)
                 draw_text(rect(), 0, text(), p.font(), fp);
@@ -281,10 +284,10 @@ void LabelCanvas::draw(QPainter & p)
 
         if (fp != 0) {
             fprintf(fp, "\t<polyline fill=\"none\" stroke=\"black\" stroke-opacity=\"1\""
-                    " points=\"%d,%d %d,%d %d,%d %d,%d %d,%d\" />\n",
+                    " points=\"%f,%d %f,%d %f,%d %f,%d %d,%f\" />\n",
                     r.left(), t, r.right(), t, r.left(), yb, r.right(), yb, xr, r.bottom() - h / 2);
             fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                    " x1=\"%f\" y1=\"%d\" x2=\"%d\" y2=\"%f\" />\n",
                     r.right(), yb, xr, r.bottom());
         }
     }
@@ -292,11 +295,19 @@ void LabelCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("</g>\n", fp);
 
-    if (selected())
-        show_mark(p, r);
+    if (isSelected())
+        show_mark(p, r.toRect());
+}
+
+void LabelCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
 }
 
-UmlCode LabelCanvas::type() const
+UmlCode LabelCanvas::typeUmlCode() const
 {
     return UmlLabel;
 }
@@ -308,17 +319,22 @@ int LabelCanvas::rtti() const
 
 QPoint LabelCanvas::center() const
 {
-    return boundingRect().center();
+    return sceneBoundingRect().center().toPoint();
 }
 
 QRect LabelCanvas::rect() const
 {
-    return boundingRect();
+    return boundingRect().toRect();
+}
+
+QRect LabelCanvas::sceneRect() const
+{
+    return rect();
 }
 
 bool LabelCanvas::isSelected() const
 {
-    return selected();
+    return QGraphicsSimpleTextItem::isSelected();
 }
 
 bool LabelCanvas::contains(int, int) const
@@ -328,12 +344,12 @@ bool LabelCanvas::contains(int, int) const
 
 QString LabelCanvas::may_start(UmlCode &) const
 {
-    return TR("illegal");
+    return QObject::tr("illegal");
 }
 
 QString LabelCanvas::may_connect(UmlCode &, const DiagramItem *) const
 {
-    return TR("illegal");
+    return QObject::tr("illegal");
 }
 
 void LabelCanvas::connexion(UmlCode, DiagramItem *,
@@ -352,12 +368,12 @@ void LabelCanvas::menu(const QPoint &)
 
 double LabelCanvas::get_z() const
 {
-    return z();
+    return zValue();
 }
 
 void LabelCanvas::set_z(double z)
 {
-    setZ(z);
+    setZValue(z);
 }
 
 //
@@ -409,10 +425,10 @@ LabelCanvas * LabelCanvas::read(char *& st, UmlCanvas * canvas, char * k)
                         bold, italic, underlined);
 
     if (!strcmp(k, "xyz"))
-        result->setZ(read_double(st));
+        result->setZValue(read_double(st));
     else if (!strcmp(k, "xy"))
         // old version
-        ;//result->setZ(OLD_LABEL_Z);
+        ;//result->setZValue(OLD_LABEL_Z);
     else
         wrong_keyword(k, "xyz");
 
@@ -426,7 +442,7 @@ void LabelCanvas::history_save(QBuffer & b) const
     ::save(center_y_scale100, b);
     ::save(x(), b);
     ::save(y(), b);
-    ::save(z(), b);
+    ::save(zValue(), b);
 }
 
 void LabelCanvas::history_load(QBuffer & b)
@@ -435,18 +451,23 @@ void LabelCanvas::history_load(QBuffer & b)
     ::load(center_y_scale100, b);
     double dx = load_double(b) - x();
 
-    Q3CanvasText::moveBy(dx, load_double(b) - y());
-    Q3CanvasText::setZ(load_double(b));
-    Q3CanvasItem::setSelected(FALSE);
-    Q3CanvasItem::setVisible(TRUE);
+    QGraphicsSimpleTextItem::moveBy(dx, load_double(b) - y());
+    QGraphicsSimpleTextItem::setZValue(load_double(b));
+    QGraphicsItem::setSelected(FALSE);
+    QGraphicsItem::setVisible(TRUE);
 }
 
 void LabelCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 }
 
 void LabelCanvas::check_stereotypeproperties()
 {
     // do nothing
 }
+
+int LabelCanvas::type() const
+{
+    return RTTI_LABEL;
+}
diff --git a/src/diagram/LabelCanvas.h b/src/diagram/LabelCanvas.h
index 9c7a3169f..48051b9ec 100644
--- a/src/diagram/LabelCanvas.h
+++ b/src/diagram/LabelCanvas.h
@@ -30,7 +30,7 @@
 
 #include <qfont.h>
 
-#include "q3canvas.h"
+#include "QGraphicsScene"
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -40,9 +40,9 @@
 #define LABEL_Z 3000
 #define OLD_LABEL_Z 1e100
 
-#define isa_label(x) ((x)->rtti() == RTTI_LABEL)
+#define isa_label(x) ((x)->type() == RTTI_LABEL)
 
-class LabelCanvas : public Q3CanvasText, public DiagramItem
+class LabelCanvas : public QGraphicsSimpleTextItem, public DiagramItem
 {
 public:
     static const char * Triangle;
@@ -53,18 +53,21 @@ class LabelCanvas : public Q3CanvasText, public DiagramItem
     int center_x_scale100;
     int center_y_scale100;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     LabelCanvas(const QString & n, UmlCanvas * canvas, int x, int y,
                 bool bold = FALSE, bool italic = FALSE,
                 bool underlined = FALSE, bool mlcentered = TRUE);
     virtual ~LabelCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     const QString get_name() const {
         return text();
     };
-    virtual QRect rect() const;
+    virtual QRect rect() const override;
+    virtual QRect sceneRect() const override;
+
     int width() const {
         return boundingRect().width();
     };
@@ -80,30 +83,33 @@ class LabelCanvas : public Q3CanvasText, public DiagramItem
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
+    virtual UmlCode typeUmlCode() const override;
     virtual int rtti() const;
-    void moveBy(double dx, double dy);
-    virtual QPoint center() const;
+    virtual void moveBy(double dx, double dy) override;
+    virtual QPoint center() const override;
     void recenter();
     void set_center100();
-    virtual bool contains(int, int) const;
-    virtual void change_scale();
-    virtual void open();
-    void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual double get_z() const;
-    virtual void set_z(double z);	// only called by upper() & lower()
-    virtual UmlCanvas * the_canvas() const;
-    virtual bool isSelected() const;
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    using QGraphicsSimpleTextItem::contains;
+    virtual bool contains(int, int) const override;
+    virtual void change_scale() override;
+    virtual void open() override;
+    void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual double get_z() const override;
+    virtual void set_z(double z) override;	// only called by upper() & lower()
+    virtual UmlCanvas * the_canvas() const override;
+    virtual bool isSelected() const override;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static LabelCanvas * read(char *& st, UmlCanvas * canvas, char *);
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual void check_stereotypeproperties() override;
 
-    virtual void check_stereotypeproperties();
+    virtual int type() const override;
 };
 
 #endif
diff --git a/src/diagram/NoteCanvas.cpp b/src/diagram/NoteCanvas.cpp
index 60da5dbaf..e589483cd 100644
--- a/src/diagram/NoteCanvas.cpp
+++ b/src/diagram/NoteCanvas.cpp
@@ -31,10 +31,11 @@
 
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
+#include <QPolygon>
+
 
 #include "NoteCanvas.h"
 #include "MLEDialog.h"
@@ -52,8 +53,8 @@
 NoteCanvas::NoteCanvas(UmlCanvas * canvas, int x, int y, int id)
     : DiagramCanvas(0, canvas, x, y, NOTE_CANVAS_MIN_SIZE,
                     NOTE_CANVAS_MIN_SIZE, id),
-    itsfont(UmlNormalFont), itscolor(UmlDefaultColor),
-    used_color(UmlDefaultColor), fg_c(UmlBlack)
+      itsfont(UmlNormalFont), itscolor(UmlDefaultColor),
+      used_color(UmlDefaultColor), fg_c(UmlBlack)
 {
     browser_node = canvas->browser_diagram();
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
@@ -76,13 +77,14 @@ void NoteCanvas::draw(QPainter & p)
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     QPen fgcolor = p.pen();
-    Q3PointArray a(7);
+    QPolygon a(7);
+    QBrush backB = p.background();
 
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlNote)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlNote)
+            : itscolor;
 
     QColor co = color(used_color);
 
@@ -103,7 +105,8 @@ void NoteCanvas::draw(QPainter & p)
 
     if (used_color == UmlTransparent) {
         p.setBackgroundMode(::Qt::TransparentMode);
-        p.setBackgroundColor(co);
+        backB.setColor(co);
+        p.setBackground(backB);
         p.drawPolyline(a);
 
         if (fp != 0)
@@ -112,9 +115,11 @@ void NoteCanvas::draw(QPainter & p)
     else {
         p.setBackgroundMode(::Qt::OpaqueMode);
         p.setBrush(co);
-        p.drawPolygon(a, TRUE, 0, 6);
+        p.drawPolygon(a, Qt::WindingFill /*TRUE, 0, 6*/);
         p.setBrush(brsh);
-        p.setBackgroundColor(co);
+        QBrush backB = p.background();
+        backB.setColor(co);
+        p.setBackground(backB);
 
         if (fp != 0)
             draw_poly(fp, a, used_color);
@@ -125,7 +130,7 @@ void NoteCanvas::draw(QPainter & p)
 
     if (fp != 0)
         fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                 r.right() - corner_size, r.top(), r.right(), r.top() + corner_size);
 
     p.setFont(the_canvas()->get_font(itsfont));
@@ -147,14 +152,23 @@ void NoteCanvas::draw(QPainter & p)
     }
 
     p.setFont(the_canvas()->get_font(UmlNormalFont));
-    p.setBackgroundColor(bckgrnd);
+    backB.setColor(bckgrnd);
+    p.setBackground(backB);
     p.setPen(fgcolor);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode NoteCanvas::type() const
+void NoteCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode NoteCanvas::typeUmlCode() const
 {
     return UmlNote;
 }
@@ -180,18 +194,16 @@ void NoteCanvas::open()
 
     // warning : 'note' is already unicode
     QString s = fromUnicode(note);
-
     MLEDialog::get(s, QCursor::pos(), sz);
-    note = toUnicode(s);
-
+    note = s;
     modified();
 }
 
 void NoteCanvas::modified()
 {
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlNote)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlNote)
+            : itscolor;
     // force son reaffichage
     hide();
     show();
@@ -201,112 +213,116 @@ void NoteCanvas::modified()
 
 void NoteCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu fontsubm(0);
-
-    MenuFactory::createTitle(m, TR("Note"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 7);
-    m.insertItem(TR("Go down"), 8);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Color of text"), 6);
-    m.insertItem(TR("Font"), &fontsubm);
+    QMenu m(0);
+    QMenu fontsubm(0);
+
+    MenuFactory::createTitle(m, tr("Note"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 7);
+    MenuFactory::addItem(m, tr("Go down"), 8);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Color of text"), 6);
+    MenuFactory::insertItem(m, tr("Font"), &fontsubm);
     init_font_menu(fontsubm, the_canvas(), 10);
-    m.insertItem(TR("Edit drawing settings"), 3);
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 4);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select linked items"), 4);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 5);
-
-    int index = m.exec(QCursor::pos());
-
-    switch (index) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
-
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
-
-    case 7:
-        z_up();
-        modified();	// call package_modified()
-        return;
-
-    case 8:
-        z_down();
-        modified();	// call package_modified()
-        return;
-
-    case 2:
-        open();
-        // modified then package_modified already called
-        return;
-
-    case 3:
-        edit_drawing_settings();
-        return;
-
-    case 4:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 5);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int index = retAction->data().toInt();
+
+        switch (index) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
+
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
+
+        case 7:
+            z_up();
+            modified();	// call package_modified()
+            return;
+
+        case 8:
+            z_down();
+            modified();	// call package_modified()
+            return;
+
+        case 2:
+            open();
+            // modified then package_modified already called
+            return;
+
+        case 3:
+            edit_drawing_settings();
+            return;
+
+        case 4:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
+
+        case 5:
+            delete_it();
+            break;
 
-    case 5:
-        delete_it();
-        break;
+        case 6:
+            for (;;) {
+                ColorSpecVector co(1);
 
-    case 6:
-        for (;;) {
-            ColorSpecVector co(1);
+                co[0].set(tr("color"), &fg_c);
 
-            co[0].set(TR("color"), &fg_c);
+                SettingsDialog dialog(0, &co, TRUE, FALSE,
+                                      tr("Text color dialog"));
 
-            SettingsDialog dialog(0, &co, TRUE, FALSE,
-                                  TR("Text color dialog"));
+                dialog.raise();
 
-            dialog.raise();
+                if (dialog.exec() != QDialog::Accepted)
+                    return;
 
-            if (dialog.exec() != QDialog::Accepted)
-                return;
+                // force son reaffichage
+                hide();
+                show();
+                canvas()->update();
 
-            // force son reaffichage
-            hide();
-            show();
-            canvas()->update();
+                if (!dialog.redo())
+                    break;
+                else
+                    package_modified();
+            }
 
-            if (!dialog.redo())
-                break;
-            else
-                package_modified();
-        }
+            break;
 
-        break;
+        default:
+            if (index >= 10) {
+                itsfont = (UmlFont)(index - 10);
+                modified();
+            }
 
-    default:
-        if (index >= 10) {
-            itsfont = (UmlFont)(index - 10);
-            modified();
+            return;
         }
-
-        return;
     }
 
     package_modified();
 }
 
-void NoteCanvas::apply_shortcut(QString s)
+void NoteCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -336,7 +352,7 @@ void NoteCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("note color"), &itscolor);
+        co[0].set(tr("note color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -355,24 +371,23 @@ bool NoteCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void NoteCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void NoteCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("note color"), &itscolor);
+        co[0].set(tr("note color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((NoteCanvas *) it.current())->itscolor = itscolor;
-                ((NoteCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                NoteCanvas *canvas = (NoteCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -381,28 +396,21 @@ void NoteCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void NoteCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void NoteCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    NoteCanvas * x = (NoteCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        NoteCanvas * o = (NoteCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const NoteCanvas * x = (const NoteCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString NoteCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString NoteCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 aCorner NoteCanvas::on_resize_point(const QPoint & p)
@@ -426,9 +434,7 @@ void NoteCanvas::resize(const QSize & sz, bool w, bool h)
 
 void NoteCanvas::save_internal(QTextStream & st) const
 {
-    QTextCodec* codec = QTextCodec::codecForLocale();
-    QByteArray toWrite = codec->fromUnicode(note);
-    save_string(toWrite, st);
+    save_string(note, st);
 
     //save_string(temp1, st);
     nl_indent(st);
@@ -441,7 +447,6 @@ void NoteCanvas::save_internal(QTextStream & st) const
 
     if (fg_c != UmlBlack)
         st << "  fg " << stringify(fg_c);
-
     save_xyzwh(st, this, "  xyzwh");
 }
 
@@ -460,16 +465,9 @@ void NoteCanvas::save(QTextStream & st, bool ref, QString &) const
 
 void NoteCanvas::read_internal(char *& st)
 {
-    const char * p = st;
-    QTextCodec* codec = QTextCodec::codecForLocale();
-    QTextStream stream(p);
-    stream.setCodec(codec);
-    QByteArray ba;
-    stream   >> ba;
-    QString temp = QString::fromLocal8Bit(ba);
-    char* test = read_string(st);
-    Q_UNUSED(test);
-    note = temp;
+    note = read_string(st);
+    //Q_UNUSED(test);
+
 
 
     char * k = read_keyword(st);
@@ -504,7 +502,7 @@ NoteCanvas * NoteCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
 void NoteCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
 
@@ -527,7 +525,7 @@ void NoteCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
diff --git a/src/diagram/NoteCanvas.h b/src/diagram/NoteCanvas.h
index 8b8a6f1b7..11fdd584b 100644
--- a/src/diagram/NoteCanvas.h
+++ b/src/diagram/NoteCanvas.h
@@ -55,35 +55,36 @@ class NoteCanvas : public QObject, public DiagramCanvas
     NoteCanvas(UmlCanvas * canvas, int x, int y, int id);
     virtual ~NoteCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual aCorner on_resize_point(const QPoint &);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual aCorner on_resize_point(const QPoint &) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static NoteCanvas * read(char *& , UmlCanvas *, char *);
-
 protected slots:
     void modified();
 };
diff --git a/src/diagram/ObjectDiagramView.cpp b/src/diagram/ObjectDiagramView.cpp
index bd49d6c7a..56e4d4c86 100644
--- a/src/diagram/ObjectDiagramView.cpp
+++ b/src/diagram/ObjectDiagramView.cpp
@@ -30,7 +30,7 @@
 
 
 #include <qfont.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -66,9 +66,9 @@ ObjectDiagramView::ObjectDiagramView(QWidget * parent, UmlCanvas * canvas, int i
 
 void ObjectDiagramView::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Object diagram menu"));
+    MenuFactory::createTitle(m, tr("Object diagram menu"));
 
     switch (default_menu(m, 30)) {
     case EDIT_DRAWING_SETTING_CMD:
@@ -85,11 +85,13 @@ void ObjectDiagramView::menu(const QPoint &)
     }
 }
 
-void ObjectDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void ObjectDiagramView::mousePressEvent(QMouseEvent * e)
 {
     if (!window()->frozen()) {
+        QPoint diagramPoint(e->x(), e->y());
+        QPointF scenePoint = mapToScene(diagramPoint);
         if (e->button() == ::Qt::RightButton)
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
         else {
             UmlCode c = window()->buttonOn();
 
@@ -109,7 +111,7 @@ void ObjectDiagramView::contentsMousePressEvent(QMouseEvent * e)
                     BrowserClassInstance * i =
                         new BrowserClassInstance("", b, parent);
                     OdClassInstCanvas * cl =
-                        new OdClassInstCanvas(i, the_canvas(), e->x(), e->y(), 0);
+                        new OdClassInstCanvas(i, the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
                     cl->show();
                     cl->upper();
@@ -133,7 +135,7 @@ void ObjectDiagramView::contentsMousePressEvent(QMouseEvent * e)
 
                 if (b != 0) {
                     OdClassInstCanvas * cl =
-                        new OdClassInstCanvas(b, the_canvas(), e->x(), e->y(), 0);
+                        new OdClassInstCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
                     cl->show();
                     cl->upper();
@@ -146,13 +148,13 @@ void ObjectDiagramView::contentsMousePressEvent(QMouseEvent * e)
             break;
 
             default:
-                DiagramView::contentsMousePressEvent(e);
+                DiagramView::mousePressEvent(e);
                 break;
             }
         }
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
 void ObjectDiagramView::dragEnterEvent(QDragEnterEvent * e)
@@ -174,10 +176,28 @@ void ObjectDiagramView::dragEnterEvent(QDragEnterEvent * e)
         e->ignore();
 }
 
+void ObjectDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+    if (!window()->frozen() &&
+        (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlClassInstance, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
+        e->accept();
+    else
+        e->ignore();
+}
 void ObjectDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
+   QPointF p = mapToScene(e->pos());
 
     if ((bn = UmlDrag::decode(e, UmlClassInstance)) != 0) {
         history_save();
@@ -246,8 +266,7 @@ void ObjectDiagramView::dropEvent(QDropEvent * e)
 void ObjectDiagramView::save(QTextStream & st, QString & warning,
                              bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
+    DiagramItemList items(canvas()->items());
 
     if (!copy)
         // sort is useless for a copy
@@ -257,8 +276,8 @@ void ObjectDiagramView::save(QTextStream & st, QString & warning,
 
     // save first the packages fragment, classes instances, notes, icons and text
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlPackage:
         case UmlFragment:
         case UmlClassInstance:
@@ -277,8 +296,8 @@ void ObjectDiagramView::save(QTextStream & st, QString & warning,
 
     // then save links
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        UmlCode k = di->type();
+    foreach (DiagramItem *di, items) {
+        UmlCode k = di->typeUmlCode();
 
         if (IsaRelation(k) || (k == UmlObjectLink)) {
             if (!copy || di->copyable())
@@ -288,8 +307,8 @@ void ObjectDiagramView::save(QTextStream & st, QString & warning,
 
     // then save anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    foreach (DiagramItem *di, items)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
 
     if (!copy && (preferred_zoom != 0)) {
diff --git a/src/diagram/ObjectDiagramView.h b/src/diagram/ObjectDiagramView.h
index 3aefb253e..f204c3e01 100644
--- a/src/diagram/ObjectDiagramView.h
+++ b/src/diagram/ObjectDiagramView.h
@@ -42,12 +42,14 @@ class OperationData;
 
 class ObjectDiagramView : public DiagramView
 {
+    Q_OBJECT
+    
 public:
     ObjectDiagramView(QWidget * parent, UmlCanvas * canvas, int is);
 
-    virtual void menu(const QPoint &);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+    virtual void menu(const QPoint &) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
 private:
     ObjectDiagramWindow * window() const {
@@ -55,9 +57,10 @@ class ObjectDiagramView : public DiagramView
     };
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent *e) override;
 };
 
 #endif
diff --git a/src/diagram/ObjectDiagramWindow.cpp b/src/diagram/ObjectDiagramWindow.cpp
index a9c5cc725..1205ca965 100644
--- a/src/diagram/ObjectDiagramWindow.cpp
+++ b/src/diagram/ObjectDiagramWindow.cpp
@@ -30,10 +30,10 @@
 
 
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+#include <QMdiArea>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qspinbox.h>
 
@@ -44,6 +44,7 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
+#include "toolbarfactory.h"
 
 extern QString addmodeledclassinstanceText();
 extern QString addclassinstanceText();
@@ -53,7 +54,7 @@ extern QString noteText();
 extern QString anchorText();
 static QString linkText()
 {
-    return TR("Click this button to add a <i>link</i> between instances");
+    return  QObject::tr("Click this button to add a <i>link</i> between instances");
 }
 extern QString textText();
 extern QString imageText();
@@ -63,72 +64,74 @@ ObjectDiagramWindow::ObjectDiagramWindow(const QString & s, BrowserObjectDiagram
     : DiagramWindow(b, s), view(0)
 {
     b->set_diagram_window(this);
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "object diagram operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
+    QToolBar * toolbar = new QToolBar("object diagram operations", this);
+    toolbar->setMinimumHeight(50);
+    toolbar->setOrientation(Qt::Horizontal);
+    addToolBar(Qt::TopToolBarArea, toolbar);
 
     add_edit_button(toolbar);
 
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton, tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar, "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
+    select->setCheckable(TRUE);
+    select->setChecked(TRUE);
     current_button = UmlSelect;
 
     addPackage
-        = new QToolButton(*packageButton, TR("Add Package"), QString(),
+        = ToolBarFactory::createToolButton(*packageButton, tr("Add Package"), QString(),
                           this, SLOT(hit_package()), toolbar, "add package");
-    addPackage->setToggleButton(TRUE);
-    Q3WhatsThis::add(addPackage, addpackageText());
+    addPackage->setCheckable(TRUE);
+    addPackage->setWhatsThis(addpackageText());
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("Add Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton, tr("Add Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar, "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis(addfragmentText());
 
     addClassInstance
-        = new QToolButton(*classinstanceButton, TR("Add modeled Class instance"), QString(),
+        = ToolBarFactory::createToolButton(*classinstanceButton, tr("Add modeled Class instance"), QString(),
                           this, SLOT(hit_classinstance()), toolbar,
                           "add modeled class instance");
-    addClassInstance->setToggleButton(TRUE);
-    Q3WhatsThis::add(addClassInstance, addmodeledclassinstanceText());
+    addClassInstance->setCheckable(TRUE);
+    addClassInstance->setWhatsThis(addmodeledclassinstanceText());
 
     addClass
-        = new QToolButton(*classButton, TR("Add Class instance"), QString(),
+        = ToolBarFactory::createToolButton(*classButton, tr("Add Class instance"), QString(),
                           this, SLOT(hit_class()), toolbar, "add class instance");
-    addClass->setToggleButton(TRUE);
-    Q3WhatsThis::add(addClass, addclassinstanceText());
+    addClass->setCheckable(TRUE);
+    addClass->setWhatsThis(addclassinstanceText());
 
     addLink =
-        new QToolButton(*associationButton, TR("Add Link between instances"), QString(),
+        ToolBarFactory::createToolButton(*associationButton, tr("Add Link between instances"), QString(),
                         this, SLOT(hit_link()), toolbar, "add link between instances");
-    addLink->setToggleButton(TRUE);
-    Q3WhatsThis::add(addLink, linkText());
+    addLink->setCheckable(TRUE);
+    addLink->setWhatsThis(linkText());
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton, tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar, "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis(noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton, tr("Anchor"), QString(),
                         this, SLOT(hit_anchor()), toolbar, "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis(anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton, tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar, "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis(textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton, tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+    image->setWhatsThis(imageText());
 
     toolbar->addSeparator();
 
@@ -142,9 +145,9 @@ ObjectDiagramWindow::ObjectDiagramWindow(const QString & s, BrowserObjectDiagram
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
+    QMdiArea * w = UmlWindow::get_workspace();
 
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -183,18 +186,18 @@ void ObjectDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
 
-    select->setOn(FALSE);
-    addPackage->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    addClass->setOn(FALSE);
-    addClassInstance->setOn(FALSE);
-    addLink->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addPackage->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    addClass->setChecked(FALSE);
+    addClassInstance->setChecked(FALSE);
+    addLink->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/ObjectDiagramWindow.h b/src/diagram/ObjectDiagramWindow.h
index cf453b97f..60346b174 100644
--- a/src/diagram/ObjectDiagramWindow.h
+++ b/src/diagram/ObjectDiagramWindow.h
@@ -56,9 +56,9 @@ class ObjectDiagramWindow : public DiagramWindow
     ObjectDiagramWindow(const QString & s, BrowserObjectDiagram *, int id = -1);
     virtual ~ObjectDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_class();
diff --git a/src/diagram/ObjectLinkCanvas.cpp b/src/diagram/ObjectLinkCanvas.cpp
index 0ba81f98b..40ef1adac 100644
--- a/src/diagram/ObjectLinkCanvas.cpp
+++ b/src/diagram/ObjectLinkCanvas.cpp
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QTextStream>
 #include <math.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 
 #include "ObjectLinkCanvas.h"
 #include "ArrowPointCanvas.h"
@@ -141,14 +141,14 @@ void ObjectLinkCanvas::set_relation(RelationData * d)
 
         ObjectLinkCanvas * a = this;
 
-        while (a->begin->type() == UmlArrowPoint) {
+        while (a->begin->typeUmlCode() == UmlArrowPoint) {
             a = (ObjectLinkCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
             a->internal_set_relation(d);
         }
 
         ObjectLinkCanvas * z = this;
 
-        while (z->end->type() == UmlArrowPoint) {
+        while (z->end->typeUmlCode() == UmlArrowPoint) {
             z = (ObjectLinkCanvas *)((ArrowPointCanvas *) z->end)->get_other(z);
             z->internal_set_relation(d);
         }
@@ -162,10 +162,10 @@ void ObjectLinkCanvas::update_pos()
     ArrowCanvas::update_pos();
 
     if (auto_pos) {
-        if ((role_a != 0) && !role_a->selected())
+        if ((role_a != 0) && !role_a->isSelected())
             role_a_default_position();
 
-        if ((role_b != 0) && !role_b->selected())
+        if ((role_b != 0) && !role_b->isSelected())
             role_b_default_position();
     }
 
@@ -187,10 +187,10 @@ void ObjectLinkCanvas::moveBy(double dx, double dy)
 {
     ArrowCanvas::moveBy(dx, dy);
 
-    if ((role_a != 0) && !role_a->selected())
+    if ((role_a != 0) && !role_a->isSelected())
         role_a->moveBy(dx, dy);
 
-    if ((role_b != 0) && !role_b->selected())
+    if ((role_b != 0) && !role_b->isSelected())
         role_b->moveBy(dx, dy);
 }
 
@@ -199,10 +199,10 @@ void ObjectLinkCanvas::set_z(double z)
     ArrowCanvas::set_z(z);
 
     if (role_a != 0)
-        role_a->setZ(z);
+        role_a->setZValue(z);
 
     if (role_b != 0)
-        role_b->setZ(z);
+        role_b->setZValue(z);
 }
 
 void ObjectLinkCanvas::select_associated()
@@ -214,27 +214,27 @@ void ObjectLinkCanvas::select_associated()
     ObjectLinkCanvas * rel = this;
 
     // goes to the beginning of the (broken) line
-    while (rel->begin->type() == UmlArrowPoint)
+    while (rel->begin->typeUmlCode() == UmlArrowPoint)
         rel = ((ObjectLinkCanvas *)((ArrowPointCanvas *) rel->begin)->get_other(rel));
 
     rel->begin->select_associated();
 
     for (;;) {
         // select labels
-        if ((rel->role_a != 0) && !rel->role_a->selected())
+        if ((rel->role_a != 0) && !rel->role_a->isSelected())
             the_canvas()->select(rel->role_a);
 
-        if ((rel->role_b != 0) && !rel->role_b->selected())
+        if ((rel->role_b != 0) && !rel->role_b->isSelected())
             the_canvas()->select(rel->role_b);
 
-        if (! rel->selected())
+        if (! rel->isSelected())
             the_canvas()->select(rel);
 
         // goes forward
-        if (rel->end->type() != UmlArrowPoint)
+        if (rel->end->typeUmlCode() != UmlArrowPoint)
             break;
 
-        if (!((ArrowPointCanvas *) rel->end)->selected())
+        if (!((ArrowPointCanvas *) rel->end)->isSelected())
             the_canvas()->select((ArrowPointCanvas *) rel->end);
 
         rel = (ObjectLinkCanvas *)((ArrowPointCanvas *) rel->end)->get_other(rel);
@@ -254,25 +254,25 @@ void ObjectLinkCanvas::open()
     ObjectLinkCanvas * first = this;
     ObjectLinkCanvas * last = this;
 
-    while (first->begin->type() == UmlArrowPoint)
+    while (first->begin->typeUmlCode() == UmlArrowPoint)
         first = ((ObjectLinkCanvas *)((ArrowPointCanvas *) first->begin)->get_other(first));
 
-    while (last->end->type() == UmlArrowPoint)
+    while (last->end->typeUmlCode() == UmlArrowPoint)
         last = (ObjectLinkCanvas *)((ArrowPointCanvas *) last->end)->get_other(last);
 
     // compute all compatible relations in the two directions
-    Q3PtrList<RelationData> l;
+    QList<RelationData *> l;
     int nfirstdir;
 
     ((BrowserClass *)((OdClassInstCanvas *) first->begin)->get_type())
-    ->get_rels((BrowserClass *)((OdClassInstCanvas *) last->end)->get_type(),
-               l, &nfirstdir);
+            ->get_rels((BrowserClass *)((OdClassInstCanvas *) last->end)->get_type(),
+                       l, &nfirstdir);
 
     // dialog
     BrowserClassInstance * a =
-        (BrowserClassInstance *) first->begin->get_bn();
+            (BrowserClassInstance *) first->begin->get_bn();
     BrowserClassInstance * b =
-        (BrowserClassInstance *) last->end->get_bn();
+            (BrowserClassInstance *) last->end->get_bn();
     ObjectLinkDialog dialog(a, b, l, data, nfirstdir);
 
     if (dialog.exec() == QDialog::Accepted) {
@@ -309,13 +309,12 @@ void ObjectLinkCanvas::open()
 
         // already drawn ?
         if ((choozen != 0) &&
-            ((OdClassInstCanvas *) first->begin)
-            ->is_duplicated(first, (OdClassInstCanvas *) last->end)) {
+                ((OdClassInstCanvas *) first->begin)
+                ->is_duplicated(first, (OdClassInstCanvas *) last->end)) {
             // already drawn
-            msg_warning("Douml", TR("Relation already drawn"));
+            msg_warning("Douml", tr("Relation already drawn"));
             set_relation(0);
         }
-
         first->modified();	// to update role label
 
         if (first != last)
@@ -339,15 +338,15 @@ void ObjectLinkCanvas::delete_available(BooL & in_model, BooL & out_model) const
         const ObjectLinkCanvas * first = this;
         const ObjectLinkCanvas * last = this;
 
-        while (first->begin->type() == UmlArrowPoint)
+        while (first->begin->typeUmlCode() == UmlArrowPoint)
             first = ((ObjectLinkCanvas *)((ArrowPointCanvas *) first->begin)->get_other(first));
 
-        while (last->end->type() == UmlArrowPoint)
+        while (last->end->typeUmlCode() == UmlArrowPoint)
             last = (ObjectLinkCanvas *)((ArrowPointCanvas *) last->end)->get_other(last);
 
         if (data->get_end())
             in_model |= first->begin->get_bn()->is_writable() &&
-                        last->end->get_bn()->is_writable();
+                    last->end->get_bn()->is_writable();
         else
             in_model |= first->begin->get_bn()->is_writable();
     }
@@ -360,7 +359,7 @@ void ObjectLinkCanvas::remove(bool from_model)
             if (the_canvas()->must_draw_all_relations()) {
                 const ObjectLinkCanvas * a = this;
 
-                while (a->begin->type() == UmlArrowPoint) {
+                while (a->begin->typeUmlCode() == UmlArrowPoint) {
                     a = (ObjectLinkCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
                     if (a == 0)
@@ -370,7 +369,7 @@ void ObjectLinkCanvas::remove(bool from_model)
                 if (a && !a->begin->isSelected() && !a->begin->get_bn()->deletedp()) {
                     a = this;
 
-                    while (a->end->type() == UmlArrowPoint) {
+                    while (a->end->typeUmlCode() == UmlArrowPoint) {
                         a = (ObjectLinkCanvas *)((ArrowPointCanvas *) a->end)->get_other(a);
 
                         if (a == 0)
@@ -378,7 +377,7 @@ void ObjectLinkCanvas::remove(bool from_model)
                     }
 
                     if (a && !a->end->isSelected() && !a->end->get_bn()->deletedp()) {
-                        msg_warning("Douml", TR("<i>Draw all relations</i> forced to <i>no</i>"));
+                        msg_warning("Douml", tr("<i>Draw all relations</i> forced to <i>no</i>"));
                         the_canvas()->dont_draw_all_relations();
                     }
                 }
@@ -388,14 +387,14 @@ void ObjectLinkCanvas::remove(bool from_model)
             ObjectLinkCanvas * first = this;
             ObjectLinkCanvas * last = this;
 
-            while (first->begin->type() == UmlArrowPoint)
+            while (first->begin->typeUmlCode() == UmlArrowPoint)
                 first = ((ObjectLinkCanvas *)((ArrowPointCanvas *) first->begin)->get_other(first));
 
-            while (last->end->type() == UmlArrowPoint)
+            while (last->end->typeUmlCode() == UmlArrowPoint)
                 last = (ObjectLinkCanvas *)((ArrowPointCanvas *) last->end)->get_other(last);
 
             ClassInstanceData * d = (ClassInstanceData *)
-                                    first->begin->get_bn()->get_data();
+                    first->begin->get_bn()->get_data();
 
             d->replace((BrowserClassInstance *) last->end->get_bn(),
                        data, 0, TRUE, TRUE);
@@ -428,45 +427,45 @@ void ObjectLinkCanvas::menu(const QPoint & lpos)
     const ObjectLinkCanvas * first = this;
     const ObjectLinkCanvas * last = this;
 
-    while (first->begin->type() == UmlArrowPoint)
+    while (first->begin->typeUmlCode() == UmlArrowPoint)
         first = ((ObjectLinkCanvas *)((ArrowPointCanvas *) first->begin)->get_other(first));
 
-    while (last->end->type() == UmlArrowPoint)
+    while (last->end->typeUmlCode() == UmlArrowPoint)
         last = (ObjectLinkCanvas *)((ArrowPointCanvas *) last->end)->get_other(last);
 
     bool prefer_start =
-        (lpos - first->beginp).manhattanLength() >
-        (lpos - last->endp).manhattanLength();
-    Q3PopupMenu m(0);
-    Q3PopupMenu geo(0);
+            (lpos - first->beginp).manhattanLength() >
+            (lpos - last->endp).manhattanLength();
+    QMenu m(0);
+    QMenu geo(0);
     //QPopupMenu toolm(0);
 
-    MenuFactory::createTitle(m, TR("Object link"));
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 0);
-    m.insertSeparator();
+    MenuFactory::createTitle(m, tr("Object link"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 0);
+    m.addSeparator();
 
     if (data != 0)
-        m.insertItem(TR("Select relation in browser"), 2);
+        MenuFactory::addItem(m, tr("Select relation in browser"), 2);
 
     if (plabel || pstereotype || first->role_b || last->role_a) {
-        m.insertItem(TR("Select labels"), 3);
-        m.insertItem(TR("Labels default position"), 4);
+        MenuFactory::addItem(m, tr("Select labels"), 3);
+        MenuFactory::addItem(m, tr("Labels default position"), 4);
 
         if (plabel && (label == 0))
-            m.insertItem(TR("Attach relation's name to this segment"), 5);
+            MenuFactory::addItem(m, tr("Attach relation's name to this segment"), 5);
 
         if (pstereotype && (stereotype == 0))
-            m.insertItem(TR("Attach relation's stereotype to this segment"), 6);
+            MenuFactory::addItem(m, tr("Attach relation's stereotype to this segment"), 6);
     }
 
     if (get_start() != get_end()) {
         init_geometry_menu(geo, 10);
-        m.insertItem(TR("Geometry (Ctrl+l)"), &geo);
+        MenuFactory::insertItem(m, tr("Geometry (Ctrl+l)"), &geo);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     BooL in_model = FALSE;
     BooL out_model = FALSE;
@@ -474,103 +473,107 @@ void ObjectLinkCanvas::menu(const QPoint & lpos)
     delete_available(in_model, out_model);
 
     if (in_model)
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
     /*
     if (Tool::menu_insert(&toolm, itstype, 20))
       m.insertItem("Tool", &toolm);
     */
 
-    int rank = m.exec(QCursor::pos());
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int rank = retAction->data().toInt();
 
-    switch (rank) {
-    case 0:
-        open();	// call package_modified
-        return;
+        switch (rank) {
+        case 0:
+            open();	// call package_modified
+            return;
 
-    case 2:
-        data->select_in_browser(prefer_start);
-        return;
+        case 2:
+            data->select_in_browser(prefer_start);
+            return;
 
-    case 3:
-        the_canvas()->unselect_all();
+        case 3:
+            the_canvas()->unselect_all();
 
-        if (plabel)
-            the_canvas()->select(plabel->label);
+            if (plabel)
+                the_canvas()->select(plabel->label);
 
-        if (pstereotype)
-            the_canvas()->select(pstereotype->stereotype);
+            if (pstereotype)
+                the_canvas()->select(pstereotype->stereotype);
 
-        if (last->role_a)
-            the_canvas()->select(last->role_a);
+            if (last->role_a)
+                the_canvas()->select(last->role_a);
 
-        if (first->role_b)
-            the_canvas()->select(first->role_b);
+            if (first->role_b)
+                the_canvas()->select(first->role_b);
 
-        return;
+            return;
 
-    case 4:
-        if (plabel)
-            plabel->default_label_position();
+        case 4:
+            if (plabel)
+                plabel->default_label_position();
 
-        if (pstereotype)
-            pstereotype->default_stereotype_position();
+            if (pstereotype)
+                pstereotype->default_stereotype_position();
 
-        if (last->role_a != 0)
-            last->role_a_default_position();
+            if (last->role_a != 0)
+                last->role_a_default_position();
 
-        if (first->role_b != 0)
-            first->role_b_default_position();
+            if (first->role_b != 0)
+                first->role_b_default_position();
 
-        break;
+            break;
 
-    case 5:
-        label = plabel->label;
-        plabel->label = 0;
-        default_label_position();
-        break;
+        case 5:
+            label = plabel->label;
+            plabel->label = 0;
+            default_label_position();
+            break;
 
-    case 6:
-        stereotype = pstereotype->stereotype;
-        pstereotype->stereotype = 0;
-        default_stereotype_position();
-        break;
+        case 6:
+            stereotype = pstereotype->stereotype;
+            pstereotype->stereotype = 0;
+            default_stereotype_position();
+            break;
 
-    case 7:
-        // not removed from the browser : just hide it
-        remove(FALSE);
-        break;
+        case 7:
+            // not removed from the browser : just hide it
+            remove(FALSE);
+            break;
 
-    case 8:
-        remove(TRUE);
-        break;
+        case 8:
+            remove(TRUE);
+            break;
 
-    default:
+        default:
 
-        /*
+            /*
         if (rank >= 20) {
           ToolCom::run(Tool::command(rank - 20),
-        	   ((prefer_start || RelationData::uni_directional(itstype))
-        	    ? data->get_start()
-        	    : data->get_end()));
+               ((prefer_start || RelationData::uni_directional(itstype))
+                ? data->get_start()
+                : data->get_end()));
           return;
         }
         else*/
-        if (rank >= 10) {
-            rank -= 10;
-
-            if (rank == RecenterBegin)
-                set_decenter(-1.0, decenter_end);
-            else if (rank == RecenterEnd)
-                set_decenter(decenter_begin, -1.0);
-            else if (rank != (int) geometry)
-                set_geometry((LineGeometry) rank, TRUE);
+            if (rank >= 10) {
+                rank -= 10;
+
+                if (rank == RecenterBegin)
+                    set_decenter(-1.0, decenter_end);
+                else if (rank == RecenterEnd)
+                    set_decenter(decenter_begin, -1.0);
+                else if (rank != (int) geometry)
+                    set_geometry((LineGeometry) rank, TRUE);
+                else
+                    return;
+            }
             else
                 return;
         }
-        else
-            return;
     }
 
     package_modified();
@@ -583,14 +586,14 @@ void ObjectLinkCanvas::menu(const QPoint & lpos)
 ArrowPointCanvas * ObjectLinkCanvas::brk(const QPoint & p)
 {
     ArrowPointCanvas * ap =
-        new ArrowPointCanvas(the_canvas(), p.x(), p.y());
+            new ArrowPointCanvas(the_canvas(), p.x(), p.y());
 
-    ap->setZ(z() + 1);
+    ap->setZValue(zValue() + 1);
 
     ObjectLinkCanvas * other =
-        // do not give data to not call update()
-        new ObjectLinkCanvas(the_canvas(), ap, end, UmlObjectLink, 0,
-                             decenter_begin, decenter_end, 0);
+            // do not give data to not call update()
+            new ObjectLinkCanvas(the_canvas(), ap, end, UmlObjectLink, 0,
+                                 decenter_begin, decenter_end, 0);
 
     if (data != 0) {
         other->data = data;
@@ -624,7 +627,7 @@ ArrowCanvas * ObjectLinkCanvas::join(ArrowCanvas * other, ArrowPointCanvas * ap)
 
 void ObjectLinkCanvas::modified()
 {
-    if (visible()) {
+    if (isVisible()) {
         hide();
         update(TRUE);
         show();
@@ -642,7 +645,7 @@ void ObjectLinkCanvas::update(bool updatepos)
 
         s = data->get_role_a();
 
-        if (s.isEmpty() || (end->type() == UmlArrowPoint)) {
+        if (s.isEmpty() || (end->typeUmlCode() == UmlArrowPoint)) {
             // relation does not have role_a name or it must be hidden
             if (role_a != 0) {
                 the_canvas()->del(role_a);
@@ -664,8 +667,8 @@ void ObjectLinkCanvas::update(bool updatepos)
         s = data->get_role_b();
 
         if (s.isEmpty() ||
-            RelationData::uni_directional(itstype) ||
-            (begin->type() == UmlArrowPoint)) {
+                RelationData::uni_directional(itstype) ||
+                (begin->typeUmlCode() == UmlArrowPoint)) {
             // relation does not have role_b name
             if (role_b != 0) {
                 the_canvas()->del(role_b);
@@ -710,11 +713,11 @@ void ObjectLinkCanvas::update(bool updatepos)
                 plabel->label = 0;
             }
         }
-        else if ((plabel == 0) && (begin->type() != UmlArrowPoint)) {
+        else if ((plabel == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
             // adds relation's name
             label =
-                new LabelCanvas(s, the_canvas(), c.x() - fm.width(s) / 2,
-                                c.y() - h, FALSE, TRUE, FALSE);
+                    new LabelCanvas(s, the_canvas(), c.x() - fm.width(s) / 2,
+                                    c.y() - h, FALSE, TRUE, FALSE);
             default_label_position();
         }
         else if ((plabel != 0) && (plabel->label->get_name() != s)) {
@@ -736,12 +739,12 @@ void ObjectLinkCanvas::update(bool updatepos)
             }
         }
         else {
-            s = toUnicode(s);
+            s = toUnicode(s.toLatin1().constData());
 
             if (s[0] != '{')
                 s = QString("<<") + s + ">>";
 
-            if ((pstereotype == 0) && (begin->type() != UmlArrowPoint)) {
+            if ((pstereotype == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
                 // adds relation's stereotype
                 stereotype = new LabelCanvas(s, the_canvas(), 0, 0);
                 default_stereotype_position();
@@ -786,7 +789,7 @@ void ObjectLinkCanvas::check()
         return;
 
     if (!((ClassInstanceData *) get_start()->get_bn()->get_data())
-        ->exist((BrowserClassInstance *) get_end()->get_bn(), data)) {
+            ->exist((BrowserClassInstance *) get_end()->get_bn(), data)) {
         set_relation(0);
         package_modified();
     }
@@ -799,18 +802,18 @@ void ObjectLinkCanvas::role_a_default_position() const
     int dx = endp.x() - beginp.x();
     int dy = endp.y() - beginp.y();
 
-    if (fabs(dx) >= fabs(dy)) {
+    if (fabs((double)dx) >= fabs((double)dy)) {
         // horizontal line
         if (dx == 0) dx = 1;
 
         if (dx > 0) {
             int w = fm.width(data->get_role_a());
 
-            role_a->move(endp.x() - w - ARROW_LENGTH,
+            role_a->moveBy(endp.x() - w - ARROW_LENGTH,
                          endp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
         }
         else
-            role_a->move(endp.x() + ARROW_LENGTH,
+            role_a->moveBy(endp.x() + ARROW_LENGTH,
                          endp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
     }
     else {
@@ -818,10 +821,10 @@ void ObjectLinkCanvas::role_a_default_position() const
         if (dy == 0) dy = 1;
 
         if (dy > 0)
-            role_a->move(endp.x() + ARROW_LENGTH - (dx * h / 2) / dy,
+            role_a->moveBy(endp.x() + ARROW_LENGTH - (dx * h / 2) / dy,
                          endp.y() - 4 * h / 3);
         else
-            role_a->move(endp.x() + ARROW_LENGTH + (dx * h / 2) / dy,
+            role_a->moveBy(endp.x() + ARROW_LENGTH + (dx * h / 2) / dy,
                          endp.y() + h / 2);
     }
 
@@ -835,17 +838,17 @@ void ObjectLinkCanvas::role_b_default_position() const
     int dx = endp.x() - beginp.x();
     int dy = endp.y() - beginp.y();
 
-    if (fabs(dx) >= fabs(dy)) {
+    if (fabs((double)dx) >= fabs((double)dy)) {
         // horizontal line
         if (dx == 0) dx = 1;
 
         if (dx > 0)
-            role_b->move(beginp.x() + ARROW_LENGTH,
+            role_b->moveBy(beginp.x() + ARROW_LENGTH,
                          beginp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
         else {
             int w = fm.width(data->get_role_b());
 
-            role_b->move(beginp.x() - w - ARROW_LENGTH,
+            role_b->moveBy(beginp.x() - w - ARROW_LENGTH,
                          beginp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
         }
     }
@@ -854,10 +857,10 @@ void ObjectLinkCanvas::role_b_default_position() const
         if (dy == 0) dy = 1;
 
         if (dy > 0)
-            role_b->move(beginp.x() + ARROW_LENGTH + (dx * h / 2) / dy,
+            role_b->moveBy(beginp.x() + ARROW_LENGTH + (dx * h / 2) / dy,
                          beginp.y() + h / 2);
         else
-            role_b->move(beginp.x() + ARROW_LENGTH - (dx * h / 2) / dy,
+            role_b->moveBy(beginp.x() + ARROW_LENGTH - (dx * h / 2) / dy,
                          beginp.y() - 4 * h / 3);
     }
 
@@ -879,7 +882,7 @@ void ObjectLinkCanvas::save(QTextStream & st, bool ref, QString & warning) const
     if (ref)
         st << "objectlinkcanvas_ref " << get_ident()
            << " // " << data->get_name();
-    else if (begin->type() != UmlArrowPoint) {
+    else if (begin->typeUmlCode() != UmlArrowPoint) {
         // relation canvas start
         nl_indent(st);
         st << "objectlinkcanvas " << get_ident();
@@ -914,7 +917,7 @@ void ObjectLinkCanvas::save(QTextStream & st, bool ref, QString & warning) const
         }
 
         const ObjectLinkCanvas * last =
-            (const ObjectLinkCanvas *) ArrowCanvas::save_lines(st, TRUE, TRUE, warning);
+                (const ObjectLinkCanvas *) ArrowCanvas::save_lines(st, TRUE, TRUE, warning);
 
         nl_indent(st);
 
@@ -1021,7 +1024,7 @@ ObjectLinkCanvas * ObjectLinkCanvas::read(char *& st, UmlCanvas * canvas, char *
                     label = 0;
                 }
                 else
-                    label->setZ(z);
+                    label->setZValue(z);
 
                 k = read_keyword(st);
             }
@@ -1044,7 +1047,7 @@ ObjectLinkCanvas * ObjectLinkCanvas::read(char *& st, UmlCanvas * canvas, char *
                         s = QString("<<") + s + ">>";
 
                     stereotype = new LabelCanvas(s, canvas, x, y);
-                    stereotype->setZ(read_double(st));
+                    stereotype->setZValue(read_double(st));
                 }
 
                 k = read_keyword(st);
@@ -1089,7 +1092,7 @@ ObjectLinkCanvas * ObjectLinkCanvas::read(char *& st, UmlCanvas * canvas, char *
 
             result->show();
 
-            if (di->type() != UmlArrowPoint)
+            if (di->typeUmlCode() != UmlArrowPoint)
                 break;
 
             bi = di;
@@ -1114,7 +1117,7 @@ ObjectLinkCanvas * ObjectLinkCanvas::read(char *& st, UmlCanvas * canvas, char *
 
                 if (!unamed && !s.isEmpty()) {
                     result->role_a = new LabelCanvas(s, canvas, x, y);
-                    result->role_a->setZ(z);
+                    result->role_a->setZValue(z);
                     result->role_a->show();
                 }
             }
@@ -1134,7 +1137,7 @@ ObjectLinkCanvas * ObjectLinkCanvas::read(char *& st, UmlCanvas * canvas, char *
 
                 if (!unamed && !s.isEmpty()) {
                     first->role_b = new LabelCanvas(s, canvas, x, y);
-                    first->role_b->setZ(z);
+                    first->role_b->setZValue(z);
                     first->role_b->show();
                 }
             }
@@ -1157,7 +1160,7 @@ ObjectLinkCanvas * ObjectLinkCanvas::read(char *& st, UmlCanvas * canvas, char *
             else
                 // add relation
                 ((ClassInstanceData *) first->begin->get_bn()->get_data())
-                ->add((BrowserClassInstance *) result->end->get_bn(), rd);
+                    ->add((BrowserClassInstance *) result->end->get_bn(), rd);
         }
 
         result->setVisible(TRUE);
@@ -1191,6 +1194,6 @@ void ObjectLinkCanvas::history_load(QBuffer & b)
 
 void ObjectLinkCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     unconnect();
 }
diff --git a/src/diagram/ObjectLinkCanvas.h b/src/diagram/ObjectLinkCanvas.h
index 64ac85ec9..67fa36b6f 100644
--- a/src/diagram/ObjectLinkCanvas.h
+++ b/src/diagram/ObjectLinkCanvas.h
@@ -52,29 +52,29 @@ class ObjectLinkCanvas : public ArrowCanvas
                      RelationData * d = 0);
     virtual ~ObjectLinkCanvas();
 
-    virtual void delete_it();
-    virtual void unconnect();
+    virtual void delete_it() override;
+    virtual void unconnect() override;
 
-    virtual void history_save(QBuffer & b) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer & b) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void setVisible(bool yes);
-    virtual void moveBy(double dx, double dy);
-    virtual void set_z(double z);
-    virtual void select_associated();
+    virtual void setVisible(bool yes) override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void set_z(double z) override;
+    virtual void select_associated() override;
 
-    virtual void update_pos();
-    virtual ArrowPointCanvas * brk(const QPoint &);
-    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap);
+    virtual void update_pos() override;
+    virtual ArrowPointCanvas * brk(const QPoint &) override;
+    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap) override;
 
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static ObjectLinkCanvas * read(char *& st, UmlCanvas * canvas, char *);
 
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
     void label_default_position() const;
     void role_a_default_position() const;
@@ -88,11 +88,12 @@ class ObjectLinkCanvas : public ArrowCanvas
         return data;
     }
 
-    virtual bool represents(BrowserNode *);
+    virtual bool represents(BrowserNode *) override;
 
 protected:
     void internal_set_relation(RelationData * d);
     void set_relation(RelationData * d);
+    using DiagramItem::update;
     void update(bool updatepos);
 
 private slots:
diff --git a/src/diagram/OdClassInstCanvas.cpp b/src/diagram/OdClassInstCanvas.cpp
index af4be7a12..f24ade932 100644
--- a/src/diagram/OdClassInstCanvas.cpp
+++ b/src/diagram/OdClassInstCanvas.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "OdClassInstCanvas.h"
 #include "ObjectLinkCanvas.h"
@@ -117,8 +117,8 @@ void OdClassInstCanvas::compute_size()
     ClassInstanceData * data = (ClassInstanceData *) browser_node->get_data();
 
     used_color = (itscolor == UmlDefaultColor)
-                 ? canvas->browser_diagram()->get_color(UmlClass)
-                 : itscolor;
+            ? canvas->browser_diagram()->get_color(UmlClass)
+            : itscolor;
 
     switch (show_stereotype_properties) {
     case UmlYes:
@@ -160,8 +160,8 @@ void OdClassInstCanvas::compute_size()
     he = fm.height() + two + two;
 
     used_show_context_mode = (show_context_mode == DefaultShowContextMode)
-                             ? canvas->browser_diagram()->get_classinstshowmode()
-                             : show_context_mode;
+            ? canvas->browser_diagram()->get_classinstshowmode()
+            : show_context_mode;
 
     if (horiz)
         wi = fm.width(full_name());
@@ -176,10 +176,10 @@ void OdClassInstCanvas::compute_size()
             wi = w;
     }
 
-    const Q3ValueList<SlotAttr> & attributes = data->get_attributes();
+    const QList<SlotAttr> & attributes = data->get_attributes();
 
     if (! attributes.isEmpty()) {
-        Q3ValueList<SlotAttr>::ConstIterator it = attributes.begin();
+        QList<SlotAttr>::ConstIterator it = attributes.begin();
         QString egal = " = ";
 
         do {
@@ -206,7 +206,7 @@ void OdClassInstCanvas::compute_size()
     const int eight = (int)(8 * zoom);
 
     wi += (((ClassData *) data->get_class()->get_data())->get_is_active())
-          ? eight * 3 : eight;
+            ? eight * 3 : eight;
 
     int minw = (int)(zoom * CLASSINST_CANVAS_MIN_SIZE);
 
@@ -232,12 +232,10 @@ void OdClassInstCanvas::modified()
         if (the_canvas()->must_draw_all_relations())
             draw_all_relations();
 
-        Q3PtrListIterator<ArrowCanvas> it(lines);
-
-        for (; it.current(); ++it)
-            if (IsaRelation(it.current()->type()))
+        foreach (ArrowCanvas *canvas, lines)
+            if (IsaRelation(canvas->typeUmlCode()))
                 // useless to check UmlObjectLink ie unset link
-                ((ObjectLinkCanvas *) it.current())->check();
+                ((ObjectLinkCanvas *) canvas)->check();
 
         canvas()->update();
         package_modified();
@@ -252,17 +250,12 @@ void OdClassInstCanvas::post_loaded()
 
 bool OdClassInstCanvas::has_relation(const SlotRel & slot_rel) const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if (IsaRelation(it.current()->type()) &&
-            (((ObjectLinkCanvas *) it.current())
-             ->is(slot_rel, it.current()->get_start() == (DiagramItem *) this)))
+    foreach (ArrowCanvas *canvas, lines)
+        if (IsaRelation(canvas->typeUmlCode()) &&
+                (((ObjectLinkCanvas *) canvas)
+                 ->is(slot_rel, canvas->get_start() == (DiagramItem *) this)))
             return TRUE;
 
-        ++it;
-    }
-
     return FALSE;
 }
 
@@ -271,29 +264,24 @@ bool OdClassInstCanvas::is_duplicated(ObjectLinkCanvas * lnk,
                                       OdClassInstCanvas * other) const
 {
     RelationData * rel = lnk->get_rel();
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-    ArrowCanvas * ar;
 
-    while ((ar = it.current()) != 0) {
+    foreach (ArrowCanvas *ar, lines)
         if ((ar != lnk) &&
-            IsaRelation(ar->type()) &&
-            (((ObjectLinkCanvas *) ar)->get_rel() == rel) &&
-            (ar->get_end() == other))
+                IsaRelation(ar->typeUmlCode()) &&
+                (((ObjectLinkCanvas *) ar)->get_rel() == rel) &&
+                (ar->get_end() == other))
             return TRUE;
-        else
-            ++it;
-    }
 
     return FALSE;
 }
 
 void OdClassInstCanvas::draw_all_relations(OdClassInstCanvas * end)
 {
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     ClassInstanceData * d = (ClassInstanceData *) browser_node->get_data();
-    const Q3ValueList<SlotRel> & rels = d->get_relations();
-    Q3ValueList<SlotRel>::ConstIterator it_rel;
+    const QList<SlotRel> & rels = d->get_relations();
+    QList<SlotRel>::ConstIterator it_rel;
 
     for (it_rel = rels.begin(); it_rel != rels.end(); it_rel++) {
         const SlotRel & slot_rel = *it_rel;
@@ -311,9 +299,9 @@ void OdClassInstCanvas::draw_all_relations(OdClassInstCanvas * end)
                     DiagramItem * adi = QCanvasItemToDiagramItem(*cit);
 
                     if ((adi != 0) &&		// an uml canvas item
-                        (adi->type() == UmlClassInstance) &&
-                        (((OdClassInstCanvas *) adi)->browser_node == end_inst) &&
-                        ((((OdClassInstCanvas *) adi) == end) || (*cit)->visible())) {
+                            (adi->typeUmlCode() == UmlClassInstance) &&
+                            (((OdClassInstCanvas *) adi)->browser_node == end_inst) &&
+                            ((((OdClassInstCanvas *) adi) == end) || (*cit)->isVisible())) {
                         // other class canvas find
                         di = adi;
                         break;
@@ -326,27 +314,27 @@ void OdClassInstCanvas::draw_all_relations(OdClassInstCanvas * end)
                     (new ObjectLinkCanvas(the_canvas(), this, di,
                                           slot_rel.rel->get_type(),
                                           0, -1.0, -1.0, slot_rel.rel))
-                    ->show();
+                        ->show();
                 else
                     (new ObjectLinkCanvas(the_canvas(), di, this,
                                           slot_rel.rel->get_type(),
                                           0, -1.0, -1.0, slot_rel.rel))
-                    ->show();
+                        ->show();
             }
         }
     }
 
     if ((end == 0) &&
-        !DrawingSettings::just_modified() &&
-        !on_load_diagram()) {
+            !DrawingSettings::just_modified() &&
+            !on_load_diagram()) {
         for (cit = all.begin(); cit != all.end(); ++cit) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&	// an uml canvas item
-                (di->type() == UmlClassInstance) &&
-                (((OdClassInstCanvas *) di) != this) &&
-                !((OdClassInstCanvas *) di)->browser_node->deletedp() &&
-                ((OdClassInstCanvas *) di)->visible())
+                    (di->typeUmlCode() == UmlClassInstance) &&
+                    (((OdClassInstCanvas *) di) != this) &&
+                    !((OdClassInstCanvas *) di)->browser_node->deletedp() &&
+                    ((OdClassInstCanvas *) di)->isVisible())
                 ((OdClassInstCanvas *) di)->draw_all_relations(this);
         }
     }
@@ -354,10 +342,10 @@ void OdClassInstCanvas::draw_all_relations(OdClassInstCanvas * end)
 
 void OdClassInstCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     compute_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void OdClassInstCanvas::draw(QPainter & p)
@@ -371,6 +359,7 @@ void OdClassInstCanvas::draw(QPainter & p)
 
         QColor co = color(used_color);
         FILE * fp = svg();
+        QBrush backBrush = p.background();
 
         if (fp != 0)
             fputs("<g>\n", fp);
@@ -391,33 +380,34 @@ void OdClassInstCanvas::draw(QPainter & p)
 
                 if (fp != 0) {
                     fprintf(fp, "\t<rect fill=\"#%06x\" stroke=\"none\" stroke-opacity=\"1\""
-                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                             QColor(::Qt::darkGray).rgb() & 0xffffff,
                             r.right(), r.top() + shadow, shadow - 1, r.height() - 1 - 1);
 
                     fprintf(fp, "\t<rect fill=\"#%06x\" stroke=\"none\" stroke-opacity=\"1\""
-                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                             QColor(::Qt::darkGray).rgb() & 0xffffff,
                             r.left() + shadow, r.bottom(), r.width() - 1 - 1, shadow - 1);
                 }
             }
         }
 
-        p.setBackgroundColor(co);
+        backBrush.setColor(co);
+        p.setBackground(backBrush);
 
         if (used_color != UmlTransparent)
             p.fillRect(r, co);
 
         if (fp != 0)
             fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     svg_color(used_color),
                     r.x(), r.y(), r.width() - 1, r.height() - 1);
 
         p.drawRect(r);
 
         BrowserClass * cl =
-            ((ClassInstanceData *) browser_node->get_data())->get_class();
+                ((ClassInstanceData *) browser_node->get_data())->get_class();
 
         if (((ClassData *) cl->get_data())->get_is_active()) {
             const int eight = (int)(8 * zoom);
@@ -476,8 +466,8 @@ void OdClassInstCanvas::draw(QPainter & p)
 
         p.setFont(the_canvas()->get_font(UmlNormalFont));
 
-        const Q3ValueList<SlotAttr> & attributes =
-            ((ClassInstanceData *) browser_node->get_data())->get_attributes();
+        const QList<SlotAttr> & attributes =
+                ((ClassInstanceData *) browser_node->get_data())->get_attributes();
 
         if (!attributes.isEmpty()) {
             r.setTop(r.top() + he + two);
@@ -485,13 +475,13 @@ void OdClassInstCanvas::draw(QPainter & p)
 
             if (fp != 0)
                 fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                            " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                         r.left(), r.top(), r.right(), r.top());
 
             r.setTop(r.top() + two);
             r.setLeft(r.left() + (int)(4 * zoom));
 
-            Q3ValueList<SlotAttr>::ConstIterator it = attributes.begin();
+            QList<SlotAttr>::ConstIterator it = attributes.begin();
             QString egal = " = ";
 
             do {
@@ -517,7 +507,15 @@ void OdClassInstCanvas::draw(QPainter & p)
     }
 }
 
-UmlCode OdClassInstCanvas::type() const
+void OdClassInstCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode OdClassInstCanvas::typeUmlCode() const
 {
     return UmlClassInstance;
 }
@@ -537,7 +535,7 @@ void OdClassInstCanvas::set_name(const QString &)
 BrowserNode * OdClassInstCanvas::get_type() const
 {
     return ((ClassInstanceData *) browser_node->get_data())
-           ->get_class();
+            ->get_class();
 }
 
 // out of model case : never called
@@ -562,90 +560,94 @@ void OdClassInstCanvas::open()
 
 void OdClassInstCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
     MenuFactory::createTitle(m, full_name());
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 9);
-    m.insertItem(TR("Go down"), 10);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
-    m.insertItem(TR("Select class in browser"), 5);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 9);
+    MenuFactory::addItem(m, tr("Go down"), 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
+    MenuFactory::addItem(m, tr("Select class in browser"), 5);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 6);
+        MenuFactory::addItem(m, tr("Select linked items"), 6);
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
-
-    switch (m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();	// call package_modified
-        return;
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();	// call package_modified
+            return;
 
-    case 1:
-        lower();
-        modified();	// call package_modified
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified
+            return;
 
-    case 9:
-        z_up();
-        modified();	// call package_modified()
-        return;
+        case 9:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 10:
-        z_down();
-        modified();	// call package_modified()
-        return;
+        case 10:
+            z_down();
+            modified();	// call package_modified()
+            return;
 
-    case 2:
-        edit_drawing_settings();
-        return;
+        case 2:
+            edit_drawing_settings();
+            return;
 
-    case 3:
-        browser_node->open(TRUE);
-        return;
+        case 3:
+            browser_node->open(TRUE);
+            return;
 
-    case 4:
-        browser_node->select_in_browser();
-        return;
+        case 4:
+            browser_node->select_in_browser();
+            return;
 
-    case 5:
-        ((ClassInstanceData *) browser_node->get_data())
-        ->get_class()->select_in_browser();
-        return;
+        case 5:
+            ((ClassInstanceData *) browser_node->get_data())
+                    ->get_class()->select_in_browser();
+            return;
 
-    case 6:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 6:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    case 7:
-        delete_it();
-        package_modified();
-        return;
+        case 7:
+            delete_it();
+            package_modified();
+            return;
 
-    case 8:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 8:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    default:
-        return;
+        default:
+            return;
+        }
     }
 }
 
-void OdClassInstCanvas::apply_shortcut(QString s)
+void OdClassInstCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -679,13 +681,13 @@ void OdClassInstCanvas::edit_drawing_settings()
         StateSpecVector st((browser_node->get_type() != UmlClass) ? 3 : 2);
         ColorSpecVector co(1);
 
-        st[0].set(TR("write name:type \nhorizontally"), &write_horizontally);
-        st[1].set(TR("show class context"), &show_context_mode);
+        st[0].set(tr("write name:type \nhorizontally"), &write_horizontally);
+        st[1].set(tr("show class context"), &show_context_mode);
 
         if (browser_node->get_type() != UmlClass)
-            st[2].set(TR("show stereotypes \nproperties"), &show_stereotype_properties);
+            st[2].set(tr("show stereotypes \nproperties"), &show_stereotype_properties);
 
-        co[0].set(TR("class instance color"), &itscolor);
+        co[0].set(tr("class instance color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -706,7 +708,7 @@ bool OdClassInstCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void OdClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void OdClassInstCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(2);
@@ -715,30 +717,29 @@ void OdClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         ShowContextMode show_context_mode;
         UmlColor itscolor;
 
-        st[0].set(TR("write name:type \nhorizontally"), &write_horizontally);
-        st[1].set(TR("show class context"), &show_context_mode);
-        co[0].set(TR("class instance color"), &itscolor);
+        st[0].set(tr("write name:type \nhorizontally"), &write_horizontally);
+        st[1].set(tr("show class context"), &show_context_mode);
+        co[0].set(tr("class instance color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                OdClassInstCanvas *canvas = (OdClassInstCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((OdClassInstCanvas *) it.current())->write_horizontally =
-                        write_horizontally;
+                    canvas->write_horizontally =
+                            write_horizontally;
 
                 if (!st[1].name.isEmpty())
-                    ((OdClassInstCanvas *) it.current())->show_context_mode =
-                        show_context_mode;
+                    canvas->show_context_mode =
+                            show_context_mode;
 
                 if (!co[0].name.isEmpty())
-                    ((OdClassInstCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((OdClassInstCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();
             }
         }
 
@@ -747,20 +748,13 @@ void OdClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void OdClassInstCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void OdClassInstCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    OdClassInstCanvas * x = (OdClassInstCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        OdClassInstCanvas * o = (OdClassInstCanvas *) it.current();
-
-        o->write_horizontally = x->write_horizontally;
-        o->show_context_mode = x->show_context_mode;
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const OdClassInstCanvas * x = (const OdClassInstCanvas *) src;
+    write_horizontally = x->write_horizontally;
+    show_context_mode = x->show_context_mode;
+    itscolor = x->itscolor;
+    modified();
 }
 
 bool OdClassInstCanvas::get_show_stereotype_properties() const
@@ -804,10 +798,10 @@ QString OdClassInstCanvas::may_start(UmlCode &) const
 
 QString OdClassInstCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return ((dest->type() == UmlClassInstance)
+    return ((dest->typeUmlCode() == UmlClassInstance)
             ? ((l == UmlObjectLink) || (l == UmlAnchor) || IsaRelation(l))
             : (l == UmlAnchor))
-           ? QString() : TR("illegal");
+            ? QString() : tr("illegal");
 }
 
 void OdClassInstCanvas::connexion(UmlCode t, DiagramItem * dest, const QPoint &, const QPoint &)
@@ -851,7 +845,7 @@ void OdClassInstCanvas::save(QTextStream & st, bool ref, QString & warning) cons
 }
 
 OdClassInstCanvas * OdClassInstCanvas::read(char *& st, UmlCanvas * canvas,
-        char * k)
+                                            char * k)
 {
     if (!strcmp(k, "classinstance_ref"))
         return ((OdClassInstCanvas *) dict_get(read_id(st), "classinstance", canvas));
@@ -869,7 +863,7 @@ OdClassInstCanvas * OdClassInstCanvas::read(char *& st, UmlCanvas * canvas,
         Uml3States ho;
 
         if (!strcmp(k, "write_horizontally") ||
-            !strcmp(k, "write_horizontaly")) {
+                !strcmp(k, "write_horizontaly")) {
             ho = state(read_keyword(st));
             k = read_keyword(st);
         }
@@ -886,16 +880,16 @@ OdClassInstCanvas * OdClassInstCanvas::read(char *& st, UmlCanvas * canvas,
         read_keyword(st, "name");
 
         BrowserNode * parent =
-            canvas->browser_diagram()->container(UmlClass);
+                canvas->browser_diagram()->container(UmlClass);
         BrowserClassInstance * icl =
-            // create a new one, don't look at already exising instances
-            // contrarilly to the collaboration and sequence diagram
-            // because of attributes & relations
-            new BrowserClassInstance(read_string(st), cl, parent);
+                // create a new one, don't look at already exising instances
+                // contrarilly to the collaboration and sequence diagram
+                // because of attributes & relations
+                new BrowserClassInstance(read_string(st), cl, parent);
         OdClassInstCanvas * result =
-            new OdClassInstCanvas(icl, canvas, x, y, id);
+                new OdClassInstCanvas(icl, canvas, x, y, id);
 
-        result->setZ(z);
+        result->setZValue(z);
         result->itscolor = co;
         result->write_horizontally = ho;
         result->show_context_mode = noContext;
@@ -929,9 +923,9 @@ OdClassInstCanvas * OdClassInstCanvas::read(char *& st, UmlCanvas * canvas,
 
         int x = (int) read_double(st);
         OdClassInstCanvas * result =
-            new OdClassInstCanvas(icl, canvas, x, (int) read_double(st), id);
+                new OdClassInstCanvas(icl, canvas, x, (int) read_double(st), id);
 
-        result->setZ(read_double(st));
+        result->setZValue(read_double(st));
 
         result->ClassInstCanvas::read(st, k);
 
@@ -959,7 +953,7 @@ OdClassInstCanvas * OdClassInstCanvas::read(char *& st, UmlCanvas * canvas,
 
 void OdClassInstCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 
     BasicData * d = browser_node->get_data();
diff --git a/src/diagram/OdClassInstCanvas.h b/src/diagram/OdClassInstCanvas.h
index 4b83fcc69..aa83e98fd 100644
--- a/src/diagram/OdClassInstCanvas.h
+++ b/src/diagram/OdClassInstCanvas.h
@@ -56,52 +56,59 @@ class OdClassInstCanvas : public QObject, public DiagramCanvas,
                       int x, int y, int id);
     virtual ~OdClassInstCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
+    virtual void change_scale() override;
 
     void compute_size();
 
-    virtual UmlCode type() const;
-    virtual QString get_name() const;	// all cases
-    virtual void set_name(const QString & s);	// out of model case
-    virtual BrowserNode * get_type() const;	// return class, all cases
-    void set_type(BrowserNode * t);	// out of model case
-    virtual BrowserNodeList & get_types(BrowserNodeList &) const;
-    virtual BrowserNode * container(UmlCode) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual QString get_name() const override;	// all cases
+    virtual void set_name(const QString & s) override;	// out of model case
+    virtual BrowserNode * get_type() const override;	// return class, all cases
+    virtual void set_type(BrowserNode * t) override;	// out of model case
+    virtual BrowserNodeList & get_types(BrowserNodeList &) const override;
+    virtual BrowserNode * container(UmlCode) const override;
+
     virtual BrowserClassInstance * get_instance() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual bool move_with_its_package() const;
+
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual bool move_with_its_package() const override;
+
     virtual QString get_full_name() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
     void draw_all_relations(OdClassInstCanvas * end = 0);
+    using DiagramCanvas::has_relation;
     bool has_relation(const SlotRel &) const;
     bool is_duplicated(ObjectLinkCanvas * lnk,
                        OdClassInstCanvas * other) const;
 
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static OdClassInstCanvas * read(char *& , UmlCanvas * canvas, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
+protected:
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 private slots:
     void modified();	// canvas must be updated
     void deleted();	// the class is deleted
diff --git a/src/diagram/PackageCanvas.cpp b/src/diagram/PackageCanvas.cpp
index f5db4eab9..635491292 100644
--- a/src/diagram/PackageCanvas.cpp
+++ b/src/diagram/PackageCanvas.cpp
@@ -31,13 +31,14 @@
 
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QPixmap>
 
 #include "PackageCanvas.h"
 #include "SimpleRelationCanvas.h"
+
 #include "DiagramView.h"
 #include "PackageData.h"
 #include "BrowserPackage.h"
@@ -231,11 +232,11 @@ void PackageCanvas::change_scale()
 {
     double scale = the_canvas()->zoom();
 
-    Q3CanvasRectangle::setVisible(FALSE);
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    QGraphicsRectItem::setVisible(FALSE);
+    setRect(rect().x(), rect().y(),(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     check_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void PackageCanvas::draw(QPainter & p)
@@ -253,6 +254,7 @@ void PackageCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("<g>\n", fp);
 
+    QBrush backbrush = p.background();
     if (px != 0) {
         p.setBackgroundMode(::Qt::TransparentMode);
 
@@ -267,7 +269,7 @@ void PackageCanvas::draw(QPainter & p)
                     " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     svg_color(UmlBlack), lft, r.y(), px->width() - 1, px->height() - 1);
 
-        r.moveBy(0, px->height());
+        r.moveTo(0, px->height());
         p.setFont(the_canvas()->get_font(UmlNormalBoldFont));
         p.drawText(r, ::Qt::AlignHCenter, browser_node->get_name());
 
@@ -279,11 +281,12 @@ void PackageCanvas::draw(QPainter & p)
         p.setFont(the_canvas()->get_font(UmlNormalFont));
     }
     else {
-        QColor bckgrnd = p.backgroundColor();
+        QColor bckgrnd = p.background().color();
         QColor co = color(used_color);
 
         p.setBackgroundMode((used_color == UmlTransparent) ? ::Qt::TransparentMode : ::Qt::OpaqueMode);
-        p.setBackgroundColor(co);
+        backbrush.setColor(co);
+        p.setBackground(backbrush);
         p.setFont(the_canvas()->get_font(UmlNormalFont));
 
         QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
@@ -322,7 +325,7 @@ void PackageCanvas::draw(QPainter & p)
                         r.right(), r.top() + shadow, shadow - 1, r.height() - 1 - shadow - 1);
         }
 
-        const char * name = browser_node->get_name();
+        QString name = browser_node->get_name(); //.toLatin1().constData();
 
         if (in_tab) {
             p.drawText(r, ::Qt::AlignCenter, name);
@@ -410,7 +413,8 @@ void PackageCanvas::draw(QPainter & p)
             p.setFont(the_canvas()->get_font(UmlNormalFont));
         }
 
-        p.setBackgroundColor(bckgrnd);
+        backbrush.setColor(bckgrnd);
+        p.setBackground(backbrush);
     }
 
     if (fp != 0)
@@ -420,7 +424,15 @@ void PackageCanvas::draw(QPainter & p)
         show_mark(p, rect());
 }
 
-UmlCode PackageCanvas::type() const
+void PackageCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode PackageCanvas::typeUmlCode() const
 {
     return UmlPackage;
 }
@@ -472,50 +484,53 @@ void PackageCanvas::post_loaded()
 
 void PackageCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Add related elements"), 10);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Add related elements"), 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
             (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 9);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 9);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlPackage, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-    int rank = m.exec(QCursor::pos());
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    int rank = retAction->data().toInt();
 
     switch (rank) {
     case 0:
@@ -578,7 +593,7 @@ void PackageCanvas::menu(const QPoint &)
 
     case 10:
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("package"), TRUE, FALSE);
+        ->add_related_elements(this, tr("package"), TRUE, FALSE);
         return;
 
     default:
@@ -587,11 +602,12 @@ void PackageCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void PackageCanvas::apply_shortcut(QString s)
+void PackageCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -611,7 +627,7 @@ void PackageCanvas::apply_shortcut(QString s)
     }
     else if (s == "Add related elements") {
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("package"), TRUE, FALSE);
+        ->add_related_elements(this, tr("package"), TRUE, FALSE);
         return;
     }
     else {
@@ -629,10 +645,10 @@ void PackageCanvas::edit_drawing_settings()
         StateSpecVector st(3);
         ColorSpecVector co(1);
 
-        st[0].set(TR("name in tab"), &name_in_tab);
-        st[1].set(TR("show context"), &show_context_mode);
-        st[2].set(TR("show stereotype \nproperties"), &show_stereotype_properties);
-        co[0].set(TR("Package color"), &itscolor);
+        st[0].set(tr("name in tab"), &name_in_tab);
+        st[1].set(tr("show context"), &show_context_mode);
+        st[2].set(tr("show stereotype \nproperties"), &show_stereotype_properties);
+        co[0].set(tr("Package color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -651,7 +667,7 @@ bool PackageCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void PackageCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void PackageCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(3);
@@ -661,32 +677,31 @@ void PackageCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         ShowContextMode show_context_mode;
         UmlColor itscolor;
 
-        st[0].set(TR("name in tab"), &name_in_tab);
-        st[1].set(TR("show context"), &show_context_mode);
-        st[2].set(TR("show stereotype \nproperties"), &show_stereotype_properties);
-        co[0].set(TR("Package color"), &itscolor);
+        st[0].set(tr("name in tab"), &name_in_tab);
+        st[1].set(tr("show context"), &show_context_mode);
+        st[2].set(tr("show stereotype \nproperties"), &show_stereotype_properties);
+        co[0].set(tr("Package color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                PackageCanvas *canvas = (PackageCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((PackageCanvas *) it.current())->name_in_tab = name_in_tab;
+                    canvas->name_in_tab = name_in_tab;
 
                 if (!st[1].name.isEmpty())
-                    ((PackageCanvas *) it.current())->show_context_mode = show_context_mode;
+                    canvas->show_context_mode = show_context_mode;
 
                 if (!st[2].name.isEmpty())
-                    ((PackageCanvas *) it.current())->show_stereotype_properties = show_stereotype_properties;
+                    canvas->show_stereotype_properties = show_stereotype_properties;
 
                 if (!co[0].name.isEmpty())
-                    ((PackageCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((PackageCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();
             }
         }
 
@@ -695,21 +710,14 @@ void PackageCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void PackageCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void PackageCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    PackageCanvas * x = (PackageCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        PackageCanvas * o = (PackageCanvas *) it.current();
-
-        o->name_in_tab = x->name_in_tab;
-        o->show_context_mode = x->show_context_mode;
-        o->show_stereotype_properties = x->show_stereotype_properties;
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const PackageCanvas * x = (const PackageCanvas *) src;
+    name_in_tab = x->name_in_tab;
+    show_context_mode = x->show_context_mode;
+    show_stereotype_properties = x->show_stereotype_properties;
+    itscolor = x->itscolor;
+    modified();
 }
 
 bool PackageCanvas::get_show_stereotype_properties() const
@@ -733,17 +741,17 @@ QString PackageCanvas::may_start(UmlCode & l) const
         l = UmlDependOn;
 
     case UmlDependOn:
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlGeneralisation:
         l = UmlInherit;
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlAnchor:
         return 0;
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -752,7 +760,7 @@ QString PackageCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     if (l == UmlAnchor)
         return dest->may_start(l);
     else if (dest->get_bn() == 0)
-        return TR("illegal");
+        return tr("illegal");
     else
         return ((BrowserPackage *) browser_node)->may_connect(l, dest->get_bn());
 }
@@ -795,15 +803,15 @@ void PackageCanvas::prepare_for_move(bool on_resize)
     if (! on_resize) {
         DiagramCanvas::prepare_for_move(on_resize);
 
-        Q3CanvasItemList l = collisions(TRUE);
-        Q3CanvasItemList::ConstIterator it;
-        Q3CanvasItemList::ConstIterator end = l.end();
+        QList<QGraphicsItem*> l = collidingItems();
+        QList<QGraphicsItem*>::ConstIterator it;
+        QList<QGraphicsItem*>::ConstIterator end = l.end();
         DiagramItem * di;
         BrowserNode * p = get_bn();
 
         for (it = l.begin(); it != end; ++it) {
-            if ((*it)->visible() && // at least not deleted
-                !(*it)->selected() &&
+            if ((*it)->isVisible() && // at least not deleted
+                !(*it)->isSelected() &&
                 ((di = QCanvasItemToDiagramItem(*it)) != 0) &&
                 di->move_with_its_package()) {
                 BrowserNode * bn = di->get_bn();
@@ -923,7 +931,7 @@ PackageCanvas * PackageCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
 void PackageCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
     disconnect(browser_node->get_data(), 0, this, 0);
 }
@@ -947,7 +955,7 @@ void PackageCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
diff --git a/src/diagram/PackageCanvas.h b/src/diagram/PackageCanvas.h
index 9ceeaf737..e65e326a0 100644
--- a/src/diagram/PackageCanvas.h
+++ b/src/diagram/PackageCanvas.h
@@ -48,45 +48,47 @@ class PackageCanvas : public QObject, public DiagramCanvas
     UmlColor used_color;
     QString full_name;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     PackageCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y, int id);
     virtual ~PackageCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void prepare_for_move(bool on_resize);
-    virtual bool move_with_its_package() const;
-    virtual void change_scale();
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void prepare_for_move(bool on_resize) override;
+    virtual bool move_with_its_package() const override;
+    virtual void change_scale() override;
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static PackageCanvas * read(char *& , UmlCanvas * canvas, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
     void check_size();
     int min_width();
diff --git a/src/diagram/ParameterCanvas.cpp b/src/diagram/ParameterCanvas.cpp
index 1350f18fe..cfd3e4a61 100644
--- a/src/diagram/ParameterCanvas.cpp
+++ b/src/diagram/ParameterCanvas.cpp
@@ -32,11 +32,11 @@
 #include <math.h>
 
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "ParameterCanvas.h"
 #include "BrowserParameter.h"
@@ -69,7 +69,7 @@ ParameterCanvas::ParameterCanvas(BrowserNode * bn, UmlCanvas * canvas,
     if (id == 0) {
         // not on read
         update();
-        setZ(a->z() + 2);	// 2 to have lines upper activity's z
+        setZValue(a->zValue() + 2);	// 2 to have lines upper activity's z
 
         if (canvas->must_draw_all_relations())
             draw_all_flows();
@@ -150,13 +150,13 @@ void ParameterCanvas::update()
 
 void ParameterCanvas::check_position()
 {
-    QRect act_rect = act->rect();
+    QRect act_rect = act->sceneRect();
     QPoint ce = center();
 
-    double dxl = fabs(act_rect.left() - ce.x());
-    double dxr = fabs(act_rect.right() - ce.x());
-    double dyt = fabs(act_rect.top() - ce.y());
-    double dyb = fabs(act_rect.bottom() - ce.y());
+    double dxl = fabs((double)act_rect.left() - ce.x());
+    double dxr = fabs((double)act_rect.right() - ce.x());
+    double dyt = fabs((double)act_rect.top() - ce.y());
+    double dyb = fabs((double)act_rect.bottom() - ce.y());
 
     if ((dxr == 0) || (dxl == 0)) {
         if (ce.y() < act_rect.top())
@@ -235,15 +235,15 @@ void ParameterCanvas::change_scale()
 
 void ParameterCanvas::do_change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     double scale = the_canvas()->zoom();
 
-    setSize((int)(width_scale100 * scale) | 1,
+    setRect(0,0,(int)(width_scale100 * scale) | 1,
             (int)(height_scale100 * scale) | 1);
     recenter();
     // activity already in position, can check
     check_position();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void ParameterCanvas::moveBy(double dx, double dy)
@@ -276,7 +276,8 @@ void ParameterCanvas::draw(QPainter & p)
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
+    QBrush backBrush = p.background();
 
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode
@@ -289,7 +290,8 @@ void ParameterCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("<g>\n", fp);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
@@ -318,14 +320,23 @@ void ParameterCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("</g>\n", fp);
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode ParameterCanvas::type() const
+void ParameterCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ParameterCanvas::typeUmlCode() const
 {
     return UmlParameter;
 }
@@ -347,47 +358,50 @@ void ParameterCanvas::open()
 
 void ParameterCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
-    Q3ValueList<ParameterCanvas *> params = act->get_params();
+    QList<ParameterCanvas *> params = act->get_params();
     BrowserClass * cl =
         ((ParameterData *) browser_node->get_data())->get_type().type;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
 
     if (params.count() > 1)
-        m.insertItem(TR("Resize other like it"), 6);
+        MenuFactory::addItem(m, tr("Resize other like it"), 6);
 
-    m.insertSeparator();
-    m.insertItem(TR("Edit parameter"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit parameter"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (cl != 0)
-        m.insertItem(TR("Select class in browser"), 9);
+        MenuFactory::addItem(m, tr("Select class in browser"), 9);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlParameter, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction *retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index = retAction->data().toInt()) {
     case 0:
         act->upper();
         modified();	// call package_modified()
@@ -428,11 +442,11 @@ void ParameterCanvas::menu(const QPoint &)
     case 6: {
         int w = width();
         int h = height();
-        Q3ValueList<ParameterCanvas *>::Iterator iter;
+        QList<ParameterCanvas *>::Iterator iter;
 
         for (iter = params.begin(); iter != params.end(); ++iter) {
             if (*iter != this) {
-                (*iter)->setSize(w, h);
+                (*iter)->setRect(0,0,w, h);
                 (*iter)->recenter();
                 (*iter)->width_scale100 = width_scale100;
                 (*iter)->height_scale100 = height_scale100;
@@ -456,11 +470,12 @@ void ParameterCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void ParameterCanvas::apply_shortcut(QString s)
+void ParameterCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -492,7 +507,7 @@ void ParameterCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("parameter node color"), &itscolor);
+        co[0].set(tr("parameter node color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -511,24 +526,23 @@ bool ParameterCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ParameterCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ParameterCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("parameter node color"), &itscolor);
+        co[0].set(tr("parameter node color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((ParameterCanvas *) it.current())->itscolor = itscolor;
-                ((ParameterCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ParameterCanvas *canvas = (ParameterCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -537,18 +551,11 @@ void ParameterCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ParameterCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ParameterCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ParameterCanvas * x = (ParameterCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ParameterCanvas * o = (ParameterCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const ParameterCanvas * x = (const ParameterCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString ParameterCanvas::may_start(UmlCode & l) const
@@ -558,7 +565,7 @@ QString ParameterCanvas::may_start(UmlCode & l) const
         return ((BrowserParameter *) browser_node)->may_start();
 
     case UmlDependOn:
-        return TR("illegal");
+        return tr("illegal");
 
     default: // anchor
         return 0;
@@ -570,7 +577,7 @@ QString ParameterCanvas::may_connect(UmlCode & l, const DiagramItem * dest) cons
     if (l == UmlAnchor)
         return dest->may_start(l);
     else if (dest->get_bn() == 0)
-        return TR("illegal");
+        return tr("illegal");
     else
         return ((BrowserParameter *) browser_node)->may_connect(dest->get_bn());
 }
@@ -693,7 +700,7 @@ ParameterCanvas * ParameterCanvas::read(char *& st, UmlCanvas * canvas,
 
 void ParameterCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     disconnect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
@@ -718,7 +725,7 @@ void ParameterCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
diff --git a/src/diagram/ParameterCanvas.h b/src/diagram/ParameterCanvas.h
index 83411287b..f35201fc0 100644
--- a/src/diagram/ParameterCanvas.h
+++ b/src/diagram/ParameterCanvas.h
@@ -47,51 +47,53 @@ class ParameterCanvas : public QObject, public DiagramCanvas
     UmlColor itscolor;
     UmlColor used_color;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ParameterCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y,
                     int id, ActivityCanvas * a);
     virtual ~ParameterCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    void update();
+    virtual void update() override;
     void check_position();
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void change_scale();
-    virtual void moveBy(double dx, double dy);
-    virtual bool primaryItem() const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void change_scale() override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual bool primaryItem() const override;
     void do_moveBy(double dx, double dy);
     void do_change_scale();
 
     bool activity_selected() const;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static ParameterCanvas * read(char *& , UmlCanvas *, char *, ActivityCanvas *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/ParameterSetCanvas.cpp b/src/diagram/ParameterSetCanvas.cpp
index 8663e76e8..a78533221 100644
--- a/src/diagram/ParameterSetCanvas.cpp
+++ b/src/diagram/ParameterSetCanvas.cpp
@@ -32,11 +32,11 @@
 #include <math.h>
 
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 #include "ParameterSetCanvas.h"
 #include "BrowserParameterSet.h"
@@ -66,7 +66,7 @@ ParameterSetCanvas::ParameterSetCanvas(BrowserNode * bn, UmlCanvas * canvas,
     if (id == 0) {
         // not on read
         update();
-        setZ(a->z());  // note : pins have z+2 to be upper the parameter sets with their lines
+        setZValue(a->zValue());  // note : pins have z+2 to be upper the parameter sets with their lines
         check_stereotypeproperties();
     }
 
@@ -105,13 +105,13 @@ void ParameterSetCanvas::remove(bool from_model)
 
 void ParameterSetCanvas::disconnect_pins()
 {
-    Q3ValueList<PinCanvas *>::Iterator iter;
+    QList<PinCanvas *>::Iterator iter;
 
     iter = params.begin();
 
     while (! params.isEmpty()) {
         disconnect((*iter)->get_bn()->get_data(), SIGNAL(deleted()), this, SLOT(pin_deleted()));
-        iter = params.remove(iter);
+        iter = params.erase(iter);
     }
 }
 
@@ -124,17 +124,17 @@ void ParameterSetCanvas::delete_available(BooL & in_model, BooL & out_model) con
 void ParameterSetCanvas::update()
 {
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlActivityPin)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlActivityPin)
+            : itscolor;
 
     disconnect_pins();
 
-    Q3ValueList<PinCanvas *> pincanvas = act->get_pins();
-    Q3ValueList<PinCanvas *>::ConstIterator iter;
-    Q3ValueList<BrowserPin *> pins = ((ParameterSetData *) browser_node->get_data())->get_pins();
+    QList<PinCanvas *> pincanvas = act->get_pins();
+    QList<PinCanvas *>::ConstIterator iter;
+    QList<BrowserPin *> pins = ((ParameterSetData *) browser_node->get_data())->get_pins();
 
     for (iter = pincanvas.begin(); iter != pincanvas.end(); ++iter) {
-        if (pins.findIndex((BrowserPin *)(*iter)->get_bn()) != -1) {
+        if (pins.indexOf((BrowserPin *)(*iter)->get_bn()) != -1) {
             params.append(*iter);
             connect((*iter)->get_bn()->get_data(), SIGNAL(deleted()), this, SLOT(pin_deleted()));
         }
@@ -145,12 +145,12 @@ void ParameterSetCanvas::update()
 
 void ParameterSetCanvas::pin_deleted()
 {
-    Q3ValueList<PinCanvas *>::Iterator iter = params.begin();
+    QList<PinCanvas *>::Iterator iter = params.begin();
 
     while (iter != params.end()) {
         if (!(*iter)->visible()) {
             disconnect((*iter)->get_bn()->get_data(), SIGNAL(deleted()), this, SLOT(pin_deleted()));
-            iter = params.remove(iter);
+            iter = params.erase(iter);
         }
         else
             ++iter;
@@ -163,8 +163,8 @@ void ParameterSetCanvas::check_position()
 {
     if (params.isEmpty()) {
         // hide it but still visible
-        Q3CanvasRectangle::moveBy(-1 - x(), -1 - y());
-        Q3CanvasRectangle::setSize(0, 0);
+        QGraphicsRectItem::moveBy(-1 - x(), -1 - y());
+        QGraphicsRectItem::setRect(0,0,0, 0);
     }
     else {
         int x_min = the_canvas()->width();
@@ -172,7 +172,7 @@ void ParameterSetCanvas::check_position()
         int y_min = the_canvas()->height();
         int y_max = 0;
 
-        Q3ValueList<PinCanvas *>::Iterator iter;
+        QList<PinCanvas *>::Iterator iter;
 
         for (iter = params.begin(); iter != params.end(); ++iter) {
             int i;
@@ -213,8 +213,8 @@ void ParameterSetCanvas::check_position()
         if (y_max > r_act.y())
             y_max += margin;
 
-        Q3CanvasRectangle::moveBy(x_min - x(), y_min - y());
-        Q3CanvasRectangle::setSize(x_max - x_min + 1, y_max - y_min + 1);
+        QGraphicsRectItem::moveBy(x_min - x(), y_min - y());
+        QGraphicsRectItem::setRect(0,0,x_max - x_min + 1, y_max - y_min + 1);
     }
 }
 
@@ -253,7 +253,8 @@ void ParameterSetCanvas::draw(QPainter & p)
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
+    QBrush backBrush = p.background();
 
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode
@@ -263,29 +264,39 @@ void ParameterSetCanvas::draw(QPainter & p)
     QRect r = rect();
     FILE * fp = svg();
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
 
     if (fp != 0)
         fprintf(fp, "<g>\n"
-                "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n"
-                "</g>\n",
+                    "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
+                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n"
+                    "</g>\n",
                 svg_color(used_color),
                 r.x(), r.y(), r.width() - 1, r.height() - 1);
 
     p.drawRect(r);
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode ParameterSetCanvas::type() const
+void ParameterSetCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode ParameterSetCanvas::typeUmlCode() const
 {
     return UmlParameterSet;
 }
@@ -302,90 +313,94 @@ void ParameterSetCanvas::open()
 
 void ParameterSetCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit parameter set"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit parameter set"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
-        m.insertItem(TR("Delete from model"), 8);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
+        m.addSeparator();
     }
 
     if (Tool::menu_insert(&toolm, UmlParameterSet, 20))
-        m.insertItem(TR("Tool"), &toolm);
-
-    switch (index = m.exec(QCursor::pos())) {
-    case 0:
-        act->upper();
-        modified();	// call package_modified()
-        return;
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (index = retAction->data().toInt()) {
+        case 0:
+            act->upper();
+            modified();	// call package_modified()
+            return;
 
-    case 1:
-        act->lower();
-        modified();	// call package_modified()
-        return;
+        case 1:
+            act->lower();
+            modified();	// call package_modified()
+            return;
 
-    case 13:
-        act->z_up();
-        modified();	// call package_modified()
-        return;
+        case 13:
+            act->z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 14:
-        act->z_down();
-        modified();	// call package_modified()
-        return;
+        case 14:
+            act->z_down();
+            modified();	// call package_modified()
+            return;
 
-    case 2:
-        edit_drawing_settings();
-        return;
+        case 2:
+            edit_drawing_settings();
+            return;
 
-    case 3:
-        browser_node->open(TRUE);
-        return;
+        case 3:
+            browser_node->open(TRUE);
+            return;
 
-    case 4:
-        browser_node->select_in_browser();
-        return;
+        case 4:
+            browser_node->select_in_browser();
+            return;
 
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    case 8:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 8:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    default:
-        if (index >= 20)
-            ToolCom::run(Tool::command(index - 20), browser_node);
+        default:
+            if (index >= 20)
+                ToolCom::run(Tool::command(index - 20), browser_node);
 
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void ParameterSetCanvas::apply_shortcut(QString s)
+void ParameterSetCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -417,7 +432,7 @@ void ParameterSetCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("parameter set color"), &itscolor);
+        co[0].set(tr("parameter set color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -436,24 +451,23 @@ bool ParameterSetCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void ParameterSetCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ParameterSetCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("parameter set color"), &itscolor);
+        co[0].set(tr("parameter set color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((ParameterSetCanvas *) it.current())->itscolor = itscolor;
-                ((ParameterSetCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ParameterSetCanvas *canvas = (ParameterSetCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -462,28 +476,21 @@ void ParameterSetCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void ParameterSetCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void ParameterSetCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    ParameterSetCanvas * x = (ParameterSetCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        ParameterSetCanvas * o = (ParameterSetCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const ParameterSetCanvas * x = (const ParameterSetCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString ParameterSetCanvas::may_start(UmlCode &) const
 {
-    return TR("illegal");
+    return tr("illegal");
 }
 
 QString ParameterSetCanvas::may_connect(UmlCode &, const DiagramItem *) const
 {
-    return TR("illegal");
+    return tr("illegal");
 }
 
 void ParameterSetCanvas::modified()
@@ -525,7 +532,7 @@ void ParameterSetCanvas::save(QTextStream & st, bool ref, QString & warning) con
 }
 
 ParameterSetCanvas * ParameterSetCanvas::read(char *& st, UmlCanvas * canvas,
-        char * k, ActivityActionCanvas * a)
+                                              char * k, ActivityActionCanvas * a)
 {
     if (!strcmp(k, "parametersetcanvas_ref"))
         return ((ParameterSetCanvas *) dict_get(read_id(st), "parametersetcanvas", canvas));
@@ -564,7 +571,7 @@ ParameterSetCanvas * ParameterSetCanvas::read(char *& st, UmlCanvas * canvas,
 
 void ParameterSetCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     disconnect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
@@ -588,14 +595,14 @@ void ParameterSetCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 
     // note : pin list unchanged because history raz on item deletion
-    Q3ValueList<PinCanvas *>::Iterator iter;
+    QList<PinCanvas *>::Iterator iter;
 
     for (iter = params.begin(); iter != params.end(); ++iter)
         connect((*iter)->get_bn()->get_data(), SIGNAL(deleted()), this, SLOT(pin_deleted()));
diff --git a/src/diagram/ParameterSetCanvas.h b/src/diagram/ParameterSetCanvas.h
index d15dad867..10dde04b4 100644
--- a/src/diagram/ParameterSetCanvas.h
+++ b/src/diagram/ParameterSetCanvas.h
@@ -31,7 +31,7 @@
 #include "DiagramCanvas.h"
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3ValueList>
+#include <QList>
 
 class ActivityActionCanvas;
 class PinCanvas;
@@ -43,52 +43,53 @@ class ParameterSetCanvas : public QObject, public DiagramCanvas
 
 protected:
     ActivityActionCanvas * act;
-    Q3ValueList<PinCanvas *> params;
+    QList<PinCanvas *> params;
     UmlColor itscolor;
     UmlColor used_color;
 
     void disconnect_pins();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     ParameterSetCanvas(BrowserNode * bn, UmlCanvas * canvas,
                        int id, ActivityActionCanvas * a);
     virtual ~ParameterSetCanvas();
 
-    virtual void delete_it();
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
+    virtual void delete_it() override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
 
-    void update();
+    virtual void update() override;
     void check_position();
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void change_scale();
-    virtual void moveBy(double dx, double dy);
-    virtual bool primaryItem() const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void change_scale() override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual bool primaryItem() const override;
     void do_moveBy(double dx, double dy);
     void do_change_scale();
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static ParameterSetCanvas * read(char *& , UmlCanvas *, char *, ActivityActionCanvas *);
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/PinCanvas.cpp b/src/diagram/PinCanvas.cpp
index 78cdf852b..a6b32855b 100644
--- a/src/diagram/PinCanvas.cpp
+++ b/src/diagram/PinCanvas.cpp
@@ -32,7 +32,7 @@
 #include <math.h>
 
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -70,7 +70,7 @@ PinCanvas::PinCanvas(BrowserNode * bn, UmlCanvas * canvas,
     if (id == 0) {
         // not on read
         update();
-        setZ(a->z() + 2);  // z+2 to be upper the parameter sets with their lines
+        setZValue(a->zValue() + 2);  // z+2 to be upper the parameter sets with their lines
 
         if (canvas->must_draw_all_relations())
             draw_all_flows();
@@ -210,8 +210,8 @@ void PinCanvas::update()
 
 void PinCanvas::check_position()
 {
-    QRect r = rect();
-    QRect action_r = act->rect();
+    QRect r = sceneRect();
+    QRect action_r = act->sceneRect();
     int shadow = act->shadow_margin();
 
     if (shadow != 0) {
@@ -219,10 +219,10 @@ void PinCanvas::check_position()
         action_r.setBottom(action_r.bottom() - shadow);
     }
 
-    double dxl = fabs(action_r.left() - r.right());
-    double dxr = fabs(action_r.right() - r.left());
-    double dyt = fabs(action_r.top() - r.bottom());
-    double dyb = fabs(action_r.bottom() - r.top());
+    double dxl = fabs((double)action_r.left() - r.right());
+    double dxr = fabs((double)action_r.right() - r.left());
+    double dyt = fabs((double)action_r.top() - r.bottom());
+    double dyb = fabs((double)action_r.bottom() - r.top());
 
     if ((dxr == 0) || (dxl == 0)) {
         if (r.bottom() < action_r.top())
@@ -273,14 +273,14 @@ void PinCanvas::change_scale()
 
 void PinCanvas::do_change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     int sz = (int)(PIN_SIZE * the_canvas()->zoom());
 
-    setSize(sz, sz);
+    setRect(0,0,sz, sz);
     recenter();
     // action already in position, can check
     check_position();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void PinCanvas::moveBy(double dx, double dy)
@@ -315,7 +315,8 @@ void PinCanvas::draw(QPainter & p)
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QBrush brsh = p.brush();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
+    QBrush backBrush = p.background();
 
     p.setBackgroundMode((used_color == UmlTransparent)
                         ? ::Qt::TransparentMode
@@ -325,7 +326,8 @@ void PinCanvas::draw(QPainter & p)
     QRect r = rect();
     FILE * fp = svg();
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
@@ -339,15 +341,23 @@ void PinCanvas::draw(QPainter & p)
                 r.x(), r.y(), r.width() - 1, r.height() - 1);
 
     p.drawRect(r);
-
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode PinCanvas::type() const
+void PinCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode PinCanvas::typeUmlCode() const
 {
     return UmlActivityPin;
 }
@@ -369,42 +379,45 @@ void PinCanvas::open()
 
 void PinCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
     BrowserClass * cl =
         ((PinData *) browser_node->get_data())->get_type().type;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit pin"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit pin"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (cl != 0)
-        m.insertItem(TR("Select class in browser"), 9);
+        MenuFactory::addItem(m, tr("Select class in browser"), 9);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
-        m.insertItem(TR("Delete from model"), 8);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
+        m.addSeparator();
     }
 
     if (Tool::menu_insert(&toolm, UmlActivityPin, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index = retAction->data().toInt()) {
     case 0:
         act->upper();
         modified();	// call package_modified()
@@ -457,11 +470,12 @@ void PinCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void PinCanvas::apply_shortcut(QString s)
+void PinCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -493,7 +507,7 @@ void PinCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("pin color"), &itscolor);
+        co[0].set(tr("pin color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -512,24 +526,23 @@ bool PinCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void PinCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void PinCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("pin color"), &itscolor);
+        co[0].set(tr("pin color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((PinCanvas *) it.current())->itscolor = itscolor;
-                ((PinCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                PinCanvas *canvas = (PinCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -538,18 +551,11 @@ void PinCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void PinCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void PinCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    PinCanvas * x = (PinCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        PinCanvas * o = (PinCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const PinCanvas * x = (const PinCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString PinCanvas::may_start(UmlCode & l) const
@@ -559,7 +565,7 @@ QString PinCanvas::may_start(UmlCode & l) const
         return ((BrowserPin *) browser_node)->may_start();
 
     case UmlDependOn:
-        return TR("illegal");
+        return tr("illegal");
 
     default: // anchor
         return 0;
@@ -571,7 +577,7 @@ QString PinCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     if (l == UmlAnchor)
         return dest->may_start(l);
     else if (dest->get_bn() == 0)
-        return TR("illegal");
+        return tr("illegal");
     else
         return ((BrowserPin *) browser_node)->may_connect(dest->get_bn());
 }
@@ -689,7 +695,7 @@ PinCanvas * PinCanvas::read(char *& st, UmlCanvas * canvas,
 
 void PinCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), 0, this, 0);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
@@ -713,7 +719,7 @@ void PinCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
diff --git a/src/diagram/PinCanvas.h b/src/diagram/PinCanvas.h
index e3df1d935..c1ae55d14 100644
--- a/src/diagram/PinCanvas.h
+++ b/src/diagram/PinCanvas.h
@@ -46,49 +46,50 @@ class PinCanvas : public QObject, public DiagramCanvas
     UmlColor itscolor;
     UmlColor used_color;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     PinCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y,
               int id, ActivityActionCanvas * a);
     virtual ~PinCanvas();
 
-    virtual void delete_it();
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
+    virtual void delete_it() override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
 
-    void update();
+    virtual void update() override;
     void check_position();
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual void change_scale();
-    virtual void moveBy(double dx, double dy);
-    virtual bool primaryItem() const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual void change_scale() override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual bool primaryItem() const override;
     void do_moveBy(double dx, double dy);
     void do_change_scale();
 
     bool action_selected() const;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static PinCanvas * read(char *& , UmlCanvas *, char *, ActivityActionCanvas *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/PseudoStateCanvas.cpp b/src/diagram/PseudoStateCanvas.cpp
index b46055fde..8d3e16c20 100644
--- a/src/diagram/PseudoStateCanvas.cpp
+++ b/src/diagram/PseudoStateCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -173,12 +173,12 @@ void PseudoStateCanvas::set_xpm()
         return;
     }
 
-    setSize(xpm->width(), xpm->height());
+    setRect(0,0,xpm->width(), xpm->height());
 }
 
 void PseudoStateCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
 
     if (manual_size) {
         double scale = the_canvas()->zoom();
@@ -189,7 +189,7 @@ void PseudoStateCanvas::change_scale()
             if (w < MIN_FORK_JOIN_LARGESIDE)
                 w = MIN_FORK_JOIN_LARGESIDE;
 
-            setSize(w | 1, FORK_JOIN_SMALLSIDE);
+            setRect(0,0,w | 1, FORK_JOIN_SMALLSIDE);
         }
         else {
             int h = (int)(height_scale100 * scale);
@@ -197,7 +197,7 @@ void PseudoStateCanvas::change_scale()
             if (h < MIN_FORK_JOIN_LARGESIDE)
                 h = MIN_FORK_JOIN_LARGESIDE;
 
-            setSize(FORK_JOIN_SMALLSIDE, h | 1);
+            setRect(0,0,FORK_JOIN_SMALLSIDE, h | 1);
         }
 
         DiagramCanvas::resize(width(), height());
@@ -207,7 +207,7 @@ void PseudoStateCanvas::change_scale()
         set_xpm();
 
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 aCorner PseudoStateCanvas::on_resize_point(const QPoint & p)
@@ -566,7 +566,15 @@ void PseudoStateCanvas::draw(QPainter & p)
     }
 }
 
-UmlCode PseudoStateCanvas::type() const
+void PseudoStateCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode PseudoStateCanvas::typeUmlCode() const
 {
     return browser_node->get_type();
 }
@@ -594,55 +602,58 @@ void PseudoStateCanvas::open()
 
 void PseudoStateCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
 
     switch (browser_node->get_type()) {
     case ForkPS:
     case JoinPS:
-        m.insertItem((horiz) ? TR("draw vertically") : TR("draw horizontally"), 2);
-        m.insertSeparator();
+        MenuFactory::addItem(m, (horiz) ? tr("draw vertically") : tr("draw horizontally"), 2);
+        m.addSeparator();
         break;
 
     default:
         break;
     }
 
-    /*m.insertItem("Edit drawing settings", 2);
-    m.insertSeparator();*/
-    m.insertItem(TR("Edit pseudo state"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    /*MenuFactory::addItem(m, "Edit drawing settings", 2);
+    m.addSeparator();*/
+    MenuFactory::addItem(m, tr("Edit pseudo state"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
     /*if (browser_node->is_writable())
       if (browser_node->get_associated() !=
     (BrowserNode *) the_canvas()->browser_diagram())
-        m.insertItem(TR("Set associated diagram"),6);
-    m.insertSeparator();*/
-    m.insertItem(TR("Remove from diagram"), 7);
+        MenuFactory::addItem(m, TR("Set associated diagram"),6);
+    m.addSeparator();*/
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, browser_node->get_type(), 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index = retAction->data().toInt()) {
     case 0:
         upper();
         modified();	// call package_modified()
@@ -669,7 +680,7 @@ void PseudoStateCanvas::menu(const QPoint &)
         if (!manual_size)
             set_xpm();
         else {
-            setSize(height(), width());
+            setRect(0,0,height(), width());
             DiagramCanvas::resize(width(), height());
         }
 
@@ -705,11 +716,12 @@ void PseudoStateCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void PseudoStateCanvas::apply_shortcut(QString s)
+void PseudoStateCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -742,7 +754,7 @@ QString PseudoStateCanvas::may_start(UmlCode & l) const
         return ((BrowserPseudoState *) browser_node)->may_start();
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -751,7 +763,7 @@ QString PseudoStateCanvas::may_connect(UmlCode & l, const DiagramItem * dest) co
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlState:
     case UmlStateAction:
     case FinalPS:
@@ -766,10 +778,10 @@ QString PseudoStateCanvas::may_connect(UmlCode & l, const DiagramItem * dest) co
     case EntryPointPS:
         return (l == UmlTransition)
                ? ((BrowserPseudoState *) browser_node)->may_connect(dest->get_bn())
-               : TR("illegal");
+               : tr("illegal");
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -839,7 +851,7 @@ PseudoStateCanvas * PseudoStateCanvas::read(char *& st, UmlCanvas * canvas,
             result->label = new LabelCanvas(ps->get_name(), canvas, 0, 0);
             read_keyword(st, "label_xy");
             read_xy(st, result->label);
-            result->label->setZ(result->z());
+            result->label->setZValue(result->zValue());
             result->label->set_center100();
         }
 
@@ -873,7 +885,7 @@ PseudoStateCanvas * PseudoStateCanvas::read(char *& st, UmlCanvas * canvas,
 
 void PseudoStateCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(browser_node->get_data(), 0, this, 0);
 }
 
@@ -907,7 +919,7 @@ void PseudoStateCanvas::history_load(QBuffer & b)
 
         ::load(w, b);
         ::load(h, b);
-        Q3CanvasRectangle::setSize(w, h);
+        QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
     }
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
diff --git a/src/diagram/PseudoStateCanvas.h b/src/diagram/PseudoStateCanvas.h
index 6110e31b8..de6e9a7af 100644
--- a/src/diagram/PseudoStateCanvas.h
+++ b/src/diagram/PseudoStateCanvas.h
@@ -52,37 +52,39 @@ class PseudoStateCanvas : public QObject, public DiagramCanvas
     PseudoStateCanvas(UmlCanvas * canvas, int id);
     void set_xpm();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     PseudoStateCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~PseudoStateCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void history_load(QBuffer &);
-    virtual void history_save(QBuffer & b) const;
-    virtual void history_hide();
-
-    virtual void apply_shortcut(QString s);
-
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_save(QBuffer & b) const override;
+    virtual void history_hide() override;
+
+    virtual void apply_shortcut(const QString & s) override;
+
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static PseudoStateCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/RelationCanvas.cpp b/src/diagram/RelationCanvas.cpp
index 535c69968..d04da5600 100644
--- a/src/diagram/RelationCanvas.cpp
+++ b/src/diagram/RelationCanvas.cpp
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QTextStream>
 #include <math.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 
 #include "RelationCanvas.h"
 #include "ArrowPointCanvas.h"
@@ -66,13 +66,13 @@ RelationCanvas::RelationCanvas(UmlCanvas * canvas, DiagramItem * b,
       data(d), role_a(0), role_b(0), multiplicity_a(0), multiplicity_b(0),
       stereotypeproperties(0), show_modifier(FALSE), show_visibility(FALSE)
 {
-    if ((e->type() != UmlArrowPoint) && (bb == 0)) {
+    if ((e->typeUmlCode() != UmlArrowPoint) && (bb == 0)) {
         // end of line construction, update all the line bb & be
         // adds browser relation 2 times
         update_begin(e);
     }
     else if (d != 0) {
-        if (e->type() != UmlArrowPoint) {
+        if (e->typeUmlCode() != UmlArrowPoint) {
             check_stereotypeproperties();
         }
 
@@ -136,7 +136,7 @@ void RelationCanvas::remove(bool from_model)
         if (the_canvas()->must_draw_all_relations()) {
             const RelationCanvas * a = this;
 
-            while (a->begin->type() == UmlArrowPoint) {
+            while (a->begin->typeUmlCode() == UmlArrowPoint) {
                 a = (RelationCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
                 if (a == 0)
@@ -146,7 +146,7 @@ void RelationCanvas::remove(bool from_model)
             if (a && !a->begin->isSelected() && !a->begin->get_bn()->deletedp()) {
                 a = this;
 
-                while (a->end->type() == UmlArrowPoint) {
+                while (a->end->typeUmlCode() == UmlArrowPoint) {
                     a = (RelationCanvas *)((ArrowPointCanvas *) a->end)->get_other(a);
 
                     if (a == 0)
@@ -154,7 +154,7 @@ void RelationCanvas::remove(bool from_model)
                 }
 
                 if (a && !a->end->isSelected() && !a->end->get_bn()->deletedp()) {
-                    msg_warning("Douml", TR("<i>Draw all relations</i> forced to <i>no</i>"));
+                    msg_warning("Douml", tr("<i>Draw all relations</i> forced to <i>no</i>"));
                     the_canvas()->dont_draw_all_relations();
                 }
             }
@@ -181,7 +181,7 @@ BrowserClass * RelationCanvas::update_begin(DiagramItem * cnend)
     // static to be updated in all the cases
     static RelationData * d = 0;
 
-    if (begin->type() == UmlArrowPoint) {
+    if (begin->typeUmlCode() == UmlArrowPoint) {
         RelationCanvas * other =
             ((RelationCanvas *)((ArrowPointCanvas *) begin)->get_other(this));
 
@@ -190,7 +190,7 @@ BrowserClass * RelationCanvas::update_begin(DiagramItem * cnend)
     else {
         // the relation start here
         br_begin = ((BrowserClass *) begin->get_bn());
-        d = (RelationData *) begin->add_relation(type(), cnend);
+        d = (RelationData *) begin->add_relation(typeUmlCode(), cnend);
     }
 
     data = d;
@@ -210,16 +210,16 @@ void RelationCanvas::update_pos()
     ArrowCanvas::update_pos();
 
     if (auto_pos) {
-        if ((role_a != 0) && !role_a->selected())
+        if ((role_a != 0) && !role_a->isSelected())
             role_a_default_position();
 
-        if ((role_b != 0) && !role_b->selected())
+        if ((role_b != 0) && !role_b->isSelected())
             role_b_default_position();
 
-        if ((multiplicity_a != 0) && !multiplicity_a->selected())
+        if ((multiplicity_a != 0) && !multiplicity_a->isSelected())
             multiplicity_a_default_position();
 
-        if ((multiplicity_b != 0) && !multiplicity_b->selected())
+        if ((multiplicity_b != 0) && !multiplicity_b->isSelected())
             multiplicity_b_default_position();
     }
 
@@ -250,19 +250,19 @@ void RelationCanvas::moveBy(double dx, double dy)
 {
     ArrowCanvas::moveBy(dx, dy);
 
-    if ((role_a != 0) && !role_a->selected())
+    if ((role_a != 0) && !role_a->isSelected())
         role_a->moveBy(dx, dy);
 
-    if ((role_b != 0) && !role_b->selected())
+    if ((role_b != 0) && !role_b->isSelected())
         role_b->moveBy(dx, dy);
 
-    if ((multiplicity_a != 0) && !multiplicity_a->selected())
+    if ((multiplicity_a != 0) && !multiplicity_a->isSelected())
         multiplicity_a->moveBy(dx, dy);
 
-    if ((multiplicity_b != 0) && !multiplicity_b->selected())
+    if ((multiplicity_b != 0) && !multiplicity_b->isSelected())
         multiplicity_b->moveBy(dx, dy);
 
-    if ((stereotypeproperties != 0) && !stereotypeproperties->selected())
+    if ((stereotypeproperties != 0) && !stereotypeproperties->isSelected())
         stereotypeproperties->moveBy(dx, dy);
 }
 
@@ -271,23 +271,23 @@ void RelationCanvas::set_z(double z)
     ArrowCanvas::set_z(z);
 
     if (role_a != 0)
-        role_a->setZ(z);
+        role_a->setZValue(z);
 
     if (role_b != 0)
-        role_b->setZ(z);
+        role_b->setZValue(z);
 
     if (multiplicity_a != 0)
-        multiplicity_a->setZ(z);
+        multiplicity_a->setZValue(z);
 
     if (multiplicity_b != 0)
-        multiplicity_b->setZ(z);
+        multiplicity_b->setZValue(z);
 }
 
 void RelationCanvas::setSelected(bool yes)
 {
     UmlWindow::set_commented((yes) ? data->get_start() : 0);
 
-    Q3CanvasPolygon::setSelected(yes);
+    QGraphicsPolygonItem::setSelected(yes);
 }
 
 void RelationCanvas::select_associated()
@@ -299,42 +299,42 @@ void RelationCanvas::select_associated()
     RelationCanvas * rel = this;
 
     // goes to the beginning of the (broken) line
-    while (rel->begin->type() == UmlArrowPoint)
+    while (rel->begin->typeUmlCode() == UmlArrowPoint)
         rel = ((RelationCanvas *)((ArrowPointCanvas *) rel->begin)->get_other(rel));
 
     rel->begin->select_associated();
 
-    if ((rel->stereotypeproperties != 0) && !rel->stereotypeproperties->selected())
+    if ((rel->stereotypeproperties != 0) && !rel->stereotypeproperties->isSelected())
         the_canvas()->select(rel->stereotypeproperties);
 
     for (;;) {
         // select labels
-        if ((rel->role_a != 0) && !rel->role_a->selected())
+        if ((rel->role_a != 0) && !rel->role_a->isSelected())
             the_canvas()->select(rel->role_a);
 
-        if ((rel->role_b != 0) && !rel->role_b->selected())
+        if ((rel->role_b != 0) && !rel->role_b->isSelected())
             the_canvas()->select(rel->role_b);
 
-        if ((rel->multiplicity_a != 0) && !rel->multiplicity_a->selected())
+        if ((rel->multiplicity_a != 0) && !rel->multiplicity_a->isSelected())
             the_canvas()->select(rel->multiplicity_a);
 
-        if ((rel->multiplicity_b != 0) && !rel->multiplicity_b->selected())
+        if ((rel->multiplicity_b != 0) && !rel->multiplicity_b->isSelected())
             the_canvas()->select(rel->multiplicity_b);
 
-        if ((rel->label != 0) && !rel->label->selected())
+        if ((rel->label != 0) && !rel->label->isSelected())
             the_canvas()->select(rel->label);
 
-        if ((rel->stereotype != 0) && !rel->stereotype->selected())
+        if ((rel->stereotype != 0) && !rel->stereotype->isSelected())
             the_canvas()->select(rel->stereotype);
 
-        if (! rel->selected())
+        if (! rel->isSelected())
             the_canvas()->select(rel);
 
         // goes forward
-        if (rel->end->type() != UmlArrowPoint)
+        if (rel->end->typeUmlCode() != UmlArrowPoint)
             break;
 
-        if (!((ArrowPointCanvas *) rel->end)->selected())
+        if (!((ArrowPointCanvas *) rel->end)->isSelected())
             the_canvas()->select((ArrowPointCanvas *) rel->end);
 
         rel = (RelationCanvas *)((ArrowPointCanvas *) rel->end)->get_other(rel);
@@ -373,59 +373,63 @@ void RelationCanvas::menu(const QPoint & lpos)
         const RelationCanvas * first = this;
         const RelationCanvas * last = this;
 
-        while (first->begin->type() == UmlArrowPoint)
+        while (first->begin->typeUmlCode() == UmlArrowPoint)
             first = ((RelationCanvas *)((ArrowPointCanvas *) first->begin)->get_other(first));
 
-        while (last->end->type() == UmlArrowPoint)
+        while (last->end->typeUmlCode() == UmlArrowPoint)
             last = (RelationCanvas *)((ArrowPointCanvas *) last->end)->get_other(last);
 
         bool prefer_start =
             (lpos - first->beginp).manhattanLength() >
             (lpos - last->endp).manhattanLength();
-        Q3PopupMenu m(0);
-        Q3PopupMenu geo(0);
-        Q3PopupMenu toolm(0);
+        QMenu m(0);
+        QMenu geo(0);
+        QMenu toolm(0);
 
         MenuFactory::createTitle(m, data->definition(FALSE, TRUE));
-        m.insertSeparator();
-        m.insertItem(TR("Edit"), 0);
-        m.insertSeparator();
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Edit"), 0);
+        m.addSeparator();
 
-        m.insertItem(TR("Select in browser"), 2);
+        MenuFactory::addItem(m, tr("Select in browser"), 2);
 
         if (plabel || pstereotype ||
             first->role_b || first->multiplicity_b ||
             last->role_a || last->multiplicity_a) {
-            m.insertSeparator();
-            m.insertItem(TR("Select labels"), 3);
-            m.insertItem(TR("Labels default position"), 4);
+            m.addSeparator();
+            MenuFactory::addItem(m, tr("Select labels"), 3);
+            MenuFactory::addItem(m, tr("Labels default position"), 4);
 
             if (plabel && (label == 0))
-                m.insertItem(TR("Attach relation's name to this segment"), 5);
+                MenuFactory::addItem(m, tr("Attach relation's name to this segment"), 5);
 
             if (pstereotype && (stereotype == 0))
-                m.insertItem(TR("Attach relation's stereotype to this segment"), 6);
+                MenuFactory::addItem(m, tr("Attach relation's stereotype to this segment"), 6);
         }
 
         if (get_start() != get_end()) {
-            m.insertSeparator();
+            m.addSeparator();
             init_geometry_menu(geo, 10);
-            m.insertItem(TR("Geometry (Ctrl+l)"), &geo);
+            MenuFactory::insertItem(m, tr("Geometry (Ctrl+l)"), &geo);
         }
 
-        m.insertSeparator();
-        m.insertItem(TR("Remove from diagram"), 7);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
         if ((data->get_end()) ? data->is_writable(data->get_end())
             : data->is_writable(data->get_start()))
-            m.insertItem(TR("Delete from model"), 8);
+            MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-        m.insertSeparator();
+        m.addSeparator();
 
         if (Tool::menu_insert(&toolm, itstype, 20))
-            m.insertItem(TR("Tool"), &toolm);
+            MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        int rank = retAction->data().toInt();
 
-        int rank = m.exec(QCursor::pos());
 
         switch (rank) {
         case 0:
@@ -524,6 +528,7 @@ void RelationCanvas::menu(const QPoint & lpos)
             else
                 return;
         }
+        }
 
         package_modified();
     }
@@ -535,7 +540,7 @@ ArrowPointCanvas * RelationCanvas::brk(const QPoint & p)
     ArrowPointCanvas * ap =
         new ArrowPointCanvas(the_canvas(), p.x(), p.y());
 
-    ap->setZ(z() + 1);
+    ap->setZValue(zValue() + 1);
 
     DiagramItem * e = end;
 
@@ -591,13 +596,13 @@ ArrowCanvas * RelationCanvas::join(ArrowCanvas * other, ArrowPointCanvas * ap)
 
 void RelationCanvas::modified()
 {
-    if (visible()) {
+    if (isVisible()) {
         hide();
         update(TRUE);
         show();
         canvas()->update();
 
-        if (begin->type() != UmlArrowPoint) {
+        if (begin->typeUmlCode() != UmlArrowPoint) {
             if (data->get_association().type != 0)
                 show_assoc_class(0);
             else
@@ -668,7 +673,7 @@ void RelationCanvas::update(bool updatepos)
                 plabel->label = 0;
             }
         }
-        else if ((plabel == 0) && (begin->type() != UmlArrowPoint)) {
+        else if ((plabel == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
             // adds relation's name
             label =
                 new LabelCanvas(s, the_canvas(), c.x() - fm.width(s) / 2,
@@ -693,12 +698,12 @@ void RelationCanvas::update(bool updatepos)
             }
         }
         else {
-            s = toUnicode(s);
+            s = toUnicode(s.toLatin1().constData());
 
             if (s[0] != '{')
                 s = QString("<<") + s + ">>";
 
-            if ((pstereotype == 0) && (begin->type() != UmlArrowPoint)) {
+            if ((pstereotype == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
                 // adds relation's stereotype
                 stereotype = new LabelCanvas(s, the_canvas(), 0, 0);
                 stereotype_default_position();
@@ -724,7 +729,7 @@ void RelationCanvas::update(bool updatepos)
 
         s = data->get_role_a();
 
-        if (unamed || s.isEmpty() || (end->type() == UmlArrowPoint)) {
+        if (unamed || s.isEmpty() || (end->typeUmlCode() == UmlArrowPoint)) {
             // relation does not have role_a name or it must be hidden
             if (role_a != 0) {
                 the_canvas()->del(role_a);
@@ -798,7 +803,7 @@ void RelationCanvas::update(bool updatepos)
         if (unamed ||
             s.isEmpty() ||
             RelationData::uni_directional(itstype) ||
-            (begin->type() == UmlArrowPoint)) {
+            (begin->typeUmlCode() == UmlArrowPoint)) {
             // relation does not have role_b name
             if (role_b != 0) {
                 the_canvas()->del(role_b);
@@ -868,7 +873,7 @@ void RelationCanvas::update(bool updatepos)
 
         s = data->get_multiplicity_a();
 
-        if (unamed || s.isEmpty() || (end->type() == UmlArrowPoint)) {
+        if (unamed || s.isEmpty() || (end->typeUmlCode() == UmlArrowPoint)) {
             // relation does not have multiplicity_a or it must be hidden
             if (multiplicity_a != 0) {
                 the_canvas()->del(multiplicity_a);
@@ -890,7 +895,7 @@ void RelationCanvas::update(bool updatepos)
 
         s = data->get_multiplicity_b();
 
-        if (unamed || s.isEmpty() || (begin->type() == UmlArrowPoint)) {
+        if (unamed || s.isEmpty() || (begin->typeUmlCode() == UmlArrowPoint)) {
             // relation does not have multiplicity_b or it must be hidden
             if (multiplicity_b != 0) {
                 the_canvas()->del(multiplicity_b);
@@ -915,7 +920,7 @@ void RelationCanvas::update(bool updatepos)
 
 void RelationCanvas::update_actuals(RelationCanvas * plabel)
 {
-    if ((plabel == 0) && (begin->type() == UmlArrowPoint))
+    if ((plabel == 0) && (begin->typeUmlCode() == UmlArrowPoint))
         return;
 
     QString s =
@@ -963,29 +968,28 @@ void RelationCanvas::role_a_default_position() const
     int dx = endp.x() - beginp.x();
     int dy = endp.y() - beginp.y();
 
-    if (fabs(dx) >= fabs(dy)) {
+    if (fabs((double)dx) >= fabs((double)dy)) {
         // horizontal line
         if (dx == 0) dx = 1;
 
         if (dx > 0) {
             int w = fm.width(role_a->get_name());
-
-            role_a->move(endp.x() - w - ARROW_LENGTH,
-                         endp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
+            role_a->setPos(endp.x() - w - ARROW_LENGTH, endp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
         }
         else
-            role_a->move(endp.x() + ARROW_LENGTH,
-                         endp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
+        {
+            role_a->setPos(endp.x() + ARROW_LENGTH, endp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
+        }
     }
     else {
         // vertical line
         if (dy == 0) dy = 1;
 
         if (dy > 0)
-            role_a->move(endp.x() + ARROW_LENGTH - (dx * h / 2) / dy,
+            role_a->setPos(endp.x() + ARROW_LENGTH - (dx * h / 2) / dy,
                          endp.y() - 4 * h / 3);
         else
-            role_a->move(endp.x() + ARROW_LENGTH + (dx * h / 2) / dy,
+            role_a->setPos(endp.x() + ARROW_LENGTH + (dx * h / 2) / dy,
                          endp.y() + h / 2);
     }
 
@@ -999,17 +1003,17 @@ void RelationCanvas::role_b_default_position() const
     int dx = endp.x() - beginp.x();
     int dy = endp.y() - beginp.y();
 
-    if (fabs(dx) >= fabs(dy)) {
+    if (fabs((double)dx) >= fabs((double)dy)) {
         // horizontal line
         if (dx == 0) dx = 1;
 
         if (dx > 0)
-            role_b->move(beginp.x() + ARROW_LENGTH,
+            role_b->setPos(beginp.x() + ARROW_LENGTH,
                          beginp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
         else {
             int w = fm.width(role_b->get_name());
 
-            role_b->move(beginp.x() - w - ARROW_LENGTH,
+            role_b->setPos(beginp.x() - w - ARROW_LENGTH,
                          beginp.y() - 4 * h / 3 + (dy * ARROW_LENGTH) / dx);
         }
     }
@@ -1018,10 +1022,10 @@ void RelationCanvas::role_b_default_position() const
         if (dy == 0) dy = 1;
 
         if (dy > 0)
-            role_b->move(beginp.x() + ARROW_LENGTH + (dx * h / 2) / dy,
+            role_b->setPos(beginp.x() + ARROW_LENGTH + (dx * h / 2) / dy,
                          beginp.y() + h / 2);
         else
-            role_b->move(beginp.x() + ARROW_LENGTH - (dx * h / 2) / dy,
+            role_b->setPos(beginp.x() + ARROW_LENGTH - (dx * h / 2) / dy,
                          beginp.y() - 4 * h / 3);
     }
 
@@ -1036,15 +1040,15 @@ void RelationCanvas::multiplicity_a_default_position() const
     int dx = endp.x() - beginp.x();
     int dy = endp.y() - beginp.y();
 
-    if (fabs(dx) >= fabs(dy)) {
+    if (fabs((double)dx) >= fabs((double)dy)) {
         // horizontal line
         if (dx == 0) dx = 1;
 
         if (dx > 0)
-            multiplicity_a->move(endp.x() - w - ARROW_LENGTH,
+            multiplicity_a->setPos(endp.x() - w - ARROW_LENGTH,
                                  endp.y() + h / 2 + (dy * ARROW_LENGTH) / dx);
         else
-            multiplicity_a->move(endp.x() + ARROW_LENGTH,
+            multiplicity_a->setPos(endp.x() + ARROW_LENGTH,
                                  endp.y() + h / 2 + (dy * ARROW_LENGTH) / dx);
     }
     else {
@@ -1052,10 +1056,10 @@ void RelationCanvas::multiplicity_a_default_position() const
         if (dy == 0) dy = 1;
 
         if (dy > 0)
-            multiplicity_a->move(endp.x() - w - ARROW_LENGTH - (dx * h / 2) / dy,
+            multiplicity_a->setPos(endp.x() - w - ARROW_LENGTH - (dx * h / 2) / dy,
                                  endp.y() - 4 * h / 3);
         else
-            multiplicity_a->move(endp.x() - w - ARROW_LENGTH + (dx * h / 2) / dy,
+            multiplicity_a->setPos(endp.x() - w - ARROW_LENGTH + (dx * h / 2) / dy,
                                  endp.y() + h / 2);
     }
 
@@ -1070,15 +1074,15 @@ void RelationCanvas::multiplicity_b_default_position() const
     int dy = endp.y() - beginp.y();
     int w = fm.width(data->get_multiplicity_b());
 
-    if (fabs(dx) >= fabs(dy)) {
+    if (fabs((double)dx) >= fabs((double)dy)) {
         // horizontal line
         if (dx == 0) dx = 1;
 
         if (dx > 0)
-            multiplicity_b->move(beginp.x() + ARROW_LENGTH,
+            multiplicity_b->setPos(beginp.x() + ARROW_LENGTH,
                                  beginp.y() + h / 2 + (dy * ARROW_LENGTH) / dx);
         else
-            multiplicity_b->move(beginp.x() - w - ARROW_LENGTH,
+            multiplicity_b->setPos(beginp.x() - w - ARROW_LENGTH,
                                  beginp.y() + h / 2 + (dy * ARROW_LENGTH) / dx);
     }
     else {
@@ -1086,10 +1090,10 @@ void RelationCanvas::multiplicity_b_default_position() const
         if (dy == 0) dy = 1;
 
         if (dy > 0)
-            multiplicity_b->move(beginp.x() - w - ARROW_LENGTH + (dx * h / 2) / dy,
+            multiplicity_b->setPos(beginp.x() - w - ARROW_LENGTH + (dx * h / 2) / dy,
                                  beginp.y() + h / 2);
         else
-            multiplicity_b->move(beginp.x() - w - ARROW_LENGTH - (dx * h / 2) / dy,
+            multiplicity_b->setPos(beginp.x() - w - ARROW_LENGTH - (dx * h / 2) / dy,
                                  beginp.y() - 4 * h / 3);
     }
 
@@ -1108,16 +1112,16 @@ void RelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
     BrowserClass * to = def->get_end_class();
     DiagramItem * ccfrom = 0;
     DiagramItem * ccto = 0;
-    Q3CanvasItemList all = canvas->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     // the two classes are drawn ?
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * adi = QCanvasItemToDiagramItem(*cit);
 
             if ((adi != 0) &&		// an uml canvas item
-                (adi->type() == UmlClass)) {
+                (adi->typeUmlCode() == UmlClass)) {
                 if (adi->get_bn() == from) {
                     ccfrom = adi;
 
@@ -1137,7 +1141,7 @@ void RelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
 
     if ((ccfrom != 0) && (ccto != 0)) {
         if (ccfrom->has_relation(def))
-            msg_information("Douml", TR("relation already drawn"));
+            msg_information("Douml", tr("relation already drawn"));
         else {
             RelationCanvas * rel =
                 new RelationCanvas(canvas, ccfrom, ccto, from, bn->get_type(),
@@ -1146,7 +1150,7 @@ void RelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
             rel->hide();	// else self rel not fully shown
             rel->show();
 
-            if (rel->begin->type() != UmlArrowPoint) {
+            if (rel->begin->typeUmlCode() != UmlArrowPoint) {
                 if (rel->data->get_association().type != 0)
                     rel->show_assoc_class(0);
                 else
@@ -1160,7 +1164,7 @@ void RelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
 
 // the relation is not yet drawn,
 void RelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas,
-                          Q3PtrDict<DiagramItem> & drawn)
+                          QHash<BasicData*, DiagramItem*> & drawn)
 {
     RelationData * def = (RelationData *) bn->get_data();
     BrowserClass * from = def->get_start_class();
@@ -1183,7 +1187,8 @@ void RelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas,
                 rel->show_assoc_class((CdClassCanvas *) ac);
         }
 
-        drawn.replace(def, rel);
+        drawn.remove(def);
+        drawn.insert(def, rel);
 
         // package set modified by caller
     }
@@ -1198,14 +1203,14 @@ void RelationCanvas::show_assoc_class(CdClassCanvas * cc)
         // search for the assoc class drawing
         BrowserNode * assoc = data->get_association().type;
 
-        Q3CanvasItemList all = canvas()->allItems();
-        Q3CanvasItemList::Iterator cit;
+        QList<QGraphicsItem*> all = canvas()->items();
+        QList<QGraphicsItem*>::Iterator cit;
 
         for (cit = all.begin(); cit != all.end(); ++cit) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&
-                (di->type() == UmlClass) &&
+                (di->typeUmlCode() == UmlClass) &&
                 (((CdClassCanvas *) di)->get_bn() == assoc)) {
                 cc = (CdClassCanvas *) di;
                 break;
@@ -1223,7 +1228,7 @@ void RelationCanvas::show_assoc_class(CdClassCanvas * cc)
     // assoc already drawn ?
     RelationCanvas * rc = this;
 
-    while (rc->begin->type() == UmlArrowPoint)
+    while (rc->begin->typeUmlCode() == UmlArrowPoint)
         // go to beginning of line
         rc = (RelationCanvas *)
              ((ArrowPointCanvas *) rc->begin)->get_other(rc);
@@ -1232,13 +1237,8 @@ void RelationCanvas::show_assoc_class(CdClassCanvas * cc)
 
     for (;;) {
         // goes throw the line and check / search assoc
-        Q3PtrList<ArrowCanvas> l = rc->lines;
-        Q3PtrListIterator<ArrowCanvas> it(l);
-
-        for (; it.current(); ++it) {
-            ArrowCanvas * a = it.current();
-
-            if (a->type() == UmlAnchor) {
+        foreach (ArrowCanvas *a, rc->lines) {
+            if (a->typeUmlCode() == UmlAnchor) {
                 DiagramItem * s = a->get_start();
                 DiagramItem * e = a->get_end();
 
@@ -1246,21 +1246,21 @@ void RelationCanvas::show_assoc_class(CdClassCanvas * cc)
                     if (e == cc)
                         // already drawn
                         return;
-                    else if (e->type() == UmlClass)
+                    else if (e->typeUmlCode() == UmlClass)
                         // not the good one
                         a->delete_it();
                 }
                 else if (s == cc)
                     // already drawn
                     return;
-                else if (s->type() == UmlClass)
+                else if (s->typeUmlCode() == UmlClass)
                     // not the good one
                     a->delete_it();
             }
         }
 
         // goes to the next line part
-        if (rc->end->type() == UmlArrowPoint)
+        if (rc->end->typeUmlCode() == UmlArrowPoint)
             rc = (RelationCanvas *)
                  ((ArrowPointCanvas *) rc->end)->get_other(rc);
         else
@@ -1279,21 +1279,17 @@ void RelationCanvas::hide_assoc_class()
     // assoc drawn ?
     RelationCanvas * rc = this;
 
-    while (rc->begin->type() == UmlArrowPoint)
+    while (rc->begin->typeUmlCode() == UmlArrowPoint)
         // go to beginning of line
         rc = (RelationCanvas *)
              ((ArrowPointCanvas *) rc->begin)->get_other(rc);
 
     for (;;) {
         // goes through the line to remove existing assoc
-        Q3PtrListIterator<ArrowCanvas> it(rc->lines);
-
-        for (; it.current(); ++it) {
-            ArrowCanvas * a = it.current();
-
-            if ((a->type() == UmlAnchor) &&
-                ((a->get_start()->type() == UmlClass) ||
-                 (a->get_end()->type() == UmlClass))) {
+        foreach (ArrowCanvas *a, rc->lines) {
+            if ((a->typeUmlCode() == UmlAnchor) &&
+                ((a->get_start()->typeUmlCode() == UmlClass) ||
+                 (a->get_end()->typeUmlCode() == UmlClass))) {
                 a->delete_it();
 
                 the_canvas()->get_view()->protect_history(FALSE);
@@ -1302,7 +1298,7 @@ void RelationCanvas::hide_assoc_class()
         }
 
         // goes to the next line part
-        if (rc->end->type() == UmlArrowPoint)
+        if (rc->end->typeUmlCode() == UmlArrowPoint)
             rc = (RelationCanvas *)
                  ((ArrowPointCanvas *) rc->end)->get_other(rc);
         else
@@ -1312,13 +1308,13 @@ void RelationCanvas::hide_assoc_class()
 
 QString RelationCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    if ((l == UmlAnchor) && (dest->type() == UmlClass)) {
+    if ((l == UmlAnchor) && (dest->typeUmlCode() == UmlClass)) {
         if (data->get_association().type != dest->get_bn())
             return ((data->get_end())
                     ? data->is_writable(data->get_end())
                     : data->is_writable(data->get_start()))
                    ? QString() // ok
-                   : TR("read-only relation");
+                   : tr("read-only relation");
         else
             // ok
             return QString();
@@ -1329,7 +1325,7 @@ QString RelationCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 
 void RelationCanvas::post_connexion(UmlCode l, DiagramItem * dest)
 {
-    if ((l == UmlAnchor) && (dest->type() == UmlClass)) {
+    if ((l == UmlAnchor) && (dest->typeUmlCode() == UmlClass)) {
         BrowserClass * cl = data->get_association().type;
 
         if (cl != dest->get_bn()) {
@@ -1347,7 +1343,7 @@ void RelationCanvas::post_connexion(UmlCode l, DiagramItem * dest)
 void RelationCanvas::check_stereotypeproperties()
 {
     // the note is memorized by the first segment
-    if (begin->type() == UmlArrowPoint)
+    if (begin->typeUmlCode() == UmlArrowPoint)
         ((RelationCanvas *)((ArrowPointCanvas *) begin)->get_other(this))
         ->check_stereotypeproperties();
     else {
@@ -1374,7 +1370,7 @@ void RelationCanvas::save(QTextStream & st, bool ref, QString & warning) const
     if (ref)
         st << "relationcanvas_ref " << get_ident()
            << " // " << data->get_name();
-    else if (begin->type() != UmlArrowPoint) {
+    else if (begin->typeUmlCode() != UmlArrowPoint) {
         // relation canvas start
         nl_indent(st);
         st << "relationcanvas " << get_ident() << " ";
@@ -1524,7 +1520,7 @@ RelationCanvas * RelationCanvas::read(char *& st, UmlCanvas * canvas, char * k)
                     label = 0;
                 }
                 else
-                    label->setZ(z);
+                    label->setZValue(z);
 
                 k = read_keyword(st);
             }
@@ -1553,7 +1549,7 @@ RelationCanvas * RelationCanvas::read(char *& st, UmlCanvas * canvas, char * k)
                         s = QString("<<") + s + ">>";
 
                     stereotype = new LabelCanvas(s, canvas, x, y);
-                    stereotype->setZ((read_file_format() < 5) ? OLD_ARROW_Z
+                    stereotype->setZValue((read_file_format() < 5) ? OLD_ARROW_Z
                                      : read_double(st));
                 }
 
@@ -1607,7 +1603,7 @@ RelationCanvas * RelationCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
             result->show();
 
-            if (di->type() != UmlArrowPoint)
+            if (di->typeUmlCode() != UmlArrowPoint)
                 break;
 
             bi = di;
@@ -1632,7 +1628,7 @@ RelationCanvas * RelationCanvas::read(char *& st, UmlCanvas * canvas, char * k)
             if (!unamed && !s.isEmpty()) {
                 result->role_a = new LabelCanvas(s, canvas, x, y, FALSE, FALSE,
                                                  rd->get_isa_class_relation_a());
-                result->role_a->setZ(z);
+                result->role_a->setZValue(z);
                 result->role_a->show();
             }
         }
@@ -1651,7 +1647,7 @@ RelationCanvas * RelationCanvas::read(char *& st, UmlCanvas * canvas, char * k)
             if (!unamed && !s.isEmpty()) {
                 first->role_b = new LabelCanvas(s, canvas, x, y, FALSE, FALSE,
                                                 rd->get_isa_class_relation_b());
-                first->role_b->setZ(z);
+                first->role_b->setZValue(z);
                 first->role_b->show();
             }
         }
@@ -1669,7 +1665,7 @@ RelationCanvas * RelationCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
             if (!unamed && !s.isEmpty()) {
                 result->multiplicity_a = new LabelCanvas(s, canvas, x, y);
-                result->multiplicity_a->setZ(z);
+                result->multiplicity_a->setZValue(z);
                 result->multiplicity_a->show();
             }
         }
@@ -1687,7 +1683,7 @@ RelationCanvas * RelationCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
             if (!unamed && !s.isEmpty()) {
                 first->multiplicity_b = new LabelCanvas(s, canvas, x, y);
-                first->multiplicity_b->setZ(z);
+                first->multiplicity_b->setZValue(z);
                 first->multiplicity_b->show();
             }
         }
@@ -1768,6 +1764,6 @@ void RelationCanvas::history_load(QBuffer & b)
 
 void RelationCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     unconnect();
 }
diff --git a/src/diagram/RelationCanvas.h b/src/diagram/RelationCanvas.h
index b62994e31..0ed894b71 100644
--- a/src/diagram/RelationCanvas.h
+++ b/src/diagram/RelationCanvas.h
@@ -59,35 +59,35 @@ class RelationCanvas : public ArrowCanvas
                    float d_start, float d_end, RelationData * d = 0);
     virtual ~RelationCanvas();
 
-    virtual void delete_it();
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void remove(bool from_model);
-    virtual void unconnect();
-
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void post_connexion(UmlCode, DiagramItem *);
-
-    virtual void history_save(QBuffer & b) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual void setVisible(bool yes);
-    virtual void moveBy(double dx, double dy);
-    virtual void set_z(double z);
-    virtual void select_associated();
+    virtual void delete_it() override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void remove(bool from_model) override;
+    virtual void unconnect() override;
+
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void post_connexion(UmlCode, DiagramItem *) override;
+
+    virtual void history_save(QBuffer & b) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual void setVisible(bool yes) override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void set_z(double z) override;
+    virtual void select_associated() override;
     virtual void setSelected(bool yes);
 
-    virtual void update_pos();
-    virtual ArrowPointCanvas * brk(const QPoint &);
-    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap);
+    virtual void update_pos() override;
+    virtual ArrowPointCanvas * brk(const QPoint &) override;
+    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap) override;
 
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static RelationCanvas * read(char *& st, UmlCanvas * canvas, char *);
 
-    BasicData * get_data() const;
+    virtual BasicData * get_data() const override;
 
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
     void label_default_position() const;
     void stereotype_default_position() const;
@@ -101,16 +101,17 @@ class RelationCanvas : public ArrowCanvas
     void show_assoc_class(CdClassCanvas *);
     void hide_assoc_class();
 
-    virtual void check_stereotypeproperties();
+    virtual void check_stereotypeproperties() override;
 
     static void drop(BrowserNode *, UmlCanvas *);
     static void drop(BrowserNode *, UmlCanvas *,
-                     Q3PtrDict<DiagramItem> & drawn);
+                     QHash<BasicData *, DiagramItem *> &drawn);
 
-    virtual bool represents(BrowserNode *);
+    virtual bool represents(BrowserNode *) override;
 
 protected:
     BrowserClass * update_begin(DiagramItem * cnend);
+    using DiagramItem::update;
     void update(bool updatepos);
     void update_actuals(RelationCanvas * plabel);
 
diff --git a/src/diagram/SdClassInstCanvas.cpp b/src/diagram/SdClassInstCanvas.cpp
index f07dcef85..b328510c0 100644
--- a/src/diagram/SdClassInstCanvas.cpp
+++ b/src/diagram/SdClassInstCanvas.cpp
@@ -30,7 +30,7 @@
 
 
 #include <qcursor.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
@@ -141,8 +141,8 @@ void SdClassInstCanvas::compute_size()
         ClassInstCanvas::compute_size(w, h, the_canvas());
     else {
         used_color = (itscolor == UmlDefaultColor)
-                     ? the_canvas()->browser_diagram()->get_color(UmlClass)
-                     : itscolor;
+                ? the_canvas()->browser_diagram()->get_color(UmlClass)
+                : itscolor;
 
         int minw;
         QFontMetrics fm(the_canvas()->get_font(UmlNormalUnderlinedFont));
@@ -213,6 +213,7 @@ void SdClassInstCanvas::modified()
 void SdClassInstCanvas::draw(QPainter & p)
 {
     if (visible()) {
+        QBrush backBrush = p.background();
         QRect r = rect();
         p.setRenderHint(QPainter::Antialiasing, true);
 
@@ -261,7 +262,7 @@ void SdClassInstCanvas::draw(QPainter & p)
             }
             }
 
-            QColor bckgrnd = p.backgroundColor();
+            QColor bckgrnd = p.background().color();
 
             p.setBackgroundMode(::Qt::TransparentMode);
             p.setFont(the_canvas()->get_font(UmlNormalFont));
@@ -271,7 +272,8 @@ void SdClassInstCanvas::draw(QPainter & p)
                 draw_text(r, ::Qt::AlignCenter, full_name(),
                           p.font(), fp);
 
-            p.setBackgroundColor(bckgrnd);
+            backBrush.setColor(bckgrnd);
+            p.setBackground(backBrush);
 
             if (fp != 0)
                 fputs("</g>\n", fp);
@@ -282,12 +284,20 @@ void SdClassInstCanvas::draw(QPainter & p)
     }
 }
 
+void SdClassInstCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
 // all cases
 QString SdClassInstCanvas::get_name() const
 {
     return (browser_node->get_type() == UmlClass)
-           ? iname
-           : QString(browser_node->get_name());
+            ? iname
+            : QString(browser_node->get_name());
 }
 
 // out of model case
@@ -297,7 +307,7 @@ void SdClassInstCanvas::set_name(const QString & s)
 }
 
 // UmlClass or UmlClassInstance
-UmlCode SdClassInstCanvas::type() const
+UmlCode SdClassInstCanvas::typeUmlCode() const
 {
     return browser_node->get_type();
 }
@@ -306,9 +316,9 @@ UmlCode SdClassInstCanvas::type() const
 BrowserNode * SdClassInstCanvas::get_type() const
 {
     return (browser_node->get_type() == UmlClass)
-           ? browser_node
-           : ((BrowserNode *)
-              ((ClassInstanceData *) browser_node->get_data())->get_class());
+            ? browser_node
+            : ((BrowserNode *)
+               ((ClassInstanceData *) browser_node->get_data())->get_class());
 }
 
 // ut of model case
@@ -361,172 +371,176 @@ void SdClassInstCanvas::open()
 
 void SdClassInstCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
     bool modelized = (browser_node->get_type() == UmlClassInstance);
 
     MenuFactory::createTitle(m, full_name());
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
 
     if (is_mortal())
-        m.insertItem(TR("Become immortal"), 3);
+        MenuFactory::addItem(m, tr("Become immortal"), 3);
     else
-        m.insertItem(TR("Become mortal"), 4);
+        MenuFactory::addItem(m, tr("Become mortal"), 4);
 
     if (life_line) {
         if (life_line->is_masked())
-            m.insertItem(TR("Show life line"), 15);
+            MenuFactory::addItem(m, tr("Show life line"), 15);
         else if (life_line->can_be_masked())
-            m.insertItem(TR("Hide life line"), 15);
+            MenuFactory::addItem(m, tr("Hide life line"), 15);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 5);
-    m.insertSeparator();
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 5);
+    m.addSeparator();
 
     if (browser_node->get_type() == UmlClassInstance)
-        m.insertItem(TR("Select in browser"), 6);
+        MenuFactory::addItem(m, tr("Select in browser"), 6);
 
-    m.insertItem(TR("Select class in browser"), 7);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Select class in browser"), 7);
+    m.addSeparator();
 
     if (modelized)
-        m.insertItem(TR("Exit from model"), 10);
+        MenuFactory::addItem(m, tr("Exit from model"), 10);
     else {
         if (container(UmlClass)->is_writable())
-            m.insertItem(TR("Insert in model"), 11);
+            MenuFactory::addItem(m, tr("Insert in model"), 11);
 
-        m.insertItem(TR("Replace it"), 12);
+        MenuFactory::addItem(m, tr("Replace it"), 12);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 8);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 8);
 
     if ((browser_node->get_type() == UmlClassInstance) &&
-        browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 9);
-
-    switch (m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();	// call package_modified
-        return;
+            browser_node->is_writable())
+        MenuFactory::addItem(m, tr("Delete from model"), 9);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();	// call package_modified
+            return;
 
-    case 1:
-        lower();
-        modified();	// call package_modified
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified
+            return;
 
-    case 13:
-        z_up();
-        modified();	// call package_modified()
-        return;
+        case 13:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 14:
-        z_down();
-        modified();	// call package_modified()
-        return;
+        case 14:
+            z_down();
+            modified();	// call package_modified()
+            return;
 
-    case 2:
-        open();	// call modified()
-        return;
+        case 2:
+            open();	// call modified()
+            return;
 
-    case 3:
-        set_mortal(FALSE);
-        break;
+        case 3:
+            set_mortal(FALSE);
+            break;
 
-    case 4:
-        set_mortal(TRUE);
-        break;
+        case 4:
+            set_mortal(TRUE);
+            break;
 
-    case 5:
-        edit_drawing_settings();
-        return;
+        case 5:
+            edit_drawing_settings();
+            return;
 
-    case 6:
-        browser_node->select_in_browser();
-        return;
+        case 6:
+            browser_node->select_in_browser();
+            return;
 
-    case 7:
-        get_type()->select_in_browser();
-        return;
+        case 7:
+            get_type()->select_in_browser();
+            return;
 
-    case 8:
-        delete_it();
-        break;
+        case 8:
+            delete_it();
+            break;
 
-    case 9:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 9:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    case 10: {
-        BasicData * d = browser_node->get_data();
+        case 10: {
+            BasicData * d = browser_node->get_data();
 
-        disconnect(d, SIGNAL(changed()), this, SLOT(modified()));
-        disconnect(d, SIGNAL(deleted()), this, SLOT(deleted()));
+            disconnect(d, SIGNAL(changed()), this, SLOT(modified()));
+            disconnect(d, SIGNAL(deleted()), this, SLOT(deleted()));
 
-        iname = browser_node->get_name();
-        browser_node = ((ClassInstanceData *) d)->get_class();
-        d = browser_node->get_data();
-        connect(d, SIGNAL(changed()), this, SLOT(modified()));
-        connect(d, SIGNAL(deleted()), this, SLOT(deleted()));
-    }
-    break;
+            iname = browser_node->get_name();
+            browser_node = ((ClassInstanceData *) d)->get_class();
+            d = browser_node->get_data();
+            connect(d, SIGNAL(changed()), this, SLOT(modified()));
+            connect(d, SIGNAL(deleted()), this, SLOT(deleted()));
+        }
+            break;
 
-    case 11: {
-        BasicData * d = browser_node->get_data();
+        case 11: {
+            BasicData * d = browser_node->get_data();
 
-        disconnect(d, SIGNAL(changed()), this, SLOT(modified()));
-        disconnect(d, SIGNAL(deleted()), this, SLOT(deleted()));
+            disconnect(d, SIGNAL(changed()), this, SLOT(modified()));
+            disconnect(d, SIGNAL(deleted()), this, SLOT(deleted()));
 
-        browser_node =
-            new BrowserClassInstance(iname, (BrowserClass *) browser_node,
-                                     container(UmlClass));
-        d = browser_node->get_data();
-        connect(d, SIGNAL(changed()), this, SLOT(modified()));
-        connect(d, SIGNAL(deleted()), this, SLOT(deleted()));
-    }
-    break;
+            browser_node =
+                    new BrowserClassInstance(iname, (BrowserClass *) browser_node,
+                                             container(UmlClass));
+            d = browser_node->get_data();
+            connect(d, SIGNAL(changed()), this, SLOT(modified()));
+            connect(d, SIGNAL(deleted()), this, SLOT(deleted()));
+        }
+            break;
 
-    case 12: {
-        BrowserNode * bn =
-            BrowserClassInstance::get_classinstance((BrowserClass *) browser_node);
+        case 12: {
+            BrowserNode * bn =
+                    BrowserClassInstance::get_classinstance((BrowserClass *) browser_node);
 
-        if (bn == 0)
-            return;
+            if (bn == 0)
+                return;
 
-        BasicData * d = browser_node->get_data();
+            BasicData * d = browser_node->get_data();
 
-        disconnect(d, SIGNAL(changed()), this, SLOT(modified()));
-        disconnect(d, SIGNAL(deleted()), this, SLOT(deleted()));
+            disconnect(d, SIGNAL(changed()), this, SLOT(modified()));
+            disconnect(d, SIGNAL(deleted()), this, SLOT(deleted()));
 
-        browser_node = bn;
-        d = browser_node->get_data();
-        connect(d, SIGNAL(changed()), this, SLOT(modified()));
-        connect(d, SIGNAL(deleted()), this, SLOT(deleted()));
-        modified();	// call package_modified
-        return;
-    }
+            browser_node = bn;
+            d = browser_node->get_data();
+            connect(d, SIGNAL(changed()), this, SLOT(modified()));
+            connect(d, SIGNAL(deleted()), this, SLOT(deleted()));
+            modified();	// call package_modified
+            return;
+        }
 
-    case 15:
-        life_line->set_masked(!life_line->is_masked());
-        modified();	// call package_modified()
-        return;
+        case 15:
+            life_line->set_masked(!life_line->is_masked());
+            modified();	// call package_modified()
+            return;
 
-    default:
-        return;
+        default:
+            return;
+        }
     }
 
     package_modified();
 }
 
-void SdClassInstCanvas::apply_shortcut(QString s)
+void SdClassInstCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -560,14 +574,14 @@ void SdClassInstCanvas::edit_drawing_settings()
         StateSpecVector st((browser_node->get_type() != UmlClass) ? 4 : 3);
         ColorSpecVector co(1);
 
-        st[0].set(TR("drawing mode"), &drawing_mode);
-        st[1].set(TR("write name:type \nhorizontally"), &write_horizontally);
-        st[2].set(TR("show class context"), &show_context_mode);
+        st[0].set(tr("drawing mode"), &drawing_mode);
+        st[1].set(tr("write name:type \nhorizontally"), &write_horizontally);
+        st[2].set(tr("show class context"), &show_context_mode);
 
         if (browser_node->get_type() != UmlClass)
-            st[3].set(TR("show stereotypes \nproperties"), &show_stereotype_properties);
+            st[3].set(tr("show stereotypes \nproperties"), &show_stereotype_properties);
 
-        co[0].set(TR("class instance color"), &itscolor);
+        co[0].set(tr("class instance color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -586,7 +600,7 @@ bool SdClassInstCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void SdClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdClassInstCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(3);
@@ -596,35 +610,34 @@ void SdClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         ShowContextMode show_context_mode;
         UmlColor itscolor;
 
-        st[0].set(TR("drawing mode"), &drawing_mode);
-        st[1].set(TR("write name:type \nhorizontally"), &write_horizontally);
-        st[2].set(TR("show class context"), &show_context_mode);
-        co[0].set(TR("class instance color"), &itscolor);
+        st[0].set(tr("drawing mode"), &drawing_mode);
+        st[1].set(tr("write name:type \nhorizontally"), &write_horizontally);
+        st[2].set(tr("show class context"), &show_context_mode);
+        co[0].set(tr("class instance color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                SdClassInstCanvas *canvas = (SdClassInstCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((SdClassInstCanvas *) it.current())->drawing_mode =
-                        drawing_mode;
+                    canvas->drawing_mode =
+                            drawing_mode;
 
                 if (!st[1].name.isEmpty())
-                    ((SdClassInstCanvas *) it.current())->write_horizontally =
-                        write_horizontally;
+                    canvas->write_horizontally =
+                            write_horizontally;
 
                 if (!st[2].name.isEmpty())
-                    ((SdClassInstCanvas *) it.current())->show_context_mode =
-                        show_context_mode;
+                    canvas->show_context_mode =
+                            show_context_mode;
 
                 if (!co[0].name.isEmpty())
-                    ((SdClassInstCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((SdClassInstCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -633,21 +646,14 @@ void SdClassInstCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void SdClassInstCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdClassInstCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    SdClassInstCanvas * x = (SdClassInstCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        SdClassInstCanvas * o = (SdClassInstCanvas *) it.current();
-
-        o->drawing_mode = x->drawing_mode;
-        o->show_context_mode = x->show_context_mode;
-        o->write_horizontally = x->write_horizontally;
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const SdClassInstCanvas * x = (const SdClassInstCanvas *) src;
+    drawing_mode = x->drawing_mode;
+    show_context_mode = x->show_context_mode;
+    write_horizontally = x->write_horizontally;
+    itscolor = x->itscolor;
+    modified();
 }
 
 bool SdClassInstCanvas::get_show_stereotype_properties() const
@@ -703,7 +709,7 @@ SdClassInstCanvas * SdClassInstCanvas::read(char *& st, UmlCanvas * canvas, char
         int id = read_id(st);
         BrowserClass * cl = BrowserClass::read_ref(st);
         SdClassInstCanvas * result =
-            new SdClassInstCanvas(cl, canvas, 0, id);
+                new SdClassInstCanvas(cl, canvas, 0, id);
 
         result->ClassInstCanvas::read(st, k);
 
@@ -721,21 +727,22 @@ SdClassInstCanvas * SdClassInstCanvas::read(char *& st, UmlCanvas * canvas, char
         result->compute_size();
 
         if ((read_file_format() < 72) &&
-            (result->used_drawing_mode == asInterface)) {
+                (result->used_drawing_mode == asInterface)) {
             result->drawing_mode = asClass;
             result->compute_size();
         }
 
         result->SdObjCanvas::read(st, read_keyword(st));
         result->show();
-
+        if (result->life_line)
+            result->life_line->update_pos();
         return result;
     }
     else if (!strcmp(k, "classinstancecanvas")) {
         int id = read_id(st);
         BrowserClassInstance * icl = BrowserClassInstance::read_ref(st);
         SdClassInstCanvas * result =
-            new SdClassInstCanvas(icl, canvas, 0, id);
+                new SdClassInstCanvas(icl, canvas, 0, id);
 
         result->ClassInstCanvas::read(st, k);
 
@@ -759,7 +766,7 @@ SdClassInstCanvas * SdClassInstCanvas::read(char *& st, UmlCanvas * canvas, char
             result->compute_size();
 
             if ((read_file_format() < 72) &&
-                (result->used_drawing_mode == asInterface)) {
+                    (result->used_drawing_mode == asInterface)) {
                 result->drawing_mode = asClass;
                 result->compute_size();
             }
@@ -781,7 +788,7 @@ SdClassInstCanvas * SdClassInstCanvas::read(char *& st, UmlCanvas * canvas, char
 
 void SdClassInstCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 
     BasicData * d = browser_node->get_data();
@@ -803,16 +810,16 @@ void SdClassInstCanvas::history_load(QBuffer & b)
 
 // for plug outs
 
-void SdClassInstCanvas::send(ToolCom * com, Q3CanvasItemList & all)
+void SdClassInstCanvas::send(ToolCom * com, QList<QGraphicsItem*> & all)
 {
-    Q3PtrList<SdClassInstCanvas> l;
-    Q3CanvasItemList::Iterator cit;
+    QList<SdClassInstCanvas *> l;
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
-        if ((di != 0) && (*cit)->visible()) {
-            switch (di->type()) {
+        if ((di != 0) && (*cit)->isVisible()) {
+            switch (di->typeUmlCode()) {
             case UmlClass:
             case UmlClassInstance:
                 l.append((SdClassInstCanvas *) di);
@@ -826,11 +833,7 @@ void SdClassInstCanvas::send(ToolCom * com, Q3CanvasItemList & all)
 
     com->write_unsigned(l.count());
 
-    Q3PtrListIterator<SdClassInstCanvas> it(l);
-
-    for (; it.current(); ++it) {
-        SdClassInstCanvas * i = it.current();
-
+    foreach (SdClassInstCanvas *i, l) {
         com->write_unsigned((unsigned) i->get_ident());
 
         if (i->browser_node->get_type() == UmlClass) {
diff --git a/src/diagram/SdClassInstCanvas.h b/src/diagram/SdClassInstCanvas.h
index e546122ae..37a051619 100644
--- a/src/diagram/SdClassInstCanvas.h
+++ b/src/diagram/SdClassInstCanvas.h
@@ -53,42 +53,43 @@ class SdClassInstCanvas : public QObject, public SdObjCanvas, public ClassInstCa
     ClassDrawingMode drawing_mode;
     ClassDrawingMode used_drawing_mode;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     SdClassInstCanvas(BrowserNode * t, UmlCanvas * canvas, int x, int id);
     virtual ~SdClassInstCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
 
     void compute_size();
-    virtual UmlCode type() const;	// -> class or classinstance
-    virtual QString get_name() const;	// all cases
-    virtual void set_name(const QString & s);	// out of model case
-    virtual BrowserNode * get_type() const;	// return class, all cases
-    virtual void set_type(BrowserNode * t);	// out of model case
-    virtual BrowserNodeList & get_types(BrowserNodeList &) const;
-    virtual BrowserNode * container(UmlCode) const;
-    virtual BrowserClass * get_class() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual UmlCode typeUmlCode() const override;	// -> class or classinstance
+    virtual QString get_name() const override;	// all cases
+    virtual void set_name(const QString & s) override;	// out of model case
+    virtual BrowserNode * get_type() const override;	// return class, all cases
+    virtual void set_type(BrowserNode * t) override;	// out of model case
+    virtual BrowserNodeList & get_types(BrowserNodeList &) const override;
+    virtual BrowserNode * container(UmlCode) const override;
+    virtual BrowserClass * get_class() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static SdClassInstCanvas * read(char *& , UmlCanvas * canvas, char *);
 
-    static void send(ToolCom * com, Q3CanvasItemList & all);
+    static void send(ToolCom * com, QList<QGraphicsItem*> & all);
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/SdContinuationCanvas.cpp b/src/diagram/SdContinuationCanvas.cpp
index da6f80273..0cf8852f8 100644
--- a/src/diagram/SdContinuationCanvas.cpp
+++ b/src/diagram/SdContinuationCanvas.cpp
@@ -31,11 +31,7 @@
 
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
-//Added by qt3to4:
 #include <QTextStream>
-
-
 #include "SdContinuationCanvas.h"
 #include "ContinuationDialog.h"
 #include "UmlGlobal.h"
@@ -73,12 +69,13 @@ void SdContinuationCanvas::delete_it()
 
 void SdContinuationCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     QBrush brsh = p.brush();
+    QBrush backBrush = p.background();
 
     p.setBackgroundMode((used_color == UmlTransparent) ? ::Qt::TransparentMode : ::Qt::OpaqueMode);
 
@@ -88,7 +85,8 @@ void SdContinuationCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("<g>\n", fp);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
@@ -110,14 +108,23 @@ void SdContinuationCanvas::draw(QPainter & p)
         fputs("</g>\n", fp);
     }
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode SdContinuationCanvas::type() const
+void SdContinuationCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode SdContinuationCanvas::typeUmlCode() const
 {
     return UmlContinuation;
 }
@@ -174,11 +181,11 @@ void SdContinuationCanvas::change_scale()
 {
     double scale = the_canvas()->zoom();
 
-    Q3CanvasRectangle::setVisible(FALSE);
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    QGraphicsRectItem::setVisible(FALSE);
+    setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     check_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void SdContinuationCanvas::modified()
@@ -193,28 +200,31 @@ void SdContinuationCanvas::modified()
 
 void SdContinuationCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-
-    MenuFactory::createTitle(m, TR("Continuation"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 6);
-    m.insertItem(TR("Go down"), 7);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 3);
+    QMenu m(0);
+
+    MenuFactory::createTitle(m, tr("Continuation"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 6);
+    MenuFactory::addItem(m, tr("Go down"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 4);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select linked items"), 4);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 5);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 5);
 
-    int index = m.exec(QCursor::pos());
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    int index = retAction->data().toInt();
 
     switch (index) {
     case 0:
@@ -258,11 +268,12 @@ void SdContinuationCanvas::menu(const QPoint &)
     default:
         return;
     }
+    }
 
     package_modified();
 }
 
-void SdContinuationCanvas::apply_shortcut(QString s)
+void SdContinuationCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -291,7 +302,7 @@ void SdContinuationCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("continuation color"), &itscolor);
+        co[0].set(tr("continuation color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -310,24 +321,23 @@ bool SdContinuationCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void SdContinuationCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdContinuationCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("continuation color"), &itscolor);
+        co[0].set(tr("continuation color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((SdContinuationCanvas *) it.current())->itscolor = itscolor;
-                ((SdContinuationCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                SdContinuationCanvas *canvas = (SdContinuationCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -336,28 +346,21 @@ void SdContinuationCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void SdContinuationCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdContinuationCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    SdContinuationCanvas * x = (SdContinuationCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        SdContinuationCanvas * o = (SdContinuationCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const SdContinuationCanvas * x = (const SdContinuationCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString SdContinuationCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString SdContinuationCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 aCorner SdContinuationCanvas::on_resize_point(const QPoint & p)
@@ -445,30 +448,30 @@ void SdContinuationCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
 
 void SdContinuationCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
 
 // for plug-out
 
-void SdContinuationCanvas::send(ToolCom * com, Q3CanvasItemList & all)
+void SdContinuationCanvas::send(ToolCom * com, QList<QGraphicsItem*> & all)
 {
     if (com->api_format() < 41)
         return;
 
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); (cit != all.end()); ++cit) {
         DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
-        if ((di != 0) && (*cit)->visible() && (di->type() == UmlContinuation)) {
+        if ((di != 0) && (*cit)->isVisible() && (di->typeUmlCode() == UmlContinuation)) {
             WrapperStr s = fromUnicode(((SdContinuationCanvas *) di)->name);
 
             com->write_bool(TRUE);	// one more
diff --git a/src/diagram/SdContinuationCanvas.h b/src/diagram/SdContinuationCanvas.h
index d20850a56..5f3c396cb 100644
--- a/src/diagram/SdContinuationCanvas.h
+++ b/src/diagram/SdContinuationCanvas.h
@@ -49,41 +49,43 @@ class SdContinuationCanvas : public QObject, public DiagramCanvas
 
     void check_size();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     SdContinuationCanvas(UmlCanvas * canvas, int x, int y, int id);
     virtual ~SdContinuationCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual aCorner on_resize_point(const QPoint &);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void change_scale();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual aCorner on_resize_point(const QPoint &) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void change_scale() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    static void send(ToolCom * com, Q3CanvasItemList & all);
+    static void send(ToolCom * com, QList<QGraphicsItem*> & all);
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static SdContinuationCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();
diff --git a/src/diagram/SdDurationCanvas.cpp b/src/diagram/SdDurationCanvas.cpp
index d305feb84..44efdf2eb 100644
--- a/src/diagram/SdDurationCanvas.cpp
+++ b/src/diagram/SdDurationCanvas.cpp
@@ -31,10 +31,7 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
-//Added by qt3to4:
 #include <QTextStream>
-
 #include "SdDurationCanvas.h"
 #include "SdLifeLineCanvas.h"
 #include "SdClassInstCanvas.h"
@@ -61,11 +58,11 @@ SdDurationCanvas::SdDurationCanvas(UmlCanvas * canvas, SdDurationSupport * sp,
     : SdMsgSupport(canvas, 0, v, DURATION_WIDTH,
                    (isdest) ? DURATION_MIN_HEIGHT : DURATION_START_HEIGHT,
                    0),
-    support(sp), itscolor(UmlDefaultColor), coregion(FALSE)
+      support(sp), itscolor(UmlDefaultColor), coregion(FALSE)
 {
     browser_node = canvas->browser_diagram();
     update_hpos();
-    setZ(sp->getZ() + 10);
+    setZValue(sp->getZ() + 10);
     show();
 
     support->add(this);
@@ -117,12 +114,10 @@ void SdDurationCanvas::change_scale()
 
 void SdDurationCanvas::update_hpos()
 {
-    move(support->sub_x(width()), 100000);
-
-    Q3PtrListIterator<SdDurationCanvas> itd(durations);
+    moveBy(support->sub_x(width()) - x(), 100000);
 
-    for (; itd.current(); ++itd)
-        itd.current()->update_hpos();
+    foreach (SdDurationCanvas *canvas, durations)
+        canvas->update_hpos();
 }
 
 void SdDurationCanvas::draw(QPainter & p)
@@ -130,8 +125,8 @@ void SdDurationCanvas::draw(QPainter & p)
     const QRect r = rect();
     p.setRenderHint(QPainter::Antialiasing, true);
     UmlColor used_color = (itscolor != UmlDefaultColor)
-                          ? itscolor
-                          : browser_node->get_color(UmlActivityDuration);
+            ? itscolor
+            : browser_node->get_color(UmlActivityDuration);
     QColor co = color(used_color);
 
     int w = width() - 1;
@@ -172,11 +167,11 @@ void SdDurationCanvas::draw(QPainter & p)
     if (fp != 0) {
         if (coregion) {
             fprintf(fp, "<g>\n"
-                    "\t<rect fill=\"%s\" stroke=\"none\" "
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n"
-                    "\t<path fill = \"none\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" "
-                    "d=\"M %d %d v %d h %d v %d M %d %d v %d h %d v %d\" />\n"
-                    "</g>\n",
+                        "\t<rect fill=\"%s\" stroke=\"none\" "
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n"
+                        "\t<path fill = \"none\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\" "
+                        "d=\"M %d %d v %d h %d v %d M %d %d v %d h %d v %d\" />\n"
+                        "</g>\n",
                     svg_color(used_color),
                     x, y, w, r.height() - 1,
                     x, y + w, -w, w, w,
@@ -184,9 +179,9 @@ void SdDurationCanvas::draw(QPainter & p)
         }
         else
             fprintf(fp, "<g>\n"
-                    "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n"
-                    "</g>\n",
+                        "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n"
+                        "</g>\n",
                     svg_color(used_color),
                     x, y, w, r.height() - 1);
     }
@@ -195,6 +190,14 @@ void SdDurationCanvas::draw(QPainter & p)
         show_mark(p, r);
 }
 
+void SdDurationCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
 void SdDurationCanvas::moveBy(double dx, double dy)
 {
     if (dy > 80000) {
@@ -202,10 +205,8 @@ void SdDurationCanvas::moveBy(double dx, double dy)
         DiagramCanvas::moveBy(dx, 0);
 
         // update messages position (even selected, this case is managed by the messages)
-        Q3PtrListIterator<SdMsgBaseCanvas> it(msgs);
-
-        for (; it.current(); ++it)
-            it.current()->update_hpos();
+        foreach (SdMsgBaseCanvas *canvas, msgs)
+            canvas->update_hpos();
     }
     else {
         double my = min_y();
@@ -217,10 +218,8 @@ void SdDurationCanvas::moveBy(double dx, double dy)
         DiagramCanvas::moveBy(0, dy);
 
         // move messages (even selected, this case is managed by the messages)
-        Q3PtrListIterator<SdMsgBaseCanvas> it(msgs);
-
-        for (; it.current(); ++it)
-            it.current()->moveBy(100000, dy);
+        foreach (SdMsgBaseCanvas *canvas, msgs)
+            canvas->moveBy(100000, dy);
     }
 
     support->update_v_to_contain(this, FALSE);
@@ -232,12 +231,10 @@ void SdDurationCanvas::prepare_for_move(bool on_resize)
     DiagramCanvas::prepare_for_move(on_resize);
 
     if (! on_resize) {
-        Q3PtrListIterator<SdDurationCanvas> itd(durations);
-
-        for (; itd.current(); ++itd) {
-            if (! itd.current()->selected()) {
-                the_canvas()->select(itd.current());
-                itd.current()->prepare_for_move(on_resize);
+        foreach (SdDurationCanvas *canvas, durations) {
+            if (! canvas->selected()) {
+                the_canvas()->select(canvas);
+                canvas->prepare_for_move(on_resize);
             }
         }
     }
@@ -248,7 +245,7 @@ double SdDurationCanvas::min_y() const
     return support->min_y();
 }
 
-UmlCode SdDurationCanvas::type() const
+UmlCode SdDurationCanvas::typeUmlCode() const
 {
     return UmlActivityDuration;
 }
@@ -262,12 +259,12 @@ DiagramItem::LineDirection SdDurationCanvas::allowed_direction(UmlCode c)
 // needed the duration to contain its messages
 void SdDurationCanvas::update_v_to_contain(const QRect re)
 {
-    const QRect r = rect();
+    const QRect r = sceneRect();
 
     if (re.top() < r.top()) {
         int dy = re.top() - r.top();
 
-        Q3CanvasItem::moveBy(0, dy);
+        QGraphicsItem::moveBy(0, dy);
         resize(r.width(), r.height() - dy);
         update_self();
     }
@@ -287,7 +284,7 @@ void SdDurationCanvas::update_v_to_contain(SdDurationCanvas * d, bool force)
         int b = (int) y() + height();
 
         if (d->y() < y()) {
-            Q3CanvasItem::moveBy(0, d->y() - y());
+            QGraphicsItem::moveBy(0, d->y() - y());
             resize(width(),
                    ((min_b > b) ? min_b : b) - (int) y());
             update_self();
@@ -304,11 +301,10 @@ void SdDurationCanvas::update_v_to_contain(SdDurationCanvas * d, bool force)
 
 void SdDurationCanvas::update_self()
 {
-    Q3PtrListIterator<SdMsgBaseCanvas> it(msgs);
     QRect r = rect();
 
-    for (; it.current(); ++it)
-        it.current()->check_vpos(r);
+    foreach (SdMsgBaseCanvas *canvas, msgs)
+        canvas->check_vpos(r);
 }
 
 QString SdDurationCanvas::may_start(UmlCode &) const
@@ -321,13 +317,13 @@ QString SdDurationCanvas::may_connect(UmlCode & l, const DiagramItem * dest) con
     if (l == UmlAnchor)
         return dest->may_start(l);
     else {
-        switch (dest->type()) {
+        switch (dest->typeUmlCode()) {
         case UmlActivityDuration:
         case UmlLifeLine:
             return 0;
 
         default:
-            return TR("illegal");
+            return tr("illegal");
         }
     }
 }
@@ -352,7 +348,7 @@ void SdDurationCanvas::connexion(UmlCode l, DiagramItem * dest,
     switch (l) {
     case UmlSyncSelfMsg:
     case UmlAsyncSelfMsg:
-        if (dest->type() == UmlLifeLine)
+        if (dest->typeUmlCode() == UmlLifeLine)
             dest = this;
         else if (((BrowserSeqDiagram *) browser_node)->is_overlapping_bars()) {
             SdDurationCanvas * d = (SdDurationCanvas *) dest;
@@ -365,7 +361,7 @@ void SdDurationCanvas::connexion(UmlCode l, DiagramItem * dest,
         break;
 
     case UmlSelfReturnMsg:
-        if (dest->type() == UmlLifeLine)
+        if (dest->typeUmlCode() == UmlLifeLine)
             dest = this;
 
         (new SdSelfMsgCanvas(the_canvas(), (SdDurationCanvas *) dest, l, s.y(), 0))->upper();
@@ -377,7 +373,7 @@ void SdDurationCanvas::connexion(UmlCode l, DiagramItem * dest,
 
     default:
         if (dest != this) {
-            if (dest->type() == UmlLifeLine)
+            if (dest->typeUmlCode() == UmlLifeLine)
                 // insert an activity duration canvas
                 dest = new SdDurationCanvas(the_canvas(), ((SdLifeLineCanvas *) dest), s.y(), TRUE);
             else if (((BrowserSeqDiagram *) browser_node)->is_overlapping_bars() &&
@@ -389,7 +385,7 @@ void SdDurationCanvas::connexion(UmlCode l, DiagramItem * dest,
             }
 
             (new SdMsgCanvas(the_canvas(), this, (SdDurationCanvas *) dest, l, s.y(), 0))
-            ->upper();
+                    ->upper();
         }
     }
 }
@@ -407,7 +403,7 @@ bool SdDurationCanvas::connexion(UmlCode l, const QPoint & s, const QPoint & e)
 
         // 'this' is dest
         if (((BrowserSeqDiagram *) browser_node)->is_overlapping_bars() &&
-            (!msgs.isEmpty() || !durations.isEmpty())) { // 'this' not just created
+                (!msgs.isEmpty() || !durations.isEmpty())) { // 'this' not just created
             dest = new SdDurationCanvas(the_canvas(), this, s.y(), TRUE);
             update_v_to_contain((SdDurationCanvas *) dest, FALSE);
         }
@@ -446,7 +442,7 @@ void SdDurationCanvas::add(SdMsgBaseCanvas * m)
 
 void SdDurationCanvas::remove(SdMsgBaseCanvas * m)
 {
-    msgs.removeRef(m);
+    msgs.removeOne(m);
 
     if (msgs.isEmpty() && durations.isEmpty())
         // now useless, remove it
@@ -460,7 +456,7 @@ void SdDurationCanvas::add(SdDurationCanvas * d)
 
 void SdDurationCanvas::remove(SdDurationCanvas * d)
 {
-    durations.remove(d);
+    durations.removeOne(d);
 
     if (msgs.isEmpty() && durations.isEmpty())
         // now useless, remove it
@@ -469,20 +465,15 @@ void SdDurationCanvas::remove(SdDurationCanvas * d)
 
 void SdDurationCanvas::cut_internal(int py)
 {
-    Q3PtrListIterator<SdDurationCanvas> itd(durations);
-
-    for (; itd.current(); ++itd)
-        itd.current()->cut_internal(py);
+    foreach (SdDurationCanvas *canvas, durations)
+        canvas->cut_internal(py);
 
     QRect r = rect();
     resize(width(), py - r.top());
     SdDurationCanvas * newone = 0;
 
-    Q3PtrList<SdMsgBaseCanvas> ms(msgs);
-    Q3PtrListIterator<SdMsgBaseCanvas> it(ms);
-
-    for (; it.current(); ++it) {
-        if (it.current()->rect().center().y() > py) {
+    foreach (SdMsgBaseCanvas *canvas, msgs) {
+        if (canvas->rect().center().y() > py) {
             // on the new duration
             if (newone == 0) {
                 // width and height to 0 on creation to not have
@@ -490,21 +481,18 @@ void SdDurationCanvas::cut_internal(int py)
                 newone = new SdDurationCanvas(the_canvas(), support, r.x(), py, 0, 0, 0, coregion);
                 newone->resize(width(), r.bottom() - py);
                 newone->itscolor = itscolor;
-                newone->setZ(z());
+                newone->setZValue(zValue());
                 newone->show();
             }
 
-            remove(it.current());
-            newone->add(it.current());
-            it.current()->change_duration(this, newone);
+            remove(canvas);
+            newone->add(canvas);
+            canvas->change_duration(this, newone);
         }
     }
 
-    Q3PtrList<SdDurationCanvas> durs(durations);
-    Q3PtrListIterator<SdDurationCanvas> itdur(durs);
-
-    for (itdur.toFirst() ; itdur.current(); ++itdur) {
-        if (itdur.current()->rect().center().y() > py) {
+    foreach (SdDurationCanvas *canvas, durations) {
+        if (canvas->rect().center().y() > py) {
             // on the new duration
             if (newone == 0) {
                 // width and height to 0 on creation to not have
@@ -512,16 +500,16 @@ void SdDurationCanvas::cut_internal(int py)
                 newone = new SdDurationCanvas(the_canvas(), support, r.x(), py, 0, 0, 0, coregion);
                 newone->resize(width(), r.bottom() - py);
                 newone->itscolor = itscolor;
-                newone->setZ(z());
+                newone->setZValue(zValue());
                 newone->show();
             }
 
-            remove(itdur.current());
-            newone->add(itdur.current());
-            itdur.current()->support =  newone;
+            remove(canvas);
+            newone->add(canvas);
+            canvas->support =  newone;
         }
 
-        itdur.current()->update_v_to_contain(itdur.current(), TRUE);
+        canvas->update_v_to_contain(canvas, TRUE);
     }
 }
 
@@ -531,16 +519,15 @@ void SdDurationCanvas::cut(const QPoint & p)
     package_modified();
 }
 
-void SdDurationCanvas::merge(Q3PtrList<SdDurationCanvas> & l)
+void SdDurationCanvas::merge(QList<SdDurationCanvas *> & l)
 {
-    l.removeRef(this);
+    l.removeOne(this);
 
     QRect r = rect();
     int vmin = r.top();
     int vmax = r.bottom();
-    SdDurationCanvas * d;
 
-    for (d = l.first(); d != 0; d = l.next()) {
+    foreach (SdDurationCanvas *d, l) {
         QRect dr = d->rect();
 
         if (dr.top() < vmin)
@@ -553,7 +540,7 @@ void SdDurationCanvas::merge(Q3PtrList<SdDurationCanvas> & l)
     }
 
     if (vmin < r.top())
-        Q3CanvasItem::moveBy(0, vmin - r.top());
+        QGraphicsItem::moveBy(0, vmin - r.top());
 
     resize(r.width(), vmax - vmin + 1);
     update_self();
@@ -561,23 +548,17 @@ void SdDurationCanvas::merge(Q3PtrList<SdDurationCanvas> & l)
 
 void SdDurationCanvas::collapse(SdDurationCanvas * d)
 {
-    Q3PtrList<SdMsgBaseCanvas> & ms = d->msgs;
-
-    while (! ms.isEmpty()) {
-        SdMsgBaseCanvas * m = ms.take(0);
-
-        msgs.append(m);
+    foreach (SdMsgBaseCanvas *m, d->msgs) {
+        msgs << m;
         m->change_duration(d, this);
     }
+    d->msgs.clear();
 
-    Q3PtrList<SdDurationCanvas> & durs = d->durations;
-
-    while (! durs.isEmpty()) {
-        SdDurationCanvas * dur = durs.take(0);
-
-        durations.append(dur);
+    foreach (SdDurationCanvas *dur, d->durations) {
+        durations << dur;
         dur->support = this;
     }
+    d->durations.clear();
 
     d->delete_it();
 }
@@ -585,18 +566,18 @@ void SdDurationCanvas::collapse(SdDurationCanvas * d)
 void SdDurationCanvas::go_up(SdMsgBaseCanvas * m, bool isdest)
 {
     // create a new overlapping bar and move m in it
-    int v = (m->type() != UmlSelfReturnMsg)
+    int v = (m->typeUmlCode() != UmlSelfReturnMsg)
             ? (int) m->y()
             : (int)(m->y() - DURATION_MIN_HEIGHT * the_canvas()->zoom() + m->rect().height() / 2);
     SdDurationCanvas * d =
-        new SdDurationCanvas(the_canvas(), this, v, isdest);
+            new SdDurationCanvas(the_canvas(), this, v, isdest);
     update_v_to_contain(d, FALSE);
 
     d->msgs.append(m);
     m->change_duration(this, d);
     d->update_hpos(); // update sub duration and msg hpos
     d->update_self();
-    msgs.removeRef(m);
+    msgs.removeOne(m);
     m->upper();
 }
 
@@ -615,7 +596,7 @@ void SdDurationCanvas::go_down(SdMsgBaseCanvas * m)
 void SdDurationCanvas::toFlat()
 {
     while (! durations.isEmpty()) {
-        SdDurationCanvas * d = durations.getFirst();
+        SdDurationCanvas * d = durations.first();
 
         d->toFlat();
         collapse(d);
@@ -633,7 +614,7 @@ void SdDurationCanvas::toOverlapping()
     unsigned index = 0;
 
     while (! msgs.isEmpty())
-        v[index++] = msgs.take(0);
+        v[index++] = msgs.takeFirst();
 
     unsigned sup = sz;
 
@@ -688,7 +669,7 @@ void SdDurationCanvas::toOverlapping(SdMsgBaseCanvas ** v,
         default: // 1 or 2
             if (! first) {
                 SdDurationCanvas * sd =
-                    new SdDurationCanvas(the_canvas(), this, (int) m->y(), TRUE);
+                        new SdDurationCanvas(the_canvas(), this, (int) m->y(), TRUE);
 
                 if (d == 1) {
                     index -= 1;
@@ -719,17 +700,13 @@ void SdDurationCanvas::toOverlapping(SdMsgBaseCanvas ** v,
 
 void SdDurationCanvas::postToOverlapping()
 {
-    Q3PtrListIterator<SdDurationCanvas> itd(durations);
+    foreach (SdDurationCanvas *canvas, durations)
+        canvas->postToOverlapping();
 
-    for (; itd.current(); ++itd)
-        itd.current()->postToOverlapping();
-
-    Q3PtrListIterator<SdMsgBaseCanvas> it(msgs);
-
-    for (; it.current(); ++it) {
-        it.current()->upper();
-        it.current()->update_hpos();
-        ((DiagramItem *) it.current())->update();	// not QCanvasItem::update
+    foreach (SdMsgBaseCanvas *canvas, msgs) {
+        canvas->upper();
+        canvas->update_hpos();
+        canvas->DiagramItem::update();	// not QCanvasItem::update
     }
 }
 
@@ -749,113 +726,117 @@ void SdDurationCanvas::modified()
 
 void SdDurationCanvas::menu(const QPoint & p)
 {
-    Q3PopupMenu m(0);
-    Q3CanvasItemList items = collisions(TRUE);
-    Q3PtrList<SdDurationCanvas> l;
-    Q3CanvasItemList::ConstIterator it;
-    Q3CanvasItemList::ConstIterator end = items.end();
+    QMenu m(0);
+    QList<QGraphicsItem*> items = collidingItems();
+    QList<SdDurationCanvas *> l;
+    QList<QGraphicsItem*>::ConstIterator it;
+    QList<QGraphicsItem*>::ConstIterator end = items.end();
 
     for (it = items.begin(); it != end; ++it) {
-        if ((*it)->visible()) {
+        if ((*it)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*it);
 
             if ((di != 0) &&
-                (di->type() == UmlActivityDuration) &&
-                (((SdDurationCanvas *) di)->support == support))
+                    (di->typeUmlCode() == UmlActivityDuration) &&
+                    (((SdDurationCanvas *) di)->support == support))
                 l.append((SdDurationCanvas *) di);
         }
     }
 
-    MenuFactory::createTitle(m, TR("Activity bar"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 9);
-    m.insertItem(TR("Go down"), 10);
-    m.insertSeparator();
-    m.insertItem((coregion) ? TR("Draw as activity bar") :  TR("Draw as a coregion"), 7);
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Select linked items"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 4);
-    m.insertSeparator();
-    m.insertItem(TR("Cut here"), 5);
+    MenuFactory::createTitle(m, tr("Activity bar"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 9);
+    MenuFactory::addItem(m, tr("Go down"), 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, (coregion) ? tr("Draw as activity bar") :  tr("Draw as a coregion"), 7);
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select linked items"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Cut here"), 5);
 
     if (!l.isEmpty())
-        m.insertItem(TR("Merge juxtaposed activity bars"), 6);
+        MenuFactory::addItem(m, tr("Merge juxtaposed activity bars"), 6);
 
     if (support->isaDuration())
-        m.insertItem(TR("Collapse in parent bar"), 8);
+        MenuFactory::addItem(m, tr("Collapse in parent bar"), 8);
 
-    switch (m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();
-        return;
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();
+            return;
 
-    case 1:
-        lower();
-        modified();
-        return;
+        case 1:
+            lower();
+            modified();
+            return;
 
-    case 9:
-        z_up();
-        modified();	// call package_modified()
-        return;
+        case 9:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 10:
-        z_down();
-        modified();	// call package_modified()
-        return;
+        case 10:
+            z_down();
+            modified();	// call package_modified()
+            return;
 
-    case 2:
-        edit_drawing_settings();
-        return;
+        case 2:
+            edit_drawing_settings();
+            return;
 
-    case 3:
-        select_associated();
-        break;
+        case 3:
+            select_associated();
+            break;
 
-    case 4:
-        delete_it();
-        package_modified();
-        break;
+        case 4:
+            delete_it();
+            package_modified();
+            break;
 
-    case 5:
-        cut(p);
-        package_modified();
-        break;
+        case 5:
+            cut(p);
+            package_modified();
+            break;
 
-    case 6:
-        merge(l);
-        package_modified();
-        break;
+        case 6:
+            merge(l);
+            package_modified();
+            break;
 
-    case 7:
-        coregion = !coregion;
-        modified();
-        return;
+        case 7:
+            coregion = !coregion;
+            modified();
+            return;
 
-    case 8: {
-        SdDurationCanvas * d = (SdDurationCanvas *) support;
+        case 8: {
+            SdDurationCanvas * d = (SdDurationCanvas *) support;
 
-        d->collapse(this);
-        d->update_hpos(); // update sub duration and msg hpos
-        d->update_self();
-    }
+            d->collapse(this);
+            d->update_hpos(); // update sub duration and msg hpos
+            d->update_self();
+        }
 
-    package_modified();
-    break;
+            package_modified();
+            break;
 
-    default:
-        return;
+        default:
+            return;
+        }
     }
 
     canvas()->update();
 }
 
-void SdDurationCanvas::apply_shortcut(QString s)
+void SdDurationCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -880,7 +861,7 @@ void SdDurationCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("duration color"), &itscolor);
+        co[0].set(tr("duration color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -899,24 +880,23 @@ bool SdDurationCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void SdDurationCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdDurationCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("duration color"), &itscolor);
+        co[0].set(tr("duration color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((SdDurationCanvas *) it.current())->itscolor = itscolor;
-                ((SdDurationCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                SdDurationCanvas *canvas = (SdDurationCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -925,18 +905,11 @@ void SdDurationCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void SdDurationCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdDurationCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    SdDurationCanvas * x = (SdDurationCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        SdDurationCanvas * o = (SdDurationCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const SdDurationCanvas * x = (const SdDurationCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 aCorner SdDurationCanvas::on_resize_point(const QPoint & p)
@@ -947,7 +920,7 @@ aCorner SdDurationCanvas::on_resize_point(const QPoint & p)
 // redefined to not change width_scale100 and center_x_scale100
 void SdDurationCanvas::resize(int wi, int he)
 {
-    setSize(wi, he);
+    setRect(0,0,wi, he);
 
     if (!((UmlCanvas *) canvas())->do_zoom()) {
         double zoom = the_canvas()->zoom();
@@ -999,11 +972,9 @@ void SdDurationCanvas::select_associated()
     if (! selected())
         the_canvas()->select(this);
 
-    Q3PtrListIterator<SdMsgBaseCanvas> it(msgs);
-
-    for (; it.current(); ++it)
-        if (! it.current()->selected())
-            it.current()->select_associated();
+    foreach (SdMsgBaseCanvas *canvas, msgs)
+        if (! canvas->selected())
+            canvas->select_associated();
 }
 
 bool SdDurationCanvas::copyable() const
@@ -1011,10 +982,8 @@ bool SdDurationCanvas::copyable() const
     if (! selected())
         return FALSE;
 
-    Q3PtrListIterator<SdMsgBaseCanvas> it(msgs);
-
-    for (; it.current(); ++it)
-        if (it.current()->copyable())
+    foreach (SdMsgBaseCanvas *canvas, msgs)
+        if (canvas->copyable())
             return TRUE;
 
     return FALSE;
@@ -1027,7 +996,7 @@ void SdDurationCanvas::update_instance_dead()
 
 int SdDurationCanvas::sub_x(int sub_w) const
 {
-    QRect r = rect();
+    QRect r = sceneBoundingRect().toRect();
 
     return r.right() - sub_w / 2 + 1;
 }
@@ -1049,33 +1018,25 @@ bool SdDurationCanvas::isOverlappingDuration() const
 
 double SdDurationCanvas::getZ() const
 {
-    return z();
+    return zValue();
 }
 
-void SdDurationCanvas::propag_visible(Q3PtrList<SdDurationCanvas> & l, bool y)
+void SdDurationCanvas::propag_visible(QList<SdDurationCanvas *> & l, bool y)
 {
-    Q3PtrListIterator<SdDurationCanvas> itd(l);
-    SdDurationCanvas * d;
+    foreach (SdDurationCanvas *d, l) {
+        d->QGraphicsItem::setVisible(y);
 
-    for (; (d = itd.current()) != 0; ++itd) {
-        d->Q3CanvasItem::setVisible(y);
-
-        Q3PtrListIterator<SdMsgBaseCanvas> itm(d->msgs);
-
-        for (; itm.current(); ++itm)
-            itm.current()->Q3CanvasItem::setVisible(y);
+        foreach (SdMsgBaseCanvas *msg, d->msgs)
+            msg->QGraphicsItem::setVisible(y);
 
         propag_visible(d->durations, y);
     }
 }
 
-void SdDurationCanvas::propag_dz(Q3PtrList<SdDurationCanvas> & l, double dz)
+void SdDurationCanvas::propag_dz(QList<SdDurationCanvas *> & l, double dz)
 {
-    Q3PtrListIterator<SdDurationCanvas> it(l);
-    SdDurationCanvas * d;
-
-    for (; (d = it.current()) != 0; ++it) {
-        d->Q3CanvasItem::setZ(d->z() + dz);
+    foreach (SdDurationCanvas *d, l) {
+        d->QGraphicsItem::setZValue(d->zValue() + dz);
         propag_dz(d->durations, dz);
     }
 }
@@ -1104,10 +1065,8 @@ void SdDurationCanvas::save_internal(QTextStream & st) const
     nl_indent(st);
     save_xyzwh(st, this, "xyzwh");
 
-    Q3PtrListIterator<SdDurationCanvas> itd(durations);
-
-    for (; itd.current(); ++itd)
-        itd.current()->save_sub(st);
+    foreach (SdDurationCanvas *canvas, durations)
+        canvas->save_sub(st);
 
     indent(-1);
     nl_indent(st);
@@ -1127,16 +1086,16 @@ void SdDurationCanvas::save(QTextStream & st, bool ref, QString & warning) const
 }
 
 SdDurationCanvas * SdDurationCanvas::read(char *& st, UmlCanvas * canvas,
-        bool ref)
+                                          bool ref)
 {
     return read(st, canvas,
                 read_keyword(st, (ref) ? "durationcanvas_ref"
-                             : "durationcanvas"));
+                                       : "durationcanvas"));
 }
 
 SdDurationCanvas * SdDurationCanvas::read_internal(char *& st,
-        UmlCanvas * canvas, int id,
-        SdDurationSupport * sp)
+                                                   UmlCanvas * canvas, int id,
+                                                   SdDurationSupport * sp)
 {
     UmlColor color = UmlDefaultColor;
     bool coreg = FALSE;
@@ -1158,11 +1117,11 @@ SdDurationCanvas * SdDurationCanvas::read_internal(char *& st,
     (void) read_double(st);	// width not used to bypass old bug
 
     SdDurationCanvas * result =
-        new SdDurationCanvas(canvas, sp, x, y, DURATION_WIDTH,
-                             (int) read_double(st), id, coreg);
+            new SdDurationCanvas(canvas, sp, x, y, DURATION_WIDTH,
+                                 (int) read_double(st), id, coreg);
 
     result->itscolor = color;
-    result->setZ(z);
+    result->setZValue(z);
     result->update_hpos();	// in case the current font is not the original one
     result->set_center100();
     result->show();
@@ -1203,7 +1162,7 @@ SdDurationCanvas * SdDurationCanvas::read(char *& st, UmlCanvas * canvas, char *
 
 void SdDurationCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
 
@@ -1216,19 +1175,15 @@ void SdDurationCanvas::history_save(QBuffer & b) const
     ::save(height(), b);
     ::save_ptr(support, b);
 
-    Q3PtrListIterator<SdMsgBaseCanvas> it(msgs);
-
     ::save((int) msgs.count(), b);
 
-    for (; it.current(); ++it)
-        ::save(it.current(), b);
-
-    Q3PtrListIterator<SdDurationCanvas> itd(durations);
+    foreach (SdMsgBaseCanvas *canvas, msgs)
+        ::save(canvas, b);
 
     ::save((int) durations.count(), b);
 
-    for (; itd.current(); ++itd)
-        ::save(itd.current(), b);
+    foreach (SdDurationCanvas *canvas, durations)
+        ::save(canvas, b);
 }
 
 void SdDurationCanvas::history_load(QBuffer & b)
@@ -1241,7 +1196,7 @@ void SdDurationCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     support = (SdDurationSupport *) ::load_ptr(b);
 
@@ -1267,16 +1222,15 @@ void SdDurationCanvas::history_load(QBuffer & b)
 unsigned SdDurationCanvas::count_msg(int api_format) const
 {
     unsigned count = 0;
-    Q3PtrListIterator<SdMsgBaseCanvas> itm(msgs);
     double maxy = 0;
     bool isreturn = FALSE;
 
-    for (; itm.current(); ++itm) {
-        switch (itm.current()->type()) {
+    foreach (SdMsgBaseCanvas *canvas, msgs) {
+        switch (canvas->typeUmlCode()) {
         case UmlSyncMsg:
         case UmlAsyncMsg:
         case UmlReturnMsg:
-            if (itm.current()->get_dest() == (const SdMsgSupport *) this)
+            if (canvas->get_dest() == (const SdMsgSupport *) this)
                 break;
 
             // no break
@@ -1285,10 +1239,10 @@ unsigned SdDurationCanvas::count_msg(int api_format) const
             count += 1;
         }
 
-        if (itm.current()->y() > maxy) {
-            maxy = itm.current()->y();
+        if (canvas->y() > maxy) {
+            maxy = canvas->y();
 
-            switch (itm.current()->type()) {
+            switch (canvas->typeUmlCode()) {
             case UmlReturnMsg:
             case UmlSelfReturnMsg:
                 isreturn = TRUE;
@@ -1303,38 +1257,35 @@ unsigned SdDurationCanvas::count_msg(int api_format) const
     if (!isreturn)
         count += 1;
 
-    Q3PtrListIterator<SdDurationCanvas> itd(durations);
-
-    for (; itd.current(); ++itd)
-        count += itd.current()->count_msg(api_format);
+    foreach (SdDurationCanvas *canvas, durations)
+        count += canvas->count_msg(api_format);
 
     return count;
 }
 
 void SdDurationCanvas::send(ToolCom * com, int id) const
 {
-    Q3PtrListIterator<SdMsgBaseCanvas> itm(msgs);
     double maxy = 0;
     bool isreturn = FALSE;
 
-    for (; itm.current(); ++itm) {
-        switch (itm.current()->type()) {
+    foreach (SdMsgBaseCanvas *canvas, msgs) {
+        switch (canvas->typeUmlCode()) {
         case UmlSyncMsg:
         case UmlAsyncMsg:
         case UmlReturnMsg:
-            if (itm.current()->get_dest() == (const SdMsgSupport *) this)
+            if (canvas->get_dest() == (const SdMsgSupport *) this)
                 break;
 
             // no break
         default:
             // msg start from duration, except for found msg
-            itm.current()->send(com, id);
+            canvas->send(com, id);
         }
 
-        if (itm.current()->y() > maxy) {
-            maxy = itm.current()->y();
+        if (canvas->y() > maxy) {
+            maxy = canvas->y();
 
-            switch (itm.current()->type()) {
+            switch (canvas->typeUmlCode()) {
             case UmlReturnMsg:
             case UmlSelfReturnMsg:
                 isreturn = TRUE;
@@ -1351,8 +1302,6 @@ void SdDurationCanvas::send(ToolCom * com, int id) const
                               (unsigned) y() + height(),
                               anImplicitReturn, "", "", "");
 
-    Q3PtrListIterator<SdDurationCanvas> itd(durations);
-
-    for (; itd.current(); ++itd)
-        itd.current()->send(com, id);
+    foreach (SdDurationCanvas *canvas, durations)
+        canvas->send(com, id);
 }
diff --git a/src/diagram/SdDurationCanvas.h b/src/diagram/SdDurationCanvas.h
index 13700125f..3b56ea633 100644
--- a/src/diagram/SdDurationCanvas.h
+++ b/src/diagram/SdDurationCanvas.h
@@ -46,8 +46,8 @@ class SdDurationCanvas : public QObject, public SdMsgSupport, public SdDurationS
 
 protected:
     SdDurationSupport * support;
-    Q3PtrList<SdDurationCanvas> durations;
-    Q3PtrList<SdMsgBaseCanvas> msgs;
+    QList<SdDurationCanvas *> durations;
+    QList<SdMsgBaseCanvas *> msgs;
     UmlColor itscolor;
     bool coregion;
 
@@ -59,7 +59,7 @@ class SdDurationCanvas : public QObject, public SdMsgSupport, public SdDurationS
     void cut_internal(int py);
     void update_self();
     void cut(const QPoint & p);
-    void merge(Q3PtrList<SdDurationCanvas> &);
+    void merge(QList<SdDurationCanvas *> &);
     void collapse(SdDurationCanvas *);
     void toOverlapping(SdMsgBaseCanvas **, SdDurationCanvas * orig,
                        unsigned & index, unsigned sz);
@@ -67,73 +67,76 @@ class SdDurationCanvas : public QObject, public SdMsgSupport, public SdDurationS
 
     static SdDurationCanvas * read_internal(char *& st, UmlCanvas *, int id, SdDurationSupport *);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     SdDurationCanvas(UmlCanvas * canvas, SdDurationSupport * sp,
                      int v, bool isdest);
     virtual ~SdDurationCanvas();
 
-    virtual void delete_it();
-
-    virtual void add(SdMsgBaseCanvas *);
-    virtual void remove(SdMsgBaseCanvas *);
-    virtual void add(SdDurationCanvas *);
-    virtual void remove(SdDurationCanvas *);
-    virtual void update_instance_dead();
-    virtual void update_v_to_contain(SdDurationCanvas *, bool force);
-    virtual int sub_x(int sub_w) const;
-    virtual double min_y() const;
-    virtual SdLifeLineCanvas * get_line() const;
-    virtual bool isaDuration() const;
-    virtual bool isOverlappingDuration() const;
-    virtual double getZ() const;
+    virtual void delete_it() override;
+
+    virtual void add(SdMsgBaseCanvas *) override;
+    virtual void remove(SdMsgBaseCanvas *) override;
+    virtual void add(SdDurationCanvas *) override;
+    using SdDurationSupport::remove;
+    using SdMsgSupport::remove;
+    virtual void remove(SdDurationCanvas *) override;
+    virtual void update_instance_dead() override;
+    virtual void update_v_to_contain(SdDurationCanvas *, bool force) override;
+    virtual int sub_x(int sub_w) const override;
+    virtual double min_y() const override;
+    virtual SdLifeLineCanvas * get_line() const override;
+    virtual bool isaDuration() const override;
+    virtual bool isOverlappingDuration() const override;
+    virtual double getZ() const override;
     void go_up(SdMsgBaseCanvas *, bool isdest);
     void go_down(SdMsgBaseCanvas *);
     void update_hpos();
-    virtual void update_v_to_contain(const QRect re);
+    virtual void update_v_to_contain(const QRect re) override;
     void toFlat();
     void toOverlapping();
 
     virtual void draw(QPainter & p);
-    virtual void moveBy(double dx, double dy);
-    virtual void prepare_for_move(bool on_resize);
-
-    virtual UmlCode type() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual bool may_connect(UmlCode l) const;
-    virtual aCorner on_resize_point(const QPoint &);
-    virtual void resize(int w, int h);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void change_scale();
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual bool connexion(UmlCode, const QPoint &, const QPoint &);
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual LineDirection allowed_direction(UmlCode);
-    virtual void select_associated();
-    virtual bool copyable() const;
-    virtual void history_save(QBuffer & b) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
-
-    virtual void apply_shortcut(QString s);
+    virtual void moveBy(double dx, double dy) override;
+    virtual void prepare_for_move(bool on_resize) override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual bool may_connect(UmlCode l) const override;
+    virtual aCorner on_resize_point(const QPoint &) override;
+    virtual void resize(int w, int h) override;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void change_scale() override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual bool connexion(UmlCode, const QPoint &, const QPoint &) override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual LineDirection allowed_direction(UmlCode) override;
+    virtual void select_associated() override;
+    virtual bool copyable() const override;
+    virtual void history_save(QBuffer & b) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
+
+    virtual void apply_shortcut(const QString & s) override;
     void edit_drawing_settings();
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static SdDurationCanvas * read(char *& st, UmlCanvas * canvas, char *);
     static SdDurationCanvas * read(char *& st, UmlCanvas * canvas, bool ref);
 
     unsigned count_msg(int api_format) const;
     void send(ToolCom * com, int id) const;
 
-    static void propag_visible(Q3PtrList<SdDurationCanvas> &, bool y);
-    static void propag_dz(Q3PtrList<SdDurationCanvas> &, double dz);
+    static void propag_visible(QList<SdDurationCanvas *> &, bool y);
+    static void propag_dz(QList<SdDurationCanvas *> &, double dz);
 
 private slots:
     void modified();
diff --git a/src/diagram/SdDurationSupport.h b/src/diagram/SdDurationSupport.h
index b675f7657..44a1ec27c 100644
--- a/src/diagram/SdDurationSupport.h
+++ b/src/diagram/SdDurationSupport.h
@@ -28,7 +28,7 @@
 #ifndef SDDURATIONSUPPORT_H
 #define SDDURATIONSUPPORT_H
 
-#include <qlist.h>
+#include <QList>
 
 class SdDurationCanvas;
 class SdLifeLineCanvas;
diff --git a/src/diagram/SdLifeLineCanvas.cpp b/src/diagram/SdLifeLineCanvas.cpp
index 01f061611..8e7f2f14e 100644
--- a/src/diagram/SdLifeLineCanvas.cpp
+++ b/src/diagram/SdLifeLineCanvas.cpp
@@ -31,11 +31,7 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
-#include <q3ptrdict.h>
-//Added by qt3to4:
 #include <QTextStream>
-
 #include "SdLifeLineCanvas.h"
 #include "SdObjCanvas.h"
 #include "SdDurationCanvas.h"
@@ -53,9 +49,10 @@ SdLifeLineCanvas::SdLifeLineCanvas(UmlCanvas * canvas, SdObjCanvas * o)
     : DiagramCanvas(0, canvas, 0, 0, LIFE_LINE_WIDTH, LIFE_LINE_HEIGHT, -1),
       obj(o), end(LIFE_LINE_HEIGHT)
 {
+    //setPos(o->pos().x(), o->pos().y());
     update_pos();
     set_center100();
-    setZ(DIAGRAMCANVAS_Z);
+    setZValue(DIAGRAMCANVAS_Z);
 
     if (obj->is_mortal())
         update_instance_dead();	// call show
@@ -81,8 +78,14 @@ void SdLifeLineCanvas::delete_it()
 
 void SdLifeLineCanvas::update_pos()
 {
-    move(obj->x() + (obj->width() - width()) / 2,
-         obj->y() + LIFE_LINE_TOPOFFSET * the_canvas()->zoom() + 100000);
+    //do not use setPos here. let moveby hangle other stuff
+    QPointF targetPos;
+    targetPos.setX((double)(obj->x() + (obj->sceneRect().width() - width()) / 2));
+    targetPos.setY((double)(obj->y() + LIFE_LINE_TOPOFFSET * the_canvas()->zoom()));
+    moveBy(targetPos.x()-x(),
+           targetPos.y()- y()+ 100000);
+    //setPos(targetPos.x(), targetPos.y());
+
 }
 
 bool SdLifeLineCanvas::is_decenter(const QPoint &, BooL &) const
@@ -95,7 +98,7 @@ void SdLifeLineCanvas::change_scale()
     double scale = the_canvas()->zoom();
     int w = (int)(width_scale100 * scale);
     // force odd width
-    setSize(((w & 1) == 0) ? w + 1 : w, LIFE_LINE_HEIGHT);
+    setRect(0,0,((w & 1) == 0) ? w + 1 : w, LIFE_LINE_HEIGHT);
     // don't move, the position is updated with its obj
 }
 
@@ -105,48 +108,59 @@ void SdLifeLineCanvas::drawShape(QPainter & p)
         // masked by user
         return;
 
+    //since points are in its own coordinate
+    int fakeX = 0;
+    int fakeY = 0;
     p.setBackgroundMode(::Qt::OpaqueMode);
     p.setRenderHint(QPainter::Antialiasing, true);
     p.setPen(::Qt::DashLine);
 
-    int m = (int)(x() + width() / 2);
+    int m = (int)(fakeX + width() / 2);
     FILE * fp = svg();
 
-    p.drawLine(m, (int) y(), m, end);
+    p.drawLine(m, (int) fakeY, m, end);
 
     p.setPen(::Qt::SolidLine);
 
     if (end != LIFE_LINE_HEIGHT) {
         int b = end + (int) width();
 
-        p.drawLine((int) x(), end,
-                   (int)(x() + width()) - 1, b);
-        p.drawLine((int)(x() + width() - 1), end,
-                   (int) x(), b);
+        p.drawLine((int) fakeX, end,
+                   (int)(fakeX + width()) - 1, b);
+        p.drawLine((int)(fakeX + width() - 1), end,
+                   (int) fakeX, b);
 
         if (fp != 0) {
             fprintf(fp, "<g>\n"
-                    "\t<line stroke=\"black\" stroke-dasharray=\"18,6\"  stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
-                    "</g>\n",
-                    m, (int) y(), m, end);
+                        "\t<line stroke=\"black\" stroke-dasharray=\"18,6\"  stroke-opacity=\"1\""
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
+                        "</g>\n",
+                    m, (int) fakeY, m, end);
 
             fprintf(fp, "<g>\n"
-                    "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
-                    (int) x(), end, (int)(x() + width()) - 1, b);
+                        "\t<line stroke=\"black\" stroke-opacity=\"1\""
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                    (int) fakeX, end, (int)(fakeX + width()) - 1, b);
             fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
-                    "</g>\n",
-                    (int)(x() + width() - 1), end, (int) x(), b);
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
+                        "</g>\n",
+                    (int)(fakeX + width() - 1), end, (int) fakeX, b);
         }
     }
     else if (fp != 0)
         fprintf(fp, "<g>\n"
-                "\t<line stroke=\"black\" stroke-dasharray=\"18,6\"  stroke-opacity=\"1\""
-                " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
-                "</g>\n",
-                m, (int) y(), m, svg_height());
+                    "\t<line stroke=\"black\" stroke-dasharray=\"18,6\"  stroke-opacity=\"1\""
+                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n"
+                    "</g>\n",
+                m, (int) fakeY, m, svg_height());
+}
+
+void SdLifeLineCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    drawShape(*painter);
 }
 
 void SdLifeLineCanvas::moveBy(double dx, double dy)
@@ -157,25 +171,22 @@ void SdLifeLineCanvas::moveBy(double dx, double dy)
         // not called by update_pos() which is only called by obj->moveBy()
         obj->moveBy(dx, 0);
 
-    Q3PtrListIterator<SdDurationCanvas> it(durations);
-
-    for (; it.current(); ++it)
-        it.current()->update_hpos();
+    foreach (SdDurationCanvas *canvas, durations)
+        canvas->update_hpos();
 }
 
-UmlCode SdLifeLineCanvas::type() const
+UmlCode SdLifeLineCanvas::typeUmlCode() const
 {
     return UmlLifeLine;
 }
 
 double SdLifeLineCanvas::instance_max_y() const
 {
-    Q3PtrListIterator<SdDurationCanvas> it(durations);
     double miny = 100000;
 
-    for (; it.current(); ++it)
-        if (it.current()->y() < miny)
-            miny = it.current()->y();
+    foreach (SdDurationCanvas *canvas, durations)
+        if (canvas->y() < miny)
+            miny = canvas->y();
 
     return miny - LIFE_LINE_TOPOFFSET * the_canvas()->zoom() - 5;
 }
@@ -187,18 +198,18 @@ DiagramItem::LineDirection SdLifeLineCanvas::allowed_direction(UmlCode)
 
 QString SdLifeLineCanvas::may_start(UmlCode & l) const
 {
-    return (l != UmlAnchor) ? QString() : TR("illegal");
+    return (l != UmlAnchor) ? QString() :  QObject::tr("illegal");
 }
 
 QString SdLifeLineCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlActivityDuration:
     case UmlLifeLine:
-        return (l != UmlAnchor) ? QString() : TR("illegal");
+        return (l != UmlAnchor) ? QString() :  QObject::tr("illegal");
 
     default:
-        return TR("illegal");
+        return  QObject::tr("illegal");
     }
 }
 
@@ -258,24 +269,20 @@ void SdLifeLineCanvas::add(SdDurationCanvas * d)
 
 void SdLifeLineCanvas::remove(SdDurationCanvas * d)
 {
-    durations.remove(d);
+    durations.removeOne(d);
     update_instance_dead();
 }
 
 void SdLifeLineCanvas::toFlat()
 {
-    Q3PtrListIterator<SdDurationCanvas> it(durations);
-
-    for (; it.current(); ++it)
-        it.current()->toFlat();
+    foreach (SdDurationCanvas *canvas, durations)
+        canvas->toFlat();
 }
 
 void SdLifeLineCanvas::toOverlapping()
 {
-    Q3PtrListIterator<SdDurationCanvas> it(durations);
-
-    for (; it.current(); ++it)
-        it.current()->toOverlapping();
+    foreach (SdDurationCanvas *canvas, durations)
+        canvas->toOverlapping();
 }
 
 void SdLifeLineCanvas::set_masked(bool y)
@@ -288,11 +295,10 @@ void SdLifeLineCanvas::set_masked(bool y)
 void SdLifeLineCanvas::update_instance_dead()
 {
     if (obj->is_mortal() && !durations.isEmpty()) {
-        Q3PtrListIterator<SdDurationCanvas> it(durations);
         int new_end = 0;
 
-        for (; it.current(); ++it) {
-            int b = (int)(it.current()->y() + it.current()->height());
+        foreach (SdDurationCanvas *canvas, durations) {
+            int b = (int)(canvas->y() + canvas->height());
 
             if (b > new_end)
                 new_end = b;
@@ -318,7 +324,7 @@ void SdLifeLineCanvas::update_v_to_contain(SdDurationCanvas *, bool)
 
 int SdLifeLineCanvas::sub_x(int sub_w) const
 {
-    QRect r = rect();
+    QRect r = sceneRect();
 
     return (r.left() + r.right() - sub_w) / 2 + 1;
 }
@@ -340,7 +346,7 @@ bool SdLifeLineCanvas::isaDuration() const
 
 double SdLifeLineCanvas::getZ() const
 {
-    return z();
+    return zValue();
 }
 
 void SdLifeLineCanvas::open()
@@ -349,7 +355,7 @@ void SdLifeLineCanvas::open()
 
 void SdLifeLineCanvas::exec_menu(int rank)
 {
-    double old_z = z();
+    double old_z = zValue();
 
     switch (rank) {
     case 0:
@@ -376,7 +382,7 @@ void SdLifeLineCanvas::exec_menu(int rank)
         return;
     }
 
-    double dz = z() - old_z;
+    double dz = zValue() - old_z;
 
     if (dz != 0) {
         SdDurationCanvas::propag_dz(durations, dz);
@@ -392,19 +398,23 @@ void SdLifeLineCanvas::exec_menu(int rank)
 void SdLifeLineCanvas::menu(const QPoint &)
 {
     // delete must call SdObjCanvas->delete_it() NOT the own delete_it !
-    Q3PopupMenu m(0);
-
-    MenuFactory::createTitle(m, TR("Life line"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 2);
-    m.insertItem(TR("Go down"), 3);
-
-    exec_menu(m.exec(QCursor::pos()));
+    QMenu m(0);
+
+    MenuFactory::createTitle(m,  QObject::tr("Life line"));
+    m.addSeparator();
+    MenuFactory::addItem(m,  QObject::tr("Upper"), 0);
+    MenuFactory::addItem(m,  QObject::tr("Lower"), 1);
+    MenuFactory::addItem(m,  QObject::tr("Go up"), 2);
+    MenuFactory::addItem(m,  QObject::tr("Go down"), 3);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        exec_menu(retAction->data().toInt());
+    }
 }
 
-void SdLifeLineCanvas::apply_shortcut(QString s)
+void SdLifeLineCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         exec_menu(0);
@@ -420,10 +430,8 @@ void SdLifeLineCanvas::apply_shortcut(QString s)
 
 bool SdLifeLineCanvas::copyable() const
 {
-    Q3PtrListIterator<SdDurationCanvas> it(durations);
-
-    for (; it.current(); ++it)
-        if (it.current()->copyable())
+    foreach (SdDurationCanvas *canvas, durations)
+        if (canvas->copyable())
             return TRUE;
 
     return FALSE;
@@ -440,10 +448,8 @@ void SdLifeLineCanvas::history_save(QBuffer & b) const
     ::save(end, b);
     ::save((int) durations.count(), b);
 
-    Q3PtrListIterator<SdDurationCanvas> it(durations);
-
-    for (; it.current(); ++it)
-        ::save(it.current(), b);
+    foreach (SdDurationCanvas *canvas, durations)
+        ::save(canvas, b);
 }
 
 void SdLifeLineCanvas::history_load(QBuffer & b)
@@ -460,14 +466,14 @@ void SdLifeLineCanvas::history_load(QBuffer & b)
         durations.append((SdDurationCanvas *) ::load_item(b));
 }
 
-void SdLifeLineCanvas::send(ToolCom * com, const Q3CanvasItemList & l,
-                            Q3PtrList<FragmentCanvas> & fragments,
-                            Q3PtrList<FragmentCanvas> & refs)
+void SdLifeLineCanvas::send(ToolCom * com, const QList<QGraphicsItem*> & l,
+                            QList<FragmentCanvas *> & fragments,
+                            QList<FragmentCanvas *> & refs)
 {
     int api_format = com->api_format();
-    Q3PtrDict<SdLifeLineCanvas> used_refs; // the key is the fragment ref
-    Q3PtrList<SdLifeLineCanvas> lls;
-    Q3CanvasItemList::ConstIterator cit;
+    QHash<void*, SdLifeLineCanvas*> used_refs; // the key is the fragment ref
+    QList<SdLifeLineCanvas *> lls;
+    QList<QGraphicsItem*>::ConstIterator cit;
     unsigned n = 0;
 
     // count msgs
@@ -476,29 +482,25 @@ void SdLifeLineCanvas::send(ToolCom * com, const Q3CanvasItemList & l,
         DiagramItem * it = QCanvasItemToDiagramItem(*cit);
 
         if ((it != 0) && // an uml canvas item
-            (*cit)->visible() &&
-            (it->type() == UmlLifeLine)) {
+                (*cit)->isVisible() &&
+                (it->typeUmlCode() == UmlLifeLine)) {
             SdLifeLineCanvas * ll = (SdLifeLineCanvas *) it;
 
             lls.append(ll);
 
-            Q3PtrListIterator<SdDurationCanvas> iter(ll->durations);
-
             // standard msgs
-            for (; iter.current(); ++iter)
-                n += iter.current()->count_msg(api_format);
+            foreach (SdDurationCanvas *canvas, ll->durations)
+                n += canvas->count_msg(api_format);
 
             if (com->api_format() >= 41) {
                 if (ll->end != LIFE_LINE_HEIGHT)
                     // deletion message, ll can't masked by user
                     n += 1;
 
-                FragmentCanvas * f;
-
-                for (f = refs.first(); f != 0; f = refs.next()) {
-                    if (f->collidesWith(ll)) {
+                foreach (FragmentCanvas *f, refs) {
+                    if (f->collidesWithItem(ll)) {
                         // interaction use message
-                        if (used_refs.find((void *) f) == 0) {
+                        if (used_refs.value((void *) f) == 0) {
                             n += 1;
                             used_refs.insert((void *) f, ll);
                         }
@@ -512,15 +514,12 @@ void SdLifeLineCanvas::send(ToolCom * com, const Q3CanvasItemList & l,
 
     com->write_unsigned(n);
 
-    SdLifeLineCanvas * ll;
-
-    for (ll = lls.first(); ll != 0; ll = lls.next()) {
+    foreach (SdLifeLineCanvas *ll, lls) {
         int id = ll->obj->get_ident();
-        Q3PtrListIterator<SdDurationCanvas> iter(ll->durations);
 
         // write standard messages
-        for (; iter.current(); ++iter)
-            iter.current()->send(com, id);
+        foreach (SdDurationCanvas *d, ll->durations)
+            d->send(com, id);
 
         if ((ll->end != LIFE_LINE_HEIGHT) && (com->api_format() >= 41)) {
             // deletion message, lf can't masked by user
@@ -533,32 +532,34 @@ void SdLifeLineCanvas::send(ToolCom * com, const Q3CanvasItemList & l,
 
     if (com->api_format() >= 41) {
         // interaction use messages
-        Q3PtrDictIterator<SdLifeLineCanvas>itref(used_refs);
-
-        while ((ll = itref.current()) != 0) {
-            FragmentCanvas * f = (FragmentCanvas *) itref.currentKey();
-            int m = ll->width() / 2;
-
-            SdMsgBaseCanvas::send(com, ll->obj->get_ident(),
-                                  (unsigned) ll->x() + m, (unsigned) f->center().y(),
-                                  anInteractionUse, "", "", f->arguments());
+        QHashIterator<void*, SdLifeLineCanvas*> itref(used_refs);
+        SdLifeLineCanvas *ll;
+
+        while (itref.hasNext()) {
+            itref.next();
+            if((ll = itref.value()) != 0)
+            {
+                FragmentCanvas * f = (FragmentCanvas *) itref.key();
+                int m = ll->width() / 2;
+
+                SdMsgBaseCanvas::send(com, ll->obj->get_ident(),
+                                      (unsigned) ll->x() + m, (unsigned) f->center().y(),
+                                      anInteractionUse, "", "", f->arguments().toLatin1().constData());
+            }
 
-            ++itref;
         }
 
         // send life lines covered by fragment
-        FragmentCanvas * f;
-
-        for (f = fragments.first(); f != 0; f = fragments.next()) {
-            Q3PtrList<SdLifeLineCanvas> covered;
+        foreach (FragmentCanvas *f, fragments) {
+            QList<SdLifeLineCanvas *> covered;
 
-            for (ll = lls.first(); ll != 0; ll = lls.next())
-                if (f->collidesWith(ll))
+            foreach (SdLifeLineCanvas *ll, lls)
+                if (f->collidesWithItem(ll))
                     covered.append(ll);
 
             com->write_unsigned(covered.count());
 
-            for (ll = covered.first(); ll != 0; ll = covered.next())
+            foreach (SdLifeLineCanvas *ll, covered)
                 com->write_unsigned((unsigned) ll->obj->get_ident());
         }
     }
diff --git a/src/diagram/SdLifeLineCanvas.h b/src/diagram/SdLifeLineCanvas.h
index cfc4d51f9..2661b3a10 100644
--- a/src/diagram/SdLifeLineCanvas.h
+++ b/src/diagram/SdLifeLineCanvas.h
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QTextStream>
 
-#define LIFE_LINE_TOPOFFSET 41
+#define LIFE_LINE_TOPOFFSET 30//41
 
 class SdDead;
 class SdObjCanvas;
@@ -44,23 +44,26 @@ class ToolCom;
 class SdLifeLineCanvas : public DiagramCanvas, public SdDurationSupport
 {
 protected:
-    Q3PtrList<SdDurationCanvas> durations;
+    QList<SdDurationCanvas *> durations;
     SdObjCanvas * obj;
     int end; // 0 if masked by user, LIFE_LINE_HEIGHT if not mortal
 
     void exec_menu(int rank);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     SdLifeLineCanvas(UmlCanvas * canvas, SdObjCanvas * o);
     virtual ~SdLifeLineCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     SdObjCanvas * get_obj() const {
         return obj;
     };
-    virtual void add(SdDurationCanvas *);
-    virtual void remove(SdDurationCanvas *);
+    virtual void add(SdDurationCanvas *) override;
+    using SdDurationSupport::remove;
+    using DiagramCanvas::remove;
+    virtual void remove(SdDurationCanvas *) override;
     void toFlat();
     void toOverlapping();
     double instance_max_y() const;
@@ -72,39 +75,39 @@ class SdLifeLineCanvas : public DiagramCanvas, public SdDurationSupport
         return end == 0;
     }
     void set_masked(bool y);
-    virtual void update_instance_dead();
-    virtual void update_v_to_contain(SdDurationCanvas *, bool);
-    virtual int sub_x(int sub_w) const;
-    virtual double min_y() const;
-    virtual SdLifeLineCanvas * get_line() const;
-    virtual bool isaDuration() const;
-    virtual double getZ() const;
+    virtual void update_instance_dead() override;
+    virtual void update_v_to_contain(SdDurationCanvas *, bool) override;
+    virtual int sub_x(int sub_w) const override;
+    virtual double min_y() const override;
+    virtual SdLifeLineCanvas * get_line() const override;
+    virtual bool isaDuration() const override;
+    virtual double getZ() const override;
 
     virtual bool is_decenter(const QPoint &, BooL &) const;
 
     virtual void drawShape(QPainter & p);
-    virtual void moveBy(double dx, double dy);
+    virtual void moveBy(double dx, double dy) override;
 
-    virtual UmlCode type() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual void change_scale();
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual bool may_connect(UmlCode l) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual bool connexion(UmlCode, const QPoint &, const QPoint &);
-    virtual LineDirection allowed_direction(UmlCode);
-    virtual bool copyable() const;
-    virtual void apply_shortcut(QString s);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual void change_scale() override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual bool may_connect(UmlCode l) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual bool connexion(UmlCode, const QPoint &, const QPoint &) override;
+    virtual LineDirection allowed_direction(UmlCode) override;
+    virtual bool copyable() const override;
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
 
-    static void send(ToolCom * com, const Q3CanvasItemList & l,
-                     Q3PtrList<FragmentCanvas> & fragments,
-                     Q3PtrList<FragmentCanvas> & refs);
+    static void send(ToolCom * com, const QList<QGraphicsItem*> & l,
+                     QList<FragmentCanvas *> & fragments,
+                     QList<FragmentCanvas *> & refs);
 };
 
 #endif
diff --git a/src/diagram/SdLostFoundMsgSupportCanvas.cpp b/src/diagram/SdLostFoundMsgSupportCanvas.cpp
index dcdae2a55..741e8d6d5 100644
--- a/src/diagram/SdLostFoundMsgSupportCanvas.cpp
+++ b/src/diagram/SdLostFoundMsgSupportCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -76,18 +76,18 @@ bool SdLostFoundMsgSupportCanvas::copyable() const
 void SdLostFoundMsgSupportCanvas::change_scale()
 {
     // the size is not modified
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     recenter();
 
     if (msg != 0)
         msg->update_hpos();
 
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void SdLostFoundMsgSupportCanvas::set_z(double newz)
 {
-    DiagramCanvas::set_z((msg != 0) ? msg->z() : newz);
+    DiagramCanvas::set_z((msg != 0) ? msg->zValue() : newz);
 }
 
 void SdLostFoundMsgSupportCanvas::draw(QPainter & p)
@@ -119,7 +119,15 @@ void SdLostFoundMsgSupportCanvas::draw(QPainter & p)
     // don't use show_mark is selected : too small
 }
 
-UmlCode SdLostFoundMsgSupportCanvas::type() const
+void SdLostFoundMsgSupportCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode SdLostFoundMsgSupportCanvas::typeUmlCode() const
 {
     return UmlLostFoundMsgSupport;
 }
@@ -134,14 +142,14 @@ void SdLostFoundMsgSupportCanvas::menu(const QPoint &)
 
 QString SdLostFoundMsgSupportCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() :  QObject::tr("illegal");
 }
 
 QString SdLostFoundMsgSupportCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
     return (l == UmlAnchor)
            ? dest->may_start(l)
-           : TR("illegal");
+           :  QObject::tr("illegal");
 }
 
 void SdLostFoundMsgSupportCanvas::add(SdMsgBaseCanvas * m)
@@ -226,7 +234,7 @@ SdLostFoundMsgSupportCanvas * SdLostFoundMsgSupportCanvas::read(char *& st,
     SdLostFoundMsgSupportCanvas * result =
         new SdLostFoundMsgSupportCanvas(canvas, x, (int) read_double(st), id);
 
-    result->setZ(read_double(st));
+    result->setZValue(read_double(st));
     result->show();
 
     return result;
diff --git a/src/diagram/SdLostFoundMsgSupportCanvas.h b/src/diagram/SdLostFoundMsgSupportCanvas.h
index f62137028..ada2e02f1 100644
--- a/src/diagram/SdLostFoundMsgSupportCanvas.h
+++ b/src/diagram/SdLostFoundMsgSupportCanvas.h
@@ -47,26 +47,28 @@ class SdLostFoundMsgSupportCanvas : public SdMsgSupport
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL &, BooL & out_model) const;
-    virtual void delete_it();
-    virtual void change_scale();
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void add(SdMsgBaseCanvas *);
-    virtual void remove(SdMsgBaseCanvas *);
-    virtual double min_y() const;
-    virtual void update_v_to_contain(const QRect re);
-    virtual void moveBy(double dx, double dy);
-    virtual void set_z(double);
-    virtual bool isaDuration() const;
-    virtual bool isOverlappingDuration() const;
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL &, BooL & out_model) const override;
+    virtual void delete_it() override;
+    virtual void change_scale() override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void add(SdMsgBaseCanvas *) override;
+    virtual void remove(SdMsgBaseCanvas *) override;
+    virtual double min_y() const override;
+    virtual void update_v_to_contain(const QRect re) override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void set_z(double) override;
+    virtual bool isaDuration() const override;
+    virtual bool isOverlappingDuration() const override;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static SdLostFoundMsgSupportCanvas * read(char *& st, UmlCanvas * canvas, char * k);
+protected:
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 };
 
 #endif
diff --git a/src/diagram/SdMsgBaseCanvas.cpp b/src/diagram/SdMsgBaseCanvas.cpp
index 7f1caa643..f5ce89694 100644
--- a/src/diagram/SdMsgBaseCanvas.cpp
+++ b/src/diagram/SdMsgBaseCanvas.cpp
@@ -82,7 +82,7 @@ void SdMsgBaseCanvas::delete_it()
     DiagramCanvas::delete_it();
 }
 
-UmlCode SdMsgBaseCanvas::type() const
+UmlCode SdMsgBaseCanvas::typeUmlCode() const
 {
     return itsType;
 }
@@ -116,13 +116,13 @@ QString SdMsgBaseCanvas::get_msg(bool with_args) const
         return m;
 
     QString a = (const char *) args;
-    int index1 = m.find('(');
-    int index2 = m.findRev(')');
+    int index1 = m.indexOf('(');
+    int index2 = m.lastIndexOf(')');
 
     if ((index1 == -1) || (index2 == -1) || (index2 < index1))
         return m;
 
-    if (a.find('\n') == -1)
+    if (a.indexOf('\n') == -1)
         return m.left(index1 + 1) + a + m.mid(index2);
 
     // multi lines args, compute indent
@@ -140,7 +140,7 @@ QString SdMsgBaseCanvas::get_msg(bool with_args) const
 
     int index3;
 
-    while ((index3 = a.find('\n', index1)) != -1) {
+    while ((index3 = a.indexOf('\n', index1)) != -1) {
         s += a.mid(index1, index3 - index1 + 1) + indent;
         index1 = index3 + 1;
     }
@@ -236,12 +236,12 @@ void SdMsgBaseCanvas::set_synchronous(bool yes)
 
 QString SdMsgBaseCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString SdMsgBaseCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 bool SdMsgBaseCanvas::is_decenter(const QPoint &, BooL &) const
@@ -286,13 +286,13 @@ void SdMsgBaseCanvas::open()
             st = stereotype->get_name();
 
         StereotypeDialog d(BrowserSeqDiagram::msg_default_stereotypes(),
-                           st, val, TR("Return"), TR("value :"));
+                           st, val, tr("Return"), tr("value :"));
 
         d.raise();
 
         if (d.exec() == QDialog::Accepted) {
             update_st(st);
-            explicit_msg = val.stripWhiteSpace();
+            explicit_msg = val.trimmed();
             modified();
         }
     }
@@ -346,7 +346,8 @@ void SdMsgBaseCanvas::default_label_position() const
     QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
     QSize sz = fm.size(0, label->get_name());
 
-    label->move(rect().center().x() - sz.width() / 2,
+
+    label->moveBy(center().x() - sz.width() / 2,
                 y() - fm.height());
 }
 
@@ -355,8 +356,8 @@ void SdMsgBaseCanvas::default_stereotype_position() const
     QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
     QSize sz = fm.size(0, stereotype->get_name());
 
-    stereotype->move(rect().center().x() - sz.width() / 2,
-                     y() + fm.height());
+    stereotype->moveBy(center().x() - sz.width() / 2,
+                         y() + fm.height());
 }
 
 void SdMsgBaseCanvas::setVisible(bool yes)
@@ -373,7 +374,7 @@ void SdMsgBaseCanvas::moveBy(double dx, double dy)
         // horizontal moving due to the life line moving
         DiagramCanvas::moveBy(dx, 0);
 
-        if ((stereotype != 0) && !stereotype->selected())
+        if ((stereotype != 0) && !stereotype->isSelected())
             stereotype->moveBy(dx, 0);
     }
     else if (!already_moved && ((y() + dy) > min_y())) {
@@ -381,7 +382,7 @@ void SdMsgBaseCanvas::moveBy(double dx, double dy)
         already_moved = TRUE;
         DiagramCanvas::moveBy(0, dy);
 
-        if ((stereotype != 0) && !stereotype->selected())
+        if ((stereotype != 0) && !stereotype->isSelected())
             stereotype->moveBy(0, dy);
     }
 }
@@ -390,7 +391,7 @@ void SdMsgBaseCanvas::update_after_move(SdMsgSupport * p)
 {
     already_moved = FALSE;
 
-    p->update_v_to_contain(rect());
+    p->update_v_to_contain(sceneRect());
 }
 
 void SdMsgBaseCanvas::change_scale()
@@ -398,18 +399,18 @@ void SdMsgBaseCanvas::change_scale()
     // Just update the vertical position, the horizontal size
     // and position are update by the durations.
     // The label is also moved independently
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
 
-    Q3CanvasRectangle::moveBy(0,
+    QGraphicsRectItem::moveBy(0,
                               ((int)(center_y_scale100 * the_canvas()->zoom() + 0.5))
                               - center().y());
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 bool SdMsgBaseCanvas::copyable() const
 {
     // must not call dest->copyable() else infinite loop
-    return selected() && dest->selected();
+    return isSelected() && dest->isSelected();
 }
 
 bool SdMsgBaseCanvas::represents(BrowserNode * bn)
@@ -425,11 +426,11 @@ void SdMsgBaseCanvas::save(QTextStream & st, QString & warning) const
     nl_indent(st);
 #ifdef FORCE_INT_COORD
     // note : << float bugged in Qt 3.3.3
-    st << "yz " << (int) y() << " " << (int) z();
+    st << "yz " << (int) y() << " " << (int) zValue();
 #else
     QString sy, sz;
 
-    st << "yz " << sy.setNum(y()) << " " << sz.setNum(z());
+    st << "yz " << sy.setNum(y()) << " " << sz.setNum(zValue());
 #endif
 
     if (msg != 0) {
@@ -509,15 +510,15 @@ void SdMsgBaseCanvas::read(char *& st)
         k = read_keyword(st);
 
         if (!strcmp(k, "stereotype")) {
-            k = read_string(st);
+            QString strk = read_string(st);
             read_keyword(st, "xyz");
 
             int x = (int) read_double(st);
 
             stereotype =
-                new LabelCanvas(k, the_canvas(), x, (int) read_double(st));
+                new LabelCanvas(strk, the_canvas(), x, (int) read_double(st));
 
-            stereotype->setZ(read_double(st));
+            stereotype->setZValue(read_double(st));
             stereotype->show();
             k = read_keyword(st);
         }
@@ -662,7 +663,7 @@ void SdMsgBaseCanvas::send(ToolCom * com, int fromid) const
             QString s = stereotype->get_name();
 
             s = s.mid(2, s.length() - 4);
-            com->write_string((const char *) s);
+            com->write_string((const char *) s.toLatin1().constData());
         }
     }
 
diff --git a/src/diagram/SdMsgBaseCanvas.h b/src/diagram/SdMsgBaseCanvas.h
index 4f22be162..9c714698c 100644
--- a/src/diagram/SdMsgBaseCanvas.h
+++ b/src/diagram/SdMsgBaseCanvas.h
@@ -69,7 +69,7 @@ class SdMsgBaseCanvas : public QObject, public DiagramCanvas
 public:
     virtual ~SdMsgBaseCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     SdMsgSupport * get_dest()  const {
         return dest;
@@ -92,23 +92,24 @@ class SdMsgBaseCanvas : public QObject, public DiagramCanvas
     virtual int overlap_dir(SdDurationCanvas *) const = 0;
 
     virtual bool is_decenter(const QPoint &, BooL &) const;
-    virtual void setVisible(bool yes);
+    virtual void setVisible(bool yes) override;
 
-    virtual UmlCode type() const;
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void open();
-    virtual void select_associated() = 0;
-    virtual void change_scale();
-    virtual bool copyable() const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual UmlCode typeUmlCode() const override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void open() override;
+    virtual void select_associated() override = 0;
+    virtual void change_scale() override;
+    virtual bool copyable() const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void moveBy(double dx, double dy);
+    virtual void moveBy(double dx, double dy) override;
 
-    virtual bool represents(BrowserNode *);
+    virtual bool represents(BrowserNode *) override;
 
+    using DiagramCanvas::save;
     void save(QTextStream & st, QString & warning) const;
     void read(char *&);
 
diff --git a/src/diagram/SdMsgCanvas.cpp b/src/diagram/SdMsgCanvas.cpp
index 58967098d..43410ac00 100644
--- a/src/diagram/SdMsgCanvas.cpp
+++ b/src/diagram/SdMsgCanvas.cpp
@@ -31,10 +31,10 @@
 
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
+#include <QPolygon>
 
 #include "SdMsgCanvas.h"
 #include "SdDurationCanvas.h"
@@ -73,8 +73,8 @@ void SdMsgCanvas::delete_it()
 
 void SdMsgCanvas::update_hpos()
 {
-    const QRect sr = start->rect();
-    const QRect dr = dest->rect();
+    const QRect sr = start->sceneRect();
+    const QRect dr = dest->sceneRect();
     LabelCanvas * lbl = label;
     int cy = center_y_scale100;
 
@@ -86,22 +86,22 @@ void SdMsgCanvas::update_hpos()
         double dx = sr.right() + 1 - x();
 
         DiagramCanvas::moveBy(dx, 0);
-        setSize(dr.left() - sr.right(), MSG_HEIGHT);
+        setRect(0,0,dr.left() - sr.right(), MSG_HEIGHT);
 
         if (!the_canvas()->do_zoom() &&
-            (stereotype != 0) &&
-            !stereotype->selected())
+                (stereotype != 0) &&
+                !stereotype->isSelected())
             stereotype->moveBy(dx, 0);
     }
     else {
         double dx = dr.right() + 1 - x();
 
         DiagramCanvas::moveBy(dx, 0);
-        setSize(sr.left() - dr.right(), MSG_HEIGHT);
+        setRect(0,0,sr.left() - dr.right(), MSG_HEIGHT);
 
         if (!the_canvas()->do_zoom() &&
-            (stereotype != 0) &&
-            !stereotype->selected())
+                (stereotype != 0) &&
+                !stereotype->isSelected())
             stereotype->moveBy(dx, 0);
     }
 
@@ -113,8 +113,8 @@ void SdMsgCanvas::update_hpos()
 double SdMsgCanvas::min_y() const
 {
     return (start->min_y() < dest->min_y())
-           ? start->min_y()
-           : dest->min_y();
+            ? start->min_y()
+            : dest->min_y();
 }
 
 void SdMsgCanvas::set_z(double newz)
@@ -131,7 +131,7 @@ void SdMsgCanvas::draw(QPainter & p)
 {
     const QRect r = rect();
     const int v = r.center().y();
-    Q3PointArray poly(3);
+    QPolygon poly(3);
     FILE * fp = svg();
     p.setRenderHint(QPainter::Antialiasing, true);
 
@@ -150,7 +150,7 @@ void SdMsgCanvas::draw(QPainter & p)
                 r.left(), v, r.right(), v);
     }
 
-    if (start->rect().left() < dest->rect().left()) {
+    if (start->sceneRect().left() < dest->sceneRect().left()) {
         poly.setPoint(0, r.right(), v);
         poly.setPoint(1, r.right() - MSG_HEIGHT / 2 + 1, v - MSG_HEIGHT / 2 + 1);
         poly.setPoint(2, r.right() - MSG_HEIGHT / 2 + 1, v + MSG_HEIGHT / 2 - 1);
@@ -176,7 +176,7 @@ void SdMsgCanvas::draw(QPainter & p)
             fputs("</g>\n", fp);
         }
     }
-    break;
+        break;
 
     case UmlReturnMsg:
         p.setPen(::Qt::SolidLine);
@@ -192,16 +192,24 @@ void SdMsgCanvas::draw(QPainter & p)
 
         if (fp != 0)
             fprintf(fp, "\t<path fill=\"none\" stroke=\"black\" stroke-opacity=\"1\""
-                    " d=\"M %d %d L %d %d L %d %d\" />\n"
-                    "</g>\n",
+                        " d=\"M %d %d L %d %d L %d %d\" />\n"
+                        "</g>\n",
                     p1.x(), p1.y(), p0.x(), p0.y(), p2.x(), p2.y());
     }
     }
 
-    if (selected())
+    if (isSelected())
         show_mark(p, r);
 }
 
+void SdMsgCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
 void SdMsgCanvas::update()
 {
     SdMsgBaseCanvas::update_after_move(start);
@@ -239,146 +247,150 @@ int SdMsgCanvas::overlap_dir(SdDurationCanvas * d) const
 
 void SdMsgCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-
-    MenuFactory::createTitle(m, TR("Message"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertItem(TR("Edit drawing settings"), 3);
-    m.insertSeparator();
+    QMenu m(0);
+
+    MenuFactory::createTitle(m, tr("Message"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
+    m.addSeparator();
 
     if (msg != 0)
-        m.insertItem(TR("Select operation in browser"), 8);
+        MenuFactory::addItem(m, tr("Select operation in browser"), 8);
 
-    m.insertItem(TR("Select linked items"), 4);
+    MenuFactory::addItem(m, tr("Select linked items"), 4);
 
     if (label || stereotype) {
-        m.insertSeparator();
-        m.insertItem(TR("Select stereotype and label"), 5);
-        m.insertItem(TR("Default stereotype and label position"), 6);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select stereotype and label"), 5);
+        MenuFactory::addItem(m, tr("Default stereotype and label position"), 6);
     }
 
     if (((BrowserSeqDiagram *) the_canvas()->browser_diagram())
-        ->is_overlapping_bars()) {
-        m.insertSeparator();
+            ->is_overlapping_bars()) {
+        m.addSeparator();
 
         if (start->isaDuration()) {
-            m.insertItem(TR("Start from new overlapping bar"), 9);
+            MenuFactory::addItem(m, tr("Start from new overlapping bar"), 9);
 
             if (start->isOverlappingDuration())
-                m.insertItem(TR("Start from parent bar"), 10);
+                MenuFactory::addItem(m, tr("Start from parent bar"), 10);
         }
 
         if (dest->isaDuration()) {
-            m.insertItem(TR("Go to new overlapping bar"), 11);
+            MenuFactory::addItem(m, tr("Go to new overlapping bar"), 11);
 
             if (dest->isOverlappingDuration())
-                m.insertItem(TR("Go to parent bar"), 12);
+                MenuFactory::addItem(m, tr("Go to parent bar"), 12);
         }
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
-
-    switch (m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        // force son reaffichage
-        hide();
-        show();
-        break;
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (retAction->data().toInt()) {
+        case 0:
+            upper();
+            // force son reaffichage
+            hide();
+            show();
+            break;
 
-    case 1:
-        lower();
-        // force son reaffichage
-        hide();
-        show();
-        break;
+        case 1:
+            lower();
+            // force son reaffichage
+            hide();
+            show();
+            break;
 
-    case 13:
-        z_up();
-        // force son reaffichage
-        hide();
-        show();
-        break;
+        case 13:
+            z_up();
+            // force son reaffichage
+            hide();
+            show();
+            break;
 
-    case 14:
-        z_down();
-        // force son reaffichage
-        hide();
-        show();
-        break;
+        case 14:
+            z_down();
+            // force son reaffichage
+            hide();
+            show();
+            break;
 
-    case 2:
-        open();
-        break;
+        case 2:
+            open();
+            break;
 
-    case 3:
-        edit_drawing_settings();
-        return;
+        case 3:
+            edit_drawing_settings();
+            return;
 
-    case 4:
-        select_associated();
-        return;
+        case 4:
+            select_associated();
+            return;
 
-    case 5:
-        the_canvas()->unselect_all();
+        case 5:
+            the_canvas()->unselect_all();
 
-        if (label)
-            the_canvas()->select(label);
+            if (label)
+                the_canvas()->select(label);
 
-        if (stereotype)
-            the_canvas()->select(stereotype);
+            if (stereotype)
+                the_canvas()->select(stereotype);
 
-        return;
+            return;
 
-    case 6:
-        if (label)
-            default_label_position();
+        case 6:
+            if (label)
+                default_label_position();
 
-        if (stereotype)
-            default_stereotype_position();
+            if (stereotype)
+                default_stereotype_position();
 
-        break;
+            break;
 
-    case 7:
-        delete_it();
-        return;
+        case 7:
+            delete_it();
+            return;
 
-    case 8:
-        msg->get_browser_node()->select_in_browser();
-        return;
+        case 8:
+            msg->get_browser_node()->select_in_browser();
+            return;
 
-    case 9:
-        ((SdDurationCanvas *) start)->go_up(this, FALSE);
-        break;
+        case 9:
+            ((SdDurationCanvas *) start)->go_up(this, FALSE);
+            break;
 
-    case 10:
-        ((SdDurationCanvas *) start)->go_down(this);
-        break;
+        case 10:
+            ((SdDurationCanvas *) start)->go_down(this);
+            break;
 
-    case 11:
-        ((SdDurationCanvas *) dest)->go_up(this, TRUE);
-        break;
+        case 11:
+            ((SdDurationCanvas *) dest)->go_up(this, TRUE);
+            break;
 
-    case 12:
-        ((SdDurationCanvas *) dest)->go_down(this);
-        break;
+        case 12:
+            ((SdDurationCanvas *) dest)->go_down(this);
+            break;
 
-    default:
-        return;
+        default:
+            return;
+        }
     }
 
     package_modified();
     canvas()->update();
 }
 
-void SdMsgCanvas::apply_shortcut(QString s)
+void SdMsgCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -409,9 +421,9 @@ void SdMsgCanvas::edit_drawing_settings()
     for (;;) {
         StateSpecVector st(3);
 
-        st[0].set(TR("operation drawing language"), &drawing_language);
-        st[1].set(TR("show full operation definition"), &show_full_oper);
-        st[2].set(TR("show context mode"), &show_context_mode);
+        st[0].set(tr("operation drawing language"), &drawing_language);
+        st[1].set(tr("show full operation definition"), &show_full_oper);
+        st[2].set(tr("show context mode"), &show_context_mode);
 
         SettingsDialog dialog(&st, 0, FALSE);
 
@@ -430,7 +442,7 @@ bool SdMsgCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void SdMsgCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdMsgCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(3);
@@ -438,31 +450,30 @@ void SdMsgCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         Uml3States show_full_oper;
         ShowContextMode show_context_mode;
 
-        st[0].set(TR("operation drawing language"), &drawing_language);
-        st[1].set(TR("show full operation definition"), &show_full_oper);
-        st[2].set(TR("show context mode"), &show_context_mode);
+        st[0].set(tr("operation drawing language"), &drawing_language);
+        st[1].set(tr("show full operation definition"), &show_full_oper);
+        st[2].set(tr("show context mode"), &show_context_mode);
 
         SettingsDialog dialog(&st, 0, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                SdMsgCanvas *canvas = (SdMsgCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((SdMsgCanvas *) it.current())->drawing_language =
-                        drawing_language;
+                    canvas->drawing_language =
+                            drawing_language;
 
                 if (!st[1].name.isEmpty())
-                    ((SdMsgCanvas *) it.current())->show_full_oper =
-                        show_full_oper;
+                    canvas->show_full_oper =
+                            show_full_oper;
 
                 if (!st[2].name.isEmpty())
-                    ((SdMsgCanvas *) it.current())->show_context_mode =
-                        show_context_mode;
+                    canvas->show_context_mode =
+                            show_context_mode;
 
-                ((SdMsgCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();
             }
         }
 
@@ -471,37 +482,30 @@ void SdMsgCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void SdMsgCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdMsgCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    SdMsgCanvas * x = (SdMsgCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        SdMsgCanvas * o = (SdMsgCanvas *) it.current();
-
-        o->drawing_language = x->drawing_language;
-        o->show_full_oper = x->show_full_oper;
-        o->show_context_mode = x->show_context_mode;
-        o->modified();	// call package_modified()
-    }
+    const SdMsgCanvas * x = (const SdMsgCanvas *) src;
+    drawing_language = x->drawing_language;
+    show_full_oper = x->show_full_oper;
+    show_context_mode = x->show_context_mode;
+    modified();
 }
 
 void SdMsgCanvas::select_associated()
 {
     the_canvas()->select(this);
 
-    if (!start->selected())
+    if (!start->isSelected())
         start->select_associated();
 
-    if (!dest->selected())
+    if (!dest->isSelected())
         dest->select_associated();
 }
 
 bool SdMsgCanvas::copyable() const
 {
     // must not call start->copyable() else infinite loop
-    return start->selected() && SdMsgBaseCanvas::copyable();
+    return start->isSelected() && SdMsgBaseCanvas::copyable();
 }
 
 void SdMsgCanvas::save(QTextStream & st, bool ref, QString & warning) const
@@ -611,11 +615,11 @@ SdMsgCanvas * SdMsgCanvas::read(char *& st, UmlCanvas * canvas, char * k)
         k = read_keyword(st);
 
         SdMsgCanvas * result =
-            new SdMsgCanvas(canvas, start, dest, c, (int) read_double(st), id);
+                new SdMsgCanvas(canvas, start, dest, c, (int) read_double(st), id);
 
         if (!strcmp(k, "yz"))
             // new version
-            result->setZ(read_double(st));
+            result->setZValue(read_double(st));
         else if (strcmp(k, "y"))
             wrong_keyword(k, "y/yz");
 
diff --git a/src/diagram/SdMsgCanvas.h b/src/diagram/SdMsgCanvas.h
index 8ab3343bc..39c835d46 100644
--- a/src/diagram/SdMsgCanvas.h
+++ b/src/diagram/SdMsgCanvas.h
@@ -36,41 +36,43 @@
 
 class SdMsgCanvas : public SdMsgBaseCanvas
 {
+    Q_OBJECT
 protected:
     SdMsgSupport * start;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     SdMsgCanvas(UmlCanvas * canvas, SdMsgSupport * s,
                 SdMsgSupport * d, UmlCode l, int v, int id);
     virtual ~SdMsgCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     SdMsgSupport * get_start()  const {
         return start;
     };
 
     virtual void draw(QPainter & p);
-    virtual void set_z(double);
-    virtual void update_hpos();
-    virtual void check_vpos(const QRect &);
-    virtual double min_y() const;
+    virtual void set_z(double) override;
+    virtual void update_hpos() override;
+    virtual void check_vpos(const QRect &) override;
+    virtual double min_y() const override;
     virtual void change_duration(SdDurationCanvas * oldone,
-                                 SdDurationCanvas * newone);
-    virtual int overlap_dir(SdDurationCanvas *) const;
-    virtual void update();
-    virtual void menu(const QPoint &);
-    virtual void select_associated();
-    virtual bool copyable() const;
+                                 SdDurationCanvas * newone) override;
+    virtual int overlap_dir(SdDurationCanvas *) const override;
+    virtual void update() override;
+    virtual void menu(const QPoint &) override;
+    virtual void select_associated() override;
+    virtual bool copyable() const override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
     void edit_drawing_settings();
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static SdMsgCanvas * read(char *& , UmlCanvas *, char *);
 };
 
diff --git a/src/diagram/SdMsgSupport.h b/src/diagram/SdMsgSupport.h
index c6c545eb4..999dffbee 100644
--- a/src/diagram/SdMsgSupport.h
+++ b/src/diagram/SdMsgSupport.h
@@ -41,6 +41,7 @@ class SdMsgSupport : public DiagramCanvas
     virtual bool isaDuration() const = 0;
     virtual bool isOverlappingDuration() const = 0;
     virtual void add(SdMsgBaseCanvas *) = 0;
+    using DiagramCanvas::remove;
     virtual void remove(SdMsgBaseCanvas *) = 0;
     virtual double min_y() const = 0;
     virtual void update_v_to_contain(const QRect re) = 0;
diff --git a/src/diagram/SdObjCanvas.cpp b/src/diagram/SdObjCanvas.cpp
index d71eed378..964cc3daf 100644
--- a/src/diagram/SdObjCanvas.cpp
+++ b/src/diagram/SdObjCanvas.cpp
@@ -81,12 +81,12 @@ void SdObjCanvas::moveBy(double dx, double dy)
 
 QString SdObjCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() :  QObject::tr("illegal");
 }
 
 QString SdObjCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) :  QObject::tr("illegal");
 }
 
 void SdObjCanvas::set_mortal(bool y)
@@ -111,7 +111,7 @@ void SdObjCanvas::save(QTextStream & st) const
     if (life_line->is_masked())
         st << " life_line_masked";
 
-    st << " life_line_z " << life_line->z();
+    st << " life_line_z " << life_line->zValue();
 }
 
 void SdObjCanvas::read(char *& st, const char * k)
@@ -134,7 +134,7 @@ void SdObjCanvas::read(char *& st, const char * k)
         if (strcmp(k, "life_line_z"))
             wrong_keyword(k, "life_line_z");
 
-        life_line->setZ(read_double(st));
+        life_line->setZValue(read_double(st));
     }
     else if (!strcmp(k, "xy"))
         read_xy(st, this);
diff --git a/src/diagram/SdObjCanvas.h b/src/diagram/SdObjCanvas.h
index 1cfe8a929..5392e9c6e 100644
--- a/src/diagram/SdObjCanvas.h
+++ b/src/diagram/SdObjCanvas.h
@@ -48,7 +48,7 @@ class SdObjCanvas : public DiagramCanvas
                 int w, int h, int id);
     virtual ~SdObjCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     SdLifeLineCanvas * get_life_line() const {
         return life_line;
@@ -60,15 +60,16 @@ class SdObjCanvas : public DiagramCanvas
 
     virtual BrowserClass * get_class() const = 0;
 
-    virtual void moveBy(double dx, double dy);
+    virtual void moveBy(double dx, double dy) override;
 
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    void change_scale();
-    virtual bool copyable() const;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    void change_scale() override;
+    virtual bool copyable() const override;
 
 protected:
     void read(char *& st, const char * k);
+    using DiagramCanvas::save;
     void save(QTextStream & st) const;
 };
 
diff --git a/src/diagram/SdSelfMsgCanvas.cpp b/src/diagram/SdSelfMsgCanvas.cpp
index 5481fc2d4..32a98917c 100644
--- a/src/diagram/SdSelfMsgCanvas.cpp
+++ b/src/diagram/SdSelfMsgCanvas.cpp
@@ -31,11 +31,8 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
-//Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
-
+#include <QPolygon>
 #include "SdSelfMsgCanvas.h"
 #include "SdDurationCanvas.h"
 #include "OperationData.h"
@@ -57,8 +54,8 @@ SdSelfMsgCanvas::SdSelfMsgCanvas(UmlCanvas * canvas, SdMsgSupport * d,
 {
     dest->add(this);
     update_hpos();
-    setSize(SELF_MSG_WIDTH, SELF_MSG_HEIGHT);
-    check_vpos(d->rect());
+    setRect(0,0,SELF_MSG_WIDTH, SELF_MSG_HEIGHT);
+    check_vpos(d->sceneRect());
     set_center100();
     show();
 }
@@ -70,7 +67,7 @@ SdSelfMsgCanvas::~SdSelfMsgCanvas()
 void SdSelfMsgCanvas::change_scale()
 {
     if (!((BrowserSeqDiagram *) the_canvas()->browser_diagram())
-        ->is_overlapping_bars()) {
+            ->is_overlapping_bars()) {
         // else done by check_vpos called by SdDurationCanvas::change_scale()
         SdMsgBaseCanvas::change_scale();
     }
@@ -80,12 +77,12 @@ void SdSelfMsgCanvas::update_hpos()
 {
     LabelCanvas * lbl = label;
     int cy = center_y_scale100;
-    double dx = dest->rect().right() + 1 - x();
+    double dx = dest->sceneRect().right() + 1 - x();
 
     if (the_canvas()->do_zoom())
         // the label and stereotype are moved independently
         label = 0;
-    else if ((stereotype != 0) && !stereotype->selected())
+    else if ((stereotype != 0) && !stereotype->isSelected())
         stereotype->moveBy(dx, 0);
 
     DiagramCanvas::moveBy(dx, 0);
@@ -97,7 +94,7 @@ void SdSelfMsgCanvas::update_hpos()
 void SdSelfMsgCanvas::check_vpos(const QRect & r)
 {
     if (((BrowserSeqDiagram *) the_canvas()->browser_diagram())
-        ->is_overlapping_bars()) {
+            ->is_overlapping_bars()) {
         double v;
 
         switch (itsType) {
@@ -118,7 +115,7 @@ void SdSelfMsgCanvas::check_vpos(const QRect & r)
 
             DiagramCanvas::moveBy(0, dy);
 
-            if ((stereotype != 0) && !stereotype->selected())
+            if ((stereotype != 0) && !stereotype->isSelected())
                 stereotype->moveBy(0, dy);
         }
     }
@@ -162,7 +159,7 @@ void SdSelfMsgCanvas::draw(QPainter & p)
     }
 
     if (itsType == UmlSyncSelfMsg) {
-        Q3PointArray poly(3);
+        QPolygon poly(3);
         QBrush brsh = p.brush();
 
         p.setBrush(Qt::black);
@@ -187,25 +184,33 @@ void SdSelfMsgCanvas::draw(QPainter & p)
 
         if (fp != 0)
             fprintf(fp, "\t<path fill=\"none\" stroke=\"black\" stroke-opacity=\"1\""
-                    " d=\"M %d %d L %d %d L %d %d\" />\n"
-                    "</g>\n",
+                        " d=\"M %d %d L %d %d L %d %d\" />\n"
+                        "</g>\n",
                     r.left() + 1 + ah, he + ah,
                     r.left() + 1, he,
                     r.left() + 1 + ah, he - ah);
     }
 
-    if (selected())
+    if (isSelected())
         show_mark(p, r);
 }
 
+void SdSelfMsgCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
 void SdSelfMsgCanvas::update()
 {
     if (((BrowserSeqDiagram *) the_canvas()->browser_diagram())
-        ->is_overlapping_bars()) {
+            ->is_overlapping_bars()) {
         switch (itsType) {
         case UmlSelfReturnMsg:
         case UmlSyncSelfMsg:
-            check_vpos(dest->rect());
+            check_vpos(dest->sceneRect());
             return;
 
         default:
@@ -239,127 +244,131 @@ int SdSelfMsgCanvas::overlap_dir(SdDurationCanvas *) const
 
 void SdSelfMsgCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-
-    MenuFactory::createTitle(m, TR("Message"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertItem(TR("Edit drawing settings"), 3);
-    m.insertSeparator();
+    QMenu m(0);
+
+    MenuFactory::createTitle(m, tr("Message"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
+    m.addSeparator();
 
     if (msg != 0)
-        m.insertItem(TR("Select operation in browser"), 8);
+        MenuFactory::addItem(m, tr("Select operation in browser"), 8);
 
-    m.insertItem(TR("Select linked items"), 4);
+    MenuFactory::addItem(m, tr("Select linked items"), 4);
 
     if (label || stereotype) {
-        m.insertSeparator();
-        m.insertItem(TR("Select stereotype and label"), 5);
-        m.insertItem(TR("Default stereotype and label position"), 6);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select stereotype and label"), 5);
+        MenuFactory::addItem(m, tr("Default stereotype and label position"), 6);
     }
 
     if (((BrowserSeqDiagram *) the_canvas()->browser_diagram())
-        ->is_overlapping_bars()) {
-        m.insertSeparator();
-        m.insertItem(TR("Go to new overlapping bar"), 9);
+            ->is_overlapping_bars()) {
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Go to new overlapping bar"), 9);
 
         if (dest->isOverlappingDuration())
-            m.insertItem(TR("Go to parent bar"), 10);
+            MenuFactory::addItem(m, tr("Go to parent bar"), 10);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
-
-    switch (m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        // force son reaffichage
-        hide();
-        show();
-        break;
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (retAction->data().toInt()) {
+        case 0:
+            upper();
+            // force son reaffichage
+            hide();
+            show();
+            break;
 
-    case 1:
-        lower();
-        // force son reaffichage
-        hide();
-        show();
-        break;
+        case 1:
+            lower();
+            // force son reaffichage
+            hide();
+            show();
+            break;
 
-    case 13:
-        z_up();
-        // force son reaffichage
-        hide();
-        show();
-        break;
+        case 13:
+            z_up();
+            // force son reaffichage
+            hide();
+            show();
+            break;
 
-    case 14:
-        z_down();
-        // force son reaffichage
-        hide();
-        show();
-        break;
+        case 14:
+            z_down();
+            // force son reaffichage
+            hide();
+            show();
+            break;
 
-    case 2:
-        open();
-        break;
+        case 2:
+            open();
+            break;
 
-    case 3:
-        edit_drawing_settings();
-        return;
+        case 3:
+            edit_drawing_settings();
+            return;
 
-    case 4:
-        select_associated();
-        break;
+        case 4:
+            select_associated();
+            break;
 
-    case 5:
-        the_canvas()->unselect_all();
+        case 5:
+            the_canvas()->unselect_all();
 
-        if (label)
-            the_canvas()->select(label);
+            if (label)
+                the_canvas()->select(label);
 
-        if (stereotype)
-            the_canvas()->select(stereotype);
+            if (stereotype)
+                the_canvas()->select(stereotype);
 
-        break;
+            break;
 
-    case 6:
-        if (label)
-            default_label_position();
+        case 6:
+            if (label)
+                default_label_position();
 
-        if (stereotype)
-            default_stereotype_position();
+            if (stereotype)
+                default_stereotype_position();
 
-        break;
+            break;
 
-    case 7:
-        delete_it();
-        return;
+        case 7:
+            delete_it();
+            return;
 
-    case 8:
-        msg->get_browser_node()->select_in_browser();
-        return;
+        case 8:
+            msg->get_browser_node()->select_in_browser();
+            return;
 
-    case 9:
-        ((SdDurationCanvas *) dest)->go_up(this, TRUE);
-        break;
+        case 9:
+            ((SdDurationCanvas *) dest)->go_up(this, TRUE);
+            break;
 
-    case 10:
-        ((SdDurationCanvas *) dest)->go_down(this);
+        case 10:
+            ((SdDurationCanvas *) dest)->go_down(this);
 
-    default:
-        return;
+        default:
+            return;
+        }
     }
 
     package_modified();
     canvas()->update();
 }
 
-void SdSelfMsgCanvas::apply_shortcut(QString s)
+void SdSelfMsgCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -390,9 +399,9 @@ void SdSelfMsgCanvas::edit_drawing_settings()
     for (;;) {
         StateSpecVector st(3);
 
-        st[0].set(TR("operation drawing language"), &drawing_language);
-        st[1].set(TR("show full operation definition"), &show_full_oper);
-        st[2].set(TR("show context mode"), &show_context_mode);
+        st[0].set(tr("operation drawing language"), &drawing_language);
+        st[1].set(tr("show full operation definition"), &show_full_oper);
+        st[2].set(tr("show context mode"), &show_context_mode);
 
         SettingsDialog dialog(&st, 0, FALSE);
 
@@ -411,7 +420,7 @@ bool SdSelfMsgCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void SdSelfMsgCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdSelfMsgCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(3);
@@ -419,31 +428,30 @@ void SdSelfMsgCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         Uml3States show_full_oper;
         ShowContextMode show_context_mode;
 
-        st[0].set(TR("operation drawing language"), &drawing_language);
-        st[1].set(TR("show full operation definition"), &show_full_oper);
-        st[2].set(TR("show context mode"), &show_context_mode);
+        st[0].set(tr("operation drawing language"), &drawing_language);
+        st[1].set(tr("show full operation definition"), &show_full_oper);
+        st[2].set(tr("show context mode"), &show_context_mode);
 
         SettingsDialog dialog(&st, 0, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                SdSelfMsgCanvas *canvas = (SdSelfMsgCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((SdSelfMsgCanvas *) it.current())->drawing_language =
-                        drawing_language;
+                    canvas->drawing_language =
+                            drawing_language;
 
                 if (!st[1].name.isEmpty())
-                    ((SdSelfMsgCanvas *) it.current())->show_full_oper =
-                        show_full_oper;
+                    canvas->show_full_oper =
+                            show_full_oper;
 
                 if (!st[2].name.isEmpty())
-                    ((SdSelfMsgCanvas *) it.current())->show_context_mode =
-                        show_context_mode;
+                    canvas->show_context_mode =
+                            show_context_mode;
 
-                ((SdSelfMsgCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();
             }
         }
 
@@ -452,27 +460,20 @@ void SdSelfMsgCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void SdSelfMsgCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SdSelfMsgCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    SdSelfMsgCanvas * x = (SdSelfMsgCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        SdSelfMsgCanvas * o = (SdSelfMsgCanvas *) it.current();
-
-        o->drawing_language = x->drawing_language;
-        o->show_full_oper = x->show_full_oper;
-        o->show_context_mode = x->show_context_mode;
-        o->modified();	// call package_modified()
-    }
+    const SdSelfMsgCanvas * x = (const SdSelfMsgCanvas *) src;
+    drawing_language = x->drawing_language;
+    show_full_oper = x->show_full_oper;
+    show_context_mode = x->show_context_mode;
+    modified();
 }
 
 void SdSelfMsgCanvas::select_associated()
 {
     the_canvas()->select(this);
 
-    if (!dest->selected())
+    if (!dest->isSelected())
         dest->select_associated();
 }
 
@@ -539,11 +540,11 @@ SdSelfMsgCanvas * SdSelfMsgCanvas::read(char *& st, UmlCanvas * canvas, char * k
         k = read_keyword(st);
 
         SdSelfMsgCanvas * result =
-            new SdSelfMsgCanvas(canvas, d, c, (int) read_double(st) - 1, id);
+                new SdSelfMsgCanvas(canvas, d, c, (int) read_double(st) - 1, id);
 
         if (!strcmp(k, "yz"))
             // new version
-            result->setZ(read_double(st));
+            result->setZValue(read_double(st));
         else if (strcmp(k, "y"))
             wrong_keyword(k, "y/yz");
 
diff --git a/src/diagram/SdSelfMsgCanvas.h b/src/diagram/SdSelfMsgCanvas.h
index cfdcb55aa..8a4209d28 100644
--- a/src/diagram/SdSelfMsgCanvas.h
+++ b/src/diagram/SdSelfMsgCanvas.h
@@ -34,6 +34,7 @@
 
 class SdSelfMsgCanvas : public SdMsgBaseCanvas
 {
+    Q_OBJECT
 public:
     SdSelfMsgCanvas(UmlCanvas * canvas, SdMsgSupport * d,
                     UmlCode l, int v, int id);
@@ -41,26 +42,28 @@ class SdSelfMsgCanvas : public SdMsgBaseCanvas
 
     virtual void draw(QPainter & p);
 
-    virtual void change_scale();
-    virtual void update_hpos();
-    virtual void check_vpos(const QRect &);
-    virtual double min_y() const;
-    virtual void update();
+    virtual void change_scale() override;
+    virtual void update_hpos() override;
+    virtual void check_vpos(const QRect &) override;
+    virtual double min_y() const override;
+    virtual void update() override;
     virtual void change_duration(SdDurationCanvas * oldone,
-                                 SdDurationCanvas * newone);
-    virtual int overlap_dir(SdDurationCanvas *) const;
-    virtual void menu(const QPoint &);
-    virtual void select_associated();
+                                 SdDurationCanvas * newone) override;
+    virtual int overlap_dir(SdDurationCanvas *) const override;
+    virtual void menu(const QPoint &) override;
+    virtual void select_associated() override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
     void edit_drawing_settings();
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static SdSelfMsgCanvas * read(char *& , UmlCanvas *, char *);
+protected:
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 };
 
 #endif
diff --git a/src/diagram/SelectAreaCanvas.cpp b/src/diagram/SelectAreaCanvas.cpp
index a33879979..c7b7679eb 100644
--- a/src/diagram/SelectAreaCanvas.cpp
+++ b/src/diagram/SelectAreaCanvas.cpp
@@ -34,17 +34,22 @@
 #include "SelectAreaCanvas.h"
 
 SelectAreaCanvas::SelectAreaCanvas(int x, int y, int width, int height,
-                                   Q3Canvas * canvas)
-    : Q3CanvasRectangle(x, y, width, height, canvas)
+                                   QGraphicsScene *canvas)
+    : QGraphicsRectItem(x, y, width, height)
 {
+    canvas->addItem(this);
 }
 
-void SelectAreaCanvas::drawShape(QPainter & p)
+void SelectAreaCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    if (! visible()) return;
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
 
-    p.setRenderHint(QPainter::Antialiasing, true);
-    p.setPen(::Qt::DotLine);
-    Q3CanvasRectangle::drawShape(p);
-    p.setPen(::Qt::SolidLine);
+    if (! isVisible()) return;
+
+    painter->setRenderHint(QPainter::Antialiasing, true);
+    painter->setPen(::Qt::DotLine);
+    painter->drawRect(this->rect());
+    //QGraphicsRectItem::paint(painter, option, widget);
+    painter->setPen(::Qt::SolidLine);
 }
diff --git a/src/diagram/SelectAreaCanvas.h b/src/diagram/SelectAreaCanvas.h
index a6df10252..1ec1637dc 100644
--- a/src/diagram/SelectAreaCanvas.h
+++ b/src/diagram/SelectAreaCanvas.h
@@ -28,15 +28,15 @@
 #ifndef SELECTAREACANVAS_H
 #define SELECTAREACANVAS_H
 
-#include <q3canvas.h>
-
-class SelectAreaCanvas : public Q3CanvasRectangle
+#include <QGraphicsScene>
+#include <QGraphicsRectItem>
+class SelectAreaCanvas : public QGraphicsRectItem
 {
 public:
-    SelectAreaCanvas(int x, int y, int width, int height, Q3Canvas * canvas);
+    SelectAreaCanvas(int x, int y, int width, int height, QGraphicsScene * canvas);
 
 protected:
-    virtual void drawShape(QPainter & p);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 };
 
 #endif
diff --git a/src/diagram/SeqDiagramView.cpp b/src/diagram/SeqDiagramView.cpp
index a085e2770..49d5f2d19 100644
--- a/src/diagram/SeqDiagramView.cpp
+++ b/src/diagram/SeqDiagramView.cpp
@@ -30,7 +30,7 @@
 
 
 #include <qfont.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -72,18 +72,18 @@ SeqDiagramView::SeqDiagramView(QWidget * parent, UmlCanvas * canvas, int id)
 
 void SeqDiagramView::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Sequence diagram menu"));
+    MenuFactory::createTitle(m, tr("Sequence diagram menu"));
 
     if ((((UmlCanvas *) canvas())->browser_diagram())->is_writable()) {
         BrowserSeqDiagram * sd = (BrowserSeqDiagram *) window()->browser_diagram();
         bool overlapping = sd->is_overlapping_bars();
 
-        m.insertItem((overlapping) ? TR("Transform to flat activity bars")
-                     : TR("Transform to overlapping activity bars"),
-                     29);
-        m.insertSeparator();
+        MenuFactory::addItem(m, (overlapping) ? tr("Transform to flat activity bars")
+                                              : tr("Transform to overlapping activity bars"),
+                             29);
+        m.addSeparator();
 
         switch (default_menu(m, 30)) {
         case EDIT_DRAWING_SETTING_CMD:
@@ -118,40 +118,40 @@ void SeqDiagramView::menu(const QPoint &)
 
 void SeqDiagramView::toFlat()
 {
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
-
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * it = QCanvasItemToDiagramItem(*cit);
 
         if ((it != 0) && // an uml canvas item
-            (*cit)->visible() &&
-            (it->type() == UmlLifeLine))
+                (*cit)->isVisible() &&
+                (it->typeUmlCode() == UmlLifeLine))
             ((SdLifeLineCanvas *) it)->toFlat();
     }
 }
 
 void SeqDiagramView::toOverlapping()
 {
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
-
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * it = QCanvasItemToDiagramItem(*cit);
 
         if ((it != 0) && // an uml canvas item
-            (*cit)->visible() &&
-            (it->type() == UmlLifeLine))
+                (*cit)->isVisible() &&
+                (it->typeUmlCode() == UmlLifeLine))
             ((SdLifeLineCanvas *) it)->toOverlapping();
     }
 }
 
-void SeqDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void SeqDiagramView::mousePressEvent(QMouseEvent * e)
 {
     if (!window()->frozen()) {
         if (e->button() == ::Qt::RightButton)
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
         else {
+            QPoint diagramPoint(e->x(), e->y());
+            QPointF scenePoint = mapToScene(diagramPoint);
             UmlCode c = window()->buttonOn();
 
             switch (c) {
@@ -162,21 +162,20 @@ void SeqDiagramView::contentsMousePressEvent(QMouseEvent * e)
                 history_save();
 
                 BrowserNode * parent =
-                    ((BrowserNode *) window()->browser_diagram()->parent());
+                        ((BrowserNode *) window()->browser_diagram()->parent());
                 BrowserClass * b =
-                    BrowserClass::get_class(parent);
-
+                        BrowserClass::get_class(parent);
                 if (b != 0) {
                     SdClassInstCanvas * cli =
-                        new SdClassInstCanvas(b, the_canvas(), e->x(), 0);
+                            new SdClassInstCanvas(b, the_canvas(), scenePoint.x(), 0);
 
                     cli->show();
-                    cli->moveBy(e->x() - cli->center().x(), 0);
+                    cli->moveBy(scenePoint.x() - cli->center().x(), 0);
                     cli->upper();
                     window()->package_modified();
                 }
             }
-            break;
+                break;
 
             case UmlClassInstance: {
                 history_protected = TRUE;
@@ -185,21 +184,20 @@ void SeqDiagramView::contentsMousePressEvent(QMouseEvent * e)
                 history_save();
 
                 BrowserNode * parent =
-                    ((BrowserNode *) window()->browser_diagram()->parent());
+                        ((BrowserNode *) window()->browser_diagram()->parent());
                 BrowserClassInstance * b =
-                    BrowserClassInstance::get_classinstance(parent);
-
+                        BrowserClassInstance::get_classinstance(parent);
                 if (b != 0) {
                     SdClassInstCanvas * cli =
-                        new SdClassInstCanvas(b, the_canvas(), e->x(), 0);
+                            new SdClassInstCanvas(b, the_canvas(), scenePoint.x(), 0);
 
                     cli->show();
-                    cli->moveBy(e->x() - cli->center().x(), 0);
+                    cli->moveBy(scenePoint.x() - cli->center().x(), 0);
                     cli->upper();
                     window()->package_modified();
                 }
             }
-            break;
+                break;
 
             case UmlSyncSelfMsg:
             case UmlAsyncSelfMsg:
@@ -209,7 +207,7 @@ void SeqDiagramView::contentsMousePressEvent(QMouseEvent * e)
                 window()->selectOn();
                 history_save();
 
-                Q3CanvasItem * ci = the_canvas()->collision(e->pos());
+                QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint());
 
                 if (ci != 0) {
                     DiagramItem * i = QCanvasItemToDiagramItem(ci);
@@ -220,31 +218,29 @@ void SeqDiagramView::contentsMousePressEvent(QMouseEvent * e)
                         if (!err.isEmpty())
                             msg_critical("Douml" , err);
                         else {
-                            i->connexion(c, i, e->pos(), e->pos());
+                            i->connexion(c, i, scenePoint.toPoint(), scenePoint.toPoint());
                             window()->package_modified();
                         }
                     }
                 }
             }
-            break;
+                break;
 
             case UmlContinuation: {
                 history_protected = TRUE;
                 unselect_all();
                 window()->selectOn();
                 history_save();
-
                 SdContinuationCanvas * cont =
-                    new SdContinuationCanvas(the_canvas(), e->x(), e->y(), 0);
-
+                        new SdContinuationCanvas(the_canvas(), scenePoint.x(), scenePoint.y(), 0);
                 cont->show();
                 cont->upper();
                 window()->package_modified();
             }
-            break;
+                break;
 
             default:
-                DiagramView::contentsMousePressEvent(e);
+                DiagramView::mousePressEvent(e);
                 return;
             }
 
@@ -253,22 +249,22 @@ void SeqDiagramView::contentsMousePressEvent(QMouseEvent * e)
         }
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
-void SeqDiagramView::contentsMouseMoveEvent(QMouseEvent * e)
+void SeqDiagramView::mouseMoveEvent(QMouseEvent * e)
 {
     if (!window()->frozen()) {
-        DiagramView::contentsMouseMoveEvent(e);
+        DiagramView::mouseMoveEvent(e);
 
-        Q3CanvasItemList all = canvas()->allItems();
-        Q3CanvasItemList::Iterator cit;
+        QList<QGraphicsItem*> all = canvas()->items();
+        QList<QGraphicsItem*>::Iterator cit;
 
         for (cit = all.begin(); cit != all.end(); ++cit) {
             DiagramItem * it = QCanvasItemToDiagramItem(*cit);
 
             if ((it != 0) && // an uml canvas item
-                (*cit)->visible())
+                    (*cit)->isVisible())
                 it->update();
         }
     }
@@ -279,24 +275,24 @@ void SeqDiagramView::keyPressEvent(QKeyEvent * e)
     if (!window()->frozen()) {
         DiagramView::keyPressEvent(e);
 
-        if (e->state() != ::Qt::ControlModifier) {
+        if (e->modifiers() != ::Qt::ControlModifier) {
             switch (e->key()) {
             case ::Qt::Key_Left:
             case ::Qt::Key_Up:
             case ::Qt::Key_Right:
             case ::Qt::Key_Down: {
-                Q3CanvasItemList all = canvas()->allItems();
-                Q3CanvasItemList::Iterator cit;
+                QList<QGraphicsItem*> all = canvas()->items();
+                QList<QGraphicsItem*>::Iterator cit;
 
                 for (cit = all.begin(); cit != all.end(); ++cit) {
                     DiagramItem * it = QCanvasItemToDiagramItem(*cit);
 
                     if ((it != 0) && // an uml canvas item
-                        (*cit)->visible())
+                            (*cit)->isVisible())
                         it->update();
                 }
             }
-            break;
+                break;
 
             default:
                 break;
@@ -308,33 +304,49 @@ void SeqDiagramView::keyPressEvent(QKeyEvent * e)
 void SeqDiagramView::dragEnterEvent(QDragEnterEvent * e)
 {
     if (!window()->frozen() &&
-        (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
-         UmlDrag::canDecode(e, UmlClassInstance, TRUE, TRUE) ||
-         UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
-         UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
+            (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClassInstance, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
         e->accept();
     else
         e->ignore();
 }
 
+void SeqDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+    if (!window()->frozen() &&
+            (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClassInstance, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
+        e->accept();
+    else
+        e->ignore();
+}
 void SeqDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
-
+    QPointF p = mapToScene(e->pos());
     if ((bn = UmlDrag::decode(e, UmlClassInstance)) != 0) {
         history_save();
-
         SdClassInstCanvas * cli =
-            new SdClassInstCanvas((BrowserClassInstance *) bn,
-                                  the_canvas(), p.x(), 0);
+                new SdClassInstCanvas((BrowserClassInstance *) bn,
+                                      the_canvas(), p.x(), 0);
 
         history_protected = TRUE;
         cli->show();
@@ -345,9 +357,8 @@ void SeqDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlClass)) != 0) {
         history_save();
-
         SdClassInstCanvas * cli =
-            new SdClassInstCanvas(bn, the_canvas(), p.x(), 0);
+                new SdClassInstCanvas(bn, the_canvas(), p.x(), 0);
 
         history_protected = TRUE;
         cli->show();
@@ -366,7 +377,6 @@ void SeqDiagramView::dropEvent(QDropEvent * e)
              ((bn = UmlDrag::decode(e, UmlStateDiagram, TRUE)) != 0) ||
              ((bn = UmlDrag::decode(e, UmlActivityDiagram, TRUE)) != 0)) {
         history_save();
-
         IconCanvas * ic = new IconCanvas(bn, the_canvas(), p.x(), p.y(), 0);
 
         history_protected = TRUE;
@@ -381,8 +391,7 @@ void SeqDiagramView::dropEvent(QDropEvent * e)
 void SeqDiagramView::save(QTextStream & st, QString & warning,
                           bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
+    DiagramItemList items(canvas()->items());
 
     if (!copy)
         // sort is useless for a copy
@@ -392,8 +401,8 @@ void SeqDiagramView::save(QTextStream & st, QString & warning,
 
     // save first the fragments, continuation, actors, classes instances, notes, icons and text
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlFragment:
         case UmlContinuation:
         case UmlClass:
@@ -413,22 +422,22 @@ void SeqDiagramView::save(QTextStream & st, QString & warning,
 
     // then save durations
 
-    for (di = items.first(); di != 0; di = items.next())
+    foreach (DiagramItem *di, items)
         if ((!copy || di->copyable()) &&
-            (di->type() == UmlActivityDuration))
+                (di->typeUmlCode() == UmlActivityDuration))
             di->save(st, FALSE, warning);
 
     // then save lost/found start/end
 
-    for (di = items.first(); di != 0; di = items.next())
+    foreach (DiagramItem *di, items)
         if ((!copy || di->copyable()) &&
-            (di->type() == UmlLostFoundMsgSupport))
+                (di->typeUmlCode() == UmlLostFoundMsgSupport))
             di->save(st, FALSE, warning);
 
     // then save messages
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlSyncMsg:
         case UmlAsyncMsg:
         case UmlFoundSyncMsg:
@@ -449,8 +458,8 @@ void SeqDiagramView::save(QTextStream & st, QString & warning,
 
     // then save anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    foreach (DiagramItem *di, items)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
 
     if (!copy && (preferred_zoom != 0)) {
@@ -466,13 +475,12 @@ void SeqDiagramView::save(QTextStream & st, QString & warning,
 void SeqDiagramView::read(char * st, char * k)
 {
     UmlCanvas * canvas = the_canvas();
-
     // reads first the actors, classes instances, notes, icons text and images
-    while (SdClassInstCanvas::read(st, canvas, k) ||
-           NoteCanvas::read(st, canvas, k) ||
+    while (NoteCanvas::read(st, canvas, k) ||
            TextCanvas::read(st, canvas, k) ||
            IconCanvas::read(st, canvas, k) ||
            FragmentCanvas::read(st, canvas, k) ||
+           SdClassInstCanvas::read(st, canvas, k) ||
            SdContinuationCanvas::read(st, canvas, k) ||
            ImageCanvas::read(st, canvas, k))
         k = read_keyword(st);
@@ -489,7 +497,6 @@ void SeqDiagramView::read(char * st, char * k)
     while (SdMsgCanvas::read(st, canvas, k) ||
            SdSelfMsgCanvas::read(st, canvas, k))
         k = read_keyword(st);
-
     // then reads anchors
     while (ArrowCanvas::read(st, canvas, k))
         k = read_keyword(st);
@@ -509,13 +516,13 @@ void SeqDiagramView::read(char * st, char * k)
 
 void SeqDiagramView::send(ToolCom * com)
 {
-    Q3CanvasItemList l = canvas()->allItems();
-    Q3PtrList<FragmentCanvas> fragments;
-    Q3PtrList<FragmentCanvas> refs;
-
+    QList<QGraphicsItem*> l = canvas()->items();
+    QList<FragmentCanvas *> fragments;
+    QList<FragmentCanvas *> refs;
     FragmentCanvas::send(com, l, fragments, refs);
     SdClassInstCanvas::send(com, l);
     SdLifeLineCanvas::send(com, l, fragments, refs);
-    TextCanvas::send(com, l);
     SdContinuationCanvas::send(com, l);
+    TextCanvas::send(com, l);
+
 }
diff --git a/src/diagram/SeqDiagramView.h b/src/diagram/SeqDiagramView.h
index 80db9150e..72bae92a0 100644
--- a/src/diagram/SeqDiagramView.h
+++ b/src/diagram/SeqDiagramView.h
@@ -43,12 +43,13 @@ class ToolCom;
 
 class SeqDiagramView : public DiagramView
 {
+    Q_OBJECT
 public:
     SeqDiagramView(QWidget * parent, UmlCanvas * canvas, int id);
 
-    virtual void menu(const QPoint &);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+    virtual void menu(const QPoint &) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
     void send(ToolCom * com);
 
@@ -60,11 +61,12 @@ class SeqDiagramView : public DiagramView
     void toOverlapping();
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void contentsMouseMoveEvent(QMouseEvent *);
-    void keyPressEvent(QKeyEvent * e);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void mouseMoveEvent(QMouseEvent *) override;
+    virtual void keyPressEvent(QKeyEvent * e) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent *e) override;
 };
 
 #endif
diff --git a/src/diagram/SeqDiagramWindow.cpp b/src/diagram/SeqDiagramWindow.cpp
index 8216111bd..9bc6152a6 100644
--- a/src/diagram/SeqDiagramWindow.cpp
+++ b/src/diagram/SeqDiagramWindow.cpp
@@ -30,13 +30,12 @@
 
 
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+//#include <qworkspace.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qspinbox.h>
-
 #include "UmlWindow.h"
 #include "SeqDiagramWindow.h"
 #include "SeqDiagramView.h"
@@ -44,15 +43,15 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
-
+#include "toolbarfactory.h"
 QString addmodeledclassinstanceText()
 {
-    return TR("Click this button to add a modeled <i>class instance</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a modeled <i>class instance</i> in the diagram. <br><br>"
               "You can also drop the class instance from the <b>browser</b>.");
 }
 QString addclassinstanceText()
 {
-    return TR("Click this button to add a <i>class instance</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>class instance</i> in the diagram. <br><br>"
               "You can also drop the class from the <b>browser</b>.");
 }
 extern QString addfragmentText();
@@ -60,51 +59,51 @@ extern QString noteText();
 extern QString anchorText();
 QString syncmsgText()
 {
-    return TR("Click this button to send a <i>synchronous message</i>");
+    return QObject::tr("Click this button to send a <i>synchronous message</i>");
 }
 QString asyncmsgText()
 {
-    return TR("Click this button to send an <i>asynchronous message</i>");
+    return QObject::tr("Click this button to send an <i>asynchronous message</i>");
 }
 QString syncselfmsgText()
 {
-    return TR("Click this button to send a <i>reflexive synchronous message</i>");
+    return QObject::tr("Click this button to send a <i>reflexive synchronous message</i>");
 }
 QString asyncselfmsgText()
 {
-    return TR("Click this button to send a <i>reflexive asynchronous message</i>");
+    return QObject::tr("Click this button to send a <i>reflexive asynchronous message</i>");
 }
 QString lostsyncmsgText()
 {
-    return TR("Click this button to send a <i>synchronous lost message</i>");
+    return QObject::tr("Click this button to send a <i>synchronous lost message</i>");
 }
 QString lostasyncmsgText()
 {
-    return TR("Click this button to send a <i>asynchronous lost message</i>");
+    return QObject::tr("Click this button to send a <i>asynchronous lost message</i>");
 }
 QString foundsyncmsgText()
 {
-    return TR("Click this button to add a <i>synchronous found message</i>");
+    return QObject::tr("Click this button to add a <i>synchronous found message</i>");
 }
 QString foundasyncmsgText()
 {
-    return TR("Click this button to add a <i>asynchronous found message</i>");
+    return QObject::tr("Click this button to add a <i>asynchronous found message</i>");
 }
 QString returnmsgText()
 {
-    return TR("Click this button to add an <i>explicitly return</i>");
+    return QObject::tr("Click this button to add an <i>explicitly return</i>");
 }
 QString selfreturnmsgText()
 {
-    return TR("Click this button to add an <i>explicit reflexive return</i>");
+    return QObject::tr("Click this button to add an <i>explicit reflexive return</i>");
 }
 QString textText()
 {
-    return TR("Click this button to add a <i>text</i>");
+    return QObject::tr("Click this button to add a <i>text</i>");
 }
 QString addcontinuationText()
 {
-    return TR("Click this button to add a <i>continuation</i>");
+    return QObject::tr("Click this button to add a <i>continuation</i>");
 }
 extern QString imageText();
 
@@ -112,143 +111,143 @@ extern QString imageText();
 SeqDiagramWindow::SeqDiagramWindow(const QString & s, BrowserSeqDiagram * b, int id)
     : DiagramWindow(b, s), view(0)
 {
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "sequence diagram operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
+    QToolBar * toolbar = new QToolBar("sequence diagram operations",this);
+    addToolBar(Qt::TopToolBarArea,toolbar);
 
     add_edit_button(toolbar);
 
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton, QObject::tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar,
                         "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
+    select->setCheckable(TRUE);
+    select->setChecked(TRUE);
     current_button = UmlSelect;
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("Add Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton, QObject::tr("Add Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar,
                           "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis(addfragmentText());
 
     addClassInstance
-        = new QToolButton(*classinstanceButton, TR("Add modeled Class instance"), QString(),
+        = ToolBarFactory::createToolButton(*classinstanceButton, QObject::tr("Add modeled Class instance"), QString(),
                           this, SLOT(hit_classinstance()), toolbar,
                           "add modeled class instance");
-    addClassInstance->setToggleButton(TRUE);
-    Q3WhatsThis::add(addClassInstance, addmodeledclassinstanceText());
+    addClassInstance->setCheckable(TRUE);
+    addClassInstance->setWhatsThis( addmodeledclassinstanceText());
 
     addClass
-        = new QToolButton(*classButton, TR("Add Class instance"), QString(),
+        = ToolBarFactory::createToolButton(*classButton, QObject::tr("Add Class instance"), QString(),
                           this, SLOT(hit_class()), toolbar,
                           "add class");
-    addClass->setToggleButton(TRUE);
-    Q3WhatsThis::add(addClass, addclassinstanceText());
+    addClass->setCheckable(TRUE);
+    addClass->setWhatsThis( addclassinstanceText());
 
     addContinuation
-        = new QToolButton(*continuationButton, TR("Add Continuation"), QString(),
+        = ToolBarFactory::createToolButton(*continuationButton, QObject::tr("Add Continuation"), QString(),
                           this, SLOT(hit_continuation()), toolbar,
                           "add continuation");
-    addContinuation->setToggleButton(TRUE);
-    Q3WhatsThis::add(addContinuation, addcontinuationText());
+    addContinuation->setCheckable(TRUE);
+    addContinuation->setWhatsThis( addcontinuationText());
 
     syncMsg =
-        new QToolButton(*syncmsgButton, TR("Synchronous message"), QString(),
+        ToolBarFactory::createToolButton(*syncmsgButton, QObject::tr("Synchronous message"), QString(),
                         this, SLOT(hit_syncmsg()), toolbar,
                         "synchronous message");
-    syncMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(syncMsg, syncmsgText());
+    syncMsg->setCheckable(TRUE);
+    syncMsg->setWhatsThis( syncmsgText());
 
     asyncMsg =
-        new QToolButton(*directionalAssociationButton, TR("Asynchronous message"), QString(),
+        ToolBarFactory::createToolButton(*directionalAssociationButton, QObject::tr("Asynchronous message"), QString(),
                         this, SLOT(hit_asyncmsg()), toolbar,
                         "asynchronous message");
-    asyncMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(asyncMsg, asyncmsgText());
+    asyncMsg->setCheckable(TRUE);
+    asyncMsg->setWhatsThis( asyncmsgText());
 
     syncSelfMsg =
-        new QToolButton(*syncselfmsgButton, TR("Synchronous Reflexive message"), QString(),
+        ToolBarFactory::createToolButton(*syncselfmsgButton, QObject::tr("Synchronous Reflexive message"), QString(),
                         this, SLOT(hit_syncselfmsg()), toolbar,
                         "synchronous reflexive message");
-    syncSelfMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(syncSelfMsg, syncselfmsgText());
+    syncSelfMsg->setCheckable(TRUE);
+    syncSelfMsg->setWhatsThis( syncselfmsgText());
 
     asyncSelfMsg =
-        new QToolButton(*asyncselfmsgButton, TR("Asynchronous Reflexive message"), QString(),
+        ToolBarFactory::createToolButton(*asyncselfmsgButton, QObject::tr("Asynchronous Reflexive message"), QString(),
                         this, SLOT(hit_asyncselfmsg()), toolbar,
                         "asynchronous reflexive message");
-    asyncSelfMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(asyncSelfMsg, asyncselfmsgText());
+    asyncSelfMsg->setCheckable(TRUE);
+    asyncSelfMsg->setWhatsThis( asyncselfmsgText());
 
     foundsyncMsg =
-        new QToolButton(*foundsyncmsgButton, TR("Synchronous found message"), QString(),
+        ToolBarFactory::createToolButton(*foundsyncmsgButton, QObject::tr("Synchronous found message"), QString(),
                         this, SLOT(hit_foundsyncmsg()), toolbar,
                         "synchronous found message");
-    foundsyncMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(foundsyncMsg, foundsyncmsgText());
+    foundsyncMsg->setCheckable(TRUE);
+    foundsyncMsg->setWhatsThis( foundsyncmsgText());
 
     foundasyncMsg =
-        new QToolButton(*foundasyncmsgButton, TR("Asynchronous found message"), QString(),
+        ToolBarFactory::createToolButton(*foundasyncmsgButton, QObject::tr("Asynchronous found message"), QString(),
                         this, SLOT(hit_foundasyncmsg()), toolbar,
                         "asynchronous found message");
-    foundasyncMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(foundasyncMsg, foundasyncmsgText());
+    foundasyncMsg->setCheckable(TRUE);
+    foundasyncMsg->setWhatsThis( foundasyncmsgText());
 
     lostsyncMsg =
-        new QToolButton(*lostsyncmsgButton, TR("Synchronous lost message"), QString(),
+        ToolBarFactory::createToolButton(*lostsyncmsgButton, QObject::tr("Synchronous lost message"), QString(),
                         this, SLOT(hit_lostsyncmsg()), toolbar,
                         "synchronous lost message");
-    lostsyncMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(lostsyncMsg, lostsyncmsgText());
+    lostsyncMsg->setCheckable(TRUE);
+    lostsyncMsg->setWhatsThis( lostsyncmsgText());
 
     lostasyncMsg =
-        new QToolButton(*lostasyncmsgButton, TR("Asynchronous lost message"), QString(),
+        ToolBarFactory::createToolButton(*lostasyncmsgButton, QObject::tr("Asynchronous lost message"), QString(),
                         this, SLOT(hit_lostasyncmsg()), toolbar,
                         "asynchronous lost message");
-    lostasyncMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(lostasyncMsg, lostasyncmsgText());
+    lostasyncMsg->setCheckable(TRUE);
+    lostasyncMsg->setWhatsThis( lostasyncmsgText());
 
     returnMsg =
-        new QToolButton(*returnmsgButton, TR("Explicit return"), QString(),
+        ToolBarFactory::createToolButton(*returnmsgButton, QObject::tr("Explicit return"), QString(),
                         this, SLOT(hit_returnmsg()), toolbar,
                         "explicit return");
-    returnMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(returnMsg, returnmsgText());
+    returnMsg->setCheckable(TRUE);
+    returnMsg->setWhatsThis( returnmsgText());
 
     selfreturnMsg =
-        new QToolButton(*selfreturnmsgButton, TR("Explicit reflexive return"), QString(),
+        ToolBarFactory::createToolButton(*selfreturnmsgButton, QObject::tr("Explicit reflexive return"), QString(),
                         this, SLOT(hit_selfreturnmsg()), toolbar,
                         "explicit reflexive return");
-    selfreturnMsg->setToggleButton(TRUE);
-    Q3WhatsThis::add(selfreturnMsg,  selfreturnmsgText());
+    selfreturnMsg->setCheckable(TRUE);
+    selfreturnMsg->setWhatsThis( selfreturnmsgText());
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton, QObject::tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar,
                         "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis(noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton, QObject::tr("Anchor"), QString(),
                         this, SLOT(hit_anchor()), toolbar,
                         "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis(anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton, QObject::tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar,
                         "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis( textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton, QObject::tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+    image->setWhatsThis( imageText());
 
     toolbar->addSeparator();
 
@@ -262,9 +261,9 @@ SeqDiagramWindow::SeqDiagramWindow(const QString & s, BrowserSeqDiagram * b, int
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
+    QMdiArea * w = UmlWindow::get_workspace();
 
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -301,28 +300,27 @@ DiagramView * SeqDiagramWindow::get_view() const
 void SeqDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
-
-    select->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    addClass->setOn(FALSE);
-    addClassInstance->setOn(FALSE);
-    addContinuation->setOn(FALSE);
-    syncMsg->setOn(FALSE);
-    asyncMsg->setOn(FALSE);
-    foundsyncMsg->setOn(FALSE);
-    foundasyncMsg->setOn(FALSE);
-    lostsyncMsg->setOn(FALSE);
-    lostasyncMsg->setOn(FALSE);
-    syncSelfMsg->setOn(FALSE);
-    asyncSelfMsg->setOn(FALSE);
-    selfreturnMsg->setOn(FALSE);
-    returnMsg->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    addClass->setChecked(FALSE);
+    addClassInstance->setChecked(FALSE);
+    addContinuation->setChecked(FALSE);
+    syncMsg->setChecked(FALSE);
+    asyncMsg->setChecked(FALSE);
+    foundsyncMsg->setChecked(FALSE);
+    foundasyncMsg->setChecked(FALSE);
+    lostsyncMsg->setChecked(FALSE);
+    lostasyncMsg->setChecked(FALSE);
+    syncSelfMsg->setChecked(FALSE);
+    asyncSelfMsg->setChecked(FALSE);
+    selfreturnMsg->setChecked(FALSE);
+    returnMsg->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/SeqDiagramWindow.h b/src/diagram/SeqDiagramWindow.h
index cc6d98c1d..17070c916 100644
--- a/src/diagram/SeqDiagramWindow.h
+++ b/src/diagram/SeqDiagramWindow.h
@@ -65,9 +65,9 @@ class SeqDiagramWindow : public DiagramWindow
     SeqDiagramWindow(const QString & s, BrowserSeqDiagram *, int id = -1);
     virtual ~SeqDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_class();
diff --git a/src/diagram/SimpleRelationCanvas.cpp b/src/diagram/SimpleRelationCanvas.cpp
index cc536e01c..2c436ca0a 100644
--- a/src/diagram/SimpleRelationCanvas.cpp
+++ b/src/diagram/SimpleRelationCanvas.cpp
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QTextStream>
 #include <math.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 
 #include "SimpleRelationCanvas.h"
 #include "ArrowPointCanvas.h"
@@ -61,12 +61,12 @@ SimpleRelationCanvas::SimpleRelationCanvas(UmlCanvas * canvas,
     : ArrowCanvas(canvas, b, e, t, id, TRUE, d_start, d_end),
       br_begin(bb), data(d), stereotypeproperties(0)
 {
-    if ((e->type() != UmlArrowPoint) && (bb == 0)) {
+    if ((e->typeUmlCode() != UmlArrowPoint) && (bb == 0)) {
         // end of line construction
         update_begin(e);
     }
     else if (d != 0) {
-        if (e->type() != UmlArrowPoint)
+        if (e->typeUmlCode() != UmlArrowPoint)
             check_stereotypeproperties();
 
         connect(d, SIGNAL(changed()), this, SLOT(modified()));
@@ -119,7 +119,7 @@ void SimpleRelationCanvas::remove(bool from_model)
         if (the_canvas()->must_draw_all_relations()) {
             const SimpleRelationCanvas * a = this;
 
-            while (a->begin->type() == UmlArrowPoint) {
+            while (a->begin->typeUmlCode() == UmlArrowPoint) {
                 a = (SimpleRelationCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
                 if (a == 0)
@@ -129,7 +129,7 @@ void SimpleRelationCanvas::remove(bool from_model)
             if (a && !a->begin->isSelected() && !a->begin->get_bn()->deletedp()) {
                 a = this;
 
-                while (a->end->type() == UmlArrowPoint) {
+                while (a->end->typeUmlCode() == UmlArrowPoint) {
                     a = (SimpleRelationCanvas *)((ArrowPointCanvas *) a->end)->get_other(a);
 
                     if (a == 0)
@@ -157,7 +157,7 @@ BrowserNode * SimpleRelationCanvas::update_begin(DiagramItem * cnend)
     // static to be updated in all the cases
     static SimpleRelationData * d = 0;
 
-    if (begin->type() == UmlArrowPoint) {
+    if (begin->typeUmlCode() == UmlArrowPoint) {
         SimpleRelationCanvas * other =
             ((SimpleRelationCanvas *)((ArrowPointCanvas *) begin)->get_other(this));
 
@@ -166,7 +166,7 @@ BrowserNode * SimpleRelationCanvas::update_begin(DiagramItem * cnend)
     else {
         // the relation start here
         br_begin = begin->get_bn();
-        d = (SimpleRelationData *) begin->add_relation(type(), cnend);
+        d = (SimpleRelationData *) begin->add_relation(typeUmlCode(), cnend);
     }
 
     connect(d, SIGNAL(changed()), this, SLOT(modified()));
@@ -196,44 +196,47 @@ void SimpleRelationCanvas::menu(const QPoint &)
             pstereotype = (SimpleRelationCanvas *) apstereotype;
         }
 
-        Q3PopupMenu m(0);
-        Q3PopupMenu geo(0);
-        Q3PopupMenu toolm(0);
+        QMenu m(0);
+        QMenu geo(0);
+        QMenu toolm(0);
 
         MenuFactory::createTitle(m, data->definition(FALSE, TRUE));
-        m.insertSeparator();
-        m.insertItem("Edit", 0);
-        m.insertSeparator();
+        m.addSeparator();
+        MenuFactory::addItem(m, "Edit", 0);
+        m.addSeparator();
 
-        m.insertItem("Select in browser", 2);
+        MenuFactory::addItem(m, "Select in browser", 2);
 
         if (pstereotype) {
-            m.insertSeparator();
-            m.insertItem("Select stereotype", 3);
-            m.insertItem("Stereotype default position", 4);
+            m.addSeparator();
+            MenuFactory::addItem(m, "Select stereotype", 3);
+            MenuFactory::addItem(m, "Stereotype default position", 4);
 
             if (stereotype == 0)
-                m.insertItem("Attach stereotype to this segment", 6);
+                MenuFactory::addItem(m, "Attach stereotype to this segment", 6);
         }
 
         if (get_start() != get_end()) {
-            m.insertSeparator();
+            m.addSeparator();
             init_geometry_menu(geo, 10);
-            m.insertItem("Geometry (Ctrl+l)", &geo);
+            MenuFactory::insertItem(m, "Geometry (Ctrl+l)", &geo);
         }
 
-        m.insertSeparator();
-        m.insertItem("Remove from diagram", 7);
+        m.addSeparator();
+        MenuFactory::addItem(m, "Remove from diagram", 7);
 
         if (data->get_start()->is_writable())
-            m.insertItem("Delete from model", 8);
+            MenuFactory::addItem(m, "Delete from model", 8);
 
-        m.insertSeparator();
+        m.addSeparator();
 
         if (Tool::menu_insert(&toolm, itstype, 20))
-            m.insertItem("Tool", &toolm);
+            MenuFactory::insertItem(m, "Tool", &toolm);
 
-        int rank = m.exec(QCursor::pos());
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        int rank = retAction->data().toInt();
 
         switch (rank) {
         case 0:
@@ -288,12 +291,13 @@ void SimpleRelationCanvas::menu(const QPoint &)
             else
                 return;
         }
+        }
 
         package_modified();
     }
 }
 
-void SimpleRelationCanvas::apply_shortcut(QString s)
+void SimpleRelationCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser")
         data->get_start()->select_in_browser();
@@ -306,7 +310,7 @@ ArrowPointCanvas * SimpleRelationCanvas::brk(const QPoint & p)
     ArrowPointCanvas * ap =
         new ArrowPointCanvas(the_canvas(), p.x(), p.y());
 
-    ap->setZ(z() + 1);
+    ap->setZValue(zValue() + 1);
 
     SimpleRelationCanvas * other =
         // do not give data to not call update()
@@ -350,12 +354,12 @@ ArrowCanvas * SimpleRelationCanvas::join(ArrowCanvas * other, ArrowPointCanvas *
 
 void SimpleRelationCanvas::modified()
 {
-    if (visible()) {
+    if (isVisible()) {
         hide();
         update(TRUE);
         show();
 
-        if (begin->type() != UmlArrowPoint)
+        if (begin->typeUmlCode() != UmlArrowPoint)
             check_stereotypeproperties();
 
         canvas()->update();
@@ -367,7 +371,7 @@ void SimpleRelationCanvas::setSelected(bool yes)
 {
     UmlWindow::set_commented((yes) ? data->get_start() : 0);
 
-    Q3CanvasPolygon::setSelected(yes);
+    QGraphicsPolygonItem::setSelected(yes);
 }
 
 void SimpleRelationCanvas::update(bool updatepos)
@@ -399,12 +403,12 @@ void SimpleRelationCanvas::update(bool updatepos)
             }
         }
         else {
-            s = toUnicode(s);
+            s = toUnicode(s.toLatin1().constData());
 
             if (s[0] != '{')
                 s = QString("<<") + s + ">>";
 
-            if ((pstereotype == 0) && (begin->type() != UmlArrowPoint)) {
+            if ((pstereotype == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
                 // adds relation's stereotype
                 stereotype = new LabelCanvas(s, the_canvas(), 0, 0);
                 stereotype_default_position();
@@ -440,12 +444,12 @@ void SimpleRelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
     BrowserNode * to = def->get_end_node();
     DiagramItem * ccfrom = 0;
     DiagramItem * ccto = 0;
-    Q3CanvasItemList all = canvas->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     // the two classes are drawn ?
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * adi = QCanvasItemToDiagramItem(*cit);
 
             if (adi != 0) {
@@ -482,7 +486,7 @@ void SimpleRelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
 
 // the relation is not yet drawn,
 void SimpleRelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas,
-                                Q3PtrDict<DiagramItem> & drawn)
+                                QHash<BasicData*,DiagramItem*> & drawn)
 {
     SimpleRelationData * def = (SimpleRelationData *) bn->get_data();
     BrowserNode * from = def->get_start_node();
@@ -498,7 +502,8 @@ void SimpleRelationCanvas::drop(BrowserNode * bn, UmlCanvas * canvas,
         rel->show();
         rel->package_modified();
 
-        drawn.replace(def, rel);
+        drawn.remove(def);
+        drawn.insert(def, rel);
 
         // package set modified by caller
     }
@@ -524,7 +529,7 @@ void SimpleRelationCanvas::moveBy(double dx, double dy)
 
 void SimpleRelationCanvas::select_associated()
 {
-    if (!selected()) {
+    if (!isSelected()) {
         if ((stereotypeproperties != 0) && !stereotypeproperties->selected())
             the_canvas()->select(stereotypeproperties);
 
@@ -535,7 +540,7 @@ void SimpleRelationCanvas::select_associated()
 void SimpleRelationCanvas::check_stereotypeproperties()
 {
     // the note is memorized by the first segment
-    if (begin->type() == UmlArrowPoint)
+    if (begin->typeUmlCode() == UmlArrowPoint)
         ((SimpleRelationCanvas *)((ArrowPointCanvas *) begin)->get_other(this))
         ->check_stereotypeproperties();
     else {
@@ -563,7 +568,7 @@ void SimpleRelationCanvas::save(QTextStream & st, bool ref, QString & warning) c
 {
     if (ref)
         st << "simplerelationcanvas_ref " << get_ident();
-    else if (begin->type() != UmlArrowPoint) {
+    else if (begin->typeUmlCode() != UmlArrowPoint) {
         // relation canvas start
         nl_indent(st);
         st << "simplerelationcanvas " << get_ident() << " ";
@@ -590,7 +595,7 @@ void SimpleRelationCanvas::save(QTextStream & st, bool ref, QString & warning) c
             st << "decenter_end " << ((int)(decenter_end * 1000));
         }
 
-        (const SimpleRelationCanvas *) ArrowCanvas::save_lines(st, TRUE, TRUE, warning);
+        save_lines(st, TRUE, TRUE, warning);
 
         if (stereotypeproperties != 0)
             stereotypeproperties->save(st, FALSE, warning);
@@ -683,7 +688,7 @@ SimpleRelationCanvas * SimpleRelationCanvas::read(char *& st, UmlCanvas * canvas
                         s = QString("<<") + s + ">>";
 
                     stereotype = new LabelCanvas(s, canvas, x, y);
-                    stereotype->setZ(read_double(st));
+                    stereotype->setZValue(read_double(st));
                 }
 
                 k = read_keyword(st);
@@ -727,7 +732,7 @@ SimpleRelationCanvas * SimpleRelationCanvas::read(char *& st, UmlCanvas * canvas
 
             result->show();
 
-            if (di->type() != UmlArrowPoint)
+            if (di->typeUmlCode() != UmlArrowPoint)
                 break;
 
             bi = di;
@@ -774,7 +779,7 @@ SimpleRelationCanvas * SimpleRelationCanvas::read(char *& st, UmlCanvas * canvas
 
 void SimpleRelationCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     unconnect();
 }
 
diff --git a/src/diagram/SimpleRelationCanvas.h b/src/diagram/SimpleRelationCanvas.h
index c513d9bda..534176b1c 100644
--- a/src/diagram/SimpleRelationCanvas.h
+++ b/src/diagram/SimpleRelationCanvas.h
@@ -53,44 +53,45 @@ class SimpleRelationCanvas : public ArrowCanvas
                          SimpleRelationData * d = 0);
     virtual ~SimpleRelationCanvas();
 
-    virtual void delete_it();
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void remove(bool from_model);
-    virtual void unconnect();
+    virtual void delete_it() override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void remove(bool from_model) override;
+    virtual void unconnect() override;
 
-    virtual ArrowPointCanvas * brk(const QPoint &);
-    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap);
+    virtual ArrowPointCanvas * brk(const QPoint &) override;
+    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap) override;
 
     virtual void setSelected(bool yes);
 
     void stereotype_default_position() const;
 
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
     static SimpleRelationCanvas * read(char *& st, UmlCanvas * canvas, char *);
 
-    virtual BasicData * get_data() const;
+    virtual BasicData * get_data() const override;
 
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
-    virtual void setVisible(bool yes);
-    virtual void moveBy(double dx, double dy);
-    virtual void select_associated();
-    virtual void check_stereotypeproperties();
+    virtual void setVisible(bool yes) override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void select_associated() override;
+    virtual void check_stereotypeproperties() override;
 
     static void drop(BrowserNode *, UmlCanvas *);
     static void drop(BrowserNode *, UmlCanvas *,
-                     Q3PtrDict<DiagramItem> & drawn);
+                     QHash<BasicData *, DiagramItem *> &drawn);
 
-    virtual bool represents(BrowserNode *);
+    virtual bool represents(BrowserNode *) override;
 
 protected:
     BrowserNode * update_begin(DiagramItem * cnend);
+    using DiagramItem::update;
     void update(bool updatepos);
 
 private slots:
diff --git a/src/diagram/StateActionCanvas.cpp b/src/diagram/StateActionCanvas.cpp
index a27f71fbf..592f173db 100644
--- a/src/diagram/StateActionCanvas.cpp
+++ b/src/diagram/StateActionCanvas.cpp
@@ -29,12 +29,12 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
+#include <QPolygon>
 #include <QPixmap>
 
 #include "StateActionCanvas.h"
@@ -119,9 +119,9 @@ void StateActionCanvas::compute_size()
 {
     double zoom = the_canvas()->zoom();
     const StateActionData * data =
-        (const StateActionData *) browser_node->get_data();
+            (const StateActionData *) browser_node->get_data();
     const QPixmap * px =
-        ProfiledStereotypes::diagramPixmap(data->get_stereotype(), zoom);
+            ProfiledStereotypes::diagramPixmap(data->get_stereotype(), zoom);
 
     if (px != 0) {
         // force odd width and height for line alignment
@@ -136,7 +136,7 @@ void StateActionCanvas::compute_size()
         s = data->get_action((language == DefaultDrawingLanguage)
                              ? ((BrowserStateDiagram *) the_canvas()->browser_diagram())->get_language()
                              : language);
-        s = toUnicode(s);
+        s = toUnicode(s.toLatin1().constData());
 
         QSize sz = fm.size(0, s);
 
@@ -147,7 +147,7 @@ void StateActionCanvas::compute_size()
         int mn = (int)(STATE_ACTION_CANVAS_MIN_SIZE * zoom);
 
         if (!strcmp(st, "receive-signal") ||
-            !strcmp(st, "send-signal")) {
+                !strcmp(st, "send-signal")) {
             if (min_height < mn)
                 min_height = mn;
 
@@ -173,8 +173,8 @@ void StateActionCanvas::compute_size()
         min_width += 2;
 
         used_color = (itscolor == UmlDefaultColor)
-                     ? the_canvas()->browser_diagram()->get_color(UmlStateAction)
-                     : itscolor;
+                ? the_canvas()->browser_diagram()->get_color(UmlStateAction)
+                : itscolor;
 
         if (used_color != UmlTransparent) {
             const char * st = data->get_short_stereotype();
@@ -194,13 +194,13 @@ void StateActionCanvas::compute_size()
 
 void StateActionCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     double scale = the_canvas()->zoom();
 
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     compute_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void StateActionCanvas::modified()
@@ -251,10 +251,10 @@ void StateActionCanvas::connexion(UmlCode action, DiagramItem * dest,
 aCorner StateActionCanvas::on_resize_point(const QPoint & p)
 {
     return (ProfiledStereotypes::diagramPixmap(browser_node->get_data()->get_stereotype(),
-            the_canvas()->zoom())
+                                               the_canvas()->zoom())
             != 0)
-           ? NoCorner
-           : ::on_resize_point(p, rect());
+            ? NoCorner
+            : ::on_resize_point(p, rect());
 }
 
 void StateActionCanvas::resize(aCorner c, int dx, int dy, QPoint & o)
@@ -276,10 +276,10 @@ void StateActionCanvas::draw(QPainter & p)
     const BasicData * data = browser_node->get_data();
     double zoom = the_canvas()->zoom();
     const QPixmap * px =
-        ProfiledStereotypes::diagramPixmap(data->get_stereotype(),
-                                           the_canvas()->zoom());
+            ProfiledStereotypes::diagramPixmap(data->get_stereotype(),
+                                               the_canvas()->zoom());
     FILE * fp = svg();
-
+    QBrush backBrush = p.background();
     if (fp != 0)
         fputs("<g>\n", fp);
 
@@ -293,11 +293,11 @@ void StateActionCanvas::draw(QPainter & p)
         if (fp != 0)
             // pixmap not really exported in SVG
             fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     svg_color(UmlBlack), lft, r.y(), px->width() - 1, px->height() - 1);
     }
     else {
-        QColor bckgrnd = p.backgroundColor();
+        QColor bckgrnd = p.background().color();
         int mw = min_width;
         QBrush brsh = p.brush();
         QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
@@ -310,12 +310,13 @@ void StateActionCanvas::draw(QPainter & p)
                             ? ::Qt::TransparentMode
                             : ::Qt::OpaqueMode);
 
-        p.setBackgroundColor(co);
+        backBrush.setColor(co);
+        p.setBackground(backBrush);
 
         p.setFont(the_canvas()->get_font(UmlNormalFont));
 
         if (!strcmp(st, "send-signal")) {
-            Q3PointArray a(6);
+            QPolygon a(6);
 
             if ((used_color != UmlTransparent) && (shadow != 0)) {
                 r.setRight(r.right() - shadow);
@@ -339,7 +340,7 @@ void StateActionCanvas::draw(QPainter & p)
             }
             else {
                 if (shadow != 0) {
-                    Q3PointArray b(6);
+                    QPolygon b(6);
 
                     b.setPoint(0, r.left() + shadow, r.top() + shadow);
                     b.setPoint(1, r.right() - hh + shadow, r.top() + shadow);
@@ -349,7 +350,7 @@ void StateActionCanvas::draw(QPainter & p)
                     b.setPoint(5, r.left() + shadow, r.top() + shadow);
                     p.setBrush(::Qt::darkGray);
                     p.setPen(::Qt::NoPen);
-                    p.drawPolygon(b, TRUE, 0, 5);
+                    p.drawPolygon(b/*, TRUE, 0, 5*/);
                     p.setPen(::Qt::SolidLine);
 
                     if (fp != 0)
@@ -357,7 +358,7 @@ void StateActionCanvas::draw(QPainter & p)
                 }
 
                 p.setBrush(co);
-                p.drawPolygon(a, TRUE, 0, 5);
+                p.drawPolygon(a/*, TRUE, 0, 5*/);
 
                 if (fp != 0)
                     draw_poly(fp, a, used_color);
@@ -367,7 +368,7 @@ void StateActionCanvas::draw(QPainter & p)
             mw -= hh;
         }
         else if (!strcmp(st, "receive-signal")) {
-            Q3PointArray a(6);
+            QPolygon a(6);
 
             if ((used_color != UmlTransparent) && (shadow != 0)) {
                 r.setRight(r.right() - shadow);
@@ -391,7 +392,7 @@ void StateActionCanvas::draw(QPainter & p)
             }
             else {
                 if (shadow != 0) {
-                    Q3PointArray b(6);
+                    QPolygon b(6);
 
                     b.setPoint(0, r.left() + shadow, r.top() + shadow);
                     b.setPoint(1, r.right() + shadow, r.top() + shadow);
@@ -401,7 +402,7 @@ void StateActionCanvas::draw(QPainter & p)
                     b.setPoint(5, r.left() + shadow, r.top() + shadow);
                     p.setBrush(::Qt::darkGray);
                     p.setPen(::Qt::NoPen);
-                    p.drawPolygon(b, TRUE, 0, 5);
+                    p.drawPolygon(b/*, TRUE, 0, 5*/);
                     p.setPen(::Qt::SolidLine);
 
                     if (fp != 0)
@@ -409,7 +410,7 @@ void StateActionCanvas::draw(QPainter & p)
                 }
 
                 p.setBrush(co);
-                p.drawPolygon(a, TRUE, 0, 5);
+                p.drawPolygon(a/*, TRUE, 0, 5*/);
 
                 if (fp != 0)
                     draw_poly(fp, a, used_color);
@@ -433,12 +434,12 @@ void StateActionCanvas::draw(QPainter & p)
 
                     if (fp != 0) {
                         fprintf(fp, "\t<rect fill=\"#%06x\" stroke=\"none\" stroke-opacity=\"1\""
-                                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                                 QColor(::Qt::darkGray).rgb() & 0xffffff,
                                 r.right(), r.top() + shadow, shadow - 1, r.height() - 1 - 1);
 
                         fprintf(fp, "\t<rect fill=\"#%06x\" stroke=\"none\" stroke-opacity=\"1\""
-                                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                                 QColor(::Qt::darkGray).rgb() & 0xffffff,
                                 r.left() + shadow, r.bottom(), r.width() - 1 - 1, shadow - 1);
                     }
@@ -450,7 +451,7 @@ void StateActionCanvas::draw(QPainter & p)
 
             if (fp != 0)
                 fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                         svg_color(used_color),
                         r.x(), r.y(), r.width() - 1, r.height() - 1);
 
@@ -476,14 +477,23 @@ void StateActionCanvas::draw(QPainter & p)
         }
 
         p.setBrush(brsh);
-        p.setBackgroundColor(bckgrnd);
+        backBrush.setColor(bckgrnd);
+        p.setBackground(backBrush);
     }
 
     if (selected())
         show_mark(p, rect());
 }
 
-UmlCode StateActionCanvas::type() const
+void StateActionCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode StateActionCanvas::typeUmlCode() const
 {
     return UmlStateAction;
 }
@@ -511,96 +521,100 @@ void StateActionCanvas::open()
 
 void StateActionCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit state action"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit state action"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlStateAction, 20))
-        m.insertItem(TR("Tool"), &toolm);
-
-    switch (index = m.exec(QCursor::pos())) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (index = retAction->data().toInt()) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
 
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
 
-    case 13:
-        z_up();
-        modified();	// call package_modified()
-        return;
+        case 13:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 14:
-        z_down();
-        modified();	// call package_modified()
-        return;
+        case 14:
+            z_down();
+            modified();	// call package_modified()
+            return;
 
-    case 2:
-        edit_drawing_settings();
-        return;
+        case 2:
+            edit_drawing_settings();
+            return;
 
-    case 3:
-        browser_node->open(TRUE);
-        return;
+        case 3:
+            browser_node->open(TRUE);
+            return;
 
-    case 4:
-        browser_node->select_in_browser();
-        return;
+        case 4:
+            browser_node->select_in_browser();
+            return;
 
-    case 5:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 5:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    case 7:
-        //remove from diagram
-        delete_it();
-        break;
+        case 7:
+            //remove from diagram
+            delete_it();
+            break;
 
-    case 8:
-        //delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 8:
+            //delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    default:
-        if (index >= 20)
-            ToolCom::run(Tool::command(index - 20), browser_node);
+        default:
+            if (index >= 20)
+                ToolCom::run(Tool::command(index - 20), browser_node);
 
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void StateActionCanvas::apply_shortcut(QString s)
+void StateActionCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -633,10 +647,10 @@ void StateActionCanvas::edit_drawing_settings()
         StateSpecVector st(2);
         ColorSpecVector co(1);
 
-        st[0].set(TR("drawing language"), &language);
-        st[1].set(TR("show stereotype \nproperties"), &show_stereotype_properties);
+        st[0].set(tr("drawing language"), &language);
+        st[1].set(tr("show stereotype \nproperties"), &show_stereotype_properties);
 
-        co[0].set(TR("state action color"), &itscolor);
+        co[0].set(tr("state action color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -655,7 +669,7 @@ bool StateActionCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void StateActionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void StateActionCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(2);
@@ -663,29 +677,28 @@ void StateActionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         DrawingLanguage language;
         UmlColor itscolor;
 
-        st[0].set(TR("drawing language"), &language);
-        st[1].set(TR("show stereotype \nproperties"), &show_stereotype_properties);
+        st[0].set(tr("drawing language"), &language);
+        st[1].set(tr("show stereotype \nproperties"), &show_stereotype_properties);
 
-        co[0].set(TR("state action color"), &itscolor);
+        co[0].set(tr("state action color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l)  {
+                StateActionCanvas *canvas = (StateActionCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((StateActionCanvas *) it.current())->language = language;
+                    canvas->language = language;
 
                 if (!st[1].name.isEmpty())
-                    ((StateActionCanvas *) it.current())->show_stereotype_properties = show_stereotype_properties;
+                    canvas->show_stereotype_properties = show_stereotype_properties;
 
                 if (!co[0].name.isEmpty())
-                    ((StateActionCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((StateActionCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -694,20 +707,13 @@ void StateActionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void StateActionCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void StateActionCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    StateActionCanvas * x = (StateActionCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        StateActionCanvas * o = (StateActionCanvas *) it.current();
-
-        o->language = x->language;
-        o->show_stereotype_properties = x->show_stereotype_properties;
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const StateActionCanvas * x = (const StateActionCanvas *) src;
+    language = x->language;
+    show_stereotype_properties = x->show_stereotype_properties;
+    itscolor = x->itscolor;
+    modified();
 }
 
 bool StateActionCanvas::get_show_stereotype_properties() const
@@ -732,7 +738,7 @@ QString StateActionCanvas::may_start(UmlCode & l) const
         return 0;
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -741,7 +747,7 @@ QString StateActionCanvas::may_connect(UmlCode & l, const DiagramItem * dest) co
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlState:
     case UmlStateAction:
     case EntryPointPS:
@@ -754,10 +760,10 @@ QString StateActionCanvas::may_connect(UmlCode & l, const DiagramItem * dest) co
     case ChoicePS:
     case ForkPS:
     case JoinPS:
-        return (l == UmlTransition) ? QString() : TR("illegal");
+        return (l == UmlTransition) ? QString() : tr("illegal");
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -791,7 +797,7 @@ void StateActionCanvas::save(QTextStream & st, bool ref, QString & warning) cons
 }
 
 StateActionCanvas * StateActionCanvas::read(char *& st, UmlCanvas * canvas,
-        char * k)
+                                            char * k)
 {
     if (!strcmp(k, "stateactioncanvas_ref"))
         return ((StateActionCanvas *) dict_get(read_id(st), "stateactioncanvas", canvas));
@@ -864,7 +870,7 @@ void StateActionCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(deleted()), this, SLOT(deleted()));
@@ -873,7 +879,7 @@ void StateActionCanvas::history_load(QBuffer & b)
 
 void StateActionCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
     disconnect(browser_node->get_data(), 0, this, 0);
diff --git a/src/diagram/StateActionCanvas.h b/src/diagram/StateActionCanvas.h
index c17d5da33..5abc16034 100644
--- a/src/diagram/StateActionCanvas.h
+++ b/src/diagram/StateActionCanvas.h
@@ -59,46 +59,48 @@ class StateActionCanvas : public QObject, public DiagramCanvas
 protected:
     StateActionCanvas(UmlCanvas * canvas, int id);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     StateActionCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~StateActionCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void compute_size();
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static StateActionCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/StateCanvas.cpp b/src/diagram/StateCanvas.cpp
index 5beb3cf88..49d8162b8 100644
--- a/src/diagram/StateCanvas.cpp
+++ b/src/diagram/StateCanvas.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 //Added by qt3to4:
@@ -254,16 +254,16 @@ void StateCanvas::prepare_for_move(bool on_resize)
         DiagramCanvas::prepare_for_move(on_resize);
 
         // select sub nodes
-        Q3CanvasItemList all = canvas()->allItems();
-        Q3CanvasItemList::Iterator cit;
+        QList<QGraphicsItem*> all = canvas()->items();
+        QList<QGraphicsItem*>::Iterator cit;
         UmlCanvas * canvas = the_canvas();
 
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible() && !(*cit)->selected()) {
+            if ((*cit)->isVisible() && !(*cit)->isSelected()) {
                 DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
                 if ((di != 0) && (di->get_bn() != 0)) {
-                    switch (di->type()) {
+                    switch (di->typeUmlCode()) {
                     case UmlState:
                     case UmlStateAction:
                     case InitialPS:
@@ -292,7 +292,7 @@ void StateCanvas::prepare_for_move(bool on_resize)
         // select points on lines having the two extremities selected or
         // connecting pin/parameter/expansion node of element selected
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible() && !(*cit)->selected() && isa_arrow(*cit)) {
+            if ((*cit)->isVisible() && !(*cit)->isSelected() && isa_arrow(*cit)) {
                 ArrowCanvas * ar = (ArrowCanvas *) *cit;
                 DiagramItem * b;
                 DiagramItem * e;
@@ -304,7 +304,7 @@ void StateCanvas::prepare_for_move(bool on_resize)
                     DiagramItem * dest = ar->get_end();
 
                     if (start->isSelected() && dest->isSelected()) {
-                        while (b->type() == UmlArrowPoint) {
+                        while (b->typeUmlCode() == UmlArrowPoint) {
                             canvas->select((ArrowPointCanvas *) b);
                             ar = ((ArrowPointCanvas *) b)->get_other(ar);
                             ar->extremities(b, e);
@@ -313,7 +313,7 @@ void StateCanvas::prepare_for_move(bool on_resize)
                         ar = (ArrowCanvas *) *cit;
                         ar->extremities(b, e);
 
-                        while (e->type() == UmlArrowPoint) {
+                        while (e->typeUmlCode() == UmlArrowPoint) {
                             canvas->select((ArrowPointCanvas *) e);
                             ar = ((ArrowPointCanvas *) e)->get_other(ar);
                             ar->extremities(b, e);
@@ -327,13 +327,13 @@ void StateCanvas::prepare_for_move(bool on_resize)
 
 void StateCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     double scale = the_canvas()->zoom();
 
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    setRect(0,0,(int)(width_scale100 * scale), (int)(height_scale100 * scale));
     compute_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void StateCanvas::modified()
@@ -370,7 +370,6 @@ void StateCanvas::connexion(UmlCode action, DiagramItem * dest,
                             const QPoint &, const QPoint &)
 {
     ArrowCanvas * a;
-
     if (action == UmlTransition)
         a = new TransitionCanvas(the_canvas(), this, dest, 0, 0, -1.0, -1.0);
     else if (IsaSimpleRelation(action))
@@ -391,7 +390,8 @@ void StateCanvas::resize(aCorner c, int dx, int dy, QPoint & o)
 {
     DiagramCanvas::resize(c, dx, dy, o, min_width, min_height, TRUE);
 
-    force_sub_inside(FALSE);
+    //do not move internal items while resize
+    //force_sub_inside(FALSE);
 }
 
 void StateCanvas::resize(const QSize & sz, bool w, bool h)
@@ -406,8 +406,8 @@ void StateCanvas::force_sub_inside(bool resize_it)
     // inside of the state / region
     // or resize state to contains sub elts if resize_it
 
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
     int resize_left = 0;
     int resize_right = 0;
     int resize_top = 0;
@@ -418,13 +418,13 @@ void StateCanvas::force_sub_inside(bool resize_it)
     // a for just to place again elements if needed
     for (;;) {
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible()/* && !(*cit)->selected()*/) {
+            if ((*cit)->isVisible()/* && !(*cit)->selected()*/) {
                 DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
                 if (di != 0) {
                     bool border_allowed = FALSE;
 
-                    switch (di->type()) {
+                    switch (di->typeUmlCode()) {
                     case EntryPointPS:
                     case ExitPointPS:
                         border_allowed = TRUE;
@@ -467,7 +467,7 @@ void StateCanvas::force_sub_inside(bool resize_it)
                         else
                             continue;
 
-                        need_sub_upper |= ((*cit)->z() <= z());
+                        need_sub_upper |= ((*cit)->zValue() <= zValue());
 
                         int dx = 0;
                         int dy = 0;
@@ -531,7 +531,7 @@ void StateCanvas::force_sub_inside(bool resize_it)
                             if ((dx != 0) || (dy != 0)) {
                                 (*cit)->moveBy(dx, dy);
 
-                                if (di->type() == UmlState) {
+                                if (di->typeUmlCode() == UmlState) {
                                     ((StateCanvas *) di)->moveSelfRelsBy(dx, dy);
                                     ((StateCanvas *) di)->hide_lines();
                                     ((StateCanvas *) di)->update_show_lines();
@@ -624,7 +624,7 @@ void StateCanvas::force_sub_inside(bool resize_it)
 
 int StateCanvas::resize_to_show_regions()
 {
-    Q3ListViewItem * child = browser_node->firstChild();
+    BrowserNode * child = browser_node->firstChild();
     int nr = 0;
 
     while (child != 0) {
@@ -644,8 +644,8 @@ int StateCanvas::resize_to_show_regions()
         DiagramCanvas::resize(width() + d, height());
 
     // to recompute regions rect
-    Q3CanvasRectangle::setVisible(FALSE);
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(TRUE);
     canvas()->update();
 
     if (! was_drawn)
@@ -665,7 +665,7 @@ void StateCanvas::force_inside(DiagramCanvas * elt, bool resize_it)
     case UmlState:
         container_state = parent;
 
-        switch (elt->type()) {
+        switch (elt->typeUmlCode()) {
         case EntryPointPS:
         case ExitPointPS:
             border_allowed = TRUE;
@@ -687,11 +687,11 @@ void StateCanvas::force_inside(DiagramCanvas * elt, bool resize_it)
     }
 
     if (container_state != 0) {
-        Q3CanvasItemList all = elt->the_canvas()->allItems();
-        Q3CanvasItemList::Iterator cit;
+        QList<QGraphicsItem*> all = elt->the_canvas()->items();
+        QList<QGraphicsItem*>::Iterator cit;
 
         for (cit = all.begin(); cit != all.end(); ++cit) {
-            if ((*cit)->visible()) {
+            if ((*cit)->isVisible()) {
                 DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
                 if ((di != 0) && (di->get_bn() == container_state)) {
@@ -759,7 +759,7 @@ void StateCanvas::force_inside(DiagramCanvas * elt, bool resize_it)
                         elt->moveSelfRelsBy(dx, dy);
                     }
 
-                    if (elt->z() <= state->z())
+                    if (elt->zValue() <= state->zValue())
                         elt->upper();
 
                     container_shown = TRUE;
@@ -770,7 +770,7 @@ void StateCanvas::force_inside(DiagramCanvas * elt, bool resize_it)
         }
     }
 
-    if (elt->type() == UmlState) {
+    if (elt->typeUmlCode() == UmlState) {
         ((StateCanvas *) elt)->hide_lines();
         ((StateCanvas *) elt)->update_show_lines();
         ((StateCanvas *) elt)->force_sub_inside(resize_it && !container_shown);
@@ -779,15 +779,15 @@ void StateCanvas::force_inside(DiagramCanvas * elt, bool resize_it)
 
 void StateCanvas::force_sub_upper()
 {
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if (di != 0) {
-                switch (di->type()) {
+                switch (di->typeUmlCode()) {
                 case UmlState:
                 case UmlStateAction:
                 case InitialPS:
@@ -806,10 +806,10 @@ void StateCanvas::force_sub_upper()
                     if ((parent == browser_node) ||
                         ((parent->get_type() == UmlRegion) &&
                          (parent->parent() == browser_node))) {
-                        if ((*cit)->z() <= z())
+                        if ((*cit)->zValue() <= zValue())
                             ((DiagramCanvas *) di)->upper();
 
-                        if (di->type() == UmlState)
+                        if (di->typeUmlCode() == UmlState)
                             ((StateCanvas *) di)->force_sub_upper();
                     }
                 }
@@ -830,13 +830,14 @@ void StateCanvas::draw(QPainter & p)
 
     was_drawn = TRUE; // to know compute_regions() will not have to be called
 
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     QRect re = r;
     QBrush brsh = p.brush();
     FILE * fp = svg();
+    QBrush backBrush = p.background();
 
     if (fp != 0)
         fputs("<g>\n", fp);
@@ -862,7 +863,7 @@ void StateCanvas::draw(QPainter & p)
         }
     }
 
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     QFontMetrics fm(the_canvas()->get_font(UmlNormalBoldFont));
     const int fnt_height = fm.height();
     const int half_fnt_height = fnt_height / 2;
@@ -875,7 +876,8 @@ void StateCanvas::draw(QPainter & p)
 
     QColor co = color(used_color);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
 
     if (used_color != UmlTransparent)
         p.setBrush(co);
@@ -984,7 +986,7 @@ void StateCanvas::draw(QPainter & p)
     int nregion = 0;
 
     if (ref == 0) {
-        Q3ListViewItem * child = browser_node->firstChild();
+        BrowserNode * child = browser_node->firstChild();
 
         while (child != 0) {
             if (!((BrowserNode *) child)->deletedp() &&
@@ -1000,7 +1002,7 @@ void StateCanvas::draw(QPainter & p)
                     / nregion;
 
         if (szreg > fnt_height) {
-            regions.resize(nregion);
+            //regions.resize(nregion);
             regions_rect.resize(nregion);
             p.drawLine(r.topLeft(), r.topRight());
 
@@ -1011,7 +1013,7 @@ void StateCanvas::draw(QPainter & p)
 
             p.setPen(::Qt::DashLine);
 
-            Q3ListViewItem * child = browser_node->firstChild();
+            BrowserNode * child = browser_node->firstChild();
 
             for (;;) {
                 while (((BrowserNode *) child)->deletedp() ||
@@ -1078,13 +1080,22 @@ void StateCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("</g>\n", fp);
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
     p.setBrush(brsh);
 
     if (selected())
         show_mark(p, rect());
 }
 
+void StateCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
 void StateCanvas::compute_regions()
 {
     // code of draw() without drawing
@@ -1133,7 +1144,7 @@ void StateCanvas::compute_regions()
         }
 
 
-        Q3ListViewItem * child = browser_node->firstChild();
+        BrowserNode * child = browser_node->firstChild();
 
         while (child != 0) {
             if (!((BrowserNode *) child)->deletedp() &&
@@ -1152,7 +1163,7 @@ void StateCanvas::compute_regions()
             regions.resize(nregion);
             regions_rect.resize(nregion);
 
-            Q3ListViewItem * child = browser_node->firstChild();
+            BrowserNode * child = browser_node->firstChild();
 
             for (;;) {
                 while (((BrowserNode *) child)->deletedp() ||
@@ -1198,7 +1209,7 @@ void StateCanvas::compute_regions()
     }
 }
 
-UmlCode StateCanvas::type() const
+UmlCode StateCanvas::typeUmlCode() const
 {
     return UmlState;
 }
@@ -1206,7 +1217,7 @@ UmlCode StateCanvas::type() const
 BrowserRegion * StateCanvas::pointed_region(const QPoint & p) const
 {
     // warning : without region, region_rect.size() == 1
-    for (unsigned i = 0; i != regions.size(); i += 1)
+    for (int i = 0; i != regions.size(); i += 1)
         if (regions_rect.at(i).contains(p))
             return regions.at(i);
 
@@ -1216,7 +1227,7 @@ BrowserRegion * StateCanvas::pointed_region(const QPoint & p) const
 QRect StateCanvas::region_rect(BrowserRegion * r)
 {
     // warning : without region, region_rect.size() == 1
-    for (unsigned i = 0; i != regions.size(); i += 1)
+    for (int i = 0; i != regions.size(); i += 1)
         if (regions.at(i) == r)
             return regions_rect.at(i);
 
@@ -1248,62 +1259,65 @@ void StateCanvas::open()
 
 void StateCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
     int index;
     const StateData * data = (StateData *) browser_node->get_data();
     BrowserState * ref = data->get_reference();
 
     MenuFactory::createTitle(m, data->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 13);
-    m.insertItem(TR("Go down"), 14);
-    m.insertSeparator();
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 13);
+    MenuFactory::addItem(m, tr("Go down"), 14);
+    m.addSeparator();
 
     if (ref == 0) {
         if (show_decomp_icon)
-            m.insertItem(TR("Hide decomposition indicator"), 15);
+            MenuFactory::addItem(m, tr("Hide decomposition indicator"), 15);
         else
-            m.insertItem(TR("Show decomposition indicator"), 15);
+            MenuFactory::addItem(m, tr("Show decomposition indicator"), 15);
     }
 
-    m.insertItem(TR("Edit drawing settings"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit state"), 3);
-    m.insertSeparator();
-    m.insertItem(TR("Select in browser"), 4);
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit state"), 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Select in browser"), 4);
 
     if (ref != 0)
-        m.insertItem(TR("Select referenced state in browser"), 16);
+        MenuFactory::addItem(m, tr("Select referenced state in browser"), 16);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 5);
+        MenuFactory::addItem(m, tr("Select linked items"), 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
             (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem(TR("Set associated diagram"), 6);
+            MenuFactory::addItem(m, tr("Set associated diagram"), 6);
 
         if (browser_node->get_associated())
-            m.insertItem(TR("Remove diagram association"), 9);
+            MenuFactory::addItem(m, tr("Remove diagram association"), 9);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 7);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 8);
+        MenuFactory::addItem(m, tr("Delete from model"), 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlState, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
 
-    switch (index = m.exec(QCursor::pos())) {
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    switch (index = retAction->data().toInt()) {
     case 0:
         upper();
         modified();	// call package_modified()
@@ -1376,11 +1390,12 @@ void StateCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void StateCanvas::apply_shortcut(QString s)
+void StateCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -1413,11 +1428,11 @@ void StateCanvas::edit_drawing_settings()
         StateSpecVector st(3);
         ColorSpecVector co(1);
 
-        st[0].set(TR("show activities"), &settings.show_activities);
-        st[1].set(TR("draw regions horizontally"), &settings.region_horizontally);
-        st[2].set(TR("drawing language"), &settings.drawing_language);
+        st[0].set(tr("show activities"), &settings.show_activities);
+        st[1].set(tr("draw regions horizontally"), &settings.region_horizontally);
+        st[2].set(tr("drawing language"), &settings.drawing_language);
 
-        co[0].set(TR("state color"), &itscolor);
+        co[0].set(tr("state color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -1436,7 +1451,7 @@ bool StateCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void StateCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void StateCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(3);
@@ -1446,36 +1461,35 @@ void StateCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         UmlColor itscolor;
         DrawingLanguage language;
 
-        st[0].set(TR("show activities"), &show_activities);
-        st[1].set(TR("draw regions horizontally"), &region_horizontally);
-        st[2].set(TR("drawing language"), &language);
+        st[0].set(tr("show activities"), &show_activities);
+        st[1].set(tr("draw regions horizontally"), &region_horizontally);
+        st[2].set(tr("drawing language"), &language);
 
-        co[0].set(TR("state color"), &itscolor);
+        co[0].set(tr("state color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                StateCanvas *canvas = (StateCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((StateCanvas *) it.current())->settings.show_activities =
+                    canvas->settings.show_activities =
                         show_activities;
 
                 if (!st[1].name.isEmpty())
-                    ((StateCanvas *) it.current())->settings.region_horizontally =
+                    canvas->settings.region_horizontally =
                         region_horizontally;
 
                 if (!st[2].name.isEmpty())
-                    ((StateCanvas *) it.current())->settings.drawing_language =
+                    canvas->settings.drawing_language =
                         language;
 
                 if (!co[0].name.isEmpty())
-                    ((StateCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((StateCanvas *) it.current())->modified();	// call package_modified()
+                canvas->modified();
             }
         }
 
@@ -1484,19 +1498,12 @@ void StateCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void StateCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void StateCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    StateCanvas * x = (StateCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        StateCanvas * o = (StateCanvas *) it.current();
-
-        o->settings = x->settings;
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const StateCanvas * x = (const StateCanvas *) src;
+    settings = x->settings;
+    itscolor = x->itscolor;
+    modified();
 }
 
 bool StateCanvas::get_show_stereotype_properties() const
@@ -1521,7 +1528,7 @@ QString StateCanvas::may_start(UmlCode & l) const
         return 0;
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -1530,7 +1537,7 @@ QString StateCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlState:
     case UmlStateAction:
     case EntryPointPS:
@@ -1543,10 +1550,10 @@ QString StateCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     case ChoicePS:
     case ForkPS:
     case JoinPS:
-        return (l == UmlTransition) ? QString() : TR("illegal");
+        return (l == UmlTransition) ? QString() : tr("illegal");
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -1641,13 +1648,14 @@ void StateCanvas::history_save(QBuffer & b) const
     ::save(width(), b);
     ::save(height(), b);
 
-    QRect * r = regions_rect.data();
+    //QRect * r = regions_rect.data();
 
-    if (r != 0) {
-        for (unsigned i = 0; i != regions_rect.size(); i++) {
-            ::save(r->topLeft(), b);
-            ::save(r->bottomRight(), b);
-            r += 1;
+    //if (r != 0)
+    {
+        for (int i = 0; i != regions_rect.size(); i++) {
+            ::save(regions_rect[i].topLeft(), b);
+            ::save(regions_rect[i].bottomRight(), b);
+            //r += 1;
         }
     }
 }
@@ -1664,19 +1672,20 @@ void StateCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
-    QRect * r = regions_rect.data();
+    //QRect * r = regions_rect.data();
 
-    if (r != 0) {
-        for (unsigned i = 0; i != regions_rect.size(); i++) {
+    //if (r != 0)
+    {
+        for (int i = 0; i != regions_rect.size(); i++) {
             QPoint p;
 
             ::load(p, b);
-            r->moveTopLeft(p);
+            regions_rect[i].moveTopLeft(p);
             ::load(p, b);
-            r->moveBottomRight(p);
-            r += 1;
+            regions_rect[i].moveBottomRight(p);
+            //r += 1;
         }
     }
 
@@ -1687,7 +1696,7 @@ void StateCanvas::history_load(QBuffer & b)
 
 void StateCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
     disconnect(browser_node->get_data(), 0, this, 0);
diff --git a/src/diagram/StateCanvas.h b/src/diagram/StateCanvas.h
index 970021c76..625111f9f 100644
--- a/src/diagram/StateCanvas.h
+++ b/src/diagram/StateCanvas.h
@@ -35,7 +35,7 @@
 #include <qobject.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3MemArray>
+//#include <Q3MemArray>
 #include "DiagramCanvas.h"
 #include "MultipleDependency.h"
 #include "Settings.h"
@@ -59,61 +59,63 @@ class StateCanvas : public QObject, public DiagramCanvas, public MultipleDepende
     WrapperStr activities;
     int min_width;
     int min_height;
-    Q3MemArray<QRect> regions_rect;	// from bottom to top / right to left
-    Q3MemArray<BrowserRegion *> regions;
+    QVector<QRect> regions_rect;	// from bottom to top / right to left
+    QVector<BrowserRegion *> regions;
 
 protected:
     StateCanvas(UmlCanvas * canvas, int id);
     void compute_regions();
     int resize_to_show_regions();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     StateCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y);
     virtual ~StateCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     void compute_size();
     BrowserRegion * pointed_region(const QPoint & p) const;
     QRect region_rect(BrowserRegion *);
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
-
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void prepare_for_move(bool on_resize);
+    virtual void change_scale() override;
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void prepare_for_move(bool on_resize) override;
     void force_sub_inside(bool resize_it);
     static void force_inside(DiagramCanvas *, bool resize_it);
     void force_sub_upper();
 
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static StateCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/StateDiagramView.cpp b/src/diagram/StateDiagramView.cpp
index e041cf4f6..d9ef08e01 100644
--- a/src/diagram/StateDiagramView.cpp
+++ b/src/diagram/StateDiagramView.cpp
@@ -30,13 +30,10 @@
 
 
 #include <qfont.h>
-#include <q3popupmenu.h>
-//Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
 #include <QMouseEvent>
 #include <QDragEnterEvent>
-
 #include "StateDiagramWindow.h"
 #include "StateDiagramView.h"
 #include "StateCanvas.h"
@@ -70,9 +67,9 @@ StateDiagramView::StateDiagramView(QWidget * parent, UmlCanvas * canvas, int id)
 
 void StateDiagramView::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    MenuFactory::createTitle(m, TR("State diagram menu"));
+    MenuFactory::createTitle(m, tr("State diagram menu"));
 
     switch (default_menu(m, 30)) {
     case EDIT_DRAWING_SETTING_CMD:
@@ -89,8 +86,10 @@ void StateDiagramView::menu(const QPoint &)
     }
 }
 
-void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void StateDiagramView::mousePressEvent(QMouseEvent * e)
 {
+    QPoint diagramPoint(e->x(), e->y());
+    QPointF scenePoint = mapToScene(diagramPoint);
     if (!window()->frozen()) {
         UmlCode action = window()->buttonOn();
 
@@ -101,16 +100,16 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            Q3CanvasItem * ci = the_canvas()->collision(e->pos());
+            QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint());
             DiagramItem * di;
             bool specified = ((ci != 0) &&
                               ((di = QCanvasItemToDiagramItem(ci)) != 0) &&
-                              (di->type() == UmlState) &&
+                              (di->typeUmlCode() == UmlState) &&
                               ((BrowserState *)((StateCanvas *) di)->get_bn())->may_contains(action));
             BrowserNode * parent;
 
             if (specified) {
-                if ((parent = ((StateCanvas *) di)->pointed_region(e->pos())) == 0)
+                if ((parent = ((StateCanvas *) di)->pointed_region(scenePoint.toPoint())) == 0)
                     parent = ((StateCanvas *) di)->get_bn();
             }
             else
@@ -120,13 +119,13 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
 
             if (b != 0) {
                 if (the_canvas()->already_drawn(b)) {
-                    msg_information("Douml", TR("already drawn"));
+                    msg_information("Douml", tr("already drawn"));
                     history_protected = FALSE;
                     return;
                 }
 
                 // may be added in a the state's region rather than the state
-                StateCanvas * c = new StateCanvas(b, the_canvas(), e->x(), e->y());
+                StateCanvas * c = new StateCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 c->upper();
@@ -146,12 +145,12 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            Q3CanvasItem * ci = the_canvas()->collision(e->pos());
+            QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint());
             DiagramItem * di;
 
             if ((ci != 0) &&
                 ((di = QCanvasItemToDiagramItem(ci)) != 0) &&
-                (di->type() == UmlState) &&
+                (di->typeUmlCode() == UmlState) &&
                 ((BrowserState *)((StateCanvas *) di)->get_bn())->may_contains(action)) {
                 BrowserRegion::add_region(((StateCanvas *) di)->get_bn());
                 window()->package_modified();
@@ -175,16 +174,16 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            Q3CanvasItem * ci = the_canvas()->collision(e->pos());
+            QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint());
             DiagramItem * di;
             bool specified = ((ci != 0) &&
                               ((di = QCanvasItemToDiagramItem(ci)) != 0) &&
-                              (di->type() == UmlState) &&
+                              (di->typeUmlCode() == UmlState) &&
                               ((BrowserState *)((StateCanvas *) di)->get_bn())->may_contains(action));
             BrowserNode * parent;
 
             if (specified) {
-                if ((parent = ((StateCanvas *) di)->pointed_region(e->pos())) == 0)
+                if ((parent = ((StateCanvas *) di)->pointed_region(scenePoint.toPoint())) == 0)
                     parent = ((StateCanvas *) di)->get_bn();
             }
             else
@@ -195,7 +194,7 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
             if (b != 0) {
                 PseudoStateCanvas * c =
                     // may be added in a the state's region rather than the state
-                    new PseudoStateCanvas(b, the_canvas(), e->x(), e->y());
+                    new PseudoStateCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
                 c->show();
                 c->upper();
@@ -213,16 +212,16 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
             window()->selectOn();
             history_save();
 
-            Q3CanvasItem * ci = the_canvas()->collision(e->pos());
+            QGraphicsItem * ci = the_canvas()->collision(scenePoint.toPoint());
             DiagramItem * di;
             bool specified = ((ci != 0) &&
                               ((di = QCanvasItemToDiagramItem(ci)) != 0) &&
-                              (di->type() == UmlState) &&
+                              (di->typeUmlCode() == UmlState) &&
                               ((BrowserState *)((StateCanvas *) di)->get_bn())->may_contains(UmlStateAction));
             BrowserNode * parent;
 
             if (specified) {
-                if ((parent = ((StateCanvas *) di)->pointed_region(e->pos())) == 0)
+                if ((parent = ((StateCanvas *) di)->pointed_region(scenePoint.toPoint())) == 0)
                     parent = ((StateCanvas *) di)->get_bn();
             }
             else
@@ -245,7 +244,7 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
 
             StateActionCanvas * c =
                 // may be added in a the state's region rather than the state
-                new StateActionCanvas(b, the_canvas(), e->x(), e->y());
+                new StateActionCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y());
 
             c->show();
             c->upper();
@@ -255,7 +254,7 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
         break;
 
         default:
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
             return;
         }
 
@@ -263,7 +262,7 @@ void StateDiagramView::contentsMousePressEvent(QMouseEvent * e)
         history_protected = FALSE;
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
 void StateDiagramView::dragEnterEvent(QDragEnterEvent * e)
@@ -288,18 +287,40 @@ void StateDiagramView::dragEnterEvent(QDragEnterEvent * e)
         e->ignore();
 }
 
+
+void StateDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+    if (!window()->frozen() &&
+        (UmlDrag::canDecode(e, UmlState, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlTransition, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+         UmlDrag::canDecode(e, UmlPseudoState, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlStateAction, TRUE, TRUE) ||
+         UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE)))
+        e->accept();
+    else
+        e->ignore();
+}
 void StateDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserState * mach =
         BrowserState::get_machine(the_canvas()->browser_diagram());
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
+    QPointF p = mapToScene(e->pos());
 
     if ((bn = UmlDrag::decode(e, UmlState, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else if (BrowserState::get_machine(bn) != mach)
-            msg_information("Douml", TR("illegal"));
+            msg_information("Douml", tr("illegal"));
         else {
             history_save();
 
@@ -331,9 +352,9 @@ void StateDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlPseudoState, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else if (BrowserState::get_machine(bn) != mach)
-            msg_information("Douml", TR("illegal"));
+            msg_information("Douml", tr("illegal"));
         else {
             history_save();
 
@@ -352,9 +373,9 @@ void StateDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlStateAction, TRUE)) != 0) {
         if (the_canvas()->already_drawn(bn))
-            msg_information("Douml", TR("already drawn"));
+            msg_information("Douml", tr("already drawn"));
         else if (BrowserState::get_machine(bn) != mach)
-            msg_information("Douml", TR("illegal"));
+            msg_information("Douml", tr("illegal"));
         else {
             history_save();
 
@@ -406,8 +427,7 @@ void StateDiagramView::dropEvent(QDropEvent * e)
 void StateDiagramView::save(QTextStream & st, QString & warning,
                             bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
+    DiagramItemList items(canvas()->items());
 
     if (!copy)
         // sort is useless for a copy
@@ -417,8 +437,8 @@ void StateDiagramView::save(QTextStream & st, QString & warning,
 
     // save first states pseudostates actions packages fragments notes and icons
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
+    foreach (DiagramItem *di, items) {
+        switch (di->typeUmlCode()) {
         case UmlState:
         case UmlStateAction:
         case InitialPS:
@@ -449,8 +469,8 @@ void StateDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves relations
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        if (di->type() == UmlTransition) {
+    foreach (DiagramItem *di, items) {
+        if (di->typeUmlCode() == UmlTransition) {
             if (!copy || di->copyable())
                 di->save(st, FALSE, warning);
         }
@@ -458,8 +478,8 @@ void StateDiagramView::save(QTextStream & st, QString & warning,
 
     // then saves anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    foreach (DiagramItem *di, items)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
 
     if (!copy && (preferred_zoom != 0)) {
@@ -477,7 +497,8 @@ void StateDiagramView::read(char * st, char * k)
     UmlCanvas * canvas = the_canvas();
 
     // reads first state package icons notes text and images
-    while (StateCanvas::read(st, canvas, k) ||
+    while (
+           StateCanvas::read(st, canvas, k) ||
            StateActionCanvas::read(st, canvas, k) ||
            PseudoStateCanvas::read(st, canvas, k) ||
            NoteCanvas::read(st, canvas, k) ||
@@ -487,16 +508,13 @@ void StateDiagramView::read(char * st, char * k)
            FragmentCanvas::read(st, canvas, k) ||
            ImageCanvas::read(st, canvas, k))
         k = read_keyword(st);
-
     // then reads relations and anchors
     ArrowCanvas * a;
-
     while (((a = ArrowCanvas::read(st, canvas, k)) != 0) ||
            ((a = TransitionCanvas::read(st, canvas, k)) != 0)) {
         a->get_start()->check_line(a);
         k = read_keyword(st);
     }
-
     if (!strcmp(k, "preferred_whz") || !strcmp(k, "prefered_whz")) {
         preferred_size.setWidth(read_unsigned(st));
         preferred_size.setHeight(read_unsigned(st));
diff --git a/src/diagram/StateDiagramView.h b/src/diagram/StateDiagramView.h
index 4ebe600ac..f7fb496bb 100644
--- a/src/diagram/StateDiagramView.h
+++ b/src/diagram/StateDiagramView.h
@@ -46,9 +46,9 @@ class StateDiagramView : public DiagramView
 public:
     StateDiagramView(QWidget * parent, UmlCanvas * canvas, int id);
 
-    virtual void menu(const QPoint &);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+    virtual void menu(const QPoint &) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
 private:
     StateDiagramWindow * window() {
@@ -56,9 +56,10 @@ class StateDiagramView : public DiagramView
     };
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent *e) override;
 };
 
 #endif
diff --git a/src/diagram/StateDiagramWindow.cpp b/src/diagram/StateDiagramWindow.cpp
index 74a545e25..20f8d9749 100644
--- a/src/diagram/StateDiagramWindow.cpp
+++ b/src/diagram/StateDiagramWindow.cpp
@@ -24,19 +24,13 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-
-
-
-
-
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+#include <qmdiarea.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qspinbox.h>
-
 #include "UmlWindow.h"
 #include "StateDiagramWindow.h"
 #include "StateDiagramView.h"
@@ -44,10 +38,11 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
+#include "toolbarfactory.h"
 
 QString addstateText()
 {
-    return TR("Click this button to add a <i>state</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>state</i> in the diagram. <br><br>"
               "You can also drop the state from the <b>browser</b>.");
 }
 extern QString addpackageText();
@@ -57,79 +52,79 @@ extern QString anchorText();
 extern QString textText();
 QString addentrypointText()
 {
-    return TR("Click this button to add a <i>entry point</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>entry point</i> in the diagram. <br><br>"
               "You can also drop the <i>entry point</i> from the <b>browser</b>.");
 }
 QString addexitpointText()
 {
-    return TR("Click this button to add a <i>exit point</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>exit point</i> in the diagram. <br><br>"
               "You can also drop the <i>exit point</i> from the <b>browser</b>.");
 }
 QString addinitialText()
 {
-    return TR("Click this button to add a <i>initial pseudo state</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>initial pseudo state</i> in the diagram. <br><br>"
               "You can also drop the <i>initial pseudo state</i> from the <b>browser</b>.");
 }
 QString addfinalText()
 {
-    return TR("Click this button to add a <i>final state</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>final state</i> in the diagram. <br><br>"
               "You can also drop the <i>final state</i> from the <b>browser</b>.");
 }
 QString addterminateText()
 {
-    return TR("Click this button to add a <i>terminate node</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>terminate node</i> in the diagram. <br><br>"
               "You can also drop the <i>terminate node</i> from the <b>browser</b>.");
 }
 QString adddeephistoryText()
 {
-    return TR("Click this button to add a <i>deep history</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>deep history</i> in the diagram. <br><br>"
               "You can also drop the <i>deep history</i> from the <b>browser</b>.");
 }
 QString addshallowhistoryText()
 {
-    return TR("Click this button to add a <i>shallow history</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>shallow history</i> in the diagram. <br><br>"
               "You can also drop the <i></i> from the <b>browser</b>.");
 }
 QString addjunctionText()
 {
-    return TR("Click this button to add a <i>junction</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>junction</i> in the diagram. <br><br>"
               "You can also drop the <i>junction</i> from the <b>browser</b>.");
 }
 QString addchoiceText()
 {
-    return TR("Click this button to add a <i>choice</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>choice</i> in the diagram. <br><br>"
               "You can also drop the <i>choice</i> from the <b>browser</b>.");
 }
 QString addforkText()
 {
-    return TR("Click this button to add a <i>fork</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>fork</i> in the diagram. <br><br>"
               "You can also drop the <i>foek</i> from the <b>browser</b>.");
 }
 QString addjoinText()
 {
-    return TR("Click this button to add a <i>join</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>join</i> in the diagram. <br><br>"
               "You can also drop the <i>join</i> from the <b>browser</b>.");
 }
 QString addtransitionText()
 {
-    return TR("Click this button to add a <i>transition</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add a <i>transition</i> in the diagram. <br><br>"
               "You can also drop the <i>transition</i> from the <b>browser</b>.");
 }
 QString addregionText()
 {
-    return TR("Click this button to add a <i>region</i> in a <i>state</i>.");
+    return QObject::tr("Click this button to add a <i>region</i> in a <i>state</i>.");
 }
 QString addactionText()
 {
-    return TR("Click this button to add an <i>action</i> in a <i>state</i>.");
+    return QObject::tr("Click this button to add an <i>action</i> in a <i>state</i>.");
 }
 QString addsignalinText()
 {
-    return TR("Click this button to add a <i>receive signal action</i> in a <i>state</i>.");
+    return QObject::tr("Click this button to add a <i>receive signal action</i> in a <i>state</i>.");
 }
 QString addsignaloutText()
 {
-    return TR("Click this button to add a <i>send signal action</i> in a <i>state</i>.");
+    return QObject::tr("Click this button to add a <i>send signal action</i> in a <i>state</i>.");
 }
 extern QString imageText();
 
@@ -137,163 +132,165 @@ extern QString imageText();
 StateDiagramWindow::StateDiagramWindow(const QString & s, BrowserStateDiagram * b, int id)
     : DiagramWindow(b, s), view(0)
 {
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "state operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
+    QToolBar * toolbar = new QToolBar("state operations",this);
+    toolbar->setMinimumHeight(50);
+    toolbar->setOrientation(Qt::Horizontal);
+    addToolBar(Qt::TopToolBarArea, toolbar);
 
     add_edit_button(toolbar);
 
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton, tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar, "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
+    select->setCheckable(TRUE);
+    select->setChecked(TRUE);
     current_button = UmlSelect;
 
     addPackage
-        = new QToolButton(*packageButton, TR("Add Package"), QString(),
+        = ToolBarFactory::createToolButton(*packageButton, tr("Add Package"), QString(),
                           this, SLOT(hit_package()), toolbar, "add package");
-    addPackage->setToggleButton(TRUE);
-    Q3WhatsThis::add(addPackage, addpackageText());
+    addPackage->setCheckable(TRUE);
+    addPackage->setWhatsThis(addpackageText());
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("Add Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton, tr("Add Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar, "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis( addfragmentText());
 
     addState =
-        new QToolButton(*stateButton, TR("Add State"), QString(),
+        ToolBarFactory::createToolButton(*stateButton, tr("Add State"), QString(),
                         this, SLOT(hit_state()), toolbar, "add state");
-    addState->setToggleButton(TRUE);
-    Q3WhatsThis::add(addState, addstateText());
+    addState->setCheckable(TRUE);
+    addState->setWhatsThis( addstateText());
 
     addRegion =
-        new QToolButton(*regionButton, TR("Add Region"), QString(),
+        ToolBarFactory::createToolButton(*regionButton, tr("Add Region"), QString(),
                         this, SLOT(hit_region()), toolbar, "add region");
-    addRegion->setToggleButton(TRUE);
-    Q3WhatsThis::add(addRegion, addregionText());
+    addRegion->setCheckable(TRUE);
+    addRegion->setWhatsThis( addregionText());
 
     addInitial =
-        new QToolButton(*initialButton, TR("Add Initial pseudo state"), QString(),
+        ToolBarFactory::createToolButton(*initialButton, tr("Add Initial pseudo state"), QString(),
                         this, SLOT(hit_initial()), toolbar, "add initial");
-    addInitial->setToggleButton(TRUE);
-    Q3WhatsThis::add(addInitial, addinitialText());
+    addInitial->setCheckable(TRUE);
+    addInitial->setWhatsThis( addinitialText());
 
     addEntryPoint =
-        new QToolButton(*entrypointButton, TR("Add Entry Point"), QString(),
+        ToolBarFactory::createToolButton(*entrypointButton, tr("Add Entry Point"), QString(),
                         this, SLOT(hit_entryPoint()), toolbar, "add entry point");
-    addEntryPoint->setToggleButton(TRUE);
-    Q3WhatsThis::add(addEntryPoint, addentrypointText());
+    addEntryPoint->setCheckable(TRUE);
+    addEntryPoint->setWhatsThis( addentrypointText());
 
     addFinal =
-        new QToolButton(*finalButton, TR("Add Final state"), QString(),
+        ToolBarFactory::createToolButton(*finalButton, tr("Add Final state"), QString(),
                         this, SLOT(hit_final()), toolbar, "add final");
-    addFinal->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFinal, addfinalText());
+    addFinal->setCheckable(TRUE);
+    addFinal->setWhatsThis( addfinalText());
 
     addExitPoint =
-        new QToolButton(*exitpointButton, TR("Add Exit Point"), QString(),
+        ToolBarFactory::createToolButton(*exitpointButton, tr("Add Exit Point"), QString(),
                         this, SLOT(hit_exitPoint()), toolbar, "add exit point");
-    addExitPoint->setToggleButton(TRUE);
-    Q3WhatsThis::add(addExitPoint, addexitpointText());
+    addExitPoint->setCheckable(TRUE);
+    addExitPoint->setWhatsThis( addexitpointText());
 
     addTerminate =
-        new QToolButton(*terminateButton, TR("Add Terminate node"), QString(),
+        ToolBarFactory::createToolButton(*terminateButton, tr("Add Terminate node"), QString(),
                         this, SLOT(hit_terminate()), toolbar, "add terminate");
-    addTerminate->setToggleButton(TRUE);
-    Q3WhatsThis::add(addTerminate, addterminateText());
+    addTerminate->setCheckable(TRUE);
+    addTerminate->setWhatsThis( addterminateText());
 
     addDeepHistory =
-        new QToolButton(*deephistoryButton, TR("Add Deep History"), QString(),
+        ToolBarFactory::createToolButton(*deephistoryButton, tr("Add Deep History"), QString(),
                         this, SLOT(hit_deepHistory()), toolbar, "add deep history");
-    addDeepHistory->setToggleButton(TRUE);
-    Q3WhatsThis::add(addDeepHistory, adddeephistoryText());
+    addDeepHistory->setCheckable(TRUE);
+    addDeepHistory->setWhatsThis( adddeephistoryText());
 
     addShallowHistory =
-        new QToolButton(*shallowhistoryButton, TR("Add Shallow History"), QString(),
+        ToolBarFactory::createToolButton(*shallowhistoryButton, tr("Add Shallow History"), QString(),
                         this, SLOT(hit_shallowHistory()), toolbar, "add shallow history");
-    addShallowHistory->setToggleButton(TRUE);
-    Q3WhatsThis::add(addShallowHistory, addshallowhistoryText());
+    addShallowHistory->setCheckable(TRUE);
+    addShallowHistory->setWhatsThis( addshallowhistoryText());
 
     addJunction =
-        new QToolButton(*junctionButton, TR("Add Junction"), QString(),
+        ToolBarFactory::createToolButton(*junctionButton, tr("Add Junction"), QString(),
                         this, SLOT(hit_junction()), toolbar, "add junction");
-    addJunction->setToggleButton(TRUE);
-    Q3WhatsThis::add(addJunction, addjunctionText());
+    addJunction->setCheckable(TRUE);
+    addJunction->setWhatsThis( addjunctionText());
 
     addChoice =
-        new QToolButton(*choiceButton, TR("Add Choice"), QString(),
+        ToolBarFactory::createToolButton(*choiceButton, tr("Add Choice"), QString(),
                         this, SLOT(hit_choice()), toolbar, "add choice");
-    addChoice->setToggleButton(TRUE);
-    Q3WhatsThis::add(addChoice, addchoiceText());
+    addChoice->setCheckable(TRUE);
+    addChoice->setWhatsThis( addchoiceText());
 
     addFork =
-        new QToolButton(*forkButton, TR("Add Fork"), QString(),
+        ToolBarFactory::createToolButton(*forkButton, tr("Add Fork"), QString(),
                         this, SLOT(hit_fork()), toolbar, "add fork");
-    addFork->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFork, addforkText());
+    addFork->setCheckable(TRUE);
+    addFork->setWhatsThis( addforkText());
 
     addJoin =
-        new QToolButton(*joinButton, TR("Add Join"), QString(),
+        ToolBarFactory::createToolButton(*joinButton, tr("Add Join"), QString(),
                         this, SLOT(hit_join()), toolbar, "add join");
-    addJoin->setToggleButton(TRUE);
-    Q3WhatsThis::add(addJoin, addjoinText());
+    addJoin->setCheckable(TRUE);
+    addJoin->setWhatsThis( addjoinText());
 
     addAction =
-        new QToolButton(*actionButton, TR("Add Action"), QString(),
+        ToolBarFactory::createToolButton(*actionButton, tr("Add Action"), QString(),
                         this, SLOT(hit_action()), toolbar, "add action");
-    addAction->setToggleButton(TRUE);
-    Q3WhatsThis::add(addAction, addactionText());
+    addAction->setCheckable(TRUE);
+    addAction->setWhatsThis( addactionText());
 
     addSignalIn =
-        new QToolButton(*signalinButton, TR("Add receive signal action"), QString(),
+        ToolBarFactory::createToolButton(*signalinButton, tr("Add receive signal action"), QString(),
                         this, SLOT(hit_signalin()), toolbar, "add receive signal action");
-    addSignalIn->setToggleButton(TRUE);
-    Q3WhatsThis::add(addSignalIn, addsignalinText());
+    addSignalIn->setCheckable(TRUE);
+    addSignalIn->setWhatsThis( addsignalinText());
 
     addSignalOut =
-        new QToolButton(*signaloutButton, TR("Add send signal action"), QString(),
+        ToolBarFactory::createToolButton(*signaloutButton, tr("Add send signal action"), QString(),
                         this, SLOT(hit_signalout()), toolbar, "add send signal action");
-    addSignalOut->setToggleButton(TRUE);
-    Q3WhatsThis::add(addSignalOut, addsignaloutText());
+    addSignalOut->setCheckable(TRUE);
+    addSignalOut->setWhatsThis( addsignaloutText());
 
     addTransition =
-        new QToolButton(*directionalAssociationButton, TR("Add Transition"), QString(),
+        ToolBarFactory::createToolButton(*directionalAssociationButton, tr("Add Transition"), QString(),
                         this, SLOT(hit_transition()), toolbar, "add transition");
-    addTransition->setToggleButton(TRUE);
-    Q3WhatsThis::add(addTransition, addtransitionText());
+    addTransition->setCheckable(TRUE);
+    addTransition->setWhatsThis( addtransitionText());
 
     /*
     dependency =
-      new QToolButton(*dependencyButton, "Dependency", QString(),
+      ToolBarFactory::createToolButton(*dependencyButton, "Dependency", QString(),
     	    this, SLOT(hit_dependency()), toolbar, "dependency");
-    dependency->setToggleButton(TRUE);
+    dependency->setCheckable(TRUE);
     QWhatsThis::add(dependency, dependencyText());
     */
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton, tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar, "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis( noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton, tr("Anchor"), QString(),
                         this, SLOT(hit_anchor()), toolbar, "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis( anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton, tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar, "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis( textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton, tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+    image->setWhatsThis( imageText());
 
     toolbar->addSeparator();
 
@@ -307,9 +304,10 @@ StateDiagramWindow::StateDiagramWindow(const QString & s, BrowserStateDiagram *
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
+    QMdiArea * w = UmlWindow::get_workspace();
 
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    //resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -347,33 +345,33 @@ void StateDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
 
-    select->setOn(FALSE);
-    addPackage->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    addState->setOn(FALSE);
-    addRegion->setOn(FALSE);
-    addEntryPoint->setOn(FALSE);
-    addExitPoint->setOn(FALSE);
-    addInitial->setOn(FALSE);
-    addFinal->setOn(FALSE);
-    addTerminate->setOn(FALSE);
-    addDeepHistory->setOn(FALSE);
-    addShallowHistory->setOn(FALSE);
-    addJunction->setOn(FALSE);
-    addChoice->setOn(FALSE);
-    addFork->setOn(FALSE);
-    addJoin->setOn(FALSE);
-    addAction->setOn(FALSE);
-    addSignalIn->setOn(FALSE);
-    addSignalOut->setOn(FALSE);
-    addTransition->setOn(FALSE);
-    //dependency->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addPackage->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    addState->setChecked(FALSE);
+    addRegion->setChecked(FALSE);
+    addEntryPoint->setChecked(FALSE);
+    addExitPoint->setChecked(FALSE);
+    addInitial->setChecked(FALSE);
+    addFinal->setChecked(FALSE);
+    addTerminate->setChecked(FALSE);
+    addDeepHistory->setChecked(FALSE);
+    addShallowHistory->setChecked(FALSE);
+    addJunction->setChecked(FALSE);
+    addChoice->setChecked(FALSE);
+    addFork->setChecked(FALSE);
+    addJoin->setChecked(FALSE);
+    addAction->setChecked(FALSE);
+    addSignalIn->setChecked(FALSE);
+    addSignalOut->setChecked(FALSE);
+    addTransition->setChecked(FALSE);
+    //dependency->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/StateDiagramWindow.h b/src/diagram/StateDiagramWindow.h
index 4f3b2f2e7..6f3d8c125 100644
--- a/src/diagram/StateDiagramWindow.h
+++ b/src/diagram/StateDiagramWindow.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef STATEDIAGRAMWINDOW_H
-#define STATEDISGRAMWINDOW_H
+#define STATEDIAGRAMWINDOW_H
 
 #include "DiagramWindow.h"
 
@@ -71,9 +71,9 @@ class StateDiagramWindow : public DiagramWindow
     StateDiagramWindow(const QString & s, BrowserStateDiagram * b, int id = -1);
     virtual ~StateDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_state();
diff --git a/src/diagram/StereotypePropertiesCanvas.cpp b/src/diagram/StereotypePropertiesCanvas.cpp
index 7d4c7add1..e0d6e901b 100644
--- a/src/diagram/StereotypePropertiesCanvas.cpp
+++ b/src/diagram/StereotypePropertiesCanvas.cpp
@@ -30,8 +30,8 @@
 
 
 #include <qcursor.h>
-#include <q3painter.h>
-#include <q3popupmenu.h>
+#include <qpainter.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -45,8 +45,8 @@
 #include "translate.h"
 
 StereotypePropertiesCanvas::StereotypePropertiesCanvas(UmlCanvas * canvas,
-        DiagramItem * it,
-        int x, int y, int id)
+                                                       DiagramItem * it,
+                                                       int x, int y, int id)
     : NoteCanvas(canvas, x, y, id), di(it)
 {
     // for read
@@ -54,8 +54,8 @@ StereotypePropertiesCanvas::StereotypePropertiesCanvas(UmlCanvas * canvas,
 }
 
 StereotypePropertiesCanvas::StereotypePropertiesCanvas(UmlCanvas * canvas,
-        DiagramItem * it,
-        QString s)
+                                                       DiagramItem * it,
+                                                       QString s)
     : NoteCanvas(canvas, 0, 0, 0), di(it)
 {
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(update()));
@@ -75,7 +75,7 @@ StereotypePropertiesCanvas::StereotypePropertiesCanvas(UmlCanvas * canvas,
         h = height();
 
     DiagramCanvas::resize(w, h);
-    setZ(it->get_z());
+    setZValue(it->get_z());
 
     width_scale100 = w;
     height_scale100 = h;
@@ -93,13 +93,13 @@ void StereotypePropertiesCanvas::delete_it()
     NoteCanvas::delete_it();
 }
 
-UmlCode StereotypePropertiesCanvas::type() const
+UmlCode StereotypePropertiesCanvas::typeUmlCode() const
 {
     return UmlStereotypeProperties;
 }
 
 void StereotypePropertiesCanvas::delete_available(BooL & in_model,
-        BooL & out_model) const
+                                                  BooL & out_model) const
 {
     if (di->isSelected())
         di->delete_available(in_model, out_model);
@@ -117,95 +117,98 @@ void StereotypePropertiesCanvas::open()
 
 void StereotypePropertiesCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu fontsubm(0);
-
-    MenuFactory::createTitle(m, TR("Stereotype Properties"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 5);
-    m.insertItem(TR("Go down"), 6);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Font"), &fontsubm);
+    QMenu m(0);
+    QMenu fontsubm(0);
+
+    MenuFactory::createTitle(m,  QObject::tr("Stereotype Properties"));
+    m.addSeparator();
+    MenuFactory::addItem(m,  QObject::tr("Upper"), 0);
+    MenuFactory::addItem(m,  QObject::tr("Lower"), 1);
+    MenuFactory::addItem(m,  QObject::tr("Go up"), 5);
+    MenuFactory::addItem(m,  QObject::tr("Go down"), 6);
+    m.addSeparator();
+    MenuFactory::addItem(m,  QObject::tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::insertItem(m,  QObject::tr("Font"), &fontsubm);
     init_font_menu(fontsubm, the_canvas(), 10);
-    m.insertItem(TR("Edit drawing settings"), 3);
+    MenuFactory::addItem(m,  QObject::tr("Edit drawing settings"), 3);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 4);
+        m.addSeparator();
+        MenuFactory::addItem(m,  QObject::tr("Select linked items"), 4);
     }
 
-    m.insertSeparator();
+    m.addSeparator();
 
-    int index = m.exec(QCursor::pos());
+    QAction *retAction =  m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int index = retAction->data().toInt();
 
-    switch (index) {
-    case 0:
-        upper();
-        modified();	// call package_modified()
-        return;
+        switch (index) {
+        case 0:
+            upper();
+            modified();	// call package_modified()
+            return;
 
-    case 1:
-        lower();
-        modified();	// call package_modified()
-        return;
+        case 1:
+            lower();
+            modified();	// call package_modified()
+            return;
 
-    case 5:
-        z_up();
-        modified();	// call package_modified()
-        return;
+        case 5:
+            z_up();
+            modified();	// call package_modified()
+            return;
 
-    case 6:
-        z_down();
-        modified();	// call package_modified()
-        return;
+        case 6:
+            z_down();
+            modified();	// call package_modified()
+            return;
 
-    case 2:
-        open();
-        return;
+        case 2:
+            open();
+            return;
 
-    case 3:
-        for (;;) {
-            ColorSpecVector co(1);
+        case 3:
+            for (;;) {
+                ColorSpecVector co(1);
 
-            co[0].set(TR("note color"), &itscolor);
+                co[0].set( QObject::tr("note color"), &itscolor);
 
-            SettingsDialog dialog(0, &co, FALSE);
+                SettingsDialog dialog(0, &co, FALSE);
 
-            dialog.raise();
+                dialog.raise();
 
-            if (dialog.exec() == QDialog::Accepted)
-                modified();
+                if (dialog.exec() == QDialog::Accepted)
+                    modified();
 
-            if (!dialog.redo())
-                return;
-            else
-                package_modified();
-        }
+                if (!dialog.redo())
+                    return;
+                else
+                    package_modified();
+            }
 
-        break;
+            break;
 
-    case 4:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 4:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    default:
-        if (index >= 10) {
-            itsfont = (UmlFont)(index - 10);
-            modified();	// call package_modified()
-        }
+        default:
+            if (index >= 10) {
+                itsfont = (UmlFont)(index - 10);
+                modified();	// call package_modified()
+            }
 
-        return;
+            return;
+        }
     }
-
     package_modified();
 }
 
-void StereotypePropertiesCanvas::apply_shortcut(QString s)
+void StereotypePropertiesCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -227,24 +230,23 @@ bool StereotypePropertiesCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void StereotypePropertiesCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void StereotypePropertiesCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("note color"), &itscolor);
+        co[0].set( QObject::tr("note color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((StereotypePropertiesCanvas *) it.current())->itscolor = itscolor;
-                ((StereotypePropertiesCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                StereotypePropertiesCanvas *canvas = (StereotypePropertiesCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();
             }
         }
 
@@ -253,18 +255,11 @@ void StereotypePropertiesCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> &
     }
 }
 
-void StereotypePropertiesCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void StereotypePropertiesCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    StereotypePropertiesCanvas * x = (StereotypePropertiesCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        StereotypePropertiesCanvas * o = (StereotypePropertiesCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const StereotypePropertiesCanvas * x = (const StereotypePropertiesCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 void StereotypePropertiesCanvas::needed(UmlCanvas * canvas, DiagramItem * di, QString s,
@@ -272,7 +267,7 @@ void StereotypePropertiesCanvas::needed(UmlCanvas * canvas, DiagramItem * di, QS
 {
     if (sp == 0) {
         sp = new StereotypePropertiesCanvas(canvas, di, s);
-        sp->move(pt.x(), pt.y());
+        sp->moveBy(pt.x(), pt.y());
         sp->show();
         sp->upper();
         (new ArrowCanvas(canvas, di, sp, UmlAnchor, 0, FALSE, -1.0, -1.0))->show();
@@ -320,7 +315,7 @@ StereotypePropertiesCanvas::read(char *& st, UmlCanvas * canvas,
     if (!strcmp(k, "stereotypeproperties")) {
         int id = read_id(st);
         StereotypePropertiesCanvas * result =
-            new StereotypePropertiesCanvas(canvas, it, 0, 0, id);
+                new StereotypePropertiesCanvas(canvas, it, 0, 0, id);
 
         result->read_internal(st);
         // update done by owner
diff --git a/src/diagram/StereotypePropertiesCanvas.h b/src/diagram/StereotypePropertiesCanvas.h
index 4a8af9fae..a86c7b76c 100644
--- a/src/diagram/StereotypePropertiesCanvas.h
+++ b/src/diagram/StereotypePropertiesCanvas.h
@@ -49,20 +49,20 @@ class StereotypePropertiesCanvas : public NoteCanvas
     StereotypePropertiesCanvas(UmlCanvas * canvas, DiagramItem *, QString);
     virtual ~StereotypePropertiesCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool copyable() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool copyable() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
-    virtual void apply_shortcut(QString s);
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual void apply_shortcut(const QString & s) override;
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static StereotypePropertiesCanvas * read(char *& , UmlCanvas *, char *);
     static StereotypePropertiesCanvas * read(char *& , UmlCanvas *, char *, DiagramItem *);
 
@@ -70,7 +70,7 @@ class StereotypePropertiesCanvas : public NoteCanvas
                        StereotypePropertiesCanvas *& current, QPoint);
 
 public slots:
-    void update();
+    virtual void update() override;
 };
 
 #endif
diff --git a/src/diagram/SubjectCanvas.cpp b/src/diagram/SubjectCanvas.cpp
index fc7d83894..9ba723b8a 100644
--- a/src/diagram/SubjectCanvas.cpp
+++ b/src/diagram/SubjectCanvas.cpp
@@ -31,7 +31,7 @@
 
 #include <qcursor.h>
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -76,7 +76,8 @@ void SubjectCanvas::draw(QPainter & p)
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
+    QBrush backBrush = p.background();
 
     p.setBackgroundMode((used_color == UmlTransparent) ? ::Qt::TransparentMode : ::Qt::OpaqueMode);
 
@@ -86,7 +87,8 @@ void SubjectCanvas::draw(QPainter & p)
     if (fp != 0)
         fputs("<g>\n", fp);
 
-    p.setBackgroundColor(co);
+    backBrush.setColor(co);
+    p.setBackground(backBrush);
     p.setFont(the_canvas()->get_font(UmlNormalBoldFont));
 
     if (used_color != UmlTransparent)
@@ -109,13 +111,22 @@ void SubjectCanvas::draw(QPainter & p)
         fputs("</g>\n", fp);
     }
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
 
     if (selected())
         show_mark(p, rect());
 }
 
-UmlCode SubjectCanvas::type() const
+void SubjectCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode SubjectCanvas::typeUmlCode() const
 {
     return UmlSubject;
 }
@@ -138,11 +149,11 @@ bool SubjectCanvas::copyable() const
 void SubjectCanvas::open()
 {
     BooL ok;
-    QString s = MyInputDialog::getText(TR("Subject dialog"), TR("subject : "),
+    QString s = MyInputDialog::getText(tr("Subject dialog"), tr("subject : "),
                                        fromUnicode(name), ok);
 
     if (ok) {
-        name = toUnicode(s);
+        name = toUnicode(s.toLatin1().constData());
         modified();
     }
 }
@@ -181,11 +192,12 @@ void SubjectCanvas::change_scale()
 {
     double scale = the_canvas()->zoom();
 
-    Q3CanvasRectangle::setVisible(FALSE);
-    setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    QGraphicsRectItem::setVisible(FALSE);
+    //setSize((int)(width_scale100 * scale), (int)(height_scale100 * scale));
+    setRect(0,0, (int)(width_scale100 * scale), (int)(height_scale100 * scale));
     check_size();
     recenter();
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void SubjectCanvas::modified()
@@ -200,28 +212,31 @@ void SubjectCanvas::modified()
 
 void SubjectCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-
-    MenuFactory::createTitle(m, TR("Subject"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 6);
-    m.insertItem(TR("Go down"), 7);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 3);
+    QMenu m(0);
+
+    MenuFactory::createTitle(m, tr("Subject"));
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 6);
+    MenuFactory::addItem(m, tr("Go down"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 3);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 4);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Select linked items"), 4);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 5);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 5);
 
-    int index = m.exec(QCursor::pos());
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+    int index = retAction->data().toInt();
 
     switch (index) {
     case 0:
@@ -265,11 +280,12 @@ void SubjectCanvas::menu(const QPoint &)
     default:
         return;
     }
+    }
 
     package_modified();
 }
 
-void SubjectCanvas::apply_shortcut(QString s)
+void SubjectCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -299,7 +315,7 @@ void SubjectCanvas::edit_drawing_settings()
     for (;;) {
         ColorSpecVector co(1);
 
-        co[0].set(TR("subject color"), &itscolor);
+        co[0].set(tr("subject color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE);
 
@@ -318,24 +334,22 @@ bool SubjectCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void SubjectCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SubjectCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
         UmlColor itscolor;
 
-        co[0].set(TR("subject color"), &itscolor);
+        co[0].set(tr("subject color"), &itscolor);
 
         SettingsDialog dialog(0, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((SubjectCanvas *) it.current())->itscolor = itscolor;
-                ((SubjectCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                ((SubjectCanvas *) item)->itscolor = itscolor;
+                ((SubjectCanvas *) item)->modified();	// call package_modified()
             }
         }
 
@@ -344,28 +358,21 @@ void SubjectCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void SubjectCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void SubjectCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    SubjectCanvas * x = (SubjectCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        SubjectCanvas * o = (SubjectCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const SubjectCanvas * x = (const SubjectCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString SubjectCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() : tr("illegal");
 }
 
 QString SubjectCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) : tr("illegal");
 }
 
 aCorner SubjectCanvas::on_resize_point(const QPoint & p)
@@ -389,14 +396,14 @@ void SubjectCanvas::prepare_for_move(bool on_resize)
         DiagramCanvas::prepare_for_move(on_resize);
 
         QRect r = rect();
-        Q3CanvasItemList l = collisions(TRUE);
-        Q3CanvasItemList::ConstIterator it;
-        Q3CanvasItemList::ConstIterator end = l.end();
+        QList<QGraphicsItem*> l = collidingItems();
+        QList<QGraphicsItem*>::ConstIterator it;
+        QList<QGraphicsItem*>::ConstIterator end = l.end();
         DiagramItem * di;
 
         for (it = l.begin(); it != end; ++it) {
-            if ((*it)->visible() && // at least not deleted
-                !(*it)->selected() &&
+            if ((*it)->isVisible() && // at least not deleted
+                !(*it)->isSelected() &&
                 ((di = QCanvasItemToDiagramItem(*it)) != 0) &&
                 r.contains(di->rect(), TRUE) &&
                 di->move_with(UmlSubject)) {
@@ -434,7 +441,7 @@ SubjectCanvas * SubjectCanvas::read(char *& st, UmlCanvas * canvas, char * k)
         int id = read_id(st);
         SubjectCanvas * result = new SubjectCanvas(canvas, 0, 0, id);
 
-        result->name = toUnicode(read_string(st));
+        result->name = read_string(st);
 
         k = read_keyword(st);
         read_color(st, "color", result->itscolor, k);
@@ -478,7 +485,7 @@ void SubjectCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
 }
@@ -491,27 +498,24 @@ void SubjectCanvas::history_hide()
 
 // for plug outs
 
-void SubjectCanvas::send(ToolCom * com, Q3CanvasItemList & all)
+void SubjectCanvas::send(ToolCom * com, QList<QGraphicsItem*> & all)
 {
-    Q3PtrList<SubjectCanvas> subjects;
-    Q3CanvasItemList::Iterator cit;
+    QList<SubjectCanvas *> subjects;
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
         if ((di != 0) &&
-            (*cit)->visible() &&
-            (di->type() == UmlSubject))
+            (*cit)->isVisible() &&
+            (di->typeUmlCode() == UmlSubject))
             subjects.append((SubjectCanvas *) di);
     }
 
     com->write_unsigned(subjects.count());
 
-    SubjectCanvas * sc;
-
-    for (sc = subjects.first(); sc != 0; sc = subjects.next()) {
+    foreach (SubjectCanvas *sc, subjects) {
         WrapperStr s = fromUnicode(sc->name);
-
         com->write_string((const char *) s);
         com->write(sc->rect());
     }
diff --git a/src/diagram/SubjectCanvas.h b/src/diagram/SubjectCanvas.h
index 015a7ae36..933194b34 100644
--- a/src/diagram/SubjectCanvas.h
+++ b/src/diagram/SubjectCanvas.h
@@ -48,43 +48,46 @@ class SubjectCanvas : public QObject, public DiagramCanvas
     int min_height;
 
     void check_size();
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
 public:
     SubjectCanvas(UmlCanvas * canvas, int x, int y, int id);
     virtual ~SubjectCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual aCorner on_resize_point(const QPoint &);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void prepare_for_move(bool on_resize);
-    virtual void change_scale();
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual aCorner on_resize_point(const QPoint &) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void prepare_for_move(bool on_resize) override;
+    virtual void change_scale() override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void save(QTextStream  & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream  & st, bool ref, QString & warning) const override;
     static SubjectCanvas * read(char *& , UmlCanvas *, char *);
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    static void send(ToolCom * com, Q3CanvasItemList & all);
+    static void send(ToolCom * com, QList<QGraphicsItem*> & all);
 
 private slots:
     void modified();
diff --git a/src/diagram/TemplateCanvas.cpp b/src/diagram/TemplateCanvas.cpp
index 849f489d5..b41b495d7 100644
--- a/src/diagram/TemplateCanvas.cpp
+++ b/src/diagram/TemplateCanvas.cpp
@@ -30,7 +30,7 @@
 
 
 #include <qpainter.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -53,7 +53,7 @@ TemplateCanvas::~TemplateCanvas()
 
 void TemplateCanvas::update()
 {
-    setZ(cl->z() + 0.5);
+    setZValue(cl->zValue() + 0.5);
 
     const ClassData * d = (ClassData *) cl->get_bn()->get_data();
     int i, n;
@@ -63,7 +63,7 @@ void TemplateCanvas::update()
     for (i = 1, n = d->get_n_formalparams(); i != n; i += 1)
         text += QString(", ") + d->get_formalparam_name(i);
 
-    QRect r = cl->rect();
+    QRectF r = cl->sceneBoundingRect();
     QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
     int eight = (int)(8 * the_canvas()->zoom());
     int wi = fm.width(text) + eight;
@@ -72,7 +72,16 @@ void TemplateCanvas::update()
         wi = r.width() / 2;
 
     resize(wi, fm.height() + eight);
-    move(r.right() -  r.width() / 3 + 100000, r.top() - height() / 2);
+
+
+    //do not use setPos here. let moveby hangle other stuff
+    QPointF targetPos;
+    targetPos.setX((double)(cl->x() + (cl->sceneRect().width()) / 3));
+    targetPos.setY((double)(cl->y() - height() / 2));
+    moveBy(targetPos.x()-x() + 100000,
+           targetPos.y()- y());
+
+    //moveBy(r.right() -  r.width() / 3 + 100000, r.top() - height() / 2);
 }
 
 void TemplateCanvas::change_scale()
@@ -90,7 +99,7 @@ void TemplateCanvas::moveBy(double dx, double dy)
     }
     else {
         // from update_pos
-        Q3CanvasRectangle::moveBy(dx - 100000, dy);
+        QGraphicsRectItem::moveBy(dx - 100000, dy);
 
         if (!the_canvas()->do_zoom() && !cl->selected())
             set_center100();
@@ -158,7 +167,15 @@ void TemplateCanvas::draw(QPainter & p)
 
 }
 
-UmlCode TemplateCanvas::type() const
+void TemplateCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode TemplateCanvas::typeUmlCode() const
 {
     return UmlTemplate;
 }
@@ -175,12 +192,12 @@ void TemplateCanvas::menu(const QPoint & p)
 
 QString TemplateCanvas::may_start(UmlCode &) const
 {
-    return TR("illegal");
+    return  QObject::tr("illegal");
 }
 
 QString TemplateCanvas::may_connect(UmlCode &, const DiagramItem *) const
 {
-    return TR("illegal");
+    return  QObject::tr("illegal");
 }
 
 void TemplateCanvas::save(QTextStream &, bool, QString &) const
diff --git a/src/diagram/TemplateCanvas.h b/src/diagram/TemplateCanvas.h
index 68de22719..e76c4ab4b 100644
--- a/src/diagram/TemplateCanvas.h
+++ b/src/diagram/TemplateCanvas.h
@@ -41,13 +41,14 @@ class TemplateCanvas : public DiagramCanvas
     DiagramCanvas * cl;
     QString text;
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 public:
     TemplateCanvas(DiagramCanvas * c);
     virtual ~TemplateCanvas();
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
+    virtual UmlCode typeUmlCode() const;
     virtual void open();
     virtual void menu(const QPoint &);
     virtual QString may_start(UmlCode &) const;
diff --git a/src/diagram/TextCanvas.cpp b/src/diagram/TextCanvas.cpp
index ce1a1b145..265fe41f6 100644
--- a/src/diagram/TextCanvas.cpp
+++ b/src/diagram/TextCanvas.cpp
@@ -31,7 +31,7 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -52,7 +52,7 @@
 TextCanvas::TextCanvas(UmlCanvas * canvas, int x, int y, int id)
     : DiagramCanvas(0, canvas, x, y, TEXT_CANVAS_MIN_SIZE,
                     TEXT_CANVAS_MIN_SIZE, id),
-    itsfont(UmlNormalFont), fg_c(UmlBlack), bg_c(UmlTransparent)
+      itsfont(UmlNormalFont), fg_c(UmlBlack), bg_c(UmlTransparent)
 {
     browser_node = canvas->browser_diagram();
 }
@@ -66,14 +66,17 @@ void TextCanvas::draw(QPainter & p)
     if (! visible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
-    QColor bgcolor = p.backgroundColor();
+    QColor bgcolor = p.background().color();
     QPen fgcolor = p.pen();
+    QBrush backgroundColor = p.background();
 
     if (bg_c == UmlTransparent)
         p.setBackgroundMode(::Qt::TransparentMode);
     else {
         p.setBackgroundMode(::Qt::OpaqueMode);
-        p.setBackgroundColor(color(bg_c));
+        //p.setBackgroundColor(color(bg_c));
+        backgroundColor.setColor(bg_c);
+        p.setBackground(backgroundColor);
     }
 
     if (fg_c != UmlTransparent)
@@ -93,14 +96,24 @@ void TextCanvas::draw(QPainter & p)
                   text, p.font(), fp, fg_c, bg_c);
 
     p.setFont(the_canvas()->get_font(UmlNormalFont));
-    p.setBackgroundColor(bgcolor);
+    backgroundColor.setColor(bgcolor);
+    //p.setBackgroundColor(bgcolor);
+    p.setBackground(backgroundColor);
     p.setPen(fgcolor);
 
     if (selected())
         show_mark(p, r);
 }
 
-UmlCode TextCanvas::type() const
+void TextCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode TextCanvas::typeUmlCode() const
 {
     return UmlText;
 }
@@ -118,7 +131,7 @@ void TextCanvas::open()
     if (s.isEmpty())
         delete_it();
     else {
-        text = toUnicode(s);
+        text = s;
 
         if (created) {
             QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
@@ -144,124 +157,128 @@ void TextCanvas::delete_available(BooL &, BooL & out_model) const
 
 void TextCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu fontsubm(0);
-
-    MenuFactory::createTitle(m, TR("Text"));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 6);
-    m.insertItem(TR("Go down"), 7);
-    m.insertSeparator();
-    m.insertItem(TR("Edit"), 2);
-    m.insertSeparator();
-    m.insertItem(TR("Color"), 5);
-    m.insertItem(TR("Font"), &fontsubm);
+    QMenu m(0);
+    QMenu fontsubm(0);
+
+    MenuFactory::createTitle(m,  QObject::tr("Text"));
+    m.addSeparator();
+    MenuFactory::addItem(m,  QObject::tr("Upper"), 0);
+    MenuFactory::addItem(m,  QObject::tr("Lower"), 1);
+    MenuFactory::addItem(m,  QObject::tr("Go up"), 6);
+    MenuFactory::addItem(m,  QObject::tr("Go down"), 7);
+    m.addSeparator();
+    MenuFactory::addItem(m,  QObject::tr("Edit"), 2);
+    m.addSeparator();
+    MenuFactory::addItem(m,  QObject::tr("Color"), 5);
+    MenuFactory::insertItem(m,  QObject::tr("Font"), &fontsubm);
     init_font_menu(fontsubm, the_canvas(), 10);
 
     if (linked()) {
-        m.insertSeparator();
-        m.insertItem(TR("Select linked items"), 3);
+        m.addSeparator();
+        MenuFactory::addItem(m,  QObject::tr("Select linked items"), 3);
     }
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 4);
+    m.addSeparator();
+    MenuFactory::addItem(m,  QObject::tr("Remove from diagram"), 4);
 
-    int index = m.exec(QCursor::pos());
-
-    switch (index) {
-    case 0:
-        upper();
-        // force son reaffichage
-        hide();
-        show();
-        canvas()->update();
-        break;
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int index = retAction->data().toInt();
 
-    case 1:
-        lower();
-        // force son reaffichage
-        hide();
-        show();
-        canvas()->update();
-        break;
+        switch (index) {
+        case 0:
+            upper();
+            // force son reaffichage
+            hide();
+            show();
+            canvas()->update();
+            break;
 
-    case 6:
-        z_up();
-        // force son reaffichage
-        hide();
-        show();
-        canvas()->update();
-        break;
+        case 1:
+            lower();
+            // force son reaffichage
+            hide();
+            show();
+            canvas()->update();
+            break;
 
-    case 7:
-        z_down();
-        // force son reaffichage
-        hide();
-        show();
-        canvas()->update();
-        break;
+        case 6:
+            z_up();
+            // force son reaffichage
+            hide();
+            show();
+            canvas()->update();
+            break;
 
-    case 2:
-        open();
-        return;	// call package_modified
+        case 7:
+            z_down();
+            // force son reaffichage
+            hide();
+            show();
+            canvas()->update();
+            break;
 
-    case 3:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 2:
+            open();
+            return;	// call package_modified
 
-    case 4:
-        // delete
-        the_canvas()->del(this);
-        break;
+        case 3:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    case 5:
-        for (;;) {
-            ColorSpecVector co(2);
+        case 4:
+            // delete
+            the_canvas()->del(this);
+            break;
 
-            co[0].set(TR("foreground"), &fg_c);
-            co[1].set(TR("background"), &bg_c);
+        case 5:
+            for (;;) {
+                ColorSpecVector co(2);
 
-            SettingsDialog dialog(0, &co, TRUE, FALSE,
-                                  TR("Text color dialog"));
+                co[0].set( QObject::tr("foreground"), &fg_c);
+                co[1].set( QObject::tr("background"), &bg_c);
 
-            dialog.raise();
+                SettingsDialog dialog(0, &co, TRUE, FALSE,
+                                      QObject::tr("Text color dialog"));
 
-            if (dialog.exec() != QDialog::Accepted)
-                return;
+                dialog.raise();
 
-            // force son reaffichage
-            hide();
-            show();
-            canvas()->update();
+                if (dialog.exec() != QDialog::Accepted)
+                    return;
 
-            if (!dialog.redo())
-                break;
-            else
-                package_modified();
-        }
+                // force son reaffichage
+                hide();
+                show();
+                canvas()->update();
 
-        break;
+                if (!dialog.redo())
+                    break;
+                else
+                    package_modified();
+            }
 
-    default:
-        if (index >= 10) {
-            itsfont = (UmlFont)(index - 10);
-            // force son reaffichage
-            hide();
-            show();
-            canvas()->update();
             break;
+
+        default:
+            if (index >= 10) {
+                itsfont = (UmlFont)(index - 10);
+                // force son reaffichage
+                hide();
+                show();
+                canvas()->update();
+                break;
+            }
+            else
+                return;
         }
-        else
-            return;
     }
 
     package_modified();
 }
 
-void TextCanvas::apply_shortcut(QString s)
+void TextCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Upper")
         upper();
@@ -288,12 +305,12 @@ void TextCanvas::apply_shortcut(QString s)
 
 QString TextCanvas::may_start(UmlCode & l) const
 {
-    return (l == UmlAnchor) ? QString() : TR("illegal");
+    return (l == UmlAnchor) ? QString() :  QObject::tr("illegal");
 }
 
 QString TextCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
 {
-    return (l == UmlAnchor) ? dest->may_start(l) : TR("illegal");
+    return (l == UmlAnchor) ? dest->may_start(l) :  QObject::tr("illegal");
 }
 
 bool TextCanvas::alignable() const
@@ -359,7 +376,7 @@ TextCanvas * TextCanvas::read(char *& st, UmlCanvas * canvas, char * k)
         return ((TextCanvas *) dict_get(read_id(st), "textcanvas", canvas));
     else if (!strcmp(k, "textcanvas")) {
         int id = read_id(st);
-        QString text = toUnicode(read_string(st));
+        QString text = read_string(st);
         UmlFont font;
         UmlColor fg_c = UmlBlack;
         UmlColor bg_c = UmlTransparent;
@@ -375,7 +392,7 @@ TextCanvas * TextCanvas::read(char *& st, UmlCanvas * canvas, char * k)
         int x = (int) read_double(st);
 
         TextCanvas * result =
-            new TextCanvas(canvas, x, (int) read_double(st), id);
+                new TextCanvas(canvas, x, (int) read_double(st), id);
 
         read_zwh(st, result);
         result->width_scale100 = result->width();
@@ -412,21 +429,21 @@ void TextCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 }
 
 // for plug outs
 
-void TextCanvas::send(ToolCom * com, Q3CanvasItemList & all)
+void TextCanvas::send(ToolCom * com, QList<QGraphicsItem*> & all)
 {
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
         if ((di != 0) &&
-            (*cit)->visible() &&
-            (di->type() == UmlText)) {
+                (*cit)->isVisible() &&
+                (di->typeUmlCode() == UmlText)) {
             TextCanvas * tx = (TextCanvas *) di;
             WrapperStr s = fromUnicode(tx->text);
 
diff --git a/src/diagram/TextCanvas.h b/src/diagram/TextCanvas.h
index eec139bab..ff1e29fba 100644
--- a/src/diagram/TextCanvas.h
+++ b/src/diagram/TextCanvas.h
@@ -50,25 +50,27 @@ class TextCanvas : public DiagramCanvas
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual bool move_with(UmlCode) const;
-    virtual aCorner on_resize_point(const QPoint &);
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-    virtual void apply_shortcut(QString s);
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual bool move_with(UmlCode) const override;
+    virtual aCorner on_resize_point(const QPoint &) override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+    virtual void apply_shortcut(const QString & s) override;
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static TextCanvas * read(char *& , UmlCanvas *, char *);
 
-    static void send(ToolCom * com, Q3CanvasItemList & all);
+    static void send(ToolCom * com, QList<QGraphicsItem*> & all);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 };
 
 #endif
diff --git a/src/diagram/TransitionCanvas.cpp b/src/diagram/TransitionCanvas.cpp
index 7d3ac3a2b..658cd2861 100644
--- a/src/diagram/TransitionCanvas.cpp
+++ b/src/diagram/TransitionCanvas.cpp
@@ -33,7 +33,7 @@
 //Added by qt3to4:
 #include <QTextStream>
 #include <math.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 
 #include "TransitionCanvas.h"
 #include "ArrowPointCanvas.h"
@@ -61,12 +61,12 @@ TransitionCanvas::TransitionCanvas(UmlCanvas * canvas,
     : ArrowCanvas(canvas, b, e, UmlTransition, id, TRUE, d_begin, d_end),
       br_begin(bb), data(d), stereotypeproperties(0)
 {
-    if ((e->type() != UmlArrowPoint) && (bb == 0)) {
+    if ((e->typeUmlCode() != UmlArrowPoint) && (bb == 0)) {
         // end of line construction
         update_begin(e);
     }
     else if (d != 0) {
-        if (e->type() != UmlArrowPoint)
+        if (e->typeUmlCode() != UmlArrowPoint)
             check_stereotypeproperties();
 
         connect(d, SIGNAL(changed()), this, SLOT(modified()));
@@ -128,7 +128,7 @@ void TransitionCanvas::remove(bool from_model)
         if (the_canvas()->must_draw_all_relations()) {
             const TransitionCanvas * a = this;
 
-            while (a->begin->type() == UmlArrowPoint) {
+            while (a->begin->typeUmlCode() == UmlArrowPoint) {
                 a = (TransitionCanvas *)((ArrowPointCanvas *) a->begin)->get_other(a);
 
                 if (a == 0)
@@ -138,7 +138,7 @@ void TransitionCanvas::remove(bool from_model)
             if (a && !a->begin->isSelected() && !a->begin->get_bn()->deletedp()) {
                 a = this;
 
-                while (a->end->type() == UmlArrowPoint) {
+                while (a->end->typeUmlCode() == UmlArrowPoint) {
                     a = (TransitionCanvas *)((ArrowPointCanvas *) a->end)->get_other(a);
 
                     if (a == 0)
@@ -166,7 +166,7 @@ BrowserNode * TransitionCanvas::update_begin(DiagramItem * cnend)
     // static to be updated in all the cases
     static TransitionData * d = 0;
 
-    if (begin->type() == UmlArrowPoint) {
+    if (begin->typeUmlCode() == UmlArrowPoint) {
         TransitionCanvas * other =
             ((TransitionCanvas *)((ArrowPointCanvas *) begin)->get_other(this));
 
@@ -191,7 +191,7 @@ void TransitionCanvas::propagate_drawing_settings()
 
     t = this;
 
-    while (t->begin->type() == UmlArrowPoint) {
+    while (t->begin->typeUmlCode() == UmlArrowPoint) {
         t = ((TransitionCanvas *)((ArrowPointCanvas *) t->begin)->get_other(t));
         t->drawing_language = drawing_language;
         t->write_horizontally = write_horizontally;
@@ -200,7 +200,7 @@ void TransitionCanvas::propagate_drawing_settings()
 
     t = this;
 
-    while (t->end->type() == UmlArrowPoint) {
+    while (t->end->typeUmlCode() == UmlArrowPoint) {
         t = ((TransitionCanvas *)((ArrowPointCanvas *) t->end)->get_other(t));
         t->drawing_language = drawing_language;
         t->write_horizontally = write_horizontally;
@@ -230,48 +230,51 @@ void TransitionCanvas::menu(const QPoint &)
             pstereotype = (TransitionCanvas *) apstereotype;
         }
 
-        Q3PopupMenu m(0);
-        Q3PopupMenu geo(0);
-        Q3PopupMenu toolm(0);
+        QMenu m(0);
+        QMenu geo(0);
+        QMenu toolm(0);
 
         MenuFactory::createTitle(m, data->definition(FALSE, TRUE));
-        m.insertSeparator();
-        m.insertItem("Edit", 0);
-        m.insertSeparator();
+        m.addSeparator();
+        MenuFactory::addItem(m, "Edit", 0);
+        m.addSeparator();
 
-        m.insertItem("Select in browser", 2);
+        MenuFactory::addItem(m, "Select in browser", 2);
 
         if (plabel || pstereotype) {
-            m.insertSeparator();
-            m.insertItem("Edit drawing settings", 1);
-            m.insertItem("Select labels", 3);
-            m.insertItem("Labels default position", 4);
+            m.addSeparator();
+            MenuFactory::addItem(m, "Edit drawing settings", 1);
+            MenuFactory::addItem(m, "Select labels", 3);
+            MenuFactory::addItem(m, "Labels default position", 4);
 
             if (plabel && (label == 0))
-                m.insertItem("Attach transition's name to this segment", 5);
+                MenuFactory::addItem(m, "Attach transition's name to this segment", 5);
 
             if (pstereotype && (stereotype == 0))
-                m.insertItem("Attach stereotype to this segment", 6);
+                MenuFactory::addItem(m, "Attach stereotype to this segment", 6);
         }
 
         if (get_start() != get_end()) {
-            m.insertSeparator();
+            m.addSeparator();
             init_geometry_menu(geo, 10);
-            m.insertItem("Geometry (Ctrl+l)", &geo);
+            MenuFactory::insertItem(m, "Geometry (Ctrl+l)", &geo);
         }
 
-        m.insertSeparator();
-        m.insertItem("Remove from diagram", 7);
+        m.addSeparator();
+        MenuFactory::addItem(m, "Remove from diagram", 7);
 
         if (data->get_start()->is_writable())
-            m.insertItem("Delete from model", 8);
+            MenuFactory::addItem(m, "Delete from model", 8);
 
-        m.insertSeparator();
+        m.addSeparator();
 
         if (Tool::menu_insert(&toolm, itstype, 20))
-            m.insertItem("Tool", &toolm);
+            MenuFactory::insertItem(m, "Tool", &toolm);
 
-        int rank = m.exec(QCursor::pos());
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        int rank = retAction->data().toInt();
 
         switch (rank) {
         case 0:
@@ -351,27 +354,23 @@ void TransitionCanvas::menu(const QPoint &)
             else
                 return;
         }
+        }
 
         package_modified();
     }
 }
 
-void TransitionCanvas::apply_shortcut(QString s)
+void TransitionCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         data->get_start()->select_in_browser();
-        return;
     }
     else if (s == "Edit drawing settings") {
         edit_drawing_settings();
-        return;
     }
     else {
         data->get_start()->apply_shortcut(s);
-        return;
     }
-
-    modified(); // call package_modified()
 }
 
 void TransitionCanvas::edit_drawing_settings()
@@ -403,7 +402,7 @@ bool TransitionCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void TransitionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void TransitionCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st(3);
@@ -421,23 +420,22 @@ void TransitionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                TransitionCanvas *canvas = (TransitionCanvas *)item;
                 if (!st[0].name.isEmpty())
-                    ((TransitionCanvas *) it.current())->drawing_language =
+                    canvas->drawing_language =
                         drawing_language;
 
                 if (!st[1].name.isEmpty())
-                    ((TransitionCanvas *) it.current())->write_horizontally =
+                    canvas->write_horizontally =
                         write_horizontally;
 
                 if (!st[2].name.isEmpty())
-                    ((TransitionCanvas *) it.current())->show_definition =
+                    canvas->show_definition =
                         show_definition;
 
-                ((TransitionCanvas *) it.current())->propagate_drawing_settings();
-                ((TransitionCanvas *) it.current())->modified();	// call package_modified()
+                canvas->propagate_drawing_settings();
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -446,21 +444,14 @@ void TransitionCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void TransitionCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void TransitionCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    TransitionCanvas * x = (TransitionCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        TransitionCanvas * o = (TransitionCanvas *) it.current();
-
-        o->drawing_language = x->drawing_language;
-        o->write_horizontally = x->write_horizontally;
-        o->show_definition = x->show_definition;
-        o->propagate_drawing_settings();
-        o->modified();	// call package_modified()
-    }
+    const TransitionCanvas * x = (const TransitionCanvas *) src;
+    drawing_language = x->drawing_language;
+    write_horizontally = x->write_horizontally;
+    show_definition = x->show_definition;
+    propagate_drawing_settings();
+    modified();
 }
 
 ArrowPointCanvas * TransitionCanvas::brk(const QPoint & p)
@@ -468,7 +459,7 @@ ArrowPointCanvas * TransitionCanvas::brk(const QPoint & p)
     ArrowPointCanvas * ap =
         new ArrowPointCanvas(the_canvas(), p.x(), p.y());
 
-    ap->setZ(z() + 1);
+    ap->setZValue(zValue() + 1);
 
     TransitionCanvas * other =
         // do not give data to not call update()
@@ -515,12 +506,12 @@ ArrowCanvas * TransitionCanvas::join(ArrowCanvas * other, ArrowPointCanvas * ap)
 
 void TransitionCanvas::modified()
 {
-    if (visible()) {
+    if (isVisible()) {
         hide();
         update(TRUE);
         show();
 
-        if (begin->type() != UmlArrowPoint)
+        if (begin->typeUmlCode() != UmlArrowPoint)
             check_stereotypeproperties();
 
         canvas()->update();
@@ -558,9 +549,9 @@ void TransitionCanvas::update(bool updatepos)
             }
         }
         else {
-            s = QString("<<") + toUnicode(s) + ">>";
+            s = QString("<<") + s + ">>";
 
-            if ((pstereotype == 0) && (begin->type() != UmlArrowPoint)) {
+            if ((pstereotype == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
                 // adds relation's stereotype
                 stereotype = new LabelCanvas(s, the_canvas(), 0, 0);
                 update_label = (label != 0);
@@ -590,7 +581,7 @@ void TransitionCanvas::update(bool updatepos)
                           (drawing_language == DefaultDrawingLanguage)
                           ? diagram->get_language()
                           : drawing_language);
-            s = toUnicode(s);
+            s = toUnicode(s.toLatin1().constData());
         }
         else if ((s = data->get_start()->get_name()) == "<transition>")
             s = QString();
@@ -603,7 +594,7 @@ void TransitionCanvas::update(bool updatepos)
                 plabel->label = 0;
             }
         }
-        else if ((plabel == 0) && (begin->type() != UmlArrowPoint)) {
+        else if ((plabel == 0) && (begin->typeUmlCode() != UmlArrowPoint)) {
             // adds relation's name
             label = new LabelCanvas(s, the_canvas(), 0, 0);
             default_label_position();
@@ -630,7 +621,7 @@ void TransitionCanvas::default_label_position() const
     QString s = label->get_name();
     QSize sz = fm.size(0, s);
 
-    label->move(c.x() - sz.width() / 2,
+    label->moveBy(c.x() - sz.width() / 2,
                 c.y() - ((stereotype != 0) ? sz.height() : sz.height() / 2));
     package_modified();
 }
@@ -653,12 +644,12 @@ void TransitionCanvas::drop(BrowserNode * bn, UmlCanvas * canvas)
     BrowserNode * to = def->get_end_node();
     DiagramItem * difrom = 0;
     DiagramItem * dito = 0;
-    Q3CanvasItemList all = canvas->allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = canvas->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     // the two extremities are drawn ?
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if (di != 0) {
@@ -712,7 +703,7 @@ void TransitionCanvas::moveBy(double dx, double dy)
 
 void TransitionCanvas::select_associated()
 {
-    if (!selected()) {
+    if (!isSelected()) {
         if ((stereotypeproperties != 0) && !stereotypeproperties->selected())
             the_canvas()->select(stereotypeproperties);
 
@@ -723,7 +714,7 @@ void TransitionCanvas::select_associated()
 void TransitionCanvas::check_stereotypeproperties()
 {
     // the note is memorized by the first segment
-    if (begin->type() == UmlArrowPoint)
+    if (begin->typeUmlCode() == UmlArrowPoint)
         ((TransitionCanvas *)((ArrowPointCanvas *) begin)->get_other(this))
         ->check_stereotypeproperties();
     else {
@@ -750,7 +741,7 @@ void TransitionCanvas::save(QTextStream & st, bool ref, QString & warning) const
 {
     if (ref)
         st << "transitioncanvas_ref " << get_ident();
-    else if (begin->type() != UmlArrowPoint) {
+    else if (begin->typeUmlCode() != UmlArrowPoint) {
         // relation canvas start
         nl_indent(st);
         st << "transitioncanvas " << get_ident() << " ";
@@ -778,7 +769,7 @@ void TransitionCanvas::save(QTextStream & st, bool ref, QString & warning) const
         }
 
         nl_indent(st);
-        (const TransitionCanvas *) ArrowCanvas::save_lines(st, TRUE, TRUE, warning);
+        save_lines(st, TRUE, TRUE, warning);
         nl_indent(st);
         st << "write_horizontally " << stringify(write_horizontally)
            << " show_definition " << stringify(show_definition)
@@ -856,7 +847,7 @@ TransitionCanvas * TransitionCanvas::read(char *& st, UmlCanvas * canvas, char *
 
             if ((label = LabelCanvas::read(st, canvas, k)) != 0) {
                 // the transition name can't be empty
-                label->setZ(z);
+                label->setZValue(z);
                 k = read_keyword(st);
             }
 
@@ -875,7 +866,7 @@ TransitionCanvas * TransitionCanvas::read(char *& st, UmlCanvas * canvas, char *
                     stereotype =
                         new LabelCanvas(QString("<<") + toUnicode(tr->get_short_stereotype()) + ">>",
                                         canvas, x, y);
-                    stereotype->setZ(read_double(st));
+                    stereotype->setZValue(read_double(st));
                 }
 
                 k = read_keyword(st);
@@ -922,7 +913,7 @@ TransitionCanvas * TransitionCanvas::read(char *& st, UmlCanvas * canvas, char *
 
             result->show();
 
-            if (di->type() != UmlArrowPoint)
+            if (di->typeUmlCode() != UmlArrowPoint)
                 break;
 
             bi = di;
@@ -985,7 +976,7 @@ TransitionCanvas * TransitionCanvas::read(char *& st, UmlCanvas * canvas, char *
 
 void TransitionCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     unconnect();
 }
 
diff --git a/src/diagram/TransitionCanvas.h b/src/diagram/TransitionCanvas.h
index bb57d0592..c482b72b3 100644
--- a/src/diagram/TransitionCanvas.h
+++ b/src/diagram/TransitionCanvas.h
@@ -56,46 +56,47 @@ class TransitionCanvas : public ArrowCanvas
                      TransitionData * d = 0);
     virtual ~TransitionCanvas();
 
-    virtual void delete_it();
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual void remove(bool from_model);
-    virtual void unconnect();
+    virtual void delete_it() override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual void remove(bool from_model) override;
+    virtual void unconnect() override;
 
-    virtual ArrowPointCanvas * brk(const QPoint &);
-    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap);
+    virtual ArrowPointCanvas * brk(const QPoint &) override;
+    virtual ArrowCanvas * join(ArrowCanvas * other, ArrowPointCanvas * ap) override;
 
-    virtual void default_label_position() const;
+    virtual void default_label_position() const override;
     void stereotype_default_position() const;
 
-    virtual void save(QTextStream & st, bool ref, QString & warning) const;
+    virtual void save(QTextStream & st, bool ref, QString & warning) const override;
 
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
     void edit_drawing_settings();
 
     static TransitionCanvas * read(char *& st, UmlCanvas * canvas, char *);
-    virtual BasicData * get_data() const;
+    virtual BasicData * get_data() const override;
 
-    virtual void open();
-    virtual void menu(const QPoint &);
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
 
-    virtual void setVisible(bool yes);
-    virtual void moveBy(double dx, double dy);
-    virtual void select_associated();
-    virtual void check_stereotypeproperties();
+    virtual void setVisible(bool yes) override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void select_associated() override;
+    virtual void check_stereotypeproperties() override;
 
     static void drop(BrowserNode *, UmlCanvas *);
 
-    virtual bool represents(BrowserNode *);
+    virtual bool represents(BrowserNode *) override;
 
 protected:
     BrowserNode * update_begin(DiagramItem * cnend);
+    using DiagramItem::update;
     void update(bool updatepos);
     void propagate_drawing_settings();
 
diff --git a/src/diagram/UcClassCanvas.cpp b/src/diagram/UcClassCanvas.cpp
index 83f5ead3f..abde5b230 100644
--- a/src/diagram/UcClassCanvas.cpp
+++ b/src/diagram/UcClassCanvas.cpp
@@ -31,14 +31,14 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QPixmap>
-
 #include "UcClassCanvas.h"
 #include "TemplateCanvas.h"
 #include "RelationCanvas.h"
+#include "ArrowCanvas.h"
 #include "DiagramView.h"
 #include "RelationData.h"
 #include "BasicData.h"
@@ -102,10 +102,8 @@ void UcClassCanvas::delete_it()
 {
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
     disconnect(browser_node->get_data(), 0, this, 0);
-
     if (templ)
         templ->delete_it();
-
     DiagramCanvas::delete_it();
 }
 
@@ -127,7 +125,7 @@ void UcClassCanvas::compute_size()
 {
     used_settings = settings;
     ((BrowserUseCaseDiagram *) the_canvas()->browser_diagram())
-    ->get_simpleclassdiagramsettings(used_settings);
+            ->get_simpleclassdiagramsettings(used_settings);
 
     full_name = browser_node->get_name();
 
@@ -174,10 +172,10 @@ void UcClassCanvas::compute_size()
             BrowserArtifact * cp = cl->get_associated_artifact();
 
             QString context =
-                (((PackageData *)
-                  ((BrowserNode *)
-                   (((cp == 0) ? (BrowserNode *) cl : (BrowserNode *) cp)
-                    ->parent()->parent()))->get_data())->*f)();
+                    (((PackageData *)
+                      ((BrowserNode *)
+                       (((cp == 0) ? (BrowserNode *) cl : (BrowserNode *) cp)
+                        ->parent()->parent()))->get_data())->*f)();
 
             if (!context.isEmpty())
                 full_name = context + sep + full_name;
@@ -188,7 +186,7 @@ void UcClassCanvas::compute_size()
     QFontMetrics fim(the_canvas()->get_font(UmlNormalItalicFont));
     const ClassData * data = ((ClassData *) browser_node->get_data());
     int wi =
-        (data->get_is_abstract()) ? fim.width(full_name) : fm.width(full_name);
+            (data->get_is_abstract()) ? fim.width(full_name) : fm.width(full_name);
     double zoom = the_canvas()->zoom();
     const QPixmap * px = 0;
 
@@ -282,8 +280,8 @@ void UcClassCanvas::compute_size()
         wi = min_w;
 
     used_color = (itscolor == UmlDefaultColor)
-                 ? the_canvas()->browser_diagram()->get_color(UmlClass)
-                 : itscolor;
+            ? the_canvas()->browser_diagram()->get_color(UmlClass)
+            : itscolor;
 
     if ((used_view_mode == asClass) && (used_color != UmlTransparent)) {
         const int shadow = the_canvas()->shadow();
@@ -294,7 +292,6 @@ void UcClassCanvas::compute_size()
 
     // force odd width and height for line alignment
     DiagramCanvas::resize(wi | 1, he | 1);
-
     if (tmpl) {
         if (templ == 0) {
             templ = new TemplateCanvas(this);
@@ -311,15 +308,16 @@ void UcClassCanvas::compute_size()
 
 void UcClassCanvas::draw(QPainter & p)
 {
-    if (! visible()) return;
+    if (! isVisible()) return;
 
     p.setRenderHint(QPainter::Antialiasing, true);
     QRect r = rect();
     QFontMetrics fm(the_canvas()->get_font(UmlNormalFont));
     QFontMetrics fim(the_canvas()->get_font(UmlNormalItalicFont));
-    QColor bckgrnd = p.backgroundColor();
+    QColor bckgrnd = p.background().color();
     double zoom = the_canvas()->zoom();
     FILE * fp = svg();
+    QBrush backBrush = p.background();
 
     if (fp != 0)
         fputs("<g>\n", fp);
@@ -345,32 +343,33 @@ void UcClassCanvas::draw(QPainter & p)
 
                 if (fp != 0) {
                     fprintf(fp, "\t<rect fill=\"#%06x\" stroke=\"none\" stroke-opacity=\"1\""
-                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                             QColor(::Qt::darkGray).rgb() & 0xffffff,
                             r.right(), r.top() + shadow, shadow - 1, r.height() - 1 - 1);
 
                     fprintf(fp, "\t<rect fill=\"#%06x\" stroke=\"none\" stroke-opacity=\"1\""
-                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                                " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                             QColor(::Qt::darkGray).rgb() & 0xffffff,
                             r.left() + shadow, r.bottom(), r.width() - 1 - 1, shadow - 1);
                 }
             }
         }
 
-        p.setBackgroundColor(co);
+        backBrush.setColor(co);
+        p.setBackground(backBrush);
 
         if (used_color != UmlTransparent) {
             p.fillRect(r, co);
 
             if (fp != 0)
                 fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                            " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                         svg_color(used_color),
                         r.x(), r.y(), r.width() - 1, r.height() - 1);
         }
         else if (fp != 0)
             fprintf(fp, "\t<rect fill=\"none\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     r.x(), r.y(), r.width() - 1, r.height() - 1);
 
         p.drawRect(r);
@@ -414,12 +413,12 @@ void UcClassCanvas::draw(QPainter & p)
         draw_actor(&p, ra);
     }
 
-    r.setTop(r.top() + (int)(ACTOR_SIZE * zoom) + two);
-    break;
+        r.setTop(r.top() + (int)(ACTOR_SIZE * zoom) + two);
+        break;
 
     case Natural: {
         const QPixmap * px =
-            ProfiledStereotypes::diagramPixmap(data->get_stereotype(), zoom);
+                ProfiledStereotypes::diagramPixmap(data->get_stereotype(), zoom);
         int lft = (px->width() < width()) ? r.x() + (width() - px->width()) / 2 : r.x();
 
         p.drawPixmap(lft, r.y(), *px);
@@ -427,12 +426,12 @@ void UcClassCanvas::draw(QPainter & p)
         if (fp != 0)
             // pixmap not really exported in SVG
             fprintf(fp, "\t<rect fill=\"%s\" stroke=\"black\" stroke-width=\"1\" stroke-opacity=\"1\""
-                    " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                        " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                     svg_color(UmlBlack), lft, r.y(), px->width() - 1, px->height() - 1);
 
         r.setTop(r.top() + px->height());
     }
-    break;
+        break;
 
     default:	// class
         r.setTop(r.top() + two);
@@ -468,7 +467,7 @@ void UcClassCanvas::draw(QPainter & p)
 
         if (fp != 0)
             fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                     r.left(), r.top(), r.right(), r.top());
 
         r.setTop(r.top() + (int)(8 * zoom));
@@ -476,22 +475,31 @@ void UcClassCanvas::draw(QPainter & p)
 
         if (fp != 0)
             fprintf(fp, "\t<line stroke=\"black\" stroke-opacity=\"1\""
-                    " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
+                        " x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" />\n",
                     r.left(), r.top(), r.right(), r.top());
     }
 
     if (fp != 0)
         fputs("</g>\n", fp);
 
-    p.setBackgroundColor(bckgrnd);
+    backBrush.setColor(bckgrnd);
+    p.setBackground(backBrush);
 
     if (selected())
         show_mark(p, rect());
 }
 
+void UcClassCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
 void UcClassCanvas::modified()
 {
-    if (visible()) {
+    if (isVisible()) {
         hide();
         hide_lines();
         compute_size();
@@ -527,28 +535,25 @@ bool UcClassCanvas::get_show_stereotype_properties() const
 
 void UcClassCanvas::change_scale()
 {
-    Q3CanvasRectangle::setVisible(FALSE);
+    QGraphicsRectItem::setVisible(FALSE);
     compute_size();
     recenter();
-
     if (templ != 0)
         templ->update();
 
-    Q3CanvasRectangle::setVisible(TRUE);
+    QGraphicsRectItem::setVisible(TRUE);
 }
 
 void UcClassCanvas::moveBy(double dx, double dy)
 {
     DiagramCanvas::moveBy(dx, dy);
-
     if (templ != 0)
         templ->update();
 }
 
 void UcClassCanvas::set_z(double z)
 {
-    setZ(z);
-
+    setZValue(z);
     if (templ)
         templ->update();
 }
@@ -563,7 +568,7 @@ void UcClassCanvas::post_loaded()
     }
 }
 
-UmlCode UcClassCanvas::type() const
+UmlCode UcClassCanvas::typeUmlCode() const
 {
     return UmlClass;
 }
@@ -591,112 +596,116 @@ void UcClassCanvas::open()
 
 void UcClassCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem(TR("Upper"), 0);
-    m.insertItem(TR("Lower"), 1);
-    m.insertItem(TR("Go up"), 8);
-    m.insertItem(TR("Go down"), 9);
-    m.insertSeparator();
-    m.insertItem(TR("Add related elements"), 10);
-    m.insertSeparator();
-    m.insertItem(TR("Edit drawing settings"), 4);
-    m.insertSeparator();
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Upper"), 0);
+    MenuFactory::addItem(m, tr("Lower"), 1);
+    MenuFactory::addItem(m, tr("Go up"), 8);
+    MenuFactory::addItem(m, tr("Go down"), 9);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Add related elements"), 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Edit drawing settings"), 4);
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
-        m.insertItem(TR("Edit"), 7);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("Edit"), 7);
+        m.addSeparator();
     }
 
-    m.insertItem(TR("Select in browser"), 2);
+    MenuFactory::addItem(m, tr("Select in browser"), 2);
 
     if (linked())
-        m.insertItem(TR("Select linked items"), 3);
+        MenuFactory::addItem(m, tr("Select linked items"), 3);
 
-    m.insertSeparator();
-    m.insertItem(TR("Remove from diagram"), 5);
+    m.addSeparator();
+    MenuFactory::addItem(m, tr("Remove from diagram"), 5);
 
     if (browser_node->is_writable())
-        m.insertItem(TR("Delete from model"), 6);
+        MenuFactory::addItem(m, tr("Delete from model"), 6);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlClass, 20))
-        m.insertItem(TR("Tool"), &toolm);
+        MenuFactory::insertItem(m, tr("Tool"), &toolm);
+
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int rank = retAction->data().toInt();
+
+        switch (rank) {
+        case 0:
+            upper();
+            hide();
+            show();
+            break;
 
-    int rank = m.exec(QCursor::pos());
+        case 1:
+            lower();
+            hide();
+            show();
+            break;
 
-    switch (rank) {
-    case 0:
-        upper();
-        hide();
-        show();
-        break;
+        case 2:
+            browser_node->select_in_browser();
+            return;
 
-    case 1:
-        lower();
-        hide();
-        show();
-        break;
-
-    case 2:
-        browser_node->select_in_browser();
-        return;
+        case 3:
+            the_canvas()->unselect_all();
+            select_associated();
+            return;
 
-    case 3:
-        the_canvas()->unselect_all();
-        select_associated();
-        return;
+        case 4:
+            edit_drawing_settings();
+            return;
 
-    case 4:
-        edit_drawing_settings();
-        return;
-
-    case 5:
-        // remove from diagram
-        delete_it();
-        break;
+        case 5:
+            // remove from diagram
+            delete_it();
+            break;
 
-    case 6:
-        // delete from model
-        browser_node->delete_it();	// will delete the canvas
-        break;
+        case 6:
+            // delete from model
+            browser_node->delete_it();	// will delete the canvas
+            break;
 
-    case 7:
-        browser_node->open(TRUE);
-        break;
+        case 7:
+            browser_node->open(TRUE);
+            break;
 
-    case 8:
-        z_up();
-        hide();
-        show();
-        break;
+        case 8:
+            z_up();
+            hide();
+            show();
+            break;
 
-    case 9:
-        z_down();
-        hide();
-        show();
-        break;
+        case 9:
+            z_down();
+            hide();
+            show();
+            break;
 
-    case 10:
-        ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("class/actor"), TRUE, FALSE);
-        return;
+        case 10:
+            ((UmlCanvas *) canvas())->get_view()
+                    ->add_related_elements(this, tr("class/actor"), TRUE, FALSE);
+            return;
 
-    default:
-        if (rank >= 20)
-            ToolCom::run(Tool::command(rank - 20), browser_node);
+        default:
+            if (rank >= 20)
+                ToolCom::run(Tool::command(rank - 20), browser_node);
 
-        return;
+            return;
+        }
     }
 
     package_modified();
 }
 
-void UcClassCanvas::apply_shortcut(QString s)
+void UcClassCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -716,7 +725,7 @@ void UcClassCanvas::apply_shortcut(QString s)
     }
     else if (s == "Add related elements") {
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("class/actor"), TRUE, FALSE);
+                ->add_related_elements(this, tr("class/actor"), TRUE, FALSE);
         return;
     }
     else {
@@ -736,7 +745,7 @@ void UcClassCanvas::edit_drawing_settings()
 
         settings.complete(st);
 
-        co[0].set(TR("class color"), &itscolor);
+        co[0].set(tr("class color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE);
 
@@ -757,7 +766,7 @@ bool UcClassCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void UcClassCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void UcClassCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         StateSpecVector st;
@@ -767,22 +776,22 @@ void UcClassCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
 
         settings.complete(st);
 
-        co[0].set(TR("class color"), &itscolor);
+        co[0].set(tr("class color"), &itscolor);
 
         SettingsDialog dialog(&st, &co, FALSE, TRUE);
 
         dialog.raise();
 
         if (dialog.exec() == QDialog::Accepted) {
-            Q3PtrListIterator<DiagramItem> it(l);
 
-            for (; it.current(); ++it) {
+            foreach (DiagramItem *item, l) {
+                UcClassCanvas *canvas = (UcClassCanvas *)item;
                 if (!co[0].name.isEmpty())
-                    ((UcClassCanvas *) it.current())->itscolor = itscolor;
+                    canvas->itscolor = itscolor;
 
-                ((UcClassCanvas *) it.current())->settings.set(st, 0);
-                ((UcClassCanvas *) it.current())->modified();
-                ((UcClassCanvas *) it.current())->package_modified();
+                canvas->settings.set(st, 0);
+                canvas->modified();
+                canvas->package_modified();
             }
         }
 
@@ -791,20 +800,13 @@ void UcClassCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void UcClassCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void UcClassCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    UcClassCanvas * x = (UcClassCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        UcClassCanvas * o = (UcClassCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->settings = x->settings;
-        o->modified();
-        o->package_modified();
-    }
+    const UcClassCanvas * x = (const UcClassCanvas *) src;
+    itscolor = x->itscolor;
+    settings = x->settings;
+    modified();
+    package_modified();
 }
 
 QString UcClassCanvas::may_start(UmlCode & c) const
@@ -817,10 +819,10 @@ QString UcClassCanvas::may_start(UmlCode & c) const
 
     case UmlGeneralisation:
     case UmlDependency:
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -829,34 +831,29 @@ QString UcClassCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlUseCase:
         return ((l == UmlAssociation) || (l == UmlDirectionalAssociation))
-               ? QString() : TR("illegal");
+                ? QString() : tr("illegal");
 
     case UmlClass:
         return ((l == UmlGeneralisation) || (l == UmlDependency))
-               ? ((BrowserClass *) browser_node)
-               ->may_connect(l, (BrowserClass *)((const UcClassCanvas *) dest)->browser_node)
-               : TR("illegal");
+                ? ((BrowserClass *) browser_node)
+                  ->may_connect(l, (BrowserClass *)((const UcClassCanvas *) dest)->browser_node)
+                : tr("illegal");
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
 bool UcClassCanvas::has_relation(BasicData * def) const
 {
-    Q3PtrListIterator<ArrowCanvas> it(lines);
-
-    while (it.current()) {
-        if (IsaRelation(it.current()->type()) &&
-            (((RelationCanvas *) it.current())->get_data() == def))
+    foreach (ArrowCanvas *line, lines) {
+        if (IsaRelation(line->typeUmlCode()) &&
+                (((RelationCanvas *) line)->get_data() == def))
             return TRUE;
-
-        ++it;
     }
-
     return FALSE;
 }
 
@@ -875,22 +872,22 @@ static bool dependencyOrGeneralization(UmlCode t)
 
 void UcClassCanvas::draw_all_depend_gene(UcClassCanvas * end)
 {
-    Q3ListViewItem * child;
-    Q3CanvasItemList all = canvas()->allItems();
-    Q3CanvasItemList::Iterator cit;
+    BrowserNode * child;
+    QList<QGraphicsItem*> all = canvas()->items();
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (child = browser_node->firstChild(); child; child = child->nextSibling()) {
         if (dependencyOrGeneralization(((BrowserNode *) child)->get_type()) &&
-            !((BrowserNode *) child)->deletedp()) {
+                !((BrowserNode *) child)->deletedp()) {
             RelationData * def =
-                ((RelationData *)((BrowserNode *) child)->get_data());
+                    ((RelationData *)((BrowserNode *) child)->get_data());
 
             if ((def->get_start_class() == browser_node) && 	// rel begins by this
-                ((end == 0) || (def->get_end_class() == end->browser_node)) &&
-                !has_relation(def)) {
+                    ((end == 0) || (def->get_end_class() == end->browser_node)) &&
+                    !has_relation(def)) {
                 // adds it in case the other class is drawn
                 BrowserClass * end_class =
-                    ((BrowserClass *) def->get_end_class());
+                        ((BrowserClass *) def->get_end_class());
                 DiagramItem * di;
 
                 if (end_class == browser_node)
@@ -902,36 +899,35 @@ void UcClassCanvas::draw_all_depend_gene(UcClassCanvas * end)
                         DiagramItem * adi = QCanvasItemToDiagramItem(*cit);
 
                         if ((adi != 0) &&		// an uml canvas item
-                            (adi->type() == UmlClass) &&
-                            (((UcClassCanvas *) adi)->browser_node == end_class) &&
-                            ((((UcClassCanvas *) adi) == end) || (*cit)->visible())) {
+                                (adi->typeUmlCode() == UmlClass) &&
+                                (((UcClassCanvas *) adi)->browser_node == end_class) &&
+                                ((((UcClassCanvas *) adi) == end) || (*cit)->isVisible())) {
                             // other class canvas find
                             di = adi;
                             break;
                         }
                     }
                 }
-
                 if (di != 0)
                     (new RelationCanvas(the_canvas(), this, di,
                                         ((BrowserClass *) browser_node),
                                         def->get_type(), 0, -1.0, -1.0, def))
-                    ->show();
+                        ->show();
             }
         }
     }
 
     if ((end == 0) &&
-        !DrawingSettings::just_modified() &&
-        !on_load_diagram()) {
+            !DrawingSettings::just_modified() &&
+            !on_load_diagram()) {
         for (cit = all.begin(); cit != all.end(); ++cit) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
             if ((di != 0) &&	// an uml canvas item
-                (di->type() == UmlClass) &&
-                (((UcClassCanvas *) di) != this) &&
-                !((UcClassCanvas *) di)->browser_node->deletedp() &&
-                ((UcClassCanvas *) di)->visible())
+                    (di->typeUmlCode() == UmlClass) &&
+                    (((UcClassCanvas *) di) != this) &&
+                    !((UcClassCanvas *) di)->browser_node->deletedp() &&
+                    ((UcClassCanvas *) di)->isVisible())
                 ((UcClassCanvas *) di)->draw_all_depend_gene(this);
         }
     }
@@ -941,8 +937,7 @@ void UcClassCanvas::connexion(UmlCode action, DiagramItem * dest,
                               const QPoint &, const QPoint &)
 {
     ArrowCanvas * a;
-
-    if ((dest->type() == UmlClass) && IsaRelation(action))
+    if ((dest->typeUmlCode() == UmlClass) && IsaRelation(action))
         a = new RelationCanvas(the_canvas(), this, dest, 0, action, 0, -1.0, -1.0);
     else
         a = new ArrowCanvas(the_canvas(), this, dest, action, 0, FALSE, -1.0, -1.0);
@@ -994,14 +989,14 @@ UcClassCanvas * UcClassCanvas::read(char *& st, UmlCanvas * canvas, char * k)
             int x = (int) read_double(st);
 
             result =
-                new UcClassCanvas(br, canvas, x, (int) read_double(st), id);
-            result->setZ(read_double(st));
+                    new UcClassCanvas(br, canvas, x, (int) read_double(st), id);
+            result->setZValue(read_double(st));
 
             // move the actor in its initial position
             x = ACTOR_CANVAS_SIZE - result->width();
 
             if (x < 0)
-                result->Q3CanvasRectangle::moveBy(x / 2, 0);
+                result->QGraphicsRectItem::moveBy(x / 2, 0);
 
             k = read_keyword(st);
             read_double(st);
@@ -1031,7 +1026,7 @@ UcClassCanvas * UcClassCanvas::read(char *& st, UmlCanvas * canvas, char * k)
             result->compute_size();
 
             if ((read_file_format() < 72) &&
-                (result->used_view_mode == asInterface)) {
+                    (result->used_view_mode == asInterface)) {
                 result->settings.class_drawing_mode = asClass;
                 result->compute_size();
             }
@@ -1057,7 +1052,7 @@ UcClassCanvas * UcClassCanvas::read(char *& st, UmlCanvas * canvas, char * k)
 
 void UcClassCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
 
     disconnect(DrawingSettings::instance(), SIGNAL(changed()),
                this, SLOT(modified()));
diff --git a/src/diagram/UcClassCanvas.h b/src/diagram/UcClassCanvas.h
index e11aaeaeb..cf289fa4c 100644
--- a/src/diagram/UcClassCanvas.h
+++ b/src/diagram/UcClassCanvas.h
@@ -53,46 +53,47 @@ class UcClassCanvas : public QObject, public DiagramCanvas
 protected:
     UcClassCanvas(UmlCanvas * canvas, int id);
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     UcClassCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y, int id);
     virtual ~UcClassCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
-    virtual void change_scale();
+    virtual void change_scale() override;
 
     void compute_size();
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual bool has_relation(BasicData *) const;
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual bool has_relation(BasicData *) const override;
     void draw_all_depend_gene(UcClassCanvas * end = 0);
-    virtual bool move_with_its_package() const;
-    virtual void moveBy(double dx, double dy);
-    virtual void set_z(double z);	// only called by upper() & lower()
+    virtual bool move_with_its_package() const override;
+    virtual void moveBy(double dx, double dy) override;
+    virtual void set_z(double z) override;	// only called by upper() & lower()
 
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
-    virtual bool get_show_stereotype_properties() const;
+    virtual bool get_show_stereotype_properties() const override;
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static UcClassCanvas * read(char *& , UmlCanvas * canvas, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/UcUseCaseCanvas.cpp b/src/diagram/UcUseCaseCanvas.cpp
index 57d1edd06..eab73701b 100644
--- a/src/diagram/UcUseCaseCanvas.cpp
+++ b/src/diagram/UcUseCaseCanvas.cpp
@@ -31,7 +31,7 @@
 
 #include <qpainter.h>
 #include <qcursor.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -100,6 +100,7 @@ void UcUseCaseCanvas::draw(QPainter & p)
     if (! visible()) return;
 
     QRect r = rect();
+    QBrush  backbrush = p.background();
     UseCaseData * data = (UseCaseData *) browser_node->get_data();
     p.setRenderHint(QPainter::Antialiasing, true);
     used_color = (itscolor == UmlDefaultColor)
@@ -183,10 +184,11 @@ void UcUseCaseCanvas::draw(QPainter & p)
 
         int h = (height() * 3) / 4 - two;
         int w = width() - dx - dx;
-        QColor bckgrnd = p.backgroundColor();
+        QColor bckgrnd = p.background().color();
 
         py += two;
-        p.setBackgroundColor(col);
+        backbrush.setColor(col);
+        p.setBackground(backbrush);
         p.setFont(the_canvas()->get_font(UmlNormalBoldFont));
 
         p.drawText(px, py, w, h, ::Qt::AlignHCenter + ::Qt::AlignTop,
@@ -203,7 +205,8 @@ void UcUseCaseCanvas::draw(QPainter & p)
             py += he;
             p.setFont(the_canvas()->get_font(UmlNormalFont));
             p.drawText(px, py, w, h, ::Qt::AlignCenter, ep);
-            p.setBackgroundColor(bckgrnd);
+            backbrush.setColor(bckgrnd);
+            p.setBackground(backbrush);
 
             if (fp != 0)
                 draw_text(px, py, w, h, ::Qt::AlignCenter, ep, p.font(), fp);
@@ -219,7 +222,15 @@ void UcUseCaseCanvas::draw(QPainter & p)
         show_mark(p, rect());
 }
 
-UmlCode UcUseCaseCanvas::type() const
+void UcUseCaseCanvas::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+
+    draw(*painter);
+}
+
+UmlCode UcUseCaseCanvas::typeUmlCode() const
 {
     return UmlUseCase;
 }
@@ -293,50 +304,53 @@ void UcUseCaseCanvas::post_loaded()
 
 void UcUseCaseCanvas::menu(const QPoint &)
 {
-    Q3PopupMenu m(0);
-    Q3PopupMenu toolm(0);
+    QMenu m(0);
+    QMenu toolm(0);
 
     MenuFactory::createTitle(m, browser_node->get_data()->definition(FALSE, TRUE));
-    m.insertSeparator();
-    m.insertItem("Upper", 0);
-    m.insertItem("Lower", 1);
-    m.insertItem("Go up", 13);
-    m.insertItem("Go down", 14);
-    m.insertSeparator();
-    m.insertItem("Add related elements", 10);
-    m.insertSeparator();
-    m.insertItem("Edit", 2);
-    m.insertSeparator();
-    m.insertItem("Edit drawing settings", 3);
-    m.insertSeparator();
-    m.insertItem("Select in browser", 4);
+    m.addSeparator();
+    MenuFactory::addItem(m, "Upper", 0);
+    MenuFactory::addItem(m, "Lower", 1);
+    MenuFactory::addItem(m, "Go up", 13);
+    MenuFactory::addItem(m, "Go down", 14);
+    m.addSeparator();
+    MenuFactory::addItem(m, "Add related elements", 10);
+    m.addSeparator();
+    MenuFactory::addItem(m, "Edit", 2);
+    m.addSeparator();
+    MenuFactory::addItem(m, "Edit drawing settings", 3);
+    m.addSeparator();
+    MenuFactory::addItem(m, "Select in browser", 4);
 
     if (linked())
-        m.insertItem("Select linked items", 5);
+        MenuFactory::addItem(m, "Select linked items", 5);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (browser_node->is_writable()) {
         if (browser_node->get_associated() !=
             (BrowserNode *) the_canvas()->browser_diagram())
-            m.insertItem("Set associated diagram", 6);
+            MenuFactory::addItem(m, "Set associated diagram", 6);
 
         if (browser_node->get_associated())
-            m.insertItem("Remove diagram association", 9);
+            MenuFactory::addItem(m, "Remove diagram association", 9);
     }
 
-    m.insertSeparator();
-    m.insertItem("Remove from diagram", 7);
+    m.addSeparator();
+    MenuFactory::addItem(m, "Remove from diagram", 7);
 
     if (browser_node->is_writable())
-        m.insertItem("Delete from model", 8);
+        MenuFactory::addItem(m, "Delete from model", 8);
 
-    m.insertSeparator();
+    m.addSeparator();
 
     if (Tool::menu_insert(&toolm, UmlUseCase, 20))
-        m.insertItem("Tool", &toolm);
+        MenuFactory::insertItem(m, "Tool", &toolm);
 
-    int rank = m.exec(QCursor::pos());
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        int rank = retAction->data().toInt();
 
     switch (rank) {
     case 0:
@@ -398,7 +412,7 @@ void UcUseCaseCanvas::menu(const QPoint &)
 
     case 10:
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("use case"), TRUE, FALSE);
+        ->add_related_elements(this, tr("use case"), TRUE, FALSE);
         return;
 
     default:
@@ -407,11 +421,12 @@ void UcUseCaseCanvas::menu(const QPoint &)
 
         return;
     }
+    }
 
     package_modified();
 }
 
-void UcUseCaseCanvas::apply_shortcut(QString s)
+void UcUseCaseCanvas::apply_shortcut(const QString & s)
 {
     if (s == "Select in browser") {
         browser_node->select_in_browser();
@@ -431,7 +446,7 @@ void UcUseCaseCanvas::apply_shortcut(QString s)
     }
     else if (s == "Add related elements") {
         ((UmlCanvas *) canvas())->get_view()
-        ->add_related_elements(this, TR("use case"), TRUE, FALSE);
+        ->add_related_elements(this, tr("use case"), TRUE, FALSE);
         return;
     }
     else {
@@ -467,7 +482,7 @@ bool UcUseCaseCanvas::has_drawing_settings() const
     return TRUE;
 }
 
-void UcUseCaseCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
+void UcUseCaseCanvas::edit_drawing_settings(QList<DiagramItem *> & l)
 {
     for (;;) {
         ColorSpecVector co(1);
@@ -480,11 +495,10 @@ void UcUseCaseCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
         dialog.raise();
 
         if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) {
-            Q3PtrListIterator<DiagramItem> it(l);
-
-            for (; it.current(); ++it) {
-                ((UcUseCaseCanvas *) it.current())->itscolor = itscolor;
-                ((UcUseCaseCanvas *) it.current())->modified();	// call package_modified()
+            foreach (DiagramItem *item, l) {
+                UcUseCaseCanvas *canvas = (UcUseCaseCanvas *)item;
+                canvas->itscolor = itscolor;
+                canvas->modified();	// call package_modified()
             }
         }
 
@@ -493,18 +507,11 @@ void UcUseCaseCanvas::edit_drawing_settings(Q3PtrList<DiagramItem> & l)
     }
 }
 
-void UcUseCaseCanvas::same_drawing_settings(Q3PtrList<DiagramItem> & l)
+void UcUseCaseCanvas::clone_drawing_settings(const DiagramItem *src)
 {
-    Q3PtrListIterator<DiagramItem> it(l);
-
-    UcUseCaseCanvas * x = (UcUseCaseCanvas *) it.current();
-
-    while (++it, it.current() != 0) {
-        UcUseCaseCanvas * o = (UcUseCaseCanvas *) it.current();
-
-        o->itscolor = x->itscolor;
-        o->modified();	// call package_modified()
-    }
+    const UcUseCaseCanvas * x = (const UcUseCaseCanvas *) src;
+    itscolor = x->itscolor;
+    modified();
 }
 
 QString UcUseCaseCanvas::may_start(UmlCode & l) const
@@ -512,11 +519,11 @@ QString UcUseCaseCanvas::may_start(UmlCode & l) const
     switch (l) {
     case UmlDependency:
         l = UmlDependOn;
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlGeneralisation:
         l = UmlInherit;
-        return (browser_node->is_writable()) ? QString() : TR("read only");
+        return (browser_node->is_writable()) ? QString() : tr("read only");
 
     case UmlAnchor:
     case UmlAssociation:
@@ -524,7 +531,7 @@ QString UcUseCaseCanvas::may_start(UmlCode & l) const
         return 0;
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -533,7 +540,7 @@ QString UcUseCaseCanvas::may_connect(UmlCode & l, const DiagramItem * dest) cons
     if (l == UmlAnchor)
         return dest->may_start(l);
 
-    switch (dest->type()) {
+    switch (dest->typeUmlCode()) {
     case UmlUseCase:
         switch (l) {
         case UmlInherit:
@@ -545,15 +552,15 @@ QString UcUseCaseCanvas::may_connect(UmlCode & l, const DiagramItem * dest) cons
             return 0;
 
         default:
-            return TR("illegal");
+            return tr("illegal");
         }
 
     case UmlClass:
         return ((l == UmlAssociation) || (l == UmlDirectionalAssociation))
-               ? QString() : TR("illegal");
+               ? QString() : tr("illegal");
 
     default:
-        return TR("illegal");
+        return tr("illegal");
     }
 }
 
@@ -650,7 +657,7 @@ UcUseCaseCanvas * UcUseCaseCanvas::read(char *& st, UmlCanvas * canvas, char * k
         k = read_keyword(st);
         result->update_name();
         read_xy(st, result->label);
-        result->label->setZ(result->z() + 0.5);
+        result->label->setZValue(result->zValue() + 0.5);
         result->label->set_center100();
 
         if (!strcmp(k, "label_xyz"))
@@ -677,7 +684,7 @@ UcUseCaseCanvas * UcUseCaseCanvas::read(char *& st, UmlCanvas * canvas, char * k
 
 void UcUseCaseCanvas::history_hide()
 {
-    Q3CanvasItem::setVisible(FALSE);
+    QGraphicsItem::setVisible(FALSE);
     disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
     disconnect(browser_node->get_data(), 0, this, 0);
 }
@@ -701,7 +708,7 @@ void UcUseCaseCanvas::history_load(QBuffer & b)
 
     ::load(w, b);
     ::load(h, b);
-    Q3CanvasRectangle::setSize(w, h);
+    QGraphicsRectItem::setRect(rect().x(), rect().y(), w, h);
 
     connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified()));
     connect(browser_node->get_data(), SIGNAL(changed()), this, SLOT(modified()));
@@ -710,17 +717,17 @@ void UcUseCaseCanvas::history_load(QBuffer & b)
 
 // for plug outs
 
-void UcUseCaseCanvas::send(ToolCom * com, Q3CanvasItemList & all)
+void UcUseCaseCanvas::send(ToolCom * com, QList<QGraphicsItem*> & all)
 {
-    Q3PtrList<UcUseCaseCanvas> lu;
-    Q3PtrList<UcClassCanvas> la;
-    Q3CanvasItemList::Iterator cit;
+    QList<UcUseCaseCanvas *> lu;
+    QList<UcClassCanvas *> la;
+    QList<QGraphicsItem*>::Iterator cit;
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
         DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
-        if ((di != 0) && (*cit)->visible()) {
-            switch (di->type()) {
+        if ((di != 0) && (*cit)->isVisible()) {
+            switch (di->typeUmlCode()) {
             case UmlUseCase:
                 lu.append((UcUseCaseCanvas *) di);
                 break;
@@ -739,46 +746,37 @@ void UcUseCaseCanvas::send(ToolCom * com, Q3CanvasItemList & all)
 
     com->write_unsigned(lu.count());
 
-    Q3PtrListIterator<UcUseCaseCanvas> itu(lu);
-
-    for (; itu.current(); ++itu) {
-        com->write_unsigned((unsigned) itu.current()->get_ident());
-        itu.current()->get_bn()->write_id(com);
-        com->write(itu.current()->rect());
+    foreach (UcUseCaseCanvas *canvas, lu) {
+        com->write_unsigned((unsigned) canvas->get_ident());
+        canvas->get_bn()->write_id(com);
+        com->write(canvas->rect());
     }
 
     // send Actors
 
     com->write_unsigned(la.count());
 
-    Q3PtrListIterator<UcClassCanvas> ita(la);
-
-    for (; ita.current(); ++ita)
-        ita.current()->get_bn()->write_id(com);
+    foreach (UcClassCanvas *canvas, la)
+        canvas->get_bn()->write_id(com);
 
     // send rels
 
-    Q3PtrList<ArrowCanvas> lr;
-
-    for (itu.toFirst(); itu.current(); ++itu) {
-        Q3PtrListIterator<ArrowCanvas> itl(itu.current()->lines);
+    QList<ArrowCanvas *> lr;
 
-        for (; itl.current(); ++itl) {
-            ArrowCanvas * r = itl.current();
+    foreach (UcUseCaseCanvas *canvas, lu) {
+        foreach (ArrowCanvas *r, canvas->lines) {
             DiagramItem * from = r->get_start();
             DiagramItem * to = r->get_end();
 
-            if ((from->type() == UmlUseCase)
-                ? (to->type() == UmlClass)
-                : (from->type() == UmlClass))
+            if ((from->typeUmlCode() == UmlUseCase)
+                ? (to->typeUmlCode() == UmlClass)
+                : (from->typeUmlCode() == UmlClass))
                 lr.append(r);
         }
     }
 
     com->write_unsigned(lr.count());
 
-    Q3PtrListIterator<ArrowCanvas> itr(lr);
-
-    for (; itr.current(); ++itr)
-        itr.current()->write_uc_rel(com);
+    foreach (ArrowCanvas *arrow, lr)
+        arrow->write_uc_rel(com);
 }
diff --git a/src/diagram/UcUseCaseCanvas.h b/src/diagram/UcUseCaseCanvas.h
index d859f7b77..a030ef6b2 100644
--- a/src/diagram/UcUseCaseCanvas.h
+++ b/src/diagram/UcUseCaseCanvas.h
@@ -47,45 +47,47 @@ class UcUseCaseCanvas : public QObject, public DiagramCanvas
 
     void update_name();
 
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 public:
     UcUseCaseCanvas(BrowserNode * bn, UmlCanvas * canvas, int x, int y, int id);
     virtual ~UcUseCaseCanvas();
 
-    virtual void delete_it();
+    virtual void delete_it() override;
 
     virtual void draw(QPainter & p);
 
-    virtual UmlCode type() const;
-    virtual void delete_available(BooL & in_model, BooL & out_model) const;
-    virtual bool alignable() const;
-    virtual bool copyable() const;
-    virtual void remove(bool from_model);
-    virtual void open();
-    virtual void menu(const QPoint &);
-    virtual QString may_start(UmlCode &) const;
-    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const;
-    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &);
-    virtual aCorner on_resize_point(const QPoint & p);
-    virtual bool move_with_its_package() const;
-    virtual void resize(aCorner c, int dx, int dy, QPoint &);
-    virtual void resize(const QSize & sz, bool w, bool h);
-
-    virtual bool has_drawing_settings() const;
-    virtual void edit_drawing_settings(Q3PtrList<DiagramItem> &);
-    virtual void same_drawing_settings(Q3PtrList<DiagramItem> &);
+    virtual UmlCode typeUmlCode() const override;
+    virtual void delete_available(BooL & in_model, BooL & out_model) const override;
+    virtual bool alignable() const override;
+    virtual bool copyable() const override;
+    virtual void remove(bool from_model) override;
+    virtual void open() override;
+    virtual void menu(const QPoint &) override;
+    virtual QString may_start(UmlCode &) const override;
+    virtual QString may_connect(UmlCode & l, const DiagramItem * dest) const override;
+    virtual void connexion(UmlCode, DiagramItem *, const QPoint &, const QPoint &) override;
+    virtual aCorner on_resize_point(const QPoint & p) override;
+    virtual bool move_with_its_package() const override;
+    using DiagramCanvas::resize;
+    virtual void resize(aCorner c, int dx, int dy, QPoint &) override;
+    virtual void resize(const QSize & sz, bool w, bool h) override;
+
+    virtual bool has_drawing_settings() const override;
+    virtual void edit_drawing_settings(QList<DiagramItem *> &) override;
+    virtual void clone_drawing_settings(const DiagramItem *src) override;
     void edit_drawing_settings();
 
-    virtual void apply_shortcut(QString s);
+    virtual void apply_shortcut(const QString & s) override;
 
-    virtual void history_save(QBuffer &) const;
-    virtual void history_load(QBuffer &);
-    virtual void history_hide();
+    virtual void history_save(QBuffer &) const override;
+    virtual void history_load(QBuffer &) override;
+    virtual void history_hide() override;
 
-    virtual void save(QTextStream &, bool ref, QString & warning) const;
+    virtual void save(QTextStream &, bool ref, QString & warning) const override;
     static UcUseCaseCanvas * read(char *& , UmlCanvas * canvas, char *);
-    virtual void post_loaded();
+    virtual void post_loaded() override;
 
-    static void send(ToolCom * com, Q3CanvasItemList & all);
+    static void send(ToolCom * com, QList<QGraphicsItem*> & all);
 
 private slots:
     void modified();	// canvas must be updated
diff --git a/src/diagram/UmlCanvas.cpp b/src/diagram/UmlCanvas.cpp
index ce149b00a..d560b0e13 100644
--- a/src/diagram/UmlCanvas.cpp
+++ b/src/diagram/UmlCanvas.cpp
@@ -32,12 +32,13 @@
 #include "UmlCanvas.h"
 #include "UmlGlobal.h"
 #include "DiagramView.h"
-#include "CodDirsCanvas.h"
 #include "ArrowCanvas.h"
+#include "CodDirsCanvas.h"
 #include "ArrowPointCanvas.h"
+#include "DiagramCanvas.h"
 #include "BrowserDiagram.h"
 
-static Q3PtrList<UmlCanvas> All;
+static QList<UmlCanvas *> All;
 
 static const struct {
     int w;
@@ -75,7 +76,9 @@ static const struct {
 };
 
 UmlCanvas::UmlCanvas(CanvasFormat f, BrowserDiagram * br_diag)
-    : Q3Canvas(formatSize[f].w, formatSize[f].h),
+    : QGraphicsScene(
+          0,0,formatSize[f].w, formatSize[f].h
+          ),
       br_diagram(br_diag), view(0), all_items((const char *) 0)
 {
     width100percent = width();
@@ -94,45 +97,52 @@ UmlCanvas::UmlCanvas(CanvasFormat f, BrowserDiagram * br_diag)
 
 UmlCanvas::~UmlCanvas()
 {
-    All.removeRef(this);
+    All.removeOne(this);
 }
 
 void UmlCanvas::set_view(DiagramView * v)
 {
     view = v;
-
     // add limits
-    vlimit = new Q3CanvasLine(this);
-    hlimit = new Q3CanvasLine(this);
-    vlimit->setZ(TOP_Z);	// alien
-    hlimit->setZ(TOP_Z);	// alien
+    vlimit = new QGraphicsLineItem(/*this*/);
+    hlimit = new QGraphicsLineItem(/*this*/);
+    vlimit->setZValue(TOP_Z);	// alien
+    hlimit->setZValue(TOP_Z);	// alien
     vlimit->setPen(::Qt::DotLine);
     hlimit->setPen(::Qt::DotLine);
     update_limits();
     vlimit->show();
     hlimit->show();
+    this->addItem(vlimit);
+    this->addItem(hlimit);
 }
 
 void UmlCanvas::update_limits()
 {
     if (vlimit) {
-        vlimit->setPoints(width() - 1, 0, width() - 1, height() - 1);
-        hlimit->setPoints(0, height() - 1, width() - 1, height() - 1);
+        vlimit->setLine(width() - 1, 0, width() - 1, height() - 1);
+        hlimit->setLine(0, height() - 1, width() - 1, height() - 1);
     }
 }
 
 void UmlCanvas::resize(CanvasFormat f)
 {
-    Q3Canvas::resize((int)(formatSize[f].w * zoom_value),
+
+    setSceneRect(0, 0,(int)(formatSize[f].w * zoom_value),
                      (int)(formatSize[f].h * zoom_value));
     width100percent = formatSize[f].w;
     height100percent = formatSize[f].h;
     update_limits();
 
     // force redisplay else phantoms may appears
-    setBackgroundColor(::Qt::lightGray);
+    QBrush bBrush = backgroundBrush();
+    bBrush.setColor(::Qt::lightGray);
+    setBackgroundBrush(bBrush);
+    //setBackgroundColor(::Qt::lightGray);
     update();
-    setBackgroundColor(::Qt::white);
+    bBrush.setColor(::Qt::white);
+    //setBackgroundColor(::Qt::white);
+    setBackgroundBrush(bBrush);
     update();
 }
 
@@ -144,51 +154,53 @@ static bool small_element(const QRect & r)
     return (r.width() < l) && (r.height() < l);
 }
 
-Q3CanvasItem * UmlCanvas::collision(const QPoint & p) const
+QGraphicsItem * UmlCanvas::collision(const QPoint & p) const
 {
-    Q3CanvasItemList l = collisions(p);
-    Q3CanvasItemList::ConstIterator it;
-    Q3CanvasItemList::ConstIterator end = l.end();
+    QList<QGraphicsItem*> l = items(p);
+    QList<QGraphicsItem*>::ConstIterator it;
+    QList<QGraphicsItem*>::ConstIterator end = l.end();
     ArrowCanvas * arrow = 0;
 
+
     for (it = l.begin(); it != end; ++it)
-        if (((*it)->visible()) && // at least not deleted
-            !isa_alien(*it) &&
-            !isa_col_msg_dirs(*it)) {
-            switch ((*it)->rtti()) {
+        if (((*it)->isVisible()) && // at least not deleted
+            !isa_alien(*it)&&
+            !isa_col_msg_dirs(*it)
+                ) {
+            switch ((*it)->type()) {
             case RTTI_ARROW:
                 if (arrow == 0)
                     arrow = (ArrowCanvas *) *it;
-
                 break;
-
             case RTTI_LABEL:
-                return (arrow == 0) ? *it : arrow;
-
+                return (arrow == NULL) ? *it : arrow;
             default:
                 // isa DiagramCanvas
                 return ((arrow == 0) ||
                         (small_element(((DiagramCanvas *) *it)->rect()) &&
                          ((DiagramCanvas *) *it)->attached_to(arrow)))
-                       ? *it : arrow;
+                       ? *it : (QGraphicsItem *)arrow;
+
             }
         }
-
     return arrow;
 }
 
-Q3CanvasItem * UmlCanvas::collision(const QPoint & p, int except) const
+QGraphicsItem * UmlCanvas::collision(const QPoint & p, int except) const
 {
-    Q3CanvasItemList l = collisions(p);
-    Q3CanvasItemList::ConstIterator it;
-    Q3CanvasItemList::ConstIterator end = l.end();
+
+    QList<QGraphicsItem*> l = items(p);
+    QList<QGraphicsItem*>::ConstIterator it;
+    QList<QGraphicsItem*>::ConstIterator end = l.end();
     ArrowCanvas * arrow = 0;
 
     for (it = l.begin(); it != end; ++it)
-        if (((*it)->visible()) && // at least not deleted
-            !isa_alien(*it) &&
-            !isa_col_msg_dirs(*it)) {
-            int k = (*it)->rtti();
+        if (((*it)->isVisible()) && // at least not deleted
+            !isa_alien(*it)
+                &&
+            !isa_col_msg_dirs(*it)
+                ) {
+            int k = (*it)->type();
 
             if (k != except) {
                 switch (k) {
@@ -197,10 +209,8 @@ Q3CanvasItem * UmlCanvas::collision(const QPoint & p, int except) const
                         arrow = (ArrowCanvas *) *it;
 
                     break;
-
                 case RTTI_LABEL:
                     return (arrow == 0) ? *it : arrow;
-
                 default:
                     // isa DiagramCanvas
                     return ((arrow == 0) ||
@@ -210,37 +220,35 @@ Q3CanvasItem * UmlCanvas::collision(const QPoint & p, int except) const
                 }
             }
         }
-
     return arrow;
 }
 
-void UmlCanvas::del(Q3CanvasItem * i)
+void UmlCanvas::del(QGraphicsItem * i)
 {
     // do not delete, just hide because of a Qt's bug (?)
     i->hide();
-    selected.remove(i);
-
+    selected.removeOne(i);
     DiagramItem * it = QCanvasItemToDiagramItem(i);
 
     if (it != 0)
         all_items.remove(it->get_ident());
 }
 
-void UmlCanvas::select(Q3CanvasItem * i)
+void UmlCanvas::select(QGraphicsItem * i)
 {
     i->setSelected(TRUE);
     selected.append(i);
 }
 
-void UmlCanvas::unselect(Q3CanvasItem * i)
+void UmlCanvas::unselect(QGraphicsItem * i)
 {
     i->setSelected(FALSE);
-    selected.remove(i);
+    selected.removeOne(i);
 }
 
 void UmlCanvas::unselect_all()
 {
-    Q3CanvasItemList::Iterator it;
+    QList<QGraphicsItem*>::Iterator it;
 
     for (it = selected.begin(); it != selected.end(); ++it)
         (*it)->setSelected(FALSE);
@@ -258,39 +266,37 @@ void UmlCanvas::set_zoom(double zm)
     float ps_large = 2 * ps;
 
     the_fonts[UmlNormalFont] = NormalFont;
-    the_fonts[UmlNormalFont].setPointSizeFloat(ps);
+    the_fonts[UmlNormalFont].setPointSizeF(ps);
     the_fonts[UmlNormalBoldFont] = BoldFont;
-    the_fonts[UmlNormalBoldFont].setPointSizeFloat(ps);
+    the_fonts[UmlNormalBoldFont].setPointSizeF(ps);
     the_fonts[UmlNormalItalicFont] = ItalicFont;
-    the_fonts[UmlNormalItalicFont].setPointSizeFloat(ps);
+    the_fonts[UmlNormalItalicFont].setPointSizeF(ps);
     the_fonts[UmlNormalBoldItalicFont] = BoldItalicFont;
-    the_fonts[UmlNormalBoldItalicFont].setPointSizeFloat(ps);
+    the_fonts[UmlNormalBoldItalicFont].setPointSizeF(ps);
     the_fonts[UmlNormalUnderlinedFont] = UnderlineFont;
-    the_fonts[UmlNormalUnderlinedFont].setPointSizeFloat(ps);
+    the_fonts[UmlNormalUnderlinedFont].setPointSizeF(ps);
     the_fonts[UmlNormalStrikeOutFont] = StrikeOutFont;
-    the_fonts[UmlNormalStrikeOutFont].setPointSizeFloat(ps);
+    the_fonts[UmlNormalStrikeOutFont].setPointSizeF(ps);
 
     the_fonts[UmlSmallFont] = NormalFont;
-    the_fonts[UmlSmallFont].setPointSizeFloat(ps_small);
+    the_fonts[UmlSmallFont].setPointSizeF(ps_small);
     the_fonts[UmlSmallBoldFont] = BoldFont;
-    the_fonts[UmlSmallBoldFont].setPointSizeFloat(ps_small);
+    the_fonts[UmlSmallBoldFont].setPointSizeF(ps_small);
     the_fonts[UmlSmallItalicFont] = ItalicFont;
-    the_fonts[UmlSmallItalicFont].setPointSizeFloat(ps_small);
+    the_fonts[UmlSmallItalicFont].setPointSizeF(ps_small);
     the_fonts[UmlSmallBoldItalicFont] = BoldItalicFont;
-    the_fonts[UmlSmallBoldItalicFont].setPointSizeFloat(ps_small);
+    the_fonts[UmlSmallBoldItalicFont].setPointSizeF(ps_small);
 
     the_fonts[UmlLargeFont] = NormalFont;
-    the_fonts[UmlLargeFont].setPointSizeFloat(ps_large);
+    the_fonts[UmlLargeFont].setPointSizeF(ps_large);
     the_fonts[UmlLargeBoldFont] = BoldFont;
-    the_fonts[UmlLargeBoldFont].setPointSizeFloat(ps_large);
+    the_fonts[UmlLargeBoldFont].setPointSizeF(ps_large);
     the_fonts[UmlLargeItalicFont] = ItalicFont;
-    the_fonts[UmlLargeItalicFont].setPointSizeFloat(ps_large);
+    the_fonts[UmlLargeItalicFont].setPointSizeF(ps_large);
     the_fonts[UmlLargeBoldItalicFont] = BoldItalicFont;
-    the_fonts[UmlLargeBoldItalicFont].setPointSizeFloat(ps_large);
-
-    Q3Canvas::resize((int)(width100percent * zm),
+    the_fonts[UmlLargeBoldItalicFont].setPointSizeF(ps_large);
+    setSceneRect(0,0,(int)(width100percent * zm),
                      (int)(height100percent * zm));
-
     update_limits();
 }
 
@@ -302,9 +308,7 @@ void UmlCanvas::show_limits(bool y)
 
 void UmlCanvas::update_global_settings()
 {
-    UmlCanvas * c;
-
-    for (c = All.first(); c != 0; c = All.next()) {
+    foreach (UmlCanvas *c, All) {
         c->br_diagram->update_drawing_settings();
         c->show_shadow = c->br_diagram->get_shadow();
         c->draw_all_relations = c->br_diagram->get_draw_all_relations();
@@ -331,24 +335,23 @@ void UmlCanvas::update()
     if (view != 0)
         view->update_history();
 
-    Q3Canvas::update();
+    QGraphicsScene::update();
 }
 
 bool UmlCanvas::already_drawn(BrowserNode * bn)
 {
-    Q3CanvasItemList all = allItems();
-    Q3CanvasItemList::Iterator cit;
+    QList<QGraphicsItem*> all = items();
+    QList<QGraphicsItem*>::Iterator cit;
     UmlCode k = bn->get_type();
 
     for (cit = all.begin(); cit != all.end(); ++cit) {
-        if ((*cit)->visible()) {
+        if ((*cit)->isVisible()) {
             DiagramItem * di = QCanvasItemToDiagramItem(*cit);
 
-            if ((di != 0) && (di->type() == k) && (di->get_bn() == bn))
+            if ((di != 0) && (di->typeUmlCode() == k) && (di->get_bn() == bn))
                 return TRUE;
         }
     }
-
     return FALSE;
 }
 
diff --git a/src/diagram/UmlCanvas.h b/src/diagram/UmlCanvas.h
index 6dd336f2c..5719aecd6 100644
--- a/src/diagram/UmlCanvas.h
+++ b/src/diagram/UmlCanvas.h
@@ -32,26 +32,24 @@
 
 
 
-#include <q3canvas.h>
+#include <QGraphicsScene>
 #include <qfont.h>
-#include <q3intdict.h>
-
 #include "UmlEnum.h"
 #include "Labeled.h"
-
-class Q3CanvasLine;
+#include <QGraphicsItem>
+class QGraphicsLineItem;
 class QPainter;
 class BrowserNode;
 class BrowserDiagram;
 class DiagramView;
 class DiagramItem;
 
-class UmlCanvas : public Q3Canvas
+class UmlCanvas : public QGraphicsScene
 {
     Q_OBJECT
 
 protected:
-    Q3CanvasItemList selected;
+    QList<QGraphicsItem*>  selected;
     BrowserDiagram * br_diagram;
     DiagramView * view;
     bool do_scale;
@@ -64,8 +62,8 @@ class UmlCanvas : public Q3Canvas
     int height100percent;
     QFont the_fonts[UmlFontNumber];
     IdDict<DiagramItem> all_items;	// to re-use the same id for the DiagramItems
-    Q3CanvasLine * hlimit;
-    Q3CanvasLine * vlimit;
+    QGraphicsLineItem * hlimit;
+    QGraphicsLineItem * vlimit;
 
     void update_limits();
 
@@ -73,16 +71,16 @@ class UmlCanvas : public Q3Canvas
     UmlCanvas(CanvasFormat f, BrowserDiagram * br_diag);
     virtual ~UmlCanvas();
 
-    Q3CanvasItem * collision(const QPoint &) const;
-    Q3CanvasItem * collision(const QPoint &, int except) const;
-    const Q3CanvasItemList & selection() const {
+    QGraphicsItem * collision(const QPoint &) const;
+    QGraphicsItem * collision(const QPoint &, int except) const;
+    const QList<QGraphicsItem*>  & selection() const {
         return selected;
     };
-    void select(Q3CanvasItem * i);
-    void unselect(Q3CanvasItem * i);
+    void select(QGraphicsItem * i);
+    void unselect(QGraphicsItem * i);
     void unselect_all();
 
-    void del(Q3CanvasItem * i);
+    void del(QGraphicsItem * i);
 
     void set_zoom(double zm);
     void zoom_end() {
diff --git a/src/diagram/UmlDesktop.h b/src/diagram/UmlDesktop.h
index 60f0e617a..31ca73a17 100644
--- a/src/diagram/UmlDesktop.h
+++ b/src/diagram/UmlDesktop.h
@@ -27,7 +27,7 @@
 
 // all is static ... I don't like singleton
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class UmlDesktop
 {
diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp
index 94e580c30..13b956d5f 100644
--- a/src/diagram/UmlWindow.cpp
+++ b/src/diagram/UmlWindow.cpp
@@ -28,60 +28,49 @@
 
 
 
-
+#include "Labeled.h"
 #include <qcursor.h>
-#include <qworkspace.h>
 #include <qsplitter.h>
-#include <q3vbox.h>
-#include <q3hbox.h>
-#include <Q3TextEdit>
 #include <qstatusbar.h>
 #include <qpixmap.h>
-#include <qtoolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3popupmenu.h>
 #include <qmenubar.h>
 #ifndef QT_NO_PRINTER
 #include <qprinter.h>
+#include <QLineEdit>
 #endif
-#include <q3whatsthis.h>
 #include <qapplication.h>
-#include <q3filedialog.h>
 #include <qfileinfo.h>
-#include <qwindowsstyle.h>
-#include <qmotifstyle.h>
-//#include <qmotifplusstyle.h> [lgfreitas] this does not exists anymore
-//Added by qt3to4:
+#include <QVBoxLayout>
 #include <QCloseEvent>
-#include <Q3ValueList>
 #include <QTextStream>
 #include <QLabel>
 #include <QKeyEvent>
 #include <QStyle>
-//#include <qcdestyle.h>
-//#include <qsgistyle.h>
-
+#include <QFileDialog>
+#include <QStyleFactory>
 #include "UmlWindow.h"
 #include "UmlDesktop.h"
 #include "BrowserView.h"
 #include "BrowserPackage.h"
-#include "BrowserDiagram.h"
 #include "BrowserClass.h"
+#include "BrowserUseCase.h"
 #include "BrowserState.h"
 #include "BrowserActivity.h"
-#include "BrowserUseCase.h"
-#include "BrowserComponent.h"
+#include "BrowserDiagram.h"
+#include "TraceDialog.h"
+#include "DiagramView.h"
 #include "BrowserArtifact.h"
+#include "BrowserComponent.h"
 #include "BrowserDeploymentNode.h"
 #include "DiagramWindow.h"
-#include "DiagramView.h"
 #include "GenerationSettings.h"
-#include "TraceDialog.h"
 #include "EnvDialog.h"
 #include "HelpDialog.h"
 #include "Tool.h"
-#include "ToolDialog.h"
 #include "BrowserSearchDialog.h"
+#include "ToolDialog.h"
 #include "ShortcutDialog.h"
 #include "GreetingsDialog.h"
 #include "BasicData.h"
@@ -91,21 +80,29 @@
 #include "UmlPixmap.h"
 #include "DialogUtil.h"
 #include "ui/menufactory.h"
-#include "Shortcut.h"
-#include "myio.h"
 #include "strutil.h"
-#include "mu.h"
+#include "tool/snippets.h"
+#include "CustomWidgets/quickedit.h"
+#include "Libs/L_UniversalModels/include/TreeItemInterface.h"
+#include "ui/catalogwidget.h"
 #include "err.h"
-#include "translate.h"
-
+#include "myio.h"
 #include "filesave.xpm"
 #include "fileopen.xpm"
 #include "fileprint.xpm"
 #include "browsersearch.xpm"
 #include "misc/ClipboardManager.h"
+#include "Shortcut.h"
+#include "mu.h"
+#include "translate.h"
 #include <QClipboard>
 #include <QApplication>
-
+#include <QShortcut>
+#include <QAction>
+#include <QMdiSubWindow>
+#include <QWhatsThis>
+#include <QMdiSubWindow>
+#include <QPrintDialog>
 static QString TemplateProject;
 
 QString template_project()
@@ -118,140 +115,138 @@ void set_template_project(QString s)
     TemplateProject = s;
 }
 
-//
-
-static int Counter;
-
 UmlWindow * UmlWindow::the;
-
 QString projectNewText()
 {
-    return TR("To create a <i>new project</i>.<br><br>"
-              "This will ask you to indicate where to create a new directory having the name of the project "
-              "where all the project files will be placed.");
+    return QObject::tr("To create a <i>new project</i>.<br><br>"
+                       "This will ask you to indicate where to create a new directory having the name of the project "
+                       "where all the project files will be placed.");
 }
 QString projectNewFromTemplateText()
 {
-    return TR("To create a <i>new project</i> from an already existing one.<br><br>"
-              "This will ask you to indicate where to create a new directory having the name of the project "
-              "where all the project files will be placed.");
+    return QObject::tr("To create a <i>new project</i> from an already existing one.<br><br>"
+                       "This will ask you to indicate where to create a new directory having the name of the project "
+                       "where all the project files will be placed.");
 }
 QString projectOpenText()
 {
-    return TR("To open a <i>project</i>.<br><br>"
-              "You can also select the <b>Open command</b> from the Project menu.");
+    return QObject::tr("To open a <i>project</i>.<br><br>"
+                       "You can also select the <b>Open command</b> from the Project menu.");
 }
 QString projectSaveText()
 {
-    return TR("To save the project.<br><br>"
-              "You can also select the Save command from the Project menu.");
+    return QObject::tr("To save the project.<br><br>"
+                       "You can also select the Save command from the Project menu.");
 }
 QString projectSaveAsText()
 {
-    return TR("To save all in a new project.");
+    return QObject::tr("To save all in a new project.");
 }
 QString diagramPrintText()
 {
-    return TR("To print the current diagram.");
+    return QObject::tr("To print the current diagram.");
 }
 QString cppText()
 {
-    return TR("To manage or not C++ and to set or not the C++ definition/declaration "
-              "to the default value when a class/operation/attribute/relation/artefact is created");
+    return QObject::tr("To manage or not C++ and to set or not the C++ definition/declaration "
+                       "to the default value when a class/operation/attribute/relation/artefact is created");
 }
 QString javaText()
 {
-    return TR("To manage or not Java and to set or not the Java definition "
-              "to the default value when a class/operation/attribute/relation/artefact is created");
+    return QObject::tr("To manage or not Java and to set or not the Java definition "
+                       "to the default value when a class/operation/attribute/relation/artefact is created");
 }
 QString phpText()
 {
-    return TR("To manage or not Php and to set or not the Php definition "
-              "to the default value when a class/operation/attribute/relation/artefact is created");
+    return QObject::tr("To manage or not Php and to set or not the Php definition "
+                       "to the default value when a class/operation/attribute/relation/artefact is created");
 }
 QString pythonText()
 {
-    return TR("To manage or not Python and to set or not the Python definition "
-              "to the default value when a class/operation/attribute/relation/artefact is created");
+    return QObject::tr("To manage or not Python and to set or not the Python definition "
+                       "to the default value when a class/operation/attribute/relation/artefact is created");
 }
 QString idlText()
 {
-    return TR("To manage or not IDL and to set or not the IDL definition/declaration "
-              "to the default value when a class/operation/attribute/relation/artefact is created");
+    return QObject::tr("To manage or not IDL and to set or not the IDL definition/declaration "
+                       "to the default value when a class/operation/attribute/relation/artefact is created");
 }
 QString verboseText()
 {
-    return TR("To ask or not for a verbose code generation");
+    return QObject::tr("To ask or not for a verbose code generation");
 }
 QString preserve_bodiesText()
 {
-    return TR("To preserve or not the operations's body");
+    return QObject::tr("To preserve or not the operations's body");
 }
 QString add_operation_profileText()
 {
-    return TR("To write the operation profile at the beginning of the temporary file when you edit an operation's body");
+    return QObject::tr("To write the operation profile at the beginning of the temporary file when you edit an operation's body");
 }
 QString viewBrowserStereotypeText()
 {
-    return TR("To show or hide the <i>stereotypes</i> "
-              "in the <b>Browser</b>.");
+    return QObject::tr("To show or hide the <i>stereotypes</i> "
+                       "in the <b>Browser</b>.");
 }
 QString browserUpText()
 {
-    return TR("To select the <i>browser</i> current item's parent.");
+    return QObject::tr("To select the <i>browser</i> current item's parent.");
 }
 QString browserSearchText()
 {
-    return TR("To search an item in the <i>browser</i>.");
+    return QObject::tr("To search an item in the <i>browser</i>.");
 }
 QString whatsThisText()
 {
-    return TR("To get information about items.");
+    return QObject::tr("To get information about items.");
 }
 
 QString fontSizeMenuText()
 {
-    return TR("To set the point size of the base font used in the "
-              "<i>browser</i> and the diagrams.");
+    return QObject::tr("To set the point size of the base font used in the "
+                       "<i>browser</i> and the diagrams.");
 }
 QString formatMenuText()
 {
-    return TR("To set the default format of the diagrams.");
+    return QObject::tr("To set the default format of the diagrams.");
 }
 static QString prevText()
 {
-    return TR("To select the previously selected element in the <i>browser</i>.");
+    return QObject::tr("To select the previously selected element in the <i>browser</i>.");
 }
 static QString nextText()
 {
-    return TR("To select the next selected element in the <i>browser</i>.");
+    return QObject::tr("To select the next selected element in the <i>browser</i>.");
 }
 static QString completionText()
 {
-    return TR("To ask or not for an auto completion (non case sensitive) in choice list (<i>combo box</i>)");
+    return QObject::tr("To ask or not for an auto completion (non case sensitive) in choice list (<i>combo box</i>)");
 }
 
 QToolButton *
 CreateToolButton(
-    QPixmap icon,
-    QWidget * receiver,
-    const char * boundslot,
-    QToolBar * parent,
-    QString shown)
+        QPixmap icon,
+        QWidget * receiver,
+        const char * boundslot,
+        QToolBar * parent,
+        QString shown)
 {
     QToolButton * newButton = new QToolButton();
     QObject::connect(newButton, SIGNAL(clicked()), receiver, boundslot);
     newButton->setIcon(icon);
     newButton->setText(shown);
+    newButton->setToolTip(shown);
     newButton->setMinimumSize(30, 30);
     parent->addWidget(newButton);
     return newButton;
 }
 
-UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose)
+UmlWindow::UmlWindow(bool ) : QMainWindow(0)
+	, isToolMenuLoaded(false)
+    , quitConfirmed(false)
 {
-    setCaption("DoUML");
-
+    setAttribute(Qt::WA_QuitOnClose);
+    setWindowTitle("DoUML");
     the = this;
     commented = 0;
     format = IsoA4;
@@ -273,47 +268,56 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose)
 
     openIcon = QPixmap(fileopen);
     QToolButton * projectOpen
-        = CreateToolButton(openIcon,
-                           this, SLOT(load()), projectTools, "open project");
+            = CreateToolButton(openIcon,
+                               this, SLOT(load()), projectTools, "open project");
 
     saveIcon = QPixmap(filesave);
     QToolButton * projectSave
-        = CreateToolButton(saveIcon,
-                           this, SLOT(save()), projectTools, "save project");
+            = CreateToolButton(saveIcon,
+                               this, SLOT(save()), projectTools, "save project");
 
 #ifndef QT_NO_PRINTER
     QPixmap printIcon;
 
     printIcon = QPixmap(fileprint);
     QToolButton * diagramPrint
-        = CreateToolButton(printIcon,
-                           this, SLOT(print()), projectTools, "print diagram");
-    Q3WhatsThis::add(diagramPrint, diagramPrintText());
+            = CreateToolButton(printIcon,
+                               this, SLOT(print()), projectTools, "print diagram");
+    diagramPrint->setToolTip("print diagram");
+    diagramPrint->setWhatsThis(diagramPrintText());
 #endif
 
+
     QPixmap searchIcon = QPixmap(browsersearch);
     QToolButton * browserSearch
-        = CreateToolButton(searchIcon,
-                           this, SLOT(browser_search()), projectTools, "browser search");
-    Q3WhatsThis::add(browserSearch, browserSearchText());
+            = CreateToolButton(searchIcon,
+                               this, SLOT(browser_search()), projectTools, "browser search");
+    browserSearch->setWhatsThis(browserSearchText());
 
 
 
 
-    prev = CreateToolButton(*leftPixmap,
-                            this, SLOT(prev_select()), projectTools, "previous selected");
-    Q3WhatsThis::add(prev, prevText());
+    prev = CreateToolButton(*leftPixmap,  this, SLOT(prev_select()), projectTools, "previous selected");
+    prev->setWhatsThis(prevText());
 
-    next = CreateToolButton(*rightPixmap,
-                            this, SLOT(next_select()), projectTools, "next selected");
-    Q3WhatsThis::add(next, nextText());
+    next = CreateToolButton(*rightPixmap, this, SLOT(next_select()), projectTools, "next selected");
+    next->setWhatsThis(nextText());
 
 
-    Q3WhatsThis::add(projectOpen, projectOpenText());
-    Q3WhatsThis::add(projectSave, projectSaveText());
+
+    projectOpen->setWhatsThis(projectOpenText());
+    projectSave->setWhatsThis(projectSaveText());
+
+    tbClipboard = CreateToolButton(QIcon(":/root/icons/date_empty.png").pixmap(20,20),
+                                   this, SLOT(OnCallClipboardMenu()), projectTools, "Call clipboard");
+    tbQuickEdit = CreateToolButton(QIcon(":/root/icons/photo_edit.png").pixmap(100,100),
+                                   this, SLOT(OnShowQuickEdit()), projectTools, "Call QuickEdit window(Ctrl-E)");
+    tbQuickEdit->setEnabled(false);
+
     QToolButton * whatsThisButton
-        = CreateToolButton(QApplication::style()->standardIcon(QStyle::SP_TitleBarContextHelpButton).pixmap(),
-                           this, SLOT(whats_this()), projectTools, "Whats's this?");
+            = CreateToolButton(QApplication::style()->standardIcon(QStyle::SP_TitleBarContextHelpButton).pixmap(200,2000),
+                               this, SLOT(whats_this()), projectTools, "Whats's this?");
+
 
     generateLabel = new QLabel(tr("Generate:"));
     QFont font = generateLabel->font();
@@ -322,109 +326,139 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose)
     generateLabelAction = projectTools->addWidget(generateLabel);
 
 
-    Q3WhatsThis::add(whatsThisButton, whatsThisText());
+    whatsThisButton->setWhatsThis(whatsThisText());
 
-    projectMenu = new Q3PopupMenu(this);
-    menuBar()->insertItem(TR("&Project"), projectMenu);
+    this->setMenuBar(new QMenuBar(this));
+    projectMenu = new QMenu(tr("&Project"),this);
+    menuBar()->addMenu(projectMenu);
     connect(projectMenu, SIGNAL(aboutToShow()),
             this, SLOT(projectMenuAboutToShow()));
+    // Add at least one menu item to each menu right after creation, otherwise the
+    // menus are never shown on OS X with Qt built againt Cocoa.
+    projectMenu->addAction(QObject::tr("&New"), this, SLOT(newProject()));
 
-    windowsMenu = new Q3PopupMenu(this);
-    windowsMenu->setCheckable(TRUE);
+    windowsMenu = new QMenu(tr("&Windows"),this);
+    //windowsMenu->setCheckable(TRUE);
     connect(windowsMenu, SIGNAL(aboutToShow()),
             this, SLOT(windowsMenuAboutToShow()));
-    menuBar()->insertItem(TR("&Windows"), windowsMenu);
+    menuBar()->addMenu(windowsMenu);
 
-    toolMenu = new Q3PopupMenu(this);
+    toolMenu = new QMenu(tr("&Tools"),this);
     connect(toolMenu, SIGNAL(aboutToShow()), this, SLOT(toolMenuAboutToShow()));
-    menuBar()->insertItem(TR("&Tools"), toolMenu);
+    menuBar()->addMenu(toolMenu);
+    toolMenu->addAction(tr("Show &Trace Window"), this, SLOT(show_trace()));
 
-    langMenu = new Q3PopupMenu(this);
-    menuBar()->insertItem(TR("&Languages"), langMenu);
-    langMenu->setCheckable(TRUE);
+    langMenu = new QMenu(tr("&Languages"),this);
+    menuBar()->addMenu(langMenu);
+    //langMenu->setCheckable(TRUE);
     connect(langMenu, SIGNAL(aboutToShow()),
             this, SLOT(langMenuAboutToShow()));
 
-    use_cpp_id =
-        langMenu->insertItem(TR("C++ management and default declaration/definition"), this, SLOT(use_cpp()));
-    langMenu->setItemChecked(use_cpp_id, GenerationSettings::cpp_get_default_defs());
-    langMenu->setWhatsThis(use_cpp_id, cppText());
-    use_java_id =
-        langMenu->insertItem(TR("Java management and default definition"), this, SLOT(use_java()));
-    langMenu->setItemChecked(use_java_id, GenerationSettings::java_get_default_defs());
-    langMenu->setWhatsThis(use_java_id, javaText());
+    use_cpp_id = new QAction(tr("C++ management and default declaration/definition"),this);
+    use_cpp_id->setCheckable(true);
+    connect(use_cpp_id,SIGNAL(triggered()), this, SLOT(use_cpp()));
+    langMenu->addAction(use_cpp_id);
+    use_cpp_id->setWhatsThis(cppText());
+    use_cpp_id->setChecked(GenerationSettings::cpp_get_default_defs());
+    use_cpp_id->setEnabled(false);
+
+
+    use_java_id = new QAction(tr("Java management and default definition"), this);
+    use_java_id->setCheckable(true);
+    connect(use_java_id, SIGNAL(triggered()), this,SLOT(use_java()));
+    langMenu->addAction(use_java_id);
+    use_java_id->setChecked(GenerationSettings::java_get_default_defs());
+    use_java_id->setWhatsThis(javaText());
+    use_java_id->setEnabled(false);
+
     use_php_id =
-        langMenu->insertItem(TR("Php management and default definition"), this, SLOT(use_php()));
-    langMenu->setItemChecked(use_php_id, GenerationSettings::php_get_default_defs());
-    langMenu->setWhatsThis(use_php_id, phpText());
+            new QAction(tr("Php management and default definition"), this);
+    use_php_id->setCheckable(true);
+    connect(use_php_id, SIGNAL(triggered()), this,SLOT(use_php()));
+    langMenu->addAction(use_php_id);
+    use_php_id->setChecked(GenerationSettings::php_get_default_defs());
+    use_php_id->setWhatsThis(phpText());
+    use_php_id->setEnabled(false);
+
     use_python_id =
-        langMenu->insertItem(TR("Python management and default definition"), this, SLOT(use_python()));
-    langMenu->setItemChecked(use_python_id, GenerationSettings::python_get_default_defs());
-    langMenu->setWhatsThis(use_python_id, pythonText());
+            new QAction(tr("Python management and default definition"), this);
+    use_python_id->setCheckable(true);
+    connect(use_python_id, SIGNAL(triggered()),this, SLOT(use_python()));
+    langMenu->addAction(use_python_id);
+    use_python_id->setChecked( GenerationSettings::python_get_default_defs());
+    use_python_id->setWhatsThis(pythonText());
+    use_python_id->setEnabled(false);
+
     use_idl_id =
-        langMenu->insertItem(TR("Idl management and default declaration"), this, SLOT(use_idl()));
-    langMenu->setItemChecked(use_idl_id, GenerationSettings::idl_get_default_defs());
-    langMenu->setWhatsThis(use_idl_id, idlText());
+            new QAction(tr("Idl management and default declaration"), this);
+    use_idl_id->setCheckable(true);
+    connect(use_idl_id, SIGNAL(triggered()),this, SLOT(use_idl()));
+    langMenu->addAction(use_idl_id);
+    use_idl_id->setChecked( GenerationSettings::idl_get_default_defs());
+    use_idl_id->setWhatsThis(idlText());
+    use_idl_id->setEnabled(false);
+
+    langMenu->addSeparator();
 
-    langMenu->insertSeparator();
     verbose_gen_id =
-        langMenu->insertItem(TR("Verbose code generation"), this, SLOT(verbose()));
-    langMenu->setWhatsThis(verbose_gen_id, verboseText());
+            new QAction(tr("Verbose code generation"), this);
+    verbose_gen_id->setCheckable(true);
+    connect(verbose_gen_id, SIGNAL(triggered()),this, SLOT(verbose()));
+    langMenu->addAction(verbose_gen_id);
+    verbose_gen_id->setWhatsThis(verboseText());
+    verbose_gen_id->setEnabled(false);
 
     preserve_bodies_id =
-        langMenu->insertItem(TR("Preserve operations's body"), this, SLOT(preserve()));
-    langMenu->setWhatsThis(preserve_bodies_id, preserve_bodiesText());
+            new QAction(tr("Preserve operations's body"), this);
+    preserve_bodies_id->setCheckable(true);
+    connect(preserve_bodies_id, SIGNAL(triggered()),this, SLOT(preserve()));
+    langMenu->addAction(preserve_bodies_id);
+    preserve_bodies_id->setWhatsThis( preserve_bodiesText());
+    preserve_bodies_id->setEnabled(false);
 
     add_operation_profile_id =
-        langMenu->insertItem(TR("Add operation profile on body edition"), this,
-                             SLOT(addoperationprofile()));
-    langMenu->setWhatsThis(add_operation_profile_id, add_operation_profileText());
-
-    miscMenu = new Q3PopupMenu(this);
-    menuBar()->insertItem(TR("&Miscellaneous"), miscMenu);
-    miscMenu->setCheckable(TRUE);
+            new QAction(tr("Add operation profile on body edition"), this);
+    add_operation_profile_id->setCheckable(true);
+    connect(add_operation_profile_id, SIGNAL(triggered()),this, SLOT(addoperationprofile()));
+    langMenu->addAction(add_operation_profile_id);
+    add_operation_profile_id->setWhatsThis(add_operation_profileText());
+    add_operation_profile_id->setEnabled(false);
+
+    miscMenu = new QMenu(tr("&Miscellaneous"),this);
+    menuBar()->addMenu( miscMenu);
+    //miscMenu->setCheckable(TRUE);
     connect(miscMenu, SIGNAL(aboutToShow()),
             this, SLOT(miscMenuAboutToShow()));
 
     show_browser_stereotypes_id =
-        miscMenu->insertItem(TR("Show s&tereotypes in browser"), this,
-                             SLOT(show_stereotypes()));
-    miscMenu->setItemChecked(show_browser_stereotypes_id, TRUE);
-    miscMenu->setWhatsThis(show_browser_stereotypes_id, viewBrowserStereotypeText());
+            new QAction(tr("Show s&tereotypes in browser"), this);
+    show_browser_stereotypes_id->setCheckable(true);
+    connect(show_browser_stereotypes_id, SIGNAL(triggered()),this,SLOT(show_stereotypes()));
+    show_browser_stereotypes_id->setChecked(TRUE);
+    show_browser_stereotypes_id->setWhatsThis(viewBrowserStereotypeText());
+    show_browser_stereotypes_id->setEnabled(false);
+    miscMenu->addAction(show_browser_stereotypes_id);
 
     completion_id =
-        miscMenu->insertItem(TR("Completion in dialog"), this,
-                             SLOT(do_completion()));
-
-
-    miscMenu->setItemChecked(completion_id, TRUE);
-    miscMenu->setWhatsThis(completion_id, completionText());
-
-    Q3PopupMenu * pmstyle = new Q3PopupMenu(this);
-    bool used = FALSE;
-
-#ifndef QT_NO_STYLE_MOTIF
-    pmstyle->insertItem("Motif", this, SLOT(motif_style()));
-    used = TRUE;
-#endif
-#ifndef QT_NO_STYLE_MOTIFPLUS
-    pmstyle->insertItem("MotifPlus", this, SLOT(motifplus_style()));
-    used = TRUE;
-#endif
-    //pmstyle->insertItem("Sgi", this, SLOT(sgi_style()));
-    //pmstyle->insertItem("Cde", this, SLOT(cde_style()));
-#ifndef QT_NO_STYLE_WINDOWS
-    pmstyle->insertItem("Windows", this, SLOT(windows_style()));
-    used = TRUE;
-#endif
-
-    if (used)
-        miscMenu->insertItem(TR("Style"), pmstyle);
-
-    style = '?';
-
-    fontSizeMenu = new Q3PopupMenu(this);
-    fontSizeMenu->setCheckable(TRUE);
+            new QAction(tr("Completion in dialog"), this);
+    completion_id->setCheckable(true);
+    connect(completion_id,SIGNAL(triggered()),this,SLOT(do_completion()));
+    completion_id->setChecked( TRUE);
+    completion_id->setWhatsThis( completionText());
+    miscMenu->addAction(completion_id);
+
+
+    QMenu * pmstyle = new QMenu(tr("Style"),this);
+    QAction *action;
+    QStringList styles = QStyleFactory::keys();
+    foreach (QString currentStyle, styles) {
+        action = pmstyle->addAction(currentStyle);
+        connect(action, SIGNAL(triggered(bool)), this, SLOT(setApplicationStyleSlot()));
+    }
+    if(styles.count())
+        miscMenu->addMenu(pmstyle);
+    fontSizeMenu = new QMenu(tr("Font size"),this);
+    //fontSizeMenu->setCheckable(TRUE);
     connect(fontSizeMenu, SIGNAL(aboutToShow()),
             this, SLOT(fontSizeMenuAboutToShow()));
 
@@ -432,51 +466,97 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose)
 #define FONTSIZESUP 16
 
     for (int i = FONTSIZEMIN; i < FONTSIZESUP; i += 1)
-        fontSizeMenu->insertItem(QString::number(i), this,
-                                 SLOT(setFontSize(int)), 0, i);
+    {
+        action = new QAction(QString::number(i), this);
+        connect(action, SIGNAL(triggered()), this, SLOT(setFontSize()));
+        action->setCheckable(true);
+        fontSizeMenu->addAction(action);
+    }
 
-    int id = miscMenu->insertItem(TR("Font size"), fontSizeMenu);
-    miscMenu->setWhatsThis(id, fontSizeMenuText());
+    miscMenu->addMenu(fontSizeMenu);
+    fontSizeMenu->setWhatsThis(fontSizeMenuText());
 
-    formatMenu = new Q3PopupMenu(this);
-    formatLandscapeMenu = new Q3PopupMenu(this);
+    formatMenu = new QMenu(tr("Diagram default format"),this);
+    formatLandscapeMenu = new QMenu(tr("Landscape formats"),this);
     connect(formatMenu, SIGNAL(aboutToShow()),
             this, SLOT(formatMenuAboutToShow()));
     init_format_menu(formatMenu, formatLandscapeMenu);
 
-    id = miscMenu->insertItem(TR("Diagram default format"), formatMenu);
-    miscMenu->setWhatsThis(id, formatMenuText());
+    miscMenu->addMenu(formatMenu);
+    formatMenu->setWhatsThis(formatMenuText());
 
-    miscMenu->insertSeparator();
+    miscMenu->addSeparator();
 
     shortcut_id =
-        miscMenu->insertItem(TR("Edit shortcuts"), this, SLOT(edit_shortcuts()));
+            new QAction(tr("Edit shortcuts"), this);
+    miscMenu->addAction(shortcut_id);
+    connect(shortcut_id, SIGNAL(triggered()), this, SLOT(edit_shortcuts()));
+    menuBar()->addSeparator();
 
-    menuBar()->insertSeparator();
-
-    miscMenu->insertItem(TR("Set environment"), this, SLOT(edit_env()));
+    action =
+            new QAction(tr("Set environment"), this);
+    miscMenu->addAction(action);
+    connect(action, SIGNAL(triggered()),this, SLOT(edit_env()));
 
     img_root_dir_id =
-        miscMenu->insertItem(TR("Set images root dir"), this, SLOT(edit_image_root_dir()));
-
-    Q3PopupMenu * help = new Q3PopupMenu(this);
-    menuBar()->insertItem(TR("&Help"), help);
-
-    help->insertItem(TR("&About"), this, SLOT(about()), ::Qt::Key_F2);
-    help->insertItem(TR("About&Qt"), this, SLOT(aboutQt()));
-    help->insertSeparator();
-    help->insertItem(TR("&Help"), this, SLOT(help()), ::Qt::Key_F1);
-    help->insertItem(TR("What's This"), this, SLOT(whats_this()), ::Qt::SHIFT +::Qt::Key_F1);
+            new QAction(tr("Set images root dir"), this);
+    miscMenu->addAction(img_root_dir_id);
+    connect(img_root_dir_id, SIGNAL(triggered()),this, SLOT(edit_image_root_dir()));
+
+    QMenu * help = new QMenu(tr("&Help"),this);
+    menuBar()->addMenu(help);
+
+    action =
+            new QAction(tr("&About"), help);
+    connect(action, SIGNAL(triggered()), this,SLOT(about()));
+    action->setShortcut(::Qt::Key_F2);
+    help->addAction(action);
+
+    action =
+            new QAction(tr("About&Qt"), help);
+    connect(action, SIGNAL(triggered()), this,SLOT(aboutQt()));
+    help->addAction(action);
+
+    help->addSeparator();
+
+    action =
+            new QAction(tr("&Help"), this);
+    connect(action, SIGNAL(triggered()), this,SLOT(help()));
+    action->setShortcut(::Qt::Key_F1);
+    help->addAction(action);
+
+    action =
+            new QAction(tr("What's This?"), this);
+    connect(action, SIGNAL(triggered()), this,SLOT(whats_this()));
+    action->setShortcut(::Qt::SHIFT + ::Qt::Key_F1);
+    help->addAction(action);
 
     //
     // sub windows
     //
 
-    spl1 = new QSplitter(Qt::Horizontal, this, "spl1");
-    spl2 = new QSplitter(Qt::Vertical, spl1, "spl2");
+    //spl1 = new QSplitter(Qt::Horizontal, this, "spl1");
+    //spl2 = new QSplitter(Qt::Vertical, spl1, "spl2");
+    spl1 = new QSplitter(Qt::Horizontal, this);
+    spl2 = new QSplitter(Qt::Vertical, /*spl1*/this);
+    wdgCatalog = new CatalogWidget;
+    quickEdit = new QuickEdit();
+    browser = new BrowserView();
+    connect(browser, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(OnChooseQuickEditMode(QTreeWidgetItem*, QTreeWidgetItem*)));
+
+    wdgCatalog->Init(this, browser);
+    connect(wdgCatalog, SIGNAL(markedRemove(QString,int)), browser, SLOT(OnUnmarkItem(QString,int)));
+    connect(wdgCatalog, SIGNAL(allMarkedRemove()), browser, SLOT(OnUnmarkAll()));
+
+
+    quickEdit->Init(this, browser);
+    quickEdit->setWindowFlags(Qt::WindowStaysOnTopHint);
+    sh1 = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_E),this, SLOT(OnShowQuickEdit()),SLOT(OnShowQuickEdit()), Qt::ApplicationShortcut);
 
-    browser = new BrowserView(spl1);
 
+    splTreeTab = new QSplitter(Qt::Vertical, spl1);
+    splTreeTab->addWidget(browser);
+    splTreeTab->addWidget(wdgCatalog);
     cppAction = new QAction(tr("C++"),0);
     connect(cppAction, SIGNAL(triggered()),browser, SLOT(OnGenerateCpp()));
     javaAction = new QAction( tr("Java"),0);
@@ -497,26 +577,24 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose)
     phpAction->setVisible(false);
     pythonAction->setVisible(false);
     idlAction->setVisible(false);
-
-
-
-    ws = new QWorkspace(spl2);
-
+    ws = new QMdiArea(spl2);
+    //ws->setToolTip("mdi area");
     comment = new MultiLineEdit(spl2);
+    comment->setToolTip("coment");
+
     set_commented(0);
     connect(comment, SIGNAL(textChanged()), this, SLOT(comment_changed()));
-
-    spl1->moveToFirst(browser);
-    spl2->moveToFirst(ws);
-
-
+    spl2->addWidget(ws);
+    spl2->addWidget(comment);
+    spl1->addWidget(splTreeTab);
+    spl1->addWidget(spl2);
     int w = (UmlDesktop::width() * 15) / 16;
 
     resize(w, (UmlDesktop::height() * 7) / 8);
     UmlDesktop::tocenter(this);
 
     // browser width = total width/4
-    Q3ValueList<int> lsz = spl1->sizes();
+    QList<int> lsz = spl1->sizes();
 
     lsz.first() = w / 4;
     lsz.last() = w - lsz.first();
@@ -524,8 +602,8 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose)
     spl1->setSizes(lsz);
 
     // on resize try to resize only the diagrams
-    spl1->setResizeMode(browser, QSplitter::KeepSize);
-    spl2->setResizeMode(comment, QSplitter::KeepSize);
+    spl1->setStretchFactor(spl1->indexOf(browser), 1);
+    spl2->setStretchFactor(spl2->indexOf(comment),1);
 
 #ifdef _WS_QWS_
     // Qt/Embedded XOR drawing not yet implemented.
@@ -538,85 +616,94 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose)
     //
     // read historic
     //
-
-    // note : QFile fp(QDir::home().absFilePath(".douml")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = homeDir().absFilePath(".douml");
-    FILE * fp = fopen((const char *) s, "r");
-
-    if (fp != 0) {
-        char line[512];
-
-        while (fgets(line, sizeof(line) - 1, fp) != 0) {
-            remove_crlf(line);
-
-            if (!strncmp(line, "compteur d utilisation ", 23)) {
-                Counter = atoi(line + 23);
-                break;
-            }
-            else
-                historic.append(line);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    settings.beginGroup("Recent_Files");
+    for(int i = 1; i <= 10; ++i)
+    {
+        const QString line = settings.value(tr("File%1").arg(i)).toString();
+        if(!line.isEmpty())
+        {
+            historic.append(line);
+        }
+        else
+        {
+            break;
         }
-
-        fclose(fp);
     }
-
-    // and do not enable it back
-    //    if (!batch && ((Counter++ % 30) == 0)) {
-    //        GreetingsDialog d;
-
-    //        d.exec();
-    //    }
-
-    //
+    settings.endGroup();
 
     clear_select_historic();
-
-    //
-
-    statusBar()->message(TR("Ready"), 2000);
+    statusBar()->showMessage(tr("Ready"), 20000);
 }
-
 UmlWindow::~UmlWindow()
 {
     BrowserView::remove_temporary_files();
     set_user_id(-1);
     exit(0);
 }
-
-void UmlWindow::init_format_menu(Q3PopupMenu * m, Q3PopupMenu * lm)
+void UmlWindow::init_format_menu(QMenu * m, QMenu * lm)
 {
-    m->setCheckable(TRUE);
-    lm->setCheckable(TRUE);
-
+    //m->setCheckable(TRUE);
+    //lm->setCheckable(TRUE);
+    QAction* action;
     int i;
 
     for (i = 0; i <= IsoA5; i += 1)
-        m->insertItem(QString("Iso ") + stringify((CanvasFormat) i), this,
-                      SLOT(setFormat(int)), 0, i);
+    {
+        action = new QAction(QString("Iso ") + stringify((CanvasFormat) i), this);
+        action->setCheckable(true);
+        connect(action, SIGNAL(triggered()),this, SLOT(setFormat()));
+        m->addAction(action);
+        action->setData(i);
+    }
 
     for (; i <= UsE; i += 1)
-        m->insertItem(QString("Ansi ") + stringify((CanvasFormat) i), this,
-                      SLOT(setFormat(int)), 0, i);
-
+    {
+        action = new QAction(QString("Ansi ") + stringify((CanvasFormat) i), this);
+        action->setCheckable(true);
+        connect(action, SIGNAL(triggered()),this,SLOT(setFormat()));
+        m->addAction(action);
+        action->setData(i);
+    }
     for (; i != IsoA0Landscape; i += 1)
-        m->insertItem(stringify((CanvasFormat) i), this,
-                      SLOT(setFormat(int)), 0, i);
+    {
+        action = new QAction(stringify((CanvasFormat) i), this);
+        action->setCheckable(true);
+        connect(action, SIGNAL(triggered()),this,SLOT(setFormat()));
+        m->addAction(action);
+        action->setData(i);
+    }
 
-    m->insertSeparator();
-    m->insertItem(TR("Landscape formats"), lm);
+    m->addSeparator();
+    m->addMenu(lm);
 
     for (; i <= IsoA5Landscape; i += 1)
-        lm->insertItem(QString("Iso ") + stringify((CanvasFormat) i), this,
-                       SLOT(setFormat(int)), 0, i);
+    {
+        action = new QAction(QString("Iso ") + stringify((CanvasFormat) i), this);
+        action->setCheckable(true);
+        connect(action, SIGNAL(triggered()),this,SLOT(setFormat()));
+        lm->addAction(action);
+        action->setData(i);
+    }
 
     for (; i <= UsELandscape; i += 1)
-        lm->insertItem(QString("Ansi ") + stringify((CanvasFormat) i), this,
-                       SLOT(setFormat(int)), 0, i);
+    {
+        action = new QAction(QString("Ansi ") + stringify((CanvasFormat) i), this);
+        action->setData(i);
+        action->setCheckable(true);
+        connect(action, SIGNAL(triggered()),this,SLOT(setFormat()));
+        lm->addAction(action);
+    }
 
     for (; i != CanvasFormatSup; i += 1)
-        lm->insertItem(stringify((CanvasFormat) i), this,
-                       SLOT(setFormat(int)), 0, i);
+    {
+        action = new QAction(stringify((CanvasFormat) i), this);
+        action->setCheckable(true);
+        connect(action, SIGNAL(triggered()),this,SLOT(setFormat()));
+        lm->addAction(action);
+        action->setData(i);
+    }
 }
 
 void UmlWindow::projectMenuAboutToShow()
@@ -628,95 +715,99 @@ void UmlWindow::projectMenuAboutToShow()
     if (!BrowserNode::edition_active()) {
         (void) user_id(); // force doumlrc read to have TemplateProject
 
-        int id;
+        QAction *id;
         bool enabled = (browser->get_project() != 0);
         QPixmap openIcon = QPixmap(fileopen);
         QPixmap saveIcon = QPixmap(filesave);
 
-        id = projectMenu->insertItem(TR("&New"), this, SLOT(newProject()));
-        projectMenu->setWhatsThis(id, projectNewText());
+        id = projectMenu->addAction(QObject::tr("&New"), this, SLOT(newProject()));
+        id->setWhatsThis(projectNewText());
+
 
         if (!TemplateProject.isEmpty()) {
-            id = projectMenu->insertItem(TR("Create from &Template"), this, SLOT(newFromTemplate()));
-            projectMenu->setWhatsThis(id, projectNewFromTemplateText());
+            id = projectMenu->addAction(QObject::tr("Create from &Template"), this, SLOT(newFromTemplate()));
+            id->setWhatsThis(projectNewFromTemplateText());
         }
 
-        id = projectMenu->insertItem(openIcon, TR("&Open"), this, SLOT(load()),
-                                     ::Qt::CTRL +::Qt::Key_O);
-        projectMenu->setWhatsThis(id, projectOpenText());
+        id = projectMenu->addAction(openIcon, QObject::tr("&Open"), this, SLOT(load()),
+                                    ::Qt::CTRL +::Qt::Key_O);
+        id->setWhatsThis(projectOpenText());
 
-        id = projectMenu->insertItem(saveIcon, TR("&Save"), this, SLOT(save()),
-                                     ::Qt::CTRL +::Qt::Key_S);
-        projectMenu->setWhatsThis(id, projectSaveText());
-        projectMenu->setItemEnabled(id, enabled);
+        id = projectMenu->addAction(saveIcon, QObject::tr("&Save"), this, SLOT(save()),
+                                    ::Qt::CTRL +::Qt::Key_S);
+        id->setWhatsThis(projectSaveText());
+        id->setEnabled(enabled);
 
-        id = projectMenu->insertItem(TR("Save &as..."), this, SLOT(saveAs()),
-                                     ::Qt::CTRL +::Qt::SHIFT +::Qt::Key_S);
-        projectMenu->setWhatsThis(id, projectSaveAsText());
-        projectMenu->setItemEnabled(id, enabled);
+        id = projectMenu->addAction(QObject::tr("Save &as..."), this, SLOT(saveAs()),
+                                    ::Qt::CTRL +::Qt::SHIFT +::Qt::Key_S);
+        id->setWhatsThis(projectSaveAsText());
+        id->setEnabled(enabled);
 
-        projectMenu->insertSeparator();
-        projectMenu->insertItem(TR("&Close"), this, SLOT(close()),
-                                ::Qt::CTRL +::Qt::Key_W);
-        projectMenu->setItemEnabled(id, enabled);
-        projectMenu->insertItem(TR("&Quit"), this, SLOT(quit()),
-                                ::Qt::CTRL +::Qt::Key_Q);
+        projectMenu->addSeparator();
+        projectMenu->addAction(QObject::tr("&Close"), this, SLOT(close()),
+                               ::Qt::CTRL +::Qt::Key_W);
+        id->setEnabled(enabled);
+        projectMenu->addAction(QObject::tr("&Quit"), this, SLOT(quit()),
+                               ::Qt::CTRL +::Qt::Key_Q);
 
         // edit
 
         if (enabled) {
             bool writable = browser->get_project()->is_writable();
-            Q3PopupMenu * ed = new Q3PopupMenu(this);
+            QMenu * ed; // = new QMenu(this);
 
-            projectMenu->insertSeparator();
-            projectMenu->insertItem(TR("Edit"), ed);
+            projectMenu->addSeparator();
+            ed = projectMenu->addMenu(tr("Edit"));
+            //projectMenu->addAction(TR("Edit"), ed);
 
-            id = ed->insertItem(TR("Edit generation settings"), this, SLOT(edit_gen_settings()));
-            ed->setWhatsThis(id, TR("to set how an Uml type is compiled in C++ etc...,"
-                                    "to set the default parameter passing, to set the default code"
-                                    "produced for an attribute etc..., and to set the root directories"));
-            ed->setItemEnabled(id, writable);
+            id = ed->addAction(tr("Edit generation settings"), this, SLOT(edit_gen_settings()));
+            id->setWhatsThis( QObject::tr("to set how an Uml type is compiled in C++ etc...,"
+                                          "to set the default parameter passing, to set the default code"
+                                          "produced for an attribute etc..., and to set the root directories"));
 
-            id = ed->insertItem(TR("Edit default stereotypes"), this, SLOT(edit_stereotypes()));
-            ed->setWhatsThis(id, TR("to set the default stereotypes list"));
-            ed->setItemEnabled(id, writable);
+            id->setEnabled( writable);
 
-            ed->insertSeparator();
+            id = ed->addAction(tr("Edit default stereotypes"), this, SLOT(edit_stereotypes()));
+            id->setWhatsThis( QObject::tr("to set the default stereotypes list"));
+            id->setEnabled( writable);
 
-            id = ed->insertItem(TR("Edit class settings"), this, SLOT(edit_class_settings()));
-            ed->setWhatsThis(id, TR("to set the sub classes settings"));
-            ed->setItemEnabled(id, writable);
+            ed->addSeparator();
 
-            id = ed->insertItem(TR("Edit drawing settings"), this, SLOT(edit_drawing_settings()));
-            ed->setWhatsThis(id, TR("to set how the sub <i>diagrams</i>'s items must be drawn"));
-            ed->setItemEnabled(id, writable);
+            id = ed->addAction(tr("Edit class settings"), this, SLOT(edit_class_settings()));
+            id->setWhatsThis( QObject::tr("to set the sub classes settings"));
+            id->setEnabled( writable);
+
+            id = ed->addAction(tr("Edit drawing settings"), this, SLOT(edit_drawing_settings()));
+            id->setWhatsThis( QObject::tr("to set how the sub <i>diagrams</i>'s items must be drawn"));
+            id->setEnabled( writable);
         }
 
         // historic
 
-        projectMenu->insertSeparator();
-        QString whats = TR("to open this project.<br><br>The historic is saved in <i>%1</i>",
-                           homeDir().absFilePath(".douml"));
+        projectMenu->addSeparator();
 
         for (int i(0); i < historic.size(); ++i)
         {
-            id = projectMenu->insertItem(historic.at(i), this, SLOT(historicActivated(int)));
-            projectMenu->setItemParameter(id, i);
-            projectMenu->setWhatsThis(id, whats);
+            id = projectMenu->addAction(historic.at(i), this, SLOT(historicActivated()));
+            //projectMenu->setItemParameter(id, i);
+            id->setWhatsThis(tr("to open this project.<br><br>The historic is saved in <i>settings.ini</i>"));
+            id->setData(QVariant(i));
         }
     }
     else
         msg_warning("DoUML",
-                    TR("Nothing available while a dialog is opened"));
+                    QObject::tr("Nothing available while a dialog is opened"));
 }
 
-void UmlWindow::historicActivated(int id)
+void UmlWindow::historicActivated()
 {
-    bool idExists = id <= historic.size() && id >= 0;
+    QAction *action = static_cast<QAction *>( sender());
+    int i = action->data().toInt();
+    bool idExists = (i < historic.count() && i >= 0);
 
     if (!idExists)
     {
-        statusBar()->message(TR("Loading aborted as supplied project id is out of history array bounds"), 2000);
+        statusBar()->showMessage(tr("Loading aborted as supplied project id is out of history array bounds"), 2000);
         return;
     }
 
@@ -724,21 +815,26 @@ void UmlWindow::historicActivated(int id)
     bool projectSuccessfullyClosed = browser->get_project() == 0;
 
     if (!projectSuccessfullyClosed) {
-        statusBar()->message(TR("Loading aborted as currently opened project unloading failed"), 2000);
+        statusBar()->showMessage(tr("Loading aborted as currently opened project unloading failed"), 2000);
         return;
     }
 
-    load(historic.at(id));
+    load(historic[i]);
 }
 
 void UmlWindow::clear()
 {
-    while (! the->ws->windowList().isEmpty()) {
-        DiagramWindow * w = (DiagramWindow *) the->ws->windowList().at(0);
+    while (! the->ws->subWindowList().isEmpty()) {
+        DiagramWindow * w = (DiagramWindow *) the->ws->subWindowList().at(0)->widget();
+        DiagramWindow * sw = (DiagramWindow *) the->ws->subWindowList().at(0);
 
-        w->dont_save();
-        w->setParent(0);
-        delete w;
+        if(w)
+        {
+            w->dont_save();
+            w->setParent(0);
+            delete w;
+        }
+        delete sw;
     }
 
 
@@ -748,6 +844,7 @@ void UmlWindow::clear()
 
 void UmlWindow::toolMenuAboutToShow()
 {
+
     abort_line_construction();
 
     bool cpp = GenerationSettings::cpp_get_default_defs();
@@ -758,88 +855,83 @@ void UmlWindow::toolMenuAboutToShow()
     bool lang_except_idl = cpp || java || php || python;
 
     toolMenu->clear();
-    toolMenu->insertItem(TR("Show &Trace Window"), this, SLOT(show_trace()));
+    toolMenu->addAction(tr("Show &Trace Window"), this, SLOT(show_trace()));
 
     if (browser->get_project() != 0) {
+
+		isToolMenuLoaded = true;
+
         if (lang_except_idl | idl) {
-            toolMenu->insertSeparator();
+            toolMenu->addSeparator();
 
             if (cpp)
-                toolMenu->insertItem(TR("Generate C++"), this, SLOT(cpp_generate()), ::Qt::CTRL +::Qt::Key_G);
+                toolMenu->addAction(tr("Generate C++"), this, SLOT(cpp_generate()), ::Qt::CTRL +::Qt::Key_G);
 
             if (java)
-                toolMenu->insertItem(TR("Generate Java"), this, SLOT(java_generate()), ::Qt::CTRL +::Qt::Key_J);
+                toolMenu->addAction(tr("Generate Java"), this, SLOT(java_generate()), ::Qt::CTRL +::Qt::Key_J);
 
             if (php)
-                toolMenu->insertItem(TR("Generate Php"), this, SLOT(php_generate()), ::Qt::CTRL +::Qt::Key_H);
+                toolMenu->addAction(tr("Generate Php"), this, SLOT(php_generate()), ::Qt::CTRL +::Qt::Key_H);
 
             if (python)
-                toolMenu->insertItem(TR("Generate Python"), this, SLOT(python_generate()), ::Qt::CTRL +::Qt::Key_Y);
+                toolMenu->addAction(tr("Generate Python"), this, SLOT(python_generate()), ::Qt::CTRL +::Qt::Key_Y);
 
             if (idl)
-                toolMenu->insertItem(TR("Generate Idl"), this, SLOT(idl_generate()), ::Qt::CTRL +::Qt::Key_I);
+                toolMenu->addAction(tr("Generate Idl"), this, SLOT(idl_generate()), ::Qt::CTRL +::Qt::Key_I);
         }
 
         if (!BrowserNode::edition_active()) {
             if (lang_except_idl) {
-                toolMenu->insertSeparator();
+                toolMenu->addSeparator();
 
                 if (cpp) {
-                    toolMenu->insertItem(TR("Reverse C++"), this, SLOT(cpp_reverse()));
-                    toolMenu->insertItem(TR("Roundtrip C++"), this, SLOT(cpp_roundtrip()));
+                    toolMenu->addAction(tr("Reverse C++"), this, SLOT(cpp_reverse()));
+                    toolMenu->addAction(tr("Roundtrip C++"), this, SLOT(cpp_roundtrip()));
                 }
 
                 if (java) {
-                    toolMenu->insertItem(TR("Reverse Java"), this, SLOT(java_reverse()));
-                    toolMenu->insertItem(TR("Roundtrip Java"), this, SLOT(java_roundtrip()));
+                    toolMenu->addAction(tr("Reverse Java"), this, SLOT(java_reverse()));
+                    toolMenu->addAction(tr("Roundtrip Java"), this, SLOT(java_roundtrip()));
                 }
 
                 if (php)
-                    toolMenu->insertItem(TR("Reverse Php"), this, SLOT(php_reverse()));
+                    toolMenu->addAction(tr("Reverse Php"), this, SLOT(php_reverse()));
 
-#warning reverse python
-
-#if 0
-
-                if (python)
-                    toolMenu->insertItem(TR("Reverse Python"), this, SLOT(python_reverse()));
-
-#endif
 
                 if (java) {
-                    toolMenu->insertSeparator();
-                    toolMenu->insertItem(TR("Java Catalog"), this, SLOT(java_catalog()));
+                    toolMenu->addSeparator();
+                    toolMenu->addAction(tr("Java Catalog"), this, SLOT(java_catalog()));
                 }
 
                 if (preserve_bodies()) {
-                    toolMenu->insertSeparator();
+                    toolMenu->addSeparator();
 
                     if (cpp)
-                        toolMenu->insertItem(TR("Roundtrip C++ bodies"), this, SLOT(cpp_roundtripbody()));
+                        toolMenu->addAction(tr("Roundtrip C++ bodies"), this, SLOT(cpp_roundtripbody()));
 
                     if (java)
-                        toolMenu->insertItem(TR("Roundtrip Java bodies"), this, SLOT(java_roundtripbody()));
+                        toolMenu->addAction(tr("Roundtrip Java bodies"), this, SLOT(java_roundtripbody()));
 
                     if (php)
-                        toolMenu->insertItem(TR("Roundtrip Php bodies"), this, SLOT(php_roundtripbody()));
+                        toolMenu->addAction(tr("Roundtrip Php bodies"), this, SLOT(php_roundtripbody()));
 
                     if (python)
-                        toolMenu->insertItem(TR("Roundtrip Python bodies"), this, SLOT(python_roundtripbody()));
+                        toolMenu->addAction(tr("Roundtrip Python bodies"), this, SLOT(python_roundtripbody()));
                 }
             }
 
             if (BrowserClass::find("UmlBaseItem") != 0) {
-                toolMenu->insertSeparator();
-                toolMenu->insertItem(TR("Plug-out upgrade"), this, SLOT(plug_out_upgrade()));
+                toolMenu->addSeparator();
+                toolMenu->addAction(tr("Plug-out upgrade"), this, SLOT(plug_out_upgrade()));
             }
 
-            Tool::menu_insert(toolMenu, UmlProject, this, SLOT(run_tool(int)));
+            Tool::menu_insert(toolMenu, UmlProject, this, SLOT(run_tool()));
         }
 
         if (browser->get_project()->is_writable()) {
-            toolMenu->insertSeparator();
-            toolMenu->insertItem(TR("Tools settings"), this, SLOT(tool_settings()));
-            toolMenu->insertItem(TR("Import settings"), this, SLOT(import_tool_settings()));
+            toolMenu->addSeparator();
+            toolMenu->addAction(tr("Tools settings"), this, SLOT(tool_settings()));
+            toolMenu->addAction(tr("Import settings"), this, SLOT(import_tool_settings()));
         }
     }
 }
@@ -851,14 +943,14 @@ void UmlWindow::set_commented(BrowserNode * bn)
         UmlWindow * him = the;
         bool same = (him->commented == bn);
 
-        the = 0;	// to do nothing in comment_changed() which is called
+        the = 0;    // to do nothing in comment_changed() which is called
 
         him->commented = bn;
 
         if (bn != 0) {
             him->comment->setText(bn->get_comment());
             him->comment->setReadOnly(!bn->is_writable());
-            him->statusBar()->message(bn->get_data()->definition(TRUE, TRUE));
+            him->statusBar()->showMessage(bn->get_data()->definition(TRUE, TRUE));
 
             if (! same)
                 him->is_selected(bn);
@@ -866,7 +958,7 @@ void UmlWindow::set_commented(BrowserNode * bn)
         else {
             him->comment->clear();
             him->comment->setReadOnly(TRUE);
-            him->statusBar()->clear();
+            him->statusBar()->clearMessage();
         }
 
         the = him;
@@ -882,7 +974,7 @@ void UmlWindow::update_comment_if_needed(BrowserNode * bn)
 void UmlWindow::comment_changed()
 {
     if ((the != 0) && (the->commented != 0) &&
-        (the->commented->get_comment() != the->comment->text())) {
+            (the->commented->get_comment() != the->comment->text())) {
         the->commented->set_comment(the->comment->text());
         the->commented->modified();
         the->commented->package_modified();
@@ -891,10 +983,10 @@ void UmlWindow::comment_changed()
 
 void UmlWindow::set_message(const QString & m)
 {
-    the->statusBar()->message(m);
+    the->statusBar()->showMessage(m);
 }
 
-QWorkspace * UmlWindow::get_workspace()
+QMdiArea  * UmlWindow::get_workspace()
 {
     return the->ws;
 }
@@ -917,35 +1009,36 @@ void UmlWindow::set_images_root_dir(QString s)
 void UmlWindow::newProject()
 {
     abort_line_construction();
+    if (BrowserNode::edition_active())
+        return;
 
-    if (!BrowserNode::edition_active()) {
-        close();
-
-        if (browser->get_project() == 0) {
-            QString f = Q3FileDialog::getSaveFileName(last_used_directory(), "*", this,
-                        0, TR("Enter a folder name, this folder will be created and will name the new project"));
-
-            if (!f.isEmpty()) {
-                set_last_used_directory(f);
-
-                QDir di;
-
-                if (di.mkdir(f)) {
-                    di.cd(f);
-                    browser->set_project(di);
-                    Tool::defaults();
-                    browser->get_project()->BrowserPackage::save_all(FALSE);
-
-                    msg_warning(TR("New project"),
-                                TR("Do not forget to set the target languages list\n"
-                                   "through the 'Languages' menu\n"
-                                   "\n"
-                                   "If you program in Java, the Java Catalog plug-out\n"
-                                   "will help you, use it !"));
-                }
-                else
-                    msg_critical(TR("New project"), TR("Cannot create directory ") + f);
+    close();
+    if (browser->get_project() == 0) {
+        QString f = QFileDialog::getSaveFileName(
+                    this,
+                    tr("Enter a folder name, this folder will be created and will name the new project"),
+                    last_used_directory());
+
+        if (!f.isEmpty()) {
+            set_last_used_directory(f);
+
+            QDir di;
+
+            if (di.mkdir(f)) {
+                di.cd(f);
+                browser->set_project(di);
+                Tool::defaults();
+                browser->get_project()->BrowserPackage::save_all(FALSE);
+
+                msg_warning(tr("New project"),
+                            QObject::tr("Do not forget to set the target languages list\n"
+                                        "through the 'Languages' menu\n"
+                                        "\n"
+                                        "If you program in Java, the Java Catalog plug-out\n"
+                                        "will help you, use it !"));
             }
+            else
+                msg_critical(tr("New project"), QObject::tr("Cannot create directory ") + f);
         }
     }
 }
@@ -968,14 +1061,16 @@ void UmlWindow::load()
         close();
 
         if (browser->get_project() == 0) {
-            QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), "*.prj", this);
+            QString fn = QFileDialog::getOpenFileName(
+                        this, tr("Select DoUML project file"), last_used_directory(), QLatin1String("*.prj"));
 
             if (!fn.isEmpty()) {
                 set_last_used_directory(fn);
                 load(fn);
             }
+
             else
-                statusBar()->message(TR("Loading aborted"), 2000);
+                statusBar()->showMessage(tr("Loading aborted"), 2000);
         }
     }
     if(BrowserNode::marked_nodes().count()!=0)
@@ -983,35 +1078,32 @@ void UmlWindow::load()
     else
         set_selected_generation();
 }
-
 void UmlWindow::historic_add(QString fn)
 {
-    QStringList::Iterator it = the->historic.find(fn);
+    //QStringList::Iterator it = the->historic.indexOf(fn);
+    the->historic.removeOne(fn);
 
-    if (it != the->historic.end())
-        the->historic.remove(it);
+    //if (it != the->historic.end())
+    //  the->historic.remove(it);
 
     the->historic.prepend(fn);
 
-    // note : QFile fp(QDir::home().absFilePath(".douml")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = homeDir().absFilePath(".douml");
-    FILE * fp = fopen((const char *) s, "w");
-
-    if (fp != 0) {
-        int rank;
-
-        for (it = the->historic.begin(), rank = 0;
-             (it != the->historic.end()) && (rank != 10);
-             ++it, rank += 1) {
-            (void) fputs((const char *) *it, fp);
-            fputc('\n', fp);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    settings.beginGroup("Recent_Files");
+    for(int i = 0; i < 10; i++)
+    {
+        QString s;
+        if(i < the->historic.size())
+        {
+            settings.setValue(tr("File%1").arg(i+1), the->historic.at(i));
+        }
+        else
+        {
+            break;
         }
-
-        fprintf(fp, "compteur d utilisation %d\n", Counter);
-
-        fclose(fp);
     }
+    settings.endGroup();
 }
 
 void UmlWindow::load_it()
@@ -1042,27 +1134,27 @@ void UmlWindow::load(QString fn, bool forcesaveas)
         return;
     }
 
-    QDir di(fi.dirPath(TRUE));
+    QDir di(fi.dir());
     QRegExp dotSearch("[.]");
     int pos  = dotSearch.lastIndexIn(fi.fileName());
     int nameLength = fi.fileName().length();
     QString filename = fi.fileName().left(nameLength - (nameLength - pos));
 
-    //s.truncate(s.length() - 4);	// QFileInfo::baseName remove all after first dot
+    //s.truncate(s.length() - 4);   // QFileInfo::baseName remove all after first dot
 
     if (di.dirName() != filename) {
         msg_critical("Uml",
-                     TR("The name of the project and the name of\n"
-                        "the directory containing it must be the same\n\n") +
-                     TR("Project name : ") + filename + "\n" +
-                     TR("Directory name : ") + di.dirName());
+                     QObject::tr("The name of the project and the name of\n"
+                                 "the directory containing it must be the same\n\n") +
+                     QObject::tr("Project name : ") + filename + "\n" +
+                     QObject::tr("Directory name : ") + di.dirName());
         close_it();
         return;
     }
 
-    historic_add(fi.absFilePath());
+    historic_add(fi.absoluteFilePath());
 
-    QApplication::setOverrideCursor(::Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
     set_in_import(FALSE);
     browser->set_project(di);
     BrowserNode::pre_load();
@@ -1072,7 +1164,9 @@ void UmlWindow::load(QString fn, bool forcesaveas)
     PRE_TRY;
 
     try {
+
         format = browser->get_project()->load(TRUE);
+
     }
     catch (int) {
         QApplication::restoreOverrideCursor();
@@ -1088,7 +1182,7 @@ void UmlWindow::load(QString fn, bool forcesaveas)
     idmax_add_margin();
     browser->get_project()->setOpen(TRUE);
     QApplication::restoreOverrideCursor();
-    setCaption("DoUML : " + fn);
+    setWindowTitle("DoUML : " + fn);
 
     if (format < 20) {
         BrowserClass::plug_out_conversion();
@@ -1103,7 +1197,7 @@ void UmlWindow::load(QString fn, bool forcesaveas)
                     "A <i>save-as</i> is forced now to save the result "
                     "in a new project, then the project will be closed");
         saveAs();
-        close_it();		// write access of added items not ok
+        close_it();     // write access of added items not ok
     }
     else if (format < 22) {
         QString new_st = GenerationSettings::new_java_enums();
@@ -1115,8 +1209,8 @@ void UmlWindow::load(QString fn, bool forcesaveas)
 
         if (!new_st.isEmpty())
             m = "The class stereotype <i>enum_pattern</i> is renamed <i>" + new_st +
-                "</i>and the classes having the stereotype <i>enum_pattern</i> have now the stereotype <i>" +
-                new_st + "</i><br><br>" + m;
+                    "</i>and the classes having the stereotype <i>enum_pattern</i> have now the stereotype <i>" +
+                    new_st + "</i><br><br>" + m;
 
         if (must_save_as)
             m += "A <i>save-as</i> is forced now to save the result in a new project";
@@ -1145,6 +1239,7 @@ void UmlWindow::load(QString fn, bool forcesaveas)
 
     clear_select_historic(); // in case selection are done by error
     setup_generator_action_visibility();
+
 }
 
 void UmlWindow::save()
@@ -1156,7 +1251,7 @@ void UmlWindow::save()
             // hide the window else the user see that
             // all the not-open diagram window will be open
             // to save their content
-            QApplication::setOverrideCursor(::Qt::waitCursor);
+            QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
             ws->hide();
             BrowserPackage::save_all(TRUE);
             ws->show();
@@ -1164,7 +1259,7 @@ void UmlWindow::save()
         }
         else
             msg_warning("DoUML",
-                        TR("Saving can't be done while a dialog is opened"));
+                        QObject::tr("Saving can't be done while a dialog is opened"));
     }
 }
 
@@ -1181,82 +1276,92 @@ void UmlWindow::saveAs()
 
 bool UmlWindow::saveas_it()
 {
-    if (the->browser->get_project() && !BrowserNode::edition_active()) {
-        for (;;) {
-            QString f = Q3FileDialog::getSaveFileName(last_used_directory(), "*", the,
-                        0, TR("Enter a folder name, this folder will be created and will name the new project"));
+    if (!the->browser->get_project() || BrowserNode::edition_active())
+        return false;
 
-            if (!f.isEmpty()) {
-                set_last_used_directory(f);
+    for (;;) {
+        QString f = QFileDialog::getSaveFileName(
+                    the,
+                    tr("Enter a folder name, this folder will be created and will name the new project"),
+                    last_used_directory());
 
-                QDir d(f);
+        if (!f.isEmpty()) {
+            set_last_used_directory(f);
 
-                if (d.dirName() == "empty")
-                    msg_critical("Error", TR("'empty' is reserved to the empty plug-out"));
-                else {
-                    QDir di;
+            QDir d(f);
 
-                    while (!di.mkdir(f)) {
-                        if (msg_critical("Error", TR("Cannot create directory\n") + f,
-                                         QMessageBox::Retry, QMessageBox::Abort)
+            if (d.dirName() == "empty")
+                msg_critical("Error", QObject::tr("'empty' is reserved to the empty plug-out"));
+            else {
+                QDir di;
+
+                while (!di.mkdir(f)) {
+                    if (msg_critical("Error", QObject::tr("Cannot create directory\n") + f,
+                                     QMessageBox::Retry, QMessageBox::Abort)
                             != QMessageBox::Retry) {
-                            if (!strcmp(the->browser->get_project()->get_name(), "empty"))
-                                exit(0);
+                        if (!strcmp(the->browser->get_project()->get_name().toLatin1().constData(), "empty"))
+                            exit(0);
 
-                            return FALSE;
-                        }
+                        return false;
                     }
+                }
 
-                    QApplication::setOverrideCursor(::Qt::waitCursor);
-                    di.cd(f);
-                    the->ws->hide();
+                QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+                di.cd(f);
+                the->ws->hide();
 
-                    if (the->browser->save_as(di))
-                        BrowserPackage::save_all(FALSE);
+                if (the->browser->save_as(di))
+                    BrowserPackage::save_all(FALSE);
 
-                    the->ws->show();
-                    QApplication::restoreOverrideCursor();
-                    the->setCaption("DoUML : " + f);
-                    return TRUE;
-                }
+                the->ws->show();
+                QApplication::restoreOverrideCursor();
+                the->setWindowTitle("DoUML : " + f);
+                return true;
             }
-            else if (!strcmp(the->browser->get_project()->get_name(), "empty"))
-                exit(0);
-            else
-                return FALSE;
         }
+        else if (!strcmp(the->browser->get_project()->get_name().toLatin1().constData(), "empty"))
+            exit(0);
+        else
+            return false;
     }
-
-    return FALSE;
+    return false;
 }
 
 
 bool UmlWindow::can_close()
 {
     BrowserPackage * packagePtr = browser->get_project();
+    if(!packagePtr)
+        return true;
+    bool mustBeSaved = BrowserPackage::must_be_saved();
+    if(!mustBeSaved)
+        return true;
 
-    if (packagePtr) {
-        bool mustBeSaved = BrowserPackage::must_be_saved();
 
-        if (mustBeSaved) {
-            int result = msg_warning("DoUML", TR("The project is modified, save it ?\n"),
-                                     QMessageBox::Yes, QMessageBox::No, QMessageBox::Cancel);
+    if (mustBeSaved)
+    {
+        int result = msg_warning("DoUML", QObject::tr("The project is modified, save it ?\n"),
+                                 QMessageBox::Yes, QMessageBox::No, QMessageBox::Cancel);
 
-            switch (result) {
-            case QMessageBox::Yes:
-                ws->hide();
-                BrowserPackage::save_all(TRUE);
-                ws->show();
-                break;
+        switch (result)
+        {
+        case QMessageBox::Yes:
+            ws->hide();
+            BrowserPackage::save_all(TRUE);
+            ws->show();
+            break;
 
-            case QMessageBox::Cancel:
-                statusBar()->message(TR("Close aborted"), 2000);
-                return FALSE;
-            }
+        case QMessageBox::No:
+            statusBar()->showMessage(tr("Close aborted"), 2000);
+            return true;
+        case QMessageBox::Cancel:
+        {
+            statusBar()->showMessage(tr("Close aborted"), 2000);
+            return false;
+        }
         }
     }
-
-    return TRUE;
+    return true;
 }
 
 void UmlWindow::set_marked_generation()
@@ -1265,7 +1370,6 @@ void UmlWindow::set_marked_generation()
     pal.setColor(QPalette::Button, QColor(255,210,210));
     the->generateLabel->setAutoFillBackground(true);   // <--- this is the important line
     the->generateLabel->setPalette(pal);
-    QApplication::processEvents();
 }
 
 void UmlWindow::set_selected_generation()
@@ -1274,17 +1378,26 @@ void UmlWindow::set_selected_generation()
     pal.setColor(QPalette::Button, QColor(182,206,252));
     the->generateLabel->setAutoFillBackground(true);   // <--- this is the important line
     the->generateLabel->setPalette(pal);
-    QApplication::processEvents();
 }
 
 void UmlWindow::close()
 {
     abort_line_construction();
     bool editionActive = !BrowserNode::edition_active();
-    bool canClose = can_close();
-
-    if (editionActive && canClose)
+    if (quitConfirmed || // if we already confirmed then it must be because the window
+         // is being closed by the quit command, not the close project command,
+         // so don't ask again to safe if modified, the user already answered the question
+         (can_close() && editionActive))
+    {
         close_it();
+    }
+    else
+    {
+        // reset the quitConfirmed flag so that if for some reason the project did not
+        // close, then the user will, on a future close project command, be appropriately
+        // warned to save if modified.
+        quitConfirmed = false;
+    }
 }
 
 void UmlWindow::do_close()
@@ -1292,10 +1405,11 @@ void UmlWindow::do_close()
     if (the)
         the->close();
 }
-
-void UmlWindow::closeEvent(QCloseEvent *)
+void UmlWindow::closeEvent(QCloseEvent *e)
 {
     quit();
+    if(!quitConfirmed)
+        e->ignore();
 #if 0
 
     if (can_close()) {
@@ -1308,14 +1422,15 @@ void UmlWindow::closeEvent(QCloseEvent *)
 
 void UmlWindow::close_it()
 {
-    if (user_id() != 0) {
+    if (user_id() != 0)
+    {
         clear_select_historic();
 
         ToolCom::close_all();
 
         the->save_session();
 
-        QApplication::setOverrideCursor(::Qt::waitCursor);
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
         // close all diagram windows
         // do not hide ws, else a future diagram window opening will crash !
@@ -1324,13 +1439,18 @@ void UmlWindow::close_it()
 
         // empty the browser
         set_commented(0);
+        the->wdgCatalog->CleanupBeforeNewProject();
         the->browser->clear();
 
         // remove tools
-        the->toolMenu->clear();
+        if (the->isToolMenuLoaded) {
+            // Only clear the menu if it has already been loaded once, otherwise the
+            // menu is never shown on OS X if Qt is built againt Cocoa.
+            the->toolMenu->clear();
+        }
 
         QApplication::restoreOverrideCursor();
-        the->setCaption("DoUML");
+        the->setWindowTitle("DoUML");
     }
 
     Tool::init();
@@ -1350,16 +1470,33 @@ void UmlWindow::quit()
 {
     abort_line_construction();
 
-    if (!BrowserNode::edition_active() && can_close()) {
+    bool canClose = true;
+    bool editionActive = false;
+
+    Q_ASSERT(!quitConfirmed); // if this happens, then probably it was not initialized by the contructor
+
+    if ((editionActive = BrowserNode::edition_active() == false) && (canClose = can_close()) == true)
+    {
         if (browser->get_project() != 0) {
             save_session();
             BrowserView::remove_temporary_files();
             // delete lock
             set_user_id(-1);
         }
+        quitConfirmed = true;
+
+        // Call the close project command now to prevent a segmentation fault
+        // if the project was not manually closed by the user before quitting douml,
+        // i.e. if the user used the quit command with a project currently opened.
+        // (note: the segmentation fault was due to the static object 'BasicParent BasicParent::the'
+        // which is declared in 'BasicData.cpp' that still had invalid references to child items and
+        // tried to delete them in its destructor.
+        close();
 
         QApplication::exit(0);
+        return;
     }
+    quitConfirmed = canClose;
 }
 
 void UmlWindow::do_quit()
@@ -1378,44 +1515,29 @@ void UmlWindow::save_session()
 
     sprintf(fn, "%d.session", user_id());
 
-    QFile fp(d.absFilePath(fn));
+    QFile fp(d.absoluteFilePath(fn));
 
     if (open_file(fp, QIODevice::WriteOnly, TRUE) != -1) {
         QTextStream st(&fp);
 
-        st.setEncoding(QTextStream::Latin1);
+        st.setCodec("UTF-8");
 
         st << "window_sizes " << width() << " " << height() << " "
            << spl1->sizes().first() << " " << spl1->sizes().last() << " "
            << spl2->sizes().first() << " " << spl2->sizes().last() << '\n';
 
-        switch (style) {
-        case 'w':
-            st << "windows_style\n";
-            break;
+        if(!style.isEmpty())
+            st << style + "_style\n";
 
-        case 'm' :
-            st << "motif_style\n";
-            break;
-
-        case '+' :
-            st << "motifplus_style\n";
-            break;
-
-        default:
-            break;
-        }
-
-        QWidgetList windows = ws->windowList();
+        QList<QMdiSubWindow *> windows = ws->subWindowList();
 
         if (! windows.isEmpty()) {
             st << "diagrams\n";
 
             for (int i = 0; i != windows.count(); i += 1) {
-                if (ws->activeWindow() == windows.at(i))
+                if (ws->activeSubWindow() == windows.at(i))
                     st << "  active";
-
-                ((DiagramWindow *) windows.at(i))->save_session(st);
+                ((DiagramWindow *) windows.at(i)->widget())->save_session(st);
             }
 
             st << "end\n";
@@ -1431,7 +1553,6 @@ void UmlWindow::save_session()
 
     }
 }
-
 void UmlWindow::read_session()
 {
     if (user_id() <= 0)
@@ -1442,13 +1563,13 @@ void UmlWindow::read_session()
 
     sprintf(fn, "%d.session", user_id());
 
-    QFile fp(d.absFilePath(fn));
-    int size;
+    QFile fp(d.absoluteFilePath(fn));
+    qint64 size;
 
     if ((size = open_file(fp, QIODevice::ReadOnly, TRUE)) != -1) {
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) != -1) {
+        if (fp.read(s, size) != -1) {
             s[size] = 0;
 
             PRE_TRY;
@@ -1463,11 +1584,10 @@ void UmlWindow::read_session()
 
                 resize(w, h);
                 {
-                    extern QApplication * theApp;
-                    theApp->processEvents(/*500*/);
+                    qApp->processEvents(/*500*/);
                 }
 
-                Q3ValueList<int> lsz = spl1->sizes();
+                QList<int> lsz = spl1->sizes();
 
                 lsz.first() = read_unsigned(st);
                 lsz.last() = read_unsigned(st);
@@ -1481,22 +1601,14 @@ void UmlWindow::read_session()
 
                 spl2->setSizes(lsz);
                 {
-                    extern QApplication * theApp;
-                    theApp->processEvents(/*500*/);
+                    qApp->processEvents(/*500*/);
                 }
 
                 const char * k = read_keyword(st);
-
-                if (!strcmp(k, "windows_style")) {
-                    windows_style();
-                    k = read_keyword(st);
-                }
-                else if (!strcmp(k, "motif_style")) {
-                    motif_style();
-                    k = read_keyword(st);
-                }
-                else if (!strcmp(k, "motifplus_style")) {
-                    motifplus_style();
+                QString styleDetected(k);
+                if(styleDetected.endsWith("_style"))
+                {
+                    setApplicationStyle(styleDetected.remove("_style"));
                     k = read_keyword(st);
                 }
 
@@ -1557,7 +1669,6 @@ void UmlWindow::setup_generator_action_visibility()
     else
         idlAction->setVisible(false);
 }
-
 void UmlWindow::print_it()
 {
     the->print();
@@ -1567,7 +1678,9 @@ void UmlWindow::print()
 {
     abort_line_construction();
 #ifndef QT_NO_PRINTER
-    DiagramWindow * dw = ((DiagramWindow *) ws->activeWindow());
+    DiagramWindow * dw = NULL;
+    if(ws->activeSubWindow())
+        dw = ((DiagramWindow *) ws->activeSubWindow()->widget());
 
     if (dw) {
         QPrinter printer;
@@ -1587,30 +1700,34 @@ void UmlWindow::print()
             printer.setFullPage(fp);
         }
 
-        if (printer.setup(this)) {
+        QPrintDialog dialog( &printer, this );
+        if (/*printer.setup(this)*/dialog.exec() == QDialog::Accepted) {
             initialized = TRUE;
             cm = printer.colorMode();
             ps = printer.pageSize();
             fp = printer.fullPage();
 
-            Q3PopupMenu m(0);
+            QMenu m(0);
 
-            MenuFactory::createTitle(m, TR("Choose"));
-            m.insertSeparator();
-            m.insertItem(TR("Print on 1 page"), 1);
-            m.insertItem(TR("Print on 4 pages"), 2);
-            m.insertItem(TR("Print on 9 pages"), 3);
+            MenuFactory::createTitle(m, QObject::tr("Choose"));
+            m.addSeparator();
+            MenuFactory::addItem(m, tr("Print on 1 page"), 1);
+            MenuFactory::addItem(m, tr("Print on 4 pages"), 2);
+            MenuFactory::addItem(m, tr("Print on 9 pages"), 3);
 
-            int div = m.exec(QCursor::pos());
+            QAction* retAction = m.exec(QCursor::pos());
+            if(retAction)
+            {
+                int div = retAction->data().toInt();
 
-            if ((div >= 1) && (div <= 3)) {
-                QApplication::setOverrideCursor(::Qt::waitCursor);
-                dw->get_view()->print(printer, div);
-                QApplication::restoreOverrideCursor();
+                if ((div >= 1) && (div <= 3)) {
+                    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+                    dw->get_view()->print(printer, div);
+                    QApplication::restoreOverrideCursor();
+                }
             }
         }
     }
-
 #endif
 }
 
@@ -1686,30 +1803,29 @@ void UmlWindow::use_idl()
         idlAction->setVisible(false);
 
 }
-
 bool UmlWindow::using_cpp()
 {
-   return GenerationSettings::cpp_get_default_defs();
+    return GenerationSettings::cpp_get_default_defs();
 }
 
 bool UmlWindow::using_java()
 {
-   return GenerationSettings::java_get_default_defs();
+    return GenerationSettings::java_get_default_defs();
 }
 
 bool UmlWindow::using_php()
 {
-   return GenerationSettings::php_get_default_defs();
+    return GenerationSettings::php_get_default_defs();
 }
 
 bool UmlWindow::using_python()
 {
-   return GenerationSettings::python_get_default_defs();
+    return GenerationSettings::python_get_default_defs();
 }
 
 bool UmlWindow::using_idl()
 {
-   return GenerationSettings::idl_get_default_defs();
+    return GenerationSettings::idl_get_default_defs();
 }
 
 void UmlWindow::verbose()
@@ -1723,18 +1839,18 @@ void UmlWindow::preserve()
 
     if (prj != 0) {
         if (!prj->is_writable())
-            msg_critical("DoUML", TR("Unchanged : project is read-only"));
+            msg_critical("DoUML", QObject::tr("Unchanged : project is read-only"));
         else {
             toggle_preserve_bodies();
 
             if (! preserve_bodies())
                 msg_warning("DoUML",
-                            TR("Warning : <i>Preserve operations's body</i> set to false.<br><br>"
-                               "If you had modified body of operation outside DoUML without "
-                               "using <i>roundtrip body</i> after these modifications, you "
-                               "will loose them.<br>"
-                               "If needed, set <i>Preserve operations's body</i> to true, apply "
-                               "<i>roundtrip body</i>, then set <i>Preserve operations's body</i> to false"));
+                            QObject::tr("Warning : <i>Preserve operations's body</i> set to false.<br><br>"
+                                        "If you had modified body of operation outside DoUML without "
+                                        "using <i>roundtrip body</i> after these modifications, you "
+                                        "will loose them.<br>"
+                                        "If needed, set <i>Preserve operations's body</i> to true, apply "
+                                        "<i>roundtrip body</i>, then set <i>Preserve operations's body</i> to false"));
             else if (add_operation_profile())
                 toggle_add_operation_profile();
 
@@ -1749,20 +1865,20 @@ void UmlWindow::addoperationprofile()
 
     if (prj != 0) {
         if (!prj->is_writable())
-            msg_critical("DoUML", TR("Unchanged : project is read-only"));
+            msg_critical("DoUML", QObject::tr("Unchanged : project is read-only"));
         else {
             toggle_add_operation_profile();
 
             if (add_operation_profile() && preserve_bodies()) {
                 toggle_preserve_bodies();
                 msg_critical("DoUML",
-                             TR("Warning : <i>Preserve operations's body</i> toggle is cleared !<br><br>"
-                                "Next code generations will replace operations's body<br><br>"
-                                "If you had modified body of operation outside DoUML without "
-                                "using <i>roundtrip body</i> after these modifications, you "
-                                "will loose them.<br>"
-                                "If needed, set <i>Preserve operations's body</i> to true, apply "
-                                "<i>roundtrip body</i>, then set <i>Preserve operations's body</i> to false"));
+                             QObject::tr("Warning : <i>Preserve operations's body</i> toggle is cleared !<br><br>"
+                                         "Next code generations will replace operations's body<br><br>"
+                                         "If you had modified body of operation outside DoUML without "
+                                         "using <i>roundtrip body</i> after these modifications, you "
+                                         "will loose them.<br>"
+                                         "If needed, set <i>Preserve operations's body</i> to true, apply "
+                                         "<i>roundtrip body</i>, then set <i>Preserve operations's body</i> to false"));
             }
 
             prj->modified();
@@ -1780,19 +1896,16 @@ void UmlWindow::edit_shortcuts()
 void UmlWindow::edit_env()
 {
     EnvDialog::edit(FALSE);
-
     if (BrowserView::get_project() == 0)
         // id was set by reading doumlrc
         set_user_id(-1);
     else
         read_doumlrc();
 }
-
 void UmlWindow::edit_image_root_dir()
 {
-    QString s =
-        Q3FileDialog::getExistingDirectory(img_root_dir, 0, 0,
-                                           TR("Select images root directory"));
+    QString s = QFileDialog::getExistingDirectory(
+                this, tr("Select images root directory"), img_root_dir);
 
     if (! s.isEmpty()) {
         img_root_dir = s;
@@ -1804,48 +1917,46 @@ void UmlWindow::langMenuAboutToShow()
 {
     abort_line_construction();
 
-    langMenu->setItemChecked(use_cpp_id,
-                             GenerationSettings::cpp_get_default_defs());
-    langMenu->setItemChecked(use_java_id,
-                             GenerationSettings::java_get_default_defs());
-    langMenu->setItemChecked(use_php_id,
-                             GenerationSettings::php_get_default_defs());
-    langMenu->setItemChecked(use_python_id,
-                             GenerationSettings::python_get_default_defs());
-    langMenu->setItemChecked(use_idl_id,
-                             GenerationSettings::idl_get_default_defs());
-    langMenu->setItemChecked(verbose_gen_id, verbose_generation());
+    use_cpp_id->setChecked(GenerationSettings::cpp_get_default_defs());
+    use_java_id->setChecked(GenerationSettings::java_get_default_defs());
+    use_php_id->setChecked(GenerationSettings::php_get_default_defs());
+    use_python_id->setChecked(GenerationSettings::python_get_default_defs());
+    use_idl_id->setChecked(GenerationSettings::idl_get_default_defs());
+    verbose_gen_id->setChecked(verbose_generation());
 
     BrowserPackage * prj = browser->get_project();
     bool enabled = (prj != 0);
 
-    langMenu->setItemEnabled(use_cpp_id, enabled);
-    langMenu->setItemEnabled(use_java_id, enabled);
-    langMenu->setItemEnabled(use_php_id, enabled);
-    langMenu->setItemEnabled(use_python_id, enabled);
-    langMenu->setItemEnabled(use_idl_id, enabled);
-    langMenu->setItemEnabled(verbose_gen_id, enabled);
+    use_cpp_id->setEnabled(enabled);
+    use_java_id->setEnabled(enabled);
+    use_php_id->setEnabled(enabled);
+    use_python_id->setEnabled(enabled);
+    use_idl_id->setEnabled(enabled);
+    verbose_gen_id->setEnabled(enabled);
 
     if (enabled) {
-        langMenu->setItemChecked(preserve_bodies_id, preserve_bodies());
-        langMenu->setItemChecked(add_operation_profile_id, add_operation_profile());
+        preserve_bodies_id->setChecked(preserve_bodies());
+        add_operation_profile_id->setChecked( add_operation_profile());
     }
 
-    langMenu->setItemEnabled(preserve_bodies_id, enabled && prj->is_writable());
-    langMenu->setItemEnabled(add_operation_profile_id, enabled && prj->is_writable());
+    preserve_bodies_id->setEnabled(enabled
+                                   && prj->is_writable()
+                                   );
+    add_operation_profile_id->setEnabled(enabled
+                                         && prj->is_writable()
+                                         );
 }
 
 void UmlWindow::miscMenuAboutToShow()
 {
     abort_line_construction();
-
     BrowserPackage * prj = browser->get_project();
     bool enabled = (prj != 0);
-
-    miscMenu->setItemEnabled(shortcut_id, enabled);
-    miscMenu->setItemEnabled(img_root_dir_id,
-                             enabled && browser->get_project()->is_writable());
-    miscMenu->setItemEnabled(show_browser_stereotypes_id, enabled);
+    shortcut_id->setEnabled(enabled);
+    img_root_dir_id->setEnabled(enabled
+                                && browser->get_project()->is_writable()
+                                );
+    show_browser_stereotypes_id->setEnabled(enabled);
 }
 
 void UmlWindow::fontSizeMenuAboutToShow()
@@ -1855,28 +1966,28 @@ void UmlWindow::fontSizeMenuAboutToShow()
     int ps = NormalFont.pointSize();
     BrowserNode * prj = browser->get_project();
     bool enabled = (prj != 0) && prj->is_writable();
-
-    for (int i = FONTSIZEMIN; i < FONTSIZESUP; i += 1) {
-        fontSizeMenu->setItemEnabled(i, enabled);
-        fontSizeMenu->setItemChecked(i, i == ps);
-        fontSizeMenu->setWhatsThis(i, fontSizeMenuText());
+    foreach(QAction* action,fontSizeMenu->actions()){
+        action->setEnabled(enabled);
+        action->setChecked(action->text().toInt() == ps);
+        action->setWhatsThis(fontSizeMenuText());
     }
 }
 
-void UmlWindow::setFontSize(int i)
+void UmlWindow::setFontSize()
 {
+    QAction *action = static_cast<QAction *>( sender());
+    int i = action->text().toInt();
     if (i == NormalFont.pointSize())
         return;
-
     BrowserNode * prj = browser->get_project();
 
     if (prj != 0) {
         if (!prj->is_writable() &&
-            (msg_warning("DoUML",
-                         TR("Project file is read-only, new font "
-                            "size will not be saved, continue ?\n"),
-                         QMessageBox::Yes, QMessageBox::No)
-             != QMessageBox::Yes))
+                (msg_warning("DoUML",
+                             QObject::tr("Project file is read-only, new font "
+                                         "size will not be saved, continue ?\n"),
+                             QMessageBox::Yes, QMessageBox::No)
+                 != QMessageBox::Yes))
             return;
 
         prj->package_modified();
@@ -1886,16 +1997,16 @@ void UmlWindow::setFontSize(int i)
 
         // force browser redisplay
 
-        bool is_open = prj->isOpen();
+        bool is_open = prj->isExpanded();
 
         prj->setOpen(!is_open);
         prj->setOpen(is_open);
 
         // force diagrams redisplay
-        QWidgetList windows = ws->windowList();
+        QList<QMdiSubWindow *> windows = ws->subWindowList();
 
         for (i = 0; i < int(windows.count()); ++i) {
-            DiagramView * view = ((DiagramWindow *) windows.at(i))->get_view();
+            DiagramView * view = ((DiagramWindow *) windows.at(i)->widget())->get_view();
             double z = view->the_canvas()->zoom();
 
             view->set_zoom(z + 0.1);
@@ -1910,36 +2021,45 @@ void UmlWindow::formatMenuAboutToShow()
 {
     abort_line_construction();
 
-    int i;
+    //int i = IsoA0;
 
-    for (i = IsoA0; i != IsoA0Landscape; i += 1) {
-        formatMenu->setItemChecked(i, i == (int) format);
-        formatMenu->setWhatsThis(i, formatMenuText());
+    foreach(QAction* action,formatMenu->actions())
+    {
+        //for (i = IsoA0; i != IsoA0Landscape; i += 1) {
+        action->setChecked( action->data().toInt() == (int) format);
+        action->setWhatsThis(formatMenuText());
+        //}
+        //i++;
     }
-
-    for (; i != CanvasFormatSup; i += 1) {
-        formatLandscapeMenu->setItemChecked(i, i == (int) format);
-        formatLandscapeMenu->setWhatsThis(i, formatMenuText());
+    foreach(QAction* action,formatLandscapeMenu->actions())
+    {
+        //for (; i != CanvasFormatSup; i += 1) {
+        action->setChecked(action->data().toInt()== (int) format);
+        action->setWhatsThis(formatMenuText());
+        //}
     }
 }
 
-void UmlWindow::setFormat(int i)
+void UmlWindow::setFormat()
 {
+    QAction* action = static_cast<QAction*>(sender());
+    int i = action->data().toInt();
     BrowserNode * prj = browser->get_project();
 
     if (prj != 0) {
         if (!prj->is_writable() &&
-            (msg_warning("DoUML",
-                         TR("Project file is read-only, default "
-                            "format will not be saved, continue ?\n"),
-                         QMessageBox::Yes, QMessageBox::No)
-             != QMessageBox::Yes))
+                (msg_warning("DoUML",
+                             QObject::tr("Project file is read-only, default "
+                                         "format will not be saved, continue ?\n"),
+                             QMessageBox::Yes, QMessageBox::No)
+                 != QMessageBox::Yes))
             return;
 
         format = (CanvasFormat) i;
 
         prj->package_modified();
     }
+
 }
 
 void UmlWindow::set_default_format(CanvasFormat f)
@@ -1947,16 +2067,17 @@ void UmlWindow::set_default_format(CanvasFormat f)
     the->format = f;
 }
 
-
 void UmlWindow::browser_search()
 {
     abort_line_construction();
-
     if (browser->get_project() != 0) {
         if (BrowserSearchDialog::get() == 0)
             (new BrowserSearchDialog())->show();
         else
+        {
+            BrowserSearchDialog::get()->show();
             BrowserSearchDialog::get()->raise();
+        }
     }
 }
 
@@ -1967,49 +2088,29 @@ void UmlWindow::browser_search_it()
 
 void UmlWindow::show_stereotypes()
 {
-    miscMenu->setItemChecked(show_browser_stereotypes_id,
-                             BrowserNode::toggle_show_stereotypes());
+    //miscMenu->setItemChecked(show_browser_stereotypes_id,
+    //                       BrowserNode::toggle_show_stereotypes());
+    show_browser_stereotypes_id->setChecked(BrowserNode::toggle_show_stereotypes());
 }
-
 void UmlWindow::do_completion()
 {
     bool cmpltn = !completion();
 
-    miscMenu->setItemChecked(completion_id, cmpltn);
+    //miscMenu->setItemChecked(completion_id, cmpltn);
+    completion_id->setChecked(cmpltn);
     set_completion(cmpltn);
 }
 
-void UmlWindow::motif_style()
-{
-#ifndef QT_NO_STYLE_MOTIF
-    QApplication::setStyle(new QMotifStyle);
-    style = 'm';
-#endif
-}
-
-void UmlWindow::motifplus_style()
+void UmlWindow::setApplicationStyleSlot()
 {
-#define QT_NO_STYLE_MOTIFPLUS
-#ifndef QT_NO_STYLE_MOTIFPLUS
-    QApplication::setStyle(new QMotifPlusStyle);
-    style = '+';
-#endif
+    QAction *action = static_cast<QAction*>(sender());
+    setApplicationStyle(action->text());
 }
 
-//void UmlWindow::sgi_style() {
-//  QApplication::setStyle(new QSGIStyle);
-//}
-//
-//void UmlWindow::cde_style() {
-//  QApplication::setStyle(new QCDEStyle);
-//}
-
-void UmlWindow::windows_style()
+void UmlWindow::setApplicationStyle(QString s)
 {
-#ifndef QT_NO_STYLE_WINDOWS
-    QApplication::setStyle(new QWindowsStyle);
-    style = 'w';
-#endif
+    QApplication::setStyle(s);
+    style = s;
 }
 
 
@@ -2026,8 +2127,8 @@ void UmlWindow::cpp_generate()
     if (prj != 0)
         ToolCom::run((verbose_generation())
                      ? ((preserve) ? "cpp_generator -v -p" : "cpp_generator -v")
-                         : ((preserve) ? "cpp_generator -p" : "cpp_generator"),
-                         prj);
+                     : ((preserve) ? "cpp_generator -p" : "cpp_generator"),
+                     prj);
 }
 
 void UmlWindow::java_generate()
@@ -2038,8 +2139,8 @@ void UmlWindow::java_generate()
     if (prj != 0)
         ToolCom::run((verbose_generation())
                      ? ((preserve) ? "java_generator -v -p" : "java_generator -v")
-                         : ((preserve) ? "java_generator -p" : "java_generator"),
-                         prj);
+                     : ((preserve) ? "java_generator -p" : "java_generator"),
+                     prj);
 }
 
 void UmlWindow::php_generate()
@@ -2050,8 +2151,8 @@ void UmlWindow::php_generate()
     if (prj != 0)
         ToolCom::run((verbose_generation())
                      ? ((preserve) ? "php_generator -v -p" : "php_generator -v")
-                         : ((preserve) ? "php_generator -p" : "php_generator"),
-                         prj);
+                     : ((preserve) ? "php_generator -p" : "php_generator"),
+                     prj);
 }
 
 void UmlWindow::python_generate()
@@ -2062,8 +2163,8 @@ void UmlWindow::python_generate()
     if (prj != 0)
         ToolCom::run((verbose_generation())
                      ? ((preserve) ? "python_generator -v -p" : "python_generator -v")
-                         : ((preserve) ? "python_generator -p" : "python_generator"),
-                         prj);
+                     : ((preserve) ? "python_generator -p" : "python_generator"),
+                     prj);
 }
 
 void UmlWindow::idl_generate()
@@ -2185,8 +2286,10 @@ void UmlWindow::plug_out_upgrade()
         ToolCom::run("plug_out_upgrade", prj);
 }
 
-void UmlWindow::run_tool(int param)
+void UmlWindow::run_tool()
 {
+    QAction *action = static_cast<QAction*>( sender());
+    int param = action->data().toInt();
     BrowserPackage * prj = browser->get_project();
 
     if (prj != 0)
@@ -2214,11 +2317,11 @@ void UmlWindow::help()
         read_doumlrc();
 
     const char * topic =
-        (browser->get_project() == 0)
-        ? "starting"
-        : ((BrowserView::selected_item() == 0)
-           ? "browseritems"
-           : BrowserView::selected_item()->help_topic());
+            (browser->get_project() == 0)
+            ? "starting"
+            : ((BrowserView::selected_item() == 0)
+               ? "browseritems"
+               : BrowserView::selected_item()->help_topic());
 
     HelpDialog::show(topic);
 
@@ -2245,109 +2348,138 @@ void UmlWindow::windowsMenuAboutToShow()
 
     windowsMenu->clear();
 
-    int cascadeId = windowsMenu->insertItem(TR("&Cascade"), ws, SLOT(cascade()));
-    int tileId = windowsMenu->insertItem(TR("&Tile"), ws, SLOT(tile()));
-    int preferredId = windowsMenu->insertItem(TR("&Preferred geometry"), this, SLOT(preferred_geometry()));
-    int closeAllId = windowsMenu->insertItem(TR("C&lose all"), this, SLOT(close_all_windows()));
+    QAction* cascadeId = windowsMenu->addAction(tr("&Cascade"), ws, SLOT(cascadeSubWindows()));
+    QAction*  tileId = windowsMenu->addAction(tr("&Tile"), ws, SLOT(tileSubWindows()));
+    QAction*  preferredId = windowsMenu->addAction(tr("&Preferred geometry"), this, SLOT(preferred_geometry()));
+    QAction*  closeAllId = windowsMenu->addAction(tr("C&lose all"), this, SLOT(close_all_windows()));
 
-    QWidgetList windows = ws->windowList();
+    QList<QMdiSubWindow *>  windows = ws->subWindowList();
 
     if (windows.isEmpty()) {
+        /*
         windowsMenu->setItemEnabled(cascadeId, FALSE);
         windowsMenu->setItemEnabled(tileId, FALSE);
         windowsMenu->setItemEnabled(preferredId, FALSE);
         windowsMenu->setItemEnabled(closeAllId, FALSE);
+        */
+        cascadeId->setEnabled(false);
+        tileId->setEnabled(false);
+        preferredId->setEnabled(false);
+        closeAllId->setEnabled(false);
     }
     else {
-        windowsMenu->insertSeparator();
+        windowsMenu->addSeparator();
 
         for (int i = 0; i < int(windows.count()); ++i) {
-            int id = windowsMenu->insertItem(windows.at(i)->caption(),
-                                             this, SLOT(windowsMenuActivated(int)));
-            windowsMenu->setItemParameter(id, i);
-            windowsMenu->setItemChecked(id, ws->activeWindow() == windows.at(i));
+            QAction* id = windowsMenu->addAction(windows.at(i)->windowTitle(),
+                                                 this, SLOT(windowsMenuActivated()));
+            //windowsMenu->setItemParameter(id, i);
+            id->setData(i);
+            id->setChecked(ws->activeSubWindow() == windows.at(i));
+            //windowsMenu->setItemChecked(id, ws->activeWindow() == windows.at(i));
         }
     }
 
-    windows = dialogs();
+    QWidgetList widgets = dialogs();
 
-    if (! windows.isEmpty()) {
-        windowsMenu->insertSeparator();
+    if (! widgets.isEmpty()) {
+        windowsMenu->addSeparator();
 
-        for (int j = 0; j < int(windows.count()); ++j) {
-            int id = windowsMenu->insertItem(windows.at(j)->caption(),
-                                             this, SLOT(dialogsMenuActivated(int)));
-            windowsMenu->setItemParameter(id, j);
+        for (int j = 0; j < int(widgets.count()); ++j) {
+            QAction* id = windowsMenu->addAction(widgets.at(j)->windowTitle(),
+                                                 this, SLOT(dialogsMenuActivated()));
+            id->setData(j);
+            // windowsMenu->setItemParameter(id, j);
         }
     }
 }
 
 void UmlWindow::preferred_geometry()
 {
-    QWidgetList l = the->ws->windowList();
+    QList<QMdiSubWindow *> l = the->ws->subWindowList();
     QWidget * w;
 
     //for (w = l.first(); w != 0; w = l.next())
-    for (QWidgetList::iterator it = l.begin(); it != l.end(); it++) {
-        w = *it; // qlist no longer is a iterator itself
+
+    for (QList<QMdiSubWindow *>::iterator it = l.begin(); it != l.end(); it++) {
+        w = (*it)->widget(); // qlist no longer is a iterator itself
         ((DiagramWindow *) w)->get_view()->preferred_size_zoom();
     }
 }
 
 void UmlWindow::close_all_windows()
 {
-    QWidgetList l = the->ws->windowList();
+    QList<QMdiSubWindow *> l = the->ws->subWindowList();
     QWidget * w;
 
-    for (QWidgetList::iterator it = l.begin(); it != l.end(); it++) {
-        w = *it; // qlist no longer is a iterator itself
-        ((DiagramWindow *) w)->close();
+    for (QList<QMdiSubWindow *>::iterator it = l.begin(); it != l.end(); it++) {
+        w = (*it); // qlist no longer is a iterator itself
+        /*((DiagramWindow *))*/ w->close();
     }
 
-    l = dialogs();
+    QList<QWidget *> listDialogs = dialogs();
 
-    for (QWidgetList::iterator it = l.begin(); it != l.end(); it++) {
-        w = *it; // qlist no longer is a iterator itself
+    for (QList<QWidget *>::iterator it = listDialogs.begin(); it != listDialogs.end(); it++) {
+        w = (*it); // qlist no longer is a iterator itself
         w->close();
     }
 }
 
-void UmlWindow::windowsMenuActivated(int id)
+void UmlWindow::windowsMenuActivated()
 {
-    QWidget * w = ws->windowList().at(id);
+    QAction* act = static_cast<QAction*>(sender());
+    if(act)
+    {
+        int id = act->data().toInt();
+        QMdiSubWindow * w = ws->subWindowList().at(id);
 
-    if (w) {
-        w->showNormal();
-        w->setFocus();
+        if (w) {
+            w->showNormal();
+            w->setFocus();
+        }
     }
 }
 
-void UmlWindow::dialogsMenuActivated(int id)
+void UmlWindow::dialogsMenuActivated()
 {
-    QWidget * w = dialogs().at(id);
 
-    if (w) {
-        w->showNormal();
-        w->raise();
+    QAction* act = static_cast<QAction*>(sender());
+    if(act)
+    {
+        int id = act->data().toInt();
+        QWidget * w = dialogs().at(id);
+
+        if (w) {
+            w->showNormal();
+            w->raise();
+        }
     }
+
 }
 
 void UmlWindow::abort_line_construction()
 {
-    QWidgetList l = the->ws->windowList();
+    QList<QMdiSubWindow *> l = the->ws->subWindowList();
+
     QWidget * w;
 
-    for (QWidgetList::iterator it = l.begin(); it != l.end(); it++) {
+    /*for (QWidgetList::iterator it = l.begin(); it != l.end(); it++) {
         w = *it; // qlist no longer is a iterator itself
         ((DiagramWindow *) w)->get_view()->abort_line_construction();
+    }*/
+    for (QList<QMdiSubWindow *>::iterator it = l.begin(); it != l.end(); it++) {
+        w = (*it)->widget(); // qlist no longer is a iterator itself
+        if(w)
+            ((DiagramWindow *) w)->get_view()->abort_line_construction();
     }
+
 }
 
 //
 
 void UmlWindow::keyPressEvent(QKeyEvent * e)
 {
-    QString s = Shortcut::shortcut(e->key(), e->state());
+    QString s = Shortcut::shortcut(e->key(), e->modifiers());
 
     if (!s.isEmpty()) {
         e->accept();
@@ -2369,6 +2501,44 @@ void UmlWindow::keyPressEvent(QKeyEvent * e)
         QMainWindow::keyPressEvent(e);
 }
 
+void UmlWindow::OnPickSelectionFromItem(const QModelIndex & current, const QModelIndex &)
+{
+    TreeItemInterface *itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* itemAsNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+    itemAsNode->select_in_browser();
+}
+
+void UmlWindow::OnChooseQuickEditMode(QTreeWidgetItem* item, QTreeWidgetItem* old)
+{
+    Q_UNUSED(old);
+
+    if (!item)
+        return;
+
+    BrowserNode* itemAsNode = static_cast<BrowserNode*>(item);
+    if(!itemAsNode)
+        return;
+    if(quickEdit->ValidType(itemAsNode))
+        tbQuickEdit->setEnabled(true);
+    else
+        tbQuickEdit->setEnabled(false);
+
+}
+
+void UmlWindow::OnShowQuickEdit()
+{
+    if(quickEdit->isVisible())
+        quickEdit->close();
+    else
+        quickEdit->OnShow();
+}
+
+void UmlWindow::OnCallClipboardMenu()
+{
+    An<ClipboardManager> clipboard;
+    clipboard->GetMenuInstance()->popup(QCursor::pos());
+}
+
 void UmlWindow::whats_this() const
 {
     QWhatsThis::enterWhatsThisMode();
@@ -2376,16 +2546,16 @@ void UmlWindow::whats_this() const
 
 //
 
-static bool OnHistoric = FALSE;
-static Q3ValueList<BrowserNode *>::Iterator HistoricIterator;
+static QList<BrowserNode *>::Iterator HistoricIterator;
 
+static bool OnHistoric = FALSE;
 void UmlWindow::clear_select_historic()
 {
     the->select_historic.clear();
     HistoricIterator = the->select_historic.end();
 
-    the->prev->setPixmap(*leftUnavailablePixmap);
-    the->next->setPixmap(*rightUnavailablePixmap);
+    the->prev->setIcon(QIcon(*leftUnavailablePixmap));
+    the->next->setIcon(QIcon(*rightUnavailablePixmap));
 }
 
 void UmlWindow::is_selected(BrowserNode * bn)
@@ -2394,52 +2564,61 @@ void UmlWindow::is_selected(BrowserNode * bn)
         OnHistoric = FALSE;
     else if ((HistoricIterator == select_historic.end()) ||
              (*HistoricIterator != bn)) {
-        ++HistoricIterator;
+        if ((HistoricIterator != select_historic.end()))
+            ++HistoricIterator;
 
         while (HistoricIterator != select_historic.end())
-            HistoricIterator = select_historic.remove(HistoricIterator);
+        {
+            HistoricIterator = select_historic.erase(HistoricIterator);
+        }
 
         if (select_historic.count() == 50)
-            select_historic.remove(select_historic.first());
+            select_historic.removeOne(select_historic.first());
 
         select_historic.append(bn);
         HistoricIterator = select_historic.end();
         --HistoricIterator;
 
-        prev->setPixmap((HistoricIterator != select_historic.begin())
-                        ? *leftPixmap : *leftUnavailablePixmap);
-        next->setPixmap(*rightUnavailablePixmap);
+        prev->setIcon((HistoricIterator != select_historic.begin())
+                      ? *leftPixmap : *leftUnavailablePixmap);
+        next->setIcon(*rightUnavailablePixmap);
     }
 }
 
 void UmlWindow::next_select()
 {
-    if (++HistoricIterator != select_historic.end()) {
-        OnHistoric = TRUE;
-        browser->select(*HistoricIterator);
+    if(select_historic.count())
+    {
+        if (++HistoricIterator != select_historic.end()) {
+            OnHistoric = TRUE;
+            browser->select(*HistoricIterator);
+
+            the->prev->setIcon(*leftPixmap);
+            ++HistoricIterator;
+            the->next->setIcon((HistoricIterator != select_historic.end())
+                               ? *rightPixmap : *rightUnavailablePixmap);
+        }
 
-        the->prev->setPixmap(*leftPixmap);
-        ++HistoricIterator;
-        the->next->setPixmap((HistoricIterator != select_historic.end())
-                             ? *rightPixmap : *rightUnavailablePixmap);
+        --HistoricIterator;
     }
-
-    --HistoricIterator;
 }
 
 void UmlWindow::prev_select()
 {
-    if (HistoricIterator != select_historic.begin()) {
-        OnHistoric = TRUE;
-        browser->select(*--HistoricIterator);
+    if(select_historic.count())
+    {
+        if (HistoricIterator != select_historic.begin()) {
+            OnHistoric = TRUE;
+            browser->select(*--HistoricIterator);
 
-        the->prev->setPixmap((HistoricIterator != select_historic.begin())
-                             ? *leftPixmap : *leftUnavailablePixmap);
-        the->next->setPixmap(*rightPixmap);
+            the->prev->setIcon((HistoricIterator != select_historic.begin())
+                               ? *leftPixmap : *leftUnavailablePixmap);
+            the->next->setIcon(*rightPixmap);
+        }
     }
 }
-
 void UmlWindow::historic_forget(BrowserNode * bn)
 {
-    the->select_historic.remove(bn);
+    the->select_historic.removeOne(bn);
 }
+
diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h
index dbffcb7fd..3030e95c9 100644
--- a/src/diagram/UmlWindow.h
+++ b/src/diagram/UmlWindow.h
@@ -32,22 +32,27 @@
 #include <qstringlist.h>
 //Added by qt3to4:
 #include <QCloseEvent>
-#include <Q3ValueList>
-#include <Q3PopupMenu>
+//#include <QList>
+////#include <QMenu>
 #include <QLabel>
 #include <QKeyEvent>
 #include <QMainWindow>
+#include <QSharedPointer>
+#include <QModelIndex>
+#include <functional>
+#include <QMdiArea>
+//#include "Libs/L_UniversalModels/include/ItemController.h"
 
-class Q3CanvasView;
+class QGraphicsView;
 class QWorkspace;
 class QToolBar;
-class Q3PopupMenu;
 class QSplitter;
 class QToolButton;
 
 class BrowserView;
 class BrowserNode;
 class MultiLineEdit;
+class QuickEdit;
 
 #include "UmlEnum.h"
 
@@ -55,6 +60,14 @@ class MultiLineEdit;
 
 /* This class seems to be responsible for the main Project, with Open,
  * Save, Close, etc... It is the main window */
+class QTreeView;
+class QTabWidget;
+class TreeItemInterface;
+class TreeModel;
+class QLineEdit;
+class QTreeWidgetItem;
+class CatalogWidget;
+class QShortcut;
 class UmlWindow : public QMainWindow
 {
     Q_OBJECT
@@ -62,19 +75,33 @@ class UmlWindow : public QMainWindow
 protected:
     static UmlWindow * the;
 
-    QWorkspace * ws;
-    BrowserView * browser;
+    QMdiArea  * ws = nullptr;
+
+    BrowserView * browser = nullptr;
+    BrowserView * dummyBrowser = nullptr;
+    // perverted stuff
+    QSplitter* splTreeTab = nullptr;
+    CatalogWidget* wdgCatalog = nullptr;
+    void SetupTreeModel();
+    void SetupTreeController();
+    void PerformFiltering();
+    QList<std::function<bool (TreeItemInterface *)> > CreateCheckList();
+
+    QuickEdit* quickEdit = nullptr;
+    QShortcut* sh1;
+    // end of perverted stuff
     MultiLineEdit * comment;
     BrowserNode * commented;	// the commented object
     QToolBar * projectTools;
-    Q3PopupMenu * projectMenu;
-    Q3PopupMenu * windowsMenu;
-    Q3PopupMenu * toolMenu;
-    Q3PopupMenu * langMenu;
-    Q3PopupMenu * miscMenu;
-    Q3PopupMenu * fontSizeMenu;
-    Q3PopupMenu * formatMenu;
-    Q3PopupMenu * formatLandscapeMenu;
+    QMenu * projectMenu;
+    QMenu * windowsMenu;
+    QMenu * toolMenu;
+	bool isToolMenuLoaded;
+    QMenu * langMenu;
+    QMenu * miscMenu;
+    QMenu * fontSizeMenu;
+    QMenu * formatMenu;
+    QMenu * formatLandscapeMenu;
     QAction* cppAction = nullptr;
     QAction* javaAction = nullptr;
     QAction* phpAction = nullptr;
@@ -82,33 +109,36 @@ class UmlWindow : public QMainWindow
     QAction* idlAction = nullptr;
     QAction* generateLabelAction = nullptr;
     QLabel* generateLabel = nullptr;
-    int use_cpp_id;
-    int use_java_id;
-    int use_php_id;
-    int use_python_id;
-    int use_idl_id;
-    int verbose_gen_id;
-    int preserve_bodies_id;
-    int add_operation_profile_id;
-    int shortcut_id;
-    int img_root_dir_id;
-    int show_browser_stereotypes_id;
-    int completion_id;
+    QAction* use_cpp_id;
+    QAction* use_java_id;
+    QAction* use_php_id;
+    QAction* use_python_id;
+    QAction* use_idl_id;
+    QAction*  verbose_gen_id;
+    QAction*  preserve_bodies_id;
+    QAction*  add_operation_profile_id;
+    QAction*  shortcut_id;
+    QAction*  img_root_dir_id;
+    QAction*  show_browser_stereotypes_id;
+    QAction*  completion_id;
     QStringList historic;
+
     CanvasFormat format;
     QString img_root_dir;
     QSplitter * spl1;
     QSplitter * spl2;
-    char style;	// '?' unknown, 'm' = motif, '+' = motif+, 'w' = windows
+    QString style;
     QToolButton * prev;
     QToolButton * next;
-    Q3ValueList<BrowserNode *> select_historic;
-
+    QToolButton * tbClipboard = nullptr;
+    QToolButton * tbQuickEdit = nullptr;
+    QList<BrowserNode *> select_historic;
+    bool quitConfirmed = false;
 public:
     UmlWindow(bool batch);
     virtual ~UmlWindow();
 
-    void load(QString fn, bool forcesaveas = FALSE);
+
     bool can_close();
     static void set_marked_generation();
     static void set_selected_generation();
@@ -116,41 +146,45 @@ class UmlWindow : public QMainWindow
     static void set_commented(BrowserNode * bn);
     static void update_comment_if_needed(BrowserNode * bn);
     static void set_message(const QString &);
-    static QWorkspace * get_workspace();
     static void clear();
-    static void historic_add(QString fn);
     static void historic_forget(BrowserNode *);
     static void save_it();
     static bool saveas_it();
-    static void close_it();
     static void do_close();
     static void do_quit();
+    static void historic_add(QString fn);
+    static void close_it();
+    void load(QString fn, bool forcesaveas = FALSE);
+    static QMdiArea * get_workspace();
     static void load_it();
     static void load_it(QString fn);
     static void reload_it();
-    static CanvasFormat default_format();
+    static void abort_line_construction();
     static void set_default_format(CanvasFormat);
+    static CanvasFormat default_format();
     static QString images_root_dir();
     static void set_images_root_dir(QString);
-    static void abort_line_construction();
     static void clear_select_historic();
+
     static void browser_search_it();
     static void print_it();
-
 protected:
-    void init_format_menu(Q3PopupMenu * m, Q3PopupMenu * lm);
+    void init_format_menu(QMenu * m, QMenu * lm);
+
     void is_selected(BrowserNode *);
-    virtual void closeEvent(QCloseEvent *);
+    virtual void closeEvent(QCloseEvent *) override;
     void save_session();
-    void read_session();
-    void setup_generator_action_visibility();
 
+    void setup_generator_action_visibility();
+    void read_session();
 private slots:
+    void saveAs();
+    void save();
     void newProject();
     void newFromTemplate();
     void load();
-    void save();
-    void saveAs();
+
+
     void print();
     void close();
     void quit();
@@ -168,32 +202,28 @@ private slots:
     void use_php();
     void use_python();
     void use_idl();
+
+    void verbose();
+    void preserve();
+    void addoperationprofile();
+    void edit_shortcuts();
     bool using_cpp();
     bool using_java();
     bool using_php();
     bool using_python();
     bool using_idl();
-    void verbose();
-    void preserve();
-    void addoperationprofile();
-    void edit_shortcuts();
     void edit_env();
-    void edit_image_root_dir();
-
-    void motif_style();
-    void motifplus_style();
-    //void sgi_style();
-    //void cde_style();
-    void windows_style();
-
+    void setApplicationStyleSlot();
     void show_stereotypes();
-
-    void do_completion();
-
     void about();
     void aboutQt();
     void help();
 
+     void edit_image_root_dir();
+    void do_completion();
+
+
+
     void show_trace();
     void cpp_generate();
     void java_generate();
@@ -212,38 +242,43 @@ private slots:
     void java_roundtripbody();
     void php_roundtripbody();
     void python_roundtripbody();
-    void run_tool(int param);
+    void plug_out_upgrade();
+
+    void run_tool();
     void tool_settings();
     void import_tool_settings();
-    void plug_out_upgrade();
 
-    void comment_changed();
+
     void preferred_geometry();
     void close_all_windows();
 
-    void toolMenuAboutToShow();
+    void comment_changed();
+    void historicActivated();
     void projectMenuAboutToShow();
-    void historicActivated(int id);
+    void toolMenuAboutToShow();
 
     void langMenuAboutToShow();
 
     void miscMenuAboutToShow();
 
     void fontSizeMenuAboutToShow();
-    void setFontSize(int);
+    void setFontSize();
 
     void formatMenuAboutToShow();
-    void setFormat(int);
-
+    void setFormat();
     void windowsMenuAboutToShow();
-    void windowsMenuActivated(int id);
-    void dialogsMenuActivated(int id);
-
-    virtual void keyPressEvent(QKeyEvent * e);
-
+    void windowsMenuActivated();
+    void dialogsMenuActivated();
+    virtual void keyPressEvent(QKeyEvent * e) override;
 public slots:
     void whats_this() const;
-
+    void OnPickSelectionFromItem(const QModelIndex&,const QModelIndex& );
+    void OnChooseQuickEditMode(QTreeWidgetItem *item, QTreeWidgetItem *old);
+    void OnShowQuickEdit();
+    void OnCallClipboardMenu();
+private:
+    void setApplicationStyle(QString s);
+    //void OnCallQuickEdit();
 
 };
 
diff --git a/src/diagram/UseCaseDiagramView.cpp b/src/diagram/UseCaseDiagramView.cpp
index b52059bea..09f6677dd 100644
--- a/src/diagram/UseCaseDiagramView.cpp
+++ b/src/diagram/UseCaseDiagramView.cpp
@@ -31,7 +31,7 @@
 
 #include <qapplication.h>
 #include <qfont.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QTextStream>
 #include <QDropEvent>
@@ -42,17 +42,18 @@
 #include "UseCaseDiagramView.h"
 #include "BrowserUseCaseDiagram.h"
 #include "DiagramCanvas.h"
-#include "UcUseCaseCanvas.h"
-#include "PackageCanvas.h"
 #include "FragmentCanvas.h"
-#include "SubjectCanvas.h"
-#include "UcClassCanvas.h"
 #include "IconCanvas.h"
 #include "RelationCanvas.h"
+#include "SubjectCanvas.h"
+#include "UcUseCaseCanvas.h"
 #include "SimpleRelationCanvas.h"
-#include "NoteCanvas.h"
 #include "TextCanvas.h"
 #include "ImageCanvas.h"
+#include "PackageCanvas.h"
+#include "UcClassCanvas.h"
+#include "ArrowCanvas.h"
+#include "NoteCanvas.h"
 #include "UmlPixmap.h"
 #include "UmlDrag.h"
 #include "BrowserClass.h"
@@ -62,7 +63,7 @@
 #include "BrowserView.h"
 #include "RelatedElementsDialog.h"
 #include "translate.h"
-
+#include <QList>
 UseCaseDiagramView::UseCaseDiagramView(QWidget * parent, UmlCanvas * canvas, int id)
     : DiagramView(parent, canvas, id)
 {
@@ -70,13 +71,10 @@ UseCaseDiagramView::UseCaseDiagramView(QWidget * parent, UmlCanvas * canvas, int
 }
 
 // have marked elements not yet drawn ?
-static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
+static bool marked_not_yet_drawn(QHash<BasicData*, DiagramItem*> & drawn)
 {
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
-    Q3PtrListIterator<BrowserNode> it(l);
-    BrowserNode * bn;
-
-    for (; (bn = it.current()) != 0; ++it) {
+    const QList<BrowserNode *> & l = BrowserNode::marked_nodes();
+    foreach (BrowserNode *bn, l) {
         UmlCode k = bn->get_type();
 
         switch (k) {
@@ -92,46 +90,44 @@ static bool marked_not_yet_drawn(Q3PtrDict<DiagramItem> & drawn)
                 return TRUE;
         }
     }
-
     return FALSE;
 }
 
-static void get_drawn(DiagramItemList & items,
-                      Q3PtrDict<DiagramItem> & drawn)
+static void get_drawn(QList<DiagramItem*> & items,
+                      QHash<BasicData*, DiagramItem *> & drawn)
 {
-    DiagramItem * di;
-
-    for (di = items.first(); di != 0; di = items.next()) {
-        UmlCode k = di->type();
+    foreach (DiagramItem *di, items) {
+        UmlCode k = di->typeUmlCode();
 
         switch (k) {
         case UmlClass:
         case UmlPackage:
         case UmlUseCase:
-            drawn.replace(di->get_bn()->get_data(), di);
+            drawn.insert(di->get_bn()->get_data(), di);
             break;
 
         default:
             if (IsaRelation(k) || IsaSimpleRelation(k))
-                drawn.replace(((ArrowCanvas *) di)->get_data(), di);
+                drawn.insert(((ArrowCanvas *) di)->get_data(), di);
         }
     }
 }
 
 void UseCaseDiagramView::menu(const QPoint & p)
 {
-    Q3PopupMenu m(0);
 
-    MenuFactory::createTitle(m, TR("Use case diagram menu"));
+    QMenu m(0);
+
+    MenuFactory::createTitle(m, QObject::tr("Use case diagram menu"));
 
     if ((((UmlCanvas *) canvas())->browser_diagram())->is_writable()) {
-        DiagramItemList items(canvas()->allItems());
-        Q3PtrDict<DiagramItem> drawn;
+        DiagramItemList items(canvas()->items());
+        QHash<BasicData*, DiagramItem*> drawn;
 
         get_drawn(items, drawn);
 
         if (marked_not_yet_drawn(drawn))
-            m.insertItem(TR("Add marked elements"), 28);
+            MenuFactory::addItem(m,  tr("Add marked elements"), 28);
 
         switch (default_menu(m, 30)) {
         case EDIT_DRAWING_SETTING_CMD:
@@ -158,9 +154,9 @@ void UseCaseDiagramView::menu(const QPoint & p)
 const int Diagram_Margin = 20;
 
 void UseCaseDiagramView::add_marked_elements(const QPoint & p,
-        Q3PtrDict<DiagramItem> & drawn)
+                                             QHash<BasicData*, DiagramItem*> & drawn)
 {
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
     history_save();
     history_protected = TRUE;
@@ -170,15 +166,14 @@ void UseCaseDiagramView::add_marked_elements(const QPoint & p,
     int x = p.x();
     int y = p.y();
     int future_y = y;
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
-    Q3PtrListIterator<BrowserNode> it(l);
-    BrowserNode * bn;
+    const QList<BrowserNode *> & l = BrowserNode::marked_nodes();
 
-    for (; (bn = it.current()) != 0; ++it) {
+    foreach (BrowserNode *bn, l) {
         if (drawn[bn->get_data()] == 0) {
             DiagramCanvas * dc;
 
             switch (bn->get_type()) {
+
             case UmlClass:
                 dc = new UcClassCanvas(bn, the_canvas(), x, y, 0);
                 break;
@@ -186,22 +181,20 @@ void UseCaseDiagramView::add_marked_elements(const QPoint & p,
             case UmlPackage:
                 dc = new PackageCanvas(bn, the_canvas(), x, y, 0);
                 break;
-
             case UmlUseCase:
                 dc = new UcUseCaseCanvas(bn, the_canvas(), x, y, 0);
                 break;
-
             default:
                 continue;
             }
 
-            drawn.replace(dc->get_bn()->get_data(), dc);
+            drawn.insert(dc->get_bn()->get_data(), dc);
 
             if ((x + dc->width()) > xmax)
-                dc->move(x = Diagram_Margin, y = future_y);
+                dc->moveBy(x = Diagram_Margin, y = future_y);
 
             if (y + dc->height() > ymax) {
-                dc->move(x = Diagram_Margin, y = Diagram_Margin);
+                dc->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                 future_y = y + dc->height() + Diagram_Margin;
             }
             else {
@@ -221,10 +214,9 @@ void UseCaseDiagramView::add_marked_elements(const QPoint & p,
     UmlCanvas * cnv = (UmlCanvas *) canvas();
 
     if (! cnv->must_draw_all_relations()) {
-        for (it.toFirst(); (bn = it.current()) != 0; ++it) {
+        foreach (BrowserNode *bn, l) {
             if (drawn[bn->get_data()] == 0) {
                 UmlCode k = bn->get_type();
-
                 if (IsaRelation(k))
                     RelationCanvas::drop(bn, cnv, drawn);
                 else if (IsaSimpleRelation(k))
@@ -236,12 +228,12 @@ void UseCaseDiagramView::add_marked_elements(const QPoint & p,
     canvas()->update();
     history_protected = FALSE;
     window()->package_modified();
-
     QApplication::restoreOverrideCursor();
+
 }
 
 void UseCaseDiagramView::add_related_elements(DiagramItem  * di, QString what,
-        bool inh, bool assoc)
+                                              bool inh, bool assoc)
 {
     BrowserNodeList l;
     RelatedElementsDialog dialog(di->get_bn(), what, inh, assoc, l);
@@ -249,10 +241,10 @@ void UseCaseDiagramView::add_related_elements(DiagramItem  * di, QString what,
     dialog.raise();
 
     if (dialog.exec() == QDialog::Accepted) {
-        QApplication::setOverrideCursor(Qt::waitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
 
-        DiagramItemList items(canvas()->allItems());
-        Q3PtrDict<DiagramItem> drawn;
+        DiagramItemList items(canvas()->items());
+        QHash<BasicData *,DiagramItem*> drawn;
 
         get_drawn(items, drawn);
         history_save();
@@ -264,10 +256,8 @@ void UseCaseDiagramView::add_related_elements(DiagramItem  * di, QString what,
         int x = re.x();
         int y = re.bottom() + Diagram_Margin;
         int future_y = y;
-        Q3PtrListIterator<BrowserNode> it(l);
-        BrowserNode * bn;
 
-        for (; (bn = it.current()) != 0; ++it) {
+        foreach (BrowserNode *bn, l) {
             if (drawn[bn->get_data()] == 0) {
                 DiagramCanvas * dc;
 
@@ -288,13 +278,13 @@ void UseCaseDiagramView::add_related_elements(DiagramItem  * di, QString what,
                     continue;
                 }
 
-                drawn.replace(dc->get_bn()->get_data(), dc);
+                drawn.insert(dc->get_bn()->get_data(), dc);
 
                 if ((x + dc->width()) > xmax)
-                    dc->move(x = Diagram_Margin, y = future_y);
+                    dc->moveBy(x = Diagram_Margin, y = future_y);
 
                 if (y + dc->height() > ymax) {
-                    dc->move(x = Diagram_Margin, y = Diagram_Margin);
+                    dc->moveBy(x = Diagram_Margin, y = Diagram_Margin);
                     future_y = y + dc->height() + Diagram_Margin;
                 }
                 else {
@@ -319,8 +309,11 @@ void UseCaseDiagramView::add_related_elements(DiagramItem  * di, QString what,
     }
 }
 
-void UseCaseDiagramView::contentsMousePressEvent(QMouseEvent * e)
+void UseCaseDiagramView::mousePressEvent(QMouseEvent * e)
 {
+
+    QPoint diagramPoint(e->x(), e->y());
+    QPointF scenePoint = mapToScene(diagramPoint);
     if (!window()->frozen()) {
         UmlCode action = window()->buttonOn();
 
@@ -332,19 +325,20 @@ void UseCaseDiagramView::contentsMousePressEvent(QMouseEvent * e)
             history_save();
 
             BrowserNode * b =
-                BrowserClass::get_class(((BrowserNode *) window()->browser_diagram()->parent()),
-                                        "actor");
+                    BrowserClass::get_class(((BrowserNode *) window()->browser_diagram()->parent()),
+                                            "actor");
 
             if (b != 0) {
                 UcClassCanvas * uc =
-                    new UcClassCanvas(b, the_canvas(), e->x(), e->y(), 0);
+                        new UcClassCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y(), 0);
 
                 uc->show();
                 uc->upper();
                 window()->package_modified();
+
             }
         }
-        break;
+            break;
 
         case UmlUseCase: {
             history_protected = TRUE;
@@ -353,78 +347,98 @@ void UseCaseDiagramView::contentsMousePressEvent(QMouseEvent * e)
             history_save();
 
             BrowserNode * b =
-                BrowserUseCase::get_use_case(((BrowserNode *) window()->browser_diagram()->parent()));
+                    BrowserUseCase::get_use_case(((BrowserNode *) window()->browser_diagram()->parent()));
 
             if (b != 0) {
                 UcUseCaseCanvas * uc =
-                    new UcUseCaseCanvas(b, the_canvas(), e->x(), e->y(), 0);
+                        new UcUseCaseCanvas(b, the_canvas(), scenePoint.x(), scenePoint.y(), 0);
                 uc->show();
                 uc->upper();
                 window()->package_modified();
             }
         }
-        break;
+            break;
 
         case UmlSubject: {
             unselect_all();
             window()->selectOn();
             history_save();
-
             SubjectCanvas * f =
-                new SubjectCanvas(the_canvas(), e->x(), e->y(), 0);
-
+                    new SubjectCanvas(the_canvas(), scenePoint.x(), scenePoint.y(), 0);
             f->show();
             f->upper();
+
             window()->package_modified();
         }
-        break;
+            break;
 
         default:
-            DiagramView::contentsMousePressEvent(e);
+            DiagramView::mousePressEvent(e);
             return;
         }
-
         canvas()->update();
         history_protected = FALSE;
     }
     else
-        DiagramView::contentsMousePressEvent(e);
+        DiagramView::mousePressEvent(e);
 }
 
 void UseCaseDiagramView::dragEnterEvent(QDragEnterEvent * e)
 {
     abort_line_construction();
-
     if (!window()->frozen() &&
-        (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
-         UmlDrag::canDecode(e, UmlUseCase, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlRelations, TRUE, TRUE) ||
-         UmlDrag::canDecode(e, UmlSimpleRelations, TRUE, TRUE) ||
-         UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
-         UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
-         UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
+            (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlUseCase, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlRelations, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlSimpleRelations, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
         e->accept();
     else
         e->ignore();
 }
 
+
+void UseCaseDiagramView::dragMoveEvent(QDragMoveEvent * e)
+{
+    abort_line_construction();
+    if (!window()->frozen() &&
+            (UmlDrag::canDecode(e, UmlClass, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlUseCase, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlPackage, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlRelations, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlSimpleRelations, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlClassDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlUseCaseDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlSeqDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlColDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlObjectDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlComponentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlDeploymentDiagram, FALSE, TRUE) ||
+             UmlDrag::canDecode(e, UmlActivityDiagram, TRUE, TRUE) ||
+             UmlDrag::canDecode(e, UmlStateDiagram, TRUE, TRUE)))
+        e->accept();
+    else
+        e->ignore();
+}
 void UseCaseDiagramView::dropEvent(QDropEvent * e)
 {
     BrowserNode * bn;
-    QPoint p = viewportToContents(e->pos());
+
+    QPointF p = mapToScene(e->pos());
 
     if ((bn = UmlDrag::decode(e, UmlClass)) != 0) {
         history_save();
-
         UcClassCanvas * uc =
-            new UcClassCanvas(bn, the_canvas(), p.x(), p.y(), 0);
+                new UcClassCanvas(bn, the_canvas(), p.x(), p.y(), 0);
 
         history_protected = TRUE;
         uc->show();
@@ -435,9 +449,8 @@ void UseCaseDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlUseCase)) != 0) {
         history_save();
-
         UcUseCaseCanvas * uc =
-            new UcUseCaseCanvas(bn, the_canvas(), p.x(), p.y(), 0);
+                new UcUseCaseCanvas(bn, the_canvas(), p.x(), p.y(), 0);
 
         history_protected = TRUE;
         uc->show();
@@ -448,9 +461,8 @@ void UseCaseDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlPackage)) != 0) {
         history_save();
-
         PackageCanvas * pk =
-            new PackageCanvas(bn, the_canvas(), p.x(), p.y(), 0);
+                new PackageCanvas(bn, the_canvas(), p.x(), p.y(), 0);
 
         history_protected = TRUE;
         pk->show();
@@ -460,7 +472,6 @@ void UseCaseDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlRelations, TRUE)) != 0) {
         history_save();
-
         history_protected = TRUE;
         RelationCanvas::drop(bn, the_canvas());
         canvas()->update();
@@ -468,7 +479,6 @@ void UseCaseDiagramView::dropEvent(QDropEvent * e)
     }
     else if ((bn = UmlDrag::decode(e, UmlSimpleRelations, TRUE)) != 0) {
         history_save();
-
         history_protected = TRUE;
         SimpleRelationCanvas::drop(bn, the_canvas());
         canvas()->update();
@@ -484,7 +494,6 @@ void UseCaseDiagramView::dropEvent(QDropEvent * e)
              ((bn = UmlDrag::decode(e, UmlStateDiagram, TRUE)) != 0) ||
              ((bn = UmlDrag::decode(e, UmlActivityDiagram, TRUE)) != 0)) {
         history_save();
-
         IconCanvas * ic = new IconCanvas(bn, the_canvas(), p.x(), p.y(), 0);
 
         history_protected = TRUE;
@@ -499,49 +508,58 @@ void UseCaseDiagramView::dropEvent(QDropEvent * e)
 void UseCaseDiagramView::save(QTextStream & st, QString & warning,
                               bool copy) const
 {
-    DiagramItemList items(canvas()->allItems());
-    DiagramItem * di;
 
+    QList<QGraphicsItem *> items = canvas()->items();
     if (!copy)
         // sort is useless for a copy
-        items.sort();
-
+        std::sort(items.begin(), items.end());
     st << "format " << api_format() << "\n";
 
     // save first class use_cases packages fragment subject notes and icons
 
-    for (di = items.first(); di != 0; di = items.next()) {
-        switch (di->type()) {
-        case UmlClass:
-        case UmlUseCase:
-        case UmlNote:
-        case UmlText:
-        case UmlImage:
-        case UmlPackage:
-        case UmlFragment:
-        case UmlSubject:
-        case UmlIcon:
-            if (!copy || di->copyable())
-                di->save(st, FALSE, warning);
+    for (int i = 0; i< items.count(); i++)
+    {
+        DiagramItem *di = QCanvasItemToDiagramItem(items.at(i));
+        if(di)
+        {
+            switch (di->typeUmlCode()) {
+            case UmlClass:
+            case UmlUseCase:
+            case UmlNote:
+            case UmlText:
+            case UmlImage:
+            case UmlPackage:
+            case UmlFragment:
+            case UmlSubject:
+            case UmlIcon:
+                if (!copy || di->copyable())
+                    di->save(st, FALSE, warning);
 
-            // no break
-        default:
-            break;
+                // no break
+            default:
+                break;
+            }
         }
     }
-
     // then saves relations
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) &&
-            (IsaRelation(di->type()) || IsaSimpleRelation(di->type())))
+    for (int i = 0; i< items.count(); i++)
+    {
+        DiagramItem *di = QCanvasItemToDiagramItem(items.at(i));
+        if (di && (!copy || di->copyable()) &&
+                (IsaRelation(di->typeUmlCode()) || IsaSimpleRelation(di->typeUmlCode())))
             di->save(st, FALSE, warning);
+    }
 
     // then saves anchors
 
-    for (di = items.first(); di != 0; di = items.next())
-        if ((!copy || di->copyable()) && (di->type() == UmlAnchor))
+    for (int i = 0; i< items.count(); i++)
+    {
+        DiagramItem *di = QCanvasItemToDiagramItem(items.at(i));//(DiagramItem *)items.at(i);
+        if(di)
+        if ((!copy || di->copyable()) && (di->typeUmlCode() == UmlAnchor))
             di->save(st, FALSE, warning);
+    }
 
     if (!copy && (preferred_zoom != 0)) {
         nl_indent(st);
@@ -556,17 +574,16 @@ void UseCaseDiagramView::save(QTextStream & st, QString & warning,
 void UseCaseDiagramView::read(char * st, char * k)
 {
     UmlCanvas * canvas = the_canvas();
-
     // reads first the class use_cases package icons, notes text and image
     while (UcClassCanvas::read(st, canvas, k) ||
-           UcUseCaseCanvas::read(st, canvas, k) ||
            NoteCanvas::read(st, canvas, k) ||
-           TextCanvas::read(st, canvas, k) ||
-           IconCanvas::read(st, canvas, k) ||
            PackageCanvas::read(st, canvas, k) ||
+           UcUseCaseCanvas::read(st, canvas, k) ||
+           IconCanvas::read(st, canvas, k) ||
            FragmentCanvas::read(st, canvas, k) ||
            SubjectCanvas::read(st, canvas, k) ||
-           ImageCanvas::read(st, canvas, k))
+           ImageCanvas::read(st, canvas, k)||
+           TextCanvas::read(st, canvas, k))
         k = read_keyword(st);
 
     // then reads relations and anchors
@@ -590,12 +607,13 @@ void UseCaseDiagramView::read(char * st, char * k)
 
 void UseCaseDiagramView::send(ToolCom * com)
 {
-    Q3CanvasItemList l = canvas()->allItems();
-    Q3PtrList<FragmentCanvas> fragments;
-    Q3PtrList<FragmentCanvas> refs;
 
+    QList<QGraphicsItem*> l = canvas()->items();
+    QList<FragmentCanvas *> fragments;
+    QList<FragmentCanvas *> refs;
     FragmentCanvas::send(com, l, fragments, refs);
     SubjectCanvas::send(com, l);
     UcUseCaseCanvas::send(com, l);
+
 }
 
diff --git a/src/diagram/UseCaseDiagramView.h b/src/diagram/UseCaseDiagramView.h
index 53908fa89..6d5c4df4b 100644
--- a/src/diagram/UseCaseDiagramView.h
+++ b/src/diagram/UseCaseDiagramView.h
@@ -27,14 +27,14 @@
 
 #ifndef USECASEDIAGRAMVIEW_H
 #define USECASEDIAGRAMVIEW_H
-
+#include <QList>
 #include "DiagramView.h"
 //Added by qt3to4:
 #include <QTextStream>
 #include <QMouseEvent>
 #include <QDropEvent>
 #include <QDragEnterEvent>
-
+#include "BasicData.h"
 template <class K> class Q3PtrDict;
 
 class UseCaseDiagramWindow;
@@ -49,11 +49,11 @@ class UseCaseDiagramView : public DiagramView
 public:
     UseCaseDiagramView(QWidget * parent, UmlCanvas * canvas, int id);
 
-    virtual void menu(const QPoint &);
+    virtual void menu(const QPoint &) override;
     virtual void add_related_elements(DiagramItem *, QString what,
-                                      bool inh, bool assoc);
-    virtual void read(char *, char * k);
-    virtual void save(QTextStream & st, QString & warning, bool copy) const;
+                                      bool inh, bool assoc) override;
+    virtual void read(char *, char * k) override;
+    virtual void save(QTextStream & st, QString & warning, bool copy) const override;
 
     void send(ToolCom * com);
 
@@ -62,12 +62,13 @@ class UseCaseDiagramView : public DiagramView
         return (UseCaseDiagramWindow *) parent();
     }
     void add_marked_elements(const QPoint & p,
-                             Q3PtrDict<DiagramItem> & drawn);
+                             QHash<BasicData *, DiagramItem *> &drawn);
 
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent *);
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dropEvent(QDropEvent *);
+    virtual void mousePressEvent(QMouseEvent *) override;
+    virtual void dragEnterEvent(QDragEnterEvent *) override;
+    virtual void dropEvent(QDropEvent *) override;
+    virtual void dragMoveEvent(QDragMoveEvent *e) override;
 };
 
 #endif
diff --git a/src/diagram/UseCaseDiagramWindow.cpp b/src/diagram/UseCaseDiagramWindow.cpp
index 0c74404a1..831c86aeb 100644
--- a/src/diagram/UseCaseDiagramWindow.cpp
+++ b/src/diagram/UseCaseDiagramWindow.cpp
@@ -30,13 +30,13 @@
 
 
 #include <qapplication.h>
-#include <qworkspace.h>
-#include <q3toolbar.h>
+#include <QMdiArea>
+#include <QToolBar>
 #include <qtoolbutton.h>
-#include <q3whatsthis.h>
+#include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qspinbox.h>
-
+#include "toolbarfactory.h"
 #include "UmlWindow.h"
 #include "UseCaseDiagramWindow.h"
 #include "UseCaseDiagramView.h"
@@ -44,144 +44,146 @@
 #include "UmlPixmap.h"
 #include "myio.h"
 #include "translate.h"
+#include <QHBoxLayout>
 
 QString addactorText()
 {
-    return TR("Click this button to add an <i>actor</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add an <i>actor</i> in the diagram. <br><br>"
               "You can also drop the class from the <b>browser</b>.");
 }
 QString addusecaseText()
 {
-    return TR("Click this button to add an <i>use case</i> in the diagram. <br><br>"
+    return QObject::tr("Click this button to add an <i>use case</i> in the diagram. <br><br>"
               "You can also drop the use case from the <b>browser</b>.");
 }
 extern QString addpackageText();
 QString addfragmentText()
 {
-    return TR("Click this button to add a <i>fragment</i>.");
+    return QObject::tr("Click this button to add a <i>fragment</i>.");
 }
 QString addsubjectText()
 {
-    return TR("Click this button to add a <i>subject</i>.");
+    return QObject::tr("Click this button to add a <i>subject</i>.");
 }
 QString associationText()
 {
-    return TR("Click this button to create an <i>association</i>");
+    return QObject::tr("Click this button to create an <i>association</i>");
 }
 extern QString dependencyText();
 QString inheritText()
 {
-    return TR("Click this button to create a <i>generalisation</i>");
+    return QObject::tr("Click this button to create a <i>generalisation</i>");
 }
 QString noteText()
 {
-    return TR("Click this button to create a <i>note</i>");
+    return QObject::tr("Click this button to create a <i>note</i>");
 }
 QString anchorText()
 {
-    return TR("Click this button to create a connection between a "
+    return QObject::tr("Click this button to create a connection between a "
               "<i>note</i> and any other item, or between an <i>association</i> "
               "and a <i>class</i> in case of an <i>association class</i>.");
 }
 extern QString textText();
 QString imageText()
 {
-    return TR("Click this button to add an <i>image</i>");
+    return QObject::tr("Click this button to add an <i>image</i>");
 }
 
 // id is an old ident in case of an import
 UseCaseDiagramWindow::UseCaseDiagramWindow(const QString & s, BrowserUseCaseDiagram * b, int id)
     : DiagramWindow(b, s), view(0)
 {
-    Q3ToolBar * toolbar = new Q3ToolBar(this, "use case operations");
-    addToolBar(toolbar, TR("Toolbar"), Qt::DockTop, TRUE);
-
+    QToolBar * toolbar = new QToolBar("use case operations",this);
+    toolbar->setMinimumHeight(50);
+    toolbar->setOrientation(Qt::Horizontal);
+    addToolBar(Qt::TopToolBarArea, toolbar);
     add_edit_button(toolbar);
-
     select =
-        new QToolButton(*selectButton, TR("Select"), QString(),
+        ToolBarFactory::createToolButton(*selectButton, QObject::tr("Select"), QString(),
                         this, SLOT(hit_select()), toolbar, "select");
-    select->setToggleButton(TRUE);
-    select->setOn(TRUE);
-    current_button = UmlSelect;
+    select->setCheckable(TRUE);
+
 
+    current_button = UmlSelect;
     addClass =
-        new QToolButton(*actorButton, TR("Actor"), QString(),
+        ToolBarFactory::createToolButton(*actorButton, QObject::tr("Actor"), QString(),
                         this, SLOT(hit_class()), toolbar, "actor");
-    addClass->setToggleButton(TRUE);
-    Q3WhatsThis::add(addClass, addactorText());
+    addClass->setCheckable(TRUE);
+    addClass->setWhatsThis(addactorText());
 
     addUseCase =
-        new QToolButton(*usecaseButton, TR("Use Case"), QString(),
+        ToolBarFactory::createToolButton(*usecaseButton, QObject::tr("Use Case"), QString(),
                         this, SLOT(hit_usecase()), toolbar, "use case");
-    addUseCase->setToggleButton(TRUE);
-    Q3WhatsThis::add(addUseCase, addusecaseText());
+    addUseCase->setCheckable(TRUE);
+    addUseCase->setWhatsThis( addusecaseText());
 
     addSubject
-        = new QToolButton(*subjectButton, TR("Add Subject"), QString(),
+        = ToolBarFactory::createToolButton(*subjectButton, QObject::tr("Add Subject"), QString(),
                           this, SLOT(hit_subject()), toolbar, "add subject");
-    addSubject->setToggleButton(TRUE);
-    Q3WhatsThis::add(addSubject, addsubjectText());
+    addSubject->setCheckable(TRUE);
+    addSubject->setWhatsThis( addsubjectText());
 
     addPackage
-        = new QToolButton(*packageButton, TR("Add Package"), QString(),
+        = ToolBarFactory::createToolButton(*packageButton, QObject::tr("Add Package"), QString(),
                           this, SLOT(hit_package()), toolbar, "add package");
-    addPackage->setToggleButton(TRUE);
-    Q3WhatsThis::add(addPackage, addpackageText());
+    addPackage->setCheckable(TRUE);
+    addPackage->setWhatsThis( addpackageText());
 
     addFragment
-        = new QToolButton(*fragmentButton, TR("Add Fragment"), QString(),
+        = ToolBarFactory::createToolButton(*fragmentButton, QObject::tr("Add Fragment"), QString(),
                           this, SLOT(hit_fragment()), toolbar, "add fragment");
-    addFragment->setToggleButton(TRUE);
-    Q3WhatsThis::add(addFragment, addfragmentText());
+    addFragment->setCheckable(TRUE);
+    addFragment->setWhatsThis( addfragmentText());
 
     association =
-        new QToolButton(*associationButton, TR("Association"), QString(),
+        ToolBarFactory::createToolButton(*associationButton, QObject::tr("Association"), QString(),
                         this, SLOT(hit_association()), toolbar, "association");
-    association->setToggleButton(TRUE);
-    Q3WhatsThis::add(association, associationText());
+    association->setCheckable(TRUE);
+    association->setWhatsThis( associationText());
 
     directionalassociation =
-        new QToolButton(*directionalAssociationButton, TR("Association"), QString(),
+        ToolBarFactory::createToolButton(*directionalAssociationButton, QObject::tr("Association"), QString(),
                         this, SLOT(hit_directionalassociation()), toolbar, "association");
-    directionalassociation->setToggleButton(TRUE);
-    Q3WhatsThis::add(directionalassociation, associationText());
+    directionalassociation->setCheckable(TRUE);
+    directionalassociation->setWhatsThis( associationText());
 
     dependency =
-        new QToolButton(*dependencyButton, TR("Dependency"), QString(),
+        ToolBarFactory::createToolButton(*dependencyButton, QObject::tr("Dependency"), QString(),
                         this, SLOT(hit_dependency()), toolbar, "dependency");
-    dependency->setToggleButton(TRUE);
-    Q3WhatsThis::add(dependency, dependencyText());
+    dependency->setCheckable(TRUE);
+    dependency->setWhatsThis( dependencyText());
 
     inherit =
-        new QToolButton(*generalisationButton, TR("Generalisation"), QString(),
+        ToolBarFactory::createToolButton(*generalisationButton, QObject::tr("Generalisation"), QString(),
                         this, SLOT(hit_inherit()), toolbar, "generalisation");
-    inherit->setToggleButton(TRUE);
-    Q3WhatsThis::add(inherit, inheritText());
+    inherit->setCheckable(TRUE);
+    inherit->setWhatsThis( inheritText());
 
     note =
-        new QToolButton(*noteButton, TR("Note"), QString(),
+        ToolBarFactory::createToolButton(*noteButton, QObject::tr("Note"), QString(),
                         this, SLOT(hit_note()), toolbar, "note");
-    note->setToggleButton(TRUE);
-    Q3WhatsThis::add(note, noteText());
+    note->setCheckable(TRUE);
+    note->setWhatsThis( noteText());
 
     anchor =
-        new QToolButton(*anchorButton, TR("Anchor"), QString(),
+        ToolBarFactory::createToolButton(*anchorButton, QObject::tr("Anchor"), QString(),
                         this, SLOT(hit_anchor()), toolbar, "anchor");
-    anchor->setToggleButton(TRUE);
-    Q3WhatsThis::add(anchor, anchorText());
+    anchor->setCheckable(TRUE);
+    anchor->setWhatsThis( anchorText());
 
     text =
-        new QToolButton(*textButton, TR("Text"), QString(),
+        ToolBarFactory::createToolButton(*textButton, QObject::tr("Text"), QString(),
                         this, SLOT(hit_text()), toolbar, "text");
-    text->setToggleButton(TRUE);
-    Q3WhatsThis::add(text, textText());
+    text->setCheckable(TRUE);
+    text->setWhatsThis( textText());
 
     image =
-        new QToolButton(*imageButton, TR("Image"), QString(),
+        ToolBarFactory::createToolButton(*imageButton, QObject::tr("Image"), QString(),
                         this, SLOT(hit_image()), toolbar, "image");
-    image->setToggleButton(TRUE);
-    Q3WhatsThis::add(image, imageText());
+    image->setCheckable(TRUE);
+
+    image->setWhatsThis( imageText());
 
     toolbar->addSeparator();
 
@@ -195,9 +197,8 @@ UseCaseDiagramWindow::UseCaseDiagramWindow(const QString & s, BrowserUseCaseDiag
 
     //qApp->setMainWidget(this);
 
-    QWorkspace * w = UmlWindow::get_workspace();
-
-    resize((w->width() * 4) / 5, (w->height() * 4) / 5);
+    QMdiArea * w = UmlWindow::get_workspace();
+    m_containingSubWindow->resize((w->width() * 4) / 5, (w->height() * 4) / 5);
 
     /*if (w->windowList().isEmpty())
       showMaximized();
@@ -206,6 +207,7 @@ UseCaseDiagramWindow::UseCaseDiagramWindow(const QString & s, BrowserUseCaseDiag
 
     view->preferred_size_zoom();
 
+
     //qApp->setMainWidget(0);
 }
 
@@ -215,10 +217,17 @@ UseCaseDiagramWindow::~UseCaseDiagramWindow()
         QString warning = "!";
         BooL is_new = FALSE;
 
+        //habip hidden items means deleted. So delete them not to save
+        QList<QGraphicsItem*> itList = canvas->items();
+        for(int i= itList.size() -1; i>=0; i--)
+        {
+            DiagramItem *di = QCanvasItemToDiagramItem(itList.at(i));
+            if(di && !itList.at(i)->isVisible())
+                delete di;
+        }
         save("d", warning, is_new);
         warning.remove(0, 1);	// removes !
         view->hide();
-
         if (!warning.isEmpty())
             warn(warning);
     }
@@ -235,22 +244,22 @@ void UseCaseDiagramWindow::hit_button(UmlCode c, QToolButton * b)
 {
     view->abort_line_construction();
 
-    select->setOn(FALSE);
-    addClass->setOn(FALSE);
-    addPackage->setOn(FALSE);
-    addFragment->setOn(FALSE);
-    addSubject->setOn(FALSE);
-    addUseCase->setOn(FALSE);
-    association->setOn(FALSE);
-    directionalassociation->setOn(FALSE);
-    dependency->setOn(FALSE);
-    inherit->setOn(FALSE);
-    note->setOn(FALSE);
-    anchor->setOn(FALSE);
-    text->setOn(FALSE);
-    image->setOn(FALSE);
-
-    b->setOn(TRUE);
+    select->setChecked(FALSE);
+    addClass->setChecked(FALSE);
+    addPackage->setChecked(FALSE);
+    addFragment->setChecked(FALSE);
+    addSubject->setChecked(FALSE);
+    addUseCase->setChecked(FALSE);
+    association->setChecked(FALSE);
+    directionalassociation->setChecked(FALSE);
+    dependency->setChecked(FALSE);
+    inherit->setChecked(FALSE);
+    note->setChecked(FALSE);
+    anchor->setChecked(FALSE);
+    text->setChecked(FALSE);
+    image->setChecked(FALSE);
+
+    b->setChecked(TRUE);
     current_button = c;
 }
 
diff --git a/src/diagram/UseCaseDiagramWindow.h b/src/diagram/UseCaseDiagramWindow.h
index 5801586d0..675f53d05 100644
--- a/src/diagram/UseCaseDiagramWindow.h
+++ b/src/diagram/UseCaseDiagramWindow.h
@@ -26,7 +26,7 @@
 // *************************************************************************
 
 #ifndef USECASEDIAGRAMWINDOW_H
-#define USECASEDISGRAMWINDOW_H
+#define USECASEDIAGRAMWINDOW_H
 
 #include "DiagramWindow.h"
 
@@ -60,9 +60,9 @@ class UseCaseDiagramWindow : public DiagramWindow
     UseCaseDiagramWindow(const QString & s, BrowserUseCaseDiagram * b, int id = -1);
     virtual ~UseCaseDiagramWindow();
 
-    virtual DiagramView * get_view() const;
+    virtual DiagramView * get_view() const override;
 
-    virtual void hit_button(UmlCode, QToolButton *);
+    virtual void hit_button(UmlCode, QToolButton *) override;
 
 protected slots:
     void hit_class();
diff --git a/src/dialog/About.cpp b/src/dialog/About.cpp
index 3f8a62267..3f208b65b 100644
--- a/src/dialog/About.cpp
+++ b/src/dialog/About.cpp
@@ -25,70 +25,137 @@
 //
 // *************************************************************************
 
-
-
-
-
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3textview.h>
+#include <QTextEdit>
 #include <qpushbutton.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 #include <QPixmap>
-#include <Q3HBoxLayout>
-
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QTabWidget>
 #include "About.h"
-#include "bp_xpm.xpm"
 #include "UmlDesktop.h"
 #include "translate.h"
+#include "version.h"
 
-AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE)
+AboutDialog::AboutDialog() : QDialog(0/*, "About DoUML", TRUE*/)
 {
-    setCaption(TR("About DoUML"));
-    //move(p);
+    setWindowTitle(tr("About DoUML"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
+    hbox->setMargin(5);
+
+    QPixmap pix(QPixmap(QString(":/douml.png")));
+    QColor backgroundColor = palette().light().color();
+    backgroundColor.setAlpha(200);
+    QPainter p(&pix);
+    p.setFont(QFont("Arial", 14, QFont::Black));
+    p.setPen( Qt::black );
+    p.drawText( p.window(), Qt::AlignCenter, QString(DOUML_VERSION));
+    p.end();
+
+    QLabel * lbp = new QLabel(this);
+    QPalette palette;
+    QBrush brush(Qt::lightGray);
+    palette.setBrush(QPalette::Active, QPalette::Window, brush);
+    lbp->setPalette(palette);
+    lbp->setAutoFillBackground(true);
+
+    lbp->setPixmap(pix);
+    hbox->addWidget(lbp);
+
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
+    lbp = new QLabel(this);
+    lbp->setText(QString("Build: \" %1 %2\" - Qt version " QT_VERSION_STR).arg(DOUML_BUILD_DATE).arg(DOUML_BUILD_TIME));
+    hbox->addWidget(lbp);
 
-    QPixmap bp((const char **) bp_xpm);
-    // QLabel * lbp = new QLabel(this);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
+    QTabWidget *tabs = new QTabWidget(this);
 
-    // lbp->setPixmap(bp);
-    //  hbox->addWidget(lbp);
-    hbox->addWidget(new QLabel("  ", this));
-    // Replacing about to bouml-ng
-    const char htmltext[] = "<p>DoUML</p>\n"
+    // Description
+
+    QWidget *page_description = new QWidget;
+
+    hbox = new QHBoxLayout;
+    hbox->setMargin(5);
+
+    const char htmltext_description[] = "<p>DoUML</p>\n"
                             "<p>This project is a fork of\n"
                             "Bruno Pages's work, BoUML:\n"
-                            "<i>http://sourceforge.net/projects/douml/</i></p>\n"
-                            "<p>DoUML focus is to port BoUML to Qt4\n"
+                            "<i>http://sourceforge.net/projects/bouml/</i></p>\n"
+                            "<p>DoUML focus is to port BoUML to Qt5\n"
                             "and to maintain it as a community</p>\n"
                             "<p>Join us at:<br>\n"
-                            "https://github.com/leonardo2d/douml/<br>\n"
+                            "https://github.com/DoUML/douml<br>\n"
                             "#bdouml@irc.freenode.net</p>\n\n\n";
 
-    Q3TextView * tx =
-        new Q3TextView(htmltext, QString(), this);
+    QTextEdit * tx_description = new QTextEdit(htmltext_description, this);
+    QFont fnt_description = tx_description->font();
+    tx_description->setReadOnly(true);
+
+    fnt_description.setItalic(TRUE);
+
+    QFontMetrics fm_description(fnt_description);
+
+    tx_description->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff );
+    tx_description->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    tx_description->setMinimumSize(fm_description.size(0, htmltext_description));
+
+    hbox->addWidget(tx_description);
+
+    page_description->setLayout(hbox);
+
+    // License
+
+    QWidget *page_license = new QWidget;
+
+    hbox = new QHBoxLayout;
+    hbox->setMargin(5);
+
+    const char htmltext[] = "This program is licensed under the terms of the GNU General Public\n"
+                            "License version 3\n\n"
+                            "Available online under:\n"
+                            "http://www.gnu.org/licenses/gpl-3.0.html";
+
+    QTextEdit * tx = new QTextEdit(htmltext, this);
     QFont fnt = tx->font();
 
     fnt.setItalic(TRUE);
 
     QFontMetrics fm(fnt);
 
-    tx->setVScrollBarMode(Q3ScrollView::AlwaysOff);
-    tx->setHScrollBarMode(Q3ScrollView::AlwaysOff);
+    tx->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff );
+    tx->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     tx->setMinimumSize(fm.size(0, htmltext));
+    tx->setReadOnly(true);
+
     hbox->addWidget(tx);
 
-    hbox = new Q3HBoxLayout(vbox);
+    page_license->setLayout(hbox);
+
+    // Build tabs
+
+    tabs->addTab(page_description, "Description");
+    tabs->addTab(page_license, "License");
+    vbox->addWidget(tabs);
+
+    // Build button
+
+    hbox = new QHBoxLayout(this);
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
+    QPushButton * ok = new QPushButton(tr("&OK"), this);
 
     ok->setDefault(TRUE);
 
diff --git a/src/dialog/About.h b/src/dialog/About.h
index 156f09d96..b24526ff1 100644
--- a/src/dialog/About.h
+++ b/src/dialog/About.h
@@ -32,6 +32,7 @@
 
 class AboutDialog : public QDialog
 {
+    Q_OBJECT
 public:
     AboutDialog();
 };
diff --git a/src/dialog/ActivityActionDialog.cpp b/src/dialog/ActivityActionDialog.cpp
index 4f7f6ea4e..3efb796e6 100644
--- a/src/dialog/ActivityActionDialog.cpp
+++ b/src/dialog/ActivityActionDialog.cpp
@@ -29,18 +29,14 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3buttongroup.h>
+#include <qcombobox.h>
+#include <bbuttongroup.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
 #include "ActivityActionDialog.h"
 #include "BrowserActivityAction.h"
 #include "BrowserClass.h"
@@ -59,6 +55,7 @@
 #include "GenerationSettings.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
+#include "menufactory.h"
 
 QSize ActivityActionDialog::previous_size;
 
@@ -67,16 +64,15 @@ static QString pretty_kind(UmlActionKind k)
     QString s = stringify(k);
     int index = 0;
 
-    while ((index = s.find('_', index)) != -1)
+    while ((index = s.indexOf('_', index)) != -1)
         s.replace(index, 1, " ");
 
     return s;
 }
 
-static Q3Grid * mkgrid(Q3TabDialog * d, const char * name = 0)
+static GridBox * mkgrid(TabDialog * d, QString name = QString())
 {
-    Q3Grid * grid = new Q3Grid(2, d, name);
-
+    GridBox * grid = new GridBox(2, d, name);
     grid->setMargin(5);
     grid->setSpacing(5);
 
@@ -84,27 +80,27 @@ static Q3Grid * mkgrid(Q3TabDialog * d, const char * name = 0)
 }
 
 ActivityActionDialog::ActivityActionDialog(ActivityActionData * a)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), act(a)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), act(a)
 {
     a->browser_node->edit_start();
 
     if (a->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("Activity Action dialog"));
+    setWindowTitle(tr("Activity Action dialog"));
     visit = !hasOkButton();
 
     current_type = act->get_action_kind();
 
     BrowserActivityAction * action =
-        (BrowserActivityAction *) a->get_browser_node();
-    Q3Grid * grid;
+            (BrowserActivityAction *) a->get_browser_node();
+    GridBox * grid;
 
     //
     // general tab
@@ -113,65 +109,72 @@ ActivityActionDialog::ActivityActionDialog(ActivityActionData * a)
     grid = mkgrid(this);
     umltab = grid;
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(action->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(action->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(action->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(action->get_stereotype()));
 
     if (!visit) {
-        edstereotype->insertStringList(BrowserActivityAction::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlActivityAction));
+        edstereotype->addItems(BrowserActivityAction::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlActivityAction));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    new QLabel(TR("kind : "), grid);
-    edtype = new Q3ComboBox(FALSE, grid);
+    grid->addWidget(new QLabel(tr("kind : "), grid));
+    grid->addWidget(edtype = new QComboBox(grid));
 
     if (visit) {
         // action kind cannot be changed
-        edtype->insertItem(pretty_kind(current_type));
+        edtype->addItem(pretty_kind(current_type));
     }
     else {
         int index;
 
         for (index = UmlOpaqueAction; index <= UmlReduceAction; index += 1) {
-            edtype->insertItem(pretty_kind((UmlActionKind) index));
+            edtype->addItem(pretty_kind((UmlActionKind) index));
 
             if (index == (int) current_type)
-                edtype->setCurrentItem(index);
+                edtype->setCurrentIndex(index);
         }
 
         connect(edtype, SIGNAL(activated(int)), this, SLOT(edTypeActivated(int)));
     }
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
+    SmallPushButton* sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
 
-    comment = new MultiLineEdit(grid);
+    vtab->addWidget(sButton);
+    }
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(action->get_comment());
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("constraint :"), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("constraint :"), vtab));
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_constraint()));
+        vtab->addWidget(sButton);
     }
 
-    constraint = new MultiLineEdit(grid);
+    grid->addWidget(constraint = new MultiLineEdit(grid));
     constraint->setReadOnly(visit);
     constraint->setText(act->constraint);
 
@@ -238,8 +241,8 @@ ActivityActionDialog::ActivityActionDialog(ActivityActionData * a)
 
     grid = mkgrid(this);
 
-    kvtable = new KeyValuesTable(action, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(action, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -251,7 +254,7 @@ ActivityActionDialog::ActivityActionDialog(ActivityActionData * a)
 
 void ActivityActionDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -260,8 +263,9 @@ ActivityActionDialog::~ActivityActionDialog()
     act->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -279,14 +283,14 @@ void ActivityActionDialog::edit_description()
 }
 
 void ActivityActionDialog::post_edit_description(ActivityActionDialog * d,
-        QString s)
+                                                 QString s)
 {
     d->comment->setText(s);
 }
 
 void ActivityActionDialog::edit_constraint()
 {
-    edit(constraint->text(), edname->text().stripWhiteSpace() + "_constraint",
+    edit(constraint->text(), edname->text().trimmed() + "_constraint",
          act, TxtEdit, this, (post_edit) post_edit_constraint, edits);
 }
 
@@ -377,18 +381,18 @@ void ActivityActionDialog::accept()
     BrowserActivityAction * bn = (BrowserActivityAction *) act->browser_node;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if ((s != bn->get_name()) &&
-        ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlActivityAction,
-                bn->allow_spaces(),
-                bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+            ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlActivityAction,
+                                                             bn->allow_spaces(),
+                                                             bn->allow_empty()))
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else {
         act->undepend();
         bn->set_name(s);
 
-        bool newst = act->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+        bool newst = act->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
         QString ocl_pre;
         QString ocl_post;
@@ -403,35 +407,35 @@ void ActivityActionDialog::accept()
 
         switch (current_type) {
 #define CASE(t, v)  \
-    case Uml##t :   \
-      v.get_cond(ocl_pre, ocl_post, cpp_pre, cpp_post, java_pre, java_post);  \
-      if (v.update((t *) act->action) || changed) { \
-	/* pins changed */	\
-	bn->set_pins(); \
-      }	\
-      break
-
-            CASE(OpaqueAction, opaque);
-            CASE(AcceptEventAction, acceptevent);
-            CASE(SendObjectAction, sendobject);
-            CASE(UnmarshallAction, unmarshall);
-            CASE(ValueSpecificationAction, valuespecification);
-            CASE(SendSignalAction, sendsignal);
-            CASE(BroadcastSignalAction, broadcastsignal);
-            CASE(ReadVariableValueAction, readvariablevalue);
-            CASE(ClearVariableValueAction, clearvariablevalue);
-            CASE(WriteVariableValueAction, writevariablevalue);
-            CASE(AddVariableValueAction, addvariablevalue);
-            CASE(RemoveVariableValueAction, removevariablevalue);
-            CASE(CallOperationAction, calloperation);
-            CASE(CallBehaviorAction, callbehavior);
-            CASE(AcceptCallAction, acceptcall);
-            CASE(ReplyAction, reply);
-            CASE(CreateObjectAction, createobject);
-            CASE(DestroyObjectAction, destroyobject);
-            CASE(TestIdentityAction, testidentity);
-            CASE(RaiseExceptionAction, raiseexception);
-            CASE(ReduceAction, reduce);
+        case Uml##t :   \
+    v.get_cond(ocl_pre, ocl_post, cpp_pre, cpp_post, java_pre, java_post);  \
+    if (v.update((t *) act->action) || changed) { \
+    /* pins changed */	\
+    bn->set_pins(); \
+        }	\
+    break
+
+        CASE(OpaqueAction, opaque);
+        CASE(AcceptEventAction, acceptevent);
+        CASE(SendObjectAction, sendobject);
+        CASE(UnmarshallAction, unmarshall);
+        CASE(ValueSpecificationAction, valuespecification);
+        CASE(SendSignalAction, sendsignal);
+        CASE(BroadcastSignalAction, broadcastsignal);
+        CASE(ReadVariableValueAction, readvariablevalue);
+        CASE(ClearVariableValueAction, clearvariablevalue);
+        CASE(WriteVariableValueAction, writevariablevalue);
+        CASE(AddVariableValueAction, addvariablevalue);
+        CASE(RemoveVariableValueAction, removevariablevalue);
+        CASE(CallOperationAction, calloperation);
+        CASE(CallBehaviorAction, callbehavior);
+        CASE(AcceptCallAction, acceptcall);
+        CASE(ReplyAction, reply);
+        CASE(CreateObjectAction, createobject);
+        CASE(DestroyObjectAction, destroyobject);
+        CASE(TestIdentityAction, testidentity);
+        CASE(RaiseExceptionAction, raiseexception);
+        CASE(ReduceAction, reduce);
 
 #undef CASE
 
@@ -451,7 +455,7 @@ void ActivityActionDialog::accept()
         bn->set_comment(comment->text());
         UmlWindow::update_comment_if_needed(bn);
 
-        act->constraint = constraint->stripWhiteSpaceText();
+        act->constraint = constraint->trimmedText();
 
         kvtable->updateNodeFromThis(bn);
 
@@ -460,21 +464,21 @@ void ActivityActionDialog::accept()
         bn->modified();   // call action->modified()
         bn->package_modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
 
 // ActionCondDialog
 
-void ActionCondDialog::init(Q3Grid * grid, ActivityActionData * d,
+void ActionCondDialog::init(GridBox * grid, ActivityActionData * d,
                             DrawingLanguage lang, bool visit)
 {
-    new QLabel(TR("Pre\ncondition : "), grid);
-    edpre = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(QObject::tr("Pre\ncondition : "), grid));
+    grid->addWidget(edpre = new MultiLineEdit(grid));
     edpre->setText(d->get_precond(lang));
 
-    new QLabel(TR("Post\ncondition : "), grid);
-    edpost = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(QObject::tr("Post\ncondition : "), grid));
+    grid->addWidget(edpost = new MultiLineEdit(grid));
     edpost->setText(d->get_postcond(lang));
 
     if (visit) {
@@ -485,8 +489,8 @@ void ActionCondDialog::init(Q3Grid * grid, ActivityActionData * d,
 
 void ActionCondDialog::get(QString & pre, QString & post) const
 {
-    pre = edpre->text().stripWhiteSpace();
-    post = edpost->text().stripWhiteSpace();
+    pre = edpre->text().trimmed();
+    post = edpost->text().trimmed();
 }
 
 void ActionCondDialog::set(QString pre, QString post)
@@ -503,7 +507,7 @@ AnyActionDialog::AnyActionDialog()
 {
 }
 
-void AnyActionDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void AnyActionDialog::init(TabDialog * t, ActivityActionData * act,
                            void * d, bool visit)
 {
     // just add the pre/post condition
@@ -529,7 +533,7 @@ void AnyActionDialog::init(Q3TabDialog * t, ActivityActionData * act,
     init_java(t, act, d, visit);
 }
 
-void AnyActionDialog::init_cpp(Q3TabDialog * t, ActivityActionData * act,
+void AnyActionDialog::init_cpp(TabDialog * t, ActivityActionData * act,
                                void * d, bool visit)
 {
     // cpp
@@ -548,7 +552,7 @@ void AnyActionDialog::init_cpp(Q3TabDialog * t, ActivityActionData * act,
         t->removePage(cpp_grid);
 }
 
-void AnyActionDialog::init_java(Q3TabDialog * t, ActivityActionData * act,
+void AnyActionDialog::init_java(TabDialog * t, ActivityActionData * act,
                                 void * d, bool visit)
 {
     // java
@@ -605,8 +609,8 @@ void AnyActionDialog::get_cond(QString & ocl_pre, QString & ocl_post,
 
 // opaque
 
-void OpaqueDialog::init(Q3TabDialog * t, ActivityActionData * act,
-                        OpaqueAction * d, Q3PtrList<BodyDialog> & e, bool visit)
+void OpaqueDialog::init(TabDialog * t, ActivityActionData * act,
+                        OpaqueAction * d, QList<BodyDialog *> & e, bool visit)
 {
     edits = &e;
     td = t;
@@ -615,15 +619,19 @@ void OpaqueDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     ocl_grid = mkgrid(t);
 
-    Q3VBox * vtab = new Q3VBox(ocl_grid);
-
-    new QLabel(TR("Behavior : "), vtab);
+    VVBox * vtab;
+    ocl_grid->addWidget(vtab = new VVBox(ocl_grid));
 
+    vtab->addWidget(new QLabel(tr("Behavior : "), vtab));
+    SmallPushButton* sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_ocl()));
+        vtab->addWidget(sButton);
+    }
 
-    ocl_beh = new MultiLineEdit(ocl_grid);
+    ocl_grid->addWidget(ocl_beh = new MultiLineEdit(ocl_grid));
 
     if (visit)
         ocl_beh->setReadOnly(TRUE);
@@ -644,14 +652,17 @@ void OpaqueDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     cpp_grid = mkgrid(t);
 
-    vtab = new Q3VBox(cpp_grid);
-    new QLabel(TR("Behavior : "), vtab);
+    cpp_grid->addWidget(vtab = new VVBox(cpp_grid));
+    vtab->addWidget(new QLabel(tr("Behavior : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_cpp()));
+        vtab->addWidget(sButton);
+    }
 
-    cpp_beh = new MultiLineEdit(cpp_grid);
+    cpp_grid->addWidget(cpp_beh = new MultiLineEdit(cpp_grid));
 
     if (visit)
         cpp_beh->setReadOnly(TRUE);
@@ -672,14 +683,17 @@ void OpaqueDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     java_grid = mkgrid(t);
 
-    vtab = new Q3VBox(java_grid);
-    new QLabel(TR("Behavior : "), vtab);
+    java_grid->addWidget(vtab = new VVBox(java_grid));
+    vtab->addWidget(new QLabel(tr("Behavior : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_java()));
+        vtab->addWidget(sButton);
+    }
 
-    java_beh = new MultiLineEdit(java_grid);
+    java_grid->addWidget(java_beh = new MultiLineEdit(java_grid));
 
     if (visit)
         java_beh->setReadOnly(TRUE);
@@ -699,9 +713,9 @@ void OpaqueDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
 bool OpaqueDialog::update(OpaqueAction * a)
 {
-    a->uml_behavior = ocl_beh->text().stripWhiteSpace();
-    a->cpp_behavior = cpp_beh->text().stripWhiteSpace();
-    a->java_behavior = java_beh->text().stripWhiteSpace();
+    a->uml_behavior = ocl_beh->text().trimmed();
+    a->cpp_behavior = cpp_beh->text().trimmed();
+    a->java_behavior = java_beh->text().trimmed();
 
     return FALSE;
 }
@@ -741,27 +755,27 @@ void OpaqueDialog::post_edit_java(ActivityActionDialog * d, QString s)
 
 // Accept Event
 
-void AcceptEventDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void AcceptEventDialog::init(TabDialog * t, ActivityActionData * act,
                              AcceptEventAction * d, bool visit)
 {
     td = t;
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("trigger - Ocl"));
+    ocl_grid = mkgrid(t, QObject::tr("trigger - Ocl"));
 
-    new QLabel("", ocl_grid);
-    Q3ButtonGroup * grp =
-        new Q3ButtonGroup(2, Qt::Horizontal, QString(), ocl_grid);
+    ocl_grid->addWidget(new QLabel("", ocl_grid));
+    BButtonGroup * grp;
+    ocl_grid->addWidget(grp = new BButtonGroup(2, Qt::Horizontal, QString(), ocl_grid));
 
-    unmarshall_cb = new QCheckBox(TR("unmarshall"), grp);
+    grp->addWidget(unmarshall_cb = new QCheckBox(QObject::tr("unmarshall"), grp));
     unmarshall_cb->setDisabled(visit);
 
-    timeevent_cb = new QCheckBox(TR("time event"), grp);
+    grp->addWidget(timeevent_cb = new QCheckBox(QObject::tr("time event"), grp));
     timeevent_cb->setDisabled(visit);
 
-    new QLabel(TR("trigger : "), ocl_grid);
-    uml_trigger = new LineEdit(ocl_grid);
+    ocl_grid->addWidget(new QLabel(QObject::tr("trigger : "), ocl_grid));
+    ocl_grid->addWidget(uml_trigger = new LineEdit(ocl_grid));
     uml_trigger->setReadOnly(visit);
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
@@ -773,17 +787,17 @@ void AcceptEventDialog::init(Q3TabDialog * t, ActivityActionData * act,
         uml_trigger->setText(d->uml_trigger);
     }
 
-    t->addTab(ocl_grid, TR("trigger - Ocl"));
+    t->addTab(ocl_grid, QObject::tr("trigger - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
 
     // cpp
 
-    cpp_grid = mkgrid(t, TR("trigger - C++"));
+    cpp_grid = mkgrid(t, QObject::tr("trigger - C++"));
 
-    new QLabel(TR("trigger : "), cpp_grid);
-    cpp_trigger = new LineEdit(cpp_grid);
+    cpp_grid->addWidget(new QLabel(QObject::tr("trigger : "), cpp_grid));
+    cpp_grid->addWidget(cpp_trigger = new LineEdit(cpp_grid));
 
     cpp_cond.init(cpp_grid, act, CppView, visit);
 
@@ -792,17 +806,17 @@ void AcceptEventDialog::init(Q3TabDialog * t, ActivityActionData * act,
         cpp_trigger->setText(d->cpp_trigger);
     }
 
-    t->addTab(cpp_grid, TR("trigger - C++"));
+    t->addTab(cpp_grid, QObject::tr("trigger - C++"));
 
     if ((d == 0) || !GenerationSettings::cpp_get_default_defs())
         t->removePage(cpp_grid);
 
     // java
 
-    java_grid = mkgrid(t, TR("trigger - Java"));
+    java_grid = mkgrid(t, QObject::tr("trigger - Java"));
 
-    new QLabel(TR("trigger : "), java_grid);
-    java_trigger = new LineEdit(java_grid);
+    java_grid->addWidget(new QLabel(QObject::tr("trigger : "), java_grid));
+    java_grid->addWidget(java_trigger = new LineEdit(java_grid));
 
     java_cond.init(java_grid, act, JavaView, visit);
 
@@ -811,7 +825,7 @@ void AcceptEventDialog::init(Q3TabDialog * t, ActivityActionData * act,
         java_trigger->setText(d->java_trigger);
     }
 
-    t->addTab(java_grid, TR("trigger - Java"));
+    t->addTab(java_grid, QObject::tr("trigger - Java"));
 
     if ((d == 0) || !GenerationSettings::java_get_default_defs())
         t->removePage(java_grid);
@@ -821,35 +835,40 @@ bool AcceptEventDialog::update(AcceptEventAction * a)
 {
     a->unmarshall = unmarshall_cb->isChecked();
     a->timeevent = timeevent_cb->isChecked();
-    a->uml_trigger = uml_trigger->text().stripWhiteSpace();
-    a->cpp_trigger = cpp_trigger->text().stripWhiteSpace();
-    a->java_trigger = java_trigger->text().stripWhiteSpace();
+    a->uml_trigger = uml_trigger->text().trimmed();
+    a->cpp_trigger = cpp_trigger->text().trimmed();
+    a->java_trigger = java_trigger->text().trimmed();
 
     return FALSE;
 }
 
 // value specification
 
-void ValueSpecificationDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void ValueSpecificationDialog::init(TabDialog * t, ActivityActionData * act,
                                     ValueSpecificationAction * d,
-                                    Q3PtrList<BodyDialog> & e, bool visit)
+                                    QList<BodyDialog *> & e, bool visit)
 {
     edits = &e;
     td = t;
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("value - Ocl"));
+    ocl_grid = mkgrid(t, tr("value - Ocl"));
 
-    Q3VBox * vtab = new Q3VBox(ocl_grid);
+    VVBox * vtab;
+    ocl_grid->addWidget(vtab = new VVBox(ocl_grid));
 
-    new QLabel(TR("Value : "), vtab);
+    vtab->addWidget(new QLabel(tr("Value : "), vtab));
 
+    SmallPushButton* sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_ocl()));
+        vtab->addWidget(sButton);
+    }
 
-    ocl_val = new MultiLineEdit(ocl_grid);
+    ocl_grid->addWidget(ocl_val = new MultiLineEdit(ocl_grid));
 
     if (visit)
         ocl_val->setReadOnly(TRUE);
@@ -861,23 +880,26 @@ void ValueSpecificationDialog::init(Q3TabDialog * t, ActivityActionData * act,
         ocl_val->setText(d->uml_value);
     }
 
-    t->addTab(ocl_grid, TR("value - Ocl"));
+    t->addTab(ocl_grid, tr("value - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
 
     // cpp
 
-    cpp_grid = mkgrid(t, TR("value - C++"));
+    cpp_grid = mkgrid(t, tr("value - C++"));
 
-    vtab = new Q3VBox(cpp_grid);
-    new QLabel(TR("Value : "), vtab);
+    cpp_grid->addWidget(vtab = new VVBox(cpp_grid));
+    vtab->addWidget(new QLabel(tr("Value : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_cpp()));
+        vtab->addWidget(sButton);
+    }
 
-    cpp_val = new MultiLineEdit(cpp_grid);
+    cpp_grid->addWidget(cpp_val = new MultiLineEdit(cpp_grid));
 
     if (visit)
         cpp_val->setReadOnly(TRUE);
@@ -889,23 +911,26 @@ void ValueSpecificationDialog::init(Q3TabDialog * t, ActivityActionData * act,
         cpp_val->setText(d->cpp_value);
     }
 
-    t->addTab(cpp_grid, TR("value - C++"));
+    t->addTab(cpp_grid, tr("value - C++"));
 
     if ((d == 0) || !GenerationSettings::cpp_get_default_defs())
         t->removePage(cpp_grid);
 
     // java
 
-    java_grid = mkgrid(t, TR("value - Java"));
+    java_grid = mkgrid(t, tr("value - Java"));
 
-    vtab = new Q3VBox(java_grid);
-    new QLabel(TR("Value : "), vtab);
+    java_grid->addWidget(vtab = new VVBox(java_grid));
+    vtab->addWidget(new QLabel(tr("Value : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_java()));
+        vtab->addWidget(sButton);
+    }
 
-    java_val = new MultiLineEdit(java_grid);
+    java_grid->addWidget(java_val = new MultiLineEdit(java_grid));
 
     if (visit)
         java_val->setReadOnly(TRUE);
@@ -917,7 +942,7 @@ void ValueSpecificationDialog::init(Q3TabDialog * t, ActivityActionData * act,
         java_val->setText(d->java_value);
     }
 
-    t->addTab(java_grid, TR("value - Java"));
+    t->addTab(java_grid, tr("value - Java"));
 
     if ((d == 0) || !GenerationSettings::java_get_default_defs())
         t->removePage(java_grid);
@@ -925,9 +950,9 @@ void ValueSpecificationDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
 bool ValueSpecificationDialog::update(ValueSpecificationAction * a)
 {
-    a->uml_value = ocl_val->text().stripWhiteSpace();
-    a->cpp_value = cpp_val->text().stripWhiteSpace();
-    a->java_value = java_val->text().stripWhiteSpace();
+    a->uml_value = ocl_val->text().trimmed();
+    a->cpp_value = cpp_val->text().trimmed();
+    a->java_value = java_val->text().trimmed();
 
     return FALSE;
 }
@@ -967,17 +992,17 @@ void ValueSpecificationDialog::post_edit_java(ActivityActionDialog * d, QString
 
 // Send signal
 
-void SendSignalDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void SendSignalDialog::init(TabDialog * t, ActivityActionData * act,
                             SendSignalAction * d, bool visit)
 {
     td = t;
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("signal - Ocl"));
+    ocl_grid = mkgrid(t, QObject::tr("signal - Ocl"));
 
-    new QLabel(TR("signal : "), ocl_grid);
-    ocl_signal = new LineEdit(ocl_grid);
+    ocl_grid->addWidget(new QLabel(QObject::tr("signal : "), ocl_grid));
+    ocl_grid->addWidget(ocl_signal = new LineEdit(ocl_grid));
     ocl_signal->setReadOnly(visit);
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
@@ -987,17 +1012,17 @@ void SendSignalDialog::init(Q3TabDialog * t, ActivityActionData * act,
         ocl_signal->setText(d->ocl_signal);
     }
 
-    t->addTab(ocl_grid, TR("signal - Ocl"));
+    t->addTab(ocl_grid, QObject::tr("signal - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
 
     // cpp
 
-    cpp_grid = mkgrid(t, TR("signal - C++"));
+    cpp_grid = mkgrid(t, QObject::tr("signal - C++"));
 
-    new QLabel(TR("signal : "), cpp_grid);
-    cpp_signal = new LineEdit(cpp_grid);
+    cpp_grid->addWidget(new QLabel(QObject::tr("signal : "), cpp_grid));
+    cpp_grid->addWidget(cpp_signal = new LineEdit(cpp_grid));
 
     cpp_cond.init(cpp_grid, act, CppView, visit);
 
@@ -1006,17 +1031,17 @@ void SendSignalDialog::init(Q3TabDialog * t, ActivityActionData * act,
         cpp_signal->setText(d->cpp_signal);
     }
 
-    t->addTab(cpp_grid, TR("signal - C++"));
+    t->addTab(cpp_grid, QObject::tr("signal - C++"));
 
     if ((d == 0) || !GenerationSettings::cpp_get_default_defs())
         t->removePage(cpp_grid);
 
     // java
 
-    java_grid = mkgrid(t, TR("signal - Java"));
+    java_grid = mkgrid(t, QObject::tr("signal - Java"));
 
-    new QLabel(TR("signal : "), java_grid);
-    java_signal = new LineEdit(java_grid);
+    java_grid->addWidget(new QLabel(QObject::tr("signal : "), java_grid));
+    java_grid->addWidget(java_signal = new LineEdit(java_grid));
 
     java_cond.init(java_grid, act, JavaView, visit);
 
@@ -1025,7 +1050,7 @@ void SendSignalDialog::init(Q3TabDialog * t, ActivityActionData * act,
         java_signal->setText(d->java_signal);
     }
 
-    t->addTab(java_grid, TR("signal - Java"));
+    t->addTab(java_grid, QObject::tr("signal - Java"));
 
     if ((d == 0) || !GenerationSettings::java_get_default_defs())
         t->removePage(java_grid);
@@ -1033,16 +1058,16 @@ void SendSignalDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
 bool SendSignalDialog::update(SendSignalAction * a)
 {
-    a->ocl_signal = ocl_signal->text().stripWhiteSpace();
-    a->cpp_signal = cpp_signal->text().stripWhiteSpace();
-    a->java_signal = java_signal->text().stripWhiteSpace();
+    a->ocl_signal = ocl_signal->text().trimmed();
+    a->cpp_signal = cpp_signal->text().trimmed();
+    a->java_signal = java_signal->text().trimmed();
 
     return FALSE;
 }
 
 // access & change variable value working classes
 
-void AccessVariableValueDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void AccessVariableValueDialog::init(TabDialog * t, ActivityActionData * act,
                                      AccessVariableValueAction * d,
                                      BrowserNodeList & cl,
                                      QStringList & clstr, bool ro)
@@ -1055,33 +1080,34 @@ void AccessVariableValueDialog::init(Q3TabDialog * t, ActivityActionData * act,
     // ocl
 
     if (ocl_grid == 0)
-        ocl_grid = mkgrid(t, TR("variable - Ocl"));
-
-    new QLabel(TR("class : "), ocl_grid);
-    class_co = new Q3ComboBox(FALSE, ocl_grid);
+        ocl_grid = mkgrid(t, tr("variable - Ocl"));
 
-    connect(new SmallPushButton(TR("variable :"), ocl_grid), SIGNAL(clicked()),
+    ocl_grid->addWidget(new QLabel(tr("class : "), ocl_grid));
+    ocl_grid->addWidget(class_co = new QComboBox(ocl_grid));
+    SmallPushButton* sButton;
+    connect(sButton = new SmallPushButton(tr("variable :"), ocl_grid), SIGNAL(clicked()),
             this, SLOT(menu_var()));
-    var_co = new Q3ComboBox(FALSE, ocl_grid);
+    ocl_grid->addWidget(sButton);
+    ocl_grid->addWidget(var_co = new QComboBox(ocl_grid));
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
 
     if (!visit) {
-        class_co->insertItem("");
-        var_co->insertItem("");
+        class_co->addItem("");
+        var_co->addItem("");
         class_co->setAutoCompletion(completion());
         var_co->setAutoCompletion(completion());
 
-        class_co->insertStringList(*class_names);
+        class_co->addItems(*class_names);
         connect(class_co, SIGNAL(activated(int)), this, SLOT(classChanged(int)));
     }
 
     if ((d != 0) && (d->variable != 0)) {
         if (visit) {
-            class_co->insertItem(((BrowserNode *) d->variable->parent())->full_name(TRUE));
-            var_co->insertItem(*(d->variable->pixmap(0)), d->variable->get_name());
-            class_co->setCurrentItem(0);
-            var_co->setCurrentItem(0);
+            class_co->addItem(((BrowserNode *) d->variable->parent())->full_name(TRUE));
+            var_co->addItem(*(d->variable->pixmap(0)), d->variable->get_name());
+            class_co->setCurrentIndex(0);
+            var_co->setCurrentIndex(0);
         }
         else
             set(d->variable);
@@ -1091,7 +1117,7 @@ void AccessVariableValueDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     // note : must add then remove rather than doing nothing
     // else some sub widget will be wrong placed
-    t->addTab(ocl_grid, TR("variable - Ocl"));
+    t->addTab(ocl_grid, tr("variable - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
@@ -1104,9 +1130,9 @@ void AccessVariableValueDialog::init(Q3TabDialog * t, ActivityActionData * act,
 void AccessVariableValueDialog::classChanged(int)
 {
     var_co->clear();
-    var_co->insertItem("");
+    var_co->addItem("");
 
-    int index = class_names->findIndex(class_co->currentText());
+    int index = class_names->indexOf(class_co->currentText());
 
     if (index != -1)
         insert_vars((BrowserClass *) classes->at(index));
@@ -1118,7 +1144,7 @@ void AccessVariableValueDialog::insert_vars(BrowserClass * c)
     vars.clear();
     var_names.clear();
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = c->firstChild(); child; child = child->nextSibling()) {
         if (!((BrowserNode *) child)->deletedp()) {
@@ -1132,8 +1158,8 @@ void AccessVariableValueDialog::insert_vars(BrowserClass * c)
             case UmlAttribute:
                 vars.append((BrowserNode *) child);
                 var_names.append(((BrowserNode *) child)->get_name());
-                var_co->insertItem(*(((BrowserNode *) child)->pixmap(0)),
-                                   ((BrowserNode *) child)->get_name());
+                var_co->addItem(*(((BrowserNode *) child)->pixmap(0)),
+                                ((BrowserNode *) child)->get_name());
                 break;
 
             default:
@@ -1145,7 +1171,7 @@ void AccessVariableValueDialog::insert_vars(BrowserClass * c)
 
 bool AccessVariableValueDialog::update(AccessVariableValueAction * a)
 {
-    int index = var_names.findIndex(var_co->currentText());
+    int index = var_names.indexOf(var_co->currentText());
 
     BrowserNode * old = a->variable;
 
@@ -1156,15 +1182,15 @@ bool AccessVariableValueDialog::update(AccessVariableValueAction * a)
 
 void AccessVariableValueDialog::menu_var()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = var_names.findIndex(var_co->currentText());
+    int index = var_names.indexOf(var_co->currentText());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
     BrowserClass * cl = 0;
@@ -1182,7 +1208,7 @@ void AccessVariableValueDialog::menu_var()
             case UmlDirectionalAggregationByValue:
             case UmlAttribute:
                 if (!bn->deletedp()) {
-                    m.insertItem(TR("Choose variable selected in browser"), 1);
+                    MenuFactory::addItem(m, tr("Choose variable selected in browser"), 1);
                     break;
                 }
 
@@ -1192,7 +1218,7 @@ void AccessVariableValueDialog::menu_var()
             }
         }
 
-        int index_cl = class_names->findIndex(class_co->currentText());
+        int index_cl = class_names->indexOf(class_co->currentText());
 
         if (index_cl != -1) {
             cl = (BrowserClass *) classes->at(index_cl);
@@ -1200,35 +1226,39 @@ void AccessVariableValueDialog::menu_var()
             if (!cl->is_writable())
                 cl = 0;
             else
-                m.insertItem(TR("Create attribute and choose it"), 2);
+                MenuFactory::addItem(m, tr("Create attribute and choose it"), 2);
         }
     }
 
     if ((index != -1) || (bn != 0) || (cl != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            vars.at(index)->select_in_browser();
-            break;
+        QAction *retActon = m.exec(QCursor::pos());
+        if(retActon)
+        {
+            switch (retActon->data().toInt()) {
+            case 0:
+                vars.at(index)->select_in_browser();
+                break;
 
-        case 2: {
-            const char * stereotype = cl->get_data()->get_stereotype();
+            case 2: {
+                const char * stereotype = cl->get_data()->get_stereotype();
 
-            bn = cl->add_attribute(0,
-                                   !strcmp(stereotype, "enum") ||
-                                   !strcmp(stereotype, "enum_pattern"));
+                bn = cl->add_attribute(0,
+                                       !strcmp(stereotype, "enum") ||
+                                       !strcmp(stereotype, "enum_pattern"));
 
-            if (bn == 0)
-                break;
+                if (bn == 0)
+                    break;
 
-            bn->select_in_browser();
-        }
+                bn->select_in_browser();
+            }
 
-        // no break;
-        case 1:
-            var_co->clear();
-            var_co->insertItem("");
-            set(bn);
-            break;
+                // no break;
+            case 1:
+                var_co->clear();
+                var_co->addItem("");
+                set(bn);
+                break;
+            }
         }
     }
 }
@@ -1238,29 +1268,29 @@ void AccessVariableValueDialog::set(BrowserNode * bn)
     BrowserClass * cl = (BrowserClass *) bn->parent();
     int index;
 
-    if ((index = class_names->findIndex(cl->full_name(TRUE))) == -1)
+    if ((index = class_names->indexOf(cl->full_name(TRUE))) == -1)
         // new class, not managed
         return;
 
-    class_co->setCurrentItem(index + 1);
+    class_co->setCurrentIndex(index + 1);
     insert_vars(cl);
 
     // var is in var_names
-    var_co->setCurrentItem(var_names.findIndex(bn->get_name()) + 1);
+    var_co->setCurrentIndex(var_names.indexOf(bn->get_name()) + 1);
 }
 
-void ChangeVariableValueDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void ChangeVariableValueDialog::init(TabDialog * t, ActivityActionData * act,
                                      ChangeVariableValueAction * d,
-                                     const char * flg_name, BrowserNodeList & cl,
+                                     QString flg_name, BrowserNodeList & cl,
                                      QStringList & clstr, bool visit)
 {
-    ocl_grid = mkgrid(t, TR("variable - Ocl"));
+    ocl_grid = mkgrid(t, tr("variable - Ocl"));
 
-    new QLabel("", ocl_grid);
-    Q3ButtonGroup * grp =
-        new Q3ButtonGroup(2, Qt::Horizontal, QString(), ocl_grid);
+    ocl_grid->addWidget(new QLabel("", ocl_grid));
+    BButtonGroup * grp;
+    ocl_grid->addWidget(grp = new BButtonGroup(2, Qt::Horizontal, QString(), ocl_grid));
 
-    flag_cb = new QCheckBox(flg_name, grp);
+    grp->addWidget(flag_cb = new QCheckBox(flg_name, grp));
     flag_cb->setDisabled(visit);
 
     AccessVariableValueDialog::init(t, act, d, cl, clstr, visit);
@@ -1277,25 +1307,25 @@ bool ChangeVariableValueDialog::update(ChangeVariableValueAction * a)
 
 // add variable value
 
-void AddVariableValueDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void AddVariableValueDialog::init(TabDialog * t, ActivityActionData * act,
                                   AddVariableValueAction * d, BrowserNodeList & cl,
                                   QStringList & clstr, bool visit)
 {
-    ChangeVariableValueDialog::init(t, act, d, TR("replace all"), cl, clstr, visit);
+    ChangeVariableValueDialog::init(t, act, d, tr("replace all"), cl, clstr, visit);
 }
 
 // remove variable value
 
-void RemoveVariableValueDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void RemoveVariableValueDialog::init(TabDialog * t, ActivityActionData * act,
                                      RemoveVariableValueAction * d, BrowserNodeList & cl,
                                      QStringList & clstr, bool visit)
 {
-    ChangeVariableValueDialog::init(t, act, d, TR("remove duplicates"), cl, clstr, visit);
+    ChangeVariableValueDialog::init(t, act, d, tr("remove duplicates"), cl, clstr, visit);
 }
 
 // call operation
 
-void CallOperationDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void CallOperationDialog::init(TabDialog * t, ActivityActionData * act,
                                CallOperationAction * d, BrowserNodeList & cl,
                                QStringList & clstr, bool ro)
 {
@@ -1306,31 +1336,32 @@ void CallOperationDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("operation - Ocl"));
+    ocl_grid = mkgrid(t, tr("operation - Ocl"));
 
-    new QLabel("", ocl_grid);
-    Q3ButtonGroup * grp =
-        new Q3ButtonGroup(2, Qt::Horizontal, QString(), ocl_grid);
+    ocl_grid->addWidget(new QLabel("", ocl_grid));
+    BButtonGroup * grp;
+    ocl_grid->addWidget(grp = new BButtonGroup(2, Qt::Horizontal, QString(), ocl_grid));
 
-    synchronous_cb = new QCheckBox(TR("synchronous"), grp);
+    grp->addWidget(synchronous_cb = new QCheckBox(tr("synchronous"), grp));
     synchronous_cb->setDisabled(visit);
 
-    new QLabel(TR("class : "), ocl_grid);
-    class_co = new Q3ComboBox(FALSE, ocl_grid);
-
-    connect(new SmallPushButton(TR("operation :"), ocl_grid), SIGNAL(clicked()),
+    ocl_grid->addWidget(new QLabel(tr("class : "), ocl_grid));
+    ocl_grid->addWidget(class_co = new QComboBox(ocl_grid));
+    SmallPushButton* sButton;
+    connect(sButton = new SmallPushButton(tr("operation :"), ocl_grid), SIGNAL(clicked()),
             this, SLOT(menu_oper()));
-    oper_co = new Q3ComboBox(FALSE, ocl_grid);
+    ocl_grid->addWidget(sButton);
+    ocl_grid->addWidget(oper_co = new QComboBox(ocl_grid));
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
 
     if (! visit) {
-        class_co->insertItem("");
-        oper_co->insertItem("");
+        class_co->addItem("");
+        oper_co->addItem("");
         class_co->setAutoCompletion(completion());
         oper_co->setAutoCompletion(completion());
 
-        class_co->insertStringList(*class_names);
+        class_co->addItems(*class_names);
         connect(class_co, SIGNAL(activated(int)), this, SLOT(classChanged(int)));
     }
 
@@ -1338,10 +1369,10 @@ void CallOperationDialog::init(Q3TabDialog * t, ActivityActionData * act,
         synchronous_cb->setChecked(d->synchronous);
 
         if (visit) {
-            class_co->insertItem(((BrowserNode *) d->operation->parent())->full_name(TRUE));
-            oper_co->insertItem(((OperationData *) d->operation->get_data())->definition(TRUE, FALSE));
-            class_co->setCurrentItem(0);
-            oper_co->setCurrentItem(0);
+            class_co->addItem(((BrowserNode *) d->operation->parent())->full_name(TRUE));
+            oper_co->addItem(((OperationData *) d->operation->get_data())->definition(TRUE, FALSE));
+            class_co->setCurrentIndex(0);
+            oper_co->setCurrentIndex(0);
         }
         else
             set(d->operation);
@@ -1351,7 +1382,7 @@ void CallOperationDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     // note : must add then remove rather than doing nothing
     // else some sub widget will be wrong placed
-    t->addTab(ocl_grid, TR("operation - Ocl"));
+    t->addTab(ocl_grid, tr("operation - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
@@ -1364,9 +1395,9 @@ void CallOperationDialog::init(Q3TabDialog * t, ActivityActionData * act,
 void CallOperationDialog::classChanged(int)
 {
     oper_co->clear();
-    oper_co->insertItem("");
+    oper_co->addItem("");
 
-    int index = class_names->findIndex(class_co->currentText());
+    int index = class_names->indexOf(class_co->currentText());
 
     if (index != -1)
         insert_opers((BrowserClass *) classes->at(index));
@@ -1378,16 +1409,16 @@ void CallOperationDialog::insert_opers(BrowserClass * c)
     opers.clear();
     oper_names.clear();
 
-    Q3ListViewItem * child;
+    BrowserNode * child;
 
     for (child = c->firstChild(); child; child = child->nextSibling()) {
         if (!((BrowserNode *) child)->deletedp() &&
-            (((BrowserNode *) child)->get_type() == UmlOperation)) {
+                (((BrowserNode *) child)->get_type() == UmlOperation)) {
             QString s = ((OperationData *)((BrowserNode *) child)->get_data())->definition(TRUE, FALSE);
 
             opers.append((BrowserNode *) child);
             oper_names.append(s);
-            oper_co->insertItem(s);
+            oper_co->addItem(s);
         }
     }
 }
@@ -1396,7 +1427,7 @@ bool CallOperationDialog::update(CallOperationAction * a)
 {
     a->synchronous = synchronous_cb->isChecked();
 
-    int index = oper_names.findIndex(oper_co->currentText());
+    int index = oper_names.indexOf(oper_co->currentText());
 
     BrowserNode * old = a->operation;
 
@@ -1408,30 +1439,30 @@ bool CallOperationDialog::update(CallOperationAction * a)
 void CallOperationDialog::set(BrowserNode * bn)
 {
     BrowserClass * cl = (BrowserClass *) bn->parent();
-    int index = class_names->findIndex(cl->full_name(TRUE));
+    int index = class_names->indexOf(cl->full_name(TRUE));
 
     if (index == -1)
         // new class, not managed
         return;
 
-    class_co->setCurrentItem(index + 1);
+    class_co->setCurrentIndex(index + 1);
     insert_opers(cl);
 
     // the operation is in oper_names
-    oper_co->setCurrentItem(oper_names.findIndex(((OperationData *) bn->get_data())->definition(TRUE, FALSE)) + 1);
+    oper_co->setCurrentIndex(oper_names.indexOf(((OperationData *) bn->get_data())->definition(TRUE, FALSE)) + 1);
 }
 
 void CallOperationDialog::menu_oper()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = oper_names.findIndex(oper_co->currentText());
+    int index = oper_names.indexOf(oper_co->currentText());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
     BrowserClass * cl = 0;
@@ -1440,11 +1471,11 @@ void CallOperationDialog::menu_oper()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlOperation) && !bn->deletedp())
-            m.insertItem(TR("Choose operation selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose operation selected in browser"), 1);
         else
             bn = 0;
 
-        int index_cl = class_names->findIndex(class_co->currentText());
+        int index_cl = class_names->indexOf(class_co->currentText());
 
         if (index_cl != -1) {
             cl = (BrowserClass *) classes->at(index_cl);
@@ -1452,29 +1483,33 @@ void CallOperationDialog::menu_oper()
             if (!cl->is_writable())
                 cl = 0;
             else
-                m.insertItem(TR("Create operation and choose it"), 2);
+                MenuFactory::addItem(m, tr("Create operation and choose it"), 2);
         }
     }
 
     if ((index != -1) || (bn != 0) || (cl != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            opers.at(index)->select_in_browser();
-            break;
+        QAction *retActon = m.exec(QCursor::pos());
+        if(retActon)
+        {
+            switch (retActon->data().toInt()) {
+            case 0:
+                opers.at(index)->select_in_browser();
+                break;
 
-        case 2:
-            bn = cl->add_operation();
+            case 2:
+                bn = cl->add_operation();
 
-            if (bn == 0)
-                break;
+                if (bn == 0)
+                    break;
 
-            bn->select_in_browser();
+                bn->select_in_browser();
 
-            // no break;
-        case 1:
-            oper_co->clear();
-            oper_co->insertItem("");
-            set(bn);
+                // no break;
+            case 1:
+                oper_co->clear();
+                oper_co->addItem("");
+                set(bn);
+            }
         }
     }
 }
@@ -1484,35 +1519,35 @@ void CallOperationDialog::menu_oper()
 void WithBehaviorDialog::init(BrowserNode * beh)
 {
     if (!visit) {
-        behavior_co->insertItem("");
+        behavior_co->addItem("");
         behavior_co->setAutoCompletion(completion());
 
-        Q3PtrListIterator<BrowserNode> iter_node(*nodes);
         QStringList::Iterator iter_str = node_names->begin();
-
-        for (; iter_node.current(); ++iter_node, ++iter_str)
-            behavior_co->insertItem(*(iter_node.current()->pixmap(0)), *iter_str);
+        foreach (BrowserNode *node, *nodes) {
+            behavior_co->addItem(*(node->pixmap(0)), *iter_str);
+            ++iter_str;
+        }
 
         if (beh != 0)
-            behavior_co->setCurrentItem(node_names->findIndex(beh->full_name(TRUE)) + 1);
+            behavior_co->setCurrentIndex(node_names->indexOf(beh->full_name(TRUE)) + 1);
     }
     else if (beh != 0) {
-        behavior_co->insertItem(*(beh->pixmap(0)), beh->full_name(TRUE));
-        behavior_co->setCurrentItem(0);
+        behavior_co->addItem(*(beh->pixmap(0)), beh->full_name(TRUE));
+        behavior_co->setCurrentIndex(0);
     }
 }
 
 void WithBehaviorDialog::menu_behavior()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, QObject::tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = node_names->findIndex(behavior_co->currentText());
+    int index = node_names->indexOf(behavior_co->currentText());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, QObject::tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -1524,7 +1559,7 @@ void WithBehaviorDialog::menu_behavior()
             case UmlState:
             case UmlActivity:
                 if (!bn->deletedp()) {
-                    m.insertItem(TR("Choose behavior selected in browser"), 1);
+                    MenuFactory::addItem(m, QObject::tr("Choose behavior selected in browser"), 1);
                     break;
                 }
 
@@ -1534,45 +1569,49 @@ void WithBehaviorDialog::menu_behavior()
             }
         }
 
-        m.insertItem(TR("Create activity and choose it"), 2);
-        m.insertItem(TR("Create state machine and choose it"), 3);
+        MenuFactory::addItem(m, QObject::tr("Create activity and choose it"), 2);
+        MenuFactory::addItem(m, QObject::tr("Create state machine and choose it"), 3);
     }
 
     if (!visit || (index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            nodes->at(index)->select_in_browser();
-            return;
+        QAction *retActon = m.exec(QCursor::pos());
+        if(retActon)
+        {
+            switch (retActon->data().toInt()) {
+            case 0:
+                nodes->at(index)->select_in_browser();
+                return;
 
-        case 1:
-            break;
+            case 1:
+                break;
 
-        case 2:
-            bn = BrowserActivity::add_activity(view);
+            case 2:
+                bn = BrowserActivity::add_activity(view);
 
-            if (bn == 0)
-                return;
+                if (bn == 0)
+                    return;
 
-            bn->select_in_browser();
-            break;
+                bn->select_in_browser();
+                break;
 
-        case 3:
-            bn = BrowserState::add_state(view, (bool) TRUE);
+            case 3:
+                bn = BrowserState::add_state(view, (bool) TRUE);
 
-            if (bn == 0)
-                return;
+                if (bn == 0)
+                    return;
 
-            bn->select_in_browser();
-            break;
+                bn->select_in_browser();
+                break;
 
-        default:
-            return;
+            default:
+                return;
+            }
         }
 
         // here the behavior bn was choosen
         QString s = bn->full_name(TRUE);
 
-        index = node_names->findIndex(s);
+        index = node_names->indexOf(s);
 
         if (index == -1) {
             // new behavior, may be created through an other dialog, add it
@@ -1587,16 +1626,16 @@ void WithBehaviorDialog::menu_behavior()
 
             nodes->insert((unsigned) index, bn);
             node_names->insert(iter, s);
-            behavior_co->insertItem(*(bn->pixmap(0)), s, index + 1);
+            behavior_co->insertItem(index + 1,*(bn->pixmap(0)), s);
         }
 
-        behavior_co->setCurrentItem(index + 1);
+        behavior_co->setCurrentIndex(index + 1);
     }
 }
 
 //
 
-void CallBehaviorDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void CallBehaviorDialog::init(TabDialog * t, ActivityActionData * act,
                               CallBehaviorAction * d, BrowserNodeList & beh,
                               QStringList & behstr, BrowserNode * v, bool ro)
 {
@@ -1608,18 +1647,19 @@ void CallBehaviorDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("behavior - Ocl"));
+    ocl_grid = mkgrid(t, tr("behavior - Ocl"));
 
-    new QLabel("", ocl_grid);
-    Q3ButtonGroup * grp =
-        new Q3ButtonGroup(2, Qt::Horizontal, QString(), ocl_grid);
+    ocl_grid->addWidget(new QLabel("", ocl_grid));
+    BButtonGroup * grp;
+    ocl_grid->addWidget(grp = new BButtonGroup(2, Qt::Horizontal, QString(), ocl_grid));
 
-    synchronous_cb = new QCheckBox(TR("synchronous"), grp);
+    grp->addWidget(synchronous_cb = new QCheckBox(tr("synchronous"), grp));
     synchronous_cb->setDisabled(visit);
-
-    connect(new SmallPushButton(TR("behavior :"), ocl_grid), SIGNAL(clicked()),
+    SmallPushButton* sButton;
+    connect(sButton = new SmallPushButton(tr("behavior :"), ocl_grid), SIGNAL(clicked()),
             this, SLOT(menu_beh()));
-    behavior_co = new Q3ComboBox(FALSE, ocl_grid);
+    ocl_grid->addWidget(sButton);
+    ocl_grid->addWidget(behavior_co = new QComboBox(ocl_grid));
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
 
@@ -1632,7 +1672,7 @@ void CallBehaviorDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     // note : must add then remove rather than doing nothing
     // else some sub widget will be wrong placed
-    t->addTab(ocl_grid, TR("behavior - Ocl"));
+    t->addTab(ocl_grid, tr("behavior - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
@@ -1646,7 +1686,7 @@ bool CallBehaviorDialog::update(CallBehaviorAction * a)
 {
     a->synchronous = synchronous_cb->isChecked();
 
-    int index = node_names->findIndex(behavior_co->currentText());
+    int index = node_names->indexOf(behavior_co->currentText());
 
     BrowserNode * old = a->behavior;
 
@@ -1662,17 +1702,17 @@ void CallBehaviorDialog::menu_beh()
 
 // Accept Call
 
-void AcceptCallDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void AcceptCallDialog::init(TabDialog * t, ActivityActionData * act,
                             AcceptCallAction * d, bool visit)
 {
     td = t;
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("trigger - Ocl"));
+    ocl_grid = mkgrid(t, QObject::tr("trigger - Ocl"));
 
-    new QLabel(TR("trigger : "), ocl_grid);
-    uml_trigger = new LineEdit(ocl_grid);
+    ocl_grid->addWidget(new QLabel(QObject::tr("trigger : "), ocl_grid));
+    ocl_grid->addWidget(uml_trigger = new LineEdit(ocl_grid));
     uml_trigger->setReadOnly(visit);
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
@@ -1682,17 +1722,17 @@ void AcceptCallDialog::init(Q3TabDialog * t, ActivityActionData * act,
         uml_trigger->setText(d->uml_trigger);
     }
 
-    t->addTab(ocl_grid, TR("trigger - Ocl"));
+    t->addTab(ocl_grid, QObject::tr("trigger - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
 
     // cpp
 
-    cpp_grid = mkgrid(t, TR("trigger - C++"));
+    cpp_grid = mkgrid(t, QObject::tr("trigger - C++"));
 
-    new QLabel(TR("trigger : "), cpp_grid);
-    cpp_trigger = new LineEdit(cpp_grid);
+    cpp_grid->addWidget(new QLabel(QObject::tr("trigger : "), cpp_grid));
+    cpp_grid->addWidget(cpp_trigger = new LineEdit(cpp_grid));
 
     cpp_cond.init(cpp_grid, act, CppView, visit);
 
@@ -1701,17 +1741,17 @@ void AcceptCallDialog::init(Q3TabDialog * t, ActivityActionData * act,
         cpp_trigger->setText(d->cpp_trigger);
     }
 
-    t->addTab(cpp_grid, TR("trigger - C++"));
+    t->addTab(cpp_grid, QObject::tr("trigger - C++"));
 
     if ((d == 0) || !GenerationSettings::cpp_get_default_defs())
         t->removePage(cpp_grid);
 
     // java
 
-    java_grid = mkgrid(t, TR("trigger - Java"));
+    java_grid = mkgrid(t, QObject::tr("trigger - Java"));
 
-    new QLabel(TR("trigger : "), java_grid);
-    java_trigger = new LineEdit(java_grid);
+    java_grid->addWidget(new QLabel(QObject::tr("trigger : "), java_grid));
+    java_grid->addWidget(java_trigger = new LineEdit(java_grid));
 
     java_cond.init(java_grid, act, JavaView, visit);
 
@@ -1720,7 +1760,7 @@ void AcceptCallDialog::init(Q3TabDialog * t, ActivityActionData * act,
         java_trigger->setText(d->java_trigger);
     }
 
-    t->addTab(java_grid, TR("trigger - Java"));
+    t->addTab(java_grid, QObject::tr("trigger - Java"));
 
     if ((d == 0) || !GenerationSettings::java_get_default_defs())
         t->removePage(java_grid);
@@ -1728,26 +1768,26 @@ void AcceptCallDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
 bool AcceptCallDialog::update(AcceptCallAction * a)
 {
-    a->uml_trigger = uml_trigger->text().stripWhiteSpace();
-    a->cpp_trigger = cpp_trigger->text().stripWhiteSpace();
-    a->java_trigger = java_trigger->text().stripWhiteSpace();
+    a->uml_trigger = uml_trigger->text().trimmed();
+    a->cpp_trigger = cpp_trigger->text().trimmed();
+    a->java_trigger = java_trigger->text().trimmed();
 
     return FALSE;
 }
 
 // Reply
 
-void ReplyDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void ReplyDialog::init(TabDialog * t, ActivityActionData * act,
                        ReplyAction * d, bool visit)
 {
     td = t;
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("trigger - Ocl"));
+    ocl_grid = mkgrid(t, QObject::tr("trigger - Ocl"));
 
-    new QLabel(TR("trigger : "), ocl_grid);
-    uml_trigger = new LineEdit(ocl_grid);
+    ocl_grid->addWidget(new QLabel(QObject::tr("trigger : "), ocl_grid));
+    ocl_grid->addWidget(uml_trigger = new LineEdit(ocl_grid));
     uml_trigger->setReadOnly(visit);
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
@@ -1757,17 +1797,17 @@ void ReplyDialog::init(Q3TabDialog * t, ActivityActionData * act,
         uml_trigger->setText(d->uml_trigger);
     }
 
-    t->addTab(ocl_grid, TR("trigger - Ocl"));
+    t->addTab(ocl_grid, QObject::tr("trigger - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
 
     // cpp
 
-    cpp_grid = mkgrid(t, TR("trigger - C++"));
+    cpp_grid = mkgrid(t, QObject::tr("trigger - C++"));
 
-    new QLabel(TR("trigger : "), cpp_grid);
-    cpp_trigger = new LineEdit(cpp_grid);
+    cpp_grid->addWidget(new QLabel(QObject::tr("trigger : "), cpp_grid));
+    cpp_grid->addWidget(cpp_trigger = new LineEdit(cpp_grid));
 
     cpp_cond.init(cpp_grid, act, CppView, visit);
 
@@ -1776,17 +1816,17 @@ void ReplyDialog::init(Q3TabDialog * t, ActivityActionData * act,
         cpp_trigger->setText(d->cpp_trigger);
     }
 
-    t->addTab(cpp_grid, TR("trigger - C++"));
+    t->addTab(cpp_grid, QObject::tr("trigger - C++"));
 
     if ((d == 0) || !GenerationSettings::cpp_get_default_defs())
         t->removePage(cpp_grid);
 
     // java
 
-    java_grid = mkgrid(t, TR("trigger - Java"));
+    java_grid = mkgrid(t, QObject::tr("trigger - Java"));
 
-    new QLabel(TR("trigger : "), java_grid);
-    java_trigger = new LineEdit(java_grid);
+    java_grid->addWidget(new QLabel(QObject::tr("trigger : "), java_grid));
+    java_grid->addWidget(java_trigger = new LineEdit(java_grid));
 
     java_cond.init(java_grid, act, JavaView, visit);
 
@@ -1795,7 +1835,7 @@ void ReplyDialog::init(Q3TabDialog * t, ActivityActionData * act,
         java_trigger->setText(d->java_trigger);
     }
 
-    t->addTab(java_grid, TR("trigger - Java"));
+    t->addTab(java_grid, QObject::tr("trigger - Java"));
 
     if ((d == 0) || !GenerationSettings::java_get_default_defs())
         t->removePage(java_grid);
@@ -1803,26 +1843,26 @@ void ReplyDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
 bool ReplyDialog::update(ReplyAction * a)
 {
-    a->uml_trigger = uml_trigger->text().stripWhiteSpace();
-    a->cpp_trigger = cpp_trigger->text().stripWhiteSpace();
-    a->java_trigger = java_trigger->text().stripWhiteSpace();
+    a->uml_trigger = uml_trigger->text().trimmed();
+    a->cpp_trigger = cpp_trigger->text().trimmed();
+    a->java_trigger = java_trigger->text().trimmed();
 
     return FALSE;
 }
 
 // Create Object
 
-void CreateObjectDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void CreateObjectDialog::init(TabDialog * t, ActivityActionData * act,
                               CreateObjectAction * d, bool visit)
 {
     td = t;
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("classifier - Ocl"));
+    ocl_grid = mkgrid(t, QObject::tr("classifier - Ocl"));
 
-    new QLabel(TR("classifier : "), ocl_grid);
-    classifier = new LineEdit(ocl_grid);
+    ocl_grid->addWidget(new QLabel(QObject::tr("classifier : "), ocl_grid));
+    ocl_grid->addWidget(classifier = new LineEdit(ocl_grid));
     classifier->setReadOnly(visit);
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
@@ -1832,7 +1872,7 @@ void CreateObjectDialog::init(Q3TabDialog * t, ActivityActionData * act,
         classifier->setText(d->classifier);
     }
 
-    t->addTab(ocl_grid, TR("classifier - Ocl"));
+    t->addTab(ocl_grid, QObject::tr("classifier - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
@@ -1844,30 +1884,30 @@ void CreateObjectDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
 bool CreateObjectDialog::update(CreateObjectAction * a)
 {
-    a->classifier = classifier->text().stripWhiteSpace();
+    a->classifier = classifier->text().trimmed();
 
     return FALSE;
 }
 
 // Destroy Object
 
-void DestroyObjectDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void DestroyObjectDialog::init(TabDialog * t, ActivityActionData * act,
                                DestroyObjectAction * d, bool visit)
 {
     td = t;
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("flags - Ocl"));
+    ocl_grid = mkgrid(t, QObject::tr("flags - Ocl"));
 
-    new QLabel("", ocl_grid);
-    Q3ButtonGroup * grp =
-        new Q3ButtonGroup(2, Qt::Horizontal, QString(), ocl_grid);
+    ocl_grid->addWidget(new QLabel("", ocl_grid));
+    BButtonGroup * grp;
+    ocl_grid->addWidget(grp = new BButtonGroup(2, Qt::Horizontal, QString(), ocl_grid));
 
-    is_destroy_links_cb = new QCheckBox(TR("links"), grp);
+    grp->addWidget(is_destroy_links_cb = new QCheckBox(QObject::tr("links"), grp));
     is_destroy_links_cb->setDisabled(visit);
 
-    is_destroy_owned_objects_cb = new QCheckBox(TR("owned objects"), grp);
+    grp->addWidget(is_destroy_owned_objects_cb = new QCheckBox(QObject::tr("owned objects"), grp));
     is_destroy_owned_objects_cb->setDisabled(visit);
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
@@ -1878,7 +1918,7 @@ void DestroyObjectDialog::init(Q3TabDialog * t, ActivityActionData * act,
         is_destroy_owned_objects_cb->setChecked(d->is_destroy_owned_objects);
     }
 
-    t->addTab(ocl_grid, TR("flags - Ocl"));
+    t->addTab(ocl_grid, QObject::tr("flags - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
@@ -1898,7 +1938,7 @@ bool DestroyObjectDialog::update(DestroyObjectAction * a)
 
 // test identity action
 
-void TestIdentityDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void TestIdentityDialog::init(TabDialog * t, ActivityActionData * act,
                               TestIdentityAction * d, bool visit)
 {
     td = t;
@@ -1928,7 +1968,7 @@ bool TestIdentityDialog::update(TestIdentityAction *)
 
 // raise exception action
 
-void RaiseExceptionDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void RaiseExceptionDialog::init(TabDialog * t, ActivityActionData * act,
                                 RaiseExceptionAction * d, bool visit)
 {
     td = t;
@@ -1958,7 +1998,7 @@ bool RaiseExceptionDialog::update(RaiseExceptionAction *)
 
 // reduce action
 
-void ReduceDialog::init(Q3TabDialog * t, ActivityActionData * act,
+void ReduceDialog::init(TabDialog * t, ActivityActionData * act,
                         ReduceAction * d, BrowserNodeList & beh,
                         QStringList & behstr, BrowserNode * v, bool ro)
 {
@@ -1970,18 +2010,19 @@ void ReduceDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     // ocl
 
-    ocl_grid = mkgrid(t, TR("reducer - Ocl"));
+    ocl_grid = mkgrid(t, tr("reducer - Ocl"));
 
-    new QLabel("", ocl_grid);
-    Q3ButtonGroup * grp =
-        new Q3ButtonGroup(2, Qt::Horizontal, QString(), ocl_grid);
+    ocl_grid->addWidget(new QLabel("", ocl_grid));
+    BButtonGroup * grp;
+    ocl_grid->addWidget(grp = new BButtonGroup(2, Qt::Horizontal, QString(), ocl_grid));
 
-    is_ordered_cb = new QCheckBox(TR("ordered"), grp);
+    grp->addWidget(is_ordered_cb = new QCheckBox(tr("ordered"), grp));
     is_ordered_cb->setDisabled(visit);
-
-    connect(new SmallPushButton(TR("reducer :"), ocl_grid), SIGNAL(clicked()),
+    SmallPushButton* sButton;
+    connect(sButton = new SmallPushButton(tr("reducer :"), ocl_grid), SIGNAL(clicked()),
             this, SLOT(menu_beh()));
-    behavior_co = new Q3ComboBox(FALSE, ocl_grid);
+    ocl_grid->addWidget(sButton);
+    ocl_grid->addWidget(behavior_co = new QComboBox(ocl_grid));
 
     ocl_cond.init(ocl_grid, act, UmlView, visit);
 
@@ -1994,7 +2035,7 @@ void ReduceDialog::init(Q3TabDialog * t, ActivityActionData * act,
 
     // note : must add then remove rather than doing nothing
     // else some sub widget will be wrong placed
-    t->addTab(ocl_grid, TR("reducer - Ocl"));
+    t->addTab(ocl_grid, tr("reducer - Ocl"));
 
     if (d == 0)
         t->removePage(ocl_grid);
@@ -2008,7 +2049,7 @@ bool ReduceDialog::update(ReduceAction * a)
 {
     a->is_ordered = is_ordered_cb->isChecked();
 
-    int index = node_names->findIndex(behavior_co->currentText());
+    int index = node_names->indexOf(behavior_co->currentText());
 
     a->reducer = (index != -1) ? nodes->at(index) : 0;
 
diff --git a/src/dialog/ActivityActionDialog.h b/src/dialog/ActivityActionDialog.h
index b37364085..1e4a84001 100644
--- a/src/dialog/ActivityActionDialog.h
+++ b/src/dialog/ActivityActionDialog.h
@@ -30,17 +30,14 @@
 
 #include <qwidget.h>
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 #include "BodyDialog.h"
 #include "ActivityActionData.h"
 
-class Q3ComboBox;
+class QComboBox;
 class Q3GroupBox;
-class Q3Grid;
+class GridBox;
 class QCheckBox;
 
 class ActivityActionData;
@@ -52,7 +49,7 @@ struct ActionCondDialog {
     MultiLineEdit * edpre;
     MultiLineEdit * edpost;
 
-    void init(Q3Grid *, ActivityActionData *, DrawingLanguage, bool visit);
+    void init(GridBox *, ActivityActionData *, DrawingLanguage, bool visit);
     void get(QString & pre, QString & post) const;
     void set(QString pre, QString post);
 };
@@ -60,19 +57,19 @@ struct ActionCondDialog {
 class AnyActionDialog
 {
 protected:
-    Q3TabDialog * td;
-    Q3Grid * ocl_grid;
-    Q3Grid * cpp_grid;
-    Q3Grid * java_grid;
+    TabDialog * td;
+    GridBox * ocl_grid;
+    GridBox * cpp_grid;
+    GridBox * java_grid;
     ActionCondDialog ocl_cond;
     ActionCondDialog cpp_cond;
     ActionCondDialog java_cond;
 
 public:
     AnyActionDialog();
-    void init(Q3TabDialog *, ActivityActionData *, void * d, bool visit);
-    void init_cpp(Q3TabDialog *, ActivityActionData *, void * d, bool visit);
-    void init_java(Q3TabDialog *, ActivityActionData *, void * d, bool visit);
+    void init(TabDialog *, ActivityActionData *, void * d, bool visit);
+    void init_cpp(TabDialog *, ActivityActionData *, void * d, bool visit);
+    void init_java(TabDialog *, ActivityActionData *, void * d, bool visit);
     bool update(void *);
     void goes(AnyActionDialog & previous);
     void get_cond(QString & ocl_pre, QString & ocl_post,
@@ -85,14 +82,14 @@ class OpaqueDialog : public QObject, public AnyActionDialog
     Q_OBJECT
 
 private:
-    Q3PtrList<BodyDialog> * edits;
+    QList<BodyDialog *> * edits;
     MultiLineEdit * ocl_beh;
     MultiLineEdit * cpp_beh;
     MultiLineEdit * java_beh;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, OpaqueAction *,
-              Q3PtrList<BodyDialog> & e, bool visit);
+    void init(TabDialog *, ActivityActionData *, OpaqueAction *,
+              QList<BodyDialog *> & e, bool visit);
     bool update(OpaqueAction *);
 
     static void post_edit_ocl(ActivityActionDialog * d, QString s);
@@ -115,7 +112,7 @@ class AcceptEventDialog : public AnyActionDialog
     LineEdit * java_trigger;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, AcceptEventAction *, bool visit);
+    void init(TabDialog *, ActivityActionData *, AcceptEventAction *, bool visit);
     bool update(AcceptEventAction *);
 };
 
@@ -129,15 +126,15 @@ class AccessVariableValueDialog : public QObject, public AnyActionDialog
     BrowserNodeList vars;	// attribute or relation
     QStringList var_names;
     QCheckBox * flag_cb;
-    Q3ComboBox * class_co;
-    Q3ComboBox * var_co;
+    QComboBox * class_co;
+    QComboBox * var_co;
     bool visit;
 
     void insert_vars(BrowserClass * c);
     void set(BrowserNode * bn);
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *,
+    void init(TabDialog *, ActivityActionData *,
               AccessVariableValueAction *, BrowserNodeList & nodes,
               QStringList &, bool visit);
     bool update(AccessVariableValueAction *);
@@ -149,39 +146,48 @@ protected slots:
 
 class ClearVariableValueDialog : public AccessVariableValueDialog
 {
+    Q_OBJECT
 };
 
 class ReadVariableValueDialog : public AccessVariableValueDialog
 {
+    Q_OBJECT
 };
 
 class WriteVariableValueDialog : public AccessVariableValueDialog
 {
+    Q_OBJECT
 };
 
 class ChangeVariableValueDialog : public AccessVariableValueDialog
 {
+    Q_OBJECT
+
 private:
     QCheckBox * flag_cb;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *,
-              ChangeVariableValueAction *, const char * flg_name,
+    void init(TabDialog *, ActivityActionData *,
+              ChangeVariableValueAction *, QString flg_name,
               BrowserNodeList & nodes, QStringList &, bool visit);
     bool update(ChangeVariableValueAction *);
 };
 
 class AddVariableValueDialog : public ChangeVariableValueDialog
 {
+    Q_OBJECT
+
 public:
-    void init(Q3TabDialog *, ActivityActionData *, AddVariableValueAction *,
+    void init(TabDialog *, ActivityActionData *, AddVariableValueAction *,
               BrowserNodeList & nodes, QStringList &, bool visit);
 };
 
 class RemoveVariableValueDialog : public ChangeVariableValueDialog
 {
+    Q_OBJECT
+
 public:
-    void init(Q3TabDialog *, ActivityActionData *, RemoveVariableValueAction *,
+    void init(TabDialog *, ActivityActionData *, RemoveVariableValueAction *,
               BrowserNodeList & nodes, QStringList &, bool visit);
 };
 
@@ -190,7 +196,7 @@ class WithBehaviorDialog : public AnyActionDialog
 protected:
     BrowserNodeList * nodes;
     QStringList * node_names;
-    Q3ComboBox * behavior_co;
+    QComboBox * behavior_co;
     BrowserNode * view;
     bool visit;
 
@@ -208,7 +214,7 @@ class CallBehaviorDialog : public QObject, public WithBehaviorDialog
     QCheckBox * synchronous_cb;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, CallBehaviorAction *,
+    void init(TabDialog *, ActivityActionData *, CallBehaviorAction *,
               BrowserNodeList &, QStringList &, BrowserNode * v, bool visit);
     bool update(CallBehaviorAction *);
 
@@ -226,15 +232,15 @@ class CallOperationDialog :  public QObject, public AnyActionDialog
     BrowserNodeList opers;	// attribute or relation
     QStringList oper_names;
     QCheckBox * synchronous_cb;
-    Q3ComboBox * class_co;
-    Q3ComboBox * oper_co;
+    QComboBox * class_co;
+    QComboBox * oper_co;
     bool visit;
 
     void insert_opers(BrowserClass * c);
     void set(BrowserNode * bn);
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, CallOperationAction *,
+    void init(TabDialog *, ActivityActionData *, CallOperationAction *,
               BrowserNodeList &, QStringList &, bool visit);
     bool update(CallOperationAction *);
 
@@ -255,7 +261,7 @@ class SendSignalDialog : public AnyActionDialog
     LineEdit * java_signal;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, SendSignalAction *, bool visit);
+    void init(TabDialog *, ActivityActionData *, SendSignalAction *, bool visit);
     bool update(SendSignalAction *);
 };
 
@@ -272,14 +278,14 @@ class ValueSpecificationDialog : public QObject, public AnyActionDialog
     Q_OBJECT
 
 private:
-    Q3PtrList<BodyDialog> * edits;
+    QList<BodyDialog *> * edits;
     MultiLineEdit * ocl_val;
     MultiLineEdit * cpp_val;
     MultiLineEdit * java_val;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *,
-              ValueSpecificationAction *, Q3PtrList<BodyDialog> & e,
+    void init(TabDialog *, ActivityActionData *,
+              ValueSpecificationAction *, QList<BodyDialog *> & e,
               bool visit);
     bool update(ValueSpecificationAction *);
 
@@ -301,7 +307,7 @@ class AcceptCallDialog : public AnyActionDialog
     LineEdit * java_trigger;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, AcceptCallAction *, bool visit);
+    void init(TabDialog *, ActivityActionData *, AcceptCallAction *, bool visit);
     bool update(AcceptCallAction *);
 };
 
@@ -313,7 +319,7 @@ class ReplyDialog : public AnyActionDialog
     LineEdit * java_trigger;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, ReplyAction *, bool visit);
+    void init(TabDialog *, ActivityActionData *, ReplyAction *, bool visit);
     bool update(ReplyAction *);
 };
 
@@ -323,7 +329,7 @@ class CreateObjectDialog : public AnyActionDialog
     LineEdit * classifier;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, CreateObjectAction *, bool visit);
+    void init(TabDialog *, ActivityActionData *, CreateObjectAction *, bool visit);
     bool update(CreateObjectAction *);
 };
 
@@ -334,21 +340,21 @@ class DestroyObjectDialog : public AnyActionDialog
     QCheckBox * is_destroy_owned_objects_cb;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, DestroyObjectAction *, bool visit);
+    void init(TabDialog *, ActivityActionData *, DestroyObjectAction *, bool visit);
     bool update(DestroyObjectAction *);
 };
 
 class TestIdentityDialog : public AnyActionDialog
 {
 public:
-    void init(Q3TabDialog *, ActivityActionData *, TestIdentityAction *, bool visit);
+    void init(TabDialog *, ActivityActionData *, TestIdentityAction *, bool visit);
     bool update(TestIdentityAction *);
 };
 
 class RaiseExceptionDialog : public AnyActionDialog
 {
 public:
-    void init(Q3TabDialog *, ActivityActionData *, RaiseExceptionAction *, bool visit);
+    void init(TabDialog *, ActivityActionData *, RaiseExceptionAction *, bool visit);
     bool update(RaiseExceptionAction *);
 };
 
@@ -360,7 +366,7 @@ class ReduceDialog : public QObject, public WithBehaviorDialog
     QCheckBox * is_ordered_cb;
 
 public:
-    void init(Q3TabDialog *, ActivityActionData *, ReduceAction *,
+    void init(TabDialog *, ActivityActionData *, ReduceAction *,
               BrowserNodeList &, QStringList &, BrowserNode * v, bool visit);
     bool update(ReduceAction *);
 
@@ -368,7 +374,7 @@ public slots:
     void menu_beh();
 };
 
-class ActivityActionDialog : public Q3TabDialog
+class ActivityActionDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -378,8 +384,8 @@ class ActivityActionDialog : public Q3TabDialog
     QWidget * umltab;
     ActivityActionData * act;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * edtype;
+    QComboBox * edstereotype;
+    QComboBox * edtype;
     UmlActionKind current_type;
     MultiLineEdit * comment;
     MultiLineEdit * constraint;
@@ -387,7 +393,7 @@ class ActivityActionDialog : public Q3TabDialog
     QStringList class_names;
     BrowserNodeList behaviors;
     QStringList behavior_names;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     OpaqueDialog opaque;
     AcceptEventDialog acceptevent;
@@ -434,7 +440,7 @@ class ActivityActionDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edTypeActivated(int);
     void edit_description();
diff --git a/src/dialog/ActivityDialog.cpp b/src/dialog/ActivityDialog.cpp
index 510a0122d..723da1d5d 100644
--- a/src/dialog/ActivityDialog.cpp
+++ b/src/dialog/ActivityDialog.cpp
@@ -29,16 +29,14 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
-#include <q3buttongroup.h>
-#include <q3popupmenu.h>
+#include <bbuttongroup.h>
 #include <qcursor.h>
-
 #include "ActivityDialog.h"
 #include "ActivityData.h"
 #include "BrowserActivity.h"
@@ -53,124 +51,135 @@
 #include "GenerationSettings.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
+#include "menufactory.h"
 
 QSize ActivityDialog::previous_size;
 
 ActivityDialog::ActivityDialog(ActivityData * d)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), activity(d)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), activity(d)
 {
     d->browser_node->edit_start();
 
     if (d->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("Activity dialog"));
+    setWindowTitle(tr("Activity dialog"));
     visit = !hasOkButton();
 
     BrowserNode * bn = activity->browser_node;
-    Q3Grid * grid;
+    GridBox * grid;
 
     //
     // general tab
     //
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(activity->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(activity->get_stereotype()));
 
     if (!visit) {
-        edstereotype->insertStringList(BrowserActivity::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlActivity));
+        edstereotype->addItems(BrowserActivity::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlActivity));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    connect(new SmallPushButton(TR("specification :"), grid), SIGNAL(clicked()),
+    SmallPushButton* sButton;
+    connect(sButton = new SmallPushButton(tr("specification :"), grid), SIGNAL(clicked()),
             this, SLOT(menu_specification()));
-    edspecification = new Q3ComboBox(FALSE, grid);
+    grid->addWidget(sButton);
+    grid->addWidget(edspecification = new QComboBox(grid));
     edspecification->setSizePolicy(sp);
 
     if (visit) {
         if (activity->get_specification() == 0)
-            edspecification->insertItem("");
+            edspecification->addItem("");
         else
-            edspecification->insertItem(activity->get_specification()->full_name(TRUE));
+            edspecification->addItem(activity->get_specification()->full_name(TRUE));
     }
     else {
-        edspecification->insertItem("");
+        edspecification->addItem("");
         edspecification->setAutoCompletion(completion());
         BrowserOperation::instances(opers);
         opers.full_names(list);
-        edspecification->insertStringList(list);
-        edspecification->setCurrentItem((activity->get_specification() == 0)
-                                        ? 0
-                                        : opers.findRef(activity->get_specification()) + 1);
+        edspecification->addItems(list);
+        edspecification->setCurrentIndex((activity->get_specification() == 0)
+                                         ? 0
+                                         : opers.indexOf(activity->get_specification()) + 1);
     }
 
-    new QLabel(grid);
-    Q3ButtonGroup * bg =
-        new Q3ButtonGroup(3, Qt::Horizontal, QString(), grid);
+    grid->addWidget(new QLabel(grid));
+    BButtonGroup * bg;
+    grid->addWidget(bg =
+            new BButtonGroup(3, Qt::Horizontal, QString(), grid));
 
-    readonly_cb = new QCheckBox(TR("read only"), bg);
+    bg->addWidget(readonly_cb = new QCheckBox(tr("read only"), bg));
 
     if (activity->read_only)
         readonly_cb->setChecked(TRUE);
 
     readonly_cb->setDisabled(visit);
 
-    singlexec_cb = new QCheckBox(TR("single execution"), bg);
+    bg->addWidget(singlexec_cb = new QCheckBox(tr("single execution"), bg));
 
     if (activity->single_execution)
         singlexec_cb->setChecked(TRUE);
 
     singlexec_cb->setDisabled(visit);
 
-    active_cb = new QCheckBox(TR("active"), bg);
+    bg->addWidget(active_cb = new QCheckBox(tr("active"), bg));
 
     if (activity->is_active)
         active_cb->setChecked(TRUE);
 
     active_cb->setDisabled(visit);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+    vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     //comment->setFont(font);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("constraint :"), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("constraint :"), vtab));
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_constraint()));
+        vtab->addWidget(sButton);
     }
 
-    constraint = new MultiLineEdit(grid);
+
+    grid->addWidget(constraint = new MultiLineEdit(grid));
     constraint->setReadOnly(visit);
     constraint->setText(activity->constraint);
     //constraint->setFont(font);
@@ -190,12 +199,12 @@ ActivityDialog::ActivityDialog(ActivityData * d)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -207,21 +216,21 @@ ActivityDialog::ActivityDialog(ActivityData * d)
 
 void ActivityDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
 void ActivityDialog::menu_specification()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edspecification->currentText().stripWhiteSpace());
+    int index = list.indexOf(edspecification->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -229,42 +238,47 @@ void ActivityDialog::menu_specification()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlOperation) && !bn->deletedp())
-            m.insertItem(TR("Choose operation selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose operation selected in browser"), 1);
         else
             bn = 0;
     }
 
     if ((index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            opers.at(index)->select_in_browser();
-            break;
-
-        case 1: {
-            QString s = bn->full_name(TRUE);
-
-            if ((index = list.findIndex(s)) == -1) {
-                // new operation, may be created through an other dialog
-                index = 0;
-                QStringList::Iterator iter = list.begin();
-                QStringList::Iterator iter_end = list.end();
-
-                while ((iter != iter_end) && (*iter < s)) {
-                    ++iter;
-                    index += 1;
+        QAction *retActon = m.exec(QCursor::pos());
+        if(retActon)
+        {
+            switch (retActon->data().toInt()) {
+            case 0:
+                opers.at(index)->select_in_browser();
+                break;
+
+            case 1: {
+                QString s = bn->full_name(TRUE);
+
+                if ((index = list.indexOf(s)) == -1) {
+                    // new operation, may be created through an other dialog
+                    index = 0;
+                    QStringList::Iterator iter = list.begin();
+                    QStringList::Iterator iter_end = list.end();
+
+                    while ((iter != iter_end) && (*iter < s)) {
+                        ++iter;
+                        index += 1;
+                    }
+
+                    opers.insert((unsigned) index, bn);
+                    list.insert(iter, s);
+                    edspecification->addItem(s, index + 1);
                 }
-
-                opers.insert((unsigned) index, bn);
-                list.insert(iter, s);
-                edspecification->insertItem(s, index + 1);
             }
-        }
 
-        edspecification->setCurrentItem(index + 1);
-        break;
 
-        default:
-            break;
+                edspecification->setCurrentIndex(index + 1);
+                break;
+
+            default:
+                break;
+            }
         }
     }
 }
@@ -274,8 +288,9 @@ ActivityDialog::~ActivityDialog()
     activity->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -289,19 +304,19 @@ void ActivityDialog::change_tabs(QWidget *)
 void ActivityDialog::init_tab(CondDialog & d, InfoData & cd,
                               const char * lbl, bool enabled)
 {
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("Pre\ncondition : "), grid);
-    d.edpre = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Pre\ncondition : "), grid));
+    grid->addWidget(d.edpre = new MultiLineEdit(grid));
     d.edpre->setText(cd.first);
 
     if (visit)
         d.edpre->setReadOnly(TRUE);
 
-    new QLabel(TR("Post\ncondition : "), grid);
-    d.edpost = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Post\ncondition : "), grid));
+    grid->addWidget(d.edpost = new MultiLineEdit(grid));
     d.edpost->setText(cd.second);
 
     if (visit)
@@ -326,7 +341,7 @@ void ActivityDialog::post_edit_description(ActivityDialog * d, QString s)
 
 void ActivityDialog::edit_constraint()
 {
-    edit(constraint->text(), edname->text().stripWhiteSpace() + "_constraint",
+    edit(constraint->text(), edname->text().trimmed() + "_constraint",
          activity, TxtEdit, this, (post_edit) post_edit_constraint, edits);
 }
 
@@ -343,18 +358,18 @@ void ActivityDialog::accept()
     BrowserNode * bn = activity->browser_node;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if ((s != bn->get_name()) &&
-        ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlActivity,
-                bn->allow_spaces(),
-                bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+            ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlActivity,
+                                                             bn->allow_spaces(),
+                                                             bn->allow_empty()))
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else {
         bn->set_name(s);
 
-        bool newst = activity->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
-        int index = list.findIndex(edspecification->currentText().stripWhiteSpace());
+        bool newst = activity->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
+        int index = list.indexOf(edspecification->currentText().trimmed());
 
         activity->set_specification((index != -1)
                                     ? (BrowserOperation *) opers.at(index)
@@ -371,7 +386,7 @@ void ActivityDialog::accept()
         bn->set_comment(comment->text());
         UmlWindow::update_comment_if_needed(bn);
 
-        activity->constraint = constraint->stripWhiteSpaceText();
+        activity->constraint = constraint->trimmedText();
 
         kvtable->updateNodeFromThis(bn);
 
@@ -381,12 +396,12 @@ void ActivityDialog::accept()
         bn->package_modified();
         activity->modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
 
 void CondDialog::accept(InfoData & cond)
 {
-    cond.first = edpre->text().stripWhiteSpace();
-    cond.second = edpost->text().stripWhiteSpace();
+    cond.first = edpre->text().trimmed();
+    cond.second = edpost->text().trimmed();
 }
diff --git a/src/dialog/ActivityDialog.h b/src/dialog/ActivityDialog.h
index 53bbff7a0..a64388102 100644
--- a/src/dialog/ActivityDialog.h
+++ b/src/dialog/ActivityDialog.h
@@ -30,17 +30,13 @@
 
 #include <qwidget.h>
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "UmlEnum.h"
 #include "BrowserNode.h"
 
 class QPushButton;
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
-
 class LineEdit;
 class MultiLineEdit;
 class ActivityData;
@@ -55,7 +51,7 @@ struct CondDialog {
     void accept(InfoData &);
 };
 
-class ActivityDialog : public Q3TabDialog
+class ActivityDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -65,11 +61,11 @@ class ActivityDialog : public Q3TabDialog
     QStringList list;
     BrowserNodeList opers;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * edspecification;
+    QComboBox * edstereotype;
+    QComboBox * edspecification;
     MultiLineEdit * comment;
     MultiLineEdit * constraint;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
     QCheckBox * readonly_cb;
     QCheckBox * singlexec_cb;
     QCheckBox * active_cb;
@@ -94,7 +90,7 @@ class ActivityDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void menu_specification();
     void edit_description();
diff --git a/src/dialog/ActivityObjectDialog.cpp b/src/dialog/ActivityObjectDialog.cpp
index 83d0c2b7a..b6d3b2862 100644
--- a/src/dialog/ActivityObjectDialog.cpp
+++ b/src/dialog/ActivityObjectDialog.cpp
@@ -29,17 +29,15 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3buttongroup.h>
+#include <qcombobox.h>
+#include <bbuttongroup.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
 #include <qcursor.h>
-
 #include "ActivityObjectDialog.h"
 #include "ActivityObjectData.h"
 #include "BrowserActivityObject.h"
@@ -54,40 +52,41 @@
 #include "BodyDialog.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "hhbox.h"
+#include "menufactory.h"
 QSize ActivityObjectDialog::previous_size;
 
-ActivityObjectDialog::ActivityObjectDialog(ActivityObjectData * d, const char * what,
-        QStringList & st)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), data(d)
+ActivityObjectDialog::ActivityObjectDialog(ActivityObjectData * d, QString what,
+                                           QStringList & st)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), data(d)
 {
     d->browser_node->edit_start();
 
     if (d->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     visit = !hasOkButton();
-    setCaption(TR(QString(what) + " dialog"));
+    setWindowTitle((QString(what) + " dialog"));
 
-    Q3Grid * grid;
-    Q3HBox * htab;
+    GridBox * grid;
+    HHBox * htab;
     QString s;
 
     // general tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name :"), grid);
-    edname = new LineEdit(data->name(), grid);
+    grid->addWidget(new QLabel(tr("name :"), grid));
+    grid->addWidget(edname = new LineEdit(data->name(), grid));
     edname->setReadOnly(visit);
 
     QFont font = edname->font();
@@ -97,36 +96,40 @@ ActivityObjectDialog::ActivityObjectDialog(ActivityObjectData * d, const char *
 
     font.setFixedPitch(TRUE);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(data->stereotype));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(data->stereotype));
 
     if (! visit) {
-        edstereotype->insertStringList(st);
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlActivityObject));
+        edstereotype->addItems(st);
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlActivityObject));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
 
     QSizePolicy sp = edstereotype->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    connect(new SmallPushButton(TR("type :"), grid), SIGNAL(clicked()),
+    SmallPushButton* sButton;
+    connect( sButton= new SmallPushButton(tr("type :"), grid), SIGNAL(clicked()),
             this, SLOT(menu_type()));
+    grid->addWidget(sButton);
 
-    edtype = new Q3ComboBox(!visit, grid);
-    edtype->insertItem(data->get_type().get_full_type());
+    grid->addWidget(edtype = new QComboBox(grid));
+    edtype->setEditable(!visit);
+    edtype->addItem(data->get_type().get_full_type());
 
     if (!visit) {
         BrowserClass::instances(nodes);
         nodes.full_names(list);
 
-        edtype->insertStringList(GenerationSettings::basic_types());
+        edtype->addItems(GenerationSettings::basic_types());
         offset = edtype->count();
-        edtype->insertStringList(list);
+        edtype->addItems(list);
         edtype->setAutoCompletion(completion());
 
         // search for the view containing the activity
@@ -140,65 +143,68 @@ ActivityObjectDialog::ActivityObjectDialog(ActivityObjectData * d, const char *
         view = (BrowserNode *) view->parent();
     }
 
-    edtype->setCurrentItem(0);
+    edtype->setCurrentIndex(0);
     edtype->setSizePolicy(sp);
 
-    new QLabel(TR("multiplicity : "), grid);
-    htab = new Q3HBox(grid);
-    edmultiplicity = new Q3ComboBox(!visit, htab);
+    grid->addWidget(new QLabel(tr("multiplicity : "), grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(edmultiplicity = new QComboBox(htab));
+    edmultiplicity->setEditable(!visit);
     edmultiplicity->setSizePolicy(sp);
-    edmultiplicity->insertItem(data->get_multiplicity());
+    edmultiplicity->addItem(data->get_multiplicity());
 
     if (!visit) {
-        edmultiplicity->insertItem("1");
-        edmultiplicity->insertItem("0..1");
-        edmultiplicity->insertItem("*");
-        edmultiplicity->insertItem("1..*");
+        edmultiplicity->addItem("1");
+        edmultiplicity->addItem("0..1");
+        edmultiplicity->addItem("*");
+        edmultiplicity->addItem("1..*");
     }
 
-    new QLabel(TR("   ordering : "), htab);
-    edordering = new Q3ComboBox(FALSE, htab);
+    htab->addWidget(new QLabel(tr("   ordering : "), htab));
+    htab->addWidget(edordering = new QComboBox(htab));
 
     UmlOrderingKind o = data->get_ordering();
 
-    edordering->insertItem(stringify(o));
+    edordering->addItem(stringify(o));
 
     if (!visit) {
         if (o != UmlUnordered)
-            edordering->insertItem(stringify(UmlUnordered));
+            edordering->addItem(stringify(UmlUnordered));
 
         if (o != UmlOrdered)
-            edordering->insertItem(stringify(UmlOrdered));
+            edordering->addItem(stringify(UmlOrdered));
 
         if (o != UmlLifo)
-            edordering->insertItem(stringify(UmlLifo));
+            edordering->addItem(stringify(UmlLifo));
 
         if (o != UmlFifo)
-            edordering->insertItem(stringify(UmlFifo));
+            edordering->addItem(stringify(UmlFifo));
     }
 
-    new QLabel(TR("in state : "), grid);
-    htab = new Q3HBox(grid);
-    edin_state = new LineEdit(data->in_state, htab);
+    grid->addWidget(new QLabel(tr("in state : "), grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(edin_state = new LineEdit(data->in_state, htab));
     edin_state->setReadOnly(visit);
 
-    new QLabel("  ", htab);
-    is_control_cb = new QCheckBox(TR("is control"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(is_control_cb = new QCheckBox(tr("is control"), htab));
 
     if (data->is_control)
         is_control_cb->setChecked(TRUE);
 
     is_control_cb->setDisabled(visit);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
     }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(data->browser_node->get_comment());
     comment->setFont(font);
@@ -221,12 +227,12 @@ ActivityObjectDialog::ActivityObjectDialog(ActivityObjectData * d, const char *
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(data->browser_node, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(data->browser_node, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -238,7 +244,7 @@ ActivityObjectDialog::ActivityObjectDialog(ActivityObjectData * d, const char *
 
 void ActivityObjectDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -247,8 +253,9 @@ ActivityObjectDialog::~ActivityObjectDialog()
     data->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -272,20 +279,25 @@ void ActivityObjectDialog::init_tab(QWidget *& w, MultiLineEdit *& ed,
                                     const char * sl, bool enabled)
 {
     bool visit = !hasOkButton();
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     w = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    Q3VBox * vtab = new Q3VBox(grid);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
 
-    new QLabel(TR("selection : "), vtab);
+    vtab->addWidget(new QLabel(tr("selection : "), vtab));
 
+    SmallPushButton *sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl);
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl);
+        vtab->addWidget(sButton);
+    }
 
-    ed = new MultiLineEdit(grid);
+    grid->addWidget(ed = new MultiLineEdit(grid));
 
     QFont font = ed->font();
 
@@ -307,15 +319,15 @@ void ActivityObjectDialog::init_tab(QWidget *& w, MultiLineEdit *& ed,
 
 void ActivityObjectDialog::menu_type()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edtype->currentText().stripWhiteSpace());
+    int index = list.indexOf(edtype->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -323,61 +335,65 @@ void ActivityObjectDialog::menu_type()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlClass) && !bn->deletedp())
-            m.insertItem(TR("Choose class selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose class selected in browser"), 1);
         else
             bn = 0;
 
-        m.insertItem(TR("Create class and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create class and choose it"), 2);
     }
 
     if (!visit || (index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            nodes.at(index)->select_in_browser();
-            break;
+        QAction *retActon = m.exec(QCursor::pos());
+        if(retActon)
+        {
+            switch (retActon->data().toInt()) {
+            case 0:
+                nodes.at(index)->select_in_browser();
+                break;
 
-        case 2:
-            bn = BrowserClass::add_class(FALSE, view);
+            case 2:
+                bn = BrowserClass::add_class(FALSE, view);
 
-            if (bn == 0)
-                return;
+                if (bn == 0)
+                    return;
 
-            bn->select_in_browser();
+                bn->select_in_browser();
 
-            // no break
-        case 1: {
-            QString s = bn->full_name(TRUE);
+                // no break
+            case 1: {
+                QString s = bn->full_name(TRUE);
 
-            if ((index = list.findIndex(s)) == -1) {
-                // new class, may be created through an other dialog
-                QStringList::Iterator iter = list.begin();
-                QStringList::Iterator iter_end = list.end();
+                if ((index = list.indexOf(s)) == -1) {
+                    // new class, may be created through an other dialog
+                    QStringList::Iterator iter = list.begin();
+                    QStringList::Iterator iter_end = list.end();
 
-                index = 0;
+                    index = 0;
 
-                while ((iter != iter_end) && (*iter < s)) {
-                    ++iter;
-                    index += 1;
-                }
+                    while ((iter != iter_end) && (*iter < s)) {
+                        ++iter;
+                        index += 1;
+                    }
 
-                nodes.insert((unsigned) index, bn);
-                list.insert(iter, s);
-                edtype->insertItem(s, index + offset);
+                    nodes.insert((unsigned) index, bn);
+                    list.insert(iter, s);
+                    edtype->insertItem(index + offset, s);
+                }
             }
-        }
 
-        edtype->setCurrentItem(index + offset);
-        break;
+                edtype->setCurrentIndex(index + offset);
+                break;
 
-        default:
-            break;
+            default:
+                break;
+            }
         }
     }
 }
 
 void ActivityObjectDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          data, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -387,15 +403,15 @@ void ActivityObjectDialog::post_edit_description(ActivityObjectDialog * d, QStri
 }
 
 #define DEF_EDIT(lang, Lang) \
-void ActivityObjectDialog::edit_##lang##_selection() {	\
-  edit(ed##lang##_selection->text(), "object_"#lang"_selection", data, Lang,  \
-       this, (post_edit) post_edit_##lang##_##selection, edits);	\
-} \
-  \
-void ActivityObjectDialog::post_edit_##lang##_selection(ActivityObjectDialog * d, QString s) \
+    void ActivityObjectDialog::edit_##lang##_selection() {	\
+    edit(ed##lang##_selection->text(), "object_"#lang"_selection", data, Lang,  \
+    this, (post_edit) post_edit_##lang##_##selection, edits);	\
+    } \
+    \
+    void ActivityObjectDialog::post_edit_##lang##_selection(ActivityObjectDialog * d, QString s) \
 { \
-  d->ed##lang##_selection->setText(s); \
-}
+    d->ed##lang##_selection->setText(s); \
+    }
 
 DEF_EDIT(uml, TxtEdit)
 DEF_EDIT(cpp, CppEdit)
@@ -407,17 +423,17 @@ void ActivityObjectDialog::accept()
         return;
 
     BrowserNode * bn = data->browser_node;
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
 
     bn->set_name(s);
 
-    bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
     AType t;
 
-    s = edtype->currentText().stripWhiteSpace();
+    s = edtype->currentText().trimmed();
 
     if (!s.isEmpty()) {
-        int index = list.findIndex(s);
+        int index = list.indexOf(s);
 
         if (index >= 0)
             t.type = (BrowserClass *) nodes.at(index);
@@ -427,13 +443,13 @@ void ActivityObjectDialog::accept()
 
     data->set_type(t);
     data->multiplicity =
-        edmultiplicity->currentText().stripWhiteSpace();
+            edmultiplicity->currentText().trimmed();
     data->ordering = ordering(edordering->currentText());
     data->is_control = is_control_cb->isChecked();
-    data->in_state = edin_state->text().stripWhiteSpace();
-    data->uml_selection = eduml_selection->text().stripWhiteSpace();
-    data->cpp_selection = edcpp_selection->text().stripWhiteSpace();
-    data->java_selection = edjava_selection->text().stripWhiteSpace();
+    data->in_state = edin_state->text().trimmed();
+    data->uml_selection = eduml_selection->text().trimmed();
+    data->cpp_selection = edcpp_selection->text().trimmed();
+    data->java_selection = edjava_selection->text().trimmed();
 
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
@@ -446,5 +462,5 @@ void ActivityObjectDialog::accept()
     bn->package_modified();
     data->modified();
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/ActivityObjectDialog.h b/src/dialog/ActivityObjectDialog.h
index 51a269954..f7d1a6a65 100644
--- a/src/dialog/ActivityObjectDialog.h
+++ b/src/dialog/ActivityObjectDialog.h
@@ -33,16 +33,12 @@
 
 
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QRadioButton;
-
 class BrowserActivityObject;
 class ActivityObjectData;
 class BrowserNode;
@@ -51,7 +47,7 @@ class MultiLineEdit;
 class KeyValuesTable;
 class BodyDialog;
 
-class ActivityObjectDialog : public Q3TabDialog
+class ActivityObjectDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -60,7 +56,7 @@ class ActivityObjectDialog : public Q3TabDialog
     ActivityObjectData * data;
     QStringList list;
     BrowserNodeList nodes;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
     int offset;
     BrowserNode * view;
 
@@ -71,10 +67,10 @@ class ActivityObjectDialog : public Q3TabDialog
 
     // uml tab
     LineEdit * edname;
-    Q3ComboBox * edtype;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * edordering;
-    Q3ComboBox * edmultiplicity;
+    QComboBox * edtype;
+    QComboBox * edstereotype;
+    QComboBox * edordering;
+    QComboBox * edmultiplicity;
     QCheckBox * is_control_cb;
     LineEdit * edin_state;
     MultiLineEdit * eduml_selection;
@@ -96,13 +92,13 @@ class ActivityObjectDialog : public Q3TabDialog
                   const char * lbl, const char * sl, bool enabled);
 
 public:
-    ActivityObjectDialog(ActivityObjectData * a, const char * what,
+    ActivityObjectDialog(ActivityObjectData * a, QString what,
                          QStringList & st);
     virtual ~ActivityObjectDialog();
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edit_description();
     void edit_uml_selection();
diff --git a/src/dialog/ActivityPartitionDialog.cpp b/src/dialog/ActivityPartitionDialog.cpp
index 043ed2794..1454675f0 100644
--- a/src/dialog/ActivityPartitionDialog.cpp
+++ b/src/dialog/ActivityPartitionDialog.cpp
@@ -29,18 +29,13 @@
 
 
 
-#include <q3grid.h>
+#include <gridbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qcheckbox.h>
-#include <q3vbox.h>
-#include <q3popupmenu.h>
+#include <vvbox.h>
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
-
 #include "ActivityPartitionDialog.h"
 #include "ActivityPartitionData.h"
 #include "BrowserActivityPartition.h"
@@ -53,103 +48,111 @@
 #include "ProfiledStereotypes.h"
 #include "BrowserView.h"
 #include "translate.h"
-
+#include "hhbox.h"
+#include "menufactory.h"
 QSize ActivityPartitionDialog::previous_size;
 
 ActivityPartitionDialog::ActivityPartitionDialog(ActivityPartitionData * d)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), data(d)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), data(d)
 {
     d->browser_node->edit_start();
 
     if (d->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("Activity Partition dialog"));
+    setWindowTitle(tr("Activity Partition dialog"));
 
     bool visit = !hasOkButton();
 
     // general tab
 
     BrowserNode * bn = data->get_browser_node();
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(data->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(data->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserActivityPartition::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlActivityPartition));
+        edstereotype->addItems(BrowserActivityPartition::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlActivityPartition));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    connect(new SmallPushButton(TR("represents :"), grid), SIGNAL(clicked()),
+    SmallPushButton *sButton;
+    connect(sButton = new SmallPushButton(tr("represents :"), grid), SIGNAL(clicked()),
             this, SLOT(menu_represents()));
-    edrepresents = new Q3ComboBox(FALSE, grid);
+    grid->addWidget(sButton);
+    grid->addWidget(edrepresents = new QComboBox(grid));
 
     if ((data->represents != 0) && !data->represents->deletedp()) {
         represented = data->represents;
-        edrepresents->insertItem(*(data->represents->pixmap(0)),
-                                 data->represents->full_name(TRUE));
+        edrepresents->addItem(*(data->represents->pixmap(0)),
+                              data->represents->full_name(TRUE));
     }
     else {
         represented = 0;
-        edrepresents->insertItem("");
+        edrepresents->addItem("");
     }
 
     if (! visit)
-        edrepresents->insertItem("");
+        edrepresents->addItem("");
 
-    edrepresents->setCurrentItem(0);
+    edrepresents->setCurrentIndex(0);
     edrepresents->setSizePolicy(sp);
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    new QLabel(grid);
-    htab = new Q3HBox(grid);
-    new QLabel("  ", htab);
-    dimension_cb = new QCheckBox(TR("is dimension"), htab);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(dimension_cb = new QCheckBox(tr("is dimension"), htab));
 
     if (data->is_dimension)
         dimension_cb->setChecked(TRUE);
 
     dimension_cb->setDisabled(visit);
-    new QLabel("", htab);
-    external_cb = new QCheckBox(TR("is external"), htab);
+    htab->addWidget(new QLabel("", htab));
+    htab->addWidget(external_cb = new QCheckBox(tr("is external"), htab));
 
     if (data->is_external)
         external_cb->setChecked(TRUE);
 
     external_cb->setDisabled(visit);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton =  new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     QFont font = comment->font();
@@ -164,12 +167,12 @@ ActivityPartitionDialog::ActivityPartitionDialog(ActivityPartitionData * d)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+   grid->addWidget( kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -181,7 +184,7 @@ ActivityPartitionDialog::ActivityPartitionDialog(ActivityPartitionData * d)
 
 void ActivityPartitionDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -190,8 +193,9 @@ ActivityPartitionDialog::~ActivityPartitionDialog()
     data->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -206,7 +210,7 @@ void ActivityPartitionDialog::edit_description()
 {
     edit(comment->text(),
          (edname == 0) ? QString("description")
-         : edname->text().stripWhiteSpace() + "_description",
+                       : edname->text().trimmed() + "_description",
          data, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -244,44 +248,47 @@ void ActivityPartitionDialog::menu_represents()
     if (!hasOkButton() && (represented == 0))
         return;
 
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
     if (represented != 0)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = BrowserView::selected_item();
 
     if ((bn != 0) && allowed(bn))
-        m.insertItem(TR("Choose element selected in browser"), 1);
+        MenuFactory::addItem(m, tr("Choose element selected in browser"), 1);
 
-    const Q3PtrList<BrowserNode> & l = BrowserNode::marked_nodes();
+    const QList<BrowserNode *> & l = BrowserNode::marked_nodes();
 
-    if ((l.count() == 1) && allowed(l.getFirst()))
-        m.insertItem(TR("Choose element marked in browser"), 2);
+    if ((l.count() == 1) && allowed(l.first()))
+        MenuFactory::addItem(m, tr("Choose element marked in browser"), 2);
 
-    switch (m.exec(QCursor::pos())) {
-    case 0:
-        represented->select_in_browser();
-        return;
+    QAction* retAction = m.exec(QCursor::pos());
+    if(retAction)
+    {
+        switch (retAction->data().toInt()) {
+        case 0:
+            represented->select_in_browser();
+            return;
 
-    case 1:
-        represented = bn;
-        break;
+        case 1:
+            represented = bn;
+            break;
 
-    case 2:
-        represented = l.getFirst();
-        break;
+        case 2:
+            represented = l.first();
+            break;
 
-    default:
-        return;
+        default:
+            return;
+        }
     }
 
-    edrepresents->changeItem(*(represented->pixmap(0)),
-                             represented->full_name(TRUE),
-                             0);
+    edrepresents->setItemText(0, represented->full_name(TRUE));
+    edrepresents->setItemIcon(0, *(represented->pixmap(0)));
 }
 
 void ActivityPartitionDialog::accept()
@@ -292,13 +299,13 @@ void ActivityPartitionDialog::accept()
     BrowserNode * bn = data->get_browser_node();
 
     if (edname != 0) {
-        QString s = edname->text().stripWhiteSpace();
+        QString s = edname->text().trimmed();
 
         if ((s != bn->get_name()) &&
-            ((BrowserNode *) bn->parent())->wrong_child_name(s, bn->get_type(),
-                    bn->allow_spaces(),
-                    bn->allow_empty())) {
-            msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+                ((BrowserNode *) bn->parent())->wrong_child_name(s, bn->get_type(),
+                                                                 bn->allow_spaces(),
+                                                                 bn->allow_empty())) {
+            msg_critical(tr("Error"), edname->text() + tr("\n\nillegal name or already used"));
             return;
         }
         else
@@ -306,11 +313,11 @@ void ActivityPartitionDialog::accept()
     }
 
     data->represents = (edrepresents->currentText().isEmpty())
-                       ? 0 : represented;
+            ? 0 : represented;
     data->is_dimension = dimension_cb->isChecked();
     data->is_external = external_cb->isChecked();
 
-    bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
@@ -322,5 +329,5 @@ void ActivityPartitionDialog::accept()
     bn->package_modified();
     data->modified();
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/ActivityPartitionDialog.h b/src/dialog/ActivityPartitionDialog.h
index f87631ff2..50f0dcc17 100644
--- a/src/dialog/ActivityPartitionDialog.h
+++ b/src/dialog/ActivityPartitionDialog.h
@@ -27,16 +27,9 @@
 
 #ifndef ACTIVITYPARTITIONDIALOG_H
 #define ACTIVITYPARTITIONDIALOG_H
+#include <tabdialog.h>
 
-
-
-
-
-#include <q3ptrlist.h>
-#include <q3tabdialog.h>
-#include <q3ptrlist.h>
-
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 
 class LineEdit;
@@ -46,7 +39,7 @@ class KeyValuesTable;
 class BodyDialog;
 class BrowserNode;
 
-class ActivityPartitionDialog : public Q3TabDialog
+class ActivityPartitionDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -54,14 +47,14 @@ class ActivityPartitionDialog : public Q3TabDialog
     QWidget * umltab;
     ActivityPartitionData * data;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * edrepresents;
+    QComboBox * edstereotype;
+    QComboBox * edrepresents;
     BrowserNode * represented;
     QCheckBox * dimension_cb;
     QCheckBox * external_cb;
     MultiLineEdit * comment;
     KeyValuesTable * kvtable;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     static QSize previous_size;
 
@@ -73,7 +66,7 @@ class ActivityPartitionDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
     void menu_represents();
 
diff --git a/src/dialog/AnnotationDialog.cpp b/src/dialog/AnnotationDialog.cpp
index ffc3ad2d2..62098d706 100644
--- a/src/dialog/AnnotationDialog.cpp
+++ b/src/dialog/AnnotationDialog.cpp
@@ -32,10 +32,10 @@
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "AnnotationDialog.h"
 #include "UmlDesktop.h"
@@ -50,9 +50,10 @@ static const char * DefaultAnnotations[] = {
 };
 
 AnnotationDialog::AnnotationDialog(QWidget * parent, QString & s, bool visit)
-    : QDialog(parent, "annotation editor", TRUE), value(s)
+    : QDialog(parent/*, "annotation editor", TRUE*/), value(s)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    setWindowTitle("annotation editor");
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
@@ -68,32 +69,33 @@ AnnotationDialog::AnnotationDialog(QWidget * parent, QString & s, bool visit)
         // to choose and add an annotation
 
         QLabel * label =
-            new QLabel(TR("\nTo add an annotation at the cursor position\n"
+            new QLabel(tr("\nTo add an annotation at the cursor position\n"
                           "you may select it in the list and press 'add'\n"),
                        this);
         label->setAlignment(Qt::AlignCenter);
         vbox->addWidget(label);
 
-        Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+        QHBoxLayout * hbox = new QHBoxLayout();
+        vbox->addLayout(hbox);
         QPushButton * add_button;
 
         hbox->setMargin(5);
-        add_button = new QPushButton(TR("Add "), this);
+        add_button = new QPushButton(tr("Add "), this);
         hbox->addWidget(add_button);
         connect(add_button, SIGNAL(clicked()), this, SLOT(add_annotation()));
 
-        cb = new Q3ComboBox(FALSE, this);
+        cb = new QComboBox(this);
 
         QSizePolicy sp = cb->sizePolicy();
 
-        sp.setHorData(QSizePolicy::Expanding);
+        sp.setHorizontalPolicy(QSizePolicy::Expanding);
         cb->setSizePolicy(sp);
         cb->setAutoCompletion(completion());
 
         for (int i = 0;
              i != sizeof(DefaultAnnotations) / sizeof(*DefaultAnnotations);
              i += 1)
-            cb->insertItem(DefaultAnnotations[i]);
+            cb->addItem(DefaultAnnotations[i]);
 
         QStringList list;
 
@@ -101,7 +103,7 @@ AnnotationDialog::AnnotationDialog(QWidget * parent, QString & s, bool visit)
 
         if (! annotations.isEmpty()) {
             annotations.full_names(list);
-            cb->insertStringList(list);
+            cb->addItems(list);
         }
 
         hbox->addWidget(cb);
@@ -110,10 +112,11 @@ AnnotationDialog::AnnotationDialog(QWidget * parent, QString & s, bool visit)
 
         vbox->addWidget(new QLabel("", this));
 
-        hbox = new Q3HBoxLayout(vbox);
+        hbox = new QHBoxLayout();
+        vbox->addLayout(hbox);
         hbox->setMargin(5);
-        QPushButton * accept = new QPushButton(TR("&OK"), this);
-        QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+        QPushButton * accept = new QPushButton(tr("&OK"), this);
+        QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
         QSize bs(cancel->sizeHint());
 
         accept->setDefault(TRUE);
@@ -133,10 +136,11 @@ AnnotationDialog::AnnotationDialog(QWidget * parent, QString & s, bool visit)
 
         vbox->addWidget(new QLabel("", this));
 
-        Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+        QHBoxLayout * hbox = new QHBoxLayout();
+        vbox->addLayout(hbox);
 
         hbox->setMargin(5);
-        QPushButton * close = new QPushButton(TR("&Close"), this);
+        QPushButton * close = new QPushButton(tr("&Close"), this);
 
         hbox->addWidget(close);
 
@@ -156,7 +160,7 @@ void AnnotationDialog::add_annotation()
 {
     const int ndefault =
         sizeof(DefaultAnnotations) / sizeof(*DefaultAnnotations);
-    int added_index = cb->currentItem();
+    int added_index = cb->currentIndex();
     QString added;
 
     if (added_index < ndefault)
@@ -168,7 +172,7 @@ void AnnotationDialog::add_annotation()
         // have member ?
         int n = 0;
         QString first_name;
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
         for (child = cl->firstChild(); child != 0; child = child->nextSibling()) {
             if (!((BrowserNode *) child)->deletedp()) {
@@ -208,13 +212,13 @@ void AnnotationDialog::add_annotation()
         }
     }
 
-    e->insert("@" + added + "\n");
+    e->appendPlainText("@" + added + "\n");
     e->setFocus();
 }
 
 void AnnotationDialog::accept()
 {
-    value = e->text().stripWhiteSpace();
+    value = e->text().trimmed();
 
     if (!value.isEmpty())
         value += '\n';
diff --git a/src/dialog/AnnotationDialog.h b/src/dialog/AnnotationDialog.h
index 1426dd1f1..b5cac5186 100644
--- a/src/dialog/AnnotationDialog.h
+++ b/src/dialog/AnnotationDialog.h
@@ -33,7 +33,7 @@
 #include "DialogUtil.h"
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class MultiLineEdit;
 
 class AnnotationDialog : public QDialog
@@ -43,7 +43,7 @@ class AnnotationDialog : public QDialog
 protected:
     QString & value;
     MultiLineEdit * e;
-    Q3ComboBox * cb;
+    QComboBox * cb;
     BrowserNodeList annotations;
 
     static QSize previous_size;
@@ -53,7 +53,7 @@ class AnnotationDialog : public QDialog
     virtual ~AnnotationDialog();
 
 protected slots:
-    virtual void accept();
+    virtual void accept() override;
     void add_annotation();
 
 
diff --git a/src/dialog/ArtifactDialog.cpp b/src/dialog/ArtifactDialog.cpp
index 033cbd6a0..d3a8f1f3c 100644
--- a/src/dialog/ArtifactDialog.cpp
+++ b/src/dialog/ArtifactDialog.cpp
@@ -30,14 +30,12 @@
 
 
 #include <qsplitter.h>
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-
+#include <qcombobox.h>
+#include <QList>
 #include "ArtifactDialog.h"
 #include "UmlDesktop.h"
 #include "BrowserArtifact.h"
@@ -64,18 +62,18 @@ static QScopedPointer<ArtifactDialog> instance;
 ArtifactDialog::ArtifactDialog(ArtifactData * nd)
     : EdgeMenuDialog(0, 0, FALSE), data(nd)
 {
-    nd->browser_node->edit_start();
+    //nd->browser_node->edit_start();
 
     if (nd->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("artifact dialog"));
+    setWindowTitle(tr("artifact dialog"));
 
     init_uml_tab();
     init_cpp_tab();
@@ -88,27 +86,27 @@ ArtifactDialog::ArtifactDialog(ArtifactData * nd)
 
     // USER : list key - value
 
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable((BrowserArtifact *) data->get_browser_node(),
-                                 grid, !hasOkButton());
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable((BrowserArtifact *) data->get_browser_node(),
+                                                 grid, !hasOkButton()));
+    addTab(grid, tr("Properties"));
 
     //
 
     edStereotypeActivated(data->get_stereotype());
 
-    connect(this, SIGNAL(currentChanged(QWidget *)),
-            this, SLOT(update_tab(QWidget *)));
+    connect(m_tabWidget, SIGNAL(currentChanged(int)),
+            this, SLOT(update_tab(int)));
 
     //open_dialog(this);
 }
 
 void ArtifactDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::setsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -117,14 +115,16 @@ ArtifactDialog::~ArtifactDialog()
     //data->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
-
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
+#ifdef EDGETOOLENABLED
     if(toolbar)
     {
         toolbar->setParent(0);
         toolbar->hide();
     }
+#endif
     close_dialog(this);
 
 }
@@ -134,47 +134,51 @@ void ArtifactDialog::init_uml_tab()
     bool visit = !hasOkButton();
 
     BrowserArtifact * bn = (BrowserArtifact *) data->get_browser_node();
-    Q3VBox * vbox;
-    Q3Grid * grid = new Q3Grid(2, this);
+    VVBox * vbox;
+    GridBox * grid = new GridBox(2, this);
 
     uml_page = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(TRUE, grid);
-    edstereotype->insertItem(toUnicode(data->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(true);
+    edstereotype->addItem(toUnicode(data->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserArtifact::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlArtifact));
+        edstereotype->addItems(BrowserArtifact::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlArtifact));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
     if (! visit)
         connect(edstereotype, SIGNAL(activated(const QString &)),
                 this, SLOT(edStereotypeActivated(const QString &)));
 
-    vbox = new Q3VBox(grid);
-    new QLabel(TR("description :"), vbox);
+    grid->addWidget(vbox = new VVBox(grid));
+    vbox->addWidget(new QLabel(tr("description :"), vbox));
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vbox), SIGNAL(clicked()),
+        SmallPushButton* sButton;
+        connect(sButton = new SmallPushButton(tr("Editor"), vbox), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
-        connect(new SmallPushButton(TR("Default"), vbox), SIGNAL(clicked()),
+        vbox->addWidget(sButton);
+        connect(sButton = new SmallPushButton(tr("Default"), vbox), SIGNAL(clicked()),
                 this, SLOT(default_description()));
+        vbox->addWidget(sButton);
     }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     QFont font = comment->font();
@@ -191,23 +195,24 @@ void ArtifactDialog::init_uml_tab()
 void ArtifactDialog::init_cpp_tab()
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
-    Q3VBox * vbox;
+    HHBox * hbox;
+    VVBox * vbox;
     QLabel * lbl1;
     QLabel * lbl2;
     QPushButton * edit = 0;
+    QPushButton * tempB = 0;
 
     // C++ h
 
     cpp_h_content_page = new QSplitter(Qt::Vertical, this);
     cpp_h_content_page->setOpaqueResize(TRUE);
 
-    vbox = new Q3VBox(cpp_h_content_page);
+    vbox = new VVBox(cpp_h_content_page);
 
-    hbox = new Q3HBox(vbox);
+    vbox->addWidget(hbox = new HHBox(vbox));
     hbox->setMargin(5);
-    lbl1 = new QLabel(TR("Header file \ndefinition : "), hbox);
-    edcpp_h_content = new MultiLineEdit(hbox);
+    hbox->addWidget( lbl1 = new QLabel(tr("Header file \ndefinition : "), hbox));
+    hbox->addWidget(edcpp_h_content = new MultiLineEdit(hbox));
     edcpp_h_content->setText(data->cpp_h);
     QFont font = comment->font();
 
@@ -222,19 +227,21 @@ void ArtifactDialog::init_cpp_tab()
     else {
         connect(edcpp_h_content, SIGNAL(textChanged()), this, SLOT(cpp_update_h()));
 
-        hbox = new Q3HBox(vbox);
-        edit = new SmallPushButton(TR("Editor"), hbox);
+        vbox->addWidget(hbox = new HHBox(vbox));
+        hbox->addWidget(edit = new SmallPushButton(tr("Editor"), hbox));
         connect(edit, SIGNAL(clicked()), this, SLOT(cpp_edit_h()));
-        connect(new QPushButton(TR("Default definition"), hbox), SIGNAL(clicked()),
+        connect(tempB = new QPushButton(tr("Default definition"), hbox), SIGNAL(clicked()),
                 this, SLOT(cpp_default_h()));
-        connect(new QPushButton(TR("Not generated in C++"), hbox), SIGNAL(clicked()),
+        hbox->addWidget(tempB);
+        connect(tempB = new QPushButton(tr("Not generated in C++"), hbox), SIGNAL(clicked()),
                 this, SLOT(cpp_unmapped_h()));
+        hbox->addWidget(tempB);
     }
 
-    hbox = new Q3HBox(cpp_h_content_page, "result");
+    hbox = new HHBox(cpp_h_content_page, "result");
     hbox->setMargin(5);
-    lbl2 = new QLabel(TR("Result after\nsubstitution : "), hbox);
-    showcpp_h_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl2 = new QLabel(tr("Result after\nsubstitution : "), hbox));
+    hbox->addWidget(showcpp_h_content = new MultiLineEdit(hbox));
     showcpp_h_content->setReadOnly(TRUE);
     showcpp_h_content->setFont(font);
 
@@ -243,7 +250,7 @@ void ArtifactDialog::init_cpp_tab()
     else
         same_width(lbl1, lbl2, edit);
 
-    addTab(cpp_h_content_page, TR("C++ header"));
+    addTab(cpp_h_content_page, tr("C++ header"));
 
     if (!GenerationSettings::cpp_get_default_defs())
         removePage(cpp_h_content_page);
@@ -253,12 +260,12 @@ void ArtifactDialog::init_cpp_tab()
     cpp_src_content_page = new QSplitter(Qt::Vertical, this);
     cpp_src_content_page->setOpaqueResize(TRUE);
 
-    vbox = new Q3VBox(cpp_src_content_page);
+    vbox = new VVBox(cpp_src_content_page);
 
-    hbox = new Q3HBox(vbox);
+    vbox->addWidget(hbox = new HHBox(vbox));
     hbox->setMargin(5);
-    lbl1 = new QLabel(TR("Source file \ndefinition : "), hbox);
-    edcpp_src_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl1 = new QLabel(tr("Source file \ndefinition : "), hbox));
+    hbox->addWidget(edcpp_src_content = new MultiLineEdit(hbox));
     edcpp_src_content->setText(data->cpp_src);
     edcpp_src_content->setFont(font);
 
@@ -267,19 +274,21 @@ void ArtifactDialog::init_cpp_tab()
     else {
         connect(edcpp_src_content, SIGNAL(textChanged()), this, SLOT(cpp_update_src()));
 
-        hbox = new Q3HBox(vbox);
-        edit = new SmallPushButton(TR("Editor"), hbox);
+        vbox->addWidget(hbox = new HHBox(vbox));
+        hbox->addWidget(edit = new SmallPushButton(tr("Editor"), hbox));
         connect(edit, SIGNAL(clicked()), this, SLOT(cpp_edit_src()));
-        connect(new QPushButton(TR("Default definition"), hbox), SIGNAL(clicked()),
+        connect(tempB =  new QPushButton(tr("Default definition"), hbox), SIGNAL(clicked()),
                 this, SLOT(cpp_default_src()));
-        connect(new QPushButton(TR("Not generated in C++"), hbox), SIGNAL(clicked()),
+         hbox->addWidget(tempB);
+        connect(tempB = new QPushButton(tr("Not generated in C++"), hbox), SIGNAL(clicked()),
                 this, SLOT(cpp_unmapped_src()));
+         hbox->addWidget(tempB);
     }
 
-    hbox = new Q3HBox(cpp_src_content_page, "result");
+    hbox = new HHBox(cpp_src_content_page, "result");
     hbox->setMargin(5);
-    lbl2 = new QLabel(TR("Result after\nsubstitution : "), hbox);
-    showcpp_src_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl2 = new QLabel(tr("Result after\nsubstitution : "), hbox));
+    hbox->addWidget(showcpp_src_content = new MultiLineEdit(hbox));
     showcpp_src_content->setReadOnly(TRUE);
     showcpp_src_content->setFont(font);
 
@@ -288,7 +297,7 @@ void ArtifactDialog::init_cpp_tab()
     else
         same_width(lbl1, lbl2, edit);
 
-    addTab(cpp_src_content_page, TR("C++ source"));
+    addTab(cpp_src_content_page, tr("C++ source"));
 
     if (!GenerationSettings::cpp_get_default_defs())
         removePage(cpp_src_content_page);
@@ -297,8 +306,8 @@ void ArtifactDialog::init_cpp_tab()
 void ArtifactDialog::init_java_tab()
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
-    Q3VBox * vbox;
+    HHBox * hbox;
+    VVBox * vbox;
     QLabel * lbl1;
     QLabel * lbl2;
     QPushButton * edit = 0;
@@ -306,12 +315,12 @@ void ArtifactDialog::init_java_tab()
     java_content_page = new QSplitter(Qt::Vertical, this);
     java_content_page->setOpaqueResize(TRUE);
 
-    vbox = new Q3VBox(java_content_page);
+    vbox = new VVBox(java_content_page);
 
-    hbox = new Q3HBox(vbox);
+    vbox->addWidget(hbox = new HHBox(vbox));
     hbox->setMargin(5);
-    lbl1 = new QLabel(TR("File \ndefinition : "), hbox);
-    edjava_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl1 = new QLabel(tr("File \ndefinition : "), hbox));
+    hbox->addWidget(edjava_content = new MultiLineEdit(hbox));
     edjava_content->setText(data->java_src);
     QFont font = comment->font();
 
@@ -326,19 +335,22 @@ void ArtifactDialog::init_java_tab()
     else {
         connect(edjava_content, SIGNAL(textChanged()), this, SLOT(java_update_src()));
 
-        hbox = new Q3HBox(vbox);
-        edit = new SmallPushButton(TR("Editor"), hbox);
+        vbox->addWidget(hbox = new HHBox(vbox));
+        hbox->addWidget(edit = new SmallPushButton(tr("Editor"), hbox));
         connect(edit, SIGNAL(clicked()), this, SLOT(java_edit()));
-        connect(new QPushButton(TR("Default definition"), hbox), SIGNAL(clicked()),
+        QPushButton * tempB = 0;
+        connect(tempB = new QPushButton(tr("Default definition"), hbox), SIGNAL(clicked()),
                 this, SLOT(java_default_src()));
-        connect(new QPushButton(TR("Not generated in Java"), hbox), SIGNAL(clicked()),
+        hbox->addWidget(tempB);
+        connect(tempB = new QPushButton(tr("Not generated in Java"), hbox), SIGNAL(clicked()),
                 this, SLOT(java_unmapped_src()));
+        hbox->addWidget(tempB);
     }
 
-    hbox = new Q3HBox(java_content_page, "result");
+    hbox = new HHBox(java_content_page, "result");
     hbox->setMargin(5);
-    lbl2 = new QLabel(TR("Result after\nsubstitution : "), hbox);
-    showjava_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl2 = new QLabel(tr("Result after\nsubstitution : "), hbox));
+    hbox->addWidget(showjava_content = new MultiLineEdit(hbox));
     showjava_content->setReadOnly(TRUE);
     showjava_content->setFont(font);
 
@@ -347,7 +359,7 @@ void ArtifactDialog::init_java_tab()
     else
         same_width(lbl1, lbl2, edit);
 
-    addTab(java_content_page, TR("Java source"));
+    addTab(java_content_page, tr("Java source"));
 
     if (!GenerationSettings::java_get_default_defs())
         removePage(java_content_page);
@@ -356,8 +368,8 @@ void ArtifactDialog::init_java_tab()
 void ArtifactDialog::init_php_tab()
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
-    Q3VBox * vbox;
+    HHBox * hbox;
+    VVBox * vbox;
     QLabel * lbl1;
     QLabel * lbl2;
     QPushButton * edit = 0;
@@ -365,12 +377,12 @@ void ArtifactDialog::init_php_tab()
     php_content_page = new QSplitter(Qt::Vertical, this);
     php_content_page->setOpaqueResize(TRUE);
 
-    vbox = new Q3VBox(php_content_page);
+    vbox = new VVBox(php_content_page);
 
-    hbox = new Q3HBox(vbox);
+    vbox->addWidget(hbox = new HHBox(vbox));
     hbox->setMargin(5);
-    lbl1 = new QLabel(TR("File \ndefinition : "), hbox);
-    edphp_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl1 = new QLabel(tr("File \ndefinition : "), hbox));
+    hbox->addWidget(edphp_content = new MultiLineEdit(hbox));
     edphp_content->setText(data->php_src);
     QFont font = comment->font();
 
@@ -385,19 +397,22 @@ void ArtifactDialog::init_php_tab()
     else {
         connect(edphp_content, SIGNAL(textChanged()), this, SLOT(php_update_src()));
 
-        hbox = new Q3HBox(vbox);
-        edit = new SmallPushButton(TR("Editor"), hbox);
+        vbox->addWidget(hbox = new HHBox(vbox));
+        hbox->addWidget(edit = new SmallPushButton(tr("Editor"), hbox));
         connect(edit, SIGNAL(clicked()), this, SLOT(php_edit()));
-        connect(new QPushButton(TR("Default definition"), hbox), SIGNAL(clicked()),
+        QPushButton * tempB = 0;
+        connect(tempB = new QPushButton(tr("Default definition"), hbox), SIGNAL(clicked()),
                 this, SLOT(php_default_src()));
-        connect(new QPushButton(TR("Not generated in Php"), hbox), SIGNAL(clicked()),
+        hbox->addWidget(tempB);
+        connect(tempB = new QPushButton(tr("Not generated in Php"), hbox), SIGNAL(clicked()),
                 this, SLOT(php_unmapped_src()));
+        hbox->addWidget(tempB);
     }
 
-    hbox = new Q3HBox(php_content_page, "result");
+    hbox = new HHBox(php_content_page, "result");
     hbox->setMargin(5);
-    lbl2 = new QLabel(TR("Result after\nsubstitution : "), hbox);
-    showphp_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl2 = new QLabel(tr("Result after\nsubstitution : "), hbox));
+    hbox->addWidget(showphp_content = new MultiLineEdit(hbox));
     showphp_content->setReadOnly(TRUE);
     showphp_content->setFont(font);
 
@@ -406,7 +421,7 @@ void ArtifactDialog::init_php_tab()
     else
         same_width(lbl1, lbl2, edit);
 
-    addTab(php_content_page, TR("Php source"));
+    addTab(php_content_page, tr("Php source"));
 
     if (!GenerationSettings::php_get_default_defs())
         removePage(php_content_page);
@@ -415,8 +430,8 @@ void ArtifactDialog::init_php_tab()
 void ArtifactDialog::init_python_tab()
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
-    Q3VBox * vbox;
+    HHBox * hbox;
+    VVBox * vbox;
     QLabel * lbl1;
     QLabel * lbl2;
     QPushButton * edit = 0;
@@ -424,12 +439,12 @@ void ArtifactDialog::init_python_tab()
     python_content_page = new QSplitter(Qt::Vertical, this);
     python_content_page->setOpaqueResize(TRUE);
 
-    vbox = new Q3VBox(python_content_page);
+    vbox = new VVBox(python_content_page);
 
-    hbox = new Q3HBox(vbox);
+    vbox->addWidget(hbox = new HHBox(vbox));
     hbox->setMargin(5);
-    lbl1 = new QLabel(TR("File \ndefinition : "), hbox);
-    edpython_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl1 = new QLabel(tr("File \ndefinition : "), hbox));
+    hbox->addWidget(edpython_content = new MultiLineEdit(hbox));
     edpython_content->setText(data->python_src);
     QFont font = comment->font();
 
@@ -444,19 +459,22 @@ void ArtifactDialog::init_python_tab()
     else {
         connect(edpython_content, SIGNAL(textChanged()), this, SLOT(python_update_src()));
 
-        hbox = new Q3HBox(vbox);
-        edit = new SmallPushButton(TR("Editor"), hbox);
+        vbox->addWidget(hbox = new HHBox(vbox));
+        hbox->addWidget(edit = new SmallPushButton(tr("Editor"), hbox));
         connect(edit, SIGNAL(clicked()), this, SLOT(python_edit()));
-        connect(new QPushButton(TR("Default definition"), hbox), SIGNAL(clicked()),
+        QPushButton * tempB = 0;
+        connect(tempB = new QPushButton(tr("Default definition"), hbox), SIGNAL(clicked()),
                 this, SLOT(python_default_src()));
-        connect(new QPushButton(TR("Not generated in Python"), hbox), SIGNAL(clicked()),
+        hbox->addWidget(tempB);
+        connect(tempB = new QPushButton(tr("Not generated in Python"), hbox), SIGNAL(clicked()),
                 this, SLOT(python_unmapped_src()));
+        hbox->addWidget(tempB);
     }
 
-    hbox = new Q3HBox(python_content_page, "result");
+    hbox = new HHBox(python_content_page, "result");
     hbox->setMargin(5);
-    lbl2 = new QLabel(TR("Result after\nsubstitution : "), hbox);
-    showpython_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl2 = new QLabel(tr("Result after\nsubstitution : "), hbox));
+    hbox->addWidget(showpython_content = new MultiLineEdit(hbox));
     showpython_content->setReadOnly(TRUE);
     showpython_content->setFont(font);
 
@@ -465,7 +483,7 @@ void ArtifactDialog::init_python_tab()
     else
         same_width(lbl1, lbl2, edit);
 
-    addTab(python_content_page, TR("Python source"));
+    addTab(python_content_page, tr("Python source"));
 
     if (!GenerationSettings::python_get_default_defs())
         removePage(python_content_page);
@@ -474,8 +492,8 @@ void ArtifactDialog::init_python_tab()
 void ArtifactDialog::init_idl_tab()
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
-    Q3VBox * vbox;
+    HHBox * hbox;
+    VVBox * vbox;
     QLabel * lbl1;
     QLabel * lbl2;
     QPushButton * edit = 0;
@@ -483,12 +501,12 @@ void ArtifactDialog::init_idl_tab()
     idl_content_page = new QSplitter(Qt::Vertical, this);
     idl_content_page->setOpaqueResize(TRUE);
 
-    vbox = new Q3VBox(idl_content_page);
+    vbox = new VVBox(idl_content_page);
 
-    hbox = new Q3HBox(vbox);
+    vbox->addWidget(hbox = new HHBox(vbox));
     hbox->setMargin(5);
-    lbl1 = new QLabel(TR("File \ndefinition : "), hbox);
-    edidl_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl1 = new QLabel(tr("File \ndefinition : "), hbox));
+    hbox->addWidget(edidl_content = new MultiLineEdit(hbox));
     edidl_content->setText(data->idl_src);
     QFont font = comment->font();
 
@@ -503,19 +521,22 @@ void ArtifactDialog::init_idl_tab()
     else {
         connect(edidl_content, SIGNAL(textChanged()), this, SLOT(idl_update_src()));
 
-        hbox = new Q3HBox(vbox);
-        edit = new SmallPushButton(TR("Editor"), hbox);
+        vbox->addWidget(hbox = new HHBox(vbox));
+        hbox->addWidget(edit = new SmallPushButton(tr("Editor"), hbox));
         connect(edit, SIGNAL(clicked()), this, SLOT(idl_edit()));
-        connect(new QPushButton(TR("Default definition"), hbox), SIGNAL(clicked()),
+        QPushButton * tempB = 0;
+        connect(tempB = new QPushButton(tr("Default definition"), hbox), SIGNAL(clicked()),
                 this, SLOT(idl_default_src()));
-        connect(new QPushButton(TR("Not generated in Idl"), hbox), SIGNAL(clicked()),
+        hbox->addWidget(tempB);
+        connect(tempB = new QPushButton(tr("Not generated in Idl"), hbox), SIGNAL(clicked()),
                 this, SLOT(idl_unmapped_src()));
+        hbox->addWidget(tempB);
     }
 
-    hbox = new Q3HBox(idl_content_page, "result");
+    hbox = new HHBox(idl_content_page, "result");
     hbox->setMargin(5);
-    lbl2 = new QLabel(TR("Result after\nsubstitution : "), hbox);
-    showidl_content = new MultiLineEdit(hbox);
+    hbox->addWidget(lbl2 = new QLabel(tr("Result after\nsubstitution : "), hbox));
+    hbox->addWidget(showidl_content = new MultiLineEdit(hbox));
     showidl_content->setReadOnly(TRUE);
     showidl_content->setFont(font);
 
@@ -524,7 +545,7 @@ void ArtifactDialog::init_idl_tab()
     else
         same_width(lbl1, lbl2, edit);
 
-    addTab(idl_content_page, TR("Idl source"));
+    addTab(idl_content_page, tr("Idl source"));
 
     if (!GenerationSettings::idl_get_default_defs())
         removePage(idl_content_page);
@@ -533,68 +554,73 @@ void ArtifactDialog::init_idl_tab()
 void ArtifactDialog::init_assoc_classes_tab()
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
-    Q3VBox * vbox;
+    HHBox * hbox;
+    VVBox * vbox;
     QPushButton * button;
     BrowserArtifact * bn = (BrowserArtifact *) data->get_browser_node();
-    const Q3ValueList<BrowserClass *> & l = bn->get_associated_classes();
-    Q3ValueList<BrowserClass *>::ConstIterator it;
-    Q3ValueList<BrowserClass *>::ConstIterator end = l.end();
+    const QList<BrowserClass *> & l = bn->get_associated_classes();
+    QList<BrowserClass *>::ConstIterator it;
+    QList<BrowserClass *>::ConstIterator end = l.end();
+    QLabel* lable;
 
-    cl_assoc_page = new Q3VBox(this);
+    cl_assoc_page = new VVBox(this);
 
     if (!visit) {
-        hbox = new Q3HBox(cl_assoc_page);
-        vbox = new Q3VBox(hbox);
+        cl_assoc_page->addWidget(hbox = new HHBox(cl_assoc_page));
+        hbox->addWidget(vbox = new VVBox(hbox));
         vbox->setMargin(5);
-        (new QLabel(TR("Classes without artifact"), vbox))->setAlignment(Qt::AlignCenter);
-        lb_cl_available = new Q3ListBox(vbox);
-        lb_cl_available->setSelectionMode(Q3ListBox::Multi);
+        (lable = new QLabel(tr("Classes without artifact"), vbox))->setAlignment(Qt::AlignCenter);
+        vbox->addWidget(lable);
+        vbox->addWidget(lb_cl_available = new QListWidget (vbox));
+        lb_cl_available->setSelectionMode(QListWidget ::MultiSelection);
 
-        Q3PtrDict<BrowserNode> d(97);
+        QHash<BrowserNode*, BrowserNode*> d;
 
         for (it = l.begin(); it != end; ++it)
             d.insert(*it, *it);
 
-        BrowserNode * cl;
         BrowserNodeList classes;
 
         BrowserClass::instances(classes, 0, TRUE);
 
-        for (cl = classes.first(); cl != 0; cl = classes.next())
+        foreach (BrowserNode *cl, classes)
             if ((((BrowserClass *) cl)->get_associated_artifact() == 0) &&
-                (d.find(cl) == 0))
-                lb_cl_available->insertItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE)));
+                    (d.find(cl) == d.end()))
+                lb_cl_available->addItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE)));
 
-        lb_cl_available->sort();
+        lb_cl_available->sortItems();
 
-        vbox = new Q3VBox(hbox);
+        hbox->addWidget(vbox = new VVBox(hbox));
         vbox->setMargin(5);
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        button = new QPushButton(vbox);
-        button->setPixmap(*rightPixmap);
+        (lable = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(lable);
+        vbox->addWidget(button = new QPushButton(vbox));
+        button->setIcon(*rightPixmap);
         connect(button, SIGNAL(clicked()), this, SLOT(associate_cls()));
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        button = new QPushButton(vbox);
-        button->setPixmap(*leftPixmap);
+        (lable = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(lable);
+        vbox->addWidget(button = new QPushButton(vbox));
+        button->setIcon(*leftPixmap);
         connect(button, SIGNAL(clicked()), this, SLOT(unassociate_cls()));
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        vbox = new Q3VBox(hbox);
+        (lable = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(lable);
+        hbox->addWidget(vbox = new VVBox(hbox));
     }
     else
         vbox = cl_assoc_page;
 
     vbox->setMargin(5);
-    (new QLabel(TR("Associated classes"), vbox))->setAlignment(Qt::AlignCenter);
-    lb_cl_associated = new Q3ListBox(vbox);
-    lb_cl_associated->setSelectionMode((visit) ? Q3ListBox::NoSelection
-                                       : Q3ListBox::Multi);
+    (lable = new QLabel(tr("Associated classes"), vbox))->setAlignment(Qt::AlignCenter);
+    vbox->addWidget(lable);
+    vbox->addWidget(lb_cl_associated = new QListWidget (vbox));
+    lb_cl_associated->setSelectionMode((visit) ? QListWidget ::NoSelection
+                                               : QListWidget ::MultiSelection);
 
     n_cpp = n_java = n_php = n_python = n_idl = 0;
 
     for (it = l.begin(); it != end; ++it) {
         if (!(*it)->deletedp() && !(*it)->nestedp()) {
-            lb_cl_associated->insertItem(new ListBoxBrowserNode(*it, (*it)->full_name(TRUE)));
+            lb_cl_associated->addItem(new ListBoxBrowserNode(*it, (*it)->full_name(TRUE)));
 
             ClassData * c = (ClassData *)(*it)->get_data();
 
@@ -616,76 +642,86 @@ void ArtifactDialog::init_assoc_classes_tab()
     }
 
     if (!visit) {
-        hbox = new Q3HBox(vbox);
+        vbox->addWidget(hbox = new HHBox(vbox));
         hbox->setMargin(5);
-        (new QLabel("", hbox))->setScaledContents(TRUE);
-        button = new QPushButton(TR("go up"), hbox);
+        (lable = new QLabel("", hbox))->setScaledContents(TRUE);
+        hbox->addWidget(lable);
+        hbox->addWidget(button = new QPushButton(tr("go up"), hbox));
         connect(button, SIGNAL(clicked()), this, SLOT(move_cls_up()));
-        (new QLabel("", hbox))->setScaledContents(TRUE);
-        button = new QPushButton(TR("go down"), hbox);
+        (lable = new QLabel("", hbox))->setScaledContents(TRUE);
+        hbox->addWidget(lable);
+        hbox->addWidget(button = new QPushButton(tr("go down"), hbox));
         connect(button, SIGNAL(clicked()), this, SLOT(move_cls_down()));
-        (new QLabel("", hbox))->setScaledContents(TRUE);
+        (lable = new QLabel("", hbox))->setScaledContents(TRUE);
+        hbox->addWidget(lable);
     }
 
-    addTab(cl_assoc_page, TR("Associated classes"));
+    addTab(cl_assoc_page, tr("Associated classes"));
 }
 
 void ArtifactDialog::init_assoc_artifacts_tab()
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
-    Q3VBox * vbox;
+    HHBox * hbox;
+    VVBox * vbox;
     QPushButton * button;
+    QLabel* label;
 
-    art_assoc_page = new Q3VBox(this);
+    art_assoc_page = new VVBox(this);
 
     if (!visit) {
-        hbox = new Q3HBox(art_assoc_page);
+        art_assoc_page->addWidget(hbox = new HHBox(art_assoc_page));
         hbox->setMargin(5);
-        new QLabel(TR("Stereotype filtering  "), hbox);
-        stereotypefilter = new Q3ComboBox(TRUE, hbox);
+        hbox->addWidget(new QLabel(tr("Stereotype filtering  "), hbox));
+        hbox->addWidget(stereotypefilter = new QComboBox( hbox));
+        stereotypefilter->setEditable(true);
         stereotypefilter->setAutoCompletion(completion());
-        stereotypefilter->insertItem("");
-        stereotypefilter->insertStringList(BrowserArtifact::default_stereotypes());
-        stereotypefilter->insertStringList(ProfiledStereotypes::defaults(UmlArtifact));
-        stereotypefilter->setCurrentItem(0);
+        stereotypefilter->addItem("");
+        stereotypefilter->addItems(BrowserArtifact::default_stereotypes());
+        stereotypefilter->addItems(ProfiledStereotypes::defaults(UmlArtifact));
+        stereotypefilter->setCurrentIndex(0);
         QSizePolicy sp = stereotypefilter->sizePolicy();
-        sp.setHorData(QSizePolicy::Expanding);
+        sp.setHorizontalPolicy(QSizePolicy::Expanding);
         stereotypefilter->setSizePolicy(sp);
         connect(stereotypefilter, SIGNAL(activated(const QString &)),
                 this, SLOT(stereotypeFilterActivated(const QString &)));
 
-        hbox = new Q3HBox(art_assoc_page);
-        vbox = new Q3VBox(hbox);
+        art_assoc_page->addWidget(hbox = new HHBox(art_assoc_page));
+        hbox->addWidget(vbox = new VVBox(hbox));
         vbox->setMargin(5);
-        (new QLabel(TR("Unassociated artifacts"), vbox))->setAlignment(Qt::AlignCenter);
-        lb_art_available = new Q3ListBox(vbox);
-        lb_art_available->setSelectionMode(Q3ListBox::Multi);
+        (label = new QLabel(tr("Unassociated artifacts"), vbox))->setAlignment(Qt::AlignCenter);
+        vbox->addWidget(label);
+        vbox->addWidget(lb_art_available = new QListWidget (vbox));
+        lb_art_available->setSelectionMode(QListWidget ::MultiSelection);
 
-        vbox = new Q3VBox(hbox);
+        hbox->addWidget(vbox = new VVBox(hbox));
         vbox->setMargin(5);
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        button = new QPushButton(vbox);
-        button->setPixmap(*rightPixmap);
+        (label = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(label);
+        vbox->addWidget(button = new QPushButton(vbox));
+        button->setIcon(*rightPixmap);
         connect(button, SIGNAL(clicked()), this, SLOT(associate_arts()));
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        button = new QPushButton(vbox);
-        button->setPixmap(*leftPixmap);
+        (label = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(label);
+        vbox->addWidget(button = new QPushButton(vbox));
+        button->setIcon(*leftPixmap);
         connect(button, SIGNAL(clicked()), this, SLOT(unassociate_arts()));
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        vbox = new Q3VBox(hbox);
+        (label = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(label);
+        hbox->addWidget(vbox = new VVBox(hbox));
     }
     else
         vbox = art_assoc_page;
 
     vbox->setMargin(5);
-    (new QLabel(TR("Associated artifacts"), vbox))->setAlignment(Qt::AlignCenter);
-    lb_art_associated = new Q3ListBox(vbox);
-    lb_art_associated->setSelectionMode((visit) ? Q3ListBox::NoSelection
-                                        : Q3ListBox::Multi);
+    (label = new QLabel(tr("Associated artifacts"), vbox))->setAlignment(Qt::AlignCenter);
+    vbox->addWidget(label);
+    vbox->addWidget(lb_art_associated = new QListWidget (vbox));
+    lb_art_associated->setSelectionMode((visit) ? QListWidget ::NoSelection
+                                                : QListWidget ::MultiSelection);
     lb_art_initialized = FALSE;
 
-    addTab(art_assoc_page, TR("Associated artifacts"));
+    addTab(art_assoc_page, tr("Associated artifacts"));
 }
 
 void ArtifactDialog::default_description()
@@ -695,7 +731,7 @@ void ArtifactDialog::default_description()
 
 void ArtifactDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          data, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -706,8 +742,8 @@ void ArtifactDialog::post_edit_description(ArtifactDialog * d, QString s)
 
 void ArtifactDialog::edStereotypeActivated(const QString & ste)
 {
-    bool a_source = (ste.stripWhiteSpace() == "source");
-    bool a_text = (ste.stripWhiteSpace() == "text");
+    bool a_source = (ste.trimmed() == "source");
+    bool a_text = (ste.trimmed() == "text");
 
     setTabEnabled(cpp_h_content_page, a_source && !a_text);
     setTabEnabled(cpp_src_content_page, a_source || a_text);
@@ -748,10 +784,11 @@ void ArtifactDialog::edStereotypeActivated(const QString & ste)
     }
 }
 
-void ArtifactDialog::update_tab(QWidget * w)
+void ArtifactDialog::update_tab(int index)
 {
     bool visit = !hasOkButton();
 
+    QWidget * w = m_tabWidget->widget(index);
     if (w == uml_page) {
         if (! visit)
             edname->setFocus();
@@ -798,7 +835,7 @@ void ArtifactDialog::update_tab(QWidget * w)
 void ArtifactDialog::cpp_edit_h()
 {
     edit(edcpp_h_content->text(),
-         edname->text().stripWhiteSpace() + "_header", data,
+         edname->text().trimmed() + "_header", data,
          CppEdit, this, (post_edit) post_cpp_edit_h, edits);
 }
 
@@ -810,8 +847,8 @@ void ArtifactDialog::post_cpp_edit_h(ArtifactDialog * d, QString s)
 void ArtifactDialog::cpp_edit_src()
 {
     edit(edcpp_src_content->text(),
-         edname->text().stripWhiteSpace() + "_source", data,
-         (edstereotype->currentText().stripWhiteSpace() == "text") ? TxtEdit : CppEdit,
+         edname->text().trimmed() + "_source", data,
+         (edstereotype->currentText().trimmed() == "text") ? TxtEdit : CppEdit,
          this, (post_edit) post_cpp_edit_src, edits);
 }
 
@@ -823,8 +860,8 @@ void ArtifactDialog::post_cpp_edit_src(ArtifactDialog * d, QString s)
 void ArtifactDialog::java_edit()
 {
     edit(edjava_content->text(),
-         edname->text().stripWhiteSpace() + "_source", data,
-         (edstereotype->currentText().stripWhiteSpace() == "text") ? TxtEdit : JavaEdit,
+         edname->text().trimmed() + "_source", data,
+         (edstereotype->currentText().trimmed() == "text") ? TxtEdit : JavaEdit,
          this, (post_edit) post_java_edit, edits);
 }
 
@@ -836,8 +873,8 @@ void ArtifactDialog::post_java_edit(ArtifactDialog * d, QString s)
 void ArtifactDialog::php_edit()
 {
     edit(edphp_content->text(),
-         edname->text().stripWhiteSpace() + "_source", data,
-         (edstereotype->currentText().stripWhiteSpace() == "text") ? TxtEdit : PhpEdit,
+         edname->text().trimmed() + "_source", data,
+         (edstereotype->currentText().trimmed() == "text") ? TxtEdit : PhpEdit,
          this, (post_edit) post_php_edit, edits);
 }
 
@@ -849,8 +886,8 @@ void ArtifactDialog::post_php_edit(ArtifactDialog * d, QString s)
 void ArtifactDialog::python_edit()
 {
     edit(edpython_content->text(),
-         edname->text().stripWhiteSpace() + "_source", data,
-         (edstereotype->currentText().stripWhiteSpace() == "text") ? TxtEdit : PythonEdit,
+         edname->text().trimmed() + "_source", data,
+         (edstereotype->currentText().trimmed() == "text") ? TxtEdit : PythonEdit,
          this, (post_edit) post_python_edit, edits);
 }
 
@@ -862,7 +899,7 @@ void ArtifactDialog::post_python_edit(ArtifactDialog * d, QString s)
 void ArtifactDialog::idl_edit()
 {
     edit(edidl_content->text(),
-         edname->text().stripWhiteSpace() + "_source",
+         edname->text().trimmed() + "_source",
          data, TxtEdit, this, (post_edit) post_idl_edit, edits);
 }
 
@@ -887,7 +924,7 @@ void ArtifactDialog::cpp_default_h()
 void ArtifactDialog::cpp_default_src()
 {
     edcpp_src_content->setText(((n_cpp != 0) &&
-                                (edstereotype->currentText().stripWhiteSpace() != "text"))
+                                (edstereotype->currentText().trimmed() != "text"))
                                ? GenerationSettings::cpp_default_source_content()
                                : "");
     cpp_update_src();
@@ -896,7 +933,7 @@ void ArtifactDialog::cpp_default_src()
 void ArtifactDialog::java_default_src()
 {
     edjava_content->setText(((n_java != 0) &&
-                             (edstereotype->currentText().stripWhiteSpace() != "text"))
+                             (edstereotype->currentText().trimmed() != "text"))
                             ? GenerationSettings::java_default_source_content()
                             : "");
     java_update_src();
@@ -905,7 +942,7 @@ void ArtifactDialog::java_default_src()
 void ArtifactDialog::php_default_src()
 {
     edphp_content->setText(((n_php != 0) &&
-                            (edstereotype->currentText().stripWhiteSpace() != "text"))
+                            (edstereotype->currentText().trimmed() != "text"))
                            ? GenerationSettings::php_default_source_content()
                            : "");
     php_update_src();
@@ -914,7 +951,7 @@ void ArtifactDialog::php_default_src()
 void ArtifactDialog::python_default_src()
 {
     edpython_content->setText(((n_python != 0) &&
-                               (edstereotype->currentText().stripWhiteSpace() != "text"))
+                               (edstereotype->currentText().trimmed() != "text"))
                               ? GenerationSettings::python_default_source_content()
                               : "");
     python_update_src();
@@ -923,7 +960,7 @@ void ArtifactDialog::python_default_src()
 void ArtifactDialog::idl_default_src()
 {
     edidl_content->setText(((n_idl != 0) &&
-                            (edstereotype->currentText().stripWhiteSpace() != "text"))
+                            (edstereotype->currentText().trimmed() != "text"))
                            ? GenerationSettings::idl_default_source_content()
                            : "");
     idl_update_src();
@@ -967,12 +1004,21 @@ void ArtifactDialog::idl_unmapped_src()
 
 static void hide_result(QSplitter * spl)
 {
-    Q3HBox * vb = (Q3HBox *) spl->child("result");
+    HHBox * vb = 0;
+    QList<QObject*> childList = spl->children();
+    foreach (QObject* obj, childList) {
+        if(obj->objectName() == "result")
+        {
+            vb = (HHBox *)obj;
+            break;
+        }
+    }
+
 
     if (vb->isVisible()) {
         vb->hide();
 
-        Q3ValueList<int> sz = spl->sizes();
+        QList<int> sz = spl->sizes();
 
         sz[0] = sz[0] + sz[1];
         sz[1] = 0;
@@ -982,10 +1028,18 @@ static void hide_result(QSplitter * spl)
 
 static void show_result(QSplitter * spl)
 {
-    Q3HBox * vb = (Q3HBox *) spl->child("result");
+    HHBox * vb = 0;
+    QList<QObject*> childList = spl->children();
+    foreach (QObject* obj, childList) {
+        if(obj->objectName() == "result")
+        {
+            vb = (HHBox *)obj;
+            break;
+        }
+    }
 
     if (vb->isHidden()) {
-        Q3ValueList<int> sz = spl->sizes();
+        QList<int> sz = spl->sizes();
 
         sz[1] = sz[0] = sz[0] / 2;
         spl->setSizes(sz);
@@ -995,24 +1049,24 @@ static void show_result(QSplitter * spl)
 }
 
 void ArtifactDialog::compute_cpp_namespace(QString & nasp,
-        QString & nasp_start,
-        QString & nasp_end)
+                                           QString & nasp_start,
+                                           QString & nasp_end)
 {
     const char * cnasp = (const char *)
-                         ((PackageData *)
-                          ((BrowserNode *) data->browser_node->parent()->parent())->get_data())
-                         ->get_cpp_namespace();
+            ((PackageData *)
+             ((BrowserNode *) data->browser_node->parent()->parent())->get_data())
+            ->get_cpp_namespace();
 
     nasp = ((cnasp[0] == ':') && (cnasp[1] == ':'))
-           ? cnasp + 2 : cnasp;
+            ? cnasp + 2 : cnasp;
 
     if (! nasp.isEmpty()) {
         int index = 0;
         int index2;
 
-        while ((index2 = nasp.find(':', index)) != -1) {
+        while ((index2 = nasp.indexOf(':', index)) != -1) {
             nasp_start += QString("namespace ") +
-                          nasp.mid(index, index2 - index) + " {\n\n";
+                    nasp.mid(index, index2 - index) + " {\n\n";
             nasp_end += "\n}\n";
             nasp.replace(index2, 2, "_");
             index = index2 + 1;
@@ -1026,25 +1080,25 @@ void ArtifactDialog::compute_cpp_namespace(QString & nasp,
 QString ArtifactDialog::compute_java_package()
 {
     const QString pack = (const char *)
-                         ((PackageData *)
-                          ((BrowserNode *) data->browser_node->parent()->parent())->get_data())
-                         ->get_java_package();
+            ((PackageData *)
+             ((BrowserNode *) data->browser_node->parent()->parent())->get_data())
+            ->get_java_package();
 
     return (pack.isEmpty())
-           ? pack
-           : QString("package ") + pack + ";\n";
+            ? pack
+            : QString("package ") + pack + ";\n";
 }
 
 QString ArtifactDialog::compute_php_namespace()
 {
     const QString nasp = (const char *)
-                         ((PackageData *)
-                          ((BrowserNode *) data->browser_node->parent()->parent())->get_data())
-                         ->get_php_namespace();
+            ((PackageData *)
+             ((BrowserNode *) data->browser_node->parent()->parent())->get_data())
+            ->get_php_namespace();
 
     return (nasp.isEmpty())
-           ? nasp
-           : QString("namespace ") + nasp + ";\n";
+            ? nasp
+            : QString("namespace ") + nasp + ";\n";
 }
 
 void ArtifactDialog::compute_idl_module(QString & mod,
@@ -1052,17 +1106,17 @@ void ArtifactDialog::compute_idl_module(QString & mod,
                                         QString & mod_end)
 {
     mod = (const char *)
-          ((PackageData *)
-           ((BrowserNode *) data->browser_node->parent()->parent())->get_data())
-          ->get_idl_module();
+            ((PackageData *)
+             ((BrowserNode *) data->browser_node->parent()->parent())->get_data())
+            ->get_idl_module();
 
     if (! mod.isEmpty()) {
         int index = 0;
         int index2;
 
-        while ((index2 = mod.find(':', index)) != -1) {
+        while ((index2 = mod.indexOf(':', index)) != -1) {
             mod_start += QString("module ") +
-                         mod.mid(index, index2 - index) + " {\n\n";
+                    mod.mid(index, index2 - index) + " {\n\n";
             mod_end += "\n};\n";
             mod.replace(index2, 2, "_");
             index = index2 + 1;
@@ -1081,7 +1135,8 @@ void ArtifactDialog::cpp_update_h()
         show_result(cpp_h_content_page);
 
         QString def = edcpp_h_content->text();
-        const char * p = def;
+        QByteArray byteArray = def.toLatin1();
+        const char * p = byteArray.constData();
         const char * pp = 0;
         QString s;
         QString nasp;
@@ -1090,7 +1145,7 @@ void ArtifactDialog::cpp_update_h()
 
         compute_cpp_namespace(nasp, nasp_start, nasp_end);
 
-        bool all_incl = (def.find("${all_includes}") != -1);
+        bool all_incl = (def.indexOf("${all_includes}") != -1);
 
         for (;;) {
             if (*p == 0) {
@@ -1117,19 +1172,19 @@ void ArtifactDialog::cpp_update_h()
                 manage_description(comment->text(), p, pp);
             else if (!strncmp(p, "${name}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace();
+                s += edname->text().trimmed();
             }
             else if (!strncmp(p, "${Name}", 7)) {
                 p += 7;
-                s += capitalize(edname->text().stripWhiteSpace());
+                s += capitalize(edname->text().trimmed());
             }
             else if (!strncmp(p, "${NAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().upper();
+                s += edname->text().trimmed().toUpper();
             }
             else if (!strncmp(p, "${nAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().lower();
+                s += edname->text().trimmed().toLower();
             }
             else if (!strncmp(p, "${namespace}", 12)) {
                 p += 12;
@@ -1137,13 +1192,13 @@ void ArtifactDialog::cpp_update_h()
             }
             else if (!strncmp(p, "${NAMESPACE}", 12)) {
                 p += 12;
-                s += nasp.upper();
+                s += nasp.toUpper();
             }
             else if (!strncmp(p, "${includes}", 11)) {
                 p += 11;
                 s += (all_incl)
-                     ? "ERROR : ${includes} exclusive with ${all_includes}\n"
-                     : "...#include \"a_needed_file.h\"   // produced by the C++ generator\n";
+                        ? "ERROR : ${includes} exclusive with ${all_includes}\n"
+                        : "...#include \"a_needed_file.h\"   // produced by the C++ generator\n";
             }
             else if (!strncmp(p, "${all_includes}", 15)) {
                 p += 15;
@@ -1152,8 +1207,8 @@ void ArtifactDialog::cpp_update_h()
             else if (!strncmp(p, "${declarations}", 15)) {
                 p += 15;
                 s += (all_incl)
-                     ? "WARNING : ${declarations} is useless because of ${all_includes}\n"
-                     : "...class a_referenced_class;    // produced by the C++ generator\n";
+                        ? "WARNING : ${declarations} is useless because of ${all_includes}\n"
+                        : "...class a_referenced_class;    // produced by the C++ generator\n";
             }
             else if (!strncmp(p, "${namespace_start}", 18)) {
                 p += 18;
@@ -1175,14 +1230,14 @@ void ArtifactDialog::cpp_update_h()
 
                 for (unsigned i = 0; i != n; i += 1) {
                     BrowserNode * bn =
-                        ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
+                            ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
                     ClassData * c = (ClassData *) bn->get_data();
 
                     if (c->get_cppdecl()[0]) {
                         FormalParamsTable * f = formals[(BrowserClass *) bn];
 
                         if (f == 0) {
-                            f = new FormalParamsTable(c, currentPage(), nodes, TRUE);
+                            f = new FormalParamsTable(c,m_tabWidget->currentWidget(), nodes, TRUE);
                             f->hide();
                             formals.insert((BrowserClass *) bn, f);
                         }
@@ -1192,7 +1247,7 @@ void ArtifactDialog::cpp_update_h()
                         if (c->get_n_actualparams() == 0)
                             a = 0;
                         else if ((a = actuals[(BrowserClass *) bn]) == 0) {
-                            a = new ActualParamsTable(c, currentPage(), nodes, TRUE);
+                            a = new ActualParamsTable(c, m_tabWidget->currentWidget(), nodes, TRUE);
                             a->hide();
                             actuals.insert((BrowserClass *) bn, a);
                         }
@@ -1202,10 +1257,10 @@ void ArtifactDialog::cpp_update_h()
 
                         ClassDialog::cpp_generate_decl(s, c, c->get_cppdecl(),
                                                        true_name(bn->get_name(),
-                                                               c->get_cppdecl()),
+                                                                 c->get_cppdecl()),
                                                        c->get_stereotype(),
                                                        (t.type != 0) ? t.type->full_name(TRUE)
-                                                       : QString((const char *) t.explicit_type),
+                                                                     : QString((const char *) t.explicit_type),
                                                        bn->get_comment(), a, f,
                                                        nds, node_names, 0);
                         s += '\n';
@@ -1229,7 +1284,8 @@ void ArtifactDialog::cpp_update_src()
         show_result(cpp_src_content_page);
 
         QString def = edcpp_src_content->text();
-        const char * p = def;
+        QByteArray byteArray = def.toLatin1();
+        const char * p = byteArray.constData();
         const char * pp = 0;
         QString s;
         QString nasp;
@@ -1266,19 +1322,19 @@ void ArtifactDialog::cpp_update_src()
             }
             else if (!strncmp(p, "${name}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace();
+                s += edname->text().trimmed();
             }
             else if (!strncmp(p, "${Name}", 7)) {
                 p += 7;
-                s += capitalize(edname->text().stripWhiteSpace());
+                s += capitalize(edname->text().trimmed());
             }
             else if (!strncmp(p, "${NAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().upper();
+                s += edname->text().trimmed().toUpper();
             }
             else if (!strncmp(p, "${nAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().lower();
+                s += edname->text().trimmed().toLower();
             }
             else if (!strncmp(p, "${namespace}", 12)) {
                 p += 12;
@@ -1286,7 +1342,7 @@ void ArtifactDialog::cpp_update_src()
             }
             else if (!strncmp(p, "${NAMESPACE}", 12)) {
                 p += 12;
-                s += nasp.upper();
+                s += nasp.toUpper();
             }
             else if (!strncmp(p, "${namespace_start}", 18)) {
                 p += 18;
@@ -1325,7 +1381,8 @@ void ArtifactDialog::java_update_src()
         show_result(java_content_page);
 
         QString def = edjava_content->text();
-        const char * p = def;
+        QByteArray byteArray = def.toLatin1();
+        const char * p = byteArray.constData();
         const char * pp = 0;
         QString s;
 
@@ -1353,7 +1410,7 @@ void ArtifactDialog::java_update_src()
                 manage_description(comment->text(), p, pp);
             else if (!strncmp(p, "${name}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace();
+                s += edname->text().trimmed();
             }
             else if (!strncmp(p, "${imports}", 10)) {
                 p += 10;
@@ -1361,15 +1418,15 @@ void ArtifactDialog::java_update_src()
             }
             else if (!strncmp(p, "${Name}", 7)) {
                 p += 7;
-                s += capitalize(edname->text().stripWhiteSpace());
+                s += capitalize(edname->text().trimmed());
             }
             else if (!strncmp(p, "${NAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().upper();
+                s += edname->text().trimmed().toUpper();
             }
             else if (!strncmp(p, "${nAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().lower();
+                s += edname->text().trimmed().toLower();
             }
             else if (!strncmp(p, "${package}", 10)) {
                 p += 10;
@@ -1387,12 +1444,12 @@ void ArtifactDialog::java_update_src()
 
                 for (unsigned i = 0; i != n; i += 1) {
                     BrowserNode * bn =
-                        ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
+                            ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
                     ClassData * c = (ClassData *) bn->get_data();
                     FormalParamsTable * f = formals[(BrowserClass *) bn];
 
                     if (f == 0) {
-                        f = new FormalParamsTable(c, currentPage(), nodes, TRUE);
+                        f = new FormalParamsTable(c, m_tabWidget->currentWidget(), nodes, TRUE);
                         f->hide();
                         formals.insert((BrowserClass *) bn, f);
                     }
@@ -1402,7 +1459,7 @@ void ArtifactDialog::java_update_src()
                     if (c->get_n_actualparams() == 0)
                         a = 0;
                     else if ((a = actuals[(BrowserClass *) bn]) == 0) {
-                        a = new ActualParamsTable(c, currentPage(), nodes, TRUE);
+                        a = new ActualParamsTable(c, m_tabWidget->currentWidget(), nodes, TRUE);
                         a->hide();
                         actuals.insert((BrowserClass *) bn, a);
                     }
@@ -1433,7 +1490,8 @@ void ArtifactDialog::php_update_src()
         show_result(php_content_page);
 
         QString def = edphp_content->text();
-        const char * p = def;
+        QByteArray byteArray = def.toLatin1();
+        const char * p = byteArray.constData();
         const char * pp = 0;
         QString s;
 
@@ -1461,19 +1519,19 @@ void ArtifactDialog::php_update_src()
                 manage_description(comment->text(), p, pp);
             else if (!strncmp(p, "${name}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace();
+                s += edname->text().trimmed();
             }
             else if (!strncmp(p, "${Name}", 7)) {
                 p += 7;
-                s += capitalize(edname->text().stripWhiteSpace());
+                s += capitalize(edname->text().trimmed());
             }
             else if (!strncmp(p, "${NAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().upper();
+                s += edname->text().trimmed().toUpper();
             }
             else if (!strncmp(p, "${nAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().lower();
+                s += edname->text().trimmed().toLower();
             }
             else if (!strncmp(p, "${namespace}", 12)) {
                 p += 12;
@@ -1495,7 +1553,7 @@ void ArtifactDialog::php_update_src()
 
                 for (unsigned i = 0; i != n; i += 1) {
                     BrowserNode * bn =
-                        ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
+                            ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
                     ClassData * c = (ClassData *) bn->get_data();
 
                     ClassDialog::php_generate_decl(s, c, c->get_phpdecl(), bn->get_name(),
@@ -1520,7 +1578,8 @@ void ArtifactDialog::python_update_src()
         show_result(python_content_page);
 
         QString def = edpython_content->text();
-        const char * p = def;
+        QByteArray byteArray = def.toLatin1();
+        const char * p = byteArray.constData();
         const char * pp = 0;
         QString s;
 
@@ -1547,19 +1606,19 @@ void ArtifactDialog::python_update_src()
                 manage_python_description(comment->text(), p, pp);
             else if (!strncmp(p, "${name}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace();
+                s += edname->text().trimmed();
             }
             else if (!strncmp(p, "${Name}", 7)) {
                 p += 7;
-                s += capitalize(edname->text().stripWhiteSpace());
+                s += capitalize(edname->text().trimmed());
             }
             else if (!strncmp(p, "${NAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().upper();
+                s += edname->text().trimmed().toUpper();
             }
             else if (!strncmp(p, "${nAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().lower();
+                s += edname->text().trimmed().toLower();
             }
             else if (!strncmp(p, "${definition}", 13)) {
                 p += 13;
@@ -1573,7 +1632,7 @@ void ArtifactDialog::python_update_src()
 
                 for (unsigned i = 0; i != n; i += 1) {
                     BrowserNode * bn =
-                        ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
+                            ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
                     ClassData * c = (ClassData *) bn->get_data();
 
                     ClassDialog::python_generate_decl(s, c, c->get_pythondecl(), bn->get_name(),
@@ -1602,7 +1661,8 @@ void ArtifactDialog::idl_update_src()
         show_result(idl_content_page);
 
         QString def = edidl_content->text();
-        const char * p = def;
+        QByteArray byteArray = def.toLatin1();
+        const char * p = byteArray.constData();
         const char * pp = 0;
         QString s;
         QString mod;
@@ -1635,19 +1695,19 @@ void ArtifactDialog::idl_update_src()
                 manage_description(comment->text(), p, pp);
             else if (!strncmp(p, "${name}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace();
+                s += edname->text().trimmed();
             }
             else if (!strncmp(p, "${Name}", 7)) {
                 p += 7;
-                s += capitalize(edname->text().stripWhiteSpace());
+                s += capitalize(edname->text().trimmed());
             }
             else if (!strncmp(p, "${NAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().upper();
+                s += edname->text().trimmed().toUpper();
             }
             else if (!strncmp(p, "${nAME}", 7)) {
                 p += 7;
-                s += edname->text().stripWhiteSpace().lower();
+                s += edname->text().trimmed().toLower();
             }
             else if (!strncmp(p, "${module}", 9)) {
                 p += 9;
@@ -1655,7 +1715,7 @@ void ArtifactDialog::idl_update_src()
             }
             else if (!strncmp(p, "${MODULE}", 9)) {
                 p += 9;
-                s += mod.upper();
+                s += mod.toUpper();
             }
             else if (!strncmp(p, "${includes}", 11)) {
                 p += 11;
@@ -1675,7 +1735,7 @@ void ArtifactDialog::idl_update_src()
 
                 for (unsigned i = 0; i != n; i += 1) {
                     BrowserNode * bn =
-                        ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
+                            ((ListBoxBrowserNode *) lb_cl_associated->item(i))->browser_node;
                     ClassData * c = (ClassData *) bn->get_data();
 
                     ClassDialog::idl_generate_decl(s, c, c->get_idldecl(), bn->get_name(),
@@ -1705,17 +1765,17 @@ void ArtifactDialog::idl_update_src()
 
 void ArtifactDialog::associate_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i < lb_cl_available->count()) {
-        Q3ListBoxItem * item = lb_cl_available->item(i);
+        QListWidgetItem * item = lb_cl_available->item(i);
 
-        if (item->selected()) {
-            lb_cl_available->takeItem(item);
-            lb_cl_associated->insertItem(item);
+        if (item->isSelected()) {
+            lb_cl_available->takeItem(lb_cl_available->row(item));
+            lb_cl_associated->addItem(item);
 
             ClassData * c = (ClassData *)
-                            ((ListBoxBrowserNode *) item)->browser_node->get_data();
+                    ((ListBoxBrowserNode *) item)->browser_node->get_data();
 
             if (c->get_cppdecl()[0])
                 n_cpp += 1;
@@ -1739,17 +1799,17 @@ void ArtifactDialog::associate_cls()
 
 void ArtifactDialog::unassociate_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i < lb_cl_associated->count()) {
-        Q3ListBoxItem * item = lb_cl_associated->item(i);
+        QListWidgetItem * item = lb_cl_associated->item(i);
 
-        if (item->selected()) {
-            lb_cl_associated->takeItem(item);
-            lb_cl_available->insertItem(item);
+        if (item->isSelected()) {
+            lb_cl_associated->takeItem(lb_cl_associated->row(item));
+            lb_cl_available->addItem(item);
 
             ClassData * c = (ClassData *)
-                            ((ListBoxBrowserNode *) item)->browser_node->get_data();
+                    ((ListBoxBrowserNode *) item)->browser_node->get_data();
 
             if (c->get_cppdecl()[0])
                 n_cpp -= 1;
@@ -1770,20 +1830,20 @@ void ArtifactDialog::unassociate_cls()
             i += 1;
     }
 
-    lb_cl_available->sort();
+    lb_cl_available->sortItems();
 }
 
 void ArtifactDialog::move_cls_up()
 {
     unsigned n = lb_cl_associated->count();
 
-    if ((n > 1) && !lb_cl_associated->item(0)->selected()) {
+    if ((n > 1) && !lb_cl_associated->item(0)->isSelected()) {
         for (unsigned i = 1; i != n; i += 1) {
-            Q3ListBoxItem * item = lb_cl_associated->item(i);
+            QListWidgetItem * item = lb_cl_associated->item(i);
 
-            if (item->selected()) {
-                lb_cl_associated->takeItem(item);
-                lb_cl_associated->insertItem(item, i - 1);
+            if (item->isSelected()) {
+                lb_cl_associated->takeItem(lb_cl_associated->row(item));
+                lb_cl_associated->insertItem(i - 1, item);
             }
         }
     }
@@ -1793,13 +1853,13 @@ void ArtifactDialog::move_cls_down()
 {
     int n = (int) lb_cl_associated->count();
 
-    if ((n > 1) && !lb_cl_associated->item(n - 1)->selected()) {
+    if ((n > 1) && !lb_cl_associated->item(n - 1)->isSelected()) {
         for (int i = n - 2; i >= 0; i -= 1) {
-            if (lb_cl_associated->item(i)->selected()) {
-                Q3ListBoxItem * item = lb_cl_associated->item(i + 1);
+            if (lb_cl_associated->item(i)->isSelected()) {
+                QListWidgetItem * item = lb_cl_associated->item(i + 1);
 
-                lb_cl_associated->takeItem(item);
-                lb_cl_associated->insertItem(item, i);
+                lb_cl_associated->takeItem(lb_cl_associated->row(item));
+                lb_cl_associated->insertItem(i,item);
             }
         }
     }
@@ -1807,17 +1867,17 @@ void ArtifactDialog::move_cls_down()
 
 void ArtifactDialog::associate_arts()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i < lb_art_available->count()) {
-        Q3ListBoxItem * item = lb_art_available->item(i);
+        QListWidgetItem * item = lb_art_available->item(i);
 
-        if (item->selected()) {
-            lb_art_available->takeItem(item);
-            lb_art_associated->insertItem(item);
+        if (item->isSelected()) {
+            lb_art_available->takeItem(lb_art_available->row(item));
+            lb_art_associated->addItem(item);
 
             BrowserArtifact * c = (BrowserArtifact *)
-                                  ((ListBoxBrowserNode *) item)->browser_node;
+                    ((ListBoxBrowserNode *) item)->browser_node;
 
             art_associated.insert(c, c);
         }
@@ -1825,61 +1885,61 @@ void ArtifactDialog::associate_arts()
             i += 1;
     }
 
-    lb_art_associated->sort();
+    lb_art_associated->sortItems();
 }
 
 void ArtifactDialog::unassociate_arts()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i < lb_art_associated->count()) {
-        Q3ListBoxItem * item = lb_art_associated->item(i);
+        QListWidgetItem * item = lb_art_associated->item(i);
 
-        if (item->selected()) {
-            lb_art_associated->takeItem(item);
-            lb_art_available->insertItem(item);
+        if (item->isSelected()) {
+            lb_art_associated->takeItem(lb_art_associated->row(item));
+            lb_art_available->addItem(item);
             art_associated.remove(((ListBoxBrowserNode *) item)->browser_node);
         }
         else
             i += 1;
     }
 
-    lb_art_available->sort();
+    lb_art_available->sortItems();
 }
 
 void ArtifactDialog::stereotypeFilterActivated(const QString & st)
 {
     if (!hasOkButton()) {
-        Q3PtrDictIterator<BrowserArtifact> it(art_associated);
+        QHashIterator<void*,BrowserArtifact*> it(art_associated);
 
-        while (it.current()) {
-            lb_art_associated->insertItem(it.current()->full_name(TRUE));
-            ++it;
+        while (it.hasNext()) {
+            it.next();
+            if(it.value())
+                lb_art_associated->addItem(it.value()->full_name(TRUE));
         }
 
-        lb_art_associated->sort();
+        lb_art_associated->sortItems();
     }
     else {
-        QString s = st.stripWhiteSpace();
+        QString s = st.trimmed();
         BrowserNodeList artifacts;
         BrowserNode * itself = data->browser_node;
-        BrowserNode * cp;
 
-        BrowserArtifact::instances(artifacts, s);
+        BrowserArtifact::instances(artifacts, s.toLatin1().constData());
         lb_art_available->clear();
         lb_art_associated->clear();
 
-        for (cp = artifacts.first(); cp != 0; cp = artifacts.next()) {
+        foreach (BrowserNode *cp, artifacts) {
             if (cp != itself) {
-                if (art_associated.find(cp))
-                    lb_art_associated->insertItem(new ListBoxBrowserNode(cp, cp->full_name(TRUE)));
+                if (art_associated.find(cp) != art_associated.end())
+                    lb_art_associated->addItem(new ListBoxBrowserNode(cp, cp->full_name(TRUE)));
                 else
-                    lb_art_available->insertItem(new ListBoxBrowserNode(cp, cp->full_name(TRUE)));
+                    lb_art_available->addItem(new ListBoxBrowserNode(cp, cp->full_name(TRUE)));
             }
         }
 
-        lb_art_available->sort();
-        lb_art_associated->sort();
+        lb_art_available->sortItems();
+        lb_art_associated->sortItems();
     }
 }
 
@@ -1888,26 +1948,26 @@ void ArtifactDialog::accept()
     if (!check_edits(edits) || !kvtable->check_unique())
         return;
 
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
     BrowserArtifact * bn = (BrowserArtifact *) data->get_browser_node();
 
     if ((s != bn->get_name()) &&
-        ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlArtifact,
-                bn->allow_spaces(),
-                bn->allow_empty()))
-        msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+            ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlArtifact,
+                                                             bn->allow_spaces(),
+                                                             bn->allow_empty()))
+        msg_critical(tr("Error"), edname->text() + tr("\n\nillegal name or already used"));
     else {
         bn->set_name(s);
         bn->set_comment(comment->text());
         UmlWindow::update_comment_if_needed(bn);
 
         QString stereotype =
-            fromUnicode(edstereotype->currentText().stripWhiteSpace());
+                fromUnicode(edstereotype->currentText().trimmed());
         bool a_text = (stereotype == "text");
         bool newst = data->set_stereotype(stereotype);
 
         if (a_text || (stereotype == "source")) {
-            Q3ValueList<BrowserClass *> l;
+            QList<BrowserClass *> l;
 
             if (! a_text) {
                 unsigned n = lb_cl_associated->count();
@@ -1920,37 +1980,37 @@ void ArtifactDialog::accept()
 
             bn->set_associated_classes(l);
 
-            if (isTabEnabled(cpp_h_content_page)) {
+            if (m_tabWidget->isTabEnabled(m_tabWidget->indexOf(cpp_h_content_page))) {
                 data->cpp_h = edcpp_h_content->text();
             }
             else
                 data->cpp_h = QString();
 
-            if (isTabEnabled(cpp_src_content_page)) {
+            if (m_tabWidget->isTabEnabled(m_tabWidget->indexOf(cpp_src_content_page))) {
                 data->cpp_src = edcpp_src_content->text();
             }
             else
                 data->cpp_src = QString();
 
-            if (isTabEnabled(java_content_page)) {
+            if (m_tabWidget->isTabEnabled(m_tabWidget->indexOf(java_content_page))) {
                 data->java_src = edjava_content->text();
             }
             else
                 data->java_src = QString();
 
-            if (isTabEnabled(php_content_page)) {
+            if (m_tabWidget->isTabEnabled(m_tabWidget->indexOf(php_content_page))) {
                 data->php_src = edphp_content->text();
             }
             else
                 data->php_src = QString();
 
-            if (isTabEnabled(python_content_page)) {
+            if (m_tabWidget->isTabEnabled(m_tabWidget->indexOf(python_content_page))) {
                 data->python_src = edpython_content->text();
             }
             else
                 data->python_src = QString();
 
-            if (isTabEnabled(idl_content_page)) {
+            if (m_tabWidget->isTabEnabled(m_tabWidget->indexOf(idl_content_page))) {
                 data->idl_src = edidl_content->text();
             }
             else
@@ -1967,21 +2027,25 @@ void ArtifactDialog::accept()
         bn->package_modified();
         data->modified();
 
-        BrowserArtifact * bn = (BrowserArtifact *) data->get_browser_node();
-        bn->edit_end();
+        //BrowserArtifact * bn = (BrowserArtifact *) data->get_browser_node();
+       // bn->edit_end();
+#ifdef EDGETOOLENABLED
         toolbar->setParent(0);
         toolbar->hide();
-        Q3TabDialog::accept();
+#endif
+        TabDialog::accept();
     }
 }
 
 void ArtifactDialog::reject()
 {
-    BrowserArtifact * bn = (BrowserArtifact *) data->get_browser_node();
-    bn->edit_end();
+    //BrowserArtifact * bn = (BrowserArtifact *) data->get_browser_node();
+    //bn->edit_end();
+#ifdef EDGETOOLENABLED
     toolbar->setParent(0);
     toolbar->hide();
-    Q3TabDialog::accept();
+#endif
+    TabDialog::accept();
 }
 ArtifactDialog* ArtifactDialog::Instance(ArtifactData * nd)
 {
diff --git a/src/dialog/ArtifactDialog.h b/src/dialog/ArtifactDialog.h
index badeafef5..dbdad4233 100644
--- a/src/dialog/ArtifactDialog.h
+++ b/src/dialog/ArtifactDialog.h
@@ -28,23 +28,16 @@
 #ifndef ARTIFACTDIALOG_H
 #define ARTIFACTDIALOG_H
 
-
-
-
-
-#include <q3ptrdict.h>
 #include <qmap.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
+#include <tabdialog.h>
 #include <QSharedPointer>
 #include "dialog/EdgeMenuDialog.h"
 #include "BrowserArtifact.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QSplitter;
-class Q3ListBox;
-class Q3VBox;
+class QListWidget ;
+class VVBox;
 class LineEdit;
 class MultiLineEdit;
 class ArtifactData;
@@ -61,11 +54,11 @@ class ArtifactDialog : public EdgeMenuDialog
     ArtifactData * data;
     QWidget * uml_page;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
     QMap<BrowserClass *, FormalParamsTable *> formals;	// to generate the associated
     QMap<BrowserClass *, ActualParamsTable *> actuals;	// classes definition
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     // c++
     unsigned n_cpp;
@@ -101,17 +94,17 @@ class ArtifactDialog : public EdgeMenuDialog
     MultiLineEdit * showidl_content;
 
     // associated classes
-    Q3VBox * cl_assoc_page;
-    Q3ListBox * lb_cl_available;
-    Q3ListBox * lb_cl_associated;
+    VVBox * cl_assoc_page;
+    QListWidget  * lb_cl_available;
+    QListWidget  * lb_cl_associated;
 
     // associated artifacts
     bool lb_art_initialized;
-    Q3PtrDict<BrowserArtifact> art_associated;
-    Q3VBox * art_assoc_page;
-    Q3ComboBox * stereotypefilter;
-    Q3ListBox * lb_art_available;
-    Q3ListBox * lb_art_associated;
+    QHash<void*,BrowserArtifact*> art_associated;
+    VVBox * art_assoc_page;
+    QComboBox * stereotypefilter;
+    QListWidget  * lb_art_available;
+    QListWidget  * lb_art_associated;
 
     // user
     KeyValuesTable * kvtable;
@@ -140,7 +133,7 @@ class ArtifactDialog : public EdgeMenuDialog
     static void post_python_edit(ArtifactDialog * d, QString s);
     static void post_idl_edit(ArtifactDialog * d, QString s);
 
-    virtual uint TypeID();
+    virtual uint TypeID() override;
 
 
 public:
@@ -150,12 +143,12 @@ class ArtifactDialog : public EdgeMenuDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
-    virtual void reject();
+    virtual void accept() override;
+    virtual void reject() override;
     void default_description();
     void edit_description();
     void edStereotypeActivated(const QString &);
-    void update_tab(QWidget *);
+    void update_tab(int index);
     void cpp_edit_h();
     void cpp_update_h();
     void cpp_default_h();
diff --git a/src/dialog/AttributeDialog.cpp b/src/dialog/AttributeDialog.cpp
index fca61eac0..3e6bbb4eb 100644
--- a/src/dialog/AttributeDialog.cpp
+++ b/src/dialog/AttributeDialog.cpp
@@ -29,15 +29,14 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3buttongroup.h>
+#include <qcombobox.h>
+#include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qcursor.h>
 //Added by qt3to4:
 
@@ -59,27 +58,31 @@
 #include "AnnotationDialog.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "gridbox.h"
+#include "hhbox.h"
+#include "bbuttongroup.h"
+#include "vvbox.h"
+#include "menufactory.h"
 QSize AttributeDialog::previous_size;
 
 AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose),
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose),
       new_in_st(new_st_attr), att(a)
 {
     a->browser_node->edit_start();
 
     if (a->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     visit = !hasOkButton();
     ClassData * cld = (ClassData *)
-                      ((BrowserNode *) a->browser_node->parent())->get_data();
+            ((BrowserNode *) a->browser_node->parent())->get_data();
     QString stereotype = cld->get_stereotype();
     QString lang_st;
 
@@ -108,25 +111,26 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
     idl_in_struct = !idl_in_enum && ((lang_st == "struct") || (lang_st == "exception"));
     idl_in_union = !idl_in_enum && (lang_st == "union");
 
-    setCaption((in_enum || java_in_enum_pattern) ? TR("Enum item dialog") : TR("Attribute dialog"));
+    setCaption((in_enum || java_in_enum_pattern) ? tr("Enum item dialog") : tr("Attribute dialog"));
 
-    Q3Grid * grid;
-    Q3HBox * htab;
+    GridBox * grid;
+    HHBox * htab;
     QString s;
-
+    SmallPushButton* pButton;
     // general tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
-    grid->setMargin(5);
-    grid->setSpacing(5);
+    grid->setMargin(2);
+    grid->setSpacing(2);
 
-    new QLabel(TR("class : "), grid);
-    new QLabel(((BrowserNode *) a->get_browser_node()->parent())->full_name(TRUE),
-               grid);
+    grid->addWidget(new QLabel(tr("class : "), grid));
+    grid->addWidget(new QLabel(((BrowserNode *) a->get_browser_node()->parent())->full_name(TRUE),
+                               grid));
 
-    new QLabel(TR("name :"), grid);
+    grid->addWidget(new QLabel(tr("name :"), grid));
     edname = new LineEdit(a->name(), grid);
+    grid->addWidget(edname);
     edname->setReadOnly(visit);
 
     QFont font = edname->font();
@@ -137,62 +141,71 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
     font.setFixedPitch(TRUE);
 
     if (!java_in_enum_pattern) {
-        new QLabel(TR("stereotype :"), grid);
-        htab = new Q3HBox(grid);
-        edstereotype = new Q3ComboBox(!visit, htab);
-        edstereotype->insertItem(toUnicode(a->get_stereotype()));
+        grid->addWidget(new QLabel(tr("stereotype :"), grid));
+        htab = new HHBox(grid);
+        grid->addWidget(htab);
+        edstereotype = new QComboBox(htab);
+        htab->addWidget(edstereotype);
+        edstereotype->setEditable(!visit);
+        edstereotype->addItem(toUnicode(a->get_stereotype()));
 
         if (!visit) {
-            edstereotype->insertStringList(BrowserAttribute::default_stereotypes());
-            edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlAttribute));
+            //
+            QStringList list1 =  BrowserAttribute::default_stereotypes();
+            QStringList list2 =  ProfiledStereotypes::defaults(UmlAttribute);
+            edstereotype->addItems(BrowserAttribute::default_stereotypes());
+            edstereotype->addItems(ProfiledStereotypes::defaults(UmlAttribute));
 
             if (java_in_enum) {
                 int n = edstereotype->count();
 
                 for (attribute_st_rank = 0; attribute_st_rank != n; attribute_st_rank += 1)
-                    if (edstereotype->text(attribute_st_rank) == "attribute")
+                    if (edstereotype->itemText(attribute_st_rank) == "attribute")
                         break;
 
                 if (attribute_st_rank == n) {
-                    edstereotype->insertItem("attribute");
+                    edstereotype->addItem("attribute");
                     n += 1;
                 }
 
                 for (empty_st_rank = 0; empty_st_rank != n; empty_st_rank += 1)
-                    if (edstereotype->text(empty_st_rank).isEmpty())
+                    if (edstereotype->itemText(empty_st_rank).isEmpty())
                         break;
 
                 if (empty_st_rank == n)
-                    edstereotype->insertItem("");
+                    edstereotype->addItem("");
             }
 
             edstereotype->setAutoCompletion(completion());
         }
-
-        edstereotype->setCurrentItem(0);
+        edstereotype->setCurrentIndex(0);
 
         QSizePolicy sp = edstereotype->sizePolicy();
 
-        sp.setHorData(QSizePolicy::Expanding);
+        sp.setHorizontalPolicy(QSizePolicy::Expanding);
         edstereotype->setSizePolicy(sp);
 
-        new QLabel(TR("    multiplicity :  "), htab);
-        multiplicity = new Q3ComboBox(!visit, htab);
+        htab->addWidget(new QLabel(tr("    multiplicity :  "), htab));
+        multiplicity = new QComboBox( htab);
+        htab->addWidget(multiplicity);
+        multiplicity->setEditable(!visit);
         multiplicity->setSizePolicy(sp);
         previous_multiplicity = a->get_multiplicity();
-        multiplicity->insertItem(previous_multiplicity);
+        multiplicity->addItem(previous_multiplicity);
 
         if (!visit) {
-            multiplicity->insertItem("1");
-            multiplicity->insertItem("0..1");
-            multiplicity->insertItem("*");
-            multiplicity->insertItem("1..*");
+            multiplicity->addItem("1");
+            multiplicity->addItem("0..1");
+            multiplicity->addItem("*");
+            multiplicity->addItem("1..*");
         }
-
-        connect(new SmallPushButton(TR("type :"), grid), SIGNAL(clicked()),
+        connect(pButton = new SmallPushButton(tr("type :"), grid), SIGNAL(clicked()),
                 this, SLOT(menu_type()));
-        edtype = new Q3ComboBox(!visit, grid);
-        edtype->insertItem(a->get_type().get_full_type());
+        grid->addWidget(pButton);
+        edtype = new QComboBox( grid);
+        grid->addWidget(edtype);
+        edtype->setEditable(!visit);
+        edtype->addItem(a->get_type().get_full_type());
         BrowserClass::instances(nodes);
         nodes.full_names(list);
 
@@ -200,46 +213,52 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
             QStringList l = GenerationSettings::basic_types();
 
             cld->addFormals(l);
-            edtype->insertStringList(l);
+            edtype->addItems(l);
             offset = edtype->count();
-            edtype->insertStringList(list);
+            edtype->addItems(list);
             edtype->setAutoCompletion(completion());
             view = a->browser_node->container(UmlClass);
         }
 
-        edtype->setCurrentItem(0);
+        edtype->setCurrentIndex(0);
         edtype->setSizePolicy(sp);
 
-        new QLabel(TR("initial value :"), grid);
+        grid->addWidget(new QLabel(tr("initial value :"), grid));
     }
     else {
         multiplicity = 0;
-        new QLabel(TR("value :"), grid);
+        grid->addWidget(new QLabel(tr("value :"), grid));
     }
-
-    htab = new Q3HBox(grid);
+    htab = new HHBox(grid);
+    grid->addWidget(htab);
     edinit = new LineEdit(a->get_init_value_qstring(), htab);
+    htab->addWidget(edinit);
 
     if (visit)
         edinit->setReadOnly(TRUE);
     else
-        connect(new SmallPushButton(TR("Editor"), htab), SIGNAL(clicked()),
-                this, SLOT(edit_init()));
-
-    Q3ButtonGroup * bg;
+    {
+        connect( pButton = new SmallPushButton(tr("Editor"), htab), SIGNAL(clicked()),
+                 this, SLOT(edit_init()));
+        htab->addWidget(pButton);
+    }
+    BButtonGroup * bg;
 
     if (!java_in_enum_pattern) {
-        new QLabel(grid);
+        grid->addWidget(new QLabel(grid));
 
-        htab = new Q3HBox(grid);
+        htab = new HHBox(grid);
+        grid->addWidget(htab);
         bg = uml_visibility.init(htab, a->get_uml_visibility(), TRUE);
-
+        htab->addWidget(bg);
         if (visit)
             bg->setEnabled(FALSE);
 
-        bg = new Q3ButtonGroup(7, Qt::Horizontal, QString(), htab);
+        bg = new BButtonGroup(7, Qt::Horizontal, QString(), htab);
+        htab->addWidget(bg);
         bg->setExclusive(FALSE);
         classattribute_cb = new QCheckBox("static", bg);
+        bg->addWidget(classattribute_cb);
 
         if (a->get_isa_class_attribute())
             classattribute_cb->setChecked(TRUE);
@@ -247,102 +266,110 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
         classattribute_cb->setDisabled(visit);
 
         volatile_cb = new QCheckBox("volatile", bg);
+        bg->addWidget(volatile_cb);
 
         if (a->isa_volatile_attribute)
             volatile_cb->setChecked(TRUE);
 
         volatile_cb->setDisabled(visit);
 
-        constattribute_cb = new QCheckBox(TR("read-only"), bg);
+        constattribute_cb = new QCheckBox(tr("read-only"), bg);
+        bg->addWidget(constattribute_cb);
 
         if (a->get_isa_const_attribute())
             constattribute_cb->setChecked(TRUE);
 
         constattribute_cb->setDisabled(visit);
 
-        derived_cb = new QCheckBox(TR("derived"), bg);
-
+        derived_cb = new QCheckBox(tr("derived"), bg);
+        bg->addWidget(derived_cb);
         if (a->get_is_derived())
             derived_cb->setChecked(TRUE);
 
         derived_cb->setDisabled(visit);
         connect(derived_cb, SIGNAL(toggled(bool)), SLOT(derived_changed(bool)));
-
         derivedunion_cb = new QCheckBox("union", bg);
-
+        bg->addWidget(derivedunion_cb);
         if (a->get_is_derivedunion())
             derivedunion_cb->setChecked(TRUE);
 
         derivedunion_cb->setDisabled(visit || !derived_cb->isChecked());
 
-        ordered_cb = new QCheckBox(TR("ordered"), bg);
-
+        ordered_cb = new QCheckBox(tr("ordered"), bg);
+        bg->addWidget(ordered_cb);
         if (a->get_is_ordered())
             ordered_cb->setChecked(TRUE);
 
         ordered_cb->setDisabled(visit);
 
         unique_cb = new QCheckBox("unique", bg);
-
+        bg->addWidget(unique_cb);
         if (a->get_is_unique())
             unique_cb->setChecked(TRUE);
 
         unique_cb->setDisabled(visit);
     }
 
-    Q3VBox * vtab = new Q3VBox(grid);
+    VVBox * vtab = new VVBox(grid);
+    grid->addWidget(vtab);
 
-    new QLabel(TR("description :"), vtab);
+    new QLabel(tr("description :"), vtab);
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+        connect(pButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
-        connect(new SmallPushButton(TR("Default"), vtab), SIGNAL(clicked()),
+        vtab->addWidget(pButton);
+        connect(pButton = new SmallPushButton(tr("Default"), vtab), SIGNAL(clicked()),
                 this, SLOT(default_description()));
+        vtab->addWidget(pButton);
     }
 
     comment = new MultiLineEdit(grid);
+    grid->addWidget(comment);
     comment->setReadOnly(visit);
     QString temp =  a->browser_node->get_comment();
     comment->setText(temp);
     comment->setFont(font);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("constraint :"), vtab);
+    vtab = new VVBox(grid);
+    grid->addWidget(vtab);
+    vtab->addWidget(new QLabel(tr("constraint :"), vtab));
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+        connect(pButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_constraint()));
+        vtab->addWidget(pButton);
     }
 
     constraint = new MultiLineEdit(grid);
+    grid->addWidget(constraint);
     constraint->setReadOnly(visit);
     constraint->setText(a->constraint);
     constraint->setFont(font);
-
     addTab(grid, "Uml");
 
     // C++
 
     if (! cpp_ignored) {
-        grid = new Q3Grid(2, this);
+        grid = new GridBox(2, this);
         cppTab = grid;
-        grid->setMargin(5);
-        grid->setSpacing(5);
+        grid->setMargin(0);
+        grid->setSpacing(0);
 
         if (!cpp_in_enum) {
-            new QLabel(TR("Visibility :"), grid);
-            htab = new Q3HBox(grid);
-
-            Q3ButtonGroup * bg =
-                cpp_visibility.init(htab, a->get_cpp_visibility(), FALSE, 0, TR("follow uml"));
+            grid->addWidget(new QLabel(tr("Visibility :"), grid));
+            htab = new HHBox(grid);
+            grid->addWidget(htab);
+            BButtonGroup * bg =
+                    cpp_visibility.init((QWidget *)htab, a->get_cpp_visibility(), FALSE, NULL, tr("follow uml"));
 
+            htab->addWidget(bg);
             if (visit)
                 bg->setEnabled(FALSE);
 
-            new QLabel(" ", htab);
+            htab->addWidget(new QLabel(" ", htab));
 
-            mutable_cb = new QCheckBox("mutable", htab);
+            htab->addWidget(mutable_cb = new QCheckBox("mutable", htab));
 
             if (a->cpp_mutable)
                 mutable_cb->setChecked(TRUE);
@@ -353,8 +380,9 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
                 connect(mutable_cb, SIGNAL(toggled(bool)), this, SLOT(cpp_update()));
         }
 
-        new QLabel(TR("Declaration :"), grid);
+        grid->addWidget(new QLabel(tr("Declaration :"), grid));
         edcppdecl = new MultiLineEdit(grid);
+        grid->addWidget(edcppdecl);
         edcppdecl->setText(a->get_cppdecl());
         edcppdecl->setFont(font);
 
@@ -363,18 +391,23 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
         else
             connect(edcppdecl, SIGNAL(textChanged()), this, SLOT(cpp_update()));
 
-        new QLabel(TR("Result after\nsubstitution :"), grid);
+        grid->addWidget(new QLabel(tr("Result after\nsubstitution :"), grid));
         showcppdecl = new MultiLineEdit(grid);
+        grid->addWidget(showcppdecl);
         showcppdecl->setReadOnly(TRUE);
         showcppdecl->setFont(font);
 
         if (! visit) {
-            new QLabel(grid);
-            htab = new Q3HBox(grid);
-            connect(new QPushButton(TR("Default declaration"), htab), SIGNAL(clicked()),
+            grid->addWidget(new QLabel(grid));
+            htab = new HHBox(grid);
+            grid->addWidget(htab);
+            QPushButton *button;
+            connect(button = new QPushButton(tr("Default declaration"), htab), SIGNAL(clicked()),
                     this, SLOT(cpp_default()));
-            connect(new QPushButton(TR("Not generated in C++"), htab), SIGNAL(clicked()),
+            htab->addWidget(button);
+            connect(button = new QPushButton(tr("Not generated in C++"), htab), SIGNAL(clicked()),
                     this, SLOT(cpp_unmapped()));
+            htab->addWidget(button);
         }
 
         addTab(grid, "C++");
@@ -388,15 +421,15 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
     // Java
 
     if (! java_ignored) {
-        grid = new Q3Grid(2, this);
+        grid = new GridBox(2, this);
         javatab = grid;
-        grid->setMargin(5);
-        grid->setSpacing(5);
+        grid->setMargin(0);
+        grid->setSpacing(0);
 
         if (!java_in_enum && !java_in_enum_pattern) {
-            new QLabel("", grid);
+            grid->addWidget(new QLabel("", grid));
             transient_cb = new QCheckBox("transient", grid);
-
+            grid->addWidget(transient_cb);
             if (a->java_transient)
                 transient_cb->setChecked(TRUE);
 
@@ -406,8 +439,9 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
                 connect(transient_cb, SIGNAL(toggled(bool)), this, SLOT(java_update()));
         }
 
-        new QLabel(TR("Declaration :"), grid);
+        grid->addWidget(new QLabel(tr("Declaration :"), grid));
         edjavadecl = new MultiLineEdit(grid);
+        grid->addWidget(edjavadecl);
         edjavadecl->setText(a->get_javadecl());
         edjavadecl->setFont(font);
 
@@ -416,34 +450,43 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
         else
             connect(edjavadecl, SIGNAL(textChanged()), this, SLOT(java_update()));
 
-        new QLabel(TR("Result after\nsubstitution :"), grid);
+        grid->addWidget(new QLabel(tr("Result after\nsubstitution :"), grid));
         showjavadecl = new MultiLineEdit(grid);
+        grid->addWidget(showjavadecl);
         showjavadecl->setReadOnly(TRUE);
         showjavadecl->setFont(font);
 
-        new QLabel(grid);
-        htab = new Q3HBox(grid);
-
+        grid->addWidget(new QLabel(grid));
+        htab = new HHBox(grid);
+        grid->addWidget(htab);
         if (! visit) {
+            QPushButton *button;
+
             if (java_in_enum) {
-                connect(new QPushButton(TR("Default item declaration"), htab), SIGNAL(clicked()),
+                connect(button = new QPushButton(tr("Default item declaration"), htab), SIGNAL(clicked()),
                         this, SLOT(java_default_item()));
-                connect(new QPushButton(TR("Default attribute declaration"), htab), SIGNAL(clicked()),
+                htab->addWidget(button);
+                connect(button = new QPushButton(tr("Default attribute declaration"), htab), SIGNAL(clicked()),
                         this, SLOT(java_default()));
+                htab->addWidget(button);
             }
             else
-                connect(new QPushButton(TR("Default declaration"), htab), SIGNAL(clicked()),
+            {
+                connect(button = new QPushButton(tr("Default declaration"), htab), SIGNAL(clicked()),
                         this, SLOT(java_default()));
+                htab->addWidget(button);
+            }
 
-            connect(new QPushButton(TR("Not generated in Java"), htab), SIGNAL(clicked()),
+            connect(button = new QPushButton(tr("Not generated in Java"), htab), SIGNAL(clicked()),
                     this, SLOT(java_unmapped()));
+            htab->addWidget(button);
 
         }
 
         javaannotation = (const char *) a->java_annotation;
-        editjavaannotation =
-            new QPushButton((visit) ? TR("Show annotation") : TR("Edit annotation"),
-                            htab);
+        htab->addWidget(editjavaannotation =
+                new QPushButton((visit) ? tr("Show annotation") : tr("Edit annotation"),
+                                htab));
         connect(editjavaannotation, SIGNAL(clicked()),
                 this, SLOT(java_edit_annotation()));
 
@@ -459,16 +502,17 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
 
     if (! php_ignored) {
         python_self =
-            BrowserOperation::python_init_self((BrowserNode *) a->browser_node->parent())
-            + ".";
+                BrowserOperation::python_init_self((BrowserNode *) a->browser_node->parent())
+                + ".";
 
-        grid = new Q3Grid(2, this);
+        grid = new GridBox(2, this);
         phptab = grid;
-        grid->setMargin(5);
-        grid->setSpacing(5);
+        grid->setMargin(0);
+        grid->setSpacing(0);
 
-        new QLabel(TR("Declaration :"), grid);
+        grid->addWidget(new QLabel(tr("Declaration :"), grid));
         edphpdecl = new MultiLineEdit(grid);
+        grid->addWidget(edphpdecl);
         edphpdecl->setText(a->get_phpdecl());
         edphpdecl->setFont(font);
 
@@ -477,19 +521,23 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
         else
             connect(edphpdecl, SIGNAL(textChanged()), this, SLOT(php_update()));
 
-        new QLabel(TR("Result after\nsubstitution :"), grid);
+        grid->addWidget(new QLabel(tr("Result after\nsubstitution :"), grid));
         showphpdecl = new MultiLineEdit(grid);
+        grid->addWidget(showphpdecl);
         showphpdecl->setReadOnly(TRUE);
         showphpdecl->setFont(font);
 
-        new QLabel(grid);
-        htab = new Q3HBox(grid);
-
+        grid->addWidget(new QLabel(grid));
+        htab = new HHBox(grid);
+        grid->addWidget(htab);
         if (! visit) {
-            connect(new QPushButton(TR("Default declaration"), htab), SIGNAL(clicked()),
+            QPushButton *button;
+            connect(button = new QPushButton(tr("Default declaration"), htab), SIGNAL(clicked()),
                     this, SLOT(php_default()));
-            connect(new QPushButton(TR("Not generated in Php"), htab), SIGNAL(clicked()),
+            htab->addWidget(button);
+            connect(button = new QPushButton(tr("Not generated in Php"), htab), SIGNAL(clicked()),
                     this, SLOT(php_unmapped()));
+            htab->addWidget(button);
         }
 
         addTab(grid, "Php");
@@ -503,13 +551,14 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
     // Python
 
     if (! python_ignored) {
-        grid = new Q3Grid(2, this);
+        grid = new GridBox(2, this);
         pythontab = grid;
-        grid->setMargin(5);
-        grid->setSpacing(5);
+        grid->setMargin(0);
+        grid->setSpacing(0);
 
-        new QLabel(TR("Declaration :"), grid);
+        grid->addWidget(new QLabel(tr("Declaration :"), grid));
         edpythondecl = new MultiLineEdit(grid);
+        grid->addWidget(edpythondecl);
         edpythondecl->setText(a->get_pythondecl());
         edpythondecl->setFont(font);
 
@@ -518,19 +567,23 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
         else
             connect(edpythondecl, SIGNAL(textChanged()), this, SLOT(python_update()));
 
-        new QLabel(TR("Result after\nsubstitution :"), grid);
+        grid->addWidget(new QLabel(tr("Result after\nsubstitution :"), grid));
         showpythondecl = new MultiLineEdit(grid);
+        grid->addWidget(showpythondecl);
         showpythondecl->setReadOnly(TRUE);
         showpythondecl->setFont(font);
 
-        new QLabel(grid);
-        htab = new Q3HBox(grid);
-
+        grid->addWidget(new QLabel(grid));
+        htab = new HHBox(grid);
+        grid->addWidget(htab);
         if (! visit) {
-            connect(new QPushButton(TR("Default declaration"), htab), SIGNAL(clicked()),
+            QPushButton* button;
+            connect(button = new QPushButton(tr("Default declaration"), htab), SIGNAL(clicked()),
                     this, SLOT(python_default()));
-            connect(new QPushButton(TR("Not generated in Python"), htab), SIGNAL(clicked()),
+            htab->addWidget(button);
+            connect(button =  new QPushButton(tr("Not generated in Python"), htab), SIGNAL(clicked()),
                     this, SLOT(python_unmapped()));
+            htab->addWidget(button);
         }
 
         addTab(grid, "Python");
@@ -544,15 +597,17 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
     // IDL
 
     if (! idl_in_typedef) {
-        grid = new Q3Grid(2, this);
+        grid = new GridBox(2, this);
         idltab = grid;
-        grid->setMargin(5);
-        grid->setSpacing(5);
+        grid->setMargin(0);
+        grid->setSpacing(0);
 
         if (idl_in_union) {
-            new QLabel("Case :", grid);
-            edcase = new Q3ComboBox(TRUE, grid);
-            edcase->insertItem(a->get_idlcase());
+            grid->addWidget(new QLabel("Case :", grid));
+            edcase = new QComboBox( grid);
+            grid->addWidget(edcase);
+            edcase->setEditable(TRUE);
+            edcase->addItem(a->get_idlcase());
 
             if (! visit) {
                 AType switch_type = cld->get_switch_type();
@@ -560,24 +615,25 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
                 if (switch_type.type != 0) {
                     switch_type.type->children(enums, UmlAttribute);
                     enums.names(enum_names);
-                    edcase->insertStringList(enum_names);
+                    edcase->addItems(enum_names);
                     edcase->setAutoCompletion(completion());
                 }
             }
 
-            edcase->setCurrentItem(0);
+            edcase->setCurrentIndex(0);
 
             QSizePolicy sp = edcase->sizePolicy();
 
-            sp.setHorData(QSizePolicy::Expanding);
+            sp.setHorizontalPolicy(QSizePolicy::Expanding);
             edcase->setSizePolicy(sp);
 
             if (! visit)
                 connect(edcase, SIGNAL(activated(int)), this, SLOT(idl_update()));
         }
 
-        new QLabel(TR("Declaration :"), grid);
+        grid->addWidget(new QLabel(tr("Declaration :"), grid));
         edidldecl = new MultiLineEdit(grid);
+        grid->addWidget(edidldecl);
         edidldecl->setText(a->get_idldecl());
         edidldecl->setFont(font);
 
@@ -586,30 +642,39 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
         else
             connect(edidldecl, SIGNAL(textChanged()), this, SLOT(idl_update()));
 
-        new QLabel(TR("Result after\nsubstitution :"), grid);
+        grid->addWidget(new QLabel(tr("Result after\nsubstitution :"), grid));
         showidldecl = new MultiLineEdit(grid);
+        grid->addWidget(showidldecl);
         showidldecl->setReadOnly(TRUE);
         showidldecl->setFont(font);
 
         if (! visit) {
-            new QLabel(grid);
-            htab = new Q3HBox(grid);
-            connect(new QPushButton((idl_in_enum) ? TR("Default declaration")
-                                    : TR("Default attribute declaration"),
-                                    htab),
+            grid->addWidget(new QLabel(grid));
+            htab = new HHBox(grid);
+            grid->addWidget(htab);
+            QPushButton *button;
+            connect(button = new QPushButton((idl_in_enum) ? tr("Default declaration")
+                                                           : tr("Default attribute declaration"),
+                                             htab),
                     SIGNAL(clicked()), this, SLOT(idl_default()));
+            htab->addWidget(button);
 
             if (!idl_in_enum && !idl_in_union) {
                 if (!idl_in_struct)
-                    connect(new QPushButton(TR("Default state declaration"), htab), SIGNAL(clicked()),
+                {
+                    connect(button = new QPushButton(tr("Default state declaration"), htab), SIGNAL(clicked()),
                             this, SLOT(idl_default_state()));
+                    htab->addWidget(button);
+                }
 
-                connect(new QPushButton(TR("Default constant declaration"), htab), SIGNAL(clicked()),
+                connect(button = new QPushButton(tr("Default constant declaration"), htab), SIGNAL(clicked()),
                         this, SLOT(idl_default_constant()));
+                htab->addWidget(button);
             }
 
-            connect(new QPushButton(TR("Not generated in Idl"), htab), SIGNAL(clicked()),
+            connect(button = new QPushButton(tr("Not generated in Idl"), htab), SIGNAL(clicked()),
                     this, SLOT(idl_unmapped()));
+            htab->addWidget(button);
         }
 
         addTab(grid, "Idl");
@@ -622,17 +687,18 @@ AttributeDialog::AttributeDialog(AttributeData * a, bool new_st_attr)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
-    grid->setMargin(5);
-    grid->setSpacing(5);
+    grid = new GridBox(2, this);
+    grid->setMargin(0);
+    grid->setSpacing(0);
 
     kvtable = new KeyValuesTable(a->browser_node, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable);
+    addTab(grid, tr("Properties"));
 
     //
 
-    connect(this, SIGNAL(currentChanged(QWidget *)),
-            this, SLOT(update_all_tabs(QWidget *)));
+    connect(m_tabWidget, SIGNAL(currentChanged(int)),
+            this, SLOT(update_all_tabs(int)));
 
     open_dialog(this);
 }
@@ -642,8 +708,9 @@ AttributeDialog::~AttributeDialog()
     att->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     if (new_in_st)
         // new_in_st cleared by accept
@@ -654,13 +721,13 @@ AttributeDialog::~AttributeDialog()
 
 void AttributeDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
 void AttributeDialog::default_defs_if_needed()
 {
-    QString m = multiplicity->currentText().stripWhiteSpace();
+    QString m = multiplicity->currentText().trimmed();
 
     if (m != previous_multiplicity) {
         default_cpp_if_needed(previous_multiplicity, m);
@@ -675,15 +742,15 @@ void AttributeDialog::default_defs_if_needed()
 
 void AttributeDialog::menu_type()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edtype->currentText().stripWhiteSpace());
+    int index = list.indexOf(edtype->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -691,54 +758,56 @@ void AttributeDialog::menu_type()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlClass) && !bn->deletedp())
-            m.insertItem(TR("Choose class selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose class selected in browser"), 1);
         else
             bn = 0;
 
-        m.insertItem(TR("Create class and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create class and choose it"), 2);
     }
 
     if (!visit || (index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            nodes.at(index)->select_in_browser();
-            break;
+        QAction *retActon = m.exec(QCursor::pos());
+        if(retActon)
+            switch (retActon->data().toInt()) {
+            case 0:
+                nodes.at(index)->select_in_browser();
+                break;
 
-        case 2:
-            bn = BrowserClass::add_class(FALSE, view);
+            case 2:
+                bn = BrowserClass::add_class(FALSE, view);
 
-            if (bn == 0)
-                return;
+                if (bn == 0)
+                    return;
 
-            bn->select_in_browser();
+                bn->select_in_browser();
 
-            // no break
-        case 1: {
-            QString s = bn->full_name(TRUE);
+                // no break
+            case 1: {
+                QString s = bn->full_name(TRUE);
 
-            if ((index = list.findIndex(s)) == -1) {
-                // new class, may be created through an other dialog
-                index = 0;
-                QStringList::Iterator iter = list.begin();
-                QStringList::Iterator iter_end = list.end();
+                if ((index = list.indexOf(s)) == -1) {
+                    // new class, may be created through an other dialog
+                    index = 0;
+                    QStringList::Iterator iter = list.begin();
+                    QStringList::Iterator iter_end = list.end();
 
-                while ((iter != iter_end) && (*iter < s)) {
-                    ++iter;
-                    index += 1;
-                }
+                    while ((iter != iter_end) && (*iter < s)) {
+                        ++iter;
+                        index += 1;
+                    }
 
-                nodes.insert((unsigned) index, bn);
-                list.insert(iter, s);
-                edtype->insertItem(s, index + offset);
+                    nodes.insert((unsigned) index, bn);
+                    list.insert(iter, s);
+                    edtype->insertItem(index + offset, s);
+                }
             }
-        }
 
-        edtype->setCurrentItem(index + offset);
-        break;
+                edtype->setCurrentIndex(index + offset);
+                break;
 
-        default:
-            break;
-        }
+            default:
+                break;
+            }
     }
 }
 
@@ -749,20 +818,22 @@ void AttributeDialog::derived_changed(bool on)
 
 void AttributeDialog::accept()
 {
-    if (!check_edits(edits) || !kvtable->check_unique())
+    if (
+            !check_edits(edits) ||
+            !kvtable->check_unique())
         return;
 
     BrowserNode * bn = att->browser_node;
     QString oldname = att->name();
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if ((s != oldname) &&
-        ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlAttribute,
-                bn->allow_spaces(),
-                bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+            ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlAttribute,
+                                                             bn->allow_spaces(),
+                                                             bn->allow_empty()))
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else {
         default_defs_if_needed();
 
@@ -773,10 +844,10 @@ void AttributeDialog::accept()
         if (!java_in_enum_pattern) {
             AType t;
 
-            s = edtype->currentText().stripWhiteSpace();
+            s = edtype->currentText().trimmed();
 
             if (!s.isEmpty()) {
-                int index = list.findIndex(s);
+                int index = list.indexOf(s);
 
                 if (index >= 0)
                     t.type = (BrowserClass *) nodes.at(index);
@@ -785,9 +856,7 @@ void AttributeDialog::accept()
             }
 
             att->set_type(t);
-
             att->uml_visibility = uml_visibility.value();
-
             att->isa_class_attribute = classattribute_cb->isChecked();
             att->isa_volatile_attribute = volatile_cb->isChecked();
             att->isa_const_attribute = constattribute_cb->isChecked();
@@ -796,10 +865,10 @@ void AttributeDialog::accept()
             att->is_ordered = ordered_cb->isChecked();
             att->is_unique = unique_cb->isChecked();
 
-            att->multiplicity = multiplicity->currentText().stripWhiteSpace();
+            att->multiplicity = multiplicity->currentText().trimmed();
 
-            WrapperStr tempStereo = fromUnicode(edstereotype->currentText().stripWhiteSpace());
-            newst = att->set_stereotype(tempStereo.operator const char *());
+            WrapperStr tempStereo = fromUnicode(edstereotype->currentText().trimmed());
+            newst = att->set_stereotype(/*tempStereo.operator const char *()*/edstereotype->currentText().trimmed().toLatin1().constData());
         }
 
         att->init_value = edinit->text();
@@ -808,18 +877,17 @@ void AttributeDialog::accept()
             att->cpp_decl = QString();
         else {
             att->cpp_decl = edcppdecl->text();
-
             if (!cpp_in_enum)
                 att->cpp_visibility = cpp_visibility.value();
         }
 
         att->cpp_mutable = (cpp_in_enum || cpp_ignored)
-                           ? FALSE
-                           : mutable_cb->isChecked();
+                ? FALSE
+                : mutable_cb->isChecked();
 
         att->java_transient = (java_in_enum || java_ignored || java_in_enum_pattern)
-                              ? FALSE
-                              : transient_cb->isChecked();
+                ? FALSE
+                : transient_cb->isChecked();
         att->java_decl = (java_ignored) ? QString() : edjavadecl->text();
         att->java_annotation = javaannotation;
 
@@ -831,18 +899,18 @@ void AttributeDialog::accept()
 
         if (idl_in_union) {
             int index;
-            s = edcase->currentText().stripWhiteSpace();
+            s = edcase->currentText().trimmed();
 
-            if (!s.isEmpty() && ((index = enum_names.findIndex(s)) != -1))
+            if (!s.isEmpty() && ((index = enum_names.indexOf(s)) != -1))
                 att->set_idlcase((BrowserAttribute *) enums.at(index), "");
             else
-                att->set_idlcase(0, s);
+                att->set_idlcase(0, s.toLatin1().constData());
         }
 
         bn->set_comment(comment->text());
         UmlWindow::update_comment_if_needed(bn);
 
-        att->constraint = constraint->stripWhiteSpaceText();
+        att->constraint = constraint->trimmedText();
 
         kvtable->updateNodeFromThis(bn);
 
@@ -863,12 +931,13 @@ void AttributeDialog::accept()
     }
 }
 
-void AttributeDialog::update_all_tabs(QWidget * w)
+void AttributeDialog::update_all_tabs(int index)
 {
+    QWidget * w = m_tabWidget->widget(index);
     if (!visit)
         default_defs_if_needed();
 
-    edname->setText(edname->text().stripWhiteSpace());
+    edname->setText(edname->text().trimmed());
 
     if (w == umltab) {
         if (!visit)
@@ -913,7 +982,7 @@ void AttributeDialog::default_description()
 
 void AttributeDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          att, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -924,7 +993,7 @@ void AttributeDialog::post_edit_description(AttributeDialog * d, QString s)
 
 void AttributeDialog::edit_constraint()
 {
-    edit(constraint->text(), edname->text().stripWhiteSpace() + "_constraint",
+    edit(constraint->text(), edname->text().trimmed() + "_constraint",
          att, TxtEdit, this, (post_edit) post_edit_constraint, edits);
 }
 
@@ -935,7 +1004,7 @@ void AttributeDialog::post_edit_constraint(AttributeDialog * d, QString s)
 
 void AttributeDialog::edit_init()
 {
-    edit(edinit->text(), edname->text().stripWhiteSpace() + "_initialization",
+    edit(edinit->text(), edname->text().trimmed() + "_initialization",
          att, TxtEdit, this, (post_edit) post_edit_init, edits);
 }
 
@@ -948,7 +1017,7 @@ void AttributeDialog::cpp_default()
 {
     edcppdecl->setText((cpp_in_enum)
                        ? GenerationSettings::cpp_default_enum_item_decl()
-                       : GenerationSettings::cpp_default_attr_decl(multiplicity->currentText().stripWhiteSpace()));
+                       : GenerationSettings::cpp_default_attr_decl(multiplicity->currentText().trimmed()));
     cpp_update();
 }
 
@@ -977,7 +1046,8 @@ void AttributeDialog::cpp_update()
     //	const char * p = edcppdecl->text();
     // because the QString is immediatly destroyed !
     QString def = edcppdecl->text();
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     QString indent = "";
     QString s;
@@ -1015,7 +1085,7 @@ void AttributeDialog::cpp_update()
         }
         else if ((cpp_in_enum && !strncmp(p, "${value}", 8)) ||
                  !strncmp(p, "${h_value}", 10)) {
-            QString i = edinit->text().stripWhiteSpace();
+            QString i = edinit->text().trimmed();
 
             if (!i.isEmpty() && (cpp_in_enum || classattribute_cb->isChecked())) {
                 if (need_equal(p, i, TRUE))
@@ -1027,7 +1097,7 @@ void AttributeDialog::cpp_update()
             p += (p[2] == 'h') ? 10 : 8;
         }
         else if (!strncmp(p, "${value}", 8)) {
-            QString i = edinit->text().stripWhiteSpace();
+            QString i = edinit->text().trimmed();
 
             if (!i.isEmpty()) {
                 if (need_equal(p, i, TRUE))
@@ -1074,19 +1144,19 @@ void AttributeDialog::cpp_update()
         }
         else if (!strncmp(p, "${type}", 7)) {
             p += 7;
-            s += get_cpp_name(the_type(edtype->currentText().stripWhiteSpace(),
+            s += get_cpp_name(the_type(edtype->currentText().trimmed(),
                                        list, nodes));
         }
         else if (!strncmp(p, "${multiplicity}", 15)) {
             p += 15;
 
-            QString m = multiplicity->currentText().stripWhiteSpace();
+            QString m = multiplicity->currentText().trimmed();
 
-            s += (*m == '[') ? m : QString("[") + m + "]";
+            s += (m.startsWith('[')) ? m : QString("[") + m + "]";
         }
         else if (!strncmp(p, "${stereotype}", 13)) {
             p += 13;
-            s += GenerationSettings::cpp_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+            s += GenerationSettings::cpp_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
         }
         else if (*p == '@')
             manage_alias(att->browser_node, p, s, kvtable);
@@ -1103,7 +1173,6 @@ QString AttributeDialog::cpp_decl(const BrowserAttribute * at, bool init,
     QString s;
     AttributeData * d = (AttributeData *) at->get_data();
     WrapperStr decl = d->cpp_decl;
-
     remove_comments(decl);
     remove_preprocessor(decl);
 
@@ -1123,7 +1192,7 @@ QString AttributeDialog::cpp_decl(const BrowserAttribute * at, bool init,
         }
         else if (!strncmp(p, "${value}", 8) || !strncmp(p, "${h_value}", 10)) {
             if (init) {
-                const char * v = d->get_init_value();
+                const char * v = d->get_init_value().toLatin1().constData();
 
                 if (*v) {
                     if (need_equal(p, v, TRUE))
@@ -1153,7 +1222,7 @@ QString AttributeDialog::cpp_decl(const BrowserAttribute * at, bool init,
             QString m = d->get_multiplicity();
 
             if (!m.isEmpty())
-                s += (*m == '[') ? m : QString("[") + m + "]";
+                s += (m.startsWith('[')) ? m : QString("[") + m + "]";
         }
         else if (!strncmp(p, "${stereotype}", 13)) {
             p += 13;
@@ -1174,7 +1243,6 @@ QString AttributeDialog::cpp_decl(const BrowserAttribute * at, bool init,
         else
             s += *p++;
     }
-
     return s;
 }
 
@@ -1182,8 +1250,8 @@ void AttributeDialog::java_default_item()
 {
     edjavadecl->setText(GenerationSettings::java_default_enum_item_decl());
 
-    if (edstereotype->currentText().stripWhiteSpace() == "attribute")
-        edstereotype->setCurrentItem(empty_st_rank);
+    if (edstereotype->currentText().trimmed() == "attribute")
+        edstereotype->setCurrentIndex(empty_st_rank);
 
     java_update();
 }
@@ -1194,9 +1262,9 @@ void AttributeDialog::java_default()
         edjavadecl->setText(GenerationSettings::java_default_enum_pattern_item_decl());
     else {
         if (java_in_enum)
-            edstereotype->setCurrentItem(attribute_st_rank);
+            edstereotype->setCurrentIndex(attribute_st_rank);
 
-        edjavadecl->setText(GenerationSettings::java_default_attr_decl(multiplicity->currentText().stripWhiteSpace()));
+        edjavadecl->setText(GenerationSettings::java_default_attr_decl(multiplicity->currentText().trimmed()));
     }
 
     java_update();
@@ -1224,11 +1292,11 @@ void AttributeDialog::java_update()
     //	const char * p = edjavadecl->text();
     // because the QString is immediatly destroyed !
     QString def = edjavadecl->text();
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     QString indent = "";
     QString s;
-
     while ((*p == ' ') || (*p == '\t'))
         indent += *p++;
 
@@ -1259,11 +1327,11 @@ void AttributeDialog::java_update()
             s += edname->text();
         }
         else if (!strncmp(p, "${value}", 8)) {
-            QString i = edinit->text().stripWhiteSpace();
+            QString i = edinit->text().trimmed();
 
             if (!i.isEmpty()) {
                 if (java_in_enum &&
-                    (edstereotype->currentText().stripWhiteSpace() != "attribute"))
+                        (edstereotype->currentText().trimmed() != "attribute"))
                     s += '(' + edinit->text() + ')';
                 else {
                     if (need_equal(p, i, FALSE))
@@ -1290,7 +1358,7 @@ void AttributeDialog::java_update()
                 s += "${@}";
             else if (!javaannotation.isEmpty()) {
                 pp = p;
-                p = javaannotation;
+                p = javaannotation.toLatin1().constData();
             }
         }
         else if (*p == '@')
@@ -1335,23 +1403,22 @@ void AttributeDialog::java_update()
         }
         else if (!strncmp(p, "${type}", 7)) {
             p += 7;
-            s += get_java_name(the_type(edtype->currentText().stripWhiteSpace(),
+            s += get_java_name(the_type(edtype->currentText().trimmed(),
                                         list, nodes));
         }
         else if (!strncmp(p, "${multiplicity}", 15)) {
             p += 15;
-            s += java_multiplicity(multiplicity->currentText().stripWhiteSpace());
+            s += java_multiplicity(multiplicity->currentText().trimmed());
         }
         else if (!strncmp(p, "${stereotype}", 13)) {
             p += 13;
-            s += GenerationSettings::java_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+            s += GenerationSettings::java_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
         }
         else
             s += *p++;
     }
 
-    editjavaannotation->setEnabled(def.find("${@}") != -1);
-
+    editjavaannotation->setEnabled(def.indexOf("${@}") != -1);
     showjavadecl->setText(s);
 }
 
@@ -1361,7 +1428,6 @@ QString AttributeDialog::java_decl(const BrowserAttribute * at, bool init,
     QString s;
     AttributeData * d = (AttributeData *) at->get_data();
     WrapperStr decl = d->java_decl;
-
     remove_comments(decl);
 
     const char * p = decl;
@@ -1380,7 +1446,7 @@ QString AttributeDialog::java_decl(const BrowserAttribute * at, bool init,
         }
         else if (!strncmp(p, "${value}", 8)) {
             if (init) {
-                const char * v = d->get_init_value();
+                const char * v = d->get_init_value().toLatin1().constData();
 
                 if (*v) {
                     if (need_equal(p, v, FALSE))
@@ -1415,11 +1481,11 @@ QString AttributeDialog::java_decl(const BrowserAttribute * at, bool init,
 
             QString m = d->get_multiplicity();
 
-            if (*m != '[')
+            if (!m.startsWith('['))
                 s += "[]";
             else {
                 for (int index = 0; index != m.length(); index += 1) {
-                    switch (m.at(index).latin1()) {
+                    switch (m.at(index).toLatin1()) {
                     case '[':
                         s += '[';
                         break;
@@ -1454,7 +1520,6 @@ QString AttributeDialog::java_decl(const BrowserAttribute * at, bool init,
         else
             s += *p++;
     }
-
     return s;
 }
 
@@ -1493,11 +1558,11 @@ void AttributeDialog::php_update()
     //	const char * p = edphpdecl->text();
     // because the QString is immediatly destroyed !
     QString def = edphpdecl->text();
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     QString indent = "";
     QString s;
-
     while ((*p == ' ') || (*p == '\t'))
         indent += *p++;
 
@@ -1532,7 +1597,7 @@ void AttributeDialog::php_update()
             s += edname->text();
         }
         else if (!strncmp(p, "${value}", 8)) {
-            QString i = edinit->text().stripWhiteSpace();
+            QString i = edinit->text().trimmed();
 
             if (!i.isEmpty()) {
                 if (need_equal(p, i, FALSE))
@@ -1555,9 +1620,9 @@ void AttributeDialog::php_update()
             p += 6;
 
             if (!php_in_enum &&
-                !constattribute_cb->isChecked() &&
-                !classattribute_cb->isChecked() &&
-                (uml_visibility.value() == UmlPackageVisibility))
+                    !constattribute_cb->isChecked() &&
+                    !classattribute_cb->isChecked() &&
+                    (uml_visibility.value() == UmlPackageVisibility))
                 s += "var ";
         }
         else if (*p == '\n') {
@@ -1583,13 +1648,12 @@ void AttributeDialog::php_update()
         else if (!strncmp(p, "${type}", 7)) {
             // for comment
             p += 7;
-            s += get_php_name(the_type(edtype->currentText().stripWhiteSpace(),
+            s += get_php_name(the_type(edtype->currentText().trimmed(),
                                        list, nodes));
         }
         else
             s += *p++;
     }
-
     showphpdecl->setText(s);
 }
 
@@ -1599,7 +1663,6 @@ QString AttributeDialog::php_decl(const BrowserAttribute * at, bool init,
     QString s;
     AttributeData * d = (AttributeData *) at->get_data();
     WrapperStr decl = d->php_decl;
-
     remove_comments(decl);
 
     const char * p = decl;
@@ -1616,7 +1679,7 @@ QString AttributeDialog::php_decl(const BrowserAttribute * at, bool init,
             p += 7;
 
             ClassData * cld = (ClassData *)
-                              ((BrowserNode *) at->parent())->get_data();
+                    ((BrowserNode *) at->parent())->get_data();
             QString stereotype = cld->get_stereotype();
             bool in_enum = (stereotype == "enum");
             QString lang_st = GenerationSettings::php_class_stereotype(stereotype);
@@ -1624,14 +1687,14 @@ QString AttributeDialog::php_decl(const BrowserAttribute * at, bool init,
             in_enum |= (lang_st == "enum");
 
             if (!in_enum &&
-                !((AttributeData *) at->get_data())->get_isa_const_attribute())
+                    !((AttributeData *) at->get_data())->get_isa_const_attribute())
                 s += "$";
 
             s += at->get_name();
         }
         else if (!strncmp(p, "${value}", 8)) {
             if (init) {
-                const char * v = d->get_init_value();
+                const char * v = d->get_init_value().toLatin1().constData();
 
                 if (*v) {
                     if (need_equal(p, v, FALSE))
@@ -1671,7 +1734,6 @@ QString AttributeDialog::php_decl(const BrowserAttribute * at, bool init,
         else
             s += *p++;
     }
-
     return s;
 }
 
@@ -1682,7 +1744,7 @@ void AttributeDialog::python_default()
     else if (!java_in_enum_pattern)
         edpythondecl->setText(GenerationSettings::python_default_attr_decl(""));
     else
-        edpythondecl->setText(GenerationSettings::python_default_attr_decl(multiplicity->currentText().stripWhiteSpace()));
+        edpythondecl->setText(GenerationSettings::python_default_attr_decl(multiplicity->currentText().trimmed()));
 
     python_update();
 }
@@ -1709,10 +1771,10 @@ void AttributeDialog::python_update()
     //	const char * p = edpythondecl->text();
     // because the QString is immediatly destroyed !
     QString def = edpythondecl->text();
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     QString s;
-
     for (;;) {
         if (*p == 0) {
             if (pp == 0)
@@ -1735,7 +1797,7 @@ void AttributeDialog::python_update()
             s += edname->text();
         }
         else if (!strncmp(p, "${value}", 8)) {
-            QString i = edinit->text().stripWhiteSpace();
+            QString i = edinit->text().trimmed();
 
             if (!i.isEmpty()) {
                 if (need_equal(p, i, FALSE))
@@ -1762,11 +1824,11 @@ void AttributeDialog::python_update()
             p += 13;
 
             if (! java_in_enum_pattern)
-                s += GenerationSettings::python_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+                s += GenerationSettings::python_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
         }
         else if (!strncmp(p, "${type}", 7)) {
             p += 7;
-            s += get_python_name(the_type(edtype->currentText().stripWhiteSpace(),
+            s += get_python_name(the_type(edtype->currentText().trimmed(),
                                           list, nodes));
         }
         else if (*p == '@')
@@ -1774,7 +1836,6 @@ void AttributeDialog::python_update()
         else
             s += *p++;
     }
-
     showpythondecl->setText(s);
 }
 
@@ -1789,7 +1850,6 @@ QString AttributeDialog::python_decl(const BrowserAttribute * at,
     remove_comments(decl);
 
     const char * p = decl;
-
     while (*p) {
         if (!strncmp(p, "${comment}", 10)) {
             p += 10;
@@ -1803,7 +1863,7 @@ QString AttributeDialog::python_decl(const BrowserAttribute * at,
         }
         else if (!strncmp(p, "${value}", 8)) {
             if (init) {
-                const char * v = d->get_init_value();
+                const char * v = d->get_init_value().toLatin1().constData();
 
                 if (*v) {
                     if (need_equal(p, v, FALSE))
@@ -1843,7 +1903,6 @@ QString AttributeDialog::python_decl(const BrowserAttribute * at,
         else
             s += *p++;
     }
-
     return s;
 }
 
@@ -1852,12 +1911,12 @@ void AttributeDialog::idl_default()
     if (idl_in_enum)
         edidldecl->setText(GenerationSettings::idl_default_enum_item_decl());
     else if (idl_in_union)
-        edidldecl->setText(GenerationSettings::idl_default_union_item_decl(multiplicity->currentText().stripWhiteSpace()));
+        edidldecl->setText(GenerationSettings::idl_default_union_item_decl(multiplicity->currentText().trimmed()));
     else
         edidldecl->setText((constattribute_cb->isChecked() &&
-                            !edinit->text().stripWhiteSpace().isEmpty())
-                           ? GenerationSettings::idl_default_const_decl(multiplicity->currentText().stripWhiteSpace())
-                           : GenerationSettings::idl_default_attr_decl(multiplicity->currentText().stripWhiteSpace()));
+                            !edinit->text().trimmed().isEmpty())
+                           ? GenerationSettings::idl_default_const_decl(multiplicity->currentText().trimmed())
+                           : GenerationSettings::idl_default_attr_decl(multiplicity->currentText().trimmed()));
 
     idl_update();
 }
@@ -1868,7 +1927,7 @@ void AttributeDialog::default_idl_if_needed(QString prev_mult, QString new_mult)
         QString p;
         QString n;
 
-        if (constattribute_cb->isChecked() && !edinit->text().stripWhiteSpace().isEmpty()) {
+        if (constattribute_cb->isChecked() && !edinit->text().trimmed().isEmpty()) {
             p = GenerationSettings::idl_default_const_decl(prev_mult);
             n = GenerationSettings::idl_default_const_decl(new_mult);
         }
@@ -1884,13 +1943,13 @@ void AttributeDialog::default_idl_if_needed(QString prev_mult, QString new_mult)
 
 void AttributeDialog::idl_default_state()
 {
-    edidldecl->setText(GenerationSettings::idl_default_valuetype_attr_decl(multiplicity->currentText().stripWhiteSpace()));
+    edidldecl->setText(GenerationSettings::idl_default_valuetype_attr_decl(multiplicity->currentText().trimmed()));
     idl_update();
 }
 
 void AttributeDialog::idl_default_constant()
 {
-    edidldecl->setText(GenerationSettings::idl_default_const_decl(multiplicity->currentText().stripWhiteSpace()));
+    edidldecl->setText(GenerationSettings::idl_default_const_decl(multiplicity->currentText().trimmed()));
     idl_update();
 }
 
@@ -1906,11 +1965,11 @@ void AttributeDialog::idl_update()
     //	const char * p = edidldecl->text();
     // because the QString is immediatly destroyed !
     QString def = edidldecl->text();
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     QString indent = "";
     QString s;
-
     while ((*p == ' ') || (*p == '\t'))
         indent += *p++;
 
@@ -1941,7 +2000,7 @@ void AttributeDialog::idl_update()
             s += edname->text();
         }
         else if (!strncmp(p, "${value}", 8)) {
-            QString i = edinit->text().stripWhiteSpace();
+            QString i = edinit->text().trimmed();
 
             if (need_equal(p, i, FALSE))
                 s += " = ";
@@ -1959,7 +2018,7 @@ void AttributeDialog::idl_update()
             s += *p++;
         else if (idl_in_union && !strncmp(p, "${case}", 7)) {
             p += 7;
-            s += edcase->currentText().stripWhiteSpace();
+            s += edcase->currentText().trimmed();
         }
         else if (!strncmp(p, "${attribut}", 11)) {
             // old version
@@ -1994,23 +2053,22 @@ void AttributeDialog::idl_update()
         }
         else if (!strncmp(p, "${type}", 7)) {
             p += 7;
-            s += get_idl_name(the_type(edtype->currentText().stripWhiteSpace(),
+            s += get_idl_name(the_type(edtype->currentText().trimmed(),
                                        list, nodes));
         }
         else if (!strncmp(p, "${stereotype}", 13)) {
             p += 13;
-            s += GenerationSettings::idl_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+            s += GenerationSettings::idl_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
         }
         else if (!strncmp(p, "${multiplicity}", 15)) {
             p += 15;
-            s += multiplicity->currentText().stripWhiteSpace();
+            s += multiplicity->currentText().trimmed();
         }
         else if (*p == '@')
             manage_alias(att->browser_node, p, s, kvtable);
         else
             s += *p++;
     }
-
     showidldecl->setText(s);
 }
 
@@ -2022,8 +2080,7 @@ QString AttributeDialog::idl_decl(const BrowserAttribute * at,
     WrapperStr decl = d->idl_decl;
     QString stereotype = ((BrowserNode *) at->parent())->get_data()->get_stereotype();
     bool in_enum = (stereotype == "enum") ||
-                   (GenerationSettings::idl_class_stereotype(stereotype) == "enum");
-
+            (GenerationSettings::idl_class_stereotype(stereotype) == "enum");
     remove_comments(decl);
 
     const char * p = decl;
@@ -2082,6 +2139,5 @@ QString AttributeDialog::idl_decl(const BrowserAttribute * at,
         else
             s += *p++;
     }
-
     return s;
 }
diff --git a/src/dialog/AttributeDialog.h b/src/dialog/AttributeDialog.h
index 5c6c342c1..7fac57f01 100644
--- a/src/dialog/AttributeDialog.h
+++ b/src/dialog/AttributeDialog.h
@@ -33,14 +33,13 @@
 
 
 #include <qstringlist.h>
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 #include "BrowserNode.h"
 #include "VisibilityGroup.h"
-
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QRadioButton;
 
@@ -52,7 +51,7 @@ class MultiLineEdit;
 class KeyValuesTable;
 class BodyDialog;
 
-class AttributeDialog : public Q3TabDialog
+class AttributeDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -63,18 +62,18 @@ class AttributeDialog : public Q3TabDialog
     AttributeData * att;
     QStringList list;
     BrowserNodeList nodes;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
     BrowserNode * view;
     int offset;
 
     // uml tab
     QWidget * umltab;
     LineEdit * edname;
-    Q3ComboBox * multiplicity;
+    QComboBox * multiplicity;
     QString previous_multiplicity;
     LineEdit * edinit;
-    Q3ComboBox * edtype;
-    Q3ComboBox * edstereotype;
+    QComboBox * edtype;
+    QComboBox * edstereotype;
     int attribute_st_rank;
     int empty_st_rank;
     VisibilityGroup uml_visibility;
@@ -129,7 +128,7 @@ class AttributeDialog : public Q3TabDialog
     bool idl_in_struct;
     bool idl_in_union;
     bool idl_in_typedef;
-    Q3ComboBox * edcase;
+    QComboBox * edcase;
     BrowserNodeList enums;
     QStringList enum_names;
     MultiLineEdit * edidldecl;
@@ -168,7 +167,7 @@ class AttributeDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edit_init();
     void default_description();
@@ -195,7 +194,7 @@ protected slots:
     void idl_default_constant();
     void idl_unmapped();
     void idl_update();
-    void update_all_tabs(QWidget *);
+    void update_all_tabs(int);
 };
 
 #endif
diff --git a/src/dialog/BasicDialog.cpp b/src/dialog/BasicDialog.cpp
index 0ab8b7155..9360cb9e7 100644
--- a/src/dialog/BasicDialog.cpp
+++ b/src/dialog/BasicDialog.cpp
@@ -29,12 +29,10 @@
 
 
 
-#include <q3grid.h>
+#include <gridbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
-#include <q3vbox.h>
-
+#include <qcombobox.h>
 #include "BasicDialog.h"
 #include "BasicData.h"
 #include "BrowserNode.h"
@@ -46,65 +44,72 @@
 #include "strutil.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "vvbox.h"
+#include "hhbox.h"
 BasicDialog::BasicDialog(BasicData * nd, QString s,
                          const QStringList & default_stereotypes,
                          QSize & sz, bool unnamed)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), data(nd), previous_size(sz)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), data(nd), previous_size(sz)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
     nd->get_browser_node()->edit_start();
 
     if (nd->get_browser_node()->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR(s + " dialog"));
-
+    setWindowTitle(s + tr(" dialog"));
     bool visit = !hasOkButton();
 
     // general tab
 
     BrowserNode * bn = data->get_browser_node();
-    Q3Grid * grid = new Q3Grid(2, this);
-    grid->setMargin(5);
-    grid->setSpacing(5);
+    GridBox * grid = new GridBox(2, this);
+    grid->setMargin(0);
+    grid->setSpacing(0);
 
     if (unnamed)
         edname = 0;
     else {
-        new QLabel(TR("name : "), grid);
-        edname = new LineEdit(bn->get_name(), grid);
+        grid->addWidget(new QLabel(tr("name : "), grid));
+        grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
         edname->setReadOnly(visit);
     }
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(data->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(data->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(default_stereotypes);
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(bn->get_type()));
+        edstereotype->addItems(default_stereotypes);
+        edstereotype->addItems(ProfiledStereotypes::defaults(bn->get_type()));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab = new VVBox(grid);
+    grid->addWidget(vtab);
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
+    SmallPushButton *sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     QFont font = comment->font();
@@ -119,19 +124,19 @@ BasicDialog::BasicDialog(BasicData * nd, QString s,
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
     kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
-
+    grid->addWidget(kvtable);
+    addTab(grid, QObject::tr("Properties"));
     open_dialog(this);
 }
 
 void BasicDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -140,8 +145,9 @@ BasicDialog::~BasicDialog()
     data->get_browser_node()->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -150,7 +156,7 @@ void BasicDialog::edit_description()
 {
     edit(comment->text(),
          (edname == 0) ? QString("description")
-         : edname->text().stripWhiteSpace() + "_description",
+         : edname->text().trimmed() + "_description",
          data, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -167,21 +173,19 @@ void BasicDialog::accept()
     BrowserNode * bn = data->get_browser_node();
 
     if (edname != 0) {
-        QString s = edname->text().stripWhiteSpace();
+        QString s = edname->text().trimmed();
 
         if ((s != bn->get_name()) &&
             ((BrowserNode *) bn->parent())->wrong_child_name(s, bn->get_type(),
                     bn->allow_spaces(),
                     bn->allow_empty())) {
-            msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+            msg_critical(tr("Error"), edname->text() + QObject::tr("\n\nillegal name or already used"));
             return;
         }
         else
             bn->set_name(s);
     }
-
-    bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
-
+    bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().trimmed().toLatin1().constData()));
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
 
@@ -191,6 +195,5 @@ void BasicDialog::accept()
 
     bn->package_modified();
     data->modified();
-
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/BasicDialog.h b/src/dialog/BasicDialog.h
index 06b3f62a9..05474afcd 100644
--- a/src/dialog/BasicDialog.h
+++ b/src/dialog/BasicDialog.h
@@ -32,29 +32,31 @@
 
 
 
-#include <q3ptrlist.h>
-#include <q3tabdialog.h>
-#include <q3ptrlist.h> //[lgfreitas] added 
-
-class Q3ComboBox;
+//
+//#include <tabdialog.h>
+// //[lgfreitas] added
+#include <QDialog>
+#include <tabdialog.h>
+class QComboBox;
 class LineEdit;
 class MultiLineEdit;
 class BasicData;
 class KeyValuesTable;
 class BodyDialog;
 
-class BasicDialog : public Q3TabDialog
+
+class BasicDialog : public TabDialog
 {
     Q_OBJECT
 
 protected:
     BasicData * data;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
     KeyValuesTable * kvtable;
     QSize & previous_size;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     static void post_edit_description(BasicDialog * d, QString s);
 
@@ -66,7 +68,7 @@ class BasicDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
 };
 
diff --git a/src/dialog/BodyDialog.cpp b/src/dialog/BodyDialog.cpp
index 57f51acda..27a08c77b 100644
--- a/src/dialog/BodyDialog.cpp
+++ b/src/dialog/BodyDialog.cpp
@@ -31,11 +31,11 @@
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 #include "BodyDialog.h"
 #include "UmlDesktop.h"
@@ -45,38 +45,41 @@
 
 QSize BodyDialog::previous_size;
 
-BodyDialog::BodyDialog(QString t, Q3TabDialog * d, post_edit pf,
-                       EditType k, QString what, Q3PtrList<BodyDialog> & edits)
-    : QDialog(d, what, d->isModal(), Qt::WDestructiveClose), dlg(d), f(pf), eds(edits)
+BodyDialog::BodyDialog(QString t, TabDialog * d, post_edit pf,
+                       EditType k, QString what, QList<BodyDialog *> & edits)
+    : QDialog(d/*, what, d->isModal(), Qt::WDestructiveClose*/), dlg(d), f(pf), eds(edits)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
+    setModal(d->isModal());
+    setWindowTitle(what);
     eds.append(this);
-    what.replace(what.findRev('_'), 1, " ");
+    what.replace(what.lastIndexOf('_'), 1, " ");
 
     switch (k) {
     case CppEdit:
-        setCaption(what + " (C++)");
+        setWindowTitle(what + " (C++)");
         break;
 
     case JavaEdit:
-        setCaption(what + " (Java)");
+        setWindowTitle(what + " (Java)");
         break;
 
     case PhpEdit:
-        setCaption(what + " (Php)");
+        setWindowTitle(what + " (Php)");
         break;
 
     case PythonEdit:
-        setCaption(what + " (Python)");
+        setWindowTitle(what + " (Python)");
         break;
 
     default:
-        setCaption(what);
+        setWindowTitle(what);
     }
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
-    vbox->addWidget(new QLabel((f == 0) ? TR("Note : operation bodies preserved")
-                               : TR("You can specify the editor through the environment dialog"),
+    vbox->addWidget(new QLabel((f == 0) ? QObject::tr("Note : operation bodies preserved")
+                               : QObject::tr("You can specify the editor through the environment dialog"),
                                this));
 
     e = new MultiLineEdit(this);
@@ -103,7 +106,7 @@ BodyDialog::~BodyDialog()
 {
     previous_size = size();
 
-    if (eds.remove(this) && (f != 0))
+    if (eds.removeOne(this) && (f != 0))
         // dialog still active
         f(dlg, e->text());
 
diff --git a/src/dialog/BodyDialog.h b/src/dialog/BodyDialog.h
index 16f352a4a..f7a15ccd4 100644
--- a/src/dialog/BodyDialog.h
+++ b/src/dialog/BodyDialog.h
@@ -29,30 +29,27 @@
 #define BODYDIALOG_H
 
 #include <qdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
 #include "DialogUtil.h"
-
-class Q3TabDialog;
+#include "tabdialog.h"
+class TabDialog;
 class MultiLineEdit;
 
 class BodyDialog : public QDialog
 {
-    Q_OBJECT
+    //Q_OBJECT
 
 protected:
     MultiLineEdit * e;
-    Q3TabDialog * dlg;
+    TabDialog * dlg;
     post_edit f;
-    Q3PtrList<BodyDialog> & eds;
+    QList<BodyDialog *> & eds;
 
     static QSize previous_size;
 
 public:
-    BodyDialog(QString t, Q3TabDialog * d, post_edit pf,
-               EditType k, QString what, Q3PtrList<BodyDialog> & edits);
-    virtual ~BodyDialog();
+    BodyDialog(QString t, TabDialog *d, post_edit pf,
+               EditType k, QString what, QList<BodyDialog *> & edits);
+    ~BodyDialog();
 };
 
 #endif
diff --git a/src/dialog/BrowserSearchDialog.cpp b/src/dialog/BrowserSearchDialog.cpp
index 307f7d2c2..b3d8c6727 100644
--- a/src/dialog/BrowserSearchDialog.cpp
+++ b/src/dialog/BrowserSearchDialog.cpp
@@ -30,19 +30,19 @@
 
 
 #include <qlayout.h>
-#include <q3hbox.h>
+#include <hhbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
-#include <q3groupbox.h>
-#include <q3buttongroup.h>
+#include <qgroupbox.h>
+#include <qbuttongroup.h>
 #include <qapplication.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3GridLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QVBoxLayout>
 
 #include "BrowserSearchDialog.h"
 #include "BrowserView.h"
@@ -112,69 +112,114 @@ static const struct {
 };
 
 BrowserSearchDialog::BrowserSearchDialog()
-    : QDialog(0, "Browser search", FALSE, Qt::WDestructiveClose)
+    : QDialog(0/*, "Browser search", FALSE, Qt::WDestructiveClose*/)
 {
     the = this;
-    setCaption(TR("Browser search"));
+    setWindowTitle(tr("Browser search"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
-    Q3GridLayout * gl = new Q3GridLayout(vbox, 4, 2, 5/*space*/);
+    //QGridLayout * gl = new QGridLayout(vbox, 4, 2, 5/*space*/);
 
-    gl->addWidget(new QLabel(TR("Kind"), this), 0, 0, Qt::AlignLeft);
-    kind = new Q3ComboBox(FALSE, this);
+    QGridLayout * gl = new QGridLayout();
+    vbox->addLayout(gl);
+
+    gl->addWidget(new QLabel(tr("Kind"), this), 0, 0, Qt::AlignLeft);
+    kind = new QComboBox(this);
+    kind->setEditable(false);
 
     for (int index = 0; index != sizeof(Kinds) / sizeof(*Kinds); index += 1)
-        kind->insertItem(TR(Kinds[index].lbl));
+        kind->addItem(tr(Kinds[index].lbl));
 
-    kind->setCurrentItem(saved_kind);
+    kind->setCurrentIndex(saved_kind);
     gl->addWidget(kind, 0, 1);
 
     ed = new LineEdit(this);
     ed->setText(saved_ed);
-    gl->addWidget(new QLabel(TR("Containing"), this), 1, 0, Qt::AlignLeft);
+    gl->addWidget(new QLabel(tr("Containing"), this), 1, 0, Qt::AlignLeft);
     gl->addWidget(ed, 1, 1);
     ed->setFocus();
 
-    Q3HBox * hb = new Q3HBox(this);
+    QHBoxLayout * hb = new QHBoxLayout();
+    QWidget *hbW = new QWidget(this);
+    hbW->setLayout(hb);
 
-    gl->addWidget(hb, 2, 1);
+    gl->addWidget(hbW, 2, 1,1,2);
 
-    Q3GroupBox * gb = new Q3GroupBox(2, Qt::Horizontal, hb);
+    //QGroupBox * gb = new QGroupBox(2, Qt::Horizontal, hb);
+    QGroupBox * gb = new QGroupBox(hbW);
+    gb->setLayoutDirection(Qt::LeftToRight);
+    hb->addWidget(gb);
 
-    case_sensitive = new QCheckBox(TR("case sensitive"), gb);
+    case_sensitive = new QCheckBox(tr("case sensitive"), gb);
     case_sensitive->setChecked(saved_case_sensitive);
-    even_deleted = new QCheckBox(TR("even deleted"), gb);
+    even_deleted = new QCheckBox(tr("even deleted"), gb);
     even_deleted->setChecked(saved_even_deleted);
 
-    Q3ButtonGroup * bg = new Q3ButtonGroup(4, Qt::Horizontal, hb);
+    QHBoxLayout * hb2 = new QHBoxLayout();
+    gb->setLayout(hb2);
+    gb->layout()->addWidget(case_sensitive);
+    gb->layout()->addWidget(even_deleted);
+    //QButtonGroup * bg = new QButtonGroup(4, Qt::Horizontal, hb);
+    QButtonGroup * bg = new QButtonGroup(hbW);
 
     bg->setExclusive(TRUE);
-    for_name = new QRadioButton(TR("name"), bg);
+
+    //for_name = new QRadioButton(TR("name"), bg);
+    for_name = new QRadioButton(tr("name"), hbW);
+    bg->addButton(for_name);
+
+
     for_name->setChecked(saved_name);
-    for_stereotype = new QRadioButton(TR("stereotype"), bg);
+
+    //for_stereotype = new QRadioButton(TR("stereotype"), bg);
+    for_stereotype = new QRadioButton(tr("stereotype"), hbW);
+    bg->addButton(for_stereotype);
+
     for_stereotype->setChecked(saved_stereotype);
-    for_comment = new QRadioButton(TR("description"), bg);
+
+
+    //for_comment = new QRadioButton(TR("description"), bg);
+    for_comment = new QRadioButton(tr("description"), hbW);
+    bg->addButton(for_comment);
+
     for_comment->setChecked(saved_comment);
-    for_decldefbody = new QRadioButton(TR("declaration/definition/body"), bg);
+
+    //for_decldefbody = new QRadioButton(TR("declaration/definition/body"), bg);
+    for_decldefbody = new QRadioButton(tr("declaration/definition/body"), hbW);
+    bg->addButton(for_decldefbody);
+
     for_decldefbody->setChecked(saved_decldefbody);
 
-    gl->addWidget(new QLabel(TR("Result"), this), 3, 0, Qt::AlignLeft);
-    results = new Q3ComboBox(FALSE, this);
+
+    QHBoxLayout * hb3 = new QHBoxLayout();
+
+    QGroupBox * gb2 = new QGroupBox(hbW);
+    gb2->setLayout(hb3);
+    hb3->addWidget(for_name);
+    hb3->addWidget(for_stereotype);
+    hb3->addWidget(for_comment);
+    hb3->addWidget(for_decldefbody);
+    hb->addWidget(gb2);
+
+    gl->addWidget(new QLabel(tr("Result"), this), 3, 0, Qt::AlignLeft);
+    results = new QComboBox(this);
+    results->setEditable(false);
     gl->addWidget(results, 3, 1);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
-    QPushButton * search_b = new QPushButton(TR("Search"), this);
-    QPushButton * close_b = new QPushButton(TR("Close"), this);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
+    QPushButton * search_b = new QPushButton(tr("Search"), this);
+    QPushButton * close_b = new QPushButton(tr("Close"), this);
 
     hbox->setMargin(5);
     hbox->addWidget(search_b);
-    hbox->addWidget(select_b = new QPushButton(TR("Select"), this));
-    hbox->addWidget(mark_unmark_b = new QPushButton(TR("Unmark"), this));
-    hbox->addWidget(mark_them_b = new QPushButton(TR("Mark them"), this));
-    hbox->addWidget(unmark_all_b = new QPushButton(TR("Unmark all"), this));
+    hbox->addWidget(select_b = new QPushButton(tr("Select"), this));
+    hbox->addWidget(mark_unmark_b = new QPushButton(tr("Unmark"), this));
+    hbox->addWidget(mark_them_b = new QPushButton(tr("Mark them"), this));
+    hbox->addWidget(unmark_all_b = new QPushButton(tr("Unmark all"), this));
     hbox->addWidget(close_b);
 
     search_b->setDefault(TRUE);
@@ -197,7 +242,7 @@ BrowserSearchDialog::BrowserSearchDialog()
 
 void BrowserSearchDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     //setMaximumHeight(sizeHint().height());
     //setMaximumWidth(29*UmlDesktop::width()/30)
     UmlDesktop::limitsize_move(this, previous_size, 29.0 / 30, 0.9);
@@ -206,7 +251,7 @@ void BrowserSearchDialog::polish()
 BrowserSearchDialog::~BrowserSearchDialog()
 {
     the = 0;
-    saved_kind = kind->currentItem();
+    saved_kind = kind->currentIndex();
     saved_ed = ed->text();
     saved_case_sensitive = case_sensitive->isChecked();
     saved_even_deleted = even_deleted->isChecked();
@@ -221,36 +266,34 @@ BrowserSearchDialog::~BrowserSearchDialog()
 
 void BrowserSearchDialog::search()
 {
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
     results->clear();
 
     nodes.clear();
 
     if (for_name->isChecked())
-        nodes.search(BrowserView::get_project(), Kinds[kind->currentItem()].k,
+        nodes.search(BrowserView::get_project(), Kinds[kind->currentIndex()].k,
                      ed->text(), case_sensitive->isChecked(),
                      even_deleted->isChecked(), TRUE, FALSE);
     else if (for_stereotype->isChecked())
-        nodes.search(BrowserView::get_project(), Kinds[kind->currentItem()].k,
+        nodes.search(BrowserView::get_project(), Kinds[kind->currentIndex()].k,
                      ed->text(), case_sensitive->isChecked(),
                      even_deleted->isChecked(), FALSE, TRUE);
     else if (for_comment->isChecked())
-        nodes.search(BrowserView::get_project(), Kinds[kind->currentItem()].k,
+        nodes.search(BrowserView::get_project(), Kinds[kind->currentIndex()].k,
                      ed->text(), case_sensitive->isChecked(),
                      even_deleted->isChecked(), FALSE, FALSE);
     else
-        nodes.search_ddb(BrowserView::get_project(), Kinds[kind->currentItem()].k,
+        nodes.search_ddb(BrowserView::get_project(), Kinds[kind->currentIndex()].k,
                          ed->text(), case_sensitive->isChecked(),
                          even_deleted->isChecked());
 
     if (! nodes.isEmpty()) {
         nodes.sort();
 
-        BrowserNode * bn;
-
-        for (bn = nodes.first(); bn != 0; bn = nodes.next())
-            results->insertItem(*(bn->pixmap(0)), bn->full_name(TRUE));
+        foreach (BrowserNode *bn, nodes)
+            results->addItem(*(bn->pixmap(0)), bn->full_name(TRUE));
 
         selected(0);
     }
@@ -271,7 +314,7 @@ void BrowserSearchDialog::selected(int index)
         select_b->setEnabled(TRUE);
         mark_unmark_b->setEnabled(TRUE);
         mark_unmark_b->setText((nodes.at(index)->markedp())
-                               ? TR("Unmark") : TR("Mark"));
+                               ? QObject::tr("Unmark") : QObject::tr("Mark"));
         mark_them_b->setEnabled(TRUE);
     }
 
@@ -280,7 +323,7 @@ void BrowserSearchDialog::selected(int index)
 
 void BrowserSearchDialog::mark_unmark()
 {
-    BrowserNode * bn = nodes.at(results->currentItem());
+    BrowserNode * bn = nodes.at(results->currentIndex());
 
     bn->toggle_mark();  	// call update
     BrowserView::force_visible(bn);
@@ -288,9 +331,7 @@ void BrowserSearchDialog::mark_unmark()
 
 void BrowserSearchDialog::mark_them()
 {
-    BrowserNode * bn;
-
-    for (bn = nodes.first(); bn != 0; bn = nodes.next()) {
+    foreach (BrowserNode *bn, nodes) {
         if (! bn->markedp()) {
             bn->toggle_mark();  	// call update
             BrowserView::force_visible(bn);
@@ -306,10 +347,10 @@ void BrowserSearchDialog::unmark_all()
 void BrowserSearchDialog::select()
 {
     if (results->count() != 0)
-        nodes.at(results->currentItem())->select_in_browser();
+        nodes.at(results->currentIndex())->select_in_browser();
 }
 
 void BrowserSearchDialog::update()
 {
-    selected((results->count() != 0) ? results->currentItem() : -1);
+    selected((results->count() != 0) ? results->currentIndex() : -1);
 }
diff --git a/src/dialog/BrowserSearchDialog.h b/src/dialog/BrowserSearchDialog.h
index 92c7b0632..39d8464d3 100644
--- a/src/dialog/BrowserSearchDialog.h
+++ b/src/dialog/BrowserSearchDialog.h
@@ -32,7 +32,7 @@
 
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QRadioButton;
 class QPushButton;
@@ -44,8 +44,8 @@ class BrowserSearchDialog : public QDialog
 
 protected:
     BrowserNodeList nodes;
-    Q3ComboBox * kind;
-    Q3ComboBox * results;
+    QComboBox * kind;
+    QComboBox * results;
     LineEdit * ed;
     QCheckBox * case_sensitive;
     QCheckBox * even_deleted;
diff --git a/src/dialog/ClassDialog.cpp b/src/dialog/ClassDialog.cpp
index 0953a529f..a733fbd9f 100644
--- a/src/dialog/ClassDialog.cpp
+++ b/src/dialog/ClassDialog.cpp
@@ -25,32 +25,23 @@
 //
 // *************************************************************************
 
-
-
-
-
 #include <stdio.h>
-
 #include <qcursor.h>
 #include <qsplitter.h>
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
+#include "ComboItem.h"
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qcheckbox.h>
-#include <q3popupmenu.h>
-#include <q3groupbox.h>
-#include <q3buttongroup.h>
+#include <qgroupbox.h>
+#include <qbuttongroup.h>
 #include <qpushbutton.h>
-#include <q3filedialog.h>
-//Added by qt3to4:
-
-
+#include <qfiledialog.h>
 #include "ClassDialog.h"
 #include "ClassData.h"
 #include "BrowserClass.h"
 #include "KeyValueTable.h"
-#include "ComboItem.h"
 #include "UmlWindow.h"
 #include "UmlDesktop.h"
 #include "BrowserView.h"
@@ -72,15 +63,18 @@
 #include "Images.h"
 #include "translate.h"
 #include "misc/TypeIdentifier.h"
+#include "menufactory.h"
+#include "bbuttongroup.h"
+#include <QHeaderView>
 
 QSize ClassDialog::previous_size;
-
 static QString RelativeRoot;
 static QString RelativePrj;
 static QString Absolute;
-QSharedPointer<ClassDialog> ClassDialog::instance;
-ClassDialog::ClassDialog(ClassData * c): EdgeMenuDialog(0, 0, FALSE), cl(c)
+//QSharedPointer<ClassDialog> ClassDialog::instance;
+ClassDialog::ClassDialog(ClassData * c): EdgeMenuDialog(0, 0, true), cl(c)
 {
+    //setAttribute(Qt::WA_DeleteOnClose);
     // take time in case of many classes and artifacts
     isWritable = c->browser_node->is_writable();
     NullPointers();
@@ -88,31 +82,37 @@ ClassDialog::ClassDialog(ClassData * c): EdgeMenuDialog(0, 0, FALSE), cl(c)
     SetCurrentNode(c->browser_node);
     InitGui();
     FillGuiElements(c);
+    //open_dialog(this);
 }
 
 void ClassDialog::polish()
 {
-    Q3TabDialog::polish();
+
+    ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
 ClassDialog::~ClassDialog()
 {
-    previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    previous_size = size();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
+#ifdef EDGETOOLENABLED
     if(toolbar)
     {
         toolbar->setParent(0);
         toolbar->hide();
     }
+#endif
 }
 
-QSharedPointer<ClassDialog> ClassDialog::Instance(ClassData * cl)
+std::shared_ptr<ClassDialog> ClassDialog::Instance(ClassData * cl)
 {
-    if (instance.isNull())
-        instance = QSharedPointer<ClassDialog>(new ClassDialog(cl));
+    static std::shared_ptr<ClassDialog> instance;
+    if (!instance)
+        instance.reset(new ClassDialog(cl));
     else
         instance->FillGuiElements(cl);
 
@@ -125,7 +125,7 @@ QString ClassDialog::cpp_stereotype(const QString & stereotype)
 
     return ((s == "struct") || (s == "union") || (s == "enum") ||
             (s == "typedef") || (s == "ignored") || (s == "metaclass"))
-           ? s : QString("class");
+            ? s : QString("class");
 }
 
 QString ClassDialog::java_stereotype(const QString & stereotype)
@@ -135,7 +135,7 @@ QString ClassDialog::java_stereotype(const QString & stereotype)
     return ((s == "interface") || (s == "@interface") ||
             (s == "enum") || (s == "enum_pattern") ||
             (s == "ignored") || (s == "metaclass"))
-           ? s : QString("class");
+            ? s : QString("class");
 }
 
 QString ClassDialog::php_stereotype(const QString & stereotype)
@@ -144,7 +144,7 @@ QString ClassDialog::php_stereotype(const QString & stereotype)
 
     return ((s == "interface") || (s == "enum") ||
             (s == "ignored") || (s == "metaclass"))
-           ? s : QString("class");
+            ? s : QString("class");
 }
 
 QString ClassDialog::python_stereotype(const QString & stereotype)
@@ -152,7 +152,7 @@ QString ClassDialog::python_stereotype(const QString & stereotype)
     QString s = GenerationSettings::python_class_stereotype(stereotype);
 
     return ((s == "enum") || (s == "ignored") || (s == "metaclass"))
-           ? s : QString("class");
+            ? s : QString("class");
 }
 
 QString ClassDialog::idl_stereotype(const QString & stereotype)
@@ -162,7 +162,7 @@ QString ClassDialog::idl_stereotype(const QString & stereotype)
     return ((s == "struct") || (s == "union") || (s == "enum") ||
             (s == "typedef") || (s == "exception") ||
             (s == "ignored") || (s == "interface") || (s == "metaclass"))
-           ? s : QString("valuetype");
+            ? s : QString("valuetype");
 }
 
 void ClassDialog::default_description()
@@ -172,7 +172,7 @@ void ClassDialog::default_description()
 
 void ClassDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          cl, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -183,7 +183,7 @@ void ClassDialog::post_edit_description(ClassDialog * d, QString s)
 
 void ClassDialog::edit_constraint()
 {
-    edit(constraint->text(), edname->text().stripWhiteSpace() + "_constraint",
+    edit(constraint->text(), edname->text().trimmed() + "_constraint",
          cl, TxtEdit, this, (post_edit) post_edit_constraint, edits);
 }
 
@@ -194,7 +194,7 @@ void ClassDialog::post_edit_constraint(ClassDialog * d, QString s)
 
 void ClassDialog::edStereotypeActivated(const QString & s)
 {
-    QString stereotype = s.stripWhiteSpace();
+    QString stereotype = s.trimmed();
 
     if ((stereotype == "stereotype") || (stereotype == "metaclass")) {
         if (GenerationSettings::cpp_get_default_defs())
@@ -275,12 +275,13 @@ void ClassDialog::edStereotypeActivated(const QString & s)
         if (idl_st != current_idl_stereotype)
             idl_default_decl();
     }
+
 }
 
 void ClassDialog::icon_browse()
 {
-    QString s = ediconpath->text().simplifyWhiteSpace();
-    const QString ns = Q3FileDialog::getOpenFileName(s, "", this, 0, TR("Select image"));
+    QString s = ediconpath->text().simplified();
+    const QString ns = QFileDialog::getOpenFileName(0, QObject::tr("Select image"),s);//(s, "", this, 0, QObject::tr("Select image"));
 
     if (! ns.isEmpty()) {
         ediconpath->setText(ns);
@@ -310,9 +311,9 @@ void ClassDialog::icon_root_relative()
 
 
 
-            (s.find(root) == 0) &&
+                (s.indexOf(root) == 0) &&
 
-            (s.length() >= len)) {
+                (s.length() >= len)) {
             ediconpath->setText(s.mid(len));
             iconpathrootbutton->setText(Absolute);
             iconpathprjbutton->setText(Absolute);
@@ -327,7 +328,7 @@ void ClassDialog::icon_root_relative()
 
 void ClassDialog::icon_prj_relative()
 {
-    QString root = BrowserView::get_dir().absPath();
+    QString root = BrowserView::get_dir().absolutePath();
     const QString s = ediconpath->text();
 
     if (root.at(root.length() - 1) != QChar('/'))
@@ -340,9 +341,9 @@ void ClassDialog::icon_prj_relative()
 
 
 
-            (s.find(root) == 0) &&
+                (s.indexOf(root) == 0) &&
 
-            (s.length() >= len)) {
+                (s.length() >= len)) {
             ediconpath->setText(s.mid(len));
             iconpathrootbutton->setText(Absolute);
             iconpathprjbutton->setText(Absolute);
@@ -357,15 +358,15 @@ void ClassDialog::icon_prj_relative()
     iconpathrootbutton->setEnabled(!UmlWindow::images_root_dir().isEmpty());
 }
 
-void ClassDialog::update_all_tabs(QWidget * w)
+void ClassDialog::update_all_tabs(int current)
 {
+    QWidget* w = m_tabWidget->widget(current);
     formals_table->forceUpdateCells();
 
     if (cl->get_n_actualparams() != 0)
         actuals_table->forceUpdateCells();
 
     bool visit = !hasOkButton();
-
     if (w == 0) {
         cpp_update_decl();
         java_update_decl();
@@ -431,15 +432,13 @@ static void cpp_generate_inherit(QString & s, ClassData * cl,
                                  BrowserNodeList & nodes,
                                  QStringList & node_names)
 {
-    BrowserNodeList inh;
-    const char * sep = " : ";
 
+    const char * sep = " : ";
+    BrowserNodeList inh;
     cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
 
-    Q3PtrListIterator<BrowserNode> it(inh);
-
-    while (it.current() != 0) {
-        RelationData * r = (RelationData *) it.current()->get_data();
+    foreach (BrowserNode *item, inh) {
+        RelationData * r = (RelationData *) item->get_data();
 
         if (r->get_cppdecl_a()[0]) {
             s += sep;
@@ -450,8 +449,6 @@ static void cpp_generate_inherit(QString & s, ClassData * cl,
 
             generate_mother(r->get_end_class(), TRUE, s, cl, actuals_table, nodes, node_names);
         }
-
-        ++it;
     }
 }
 
@@ -465,10 +462,8 @@ static void cpp_generate_typedef_type(QString & s, ClassData * cl,
 
     cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
 
-    Q3PtrListIterator<BrowserNode> it(inh);
-
-    while (it.current() != 0) {
-        RelationData * r = (RelationData *) it.current()->get_data();
+    foreach (BrowserNode *item, inh) {
+        RelationData * r = (RelationData *) item->get_data();
         /*if (r->get_cppdecl_a()[0])*/
         {
             BrowserClass * mother = r->get_end_class();
@@ -482,10 +477,7 @@ static void cpp_generate_typedef_type(QString & s, ClassData * cl,
                 return;
             }
         }
-
-        ++it;
     }
-
     s += GenerationSettings::cpp_type(type(basetype, node_names, nodes));
 }
 
@@ -503,8 +495,7 @@ static void generate_members(BrowserNode * cl, QString & s, QString indent,
                              bool except_instance_att_rel = FALSE,
                              bool only_instance_att_rel = FALSE)
 {
-    Q3ListViewItem * child;
-
+    BrowserNode * child;
     for (child = cl->firstChild(); child; child = child->nextSibling()) {
         if (((BrowserNode *) child)->deletedp())
             continue;
@@ -519,7 +510,7 @@ static void generate_members(BrowserNode * cl, QString & s, QString indent,
                 RelationData * rel = (RelationData *)((BrowserNode *) child)->get_data();
 
                 if (rel->is_a((BrowserRelation *) child)
-                    && (!strcmp(rel->get_stereotype(), "friend"))) {
+                        && (!strcmp(rel->get_stereotype(), "friend"))) {
                     ClassData * cld = (ClassData *) rel->get_end_class()->get_data();
                     QString st = cld->get_stereotype();
 
@@ -527,8 +518,8 @@ static void generate_members(BrowserNode * cl, QString & s, QString indent,
                         st = "class";
 
                     s += pre + "friend " + st + " " +
-                         true_name(rel->get_end_class()->get_name(), cld->get_cppdecl())
-                         + "\n";
+                            true_name(rel->get_end_class()->get_name(), cld->get_cppdecl())
+                            + "\n";
                 }
             }
 
@@ -543,8 +534,8 @@ static void generate_members(BrowserNode * cl, QString & s, QString indent,
             AttributeData * at = (AttributeData *)((BrowserNode *) child)->get_data();
 
             if ((at->get_isa_class_attribute())
-                ? only_instance_att_rel
-                : except_instance_att_rel)
+                    ? only_instance_att_rel
+                    : except_instance_att_rel)
                 continue;
 
             const char * st = at->get_stereotype();
@@ -565,7 +556,7 @@ static void generate_members(BrowserNode * cl, QString & s, QString indent,
 
             post = "\n";
         }
-        break;
+            break;
 
         case UmlOperation:
             if (!only_items && !only_instance_att_rel) {
@@ -611,16 +602,16 @@ static void generate_members(BrowserNode * cl, QString & s, QString indent,
 
                 if (re->is_a((BrowserRelation *) child)) {
                     if ((re->get_isa_class_relation_a())
-                        ? only_instance_att_rel
-                        : except_instance_att_rel)
+                            ? only_instance_att_rel
+                            : except_instance_att_rel)
                         continue;
 
                     decl = (re->*rel_a_f)();
                 }
                 else {
                     if ((re->get_isa_class_relation_b())
-                        ? only_instance_att_rel
-                        : except_instance_att_rel)
+                            ? only_instance_att_rel
+                            : except_instance_att_rel)
                         continue;
 
                     decl = (re->*rel_b_f)();
@@ -642,7 +633,7 @@ static void cpp_generate_inlines(BrowserNode * cl, const QString & cl_name,
                                  const QString & cl_decl, QString & s)
 {
     ClassData * cd = (ClassData *) cl->get_data();
-    bool templp = (cd->get_n_formalparams() != 0) || (cl_name.find('<') != -1);
+    bool templp = (cd->get_n_formalparams() != 0) || (cl_name.indexOf('<') != -1);
     QString templates;
     QString names;
     QString templates_tmplop;
@@ -650,7 +641,7 @@ static void cpp_generate_inlines(BrowserNode * cl, const QString & cl_name,
 
     if (((BrowserNode *) cl->parent())->get_type() == UmlClass) {
         ((ClassData *)((BrowserNode *) cl->parent())->get_data())
-        ->get_class_spec(templates, names, templates_tmplop, names_tmplop);
+                ->get_class_spec(templates, names, templates_tmplop, names_tmplop);
         names += "::";
     }
 
@@ -665,8 +656,7 @@ static void cpp_generate_inlines(BrowserNode * cl, const QString & cl_name,
 
     QString prefix = '\n' + templates + "..." + names + "::";
     QString prefix_tmplop = '\n' + templates_tmplop + "..." + names_tmplop + "<...>::";
-    Q3ListViewItem * child;
-
+    BrowserNode * child;
     for (child = cl->firstChild(); child; child = child->nextSibling()) {
         if (((BrowserNode *) child)->deletedp())
             continue;
@@ -677,14 +667,14 @@ static void cpp_generate_inlines(BrowserNode * cl, const QString & cl_name,
             const char * decl = d->get_cppdecl();
 
             if (templp &&
-                d->get_isa_class_attribute() &&
-                decl[0]) {
+                    d->get_isa_class_attribute() &&
+                    decl[0]) {
                 s += prefix;
                 s += true_name(((BrowserNode *) child)->get_name(), decl);
                 s += "\n\n";
             }
         }
-        break;
+            break;
 
         case UmlClass:
             cpp_generate_inlines((BrowserNode *) child,
@@ -703,8 +693,8 @@ static void cpp_generate_inlines(BrowserNode * cl, const QString & cl_name,
                 const char * decl = re->get_cppdecl_a();
 
                 if (templp &&
-                    re->get_isa_class_relation_a() &&
-                    decl[0]) {
+                        re->get_isa_class_relation_a() &&
+                        decl[0]) {
                     s += prefix;
                     s += true_name(re->get_role_a(), decl);
                     s += "\n\n";
@@ -714,15 +704,15 @@ static void cpp_generate_inlines(BrowserNode * cl, const QString & cl_name,
                 const char * decl = re->get_cppdecl_b();
 
                 if (templp &&
-                    re->get_isa_class_relation_b() &&
-                    decl[0]) {
+                        re->get_isa_class_relation_b() &&
+                        decl[0]) {
                     s += prefix;
                     s += true_name(re->get_role_b(), decl);
                     s += "\n";
                 }
             }
         }
-        break;
+            break;
 
         case UmlDependency:
         case UmlGeneralisation:
@@ -740,14 +730,16 @@ static void cpp_generate_inlines(BrowserNode * cl, const QString & cl_name,
                 s += "(...){...}\n";
             }
         }
-        break;
+            break;
 
         case UmlExtraMember: {
             ExtraMemberData * d = (ExtraMemberData *)((BrowserNode *) child)->get_data();
             const char * def = d->get_cpp_def();
 
             if ((templp || d->get_cpp_inline()) && def[0]) {
-                s += '\n' + def + '\n';
+                s += "\n";
+                s += def;
+                s += "\n";
             }
         }
         }
@@ -764,7 +756,8 @@ void ClassDialog::cpp_generate_decl(QString & s, ClassData * cl,
                                     QStringList & node_names,
                                     KeyValuesTable * kvt)
 {
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
 
     if (p == 0)
         return;
@@ -810,8 +803,8 @@ void ClassDialog::cpp_generate_decl(QString & s, ClassData * cl,
             s += *p++;
 
             if (*p && (*p != '#') &&
-                strncmp(p, "${members}", 10) &&
-                strncmp(p, "${items}", 8))
+                    strncmp(p, "${members}", 10) &&
+                    strncmp(p, "${items}", 8))
                 s += indent;
         }
         else if (a_typedef) {
@@ -870,7 +863,6 @@ void ClassDialog::cpp_generate_decl(QString & s, ClassData * cl,
 void ClassDialog::cpp_update_decl()
 {
     QString s;
-
     if (cl->browser_node->nestedp())
         cpp_visibility.update_default(uml_visibility);
 
@@ -880,12 +872,12 @@ void ClassDialog::cpp_update_decl()
         showcppdecl->setEnabled(TRUE);
 
         cpp_generate_decl(s, cl, edcppdecl->text(),
-                          edname->text().stripWhiteSpace(), current_cpp_stereotype,
-                          edbasetype->currentText().stripWhiteSpace(),
+                          edname->text().trimmed(), current_cpp_stereotype,
+                          edbasetype->currentText().trimmed(),
                           comment->text(), (instantiate_vtab != 0) ? actuals_table : 0,
                           formals_table, nodes, node_names, kvtable);
-    }
 
+    }
     showcppdecl->setText(s);
 }
 
@@ -895,7 +887,7 @@ void ClassDialog::cpp_default_decl()
         edcppdecl->setText(GenerationSettings::cpp_default_external_class_decl());
     else {
         current_cpp_stereotype =
-            cpp_stereotype(edstereotype->currentText().stripWhiteSpace());
+                cpp_stereotype(edstereotype->currentText().trimmed());
 
         if (current_cpp_stereotype == "struct")
             edcppdecl->setText(GenerationSettings::cpp_default_struct_decl());
@@ -933,9 +925,8 @@ void ClassDialog::cpp_generate_members_def(const BrowserNode * cl, QString & s)
 
     QString prefix = templates + "..." + names + "::";
     QString prefix_tmplop = templates_tmplop + "..." + names_tmplop + "<...>::";
-    bool templ = !templates.isEmpty() || (strchr(cl->get_name(), '<') != 0);
-    Q3ListViewItem * child;
-
+    bool templ = !templates.isEmpty() || (strchr(cl->get_name().toLatin1().constData(), '<') != 0);
+    BrowserNode * child;
     for (child = cl->firstChild(); child; child = child->nextSibling())
         if (!((BrowserNode *) child)->deletedp())
             ((BrowserNode *) child)->member_cpp_def(prefix, prefix_tmplop, s, templ);
@@ -950,25 +941,23 @@ static void java_generate_extends(QString & s, const QString & stereotype,
 
     cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
 
-    Q3PtrListIterator<BrowserNode> it(inh);
-
-    while (it.current() != 0) {
+    foreach (BrowserNode *item, inh) {
         RelationData * r =
-            (RelationData *)((BrowserRelation *) it.current())->get_data();
+                (RelationData *)((BrowserRelation *) item)->get_data();
 
         if (r->get_javadecl_a()[0]) {
             bool gen = FALSE;
             BrowserClass * mother = r->get_end_class();
             QString other_stereotype =
-                ClassDialog::java_stereotype(((ClassData *) mother->get_data())->get_stereotype());
+                    ClassDialog::java_stereotype(((ClassData *) mother->get_data())->get_stereotype());
 
             if ((stereotype == "interface") ||
-                (stereotype == "@interface")) {
+                    (stereotype == "@interface")) {
                 gen = TRUE;
                 s += sep;
 
                 if ((other_stereotype != "interface") &&
-                    (other_stereotype != "@interface"))
+                        (other_stereotype != "@interface"))
                     s += "!!!!!";
             }
             else if ((other_stereotype != "interface") &&
@@ -977,8 +966,8 @@ static void java_generate_extends(QString & s, const QString & stereotype,
                 s += sep;
 
                 if ((*sep == ',') ||
-                    (stereotype == "union") || (stereotype == "enum") || (stereotype == "enum_pattern") ||
-                    (other_stereotype == "union") || (other_stereotype == "enum"))
+                        (stereotype == "union") || (stereotype == "enum") || (stereotype == "enum_pattern") ||
+                        (other_stereotype == "union") || (other_stereotype == "enum"))
                     s += "!!!!!";
             }
 
@@ -987,8 +976,6 @@ static void java_generate_extends(QString & s, const QString & stereotype,
                 generate_mother(mother, FALSE, s, cl, actuals_table, nodes, node_names);
             }
         }
-
-        ++it;
     }
 }
 
@@ -1001,19 +988,17 @@ static void java_generate_implements(QString & s, const QString & stereotype,
 
     cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
 
-    Q3PtrListIterator<BrowserNode> it(inh);
-
-    while (it.current() != 0) {
+    foreach (BrowserNode *item, inh) {
         RelationData * r =
-            (RelationData *)((BrowserRelation *) it.current())->get_data();
+                (RelationData *)((BrowserRelation *) item)->get_data();
 
         if (r->get_javadecl_a()[0]) {
             BrowserClass * mother = r->get_end_class();
             QString other_stereotype =
-                ClassDialog::java_stereotype(((ClassData *) mother->get_data())->get_stereotype());
+                    ClassDialog::java_stereotype(((ClassData *) mother->get_data())->get_stereotype());
 
             if ((other_stereotype == "interface") ||
-                (other_stereotype == "@interface")) {
+                    (other_stereotype == "@interface")) {
                 s += sep;
 
                 if ((stereotype == "union") || (stereotype == "enum_pattern"))
@@ -1023,8 +1008,6 @@ static void java_generate_implements(QString & s, const QString & stereotype,
                 generate_mother(mother, FALSE, s, cl, actuals_table, nodes, node_names);
             }
         }
-
-        ++it;
     }
 }
 
@@ -1039,7 +1022,8 @@ void ClassDialog::java_generate_decl(QString & s, ClassData * cl, QString def,
                                      QStringList & node_names,
                                      KeyValuesTable * kvt)
 {
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
 
     if (p == 0)
         return;
@@ -1147,16 +1131,16 @@ void ClassDialog::java_generate_decl(QString & s, ClassData * cl, QString def,
                 s += "${@}";
             else if (! annotation.isEmpty()) {
                 pp = p;
-                p = annotation;
+                p = annotation.toLatin1().constData();
             }
         }
         else if (*p == '\n') {
             s += *p++;
 
             if (*p &&
-                strncmp(p, "${members}", 10) &&
-                strncmp(p, "${items}", 8) &&
-                strncmp(p, "${cases}", 8))
+                    strncmp(p, "${members}", 10) &&
+                    strncmp(p, "${items}", 8) &&
+                    strncmp(p, "${cases}", 8))
                 s += indent;
         }
         else if (*p == '@')
@@ -1169,7 +1153,6 @@ void ClassDialog::java_generate_decl(QString & s, ClassData * cl, QString def,
 void ClassDialog::java_update_decl()
 {
     QString s;
-
     if (java_external_cb->isChecked())
         showjavadecl->setEnabled(FALSE);
     else {
@@ -1178,15 +1161,14 @@ void ClassDialog::java_update_decl()
         QString def = edjavadecl->text();
 
         java_generate_decl(s, cl, def, javaannotation,
-                           edname->text().stripWhiteSpace(),
+                           edname->text().trimmed(),
                            current_java_stereotype, comment->text(),
                            uml_visibility.value(), java_final_cb->isChecked(),
                            abstract_cb->isChecked(), actuals_table,
                            formals_table, nodes, node_names, kvtable);
 
-        pbJavaAnnotation->setEnabled(def.find("${@}") != -1);
+        pbJavaAnnotation->setEnabled(def.indexOf("${@}") != -1);
     }
-
     showjavadecl->setText(s);
 }
 
@@ -1196,7 +1178,7 @@ void ClassDialog::java_default_decl()
         edjavadecl->setText(GenerationSettings::java_default_external_class_decl());
     else {
         current_java_stereotype =
-            java_stereotype(edstereotype->currentText().stripWhiteSpace());
+                java_stereotype(edstereotype->currentText().trimmed());
 
         if (current_java_stereotype == "enum")
             edjavadecl->setText(GenerationSettings::java_default_enum_decl());
@@ -1206,7 +1188,7 @@ void ClassDialog::java_default_decl()
             edjavadecl->setText(GenerationSettings::java_default_interface_decl());
         else if (current_java_stereotype == "@interface") {
             QString s = GenerationSettings::java_default_interface_decl();
-            int index = s.find("interface");
+            int index = s.indexOf("interface");
 
             if (index != -1)
                 s.insert(index, '@');
@@ -1245,17 +1227,15 @@ static void php_generate_extends(QString & s, const QString & stereotype,
 
     cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
 
-    Q3PtrListIterator<BrowserNode> it(inh);
-
-    while (it.current() != 0) {
+    foreach (BrowserNode *item, inh) {
         RelationData * r =
-            (RelationData *)((BrowserRelation *) it.current())->get_data();
+                (RelationData *)((BrowserRelation *) item)->get_data();
 
         if (r->get_phpdecl_a()[0]) {
             bool gen = FALSE;
             BrowserClass * mother = r->get_end_class();
             QString other_stereotype =
-                ClassDialog::php_stereotype(((ClassData *) mother->get_data())->get_stereotype());
+                    ClassDialog::php_stereotype(((ClassData *) mother->get_data())->get_stereotype());
 
             if (stereotype == "interface") {
                 gen = TRUE;
@@ -1269,8 +1249,8 @@ static void php_generate_extends(QString & s, const QString & stereotype,
                 s += sep;
 
                 if ((*sep == ',') ||
-                    (stereotype == "union") || (stereotype == "enum") ||
-                    (other_stereotype == "union") || (other_stereotype == "enum"))
+                        (stereotype == "union") || (stereotype == "enum") ||
+                        (other_stereotype == "union") || (other_stereotype == "enum"))
                     s += "!!!!!";
             }
 
@@ -1279,8 +1259,6 @@ static void php_generate_extends(QString & s, const QString & stereotype,
                 s += mother->get_name();
             }
         }
-
-        ++it;
     }
 }
 
@@ -1292,16 +1270,14 @@ static void php_generate_implements(QString & s, const QString & stereotype,
 
     cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
 
-    Q3PtrListIterator<BrowserNode> it(inh);
-
-    while (it.current() != 0) {
+    foreach (BrowserNode *item, inh) {
         RelationData * r =
-            (RelationData *)((BrowserRelation *) it.current())->get_data();
+                (RelationData *)((BrowserRelation *) item)->get_data();
 
         if (r->get_phpdecl_a()[0]) {
             BrowserClass * mother = r->get_end_class();
             QString other_stereotype =
-                ClassDialog::php_stereotype(((ClassData *) mother->get_data())->get_stereotype());
+                    ClassDialog::php_stereotype(((ClassData *) mother->get_data())->get_stereotype());
 
             if (other_stereotype == "interface") {
                 s += sep;
@@ -1313,8 +1289,6 @@ static void php_generate_implements(QString & s, const QString & stereotype,
                 s += mother->get_name();
             }
         }
-
-        ++it;
     }
 }
 
@@ -1323,7 +1297,8 @@ void ClassDialog::php_generate_decl(QString & s, ClassData * cl, QString def,
                                     QString comment, bool is_final,
                                     bool is_abstract, KeyValuesTable * kvt)
 {
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
 
     if (p == 0)
         return;
@@ -1422,14 +1397,13 @@ void ClassDialog::php_generate_decl(QString & s, ClassData * cl, QString def,
 void ClassDialog::php_update_decl()
 {
     QString s;
-
     if (php_external_cb->isChecked())
         showphpdecl->setEnabled(FALSE);
     else {
         showphpdecl->setEnabled(TRUE);
 
         php_generate_decl(s, cl, edphpdecl->text(),
-                          edname->text().stripWhiteSpace(),
+                          edname->text().trimmed(),
                           current_php_stereotype, comment->text(),
                           php_final_cb->isChecked(),
                           abstract_cb->isChecked(), kvtable);
@@ -1444,7 +1418,7 @@ void ClassDialog::php_default_decl()
         edphpdecl->setText(GenerationSettings::php_default_external_class_decl());
     else {
         current_php_stereotype =
-            php_stereotype(edstereotype->currentText().stripWhiteSpace());
+                php_stereotype(edstereotype->currentText().trimmed());
 
         if (current_php_stereotype == "enum")
             edphpdecl->setText(GenerationSettings::php_default_enum_decl());
@@ -1475,10 +1449,8 @@ static void python_generate_inherit(QString & s, ClassData * cl, bool object,
 
     cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
 
-    Q3PtrListIterator<BrowserNode> it(inh);
-
-    while (it.current() != 0) {
-        RelationData * r = (RelationData *) it.current()->get_data();
+    foreach (BrowserNode *item, inh) {
+        RelationData * r = (RelationData *) item->get_data();
 
         if (r->get_cppdecl_a()[0]) {
             s += sep;
@@ -1486,8 +1458,6 @@ static void python_generate_inherit(QString & s, ClassData * cl, bool object,
 
             generate_mother(r->get_end_class(), FALSE, s, cl, 0, nodes, node_names);
         }
-
-        ++it;
     }
 
     if (*sep != '(')
@@ -1503,7 +1473,8 @@ void ClassDialog::python_generate_decl(QString & s, ClassData * cl, QString def,
                                        QStringList & node_names,
                                        KeyValuesTable * kvt)
 {
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
 
     if (p == 0)
         return;
@@ -1513,7 +1484,7 @@ void ClassDialog::python_generate_decl(QString & s, ClassData * cl, QString def,
     QString indent;
     QString saved_indent = indent;
     QString indent_step =
-        GenerationSettings::python_get_indent_step();
+            GenerationSettings::python_get_indent_step();
 
     for (;;) {
         if (*p == 0) {
@@ -1556,13 +1527,12 @@ void ClassDialog::python_generate_decl(QString & s, ClassData * cl, QString def,
                              &RelationData::get_pythondecl_a, &RelationData::get_pythondecl_b,
                              &ExtraMemberData::get_python_decl, &ClassData::get_pythondecl,
                              python_stereotype, FALSE, FALSE, FALSE, TRUE);
-            Q3ListViewItem * child;
+            BrowserNode * child;
             bool has__init__ = FALSE;
-
             for (child = cl->browser_node->firstChild(); child; child = child->nextSibling()) {
                 if (!((BrowserNode *) child)->deletedp() &&
-                    (((BrowserNode *) child)->get_type() == UmlOperation) &&
-                    !strcmp(((BrowserNode *) child)->get_name(), "__init__")) {
+                        (((BrowserNode *) child)->get_type() == UmlOperation) &&
+                        !strcmp(((BrowserNode *) child)->get_name().toLatin1().constData(), "__init__")) {
                     has__init__ = TRUE;
                     break;
                 }
@@ -1573,6 +1543,7 @@ void ClassDialog::python_generate_decl(QString & s, ClassData * cl, QString def,
 
             indent_needed = TRUE;
         }
+
         else if (*p == '@')
             manage_alias(cl->browser_node, p, s, kvt);
         else {
@@ -1609,9 +1580,8 @@ void ClassDialog::python_update_decl()
         showpythondecl->setEnabled(FALSE);
     else {
         showpythondecl->setEnabled(TRUE);
-
         python_generate_decl(s, cl, edpythondecl->text(),
-                             edname->text().stripWhiteSpace(),
+                             edname->text().trimmed(),
                              current_python_stereotype, comment->text(),
                              python_2_2_cb->isChecked(), nodes, node_names,
                              kvtable);
@@ -1626,7 +1596,7 @@ void ClassDialog::python_default_decl()
         edpythondecl->setText(GenerationSettings::python_default_external_class_decl());
     else {
         current_python_stereotype =
-            python_stereotype(edstereotype->currentText().stripWhiteSpace());
+                python_stereotype(edstereotype->currentText().trimmed());
 
         if (current_python_stereotype == "enum")
             edpythondecl->setText(GenerationSettings::python_default_enum_decl());
@@ -1672,22 +1642,20 @@ static void idl_generate_inherit(QString & s, QString st, ClassData * cl)
 
     cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
 
-    Q3PtrListIterator<BrowserNode> it(inh);
-
-    while (it.current() != 0) {
-        RelationData * r = (RelationData *) it.current()->get_data();
+    foreach (BrowserNode *item, inh) {
+        RelationData * r = (RelationData *) item->get_data();
 
         if (r->get_idldecl_a()[0]) {
             BrowserClass * mother = r->get_end_class();
             QString other_st =
-                ClassDialog::idl_stereotype(mother->get_stereotype());
+                    ClassDialog::idl_stereotype(mother->get_stereotype());
 
             if ((other_st != "ignored") &&
-                (other_st != "metaclass") &&
-                (other_st != "union") &&
-                (other_st != "struct") &&
-                (other_st != "enum") &&
-                (other_st != "typedef")) {
+                    (other_st != "metaclass") &&
+                    (other_st != "union") &&
+                    (other_st != "struct") &&
+                    (other_st != "enum") &&
+                    (other_st != "typedef")) {
                 if (is_valuetype) {
                     if (other_st == "valuetype") {
                         s += sep;
@@ -1712,8 +1680,6 @@ static void idl_generate_inherit(QString & s, QString st, ClassData * cl)
                 sep = ", ";
             }
         }
-
-        ++it;
     }
 }
 
@@ -1724,7 +1690,8 @@ void ClassDialog::idl_generate_decl(QString & s, ClassData * cl, QString def,
                                     bool is_custom, bool is_abstract,
                                     KeyValuesTable * kvt)
 {
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
 
     if (p == 0)
         return;
@@ -1784,8 +1751,8 @@ void ClassDialog::idl_generate_decl(QString & s, ClassData * cl, QString def,
             s += *p++;
 
             if (*p && (*p != '#') &&
-                strncmp(p, "${members}", 10) &&
-                strncmp(p, "${items}", 8))
+                    strncmp(p, "${members}", 10) &&
+                    strncmp(p, "${items}", 8))
                 s += indent;
         }
         else if (stereotype == "typedef") {
@@ -1828,6 +1795,7 @@ void ClassDialog::idl_generate_decl(QString & s, ClassData * cl, QString def,
         }
         else if (*p == '@')
             manage_alias(cl->browser_node, p, s, kvt);
+
         else
             s += *p++;
     }
@@ -1841,13 +1809,12 @@ void ClassDialog::idl_update_decl()
         showidldecl->setEnabled(FALSE);
     else {
         showidldecl->setEnabled(TRUE);
-
         idl_generate_decl(s, cl, edidldecl->text(),
-                          edname->text().stripWhiteSpace(), current_idl_stereotype,
-                          type(edbasetype->currentText().stripWhiteSpace(),
+                          edname->text().trimmed(), current_idl_stereotype,
+                          type(edbasetype->currentText().trimmed(),
                                node_names, nodes),
                           comment->text(),
-                          edswitch_type->currentText().stripWhiteSpace(),
+                          edswitch_type->currentText().trimmed(),
                           idl_local_cb->isChecked(), idl_custom_cb->isChecked(),
                           abstract_cb->isChecked(), kvtable);
     }
@@ -1861,8 +1828,7 @@ void ClassDialog::idl_default_decl()
         edidldecl->setText(GenerationSettings::idl_default_external_class_decl());
     else {
         current_idl_stereotype =
-            idl_stereotype(edstereotype->currentText().stripWhiteSpace());
-
+                idl_stereotype(edstereotype->currentText().trimmed());
         if (current_idl_stereotype == "struct")
             edidldecl->setText(GenerationSettings::idl_default_struct_decl());
         else if (current_idl_stereotype == "union")
@@ -1894,7 +1860,7 @@ void ClassDialog::idl_unmapped_decl()
 void ClassDialog::accept()
 {
     SaveData();
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
 
 //
@@ -1908,47 +1874,48 @@ QString FormalParamsTable::default_value_copy;
 QString FormalParamsTable::extends_copy;
 
 FormalParamsTable::FormalParamsTable(ClassData * cl, QWidget * parent,
-                                     const QStringList & node_names, bool visit)
+                                     QStringList & node_names, bool visit)
     : MyTable(cl->get_n_formalparams() + 1, (visit) ? 4 : 5, parent),
       types(node_names)
 {
-    setSorting(true);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
-    horizontalHeader()->setLabel(0, TR("Type (C++)"));
-    horizontalHeader()->setLabel(1, TR("Name"));
-    horizontalHeader()->setLabel(2, TR("Default value (C++)"));
-    horizontalHeader()->setLabel(3, "Extends (Java)");
+    verticalHeader()->setSectionsMovable(true);
+    setHorizontalHeaderLabel(0, QObject::tr("Type (C++)"));
+    setHorizontalHeaderLabel(1, QObject::tr("Name"));
+    setHorizontalHeaderLabel(2, QObject::tr("Default value (C++)"));
+    setHorizontalHeaderLabel(3, "Extends (Java)");
 
     if (! visit)
-        horizontalHeader()->setLabel(4, TR("do"));
+        setHorizontalHeaderLabel(4, QObject::tr("do"));
 
     int index;
     int sup = cl->get_n_formalparams();
 
+    m_comboBoxDelegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(2, m_comboBoxDelegate);
+    setItemDelegateForColumn(3, m_comboBoxDelegate);
     if (visit) {
         for (index = 0; index < sup; index += 1) {
-            setItem(index, 0, new TableItem(this, Q3TableItem::Never, cl->get_formalparam_type(index)));
-            setItem(index, 1, new TableItem(this, Q3TableItem::Never, cl->get_formalparam_name(index)));
-            setItem(index, 2, new TableItem(this, Q3TableItem::Never,
-                                            cl->get_formalparam_default_value(index, !node_names.isEmpty())));
-            setItem(index, 3, new TableItem(this, Q3TableItem::Never,
-                                            cl->get_formalparam_extends(index, !node_names.isEmpty())));
+            setItem(index, 0, new TableItem(TableItem::Never, cl->get_formalparam_type(index), TableItem::TableItemType));
+            setItem(index, 1, new TableItem(TableItem::Never, cl->get_formalparam_name(index), TableItem::TableItemType));
+            setItem(index, 2, new TableItem(TableItem::Never,
+                                            cl->get_formalparam_default_value(index, !node_names.isEmpty()), TableItem::TableItemType));
+            setItem(index, 3, new TableItem(TableItem::Never,
+                                            cl->get_formalparam_extends(index, !node_names.isEmpty()), TableItem::TableItemType));
         }
     }
     else {
         for (index = 0; index < sup; index += 1) {
             setText(index, 0, cl->get_formalparam_type(index));
             setText(index, 1, cl->get_formalparam_name(index));
-            setItem(index, 2, new ComboItem(this, cl->get_formalparam_default_value(index, TRUE), types));
-            setItem(index, 3, new ComboItem(this, cl->get_formalparam_extends(index, TRUE), types));
+            setItem(index, 2, new ComboItem(cl->get_formalparam_default_value(index, TRUE), types));
+            setItem(index, 3, new ComboItem(cl->get_formalparam_extends(index, TRUE), types));
             setText(index, 4, QString());
         }
-
         setText(index, 0, "class");
         setText(index, 1, QString());
-        setItem(index, 2, new ComboItem(this, QString(), types));
-        setItem(index, 3, new ComboItem(this, QString(), types));
+        setItem(index, 2, new ComboItem(QString(), types));
+        setItem(index, 3, new ComboItem(QString(), types));
         setText(index, 4, QString());
     }
 
@@ -1961,11 +1928,80 @@ FormalParamsTable::FormalParamsTable(ClassData * cl, QWidget * parent,
         adjustColumn(4);
         setColumnStretchable(4, FALSE);
 
-        connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-                this, SLOT(button_pressed(int, int, int, const QPoint &)));
-        connect(this, SIGNAL(valueChanged(int, int)),
+        connect(this, SIGNAL(pressed(QModelIndex)),
+                this, SLOT(button_pressed(QModelIndex)));
+        connect(this, SIGNAL(cellChanged(int,int)),
                 this, SLOT(value_changed(int, int)));
     }
+    //setSortingEnabled(true);
+}
+
+void FormalParamsTable::Reinitiliaze(ClassData *cl, QStringList &node_names, bool isWritable)
+{
+    int oldRowCount = rowCount()-1;
+    blockSignals(true);
+    DISABLESORTINGMYTABLE
+    for (int index =  oldRowCount; index > -1; index -= 1) {
+        removeRow(index);
+    }
+    int sup = cl->get_n_formalparams();
+    types = node_names;
+    setRowCount(sup + 1);
+
+    //remove custom delegate if set
+    disconnect(this, SIGNAL(pressed(QModelIndex)),
+               this, SLOT(button_pressed(QModelIndex)));
+    disconnect(this, SIGNAL(cellChanged(int, int)),
+               this, SLOT(value_changed(int, int)));
+    if (isWritable)
+    {
+        setColumnCount(5);
+        adjustColumn(4);
+        setColumnStretchable(4, FALSE);
+        setHorizontalHeaderLabel(4, QObject::tr("do"));
+
+        connect(this, SIGNAL(pressed(QModelIndex)),
+                this, SLOT(button_pressed(QModelIndex)));
+        connect(this, SIGNAL(cellChanged(int,int)),
+                this, SLOT(value_changed(int, int)));
+
+        int index;
+        for ( index = 0; index < sup; index += 1) {
+            setText(index, 0, cl->get_formalparam_type(index));
+            setText(index, 1, cl->get_formalparam_name(index));
+            setItem(index, 2, new ComboItem(cl->get_formalparam_default_value(index, TRUE), types));
+            setItem(index, 3, new ComboItem(cl->get_formalparam_extends(index, TRUE), types));
+            setText(index, 4, QString());
+        }
+        setText(index, 0, "class");
+        setText(index, 1, QString());
+        setItem(index, 2, new ComboItem(QString(), types));
+        setItem(index, 3, new ComboItem(QString(), types));
+        setText(index, 4, QString());
+    }
+    else
+    {
+        setColumnCount(4);
+        for (int index = 0; index < sup; index += 1) {
+            setItem(index, 0, new TableItem(TableItem::Never, cl->get_formalparam_type(index), TableItem::TableItemType));
+            setItem(index, 1, new TableItem(TableItem::Never, cl->get_formalparam_name(index), TableItem::TableItemType));
+            setItem(index, 2, new TableItem(TableItem::Never, cl->get_formalparam_default_value(index, !node_names.isEmpty()), TableItem::TableItemType));
+            setItem(index, 3, new TableItem(TableItem::Never, cl->get_formalparam_extends(index, !node_names.isEmpty()), TableItem::TableItemType));
+
+        }
+
+
+        for (int index = 0; index < sup; index += 1) {
+            setItem(index, 0, new TableItem(TableItem::Never, cl->get_actualparam_name(index), TableItem::TableItemType));
+
+            if (!isWritable)
+                setItem(index, 1, new TableItem(TableItem::Never, cl->get_actualparam_value(index), TableItem::TableItemType));
+            else
+                setItem(index, 1, new ComboItem(cl->get_actualparam_value(index), types));
+        }
+    }
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void FormalParamsTable::activateNextCell()
@@ -1975,13 +2011,13 @@ void FormalParamsTable::activateNextCell()
 
     if (col == 3) {
         // goto next line
-        if (++row == numRows()) {
+        if (++row == rowCount()) {
             // adds a new line
-            setNumRows(row + 1);
+            setRowCount(row + 1);
             setText(row, 0, "class");
             setText(row, 1, QString());
-            setItem(row, 2, new ComboItem(this, QString(), types));
-            setItem(row, 3, new ComboItem(this, QString(), types));
+            setItem(row, 2, new ComboItem(QString(), types));
+            setItem(row, 3, new ComboItem(QString(), types));
             setText(row, 4, QString());
         }
 
@@ -1993,161 +2029,134 @@ void FormalParamsTable::activateNextCell()
 
 void FormalParamsTable::value_changed(int row, int col)
 {
-    if ((row == (numRows() - 1)) && !text(row, col).isEmpty())
+    if ((row == (rowCount() - 1)) && !text(row, col).isEmpty())
         insert_row_after(row);
 }
 
-void FormalParamsTable::button_pressed(int row, int col, int, const QPoint &)
+void FormalParamsTable::button_pressed(const QModelIndex &index)
 {
+    int row = index.row();
+    int col = index.column();
     if (col == 4) {
         char s[16];
-
         sprintf(s, "%d", row + 1);
-        Q3PopupMenu m;
-        m.insertItem(TR("formal param %1", s), -1);
-        m.insertSeparator();
-        m.insertItem(TR("Insert param before"), 0);
-        m.insertItem(TR("Insert param after"), 1);
-        m.insertSeparator();
-        m.insertItem(TR("Delete param"), 2);
-        m.insertSeparator();
-        m.insertItem(TR("Copy param"), 3);
-        m.insertItem(TR("Cut param"), 4);
-        m.insertItem(TR("Paste param"), 5);
-        m.insertSeparator();
-
-        Q3PopupMenu mv;
+        QMenu m;
+        MenuFactory::addItem(m, tr("formal param %1").arg(s), -1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Insert param before"), 0);
+        MenuFactory::addItem(m, tr("Insert param after"), 1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Delete param"), 2);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Copy param"), 3);
+        MenuFactory::addItem(m, tr("Cut param"), 4);
+        MenuFactory::addItem(m, tr("Paste param"), 5);
+        m.addSeparator();
+
+        QMenu mv;
         int rank;
 
-        for (rank = 0; rank != numRows(); rank += 1)
+        for (rank = 0; rank != rowCount(); rank += 1)
             if (rank != row)
-                mv.insertItem(QString::number(rank + 1), 10 + rank);
+                MenuFactory::addItem(mv, QString::number(rank + 1), 10 + rank);
 
-        m.insertItem(TR("Move param"), &mv);
+        MenuFactory::insertItem(m, tr("Move param"), &mv);
 
-        switch (rank = m.exec(QCursor::pos())) {
-        case 0:
-            insert_row_before(row);
-            break;
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+            switch (rank = retAction->data().toInt()) {
+            case 0:
+                insert_row_before(row);
+                break;
 
-        case 1:
-            insert_row_after(row);
-            break;
+            case 1:
+                insert_row_after(row);
+                break;
 
-        case 2:
-            delete_row(row);
-            break;
+            case 2:
+                delete_row(row);
+                break;
 
-        case 3:
-            copy_row(row);
-            break;
+            case 3:
+                copy_row(row);
+                break;
 
-        case 4:
-            cut_row(row);
-            break;
+            case 4:
+                cut_row(row);
+                break;
 
-        case 5:
-            paste_row(row);
-            break;
+            case 5:
+                paste_row(row);
+                break;
 
-        default:
-            if (rank >= 10)
-                move_row(row, rank - 10);
+            default:
+                if (rank >= 10)
+                    move_row(row, rank - 10);
 
-            break;
+                break;
+            }
         }
     }
+
 }
 
 void FormalParamsTable::insert_row_before(int row)
 {
-    int n = numRows();
-    int index;
-
-    setNumRows(n + 1);
-
-    for (index = n; index != row; index -= 1) {
-        setText(index, 0, text(index - 1, 0));
-        setText(index, 1, text(index - 1, 1));
-
-        Q3TableItem * it;
-
-        it = item(index - 1, 2);
-        takeItem(it);
-        setItem(index, 2, it);
-
-        it = item(index - 1, 3);
-        takeItem(it);
-        setItem(index, 3, it);
-    }
-
+    blockSignals(true);
+    DISABLESORTINGMYTABLE
+    insertRow(row);
     setText(row, 0, "class");
     setText(row, 1, QString());
-    setItem(row, 2, new ComboItem(this, QString(), types));
-    setItem(row, 3, new ComboItem(this, QString(), types));
+    setItem(row, 2, new ComboItem(QString(), types));
+    setItem(row, 3, new ComboItem(QString(), types));
     setText(row, 4, QString());
+    ENABLESORTINGMYTABLE
+    blockSignals(false);
 }
 
 void FormalParamsTable::insert_row_after(int row)
 {
-    int n = numRows();
-    int index;
-
-    setNumRows(n + 1);
-
-    for (index = n; index > row + 1; index -= 1) {
-        setText(index, 0, text(index - 1, 0));
-        setText(index, 1, text(index - 1, 1));
-
-        Q3TableItem * it;
-
-        it = item(index - 1, 2);
-        takeItem(it);
-        setItem(index, 2, it);
-
-        it = item(index - 1, 3);
-        takeItem(it);
-        setItem(index, 3, it);
-    }
-
+    blockSignals(true);
+    DISABLESORTINGMYTABLE
+    insertRow(row+1);
     setText(row + 1, 0, "class");
     setText(row + 1, 1, QString());
-    setItem(row + 1, 2, new ComboItem(this, QString(), types));
-    setItem(row + 1, 3, new ComboItem(this, QString(), types));
+    setItem(row + 1, 2, new ComboItem(QString(), types));
+    setItem(row + 1, 3, new ComboItem(QString(), types));
     setText(row + 1, 4, QString());
+    ENABLESORTINGMYTABLE
+    blockSignals(false);
 }
 
 void FormalParamsTable::delete_row(int row)
 {
-    int n = numRows();
+    int n = rowCount();
     int index;
-
-    clearCellWidget(row, 3);
-
     if (n == 1) {
         // the alone line : empty it
         setText(0, 0, "class");
         setText(0, 1, QString());
-        setItem(0, 2, new ComboItem(this, QString(), types));
-        setItem(0, 3, new ComboItem(this, QString(), types));
+        setItem(0, 2, new ComboItem(QString(), types));
+        setItem(0, 3, new ComboItem(QString(), types));
     }
     else {
         for (index = row; index != n - 1; index += 1) {
             setText(index, 0, text(index + 1, 0));
             setText(index, 1, text(index + 1, 1));
 
-            Q3TableItem * it;
+            QTableWidgetItem * it;
 
             it = item(index + 1, 2);
-            takeItem(it);
+            takeItem(it->row(), it->column());
             setItem(index, 2, it);
 
             it = item(index + 1, 3);
-            takeItem(it);
+            takeItem(it->row(), it->column());
             setItem(index, 3, it);
         }
 
-        setNumRows(n - 1);
+        setRowCount(n - 1);
     }
 }
 
@@ -2171,9 +2180,9 @@ void FormalParamsTable::paste_row(int row)
     setText(row, 1, name_copy);
     setText(row, 2, default_value_copy);
     setText(row, 3, extends_copy);
-
-    if ((row == (numRows() - 1)) && !name_copy.isEmpty())
+    if ((row == (rowCount() - 1)) && !name_copy.isEmpty())
         insert_row_after(row);
+
 }
 
 void FormalParamsTable::move_row(int from, int to)
@@ -2202,9 +2211,9 @@ void FormalParamsTable::generate_cpp(QString & s, BrowserNodeList & nodes,
                                      QStringList & node_names,
                                      const QString & cl_name)
 {
-    int n = numRows();
+    int n = rowCount();
 
-    if (text(n - 1, 1).stripWhiteSpace().isEmpty())
+    if (text(n - 1, 1).trimmed().isEmpty())
         n -= 1;
 
     if (n != 0) {
@@ -2212,12 +2221,12 @@ void FormalParamsTable::generate_cpp(QString & s, BrowserNodeList & nodes,
 
         for (int index = 0; index != n; index += 1) {
             s += sep;
-            s += text(index, 0).stripWhiteSpace();
+            s += text(index, 0).trimmed();
             s += " ";
-            s += text(index, 1).stripWhiteSpace();
+            s += text(index, 1).trimmed();
             sep = ", ";
 
-            QString v = type(text(index, 2).stripWhiteSpace(), node_names, nodes);
+            QString v = type(text(index, 2).trimmed(), node_names, nodes);
 
             if (! v.isEmpty()) {
                 s += " = ";
@@ -2228,16 +2237,16 @@ void FormalParamsTable::generate_cpp(QString & s, BrowserNodeList & nodes,
 
         s += "> ";
     }
-    else if (cl_name.find('<') != -1)
+    else if (cl_name.indexOf('<') != -1)
         s += "template<> ";
 }
 
 void FormalParamsTable::generate_java(QString & s, BrowserNodeList & nodes,
                                       QStringList & node_names)
 {
-    int n = numRows();
+    int n = rowCount();
 
-    if (text(n - 1, 1).stripWhiteSpace().isEmpty())
+    if (text(n - 1, 1).trimmed().isEmpty())
         n -= 1;
 
     if (n != 0) {
@@ -2245,9 +2254,9 @@ void FormalParamsTable::generate_java(QString & s, BrowserNodeList & nodes,
 
         for (int index = 0; index != n; index += 1) {
             s += sep;
-            s += text(index, 1).stripWhiteSpace();
+            s += text(index, 1).trimmed();
 
-            QString ex = type(text(index, 3).stripWhiteSpace(), node_names, nodes);
+            QString ex = type(text(index, 3).trimmed(), node_names, nodes);
 
             if (! ex.isEmpty()) {
                 s += " extends ";
@@ -2263,38 +2272,48 @@ void FormalParamsTable::generate_java(QString & s, BrowserNodeList & nodes,
 
 void FormalParamsTable::update(ClassData * cl, BrowserNodeList & nodes)
 {
+    if(!item(0,1))
+        printf("item lost: %d\r\n",__LINE__);
     forceUpdateCells();
+    if(!item(0,1))
+        printf("item lost: %d\r\n",__LINE__);
 
-    int n = numRows();
+    int n = rowCount();
     int index;
-
-    if (text(n - 1, 1).stripWhiteSpace().isEmpty())
+    if (text(n - 1, 1).trimmed().isEmpty())
         n -= 1;
-
+    if(!item(0,1))
+        printf("item lost: %d\r\n",__LINE__);
     cl->set_n_formalparams(n);
-
+    if(!item(0,1))
+        printf("item lost: %d\r\n",__LINE__);
     for (index = 0; index != n; index += 1) {
-        cl->set_formalparam_type(index, text(index, 0).stripWhiteSpace());
-        cl->set_formalparam_name(index, text(index, 1).stripWhiteSpace());
+        if(!item(0,1))
+            printf("item lost: %d\r\n",__LINE__);
+        cl->set_formalparam_type(index, text(index, 0).trimmed().toLatin1().constData());
+        if(!item(0,1))
+            printf("item lost: %d\r\n",__LINE__);
+        cl->set_formalparam_name(index, text(index, 1).trimmed().toLatin1().constData());
 
         int rank;
 
-        rank = types.findIndex(text(index, 2).stripWhiteSpace());
+        rank = types.indexOf(text(index, 2).trimmed());
 
         if (rank != -1)
             cl->set_formalparam_default_value(index, ((BrowserClass *) nodes.at(rank)),
                                               NULL); // [lgfreitas] expected const char *. QString() does not correspond to old null
         else
-            cl->set_formalparam_default_value(index, 0, text(index, 2).stripWhiteSpace());
+            cl->set_formalparam_default_value(index, 0, text(index, 2).trimmed().toLatin1().constData());
 
-        rank = types.findIndex(text(index, 3).stripWhiteSpace());
+        rank = types.indexOf(text(index, 3).trimmed().toLatin1().constData());
 
         if (rank != -1)
             cl->set_formalparam_extends(index, ((BrowserClass *) nodes.at(rank)),
                                         NULL);
         else
-            cl->set_formalparam_extends(index, 0, text(index, 3).stripWhiteSpace());
+            cl->set_formalparam_extends(index, 0, text(index, 3).trimmed().toLatin1().constData());
     }
+
 }
 
 //
@@ -2302,38 +2321,62 @@ void FormalParamsTable::update(ClassData * cl, BrowserNodeList & nodes)
 //
 
 ActualParamsTable::ActualParamsTable(ClassData * cl, QWidget * parent,
-                                     const QStringList & node_names, bool visit)
+                                     QStringList & node_names, bool isWritable)
     : MyTable(cl->get_n_actualparams(), 2, parent), types(node_names)
 {
-    setSorting(true);
+    //setSortingEnabled(true);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(FALSE);
-    horizontalHeader()->setLabel(0, TR("inherited class formal"));
-    horizontalHeader()->setLabel(1, TR("actual"));
+    verticalHeader()->setSectionsMovable(false);
+    setHorizontalHeaderLabel(0, QObject::tr("inherited class formal"));
+    setHorizontalHeaderLabel(1, QObject::tr("actual"));
 
     int index;
     int sup = cl->get_n_actualparams();
+    m_comboBoxDelegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(1, m_comboBoxDelegate);
 
     for (index = 0; index < sup; index += 1) {
-        setItem(index, 0, new TableItem(this, Q3TableItem::Never, cl->get_actualparam_name(index)));
+        setItem(index, 0, new TableItem(TableItem::Never, cl->get_actualparam_name(index), TableItem::TableItemType));
 
-        if (visit)
-            setItem(index, 1, new TableItem(this, Q3TableItem::Never, cl->get_actualparam_value(index)));
+        if (!isWritable)
+            setItem(index, 1, new TableItem(TableItem::Never, cl->get_actualparam_value(index), TableItem::TableItemType));
         else
-            setItem(index, 1, new ComboItem(this, cl->get_actualparam_value(index), types));
+            setItem(index, 1, new ComboItem(cl->get_actualparam_value(index), types));
     }
-
     adjustColumn(0);
     setColumnStretchable(0, FALSE);
     setColumnStretchable(1, TRUE);
 }
 
+void ActualParamsTable::Reinitiliaze(ClassData * cl, QStringList & node_names, bool isWritable)
+{
+    blockSignals(true);
+    int oldRowCount = rowCount()-1;
+    for (int index =  oldRowCount; index > -1; index -= 1) {
+        removeRow(index);
+    }
+
+    int sup = cl->get_n_actualparams();
+    types = node_names;
+    setRowCount(sup);
+    for (int index = 0; index < sup; index += 1) {
+        setItem(index, 0, new TableItem(TableItem::Never, cl->get_actualparam_name(index), TableItem::TableItemType));
+
+        if (!isWritable)
+            setItem(index, 1, new TableItem(TableItem::Never, cl->get_actualparam_value(index), TableItem::TableItemType));
+        else
+            setItem(index, 1, new ComboItem(cl->get_actualparam_value(index), types));
+    }
+    types = node_names;
+    blockSignals(false);
+}
+
 #if 0
 void ActualParamsTable::activateNextCell()
 {
     int row = currentRow();
 
-    if (row != numRows())
+    if (row != rowCount())
         // goto next line
         setCurrentCell(row + 1, 1);
 }
@@ -2343,12 +2386,12 @@ void ActualParamsTable::update(ClassData * cl, BrowserNodeList & nodes)
 {
     forceUpdateCells();
 
-    int n = numRows();
+    int n = rowCount();
     int index;
 
     for (index = 0; index != n; index += 1)
         cl->set_actualparam_value(index,
-                                  the_type(text(index, 1).stripWhiteSpace(),
+                                  the_type(text(index, 1).trimmed(),
                                            types, nodes));
 }
 
@@ -2357,25 +2400,23 @@ void ActualParamsTable::generate(QString & s, ClassData * cl,
                                  BrowserNodeList & nodes,
                                  QStringList & node_names)
 {
-    ActualParamData * actual;
-    unsigned index;
+    unsigned index = 0;
+    QListIterator<ActualParamData *> it(cl->actuals);
 
-    for (actual = cl->actuals.first(), index = 0;
-         actual != 0;
-         actual = cl->actuals.next(), index += 1) {
-        if (actual->get_class() == parent)
-            // find;
+    for (index = 0; it.hasNext(); index += 1) {
+        if (it.next()->get_class() == parent) {
+            it.previous();
             break;
+        }
     }
 
     int n = ((ClassData *) parent->get_data())->get_n_formalparams();
     int nth = 0;
     const char * sep = "<";
     bool need_space = FALSE;
-
     // progress on still present formals
-    while (actual && (nth < n) && (actual->get_class() == parent)) {
-        AType t = the_type(text(index, 1).stripWhiteSpace(), node_names, nodes);
+    while (it.hasNext() && (nth < n) && (it.next()->get_class() == parent)) {
+        AType t = the_type(text(index, 1).trimmed(), node_names, nodes);
 
         if (t.type != 0) {
             s += sep;
@@ -2400,7 +2441,7 @@ void ActualParamsTable::generate(QString & s, ClassData * cl,
         else if (!t.explicit_type.isEmpty()) {
             s += sep;
             s += (cpp) ? GenerationSettings::cpp_type(t.explicit_type)
-                 : GenerationSettings::java_type(t.explicit_type);
+                       : GenerationSettings::java_type(t.explicit_type);
             need_space = FALSE;
         }
         else {
@@ -2411,7 +2452,6 @@ void ActualParamsTable::generate(QString & s, ClassData * cl,
         }
 
         sep = ", ";
-        actual = cl->actuals.next();
         nth += 1;
         index += 1;
     }
@@ -2432,58 +2472,58 @@ ApplicableOnTable::ApplicableOnTable(QWidget * parent, QString s, bool visit)
     : MyTable(ProfiledStereotypes::availableTargets().count(), 2, parent),
       ro(visit)
 {
-    setSorting(true);
+    //setSortingEnabled(true);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(FALSE);
-    horizontalHeader()->setLabel(0, TR("element kind"));
-    horizontalHeader()->setLabel(1, TR("applicable"));
+    verticalHeader()->setSectionsMovable(false);
+    setHorizontalHeaderLabel(0, QObject::tr("element kind"));
+    setHorizontalHeaderLabel(1, QObject::tr("applicable"));
 
     const QStringList & available = ProfiledStereotypes::availableTargets();
-    QStringList l = QStringList::split(" ", s);
+    QStringList l = s.split(" ");
     QStringList::ConstIterator it;
     int row = 0;
-    QString yes = TR("yes");
+    QString yes = QObject::tr("yes");
     QString empty;
 
     for (it = available.begin(); it != available.end(); ++it) {
         setItem(row, 0,
-                new TableItem(this, Q3TableItem::Never,
-                              TR(ProfiledStereotypes::pretty(*it))));
+                new TableItem(TableItem::Never,
+                              tr(ProfiledStereotypes::pretty(*it).toLatin1().constData()), TableItem::TableItemType));
         setItem(row, 1,
-                new TableItem(this, Q3TableItem::Never,
-                              (l.findIndex(*it) == -1) ? empty : yes));
+                new TableItem(TableItem::Never,
+                              (l.indexOf(*it) == -1) ? empty : yes, TableItem::TableItemType));
         row += 1;
     }
 
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
-
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
     adjustColumn(0);
     adjustColumn(1);
 }
 
-void ApplicableOnTable::button_pressed(int row, int col, int, const QPoint &)
+void ApplicableOnTable::button_pressed(const QModelIndex &index)
 {
-    if (!ro && (col == 1))
-        setText(row, col, (text(row, col).isEmpty()) ? TR("yes") : QString());
+    if (!ro && (index.column() == 1))
+        setText(index.row(), index.column(), (text(index.row(), index.column()).isEmpty()) ? QObject::tr("yes") : QString());
 }
 
 QString ApplicableOnTable::targets()
 {
+    QString s;
+
     forceUpdateCells();
 
+
     const QStringList & available = ProfiledStereotypes::availableTargets();
     QStringList::ConstIterator it;
-    QString s;
+
     int row;
 
     for (row = 0, it = available.begin(); it != available.end(); row += 1, ++it)
         if (!text(row, 1).isEmpty())
             s += (*it) + " ";
-
     if (! s.isEmpty())
         s.truncate(s.length() - 1);
-
     return s;
 }
 
@@ -2494,8 +2534,7 @@ uint ClassDialog::TypeID()
 
 void ClassDialog::InitGui()
 {
-
-    setCaption(TR("Class dialog"));
+    setWindowTitle(tr("Class dialog"));
 
     currentNode = (BrowserClass *) cl->get_browser_node();
     grandParent = (BrowserNode *) currentNode->parent()->parent();
@@ -2506,69 +2545,71 @@ void ClassDialog::InitGui()
         nodes.full_names(node_names);
     }
 
-    Q3HBox * htab;
-    Q3VBox * vtab;
-    Q3Grid * grid;
+    HHBox * htab;
+    VVBox * vtab;
+    GridBox * grid;
     QSplitter * split;
-    Q3GroupBox * bg;
-//    QLabel * lbl1;
-//    QLabel * lbl2;
-//    QLabel * lbl3;
-//    QLabel * lbl4;
+    QGroupBox * bg;
+    //    QLabel * lbl1;
+    //    QLabel * lbl2;
+    //    QLabel * lbl3;
+    //    QLabel * lbl4;
     currentNode = (BrowserClass *) cl->get_browser_node();
     grandParent = (BrowserNode *) currentNode->parent()->parent();
 
     //!!!!! general tab elements
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     RegisterTab("Uml", umltab);
     grid->setSpacing(5);
     grid->setMargin(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(cl->name(), grid); //toadd
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(cl->name(), grid)); //toadd
 
-    new QLabel(TR("stereotype : "), grid);
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
 
-    edstereotype = new Q3ComboBox(isWritable, grid); // toadd
+    grid->addWidget(edstereotype = new QComboBox( grid)); // toadd
+    edstereotype->setEditable(isWritable);
 
     // setting up checkboxes for active and abstract
-    new QLabel(grid);
-    htabUml = new Q3HBox(grid);
-    opt_bg = new Q3GroupBox(2, Qt::Horizontal, QString(), htabUml);
-    abstract_cb = new QCheckBox("abstract", opt_bg);
-    active_cb = new QCheckBox("active", opt_bg);
-
+    grid->addWidget(new QLabel("",grid));
+    grid->addWidget(htabUml = new HHBox(grid));
+
+    QHBoxLayout *hLayout = new QHBoxLayout();
+    htabUml->addWidget(opt_bg = new QGroupBox(QString(), htabUml));
+    hLayout->addWidget(abstract_cb = new QCheckBox("abstract", opt_bg));
+    hLayout->addWidget(active_cb = new QCheckBox("active", opt_bg));
+    opt_bg->setLayout(hLayout);
     // setting up radiobutton group for accessibility
-    //todo make external
     // ASSUMING INSTANTIATE ON NULL
+    htabUml->addWidget(uml_visibility.init(htabUml, cl->get_uml_visibility(), TRUE)); //toAdd
 
-    uml_visibility.init(htabUml, cl->get_uml_visibility(), TRUE); //toAdd
-
-    basetypelbl = new QLabel(TR("base type : "), grid);
-    edbasetype = new Q3ComboBox(isWritable, grid);
+    grid->addWidget(basetypelbl = new QLabel(tr("base type : "), grid));
+    grid->addWidget(edbasetype = new QComboBox( grid));
+    edbasetype->setEditable( isWritable);
 
-    new QLabel(TR("artifact : "), grid);
+    grid->addWidget(new QLabel(tr("artifact : "), grid));
 
-    artifact = new Q3ComboBox(FALSE, grid);
+    grid->addWidget(artifact = new QComboBox(grid));
 
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    new QLabel(tr("description :"), vtab);
 
-    pbEditorForDescription = new SmallPushButton(TR("Editor"), vtab);
-    pbDefaultForDescription = new SmallPushButton(TR("Default"), vtab);
+    vtab->addWidget(pbEditorForDescription = new SmallPushButton(tr("Editor"), vtab));
+    vtab->addWidget(pbDefaultForDescription = new SmallPushButton(tr("Default"), vtab));
 
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(!isWritable);
     comment->setFont(font);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("constraint :"), vtab);
-    pbEditorForConstrant = new SmallPushButton(TR("Editor"), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("constraint :"), vtab));
+    vtab->addWidget(pbEditorForConstrant = new SmallPushButton(tr("Editor"), vtab));
 
-    constraint = new MultiLineEdit(grid);
+    grid->addWidget(constraint = new MultiLineEdit(grid));
     constraint->setReadOnly(!isWritable);
     constraint->setFont(font);
 
@@ -2578,30 +2619,31 @@ void ClassDialog::InitGui()
     // parameterized tab
 
     RegisterTab("Parametrized", parametrized_vtab);
-    parametrized_vtab = new Q3VBox(this);
+    parametrized_vtab = new VVBox(this);
 
     parametrized_vtab->setMargin(5);
 
 
-    (new QLabel(TR("\nEnter formals in case the class is parameterized\n"),
-                parametrized_vtab))
-    ->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    QLabel *label;
+    parametrized_vtab->addWidget(label = new QLabel(tr("\nEnter formals in case the class is parameterized\n"),
+                                                    parametrized_vtab));
+    label->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
 
 
-    formals_table = new FormalParamsTable(cl, parametrized_vtab, node_names, isWritable); //todo VISIT NOT FIXED
-    addTab(parametrized_vtab, TR("Parameterized"));
+    parametrized_vtab->addWidget(formals_table = new FormalParamsTable(cl, parametrized_vtab, node_names, isWritable)); //todo VISIT NOT FIXED
+    addTab(parametrized_vtab, QObject::tr("Parameterized"));
 
 
     //!!! parameters for a class
 
-    instantiate_vtab = new Q3VBox(this);
+    instantiate_vtab = new VVBox(this);
     RegisterTab("Instantiate", instantiate_vtab);
     instantiate_vtab->setMargin(5);
-    instantiateNotice = new QLabel(TR("\nSpecify actuals else formals default value will be used\n"),
-                                   instantiate_vtab);
+    instantiate_vtab->addWidget(instantiateNotice = new QLabel(tr("\nSpecify actuals else formals default value will be used\n"),
+                                                               instantiate_vtab));
     instantiateNotice->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    actuals_table = new ActualParamsTable(cl, instantiate_vtab, node_names, isWritable); //todo VISIT NOT FIXED
-    addTab(instantiate_vtab, TR("Instantiate"));
+    instantiate_vtab->addWidget(actuals_table = new ActualParamsTable(cl, instantiate_vtab, node_names, isWritable)); //todo VISIT NOT FIXED
+    addTab(instantiate_vtab, QObject::tr("Instantiate"));
 
     //!!! C++
     split = new QSplitter(Qt::Vertical, this);
@@ -2609,38 +2651,41 @@ void ClassDialog::InitGui()
     RegisterTab("Cpp", cppTab);
     split->setOpaqueResize(TRUE);
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1cpp = new QLabel(htab);
-    bg = new Q3GroupBox(1, Qt::Horizontal, QString(), htab);
+    htab->addWidget(lbl1cpp = new QLabel(htab));
+    hLayout = new QHBoxLayout();
+    htab->addWidget(bg = new QGroupBox(QString(), htab));
     cpp_external_cb = new QCheckBox("external", bg);
+    hLayout->addWidget(cpp_external_cb);
+    bg->setLayout(hLayout);
 
 
-    cpp_visibility.init(htab, cl->get_cpp_visibility(),
-                        FALSE, 0, TR("follow uml"));
+    htab->addWidget(cpp_visibility.init(htab, cl->get_cpp_visibility(),
+                                        FALSE, 0, QObject::tr("follow uml")));
 
 
 
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2cpp = new QLabel(TR("Declaration : "), htab);
-    edcppdecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl2cpp = new QLabel(tr("Declaration : "), htab));
+    htab->addWidget(edcppdecl = new MultiLineEdit(htab));
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl3cpp = new QLabel(TR("Result after\nsubstitution : "), htab);
-    showcppdecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl3cpp = new QLabel(tr("Result after\nsubstitution : "), htab));
+    htab->addWidget(showcppdecl = new MultiLineEdit(htab));
 
-    htabcpp = new Q3HBox(vtab);
-    lbl4cpp = new QLabel(htabcpp);
+    vtab->addWidget(htabcpp = new HHBox(vtab));
+    htabcpp->addWidget(lbl4cpp = new QLabel("",htabcpp));
 
-    pbCppDefaultDeclaration = new QPushButton(TR("Default declaration"), htabcpp);
-    pbNotGeneratedInCPP = new QPushButton(TR("Not generated in C++"), htabcpp);
+    htabcpp->addWidget(pbCppDefaultDeclaration = new QPushButton(tr("Default declaration"), htabcpp));
+    htabcpp->addWidget(pbNotGeneratedInCPP = new QPushButton(tr("Not generated in C++"), htabcpp));
 
     addTab(cppTab, "Cpp");
 
@@ -2651,77 +2696,80 @@ void ClassDialog::InitGui()
     RegisterTab("Java", javatab);
     split->setOpaqueResize(TRUE);
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1java = new QLabel(htab);
-    bg = new Q3GroupBox(3, Qt::Horizontal, QString(), htab);
-    java_final_cb = new QCheckBox("final", bg);
-    java_external_cb = new QCheckBox("external", bg);
-
-
-    htab = new Q3HBox(vtab);
+    htab->addWidget(lbl1java = new QLabel(htab));
+    hLayout = new QHBoxLayout();
+    htab->addWidget(bg = new QGroupBox( QString(), htab));
+    hLayout->addWidget(java_final_cb = new QCheckBox("final", bg));
+    hLayout->addWidget(java_external_cb = new QCheckBox("external", bg));
+    bg->setLayout(hLayout);
+
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2java = new QLabel(TR("Definition : "), htab);
-    edjavadecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl2java = new QLabel(tr("Definition : "), htab));
+    htab->addWidget(edjavadecl = new MultiLineEdit(htab));
 
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl3java = new QLabel(TR("Result after\nsubstitution : "), htab);
-    showjavadecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl3java = new QLabel(tr("Result after\nsubstitution : "), htab));
+    htab->addWidget(showjavadecl = new MultiLineEdit(htab));
 
-    htab = new Q3HBox(vtab);
-    lbl4java = new QLabel(htab);
-    pbJavaDefaultDefinition = new QPushButton(TR("Default definition"), htab);
-    pbNotGeneratedInJava = new QPushButton(TR("Not generated in Java"), htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->addWidget(lbl4java = new QLabel("",htab));
+    htab->addWidget(pbJavaDefaultDefinition = new QPushButton(tr("Default definition"), htab));
+    htab->addWidget(pbNotGeneratedInJava = new QPushButton(tr("Not generated in Java"), htab));
 
-    pbJavaAnnotation = new QPushButton("", htab);
+    htab->addWidget(pbJavaAnnotation = new QPushButton("", htab));
 
     connect(pbJavaAnnotation, SIGNAL(clicked()),
             this, SLOT(java_edit_annotation()));
 
     addTab(split, "Java");
 
-
     //!!! PHP
     split = new QSplitter(Qt::Vertical, this);
     phptab = split;
     RegisterTab("Php", phptab);
     split->setOpaqueResize(TRUE);
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1php = new QLabel(htab);
-    bg = new Q3GroupBox(3, Qt::Horizontal, QString(), htab);
-    php_final_cb = new QCheckBox("final", bg);
-    php_external_cb = new QCheckBox("external", bg);
-
-    htab = new Q3HBox(vtab);
+    htab->addWidget(lbl1php = new QLabel("",htab));
+    hLayout = new QHBoxLayout();
+    htab->addWidget(bg = new QGroupBox(QString(), htab));
+    hLayout->addWidget( php_final_cb = new QCheckBox("final", bg));
+    hLayout->addWidget( php_external_cb = new QCheckBox("external", bg));
+    bg->setLayout(hLayout);
+
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2php = new QLabel(TR("Definition : "), htab);
-    edphpdecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl2php = new QLabel(tr("Definition : "), htab));
+    htab->addWidget(edphpdecl = new MultiLineEdit(htab));
     edphpdecl->setFont(font);
 
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    pbPhpDefaultDefinition =  new QPushButton(TR("Default definition"), htab);
-    pbNotGeneratedInPhp =  new QPushButton(TR("Not generated in Php"), htab);
-    lbl3php = new QLabel(TR("Result after\nsubstitution : "), htab);
-    showphpdecl = new MultiLineEdit(htab);
+
+    htab->addWidget(lbl3php = new QLabel(tr("Result after\nsubstitution : "), htab));
+    htab->addWidget(showphpdecl = new MultiLineEdit(htab));
     showphpdecl->setReadOnly(TRUE);
     showphpdecl->setFont(font);
 
-    htab = new Q3HBox(vtab);
-    lbl4php = new QLabel(htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->addWidget(lbl4php = new QLabel("",htab));
+    htab->addWidget(pbPhpDefaultDefinition =  new QPushButton(tr("Default definition"), htab));
+    htab->addWidget(pbNotGeneratedInPhp =  new QPushButton(tr("Not generated in Php"), htab));
 
 
     addTab(phptab, "Php");
@@ -2735,40 +2783,42 @@ void ClassDialog::InitGui()
     RegisterTab("Python", pythontab);
     split->setOpaqueResize(TRUE);
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1python = new QLabel(htab);
-    bg = new Q3GroupBox(3, Qt::Horizontal, QString(), htab);
-    python_2_2_cb = new QCheckBox("Python 2.2", bg);
-    python_external_cb = new QCheckBox("external", bg);
+    htab->addWidget(lbl1python = new QLabel(htab));
 
+    htab->addWidget(bg = new QGroupBox( QString(), htab));
+    hLayout = new QHBoxLayout(bg);
+    hLayout->addWidget( python_2_2_cb = new QCheckBox("Python 2.2", bg));
+    hLayout->addWidget( python_external_cb = new QCheckBox("external", bg));
+    bg->setLayout(hLayout);
 
-    htab = new Q3HBox(vtab);
+
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2python = new QLabel(TR("Definition : "), htab);
-    edpythondecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl2python = new QLabel(tr("Definition : "), htab));
+    htab->addWidget(edpythondecl = new MultiLineEdit(htab));
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl3python = new QLabel(TR("Result after\nsubstitution : "), htab);
-    showpythondecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl3python = new QLabel(tr("Result after\nsubstitution : "), htab));
+    htab->addWidget(showpythondecl = new MultiLineEdit(htab));
     showpythondecl->setReadOnly(TRUE);
     showpythondecl->setFont(font);
 
-    htab = new Q3HBox(vtab);
-    lbl4python = new QLabel(htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->addWidget(lbl4python = new QLabel("",htab));
 
-    pbPythonDefaultDefinition = new QPushButton(TR("Default definition"), htab);
-    pbNotGeneratedInPython = new QPushButton(TR("Not generated in Python"), htab);
+    htab->addWidget(pbPythonDefaultDefinition = new QPushButton(tr("Default definition"), htab));
+    htab->addWidget(pbNotGeneratedInPython = new QPushButton(tr("Not generated in Python"), htab));
 
     addTab(pythontab, "Python");
 
 
-
     //IDL
 
 
@@ -2777,103 +2827,106 @@ void ClassDialog::InitGui()
     RegisterTab("Idl", idltab);
     split->setOpaqueResize(TRUE);
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    switch_bg = new Q3GroupBox(2, Qt::Horizontal, QString(), htab);
-    new QLabel(TR("switch type : "), switch_bg);
-    edswitch_type = new Q3ComboBox(isWritable, switch_bg);
+    htab->addWidget(switch_bg = new QGroupBox(QString(), htab));
+    hLayout = new QHBoxLayout(switch_bg);
+    hLayout->addWidget(new QLabel(tr("switch type : "), switch_bg));
+    hLayout->addWidget(edswitch_type = new QComboBox(switch_bg));
+    switch_bg->setLayout(hLayout);
+    edswitch_type->setEditable(isWritable);
     // !!!
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
 
     edswitch_type->setSizePolicy(sp);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1idl = new QLabel(htab);
-    bg = new Q3GroupBox(3, Qt::Horizontal, QString(), htab);
-    idl_external_cb = new QCheckBox("external", bg);
-    idl_local_cb = new QCheckBox("local", bg);
-    idl_custom_cb = new QCheckBox("custom", bg);
-
-    htab = new Q3HBox(vtab);
+    htab->addWidget(lbl1idl = new QLabel(htab));
+    htab->addWidget(bg = new QGroupBox( QString(), htab));
+    hLayout = new QHBoxLayout(bg);
+    hLayout->addWidget( idl_external_cb = new QCheckBox("external", bg));
+    hLayout->addWidget( idl_local_cb = new QCheckBox("local", bg));
+    hLayout->addWidget( idl_custom_cb = new QCheckBox("custom", bg));
+    bg->setLayout(hLayout);
+
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2idl = new QLabel(TR("Declaration : "), htab);
-    edidldecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl2idl = new QLabel(tr("Declaration : "), htab));
+    htab->addWidget(edidldecl = new MultiLineEdit(htab));
     edidldecl->setFont(font);
 
 
 
-    vtab = new Q3VBox(split);
+    vtab = new VVBox(split);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl3idl = new QLabel(TR("Result after\nsubstitution : "), htab);
-    showidldecl = new MultiLineEdit(htab);
+    htab->addWidget(lbl3idl = new QLabel(tr("Result after\nsubstitution : "), htab));
+    htab->addWidget(showidldecl = new MultiLineEdit(htab));
     showidldecl->setReadOnly(TRUE);
     showidldecl->setFont(font);
 
 
-    htabidl = new Q3HBox(vtab);
-    lbl4idl = new QLabel(htabidl);
-    pbIdlDefaultDeclaration = new QPushButton(TR("Default declaration"), htabidl);
-    pbINotGeneratedInIdl = new QPushButton(TR("Not generated in IDL"), htabidl);
+    vtab->addWidget(htabidl = new HHBox(vtab));
+    htabidl->addWidget(lbl4idl = new QLabel("",htabidl));
+    htabidl->addWidget(pbIdlDefaultDeclaration = new QPushButton(tr("Default declaration"), htabidl));
+    htabidl->addWidget(pbINotGeneratedInIdl = new QPushButton(tr("Not generated in IDL"), htabidl));
 
     addTab(idltab, "Idl");
-    // Profiled stereotype
-
 
-    stereotypeGrid = new Q3Grid(2, this);
+    // Profiled stereotype
+    stereotypeGrid = new GridBox(2, this);
     stereotypetab = stereotypeGrid;
     RegisterTab("Stereotype", stereotypetab);
     stereotypeGrid->setSpacing(5);
     stereotypeGrid->setMargin(5);
 
-    new QLabel(TR("Initialization \nplug-out :"), stereotypeGrid);
-    htab = new Q3HBox(stereotypeGrid);
-    stereo_init_cb = new Q3ComboBox(FALSE, htab);
+    stereotypeGrid->addWidget(new QLabel(tr("Initialization \nplug-out :"), stereotypeGrid));
+    stereotypeGrid->addWidget(htab = new HHBox(stereotypeGrid));
+    htab->addWidget(stereo_init_cb = new QComboBox(htab));
 
-    new QLabel(TR("  parameter(s) : "), htab);
-    edinitparam = new LineEdit(currentNode->get_value("stereotypeSetParameters"), htab);
+    htab->addWidget(new QLabel(tr("  parameter(s) : "), htab));
+    htab->addWidget(edinitparam = new LineEdit(currentNode->get_value("stereotypeSetParameters"), htab));
 
-    new QLabel(TR("Check \nplug-out :"), stereotypeGrid);
-    htab = new Q3HBox(stereotypeGrid);
-    stereo_check_cb = new Q3ComboBox(FALSE, htab);
+    stereotypeGrid->addWidget(new QLabel(tr("Check \nplug-out :"), stereotypeGrid));
+    stereotypeGrid->addWidget(htab = new HHBox(stereotypeGrid));
+    htab->addWidget(stereo_check_cb = new QComboBox( htab));
 
-    new QLabel(TR("  parameter(s) : "), htab);
-    edcheckparam = new LineEdit(currentNode->get_value("stereotypeCheckParameters"), htab);
+    htab->addWidget(new QLabel(tr("  parameter(s) : "), htab));
+    htab->addWidget(edcheckparam = new LineEdit(currentNode->get_value("stereotypeCheckParameters"), htab));
 
-    new QLabel(TR("Icon path :"), stereotypeGrid);
-    htab = new Q3HBox(stereotypeGrid);
-    ediconpath = new LineEdit("", htab);
+    stereotypeGrid->addWidget(new QLabel(tr("Icon path :"), stereotypeGrid));
+    stereotypeGrid->addWidget(htab = new HHBox(stereotypeGrid));
+    htab->addWidget(ediconpath = new LineEdit("", htab));
 
-    lblProfiledEmpty = new QLabel("", htab);
-    pbProfiledSteretypeBrowse = new SmallPushButton(TR("Browse"), htab);
-    lblProfiledEmpty2 = new QLabel("", htab);
-    vtabProfiled = new Q3VBox(htab);
+    htab->addWidget(lblProfiledEmpty = new QLabel("", htab));
+    htab->addWidget(pbProfiledSteretypeBrowse = new SmallPushButton(tr("Browse"), htab));
+    htab->addWidget(lblProfiledEmpty2 = new QLabel("", htab));
+    htab->addWidget(vtabProfiled = new VVBox(htab));
     QString ip = currentNode->get_value("stereotypeIconPath");
-    iconpathrootbutton = new SmallPushButton((ip.isEmpty() || QDir::isRelativePath(ip))
-            ? Absolute : RelativeRoot, vtab);
-    iconpathprjbutton = new SmallPushButton((ip.isEmpty() || QDir::isRelativePath(ip))
-                                            ? Absolute : RelativePrj, vtab);
+    vtabProfiled->addWidget(iconpathrootbutton = new SmallPushButton((ip.isEmpty() || QDir::isRelativePath(ip))
+                                                             ? Absolute : RelativeRoot, vtabProfiled));
+    vtabProfiled->addWidget(iconpathprjbutton = new SmallPushButton((ip.isEmpty() || QDir::isRelativePath(ip))
+                                                            ? Absolute : RelativePrj, vtabProfiled));
 
-    lblProfiledEmpty3 = new QLabel("", htab);
-    new QLabel(TR("Apply on : "), stereotypeGrid);
-    applicableon_table =
-        new ApplicableOnTable(stereotypeGrid, "", !isWritable); // todo!! important !!! turned off parameter
+    htab->addWidget(lblProfiledEmpty3 = new QLabel("", htab));
+    stereotypeGrid->addWidget(new QLabel(tr("Apply on : "), stereotypeGrid));
+    stereotypeGrid->addWidget(applicableon_table = new ApplicableOnTable(stereotypeGrid, "", !isWritable)); // todo!! important !!! turned off parameter
 
-    addTab(stereotypetab, TR("Stereotype"));
+    addTab(stereotypetab, QObject::tr("Stereotype"));
 
     // USER : list key - value
 
-    keyValueTab = new Q3VBox(this);
+    keyValueTab = new VVBox(this);
     RegisterTab("Properties", keyValueTab);
-    kvtable = new KeyValuesTable(currentNode, keyValueTab, !isWritable);
+    keyValueTab->addWidget(kvtable = new KeyValuesTable(currentNode, keyValueTab, !isWritable));
     kvtable->remove("stereotypeSet");
 
-    addTab(keyValueTab, TR("Properties"));
+    addTab(keyValueTab, QObject::tr("Properties"));
 
 }
 
@@ -2885,8 +2938,8 @@ void ClassDialog::FillGuiElements(BrowserNode * bn)
 
 void ClassDialog::FillGuiElements(ClassData * _cl)
 {
-    disconnect(this, SIGNAL(currentChanged(QWidget *)),
-               this, SLOT(update_all_tabs(QWidget *)));
+    disconnect(m_tabWidget, SIGNAL(currentChanged(int)),
+               this, SLOT(update_all_tabs(int)));
     cl = _cl;
     SetCurrentNode(cl->browser_node);
 
@@ -2906,11 +2959,13 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
     grandParent = (BrowserNode *) currentNode->parent()->parent();
     edname->setText(cl->get_browser_node()->get_name());
     edname->setReadOnly(!isWritable);
-    edinitparam->setText(currentNode->get_value("stereotypeSetParameters"));
-    edcheckparam->setText(currentNode->get_value("stereotypeCheckParameters"));
+    if(!currentNode->get_value("stereotypeSetParameters").isEmpty())
+        edinitparam->setText(currentNode->get_value("stereotypeSetParameters"));
+    if(!currentNode->get_value("stereotypeCheckParameters").isEmpty())
+        edcheckparam->setText(currentNode->get_value("stereotypeCheckParameters"));
     // filling stereotypes edit element
     edstereotype->clear();
-    edstereotype->insertItem(toUnicode(cl->get_stereotype()));
+    edstereotype->addItem(toUnicode(cl->get_stereotype()));
 
     if (isWritable) {
 
@@ -2918,17 +2973,17 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
         bool grannyIsProfiled = !strcmp(grandParent->get_data()->get_stereotype(), "profile");
 
         if (grannyIsUmlPackage && grannyIsProfiled)
-            edstereotype->insertStringList(BrowserClass::default_stereotypes());
+            edstereotype->addItems(BrowserClass::default_stereotypes());
         else {
             QStringList stereotypesList = BrowserClass::default_stereotypes();
 
-            stereotypesList.remove("stereotype");
-            edstereotype->insertStringList(stereotypesList);
+            stereotypesList.removeOne("stereotype");
+            edstereotype->addItems(stereotypesList);
         }
 
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlClass));
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlClass));
         edstereotype->setAutoCompletion(completion());
-        connect(edstereotype, SIGNAL(activated(const QString &)),
+        connect(edstereotype, SIGNAL(activated(QString)),
                 this, SLOT(edStereotypeActivated(const QString &)));
     }
     else {
@@ -2937,9 +2992,9 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
         edstereotype->clear();
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
     abstract_cb->setChecked(false);
@@ -2977,26 +3032,26 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
 
     if (cl->browser_node->children(inh, UmlGeneralisation, UmlRealize), inh.count() != 0) {
         // first inheritance is taken in all cases
-        edbasetype->insertItem(((RelationData *) inh.at(0)->get_data())->get_end_class()->full_name(TRUE));
+        edbasetype->addItem(((RelationData *) inh.at(0)->get_data())->get_end_class()->full_name(TRUE));
         edbasetype->setEnabled(FALSE);
     }
     else {
         QString bt = cl->get_base_type().get_full_type();
 
         if (bt.isEmpty() &&		// no base_type, try with a dependency
-            (cl->browser_node->children(inh, UmlDependency), inh.count() != 0))
+                (cl->browser_node->children(inh, UmlDependency), inh.count() != 0))
             bt = ((RelationData *) inh.at(0)->get_data())->get_end_class()->full_name(TRUE);
 
-        edbasetype->insertItem(bt);
+        edbasetype->addItem(bt);
 
         if (isWritable) {
-            edbasetype->insertStringList(GenerationSettings::basic_types());
-            edbasetype->insertStringList(node_names);
+            edbasetype->addItems(GenerationSettings::basic_types());
+            edbasetype->addItems(node_names);
             edbasetype->setAutoCompletion(completion());
         }
     }
 
-    edbasetype->setCurrentItem(0);
+    edbasetype->setCurrentIndex(0);
     edbasetype->setSizePolicy(sp);
     artifact->clear();
     artifact->show();
@@ -3007,33 +3062,33 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
 
         if (!isWritable) {
             if ((bc != 0) && !bc->deletedp()) {
-                artifact->insertItem(bc->full_name(TRUE));
+                artifact->addItem(bc->full_name(TRUE));
             }
             else
                 artifact->hide();
         }
         else {
-            BrowserArtifact::instances(artifacts, TR("source"));
+            BrowserArtifact::instances(artifacts, QObject::tr("source").toLatin1().constData());
 
             if (!artifacts.isEmpty()) {
                 QStringList artifact_names;
                 artifacts.full_names(artifact_names);
-                artifact->insertItem("");
-                artifact->insertStringList(artifact_names);
+                artifact->addItem("");
+                artifact->addItems(artifact_names);
 
                 if (bc != 0) {
                     if (bc->deletedp()) {
                         QString fn = bc->full_name(TRUE);
 
-                        artifact->insertItem(fn);
+                        artifact->addItem(fn);
                         artifacts.append(bc);
-                        artifact->setCurrentItem(artifacts.count());
+                        artifact->setCurrentIndex(artifacts.count());
                     }
                     else
-                        artifact->setCurrentItem(artifacts.find(bc) + 1);
+                        artifact->setCurrentIndex(artifacts.indexOf(bc) + 1);
                 }
                 else
-                    artifact->setCurrentItem(0);
+                    artifact->setCurrentIndex(0);
             }
             else
                 artifact->hide();
@@ -3064,9 +3119,12 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
     constraint->setText(cl->constraint);
 
     // parameterized tab
+    formals_table->Reinitiliaze(cl, node_names, isWritable);
     formals_table->update(cl, inh);
 
     // instantiate tab
+    //todo
+    actuals_table->Reinitiliaze(cl, node_names, isWritable);
     actuals_table->update(cl, inh);
 
     if (cl->get_n_actualparams() != 0)
@@ -3096,7 +3154,7 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
 
     if (currentNode->nestedp()) {
         bgvCpp = cpp_visibility.init(htabcpp, cl->get_cpp_visibility(),
-                                     FALSE, 0, TR("follow uml"));
+                                     FALSE, 0, QObject::tr("follow uml"));
 
         if (!isWritable)
             bgvCpp->setEnabled(FALSE);
@@ -3214,7 +3272,7 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
 
     same_width(lbl1java, lbl2java, lbl3java, lbl4java);
     javaannotation = (const char *) cl->java_annotation;
-    pbJavaAnnotation->setText(!isWritable ? TR("Show annotation") : TR("Edit annotation"));
+    pbJavaAnnotation->setText(!isWritable ? QObject::tr("Show annotation") : QObject::tr("Edit annotation"));
 
     if (!GenerationSettings::java_get_default_defs())
         HideTab("Java");
@@ -3355,23 +3413,19 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
 
     if (isWritable) {
         edswitch_type->setAutoCompletion(completion());
-        edswitch_type->insertItem(cl->get_switch_type().get_full_type());
-        edswitch_type->insertStringList(GenerationSettings::basic_types());
-
-        Q3PtrListIterator<BrowserNode> it(nodes);
+        edswitch_type->addItem(cl->get_switch_type().get_full_type());
+        edswitch_type->addItems(GenerationSettings::basic_types());
 
-        while (it.current() != 0) {
+        foreach (BrowserNode *item, nodes) {
             QString st =
-                idl_stereotype(((ClassData *)(it.current()->get_data()))->get_stereotype());
+                    idl_stereotype(((ClassData *)(item->get_data()))->get_stereotype());
 
             if (st == "enum")
-                edswitch_type->insertItem(it.current()->full_name(TRUE));
-
-            ++it;
+                edswitch_type->addItem(item->full_name(TRUE));
         }
     }
 
-    edswitch_type->setCurrentItem(0);
+    edswitch_type->setCurrentIndex(0);
 
     if (cl->idl_is_external())
         idl_external_cb->setChecked(TRUE);
@@ -3457,44 +3511,45 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
     bool grannyIsUmlPackage = grandParent->get_type() == UmlPackage;
     bool grannyIsProfiled = !strcmp(grandParent->get_data()->get_stereotype(), "profile");
 
-    if (grannyIsUmlPackage && grannyIsProfiled) {
+    if (grannyIsUmlPackage && grannyIsProfiled)
+    {
 
         QString s;
-        s = currentNode->get_value("stereotypeSet");
-        stereo_init_cb->insertItem(s);
+        s = QString(currentNode->get_value("stereotypeSet"));
+        stereo_init_cb->addItem(s);
         QStringList tools = Tool::all_display();
 
         if (isWritable) {
             if (!s.isEmpty())
-                stereo_init_cb->insertItem("");
+                stereo_init_cb->addItem("");
 
-            stereo_init_cb->insertStringList(tools);
+            stereo_init_cb->addItems(tools);
         }
         else {
             stereo_init_cb->clear();
         }
 
-        stereo_init_cb->setCurrentItem(0);
+        stereo_init_cb->setCurrentIndex(0);
 
         edinitparam->setReadOnly(!isWritable);
 
-        s = currentNode->get_value("stereotypeCheck");
+        s = QString(currentNode->get_value("stereotypeCheck"));
 
         stereo_check_cb->clear();
-        stereo_check_cb->insertItem(s);
+        stereo_check_cb->addItem(s);
 
         if (isWritable) {
             if (! s.isEmpty())
-                stereo_check_cb->insertItem("");
+                stereo_check_cb->addItem("");
 
-            stereo_check_cb->insertStringList(tools);
+            stereo_check_cb->addItems(tools);
         }
 
-        stereo_check_cb->setCurrentItem(0);
+        stereo_check_cb->setCurrentIndex(0);
 
         edcheckparam->setReadOnly(!isWritable);
 
-        QString ip = currentNode->get_value("stereotypeIconPath");
+        QString ip = QString(currentNode->get_value("stereotypeIconPath"));
 
         ediconpath->setText(ip);
 
@@ -3506,9 +3561,9 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
             ediconpath->setReadOnly(TRUE);
             iconpathrootbutton = iconpathprjbutton = 0;
 
-            RelativeRoot = TR("");
-            RelativePrj = TR("");
-            Absolute = TR("");
+            RelativeRoot = QObject::tr("");
+            RelativePrj = QObject::tr("");
+            Absolute = QObject::tr("");
             lblProfiledEmpty->hide();
             lblProfiledEmpty2->hide();
             lblProfiledEmpty3->hide();
@@ -3520,9 +3575,9 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
             connect(iconpathrootbutton, SIGNAL(clicked()), this, SLOT(icon_root_relative()));
             connect(iconpathprjbutton, SIGNAL(clicked()), this, SLOT(icon_prj_relative()));
 
-            RelativeRoot = TR("Set it relative to image root");
-            RelativePrj = TR("Set it relative to project");
-            Absolute = TR("Set it absolute");
+            RelativeRoot = QObject::tr("Set it relative to image root");
+            RelativePrj = QObject::tr("Set it relative to project");
+            Absolute = QObject::tr("Set it absolute");
 
             lblProfiledEmpty->show();
             pbProfiledSteretypeBrowse->show();
@@ -3543,7 +3598,7 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
         if (applicableon_table)
             delete applicableon_table;
 
-        applicableon_table = new ApplicableOnTable(stereotypeGrid, currentNode->get_value("stereotypeApplyOn"), !isWritable);
+        stereotypeGrid->addWidget(applicableon_table = new ApplicableOnTable(stereotypeGrid, currentNode->get_value("stereotypeApplyOn"), !isWritable));
 
         ShowTab("Stereotype");
     }
@@ -3554,7 +3609,7 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
 
     // USER : list key - value
     ShowTab("Properties");
-    kvtable->updateNodeFromThis(currentNode);
+    kvtable->updateThisFromNode(currentNode, !isWritable);
     kvtable->remove("stereotypeCheck");
     kvtable->remove("stereotypeSetParameters");
     kvtable->remove("stereotypeCheckParameters");
@@ -3562,7 +3617,7 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
     kvtable->remove("stereotypeIconPath");
     //
 
-    QString stereotype = fromUnicode(edstereotype->currentText());
+    QString stereotype = edstereotype->currentText();//fromUnicode(edstereotype->currentText());
 
     current_cpp_stereotype = cpp_stereotype(stereotype);
     current_java_stereotype = java_stereotype(stereotype);
@@ -3572,8 +3627,8 @@ void ClassDialog::FillGuiElements(ClassData * _cl)
 
     edStereotypeActivated(stereotype);
 
-    connect(this, SIGNAL(currentChanged(QWidget *)),
-            this, SLOT(update_all_tabs(QWidget *)));
+    connect(m_tabWidget, SIGNAL(currentChanged(int)),
+            this, SLOT(update_all_tabs(int)));
 
     update_all_tabs(0);
 }
@@ -3622,7 +3677,6 @@ void ClassDialog::NullPointers()
     stereotypeGrid = 0;
     htabUml = 0;
 
-
     currentNode = 0;
     grandParent = 0;
 
@@ -3645,23 +3699,23 @@ bool ClassDialog::SaveData()
     BrowserClass * bn = (BrowserClass *) cl->get_browser_node();
     QString oldname = cl->browser_node->get_name();
     bool was_st = !strcmp(cl->get_stereotype(), "stereotype");
-    QString st = fromUnicode(edstereotype->currentText().stripWhiteSpace());
+    QString st = edstereotype->currentText().trimmed();/*fromUnicode(edstereotype->currentText().trimmed())*/;
     QString err;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if (s != oldname) {
         if (((BrowserNode *) bn->parent())->wrong_child_name(s, UmlClass,
-                bn->allow_spaces(),
-                bn->allow_empty())) {
-            msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+                                                             bn->allow_spaces(),
+                                                             bn->allow_empty())) {
+            msg_critical(tr("Error"), s + QObject::tr("\n\nillegal name or already used"));
             return true;
         }
 
         if ((st == "stereotype") &&
-            (!(err = ProfiledStereotypes::canAddStereotype(bn, s)).isEmpty())) {
-            msg_critical(TR("Error"), s + " " + err);
+                (!(err = ProfiledStereotypes::canAddStereotype(bn, s)).isEmpty())) {
+            msg_critical(tr("Error"), s + " " + err);
             return true;
         }
 
@@ -3669,17 +3723,17 @@ bool ClassDialog::SaveData()
     }
     else if (st == "stereotype") {
         if (!was_st &&
-            (!(err = ProfiledStereotypes::canAddStereotype(bn, s)).isEmpty())) {
-            msg_critical(TR("Error"), oldname + " " + err);
+                (!(err = ProfiledStereotypes::canAddStereotype(bn, s)).isEmpty())) {
+            msg_critical(tr("Error"), oldname + " " + err);
             return true;
         }
         else if (stereotypetab != 0) {
-            WrapperStr path = fromUnicode(ediconpath->text().simplifyWhiteSpace());
+            WrapperStr path = ediconpath->text().simplified().toLatin1().constData()/*fromUnicode(ediconpath->text().simplified())*/;
 
             if (!path.isEmpty() && (get_pixmap((const char *) path) == 0)) {
-                msg_critical(TR("Error"),
+                msg_critical(tr("Error"),
                              ((const char *) path) +
-                             TR("\ndoesn't exist or is not a know image format"));
+                             QObject::tr("\ndoesn't exist or is not a know image format"));
                 return true;
             }
         }
@@ -3688,7 +3742,7 @@ bool ClassDialog::SaveData()
     bool newst = cl->set_stereotype(st);
 
     if (st == "typedef")
-        cl->set_base_type(the_type(edbasetype->currentText().stripWhiteSpace(),
+        cl->set_base_type(the_type(edbasetype->currentText().trimmed(),
                                    node_names, nodes));
 
     cl->is_abstract = abstract_cb->isChecked();
@@ -3697,11 +3751,12 @@ bool ClassDialog::SaveData()
     cl->uml_visibility = uml_visibility.value();
 
     if (artifact != 0) {
-        int index = artifact->currentItem();
+        int index = artifact->currentIndex();
 
-        bn->set_associated_artifact((index == 0)
-                                    ? 0 // "" : no artifact
-                                    : ((BrowserArtifact *) artifacts.at(index - 1)));
+        if(index > 0)
+            bn->set_associated_artifact((index == 0)
+                                        ? 0 // "" : no artifact
+                                        : ((BrowserArtifact *) artifacts.at(index - 1)));
     }
 
     formals_table->update(cl, nodes);
@@ -3712,7 +3767,7 @@ bool ClassDialog::SaveData()
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
 
-    cl->constraint = constraint->stripWhiteSpaceText();
+    cl->constraint = constraint->trimmedText();
 
     cl->cpp_external = cpp_external_cb->isChecked();
     cl->cpp_decl = edcppdecl->text();
@@ -3741,10 +3796,10 @@ bool ClassDialog::SaveData()
     if (switch_bg->isEnabled()) {
         AType swt;
 
-        s = edswitch_type->currentText().stripWhiteSpace();
+        s = edswitch_type->currentText().trimmed();
 
         if (! s.isEmpty()) {
-            int index = node_names.findIndex(s);
+            int index = node_names.indexOf(s);
 
             if (index >= 0)
                 swt.type = (BrowserClass *) nodes.at(index);
@@ -3761,7 +3816,7 @@ bool ClassDialog::SaveData()
         if (st == "stereotype") {
             unsigned n = bn->get_n_keys();
             WrapperStr oldiconpath = bn->get_value("stereotypeIconPath");
-            WrapperStr newiconpath = fromUnicode(ediconpath->text().simplifyWhiteSpace());
+            WrapperStr newiconpath = fromUnicode(ediconpath->text().simplified());
 
             bn->set_n_keys(n + 6);
             bn->set_key(n, "stereotypeSet");
@@ -3769,9 +3824,9 @@ bool ClassDialog::SaveData()
             bn->set_key(++n, "stereotypeCheck");
             bn->set_value(n, stereo_check_cb->currentText());
             bn->set_key(++n, "stereotypeSetParameters");
-            bn->set_value(n, fromUnicode(edinitparam->text().simplifyWhiteSpace()));
+            bn->set_value(n, fromUnicode(edinitparam->text().simplified()));
             bn->set_key(++n, "stereotypeCheckParameters");
-            bn->set_value(n, fromUnicode(edcheckparam->text().simplifyWhiteSpace()));
+            bn->set_value(n, fromUnicode(edcheckparam->text().simplified()));
             bn->set_key(++n, "stereotypeApplyOn");
             bn->set_value(n, applicableon_table->targets());
             bn->set_key(++n, "stereotypeIconPath");
diff --git a/src/dialog/ClassDialog.h b/src/dialog/ClassDialog.h
index a566a42c5..880ce98bd 100644
--- a/src/dialog/ClassDialog.h
+++ b/src/dialog/ClassDialog.h
@@ -27,31 +27,21 @@
 
 #ifndef CLASSDIALOG_H
 #define  CLASSDIALOG_H
-
-
-
-
-
-#include <q3tabdialog.h>
-//Added by qt3to4:
 #include <QLabel>
-//Added by qt3to4:
-#include <Q3PtrList>
-#include <Q3HBox>
-#include <Q3Grid>
-#include <QSharedPointer>
-
+#include <hhbox.h>
+#include <gridbox.h>
 #include "MyTable.h"
+#include <QSharedPointer>
+#include <memory>
 #include "BrowserNode.h"
 #include "VisibilityGroup.h"
 #include "dialog/EdgeMenuDialog.h"
 
-class Q3VBox;
+class VVBox;
 class QLabel;
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
-class Q3GroupBox;
-
+class QGroupBox;
 class LineEdit;
 class MultiLineEdit;
 class ClassData;
@@ -61,6 +51,7 @@ class ActualParamsTable;
 class ApplicableOnTable;
 class KeyValuesTable;
 class BodyDialog;
+class TableWidgetItemDelegate;
 
 class ClassDialog : public EdgeMenuDialog
 {
@@ -70,25 +61,25 @@ class ClassDialog : public EdgeMenuDialog
     QWidget * umltab;
     ClassData * cl;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     VisibilityGroup uml_visibility;
     QLabel * basetypelbl;
-    Q3ComboBox * edbasetype;
+    QComboBox * edbasetype;
     QCheckBox * abstract_cb;
     QCheckBox * active_cb;
-    Q3GroupBox * opt_bg;
-    Q3ComboBox * artifact;
+    QGroupBox * opt_bg;
+    QComboBox * artifact;
     MultiLineEdit * comment;
     MultiLineEdit * constraint;
     FormalParamsTable * formals_table;
-    Q3VBox * parametrized_vtab;
+    VVBox * parametrized_vtab;
     BrowserNodeList nodes;
     QStringList node_names;
     BrowserNodeList artifacts;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     ActualParamsTable * actuals_table;
-    Q3VBox * instantiate_vtab;
+    VVBox * instantiate_vtab;
 
     // C++
     QWidget * cppTab;
@@ -130,16 +121,16 @@ class ClassDialog : public EdgeMenuDialog
     QCheckBox * idl_external_cb;
     MultiLineEdit * edidldecl;
     MultiLineEdit * showidldecl;
-    Q3GroupBox * switch_bg;
-    Q3ComboBox * edswitch_type;
+    QGroupBox * switch_bg;
+    QComboBox * edswitch_type;
     QCheckBox * idl_local_cb;
     QCheckBox * idl_custom_cb;
 
     // profiled stereotype
     QWidget * stereotypetab;
-    Q3ComboBox * stereo_init_cb;
+    QComboBox * stereo_init_cb;
     LineEdit * edinitparam;
-    Q3ComboBox * stereo_check_cb;
+    QComboBox * stereo_check_cb;
     LineEdit * edcheckparam;
     LineEdit * ediconpath;
     QPushButton * iconpathrootbutton;
@@ -172,15 +163,15 @@ class ClassDialog : public EdgeMenuDialog
     QPushButton * pbProfiledSteretypeBrowse;
     QLabel * lblProfiledEmpty2;
     QLabel * lblProfiledEmpty3;
-    Q3VBox * vtabProfiled;
-    Q3ButtonGroup * bgvUml;
-    Q3ButtonGroup * bgvCpp;
-    Q3ButtonGroup * bgvJava;
-    Q3ButtonGroup * bgvPython;
-    Q3ButtonGroup * bgvPhp;
-    Q3ButtonGroup * bgvIDL;
-    Q3HBox * htabcpp;
-    Q3HBox * htabidl;
+    VVBox * vtabProfiled;
+    QGroupBox * bgvUml;
+    QGroupBox * bgvCpp;
+    QGroupBox * bgvJava;
+    QGroupBox * bgvPython;
+    QGroupBox * bgvPhp;
+    QGroupBox * bgvIDL;
+    HHBox * htabcpp;
+    HHBox * htabidl;
     QLabel * lbl1cpp;
     QLabel * lbl2cpp;
     QLabel * lbl3cpp;
@@ -206,33 +197,33 @@ class ClassDialog : public EdgeMenuDialog
     QLabel * lbl2java;
     QLabel * lbl3java;
     QLabel * lbl4java;
-    Q3Grid * stereotypeGrid;
-    Q3HBox * htabUml;
+    GridBox * stereotypeGrid;
+    HHBox * htabUml;
     QFont font;
 
     BrowserClass * currentNode;
     BrowserNode * grandParent;
 
-    Q3VBox * keyValueTab;
+    VVBox * keyValueTab;
 
-    virtual uint TypeID();
+    virtual uint TypeID() override;
 
-    virtual void InitGui();
-    void FillGuiElements(BrowserNode *);
+    virtual void InitGui() override;
+    virtual void FillGuiElements(BrowserNode *) override;
     void FillGuiElements(ClassData * _cl);
     void NullPointers();
-    bool SaveData();
+    virtual bool SaveData() override;
 
     //refactoring changes
 
-    static QSharedPointer<ClassDialog> instance;
+    //static QSharedPointer<ClassDialog> instance;
 
 
 public:
     ClassDialog(ClassData * c);
     virtual ~ClassDialog();
 
-    static QSharedPointer<ClassDialog> Instance(ClassData *);
+    static std::shared_ptr<ClassDialog> Instance(ClassData *);
 
     static void cpp_generate_decl(QString & s, ClassData * cl,
                                   QString def, QString name,
@@ -289,7 +280,7 @@ class ClassDialog : public EdgeMenuDialog
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
     void default_description();
     void edit_description();
     void edit_constraint();
@@ -297,7 +288,7 @@ protected slots:
     void icon_browse();
     void icon_root_relative();
     void icon_prj_relative();
-    void update_all_tabs(QWidget *);
+    void update_all_tabs(int current);
     void cpp_update_decl();
     void cpp_default_decl();
     void cpp_unmapped_decl();
@@ -325,16 +316,19 @@ class FormalParamsTable : public MyTable
     Q_OBJECT
 
 protected:
-    const QStringList & types;
+    QStringList & types;
 
     static QString type_copy;
     static QString name_copy;		// copy/cut/paste
     static QString default_value_copy;
     static QString extends_copy;
+private:
+    TableWidgetItemDelegate* m_comboBoxDelegate;
 
 public:
     FormalParamsTable(ClassData * a, QWidget * parent,
-                      const QStringList & list, bool visit);
+                      QStringList &list, bool visit);
+    void Reinitiliaze(ClassData * cl,  QStringList & node_names, bool isWritable);
 
 protected:
     virtual void activateNextCell();
@@ -355,23 +349,26 @@ class FormalParamsTable : public MyTable
                        QStringList & node_names);
 
 protected slots:
-    void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    void button_pressed(const QModelIndex &index);
     void value_changed(int row, int col);
 };
 
 class ActualParamsTable : public MyTable
 {
 protected:
-    const QStringList & types;
+    QStringList & types;
 
 public:
     ActualParamsTable(ClassData * a, QWidget * parent,
-                      const QStringList & list, bool visit);
+                       QStringList & list, bool visit);
+    void Reinitiliaze(ClassData * cl,  QStringList & node_names, bool isWritable);
     void generate(QString & s, ClassData * cl, BrowserNode * parent, bool cpp,
                   BrowserNodeList & nodes, QStringList & node_names);
 
 protected:
     //virtual void activateNextCell();
+private:
+    TableWidgetItemDelegate* m_comboBoxDelegate;
 
 public:
     void update(ClassData * c, BrowserNodeList & nodes);
@@ -391,7 +388,7 @@ class ApplicableOnTable : public MyTable
     QString targets();
 
 protected slots:
-    void button_pressed(int row, int col, int, const QPoint &);
+    void button_pressed(const QModelIndex &index);
 };
 
 #endif
diff --git a/src/dialog/ClassInstanceDialog.cpp b/src/dialog/ClassInstanceDialog.cpp
index ee6b68692..bc1dae444 100644
--- a/src/dialog/ClassInstanceDialog.cpp
+++ b/src/dialog/ClassInstanceDialog.cpp
@@ -29,16 +29,13 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-
+#include <QList>
 #include "ClassInstanceDialog.h"
 #include "BrowserClassInstance.h"
 #include "ClassInstanceData.h"
@@ -54,28 +51,29 @@
 #include "strutil.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "menufactory.h"
+#include <QHeaderView>
 RelTable::RelTable(QWidget * parent, ClassInstanceData * inst, bool visit)
     : MyTable(parent)
 {
-    const Q3ValueList<SlotRel> & rels = inst->get_relations();
+    const QList<SlotRel> & rels = inst->get_relations();
 
-    setNumRows(rels.count());
-    setNumCols((visit) ? 5 : 6);
-    setSelectionMode(Q3Table::Single);
-    setSorting(true);
+    setRowCount(rels.count());
+    setColumnCount((visit) ? 5 : 6);
+    setSelectionMode(QTableWidget::SingleSelection);
+    //setSortingEnabled(true);
 
-    horizontalHeader()->setLabel(0, TR("Class Inst."));
-    horizontalHeader()->setLabel(1, TR("Role"));
-    horizontalHeader()->setLabel(2, TR("kind"));
-    horizontalHeader()->setLabel(3, TR("Role"));
-    horizontalHeader()->setLabel(4, TR("Class Inst."));
-    horizontalHeader()->setLabel(5, TR("Delete"));
+    setHorizontalHeaderLabel(0, tr("Class Inst."));
+    setHorizontalHeaderLabel(1, tr("Role"));
+    setHorizontalHeaderLabel(2, tr("kind"));
+    setHorizontalHeaderLabel(3, tr("Role"));
+    setHorizontalHeaderLabel(4, tr("Class Inst."));
+    setHorizontalHeaderLabel(5, tr("Delete"));
 
     QString role = inst->get_browser_node()->get_name() + QString(":") +
-                   inst->get_class()->get_name();
+            inst->get_class()->get_name();
     int row = 0;
-    Q3ValueList<SlotRel>::ConstIterator it;
+    QList<SlotRel>::ConstIterator it;
 
     for (it = rels.begin(); it != rels.end(); ++it)
         init_row(*it, row++, role, visit);
@@ -89,40 +87,40 @@ RelTable::RelTable(QWidget * parent, ClassInstanceData * inst, bool visit)
     if (! visit)
         adjustColumn(5);
 
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
 }
 
 void RelTable::init_row(const SlotRel & sr, int row, QString a, bool visit)
 {
     QString b = sr.value->get_name() + QString(":") +
-                ((ClassInstanceData *) sr.value->get_data())->get_class()->get_name();
+            ((ClassInstanceData *) sr.value->get_data())->get_class()->get_name();
 
-    setItem(row, 0, new TableItem(this, Q3TableItem::Never,
-                                  (sr.is_a) ? a : b));
+    setItem(row, 0, new TableItem(TableItem::Never,
+                                  (sr.is_a) ? a : b, TableItem::TableItemType));
 
     RelationData * d = sr.rel;
     const char * s;
 
     s = d->get_role_b();
-    setItem(row, 1, new TableItem(this, Q3TableItem::Never, (s == 0) ? "" : s));
+    setItem(row, 1, new TableItem(TableItem::Never, (s == 0) ? "" : s, TableItem::TableItemType));
 
-    setItem(row, 2, new TableItem(this, Q3TableItem::Never, stringify(d->get_type())));
+    setItem(row, 2, new TableItem(TableItem::Never, stringify(d->get_type()), TableItem::TableItemType));
 
     s = d->get_role_a();
-    setItem(row, 3, new TableItem(this, Q3TableItem::Never, (s == 0) ? "" : s));
+    setItem(row, 3, new TableItem(TableItem::Never, (s == 0) ? "" : s, TableItem::TableItemType));
 
-    setItem(row, 4, new TableItem(this, Q3TableItem::Never,
-                                  (sr.is_a) ? b : a));
+    setItem(row, 4, new TableItem(TableItem::Never,
+                                  (sr.is_a) ? b : a, TableItem::TableItemType));
 
     if (! visit)
         setText(row, 5, "");
 }
 
-void RelTable::button_pressed(int row, int col, int, const QPoint &)
+void RelTable::button_pressed(const QModelIndex &index)
 {
-    if (col == 5)
-        setText(row, col, text(row, col).isEmpty() ? TR("   Yes") : QString());
+    if (index.column() == 5)
+        setText(index.row(), index.column(), text(index.row(), index.column()).isEmpty() ? tr("   Yes") : QString());
 }
 
 //
@@ -130,64 +128,66 @@ void RelTable::button_pressed(int row, int col, int, const QPoint &)
 QSize ClassInstanceDialog::previous_size;
 
 ClassInstanceDialog::ClassInstanceDialog(ClassInstanceData * i)
-    : Q3TabDialog(0, "class instance dialog", FALSE, Qt::WDestructiveClose),
+    : TabDialog(0, "class instance dialog", true, Qt::WA_DeleteOnClose),
       inst(i), atbl(0), rtbl(0)
 {
-    setCaption(TR("Class instance dialog"));
+    setWindowTitle(tr("Class instance dialog"));
 
     BrowserNode * bn = inst->get_browser_node();
 
     bn->edit_start();
 
     if (bn->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     visit = !hasOkButton();
 
-    Q3Grid * grid;
+    GridBox * grid;
 
     // general tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
 
     if (visit)
         edname->setReadOnly(TRUE);
 
-    new QLabel(TR("stereotype :"), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(bn->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype :"), grid));
+    grid->addWidget(edstereotype = new QComboBox( grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(bn->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlClassInstance));
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlClassInstance));
         edstereotype->setAutoCompletion(completion());
     }
 
-    SmallPushButton  * b = new SmallPushButton(TR("class :"), grid);
+    SmallPushButton  * b;
+    grid->addWidget(b = new SmallPushButton(tr("class :"), grid));
 
     connect(b, SIGNAL(clicked()), this, SLOT(menu_class()));
 
-    edtype = new Q3ComboBox(FALSE, grid);
+    grid->addWidget(edtype = new QComboBox(grid));
 
     if (visit) {
-        edtype->insertItem(inst->get_class()->full_name());
+        edtype->addItem(inst->get_class()->full_name());
         nodes.append(inst->get_class());
     }
     else {
         BrowserClass::instances(nodes);
         nodes.full_names(list);
-        edtype->insertStringList(list);
-        edtype->setCurrentItem(nodes.find(inst->get_class()));
+        edtype->addItems(list);
+        edtype->setCurrentIndex(nodes.indexOf(inst->get_class()));
         connect(edtype, SIGNAL(activated(int)), this, SLOT(type_changed(int)));
     }
 
@@ -200,16 +200,18 @@ ClassInstanceDialog::ClassInstanceDialog(ClassInstanceData * i)
             cl_container = 0;
     }
 
-    Q3VBox * vtab = new Q3VBox(grid);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
 
-    new QLabel(TR("description :"), vtab);
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+        connect(b =new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(b);
     }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
 
@@ -227,43 +229,44 @@ ClassInstanceDialog::ClassInstanceDialog(ClassInstanceData * i)
     // attributes tab
 
     atbl = new MyTable(this);
-    atbl->setNumCols(3);
-    atbl->setSorting(true);
-    atbl->setSelectionMode(Q3Table::NoSelection);	// single does not work
-    atbl->setRowMovingEnabled(TRUE);
-    atbl->horizontalHeader()->setLabel(0, TR(" Attribute "));
-    atbl->horizontalHeader()->setLabel(1, TR(" Class "));
-    atbl->horizontalHeader()->setLabel(2, TR(" Value "));
+    atbl->setColumnCount(3);
+    //atbl->setSortingEnabled(true);
+    atbl->setSelectionMode(QTableWidget::NoSelection);	// single does not work
+    atbl->verticalHeader()->setSectionsMovable(true);
+    atbl->verticalHeader()->setSectionsMovable(true);
+    atbl->setHorizontalHeaderLabel(0, tr(" Attribute "));
+    atbl->setHorizontalHeaderLabel(1, tr(" Class "));
+    atbl->setHorizontalHeaderLabel(2, tr(" Value "));
 
-    addTab(atbl, TR("Attributes"));
+    addTab(atbl, tr("Attributes"));
 
     // relation tab
 
     if (! inst->relations.isEmpty()) {
         rtbl = new RelTable(this, inst, visit);
-        addTab(rtbl, TR("Relations"));
+        addTab(rtbl, tr("Relations"));
     }
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
-    type_changed(edtype->currentItem());
+    type_changed(edtype->currentIndex());
 
-    connect(this, SIGNAL(currentChanged(QWidget *)),
-            this, SLOT(update_all_tabs(QWidget *)));
+    connect(m_tabWidget, SIGNAL(currentChanged(int)),
+            this, SLOT(update_all_tabs(int)));
 
     open_dialog(this);
 }
 
 void ClassInstanceDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -272,14 +275,16 @@ ClassInstanceDialog::~ClassInstanceDialog()
     inst->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
 
-void ClassInstanceDialog::update_all_tabs(QWidget * w)
+void ClassInstanceDialog::update_all_tabs(int index)
 {
+    QWidget * w = m_tabWidget->widget(index);
     if (w == atbl) {
         if (! visit)
             edname->setFocus();
@@ -288,7 +293,7 @@ void ClassInstanceDialog::update_all_tabs(QWidget * w)
 
 void ClassInstanceDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          inst, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -299,15 +304,15 @@ void ClassInstanceDialog::post_edit_description(ClassInstanceDialog * d, QString
 
 void ClassInstanceDialog::menu_class()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edtype->currentText().stripWhiteSpace());
+    int index = list.indexOf(edtype->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -315,56 +320,59 @@ void ClassInstanceDialog::menu_class()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlClass) && !bn->deletedp())
-            m.insertItem(TR("Choose class selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose class selected in browser"), 1);
         else
             bn = 0;
 
         if (cl_container != 0)
-            m.insertItem(TR("Create class and choose it"), 2);
+            MenuFactory::addItem(m, tr("Create class and choose it"), 2);
     }
 
     if ((index != -1) || (bn != 0) || (cl_container != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            nodes.at(index)->select_in_browser();
-            break;
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+            switch (retAction->data().toInt()) {
+            case 0:
+                nodes.at(index)->select_in_browser();
+                break;
 
-        case 2:
-            bn = BrowserClass::add_class(FALSE, cl_container);
+            case 2:
+                bn = BrowserClass::add_class(FALSE, cl_container);
 
-            if (bn == 0)
-                return;
+                if (bn == 0)
+                    return;
 
-            bn->select_in_browser();
+                bn->select_in_browser();
 
-            // no break
-        case 1: {
+                // no break
+            case 1: {
+                if ((index = nodes.indexOf(bn)) == -1) {
+                    // new class, may be created through an other dialog
+                    QStringList::Iterator iter = list.begin();
+                    QStringList::Iterator iter_end = list.end();
+                    QString s = bn->full_name(TRUE);
 
-            if ((index = nodes.findRef(bn)) == -1) {
-                // new class, may be created through an other dialog
-                QStringList::Iterator iter = list.begin();
-                QStringList::Iterator iter_end = list.end();
-                QString s = bn->full_name(TRUE);
+                    index = 0;
 
-                index = 0;
+                    while ((iter != iter_end) && (*iter < s)) {
+                        ++iter;
+                        index += 1;
+                    }
 
-                while ((iter != iter_end) && (*iter < s)) {
-                    ++iter;
-                    index += 1;
+                    nodes.insert((unsigned) index, bn);
+                    list.insert(iter, s);
+                    edtype->insertItem(index,s);
                 }
-
-                nodes.insert((unsigned) index, bn);
-                list.insert(iter, s);
-                edtype->insertItem(s, index);
             }
-        }
 
-        edtype->setCurrentItem(index);
-        type_changed(index);
-        break;
+                edtype->setCurrentIndex(index);
+                type_changed(index);
+                break;
 
-        default:
-            break;
+            default:
+                break;
+            }
         }
     }
 }
@@ -378,20 +386,17 @@ void ClassInstanceDialog::type_changed(int i)
     attributes.sort();
 
     // fill table
-    atbl->setNumRows(0);
-    atbl->setNumRows(attributes.count());
+    atbl->setRowCount(0);
+    atbl->setRowCount(attributes.count());
 
-    BrowserNode * at;
-    int index;
-    Q3ValueList<SlotAttr> attrs = inst->attributes;
+    QList<SlotAttr> attrs = inst->attributes;
 
-    for (at = attributes.first(), index = 0;
-         at != 0;
-         at = attributes.next(), index += 1) {
-        atbl->setItem(index, 0, new TableItem(atbl, Q3TableItem::Never, at->get_name()));
-        atbl->setItem(index, 1, new TableItem(atbl, Q3TableItem::Never, ((BrowserNode *) at->parent())->get_name()));
+    int index = 0;
+    foreach (BrowserNode * at, attributes) {
+        atbl->setItem(index, 0, new TableItem(TableItem::Never, at->get_name(), TableItem::TableItemType));
+        atbl->setItem(index, 1, new TableItem(TableItem::Never, ((BrowserNode *) at->parent())->get_name(), TableItem::TableItemType));
 
-        Q3ValueList<SlotAttr>::Iterator it_attr;
+        QList<SlotAttr>::Iterator it_attr;
 
         for (it_attr = attrs.begin(); it_attr != attrs.end(); ++it_attr) {
             if ((*it_attr).att == at) {
@@ -402,6 +407,7 @@ void ClassInstanceDialog::type_changed(int i)
 
         if (it_attr == attrs.end())
             atbl->setText(index, 2, QString());
+        ++index;
     }
 
     atbl->setColumnStretchable(2, TRUE);
@@ -421,21 +427,21 @@ void ClassInstanceDialog::accept()
 
     BrowserClassInstance * bn = (BrowserClassInstance *) inst->get_browser_node();
 
-    bn->set_name(edname->text().stripWhiteSpace());
+    bn->set_name(edname->text().trimmed());
 
-    bool newst = bn->get_data()->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
-    BrowserClass * new_cl = (BrowserClass *) nodes.at(edtype->currentItem());
+    bool newst = bn->get_data()->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
+    BrowserClass * new_cl = (BrowserClass *) nodes.at(edtype->currentIndex());
 
     if (new_cl != inst->cl)
         inst->set_class(new_cl);
     else if (rtbl) {
-        Q3ValueList<SlotRel> rels = inst->get_relations(); // copy !
-        Q3ValueList<SlotRel>::Iterator it;
+        QList<SlotRel> rels = inst->get_relations(); // copy !
+        QList<SlotRel>::Iterator it;
         int row = 0;
-        QString yes = TR("Yes");
+        QString yes = tr("Yes");
 
         for (row = 0, it = rels.begin(); it != rels.end(); ++it, row += 1) {
-            if (rtbl->text(row, 5).stripWhiteSpace() == yes) {
+            if (rtbl->text(row, 5).trimmed() == yes) {
                 SlotRel & sr = *it;
 
                 inst->replace(sr.value, sr.rel, 0, sr.is_a, FALSE);
@@ -448,11 +454,11 @@ void ClassInstanceDialog::accept()
 
     inst->attributes.clear();
 
-    int n = atbl->numRows();
+    int n = atbl->rowCount();
     int index;
 
     for (index = 0; index != n; index += 1) {
-        QString s = atbl->text(index, 2).stripWhiteSpace();
+        QString s = atbl->text(index, 2).trimmed();
 
         if (! s.isEmpty())
             inst->attributes.append(SlotAttr((BrowserAttribute *) attributes.at(index),
diff --git a/src/dialog/ClassInstanceDialog.h b/src/dialog/ClassInstanceDialog.h
index 5519d7133..997d164d4 100644
--- a/src/dialog/ClassInstanceDialog.h
+++ b/src/dialog/ClassInstanceDialog.h
@@ -28,15 +28,12 @@
 #ifndef CLASSINSTANCEDIALOG_H
 #define CLASSINSTANCEDIALOG_H
 
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 #include <qstringlist.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
 #include "BrowserNode.h"
 #include "MyTable.h"
 
-class Q3ComboBox;
+class QComboBox;
 class LineEdit;
 class KeyValuesTable;
 class ClassInstanceData;
@@ -54,10 +51,10 @@ class RelTable : public MyTable
     void init_row(const SlotRel & sr, int row, QString a, bool visit);
 
 protected slots:
-    virtual void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    virtual void button_pressed(const QModelIndex &index);
 };
 
-class ClassInstanceDialog : public Q3TabDialog
+class ClassInstanceDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -69,12 +66,12 @@ class ClassInstanceDialog : public Q3TabDialog
     QStringList list;
     BrowserNodeList nodes;
     LineEdit * edname;
-    Q3ComboBox * edtype;
-    Q3ComboBox * edstereotype;
+    QComboBox * edtype;
+    QComboBox * edstereotype;
     BrowserNodeList attributes;
     BrowserNode * cl_container;
     MultiLineEdit * comment;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
     MyTable * atbl;
     RelTable * rtbl;
     KeyValuesTable * kvtable;
@@ -91,12 +88,12 @@ class ClassInstanceDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 
     void edit_description();
     void type_changed(int);
     void menu_class();
-    void update_all_tabs(QWidget *);
+    void update_all_tabs(int index);
 };
 
 #endif
diff --git a/src/dialog/ClassListDialog.cpp b/src/dialog/ClassListDialog.cpp
index fbc59c835..074a69967 100644
--- a/src/dialog/ClassListDialog.cpp
+++ b/src/dialog/ClassListDialog.cpp
@@ -31,13 +31,11 @@
 
 #include <qcursor.h>
 #include <qlayout.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3ValueList>
-#include <Q3HBoxLayout>
-
+#include <QVBoxLayout>
+#include <QList>
+#include <QHBoxLayout>
 #include "ClassListDialog.h"
 #include "BrowserClass.h"
 #include "BasicData.h"
@@ -46,32 +44,33 @@
 
 QSize ClassListDialog::previous_size;
 
-ClassListDialog::ClassListDialog(const char * m,
-                                 const Q3ValueList<BrowserClass *> & l)
-    : QDialog(0, m, TRUE)
+ClassListDialog::ClassListDialog(QString m,
+                                 const QList<BrowserClass *> & l)
+    : QDialog(0)
 {
-    setCaption(m);
+    setWindowTitle(m);
     move(QCursor::pos());
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    cb = new Q3ComboBox(FALSE, this);
+    cb = new QComboBox(this);
     vbox->addWidget(cb);
 
-    Q3ValueList<BrowserClass *>::ConstIterator end = l.end();
-    Q3ValueList<BrowserClass *>::ConstIterator it;
+    QList<BrowserClass *>::ConstIterator end = l.end();
+    QList<BrowserClass *>::ConstIterator it;
 
     for (it = l.begin(); it != end; ++it)
         if (!(*it)->deletedp())
-            cb->insertItem((*it)->full_name(TRUE));
+            cb->addItem((*it)->full_name(TRUE));
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     ok->setDefault(TRUE);
@@ -94,5 +93,5 @@ ClassListDialog::~ClassListDialog()
 
 int ClassListDialog::choosen()
 {
-    return cb->currentItem();
+    return cb->currentIndex();
 }
diff --git a/src/dialog/ClassListDialog.h b/src/dialog/ClassListDialog.h
index 9ce0511f7..308bb917c 100644
--- a/src/dialog/ClassListDialog.h
+++ b/src/dialog/ClassListDialog.h
@@ -28,23 +28,23 @@
 #ifndef CLASSLISTDIALOG_H
 #define CLASSLISTDIALOG_H
 
-#include <q3ptrlist.h>
 #include <qdialog.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
-class Q3ComboBox;
+class QComboBox;
 class BrowserClass;
 
 class ClassListDialog : public QDialog
 {
+    Q_OBJECT
+    
 protected:
-    Q3ComboBox * cb;
+    QComboBox * cb;
 
     static QSize previous_size;
 
 public:
-    ClassListDialog(const char * m, const Q3ValueList<BrowserClass *> & l);
+    ClassListDialog(QString m, const QList<BrowserClass *> & l);
     virtual ~ClassListDialog();
 
     int choosen();
diff --git a/src/dialog/ClassSettingsDialog.cpp b/src/dialog/ClassSettingsDialog.cpp
index 3963dcb0d..c114f81e5 100644
--- a/src/dialog/ClassSettingsDialog.cpp
+++ b/src/dialog/ClassSettingsDialog.cpp
@@ -31,11 +31,11 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3HBoxLayout>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 
 #include "ClassSettingsDialog.h"
 #include "Settings.h"
@@ -43,60 +43,65 @@
 #include "translate.h"
 
 
-class ComboVisibility : public Q3ComboBox
+class ComboVisibility : public QComboBox
 {
 public:
     ComboVisibility(QWidget * parent, UmlVisibility v, bool nodefault);
 };
 
 ComboVisibility::ComboVisibility(QWidget * parent, UmlVisibility v, bool nodefault)
-    : Q3ComboBox(FALSE, parent)
+    : QComboBox(parent)
 {
+    setEditable(false);
     // the last value MUST be default
     for (int i = 0; i != (int) UmlDefaultVisibility; i += 1)
-        insertItem(stringify((UmlVisibility) i));
+        addItem(stringify((UmlVisibility) i));
 
     if (!nodefault)
-        insertItem(stringify(UmlDefaultVisibility));
+        addItem(stringify(UmlDefaultVisibility));
 
-    setCurrentItem(v);
+    setCurrentIndex(v);
 }
 
 QSize ClassSettingsDialog::previous_size;
 
 ClassSettingsDialog::ClassSettingsDialog(ClassSettings * se, bool nodefault)
-    : QDialog(0, "Class Settings dialog", TRUE), settings(se)
+    : QDialog(0/*, "Class Settings dialog", TRUE*/), settings(se)
 {
-    setCaption(TR("Class Settings dialog"));
+    setWindowTitle(tr("Class Settings dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
     QString s;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(new QLabel(TR("default attributes visibility : "), this), 1000);
+    hbox->addWidget(new QLabel(tr("default attributes visibility : "), this), 1000);
     cbattribute = new ComboVisibility(this, settings->attribute_visibility, nodefault);
     hbox->addWidget(cbattribute);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(new QLabel(TR("default relations visibility : "), this), 1000);
+    hbox->addWidget(new QLabel(tr("default relations visibility : "), this), 1000);
     cbrelation = new ComboVisibility(this, settings->relation_visibility, nodefault);
     hbox->addWidget(cbrelation);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(new QLabel(TR("default operations visibility : "), this), 1000);
+    hbox->addWidget(new QLabel(tr("default operations visibility : "), this), 1000);
     cboperation = new ComboVisibility(this, settings->operation_visibility, nodefault);
     hbox->addWidget(cboperation);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -112,7 +117,7 @@ ClassSettingsDialog::ClassSettingsDialog(ClassSettings * se, bool nodefault)
 
 void ClassSettingsDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -123,9 +128,9 @@ ClassSettingsDialog::~ClassSettingsDialog()
 
 void ClassSettingsDialog::accept()
 {
-    settings->attribute_visibility = (UmlVisibility) cbattribute->currentItem();
-    settings->relation_visibility = (UmlVisibility) cbrelation->currentItem();
-    settings->operation_visibility = (UmlVisibility) cboperation->currentItem();
+    settings->attribute_visibility = (UmlVisibility) cbattribute->currentIndex();
+    settings->relation_visibility = (UmlVisibility) cbrelation->currentIndex();
+    settings->operation_visibility = (UmlVisibility) cboperation->currentIndex();
 
     QDialog::accept();
 }
diff --git a/src/dialog/ClassSettingsDialog.h b/src/dialog/ClassSettingsDialog.h
index 32f8be7e2..df9ec67cc 100644
--- a/src/dialog/ClassSettingsDialog.h
+++ b/src/dialog/ClassSettingsDialog.h
@@ -51,7 +51,7 @@ class ClassSettingsDialog : public QDialog
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/ClassViewDialog.cpp b/src/dialog/ClassViewDialog.cpp
index 16a5f4b94..c3a5c2b54 100644
--- a/src/dialog/ClassViewDialog.cpp
+++ b/src/dialog/ClassViewDialog.cpp
@@ -29,11 +29,11 @@
 
 
 
-#include <q3grid.h>
+#include <gridbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
-#include <q3vbox.h>
+#include <qcombobox.h>
+#include <vvbox.h>
 
 #include "ClassViewDialog.h"
 #include "BasicData.h"
@@ -51,62 +51,63 @@
 QSize ClassViewDialog::previous_size;
 
 ClassViewDialog::ClassViewDialog(BasicData * nd)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), data(nd)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), data(nd)
 {
     nd->get_browser_node()->edit_start();
 
     if (nd->get_browser_node()->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("class view dialog"));
+    setWindowTitle(tr("class view dialog"));
 
     bool visit = !hasOkButton();
 
     // general tab
 
     BrowserClassView * bn = (BrowserClassView *) data->get_browser_node();
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     umltab = grid;
-    grid->setMargin(5);
-    grid->setSpacing(5);
+    grid->setMargin(1);
+    grid->setSpacing(1);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(data->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox( grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(data->get_stereotype()));
 
     if (!visit) {
-        edstereotype->insertStringList(BrowserClassView::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlClassView));
+        edstereotype->addItems(BrowserClassView::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlClassView));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
     BrowserNode * bcv = bn->get_associated();
 
     if (visit) {
         if ((bcv != 0) && !bcv->deletedp()) {
-            new QLabel(TR("deployment\nview : "), grid);
-            deploymentview = new Q3ComboBox(FALSE, grid);
+            grid->addWidget(new QLabel(tr("deployment\nview : "), grid));
+            grid->addWidget(deploymentview = new QComboBox( grid));
 
             BrowserNode * bcv = bn->get_associated();
 
-            deploymentview->insertItem(bcv->full_name(TRUE));
-            deploymentview->setCurrentItem(0);
+            deploymentview->addItem(bcv->full_name(TRUE));
+            deploymentview->setCurrentIndex(0);
         }
         else
             deploymentview = 0;
@@ -118,37 +119,42 @@ ClassViewDialog::ClassViewDialog(BasicData * nd)
             QStringList deploymentview_names;
 
             deploymentviews.full_names(deploymentview_names);
-            new QLabel(TR("deployment\nview : "), grid);
-            deploymentview = new Q3ComboBox(FALSE, grid);
-            deploymentview->insertItem("");
-            deploymentview->insertStringList(deploymentview_names);
+            grid->addWidget(new QLabel(tr("deployment\nview : "), grid));
+            grid->addWidget(deploymentview = new QComboBox(grid));
+            deploymentview->addItem("");
+            deploymentview->addItems(deploymentview_names);
 
             if (bcv != 0) {
                 if (bcv->deletedp()) {
                     QString fn = bcv->full_name(TRUE);
 
-                    deploymentview->insertItem(fn);
+                    deploymentview->addItem(fn);
                     deploymentviews.append(bcv);
-                    deploymentview->setCurrentItem(deploymentviews.count());
+                    deploymentview->setCurrentIndex(deploymentviews.count());
                 }
                 else
-                    deploymentview->setCurrentItem(deploymentviews.find(bcv) + 1);
+                    deploymentview->setCurrentIndex(deploymentviews.indexOf(bcv) + 1);
             }
             else
-                deploymentview->setCurrentItem(0);
+                deploymentview->setCurrentIndex(0);
         }
         else
             deploymentview = 0;
     }
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab = new VVBox(grid);
+    grid->addWidget(vtab);
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
+    SmallPushButton *sButton;
     if (!visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     QFont font = comment->font();
@@ -163,12 +169,13 @@ ClassViewDialog::ClassViewDialog(BasicData * nd)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
     kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable);
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -180,7 +187,7 @@ ClassViewDialog::ClassViewDialog(BasicData * nd)
 
 void ClassViewDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -189,8 +196,9 @@ ClassViewDialog::~ClassViewDialog()
     data->get_browser_node()->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -203,7 +211,7 @@ void ClassViewDialog::change_tabs(QWidget * w)
 
 void ClassViewDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          data, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -217,21 +225,21 @@ void ClassViewDialog::accept()
     if (!check_edits(edits) || !kvtable->check_unique())
         return;
 
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
     BrowserClassView * bn = (BrowserClassView *) data->get_browser_node();
 
     if ((s != bn->get_name()) &&
         ((BrowserNode *) bn->parent())->wrong_child_name(s, bn->get_type(),
                 bn->allow_spaces(),
                 bn->allow_empty()))
-        msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+        msg_critical(tr("Error"), edname->text() + tr("\n\nillegal name or already used"));
     else {
         bn->set_name(s);
 
-        bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+        bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
         if (deploymentview != 0) {
-            int index = deploymentview->currentItem();
+            int index = deploymentview->currentIndex();
 
             bn->set_associated_deploymentview((index == 0)
                                               ? 0 // "" : no deploymentview
@@ -248,6 +256,6 @@ void ClassViewDialog::accept()
         data->modified();
         bn->package_modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
diff --git a/src/dialog/ClassViewDialog.h b/src/dialog/ClassViewDialog.h
index 114cf0889..db7d4b4f8 100644
--- a/src/dialog/ClassViewDialog.h
+++ b/src/dialog/ClassViewDialog.h
@@ -28,20 +28,20 @@
 #ifndef CLASSVIEWDIALOG_H
 #define CLASSVIEWDIALOG_H
 
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class LineEdit;
 class MultiLineEdit;
 class BasicData;
 class KeyValuesTable;
 class BodyDialog;
 
-class ClassViewDialog : public Q3TabDialog
+class ClassViewDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -49,12 +49,12 @@ class ClassViewDialog : public Q3TabDialog
     QWidget * umltab;
     BasicData * data;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * deploymentview;
+    QComboBox * edstereotype;
+    QComboBox * deploymentview;
     BrowserNodeList deploymentviews;
     MultiLineEdit * comment;
     KeyValuesTable * kvtable;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     static QSize previous_size;
 
@@ -66,7 +66,7 @@ class ClassViewDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
 
     void change_tabs(QWidget *);
diff --git a/src/dialog/CodAddMsgDialog.cpp b/src/dialog/CodAddMsgDialog.cpp
index 7f6634b3e..653d5ff5f 100644
--- a/src/dialog/CodAddMsgDialog.cpp
+++ b/src/dialog/CodAddMsgDialog.cpp
@@ -31,16 +31,13 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3hbox.h>
+#include <qcombobox.h>
+#include <hhbox.h>
 #include <qpushbutton.h>
-#include <q3grid.h>
-#include <q3popupmenu.h>
+#include <gridbox.h>
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include "CodAddMsgDialog.h"
 #include "ColDiagramView.h"
 #include "CodMsgSupport.h"
@@ -53,85 +50,84 @@
 #include "UmlDesktop.h"
 #include "BrowserView.h"
 #include "translate.h"
+#include "menufactory.h"
 
 QSize CodAddMsgDialog::previous_size;
 
 CodAddMsgDialog::CodAddMsgDialog(CodObjCanvas * from, CodObjCanvas * to,
                                  CodMsgSupport * i, ColDiagramView * v,
                                  bool fo)
-    : QDialog(0, "add msg dialog", TRUE), in(i), view(v), forward(fo)
+    : QDialog(0/*, "add msg dialog", TRUE*/), in(i), view(v), forward(fo)
 {
-    setCaption(TR("Add message dialog"));
+    setWindowTitle(tr("Add message dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(10);
-    QLabel * label1 = new QLabel(TR("Add message to %1", to->get_full_name()), this);
+    QLabel * label1 = new QLabel(tr("Add message to %1").arg(to->get_full_name()), this);
     label1->setAlignment(Qt::AlignCenter);
     hbox->addWidget(label1);
 
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     vbox->addWidget(grid);
-    new QLabel(TR("rank : "), grid);
-    cbrank = new Q3ComboBox(FALSE, grid);
+    grid->addWidget(new QLabel(tr("rank : "), grid));
+    grid->addWidget(cbrank = new QComboBox(grid));
 
     ColMsgList all_in;
     ColMsgList all_out;
 
     from->get_all_in_all_out(all_in, all_out);
 
-    ColMsg * m;
     QStringList new_ones;
-    Q3PtrListIterator<ColMsg> itout(all_out);
-
-    for (; (m = itout.current()) != 0; ++itout) {
+    foreach (ColMsg *m, all_out) {
         QString s = m->next_hierarchical_rank();
 
-        if ((s.find('.') != - 1) && (ColMsg::find(s, all_out) == 0)) {
-            cbrank->insertItem(QString::number(m->get_rank() + 1) + " : " + s);
+        if ((s.indexOf('.') != - 1) && (ColMsg::find(s, all_out) == 0)) {
+            cbrank->addItem(QString::number(m->get_rank() + 1) + " : " + s);
             new_ones.append(s);
         }
     }
 
-    Q3PtrListIterator<ColMsg> itin(all_in);
-
-    for (; (m = itin.current()) != 0; ++itin) {
+    foreach (ColMsg *m, all_in) {
         QString s = m->get_hierarchical_rank() + ".1";
 
-        if ((ColMsg::find(s, all_out) == 0) && (new_ones.findIndex(s) == -1)) {
-            cbrank->insertItem(QString::number(m->get_rank() + 1) + " : " + s);
+        if ((ColMsg::find(s, all_out) == 0) && (new_ones.indexOf(s) == -1)) {
+            cbrank->addItem(QString::number(m->get_rank() + 1) + " : " + s);
             new_ones.append(s);
         }
     }
 
     // add a the rank for a new toplevel link
-    cbrank->insertItem(QString::number(ColMsg::last_rank(view->get_msgs()) + 1)
+    cbrank->addItem(QString::number(ColMsg::last_rank(view->get_msgs()) + 1)
                        + " : "
                        + QString::number(view->get_msgs().count() + 1));
 
     // the default new one follow the last input or output or view's last msg
-    cbrank->setCurrentItem((cbrank->count() == 1) ? 0 : cbrank->count() - 2);
+    cbrank->setCurrentIndex((cbrank->count() == 1) ? 0 : cbrank->count() - 2);
 
     QSizePolicy sp = cbrank->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     cbrank->setSizePolicy(sp);
 
-    new QLabel("", grid);
-    new QLabel("", grid);
+    grid->addWidget(new QLabel("", grid));
+    grid->addWidget(new QLabel("", grid));
 
     // the operations
 
-    SmallPushButton * b = new SmallPushButton(TR("message :"), grid);
+    SmallPushButton * b;
+    grid->addWidget(b = new SmallPushButton(tr("message :"), grid));
 
     connect(b, SIGNAL(clicked()), this, SLOT(menu_op()));
 
-    edoper = new Q3ComboBox(TRUE, grid);
+    grid->addWidget(edoper = new QComboBox(grid));
+    edoper->setEditable(true);
     edoper->setAutoCompletion(completion());
 
     // gets operations
@@ -139,7 +135,7 @@ CodAddMsgDialog::CodAddMsgDialog(CodObjCanvas * from, CodObjCanvas * to,
 
     if (cl != 0) {
         cl->get_opers(opers, list);
-        edoper->insertStringList(list);
+        edoper->addItems(list);
 
         if (!cl->is_writable())
             cl = 0;
@@ -147,15 +143,16 @@ CodAddMsgDialog::CodAddMsgDialog(CodObjCanvas * from, CodObjCanvas * to,
 
     edoper->setSizePolicy(sp);
 
-    new QLabel("", grid);
-    new QLabel("", grid);
+    grid->addWidget(new QLabel("", grid));
+    grid->addWidget(new QLabel("", grid));
 
     // ok & cancel
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     ok->setDefault(TRUE);
@@ -171,7 +168,7 @@ CodAddMsgDialog::CodAddMsgDialog(CodObjCanvas * from, CodObjCanvas * to,
 
 void CodAddMsgDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -182,31 +179,34 @@ CodAddMsgDialog::~CodAddMsgDialog()
 
 void CodAddMsgDialog::menu_op()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edoper->currentText().stripWhiteSpace());
+    int index = list.indexOf(edoper->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = BrowserView::selected_item();
 
     if ((bn != 0) &&
         (bn->get_type() == UmlOperation) &&
         !bn->deletedp() &&
-        (opers.findIndex((OperationData *) bn->get_data()) != -1))
-        m.insertItem(TR("Choose operation selected in browser"), 1);
+        (opers.indexOf((OperationData *) bn->get_data()) != -1))
+        MenuFactory::addItem(m, tr("Choose operation selected in browser"), 1);
     else
         bn = 0;
 
     if (cl != 0)
-        m.insertItem(TR("Create operation and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create operation and choose it"), 2);
 
     if ((index != -1) || (bn != 0) || (cl != 0)) {
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0:
             opers[index]->get_browser_node()->select_in_browser();
             break;
@@ -223,30 +223,31 @@ void CodAddMsgDialog::menu_op()
         case 1: {
             OperationData * od = (OperationData *) bn->get_data();
 
-            if ((index = opers.findIndex(od)) == -1) {
+            if ((index = opers.indexOf(od)) == -1) {
                 index = opers.count();
                 opers.append(od);
 
                 QString s = od->definition(TRUE, FALSE);
 
                 list.append(s);
-                edoper->insertItem(s);
+                edoper->addItem(s);
             }
         }
 
-        edoper->setCurrentItem(index + 1);
+        edoper->setCurrentIndex(index + 1);
+        }
         }
     }
 }
 
 void CodAddMsgDialog::accept()
 {
-    QString s = edoper->currentText().stripWhiteSpace();
+    QString s = edoper->currentText().trimmed();
 
     if (s.isEmpty())
         return;
 
-    int index = list.findIndex(s);
+    int index = list.indexOf(s);
     const OperationData * d;
     QString e;
 
@@ -259,7 +260,7 @@ void CodAddMsgDialog::accept()
 
     s = cbrank->currentText();
 
-    ColMsg::new_one(d, e, forward, s.mid(s.find(':') + 2), in)
+    ColMsg::new_one(d, e, forward, s.mid(s.indexOf(':') + 2), in)
     ->place_in(view->get_msgs());
 
     view->update_msg_supports();
diff --git a/src/dialog/CodAddMsgDialog.h b/src/dialog/CodAddMsgDialog.h
index 884f56461..a037d3e49 100644
--- a/src/dialog/CodAddMsgDialog.h
+++ b/src/dialog/CodAddMsgDialog.h
@@ -31,9 +31,9 @@
 #include <qdialog.h>
 #include <qstringlist.h>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
-class Q3ComboBox;
+class QComboBox;
 class CodObjCanvas;
 class CodMsgSupport;
 class ColDiagramView;
@@ -49,10 +49,10 @@ class CodAddMsgDialog : public QDialog
     ColDiagramView * view;
     bool forward;
     BrowserClass * cl;
-    Q3ComboBox * cbrank;
+    QComboBox * cbrank;
     QStringList list;
-    Q3ValueList<const OperationData *> opers;
-    Q3ComboBox * edoper;
+    QList<const OperationData *> opers;
+    QComboBox * edoper;
 
     static QSize previous_size;
 
@@ -64,7 +64,7 @@ class CodAddMsgDialog : public QDialog
 protected slots:
     void menu_op();
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/CodChangeMsgDialog.cpp b/src/dialog/CodChangeMsgDialog.cpp
index c36c28bb5..a03bb8468 100644
--- a/src/dialog/CodChangeMsgDialog.cpp
+++ b/src/dialog/CodChangeMsgDialog.cpp
@@ -31,15 +31,12 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3hbox.h>
+#include <qcombobox.h>
+#include <hhbox.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include "CodChangeMsgDialog.h"
 #include "ColMsg.h"
 #include "CodMsgSupport.h"
@@ -50,34 +47,37 @@
 #include "DialogUtil.h"
 #include "BrowserView.h"
 #include "translate.h"
+#include "menufactory.h"
 
 QSize CodChangeMsgDialog::previous_size;
 
 CodChangeMsgDialog::CodChangeMsgDialog(QWidget * parent, ColMsg * m)
-    : QDialog(parent, "Communication message dialog", TRUE), msg(m)
+    : QDialog(parent/*, "Communication message dialog", TRUE*/), msg(m)
 {
-    setCaption(TR("Communicationg message dialog"));
+    setWindowTitle(tr("Communicationg message dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
-    SmallPushButton * b = new SmallPushButton(TR("message :"), this);
+    SmallPushButton * b = new SmallPushButton(tr("message :"), this);
 
     hbox->addWidget(b);
     connect(b, SIGNAL(clicked()), this, SLOT(menu_op()));
 
-    edoper = new Q3ComboBox(TRUE, this);
+    edoper = new QComboBox(this);
+    edoper->setEditable(true);
     edoper->setAutoCompletion(completion());
 
     if (msg->operation == 0)
-        edoper->insertItem(msg->explicit_operation);
+        edoper->addItem(msg->explicit_operation);
     else
-        edoper->insertItem(msg->operation->definition(TRUE, FALSE));
+        edoper->addItem(msg->operation->definition(TRUE, FALSE));
 
     CodObjCanvas * from;
     CodObjCanvas * to;
@@ -89,27 +89,28 @@ CodChangeMsgDialog::CodChangeMsgDialog(QWidget * parent, ColMsg * m)
 
     if (cl != 0) {
         cl->get_opers(opers, list);
-        edoper->insertStringList(list);
+        edoper->addItems(list);
 
         if (!cl->is_writable())
             cl = 0;
     }
 
-    edoper->setCurrentItem(0);
+    edoper->setCurrentIndex(0);
 
     QSizePolicy sp = edoper->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edoper->setSizePolicy(sp);
 
     hbox->addWidget(edoper);
 
     // ok & cancel
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     ok->setDefault(TRUE);
@@ -125,7 +126,7 @@ CodChangeMsgDialog::CodChangeMsgDialog(QWidget * parent, ColMsg * m)
 
 void CodChangeMsgDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -136,31 +137,34 @@ CodChangeMsgDialog::~CodChangeMsgDialog()
 
 void CodChangeMsgDialog::menu_op()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edoper->currentText().stripWhiteSpace());
+    int index = list.indexOf(edoper->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = BrowserView::selected_item();
 
     if ((bn != 0) &&
         (bn->get_type() == UmlOperation) &&
         !bn->deletedp() &&
-        (opers.findIndex((OperationData *) bn->get_data()) != -1))
-        m.insertItem(TR("Choose operation selected in browser"), 1);
+        (opers.indexOf((OperationData *) bn->get_data()) != -1))
+        MenuFactory::addItem(m, tr("Choose operation selected in browser"), 1);
     else
         bn = 0;
 
     if (cl != 0)
-        m.insertItem(TR("Create operation and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create operation and choose it"), 2);
 
     if ((index != -1) || (bn != 0) || (cl != 0)) {
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0:
             opers[index]->get_browser_node()->select_in_browser();
             break;
@@ -177,30 +181,31 @@ void CodChangeMsgDialog::menu_op()
         case 1: {
             OperationData * od = (OperationData *) bn->get_data();
 
-            if ((index = opers.findIndex(od)) == -1) {
+            if ((index = opers.indexOf(od)) == -1) {
                 index = opers.count();
                 opers.append(od);
 
                 QString s = od->definition(TRUE, FALSE);
 
                 list.append(s);
-                edoper->insertItem(s);
+                edoper->addItem(s);
             }
         }
 
-        edoper->setCurrentItem(index + 1);
+        edoper->setCurrentIndex(index + 1);
+        }
         }
     }
 }
 
 void CodChangeMsgDialog::accept()
 {
-    QString s = edoper->currentText().stripWhiteSpace();
+    QString s = edoper->currentText().trimmed();
 
     if (s.isEmpty())
         return;
 
-    int index = list.findIndex(s);
+    int index = list.indexOf(s);
 
     if (index >= 0) {
         msg->operation = opers[index];
diff --git a/src/dialog/CodChangeMsgDialog.h b/src/dialog/CodChangeMsgDialog.h
index 511b9e345..605d86da1 100644
--- a/src/dialog/CodChangeMsgDialog.h
+++ b/src/dialog/CodChangeMsgDialog.h
@@ -30,10 +30,9 @@
 
 #include <qdialog.h>
 #include <qstringlist.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
-class Q3ComboBox;
+class QComboBox;
 class ColMsg;
 class OperationData;
 class BrowserClass;
@@ -46,8 +45,8 @@ class CodChangeMsgDialog : public QDialog
     ColMsg * msg;
     BrowserClass * cl;
     QStringList list;
-    Q3ValueList<const OperationData *> opers;
-    Q3ComboBox * edoper;
+    QList<const OperationData *> opers;
+    QComboBox * edoper;
 
     static QSize previous_size;
 
@@ -58,7 +57,7 @@ class CodChangeMsgDialog : public QDialog
 protected slots:
     void menu_op();
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/CodEditMsgDialog.cpp b/src/dialog/CodEditMsgDialog.cpp
index 9bf2a6ce2..1d169c1fe 100644
--- a/src/dialog/CodEditMsgDialog.cpp
+++ b/src/dialog/CodEditMsgDialog.cpp
@@ -32,7 +32,7 @@
 #include <qdialog.h>
 #include <qlayout.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 #include "CodEditMsgDialog.h"
 #include "ColDiagramView.h"
@@ -42,11 +42,11 @@
 
 void CodEditMsgDialog::exec(ColDiagramView * view, ColMsgList & msgs)
 {
-    QDialog d(0, "Communication diagram message dialog", TRUE, 0);
+    QDialog d(0/*, "Communication diagram message dialog", TRUE, 0*/);
 
-    d.setCaption(TR("Communication diagram message dialog"));
+    d.setWindowTitle(QObject::tr("Communication diagram message dialog"));
 
-    Q3VBoxLayout vbox(&d);
+    QVBoxLayout vbox(&d);
 
     vbox.addWidget(new ColMsgTable(&d, view, msgs));
 
diff --git a/src/dialog/CodEditMsgDialog.h b/src/dialog/CodEditMsgDialog.h
index b8846d63d..2d60570f2 100644
--- a/src/dialog/CodEditMsgDialog.h
+++ b/src/dialog/CodEditMsgDialog.h
@@ -27,9 +27,6 @@
 
 #ifndef CODEDITMSGDIALOG_H
 #define CODEDITMSGDIALOG_H
-
-#include <q3ptrlist.h>
-
 class ColMsgList;
 class ColDiagramView;
 
diff --git a/src/dialog/ColMsgTable.cpp b/src/dialog/ColMsgTable.cpp
index 37b1c51b7..92b308531 100644
--- a/src/dialog/ColMsgTable.cpp
+++ b/src/dialog/ColMsgTable.cpp
@@ -29,7 +29,7 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qvalidator.h>
 #include <qcursor.h>
 
@@ -42,7 +42,7 @@
 #include "MyInputDialog.h"
 #include "DialogUtil.h"
 #include "translate.h"
-
+#include "QHeaderView"
 #define ABS_RANK_COL	0
 #define HI_RANK_COL	1
 #define FROM_COL	2
@@ -58,15 +58,15 @@ class MsgTableItem : public TableItem
     int align;
 
 public:
-    MsgTableItem(Q3Table * table, const QString & txt, int al = Qt::AlignLeft)
-        : TableItem(table, Never, txt), align(al | Qt::AlignVCenter) { };
+    MsgTableItem(const QString & txt, int al = Qt::AlignLeft)
+        : TableItem(Never, txt, TableItem::MsgTableItemType), align(al | Qt::AlignVCenter) { }
 
-    MsgTableItem(Q3Table * table, unsigned u, int al = Qt::AlignLeft)
-        : TableItem(table, Never, QString::number(u)), align(al | Qt::AlignVCenter) { };
+    MsgTableItem(unsigned u, int al = Qt::AlignLeft)
+        : TableItem(Never, QString::number(u), TableItem::MsgTableItemType), align(al | Qt::AlignVCenter) { }
 
-    virtual int alignment() const {
+    virtual int alignment() const override {
         return align;
-    };
+    }
 };
 
 //
@@ -79,7 +79,7 @@ class HierarchicalRankValidator : public QValidator
     HierarchicalRankValidator(QWidget * parent, const QString & h)
         : QValidator(parent), sub(h + '.') {};
 
-    virtual QValidator::State validate(QString & s, int &) const;
+    virtual QValidator::State validate(QString & s, int &) const override;
 };
 
 QValidator::State HierarchicalRankValidator::validate(QString & s, int &) const
@@ -87,7 +87,8 @@ QValidator::State HierarchicalRankValidator::validate(QString & s, int &) const
     if (s.isEmpty())
         return QValidator::Intermediate;
 
-    const char * p = s;
+    QByteArray byteArray = s.toLatin1();
+    const char * p = byteArray.constData();
 
     for (;;) {
         // digits expected
@@ -96,7 +97,7 @@ QValidator::State HierarchicalRankValidator::validate(QString & s, int &) const
             return QValidator::Intermediate;
 
         case '.':
-            return (strncmp(sub, s, sub.length()))
+            return (strncmp(sub.toLatin1().constData(), s.toLatin1().constData(), sub.length()))
                    ? QValidator::Intermediate
                    : QValidator::Invalid;
 
@@ -113,7 +114,7 @@ QValidator::State HierarchicalRankValidator::validate(QString & s, int &) const
         // '.' or end of string expected
         switch (*p) {
         case 0:
-            return (strncmp(sub, s, sub.length()))
+            return (strncmp(sub.toLatin1().constData(), s.toLatin1().constData(), sub.length()))
                    ? QValidator::Acceptable
                    : QValidator::Invalid;
 
@@ -132,27 +133,30 @@ QValidator::State HierarchicalRankValidator::validate(QString & s, int &) const
 ColMsgTable::ColMsgTable(QWidget * parent, ColDiagramView * v, ColMsgList & m)
     : MyTable(parent), rec(v->get_msgs() == m), view(v), msgs(m)
 {
-    setSorting(true);
+    //setSortingEnabled(true);
     setSelectionMode(NoSelection);	// single does not work
 
-    setNumCols(6);
+    setColumnCount(6);
 
     verticalHeader()->hide();
-    horizontalHeader()->setLabel(ABS_RANK_COL, TR("Rank"));
-    horizontalHeader()->setLabel(HI_RANK_COL, TR("Hierarchical rank"));
-    horizontalHeader()->setLabel(FROM_COL, TR("From"));
-    horizontalHeader()->setLabel(MSG_COL, TR("Message"));
-    horizontalHeader()->setLabel(TO_COL, TR("To"));
-    horizontalHeader()->setLabel(CMD_COL, TR("do"));
+    setHorizontalHeaderLabel(ABS_RANK_COL, tr("Rank"));
+    setHorizontalHeaderLabel(HI_RANK_COL, tr("Hierarchical rank"));
+    setHorizontalHeaderLabel(FROM_COL, tr("From"));
+    setHorizontalHeaderLabel(MSG_COL, tr("Message"));
+    setHorizontalHeaderLabel(TO_COL, tr("To"));
+    setHorizontalHeaderLabel(CMD_COL, tr("do"));
 
     refresh();
 
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
 }
 
-void ColMsgTable::button_pressed(int row, int col, int, const QPoint &)
+void ColMsgTable::button_pressed(const QModelIndex &index)
 {
+    int row, col;
+    row = index.row();
+    col = index.column();
     if ((( row) >= flat_msg_list.count()) || (col > CMD_COL))
         // wrong signal
         return;
@@ -162,20 +166,23 @@ void ColMsgTable::button_pressed(int row, int col, int, const QPoint &)
     else if (col <= HI_RANK_COL)
         change_ranks(row, col);
     else {
-        Q3PopupMenu m;
+        QMenu m;
 
-        MenuFactory::createTitle(m, QString(TR("rank ")) + text(row, ABS_RANK_COL)
+        MenuFactory::createTitle(m, QString(tr("rank ")) + text(row, ABS_RANK_COL)
                                  + " : " + text(row, HI_RANK_COL));
-        m.insertSeparator();
-        m.insertItem(TR("Edit message"), 1);
-        m.insertItem(TR("Change ranks"), 2);
-        m.insertSeparator();
-        m.insertItem(TR("Delete it"), 3);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Edit message"), 1);
+        MenuFactory::addItem(m, tr("Change ranks"), 2);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Delete it"), 3);
 
         if (!flat_msg_list[row]->msgs.isEmpty())
-            m.insertItem(TR("Delete recursively"), 4);
+            MenuFactory::addItem(m, tr("Delete recursively"), 4);
 
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 1:
             edit_msg(row);
 
@@ -195,6 +202,7 @@ void ColMsgTable::button_pressed(int row, int col, int, const QPoint &)
             flat_msg_list[row]->delete_it(TRUE, view->get_msgs());
             break;
         }
+        }
 
         view->update_msgs();
         refresh();
@@ -203,7 +211,7 @@ void ColMsgTable::button_pressed(int row, int col, int, const QPoint &)
 
 void ColMsgTable::refresh()
 {
-    setNumRows(0);
+    setRowCount(0);
     flat_msg_list.clear();
     refresh(msgs);
     adjustColumn(ABS_RANK_COL);
@@ -216,25 +224,22 @@ void ColMsgTable::refresh()
 
 void ColMsgTable::refresh(ColMsgList & m)
 {
-    ColMsg * msg;
-    Q3PtrListIterator<ColMsg> it(m);
-
-    for (; (msg = it.current()) != 0; ++it) {
+    foreach (ColMsg *msg, m) {
         QString def = msg->def(FALSE, TRUE, UmlView, DefaultShowContextMode);
         CodObjCanvas * from;
         CodObjCanvas * to;
-        int r = numRows();
+        int r = rowCount();
 
         msg->in->get_from_to(from, to, msg->is_forward);
 
-        setNumRows(r + 1);
+        setRowCount(r + 1);
 
-        setItem(r, ABS_RANK_COL, new MsgTableItem(this, msg->absolute_rank));
-        setItem(r, HI_RANK_COL, new MsgTableItem(this, msg->hierarchical_rank));
-        setItem(r, FROM_COL, new MsgTableItem(this, from->get_full_name()));
-        setItem(r, MSG_COL, new MsgTableItem(this, def.mid(def.find(" ") + 1)));
-        setItem(r, TO_COL, new MsgTableItem(this, to->get_full_name()));
-        setItem(r, CMD_COL, new MsgTableItem(this, TR("do"), Qt::AlignHCenter));
+        setItem(r, ABS_RANK_COL, new MsgTableItem(msg->absolute_rank));
+        setItem(r, HI_RANK_COL, new MsgTableItem(msg->hierarchical_rank));
+        setItem(r, FROM_COL, new MsgTableItem(from->get_full_name()));
+        setItem(r, MSG_COL, new MsgTableItem(def.mid(def.indexOf(" ") + 1)));
+        setItem(r, TO_COL, new MsgTableItem(to->get_full_name()));
+        setItem(r, CMD_COL, new MsgTableItem(tr("do"), Qt::AlignHCenter));
 
         flat_msg_list.append(msg);
 
@@ -253,8 +258,7 @@ void ColMsgTable::edit_msg(int row)
         QString def = msg->def(FALSE, TRUE, UmlView, DefaultShowContextMode);
 
         msg->in->update_msgs();
-        item(row, MSG_COL)->setText(def.mid(def.find(" ") + 1));
-        updateCell(row, MSG_COL);
+        item(row, MSG_COL)->setText(def.mid(def.indexOf(" ") + 1));
     }
 }
 
@@ -264,11 +268,7 @@ void ColMsgTable::save_list(ColMsgList & l, Q3PtrDict<ColMsgList> & saved)
     if (saved.find(&l) == 0) {
         saved.insert(&l, new ColMsgList(l));
 
-        Q3PtrListIterator<ColMsg> it(l);
-
-        for (; it.current(); ++it) {
-            ColMsg * m = it.current();
-
+        foreach (ColMsg *m, l) {
             save_list(m->get_msgs(), saved);
             save_list(m->in->get_msgs(), saved);
         }
@@ -281,7 +281,7 @@ void ColMsgTable::change_ranks(int row, int col)
     ColMsg * msg = flat_msg_list[row];
     HierarchicalRankValidator validator(view, msg->hierarchical_rank);
     BooL ok;
-    QString new_hr = MyInputDialog::getText(TR("Enter new hierarchical rank"), TR("Hierarchical rank : "),
+    QString new_hr = MyInputDialog::getText(tr("Enter new hierarchical rank"), tr("Hierarchical rank : "),
                                             msg->hierarchical_rank, ok,
                                             &validator);
 
@@ -305,10 +305,10 @@ void ColMsgTable::change_ranks(int row, int col)
             msg->place_in_its_support();
             ColMsg::update_ranks(view->get_msgs());
 
-            if (new_hr.find('.') != -1) {
+            if (new_hr.indexOf('.') != -1) {
                 // upper level msg dest must be msg start
                 ColMsg * upper =
-                    ColMsg::find_rec(new_hr.left(new_hr.findRev('.')), view->get_msgs());
+                    ColMsg::find_rec(new_hr.left(new_hr.lastIndexOf('.')), view->get_msgs());
 
                 if (upper == 0)
                     // error
@@ -328,7 +328,7 @@ void ColMsgTable::change_ranks(int row, int col)
             }
 
             if (msg->hierarchical_rank != new_hr) {
-                msg_warning(TR("Warning"), TR("Invalid hierarchical rank"));
+                msg_warning(tr("Warning"), tr("Invalid hierarchical rank"));
                 new_hr = old_hr;
             }
             else
@@ -339,7 +339,7 @@ void ColMsgTable::change_ranks(int row, int col)
 
         if (new_hr != old_hr) {
             refresh();
-            setCurrentCell(flat_msg_list.findIndex(msg), col);
+            setCurrentCell(flat_msg_list.indexOf(msg), col);
         }
 
 #else
diff --git a/src/dialog/ColMsgTable.h b/src/dialog/ColMsgTable.h
index 76a98c7fe..8376df742 100644
--- a/src/dialog/ColMsgTable.h
+++ b/src/dialog/ColMsgTable.h
@@ -27,11 +27,7 @@
 
 #ifndef COLMSGTABLE_H
 #define COLMSGTABLE_H
-
-#include <q3ptrdict.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-
+#include <QList>
 #include "MyTable.h"
 
 class ColMsg;
@@ -47,7 +43,7 @@ class ColMsgTable : public MyTable
     bool rec;
     ColDiagramView * view;
     ColMsgList & msgs;
-    Q3ValueList<ColMsg *> flat_msg_list;
+    QList<ColMsg *> flat_msg_list;
 
     void refresh();
     void refresh(ColMsgList & m);
@@ -62,7 +58,7 @@ class ColMsgTable : public MyTable
     ColMsgTable(QWidget * parent, ColDiagramView * v, ColMsgList & m);
 
 protected slots:
-    virtual void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    virtual void button_pressed(const QModelIndex &index);
 };
 
 #endif
diff --git a/src/dialog/ComboItem.cpp b/src/dialog/ComboItem.cpp
index d5659f543..9cce352c7 100644
--- a/src/dialog/ComboItem.cpp
+++ b/src/dialog/ComboItem.cpp
@@ -29,43 +29,32 @@
 
 
 
-#include <q3combobox.h>
+#include <qcombobox.h>
 
 #include "ComboItem.h"
 #include "DialogUtil.h"
 
-ComboItem::ComboItem(Q3Table * ta, const QString & s,
-                     const QStringList & list, bool edit)
-    : TableItem(ta, Q3TableItem::WhenCurrent, s), editable(edit), cb(0), types(list)
+
+bool ComboItem::getEditable() const
 {
-    if (editable)
-        setReplaceable(FALSE);	// sinon le combo n est pas editable (!)
+    return editable;
 }
 
-QWidget * ComboItem::createEditor() const
+void ComboItem::setEditable(bool value)
 {
-    ((ComboItem *) this)->cb = new Q3ComboBox(table()->viewport());
-    // setEditable doit etre fait maintenant sinon les items sont perdus !
-    cb->setEditable(editable);
-    cb->setAutoCompletion(completion());
-    cb->insertItem(text());
-    cb->insertStringList(types);
-
-    int index = types.findIndex(text());
-
-    if (index != -1)
-        cb->setCurrentItem(index + 1);
-
-    return cb;
+    editable = value;
 }
 
-void ComboItem::setContentFromEditor(QWidget * w)
+QStringList ComboItem::getTypes()
 {
-    Q3ComboBox * editor = qobject_cast<Q3ComboBox *>(w);
+    return types;
+}
 
-    if (editor)
-        setText(editor->currentText());
-    else
-        Q3TableItem::setContentFromEditor(w);
+ComboItem::ComboItem(const QString & s,
+                     const QStringList & list, bool edit)
+    : TableItem(TableItem::WhenCurrent, s, TableItem::ComboType), editable(edit), cb(0), types(list)
+{
+    //cb->setEditable(false);
 }
 
+
diff --git a/src/dialog/ComboItem.h b/src/dialog/ComboItem.h
index 65860823a..9b6c226c8 100644
--- a/src/dialog/ComboItem.h
+++ b/src/dialog/ComboItem.h
@@ -27,24 +27,26 @@
 
 #ifndef COMBOITEM_H
 #define COMBOITEM_H
-
+#include <QStyledItemDelegate>
 #include "MyTable.h"
+#include <QModelIndex>
 
-class Q3ComboBox;
+class QComboBox;
 
 class ComboItem : public TableItem
 {
 protected:
     bool editable;
-    Q3ComboBox * cb;
+    QComboBox * cb;
     const QStringList & types;
 
 public:
-    ComboItem(Q3Table * t, const QString & s,
+    ComboItem(const QString & s,
               const QStringList & list, bool edit = TRUE);
-
-    virtual QWidget * createEditor() const;
-    virtual void setContentFromEditor(QWidget * w);
+    bool getEditable() const;
+    void setEditable(bool value);
+    QStringList getTypes();
 };
 
+
 #endif
diff --git a/src/dialog/ComponentDialog.cpp b/src/dialog/ComponentDialog.cpp
index c64f2d8bb..6e96bb217 100644
--- a/src/dialog/ComponentDialog.cpp
+++ b/src/dialog/ComponentDialog.cpp
@@ -24,20 +24,13 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-
-
-
-
-
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qcheckbox.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-
+#include <QList>
 #include "ComponentDialog.h"
 #include "BrowserComponent.h"
 #include "SimpleData.h"
@@ -52,24 +45,24 @@
 #include "BodyDialog.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "hhbox.h"
 QSize ComponentDialog::previous_size;
 
 ComponentDialog::ComponentDialog(SimpleData * nd)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), data(nd)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), data(nd)
 {
     nd->get_browser_node()->edit_start();
 
     if (nd->get_browser_node()->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("component dialog"));
+    setWindowTitle(tr("component dialog"));
 
     BrowserComponent * bn = (BrowserComponent *) nd->get_browser_node();
 
@@ -78,27 +71,27 @@ ComponentDialog::ComponentDialog(SimpleData * nd)
     init_l_tab(rq_page, rq_stereotypefilter, &ComponentDialog::rq_stereotypeFilterActivated,
                SLOT(rq_stereotypeFilterActivated(const QString &)),
                SLOT(require_cls()), SLOT(unrequire_cls()),
-               lb_rq_available, lb_rq, rqs, TR("Required classes"));
+               lb_rq_available, lb_rq, rqs, tr("Required classes"));
     prs = bn->get_provided_classes();
     init_l_tab(pr_page, pr_stereotypefilter, &ComponentDialog::pr_stereotypeFilterActivated,
                SLOT(pr_stereotypeFilterActivated(const QString &)),
                SLOT(provide_cls()), SLOT(unprovide_cls()),
-               lb_pr_available, lb_pr, prs, TR("Provided classes"));
+               lb_pr_available, lb_pr, prs, tr("Provided classes"));
     rzs = bn->get_realizing_classes();
     init_l_tab(rz_page, rz_stereotypefilter, &ComponentDialog::rz_stereotypeFilterActivated,
                SLOT(rz_stereotypeFilterActivated(const QString &)),
                SLOT(realize_cls()), SLOT(unrealize_cls()),
-               lb_rz_available, lb_rz, rzs, TR("Realizing classes"));
+               lb_rz_available, lb_rz, rzs, tr("Realizing classes"));
 
     // USER : list key - value
 
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable((BrowserComponent *) data->get_browser_node(),
-                                 grid, !hasOkButton());
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable((BrowserComponent *) data->get_browser_node(),
+                                 grid, !hasOkButton()));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -110,7 +103,7 @@ ComponentDialog::ComponentDialog(SimpleData * nd)
 
 void ComponentDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::setsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -119,8 +112,9 @@ ComponentDialog::~ComponentDialog()
     data->get_browser_node()->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -136,40 +130,45 @@ void ComponentDialog::init_uml_tab()
     bool visit = !hasOkButton();
 
     BrowserComponent * bn = (BrowserComponent *) data->get_browser_node();
-    Q3VBox * vbox;
-    Q3Grid * grid = new Q3Grid(2, this);
+    VVBox * vbox;
+    GridBox * grid = new GridBox(2, this);
 
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(TRUE, grid);
-    edstereotype->insertItem(toUnicode(data->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(true);
+    edstereotype->addItem(toUnicode(data->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserComponent::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlComponent));
+        edstereotype->addItems(BrowserComponent::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlComponent));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    vbox = new Q3VBox(grid);
-    new QLabel(TR("description :"), vbox);
+    grid->addWidget(vbox = new VVBox(grid));
+    vbox->addWidget(new QLabel(tr("description :"), vbox));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vbox), SIGNAL(clicked()),
+    {
+        SmallPushButton* sButton;
+        connect(sButton = new SmallPushButton(tr("Editor"), vbox), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vbox->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     QFont font = comment->font();
@@ -183,73 +182,79 @@ void ComponentDialog::init_uml_tab()
     addTab(grid, "Uml");
 }
 
-void ComponentDialog::init_l_tab(Q3VBox *& page, Q3ComboBox *& stereotypefilter,
+void ComponentDialog::init_l_tab(VVBox *& page, QComboBox *& stereotypefilter,
                                  void (ComponentDialog::* filteractivated)(const QString & st),
                                  const char * slt,
                                  const char * add_slt, const char * remove_slt,
-                                 Q3ListBox *& lb_available, Q3ListBox *& lb,
-                                 const Q3ValueList<BrowserClass *> & cls,
-                                 const char * lbl)
+                                 QListWidget *& lb_available, QListWidget *& lb,
+                                 const QList<BrowserClass *> & cls,
+                                 QString lbl)
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
-    Q3VBox * vbox;
+    HHBox * hbox;
+    VVBox * vbox;
     QPushButton * button;
-
-    page = new Q3VBox(this);
+        QLabel* label;
+    page = new VVBox(this);
 
     if (!visit) {
-        hbox = new Q3HBox(page);
+        page->addWidget(hbox = new HHBox(page));
         hbox->setMargin(5);
-        new QLabel(TR("Stereotype filtering  "), hbox);
-        stereotypefilter = new Q3ComboBox(TRUE, hbox);
+        hbox->addWidget(new QLabel(tr("Stereotype filtering  "), hbox));
+        hbox->addWidget(stereotypefilter = new QComboBox(hbox));
+        stereotypefilter->setEditable(true);
         stereotypefilter->setAutoCompletion(completion());
-        stereotypefilter->insertItem("");
-        stereotypefilter->insertStringList(BrowserClass::default_stereotypes());
-        stereotypefilter->insertStringList(ProfiledStereotypes::defaults(UmlComponent));
-        stereotypefilter->setCurrentItem(0);
+        stereotypefilter->addItem("");
+        stereotypefilter->addItems(BrowserClass::default_stereotypes());
+        stereotypefilter->addItems(ProfiledStereotypes::defaults(UmlComponent));
+        stereotypefilter->setCurrentIndex(0);
         QSizePolicy sp = stereotypefilter->sizePolicy();
-        sp.setHorData(QSizePolicy::Expanding);
+        sp.setHorizontalPolicy(QSizePolicy::Expanding);
         stereotypefilter->setSizePolicy(sp);
         connect(stereotypefilter, SIGNAL(activated(const QString &)),
                 this, slt);
 
-        hbox = new Q3HBox(page);
-        vbox = new Q3VBox(hbox);
+        page->addWidget(hbox = new HHBox(page));
+        hbox->addWidget(vbox = new VVBox(hbox));
         vbox->setMargin(5);
-        (new QLabel(TR("Available classes"), vbox))->setAlignment(Qt::AlignCenter);
-        lb_available = new Q3ListBox(vbox);
-        lb_available->setSelectionMode(Q3ListBox::Multi);
+        (label = new QLabel(tr("Available classes"), vbox))->setAlignment(Qt::AlignCenter);
+        vbox->addWidget(label);
+        vbox->addWidget(lb_available = new QListWidget(vbox));
+        lb_available->setSelectionMode(QListWidget::MultiSelection);
 
-        vbox = new Q3VBox(hbox);
+        hbox->addWidget(vbox = new VVBox(hbox));
         vbox->setMargin(5);
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        button = new QPushButton(vbox);
-        button->setPixmap(*rightPixmap);
+        (label = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(label);
+        vbox->addWidget(button = new QPushButton(vbox));
+        button->setIcon(*rightPixmap);
         connect(button, SIGNAL(clicked()), this, add_slt);
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        button = new QPushButton(vbox);
-        button->setPixmap(*leftPixmap);
+        (label = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(label);
+        vbox->addWidget(button = new QPushButton(vbox));
+        button->setIcon(*leftPixmap);
         connect(button, SIGNAL(clicked()), this, remove_slt);
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        vbox = new Q3VBox(hbox);
+        (label = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(label);
+        hbox->addWidget(vbox = new VVBox(hbox));
     }
     else
         vbox = page;
 
     vbox->setMargin(5);
-    (new QLabel(lbl, vbox))->setAlignment(Qt::AlignCenter);
-    lb = new Q3ListBox(vbox);
-    lb->setSelectionMode((visit) ? Q3ListBox::NoSelection
-                         : Q3ListBox::Multi);
+    ( label = new QLabel(lbl, vbox))->setAlignment(Qt::AlignCenter);
+    vbox->addWidget(label);
+    vbox->addWidget(lb = new QListWidget(vbox));
+    lb->setSelectionMode((visit) ? QListWidget::NoSelection
+                         : QListWidget::MultiSelection);
 
-    Q3ValueList<BrowserClass *>::ConstIterator it;
+    QList<BrowserClass *>::ConstIterator it;
 
     for (it = cls.begin(); it != cls.end(); ++it)
         if (!(*it)->deletedp())
-            lb->insertItem(new ListBoxBrowserNode(*it, (*it)->full_name(TRUE)));
+            lb->addItem(new ListBoxBrowserNode(*it, (*it)->full_name(TRUE)));
 
-    lb->sort();
+    lb->sortItems();
 
     if (! visit)
         (this->*filteractivated)(QString());
@@ -262,15 +267,14 @@ void ComponentDialog::rq_stereotypeFilterActivated(const QString & st)
     lb_rq_available->clear();
 
     BrowserNodeList classes;
-    BrowserNode * cl;
 
-    BrowserClass::instances(classes, st, TRUE);
+    BrowserClass::instances(classes, st.toLatin1().constData(), TRUE);
 
-    for (cl = classes.first(); cl != 0; cl = classes.next())
-        if (rqs.findIndex((BrowserClass *) cl) == -1)
-            lb_rq_available->insertItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE)));
+    foreach (BrowserNode *cl, classes)
+        if (rqs.indexOf((BrowserClass *) cl) == -1)
+            lb_rq_available->addItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE)));
 
-    lb_rq_available->sort();
+    lb_rq_available->sortItems();
 }
 
 void ComponentDialog::pr_stereotypeFilterActivated(const QString & st)
@@ -278,15 +282,14 @@ void ComponentDialog::pr_stereotypeFilterActivated(const QString & st)
     lb_pr_available->clear();
 
     BrowserNodeList classes;
-    BrowserNode * cl;
 
-    BrowserClass::instances(classes, st, TRUE);
+    BrowserClass::instances(classes, st.toLatin1().constData(), TRUE);
 
-    for (cl = classes.first(); cl != 0; cl = classes.next())
-        if (prs.findIndex((BrowserClass *) cl) == -1)
-            lb_pr_available->insertItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE)));
+    foreach (BrowserNode *cl, classes)
+        if (prs.indexOf((BrowserClass *) cl) == -1)
+            lb_pr_available->addItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE)));
 
-    lb_pr_available->sort();
+    lb_pr_available->sortItems();
 }
 
 void ComponentDialog::rz_stereotypeFilterActivated(const QString & st)
@@ -294,152 +297,151 @@ void ComponentDialog::rz_stereotypeFilterActivated(const QString & st)
     lb_rz_available->clear();
 
     BrowserNodeList classes;
-    BrowserNode * cl;
 
-    BrowserClass::instances(classes, st, TRUE);
+    BrowserClass::instances(classes, st.toLatin1().constData(), TRUE);
 
-    for (cl = classes.first(); cl != 0; cl = classes.next())
-        if (rzs.findIndex((BrowserClass *) cl) == -1)
-            lb_rz_available->insertItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE)));
+    foreach (BrowserNode *cl, classes)
+        if (rzs.indexOf((BrowserClass *) cl) == -1)
+            lb_rz_available->addItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE)));
 
-    lb_rz_available->sort();
+    lb_rz_available->sortItems();
 }
 
 void ComponentDialog::require_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i != lb_rq_available->count()) {
-        Q3ListBoxItem * item = lb_rq_available->item(i);
+        QListWidgetItem * item = lb_rq_available->item(i);
 
-        if (item->selected()) {
+        if (item->isSelected()) {
             rqs.append((BrowserClass *)((ListBoxBrowserNode *) item)->browser_node);
-            lb_rq_available->takeItem(item);
-            lb_rq->insertItem(item);
+            lb_rq_available->takeItem(lb_rq_available->row(item));
+            lb_rq->addItem(item);
         }
         else
             i += 1;
     }
 
-    lb_rq->sort();
+    lb_rq->sortItems();
 }
 
 void ComponentDialog::unrequire_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i != lb_rq->count()) {
-        Q3ListBoxItem * item = lb_rq->item(i);
+        QListWidgetItem * item = lb_rq->item(i);
 
-        if (item->selected()) {
+        if (item->isSelected()) {
             BrowserNode * c = ((ListBoxBrowserNode *) item)->browser_node;
             QString s = item->text();
 
             delete item;
-            rqs.remove((BrowserClass *) c);
+            rqs.removeOne((BrowserClass *) c);
 
             if (rq_stereotypefilter->currentText().isEmpty() ||
                 (c->get_stereotype() == rq_stereotypefilter->currentText()))
-                lb_rq_available->insertItem(new ListBoxBrowserNode(c, s));
+                lb_rq_available->addItem(new ListBoxBrowserNode(c, s));
         }
         else
             i += 1;
     }
 
-    lb_rq_available->sort();
+    lb_rq_available->sortItems();
 }
 
 void ComponentDialog::provide_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i != lb_pr_available->count()) {
-        Q3ListBoxItem * item = lb_pr_available->item(i);
+        QListWidgetItem * item = lb_pr_available->item(i);
 
-        if (item->selected()) {
+        if (item->isSelected()) {
             prs.append((BrowserClass *)((ListBoxBrowserNode *) item)->browser_node);
-            lb_pr_available->takeItem(item);
-            lb_pr->insertItem(item);
+            lb_pr_available->takeItem(lb_pr_available->row(item));
+            lb_pr->addItem(item);
         }
         else
             i += 1;
     }
 
-    lb_pr->sort();
+    lb_pr->sortItems();
 }
 
 void ComponentDialog::unprovide_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i != lb_pr->count()) {
-        Q3ListBoxItem * item = lb_pr->item(i);
+        QListWidgetItem * item = lb_pr->item(i);
 
-        if (item->selected()) {
+        if (item->isSelected()) {
             BrowserNode * c = ((ListBoxBrowserNode *) item)->browser_node;
             QString s = item->text();
 
             delete item;
-            prs.remove((BrowserClass *) c);
+            prs.removeOne((BrowserClass *) c);
 
             if (pr_stereotypefilter->currentText().isEmpty() ||
                 (c->get_stereotype() == pr_stereotypefilter->currentText()))
-                lb_pr_available->insertItem(new ListBoxBrowserNode(c, s));
+                lb_pr_available->addItem(new ListBoxBrowserNode(c, s));
         }
         else
             i += 1;
     }
 
-    lb_pr_available->sort();
+    lb_pr_available->sortItems();
 }
 
 void ComponentDialog::realize_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i != lb_rz_available->count()) {
-        Q3ListBoxItem * item = lb_rz_available->item(i);
+        QListWidgetItem * item = lb_rz_available->item(i);
 
-        if (item->selected()) {
+        if (item->isSelected()) {
             rzs.append((BrowserClass *)((ListBoxBrowserNode *) item)->browser_node);
-            lb_rz_available->takeItem(item);
-            lb_rz->insertItem(item);
+            lb_rz_available->takeItem(lb_rz_available->row(item));
+            lb_rz->addItem(item);
         }
         else
             i += 1;
     }
 
-    lb_rz->sort();
+    lb_rz->sortItems();
 }
 
 void ComponentDialog::unrealize_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i != lb_rz->count()) {
-        Q3ListBoxItem * item = lb_rz->item(i);
+        QListWidgetItem * item = lb_rz->item(i);
 
-        if (item->selected()) {
+        if (item->isSelected()) {
             BrowserNode * c = ((ListBoxBrowserNode *) item)->browser_node;
             QString s = item->text();
 
             delete item;
-            rzs.remove((BrowserClass *) c);
+            rzs.removeOne((BrowserClass *) c);
 
             if (rz_stereotypefilter->currentText().isEmpty() ||
                 (c->get_stereotype() == rz_stereotypefilter->currentText()))
-                lb_rz_available->insertItem(new ListBoxBrowserNode(c, s));
+                lb_rz_available->addItem(new ListBoxBrowserNode(c, s));
         }
         else
             i += 1;
     }
 
-    lb_rz_available->sort();
+    lb_rz_available->sortItems();
 }
 
 void ComponentDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          data, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -453,23 +455,23 @@ void ComponentDialog::accept()
     if (!check_edits(edits) || !kvtable->check_unique())
         return;
 
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
     BrowserComponent * bn = (BrowserComponent *) data->get_browser_node();
 
     if ((s != bn->get_name()) &&
         ((BrowserNode *) bn->parent())->wrong_child_name(s, bn->get_type(),
                 bn->allow_spaces(),
                 bn->allow_empty()))
-        msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+        msg_critical(tr("Error"), edname->text() + tr("\n\nillegal name or already used"));
     else {
         bn->set_name(s);
         bn->set_comment(comment->text());
         UmlWindow::update_comment_if_needed(bn);
 
-        bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
-        Q3ValueList<BrowserClass *> rq;
-        Q3ValueList<BrowserClass *> rz;
-        Q3ValueList<BrowserClass *> pr;
+        bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
+        QList<BrowserClass *> rq;
+        QList<BrowserClass *> rz;
+        QList<BrowserClass *> pr;
 
         unsigned int i;
         unsigned int n;
@@ -493,6 +495,6 @@ void ComponentDialog::accept()
         bn->package_modified();
         data->modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
diff --git a/src/dialog/ComponentDialog.h b/src/dialog/ComponentDialog.h
index b756d60bd..a24e2b6b1 100644
--- a/src/dialog/ComponentDialog.h
+++ b/src/dialog/ComponentDialog.h
@@ -28,23 +28,14 @@
 #ifndef COMPONENTDIALOG_H
 #define COMPONENTDIALOG_H
 
-
-
-
-
-#include <q3ptrdict.h>
 #include <qmap.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
+#include <QList>
 #include "BrowserComponent.h"
 
-class Q3ComboBox;
-class Q3ListBox;
-class Q3VBox;
+class QComboBox;
+class QListWidget;
+class VVBox;
 class LineEdit;
 class MultiLineEdit;
 class SimpleData;
@@ -53,7 +44,7 @@ class FormalParamsTable;
 class ActualParamsTable;
 class BodyDialog;
 
-class ComponentDialog : public Q3TabDialog
+class ComponentDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -61,30 +52,30 @@ class ComponentDialog : public Q3TabDialog
     QWidget * umltab;
     SimpleData * data;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     // required classes
-    Q3VBox * rq_page;
-    Q3ComboBox * rq_stereotypefilter;
-    Q3ListBox * lb_rq_available;
-    Q3ListBox * lb_rq;
-    Q3ValueList<BrowserClass *> rqs;
+    VVBox * rq_page;
+    QComboBox * rq_stereotypefilter;
+    QListWidget * lb_rq_available;
+    QListWidget * lb_rq;
+    QList<BrowserClass *> rqs;
 
     // provided classes
-    Q3VBox * pr_page;
-    Q3ComboBox * pr_stereotypefilter;
-    Q3ListBox * lb_pr_available;
-    Q3ListBox * lb_pr;
-    Q3ValueList<BrowserClass *> prs;
+    VVBox * pr_page;
+    QComboBox * pr_stereotypefilter;
+    QListWidget * lb_pr_available;
+    QListWidget * lb_pr;
+    QList<BrowserClass *> prs;
 
     // realization classes
-    Q3VBox * rz_page;
-    Q3ComboBox * rz_stereotypefilter;
-    Q3ListBox * lb_rz_available;
-    Q3ListBox * lb_rz;
-    Q3ValueList<BrowserClass *> rzs;
+    VVBox * rz_page;
+    QComboBox * rz_stereotypefilter;
+    QListWidget * lb_rz_available;
+    QListWidget * lb_rz;
+    QList<BrowserClass *> rzs;
 
     // user
     KeyValuesTable * kvtable;
@@ -92,13 +83,13 @@ class ComponentDialog : public Q3TabDialog
     static QSize previous_size;
 
     void init_uml_tab();
-    void init_l_tab(Q3VBox *& page, Q3ComboBox *& stereotypefilter,
+    void init_l_tab(VVBox *& page, QComboBox *& stereotypefilter,
                     void (ComponentDialog::* filteractivated)(const QString & st),
                     const char * filter_slt,
                     const char * add_slt, const char * remove_slt,
-                    Q3ListBox *& lb_available, Q3ListBox *& lb,
-                    const Q3ValueList<BrowserClass *> & cls,
-                    const char * lbl);
+                    QListWidget *&lb_available, QListWidget *&lb,
+                    const QList<BrowserClass *> & cls,
+                    QString lbl);
 
     static void post_edit_description(ComponentDialog * d, QString s);
 
@@ -108,7 +99,7 @@ class ComponentDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
     void rq_stereotypeFilterActivated(const QString & st);
     void pr_stereotypeFilterActivated(const QString & st);
diff --git a/src/dialog/ConstraintDialog.cpp b/src/dialog/ConstraintDialog.cpp
index 7511e20c7..d1903e1d2 100644
--- a/src/dialog/ConstraintDialog.cpp
+++ b/src/dialog/ConstraintDialog.cpp
@@ -33,11 +33,9 @@
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-#include <Q3ValueList>
-
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QList>
 #include "ConstraintDialog.h"
 #include "ConstraintCanvas.h"
 #include "CdClassCanvas.h"
@@ -47,15 +45,16 @@
 #include "strutil.h"
 #include "MyTable.h"
 #include "translate.h"
+#include <QHeaderView>
 
 QSize ConstraintDialog::previous_size;
 
 ConstraintDialog::ConstraintDialog(ConstraintCanvas * c)
-    : QDialog(0, "ConstraintVisibilityDialog", TRUE, 0), constraint(c)
+    : QDialog(0/*, "ConstraintVisibilityDialog", TRUE, 0*/), constraint(c)
 {
-    setCaption(TR("Constraints visibility dialog"));
+    setWindowTitle(tr("Constraints visibility dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
@@ -63,17 +62,17 @@ ConstraintDialog::ConstraintDialog(ConstraintCanvas * c)
     vbox->addWidget(table);
     vbox->addWidget(new QLabel(this));
 
-    Q3HBoxLayout * hbox;
-
-    hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox;
 
-    cb_visible = new QCheckBox(TR("Specify visible elements rather than hidden ones"), this);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
+    cb_visible = new QCheckBox(tr("Specify visible elements rather than hidden ones"), this);
     cb_visible->setChecked(constraint->indicate_visible);
     hbox->addWidget(cb_visible);
 
-    QPushButton * showall = new QPushButton(TR("Show all"), this);
-    QPushButton * hideall = new QPushButton(TR("Hide all"), this);
-    QPushButton * hideinherited = new QPushButton(TR("Hide inherited"), this);
+    QPushButton * showall = new QPushButton(tr("Show all"), this);
+    QPushButton * hideall = new QPushButton(tr("Hide all"), this);
+    QPushButton * hideinherited = new QPushButton(tr("Hide inherited"), this);
     QSize bs = hideinherited->sizeHint();
 
     showall->setFixedSize(bs);
@@ -93,11 +92,12 @@ ConstraintDialog::ConstraintDialog(ConstraintCanvas * c)
     connect(hideinherited, SIGNAL(clicked()), this, SLOT(hide_inherited()));
 
     vbox->addWidget(new QLabel(this));
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
 
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
 
     ok->setDefault(TRUE);
     bs = cancel->sizeHint();
@@ -120,7 +120,7 @@ void ConstraintDialog::polish()
 {
     static bool first = TRUE;
 
-    QDialog::polish();
+    QDialog::ensurePolished();
 
     if (first) {
         first = FALSE;
@@ -162,75 +162,81 @@ void ConstraintDialog::accept()
 // v/h, icon, name, constraint
 
 ConstraintTable::ConstraintTable(QWidget * parent, ConstraintCanvas * c)
-    : Q3Table(c->elements.count(), 4, parent)
+    : QTableWidget(c->elements.count(), 4, parent)
 {
-    setSorting(true);
     setSelectionMode(NoSelection);
-    setRowMovingEnabled(FALSE);
-
+    //setSortingEnabled(true);
+    verticalHeader()->setSectionsMovable(false);
+    QStringList headerLabels;
+    headerLabels<<tr("visible")
+               <<" "
+              <<tr("element")
+             <<tr("constraint");
+    /*
     horizontalHeader()->setLabel(0, TR("visible"));
     horizontalHeader()->setLabel(1, " ");
     horizontalHeader()->setLabel(2, TR("element"));
     horizontalHeader()->setLabel(3, TR("constraint"));
-    setColumnStretchable(0, FALSE);
-    setColumnStretchable(1, FALSE);
-
-    int row;
+    */
+    setHorizontalHeaderLabels(headerLabels);
+    horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
+    horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive);
     bool v = c->indicate_visible;
-    Q3ValueList<BrowserNode *> & hv = c->hidden_visible;
+    QList<BrowserNode *> & hv = c->hidden_visible;
     BrowserNodeList & elts = c->elements;
-    BrowserNode * bn;
-    QString yes = TR("  yes");
-    QString empty;
+    QString yes = tr("  yes");
 
     elts.sort();
 
-    for (bn = elts.first(), row = 0; bn != 0; bn = elts.next(), row += 1) {
-        if ((v) ? hv.findIndex(bn) != -1 : hv.findIndex(bn) == -1)
-            setText(row, 0, yes);
+    int row = 0;
+    foreach (BrowserNode *bn, elts) {
+        setItem(row, 0, new QTableWidgetItem());
+        setItem(row, 1, new QTableWidgetItem());
+        if ((v) ? hv.indexOf(bn) != -1 : hv.indexOf(bn) == -1)
+            item( row, 0)->setText( yes);
 
-        setPixmap(row, 1, *(bn->pixmap(0)));
+        item(row, 1)->setIcon( *(bn->pixmap(0)));
 
         TableItem * ti;
 
-        ti = new TableItem(this, Q3TableItem::Never, bn->full_name(TRUE));
-        ti->setReplaceable(FALSE);
+        ti = new TableItem(TableItem::Never, bn->full_name(TRUE), TableItem::TableItemType);
         setItem(row, 2, ti);
 
         QString s = toUnicode(bn->constraint());
         int n = s.count('\n');
 
-        ti = new TableItem(this, Q3TableItem::Never, s);
-        ti->setReplaceable(FALSE);
+        ti = new TableItem(TableItem::Never, s, TableItem::TableItemType);
         setItem(row, 3, ti);
 
         if (n != 0) {
             // note : adjustRow(row) does nothing
             setRowHeight(row, rowHeight(row) * (n + 1));
         }
+        ++row;
     }
-
-    adjustColumn(0);
-    adjustColumn(1);
-    setColumnStretchable(2, TRUE);
-    setColumnStretchable(3, TRUE);
-
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
+    horizontalHeader()->resizeSections(QHeaderView::ResizeToContents);
+    horizontalHeader()->setSectionResizeMode(2, QHeaderView::Stretch);
+    horizontalHeader()->setSectionResizeMode(3, QHeaderView::Stretch);
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
 }
 
-void ConstraintTable::button_pressed(int row, int col, int, const QPoint &)
+void ConstraintTable::button_pressed(const QModelIndex &index)
 {
-    if (col == 0)
-        setText(row, col, (text(row, col).isEmpty()) ? TR("  yes") : QString());
+    int row, col;
+    row = index.row();
+    col = index.column();
+    if (col == 0&&item(row, col))
+        item(row, col)->setText( (item(row, col)->text().isEmpty()) ? tr("  yes") : QString());
 }
 
 void ConstraintTable::show_all()
 {
     int row;
 
-    for (row = 0; row != numRows(); row += 1)
-        setText(row, 0, TR("  yes"));
+    for (row = 0; row != rowCount(); row += 1)
+        if(item(row, 0))
+        item(row, 0)->setText( tr("  yes"));
 }
 
 void ConstraintTable::hide_all()
@@ -238,35 +244,37 @@ void ConstraintTable::hide_all()
     QString empty;
     int row;
 
-    for (row = 0; row != numRows(); row += 1)
-        setText(row, 0, empty);
+    for (row = 0; row != rowCount(); row += 1)
+        item(row, 0)->setText( empty);
 }
 
 void ConstraintTable::hide_inherited(ConstraintCanvas * c)
 {
     BrowserNode * cl = c->cl->get_bn();
     BrowserNodeList & elts = c->elements;
-    BrowserNode * bn;
-    int row;
-    QString yes = TR("  yes");
+    QString yes = tr("  yes");
     QString empty;
 
-    for (bn = elts.first(), row = 0; bn != 0; bn = elts.next(), row += 1)
-        setText(row, 0,
+    int row = 0;
+    foreach (BrowserNode *bn, elts) {
+        item(row, 0)->setText(
                 ((bn == cl) || (bn->parent() == cl)) ? yes : empty);
+        ++row;
+    }
 }
 
 void ConstraintTable::update(ConstraintCanvas * c)
 {
-    Q3ValueList<BrowserNode *> & list = c->hidden_visible;
+    QList<BrowserNode *> & list = c->hidden_visible;
     bool empty_if_visible = !c->indicate_visible;
     BrowserNodeList & elts = c->elements;
-    BrowserNode * bn;
-    int row;
 
     list.clear();
 
-    for (bn = elts.first(), row = 0; bn != 0; bn = elts.next(), row += 1)
-        if (text(row, 0).isEmpty() == empty_if_visible)
+    int row = 0;
+    foreach (BrowserNode *bn, elts) {
+        if (item(row, 0) && item(row, 0)->text().isEmpty() == empty_if_visible)
             list.append(bn);
+        ++row;
+    }
 }
diff --git a/src/dialog/ConstraintDialog.h b/src/dialog/ConstraintDialog.h
index 69f1c3c49..9e4c6150d 100644
--- a/src/dialog/ConstraintDialog.h
+++ b/src/dialog/ConstraintDialog.h
@@ -29,7 +29,7 @@
 #define CONSTRAINTDIALOG_H
 
 #include <qdialog.h>
-#include <q3table.h>
+#include <QTableWidget>
 
 #include "StringTable.h"
 #include "UmlEnum.h"
@@ -57,11 +57,11 @@ protected slots:
     void show_all();
     void hide_all();
     void hide_inherited();
-    virtual void accept();
+    virtual void accept() override;
     virtual void polish();
 };
 
-class ConstraintTable : public Q3Table
+class ConstraintTable : public QTableWidget
 {
     Q_OBJECT
 
@@ -73,7 +73,7 @@ class ConstraintTable : public Q3Table
     void update(ConstraintCanvas * c);
 
 protected slots:
-    virtual void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    virtual void button_pressed(const QModelIndex &index);
 };
 
 #endif
diff --git a/src/dialog/ContinuationDialog.cpp b/src/dialog/ContinuationDialog.cpp
index d04983afb..0d79e38d2 100644
--- a/src/dialog/ContinuationDialog.cpp
+++ b/src/dialog/ContinuationDialog.cpp
@@ -33,8 +33,8 @@
 #include <qlabel.h>
 #include <qpushbutton.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3HBoxLayout>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 
 #include "ContinuationDialog.h"
 #include "DialogUtil.h"
@@ -44,27 +44,29 @@
 QSize ContinuationDialog::previous_size;
 
 ContinuationDialog::ContinuationDialog(QString & s)
-    : QDialog(0, "continuation dialog", TRUE), name(s)
+    : QDialog(0/*, "continuation dialog", TRUE*/), name(s)
 {
-    setCaption(TR("stereotype/continuation dialog"));
+    setWindowTitle(tr("stereotype/continuation dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
     QLabel * label;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(label = new QLabel(TR("label : "), this));
+    hbox->addWidget(label = new QLabel(tr("label : "), this));
     ed = new LineEdit(name, this);
     hbox->addWidget(ed);
     ed->setFocus();
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -80,7 +82,7 @@ ContinuationDialog::ContinuationDialog(QString & s)
 
 void ContinuationDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
diff --git a/src/dialog/ContinuationDialog.h b/src/dialog/ContinuationDialog.h
index e5a574d81..df8b0c773 100644
--- a/src/dialog/ContinuationDialog.h
+++ b/src/dialog/ContinuationDialog.h
@@ -48,7 +48,7 @@ class ContinuationDialog : public QDialog
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/DecoratorDialog.cpp b/src/dialog/DecoratorDialog.cpp
index 13d0199e2..91fc50203 100644
--- a/src/dialog/DecoratorDialog.cpp
+++ b/src/dialog/DecoratorDialog.cpp
@@ -32,10 +32,10 @@
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "DecoratorDialog.h"
 #include "UmlDesktop.h"
@@ -49,11 +49,11 @@ static const char * DefaultDecorators[] = {
 };
 
 DecoratorDialog::DecoratorDialog(QWidget * parent, QString & s, bool visit)
-    : QDialog(parent, "decorator editor", TRUE), value(s)
+    : QDialog(parent/*, "decorator editor", TRUE*/), value(s)
 {
-    setCaption(TR("decorator dialog"));
+    setWindowTitle(tr("decorator dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
@@ -69,7 +69,7 @@ DecoratorDialog::DecoratorDialog(QWidget * parent, QString & s, bool visit)
         // to choose and add an decorator
 
         QLabel * label =
-            new QLabel(TR("\nTo add an decorator at the cursor position\n"
+            new QLabel(tr("\nTo add an decorator at the cursor position\n"
                           "you may select it in the list and press 'add'\n"
                           "\nSet operation static to add @staticmethod,\n"
                           "set operation abstract to add @abstractmethod\n"),
@@ -77,26 +77,27 @@ DecoratorDialog::DecoratorDialog(QWidget * parent, QString & s, bool visit)
         label->setAlignment(Qt::AlignCenter);
         vbox->addWidget(label);
 
-        Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+        QHBoxLayout * hbox = new QHBoxLayout();
+        vbox->addLayout(hbox);
         QPushButton * add_button;
 
         hbox->setMargin(5);
-        add_button = new QPushButton(TR("Add "), this);
+        add_button = new QPushButton(tr("Add "), this);
         hbox->addWidget(add_button);
         connect(add_button, SIGNAL(clicked()), this, SLOT(add_decorator()));
 
-        cb = new Q3ComboBox(FALSE, this);
+        cb = new QComboBox(this);
 
         QSizePolicy sp = cb->sizePolicy();
 
-        sp.setHorData(QSizePolicy::Expanding);
+        sp.setHorizontalPolicy(QSizePolicy::Expanding);
         cb->setSizePolicy(sp);
         cb->setAutoCompletion(completion());
 
         for (int i = 0;
              i != sizeof(DefaultDecorators) / sizeof(*DefaultDecorators);
              i += 1)
-            cb->insertItem(DefaultDecorators[i]);
+            cb->addItem(DefaultDecorators[i]);
 
         BrowserClass::instances(decorators);
 
@@ -104,7 +105,7 @@ DecoratorDialog::DecoratorDialog(QWidget * parent, QString & s, bool visit)
             QStringList list;
 
             decorators.full_names(list);
-            cb->insertStringList(list);
+            cb->addItems(list);
         }
 
         hbox->addWidget(cb);
@@ -113,10 +114,11 @@ DecoratorDialog::DecoratorDialog(QWidget * parent, QString & s, bool visit)
 
         vbox->addWidget(new QLabel("", this));
 
-        hbox = new Q3HBoxLayout(vbox);
+        hbox = new QHBoxLayout();
+        vbox->addLayout(hbox);
         hbox->setMargin(5);
-        QPushButton * accept = new QPushButton(TR("&OK"), this);
-        QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+        QPushButton * accept = new QPushButton(tr("&OK"), this);
+        QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
         QSize bs(cancel->sizeHint());
 
         accept->setDefault(TRUE);
@@ -136,10 +138,11 @@ DecoratorDialog::DecoratorDialog(QWidget * parent, QString & s, bool visit)
 
         vbox->addWidget(new QLabel("", this));
 
-        Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+        QHBoxLayout * hbox = new QHBoxLayout();
+        vbox->addLayout(hbox);
 
         hbox->setMargin(5);
-        QPushButton * close = new QPushButton(TR("&Close"), this);
+        QPushButton * close = new QPushButton(tr("&Close"), this);
 
         hbox->addWidget(close);
 
@@ -159,7 +162,7 @@ void DecoratorDialog::add_decorator()
 {
     const int ndefault =
         sizeof(DefaultDecorators) / sizeof(*DefaultDecorators);
-    int added_index = cb->currentItem();
+    int added_index = cb->currentIndex();
     QString added;
 
     if (added_index < ndefault)
@@ -169,13 +172,13 @@ void DecoratorDialog::add_decorator()
         added = cl->get_name();
     }
 
-    e->insert("@" + added + "\n");
+    e->appendPlainText("@" + added + "\n");
     e->setFocus();
 }
 
 void DecoratorDialog::accept()
 {
-    value = e->text().stripWhiteSpace();
+    value = e->text().trimmed();
 
     if (!value.isEmpty())
         value += '\n';
diff --git a/src/dialog/DecoratorDialog.h b/src/dialog/DecoratorDialog.h
index fbe12c062..3b570f80f 100644
--- a/src/dialog/DecoratorDialog.h
+++ b/src/dialog/DecoratorDialog.h
@@ -33,7 +33,7 @@
 #include "DialogUtil.h"
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class MultiLineEdit;
 
 class DecoratorDialog : public QDialog
@@ -43,7 +43,7 @@ class DecoratorDialog : public QDialog
 protected:
     QString & value;
     MultiLineEdit * e;
-    Q3ComboBox * cb;
+    QComboBox * cb;
     BrowserNodeList decorators;
 
     static QSize previous_size;
@@ -53,7 +53,7 @@ class DecoratorDialog : public QDialog
     virtual ~DecoratorDialog();
 
 protected slots:
-    virtual void accept();
+    virtual void accept() override;
     void add_decorator();
 
 
diff --git a/src/dialog/DialogTimer.cpp b/src/dialog/DialogTimer.cpp
index d475163d4..c13d379dc 100644
--- a/src/dialog/DialogTimer.cpp
+++ b/src/dialog/DialogTimer.cpp
@@ -37,11 +37,11 @@
 #include <stdio.h>
 #include <QTextStream>
 #include <qfile.h>
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 
 #include "DialogTimer.h"
 
-DialogTimer::DialogTimer(QString s, QString p, Q3TabDialog * d, post_edit pf)
+DialogTimer::DialogTimer(QString s, QString p, TabDialog *d, post_edit pf)
     : QTimer(d), current(s), path(p), dlg(d), f(pf)
 {
     connect(this, SIGNAL(timeout()), this, SLOT(readfile()));
@@ -51,28 +51,17 @@ void DialogTimer::readfile()
 {
     FILE * fp;
 
-    if ((fp = fopen((const char *) path, "rb")) != 0) {
+    if ((fp = fopen((const char *) path.toLatin1().constData(), "rb")) != 0) {
         QString result;
-
-
-
-
-
-
-
-
-
-
-
         QFile fi;
 
-        fi.open(QIODevice::ReadOnly, fp);
+        fi.open(fp, QIODevice::ReadOnly);
 
         QTextStream ts(&fi);
 
-        ts.setEncoding(QTextStream::Latin1);
+        ts.setCodec("UTF-8");
 
-        result = ts.read();
+        result = ts.readAll();
         ts.flush();
         fi.close();
 
diff --git a/src/dialog/DialogTimer.h b/src/dialog/DialogTimer.h
index 72d6c60b1..dee0ac088 100644
--- a/src/dialog/DialogTimer.h
+++ b/src/dialog/DialogTimer.h
@@ -39,11 +39,11 @@ class DialogTimer : public QTimer
 protected:
     QString current;
     QString path;
-    Q3TabDialog * dlg;
+    TabDialog * dlg;
     post_edit f;
 
 public:
-    DialogTimer(QString s, QString p, Q3TabDialog * d, post_edit pf);
+    DialogTimer(QString s, QString p, TabDialog * d, post_edit pf);
 
 protected slots:
     virtual void readfile();
diff --git a/src/dialog/DialogUtil.cpp b/src/dialog/DialogUtil.cpp
index d958e39cb..4f733764e 100644
--- a/src/dialog/DialogUtil.cpp
+++ b/src/dialog/DialogUtil.cpp
@@ -39,29 +39,29 @@
 #include <qlabel.h>
 #include <QTextStream>
 #include <qfontmetrics.h>
-#include <q3popupmenu.h>
-#include <q3tabdialog.h>
+//#include <q3popupmenu.h>
+//#include <tabdialog.h>
 #include <qapplication.h>
 #include <QWidget>
 
 //Added by qt3to4:
-#include <Q3PtrList>
-
+//
 #include "BrowserClass.h"
 #include "ClassData.h"
+
 #include "DialogUtil.h"
 #include "BodyDialog.h"
-#include "DialogTimer.h"
 #include "BrowserView.h"
-#include "MenuFont.h"
+#include "DialogTimer.h"
 #include "UmlCanvas.h"
-#include "mu.h"
 #include "KeyValueTable.h"
 #include "GenerationSettings.h"
 #include "strutil.h"
+#include "mu.h"
 #include "UmlDesktop.h"
 #include "translate.h"
-
+#include "menufactory.h"
+#include <QProcess>
 static QString DoumlEditor;
 
 SmallPushButton::SmallPushButton(const QString & text, QWidget * parent)
@@ -79,42 +79,40 @@ QSize SmallPushButton::sizeHint() const
 }
 
 MultiLineEdit::MultiLineEdit(QWidget * w, const char * name)
-    : Q3TextEdit(w, name)
+    : QPlainTextEdit(name,w)
 {
-    Q3TextEdit::setTextFormat(Qt::PlainText);
+    //QTextEdit::setTextFormat(Qt::PlainText);
 }
 
 // setText() redefinition
 void MultiLineEdit::setText(const QString & s)
 {
-    Q3TextEdit::setText(toUnicode(s));
+    QPlainTextEdit::setPlainText(s.toUtf8());
 }
 
 QString MultiLineEdit::theText() const
 {
     // no fromUnicode
-    return Q3TextEdit::text();
+    return QPlainTextEdit::toPlainText();
 }
 
 void MultiLineEdit::setTheText(const QString & s)
 {
     // no toUnicode
-    Q3TextEdit::setText(s);
+    QPlainTextEdit::setPlainText(s);
 }
 
 // text() redefinition
 QString MultiLineEdit::text() const
 {
-    QString t = Q3TextEdit::text();
+    QString t = QPlainTextEdit::toPlainText();
 
-    return fromUnicode(t);
+    return QString::fromUtf8(t.toUtf8());
 }
 
-QString MultiLineEdit::stripWhiteSpaceText() const
+QString MultiLineEdit::trimmedText() const
 {
-    QString t = Q3TextEdit::text();
-
-    return fromUnicode(t.stripWhiteSpace());
+        return QString::fromUtf8(toPlainText().trimmed().toUtf8());
 }
 
 LineEdit::LineEdit(QWidget * w)
@@ -123,14 +121,15 @@ LineEdit::LineEdit(QWidget * w)
 }
 
 LineEdit::LineEdit(const QString & s, QWidget * parent, const char * name)
-    : QLineEdit(s, parent, name)
+    : QLineEdit(s, parent/*, name*/)
 {
+    setWindowTitle(name);
 }
 
 // setText() redefinition
 void LineEdit::setText(const QString & s)
 {
-    QLineEdit::setText(toUnicode(s));
+    QLineEdit::setText(s);
 }
 
 // text() redefinition
@@ -152,10 +151,9 @@ QString LineEdit::theText() const
     // no fromUnicode
     return QLineEdit::text();
 }
-
 //
 
-void init_font_menu(Q3PopupMenu & fontsubm, UmlCanvas * canvas, int index)
+void init_font_menu(QMenu & fontsubm, UmlCanvas * canvas, int index)
 {
     int f;
 
@@ -163,14 +161,15 @@ void init_font_menu(Q3PopupMenu & fontsubm, UmlCanvas * canvas, int index)
         QString s = stringify((UmlFont) f);
         int i = 0;
 
-        while ((i = s.find('_', i)) != -1)
+        while ((i = s.indexOf('_', i)) != -1)
             s.replace(i, 1, " ");
-
-        fontsubm.insertItem(new MenuFont(s, canvas->get_font((UmlFont) f)),
-                            index++);
+        //fontsubm.insertItem(new MenuFont(s, canvas->get_font((UmlFont) f)),
+         //                   index++);
+        MenuFactory::addItem(fontsubm,s,index);
+        MenuFactory::findAction(fontsubm, index)->setFont(canvas->get_font((UmlFont) f));
+        index++;
     }
 }
-
 void same_width(QWidget * l1, QWidget * l2)
 {
     int w1 = l1->sizeHint().width();
@@ -245,41 +244,40 @@ void same_width(QWidget * l1, QWidget * l2, QWidget * l3,
     l4-> setFixedWidth(w1);
     l5-> setFixedWidth(w1);
 }
-
 void edit(const QString & s, QString name, void * id, EditType k,
-          Q3TabDialog * d, post_edit pf, Q3PtrList<BodyDialog> & edits)
+          TabDialog * d, post_edit pf, QList<BodyDialog *> & edits)
 {
     QString ed = DoumlEditor;
 
     if (!ed.isEmpty() && (pf != 0)) {
         // try to use it
         QString f;
-        QString firstProto = "%s_%lx_%d.%s";
-        QString secondProto = "%s_%lx_%d.txt";
+        QString firstProto = "%1_%2_%3.";
+        QString secondProto = "%1_%2_%3.txt";
         firstProto = firstProto.arg(name)
-                .arg(QString::number((unsigned long) id))
+                .arg(QString::number((unsigned long) id, 16))
                 .arg(QString::number((unsigned long) user_id()));
        secondProto=secondProto.arg(name)
-                .arg(QString::number((unsigned long) id))
+                .arg(QString::number((unsigned long) id, 16))
                 .arg(QString::number((unsigned long) user_id()));
         switch (k) {
         case CppEdit:
-            firstProto=firstProto.arg(GenerationSettings::get_cpp_src_extension());
+            firstProto=firstProto.append(GenerationSettings::get_cpp_src_extension());
             f=firstProto;
             break;
 
         case JavaEdit:
-            firstProto=firstProto.arg(GenerationSettings::get_java_extension());
+            firstProto=firstProto.append(GenerationSettings::get_java_extension());
             f=firstProto;
             break;
 
         case PhpEdit:
-            firstProto=firstProto.arg(GenerationSettings::get_php_extension());
+            firstProto=firstProto.append(GenerationSettings::get_php_extension());
             f=firstProto;
             break;
 
         case PythonEdit:
-            firstProto=firstProto.arg(GenerationSettings::get_python_extension());
+            firstProto=firstProto.append(GenerationSettings::get_python_extension());
             f=firstProto;
             break;
 
@@ -291,18 +289,22 @@ void edit(const QString & s, QString name, void * id, EditType k,
             if (!f[index].isLetterOrNumber())
                 f.replace(index, 1, "_");
 
-        QString path = BrowserView::get_dir().absFilePath(f);
+        QString path = BrowserView::get_dir().absoluteFilePath(f);
 
-        FILE * fp = fopen((const char *) path, "wb");
+        FILE * fp = fopen((const char *) path.toLatin1().constData(), "wb");
 
         if (fp != 0) {
             if (!s.isEmpty())
-                fputs((const char *) s, fp);
+                fputs((const char *) s.toLatin1().constData(), fp);
 
             fclose(fp);
+            ed.prepend("\"");
+            ed.append("\"");
+
+            ed += " \"" + path + "\"";
+            //(void) system(ed.toLatin1().constData());
+            QProcess::startDetached(ed);
 
-            ed += " \"" + path + "\"&";
-            (void) system(ed);
 
             if (d->hasOkButton() && (pf != 0))
                 (new DialogTimer(s, path, d, pf))->start(1000);
@@ -310,7 +312,7 @@ void edit(const QString & s, QString name, void * id, EditType k,
             return;
         }
         else
-            msg_critical("Error", TR("Cannot open '%1'", path));
+            msg_critical("Error", QObject::tr("Cannot open '%1'").arg(path));
     }
     else if (d->isModal()) {
         BodyDialog * bd = new BodyDialog(s, d, pf, k, name, edits);
@@ -321,13 +323,13 @@ void edit(const QString & s, QString name, void * id, EditType k,
         (new BodyDialog(s, d, pf, k, name, edits))->show();
 }
 
-bool check_edits(Q3PtrList<BodyDialog> & edits)
+bool check_edits(QList<BodyDialog *> & edits)
 {
     if (edits.isEmpty())
         return TRUE;
 
     return (msg_critical("Douml",
-                         TR("Sub dialog(s) still opened\n"
+                         QObject::tr("Sub dialog(s) still opened\n"
                             "If you choose 'Ok' the dialog will be closed\n"
                             "without taking into account it content"),
                          QMessageBox::Ok, QMessageBox::Abort)
@@ -338,7 +340,7 @@ AType the_type(const QString & t, const QStringList & types,
                BrowserNodeList & nodes)
 {
     AType result;
-    int rank = types.findIndex(t);
+    int rank = types.indexOf(t);
 
     if (rank != -1)
         result.type = ((BrowserClass *) nodes.at(rank));
@@ -351,7 +353,7 @@ AType the_type(const QString & t, const QStringList & types,
 QString type(const QString & t, const QStringList & types,
              BrowserNodeList & nodes)
 {
-    int rank = types.findIndex(t);
+    int rank = types.indexOf(t);
 
     return (rank != -1)
            ? QString(((BrowserClass *) nodes.at(rank))->get_name())
@@ -367,19 +369,19 @@ QString get_cpp_name(const BrowserClass * cl, ShowContextMode mode)
 
     QString name = cl->get_name();
     QString s = d->get_cppdecl();
-    int index = s.find('\n');
+    int index = s.indexOf('\n');
 
-    s = (index == -1) ? s.stripWhiteSpace()
-        : s.left(index).stripWhiteSpace();
+    s = (index == -1) ? s.trimmed()
+        : s.left(index).trimmed();
 
-    if ((index = s.find("${name}")) != -1)
+    if ((index = s.indexOf("${name}")) != -1)
         s.replace(index, 7, name);
-    else if ((index = s.find("${Name}")) != -1)
+    else if ((index = s.indexOf("${Name}")) != -1)
         s.replace(index, 7, capitalize(name));
-    else if ((index = s.find("${NAME}")) != -1)
-        s.replace(index, 7, name.upper());
-    else if ((index = s.find("${nAME}")) != -1)
-        s.replace(index, 7, name.lower());
+    else if ((index = s.indexOf("${NAME}")) != -1)
+        s.replace(index, 7, name.toUpper());
+    else if ((index = s.indexOf("${nAME}")) != -1)
+        s.replace(index, 7, name.toLower());
 
     return s;
 }
@@ -393,19 +395,19 @@ QString get_java_name(const BrowserClass * cl, ShowContextMode mode)
 
     QString name = cl->get_name();
     QString s = d->get_javadecl();
-    int index = s.find('\n');
+    int index = s.indexOf('\n');
 
-    s = (index == -1) ? s.stripWhiteSpace()
-        : s.left(index).stripWhiteSpace();
+    s = (index == -1) ? s.trimmed()
+        : s.left(index).trimmed();
 
-    if ((index = s.find("${name}")) != -1)
+    if ((index = s.indexOf("${name}")) != -1)
         s.replace(index, 7, name);
-    else if ((index = s.find("${Name}")) != -1)
+    else if ((index = s.indexOf("${Name}")) != -1)
         s.replace(index, 7, capitalize(name));
-    else if ((index = s.find("${NAME}")) != -1)
-        s.replace(index, 7, name.upper());
-    else if ((index = s.find("${nAME}")) != -1)
-        s.replace(index, 7, name.lower());
+    else if ((index = s.indexOf("${NAME}")) != -1)
+        s.replace(index, 7, name.toUpper());
+    else if ((index = s.indexOf("${nAME}")) != -1)
+        s.replace(index, 7, name.toLower());
 
     return s;
 }
@@ -419,19 +421,19 @@ QString get_php_name(const BrowserClass * cl, ShowContextMode mode)
 
     QString name = cl->get_name();
     QString s = d->get_phpdecl();
-    int index = s.find('\n');
+    int index = s.indexOf('\n');
 
-    s = (index == -1) ? s.stripWhiteSpace()
-        : s.left(index).stripWhiteSpace();
+    s = (index == -1) ? s.trimmed()
+        : s.left(index).trimmed();
 
-    if ((index = s.find("${name}")) != -1)
+    if ((index = s.indexOf("${name}")) != -1)
         s.replace(index, 7, name);
-    else if ((index = s.find("${Name}")) != -1)
+    else if ((index = s.indexOf("${Name}")) != -1)
         s.replace(index, 7, capitalize(name));
-    else if ((index = s.find("${NAME}")) != -1)
-        s.replace(index, 7, name.upper());
-    else if ((index = s.find("${nAME}")) != -1)
-        s.replace(index, 7, name.lower());
+    else if ((index = s.indexOf("${NAME}")) != -1)
+        s.replace(index, 7, name.toUpper());
+    else if ((index = s.indexOf("${nAME}")) != -1)
+        s.replace(index, 7, name.toLower());
 
     return s;
 }
@@ -445,19 +447,19 @@ QString get_python_name(const BrowserClass * cl, ShowContextMode mode)
 
     QString name = cl->get_name();
     QString s = d->get_pythondecl();
-    int index = s.find('\n');
+    int index = s.indexOf('\n');
 
-    s = (index == -1) ? s.stripWhiteSpace()
-        : s.left(index).stripWhiteSpace();
+    s = (index == -1) ? s.trimmed()
+        : s.left(index).trimmed();
 
-    if ((index = s.find("${name}")) != -1)
+    if ((index = s.indexOf("${name}")) != -1)
         s.replace(index, 7, name);
-    else if ((index = s.find("${Name}")) != -1)
+    else if ((index = s.indexOf("${Name}")) != -1)
         s.replace(index, 7, capitalize(name));
-    else if ((index = s.find("${NAME}")) != -1)
-        s.replace(index, 7, name.upper());
-    else if ((index = s.find("${nAME}")) != -1)
-        s.replace(index, 7, name.lower());
+    else if ((index = s.indexOf("${NAME}")) != -1)
+        s.replace(index, 7, name.toUpper());
+    else if ((index = s.indexOf("${nAME}")) != -1)
+        s.replace(index, 7, name.toLower());
 
     return s;
 }
@@ -471,19 +473,19 @@ QString get_idl_name(const BrowserClass * cl, ShowContextMode mode)
 
     QString name = cl->get_name();
     QString s = d->get_idldecl();
-    int index = s.find('\n');
+    int index = s.indexOf('\n');
 
-    s = (index == -1) ? s.stripWhiteSpace()
-        : s.left(index).stripWhiteSpace();
+    s = (index == -1) ? s.trimmed()
+        : s.left(index).trimmed();
 
-    if ((index = s.find("${name}")) != -1)
+    if ((index = s.indexOf("${name}")) != -1)
         s.replace(index, 7, name);
-    else if ((index = s.find("${Name}")) != -1)
+    else if ((index = s.indexOf("${Name}")) != -1)
         s.replace(index, 7, capitalize(name));
-    else if ((index = s.find("${NAME}")) != -1)
-        s.replace(index, 7, name.upper());
-    else if ((index = s.find("${nAME}")) != -1)
-        s.replace(index, 7, name.lower());
+    else if ((index = s.indexOf("${NAME}")) != -1)
+        s.replace(index, 7, name.toUpper());
+    else if ((index = s.indexOf("${nAME}")) != -1)
+        s.replace(index, 7, name.toLower());
 
     return s;
 }
@@ -539,7 +541,7 @@ void manage_alias(const BrowserNode * node,
         static char st[256];
         char * key = ((pclosed - p) > 255) ? new char[pclosed - p - 1] : st;
         QString qsvalue;
-        int keylen = pclosed - p - 2;
+        ptrdiff_t keylen = pclosed - p - 2;
 
         strncpy(key, p + 2, keylen);
         key[keylen] = 0;
@@ -549,13 +551,13 @@ void manage_alias(const BrowserNode * node,
             s += qsvalue;
         }
         else {
-            const char * value = 0;
+            QString value;
             const BrowserNode * nd = (kvt != 0)
                                      ? ((const BrowserNode *) node->parent())
                                      : node;
 
             while (nd != 0) {
-                if ((value = nd->get_value(key)) != 0)
+                if (!(value = nd->get_value(key)).isEmpty())
                     break;
 
                 nd = (BrowserNode *) nd->parent();
@@ -595,7 +597,7 @@ void manage_alias(const BrowserNode * node,
     {
         static char st[256];
         char * key = ((pclosed - p) > 255) ? new char[pclosed - p - 1] : st;
-        int keylen = pclosed - p - 2;
+        ptrdiff_t keylen = pclosed - p - 2;
 
         strncpy(key, p + 2, keylen);
         key[keylen] = 0;
@@ -606,13 +608,13 @@ void manage_alias(const BrowserNode * node,
             s += QString(kvt->get_value(key));
         }
         else {
-            const char * value = 0;
+            QString value;
             const BrowserNode * nd = (kvt != 0)
                                      ? ((const BrowserNode *) node->parent())
                                      : node;
 
             while (nd != 0) {
-                if ((value = nd->get_value(key)) != 0)
+                if (!(value = nd->get_value(key)).isEmpty())
                     break;
 
                 nd = (BrowserNode *) nd->parent();
@@ -660,7 +662,7 @@ int msg_warning(QString caption, QString text,
                 int button0, int button1, int button2)
 {
     if (UmlDesktop::nogui() && (button1 == 0)) {
-        printf("warning\n%s\n%s\n", (const char *) caption, (const char *) text);
+        printf("warning\n%s\n%s\n", (const char *) caption.toLatin1().constData(), (const char *) text.toLatin1().constData());
         return 0;
     }
 
@@ -671,7 +673,7 @@ int msg_critical(QString caption, QString text,
                  int button0, int button1, int button2)
 {
     if (UmlDesktop::nogui() && (button1 == 0)) {
-        printf("critical\n%s\n%s\n", (const char *) caption, (const char *) text);
+        printf("critical\n%s\n%s\n", (const char *) caption.toLatin1().constData(), (const char *) text.toLatin1().constData());
         return 0;
     }
 
@@ -682,13 +684,12 @@ int msg_information(QString caption, QString text,
                     int button0, int button1, int button2)
 {
     if (UmlDesktop::nogui() && (button1 == 0)) {
-        printf("information\n%s\n%s\n", (const char *) caption, (const char *) text);
+        printf("information\n%s\n%s\n", (const char *) caption.toLatin1().constData(), (const char *) text.toLatin1().constData());
         return 0;
     }
 
     return msg_msg(QMessageBox::Information, caption, text, button0, button1, button2);
 }
-
 //
 
 QString editor()
@@ -716,22 +717,21 @@ bool completion()
 }
 
 //
-
 static QWidgetList NonModalDialogs;
 
 void open_dialog(QWidget * w)
 {
-    NonModalDialogs.append(w);
+    if(!NonModalDialogs.contains(w))
+        NonModalDialogs.append(w);
 }
 
 
 void close_dialog(QWidget * w)
 {
-    NonModalDialogs.remove(w);
+    NonModalDialogs.removeOne(w);
 }
 
 QWidgetList dialogs()
 {
     return NonModalDialogs;
 }
-
diff --git a/src/dialog/DialogUtil.h b/src/dialog/DialogUtil.h
index a7396483c..55754bcd8 100644
--- a/src/dialog/DialogUtil.h
+++ b/src/dialog/DialogUtil.h
@@ -30,24 +30,23 @@
 
 #include <qpushbutton.h>
 #include <qlineedit.h>
-#include <Q3TextEdit>
+//#include <Q3TextEdit>
 #include <qmessagebox.h>
 //Added by qt3to4:
-#include <Q3PopupMenu>
+////#include <QMenu>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 #include "AType.h"
-
+#include <QPlainTextEdit>
+#include "tabdialog.h"
 class QWidget;
-class Q3PopupMenu;
-class Q3TabDialog;
-class BrowserNodeList;
-class UmlCanvas;
-class BodyDialog;
-class BrowserNode;
 class KeyValuesTable;
 class HaveKeyValueData;
+class BrowserNode;
+class BrowserNodeList;
+class BodyDialog;
+class UmlCanvas;
 
 // a push button without magin
 class SmallPushButton : public QPushButton
@@ -55,19 +54,19 @@ class SmallPushButton : public QPushButton
 public:
     SmallPushButton(const QString & text, QWidget * parent);
 
-    virtual QSize sizeHint() const;
+    virtual QSize sizeHint() const override;
 };
 
 // redefine text() to remove non latin1 characters
-class MultiLineEdit : public Q3TextEdit
+class MultiLineEdit : public QPlainTextEdit
 {
 public:
     MultiLineEdit(QWidget * w, const char * name = 0);
 
-    virtual void setText(const QString &);
-    virtual QString text() const;
+    void setText(const QString &);
+    QString text() const;
 
-    QString stripWhiteSpaceText() const;
+    QString trimmedText() const;
 
     void setTheText(const QString & s);
 
@@ -81,15 +80,15 @@ class LineEdit : public QLineEdit
     LineEdit(QWidget * w);
     LineEdit(const QString & s, QWidget * parent, const char * name = 0);
 
-    virtual void setText(const QString &);
-    virtual QString text() const;
+    void setText(const QString &);
+    QString text() const;
 
     void setTheText(const QString & s);
 
     QString theText() const;
 };
 
-extern void init_font_menu(Q3PopupMenu & fontsubm, UmlCanvas * the_canvas,
+extern void init_font_menu(QMenu & fontsubm, UmlCanvas * the_canvas,
                            int index);
 extern void same_width(QWidget *, QWidget *);
 extern void same_width(QWidget *, QWidget *, QWidget *);
@@ -98,11 +97,10 @@ extern void same_width(QWidget *, QWidget *, QWidget *, QWidget *, QWidget *);
 
 enum EditType { CppEdit, JavaEdit, PhpEdit, PythonEdit, TxtEdit };
 
-typedef void (* post_edit)(Q3TabDialog *, QString);
-
+typedef void (* post_edit)(TabDialog *, QString);
 extern void edit(const QString &, QString name, void * id, EditType k,
-                 Q3TabDialog * tbl, post_edit pf, Q3PtrList<BodyDialog> & edits);
-extern bool check_edits(Q3PtrList<BodyDialog> & edits);
+                 TabDialog * tbl, post_edit pf, QList<BodyDialog *> & edits);
+extern bool check_edits(QList<BodyDialog *> & edits);
 
 extern AType the_type(const QString & t, const QStringList & types,
                       BrowserNodeList & nodes);
@@ -131,7 +129,6 @@ extern QString get_python_name(const AType,
                                ShowContextMode mode = noContext);
 extern QString get_idl_name(const AType,
                             ShowContextMode mode = noContext);
-
 extern void manage_alias(const BrowserNode * node, const char *& p,
                          QString & s, KeyValuesTable *);
 extern void manage_alias(const BrowserNode * node, const char *& p,
@@ -146,15 +143,12 @@ extern int msg_critical(QString caption, QString text,
 extern int msg_information(QString caption, QString text,
                            int button0 = QMessageBox::Ok,
                            int button1 = 0, int button2 = 0);
-
 extern QString editor();
 extern void set_editor(QString);
 
 extern void set_completion(bool y);
 extern bool completion();
-
 extern void open_dialog(QWidget *);
 extern void close_dialog(QWidget *);
 extern QWidgetList dialogs();
-
 #endif
diff --git a/src/dialog/EdgeMenuDialog.cpp b/src/dialog/EdgeMenuDialog.cpp
index 7d9cb337c..eb8e4639c 100644
--- a/src/dialog/EdgeMenuDialog.cpp
+++ b/src/dialog/EdgeMenuDialog.cpp
@@ -28,6 +28,7 @@
 #include "Factories/EdgeMenuFactory.h"
 #include "QApplication"
 #include "QDesktopWidget"
+#include "tabdialog.h"
 unsigned int ClosestEdge(QWidget * widget, QPoint position)
 {
     QPoint widgetGlobalOrigin = widget->mapToGlobal(QPoint());
@@ -50,18 +51,21 @@ unsigned int ClosestEdge(QWidget * widget, QPoint position)
     minDistance = qMin(minDistance, distances[2]);
     minDistance = qMin(minDistance, distances[3]);
 
-    auto it = qFind(distances.begin(), distances.end(), minDistance);
+    auto it = std::find(distances.begin(), distances.end(), minDistance);
 
     return it - distances.begin();
 }
 
-EdgeMenuDialog::EdgeMenuDialog(QWidget * parent, const char * name, bool modal , Qt::WindowFlags f): Q3TabDialog(parent, name, modal, f)
+EdgeMenuDialog::EdgeMenuDialog(QWidget * parent, const char * name, bool modal , Qt::WindowFlags f)
+    : TabDialog(parent, name, modal/*, f*/)
 {
+    Q_UNUSED(f);
+    
     currentTab = 0;
     currentNode = 0;
     isConnectedToToolBar = false;
     An<EdgeMenuFactory> factory;
-    QObject::connect(this, SIGNAL(edgeMenuRequested(uint)), factory.getData(), SLOT(OnEdgeMenuRequested(uint)));
+    connect(this, SIGNAL(edgeMenuRequested(uint)), factory.getData(), SLOT(OnEdgeMenuRequested(uint)));
 }
 
 EdgeMenuDialog::~EdgeMenuDialog()
@@ -150,7 +154,6 @@ void EdgeMenuDialog::SetDialogMode(bool _isWritable)
         setOkButton(QString());
         setCancelButton(QObject::tr("Close"));
     }
-
 }
 
 void EdgeMenuDialog::OnChangeTab(int delta)
@@ -162,7 +165,6 @@ void EdgeMenuDialog::OnChangeTab(int delta)
 void EdgeMenuDialog::ChangeTab(int delta)
 {
     currentTab += delta;
-
     if (currentTab > tabBar()->count())
         currentTab = 0;
 
@@ -222,7 +224,6 @@ void EdgeMenuDialog::InitiateResize(QPoint origin)
 void EdgeMenuDialog::ResizeThis(QPoint origin, QPoint newPoint)
 {
     int newWidth;
-
     if (origin.x() > newPoint.x())
     {
         newWidth = originalSize.width() + (origin.x() - newPoint.x());
@@ -239,5 +240,4 @@ void EdgeMenuDialog::MoveThis(QPoint origin, QPoint newPoint)
 {
     QPoint difference;
     this->move(newPoint - origin + dialogOrigin);
-
 }
diff --git a/src/dialog/EdgeMenuDialog.h b/src/dialog/EdgeMenuDialog.h
index b76377387..193f7bc3c 100644
--- a/src/dialog/EdgeMenuDialog.h
+++ b/src/dialog/EdgeMenuDialog.h
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -24,7 +24,6 @@
 
 #ifndef EDGEMENUDIALOG_H
 #define EDGEMENUDIALOG_H
-#include <Q3TabDialog>
 #include <QWidget>
 #include <QMouseEvent>
 #include <QList>
@@ -32,13 +31,13 @@
 #include <QMap>
 #include "CustomWidgets/MultiPurposeDragArea.h"
 #include "edgemenudialogbase.h"
-
+#include "tabdialog.h"
 unsigned int ClosestEdge(QWidget *, QPoint);
 class BrowserNode;
 
 //! class contains some methods that make it possible to change
 //! the behaviour of Bruno's dialogs as non-intrusively as possible
-class EdgeMenuDialog : public Q3TabDialog, public EdgeMenuDialogBase
+class EdgeMenuDialog : public TabDialog, public EdgeMenuDialogBase
 {
     Q_OBJECT
 public:
@@ -48,21 +47,21 @@ class EdgeMenuDialog : public Q3TabDialog, public EdgeMenuDialogBase
 protected:
 
     //! called when user leaves the window
-    void leaveEvent(QEvent * event);
+    virtual void leaveEvent(QEvent * event) override;
 
     //! called when user enters the window
-    void enterEvent(QEvent * event) override;
+    virtual void enterEvent(QEvent * event) override;
 
-    void closeEvent(QCloseEvent *) override;
+    virtual void closeEvent(QCloseEvent *) override;
 
-    void hideEvent(QHideEvent *) override;
+    virtual void hideEvent(QHideEvent *) override;
 
-    void moveEvent(QMoveEvent *) override;
+    virtual void moveEvent(QMoveEvent *) override;
 
-    void focusOutEvent(QFocusEvent *) override;
+    virtual void focusOutEvent(QFocusEvent *) override;
 
     //! called on window show()
-    void showEvent(QShowEvent * event);
+    virtual void showEvent(QShowEvent * event) override;
     //! called when user srolls with mouse wheel
 
 
@@ -82,9 +81,9 @@ class EdgeMenuDialog : public Q3TabDialog, public EdgeMenuDialogBase
     void MoveThis(QPoint, QPoint);
     void ChangeTab(int);
 
-    virtual void IntitiateMove(QPoint);
-    virtual void InitiateResize(QPoint);
-    virtual void ResizeThis(QPoint, QPoint);
+    virtual void IntitiateMove(QPoint) override;
+    virtual void InitiateResize(QPoint) override;
+    virtual void ResizeThis(QPoint, QPoint) override;
 
     bool isWritable;
 
diff --git a/src/dialog/EnvDialog.cpp b/src/dialog/EnvDialog.cpp
index 6ac24617b..2d51eb179 100644
--- a/src/dialog/EnvDialog.cpp
+++ b/src/dialog/EnvDialog.cpp
@@ -26,559 +26,482 @@
 // *************************************************************************
 
 #include <stdlib.h>
-
 #include <qapplication.h>
 #include <qlayout.h>
-#include <q3hbox.h>
 #include <qlabel.h>
-#include <q3grid.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
-#include <q3combobox.h>
 #include <qtextcodec.h>
 #include <QTextStream>
 #include <qstringlist.h>
 #include <qdir.h>
-#include <q3filedialog.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
-
 #include "EnvDialog.h"
-#include "BrowserView.h"
 #include "HelpDialog.h"
-#include "UmlDesktop.h"
-#include "UmlWindow.h"
 #include "DialogUtil.h"
-#include "strutil.h"
 #include "codec.h"
+#include "UmlDesktop.h"
+#include "BrowserView.h"
+#include "strutil.h"
+#include "UmlWindow.h"
 #include "mu.h"
 #include "myio.h"
 #include "translate.h"
-
+#include <QVBoxLayout>
+#include <QSettings>
+#include <QComboBox>
+#include <QFileDialog>
+#if defined (WIN32) && defined (_MSC_VER)
+#ifndef popen
+#define popen _popen
+#endif
+#ifndef pclose
+#define pclose _pclose
+#endif
+#endif
 void EnvDialog::edit(bool conv, bool noid)
 {
-    EnvDialog d(conv, noid);
+        EnvDialog d(conv, noid);
 
-    if ((d.exec() != QDialog::Accepted) && conv)
-        // user close the window
-        exit(-1);
+        if ((d.exec() != QDialog::Accepted) && conv)
+                // user close the window
+                exit(-1);
 }
 
 EnvDialog::EnvDialog(bool conv, bool noid)
-    : QDialog(0, "Environment dialog", TRUE), conversion(conv)
+        : QDialog(),/*(0, "Environment dialog", TRUE),*/ conversion(conv)
 {
-    setCaption(TR("Environment dialog"));
-
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBox * htab;
-    Q3Grid * grid = new Q3Grid(2, this);
-    QPushButton * button;
-    QString s;
-
-    vbox->addWidget(grid);
-    grid->setMargin(5);
-    grid->setSpacing(5);
-
-    new QLabel(grid);
-    new QLabel(TR("MANDATORY, choose a value between 2 and 127 not used by an other person working at the same time on a project with you.\n"
-                  "To be safe, if possible choose a value not used by an other person even not working on a given project with you"),
-               grid);
-
-    new QLabel(TR("Own identifier "), grid);
-    htab = new Q3HBox(grid);
-
-    if (conv)
-        s = getenv("BOUML_ID");	// yes !
-    else if (! noid)
-        s.setNum(user_id());
-
-    ed_id = new QLineEdit(s, htab);
-
-    if (BrowserView::get_project() != 0) {
-        ed_id->setEnabled(FALSE);
-        new QLabel(TR("   The identifier can't be modified while a project is load"), htab);
-    }
-
-    //
-
-    new QLabel(grid);
-    new QLabel(TR("\nOptional, to indicate where are the HTML pages of the reference manual. Used by the help (called by the F1 key) to show the\n"
-                  "chapter corresponding to the kind of the element selected in the browser"),
-               grid);
-
-    new QLabel(TR("Manual path"), grid);
-    htab = new Q3HBox(grid);
-    ed_doc = new QLineEdit(htab);
-
-    if (!conv)
-        ed_doc->setText(manual_dir());
-
-
-
-
-
-
-
-
-
-
-
-    new QLabel(" ", htab);
-    button = new QPushButton(TR("Browse"), htab);
-    connect(button, SIGNAL(clicked()), this, SLOT(doc_browse()));
-
-    //
-
-    new QLabel(grid);
-    new QLabel(TR("\nOptional, to indicate a web navigator program. If it is not defined the reference manual will be shown with an internal simple viewer"),
-               grid);
-    new QLabel(TR("Navigator"), grid);
-    htab = new Q3HBox(grid);
-    ed_navigator = new QLineEdit(htab);
-
-    if (!conv)
-        ed_navigator->setText(navigator_path());
-
-    new QLabel(" ", htab);
-    button = new QPushButton(TR("Browse"), htab);
-    connect(button, SIGNAL(clicked()), this, SLOT(navigator_browse()));
-
-    //
-
-    new QLabel(grid);
-    new QLabel(TR("\nOptional, to indicate a template project. This allows to create new projects getting all the template project settings"),
-               grid);
-    new QLabel("Template project", grid);
-    htab = new Q3HBox(grid);
-
-    if (conv)
-        s = getenv("BOUML_TEMPLATE");	// yes !
-    else
-        s = template_project();
-
-    ed_template = new QLineEdit(s, htab);
-    new QLabel(" ", htab);
-    button = new QPushButton(TR("Browse"), htab);
-    connect(button, SIGNAL(clicked()), this, SLOT(template_browse()));
-
-    //
-
-    new QLabel(grid);
-    new QLabel(TR("\nOptional, to indicate a text editor (it must creates an own window). Else Bouml will use an internal editor"),
-               grid);
-    new QLabel(TR("Editor path "), grid);
-    htab = new Q3HBox(grid);
-
-    if (conv)
-        s = getenv("BOUML_EDITOR");	// yes !
-    else
-        s = editor();
-
-    ed_editor = new QLineEdit(s, htab);
-    new QLabel(" ", htab);
-    button = new QPushButton(TR("Browse"), htab);
-    connect(button, SIGNAL(clicked()), this, SLOT(editor_browse()));
-
-    //
-
-    new QLabel(grid);
-    new QLabel(TR("\nOptional, to choose a language for menus and dialogs (default is English). You may have to select a corresponding character set"),
-               grid);
-    new QLabel(TR("Translation file path "), grid);
-    htab = new Q3HBox(grid);
-    ed_lang = new QLineEdit(current_lang(), htab);
-    new QLabel(" ", htab);
-    button = new QPushButton(TR("Browse"), htab);
-    connect(button, SIGNAL(clicked()), this, SLOT(lang_browse()));
-
-    //
+        setWindowTitle(tr("Environment dialog"));
+
+        QVBoxLayout * vbox = new QVBoxLayout(this);
+        QHBoxLayout * htab;
+        QGridLayout * grid = new QGridLayout();
+        QPushButton * button;
+        QString s;
+        vbox->addLayout(grid);
+        grid->setMargin(5);
+        grid->setSpacing(5);
+
+        grid->addWidget(new QLabel(),1,0);
+        grid->addWidget(new QLabel(tr("MANDATORY, choose a value between 2 and 127 not used by an other person working at the same time on a project with you.\n"
+                                      "To be safe, if possible choose a value not used by an other person even not working on a given project with you")
+                                   ),1,1);
+
+        grid->addWidget(new QLabel(tr("Own identifier ")),2,0);
+        htab = new QHBoxLayout();
+        grid->addLayout(htab,2,1);
+
+        if (conv)
+                s = getenv("BOUML_ID");	// yes !
+        else if (! noid)
+                s.setNum(user_id());
+
+        ed_id = new QLineEdit(s);
+        htab->addWidget(ed_id);
+        if (BrowserView::get_project() != 0) {
+                ed_id->setEnabled(FALSE);
+                htab->addWidget(new QLabel(tr("   The identifier can't be modified while a project is load"), this));
+        }
+        //
+
+        grid->addWidget(new QLabel(),3,0);
+        grid->addWidget(new QLabel(tr("\nOptional, to indicate where are the HTML pages of the reference manual. Used by the help (called by the F1 key) to show the\n"
+                                      "chapter corresponding to the kind of the element selected in the browser")
+                                   ),3,1);
+
+        grid->addWidget(new QLabel(tr("Manual path")),4,0);
+        htab = new QHBoxLayout();
+        grid->addLayout(htab,4,1);
+        ed_doc = new QLineEdit();
+        htab->addWidget(ed_doc);
+        if (!conv)
+                ed_doc->setText(manual_dir());
+
+        htab->addWidget(new QLabel(" "));
+        button = new QPushButton(tr("Browse"));
+        htab->addWidget(button);
+        connect(button, SIGNAL(clicked()), this, SLOT(doc_browse()));
+
+        //
+
+        grid->addWidget(new QLabel(),5,0);
+        grid->addWidget(new QLabel(tr("\nOptional, to indicate a web navigator program. If it is not defined the reference manual will be shown with an internal simple viewer")),5,1);
+        grid->addWidget(new QLabel(tr("Navigator")),6,0);
+        htab = new QHBoxLayout();
+        grid->addLayout(htab,6,1);
+        ed_navigator = new QLineEdit();
+        htab->addWidget(ed_navigator);
+
+        if (!conv)
+                ed_navigator->setText(navigator_path());
+
+        htab->addWidget(new QLabel(" "));
+        button = new QPushButton(tr("Browse"));
+        htab->addWidget(button);
+        connect(button, SIGNAL(clicked()), this, SLOT(navigator_browse()));
+
+        grid->addWidget(new QLabel(),7,0);
+        grid->addWidget(new QLabel(tr("\nOptional, to indicate a template project. This allows to create new projects getting all the template project settings")),7,1);
+        grid->addWidget(new QLabel("Template project"),8,0);
+        htab = new QHBoxLayout();
+        grid->addLayout(htab,8,1);
+        if (conv)
+                s = getenv("BOUML_TEMPLATE");	// yes !
+        else
+                s = template_project();
+        ed_template = new QLineEdit(s);
+        htab->addWidget(ed_template);
+        htab->addWidget(new QLabel(" "));
+        button = new QPushButton(tr("Browse"));
+        htab->addWidget(button);
+        connect(button, SIGNAL(clicked()), this, SLOT(template_browse()));
+
+        //
+
+        grid->addWidget(new QLabel(),9,0);
+        grid->addWidget(new QLabel(tr("\nOptional, to indicate a text editor (it must creates an own window). Else DoUML will use an internal editor")),9,1);
+        grid->addWidget(new QLabel(tr("Editor path ") ),10,0);
+        htab = new QHBoxLayout();
+        grid->addLayout(htab,10,1);
+        if (conv)
+                s = getenv("BOUML_EDITOR");	// yes !
+        else
+                s = editor();
 
-    new QLabel(grid);
+        ed_editor = new QLineEdit(s);
+        htab->addWidget(ed_editor);
+        htab->addWidget(new QLabel(" "));
+        button = new QPushButton(tr("Browse"));
+        htab->addWidget(button);
+        connect(button, SIGNAL(clicked()), this, SLOT(editor_browse()));
 
+        //
 
+        grid->addWidget(new QLabel(),11,0);
+        grid->addWidget(new QLabel(tr("\nOptional, to choose a language for menus and dialogs (default is English). You may have to select a corresponding character set")),11,1);
+        grid->addWidget(new QLabel(tr("Translation file path ")),12,0);
+        htab = new QHBoxLayout();
+        grid->addLayout(htab,12,1);
+        ed_lang = new QLineEdit(current_lang());
+        htab->addWidget(ed_lang);
+        htab->addWidget(new QLabel(" "));
+        button = new QPushButton(tr("Browse"));
+        htab->addWidget(button);
+        connect(button, SIGNAL(clicked()), this, SLOT(lang_browse()));
 
 
-    new QLabel(TR("\nOptional, to indicate a character set in case you use non ISO_8859-1/latin1 characters. For instance KOI8-R or KOI8-RU for Cyrillic"),
-               grid);
+        grid->addWidget(new QLabel(),13,0);
 
-    new QLabel(TR("Character set "), grid);
-    cb_charset = new Q3ComboBox(FALSE, grid);
-    cb_charset->setAutoCompletion(completion());
 
-    QStringList l;
-    QTextCodec * co;
-    int i = 0;
 
-    l.append("");
 
-    while ((co = QTextCodec::codecForIndex(i++)) != 0) {
-        QString na = co->name();
-        int pos = 0;
+        grid->addWidget(new QLabel(tr("\nOptional, to indicate a character set in case you use non ISO_8859-1/latin1 characters. For instance KOI8-R or KOI8-RU for Cyrillic")),13,1);
 
-        while ((pos = na.find(" ", pos)) != -1)
-            na.replace(pos, 1, "_");
+        grid->addWidget(new QLabel(tr("Character set ")),14,0);
+        cb_charset = new QComboBox();
+        grid->addWidget(cb_charset,14,1);
+        cb_charset->setAutoCompletion(completion());
+        QStringList l;
+        //QTextCodec * co;
+        int i = 0;
 
-        if (QTextCodec::codecForName(na) == co)
-            l.append(na);
-    }
+        l.append("");
+        QByteArray co1;
+        while ( i<QTextCodec::availableCodecs().count()) {
+                co1 = QTextCodec::availableCodecs().at(i++);
+                QByteArray na = co1;
+                int pos = 0;
 
-    l.sort();
-    cb_charset->insertStringList(l);
+                while ((pos = na.indexOf(" ", pos)) != -1)
+                        na.replace(pos, 1, "_");
 
-    if (conv)
-        s = getenv("BOUML_CHARSET");	// yes !
-    else
-        s = codec();
+               if (QTextCodec::codecForName(na)->name() == co1)
+                l.append(na);
+        }
 
-    if (!s.isEmpty() && ((i = l.findIndex(s)) != -1))
-        cb_charset->setCurrentItem(i);
+        l.sort();
+        cb_charset->addItems(l);
+        if (conv)
+                s = getenv("BOUML_CHARSET");	// yes !
+        else
+                s = codec();
+        if(s.isEmpty())
+                s = "UTF-8";
 
-    //
+        if((i = l.indexOf(s)) != -1)
+                cb_charset->setCurrentIndex(i);
 
-    new QLabel(grid);
-    new QLabel(TR("\nIn case you have a multiple screens configuration the best for you is to ask Bouml to place by default the dialogs in one of these\n"
-                  "screens giving the area, else the dialogs will be shown on the center of the virtual screen."),
-               grid);
-    new QLabel(TR("Default screen "), grid);
+        grid->addWidget(new QLabel(),15,0);
+        grid->addWidget(new QLabel(tr("\nIn case you have a multiple screens configuration the best for you is to ask DoUML to place by default the dialogs in one of these\n"
+                                      "screens giving the area, else the dialogs will be shown on the center of the virtual screen.")),15,1);
+        grid->addWidget(new QLabel(tr("Default screen ")),16,0);
 
-    QString x0, y0, x1, y1;
-    int top, left, bottom, right;
+        QString x0, y0, x1, y1;
+        int top, left, bottom, right;
 
-    if (conv) {
-        const char * limits = getenv("BOUML_LIMIT_DESKTOP"); // yes !
+        if (conv) {
+                const char * limits = getenv("BOUML_LIMIT_DESKTOP"); // yes !
 
-        if ((limits != 0) &&
-            (sscanf(limits, "%d,%d,%d,%d", &left, &top, &right, &bottom) == 4)) {
-            x0.setNum(left);
-            y0.setNum(top);
-            x1.setNum(right);
-            y1.setNum(bottom);
+                if ((limits != 0) &&
+                                (sscanf(limits, "%d,%d,%d,%d", &left, &top, &right, &bottom) == 4)) {
+                        x0.setNum(left);
+                        y0.setNum(top);
+                        x1.setNum(right);
+                        y1.setNum(bottom);
+                }
+        }
+        else {
+                int top, left, bottom, right;
+
+                UmlDesktop::limits(left, top, right, bottom);
+                x0.setNum(left);
+                y0.setNum(top);
+                x1.setNum(right);
+                y1.setNum(bottom);
+        }
+        htab = new QHBoxLayout();
+        grid->addLayout(htab,16,1);
+        htab->addWidget(new QLabel(tr("left: ")));
+        ed_xmin = new QLineEdit(x0);
+        htab->addWidget(ed_xmin);
+        htab->addWidget(new QLabel(tr("      top: ")));
+        ed_ymin = new QLineEdit(y0);
+        htab->addWidget(ed_ymin);
+        htab->addWidget(new QLabel(tr("      right: ")));
+        ed_xmax = new QLineEdit(x1);
+        htab->addWidget(ed_xmax);
+        htab->addWidget(new QLabel(tr("      bottom: ")));
+        ed_ymax = new QLineEdit(y1);
+        htab->addWidget(ed_ymax);
+
+        //
+
+        grid->addWidget(new QLabel(),17,0);
+        htab = new QHBoxLayout();
+        grid->addLayout(htab,17,1);
+        htab->addWidget(new QLabel());
+
+        button = new QPushButton(tr("OK"));
+        htab->addWidget(button);
+        connect(button, SIGNAL(clicked()), this, SLOT(accept()));
+        htab->addWidget(new QLabel());
+
+        if (! conv) {
+                button = new QPushButton(tr("Cancel"));
+                htab->addWidget(button);
+                connect(button, SIGNAL(clicked()), this, SLOT(reject()));
+                htab->addWidget(new QLabel());
         }
-    }
-    else {
-        int top, left, bottom, right;
-
-        UmlDesktop::limits(left, top, right, bottom);
-        x0.setNum(left);
-        y0.setNum(top);
-        x1.setNum(right);
-        y1.setNum(bottom);
-    }
 
-    htab = new Q3HBox(grid);
-    new QLabel(TR("left: "), htab);
-    ed_xmin = new QLineEdit(x0, htab);
-    new QLabel(TR("      top: "), htab);
-    ed_ymin = new QLineEdit(y0, htab);
-    new QLabel(TR("      right: "), htab);
-    ed_xmax = new QLineEdit(x1, htab);
-    new QLabel(TR("      bottom: "), htab);
-    ed_ymax = new QLineEdit(y1, htab);
-
-    //
-
-    new QLabel(grid);
-    htab = new Q3HBox(grid);
-    new QLabel(htab);
-    connect(new QPushButton(TR("OK"), htab), SIGNAL(clicked()), this, SLOT(accept()));
-    new QLabel(htab);
-
-    if (! conv) {
-        connect(new QPushButton(TR("Cancel"), htab), SIGNAL(clicked()), this, SLOT(reject()));
-        new QLabel(htab);
-    }
 }
 
 static void setCoord(int & v, BooL & ok, QLineEdit * ed)
 {
-    if (ed->text().isEmpty()) {
-        v = 0;
-        ok = TRUE;
-    }
-    else {
-        bool yes = ok;
+        if (ed->text().isEmpty()) {
+                v = 0;
+                ok = TRUE;
+        }
+        else {
+                bool yes = ok;
 
-        v = ed->text().toInt(&yes);
-        ok = yes;
-    }
+                v = ed->text().toInt(&yes);
+                ok = yes;
+        }
 }
 
 void EnvDialog::accept()
 {
-    int id;
-
-    if (ed_id->text().isEmpty() ||
-        (sscanf((const char *) ed_id->text(), "%d", &id) != 1) ||
-        (id < 2) ||
-        (id > 127)) {
-        QMessageBox::critical(this, "Douml", TR("Invalid identifier, must be an integer between 2 and 127"));
-        return;
-    }
+        int id;
 
-    int l, t, r, b;
-    BooL ok_l, ok_t, ok_r, ok_b;
+        if (ed_id->text().isEmpty() ||
+                        (sscanf((const char *) ed_id->text().toLatin1().constData(), "%d", &id) != 1) ||
+                        (id < 2) ||
+                        (id > 127)) {
+                QMessageBox::critical(this, "Douml", QObject::tr("Invalid identifier, must be an integer between 2 and 127"));
+                return;
+        }
 
-    setCoord(l, ok_l, ed_xmin);
-    setCoord(t, ok_t, ed_ymin);
-    setCoord(r, ok_r, ed_xmax);
-    setCoord(b, ok_b, ed_ymax);
+        int l, t, r, b;
+        BooL ok_l, ok_t, ok_r, ok_b;
 
-    if (ok_l && ok_t && ok_r && ok_b) {
-        if ((l < 0) || (t < 0) || (r < 0) || (b < 0)) {
-            QMessageBox::critical(this, "Douml",
-                                  TR("Invalid DEFAULT SCREEN : coordinates can't be negative"));
-            return;
-        }
-        else if ((l != 0) || (t != 0) || (r != 0) || (b != 0)) {
-            if (r <= l) {
-                QMessageBox::critical(this, "Douml",
-                                      TR("Invalid DEFAULT SCREEN : the right must be greater than the left"));
-                return;
-            }
+        setCoord(l, ok_l, ed_xmin);
+        setCoord(t, ok_t, ed_ymin);
+        setCoord(r, ok_r, ed_xmax);
+        setCoord(b, ok_b, ed_ymax);
 
-            if (b <= t) {
+        if (ok_l && ok_t && ok_r && ok_b) {
+                if ((l < 0) || (t < 0) || (r < 0) || (b < 0)) {
+                        QMessageBox::critical(this, "Douml",
+                                              QObject::tr("Invalid DEFAULT SCREEN : coordinates can't be negative"));
+                        return;
+                }
+                else if ((l != 0) || (t != 0) || (r != 0) || (b != 0)) {
+                        if (r <= l) {
+                                QMessageBox::critical(this, "Douml",
+                                                      QObject::tr("Invalid DEFAULT SCREEN : the right must be greater than the left"));
+                                return;
+                        }
+
+                        if (b <= t) {
+                                QMessageBox::critical(this, "Douml",
+                                                      QObject::tr("Invalid DEFAULT SCREEN : the bottom must be greater than the top"));
+                                return;
+                        }
+
+                        if ((r - l) < 500)
+                                QMessageBox::warning(this, "Douml",
+                                                     QObject::tr("small DEFAULT SCREEN, width less than 500 points !"));
+
+                        if ((b - t) < 500)
+                                QMessageBox::warning(this, "Douml",
+                                                     QObject::tr("small DEFAULT SCREEN, height less than 500 points !"));
+                }
+        }
+        else {
                 QMessageBox::critical(this, "Douml",
-                                      TR("Invalid DEFAULT SCREEN : the bottom must be greater than the top"));
+                                      QObject::tr("Invalid DEFAULT SCREEN"
+                                         "To not specify the desktop all values must be empty or null."
+                                         "Else the values must be non negative, the right must be greater\n"
+                                         "than the left, and the bottom must be greater than the top"));
                 return;
-            }
-
-            if ((r - l) < 500)
-                QMessageBox::warning(this, "Douml",
-                                     TR("small DEFAULT SCREEN, width less than 500 points !"));
-
-            if ((b - t) < 500)
-                QMessageBox::warning(this, "Douml",
-                                     TR("small DEFAULT SCREEN, height less than 500 points !"));
         }
-    }
-    else {
-        QMessageBox::critical(this, "Douml",
-                              TR("Invalid DEFAULT SCREEN"
-                                 "To not specify the desktop all values must be empty or null."
-                                 "Else the values must be non negative, the right must be greater\n"
-                                 "than the left, and the bottom must be greater than the top"));
-        return;
-    }
-
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = homeDir().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "w");
-
-
-
-
-
 
-
-
-
-
-
-
-
-
-
-
-
-
-    if (fp == 0) {
-        QMessageBox::critical(this, "Douml", "cannot write in '" + s + "'");
-
-        if (conversion)
-            exit(-1);
-        else
-            return;
-    }
-
-    fprintf(fp, "ID %d\n", id);
-
-    if (! ed_doc->text().isEmpty())
-        fprintf(fp, "MANUAL %s\n", (const char *) ed_doc->text());
-
-    if (! ed_navigator->text().isEmpty())
-        fprintf(fp, "NAVIGATOR %s\n", (const char *) ed_navigator->text());
-
-    if (! ed_template->text().isEmpty())
-        fprintf(fp, "TEMPLATE %s\n", (const char *) ed_template->text());
-
-    if (! ed_editor->text().isEmpty())
-        fprintf(fp, "EDITOR %s\n", (const char *) ed_editor->text());
-
-    if (! ed_lang->text().isEmpty())
-        fprintf(fp, "LANG %s\n", (const char *) ed_lang->text());
-    else
-        fputs("NOLANG\n", fp);
-
-    if (! cb_charset->currentText().isEmpty())
-        fprintf(fp, "CHARSET %s\n", (const char *) cb_charset->currentText());
-
-    if (!ed_xmin->text().isEmpty() &&
-        !ed_xmax->text().isEmpty() &&
-        !ed_ymin->text().isEmpty() &&
-        !ed_ymax->text().isEmpty()) {
-        fprintf(fp, "DESKTOP %d %d %d %d\n", l, t, r, b);
-    }
-
-    fclose(fp);
-
-    QDialog::accept();
+        QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+        settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+        settings.setValue("Main/id", id);
+        settings.setValue("Main/manual", ed_doc->text());
+        settings.setValue("Main/navigator", ed_navigator->text());
+        settings.setValue("Main/template", ed_template->text());
+        settings.setValue("Main/editor", ed_editor->text());
+        settings.setValue("Main/lang", ed_lang->text());
+        settings.setValue("Main/encoding", cb_charset->currentText());
+        settings.setValue("Desktop/left", l);
+        settings.setValue("Desktop/right", r);
+        settings.setValue("Desktop/top", t);
+        settings.setValue("Desktop/bottom", b);
+
+        QDialog::accept();
 }
 
 void EnvDialog::reject()
 {
-    if (!conversion)
-        QDialog::reject();
+        if (!conversion)
+                QDialog::reject();
 }
 
 void EnvDialog::doc_browse()
 {
-    QString s =
-        Q3FileDialog::getExistingDirectory(ed_doc->text(), this, 0,
-                                           TR("documentation directory"));
+        QString s =
+                        QFileDialog::getExistingDirectory(this,tr("documentation directory"),ed_doc->text(),  0);
 
-    if (! s.isNull())
-        ed_doc->setText(s);
+        if (! s.isNull())
+                ed_doc->setText(s);
 }
 
 void EnvDialog::navigator_browse()
 {
-    QString s =
-        Q3FileDialog::getOpenFileName(ed_navigator->text(),
-
-
-
-                                      "",
+        QString s =
+                        QFileDialog::getOpenFileName(this,"",ed_navigator->text());
 
-                                      this);
-
-    if (! s.isNull())
-        ed_navigator->setText(s);
+        if (! s.isNull())
+                ed_navigator->setText(s);
 }
 
 void EnvDialog::template_browse()
 {
-    QString s =
-        Q3FileDialog::getOpenFileName(ed_template->text(), "*.prj", this);
+        QString s =
+                        QFileDialog::getOpenFileName(this, "*.prj", ed_template->text());
 
-    if (! s.isNull())
-        ed_template->setText(s);
+        if (! s.isNull())
+                ed_template->setText(s);
 }
 
 void EnvDialog::editor_browse()
 {
-    QString s =
-        Q3FileDialog::getOpenFileName(ed_editor->text(),
-
-
-
-                                      "",
-
-                                      this);
+        QString s =
+                        QFileDialog::getOpenFileName(this,"",ed_editor->text());
 
-    if (! s.isNull())
-        ed_editor->setText(s);
+        if (! s.isNull())
+                ed_editor->setText(s);
 }
 
 static QString lang_file()
 {
-    QString lang;
-
-
-
-
-
-
-
-
-
-
-
+        QString lang;
 
+        lang = getenv("LANG");
 
-
-
-
-
-
-
-
-
-    lang = getenv("LANG");
-
-    if ((lang.length() > 3) && (lang[2] == '_')) {
-        if (lang.lower() == "pt_br")
-            lang = "pt_br";
-        else
-            lang = lang.left(2);
-    }
-    else {
-        lang = "";
-
-        FILE * fp = popen("locale", "r");
-
-        if (fp != 0) {
-            char l[64];
-
-            while (fgets(l, sizeof(l), fp)) {
-                if (!strncmp(l, "LC_", 3)) {
-                    char * p = strstr(l + 3, "=\"");
-
-                    if (p != 0)
-                        lang = p + 2;
-                    else if ((p = strchr(l + 3, '=')) != 0)
-                        lang = p + 1;
-                }
-
-                if ((lang.length() > 4) && (lang.left(5).lower() == "pt_br")) {
-                    lang = lang.left(5);
-                    break;
-                }
-                else if ((lang.length() > 3) && (lang[2] == '_')) {
-                    lang = lang.left(2);
-                    break;
-                }
+        if ((lang.length() > 3) && (lang[2] == '_')) {
+                if (lang.toLower() == "pt_br")
+                        lang = "pt_br";
                 else
-                    lang = "";
-            }
-
-            pclose(fp);
+                        lang = lang.left(2);
+        }
+        else {
+                lang = "";
+
+                FILE * fp = popen("locale", "r");
+
+                if (fp != 0) {
+                        char l[64];
+
+                        while (fgets(l, sizeof(l), fp)) {
+                                if (!strncmp(l, "LC_", 3)) {
+                                        char * p = strstr(l + 3, "=\"");
+
+                                        if (p != 0)
+                                                lang = p + 2;
+                                        else if ((p = strchr(l + 3, '=')) != 0)
+                                                lang = p + 1;
+                                }
+
+                                if ((lang.length() > 4) && (lang.left(5).toLower() == "pt_br")) {
+                                        lang = lang.left(5);
+                                        break;
+                                }
+                                else if ((lang.length() > 3) && (lang[2] == '_')) {
+                                        lang = lang.left(2);
+                                        break;
+                                }
+                                else
+                                        lang = "";
+                        }
+
+                        pclose(fp);
+                }
         }
-    }
 
 
-    if (! lang.isEmpty()) {
-        lang = lang.lower() + ".lang";
+        if (! lang.isEmpty()) {
+                lang = lang.toLower() + ".lang";
 
-        QString p = getenv("BOUML_LIB_DIR");
+                QString p = getenv("BOUML_LIB_DIR");
 
-        if (!p.isEmpty())
-            lang = p + "/" + lang;
+                if (!p.isEmpty())
+                        lang = p + "/" + lang;
 
-    }
+        }
 
-    return lang;
+        return lang;
 }
 
 void EnvDialog::lang_browse()
 {
-    QString s =
-        Q3FileDialog::getOpenFileName((ed_lang->text().isEmpty())
-                                      ? lang_file() : ed_lang->text(),
-                                      "*.lang", this);
+        QString s =
+                        QFileDialog::getOpenFileName(this,"*.lang",(ed_lang->text().isEmpty())
+                                                     ? lang_file() : ed_lang->text());
 
-    if (! s.isNull())
-        ed_lang->setText(s);
+        if (! s.isNull())
+                ed_lang->setText(s);
 }
 
 //
 
-static void propose_lang()
+/*static void propose_lang()
 {
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
+    // note : QFile fp(QDir::home().absoluteFilePath(".doumlrc")) doesn't work
     // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = homeDir().absFilePath(".doumlrc");
+    QString s = homeDir().absoluteFilePath(".doumlrc");
     FILE * fp = fopen((const char *) s, "a");
 
     if (fp != 0) {
@@ -594,93 +517,47 @@ static void propose_lang()
                 fclose(fp);
                 set_lang((const char *) lang);
                 msg_warning(TR("language"),
-                            TR("the used language for menus and dialogs was set automatically,\n"
+                            QObject::tr("the used language for menus and dialogs was set automatically,\n"
                                "you can change it through the environment dialog"));
             }
         }
         else
             fclose(fp);
     }
-}
+}*/
 
 int read_doumlrc()
 {
-    // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-
-    if (fp == 0) {
-        QMessageBox::critical(0, "Douml", TR("cannot read '%1'", s));
-        exit(-1);
-    }
-
-    set_manual_dir("");
-    set_navigator_path("");
-    set_template_project("");
-    set_editor("");
-    set_codec("UTF-8");
-    QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
-
-    UmlDesktop::set_limits(0, 0, 0, 0);
-
-    int id = -1;
-    char line[512];
-    bool lang_set = FALSE;
-    bool nolang = FALSE;
-
-    while (fgets(line, sizeof(line) - 1, fp) != 0) {
-        remove_crlf(line);
-
-        if (!strncmp(line, "ID ", 3))
-            sscanf(line + 3, "%d", &id);
-        else if (!strncmp(line, "MANUAL ", 7))
-            set_manual_dir(line + 7);
-        else if (!strncmp(line, "NAVIGATOR ", 10))
-            set_navigator_path(line + 10);
-        else if (!strncmp(line, "TEMPLATE ", 9))
-            set_template_project(line + 9);
-        else if (!strncmp(line, "EDITOR ", 7))
-            set_editor(line + 7);
-        else if (!strncmp(line, "CHARSET ", 8))
+        QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
+        settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+        int id = settings.value("Main/id", -1).toInt();
+        set_manual_dir(settings.value("Main/manual", "").toString());
+        set_navigator_path(settings.value("Main/navigator", "").toString());
+        set_editor(settings.value("Main/editor", "").toString());
+        set_template_project(settings.value("Main/template", "").toString());
+        set_lang(settings.value("Main/lang").toString());
+        QString s = settings.value("Main/encoding", "UTF-8").toString();
+        set_codec(s);
+        QTextCodec::setCodecForLocale(QTextCodec::codecForName(s.toLatin1()));
+        int l, t, r, b;
+        l = settings.value("Desktop/left", -1).toInt();
+        r = settings.value("Desktop/right", -1).toInt();
+        t = settings.value("Desktop/top", -1).toInt();
+        b = settings.value("Desktop/bottom", -1).toInt();
+        if(l != -1 && r != -1 && t != -1 && b != -1)
         {
-            set_codec(line + 8);
-            QSettings settings("settings.ini", QSettings::IniFormat);
-            settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
-            settings.setValue("Main/encoding", QString(line + 8));
-            settings.sync();
-            QTextCodec::setCodecForTr(QTextCodec::codecForName(line + 8));
-            QTextCodec::setCodecForLocale(QTextCodec::codecForName(line + 8));
-        }
-        else if (!strncmp(line, "DESKTOP ", 8)) {
-            int l, t, r, b;
-
-            if (sscanf(line + 8, "%d %d %d %d", &l, &t, &r, &b) == 4)
                 UmlDesktop::set_limits(l, t, r, b);
         }
-        else if (!strncmp(line, "LANG ", 5)) {
-            set_lang(line + 5);
-            lang_set = TRUE;
-        }
-        else if (!strncmp(line, "NOLANG", 6)) {
-            nolang = TRUE;
+        else
+        {
+                UmlDesktop::set_limits(0, 0, 0, 0);
         }
-    }
-
-    fclose(fp);
 
-    if (! lang_set) {
-        set_lang("");
-
-        if (! nolang)
-            propose_lang();
-    }
-
-    if (id == -1) {
-        QMessageBox::critical(0, "Douml", TR("Own identifier missing or invalid"));
-        EnvDialog::edit(FALSE, TRUE);
-        return read_doumlrc();
-    }
+        if (id == -1) {
+                QMessageBox::critical(0, "Douml", QObject::tr("Own identifier missing or invalid"));
+                EnvDialog::edit(FALSE, TRUE);
+                return read_doumlrc();
+        }
 
-    return id;
+        return id;
 }
diff --git a/src/dialog/EnvDialog.h b/src/dialog/EnvDialog.h
index b0692d22c..c566f3c10 100644
--- a/src/dialog/EnvDialog.h
+++ b/src/dialog/EnvDialog.h
@@ -28,10 +28,10 @@
 #ifndef ENVDIALOG_H
 #define ENVDIALOG_H
 
-#include <qdialog.h>
+#include <QDialog>
 
 class QLineEdit;
-class Q3ComboBox;
+class QComboBox;
 
 // singleton
 
@@ -52,15 +52,15 @@ class EnvDialog : public QDialog
     QLineEdit * ed_template;
     QLineEdit * ed_editor;
     QLineEdit * ed_lang;
-    Q3ComboBox * cb_charset;
+    QComboBox * cb_charset;
     QLineEdit * ed_xmin;
     QLineEdit * ed_xmax;
     QLineEdit * ed_ymin;
     QLineEdit * ed_ymax;
 
 private slots:
-    virtual void accept();
-    virtual void reject();
+    virtual void accept() override;
+    virtual void reject() override;
     void doc_browse();
     void navigator_browse();
     void template_browse();
diff --git a/src/dialog/ExpansionRegionDialog.cpp b/src/dialog/ExpansionRegionDialog.cpp
index c2cadd245..55f354040 100644
--- a/src/dialog/ExpansionRegionDialog.cpp
+++ b/src/dialog/ExpansionRegionDialog.cpp
@@ -29,13 +29,12 @@
 
 
 
-#include <q3grid.h>
+#include <gridbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qcheckbox.h>
-#include <q3vbox.h>
-
+#include <vvbox.h>
 #include "ExpansionRegionDialog.h"
 #include "ExpansionRegionData.h"
 #include "BrowserExpansionRegion.h"
@@ -47,93 +46,99 @@
 #include "strutil.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "hhbox.h"
 QSize ExpansionRegionDialog::previous_size;
 
 ExpansionRegionDialog::ExpansionRegionDialog(ExpansionRegionData * nd)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), data(nd)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), data(nd)
 {
     nd->browser_node->edit_start();
 
     if (nd->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("Expansion Region dialog"));
+    setWindowTitle(tr("Expansion Region dialog"));
 
     bool visit = !hasOkButton();
 
     // general tab
 
     BrowserNode * bn = data->get_browser_node();
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(data->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(data->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserExpansionRegion::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlExpansionRegion));
+        edstereotype->addItems(BrowserExpansionRegion::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlExpansionRegion));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    new QLabel(TR("mode :"), grid);
-    htab = new Q3HBox(grid);
-    edmode = new Q3ComboBox(FALSE, htab);
+    grid->addWidget(new QLabel(tr("mode :"), grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(edmode = new QComboBox(htab));
 
     UmlExpansionKind m = data->get_mode();
 
-    edmode->insertItem(stringify(m));
+    edmode->addItem(stringify(m));
 
     if (! visit) {
         if (m != UmlParallel)
-            edmode->insertItem(stringify(UmlParallel));
+            edmode->addItem(stringify(UmlParallel));
 
         if (m != UmlIterative)
-            edmode->insertItem(stringify(UmlIterative));
+            edmode->addItem(stringify(UmlIterative));
 
         if (m != UmlStream)
-            edmode->insertItem(stringify(UmlStream));
+            edmode->addItem(stringify(UmlStream));
     }
 
-    new QLabel("  ", htab);
-    must_isolate_cb = new QCheckBox(TR("must isolate"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(must_isolate_cb = new QCheckBox(tr("must isolate"), htab));
 
     if (data->must_isolate)
         must_isolate_cb->setChecked(TRUE);
 
     must_isolate_cb->setDisabled(visit);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
+    SmallPushButton* b;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(b);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     QFont font = comment->font();
@@ -148,12 +153,12 @@ ExpansionRegionDialog::ExpansionRegionDialog(ExpansionRegionData * nd)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -165,7 +170,7 @@ ExpansionRegionDialog::ExpansionRegionDialog(ExpansionRegionData * nd)
 
 void ExpansionRegionDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -174,8 +179,9 @@ ExpansionRegionDialog::~ExpansionRegionDialog()
     data->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -189,8 +195,8 @@ void ExpansionRegionDialog::change_tabs(QWidget * w)
 void ExpansionRegionDialog::edit_description()
 {
     edit(comment->text(),
-         (edname == 0) ? QString(TR("description"))
-         : edname->text().stripWhiteSpace() + "_description",
+         (edname == 0) ? QString(tr("description"))
+         : edname->text().trimmed() + "_description",
          data, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -207,13 +213,13 @@ void ExpansionRegionDialog::accept()
     BrowserNode * bn = data->get_browser_node();
 
     if (edname != 0) {
-        QString s = edname->text().stripWhiteSpace();
+        QString s = edname->text().trimmed();
 
         if ((s != bn->get_name()) &&
             ((BrowserNode *) bn->parent())->wrong_child_name(s, bn->get_type(),
                     bn->allow_spaces(),
                     bn->allow_empty())) {
-            msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+            msg_critical(tr("Error"), edname->text() + tr("\n\nillegal name or already used"));
             return;
         }
         else
@@ -223,7 +229,7 @@ void ExpansionRegionDialog::accept()
     data->must_isolate = must_isolate_cb->isChecked();
     data->mode = expansion_mode_kind(edmode->currentText());
 
-    bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool newst = data->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
@@ -235,5 +241,5 @@ void ExpansionRegionDialog::accept()
     bn->package_modified();
     data->modified();
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/ExpansionRegionDialog.h b/src/dialog/ExpansionRegionDialog.h
index 967acfba0..1ae050d58 100644
--- a/src/dialog/ExpansionRegionDialog.h
+++ b/src/dialog/ExpansionRegionDialog.h
@@ -28,15 +28,9 @@
 #ifndef EXPANSIONREGIONDIALOG_H
 #define EXPANSIONREGIONDIALOG_H
 
+#include <tabdialog.h>
 
-
-
-
-#include <q3ptrlist.h>
-#include <q3tabdialog.h>
-#include <q3ptrlist.h>
-
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 
 class LineEdit;
@@ -45,7 +39,7 @@ class ExpansionRegionData;
 class KeyValuesTable;
 class BodyDialog;
 
-class ExpansionRegionDialog : public Q3TabDialog
+class ExpansionRegionDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -53,12 +47,12 @@ class ExpansionRegionDialog : public Q3TabDialog
     QWidget * umltab;
     ExpansionRegionData * data;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * edmode;
+    QComboBox * edstereotype;
+    QComboBox * edmode;
     QCheckBox * must_isolate_cb;
     MultiLineEdit * comment;
     KeyValuesTable * kvtable;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     static QSize previous_size;
 
@@ -70,7 +64,7 @@ class ExpansionRegionDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
 
     void change_tabs(QWidget *);
diff --git a/src/dialog/ExtraMemberDialog.cpp b/src/dialog/ExtraMemberDialog.cpp
index d34cf4913..eeb1a505d 100644
--- a/src/dialog/ExtraMemberDialog.cpp
+++ b/src/dialog/ExtraMemberDialog.cpp
@@ -29,15 +29,14 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3buttongroup.h>
+#include <qcombobox.h>
+#include <bbuttongroup.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-
 #include "ExtraMemberDialog.h"
 #include "ExtraMemberData.h"
 #include "BrowserExtraMember.h"
@@ -54,33 +53,33 @@
 QSize ExtraMemberDialog::previous_size;
 
 ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), emd(ex)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), emd(ex)
 {
     ex->browser_node->edit_start();
 
     if (ex->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     bool visit = !hasOkButton();
 
-    setCaption(TR("Extra Class Member dialog"));
+    setWindowTitle(tr("Extra Class Member dialog"));
 
-    Q3Grid * grid;
+    GridBox * grid;
 
     // general tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name :"), grid);
-    edname = new LineEdit(ex->name(), grid);
+    grid->addWidget(new QLabel(tr("name :"), grid));
+    grid->addWidget(edname = new LineEdit(ex->name(), grid));
     edname->setReadOnly(visit);
 
     QFont font = edname->font();
@@ -90,13 +89,14 @@ ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
 
     font.setFixedPitch(TRUE);
 
-    new QLabel(TR("stereotype :"), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(ex->get_stereotype()));
-    edstereotype->setCurrentItem(0);
+    grid->addWidget(new QLabel(tr("stereotype :"), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(ex->get_stereotype()));
+    edstereotype->setCurrentIndex(0);
 
     if (! visit) {
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlExtraMember));
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlExtraMember));
         edstereotype->setAutoCompletion(completion());
     }
 
@@ -104,14 +104,19 @@ ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
 
     edstereotype->setSizePolicy(sp);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
+    SmallPushButton *b;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(b);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(ex->get_browser_node()->get_comment());
     comment->setFont(font);
@@ -120,39 +125,46 @@ ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
 
     // C++
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(grid);
-    Q3ButtonGroup * gp =
-        new Q3ButtonGroup(1, Qt::Horizontal, QString(), grid);
-    inline_cb = new QCheckBox("inline", gp);
+    grid->addWidget(new QLabel(grid));
+    BButtonGroup * gp;
+    grid->addWidget(gp =
+        new BButtonGroup(1, Qt::Horizontal, QString(), grid));
+    gp->addWidget(inline_cb = new QCheckBox("inline", gp));
     inline_cb->setDisabled(visit);
 
     if (ex->cpp_inline)
         inline_cb->setChecked(TRUE);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("C++ \ndeclaration :"), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("C++ \ndeclaration :"), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_cpp_decl()));
+        vtab->addWidget(b);
+    }
 
-    edcpp_decl = new MultiLineEdit(grid);
+    grid->addWidget(edcpp_decl = new MultiLineEdit(grid));
     edcpp_decl->setReadOnly(visit);
     edcpp_decl->setText(ex->cpp_decl);
     edcpp_decl->setFont(font);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("C++ \ndefinition :"), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("C++ \ndefinition :"), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(b= new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_cpp_def()));
+        vtab->addWidget(b);
+    }
 
-    edcpp_def = new MultiLineEdit(grid);
+    grid->addWidget(edcpp_def = new MultiLineEdit(grid));
     edcpp_def->setReadOnly(visit);
     edcpp_def->setText(ex->cpp_def);
     edcpp_def->setFont(font);
@@ -164,18 +176,20 @@ ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
 
     // Java
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    vtab = new Q3VBox(grid);
-    new QLabel("Java :", vtab);
-
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel("Java :", vtab));
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_java_decl()));
+        vtab->addWidget(b);
+    }
 
-    edjava_decl = new MultiLineEdit(grid);
+    grid->addWidget(edjava_decl = new MultiLineEdit(grid));
     edjava_decl->setReadOnly(visit);
     edjava_decl->setText(ex->java_decl);
     edjava_decl->setFont(font);
@@ -187,18 +201,21 @@ ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
 
     // Php
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    vtab = new Q3VBox(grid);
-    new QLabel("Php :", vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel("Php :", vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_php_decl()));
+        vtab->addWidget(b);
+    }
 
-    edphp_decl = new MultiLineEdit(grid);
+    grid->addWidget(edphp_decl = new MultiLineEdit(grid));
     edphp_decl->setReadOnly(visit);
     edphp_decl->setText(ex->php_decl);
     edphp_decl->setFont(font);
@@ -210,18 +227,21 @@ ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
 
     // Python
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    vtab = new Q3VBox(grid);
-    new QLabel("Python :", vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel("Python :", vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_python_decl()));
+        vtab->addWidget(b);
+    }
 
-    edpython_decl = new MultiLineEdit(grid);
+    grid->addWidget(edpython_decl = new MultiLineEdit(grid));
     edpython_decl->setReadOnly(visit);
     edpython_decl->setText(ex->python_decl);
     edpython_decl->setFont(font);
@@ -233,18 +253,21 @@ ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
 
     // IDL
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    vtab = new Q3VBox(grid);
-    new QLabel("Idl :", vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel("Idl :", vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_idl_decl()));
+        vtab->addWidget(b);
+    }
 
-    edidl_decl = new MultiLineEdit(grid);
+    grid->addWidget(edidl_decl = new MultiLineEdit(grid));
     edidl_decl->setReadOnly(visit);
     edidl_decl->setText(ex->idl_decl);
     edidl_decl->setFont(font);
@@ -256,19 +279,19 @@ ExtraMemberDialog::ExtraMemberDialog(ExtraMemberData * ex)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(ex->get_browser_node(), grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(ex->get_browser_node(), grid, visit));
+    addTab(grid, tr("Properties"));
 
     open_dialog(this);
 }
 
 void ExtraMemberDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -277,8 +300,9 @@ ExtraMemberDialog::~ExtraMemberDialog()
     emd->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -291,10 +315,10 @@ void ExtraMemberDialog::accept()
     BrowserNode * bn = emd->browser_node;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
     bn->set_name(s);
 
-    bool newst = emd->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool newst = emd->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
     emd->cpp_decl = edcpp_decl->text();
     emd->cpp_def = edcpp_def->text();
@@ -315,12 +339,12 @@ void ExtraMemberDialog::accept()
     bn->package_modified();
     emd->modified();
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
 
 void ExtraMemberDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          emd, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -331,7 +355,7 @@ void ExtraMemberDialog::post_edit_description(ExtraMemberDialog * d, QString s)
 
 void ExtraMemberDialog::edit_cpp_decl()
 {
-    edit(edcpp_decl->text(), edname->text().stripWhiteSpace() + "_class_extra_member_decl",
+    edit(edcpp_decl->text(), edname->text().trimmed() + "_class_extra_member_decl",
          emd, CppEdit, this, (post_edit) post_edit_cpp_decl, edits);
 }
 
@@ -342,7 +366,7 @@ void ExtraMemberDialog::post_edit_cpp_decl(ExtraMemberDialog * d, QString s)
 
 void ExtraMemberDialog::edit_cpp_def()
 {
-    edit(edcpp_def->text(), edname->text().stripWhiteSpace() + "_class_extra_member_def",
+    edit(edcpp_def->text(), edname->text().trimmed() + "_class_extra_member_def",
          emd, CppEdit, this, (post_edit) post_edit_cpp_def, edits);
 }
 
@@ -353,7 +377,7 @@ void ExtraMemberDialog::post_edit_cpp_def(ExtraMemberDialog * d, QString s)
 
 void ExtraMemberDialog::edit_java_decl()
 {
-    edit(edjava_decl->text(), edname->text().stripWhiteSpace() + "_class_extra_member",
+    edit(edjava_decl->text(), edname->text().trimmed() + "_class_extra_member",
          emd, JavaEdit, this, (post_edit) post_edit_java_decl, edits);
 }
 
@@ -364,7 +388,7 @@ void ExtraMemberDialog::post_edit_java_decl(ExtraMemberDialog * d, QString s)
 
 void ExtraMemberDialog::edit_php_decl()
 {
-    edit(edphp_decl->text(), edname->text().stripWhiteSpace() + "_class_extra_member",
+    edit(edphp_decl->text(), edname->text().trimmed() + "_class_extra_member",
          emd, PhpEdit, this, (post_edit) post_edit_php_decl, edits);
 }
 
@@ -375,7 +399,7 @@ void ExtraMemberDialog::post_edit_php_decl(ExtraMemberDialog * d, QString s)
 
 void ExtraMemberDialog::edit_python_decl()
 {
-    edit(edpython_decl->text(), edname->text().stripWhiteSpace() + "_class_extra_member",
+    edit(edpython_decl->text(), edname->text().trimmed() + "_class_extra_member",
          emd, PythonEdit, this, (post_edit) post_edit_python_decl, edits);
 }
 
@@ -386,7 +410,7 @@ void ExtraMemberDialog::post_edit_python_decl(ExtraMemberDialog * d, QString s)
 
 void ExtraMemberDialog::edit_idl_decl()
 {
-    edit(edidl_decl->text(), edname->text().stripWhiteSpace() + "_class_extra_member",
+    edit(edidl_decl->text(), edname->text().trimmed() + "_class_extra_member",
          emd, TxtEdit, this, (post_edit) post_edit_idl_decl, edits);
 }
 
diff --git a/src/dialog/ExtraMemberDialog.h b/src/dialog/ExtraMemberDialog.h
index b94b3cd75..b2c4cf1c1 100644
--- a/src/dialog/ExtraMemberDialog.h
+++ b/src/dialog/ExtraMemberDialog.h
@@ -29,14 +29,11 @@
 #define EXTRAMEMBERDIALOG_H
 
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 #include "VisibilityGroup.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QRadioButton;
 
@@ -47,17 +44,17 @@ class BrowserNode;
 class KeyValuesTable;
 class BodyDialog;
 
-class ExtraMemberDialog : public Q3TabDialog
+class ExtraMemberDialog : public TabDialog
 {
     Q_OBJECT
 
 protected:
     ExtraMemberData * emd;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     // uml tab
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
 
     // C++ tab
@@ -96,7 +93,7 @@ class ExtraMemberDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edit_cpp_decl();
     void edit_cpp_def();
diff --git a/src/dialog/FlowDialog.cpp b/src/dialog/FlowDialog.cpp
index a62000a5c..340854c96 100644
--- a/src/dialog/FlowDialog.cpp
+++ b/src/dialog/FlowDialog.cpp
@@ -29,12 +29,11 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
-
 #include "FlowDialog.h"
 #include "FlowData.h"
 #include "BrowserFlow.h"
@@ -51,61 +50,66 @@
 QSize FlowDialog::previous_size;
 
 FlowDialog::FlowDialog(FlowData * d)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), flow(d)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), flow(d)
 {
     d->browser_node->edit_start();
 
     if (d->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("Flow dialog"));
+    setWindowTitle(tr("Flow dialog"));
     visit = !hasOkButton();
 
     BrowserNode * bn = flow->browser_node;
-    Q3Grid * grid;
+    GridBox * grid;
 
     //
     // general tab
     //
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(flow->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox( grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(flow->get_stereotype()));
 
     if (!visit) {
-        edstereotype->insertStringList(BrowserFlow::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlFlow));
+        edstereotype->addItems(BrowserFlow::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlFlow));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
-
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
+    SmallPushButton* sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
 
@@ -128,12 +132,12 @@ FlowDialog::FlowDialog(FlowData * d)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -145,7 +149,7 @@ FlowDialog::FlowDialog(FlowData * d)
 
 void FlowDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -154,8 +158,9 @@ FlowDialog::~FlowDialog()
     flow->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -170,14 +175,14 @@ void FlowDialog::init_tab(FlDialog & d, FlowDef & st, const char * lbl,
                           const char * sl_guard, const char * sl_selection,
                           const char * sl_transformation, bool enabled)
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3VBox * vtab;
+    GridBox * grid = new GridBox(2, this);
+    VVBox * vtab;
 
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("weight : "), grid);
-    d.edweight = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("weight : "), grid));
+    grid->addWidget(d.edweight = new LineEdit(grid));
 
     QFont font = d.edweight->font();
 
@@ -191,39 +196,48 @@ void FlowDialog::init_tab(FlDialog & d, FlowDef & st, const char * lbl,
     if (visit)
         d.edweight->setReadOnly(TRUE);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("guard : "), vtab);
-
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("guard : "), vtab));
+    SmallPushButton* b;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl_guard);
+    {
+        connect( b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl_guard);
+        vtab->addWidget(b);
+    }
 
-    d.edguard = new MultiLineEdit(grid);
+    grid->addWidget(d.edguard = new MultiLineEdit(grid));
     d.edguard->setFont(font);
     d.edguard->setText(st.guard);
 
     if (visit)
         d.edguard->setReadOnly(TRUE);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("selection : "), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("selection : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl_selection);
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl_selection);
+        vtab->addWidget(b);
+    }
 
-    d.edselection = new MultiLineEdit(grid);
+    grid->addWidget(d.edselection = new MultiLineEdit(grid));
     d.edselection->setFont(font);
     d.edselection->setText(st.sel_trans.first);
 
     if (visit)
         d.edselection->setReadOnly(TRUE);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("transformation : "), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("transformation : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl_transformation);
+    {
+        connect(b = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl_transformation);
+        vtab->addWidget(b);
+    }
 
-    d.edtransformation = new MultiLineEdit(grid);
+    grid->addWidget(d.edtransformation = new MultiLineEdit(grid));
     d.edtransformation->setFont(font);
     d.edtransformation->setText(st.sel_trans.second);
 
@@ -278,17 +292,17 @@ void FlowDialog::accept()
     BrowserNode * bn = flow->browser_node;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if ((s != bn->get_name()) &&
         ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlFlow,
                 bn->allow_spaces(),
                 bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else {
         bn->set_name(s);
 
-        bool newst = flow->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+        bool newst = flow->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
         uml.accept(flow->uml);
         cpp.accept(flow->cpp);
@@ -305,13 +319,13 @@ void FlowDialog::accept()
         bn->package_modified();
         flow->modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
 
 void FlDialog::accept(FlowDef & st)
 {
-    st.weight = edweight->text().stripWhiteSpace();
+    st.weight = edweight->text().trimmed();
     st.guard = edguard->text();
     st.sel_trans.first = edselection->text();
     st.sel_trans.second = edtransformation->text();
diff --git a/src/dialog/FlowDialog.h b/src/dialog/FlowDialog.h
index eb628d38e..8af0968ff 100644
--- a/src/dialog/FlowDialog.h
+++ b/src/dialog/FlowDialog.h
@@ -30,14 +30,11 @@
 
 #include <qwidget.h>
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 
 class QPushButton;
-class Q3ComboBox;
+class QComboBox;
 
 class LineEdit;
 class MultiLineEdit;
@@ -56,7 +53,7 @@ struct FlDialog {
     void accept(FlowDef &);
 };
 
-class FlowDialog : public Q3TabDialog
+class FlowDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -65,9 +62,9 @@ class FlowDialog : public Q3TabDialog
     bool visit;
     FlowData * flow;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     FlDialog uml;
     FlDialog cpp;
@@ -99,7 +96,7 @@ class FlowDialog : public Q3TabDialog
                   const char * sl_transformation, bool enabled);
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edit_description();
     void edit_uml_guard();
diff --git a/src/dialog/FragmentDialog.cpp b/src/dialog/FragmentDialog.cpp
index 555381859..e14810f54 100644
--- a/src/dialog/FragmentDialog.cpp
+++ b/src/dialog/FragmentDialog.cpp
@@ -32,12 +32,12 @@
 #include <qcursor.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "FragmentDialog.h"
 #include "BrowserDiagram.h"
@@ -45,68 +45,72 @@
 #include "UmlDesktop.h"
 #include "BrowserView.h"
 #include "translate.h"
-
+#include "menufactory.h"
 QSize FragmentDialog::previous_size;
 
 FragmentDialog::FragmentDialog(const QStringList & defaults, QString & s,
                                QString & fo, BrowserNode *& d)
-    : QDialog(0, "Fragment dialog", TRUE), name(s), form(fo), refer(d)
+    : QDialog(0/*, "Fragment dialog", TRUE*/), name(s), form(fo), refer(d)
 {
-    setCaption(TR("Fragment dialog"));
+    setWindowTitle(tr("Fragment dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
     QLabel * lbl1;
     QLabel * lbl2;
     SmallPushButton * refer_bt;
-    BrowserNode * bn;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(lbl1 = new QLabel(TR("name : "), this));
-    name_cb = new Q3ComboBox(TRUE, this);
-    name_cb->insertItem(name);
-    name_cb->setCurrentItem(0);
-    name_cb->insertStringList(defaults);
+    hbox->addWidget(lbl1 = new QLabel(tr("name : "), this));
+    name_cb = new QComboBox(this);
+    name_cb->setEditable(true);
+    name_cb->addItem(name);
+    name_cb->setCurrentIndex(0);
+    name_cb->addItems(defaults);
     name_cb->setAutoCompletion(completion());
     hbox->addWidget(name_cb);
 
     QSizePolicy sp = name_cb->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     name_cb->setSizePolicy(sp);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(refer_bt = new SmallPushButton(TR("refer to : "), this));
+    hbox->addWidget(refer_bt = new SmallPushButton(tr("refer to : "), this));
     connect(refer_bt, SIGNAL(clicked()), this, SLOT(menu_refer()));
-    diag_cb = new Q3ComboBox(FALSE, this);
+    diag_cb = new QComboBox(this);
     BrowserDiagram::instances(nodes, TRUE);
-    diag_cb->insertItem("");
+    diag_cb->addItem("");
 
-    for (bn = nodes.first(); bn != 0; bn = nodes.next())
-        diag_cb->insertItem(*(bn->pixmap(0)), bn->full_name(TRUE));
+    foreach (BrowserNode *bn, nodes)
+        diag_cb->addItem(*(bn->pixmap(0)), bn->full_name(TRUE));
 
-    diag_cb->setCurrentItem((refer == 0)
+    diag_cb->setCurrentIndex((refer == 0)
                             ? 0
-                            : nodes.findRef(refer) + 1);
+                            : nodes.indexOf(refer) + 1);
     diag_cb->setSizePolicy(sp);
     hbox->addWidget(diag_cb);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(lbl2 = new QLabel(TR("arguments \n/ value : "), this));
+    hbox->addWidget(lbl2 = new QLabel(tr("arguments \n/ value : "), this));
     hbox->addWidget(ed_form = new LineEdit(this));
     ed_form->setText(form);
 
     same_width(lbl1, lbl2, refer_bt);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -122,7 +126,7 @@ FragmentDialog::FragmentDialog(const QStringList & defaults, QString & s,
 
 void FragmentDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -133,15 +137,15 @@ FragmentDialog::~FragmentDialog()
 
 void FragmentDialog::menu_refer()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
     bool used = FALSE;
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    if (diag_cb->currentItem() != 0) {
+    if (diag_cb->currentIndex() != 0) {
         used = TRUE;
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
     }
 
     BrowserNode * bn = BrowserView::selected_item();
@@ -149,34 +153,39 @@ void FragmentDialog::menu_refer()
     if ((bn != 0) &&
         !bn->deletedp() &&
         (dynamic_cast<BrowserDiagram *>(bn) != 0)) {
-        m.insertItem(TR("Choose diagram selected in browser"), 1);
+        MenuFactory::addItem(m, tr("Choose diagram selected in browser"), 1);
         used = TRUE;
     }
     else
         bn = 0;
 
     if (used) {
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        int index = retAction->data().toInt();
+        switch (index) {
         case 0:
-            nodes.at(diag_cb->currentItem() - 1)->select_in_browser();
+            nodes.at(diag_cb->currentIndex() - 1)->select_in_browser();
             break;
 
         case 1:
-            diag_cb->setCurrentItem(nodes.findRef(bn) + 1);
+            diag_cb->setCurrentIndex(nodes.indexOf(bn) + 1);
             break;
 
         default:
             break;
         }
+        }
     }
 }
 
 void FragmentDialog::accept()
 {
-    name = name_cb->currentText().stripWhiteSpace();
-    form = ed_form->text().stripWhiteSpace();
-    refer = (diag_cb->currentItem() == 0)
-            ? (BrowserNode *) 0 : nodes.at(diag_cb->currentItem() - 1);
+    name = name_cb->currentText().trimmed();
+    form = ed_form->text().trimmed();
+    refer = (diag_cb->currentIndex() == 0)
+            ? (BrowserNode *) 0 : nodes.at(diag_cb->currentIndex() - 1);
 
     QDialog::accept();
 }
diff --git a/src/dialog/FragmentDialog.h b/src/dialog/FragmentDialog.h
index 5f6d83401..fd296b8fa 100644
--- a/src/dialog/FragmentDialog.h
+++ b/src/dialog/FragmentDialog.h
@@ -33,7 +33,7 @@
 
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class LineEdit;
 
 class FragmentDialog : public QDialog
@@ -44,8 +44,8 @@ class FragmentDialog : public QDialog
     QString & name;
     QString & form;
     BrowserNode *& refer;
-    Q3ComboBox * name_cb;
-    Q3ComboBox * diag_cb;
+    QComboBox * name_cb;
+    QComboBox * diag_cb;
     LineEdit * ed_form;
     BrowserNodeList nodes;
 
@@ -58,7 +58,7 @@ class FragmentDialog : public QDialog
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
     void menu_refer();
 };
 
diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp
new file mode 100644
index 000000000..4354e9870
--- /dev/null
+++ b/src/dialog/GenerationSettingsBuiltinTable.cpp
@@ -0,0 +1,363 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#include "GenerationSettingsBuiltinTable.h"
+#include "GenerationSettings.h"
+#include "Libs/L_UniversalModels/include/AdaptingTableModel.h"
+#include <QTableView>
+#include <QSortFilterProxyModel>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QMenu>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QApplication>
+#include <QHeaderView>
+#include <algorithm>
+static Builtin rowTemporary;
+static void InsertRow(QList<Builtin>& builtins, const Builtin& newRowValue, const Builtin& currentRowValue, QSharedPointer<TableDataInterface> interface, ERowInsertMode insertMode)
+{
+    TableDataListHolder<Builtin>* holder = static_cast<TableDataListHolder<Builtin>*>(interface.data());
+    QList<Builtin>::Iterator it;
+    if(insertMode == ERowInsertMode::before_current || insertMode == ERowInsertMode::after_current)
+    {
+        using std::placeholders::_1;
+        std::function<bool(Builtin)> func = [&](const Builtin& val1){return val1 == currentRowValue;};
+        it = std::find_if(builtins.begin(),builtins.end(), std::bind(func, std::placeholders::_1));
+        if(insertMode == ERowInsertMode::after_current)
+            it++;
+    }
+    else if(insertMode == ERowInsertMode::before_first)
+    {
+        it = builtins.begin();
+    }
+    else
+    {
+        it = builtins.end() - 1;
+    }
+    builtins.insert(it,newRowValue);
+    QList<Builtin*> newBuiltins;
+    for(int i(0); i < builtins.size(); i++)
+    {
+        newBuiltins.append(&builtins[i]);
+    }
+    holder->SetData(newBuiltins);
+}
+
+
+BuiltinTable::BuiltinTable(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f)
+{
+}
+
+BuiltinTable::~BuiltinTable()
+{
+}
+
+void BuiltinTable::Init()
+{
+    InitInterface();
+    CreateRowMenu();
+    TableSetup();
+    OnSetParameterVisibility();
+    CreateConnections();
+    sortModel->sort(0, Qt::AscendingOrder);
+
+}
+
+bool BuiltinTable::ValidateTypes()
+{
+    for(Builtin& value : GenerationSettings::builtins)
+    {
+        if(value.uml.trimmed().isEmpty() ||
+                value.cpp.trimmed().isEmpty() ||
+                value.java.trimmed().isEmpty() ||
+                value.idl.trimmed().isEmpty() )
+        {
+            QMessageBox::critical(0, tr("Error"), tr("Uml/Cpp/Java/Idl fields cannot be empty"));
+            return false;
+        }
+        QList<Builtin>& builtins =  GenerationSettings::builtins;
+        std::function<bool(const Builtin&)> func = [&](const Builtin& val1){return val1.uml == value.uml;};
+        ptrdiff_t count = std::count_if(builtins.begin(), builtins.end(), func);
+        if (count > 1)
+        {
+            QMessageBox::critical(0, tr("Error"), tr("Duplicate Uml entries are not allowed"));
+            return false;
+        }
+        if(!value.cpp_in.contains("${type}") ||
+                !value.cpp_in.contains("${type}") ||
+                !value.cpp_inout.contains("${type}") ||
+                !value.cpp_out.contains("${type}") ||
+                !value.cpp_return.contains("${type}"))
+        {
+            QMessageBox::critical(0, tr("Error"), tr("Cpp parameter controls must contain ${type}"));
+            return false;
+        }
+    }
+    return true;
+}
+
+void BuiltinTable::RollBack()
+{
+    GenerationSettings::builtins = rollbackBuiltins;
+}
+
+QList<Builtin> BuiltinTable::GetBuiltins()
+{
+    QList<Builtin> result;
+    QList<Builtin*> builtins = holder->GetData();
+    for(Builtin* builtin : builtins)
+    {
+        if(builtin)
+            result.append(*builtin);
+    }
+    return result;
+}
+
+QSize BuiltinTable::GetOptimalSize()
+{
+    QRect rect = types_table->geometry();
+    int horizontalWidgth = 0;
+    for(int i(0); i < types_table->horizontalHeader()->count(); i++)
+    {
+        if(!types_table->horizontalHeader()->isSectionHidden(i))
+            horizontalWidgth+= types_table->horizontalHeader()->sectionSize(i);
+    }
+    rect.setWidth(horizontalWidgth);
+    return QSize(rect.width()+45, rect.height());
+}
+
+void BuiltinTable::TableSetup()
+{
+    holder = new TableDataListHolder<Builtin>();
+    rollbackBuiltins = GenerationSettings::builtins;
+    QList<Builtin*> builtInList;
+    for(int i(0); i < GenerationSettings::nbuiltins; i++)
+    {
+        builtInList.append(&GenerationSettings::builtins[i]);
+    }
+
+    typetableModel = new AdaptingTableModel();
+
+    SetupAccess();
+
+    holder->SetData(builtInList);
+    holder->SetColumns(QStringList() << "Uml" << "Cpp" << "Java" << "Idl" << "cpp_in" << "cpp_out" << "cpp_inout" << "cpp_return" << tr("do"));
+
+    typetableInterface = QSharedPointer<TableDataInterface>(dynamic_cast<TableDataInterface*>(holder));
+
+    typetableModel->SetInterface(typetableInterface);
+
+    sortModel = new QSortFilterProxyModel();
+    sortModel->setSourceModel(typetableModel);
+    sortModel->setSortCaseSensitivity(Qt::CaseInsensitive);
+
+    types_table->setModel(sortModel);
+
+    types_table->setAlternatingRowColors(true);
+    //types_table->setSortingEnabled(true);
+    types_table->resizeColumnToContents(0);
+    types_table->resizeColumnToContents(8);
+    types_table->resizeRowsToContents();
+}
+
+void BuiltinTable::InitInterface()
+{
+    QHBoxLayout* layControls = new QHBoxLayout;
+    pbAddNewType = new QPushButton(QIcon(":/root/icons/bullet_add.png"), tr("Add type"));
+    lblVisibility = new QLabel(tr("Language visibility:"));
+    chkCpp = new QCheckBox("C++");
+    chkCpp->setChecked(true);
+    chkJava = new QCheckBox("Java");
+    chkJava->setChecked(true);
+    chkIdl = new QCheckBox("Idl");
+    chkIdl->setChecked(true);
+    lblSearch = new QLabel(tr("Search:"));
+    leSearch = new QLineEdit();
+    layControls->addWidget(pbAddNewType);
+    layControls->addWidget(lblSearch);
+    layControls->addWidget(leSearch);
+    layControls->addWidget(lblVisibility);
+    layControls->addWidget(chkCpp);
+    layControls->addWidget(chkJava);
+    layControls->addWidget(chkIdl);
+    layControls->addStretch();
+
+    QVBoxLayout* layMain = new QVBoxLayout;
+    types_table = new QTableView();
+    layMain->addLayout(layControls);
+    layMain->addWidget(types_table);
+    layMain->setContentsMargins(0,0,0,0);
+
+    this->setLayout(layMain);
+
+
+}
+
+void BuiltinTable::CreateRowMenu()
+{
+    if(!menuRow)
+    {
+        menuRow = new QMenu();
+        menuRow->addSeparator();
+        menuRow->addAction(tr("Copy row"), this, SLOT(OnCopyRow()));
+        menuRow->addAction(tr("Paste row"), this, SLOT(OnPasteRow()));
+        menuRow->addAction(tr("Cut row"), this, SLOT(OnCutRow()));
+        menuRow->addSeparator();
+        menuRow->addAction(tr("Delete row"), this, SLOT(OnDeleteRow()));
+    }
+}
+
+void BuiltinTable::CreateConnections()
+{
+    connect(types_table, SIGNAL(clicked(QModelIndex)), this, SLOT(OnCallRowMenu(QModelIndex)));
+    connect(chkCpp, SIGNAL(clicked()),this, SLOT(OnSetParameterVisibility()));
+    connect(chkIdl, SIGNAL(clicked()),this, SLOT(OnSetParameterVisibility()));
+    connect(chkJava, SIGNAL(clicked()),this, SLOT(OnSetParameterVisibility()));
+    connect(leSearch, SIGNAL(textEdited(QString)), this, SLOT(OnFilterTable(QString)));
+    connect(pbAddNewType, SIGNAL(clicked()),this, SLOT(OnInsertNewRow()));
+
+}
+
+
+void BuiltinTable::OnInsertNewRow()
+{
+    InsertRow(GenerationSettings::builtins, Builtin(), Builtin(), typetableInterface, ERowInsertMode::after_last);
+}
+
+void BuiltinTable::OnPasteRow()
+{
+    QModelIndex current = types_table->selectionModel()->currentIndex();
+    current = sortModel->mapToSource(current);
+
+    typetableModel->setData(current.sibling(current.row(),0), rowTemporary.uml, Qt::DisplayRole);
+    typetableModel->setData(current.sibling(current.row(),1), rowTemporary.cpp, Qt::DisplayRole);
+    typetableModel->setData(current.sibling(current.row(),2), rowTemporary.java, Qt::DisplayRole);
+    typetableModel->setData(current.sibling(current.row(),3), rowTemporary.idl, Qt::DisplayRole);
+    typetableModel->setData(current.sibling(current.row(),4), rowTemporary.cpp_in, Qt::DisplayRole);
+    typetableModel->setData(current.sibling(current.row(),5), rowTemporary.cpp_out, Qt::DisplayRole);
+    typetableModel->setData(current.sibling(current.row(),6), rowTemporary.cpp_inout, Qt::DisplayRole);
+    typetableModel->setData(current.sibling(current.row(),7), rowTemporary.cpp_return, Qt::DisplayRole);
+}
+
+void BuiltinTable::OnDeleteRow()
+{
+    QModelIndex current = types_table->selectionModel()->currentIndex();
+    current = sortModel->mapToSource(current);
+    typetableModel->RemoveRow(current);
+}
+
+void BuiltinTable::OnCopyRow()
+{
+    QModelIndex current = types_table->selectionModel()->currentIndex();
+    current = sortModel->mapToSource(current);
+    Builtin* holderPtr = static_cast<Builtin*>(current.internalPointer());
+    if(holderPtr)
+        rowTemporary = *holderPtr;
+}
+
+void BuiltinTable::OnCutRow()
+{
+    OnCopyRow();
+    OnDeleteRow();
+}
+
+#define ADD_STRING_GETSET(HOLDER,ROW,ROLE,PARAM)  \
+HOLDER->AddGetter(QPair<int,int>(ROW,ROLE), \
+[] (const Builtin* data) \
+{ \
+    if(data) \
+        return QVariant(data->PARAM); \
+    else \
+        return QVariant(); \
+} \
+); \
+HOLDER->AddSetter(QPair<int,int>(ROW,ROLE), \
+[] (Builtin* data, QVariant value) \
+{ \
+    if(data) \
+        data->PARAM = value.toString(); \
+} \
+); \
+
+void BuiltinTable::SetupAccess()
+{
+    ADD_STRING_GETSET(holder, 0, 0, uml);
+    ADD_STRING_GETSET(holder, 1, 0, cpp);
+    ADD_STRING_GETSET(holder, 2, 0, java);
+    ADD_STRING_GETSET(holder, 3, 0, idl);
+    ADD_STRING_GETSET(holder, 4, 0, cpp_in);
+    ADD_STRING_GETSET(holder, 5, 0, cpp_out);
+    ADD_STRING_GETSET(holder, 6, 0, cpp_inout);
+    ADD_STRING_GETSET(holder, 7, 0, cpp_return);
+
+    ADD_STRING_GETSET(holder, 0, 2, uml);
+    ADD_STRING_GETSET(holder, 1, 2, cpp);
+    ADD_STRING_GETSET(holder, 2, 2, java);
+    ADD_STRING_GETSET(holder, 3, 2, idl);
+    ADD_STRING_GETSET(holder, 4, 2, cpp_in);
+    ADD_STRING_GETSET(holder, 5, 2, cpp_out);
+    ADD_STRING_GETSET(holder, 6, 2, cpp_inout);
+    ADD_STRING_GETSET(holder, 7, 2, cpp_return);
+    holder->AddGetter(QPair<int,int>(8,0),
+    [] (const Builtin* )
+    {
+        return QVariant(QString(" "));
+    });
+
+    holder->AddFlagsFunctor(
+                [](const QModelIndex& index)
+    {
+        if(index.column() == 8)
+            return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+        Qt::ItemFlags result;
+        result |= Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+        return result;
+    }
+    );
+}
+
+void BuiltinTable::OnCallRowMenu(const QModelIndex & index)
+{
+    if(index.column() == 8)
+        menuRow->popup(QCursor::pos());
+}
+
+void BuiltinTable::OnSetParameterVisibility()
+{
+    types_table->setColumnHidden(1, !chkCpp->isChecked());
+    types_table->setColumnHidden(2, !chkJava->isChecked());
+    types_table->setColumnHidden(3, !chkIdl->isChecked());
+}
+
+void BuiltinTable::OnFilterTable(QString val)
+{
+    sortModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    sortModel->setFilterRegExp(val);
+}
+
+
+
diff --git a/src/dialog/GenerationSettingsBuiltinTable.h b/src/dialog/GenerationSettingsBuiltinTable.h
new file mode 100644
index 000000000..252aca335
--- /dev/null
+++ b/src/dialog/GenerationSettingsBuiltinTable.h
@@ -0,0 +1,95 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#ifndef GENERATIONSETTINGSBUILTINTABLE_H
+#define GENERATIONSETTINGSBUILTINTABLE_H
+#include <QWidget>
+#include "Libs/L_UniversalModels/include/TableDataInterface.h"
+#include "Libs/L_UniversalModels/include/TableDataListHolder.h"
+#include "GenerationSettings.h"
+
+class QTableView;
+class AdaptingTableModel;
+class QCheckBox;
+class QPushButton;
+class QLabel;
+class QMenu;
+class QComboBox;
+class QLineEdit;
+class QSortFilterProxyModel;
+enum class ERowInsertMode
+{
+    before_first,
+    before_current,
+    after_last,
+    after_current
+};
+class BuiltinTable : public QWidget
+{
+    Q_OBJECT
+public:
+    BuiltinTable(QWidget* parent = 0, Qt::WindowFlags f = 0);
+    virtual ~BuiltinTable();
+    void Init();
+    bool ValidateTypes();
+    void RollBack();
+    QList<Builtin> GetBuiltins();
+    QSize GetOptimalSize();
+
+private:
+    void SetupAccess();
+    void TableSetup();
+    void InitInterface();
+
+    void CreateRowMenu();
+    void CreateConnections();
+
+    QTableView* types_table = nullptr;
+    QSortFilterProxyModel* sortModel;
+    AdaptingTableModel* typetableModel = nullptr;
+    QSharedPointer<TableDataInterface> typetableInterface;
+    TableDataListHolder<Builtin>* holder = nullptr;
+    QCheckBox* chkCpp = nullptr;
+    QCheckBox* chkJava = nullptr;
+    QCheckBox* chkIdl = nullptr;
+    QComboBox* cbSort = nullptr;
+    QLabel* lblVisibility = nullptr;
+    QLabel* lblSort = nullptr;
+    QLabel* lblSearch = nullptr;
+    QPushButton* pbAddNewType = nullptr;
+    QLineEdit* leSearch = nullptr;
+    QMenu* menuRow = nullptr;
+    QList<Builtin> rollbackBuiltins;
+public slots:
+    void OnInsertNewRow();
+    void OnPasteRow();
+    void OnDeleteRow();
+    void OnCopyRow();
+    void OnCutRow();
+    void OnCallRowMenu(const QModelIndex&);
+    void OnSetParameterVisibility();
+    void OnFilterTable(QString);
+
+};
+
+#endif // GENERATIONSETTINGSBUILTINTABLE_H
diff --git a/src/dialog/GenerationSettingsDialog.cpp b/src/dialog/GenerationSettingsDialog.cpp
index 3bad7229f..1637993d7 100644
--- a/src/dialog/GenerationSettingsDialog.cpp
+++ b/src/dialog/GenerationSettingsDialog.cpp
@@ -30,18 +30,23 @@
 
 
 #include <qcursor.h>
-#include <q3grid.h>
-#include <q3vbox.h>
+
+#include <gridbox.h>
+#include <vvbox.h>
+#include "hhbox.h"
+#include <QGridLayout>
+#include <QVBoxLayout>
 #include <qlabel.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qpushbutton.h>
-#include <q3filedialog.h>
-#include <q3combobox.h>
+#include <qfiledialog.h>
+#include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
-#include <q3buttongroup.h>
+#include <qbuttongroup.h>
 #include <qsplitter.h>
 #include <qspinbox.h>
+#include <QApplication>
 //Added by qt3to4:
 
 
@@ -53,16 +58,21 @@
 #include "UmlDesktop.h"
 #include "strutil.h"
 #include "translate.h"
-
+#include "Libs/L_UniversalModels/include/ItemController.h"
+#include "Libs/L_UniversalModels/include/TableDataInterface.h"
+#include "Libs/L_UniversalModels/include/TableDataListHolder.h"
+#include "Libs/L_UniversalModels/include/AdaptingTableModel.h"
+#include <QGroupBox>
+#include <QHeaderView>
+#include "bbuttongroup.h"
 QSize GenerationSettingsDialog::previous_size;
 
 GenerationSettingsDialog::GenerationSettingsDialog()
-    : Q3TabDialog(0, "Generation Settings dialog", TRUE, 0)
+    : TabDialog(0, "Generation Settings dialog", TRUE)
 {
-    setCaption(TR("Generation settings dialog"));
-
-    setOkButton(TR("OK"));
-    setCancelButton(TR("Cancel"));
+    setWindowTitle(tr("Generation settings dialog"));
+    setOkButton(tr("OK"));
+    setCancelButton(tr("Cancel"));
     init_types();
     init_stereotypes();
     init_cpp1();
@@ -86,11 +96,12 @@ GenerationSettingsDialog::GenerationSettingsDialog()
     init_idl5();
     init_descriptions();
     init_dirs();
+
 }
 
 void GenerationSettingsDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::setsize_center(this, previous_size, 29.0 / 30, 19.0 / 29);
 }
 
@@ -101,75 +112,84 @@ GenerationSettingsDialog::~GenerationSettingsDialog()
 
 void GenerationSettingsDialog::init_types()
 {
-    Q3Grid * grid = new Q3Grid(1, this);
+    //QWidget * grid = new GridBox(1, this);
+
+    GridBox *grid = new GridBox(1, this);
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Types correspondence, and C++ operation argument default passing for them :"), grid);
-
-    types_table = new TypesTable(grid);
-
-    addTab(grid, TR("Types"));
+    grid->addWidget(new QLabel(tr("Types correspondence, and C++ operation argument default passing for them :"), grid));
+    grid->addWidget(builtinTable = new BuiltinTable(grid));
+    grid->addWidget(builtinTable);
+    builtinTable->Init();
+    this->resize(builtinTable->GetOptimalSize());
+    addTab(grid, QObject::tr("Types"));
 }
 
 void GenerationSettingsDialog::init_stereotypes()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
 
-    grid->setMargin(3);
-    grid->setSpacing(3);
+    //QWidget * grid = new GridBox(2, this);
+    GridBox *gridW = new GridBox(2, this);
 
-    new QLabel(TR("Attributes and \nRelations\nstereotypes \ncorrespondence : "), grid);
-    relation_stereotypes_table =
-        new StereotypesTable(grid, GenerationSettings::nrelattrstereotypes,
-                             GenerationSettings::relattr_stereotypes, FALSE);
 
-    //new QLabel(grid);
-    //new QLabel(grid);
+    gridW->setMargin(3);
+    gridW->setSpacing(3);
 
-    new QLabel(TR("Classes's \nstereotypes \ncorrespondence : "), grid);
-    class_stereotypes_table =
-        new StereotypesTable(grid, GenerationSettings::nclassstereotypes,
-                             GenerationSettings::class_stereotypes, TRUE);
+    this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
+    gridW->addWidget(new QLabel(tr("Attributes and \nRelations\nstereotypes \ncorrespondence : "), gridW));
+    relation_stereotypes_table =
+            new StereotypesTable(gridW, GenerationSettings::nrelattrstereotypes,
+                                 GenerationSettings::relattr_stereotypes, FALSE);
+    gridW->addWidget(relation_stereotypes_table);
+    //new QLabel(grid));
+    //new QLabel(grid));
 
-    addTab(grid, TR("Stereotypes"));
+    gridW->addWidget(new QLabel(tr("Classes's \nstereotypes \ncorrespondence : "), gridW));
+    class_stereotypes_table =
+            new StereotypesTable(gridW, GenerationSettings::nclassstereotypes,
+                                 GenerationSettings::class_stereotypes, TRUE);
+    gridW->addWidget(class_stereotypes_table);
+    addTab(gridW, QObject::tr("Stereotypes"));
 }
 
-static void init_indent(Q3ComboBox * cb, const char * v)
+static void init_indent(QComboBox * cb, const char * v)
 {
-    cb->insertItem(TR("empty"));
-    cb->insertItem(TR("1 space"));
+    cb->addItem(QObject::tr("empty"));
+    cb->addItem(QObject::tr("1 space"));
 
-    WrapperStr f = "%1 spaces";
-    WrapperStr s = "2";
+    QString f = "%1 spaces";
+    QString s = "2";
 
     for (int c = 2; c != 9; c += 1) {
         s.setNum(c);
-        cb->insertItem(TR(f, s));
+        cb->addItem(f.arg(s));
     }
 
-    cb->insertItem(TR("1 tab"));
+    cb->addItem(QObject::tr("1 tab"));
 
     if (*v == '\t')
-        cb->setCurrentItem(9);
+        cb->setCurrentIndex(9);
     else {
         int n = strlen(v);
 
-        cb->setCurrentItem((n > 8) ? 8 : n);
+        cb->setCurrentIndex((n > 8) ? 8 : n);
     }
 }
 
 void GenerationSettingsDialog::init_cpp1()
 {
-    Q3VBox * vtab = new Q3VBox(this);
-    Q3Grid * grid = new Q3Grid(2, vtab);
+
+    VVBox * vtab = new VVBox(this);
+    GridBox * grid;
+    vtab->addWidget(grid = new GridBox(2, vtab));
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Header file\ndefault content :"), grid);
-    edcpp_h_content = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Header file\ndefault content :"), grid));
+    grid->addWidget(edcpp_h_content = new MultiLineEdit(grid));
     edcpp_h_content->setText(GenerationSettings::cpp_h_content);
     QFont font = edcpp_h_content->font();
 
@@ -179,68 +199,72 @@ void GenerationSettingsDialog::init_cpp1()
     font.setFixedPitch(TRUE);
     edcpp_h_content->setFont(font);
 
-    new QLabel(TR("Source file\ndefault content :"), grid);
-    edcpp_src_content = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Source file\ndefault content :"), grid));
+    grid->addWidget(edcpp_src_content = new MultiLineEdit(grid));
     edcpp_src_content->setText(GenerationSettings::cpp_src_content);
     edcpp_src_content->setFont(font);
 
-    new QLabel(vtab);
+    vtab->addWidget(new QLabel(vtab));
 
-    Q3HBox * htab = new Q3HBox(vtab);
+    HHBox * htab;
+    vtab->addWidget(htab = new HHBox(vtab));
 
     htab->setMargin(3);
-    htab->setStretchFactor(new QLabel(TR("generated/reversed \nheader file extension : "), htab), 0);
-    edcpp_h_extension = new Q3ComboBox(TRUE, htab);
-    htab->setStretchFactor(edcpp_h_extension, 100);
-    edcpp_h_extension->insertItem(GenerationSettings::cpp_h_extension);
-    edcpp_h_extension->setCurrentItem(0);
-    edcpp_h_extension->insertItem("h");
-    edcpp_h_extension->insertItem("hh");
-
-    htab->setStretchFactor(new QLabel(TR("    generated/reversed \n    source file extension : "), htab), 0);
-    edcpp_src_extension = new Q3ComboBox(TRUE, htab);
-    htab->setStretchFactor(edcpp_src_extension, 100);
-    edcpp_src_extension->insertItem(GenerationSettings::cpp_src_extension);
-    edcpp_src_extension->setCurrentItem(0);
-    edcpp_src_extension->insertItem("cpp");
-    edcpp_src_extension->insertItem("cc");
-
-    htab->setStretchFactor(new QLabel("    #include : ", htab), 0);
-    cpp_include_with_path_cb = new Q3ComboBox(FALSE, htab);
-    cpp_include_with_path_cb->insertItem(TR("without path"));
-    cpp_include_with_path_cb->insertItem(TR("with absolute path"));
-    cpp_include_with_path_cb->insertItem(TR("with relative path"));
-    cpp_include_with_path_cb->insertItem(TR("with root relative path"));
+    htab->addWidget(new QLabel(tr("generated/reversed \nheader file extension : "), htab));
+    htab->addWidget(edcpp_h_extension = new QComboBox(/*TRUE,*/ htab));
+    edcpp_h_extension->setEditable(true);
+    //htab->addWidget((edcpp_h_extension, 100);
+    edcpp_h_extension->addItem(GenerationSettings::cpp_h_extension);
+    edcpp_h_extension->setCurrentIndex(0);
+    edcpp_h_extension->addItem("h");
+    edcpp_h_extension->addItem("hh");
+
+    htab->addWidget(new QLabel(tr("    generated/reversed \n    source file extension : "), htab));
+    edcpp_src_extension = new QComboBox(htab);
+    edcpp_src_extension->setEditable(true);
+    htab->addWidget(edcpp_src_extension);
+    edcpp_src_extension->addItem(GenerationSettings::cpp_src_extension);
+    edcpp_src_extension->setCurrentIndex(0);
+    edcpp_src_extension->addItem("cpp");
+    edcpp_src_extension->addItem("cc");
+
+    htab->addWidget(new QLabel("    #include : ", htab));
+    htab->addWidget(cpp_include_with_path_cb = new QComboBox(htab));
+    cpp_include_with_path_cb->addItem(tr("without path"));
+    cpp_include_with_path_cb->addItem(tr("with absolute path"));
+    cpp_include_with_path_cb->addItem(tr("with relative path"));
+    cpp_include_with_path_cb->addItem(tr("with root relative path"));
 
     if (!GenerationSettings::cpp_include_with_path)
-        cpp_include_with_path_cb->setCurrentItem(0);
+        cpp_include_with_path_cb->setCurrentIndex(0);
     else if (GenerationSettings::cpp_relative_path)
-        cpp_include_with_path_cb->setCurrentItem(2);
+        cpp_include_with_path_cb->setCurrentIndex(2);
     else if (GenerationSettings::cpp_root_relative_path)
-        cpp_include_with_path_cb->setCurrentItem(3);
+        cpp_include_with_path_cb->setCurrentIndex(3);
     else
-        cpp_include_with_path_cb->setCurrentItem(1);
+        cpp_include_with_path_cb->setCurrentIndex(1);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
+    vtab->addWidget(htab);
     htab->setMargin(3);
 
-    htab->setStretchFactor(new QLabel(TR("force namespace \nprefix generation : "), htab), 0);
-    cpp_force_namespace_gen_cb = new QCheckBox(htab);
+    htab->addWidget(new QLabel(tr("force namespace \nprefix generation : "), htab));
+    htab->addWidget(cpp_force_namespace_gen_cb = new QCheckBox(htab));
     cpp_force_namespace_gen_cb->setChecked(GenerationSettings::cpp_force_namespace_gen);
 
-    htab->setStretchFactor(new QLabel(TR("            inline operation force \n            includes in header : "), htab), 0);
-    cpp_inline_force_incl_in_h_cb = new QCheckBox(htab);
+    htab->addWidget(new QLabel(tr("            inline operation force \n            includes in header : "), htab));
+    htab->addWidget(cpp_inline_force_incl_in_h_cb = new QCheckBox(htab));
     cpp_inline_force_incl_in_h_cb->setChecked(GenerationSettings::cpp_inline_force_incl_in_h);
 
-    htab->setStretchFactor(new QLabel(TR("            generate Javadoc \n            style comment : "), htab), 0);
-    cpp_javadoc_cb = new QCheckBox(htab);
+    htab->addWidget(new QLabel(tr("            generate Javadoc \n            style comment : "), htab));
+    htab->addWidget(cpp_javadoc_cb = new QCheckBox(htab));
     cpp_javadoc_cb->setChecked(GenerationSettings::cpp_javadoc_comment);
 
-    htab->setStretchFactor(new QLabel(TR("            visibility indent : "), htab), 0);
-    indentvisi_cb = new Q3ComboBox(FALSE, htab);
+    htab->addWidget(new QLabel(tr("            visibility indent : "), htab));
+    htab->addWidget(indentvisi_cb = new QComboBox(htab));
     init_indent(indentvisi_cb, GenerationSettings::cpp_indent_visibility);
 
-    htab->setStretchFactor(new QLabel(htab), 1000);
+    htab->addWidget(new QLabel(htab));
 
     addTab(vtab, "C++[1]");
 
@@ -250,13 +274,13 @@ void GenerationSettingsDialog::init_cpp1()
 
 void GenerationSettingsDialog::init_cpp2()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Class default \ndeclaration :"), grid);
-    edcpp_class_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Class default \ndeclaration :"), grid));
+    grid->addWidget(edcpp_class_decl = new MultiLineEdit(grid));
     edcpp_class_decl->setText(GenerationSettings::cpp_class_decl);
     QFont font = edcpp_class_decl->font();
 
@@ -266,23 +290,23 @@ void GenerationSettingsDialog::init_cpp2()
     font.setFixedPitch(TRUE);
     edcpp_class_decl->setFont(font);
 
-    new QLabel(TR("Struct default \ndeclaration :"), grid);
-    edcpp_struct_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Struct default \ndeclaration :"), grid));
+    grid->addWidget(edcpp_struct_decl = new MultiLineEdit(grid));
     edcpp_struct_decl->setText(GenerationSettings::cpp_struct_decl);
     edcpp_struct_decl->setFont(font);
 
-    new QLabel(TR("Union default \ndeclaration :"), grid);
-    edcpp_union_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Union default \ndeclaration :"), grid));
+    grid->addWidget(edcpp_union_decl = new MultiLineEdit(grid));
     edcpp_union_decl->setText(GenerationSettings::cpp_union_decl);
     edcpp_union_decl->setFont(font);
 
-    new QLabel(TR("Enum default \ndeclaration :"), grid);
-    edcpp_enum_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enum default \ndeclaration :"), grid));
+    grid->addWidget(edcpp_enum_decl = new MultiLineEdit(grid));
     edcpp_enum_decl->setText(GenerationSettings::cpp_enum_decl);
     edcpp_enum_decl->setFont(font);
 
-    new QLabel(TR("Typedef default \ndeclaration :"), grid);
-    edcpp_typedef_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Typedef default \ndeclaration :"), grid));
+    grid->addWidget(edcpp_typedef_decl = new MultiLineEdit(grid));
     edcpp_typedef_decl->setText(GenerationSettings::cpp_typedef_decl);
     edcpp_typedef_decl->setFont(font);
 
@@ -294,24 +318,26 @@ void GenerationSettingsDialog::init_cpp2()
 
 void GenerationSettingsDialog::init_cpp3()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3Grid * grid2;
-    Q3HBox * htab;
+    GridBox * grid = new GridBox(2, this);
+    GridBox * grid2;
+    HHBox * htab;
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Attribute \ndefault \ndeclaration :"), grid);
+    grid->addWidget(new QLabel(tr("Attribute \ndefault \ndeclaration :"), grid));
 
-    grid2 = new Q3Grid(2, grid);
-    (new QLabel(TR("Multiplicity"), grid2))->setAlignment(Qt::AlignCenter);
-    new QLabel(grid2);
-    new QLabel(TR("unspecified,\nor 1"), grid2);
-    edcpp_attr_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("* or a..b"), grid2);
-    edcpp_attr_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (means [X])\nor [...]...[...]"), grid2);
-    edcpp_attr_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    QLabel *label = new QLabel(tr("Multiplicity"), grid2);
+    label->setAlignment(Qt::AlignCenter);
+    grid2->addWidget(label);
+    grid2->addWidget(new QLabel(grid2));
+    grid2->addWidget(new QLabel(tr("unspecified,\nor 1"), grid2));
+    grid2->addWidget(edcpp_attr_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("* or a..b"), grid2));
+    grid2->addWidget(edcpp_attr_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (means [X])\nor [...]...[...]"), grid2));
+    grid2->addWidget(edcpp_attr_decl[2] = new MultiLineEdit(grid2));
 
     QFont font = edcpp_attr_decl[0]->font();
     int i, j;
@@ -326,43 +352,51 @@ void GenerationSettingsDialog::init_cpp3()
         edcpp_attr_decl[i]->setFont(font);
     }
 
-    new QLabel(grid);
-    new QLabel(grid);
-
-    new QLabel(TR("Association\nand\naggregation\ndefault\ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    (new QLabel(TR("Multiplicity"), grid2))->setAlignment(Qt::AlignCenter);
-    htab = new Q3HBox(grid2);
-    htab->setStretchFactor(new QLabel(htab), 1000);
-    (new QLabel(TR("Association "), htab))->setAlignment(Qt::AlignCenter);
-    (new QLabel(htab))->setPixmap(*associationButton);
-    (new QLabel(TR("  and aggregation "), htab))->setAlignment(Qt::AlignCenter);
-    (new QLabel(htab))->setPixmap(*aggregationButton);
-    htab->setStretchFactor(new QLabel(htab), 1000);
-    new QLabel(TR("unspecified,\n1 or 0..1"), grid2);
-    edcpp_rel_decl[0][0] = new MultiLineEdit(grid2);
-    new QLabel(TR("* or a..b"), grid2);
-    edcpp_rel_decl[0][1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (means [X])\nor [...]...[...]"), grid2);
-    edcpp_rel_decl[0][2] = new MultiLineEdit(grid2);
-
-    new QLabel(grid);
-    new QLabel(grid);
-
-    new QLabel(TR("Composition\ndefault\ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    (new QLabel(TR("Multiplicity"), grid2))->setAlignment(Qt::AlignCenter);
-    htab = new Q3HBox(grid2);
-    htab->setStretchFactor(new QLabel(htab), 1000);
-    (new QLabel(TR("Composition "), htab))->setAlignment(Qt::AlignCenter);
-    (new QLabel(htab))->setPixmap(*aggregationByValueButton);
-    htab->setStretchFactor(new QLabel(htab), 1000);
-    new QLabel(TR("unspecified\nor 1"), grid2);
-    edcpp_rel_decl[1][0] = new MultiLineEdit(grid2);
-    new QLabel(TR("* or a..b"), grid2);
-    edcpp_rel_decl[1][1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (means [X])\nor [...]...[...]"), grid2);
-    edcpp_rel_decl[1][2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
+
+    grid->addWidget(new QLabel(tr("Association\nand\naggregation\ndefault\ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(label = new QLabel(tr("Multiplicity"), grid2));
+    label->setAlignment(Qt::AlignCenter);
+    grid2->addWidget(htab =new HHBox(grid2));
+    htab->addWidget( new QLabel(htab));
+    htab->addWidget(( label = new QLabel(tr("Association "), htab)));
+    label->setAlignment(Qt::AlignCenter);
+    htab->addWidget((label = new QLabel(htab)));
+    label->setPixmap(*associationButton);
+    htab->addWidget((label =  new QLabel(tr("  and aggregation "), htab)));
+    label->setAlignment(Qt::AlignCenter);
+    htab->addWidget((label = new QLabel(htab)));
+    label->setPixmap(*aggregationButton);
+    htab->addWidget(new QLabel(htab));
+    grid2->addWidget(new QLabel(tr("unspecified,\n1 or 0..1"), grid2));
+    grid2->addWidget(edcpp_rel_decl[0][0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("* or a..b"), grid2));
+    grid2->addWidget(edcpp_rel_decl[0][1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (means [X])\nor [...]...[...]"), grid2));
+    grid2->addWidget(edcpp_rel_decl[0][2] = new MultiLineEdit(grid2));
+
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
+
+    grid->addWidget(new QLabel(tr("Composition\ndefault\ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(label = new QLabel(tr("Multiplicity"), grid2));
+    label->setAlignment(Qt::AlignCenter);
+    grid2->addWidget(htab =new HHBox(grid2));
+    htab->addWidget(new QLabel(htab));
+    htab->addWidget((label = new QLabel(tr("Composition "), htab)));
+    label->setAlignment(Qt::AlignCenter);
+    htab->addWidget((label =new QLabel("",htab)));
+    label->setPixmap(*aggregationByValueButton);
+    htab->addWidget(new QLabel("",htab));
+    grid2->addWidget(new QLabel(tr("unspecified\nor 1"), grid2));
+    grid2->addWidget(edcpp_rel_decl[1][0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("* or a..b"), grid2));
+    grid2->addWidget(edcpp_rel_decl[1][1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (means [X])\nor [...]...[...]"), grid2));
+    grid2->addWidget(edcpp_rel_decl[1][2] = new MultiLineEdit(grid2));
 
     for (i = 0; i != 2; i += 1) {
         for (j = 0; j != 3; j += 1) {
@@ -379,33 +413,34 @@ void GenerationSettingsDialog::init_cpp3()
 
 void GenerationSettingsDialog::init_cpp4()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3VBox * vtab;
-    Q3HBox * htab;
-    Q3ButtonGroup * bg;
+    GridBox * grid = new GridBox(2, this);
+    VVBox * vtab;
+    HHBox * htab;
+    BButtonGroup * bg;
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Get operation\ndefault definition : "), grid);
+    grid->addWidget(new QLabel(tr("Get operation\ndefault definition : "), grid));
 
-    vtab = new Q3VBox(grid);
+    grid->addWidget(vtab = new VVBox(grid));
 
-    htab = new Q3HBox(vtab);
-    cpp_get_visibility.init(htab, GenerationSettings::cpp_get_visibility,
-                            FALSE, TR("Visibility"));
+    vtab->addWidget(htab =new HHBox(vtab));
+    htab->addWidget(cpp_get_visibility.init(htab, GenerationSettings::cpp_get_visibility,
+                            FALSE, tr("Visibility")));
 
-    bg = new Q3ButtonGroup(3, Qt::Horizontal, TR("Modifiers"), htab);
-    bg->setExclusive(FALSE);
-    cpp_get_inline_cb = new QCheckBox("inline", bg);
-    cpp_get_value_const_cb = new QCheckBox(TR("const value"), bg);
-    cpp_get_const_cb = new QCheckBox("const", bg);
+    //bg = new QGroupBox(3, Qt::Horizontal, QObject::tr("Modifiers"), htab));
+    htab->addWidget(bg = new BButtonGroup(/*3, Qt::Horizontal, */tr("Modifiers"), htab));
+    ////bg->setExclusive(FALSE);
+    bg->addWidget(cpp_get_inline_cb = new QCheckBox("inline", bg));
+    bg->addWidget(cpp_get_value_const_cb = new QCheckBox(tr("const value"), bg));
+    bg->addWidget(cpp_get_const_cb = new QCheckBox("const", bg));
     cpp_get_inline_cb->setChecked(GenerationSettings::cpp_get_inline);
     cpp_get_value_const_cb->setChecked(GenerationSettings::cpp_get_value_const);
     cpp_get_const_cb->setChecked(GenerationSettings::cpp_get_const);
 
-    new QLabel(TR("  name : "), htab);
-    edcpp_get_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edcpp_get_name = new LineEdit(htab));
     edcpp_get_name->setText(GenerationSettings::cpp_get_name);
     QFont font = edcpp_get_name->font();
 
@@ -415,8 +450,8 @@ void GenerationSettingsDialog::init_cpp4()
     font.setFixedPitch(TRUE);
     edcpp_get_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_cpp_get_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_cpp_get_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_get_name == CppView)
         uml_follow_cpp_get_name->setChecked(TRUE);
@@ -424,30 +459,30 @@ void GenerationSettingsDialog::init_cpp4()
     connect(uml_follow_cpp_get_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_cpp_get_name()));
 
-    new QLabel(TR("Set operation\ndefault definition : "), grid);
+    grid->addWidget(new QLabel(tr("Set operation\ndefault definition : "), grid));
 
-    vtab = new Q3VBox(grid);
+    grid->addWidget(vtab = new VVBox(grid));
 
-    htab = new Q3HBox(vtab);
-    cpp_set_visibility.init(htab, GenerationSettings::cpp_get_visibility,
-                            FALSE, TR("Visibility"));
+    vtab->addWidget(htab =new HHBox(vtab));
+    htab->addWidget(cpp_set_visibility.init(htab, GenerationSettings::cpp_get_visibility,
+                                            FALSE, tr("Visibility")));
 
-    bg = new Q3ButtonGroup(4, Qt::Horizontal, TR("Modifiers"), htab);
-    bg->setExclusive(FALSE);
-    cpp_set_inline_cb = new QCheckBox("inline", bg);
-    cpp_set_param_const_cb = new QCheckBox(TR("const param"), bg);
-    cpp_set_param_ref_cb = new QCheckBox(TR("by ref"), bg);
+    htab->addWidget(bg = new BButtonGroup(/*4, Qt::Horizontal, */tr("Modifiers"), htab));
+    ////bg->setExclusive(FALSE);
+    bg->addWidget(cpp_set_inline_cb = new QCheckBox("inline", bg));
+    bg->addWidget(cpp_set_param_const_cb = new QCheckBox(tr("const param"), bg));
+    bg->addWidget(cpp_set_param_ref_cb = new QCheckBox(tr("by ref"), bg));
     cpp_set_inline_cb->setChecked(GenerationSettings::cpp_set_inline);
     cpp_set_param_const_cb->setChecked(GenerationSettings::cpp_set_param_const);
     cpp_set_param_ref_cb->setChecked(GenerationSettings::cpp_set_param_ref);
 
-    new QLabel(TR("  name : "), htab);
-    edcpp_set_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edcpp_set_name = new LineEdit(htab));
     edcpp_set_name->setText(GenerationSettings::cpp_set_name);
     edcpp_set_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_cpp_set_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_cpp_set_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_set_name == CppView)
         uml_follow_cpp_set_name->setChecked(TRUE);
@@ -455,72 +490,72 @@ void GenerationSettingsDialog::init_cpp4()
     connect(uml_follow_cpp_set_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_cpp_set_name()));
 
-    //new QLabel(grid);
-    //new QLabel(grid);
+    //new QLabel(grid));
+    //new QLabel(grid));
 
-    new QLabel(TR("Enumeration item \ndefault definition :"), grid);
-    edcpp_enum_item_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enumeration item \ndefault definition :"), grid));
+    grid->addWidget(edcpp_enum_item_decl = new MultiLineEdit(grid));
     edcpp_enum_item_decl->setText(GenerationSettings::cpp_enum_item_decl);
     edcpp_enum_item_decl->setFont(font);
 
-    //new QLabel(grid);
-    //new QLabel(grid);
+    //new QLabel(grid));
+    //new QLabel(grid));
 
-    new QLabel(TR("Default type forms\nfor the enums :"), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Default type forms\nfor the enums :"), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    new QLabel(TR("input\nparameter : "), htab);
-    cpp_enum_in = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("input\nparameter : "), htab));
+    htab->addWidget(cpp_enum_in = new LineEdit(htab));
     cpp_enum_in->setText(GenerationSettings::cpp_enum_in);
     cpp_enum_in->setFont(font);
-    new QLabel(TR("   output\n   parameter : "), htab);
-    cpp_enum_out = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("   output\n   parameter : "), htab));
+    htab->addWidget(cpp_enum_out = new LineEdit(htab));
     cpp_enum_out->setText(GenerationSettings::cpp_enum_out);
     cpp_enum_out->setFont(font);
-    new QLabel(TR("   input output \n   parameter : "), htab);
-    cpp_enum_inout = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("   input output \n   parameter : "), htab));
+    htab->addWidget(cpp_enum_inout = new LineEdit(htab));
     cpp_enum_inout->setText(GenerationSettings::cpp_enum_inout);
     cpp_enum_inout->setFont(font);
-    new QLabel(TR("   operation \n   return : "), htab);
-    cpp_enum_return = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("   operation \n   return : "), htab));
+    htab->addWidget(cpp_enum_return = new LineEdit(htab));
     cpp_enum_return->setText(GenerationSettings::cpp_enum_return);
     cpp_enum_return->setFont(font);
 
-    new QLabel(TR("Default type forms for\nthe types not given\nin the first tab:"), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Default type forms for\nthe types not given\nin the first tab:"), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    new QLabel(TR("input\nparameter : "), htab);
-    cpp_in = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("input\nparameter : "), htab));
+    htab->addWidget(cpp_in = new LineEdit(htab));
     cpp_in->setText(GenerationSettings::cpp_in);
     cpp_in->setFont(font);
-    new QLabel(TR("   output\n   parameter : "), htab);
-    cpp_out = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("   output\n   parameter : "), htab));
+    htab->addWidget(cpp_out = new LineEdit(htab));
     cpp_out->setText(GenerationSettings::cpp_out);
     cpp_out->setFont(font);
-    new QLabel(TR("   input output \n   parameter : "), htab);
-    cpp_inout = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("   input output \n   parameter : "), htab));
+    htab->addWidget(cpp_inout = new LineEdit(htab));
     cpp_inout->setText(GenerationSettings::cpp_inout);
     cpp_inout->setFont(font);
-    new QLabel(TR("   operation \n   return : "), htab);
-    cpp_return = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("   operation \n   return : "), htab));
+    htab->addWidget(cpp_return = new LineEdit(htab));
     cpp_return->setText(GenerationSettings::cpp_return);
     cpp_return->setFont(font);
 
-    //new QLabel(grid);
-    //new QLabel(grid);
+    //new QLabel(grid));
+    //new QLabel(grid));
 
-    new QLabel(TR("Operation default \ndeclaration :"), grid);
-    edcpp_oper_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Operation default \ndeclaration :"), grid));
+    grid->addWidget(edcpp_oper_decl = new MultiLineEdit(grid));
     edcpp_oper_decl->setText(GenerationSettings::cpp_oper_decl);
     edcpp_oper_decl->setFont(font);
 
-    new QLabel(TR("Operation default \ndefinition :"), grid);
-    htab = new Q3HBox(grid);
-    edcpp_oper_def = new MultiLineEdit(htab);
+    grid->addWidget(new QLabel(tr("Operation default \ndefinition :"), grid));
+    grid->addWidget(htab =new HHBox(grid));
+    htab->addWidget(edcpp_oper_def = new MultiLineEdit(htab));
     edcpp_oper_def->setText(GenerationSettings::cpp_oper_def);
     edcpp_oper_def->setFont(font);
-    new QLabel("  ", htab);
-    cpp_force_throw_cb = new QCheckBox("throw()", htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(cpp_force_throw_cb = new QCheckBox("throw()", htab));
     cpp_force_throw_cb->setChecked(GenerationSettings::cpp_force_throw);
 
 
@@ -536,21 +571,21 @@ void GenerationSettingsDialog::init_cpp5()
 
     split->setOpaqueResize(TRUE);
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl1 =
-        new QLabel(TR("External classes : \nname making\n#include, using"), htab);
-    edcpp_external_class_decl = new MultiLineEdit(htab);
+    QLabel * lbl1;
+    htab->addWidget(lbl1 = new QLabel(tr("External classes : \nname making\n#include, using"), htab));
+    htab->addWidget(edcpp_external_class_decl = new MultiLineEdit(htab));
     edcpp_external_class_decl->setText(GenerationSettings::cpp_external_class_decl);
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl2 =
-        new QLabel(TR("External types :\n#include form(s),\nusing, etc..."), htab);
-    cpp_include_table =
-        new IncludeTable(htab, GenerationSettings::cpp_includes,
-                         TR("Include etc..."), "#include <>");
+    QLabel * lbl2 = new QLabel(tr("External types :\n#include form(s),\nusing, etc..."), htab);
+    htab->addWidget(lbl2);
+    htab->addWidget(cpp_include_table =
+            new IncludeTable(htab, GenerationSettings::cpp_includes,
+                             tr("Include etc..."), "#include <>"));
 
     same_width(lbl1, lbl2);
 
@@ -558,22 +593,23 @@ void GenerationSettingsDialog::init_cpp5()
 
     if (!GenerationSettings::cpp_get_default_defs())
         removePage(split);
+
 }
 
 void GenerationSettingsDialog::init_java1()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("file default \ncontent :"), grid);
-
-    Q3HBox * htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("file default \ncontent :"), grid));
+    HHBox * htab;
+    grid->addWidget(htab =new HHBox(grid));
 
     htab->setMargin(3);
 
-    edjava_src_content = new MultiLineEdit(htab);
+    htab->addWidget(edjava_src_content = new MultiLineEdit(htab));
     edjava_src_content->setText(GenerationSettings::java_src_content);
     QFont font = edjava_src_content->font();
 
@@ -582,48 +618,50 @@ void GenerationSettingsDialog::init_java1()
 
     font.setFixedPitch(TRUE);
     edjava_src_content->setFont(font);
-
-    Q3VBox * vtab = new Q3VBox(htab);
-    Q3HBox * htab2 = new Q3HBox(vtab);
+    VVBox * vtab;
+    htab->addWidget(vtab = new VVBox(htab));
+    HHBox * htab2;
+    vtab->addWidget(htab2 = new HHBox(vtab));
 
     vtab->setMargin(3);
     htab2->setMargin(3);
 
-    new QLabel(TR("    generated/reversed file extension "), htab2);
-    edjava_extension = new Q3ComboBox(TRUE, htab2);
-    edjava_extension->insertItem(GenerationSettings::java_extension);
-    edjava_extension->setCurrentItem(0);
-    edjava_extension->insertItem("java");
+    htab2->addWidget(new QLabel(tr("    generated/reversed file extension "), htab2));
+    htab2->addWidget(edjava_extension = new QComboBox(htab2));
+    edjava_extension->setEditable(true);
+    edjava_extension->addItem(GenerationSettings::java_extension);
+    edjava_extension->setCurrentIndex(0);
+    edjava_extension->addItem("java");
 
-    htab2 = new Q3HBox(vtab);
+    vtab->addWidget(htab2 = new HHBox(vtab));
     htab2->setMargin(3);
-    new QLabel(TR("    generate Javadoc style comment "), htab2);
-    java_javadoc_cb = new QCheckBox(htab2);
+    htab2->addWidget(new QLabel(tr("    generate Javadoc style comment "), htab2));
+    htab2->addWidget(java_javadoc_cb = new QCheckBox(htab2));
     java_javadoc_cb->setChecked(GenerationSettings::java_javadoc_comment);
 
-    htab2 = new Q3HBox(vtab);
+    vtab->addWidget(htab2 = new HHBox(vtab));
     htab2->setMargin(3);
-    new QLabel(TR("    force package prefix generation "), htab2);
-    java_force_package_gen_cb = new QCheckBox(htab2);
+    htab2->addWidget(new QLabel(tr("    force package prefix generation "), htab2));
+    htab2->addWidget(java_force_package_gen_cb = new QCheckBox(htab2));
     java_force_package_gen_cb->setChecked(GenerationSettings::java_force_package_gen);
 
-    new QLabel(TR("Class default \ndeclaration :"), grid);
-    edjava_class_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Class default \ndeclaration :"), grid));
+    grid->addWidget(edjava_class_decl = new MultiLineEdit(grid));
     edjava_class_decl->setText(GenerationSettings::java_class_decl);
     edjava_class_decl->setFont(font);
 
-    new QLabel(TR("Interface default \ndeclaration :"), grid);
-    edjava_interface_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Interface default \ndeclaration :"), grid));
+    grid->addWidget(edjava_interface_decl = new MultiLineEdit(grid));
     edjava_interface_decl->setText(GenerationSettings::java_interface_decl);
     edjava_interface_decl->setFont(font);
 
-    new QLabel(TR("Enum default \ndeclaration :"), grid);
-    edjava_enum_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enum default \ndeclaration :"), grid));
+    grid->addWidget(edjava_enum_decl = new MultiLineEdit(grid));
     edjava_enum_decl->setText(GenerationSettings::java_enum_decl);
     edjava_enum_decl->setFont(font);
 
-    new QLabel(TR("Enum pattern \ndefault declaration :"), grid);
-    edjava_enum_pattern_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enum pattern \ndefault declaration :"), grid));
+    grid->addWidget(edjava_enum_pattern_decl = new MultiLineEdit(grid));
     edjava_enum_pattern_decl->setText(GenerationSettings::java_enum_pattern_decl);
     edjava_enum_pattern_decl->setFont(font);
 
@@ -635,21 +673,22 @@ void GenerationSettingsDialog::init_java1()
 
 void GenerationSettingsDialog::init_java2()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3Grid * grid2;
+
+    GridBox * grid = new GridBox(2, this);
+    GridBox * grid2;
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Attribute \ndefault \ndeclaration :"), grid);
+    grid->addWidget(new QLabel(tr("Attribute \ndefault \ndeclaration :"), grid));
 
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edjava_attr_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edjava_attr_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edjava_attr_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edjava_attr_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edjava_attr_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edjava_attr_decl[2] = new MultiLineEdit(grid2));
 
     QFont font = edjava_attr_decl[0]->font();
     int i;
@@ -664,17 +703,17 @@ void GenerationSettingsDialog::init_java2()
         edjava_attr_decl[i]->setFont(font);
     }
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Association and\naggregation\ndefault\ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edjava_rel_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edjava_rel_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edjava_rel_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Association and\naggregation\ndefault\ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edjava_rel_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edjava_rel_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edjava_rel_decl[2] = new MultiLineEdit(grid2));
 
     for (i = 0; i != 3; i += 1) {
         edjava_rel_decl[i]->setText(GenerationSettings::java_rel_decl[i]);
@@ -685,19 +724,21 @@ void GenerationSettingsDialog::init_java2()
 
     if (!GenerationSettings::java_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_java3()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3HBox * htab;
-    Q3ButtonGroup * bg;
+
+    GridBox * grid = new GridBox(2, this);
+    HHBox * htab;
+    BButtonGroup * bg;
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Enumeration item \ndefault definition :"), grid);
-    edjava_enum_item_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enumeration item \ndefault definition :"), grid));
+    grid->addWidget(edjava_enum_item_decl = new MultiLineEdit(grid));
     edjava_enum_item_decl->setText(GenerationSettings::java_enum_item_decl);
 
     QFont font = edjava_enum_item_decl->font();
@@ -708,35 +749,35 @@ void GenerationSettingsDialog::init_java3()
     font.setFixedPitch(TRUE);
     edjava_enum_item_decl->setFont(font);
 
-    new QLabel(TR("Enum pattern item \ndefault definition :"), grid);
-    edjava_enum_pattern_item_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enum pattern item \ndefault definition :"), grid));
+    grid->addWidget(edjava_enum_pattern_item_decl = new MultiLineEdit(grid));
     edjava_enum_pattern_item_decl->setText(GenerationSettings::java_enum_pattern_item_decl);
     edjava_enum_pattern_item_decl->setFont(font);
 
-    new QLabel(TR("Enum pattern item \n'case' in 'from_int' :"), grid);
-    edjava_enum_pattern_item_case = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enum pattern item \n'case' in 'from_int' :"), grid));
+    grid->addWidget(edjava_enum_pattern_item_case = new MultiLineEdit(grid));
     edjava_enum_pattern_item_case->setText(GenerationSettings::java_enum_pattern_item_case);
     edjava_enum_pattern_item_case->setFont(font);
 
-    new QLabel(TR("Get operation\ndefault definition : "), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Get operation\ndefault definition : "), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    java_get_visibility.init(htab, GenerationSettings::noncpp_get_visibility,
-                             TRUE, TR("Visibility (shared with Php)"));
+    htab->addWidget(java_get_visibility.init(htab, GenerationSettings::noncpp_get_visibility,
+                                             TRUE, tr("Visibility (shared with Php)")));
     java_get_visibility.connect(SIGNAL(clicked(int)), this, SLOT(java_get_visi_changed(int)));
 
-    bg = new Q3ButtonGroup(1, Qt::Horizontal, TR("Modifiers"), htab);
-    bg->setExclusive(FALSE);
-    java_get_final_cb = new QCheckBox("final", bg);
+    htab->addWidget(bg = new BButtonGroup(/*1, Qt::Horizontal, */tr("Modifiers"), htab));
+    ////bg->setExclusive(FALSE);
+    bg->addWidget(java_get_final_cb = new QCheckBox("final", bg));
     java_get_final_cb->setChecked(GenerationSettings::java_get_final);
 
-    new QLabel(TR("  name : "), htab);
-    edjava_get_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edjava_get_name = new LineEdit(htab));
     edjava_get_name->setText(GenerationSettings::java_get_name);
     edjava_get_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_java_get_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_java_get_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_get_name == JavaView)
         uml_follow_java_get_name->setChecked(TRUE);
@@ -744,27 +785,27 @@ void GenerationSettingsDialog::init_java3()
     connect(uml_follow_java_get_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_java_get_name()));
 
-    new QLabel(TR("Set operation\ndefault definition : "), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Set operation\ndefault definition : "), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    java_set_visibility.init(htab, GenerationSettings::noncpp_set_visibility,
-                             TRUE, TR("Visibility (shared with Php)"));
+    htab->addWidget(java_set_visibility.init(htab, GenerationSettings::noncpp_set_visibility,
+                                             TRUE, tr("Visibility (shared with Php)")));
     java_set_visibility.connect(SIGNAL(clicked(int)), this, SLOT(java_set_visi_changed(int)));
 
-    bg = new Q3ButtonGroup(2, Qt::Horizontal, TR("Modifiers"), htab);
-    bg->setExclusive(FALSE);
-    java_set_final_cb = new QCheckBox("final", bg);
-    java_set_param_final_cb = new QCheckBox(TR("final parameter"), bg);
+    htab->addWidget(bg = new BButtonGroup(/*2, Qt::Horizontal,*/ QObject::tr("Modifiers"), htab));
+    ////bg->setExclusive(FALSE);
+    bg->addWidget(java_set_final_cb = new QCheckBox("final", bg));
+    bg->addWidget(java_set_param_final_cb = new QCheckBox(tr("final parameter"), bg));
     java_set_final_cb->setChecked(GenerationSettings::java_set_final);
     java_set_param_final_cb->setChecked(GenerationSettings::java_set_param_final);
 
-    new QLabel(TR("  name : "), htab);
-    edjava_set_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edjava_set_name = new LineEdit(htab));
     edjava_set_name->setText(GenerationSettings::java_set_name);
     edjava_set_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_java_set_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_java_set_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_set_name == JavaView)
         uml_follow_java_set_name->setChecked(TRUE);
@@ -772,11 +813,11 @@ void GenerationSettingsDialog::init_java3()
     connect(uml_follow_java_set_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_java_set_name()));
 
-    //new QLabel(grid);
-    //new QLabel(grid);
+    //new QLabel(grid));
+    //new QLabel(grid));
 
-    new QLabel(TR("Operation\ndefault definition :"), grid);
-    edjava_oper_def = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Operation\ndefault definition :"), grid));
+    grid->addWidget(edjava_oper_def = new MultiLineEdit(grid));
     edjava_oper_def->setText(GenerationSettings::java_oper_def);
     edjava_oper_def->setFont(font);
 
@@ -784,52 +825,59 @@ void GenerationSettingsDialog::init_java3()
 
     if (!GenerationSettings::java_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_java4()
 {
+
     QSplitter * split = new QSplitter(Qt::Vertical, this);
 
     split->setOpaqueResize(TRUE);
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl1 =
-        new QLabel(TR("External classes : \nname making"), htab);
-    edjava_external_class_decl = new LineEdit(htab);
+    QLabel * lbl1;
+    htab->addWidget(lbl1 =
+            new QLabel(tr("External classes : \nname making"), htab));
+    htab->addWidget(edjava_external_class_decl = new LineEdit(htab));
     edjava_external_class_decl->setText(GenerationSettings::java_external_class_decl);
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl2 =
-        new QLabel(TR("External types :\nimport form(s) etc..."), htab);
-    java_import_table =
-        new IncludeTable(htab, GenerationSettings::java_imports,
-                         "Import etc...", "import ");
+    QLabel * lbl2;
+    htab->addWidget(lbl2 =
+            new QLabel(tr("External types :\nimport form(s) etc..."), htab));
+    htab->addWidget(java_import_table =
+            new IncludeTable(htab, GenerationSettings::java_imports,
+                             "Import etc...", "import "));
 
     same_width(lbl1, lbl2);
     addTab(split, "Java[4]");
 
     if (!GenerationSettings::java_get_default_defs())
         removePage(split);
+
 }
 
 void GenerationSettingsDialog::init_php1()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
+
+    GridBox * grid = new GridBox(2, this);
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("file default \ncontent :"), grid);
+    grid->addWidget(new QLabel(tr("file default \ncontent :"), grid));
 
-    Q3HBox * htab = new Q3HBox(grid);
+    HHBox * htab;
+    grid->addWidget(htab =new HHBox(grid));
 
     htab->setMargin(3);
 
-    edphp_src_content = new MultiLineEdit(htab);
+    htab->addWidget(edphp_src_content = new MultiLineEdit(htab));
     edphp_src_content->setText(GenerationSettings::php_src_content);
     QFont font = edphp_src_content->font();
 
@@ -839,60 +887,63 @@ void GenerationSettingsDialog::init_php1()
     font.setFixedPitch(TRUE);
     edphp_src_content->setFont(font);
 
-    Q3VBox * vtab = new Q3VBox(htab);
-    Q3HBox * htab2 = new Q3HBox(vtab);
+    VVBox* vtab;
+    HHBox * htab2;
+    htab->addWidget(vtab = new VVBox(htab));
+    vtab->addWidget(htab2 = new HHBox(vtab));
 
     vtab->setMargin(3);
     htab2->setMargin(3);
 
-    new QLabel(TR("    generated / reversed file extension : "), htab2);
-    edphp_extension = new Q3ComboBox(TRUE, htab2);
-    edphp_extension->insertItem(GenerationSettings::php_extension);
-    edphp_extension->setCurrentItem(0);
-    edphp_extension->insertItem("php");
+    htab2->addWidget(new QLabel(tr("    generated / reversed file extension : "), htab2));
+    htab2->addWidget(edphp_extension = new QComboBox(htab2));
+    edphp_extension->setEditable(true);
+    edphp_extension->addItem(GenerationSettings::php_extension);
+    edphp_extension->setCurrentIndex(0);
+    edphp_extension->addItem("php");
 
-    htab2 = new Q3HBox(vtab);
+    vtab->addWidget(htab2 = new HHBox(vtab));
     htab2->setMargin(3);
-    new QLabel(TR("    generate Javadoc style comment : "), htab2);
-    php_javadoc_cb = new QCheckBox(htab2);
+    htab2->addWidget(new QLabel(tr("    generate Javadoc style comment : "), htab2));
+    htab2->addWidget(php_javadoc_cb = new QCheckBox(htab2));
     php_javadoc_cb->setChecked(GenerationSettings::php_javadoc_comment);
 
-    htab2 = new Q3HBox(vtab);
+    vtab->addWidget(htab2 = new HHBox(vtab));
     htab2->setMargin(3);
-    new QLabel(TR("    require_once : "), htab2);
-    php_require_with_path_cb = new Q3ComboBox(FALSE, htab2);
-    php_require_with_path_cb->insertItem(TR("without path"));
-    php_require_with_path_cb->insertItem(TR("with absolute path"));
-    php_require_with_path_cb->insertItem(TR("with relative path"));
-    php_require_with_path_cb->insertItem(TR("with root relative path"));
+    htab2->addWidget(new QLabel(tr("    require_once : "), htab2));
+    htab2->addWidget(php_require_with_path_cb = new QComboBox( htab2));
+    php_require_with_path_cb->addItem(tr("without path"));
+    php_require_with_path_cb->addItem(tr("with absolute path"));
+    php_require_with_path_cb->addItem(tr("with relative path"));
+    php_require_with_path_cb->addItem(tr("with root relative path"));
 
     if (!GenerationSettings::php_req_with_path)
-        php_require_with_path_cb->setCurrentItem(0);
+        php_require_with_path_cb->setCurrentIndex(0);
     else if (GenerationSettings::php_relative_path)
-        php_require_with_path_cb->setCurrentItem(2);
+        php_require_with_path_cb->setCurrentIndex(2);
     else if (GenerationSettings::php_root_relative_path)
-        php_require_with_path_cb->setCurrentItem(3);
+        php_require_with_path_cb->setCurrentIndex(3);
     else
-        php_require_with_path_cb->setCurrentItem(1);
+        php_require_with_path_cb->setCurrentIndex(1);
 
-    htab2 = new Q3HBox(vtab);
+    vtab->addWidget(htab2 = new HHBox(vtab));
     htab2->setMargin(3);
-    new QLabel(TR("    force namespace prefix generation : "), htab2);
-    php_force_namespace_gen_cb = new QCheckBox(htab2);
+    htab2->addWidget(new QLabel(tr("    force namespace prefix generation : "), htab2));
+    htab2->addWidget(php_force_namespace_gen_cb = new QCheckBox(htab2));
     php_force_namespace_gen_cb->setChecked(GenerationSettings::php_force_namespace_gen);
 
-    new QLabel(TR("Class default \ndeclaration :"), grid);
-    edphp_class_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Class default \ndeclaration :"), grid));
+    grid->addWidget(edphp_class_decl = new MultiLineEdit(grid));
     edphp_class_decl->setText(GenerationSettings::php_class_decl);
     edphp_class_decl->setFont(font);
 
-    new QLabel(TR("Interface default \ndeclaration :"), grid);
-    edphp_interface_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Interface default \ndeclaration :"), grid));
+    grid->addWidget(edphp_interface_decl = new MultiLineEdit(grid));
     edphp_interface_decl->setText(GenerationSettings::php_interface_decl);
     edphp_interface_decl->setFont(font);
 
-    new QLabel(TR("Enum default \ndeclaration :"), grid);
-    edphp_enum_decl = new MultiLineEdit(grid);
+    grid->addWidget( new QLabel(tr("Enum default \ndeclaration :"), grid));
+    grid->addWidget(edphp_enum_decl = new MultiLineEdit(grid));
     edphp_enum_decl->setText(GenerationSettings::php_enum_decl);
     edphp_enum_decl->setFont(font);
 
@@ -900,17 +951,19 @@ void GenerationSettingsDialog::init_php1()
 
     if (!GenerationSettings::php_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_php2()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
+
+    GridBox * grid = new GridBox(2, this);
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Attribute default \ndeclaration :"), grid);
-    edphp_attr_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Attribute default \ndeclaration :"), grid));
+    grid->addWidget(edphp_attr_decl = new MultiLineEdit(grid));
 
     QFont font = edphp_attr_decl->font();
 
@@ -922,16 +975,16 @@ void GenerationSettingsDialog::init_php2()
     edphp_attr_decl->setText(GenerationSettings::php_attr_decl);
     edphp_attr_decl->setFont(font);
 
-    new QLabel(TR("Association and\naggregation\ndefault\ndeclaration :"), grid);
-    edphp_rel_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Association and\naggregation\ndefault\ndeclaration :"), grid));
+    grid->addWidget(edphp_rel_decl = new MultiLineEdit(grid));
     edphp_rel_decl->setText(GenerationSettings::php_rel_decl);
     edphp_rel_decl->setFont(font);
 
-    Q3HBox * htab;
-    Q3ButtonGroup * bg;
+    HHBox * htab;
+    BButtonGroup * bg;
 
-    new QLabel(TR("Enumeration item \ndefault definition :"), grid);
-    edphp_enum_item_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enumeration item \ndefault definition :"), grid));
+    grid->addWidget(edphp_enum_item_decl = new MultiLineEdit(grid));
     edphp_enum_item_decl->setText(GenerationSettings::php_enum_item_decl);
 
     if (! hasCodec())
@@ -940,25 +993,25 @@ void GenerationSettingsDialog::init_php2()
     font.setFixedPitch(TRUE);
     edphp_enum_item_decl->setFont(font);
 
-    new QLabel(TR("Get operation\ndefault definition : "), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Get operation\ndefault definition : "), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    php_get_visibility.init(htab, GenerationSettings::noncpp_get_visibility,
-                            FALSE, TR("Visibility (shared with Java)"));
+    htab->addWidget(php_get_visibility.init(htab, GenerationSettings::noncpp_get_visibility,
+                                            FALSE, tr("Visibility (shared with Java)")));
     php_get_visibility.connect(SIGNAL(clicked(int)), this, SLOT(php_get_visi_changed(int)));
 
-    bg = new Q3ButtonGroup(1, Qt::Horizontal, TR("Modifiers"), htab);
-    bg->setExclusive(FALSE);
-    php_get_final_cb = new QCheckBox("final", bg);
+    htab->addWidget(bg = new BButtonGroup(/*1, Qt::Horizontal,*/ QObject::tr("Modifiers"), htab));
+    ////bg->setExclusive(FALSE);
+    bg->addWidget(php_get_final_cb = new QCheckBox("final", bg));
     php_get_final_cb->setChecked(GenerationSettings::php_get_final);
 
-    new QLabel(TR("  name : "), htab);
-    edphp_get_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edphp_get_name = new LineEdit(htab));
     edphp_get_name->setText(GenerationSettings::php_get_name);
     edphp_get_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_php_get_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_php_get_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_get_name == PhpView)
         uml_follow_php_get_name->setChecked(TRUE);
@@ -966,25 +1019,25 @@ void GenerationSettingsDialog::init_php2()
     connect(uml_follow_php_get_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_php_get_name()));
 
-    new QLabel(TR("Set operation\ndefault definition : "), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Set operation\ndefault definition : "), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    php_set_visibility.init(htab, GenerationSettings::noncpp_set_visibility,
-                            FALSE, TR("Visibility (shared with Java)"));
+    htab->addWidget(php_set_visibility.init(htab, GenerationSettings::noncpp_set_visibility,
+                                            FALSE, tr("Visibility (shared with Java)")));
     php_set_visibility.connect(SIGNAL(clicked(int)), this, SLOT(php_set_visi_changed(int)));
 
-    bg = new Q3ButtonGroup(2, Qt::Horizontal, TR("Modifiers"), htab);
-    bg->setExclusive(FALSE);
-    php_set_final_cb = new QCheckBox("final", bg);
+    htab->addWidget(bg = new BButtonGroup(/*2, Qt::Horizontal,*/ QObject::tr("Modifiers"), htab));
+    //bg->setExclusive(FALSE);
+    bg->addWidget(php_set_final_cb = new QCheckBox("final", bg));
     php_set_final_cb->setChecked(GenerationSettings::php_set_final);
 
-    new QLabel(TR("  name : "), htab);
-    edphp_set_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edphp_set_name = new LineEdit(htab));
     edphp_set_name->setText(GenerationSettings::php_set_name);
     edphp_set_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_php_set_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_php_set_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_set_name == PhpView)
         uml_follow_php_set_name->setChecked(TRUE);
@@ -992,52 +1045,56 @@ void GenerationSettingsDialog::init_php2()
     connect(uml_follow_php_set_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_php_set_name()));
 
-    //new QLabel(grid);
-    //new QLabel(grid);
+    //new QLabel(grid));
+    //new QLabel(grid));
 
-    new QLabel(TR("Operation\ndefault definition :"), grid);
-    edphp_oper_def = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Operation\ndefault definition :"), grid));
+    grid->addWidget(edphp_oper_def = new MultiLineEdit(grid));
     edphp_oper_def->setText(GenerationSettings::php_oper_def);
     edphp_oper_def->setFont(font);
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("External classes : \nname making"), grid);
-    edphp_external_class_decl = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("External classes : \nname making"), grid));
+    grid->addWidget(edphp_external_class_decl = new LineEdit(grid));
     edphp_external_class_decl->setText(GenerationSettings::php_external_class_decl);
 
     addTab(grid, "Php[2]");
 
     if (!GenerationSettings::php_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_python1()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
+
+    GridBox * grid = new GridBox(2, this);
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("indent step :"), grid);
+    grid->addWidget(new QLabel(tr("indent step :"), grid));
 
-    Q3HBox * htab = new Q3HBox(grid);
+    HHBox * htab;
+    grid->addWidget(htab =new HHBox(grid));
 
     htab->setMargin(3);
-    indentstep_cb = new Q3ComboBox(FALSE, htab);
+    htab->addWidget(indentstep_cb = new QComboBox(htab));
     init_indent(indentstep_cb, GenerationSettings::python_indent_step);
 
-    QLabel * lbl = new QLabel(htab);
+    QLabel * lbl;
+    htab->addWidget(lbl = new QLabel(htab));
     QSizePolicy sp = lbl->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     lbl->setSizePolicy(sp);
 
-    new QLabel(TR("file default \ncontent :"), grid);
+    grid->addWidget(new QLabel(tr("file default \ncontent :"), grid));
 
-    htab = new Q3HBox(grid);
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    edpython_src_content = new MultiLineEdit(htab);
+    htab->addWidget(edpython_src_content = new MultiLineEdit(htab));
     edpython_src_content->setText(GenerationSettings::python_src_content);
     QFont font = edpython_src_content->font();
 
@@ -1047,42 +1104,44 @@ void GenerationSettingsDialog::init_python1()
     font.setFixedPitch(TRUE);
     edpython_src_content->setFont(font);
 
-    new QLabel(TR("    generated /\n    reversed\n    file extension : "), htab);
-    edpython_extension = new Q3ComboBox(TRUE, htab);
-    edpython_extension->insertItem(GenerationSettings::python_extension);
-    edpython_extension->setCurrentItem(0);
-    edpython_extension->insertItem("py");
+    htab->addWidget(new QLabel(tr("    generated /\n    reversed\n    file extension : "), htab));
+    htab->addWidget(edpython_extension = new QComboBox(htab));
+    edpython_extension->setEditable(true);
+    edpython_extension->addItem(GenerationSettings::python_extension);
+    edpython_extension->setCurrentIndex(0);
+    edpython_extension->addItem("py");
 
-    new QLabel(TR("Class default \ndeclaration :"), grid);
+    grid->addWidget(new QLabel(tr("Class default \ndeclaration :"), grid));
 
-    htab = new Q3HBox(grid);
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    edpython_class_decl = new MultiLineEdit(htab);
+    htab->addWidget(edpython_class_decl = new MultiLineEdit(htab));
     edpython_class_decl->setText(GenerationSettings::python_class_decl);
     edpython_class_decl->setFont(font);
 
-    new QLabel(TR("    classes of Python 2.2 "), htab);
-    python_2_2_cb = new QCheckBox(htab);
+    htab->addWidget(new QLabel(tr("    classes of Python 2.2 "), htab));
+    htab->addWidget(python_2_2_cb = new QCheckBox(htab));
     python_2_2_cb->setChecked(GenerationSettings::python_2_2);
 
-    new QLabel(TR("Enum default \ndeclaration :"), grid);
-    edpython_enum_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enum default \ndeclaration :"), grid));
+    grid->addWidget(edpython_enum_decl = new MultiLineEdit(grid));
     edpython_enum_decl->setText(GenerationSettings::python_enum_decl);
     edpython_enum_decl->setFont(font);
 
-    new QLabel(TR("Enumeration item \ndefault definition :"), grid);
-    edpython_enum_item_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enumeration item \ndefault definition :"), grid));
+    grid->addWidget(edpython_enum_item_decl = new MultiLineEdit(grid));
     edpython_enum_item_decl->setText(GenerationSettings::python_enum_item_decl);
     edpython_enum_item_decl->setFont(font);
 
-    new QLabel(TR("Attribute \ndefault \ndeclaration :"), grid);
+    grid->addWidget(new QLabel(tr("Attribute \ndefault \ndeclaration :"), grid));
 
-    Q3Grid * grid2 = new Q3Grid(2, grid);
+    GridBox * grid2;
+    grid->addWidget(grid2 = new GridBox(2, grid));
 
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edpython_attr_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("other\nmultiplicity"), grid2);
-    edpython_attr_decl[1] = new MultiLineEdit(grid2);
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edpython_attr_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("other\nmultiplicity"), grid2));
+    grid2->addWidget(edpython_attr_decl[1] = new MultiLineEdit(grid2));
 
     int i;
 
@@ -1095,20 +1154,22 @@ void GenerationSettingsDialog::init_python1()
 
     if (!GenerationSettings::python_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_python2()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3Grid * grid2;
+
+    GridBox * grid = new GridBox(2, this);
+    GridBox * grid2;
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Association and\naggregation\ndefault\ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edpython_rel_decl[0][0] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Association and\naggregation\ndefault\ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edpython_rel_decl[0][0] = new MultiLineEdit(grid2));
 
     QFont font = edpython_rel_decl[0][0]->font();
     int i;
@@ -1118,44 +1179,44 @@ void GenerationSettingsDialog::init_python2()
 
     font.setFixedPitch(TRUE);
 
-    new QLabel(TR("other\nmultiplicity"), grid2);
-    edpython_rel_decl[0][1] = new MultiLineEdit(grid2);
+    grid2->addWidget(new QLabel(tr("other\nmultiplicity"), grid2));
+    grid2->addWidget(edpython_rel_decl[0][1] = new MultiLineEdit(grid2));
 
     for (i = 0; i != 2; i += 1) {
         edpython_rel_decl[0][i]->setText(GenerationSettings::python_rel_decl[0][i]);
         edpython_rel_decl[0][i]->setFont(font);
     }
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Composition\ndefault\ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edpython_rel_decl[1][0] = new MultiLineEdit(grid2);
-    new QLabel(TR("other\nmultiplicity"), grid2);
-    edpython_rel_decl[1][1] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Composition\ndefault\ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edpython_rel_decl[1][0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("other\nmultiplicity"), grid2));
+    grid2->addWidget(edpython_rel_decl[1][1] = new MultiLineEdit(grid2));
 
     for (i = 0; i != 2; i += 1) {
         edpython_rel_decl[1][i]->setText(GenerationSettings::python_rel_decl[1][i]);
         edpython_rel_decl[1][i]->setFont(font);
     }
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Get operation\ndefault definition : "), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Get operation\ndefault definition : "), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    new QLabel(TR("  name : "), htab);
-    edpython_get_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edpython_get_name = new LineEdit(htab));
     edpython_get_name->setText(GenerationSettings::python_get_name);
     edpython_get_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_python_get_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_python_get_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_get_name == PythonView)
         uml_follow_python_get_name->setChecked(TRUE);
@@ -1163,16 +1224,16 @@ void GenerationSettingsDialog::init_python2()
     connect(uml_follow_python_get_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_python_get_name()));
 
-    new QLabel(TR("Set operation\ndefault definition : "), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Set operation\ndefault definition : "), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    new QLabel(TR("  name : "), htab);
-    edpython_set_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edpython_set_name = new LineEdit(htab));
     edpython_set_name->setText(GenerationSettings::python_set_name);
     edpython_set_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_python_set_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_python_set_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_set_name == PythonView)
         uml_follow_python_set_name->setChecked(TRUE);
@@ -1180,21 +1241,21 @@ void GenerationSettingsDialog::init_python2()
     connect(uml_follow_python_set_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_python_set_name()));
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Operation\ndefault definition :"), grid);
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel(tr("Operation\ndefault definition :"), grid));
+    grid->addWidget(htab =new HHBox(grid));
     htab->setMargin(3);
-    edpython_oper_def = new MultiLineEdit(htab);
+    htab->addWidget(edpython_oper_def = new MultiLineEdit(htab));
     edpython_oper_def->setText(GenerationSettings::python_oper_def);
     edpython_oper_def->setFont(font);
-    new QLabel(TR("    operation of Python 3 (pep-3107) "), htab);
-    python_3_operation_cb = new QCheckBox(htab);
+    htab->addWidget(new QLabel(tr("    operation of Python 3 (pep-3107) "), htab));
+    htab->addWidget(python_3_operation_cb = new QCheckBox(htab));
     python_3_operation_cb->setChecked(GenerationSettings::python_3_operation);
 
-    new QLabel(TR("Operation __init__\ndefault definition :"), grid);
-    edpython_initoper_def = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Operation __init__\ndefault definition :"), grid));
+    grid->addWidget(edpython_initoper_def = new MultiLineEdit(grid));
     edpython_initoper_def->setText(GenerationSettings::python_initoper_def);
     edpython_initoper_def->setFont(font);
 
@@ -1202,51 +1263,58 @@ void GenerationSettingsDialog::init_python2()
 
     if (!GenerationSettings::python_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_python3()
 {
+
     QSplitter * split = new QSplitter(Qt::Vertical, this);
 
     split->setOpaqueResize(TRUE);
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl1 =
-        new QLabel(TR("External classes : \nname making\nimport"), htab);
-    edpython_external_class_decl = new MultiLineEdit(htab);
+    QLabel * lbl1;
+    htab->addWidget(lbl1 =
+            new QLabel(tr("External classes : \nname making\nimport"), htab));
+    htab->addWidget(edpython_external_class_decl = new MultiLineEdit(htab));
     edpython_external_class_decl->setText(GenerationSettings::python_external_class_decl);
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl2 =
-        new QLabel(TR("External types :\nimport form(s)"), htab);
-    python_import_table =
-        new IncludeTable(htab, GenerationSettings::python_imports,
-                         "Import", "import ");
+    QLabel * lbl2;
+    htab->addWidget(lbl2 =
+            new QLabel(tr("External types :\nimport form(s)"), htab));
+    htab->addWidget(python_import_table =
+            new IncludeTable(htab, GenerationSettings::python_imports,
+                             "Import", "import "));
 
     same_width(lbl1, lbl2);
     addTab(split, "Python[3]");
 
     if (!GenerationSettings::python_get_default_defs())
         removePage(split);
+
 }
 
 void GenerationSettingsDialog::init_idl1()
 {
+
     QSplitter * split = new QSplitter(Qt::Vertical, this);
 
     split->setOpaqueResize(TRUE);
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl1 =
-        new QLabel(TR("file default \ncontent :"), htab);
-    edidl_src_content = new MultiLineEdit(htab);
+    QLabel * lbl1;
+    htab->addWidget(lbl1 =
+            new QLabel(tr("file default \ncontent :"), htab));
+    htab->addWidget(edidl_src_content = new MultiLineEdit(htab));
     edidl_src_content->setText(GenerationSettings::idl_src_content);
     QFont font = edidl_src_content->font();
 
@@ -1256,51 +1324,52 @@ void GenerationSettingsDialog::init_idl1()
     font.setFixedPitch(TRUE);
     edidl_src_content->setFont(font);
 
-    new QLabel(TR("    file extension : "), htab);
-    edidl_extension = new Q3ComboBox(TRUE, htab);
-    edidl_extension->insertItem(GenerationSettings::idl_extension);
-    edidl_extension->setCurrentItem(0);
-    edidl_extension->insertItem("Idl");
+    htab->addWidget(new QLabel(tr("    file extension : "), htab));
+    htab->addWidget(edidl_extension = new QComboBox( htab));
+    edidl_extension->setEditable(true);
+    edidl_extension->addItem(GenerationSettings::idl_extension);
+    edidl_extension->setCurrentIndex(0);
+    edidl_extension->addItem("Idl");
 
-    Q3Grid * grid = new Q3Grid(2, split);
+    GridBox * grid = new GridBox(2, split);
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Interface default \ndeclaration :"), grid);
-    edidl_interface_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Interface default \ndeclaration :"), grid));
+    grid->addWidget(edidl_interface_decl = new MultiLineEdit(grid));
     edidl_interface_decl->setText(GenerationSettings::idl_interface_decl);
     edidl_interface_decl->setFont(font);
 
-    QLabel * lbl2 =
-        new QLabel(TR("Valuetype default \ndeclaration :"), grid);
+    QLabel * lbl2;
+    grid->addWidget( lbl2 = new QLabel(tr("Valuetype default \ndeclaration :"), grid));
     same_width(lbl1, lbl2);
-    edidl_valuetype_decl = new MultiLineEdit(grid);
+    grid->addWidget(edidl_valuetype_decl = new MultiLineEdit(grid));
     edidl_valuetype_decl->setText(GenerationSettings::idl_valuetype_decl);
     edidl_valuetype_decl->setFont(font);
 
-    new QLabel(TR("Struct default \ndeclaration :"), grid);
-    edidl_struct_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Struct default \ndeclaration :"), grid));
+    grid->addWidget(edidl_struct_decl = new MultiLineEdit(grid));
     edidl_struct_decl->setText(GenerationSettings::idl_struct_decl);
     edidl_struct_decl->setFont(font);
 
-    new QLabel(TR("Union default \ndeclaration :"), grid);
-    edidl_union_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Union default \ndeclaration :"), grid));
+    grid->addWidget(edidl_union_decl = new MultiLineEdit(grid));
     edidl_union_decl->setText(GenerationSettings::idl_union_decl);
     edidl_union_decl->setFont(font);
 
-    new QLabel(TR("Enum default \ndeclaration :"), grid);
-    edidl_enum_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enum default \ndeclaration :"), grid));
+    grid->addWidget(edidl_enum_decl = new MultiLineEdit(grid));
     edidl_enum_decl->setText(GenerationSettings::idl_enum_decl);
     edidl_enum_decl->setFont(font);
 
-    new QLabel(TR("Typedef default \ndeclaration :"), grid);
-    edidl_typedef_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Typedef default \ndeclaration :"), grid));
+    grid->addWidget(edidl_typedef_decl = new MultiLineEdit(grid));
     edidl_typedef_decl->setText(GenerationSettings::idl_typedef_decl);
     edidl_typedef_decl->setFont(font);
 
-    new QLabel(TR("Exception default \ndeclaration :"), grid);
-    edidl_exception_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Exception default \ndeclaration :"), grid));
+    grid->addWidget(edidl_exception_decl = new MultiLineEdit(grid));
     edidl_exception_decl->setText(GenerationSettings::idl_exception_decl);
     edidl_exception_decl->setFont(font);
 
@@ -1308,24 +1377,26 @@ void GenerationSettingsDialog::init_idl1()
 
     if (!GenerationSettings::idl_get_default_defs())
         removePage(split);
+
 }
 
 void GenerationSettingsDialog::init_idl2()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3Grid * grid2;
+
+    GridBox * grid = new GridBox(2, this);
+    GridBox * grid2;
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Attribute default \ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edidl_attr_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edidl_attr_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edidl_attr_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Attribute default \ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edidl_attr_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edidl_attr_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edidl_attr_decl[2] = new MultiLineEdit(grid2));
 
     QFont font = edjava_attr_decl[0]->font();
     int i;
@@ -1340,34 +1411,34 @@ void GenerationSettingsDialog::init_idl2()
         edidl_attr_decl[i]->setFont(font);
     }
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Attribute default \ndeclaration in\nvaluetype :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edidl_valuetype_attr_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edidl_valuetype_attr_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edidl_valuetype_attr_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Attribute default \ndeclaration in\nvaluetype :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edidl_valuetype_attr_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edidl_valuetype_attr_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edidl_valuetype_attr_decl[2] = new MultiLineEdit(grid2));
 
     for (i = 0; i != 3; i += 1) {
         edidl_valuetype_attr_decl[i]->setText(GenerationSettings::idl_valuetype_attr_decl[i]);
         edidl_valuetype_attr_decl[i]->setFont(font);
     }
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Constant default \ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edidl_const_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edidl_const_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edidl_const_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Constant default \ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edidl_const_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edidl_const_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edidl_const_decl[2] = new MultiLineEdit(grid2));
 
     for (i = 0; i != 3; i += 1) {
         edidl_const_decl[i]->setText(GenerationSettings::idl_const_decl[i]);
@@ -1378,25 +1449,27 @@ void GenerationSettingsDialog::init_idl2()
 
     if (!GenerationSettings::idl_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_idl3()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3Grid * grid2;
+
+    GridBox * grid = new GridBox(2, this);
+    GridBox * grid2;
     int i;
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Association and\naggregation\ndefault\ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edidl_rel_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edidl_rel_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edidl_rel_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Association and\naggregation\ndefault\ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edidl_rel_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edidl_rel_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edidl_rel_decl[2] = new MultiLineEdit(grid2));
     QFont font = edidl_rel_decl[0]->font();
 
     if (! hasCodec())
@@ -1409,34 +1482,34 @@ void GenerationSettingsDialog::init_idl3()
         edidl_rel_decl[i]->setFont(font);
     }
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Association and\naggregation\ndefault\ndeclaration in\nvaluetype :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edidl_valuetype_rel_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edidl_valuetype_rel_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edidl_valuetype_rel_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Association and\naggregation\ndefault\ndeclaration in\nvaluetype :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edidl_valuetype_rel_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edidl_valuetype_rel_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edidl_valuetype_rel_decl[2] = new MultiLineEdit(grid2));
 
     for (i = 0; i != 3; i += 1) {
         edidl_valuetype_rel_decl[i]->setText(GenerationSettings::idl_valuetype_rel_decl[i]);
         edidl_valuetype_rel_decl[i]->setFont(font);
     }
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Association and\naggregation\ndefault\ndeclaration in\nunion:"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edidl_union_rel_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edidl_union_rel_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edidl_union_rel_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Association and\naggregation\ndefault\ndeclaration in\nunion:"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edidl_union_rel_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edidl_union_rel_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edidl_union_rel_decl[2] = new MultiLineEdit(grid2));
 
     for (i = 0; i != 3; i += 1) {
         edidl_union_rel_decl[i]->setText(GenerationSettings::idl_union_rel_decl[i]);
@@ -1447,25 +1520,27 @@ void GenerationSettingsDialog::init_idl3()
 
     if (!GenerationSettings::idl_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_idl4()
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3Grid * grid2;
-    Q3HBox * htab;
+
+    GridBox * grid = new GridBox(2, this);
+    GridBox * grid2;
+    HHBox * htab;
 
     grid->setMargin(3);
     grid->setSpacing(3);
 
-    new QLabel(TR("Union item \ndefault \ndeclaration :"), grid);
-    grid2 = new Q3Grid(2, grid);
-    new QLabel(TR("multiplicity '1'\nor unspecified"), grid2);
-    edidl_union_item_decl[0] = new MultiLineEdit(grid2);
-    new QLabel(TR("multiplicity '*'\nor 'a..b'"), grid2);
-    edidl_union_item_decl[1] = new MultiLineEdit(grid2);
-    new QLabel(TR("X (probably a\nnumber)"), grid2);
-    edidl_union_item_decl[2] = new MultiLineEdit(grid2);
+    grid->addWidget(new QLabel(tr("Union item \ndefault \ndeclaration :"), grid));
+    grid->addWidget(grid2 = new GridBox(2, grid));
+    grid2->addWidget(new QLabel(tr("multiplicity '1'\nor unspecified"), grid2));
+    grid2->addWidget(edidl_union_item_decl[0] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("multiplicity '*'\nor 'a..b'"), grid2));
+    grid2->addWidget(edidl_union_item_decl[1] = new MultiLineEdit(grid2));
+    grid2->addWidget(new QLabel(tr("X (probably a\nnumber)"), grid2));
+    grid2->addWidget(edidl_union_item_decl[2] = new MultiLineEdit(grid2));
 
     QFont font = edidl_union_item_decl[0]->font();
     int i;
@@ -1480,26 +1555,26 @@ void GenerationSettingsDialog::init_idl4()
         edidl_union_item_decl[i]->setFont(font);
     }
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Enumeration item \ndefault declaration :"), grid);
-    edidl_enum_item_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Enumeration item \ndefault declaration :"), grid));
+    grid->addWidget(edidl_enum_item_decl = new MultiLineEdit(grid));
     edidl_enum_item_decl->setText(GenerationSettings::idl_enum_item_decl);
     edidl_enum_item_decl->setFont(font);
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Get operation\ndefault definition : "), grid);
-    htab = new Q3HBox(grid);
-    new QLabel(TR("name : "), htab);
-    edidl_get_name = new LineEdit(htab);
+    grid->addWidget(new QLabel(tr("Get operation\ndefault definition : "), grid));
+    grid->addWidget(htab =new HHBox(grid));
+    htab->addWidget(new QLabel(tr("name : "), htab));
+    htab->addWidget(edidl_get_name = new LineEdit(htab));
     edidl_get_name->setText(GenerationSettings::idl_get_name);
     edidl_get_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_idl_get_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_idl_get_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_get_name == IdlView)
         uml_follow_idl_get_name->setChecked(TRUE);
@@ -1507,18 +1582,18 @@ void GenerationSettingsDialog::init_idl4()
     connect(uml_follow_idl_get_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_idl_get_name()));
 
-    new QLabel(TR("Set operation\ndefault definition : "), grid);
-    htab = new Q3HBox(grid);
-    idl_set_oneway_cb = new QCheckBox("oneway", htab);
+    grid->addWidget(new QLabel(tr("Set operation\ndefault definition : "), grid));
+    grid->addWidget(htab =new HHBox(grid));
+    htab->addWidget(idl_set_oneway_cb = new QCheckBox("oneway", htab));
     idl_set_oneway_cb->setChecked(GenerationSettings::idl_set_oneway);
 
-    new QLabel(TR("  name : "), htab);
-    edidl_set_name = new LineEdit(htab);
+    htab->addWidget(new QLabel(tr("  name : "), htab));
+    htab->addWidget(edidl_set_name = new LineEdit(htab));
     edidl_set_name->setText(GenerationSettings::idl_set_name);
     edidl_set_name->setFont(font);
 
-    new QLabel("  ", htab);
-    uml_follow_idl_set_name = new QCheckBox(TR("also in uml"), htab);
+    htab->addWidget(new QLabel("  ", htab));
+    htab->addWidget(uml_follow_idl_set_name = new QCheckBox(tr("also in uml"), htab));
 
     if (GenerationSettings::uml_set_name == IdlView)
         uml_follow_idl_set_name->setChecked(TRUE);
@@ -1526,11 +1601,11 @@ void GenerationSettingsDialog::init_idl4()
     connect(uml_follow_idl_set_name, SIGNAL(toggled(bool)),
             this, SLOT(follow_idl_set_name()));
 
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Operation default \ndeclaration : "), grid);
-    edidl_oper_decl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Operation default \ndeclaration : "), grid));
+    grid->addWidget(edidl_oper_decl = new MultiLineEdit(grid));
     edidl_oper_decl->setText(GenerationSettings::idl_oper_decl);
     edidl_oper_decl->setFont(font);
 
@@ -1538,29 +1613,33 @@ void GenerationSettingsDialog::init_idl4()
 
     if (!GenerationSettings::idl_get_default_defs())
         removePage(grid);
+
 }
 
 void GenerationSettingsDialog::init_idl5()
 {
+
     QSplitter * split = new QSplitter(Qt::Vertical, this);
 
     split->setOpaqueResize(TRUE);
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl1 =
-        new QLabel(TR("External classes : \nname making\n#include"), htab);
-    edidl_external_class_decl = new MultiLineEdit(htab);
+    QLabel * lbl1;
+    htab->addWidget(lbl1 =
+            new QLabel(tr("External classes : \nname making\n#include"), htab));
+    htab->addWidget(edidl_external_class_decl = new MultiLineEdit(htab));
     edidl_external_class_decl->setText(GenerationSettings::idl_external_class_decl);
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    QLabel * lbl2 =
-        new QLabel(TR("External types :\n#include form(s)\netc..."), htab);
-    idl_include_table =
-        new IncludeTable(htab, GenerationSettings::idl_includes,
-                         "Include etc...", "#include \"\"");
+    QLabel * lbl2;
+    htab->addWidget(lbl2 =
+            new QLabel(tr("External types :\n#include form(s)\netc..."), htab));
+    htab->addWidget(idl_include_table =
+            new IncludeTable(htab, GenerationSettings::idl_includes,
+                             "Include etc...", "#include \"\""));
 
     same_width(lbl1, lbl2);
 
@@ -1568,47 +1647,50 @@ void GenerationSettingsDialog::init_idl5()
 
     if (!GenerationSettings::idl_get_default_defs())
         removePage(split);
+
 }
 
 void GenerationSettingsDialog::init_descriptions()
 {
+
     QSplitter * split = new QSplitter(Qt::Vertical, this);
 
     split->setOpaqueResize(TRUE);
 
-    Q3HBox * htab;
+    HHBox * htab;
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    new QLabel(TR("Artifact\ndefault\ndescription : "), htab);
-    edartifact_default_description = new MultiLineEdit(htab);
+    htab->addWidget(new QLabel(tr("Artifact\ndefault\ndescription : "), htab));
+    htab->addWidget(edartifact_default_description = new MultiLineEdit(htab));
     edartifact_default_description->setText(GenerationSettings::artifact_default_description);
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    new QLabel(TR("Class\ndefault\ndescription : "), htab);
-    edclass_default_description = new MultiLineEdit(htab);
+    htab->addWidget(new QLabel(tr("Class\ndefault\ndescription : "), htab));
+    htab->addWidget(edclass_default_description = new MultiLineEdit(htab));
     edclass_default_description->setText(GenerationSettings::class_default_description);
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    new QLabel(TR("Operation\ndefault\ndescription : "), htab);
-    edoperation_default_description = new MultiLineEdit(htab);
+    htab->addWidget(new QLabel(tr("Operation\ndefault\ndescription : "), htab));
+    htab->addWidget(edoperation_default_description = new MultiLineEdit(htab));
     edoperation_default_description->setText(GenerationSettings::operation_default_description);
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    new QLabel(TR("Attribute\ndefault\ndescription : "), htab);
-    edattribute_default_description = new MultiLineEdit(htab);
+    htab->addWidget(new QLabel(tr("Attribute\ndefault\ndescription : "), htab));
+    htab->addWidget(edattribute_default_description = new MultiLineEdit(htab));
     edattribute_default_description->setText(GenerationSettings::attribute_default_description);
 
-    htab = new Q3HBox(split);
+    htab =new HHBox(split);
     htab->setMargin(3);
-    new QLabel(TR("Relation\ndefault\ndescription : "), htab);
-    edrelation_default_description = new MultiLineEdit(htab);
+    htab->addWidget(new QLabel(tr("Relation\ndefault\ndescription : "), htab));
+    htab->addWidget(edrelation_default_description = new MultiLineEdit(htab));
     edrelation_default_description->setText(GenerationSettings::relation_default_description);
 
-    addTab(split, TR("Description"));
+    addTab(split, QObject::tr("Description"));
+
 }
 
 static QString Relative;
@@ -1616,128 +1698,137 @@ static QString Absolute;
 
 void GenerationSettingsDialog::init_dirs()
 {
-    Relative = TR("Set it relative");
-    Absolute = TR("Set it absolute");
+
+    Relative = QObject::tr("Set it relative");
+    Absolute = QObject::tr("Set it absolute");
 
     QPushButton * button;
-    Q3VBox * vtab = new Q3VBox(this);
-    Q3HBox * htab;
+    VVBox * vtab = new VVBox(this);
+    HHBox * htab;
 
     vtab->setMargin(3);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    new QLabel(TR("Defining a project root directory allows to specify \
-packages's generation directory relative to the root directory rather \
-than absolute.\n"
-                  "A root directory may itself be relative to the project path"),
-               htab);
+    htab->addWidget(new QLabel(tr("Defining a project root directory allows to specify \
+                                  packages's generation directory relative to the root directory rather \
+                                  than absolute.\n"
+                                                  "A root directory may itself be relative to the project path"),
+                               htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    QLabel * lbl1 = new QLabel(TR("C++ root dir : "), htab);
-    edcpproot = new LineEdit(GenerationSettings::cpp_root_dir, htab);
-    new QLabel(" ", htab);
-    button = new SmallPushButton(TR("Browse"), htab);
+    QLabel * lbl1;
+    htab->addWidget(lbl1 = new QLabel(tr("C++ root dir : "), htab));
+    htab->addWidget(edcpproot = new LineEdit(GenerationSettings::cpp_root_dir, htab));
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(button = new SmallPushButton(tr("Browse"), htab));
     connect(button, SIGNAL(clicked()), this, SLOT(cpproot_browse()));
-    new QLabel("", htab);
-    cpprelbutton = new SmallPushButton((GenerationSettings::cpp_root_dir.isEmpty() ||
-                                        QDir::isRelativePath(GenerationSettings::cpp_root_dir))
-                                       ? Absolute : Relative, htab);
+    htab->addWidget(new QLabel("", htab));
+    htab->addWidget(cpprelbutton = new SmallPushButton((GenerationSettings::cpp_root_dir.isEmpty() ||
+                                                        QDir::isRelativePath(GenerationSettings::cpp_root_dir))
+                                                       ? Absolute : Relative, htab));
     connect(cpprelbutton, SIGNAL(clicked()), this, SLOT(cpp_relative()));
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    QLabel * lbl2 = new QLabel(TR("Java root dir : "), htab);
-    edjavaroot = new LineEdit(GenerationSettings::java_root_dir, htab);
-    new QLabel(" ", htab);
-    button = new SmallPushButton(TR("Browse"), htab);
+    QLabel * lbl2;
+    htab->addWidget(lbl2 = new QLabel(tr("Java root dir : "), htab));
+    htab->addWidget(lbl2);
+    htab->addWidget(edjavaroot = new LineEdit(GenerationSettings::java_root_dir, htab));
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(button = new SmallPushButton(tr("Browse"), htab));
     connect(button, SIGNAL(clicked()), this, SLOT(javaroot_browse()));
-    new QLabel("", htab);
-    javarelbutton = new SmallPushButton((GenerationSettings::java_root_dir.isEmpty() ||
-                                         QDir::isRelativePath(GenerationSettings::java_root_dir))
-                                        ? Absolute : Relative, htab);
+    htab->addWidget(new QLabel("", htab));
+    htab->addWidget(javarelbutton = new SmallPushButton((GenerationSettings::java_root_dir.isEmpty() ||
+                                                         QDir::isRelativePath(GenerationSettings::java_root_dir))
+                                                        ? Absolute : Relative, htab));
     connect(javarelbutton, SIGNAL(clicked()), this, SLOT(java_relative()));
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    QLabel * lbl3 = new QLabel(TR("Php root dir : "), htab);
-    edphproot = new LineEdit(GenerationSettings::php_root_dir, htab);
-    new QLabel(" ", htab);
-    button = new SmallPushButton(TR("Browse"), htab);
+    QLabel * lbl3;
+    htab->addWidget(lbl3 = new QLabel(tr("Php root dir : "), htab));
+    htab->addWidget(edphproot = new LineEdit(GenerationSettings::php_root_dir, htab));
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(button = new SmallPushButton(tr("Browse"), htab));
     connect(button, SIGNAL(clicked()), this, SLOT(phproot_browse()));
-    new QLabel("", htab);
-    phprelbutton = new SmallPushButton((GenerationSettings::php_root_dir.isEmpty() ||
-                                        QDir::isRelativePath(GenerationSettings::php_root_dir))
-                                       ? Absolute : Relative, htab);
+    htab->addWidget(new QLabel("", htab));
+    htab->addWidget(phprelbutton = new SmallPushButton((GenerationSettings::php_root_dir.isEmpty() ||
+                                                        QDir::isRelativePath(GenerationSettings::php_root_dir))
+                                                       ? Absolute : Relative, htab));
     connect(phprelbutton, SIGNAL(clicked()), this, SLOT(php_relative()));
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    QLabel * lbl4 = new QLabel(TR("Python root dir : "), htab);
-    edpythonroot = new LineEdit(GenerationSettings::python_root_dir, htab);
-    new QLabel(" ", htab);
-    button = new SmallPushButton(TR("Browse"), htab);
+    QLabel * lbl4;
+    htab->addWidget( lbl4 = new QLabel(tr("Python root dir : "), htab));
+    htab->addWidget(edpythonroot = new LineEdit(GenerationSettings::python_root_dir, htab));
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(button = new SmallPushButton(tr("Browse"), htab));
     connect(button, SIGNAL(clicked()), this, SLOT(pythonroot_browse()));
-    new QLabel("", htab);
-    pythonrelbutton = new SmallPushButton((GenerationSettings::python_root_dir.isEmpty() ||
-                                           QDir::isRelativePath(GenerationSettings::python_root_dir))
-                                          ? Absolute : Relative, htab);
+    htab->addWidget(new QLabel("", htab));
+    htab->addWidget(pythonrelbutton = new SmallPushButton((GenerationSettings::python_root_dir.isEmpty() ||
+                                                           QDir::isRelativePath(GenerationSettings::python_root_dir))
+                                                          ? Absolute : Relative, htab));
     connect(pythonrelbutton, SIGNAL(clicked()), this, SLOT(python_relative()));
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab =new HHBox(vtab));
     htab->setMargin(3);
-    QLabel * lbl5 = new QLabel(TR("Idl root dir : "), htab);
-    edidlroot = new LineEdit(GenerationSettings::idl_root_dir, htab);
-    new QLabel(" ", htab);
-    button = new SmallPushButton(TR("Browse"), htab);
+    QLabel * lbl5;
+    htab->addWidget(lbl5 = new QLabel(tr("Idl root dir : "), htab));
+    htab->addWidget(edidlroot = new LineEdit(GenerationSettings::idl_root_dir, htab));
+    htab->addWidget(new QLabel(" ", htab));
+    htab->addWidget(button = new SmallPushButton(tr("Browse"), htab));
     connect(button, SIGNAL(clicked()), this, SLOT(idlroot_browse()));
-    new QLabel("", htab);
-    idlrelbutton = new SmallPushButton((GenerationSettings::idl_root_dir.isEmpty() ||
-                                        QDir::isRelativePath(GenerationSettings::idl_root_dir))
-                                       ? Absolute : Relative, htab);
+    htab->addWidget(new QLabel("", htab));
+    htab->addWidget(idlrelbutton = new SmallPushButton((GenerationSettings::idl_root_dir.isEmpty() ||
+                                                        QDir::isRelativePath(GenerationSettings::idl_root_dir))
+                                                       ? Absolute : Relative, htab));
     connect(idlrelbutton, SIGNAL(clicked()), this, SLOT(idl_relative()));
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
     same_width(lbl1, lbl2, lbl3, lbl4, lbl5);
 
-    vtab->setStretchFactor(new Q3HBox(vtab), 1000);
+    ((QVBoxLayout*)vtab->layout())->setStretchFactor(new HHBox(vtab), 1000);
+
+    addTab(vtab, QObject::tr("Directory"));
 
-    addTab(vtab, TR("Directory"));
 }
 
 static QString add_last_slash(QString s)
 {
+
     if (!s.isEmpty()) {
         int i = s.length() - 1;
 
-        switch (s.at(i).latin1()) {
+        switch (s.at(i).toLatin1()) {
         case '/':
         case '\\':
             break;
 
         default:
-            return QDir::convertSeparators(s + "/");
+            return QDir::toNativeSeparators(s + "/");
         }
     }
 
@@ -1844,69 +1935,72 @@ void GenerationSettingsDialog::follow_idl_set_name()
     }
 }
 
-static const char * get_indent(Q3ComboBox * cb)
+static const char * get_indent(QComboBox * cb)
 {
-    int n = cb->currentItem();
-
+    int n = cb->currentIndex();
+    Q_ASSERT(n <= 9);
     return (n == 9)
-           ? "\t"
-           : "        " + (8 - n);
+            ? "\t"
+            : &"        " [ (8 - n)];
 }
 
 void GenerationSettingsDialog::accept()
 {
-    if (types_table->check()) {
-        QString enum_in = cpp_enum_in->text().stripWhiteSpace();
-        QString enum_out = cpp_enum_out->text().stripWhiteSpace();
-        QString enum_inout = cpp_enum_inout->text().stripWhiteSpace();
-        QString enum_return = cpp_enum_return->text().stripWhiteSpace();
-
-        if (enum_in.find("${type}") == -1) {
-            msg_critical(TR("Error"), TR("C++ 'in' enum argument default passing must contains ${type}"));
+    if (builtinTable->ValidateTypes())
+    {
+        GenerationSettings::builtins = builtinTable->GetBuiltins();
+        GenerationSettings::nbuiltins = GenerationSettings::builtins.size();
+        QString enum_in = cpp_enum_in->text().trimmed();
+        QString enum_out = cpp_enum_out->text().trimmed();
+        QString enum_inout = cpp_enum_inout->text().trimmed();
+        QString enum_return = cpp_enum_return->text().trimmed();
+
+        if (enum_in.indexOf("${type}") == -1) {
+            msg_critical(tr("Error"), QObject::tr("C++ 'in' enum argument default passing must contains ${type}"));
             return;
         }
 
-        if (enum_out.find("${type}") == -1) {
-            msg_critical(TR("Error"), TR("C++ 'out' enum argument default passing must contains ${type}"));
+        if (enum_out.indexOf("${type}") == -1) {
+            msg_critical(tr("Error"), QObject::tr("C++ 'out' enum argument default passing must contains ${type}"));
             return;
         }
 
-        if (enum_inout.find("${type}") == -1) {
-            msg_critical(TR("Error"), TR("C++ 'inout' enum argument default passing must contains ${type}"));
+        if (enum_inout.indexOf("${type}") == -1) {
+            msg_critical(tr("Error"), QObject::tr("C++ 'inout' enum argument default passing must contains ${type}"));
             return;
         }
 
-        if (enum_return.find("${type}") == -1) {
-            msg_critical(TR("Error"), TR("C++ 'return' enum argument default passing must contains ${type}"));
+        if (enum_return.indexOf("${type}") == -1) {
+            msg_critical(tr("Error"), QObject::tr("C++ 'return' enum argument default passing must contains ${type}"));
             return;
         }
 
-        QString in = cpp_in->text().stripWhiteSpace();
-        QString out = cpp_out->text().stripWhiteSpace();
-        QString inout = cpp_inout->text().stripWhiteSpace();
-        QString opreturn = cpp_return->text().stripWhiteSpace();
+        QString in = cpp_in->text().trimmed();
+        QString out = cpp_out->text().trimmed();
+        QString inout = cpp_inout->text().trimmed();
+        QString opreturn = cpp_return->text().trimmed();
 
-        if (in.find("${type}") == -1) {
-            msg_critical(TR("Error"), TR("C++ 'in' argument default passing must contains ${type}"));
+        if (in.indexOf("${type}") == -1) {
+            msg_critical(tr("Error"), QObject::tr("C++ 'in' argument default passing must contains ${type}"));
             return;
         }
 
-        if (out.find("${type}") == -1) {
-            msg_critical(TR("Error"), TR("C++ 'out' argument default passing must contains ${type}"));
+        if (out.indexOf("${type}") == -1) {
+            msg_critical(tr("Error"), QObject::tr("C++ 'out' argument default passing must contains ${type}"));
             return;
         }
 
-        if (inout.find("${type}") == -1) {
-            msg_critical(TR("Error"), TR("C++ 'inout' argument default passing must contains ${type}"));
+        if (inout.indexOf("${type}") == -1) {
+            msg_critical(tr("Error"), QObject::tr("C++ 'inout' argument default passing must contains ${type}"));
             return;
         }
 
-        if (opreturn.find("${type}") == -1) {
-            msg_critical(TR("Error"), TR("C++ 'return' argument default passing must contains ${type}"));
+        if (opreturn.indexOf("${type}") == -1) {
+            msg_critical(tr("Error"), QObject::tr("C++ 'return' argument default passing must contains ${type}"));
             return;
         }
 
-        types_table->update();
+        //types_table->update();
         relation_stereotypes_table->update(GenerationSettings::nrelattrstereotypes,
                                            GenerationSettings::relattr_stereotypes);
         class_stereotypes_table->update(GenerationSettings::nclassstereotypes,
@@ -1926,12 +2020,12 @@ void GenerationSettingsDialog::accept()
         GenerationSettings::cpp_inout = inout;
         GenerationSettings::cpp_return = opreturn;
 
-        GenerationSettings::cpp_h_extension = edcpp_h_extension->currentText().stripWhiteSpace();
-        GenerationSettings::cpp_src_extension = edcpp_src_extension->currentText().stripWhiteSpace();
-        GenerationSettings::java_extension = edjava_extension->currentText().stripWhiteSpace();
-        GenerationSettings::php_extension = edphp_extension->currentText().stripWhiteSpace();
-        GenerationSettings::python_extension = edpython_extension->currentText().stripWhiteSpace();
-        GenerationSettings::idl_extension = edidl_extension->currentText().stripWhiteSpace();
+        GenerationSettings::cpp_h_extension = edcpp_h_extension->currentText().trimmed();
+        GenerationSettings::cpp_src_extension = edcpp_src_extension->currentText().trimmed();
+        GenerationSettings::java_extension = edjava_extension->currentText().trimmed();
+        GenerationSettings::php_extension = edphp_extension->currentText().trimmed();
+        GenerationSettings::python_extension = edpython_extension->currentText().trimmed();
+        GenerationSettings::idl_extension = edidl_extension->currentText().trimmed();
 
         GenerationSettings::cpp_h_content = edcpp_h_content->text();
         GenerationSettings::cpp_src_content = edcpp_src_content->text();
@@ -1940,7 +2034,7 @@ void GenerationSettingsDialog::accept()
         GenerationSettings::python_src_content = edpython_src_content->text();
         GenerationSettings::idl_src_content = edidl_src_content->text();
 
-        switch (cpp_include_with_path_cb->currentItem()) {
+        switch (cpp_include_with_path_cb->currentIndex()) {
         case 0:
             GenerationSettings::cpp_include_with_path = FALSE;
             GenerationSettings::cpp_relative_path = FALSE;
@@ -1966,10 +2060,10 @@ void GenerationSettingsDialog::accept()
         }
 
         GenerationSettings::cpp_force_namespace_gen =
-            cpp_force_namespace_gen_cb->isChecked();
+                cpp_force_namespace_gen_cb->isChecked();
 
         GenerationSettings::cpp_inline_force_incl_in_h =
-            cpp_inline_force_incl_in_h_cb->isChecked();
+                cpp_inline_force_incl_in_h_cb->isChecked();
 
         GenerationSettings::cpp_javadoc_comment = cpp_javadoc_cb->isChecked();
 
@@ -2016,7 +2110,7 @@ void GenerationSettingsDialog::accept()
         GenerationSettings::php_oper_def = edphp_oper_def->text();
         GenerationSettings::php_javadoc_comment = php_javadoc_cb->isChecked();
 
-        switch (php_require_with_path_cb->currentItem()) {
+        switch (php_require_with_path_cb->currentIndex()) {
         case 0:
             GenerationSettings::php_req_with_path = FALSE;
             GenerationSettings::php_relative_path = FALSE;
@@ -2042,7 +2136,7 @@ void GenerationSettingsDialog::accept()
         }
 
         GenerationSettings::php_force_namespace_gen =
-            php_force_namespace_gen_cb->isChecked();
+                php_force_namespace_gen_cb->isChecked();
 
         GenerationSettings::python_indent_step = get_indent(indentstep_cb);
         GenerationSettings::python_2_2 = python_2_2_cb->isChecked();
@@ -2080,27 +2174,27 @@ void GenerationSettingsDialog::accept()
         for (i = 0; i != 2; i += 1)
             for (j = 0; j != 3; j += 1)
                 GenerationSettings::cpp_rel_decl[i][j] =
-                    edcpp_rel_decl[i][j]->text();
+                        edcpp_rel_decl[i][j]->text();
 
         for (i = 0; i != 3; i += 1)
             GenerationSettings::java_rel_decl[i] =
-                edjava_rel_decl[i]->text();
+                    edjava_rel_decl[i]->text();
 
         GenerationSettings::php_rel_decl = edphp_rel_decl->text();
 
         for (i = 0; i != 3; i += 1) {
             GenerationSettings::idl_rel_decl[i] =
-                edidl_rel_decl[i]->text();
+                    edidl_rel_decl[i]->text();
             GenerationSettings::idl_valuetype_rel_decl[i] =
-                edidl_valuetype_rel_decl[i]->text();
+                    edidl_valuetype_rel_decl[i]->text();
             GenerationSettings::idl_union_rel_decl[i] =
-                edidl_union_rel_decl[i]->text();
+                    edidl_union_rel_decl[i]->text();
         }
 
         for (i = 0; i != 2; i += 1)
             for (j = 0; j != 2; j += 1)
                 GenerationSettings::python_rel_decl[i][j] =
-                    edpython_rel_decl[i][j]->text();
+                        edpython_rel_decl[i][j]->text();
 
         //
 
@@ -2192,11 +2286,16 @@ void GenerationSettingsDialog::accept()
     }
 }
 
+void GenerationSettingsDialog::reject()
+{
+    builtinTable->RollBack();
+    QDialog::reject();
+}
+
 void GenerationSettingsDialog::cpproot_browse()
 {
     QString dir =
-        Q3FileDialog::getExistingDirectory(edcpproot->text(), this, 0,
-                                           TR("C++ root directory"));
+            QFileDialog::getExistingDirectory( this, QObject::tr("C++ root directory"), edcpproot->text(), 0);
 
     if (! dir.isNull()) {
         edcpproot->setText(dir);
@@ -2207,8 +2306,7 @@ void GenerationSettingsDialog::cpproot_browse()
 void GenerationSettingsDialog::javaroot_browse()
 {
     QString dir =
-        Q3FileDialog::getExistingDirectory(edjavaroot->text(), this, 0,
-                                           TR("Java root directory"));
+            QFileDialog::getExistingDirectory(this, QObject::tr("Java root directory"),edjavaroot->text(), 0);
 
     if (! dir.isNull()) {
         edjavaroot->setText(dir);
@@ -2219,8 +2317,7 @@ void GenerationSettingsDialog::javaroot_browse()
 void GenerationSettingsDialog::phproot_browse()
 {
     QString dir =
-        Q3FileDialog::getExistingDirectory(edphproot->text(), this, 0,
-                                           TR("Php root directory"));
+            QFileDialog::getExistingDirectory(this, QObject::tr("Php root directory"), edphproot->text(), 0);
 
     if (! dir.isNull()) {
         edphproot->setText(dir);
@@ -2231,8 +2328,7 @@ void GenerationSettingsDialog::phproot_browse()
 void GenerationSettingsDialog::pythonroot_browse()
 {
     QString dir =
-        Q3FileDialog::getExistingDirectory(edpythonroot->text(), this, 0,
-                                           TR("Python root directory"));
+            QFileDialog::getExistingDirectory(this,  QObject::tr("Python root directory"), edpythonroot->text(), 0);
 
     if (! dir.isNull()) {
         edpythonroot->setText(dir);
@@ -2243,8 +2339,7 @@ void GenerationSettingsDialog::pythonroot_browse()
 void GenerationSettingsDialog::idlroot_browse()
 {
     QString dir =
-        Q3FileDialog::getExistingDirectory(edidlroot->text(), this, 0,
-                                           TR("Idl root directory"));
+            QFileDialog::getExistingDirectory(this, QObject::tr("Idl root directory"), edidlroot->text(), 0);
 
     if (! dir.isNull()) {
         edidlroot->setText(dir);
@@ -2254,8 +2349,8 @@ void GenerationSettingsDialog::idlroot_browse()
 
 void GenerationSettingsDialog::relative(LineEdit * ed, QPushButton * button)
 {
-    QString root = BrowserView::get_dir().absPath();
-    const QString s = ed->text();
+    QString root = BrowserView::get_dir().absolutePath();
+    const QString s = QDir::toNativeSeparators(ed->text());
 
     if (root.at(root.length() - 1) != QChar('/'))
         root += '/';
@@ -2267,9 +2362,9 @@ void GenerationSettingsDialog::relative(LineEdit * ed, QPushButton * button)
 
 
 
-            (s.find(root) == 0) &&
+                (s.indexOf(root) == 0) &&
 
-            (s.length() >= len)) {
+                (s.length() >= len)) {
             ed->setText(s.mid(len));
             button->setText(Absolute);
         }
@@ -2332,126 +2427,48 @@ void GenerationSettingsDialog::php_set_visi_changed(int)
 }
 
 // TypesTable
-
-TypesTable::TypesTable(QWidget * parent)
-    : StringTable(GenerationSettings::nbuiltins + 1, 9, parent, FALSE)
-{
-    horizontalHeader()->setLabel(0, "Uml");
-    horizontalHeader()->setLabel(1, "C++");
-    horizontalHeader()->setLabel(2, "Java");
-    horizontalHeader()->setLabel(3, "Idl");
-    horizontalHeader()->setLabel(4, TR("C++ in"));
-    horizontalHeader()->setLabel(5, TR("C++ out"));
-    horizontalHeader()->setLabel(6, TR("C++ in out"));
-    horizontalHeader()->setLabel(7, TR("C++ return"));
-    horizontalHeader()->setLabel(8, TR("do"));
-
-    int index;
-
-    for (index = 0; index < GenerationSettings::nbuiltins; index += 1) {
-        Builtin & b = GenerationSettings::builtins[index];
-
-        setText(index, 0, b.uml);
-        setText(index, 1, b.cpp);
-        setText(index, 2, b.java);
-        setText(index, 3, b.idl);
-        setText(index, 4, b.cpp_in);
-        setText(index, 5, b.cpp_out);
-        setText(index, 6, b.cpp_inout);
-        setText(index, 7, b.cpp_return);
-        setText(index, 8, QString());
-    }
-
-    init_row(index);
-
-    for (index = 4; index < 8; index += 1)
-        setColumnStretchable(index, TRUE);
-
-    adjustColumn(8);
-    setColumnStretchable(8, FALSE);
-}
-
-void TypesTable::init_row(int index)
-{
-    setText(index, 0, QString());
-    setText(index, 1, QString());
-    setText(index, 2, QString());
-    setText(index, 3, QString());
-    setText(index, 4, "${type}");
-    setText(index, 5, "${type} &");
-    setText(index, 6, "${type} &");
-    setText(index, 7, "${type}");
-}
-
-void TypesTable::update()
-{
-    forceUpdateCells();
-
-    int n = numRows();
-    int index;
-
-    if (text(n - 1, 0).isEmpty())
-        n -= 1;
-
-    delete [] GenerationSettings::builtins;
-    GenerationSettings::nbuiltins = n;
-    GenerationSettings::builtins = new Builtin[n];
-
-    for (index = 0; index != n; index += 1) {
-        Builtin & b = GenerationSettings::builtins[index];
-
-        b.uml = text(index, 0).stripWhiteSpace();
-        b.cpp = text(index, 1).stripWhiteSpace();
-        b.java = text(index, 2).stripWhiteSpace();
-        b.idl = text(index, 3).stripWhiteSpace();
-        b.cpp_in = text(index, 4).stripWhiteSpace();
-        b.cpp_out = text(index, 5).stripWhiteSpace();
-        b.cpp_inout = text(index, 6).stripWhiteSpace();
-        b.cpp_return = text(index, 7).stripWhiteSpace();
-    }
-}
-
-bool TypesTable::check()
-{
-    int n = numRows();
-    int index;
-
-    if (text(n - 1, 0).isEmpty())
-        n -= 1;
-
-    for (index = 0; index != n; index += 1) {
-        int col;
-
-        for (col = 0; col != 4; col += 1) {
-            if (text(index, col).stripWhiteSpace().isEmpty()) {
-                char n[16];
-
-                sprintf(n, "%d", index + 1);
-                msg_critical(TR("Error"),
-                             TR("row %1 : ", n) +
-                             TR("%1 specification is mandatory", horizontalHeader()->label(col)));
-                return FALSE;
-            }
-        }
-
-        for (col = 4; col != 8; col += 1) {
-            if (text(index, col).find("${type}") == -1) {
-                char n[16];
-
-                sprintf(n, "%d", index + 1);
-                msg_critical(TR("Error"),
-                             TR("row %1 : ", n) +
-                             TR("%1 '%2' argument default passing does not contains ${type}",
-                                (const char *) text(index, 0),
-                                (const char *) horizontalHeader()->label(col)));
-
-                return FALSE;
-            }
-        }
-    }
-
-    return TRUE;
-}
+// todo need to implement this in new table
+//bool TypesTable::check()
+//{
+//    int n = rowCount();
+//    int index;
+
+//    if (text(n - 1, 0).isEmpty())
+//        n -= 1;
+
+//    for (index = 0; index != n; index += 1) {
+//        int col;
+
+//        for (col = 0; col != 4; col += 1) {
+//            if (text(index, col).trimmed().isEmpty()) {
+//                char n[16];
+
+//                sprintf(n, "%d", index + 1);
+//                msg_critical(TR("Error"),
+//                             QObject::tr("row %1 : ", n) +
+//                             QObject::tr("%1 specification is mandatory", horizontalHeader()->label(col)));
+//                return FALSE;
+//            }
+//        }
+
+//        for (col = 4; col != 8; col += 1) {
+//            if (text(index, col).indexOf("${type}") == -1) {
+//                char n[16];
+
+//                sprintf(n, "%d", index + 1);
+//                msg_critical(TR("Error"),
+//                             QObject::tr("row %1 : ", n) +
+//                             QObject::tr("%1 '%2' argument default passing does not contains ${type}",
+//                                (const char *) text(index, 0),
+//                                (const char *) horizontalHeader()->label(col)));
+
+//                return FALSE;
+//            }
+//        }
+//    }
+
+//    return TRUE;
+//}
 
 // StereotypesTable
 
@@ -2459,15 +2476,18 @@ StereotypesTable::StereotypesTable(QWidget * parent, int nst,
                                    Stereotype * st, bool php)
     : StringTable(nst + 1, (php) ? 7 : 6, parent, FALSE), with_php(php)
 {
-    horizontalHeader()->setLabel(0, "Uml");
-    horizontalHeader()->setLabel(1, "C++");
-    horizontalHeader()->setLabel(2, "Java");
+    QStringList headerLabels;
+    /*horizontalHeaderItem(0)->setText("Uml");
+    horizontalHeaderItem(1)->setText("C++");
+    horizontalHeaderItem(2)->setText("Java");*/
+    headerLabels<<"Uml"<<"C++"<<"Java";
 
     if (with_php) {
-        horizontalHeader()->setLabel(3, "Php");
-        horizontalHeader()->setLabel(4, "Python");
-        horizontalHeader()->setLabel(5, "Idl");
-        horizontalHeader()->setLabel(6, TR("do"));
+        /*horizontalHeaderItem(3)->setText("Php");
+        horizontalHeaderItem(4)->setText("Python");
+        horizontalHeaderItem(5)->setText("Idl");
+        horizontalHeaderItem(6)->setText(TR("do"));*/
+        headerLabels<<"Php"<<"Python"<<"Idl"<<tr("do");
 
         int index;
 
@@ -2486,16 +2506,20 @@ StereotypesTable::StereotypesTable(QWidget * parent, int nst,
         init_row(index);
 
         for (index = 0; index != 6; index += 1)
-            setColumnStretchable(index, TRUE);
+        {
+            //setColumnStretchable(index, TRUE);
+            horizontalHeader()->setSectionResizeMode(index, QHeaderView::Stretch);
+        }
 
         adjustColumn(6);
-        setColumnStretchable(6, FALSE);
+        //setColumnStretchable(6, FALSE);
+        horizontalHeader()->setSectionResizeMode(index, QHeaderView::Fixed);
     }
     else {
-        horizontalHeader()->setLabel(3, "Python");
-        horizontalHeader()->setLabel(4, "Idl");
-        horizontalHeader()->setLabel(5, TR("do"));
-
+        /*horizontalHeaderItem(3)->setText("Python");
+        horizontalHeaderItem(4)->setText("Idl");
+        horizontalHeaderItem(5)->setText(TR("do"));*/
+        headerLabels<<"Python"<<"Idl"<<tr("do");
         int index;
 
         for (index = 0; index < nst; index += 1) {
@@ -2512,11 +2536,16 @@ StereotypesTable::StereotypesTable(QWidget * parent, int nst,
         init_row(index);
 
         for (index = 0; index != 5; index += 1)
-            setColumnStretchable(index, TRUE);
+        {
+            //setColumnStretchable(index, TRUE);
+            horizontalHeader()->setSectionResizeMode(index, QHeaderView::Stretch);
+        }
 
         adjustColumn(5);
-        setColumnStretchable(5, FALSE);
+        //setColumnStretchable(5, FALSE);
+        horizontalHeader()->setSectionResizeMode(5, QHeaderView::Fixed);
     }
+    setHorizontalHeaderLabels( headerLabels);
 }
 
 void StereotypesTable::init_row(int index)
@@ -2535,11 +2564,10 @@ void StereotypesTable::init_row(int index)
 void StereotypesTable::update(int & nst, Stereotype *& st)
 {
     forceUpdateCells();
-
-    int n = numRows();
+    int n = rowCount();
     int index;
 
-    if (text(n - 1, 0).isEmpty())
+    if (/*text(n - 1, 0)*/text(n-1,0).isEmpty())
         n -= 1;
 
     delete [] st;
@@ -2550,23 +2578,23 @@ void StereotypesTable::update(int & nst, Stereotype *& st)
         for (index = 0; index != n; index += 1) {
             Stereotype & s = st[index];
 
-            s.uml = text(index, 0).stripWhiteSpace();
-            s.cpp = text(index, 1).stripWhiteSpace();
-            s.java = text(index, 2).stripWhiteSpace();
-            s.php = text(index, 3).stripWhiteSpace();
-            s.python = text(index, 4).stripWhiteSpace();
-            s.idl = text(index, 5).stripWhiteSpace();
+            s.uml = text(index, 0).trimmed();
+            s.cpp = text(index, 1).trimmed();
+            s.java = text(index, 2).trimmed();
+            s.php = text(index, 3).trimmed();
+            s.python = text(index, 4).trimmed();
+            s.idl = text(index, 5).trimmed();
         }
     }
     else {
         for (index = 0; index != n; index += 1) {
             Stereotype & s = st[index];
 
-            s.uml = text(index, 0).stripWhiteSpace();
-            s.cpp = text(index, 1).stripWhiteSpace();
-            s.java = text(index, 2).stripWhiteSpace();
-            s.python = text(index, 3).stripWhiteSpace();
-            s.idl = text(index, 4).stripWhiteSpace();
+            s.uml = text(index, 0).trimmed();
+            s.cpp = text(index, 1).trimmed();
+            s.java = text(index, 2).trimmed();
+            s.python = text(index, 3).trimmed();
+            s.idl = text(index, 4).trimmed();
         }
     }
 }
@@ -2574,63 +2602,64 @@ void StereotypesTable::update(int & nst, Stereotype *& st)
 // IncludeTable
 
 IncludeTable::IncludeTable(QWidget * parent, IncludesSpec & spc,
-                           const char * title, const char * df)
+                           QString title, const char * df)
     : StringTable(spc.types.count() + 1, 3, parent, FALSE),
       spec(spc), dflt(df)
 {
-    horizontalHeader()->setLabel(0, TR("External type"));
-    horizontalHeader()->setLabel(1, title);
-    horizontalHeader()->setLabel(2, TR("do"));
-
+    QStringList headerLabels;
+    headerLabels<<tr("External type")<<title<<tr("do");
+    setHorizontalHeaderLabels(headerLabels);
     int index;
     int sup = spc.types.count();
     QStringList::Iterator it_type = spc.types.begin();
     QStringList::Iterator it_incl = spc.includes.begin();
-
+    m_delegate = new TableWidgetItemDelegate(this, true);
+    setItemDelegateForColumn(1,m_delegate);
     for (index = 0; index < sup; index += 1, it_type++, it_incl++) {
         setText(index, 0, *it_type);
-        setItem(index, 1, new MLinesItem(this, *it_incl));
+        setItem(index, 1, new MLinesItem(*it_incl));
         setText(index, 2, QString());
-        setRowStretchable(index, TRUE);
-        adjustRow(index);
+        verticalHeader()->setSectionResizeMode(index, QHeaderView::Stretch);
+        //adjustRow(index);
     }
 
     setText(index, 0, QString());
-    setItem(index, 1, new MLinesItem(this, dflt));
+    setItem(index, 1, new MLinesItem(dflt));
     setText(index, 2, QString());
-    setRowStretchable(index, TRUE);
+    verticalHeader()->setSectionResizeMode(index, QHeaderView::Stretch);
 
     adjustColumn(0);
-    setColumnStretchable(1, TRUE);
+    //setColumnStretchable(1, TRUE);
+    horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
     adjustColumn(2);
-    setColumnStretchable(2, FALSE);
+    //setColumnStretchable(2, FALSE);
+    horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
 
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
-    connect(this, SIGNAL(valueChanged(int, int)),
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
+    connect(this, SIGNAL(cellChanged(int, int)),
             this, SLOT(value_changed(int, int)));
 }
 
 void IncludeTable::init_row(int index)
 {
     setText(index, 0, QString());
-    setItem(index, 1, new MLinesItem(this, QString()));
+    setItem(index, 1, new MLinesItem(QString()));
     setText(index, 2, QString());
-    setRowStretchable(index, TRUE);
+    verticalHeader()->setSectionResizeMode(index, QHeaderView::Stretch);
 }
 
 void IncludeTable::update()
 {
     forceUpdateCells();
-
-    int n = numRows();
+    int n = rowCount();
     int index;
 
     spec.types.clear();
     spec.includes.clear();
 
     for (index = 0; index != n; index += 1) {
-        QString t = text(index, 0).stripWhiteSpace();
+        QString t = text(index, 0).trimmed();
 
         if (! t.isEmpty()) {
             spec.types.append(t);
@@ -2638,3 +2667,4 @@ void IncludeTable::update()
         }
     }
 }
+
diff --git a/src/dialog/GenerationSettingsDialog.h b/src/dialog/GenerationSettingsDialog.h
index 5b69cd091..4e3585c7b 100644
--- a/src/dialog/GenerationSettingsDialog.h
+++ b/src/dialog/GenerationSettingsDialog.h
@@ -28,41 +28,40 @@
 #ifndef GENERATIONSETTINGSDIALOG_H
 #define GENERATIONSETTINGSDIALOG_H
 
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 
 #include "VisibilityGroup.h"
 #include "StringTable.h"
 #include "GenerationSettings.h"
+#include "GenerationSettingsBuiltinTable.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QRadioButton;
-
 class LineEdit;
 class MultiLineEdit;
 class TypesTable;
 class StereotypesTable;
 class RelationTable;
 class IncludeTable;
+class TableWidgetItemDelegate;
 
-class GenerationSettingsDialog : public Q3TabDialog
+class GenerationSettingsDialog : public TabDialog
 {
     Q_OBJECT
 
 protected:
     // all
-    TypesTable * types_table;
-
+    BuiltinTable* builtinTable;
     // stereotypes
     StereotypesTable * relation_stereotypes_table;
     StereotypesTable * class_stereotypes_table;
-
     // C++ specific
     MultiLineEdit * edcpp_h_content;
     MultiLineEdit * edcpp_src_content;
-    Q3ComboBox * edcpp_h_extension;
-    Q3ComboBox * edcpp_src_extension;
-    Q3ComboBox * cpp_include_with_path_cb;
+    QComboBox * edcpp_h_extension;
+    QComboBox * edcpp_src_extension;
+    QComboBox * cpp_include_with_path_cb;
     QCheckBox * cpp_force_namespace_gen_cb;
     QCheckBox * cpp_inline_force_incl_in_h_cb;
     QCheckBox * cpp_javadoc_cb;
@@ -99,11 +98,11 @@ class GenerationSettingsDialog : public Q3TabDialog
     MultiLineEdit * edcpp_oper_def;
     QCheckBox * cpp_force_throw_cb;
     IncludeTable * cpp_include_table;
-    Q3ComboBox * indentvisi_cb;
+    QComboBox * indentvisi_cb;
 
     // Java specific
     MultiLineEdit * edjava_src_content;
-    Q3ComboBox * edjava_extension;
+    QComboBox * edjava_extension;
     QCheckBox * java_javadoc_cb;
     QCheckBox * java_force_package_gen_cb;
     MultiLineEdit * edjava_class_decl;
@@ -130,9 +129,9 @@ class GenerationSettingsDialog : public Q3TabDialog
 
     // Php specific
     MultiLineEdit * edphp_src_content;
-    Q3ComboBox * edphp_extension;
+    QComboBox * edphp_extension;
     QCheckBox * php_javadoc_cb;
-    Q3ComboBox * php_require_with_path_cb;
+    QComboBox * php_require_with_path_cb;
     QCheckBox * php_force_namespace_gen_cb;
     MultiLineEdit * edphp_class_decl;
     LineEdit * edphp_external_class_decl;
@@ -152,9 +151,9 @@ class GenerationSettingsDialog : public Q3TabDialog
     QCheckBox * php_set_final_cb;
 
     // Python specific
-    Q3ComboBox * indentstep_cb;
+    QComboBox * indentstep_cb;
     MultiLineEdit * edpython_src_content;
-    Q3ComboBox * edpython_extension;
+    QComboBox * edpython_extension;
     QCheckBox * python_2_2_cb;
     QCheckBox * python_3_operation_cb;
     MultiLineEdit * edpython_class_decl;
@@ -175,7 +174,7 @@ class GenerationSettingsDialog : public Q3TabDialog
 
     // Idl specific
     MultiLineEdit * edidl_src_content;
-    Q3ComboBox * edidl_extension;
+    QComboBox * edidl_extension;
     MultiLineEdit * edidl_external_class_decl;
     MultiLineEdit * edidl_interface_decl;
     MultiLineEdit * edidl_valuetype_decl;
@@ -225,6 +224,7 @@ class GenerationSettingsDialog : public Q3TabDialog
     GenerationSettingsDialog();
     virtual ~GenerationSettingsDialog();
 
+
 protected:
     void init_types();
     void init_stereotypes();
@@ -254,7 +254,8 @@ class GenerationSettingsDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
+    virtual void reject() override;
     void cpproot_browse();
     void javaroot_browse();
     void phproot_browse();
@@ -281,19 +282,10 @@ protected slots:
     void follow_idl_set_name();
 };
 
-class TypesTable : public StringTable
-{
-public:
-    TypesTable(QWidget * parent);
-
-    virtual void init_row(int r);
-
-    void update();
-    bool check();
-};
-
 class StereotypesTable : public StringTable
 {
+    Q_OBJECT
+
 protected:
     bool with_php;
 public:
@@ -306,18 +298,23 @@ class StereotypesTable : public StringTable
 
 class IncludeTable : public StringTable
 {
+    Q_OBJECT
+    
 protected:
     IncludesSpec & spec;
     const char * dflt;
 
 public:
     IncludeTable(QWidget * parent, IncludesSpec & spc,
-                 const char * title, const char * df);
+                 QString title, const char * df);
 
 public:
     virtual void init_row(int index);
 
     void update();
+
+private:
+    TableWidgetItemDelegate* m_delegate;
 };
 
 #endif
diff --git a/src/dialog/GreetingsDialog.cpp b/src/dialog/GreetingsDialog.cpp
index c9696ed0e..251ec35a9 100644
--- a/src/dialog/GreetingsDialog.cpp
+++ b/src/dialog/GreetingsDialog.cpp
@@ -32,27 +32,28 @@
 #include <qapplication.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3textview.h>
+#include <QTextEdit>
 #include <qpushbutton.h>
 #include <qtimer.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include <QCloseEvent>
 
 #include "GreetingsDialog.h"
 #include "UmlDesktop.h"
 
-GreetingsDialog::GreetingsDialog() : QDialog(0, "", TRUE)
+GreetingsDialog::GreetingsDialog() : QDialog(0/*, "", TRUE*/)
 {
-    setCaption("Greetings");
+    setWindowTitle("Greetings");
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
     const char * msg = "\
@@ -62,7 +63,7 @@ Hello!<br>\n\
 Thank you for using <i>DoUML!</i><br>\n\
 <br>\n\
 <br>DoUML is a fork of the original BoUML project,\n\
-<br>with the focus of porting the UI to Qt4 and to\n\
+<br>with the focus of porting the UI to Qt5 and to\n\
 <br>continue development of the best UML 2.x tool!\n\
 <br>\n\
 <br>Please be aware that this is a testing version\n\
@@ -75,20 +76,21 @@ Thank you for using <i>DoUML!</i><br>\n\
 Visit us at <i>http://bouml-ng.sourceforge.net</i>\n\
 <br>\n<br>\n<br>\n";
 
-    Q3TextView * tx =
-        new Q3TextView(msg, QString(), this);
+    QTextEdit * tx =
+        new QTextEdit(msg, this);
     QFont fnt = tx->font();
 
     fnt.setItalic(TRUE);
 
     QFontMetrics fm(fnt);
 
-    tx->setVScrollBarMode(Q3ScrollView::AlwaysOff);
-    tx->setHScrollBarMode(Q3ScrollView::AlwaysOff);
+    tx->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    tx->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     tx->setMinimumSize(fm.size(0, msg));
     hbox->addWidget(tx);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
     ok = new QPushButton("&OK", this);
@@ -105,7 +107,7 @@ Visit us at <i>http://bouml-ng.sourceforge.net</i>\n\
     connect(ok, SIGNAL(clicked()), this, SLOT(reject()));
 
     QTimer::singleShot(5000, this, SLOT(valid_ok()));
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 }
 
 void GreetingsDialog::valid_ok()
diff --git a/src/dialog/GreetingsDialog.h b/src/dialog/GreetingsDialog.h
index 2e52dff25..43e6bb405 100644
--- a/src/dialog/GreetingsDialog.h
+++ b/src/dialog/GreetingsDialog.h
@@ -45,7 +45,7 @@ class GreetingsDialog : public QDialog
     GreetingsDialog();
 
 protected slots:
-    virtual void closeEvent(QCloseEvent * e);
+    virtual void closeEvent(QCloseEvent * e) override;
     void valid_ok();
 };
 
diff --git a/src/dialog/HelpDialog.cpp b/src/dialog/HelpDialog.cpp
index 36e5a4f69..4a51c2131 100644
--- a/src/dialog/HelpDialog.cpp
+++ b/src/dialog/HelpDialog.cpp
@@ -34,21 +34,17 @@
 
 
 #include <qmessagebox.h>
-#include <q3textbrowser.h>
-#include <q3textview.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qdir.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
 
 #include "HelpDialog.h"
 #include "UmlDesktop.h"
 #include "DialogUtil.h"
 #include "translate.h"
-
+#include <QTextBrowser>
+#include <QDesktopServices>
 static QString NavigatorPath;
 static QString ManualDir;
 static QSize Sz;
@@ -79,16 +75,16 @@ void set_navigator_path(QString p)
 HelpDialog * HelpDialog::the;
 
 HelpDialog::HelpDialog()
-    : QDialog(0, "BOUML Help", FALSE, Qt::WDestructiveClose)
+    : QDialog(0, Qt::Dialog)
 {
-    setCaption(TR("BOUML Help"));
+    setWindowTitle(tr("DoUML Help"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    br = new Q3TextBrowser(this);
+    br = new QTextBrowser(this);
     vbox->addWidget(br);
 
     //vbox->addWidget(new QLabel(this));
@@ -96,9 +92,10 @@ HelpDialog::HelpDialog()
     if (!DocDir.isEmpty()) {
         QDir d(DocDir);
 
-        hbox = new Q3HBoxLayout(vbox);
+        hbox = new QHBoxLayout();
+        vbox->addLayout(hbox);
         hbox->addWidget(new QLabel(this));
-        hbox->addWidget(new QLabel(TR("To set the navigator by setting the environment through the menu"
+        hbox->addWidget(new QLabel(tr("To set the navigator by setting the environment through the menu"
                                       " Miscellaneous allows to see all the documentation in better conditions")
                                    , this));
         hbox->addWidget(new QLabel(this));
@@ -106,18 +103,17 @@ HelpDialog::HelpDialog()
     else
         vbox->addWidget(new QLabel(this));
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
 
-    QPushButton * ok = new QPushButton(TR("Close"), this);
+    QPushButton * ok = new QPushButton(tr("Close"), this);
 
     hbox->addWidget(new QLabel(this));
     hbox->addWidget(ok);
     hbox->addWidget(new QLabel(this));
 
     QSize sz;
-
     UmlDesktop::setsize_center(this, Sz, 0.7, 0.7);
-
     connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
     open_dialog(this);
 }
@@ -135,6 +131,7 @@ void HelpDialog::show(QString topic)
 
 
 
+    QString topicUnchanged = topic;
     QString dirs[3];
 
     dirs[1] = "/usr/share/doc/packages/bouml";
@@ -143,40 +140,51 @@ void HelpDialog::show(QString topic)
 
     dirs[0] = ManualDir;
     DocDir = "";
-
     for (index = (ManualDir.isEmpty()) ? 1 : 0;
          index != sizeof(dirs) / sizeof(*dirs);
          index += 1) {
         QDir dir(dirs[index]);
 
         if (dir.exists(topic + ".html")) {
-            DocDir = dir.absPath();
+            DocDir = dir.absolutePath();
+
+
 
             if (!NavigatorPath.isEmpty()) {
+
                 if (dir.exists("index_" + topic + ".html"))
-                    topic = dir.absFilePath("index_" + topic + ".html");
+                    topic = dir.absoluteFilePath("index_" + topic + ".html");
                 else
-                    topic = dir.absFilePath(topic + ".html");
-
-                int index = 0;
+                    topic = dir.absoluteFilePath(topic + ".html");
 
-                while ((index = topic.find(" ", index)) != -1)
-                    topic.replace(index, 1, "%20");
 
+                QString navPath = QDir::toNativeSeparators(NavigatorPath);
+                navPath.prepend("\"");
+                navPath.append("\"");
+                QString s = navPath +" " + QString(QUrl::fromLocalFile(topic).toEncoded()) +"&";
 
-                QString s = NavigatorPath + " file://" + topic + "&";
 
                 errno = 0;
-                (void) system(s);
+                (void) system(s.toLatin1().constData());
 
                 if (errno != 0)
                     QMessageBox::critical(0, "Douml",
-                                          TR("HelpDialog : error while executing '%1'\n"
-                                             "perhaps you must specify its absolute path"
-                                             "or set the environment variable PATH ?", NavigatorPath));
+                                          QObject::tr("HelpDialog : error while executing '%1'\n"
+                                                      "perhaps you must specify its absolute path"
+                                                      "or set the environment variable PATH ?").arg(NavigatorPath));
 
                 return;
             }
+            else
+            {
+
+                if (dir.exists("index_" + topic + ".html"))
+                    topic = dir.absoluteFilePath("index_" + topic + ".html");
+                else
+                    topic = dir.absoluteFilePath(topic + ".html");
+                if(QDesktopServices::openUrl(QUrl::fromLocalFile(topic)))
+                    return;
+            }
 
             break;
         }
@@ -186,8 +194,9 @@ void HelpDialog::show(QString topic)
         the = new HelpDialog();
 
     if (!DocDir.isEmpty()) {
-        the->br->mimeSourceFactory()->setFilePath(DocDir);
-        the->br->setSource(topic + ".html");
+        the->br->setSearchPaths(QStringList()<<DocDir);
+        topicUnchanged = topicUnchanged + ".html";
+        the->br->setSource(topicUnchanged);
     }
     else {
         bool old = FALSE;
@@ -201,13 +210,13 @@ void HelpDialog::show(QString topic)
             }
         }
 
-        the->br->setText(QString((old) ? TR("The documentation is too old.<br><br>")
-                                 : TR("The documentation isn't installed.<br><br>")) +
-                         TR("The \".tar.gz\" or \".7z\" archives are available here:"
-                            "<ul><li>http://bouml.sourceforge.net/documentation.html</li>"
-                            "<li>http://sourceforge.net/projects/douml/documentation.html</li></ul>"
-                            "<br>Extract an archive and set the environment through the Miscellaneous"
-                            "menu to indicate where the directory \"doc\" is then close this dialog and redo"));
+        the->br->setText(QString((old) ? QObject::tr("The documentation is too old.<br><br>")
+                                       : QObject::tr("The documentation isn't installed.<br><br>")) +
+                         QObject::tr("The \".tar.gz\" or \".7z\" archives are available here:"
+                                     "<ul><li>http://bouml.sourceforge.net/documentation.html</li>"
+                                     "<li>http://sourceforge.net/projects/douml/documentation.html</li></ul>"
+                                     "<br>Extract an archive and set the environment through the Miscellaneous"
+                                     "menu to indicate where the directory \"doc\" is then close this dialog and redo"));
         the->setMinimumSize(QSize(600, 300));
     }
 
diff --git a/src/dialog/HelpDialog.h b/src/dialog/HelpDialog.h
index bc228208b..d6b564c40 100644
--- a/src/dialog/HelpDialog.h
+++ b/src/dialog/HelpDialog.h
@@ -30,7 +30,7 @@
 
 #include <qdialog.h>
 
-class Q3TextBrowser;
+class QTextBrowser;
 
 // singleton
 
@@ -47,7 +47,7 @@ class HelpDialog : public QDialog
 
     static HelpDialog * the;
 
-    Q3TextBrowser * br;
+    QTextBrowser * br;
 };
 
 extern QString manual_dir();
diff --git a/src/dialog/HelpRegexpDialog.h b/src/dialog/HelpRegexpDialog.h
index d3da17d59..d2b0a3d1b 100644
--- a/src/dialog/HelpRegexpDialog.h
+++ b/src/dialog/HelpRegexpDialog.h
@@ -34,7 +34,7 @@
 class HelpRegexpDialog : public QDialog
 {
     Q_OBJECT
-
+    
 protected:
     static QSize previous_size;
 
diff --git a/src/dialog/HideShowDialog.cpp b/src/dialog/HideShowDialog.cpp
index d149190dd..cef4fc776 100644
--- a/src/dialog/HideShowDialog.cpp
+++ b/src/dialog/HideShowDialog.cpp
@@ -32,13 +32,11 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3listbox.h>
+#include <QListWidget>
 #include <qcheckbox.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-#include <Q3ValueList>
-
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QList>
 #include "HideShowDialog.h"
 #include "BrowserNode.h"
 #include "ClassMemberData.h"
@@ -50,29 +48,32 @@
 QSize HideShowDialog::previous_size;
 
 HideShowDialog::HideShowDialog(const BrowserNodeList & a,
-                               Q3ValueList<BrowserNode *> & hv,
+                               QList<BrowserNode *> & hv,
                                BooL & visible)
-    : QDialog(0, "hide/show dialog", TRUE), all(a),
+    : QDialog(0/*, "hide/show dialog", TRUE*/), all(a),
       hidden_visible(hv), on_visible(visible)
 {
-    setCaption(TR("Settings dialog"));
+    setWindowTitle(tr("Settings dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
-    Q3VBoxLayout * subvbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
+    QVBoxLayout * subvbox;
     QPushButton * button;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
-    subvbox = new Q3VBoxLayout(hbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
+    subvbox = new QVBoxLayout();
+    hbox->addLayout(subvbox);
     subvbox->setMargin(5);
-    subvbox->addWidget(new QLabel(TR("Visible"), this), 0, Qt::AlignHCenter);
-    subvbox->addWidget(lb_visible = new Q3ListBox(this));
-    lb_visible->setSelectionMode(Q3ListBox::Multi);
+    subvbox->addWidget(new QLabel(tr("Visible"), this), 0, Qt::AlignHCenter);
+    subvbox->addWidget(lb_visible = new QListWidget (this));
+    lb_visible->setSelectionMode(QListWidget ::MultiSelection);
 
-    subvbox = new Q3VBoxLayout(hbox);
-    subvbox->setResizeMode(QLayout::SetMinimumSize);
+    subvbox = new QVBoxLayout();
+    hbox->addLayout(subvbox);
+    subvbox->setSizeConstraint(QLayout::SetMinimumSize);
     subvbox->setMargin(5);
     //subvbox->addWidget(new QLabel("", this));
     subvbox->addStretch(100);
@@ -83,33 +84,31 @@ HideShowDialog::HideShowDialog(const BrowserNodeList & a,
     connect(button, SIGNAL(clicked()), this, SLOT(show_them()));
     subvbox->addStretch(100);
 
-    subvbox = new Q3VBoxLayout(hbox);
+    subvbox = new QVBoxLayout();
+    hbox->addLayout(subvbox);
     subvbox->setMargin(5);
-    subvbox->addWidget(new QLabel(TR("Hidden"), this), 0, Qt::AlignHCenter);
-    subvbox->addWidget(lb_hidden = new Q3ListBox(this));
-    lb_hidden->setSelectionMode(Q3ListBox::Multi);
-
-    Q3PtrListIterator<BrowserNode> it(all);
+    subvbox->addWidget(new QLabel(tr("Hidden"), this), 0, Qt::AlignHCenter);
+    subvbox->addWidget(lb_hidden = new QListWidget (this));
+    lb_hidden->setSelectionMode(QListWidget ::MultiSelection);
 
-    while (it.current() != 0) {
-        QString def = it.current()->get_data()->definition(TRUE, FALSE);
+    foreach (BrowserNode *item, all) {
+        QString def = item->get_data()->definition(TRUE, FALSE);
 
-        (((hidden_visible.findIndex(it.current()) == -1) ^ on_visible)
+        (((hidden_visible.indexOf(item) == -1) ^ on_visible)
          ? lb_visible : lb_hidden)
-        ->insertItem(new ListBoxBrowserNode(it.current(), def));
-
-        ++it;
+        ->addItem(new ListBoxBrowserNode(item, def));
     }
 
-    lb_visible->sort();
-    lb_hidden->sort();
+    lb_visible->sortItems();
+    lb_hidden->sortItems();
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * sh_all = new SmallPushButton(TR("Show all"), this);
-    QPushButton * hi_all = new SmallPushButton(TR("Hide all"), this);
-    QPushButton * hi_priv = new SmallPushButton(TR("Hide private ones"), this);
-    QPushButton * hi_priv_prot = new SmallPushButton(TR("Hide private and\nprotected ones"), this);
+    QPushButton * sh_all = new SmallPushButton(tr("Show all"), this);
+    QPushButton * hi_all = new SmallPushButton(tr("Hide all"), this);
+    QPushButton * hi_priv = new SmallPushButton(tr("Hide private ones"), this);
+    QPushButton * hi_priv_prot = new SmallPushButton(tr("Hide private and\nprotected ones"), this);
     QSize bs(hi_priv_prot->sizeHint());
 
     sh_all->setFixedSize(bs);
@@ -129,19 +128,21 @@ HideShowDialog::HideShowDialog(const BrowserNodeList & a,
 
     //
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
-    cb_visible = new QCheckBox(TR("Specify visible members rather than hidden ones"), this);
+    cb_visible = new QCheckBox(tr("Specify visible members rather than hidden ones"), this);
     cb_visible->setChecked(on_visible);
     hbox->addWidget(cb_visible);
 
     //
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
 
     ok->setDefault(TRUE);
 
@@ -158,7 +159,7 @@ HideShowDialog::HideShowDialog(const BrowserNodeList & a,
 
 void HideShowDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -169,14 +170,14 @@ HideShowDialog::~HideShowDialog()
 
 void HideShowDialog::hide_them()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i < lb_visible->count()) {
-        Q3ListBoxItem * item = lb_visible->item(i);
+        QListWidgetItem * item = lb_visible->item(i);
 
-        if (item->selected()) {
-            lb_visible->takeItem(item);
-            lb_hidden->insertItem(item);
+        if (item->isSelected()) {
+            lb_visible->takeItem(lb_visible->row(item));
+            lb_hidden->addItem(item);
         }
         else
             i += 1;
@@ -185,14 +186,14 @@ void HideShowDialog::hide_them()
 
 void HideShowDialog::show_them()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i < lb_hidden->count()) {
-        Q3ListBoxItem * item = lb_hidden->item(i);
+        QListWidgetItem * item = lb_hidden->item(i);
 
-        if (item->selected()) {
-            lb_hidden->takeItem(item);
-            lb_visible->insertItem(item);
+        if (item->isSelected()) {
+            lb_hidden->takeItem(lb_hidden->row(item));
+            lb_visible->addItem(item);
         }
         else
             i += 1;
@@ -202,20 +203,20 @@ void HideShowDialog::show_them()
 void HideShowDialog::show_all()
 {
     while (lb_hidden->count()) {
-        Q3ListBoxItem * item = lb_hidden->firstItem();
+        QListWidgetItem * item = lb_hidden->item(0);
 
-        lb_hidden->takeItem(item);
-        lb_visible->insertItem(item);
+        lb_hidden->takeItem(lb_hidden->row(item));
+        lb_visible->addItem(item);
     }
 }
 
 void HideShowDialog::hide_all()
 {
     while (lb_visible->count()) {
-        Q3ListBoxItem * item = lb_visible->firstItem();
+        QListWidgetItem * item = lb_visible->item(0);
 
-        lb_visible->takeItem(item);
-        lb_hidden->insertItem(item);
+        lb_visible->takeItem(lb_visible->row(item));
+        lb_hidden->addItem(item);
     }
 }
 
@@ -224,21 +225,17 @@ void HideShowDialog::hide_private()
     lb_visible->clear();
     lb_hidden->clear();
 
-    Q3PtrListIterator<BrowserNode> it(all);
-
-    while (it.current() != 0) {
-        BasicData * m = it.current()->get_data();
+    foreach (BrowserNode *item, all) {
+        BasicData * m = item->get_data();
         QString def = m->definition(TRUE, FALSE);
 
         ((((ClassMemberData *) m)->get_visibility(m->get_browser_node()) != UmlPrivate)
          ? lb_visible : lb_hidden)
-        ->insertItem(new ListBoxBrowserNode(it.current(), def));
-
-        ++it;
+        ->addItem(new ListBoxBrowserNode(item, def));
     }
 
-    lb_visible->sort();
-    lb_hidden->sort();
+    lb_visible->sortItems();
+    lb_hidden->sortItems();
 }
 
 void HideShowDialog::hide_private_protected()
@@ -246,23 +243,19 @@ void HideShowDialog::hide_private_protected()
     lb_visible->clear();
     lb_hidden->clear();
 
-    Q3PtrListIterator<BrowserNode> it(all);
-
-    while (it.current() != 0) {
-        BasicData * m = it.current()->get_data();
+    foreach (BrowserNode *item, all) {
+        BasicData * m = item->get_data();
         QString def = m->definition(TRUE, FALSE);
         UmlVisibility visi =
             ((ClassMemberData *) m)->get_visibility(m->get_browser_node());
 
         (((visi == UmlPublic) || (visi == UmlPackageVisibility))
          ? lb_visible : lb_hidden)
-        ->insertItem(new ListBoxBrowserNode(it.current(), def));
-
-        ++it;
+        ->addItem(new ListBoxBrowserNode(item, def));
     }
 
-    lb_visible->sort();
-    lb_hidden->sort();
+    lb_visible->sortItems();
+    lb_hidden->sortItems();
 }
 
 void HideShowDialog::accept()
@@ -270,9 +263,9 @@ void HideShowDialog::accept()
     hidden_visible.clear();
     on_visible = cb_visible->isChecked();
 
-    Q3ListBox * lb = (on_visible) ? lb_visible : lb_hidden;
+    QListWidget * lb = (on_visible) ? lb_visible : lb_hidden;
 
-    for (unsigned int i = 0; i != lb->count(); i += 1)
+    for (int i = 0; i != lb->count(); i += 1)
         hidden_visible.append(((ListBoxBrowserNode *) lb->item(i))->browser_node);
 
     QDialog::accept();
diff --git a/src/dialog/HideShowDialog.h b/src/dialog/HideShowDialog.h
index 1e2da356f..511cd4944 100644
--- a/src/dialog/HideShowDialog.h
+++ b/src/dialog/HideShowDialog.h
@@ -29,9 +29,9 @@
 #define HIDESHOWDIALOG_H
 
 #include <qdialog.h>
-#include <q3valuelist.h>
+#include <QList>
 
-class Q3ListBox;
+class QListWidget;
 class QCheckBox;
 class BrowserNode;
 class BrowserNodeList;
@@ -42,17 +42,17 @@ class HideShowDialog : public QDialog
 
 protected:
     const BrowserNodeList & all;
-    Q3ValueList<BrowserNode *> & hidden_visible;
+    QList<BrowserNode *> & hidden_visible;
     BooL & on_visible;
-    Q3ListBox * lb_visible;
-    Q3ListBox * lb_hidden;
+    QListWidget * lb_visible;
+    QListWidget * lb_hidden;
     QCheckBox * cb_visible;
 
     static QSize previous_size;
 
 public:
     HideShowDialog(const BrowserNodeList & a,
-                   Q3ValueList<BrowserNode *> & h, BooL & visible);
+                   QList<BrowserNode *> & h, BooL & visible);
     virtual ~HideShowDialog();
 
 protected slots:
@@ -63,7 +63,7 @@ protected slots:
     void hide_all();
     void hide_private();
     void hide_private_protected();
-    virtual void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/ImageDialog.cpp b/src/dialog/ImageDialog.cpp
index e746ddd6e..676de1494 100644
--- a/src/dialog/ImageDialog.cpp
+++ b/src/dialog/ImageDialog.cpp
@@ -30,13 +30,13 @@
 
 
 #include <qlayout.h>
-#include <q3vbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
 #include <qdir.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "ImageDialog.h"
 #include "DialogUtil.h"
@@ -52,34 +52,35 @@ static QString RelativeRoot;
 static QString RelativePrj;
 
 ImageDialog::ImageDialog(QString & p)
-    : QDialog(0, "Image dialog", TRUE), path(p)
+    : QDialog(0), path(p)
 {
-    setCaption(TR("Image dialog"));
+    setWindowTitle(tr("Image dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
-    hbox->addWidget(new QLabel(TR("Image path :"), this));
+    hbox->addWidget(new QLabel(tr("Image path :"), this));
     hbox->addWidget(edpath = new LineEdit(path, this));
 
-    RelativeRoot = TR("Set it relative to image root");
-    RelativePrj = TR("Set it relative to project");
-    Absolute = TR("Set it absolute");
+    RelativeRoot = tr("Set it relative to image root");
+    RelativePrj = tr("Set it relative to project");
+    Absolute = tr("Set it absolute");
 
     hbox->addWidget(new QLabel("", this));
 
-    QPushButton * b = new SmallPushButton(TR("Browse"), this);
+    QPushButton * browse = new QPushButton(tr("Browse"), this);
 
-    hbox->addWidget(b);
-    connect(b, SIGNAL(clicked()), this, SLOT(browse()));
+    hbox->addWidget(browse);
+    connect(browse, SIGNAL(clicked()), this, SLOT(browse()));
     hbox->addWidget(new QLabel("", this));
 
-    Q3VBox * vtab = new Q3VBox(this);
+    VVBox * vtab = new VVBox(this);
 
     hbox->addWidget(vtab);
 
@@ -94,15 +95,16 @@ ImageDialog::ImageDialog(QString & p)
 
     //
 
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
     accept->setFixedSize(bs);
     cancel->setFixedSize(bs);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
 
     hbox->addWidget(accept);
     hbox->addWidget(cancel);
@@ -110,7 +112,7 @@ ImageDialog::ImageDialog(QString & p)
     connect(accept, SIGNAL(clicked()), this, SLOT(accept()));
     connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
 
-    UmlDesktop::setsize_center(this, previous_size, 0.7, 0.01);
+    UmlDesktop::setsize_center(this, previous_size, 0.3, 0.01);
 }
 
 ImageDialog::~ImageDialog()
@@ -120,8 +122,9 @@ ImageDialog::~ImageDialog()
 
 void ImageDialog::browse()
 {
-    QString s = edpath->text().simplifyWhiteSpace();
-    const QString ns = Q3FileDialog::getOpenFileName(s, "", this, 0, TR("Select image"));
+    QString s = edpath->text().simplified();
+    const QString ns = QFileDialog::getOpenFileName(0, QObject::tr("Select image"),s);//(s, "", this, 0, QObject::tr("Select image"));
+
 
     if (! ns.isEmpty()) {
         edpath->setText(ns);
@@ -151,7 +154,7 @@ void ImageDialog::root_relative()
 
 
 
-            (s.find(root) == 0) &&
+            (s.indexOf(root) == 0) &&
 
             (s.length() >= len)) {
             edpath->setText(s.mid(len));
@@ -168,7 +171,7 @@ void ImageDialog::root_relative()
 
 void ImageDialog::prj_relative()
 {
-    QString root = BrowserView::get_dir().absPath();
+    QString root = BrowserView::get_dir().absolutePath();
     const QString s = edpath->text();
 
     if (root.at(root.length() - 1) != QChar('/'))
@@ -181,7 +184,7 @@ void ImageDialog::prj_relative()
 
 
 
-            (s.find(root) == 0) &&
+            (s.indexOf(root) == 0) &&
 
             (s.length() >= len)) {
             edpath->setText(s.mid(len));
@@ -200,6 +203,6 @@ void ImageDialog::prj_relative()
 
 void ImageDialog::accept()
 {
-    path = edpath->text().simplifyWhiteSpace();
+    path = edpath->text().simplified();
     QDialog::accept();
 }
diff --git a/src/dialog/InstanceDialog.cpp b/src/dialog/InstanceDialog.cpp
index f861671ef..ceb8d5c3c 100644
--- a/src/dialog/InstanceDialog.cpp
+++ b/src/dialog/InstanceDialog.cpp
@@ -31,63 +31,62 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
-#include <q3grid.h>
+#include <gridbox.h>
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include "InstanceDialog.h"
 #include "Instance.h"
 #include "DialogUtil.h"
 #include "UmlDesktop.h"
 #include "BrowserView.h"
 #include "translate.h"
+#include "menufactory.h"
 
 QSize InstanceDialog::previous_size;
 
 InstanceDialog::InstanceDialog(Instance * i, QString w, UmlCode k)
-    : QDialog(0, w + " instance dialog", TRUE),
+    : QDialog(0/*, w + " instance dialog", TRUE*/),
       inst(i), what(w), kind(k)
 {
-    setCaption(TR(what + " instance dialog"));
+    setWindowTitle((what + " instance dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     vbox->addWidget(grid);
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(inst->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(inst->get_name(), grid));
     edname->setFocus();
 
-    new QLabel("", grid);
-    new QLabel("", grid);
+    grid->addWidget(new QLabel("", grid));
+    grid->addWidget(new QLabel("", grid));
 
-    SmallPushButton * b =
-        new SmallPushButton(TR(what) + " :", grid);
+    SmallPushButton * b;
+    grid->addWidget(b = new SmallPushButton((what) + " :", grid));
 
     connect(b, SIGNAL(clicked()), this, SLOT(menu_type()));
 
-    edtype = new Q3ComboBox(FALSE, grid);
+    grid->addWidget(edtype = new QComboBox(grid));
     inst->get_types(nodes);
     nodes.full_names(list);
-    edtype->insertStringList(list);
-    edtype->setCurrentItem(nodes.find(inst->get_type()));
+    edtype->addItems(list);
+    edtype->setCurrentIndex(nodes.indexOf(inst->get_type()));
 
-    new QLabel("", grid);
-    new QLabel("", grid);
+    grid->addWidget(new QLabel("", grid));
+    grid->addWidget(new QLabel("", grid));
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
 
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -105,7 +104,7 @@ InstanceDialog::InstanceDialog(Instance * i, QString w, UmlCode k)
 
 void InstanceDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -117,31 +116,34 @@ InstanceDialog::~InstanceDialog()
 
 void InstanceDialog::menu_type()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edtype->currentText().stripWhiteSpace());
+    int index = list.indexOf(edtype->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = BrowserView::selected_item();
 
     if ((bn != 0) &&
         (bn->get_type() == kind) && !bn->deletedp())
-        m.insertItem(TR("Choose " + what + " selected in browser"), 1);
+        MenuFactory::addItem(m, tr("Choose ") + what + tr(" selected in browser"), 1);
     else
         bn = 0;
 
     bool new_available = inst->new_type_available();
 
     if (new_available)
-        m.insertItem(TR("Create " + what + " and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create ") + what + tr(" and choose it"), 2);
 
     if (new_available || (index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0:
             nodes.at(index)->select_in_browser();
             break;
@@ -160,7 +162,7 @@ void InstanceDialog::menu_type()
         {
             QString s = bn->full_name(TRUE);
 
-            if ((index = list.findIndex(s)) == -1) {
+            if ((index = list.indexOf(s)) == -1) {
                 // new class, may be created through an other dialog
                 index = 0;
                 QStringList::Iterator iter = list.begin();
@@ -173,19 +175,20 @@ void InstanceDialog::menu_type()
 
                 nodes.insert((unsigned) index, bn);
                 list.insert(iter, s);
-                edtype->insertItem(s, index);
+                edtype->addItem(s, index);
             }
         }
 
-        edtype->setCurrentItem(index);
+        edtype->setCurrentIndex(index);
+        }
         }
     }
 }
 
 void InstanceDialog::accept()
 {
-    inst->set_name(edname->text().stripWhiteSpace());
-    inst->set_type(nodes.at(edtype->currentItem()));
+    inst->set_name(edname->text().trimmed());
+    inst->set_type(nodes.at(edtype->currentIndex()));
 
     QDialog::accept();
 }
diff --git a/src/dialog/InstanceDialog.h b/src/dialog/InstanceDialog.h
index fc058b34b..a22b3c900 100644
--- a/src/dialog/InstanceDialog.h
+++ b/src/dialog/InstanceDialog.h
@@ -33,7 +33,7 @@
 
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class LineEdit;
 class Instance;
 
@@ -48,7 +48,7 @@ class InstanceDialog : public QDialog
     QStringList list;
     BrowserNodeList nodes;
     LineEdit * edname;
-    Q3ComboBox * edtype;
+    QComboBox * edtype;
 
     static QSize previous_size;
 
@@ -59,7 +59,7 @@ class InstanceDialog : public QDialog
 protected slots:
     void menu_type();
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/KeyValueTable.cpp b/src/dialog/KeyValueTable.cpp
index 96635f5ff..b387b9d82 100644
--- a/src/dialog/KeyValueTable.cpp
+++ b/src/dialog/KeyValueTable.cpp
@@ -24,13 +24,10 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-
-
-
-
-
 #include <stdio.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
+#include <QEvent>
+#include <QKeyEvent>
 
 #include "KeyValueTable.h"
 #include "HaveKeyValueData.h"
@@ -41,104 +38,42 @@
 #include "strutil.h"
 #include "DialogUtil.h"
 #include "translate.h"
-
-KeyValuesTable::KeyValuesTable(HaveKeyValueData * hv, QWidget * parent, bool isReadOnly)
-    : StringTable(((hv == 0) ? 0 : hv->get_n_keys()) + ((isReadOnly) ? 0 : 1),
+#include <QHeaderView>
+KeyValuesTable::KeyValuesTable(HaveKeyValueData * kvData, QWidget * parent, bool isReadOnly)
+    : StringTable(((kvData == 0) ? 0 : kvData->get_n_keys()) + ((isReadOnly) ? 0 : 1),
                   (isReadOnly) ? 2 : 3, parent, isReadOnly)
 {
-    horizontalHeader()->setLabel(0, TR("Key"));
-    horizontalHeader()->setLabel(1, TR("Value"));
-
-    if (!isReadOnly)
-        horizontalHeader()->setLabel(2, TR("do"));
-
-    int index;
-    int sup = 0;
-    if(hv)
-        sup = hv->get_n_keys();
-
-    if (isReadOnly)
-    {
-        for (index = 0; index < sup; index += 1)
-        {
-            TableItem * ti;
-
-            ti = new TableItem(this, Q3TableItem::Never,
-                               toUnicode(hv->get_key(index)));
-            ti->setReplaceable(FALSE);
-            setItem(index, 0, ti);
-
-            QString s = toUnicode(hv->get_value(index));
-            int n = s.count('\n');
-
-            ti = new TableItem(this, Q3TableItem::Never, s);
-            ti->setReplaceable(FALSE);
-            setItem(index, 1, ti);
-
-            if (n != 0)
-            {
-                // note : adjustRow(index) does nothing
-                setRowHeight(index, rowHeight(index) * (n + 1));
-            }
-        }
-    }
-    else
-    {
-        props.setAutoDelete(TRUE);
-
-        QStringList items;
-
-        for (index = 0; index < sup; index += 1) {
-            QString k = toUnicode(hv->get_key(index));
-            QString v = toUnicode(hv->get_value(index));
-            QStringList * psl = props[k];
-
-            setText(index, 0, k);
-
-            if (psl != 0)
-                setItem(index, 1, new ComboItem(this, v, *psl, FALSE));
-
-            if ((k.contains(':') == 2) &&
-                    ProfiledStereotypes::enumerated(k, items)) {
-                psl = new QStringList(items);
-                props.insert(k, psl);
-                setItem(index, 1, new ComboItem(this, v, *psl, FALSE));
-            }
-            else
-                setItem(index, 1, new MLinesItem(this, v));
-
-            setText(index, 2, QString());
-            setRowStretchable(index, TRUE);
-        }
-
-        setText(index, 0, QString());
-        setItem(index, 1, new MLinesItem(this, QString()));
-        setText(index, 2, QString());
-        setRowStretchable(index, TRUE);
-    }
-
-    horizontalHeader()->setResizeEnabled(TRUE, 0);  //setColumnStretchable (0, TRUE);
-    setColumnStretchable(1, TRUE);
-
-    if (! isReadOnly) {
-        adjustColumn(2);
-        setColumnStretchable(2, FALSE);
-    }
+    colNames.insert(0, QObject::tr("Key"));
+    colNames.insert(1, QObject::tr("Value"));
+    colNames.insert(2, QObject::tr("Do"));
+    Init(kvData, isReadOnly);
+    m_delegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(0,m_delegate);
+    setItemDelegateForColumn(1,m_delegate);
 }
 
 void KeyValuesTable::init_row(int index)
 {
     setText(index, 0, QString());
-    setItem(index, 1, new MLinesItem(this, QString()));
+    setItem(index, 1, new MLinesItem(QString()));
     setText(index, 2, QString());
     setRowStretchable(index, TRUE);
 }
 
+bool KeyValuesTable::eventFilter(QObject *o, QEvent * e)
+{
+    if(e->type() == QEvent::KeyPress)
+    {
+        return false;
+    }
+   return  QTableWidget::eventFilter(o,e);
+}
+
 bool KeyValuesTable::check_unique()
 {
     forceUpdateCells();
 
-    unsigned n = numRows();
+    unsigned n = rowCount();
 
     if (n != 0) {
         unsigned index;
@@ -151,8 +86,8 @@ bool KeyValuesTable::check_unique()
         for (index = 0; index != n; index += 1) {
             const QString & s = text(index, 0);
 
-            if (l.findIndex(s) != -1) {
-                msg_critical(TR("Error"), TR("key '%1' used several times", s));
+            if (l.indexOf(s) != -1) {
+                msg_critical(tr("Error"), QObject::tr("key '%1' used several times").arg(s));
                 return FALSE;
             }
             else
@@ -167,7 +102,7 @@ void KeyValuesTable::updateNodeFromThis(HaveKeyValueData * oper)
 {
     forceUpdateCells();
 
-    unsigned n = numRows();
+    unsigned n = rowCount();
     unsigned index;
 
     if (text(n - 1, 0).isEmpty())
@@ -181,138 +116,191 @@ void KeyValuesTable::updateNodeFromThis(HaveKeyValueData * oper)
     }
 }
 
-void KeyValuesTable::updateThisFromNode(HaveKeyValueData *hv, bool isReadOnly)
+void KeyValuesTable::updateThisFromNode(HaveKeyValueData *kvData, bool isReadOnly)
 {
+    Init(kvData, isReadOnly);
+}
 
-    if (!isReadOnly)
-    {
-        if(numCols() == 2)
-            insertColumns(2);
-        horizontalHeader()->setLabel(2, TR("do"));
-    }
-    else
-    {
-        if(numCols() == 3)
-            removeColumn(2);
+bool KeyValuesTable::get_value(const char * key, QString & value)
+{
+    QString ks = toUnicode(key);
+    int index;
+
+    for (index = 0; index != rowCount(); index += 1) {
+        if (text(index, 0) == ks) {
+            value = text(index, 1);
+            return TRUE;
+        }
     }
 
-    int index;
-    int sup = 0;
-    if(hv)
-        sup = hv->get_n_keys();
-    int rowCount = numRows();
-    for (index = rowCount - 1; index > sup; index -= 1)
-        removeRow(index);
-
-    if (isReadOnly)
-    {
-        for (index = 0; index < sup; index += 1)
-        {
-            TableItem * tiKey = nullptr;
-            TableItem * tiValue = nullptr;
-            QString s = toUnicode(hv->get_value(index));
-            int n = s.count('\n');
-
-            if(index == numRows() || numRows() == 0)
-            {
-                tiKey = new TableItem(this, Q3TableItem::Never,
-                                   toUnicode(hv->get_key(index)));
-                tiValue = new TableItem(this, Q3TableItem::Never, s);
-                setItem(index, 0, tiKey);
-                setItem(index, 1, tiValue);
-            }
-            else
-            {
-                tiKey = dynamic_cast<TableItem*>(item(index, 0));
-                tiKey->setText(hv->get_key(index));
-                tiValue = dynamic_cast<TableItem*>(item(index, 1));
-                tiValue->setText(s);
-            }
-            tiKey->setReplaceable(FALSE);
-            tiValue->setReplaceable(FALSE);
+    return FALSE;
+}
 
+void KeyValuesTable::remove(const char * key)
+{
+    QString ks = toUnicode(key);
+    int index;
 
-            if (n != 0)
-            {
-                // note : adjustRow(index) does nothing
-                setRowHeight(index, rowHeight(index) * (n + 1));
-            }
+    for (index = 0; index != rowCount(); index += 1) {
+        if (text(index, 0) == ks) {
+            delete_row(index);
+            break;
         }
     }
-    else
+}
+
+bool KeyValuesTable::EqualData(HaveKeyValueData * kvData)
+{
+    if(!kvData)
+        return false;
+    unsigned n = rowCount();
+
+    if (text(n - 1, 0).isEmpty())
+        n -= 1;
+
+    if(kvData->get_n_keys() != n)
+        return false;
+
+    unsigned index;
+    for (index = 0; index != n; index += 1)
     {
-        props.setAutoDelete(TRUE);
+        if(kvData->has_key(fromUnicode(text(index, 0))) == -1)
+            return false;
+        if(kvData->get_value(fromUnicode(text(index, 0))) != fromUnicode(text(index, 1)))
+            return false;
+    }
+    return true;
+}
 
-        QStringList items;
+//bool HaveKeyValueData::isSame(KeyValueData * kvData)
+//{
 
-        for (index = 0; index < sup; index += 1)
-        {
-            QString k = toUnicode(hv->get_key(index));
-            QString v = toUnicode(hv->get_value(index));
-            QStringList * psl = props[k];
+//}
+void KeyValuesTable::Init(HaveKeyValueData *kvData, bool isReadOnly)
+{
+    if(!kvData)
+    {
+        //this->setEnabled(false);
+        return;
+    }
+    AdjustColumnCount(isReadOnly);
+    AdjustRowCount(kvData, isReadOnly);
+    SetupTableText(kvData, isReadOnly);
+    AdjustEditability(isReadOnly);
+}
 
-            setText(index, 0, k);
+void KeyValuesTable::SetupTableText(HaveKeyValueData *kvData,  bool isReadOnly)
+{
+    QStringList items;
+    unsigned index = 0;
+    for (index = 0; index < kvData->get_n_keys(); index++)
+    {
+        QString k = kvData->get_key(index);
+        QString v = kvData->get_value(index);
 
-            if (psl != 0)
-                setItem(index, 1, new ComboItem(this, v, *psl, FALSE));
+        TableItem * tiKey = nullptr;
+        tiKey =  new MLinesItem(k, !isReadOnly);
 
-            if ((k.contains(':') == 2) &&
-                    ProfiledStereotypes::enumerated(k, items)) {
-                psl = new QStringList(items);
-                props.insert(k, psl);
-                setItem(index, 1, new ComboItem(this, v, *psl, FALSE));
-            }
-            else
-                setItem(index, 1, new MLinesItem(this, v));
+        setItem(index, 0, tiKey);
+
+        if (props.contains(k))
+            setItem(index, 1, new ComboItem(v, props[k], FALSE));
 
-            setText(index, 2, QString());
-            setRowStretchable(index, TRUE);
+        if ((k.count(':') == 2) &&
+                ProfiledStereotypes::enumerated(k, items))
+        {
+            props.insert(k, items);
+            setItem(index, 1, new ComboItem(v, props[k], FALSE));
         }
+        else
+            setItem(index, 1, new MLinesItem(v, !isReadOnly));
 
-        if(index == numRows())
-            insertRows(numRows());
-        setText(index, 0, QString());
-        setItem(index, 1, new MLinesItem(this, QString()));
-        setText(index, 2, QString());
-        setRowStretchable(index, TRUE);
-    }
+        setItem(index, 2, new TableItem(TableItem::Never,"", TableItem::TableItemType));
+        setRowStretchable(index, true);
+        int crCount = v.count('\n');
+        if (crCount != 0)
+            setRowHeight(index, rowHeight(index) * (crCount + 1));
 
-    horizontalHeader()->setResizeEnabled(TRUE, 0);  //setColumnStretchable (0, TRUE);
-    setColumnStretchable(1, TRUE);
 
-    if (! isReadOnly) {
-        adjustColumn(2);
-        setColumnStretchable(2, FALSE);
     }
 
-
-
+    setItem(index, 0, new MLinesItem(QString()));
+    setItem(index, 1, new MLinesItem(QString()));
+    if(!isReadOnly)
+        setItem(index, 2, new TableItem(TableItem::Never,"", TableItem::TableItemType));
+    setRowStretchable(index, TRUE);
 }
 
-bool KeyValuesTable::get_value(const char * key, QString & value)
+void KeyValuesTable::AdjustColumnCount(bool isReadOnly)
 {
-    QString ks = toUnicode(key);
-    int index;
+    int colCount = isReadOnly ? 2 : 3;
+    int currentCount = columnCount();
 
-    for (index = 0; index != numRows(); index += 1) {
-        if (text(index, 0) == ks) {
-            value = text(index, 1);
-            return TRUE;
+    for(int current = currentCount - 1; current  > -1; current--)
+        removeColumn(0);
+
+    for(int current(0); current < colCount ; current++)
+    {
+        insertColumn(current);
+        //horizontalHeader()-> setLabel(current, colNames[current]);
+        QTableWidgetItem * item = horizontalHeaderItem(current);
+        if(!item)
+         {
+            item = new QTableWidgetItem();
+            setHorizontalHeaderItem(current, item);
         }
+         horizontalHeaderItem(current)->setText(colNames[current]);
     }
 
-    return FALSE;
+    setColumnStretchable(1, true);
+
+    if(!isReadOnly)
+    {
+
+        setColumnStretchable(2, false);
+        resizeColumnToContents(2);
+    }
+    horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
+    horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive);
+
 }
 
-void KeyValuesTable::remove(const char * key)
+void KeyValuesTable::AdjustRowCount(HaveKeyValueData * kvData, bool)
 {
-    QString ks = toUnicode(key);
-    int index;
+    int rCount = rowCount();
+    int index ;
+    for (index = rCount - 1; index > -1; index --)
+        removeRow(0);
+    for(unsigned i(0); i < kvData->get_n_keys() + 1; i++)
+    {
+        insertRow(i);
+        setRowStretchable(i, true);
+    }
+}
 
-    for (index = 0; index != numRows(); index += 1) {
-        if (text(index, 0) == ks) {
-            delete_row(index);
-            break;
+void KeyValuesTable::AdjustEditability(bool isReadOnly)
+{
+    int rCount = rowCount();
+    for (int i(0); i < rCount; i++)
+    {
+/*
+        item(i, 0)->setReplaceable(!isReadOnly);
+        item(i, 1)->setReplaceable(!isReadOnly);
+        if(!isReadOnly)
+            item(i, 2)->setReplaceable(false);
+        setRowReadOnly(i, isReadOnly);
+*/
+        if(isReadOnly)
+        {
+            item(i, 0)->setFlags(item(i, 0)->flags() & (~Qt::ItemIsEditable));
+            item(i, 1)->setFlags(item(i, 1)->flags() & (~Qt::ItemIsEditable));
+        }
+        else
+        {
+            item(i, 0)->setFlags(item(i, 0)->flags() | (Qt::ItemIsEditable));
+            item(i, 1)->setFlags(item(i, 1)->flags() | (Qt::ItemIsEditable));
         }
+        if(!isReadOnly)
+            item(i, 2)->setFlags(item(i, 2)->flags() & (~Qt::ItemIsEditable));
     }
 }
diff --git a/src/dialog/KeyValueTable.h b/src/dialog/KeyValueTable.h
index 9e5261fbf..24712bd1e 100644
--- a/src/dialog/KeyValueTable.h
+++ b/src/dialog/KeyValueTable.h
@@ -28,26 +28,39 @@
 #ifndef KEYVALUETABLE_H
 #define KEYVALUETABLE_H
 
-#include <q3dict.h>
+////
 #include "StringTable.h"
 
 class HaveKeyValueData;
-
+class TableWidgetItemDelegate;
 class KeyValuesTable : public StringTable
 {
+    Q_OBJECT
+
 public:
     KeyValuesTable(HaveKeyValueData * h, QWidget * parent, bool visit);
 
-    virtual void init_row(int index);
-
+    virtual void init_row(int index) override;
+    virtual bool eventFilter(QObject *o, QEvent *) override;
     bool check_unique();
     void updateNodeFromThis(HaveKeyValueData * h);
     void updateThisFromNode(HaveKeyValueData * h, bool visit = false);
     bool get_value(const char * key, QString & value);
     void remove(const char * key);
 
+    bool EqualData(HaveKeyValueData*);
+
 private:
-    Q3Dict<QStringList> props;
+    void Init(HaveKeyValueData * h, bool isReadOnly);
+    void SetupTableText(HaveKeyValueData * hv, bool isReadOnly);
+    void AdjustColumnCount(bool);
+    void AdjustRowCount(HaveKeyValueData *, bool);
+    void AdjustEditability(bool);
+    QHash<QString, QStringList> props;
+    QHash<int, QString> colNames;
+    TableWidgetItemDelegate* m_delegate;
+
+
 };
 
 #endif
diff --git a/src/dialog/ListBoxBrowserNode.h b/src/dialog/ListBoxBrowserNode.h
index f15cc9c81..f0b996985 100644
--- a/src/dialog/ListBoxBrowserNode.h
+++ b/src/dialog/ListBoxBrowserNode.h
@@ -28,17 +28,17 @@
 #ifndef LISTBOXBROWSERNODE_H
 #define LISTBOXBROWSERNODE_H
 
-#include <q3listbox.h>
+#include <QListWidget>
 
 class BrowserNode;
 
-class ListBoxBrowserNode : public Q3ListBoxText
+class ListBoxBrowserNode : public QListWidgetItem
 {
 public:
     BrowserNode * browser_node;
 
     ListBoxBrowserNode(BrowserNode * b, const QString & s)
-        : Q3ListBoxText(s), browser_node(b) {};
+        : QListWidgetItem(s), browser_node(b) {}
 };
 
 #endif
diff --git a/src/dialog/MLEDialog.cpp b/src/dialog/MLEDialog.cpp
index b39eb6f1e..60d3341ee 100644
--- a/src/dialog/MLEDialog.cpp
+++ b/src/dialog/MLEDialog.cpp
@@ -30,33 +30,34 @@
 
 
 #include <qlayout.h>
-#include <q3hbox.h>
+#include <hhbox.h>
 #include <qlabel.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 #include "MLEDialog.h"
 #include "DialogUtil.h"
 #include "translate.h"
 
-MLEDialog::MLEDialog(QString t, bool buttons) : QDialog(0, "Uml", TRUE, 0)
+MLEDialog::MLEDialog(QString t, bool buttons) : QDialog(0/*, "Uml", TRUE, 0*/)
 {
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    setWindowTitle("Uml");
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     e = new MultiLineEdit(this);
     vbox->addWidget(e);
 
-    Q3HBox * hbox = new Q3HBox(this);
+    HHBox * hbox = new HHBox(this);
 
     vbox->addWidget(hbox);
     hbox->setMargin(5);
 
     if (buttons) {
-        new QLabel(hbox);
-        ok = new QPushButton(TR("OK"), hbox);
-        new QLabel(hbox);
-        cancel = new QPushButton(TR("Cancel"), hbox);
-        new QLabel(hbox);
+        hbox->addWidget(new QLabel(hbox));
+        hbox->addWidget(ok = new QPushButton(tr("OK"), hbox));
+        hbox->addWidget(new QLabel(hbox));
+        hbox->addWidget(cancel = new QPushButton(tr("Cancel"), hbox));
+        hbox->addWidget(new QLabel(hbox));
 
         connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
         connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
diff --git a/src/dialog/MLinesItem.cpp b/src/dialog/MLinesItem.cpp
index 8519f415d..73eb6c3e7 100644
--- a/src/dialog/MLinesItem.cpp
+++ b/src/dialog/MLinesItem.cpp
@@ -32,32 +32,13 @@
 #include <qwidget.h>
 
 #include "MLinesItem.h"
-#include <Q3TextEdit>
+#include <QTextEdit>
+#include <QTextEdit>
 #include "DialogUtil.h"
 
 
-MLinesItem::MLinesItem(Q3Table * ta, const QString & s)
-    : TableItem(ta, Q3TableItem::WhenCurrent, s)
+MLinesItem::MLinesItem(const QString & s, bool editable)
+    : TableItem(editable ? TableItem::WhenCurrent : TableItem::Never, s, TableItem::MLinesType)
 {
-    mle = 0;
-}
-
-QWidget * MLinesItem::createEditor() const
-{
-
-    ((MLinesItem *) this)->mle = new Q3TextEdit(table()->viewport());
-    mle->setText(text());
-    return mle;
-}
-
-void MLinesItem::setContentFromEditor(QWidget * w)
-{
-
-    Q3TextEdit * editor = qobject_cast<Q3TextEdit *>(w);
-
-    if (editor)
-        setText(editor->text());
-    else
-        Q3TableItem::setContentFromEditor(w);
 }
 
diff --git a/src/dialog/MLinesItem.h b/src/dialog/MLinesItem.h
index 1c94f949f..3ba6251e8 100644
--- a/src/dialog/MLinesItem.h
+++ b/src/dialog/MLinesItem.h
@@ -30,18 +30,14 @@
 
 #include "MyTable.h"
 
-class Q3TextEdit;
+
+class QTextEdit;
 
 class MLinesItem : public TableItem
 {
 protected:
-    Q3TextEdit * mle;
-
 public:
-    MLinesItem(Q3Table * t, const QString & s);
-
-    virtual QWidget * createEditor() const;
-    virtual void setContentFromEditor(QWidget * w);
+    MLinesItem(const QString & s, bool editable = true);
 };
 
 #endif
diff --git a/src/dialog/MyInputDialog.cpp b/src/dialog/MyInputDialog.cpp
index 19b56c9c4..535f10465 100644
--- a/src/dialog/MyInputDialog.cpp
+++ b/src/dialog/MyInputDialog.cpp
@@ -32,47 +32,50 @@
 #include <qcursor.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qvalidator.h>
 #include <qapplication.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "MyInputDialog.h"
 #include "DialogUtil.h"
 #include "UmlDesktop.h"
 #include "translate.h"
-
+#include <QLineEdit>
 QSize MyInputDialog::previous_size;
 
-MyInputDialog::MyInputDialog(const char * title, const QString & msg,
+MyInputDialog::MyInputDialog(QString title, const QString & msg,
                              const QString & init)
-    : QDialog(0, title, TRUE)
+    : QDialog(0/*, title, TRUE*/), le(NULL), cb(NULL)
 {
-    setCaption(title);
+    setWindowTitle(title);
     move(QCursor::pos());
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
     hbox->addWidget(new QLabel(msg, this));
     le = new LineEdit(init, this);
+
     hbox->addWidget(le);
 
     QFontMetrics fm(QApplication::font());
 
     le->setMinimumWidth(fm.width("AZERTYUIOPQSDFGHJKLMWXCVBN"));
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     ok->setDefault(TRUE);
@@ -88,31 +91,36 @@ MyInputDialog::MyInputDialog(const char * title, const QString & msg,
     le->setFocus();
 }
 
-MyInputDialog::MyInputDialog(const char * title, const QString & msg,
+MyInputDialog::MyInputDialog(QString title, const QString & msg,
                              const QStringList & list, const QString & init,
-                             bool existing)
-    : QDialog(0, title, TRUE), le(0)
+                             bool existing, const QValidator *v)
+    : QDialog(0/*, title, TRUE*/)
+    , le(0)
+    , cb(NULL)
+    , vl(v)
 {
-    setCaption(title);
+    setWindowTitle(title);
     move(QCursor::pos());
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
     hbox->addWidget(new QLabel(msg, this));
-    cb = new Q3ComboBox(!existing, this);
+    cb = new QComboBox(this);
+    cb->setEditable(!existing);
 
     if (! existing)
-        cb->insertItem(init);
+        cb->addItem(init);
 
-    cb->insertStringList(list);
+    cb->addItems(list);
 
     if (! existing) {
-        cb->setCurrentItem(0);
+        cb->setCurrentIndex(0);
         cb->setAutoCompletion(completion());
     }
 
@@ -120,17 +128,29 @@ MyInputDialog::MyInputDialog(const char * title, const QString & msg,
 
     QSizePolicy sp = cb->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     cb->setSizePolicy(sp);
 
     QFontMetrics fm(QApplication::font());
 
     cb->setMinimumWidth(fm.width("azertyuiopqsdfghjklm"));
 
-    hbox = new Q3HBoxLayout(vbox);
+
+    if(vl)
+    {
+        lb = new QLabel(this);
+        lb->setAlignment(Qt::AlignCenter);
+        vbox->addWidget(lb);
+        if(cb->isEditable())
+            connect(cb->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onTextChanged()));
+        else
+            connect(cb, SIGNAL(currentTextChanged(QString)), this, SLOT(onTextChanged()));
+    }
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     ok->setDefault(TRUE);
@@ -144,11 +164,67 @@ MyInputDialog::MyInputDialog(const char * title, const QString & msg,
     connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
 
     cb->setFocus();
+    if(vl)
+    {
+        onTextChanged();
+    }
 }
 
+MyInputDialog::MyInputDialog(QString title, const QString & msg,
+                             const QString & init, QValidator *validator)
+    : QDialog(0/*, title, TRUE*/)
+    , le(NULL)
+    , cb(NULL)
+    , vl(validator)
+{
+    setWindowTitle(title);
+    move(QCursor::pos());
+
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
+
+    vbox->setMargin(5);
+
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
+    hbox->setMargin(5);
+    hbox->addWidget(new QLabel(msg, this));
+    le = new LineEdit(init, this);
+
+    hbox->addWidget(le);
+
+    QFontMetrics fm(QApplication::font());
+
+    le->setMinimumWidth(fm.width("AZERTYUIOPQSDFGHJKLMWXCVBN"));
+
+    connect(le, SIGNAL(textChanged(QString)), this, SLOT(onTextChanged()));
+
+    lb = new QLabel(this);
+    lb->setAlignment(Qt::AlignCenter);
+    vbox->addWidget(lb);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
+    hbox->setMargin(5);
+    ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
+    QSize bs(cancel->sizeHint());
+
+    ok->setDefault(TRUE);
+    ok->setFixedSize(bs);
+    cancel->setFixedSize(bs);
+
+    hbox->addWidget(ok);
+    hbox->addWidget(cancel);
+
+    connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
+
+    le->setFocus();
+    onTextChanged();
+}
 void MyInputDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -170,7 +246,60 @@ void MyInputDialog::accept()
     }
 }
 
-QString MyInputDialog::getText(const char * title, const QString & msg,
+void MyInputDialog::onTextChanged()
+{
+    QString text;
+    int pos = 0;
+    
+    if(le)
+    {
+        text = le->text();
+        pos = le->cursorPosition();
+    }
+    else if(cb)
+    {
+        if(cb->isEditable())
+        {
+            if(cb->hasFocus())
+            {
+                //loose and regain focus so that cb compare current text with items' text to set current index
+                this->setFocus();
+                cb->setFocus();
+            }
+            pos = cb->lineEdit()->cursorPosition();
+        }
+
+        text = cb->currentText();
+
+        if (!text.isEmpty()) {
+            int index = cb->currentIndex();
+            if (index != -1 && cb->itemText(index) == cb->currentText()) {
+                ok->setEnabled(true);
+                lb->setText(tr("Ok"));
+                return;
+            }
+        }
+    }
+    if(QValidator::Invalid == vl->validate(text, pos))
+        ok->setEnabled(false);
+    else
+        ok->setEnabled(true);
+
+    vl->fixup(text);
+    lb->setText(text);
+}
+QString MyInputDialog::getTextWithOnlineValidator(QString title, const QString & msg,
+                                                  const QString & init, BooL & ok,
+                                                  QValidator * v)
+{
+    MyInputDialog d(title, msg, init, v);
+    ok = d.exec() == QDialog::Accepted;
+
+    return (ok)
+            ? d.le->text()
+            : QString();
+}
+QString MyInputDialog::getText(QString title, const QString & msg,
                                const QString & init, BooL & ok,
                                const QValidator * v)
 {
@@ -182,19 +311,19 @@ QString MyInputDialog::getText(const char * title, const QString & msg,
     ok = d.exec() == QDialog::Accepted;
 
     return (ok)
-           ? d.le->text()
-           : QString();
+            ? d.le->text()
+            : QString();
 }
 
-QString MyInputDialog::getText(const char * title, const QString & msg,
+QString MyInputDialog::getText(QString title, const QString & msg,
                                const QStringList & list, const QString & init,
-                               bool existing, BooL & ok)
+                               bool existing, BooL & ok, const QValidator * v)
 {
-    MyInputDialog d(title, msg, list, init, existing);
+    MyInputDialog d(title, msg, list, init, existing, v);
 
     ok = d.exec() == QDialog::Accepted;
 
     return (ok)
-           ? d.cb->currentText()
-           : QString();
+            ? d.cb->currentText()
+            : QString();
 }
diff --git a/src/dialog/MyInputDialog.h b/src/dialog/MyInputDialog.h
index d7ae5ac68..3ec0162ee 100644
--- a/src/dialog/MyInputDialog.h
+++ b/src/dialog/MyInputDialog.h
@@ -34,38 +34,50 @@
 // there is no way to place it near the mouse : it is always placed
 // on the screen center
 
-class Q3ComboBox;
+class QComboBox;
 class QValidator;
 
 class LineEdit;
-
+class QLabel;
+class QValidator;
 class MyInputDialog : public QDialog
 {
     Q_OBJECT
 
 protected:
     LineEdit * le;
-    Q3ComboBox * cb;
+    QComboBox * cb;
+    QLabel * lb;
+    const QValidator *vl;
 
     static QSize previous_size;
 
-    MyInputDialog(const char * title, const QString & msg,
+    MyInputDialog(QString title, const QString & msg,
                   const QString & init);
-    MyInputDialog(const char * title, const QString & msg,
-                  const QStringList & l, const QString & init, bool existing);
+    MyInputDialog(QString title, const QString & msg,
+                  const QStringList & l, const QString & init, bool existing, const QValidator * v = 0);
+    MyInputDialog(QString title, const QString & msg,
+                                 const QString & init, QValidator *validator);
     virtual ~MyInputDialog();
 
 public:
-    static QString getText(const char * title, const QString & msg,
+    static QString getTextWithOnlineValidator(QString title, const QString & msg,
+                                   const QString & init, BooL & ok,
+                                   QValidator * v);
+    static QString getText(QString title, const QString & msg,
                            const QString & init, BooL & ok,
                            const QValidator * v = 0);
-    static QString getText(const char * title, const QString & msg,
+    static QString getText(QString title, const QString & msg,
                            const QStringList & l, const QString & init,
-                           bool existing, BooL & ok);
+                           bool existing, BooL & ok,
+                           const QValidator * v = NULL);
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
+    void onTextChanged();
+private:
+    QPushButton * ok;
 };
 
 #endif
diff --git a/src/dialog/MyTable.cpp b/src/dialog/MyTable.cpp
index b5f823284..36d2976ee 100644
--- a/src/dialog/MyTable.cpp
+++ b/src/dialog/MyTable.cpp
@@ -31,7 +31,7 @@
 
 #include "MyTable.h"
 #include "strutil.h"
-
+#include <QHeaderView>
 // TableItem is defined to redefine alignment() because the default
 // definition calls QString::to[U]Long which does not properly
 // manage the empty but not null QString (ie QString(""))
@@ -45,34 +45,106 @@ int TableItem::alignment() const
 
 void MyTable::setText(int row, int col, const QString & text)
 {
-    Q3TableItem * itm = item(row, col);
+    QTableWidgetItem * itm = item(row, col);
 
     if (itm != 0) {
         itm->setText(text);
-        updateCell(row, col);
+        //update(this->model()->index(row,col));
+    }
+    else
+    {
+        setItem(row, col, new TableItem(TableItem::OnTyping, text, TableItem::TableItemType));
     }
+}
+
+QString MyTable::text(int row, int colum) const
+{
+    if(item(row, colum))
+        return item(row, colum)->text();
     else
-        setItem(row, col, new TableItem(this, Q3TableItem::OnTyping, text));
+        return QString();
 }
 
 // force end of edition
 
 void MyTable::forceUpdateCells()
 {
-    for (int row = 0; row != numRows(); row += 1) {
-        for (int col = 0; col != numCols(); col += 1) {
-            QWidget * w = cellWidget(row, col);
-
-            if (w != 0) {
-                QString s = item(row, col)->text();
+}
 
-                item(row, col)->setContentFromEditor(w);
+void MyTable::setVerticalHeaderLabel(int section, const QIcon &icon, const QString &s)
+{
+    QTableWidgetItem *item = verticalHeaderItem(section);
+    if(item)
+    {
+        item->setIcon(icon);
+    }
+    else
+    {
+        item = new QTableWidgetItem(icon,s,0);
+        setVerticalHeaderItem(section, item);
+    }
+}
 
-                if (item(row, col)->text() != s)
-                    emit valueChanged(row, col);
+void MyTable::setHorizontalHeaderLabel(int section, const QIcon &icon, const QString &s)
+{
+    QTableWidgetItem *item = horizontalHeaderItem(section);
+    if(item)
+    {
+        item->setIcon(icon);
+    }
+    else
+    {
+        item = new QTableWidgetItem(icon,s,0);
+        setHorizontalHeaderItem(section, item);
+    }
+}
+void MyTable::setVerticalHeaderLabel(int section, const QString &s)
+{
+    QTableWidgetItem *item = verticalHeaderItem(section);
+    if(item)
+    {
+        item->setText(s);
+    }
+    else
+    {
+        item = new QTableWidgetItem(s,0);
+        setVerticalHeaderItem(section, item);
+    }
+}
 
-                // warning : may have other edited cells
-            }
-        }
+void MyTable::setHorizontalHeaderLabel(int section,  const QString &s)
+{
+    QTableWidgetItem *item = horizontalHeaderItem(section);
+    if(item)
+    {
+        item->setText(s);
     }
+    else
+    {
+        item = new QTableWidgetItem(s,0);
+        setHorizontalHeaderItem(section, item);
+    }
+}
+
+void MyTable::setColumnStretchable(int column, bool state)
+{
+    if(state)
+        horizontalHeader()->setSectionResizeMode(column, QHeaderView::Stretch);
+    else
+        horizontalHeader()->setSectionResizeMode(column, QHeaderView::Interactive);
+}
+
+void MyTable::setRowStretchable(int column, bool state)
+{
+    if(state)
+        verticalHeader()->setSectionResizeMode(column, QHeaderView::Stretch);
+    else
+        verticalHeader()->setSectionResizeMode(column, QHeaderView::Fixed);
+}
+
+void MyTable::adjustColumn(int col)
+{
+    Q_UNUSED(col);
+    
+    horizontalHeader()->resizeSections(QHeaderView::ResizeToContents);
 }
diff --git a/src/dialog/MyTable.h b/src/dialog/MyTable.h
index 506c4ffac..7f4da1945 100644
--- a/src/dialog/MyTable.h
+++ b/src/dialog/MyTable.h
@@ -28,40 +28,114 @@
 #ifndef TABLEITEM_H
 #define TABLEITEM_H
 
-
-
-
-
-#include <q3table.h>
+#include "DialogUtil.h"
+#include <QTableWidget>
 //Added by qt3to4:
 #include <QPixmap>
+#include "tablewidgetitemdelegate.h"
 
-class TableItem : public Q3TableItem
+class TableItem : public QTableWidgetItem
 {
 public:
-    TableItem(Q3Table * table, EditType et, const QString & text)
-        : Q3TableItem(table, et, text) {};
-    TableItem(Q3Table * table, EditType et, const QString & text, const QPixmap & p)
-        : Q3TableItem(table, et, text, p) {};
+    enum {
+        TableItemType = UserType,
+        ComboType,
+        MLinesType,
+        MsgTableItemType
+    };
+    enum EditType {
+        Always,
+        WhenCurrent,
+        OnTyping,
+        Never
+    };
+
+    TableItem(EditType et, const QString & text, int type)
+        : QTableWidgetItem(text, type)
+    {
+        switch(et)
+        {
+        case Always:
+            setFlags(flags()| Qt::ItemIsEditable);
+            break;
+        case WhenCurrent:
+            setFlags(flags()| Qt::ItemIsEditable);
+            break;
+        case OnTyping:
+            setFlags(flags()| Qt::ItemIsEditable);
+            break;
+        case Never:
+            setFlags(flags()& ~Qt::ItemIsEditable);
+            break;
+        }
+    }
+
+    TableItem(EditType et, const QString & text, const QPixmap & p, int type)
+        : QTableWidgetItem(QIcon(p), text, type)
+    {
+        switch(et)
+        {
+        case Always:
+            setFlags(flags()| Qt::ItemIsEditable);
+            break;
+        case WhenCurrent:
+            setFlags(flags()| Qt::ItemIsEditable);
+            break;
+        case OnTyping:
+            setFlags(flags()| Qt::ItemIsEditable);
+            break;
+        case Never:
+            setFlags(flags()& ~Qt::ItemIsEditable);
+            break;
+        }
+    }
 
     virtual int alignment() const;
+
 };
 
-class MyTable : public Q3Table
+#define DISABLESORTINGMYTABLE bool sortingEnabled = false;\
+if(isSortingEnabled())\
+{\
+    sortingEnabled =true;\
+    setSortingEnabled(false);\
+}
+
+#define ENABLESORTINGMYTABLE if(sortingEnabled)\
+{\
+    setSortingEnabled(true);\
+}
+
+class MyTable : public QTableWidget
 {
     Q_OBJECT
 
 public:
-    MyTable(QWidget * parent = 0, const char * name = 0)
-        : Q3Table(parent, name) {
-        setSorting(-1);
-    };
-    MyTable(int numRows, int numCols, QWidget * parent = 0, const char * name = 0)
-        : Q3Table(numRows, numCols, parent, name) {};
+    MyTable(QWidget * parent = 0)
+        : QTableWidget(parent)
+    {
+    }
+    MyTable(int numRows, int numCols, QWidget * parent = 0)
+        : QTableWidget(numRows, numCols, parent)
+    {
+    }
+
+    ~MyTable()
+    {
+    }
 
     virtual void setText(int row, int col, const QString & text);
+    QString text(int row, int colum) const;
 
     void forceUpdateCells();
+
+    void setVerticalHeaderLabel(int section, const QIcon & icon, const QString & s);
+    void setHorizontalHeaderLabel(int section, const QIcon & icon, const QString & s);
+    void setVerticalHeaderLabel(int section,  const QString & s);
+    void setHorizontalHeaderLabel(int section,  const QString & s);
+    void setColumnStretchable(int column, bool state);
+    void setRowStretchable(int column, bool state);
+    void adjustColumn(int col);
 };
 
 #endif
diff --git a/src/dialog/ObjectLinkDialog.cpp b/src/dialog/ObjectLinkDialog.cpp
index 1b3f07d62..45e9cd8ae 100644
--- a/src/dialog/ObjectLinkDialog.cpp
+++ b/src/dialog/ObjectLinkDialog.cpp
@@ -32,12 +32,8 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include "ObjectLinkDialog.h"
 #include "MyTable.h"
 #include "BrowserClass.h"
@@ -51,20 +47,21 @@
 QSize ObjectLinkDialog::previous_size;
 
 ObjectLinkDialog::ObjectLinkDialog(BrowserClassInstance * a, BrowserClassInstance * b,
-                                   Q3PtrList<RelationData> & l, RelationData * current,
+                                   QList<RelationData *> & l, RelationData * current,
                                    int nfirstdir)
-    : QDialog(0, "object link dialog", TRUE),
+    : QDialog(0/*, "object link dialog", TRUE*/),
       rels(l), nforward(nfirstdir), clia(a), clib(b), choozen(0), reverse(FALSE)
 {
-    setCaption(TR("Object link dialog"));
+    setWindowTitle(tr("Object link dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
-    hbox->addWidget(new QLabel(TR("\n"
+    hbox->addWidget(new QLabel(tr("\n"
                                   "To set the association, select a cell or the first column with a single click, then press 'OK'\n"
                                   "To unset the association press 'Unset' then press 'OK'\n"),
                                this));
@@ -73,15 +70,16 @@ ObjectLinkDialog::ObjectLinkDialog(BrowserClassInstance * a, BrowserClassInstanc
 
     vbox->addWidget(table);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
     QPushButton * newrel =
         (((ClassInstanceData *) clia->get_data())->get_class()->is_writable() ||
          ((ClassInstanceData *) clib->get_data())->get_class()->is_writable())
-        ? new QPushButton(TR("&New"), this) : 0;
-    QPushButton * unset = new QPushButton(TR("&Unset"), this);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+        ? new QPushButton(tr("&New"), this) : 0;
+    QPushButton * unset = new QPushButton(tr("&Unset"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     if (newrel != 0) {
@@ -110,55 +108,57 @@ ObjectLinkDialog::~ObjectLinkDialog()
 
 void ObjectLinkDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
 static void add_rel(MyTable * table, RelationData * d, int row,
                     QString a, QString b)
 {
-    table->setItem(row, 0, new TableItem(table, Q3TableItem::Never, a));
+    table->setItem(row, 0, new TableItem(TableItem::Never, a, TableItem::TableItemType));
 
     const char * s;
 
     s = d->get_role_b();
-    table->setItem(row, 1, new TableItem(table, Q3TableItem::Never, (s == 0) ? "" : s));
+    table->setItem(row, 1, new TableItem(TableItem::Never, (s == 0) ? "" : s, TableItem::TableItemType));
 
-    table->setItem(row, 2, new TableItem(table, Q3TableItem::Never, stringify(d->get_type())));
+    table->setItem(row, 2, new TableItem(TableItem::Never, stringify(d->get_type()), TableItem::TableItemType));
 
     s = d->get_role_a();
-    table->setItem(row, 3, new TableItem(table, Q3TableItem::Never, (s == 0) ? "" : s));
+    table->setItem(row, 3, new TableItem(TableItem::Never, (s == 0) ? "" : s, TableItem::TableItemType));
 
-    table->setItem(row, 4, new TableItem(table, Q3TableItem::Never, b));
+    table->setItem(row, 4, new TableItem(TableItem::Never, b, TableItem::TableItemType));
 }
 
 void ObjectLinkDialog::init(RelationData * current)
 {
     table = new MyTable(this);
+    table->setSelectionMode(QAbstractItemView::MultiSelection);
+    table->setSelectionBehavior(QAbstractItemView::SelectRows);
 
-    table->setNumRows(rels.count());
-    table->setNumCols(5);
-    table->setSelectionMode(Q3Table::Single);
-    table->setSorting(true);
+    table->setRowCount(rels.count());
+    table->setColumnCount(5);
+    table->setSelectionMode(QTableWidget::SingleSelection);
+    //table->setSortingEnabled(true);
 
-    table->horizontalHeader()->setLabel(0, TR("Class Inst."));
-    table->horizontalHeader()->setLabel(1, TR("Role"));
-    table->horizontalHeader()->setLabel(2, TR("kind"));
-    table->horizontalHeader()->setLabel(3, TR("Role"));
-    table->horizontalHeader()->setLabel(4, TR("Class Inst."));
+    table->setHorizontalHeaderLabel(0, tr("Class Inst."));
+    table->setHorizontalHeaderLabel(1, tr("Role"));
+    table->setHorizontalHeaderLabel(2, tr("kind"));
+    table->setHorizontalHeaderLabel(3, tr("Role"));
+    table->setHorizontalHeaderLabel(4, tr("Class Inst."));
 
     ra = clia->get_name() + QString(":") +
          ((ClassInstanceData *) clia->get_data())->get_class()->get_name();
     rb = clib->get_name() + QString(":") +
          ((ClassInstanceData *) clib->get_data())->get_class()->get_name();
-    Q3PtrListIterator<RelationData> iter(rels);
-    int row;
+    QListIterator<RelationData *> iter(rels);
+    int row = 0;
 
-    for (row = 0; (row != nforward) && iter.current(); ++iter, row += 1)
-        add_rel(table, iter.current(), row, ra, rb);
+    for (; (row != nforward) && iter.hasNext(); ++row)
+        add_rel(table, iter.next(), row, ra, rb);
 
-    for (; iter.current(); ++iter, row += 1)
-        add_rel(table, iter.current(), row, rb, ra);
+    for (; iter.hasNext(); ++row)
+        add_rel(table, iter.next(), row, rb, ra);
 
     ninputrels = row;
 
@@ -169,21 +169,18 @@ void ObjectLinkDialog::init(RelationData * current)
     table->adjustColumn(4);
 
     if (current != 0) {
-        // select the current relation
-        Q3TableSelection sel;
-        int row = rels.findRef(current);
-
-        sel.init(row, 0);
-        sel.expandTo(row, 4);
-        table->addSelection(sel);
+        int row = rels.indexOf(current);
+        table->selectRow(row);
     }
 }
 
 void ObjectLinkDialog::unselect()
 {
     // multi selection possible even table->setSelectionMode(QTable::Single)
-    while (table->numSelections() != 0)
-        table->removeSelection(0);
+    QList<QTableWidgetSelectionRange> selectedRanges= table->selectedRanges();
+    foreach (QTableWidgetSelectionRange range, selectedRanges) {
+        table->setRangeSelected(range, false);
+    }
 }
 
 void ObjectLinkDialog::create()
@@ -199,31 +196,27 @@ void ObjectLinkDialog::create()
     d->get_start()->select_in_browser();
     d->edit();
 
-    int n = table->numRows();
+    int n = table->rowCount();
 
-    table->setNumRows(n + 1);
+    table->setRowCount(n + 1);
     add_rel(table, d, n, ra, rb);
     rels.append(d);
 
     // multi selection possible even table->setSelectionMode(QTable::Single)
-    while (table->numSelections() != 0)
-        table->removeSelection(0);
-
-    Q3TableSelection sel;
-
-    sel.init(n, 0);
-    sel.expandTo(n, 4);
-    table->addSelection(sel);
+    QList<QTableWidgetSelectionRange> selectedRanges= table->selectedRanges();
+    foreach (QTableWidgetSelectionRange range, selectedRanges) {
+        table->setRangeSelected(range, false);
+    }
+    table->selectRow(n);
 }
 
 void ObjectLinkDialog::accept()
 {
-    if (table->numSelections() != 0) {
-        Q3TableSelection sel = table->selection(0);
-
-        choozen = rels.at(sel.topRow());
-        reverse = (sel.topRow() >= nforward) && (sel.topRow() < ninputrels);
+    QList<QTableWidgetSelectionRange> selectedRanges= table->selectedRanges();
+    if(selectedRanges.count())
+    {
+        choozen = rels.at(selectedRanges.at(0).topRow());
+        reverse = (selectedRanges.at(0).topRow() >= nforward) && (selectedRanges.at(0).topRow() < ninputrels);
     }
-
     QDialog::accept();
 }
diff --git a/src/dialog/ObjectLinkDialog.h b/src/dialog/ObjectLinkDialog.h
index a84ed5853..1a96d7fcc 100644
--- a/src/dialog/ObjectLinkDialog.h
+++ b/src/dialog/ObjectLinkDialog.h
@@ -27,10 +27,7 @@
 
 #ifndef OBJECTLINKDIALOG_H
 #define OBJECTLINKDIALOG_H
-
-#include <q3ptrlist.h>
 #include <qdialog.h>
-#include <q3ptrlist.h>
 
 class MyTable;
 class RelationData;
@@ -42,7 +39,7 @@ class ObjectLinkDialog : public QDialog
 
 public:
     ObjectLinkDialog(BrowserClassInstance * a, BrowserClassInstance * b,
-                     Q3PtrList<RelationData> & l, RelationData * current,
+                     QList<RelationData *> & l, RelationData * current,
                      int nfirstdir);
     virtual ~ObjectLinkDialog();
 
@@ -56,7 +53,7 @@ class ObjectLinkDialog : public QDialog
 protected:
     void init(RelationData * current);
 
-    Q3PtrList<RelationData> & rels;
+    QList<RelationData *> & rels;
     int nforward;
     int ninputrels;
     BrowserClassInstance * clia;
@@ -71,7 +68,7 @@ class ObjectLinkDialog : public QDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     virtual void unselect();
     virtual void create();
 };
diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp
index 5038ae182..17908cb7b 100644
--- a/src/dialog/OperationDialog.cpp
+++ b/src/dialog/OperationDialog.cpp
@@ -32,22 +32,21 @@
 #include <stdio.h>
 
 #include <qcursor.h>
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3buttongroup.h>
+#include <qcombobox.h>
+#include <bbuttongroup.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtimer.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
 #include <QDesktopWidget>
 #include <QHBoxLayout>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 #include <QRegExp>
 #include <functional>
@@ -84,48 +83,54 @@
 #include "ui_operationwidgetcpp.h"
 #include "Tools/SignalBlockerWrapper.h"
 #include "CustomWidgets/EdgeMenuToolBar.h"
+#include "browserfunctions/operationfuncs.h"
+#include "menufactory.h"
+#include "vvbox.h"
 QSize OperationDialog::previous_size;
-QSharedPointer<OperationDialog> OperationDialog::instance;
-OperationDialog::OperationDialog(OperationData * o, DrawingLanguage )
+OperationDialog::OperationDialog(OperationData * o, DrawingLanguage l)
     : EdgeMenuDialog(0, 0, FALSE), oper(o),
-      cl((ClassData *)((BrowserClass *) o->browser_node->parent())->get_data())
+      cl((ClassData *)((BrowserClass *) o->browser_node->parent())->get_data()),
+      drawingLanguage(l)
 {
     //o->browser_node->edit_start();
 
     SetDialogMode(o->browser_node->is_writable());
     //isWritable = hasOkButton();
-    setCaption(TR("Operation dialog"));
+    setWindowTitle(tr("Operation dialog"));
     SetCurrentNode(o->browser_node);
     //setWindowFlags(!Qt::WindowTitleHint);
     InitGui();
     FillGuiElements(oper);
 
-    connect(this, SIGNAL(currentChanged(QWidget *)),
-            this, SLOT(update_all_tabs(QWidget *)));
+
+
+    connect(m_tabWidget, SIGNAL(currentChanged(int)),
+            this, SLOT(update_all_tabs(int)));
     open_dialog(this);
 }
 
 OperationDialog::~OperationDialog()
 {
-//    if(oper->browser_node)
-//        oper->browser_node->edit_end();
+    //    if(oper->browser_node)
+    //        oper->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
-
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
+#ifdef EDGETOOLENABLED
     if(toolbar)
     {
         toolbar->setParent(0);
         toolbar->hide();
     }
-
+#endif
     //close_dialog(this);
 }
 
 void OperationDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -147,9 +152,9 @@ void OperationDialog::init_get_set()
     if (oper->is_get_or_set)
     {
         BrowserOperation * br_op = (BrowserOperation *) oper->browser_node;
-        Q3ListViewItem * child;
+        BrowserNode * child;
 
-        for (child = br_op->parent()->firstChild();
+        for (child = ((BrowserNode *)br_op->parent())->firstChild();
              child != 0;
              child = child->nextSibling()) {
             BrowserNode * br = (BrowserNode *) child;
@@ -188,79 +193,89 @@ void OperationDialog::init_get_set()
 // general tab
 void OperationDialog::init_uml()
 {
-    umlGrid = new Q3Grid(2, this);
+    umlGrid = new GridBox(2, this);
     umltab = umlGrid;
     RegisterTab("Uml", umltab);
     umlGrid->setSpacing(5);
     umlGrid->setMargin(5);
 
-    new QLabel(TR("class : "), umlGrid);
+    umlGrid->addWidget(new QLabel(tr("class : "), umlGrid));
     lblFullClassName = new QLabel(((BrowserNode *) oper->get_browser_node()->parent())->full_name(TRUE),
-                                  umlGrid); //todo
-
-    new QLabel(TR("name : "), umlGrid);
+                                  umlGrid);
+    umlGrid->addWidget(lblFullClassName);
+    umlGrid->addWidget(new QLabel(tr("name : "), umlGrid));
     edname = new LineEdit(oper->name(), umlGrid);
+    umlGrid->addWidget(edname);
 
+    umlGrid->addWidget(new QLabel(tr("stereotype : "), umlGrid));
+    edstereotype = new QComboBox(umlGrid);
+    umlGrid->addWidget(edstereotype);
+    edstereotype->setEditable(isWritable);
 
-    new QLabel(TR("stereotype : "), umlGrid);
-    edstereotype = new Q3ComboBox(isWritable, umlGrid);
-
-    pbValueType = new SmallPushButton(TR("value type :"), umlGrid);
+    umlGrid->addWidget(pbValueType = new SmallPushButton(tr("value type :"), umlGrid));
     connect(pbValueType, SIGNAL(clicked()), this, SLOT(menu_returntype()));
 
 
-    edreturn_type = new Q3ComboBox(isWritable, umlGrid);
+    edreturn_type = new QComboBox(umlGrid);
+    umlGrid->addWidget(edreturn_type);
+    edreturn_type->setEditable(isWritable);
+    umlGrid->addWidget(new QLabel("",umlGrid));
 
-    new QLabel(umlGrid);
-
-    htabBgUml = new Q3HBox(umlGrid);
+    htabBgUml = new HHBox(umlGrid);
+    umlGrid->addWidget(htabBgUml);
     bgUml1 = uml_visibility.init(htabBgUml, oper->get_uml_visibility(), TRUE);
+    htabBgUml->addWidget(bgUml1);
 
     htabBgUml->setStretchFactor(bgUml1, 1000);
+    QLabel *label;
+    htabBgUml->addWidget(label = new QLabel("  ", htabBgUml));
+    htabBgUml->setStretchFactor(label, 0);
 
-    htabBgUml->setStretchFactor(new QLabel("  ", htabBgUml), 0);
-
-    bgUml2 = new Q3ButtonGroup(2, Qt::Horizontal, QString(), htabBgUml);
+    htabBgUml->addWidget(bgUml2 = new BButtonGroup(2, Qt::Horizontal, QString(), htabBgUml));
 
     htabBgUml->setStretchFactor(bgUml2, 1000);
-    classoperation_cb = new QCheckBox(TR("static"), bgUml2);
-    abstract_cb = new QCheckBox(TR("abstract"), bgUml2);
+    classoperation_cb = new QCheckBox(tr("static"), bgUml2);
+    bgUml2->addWidget(classoperation_cb);
+    abstract_cb = new QCheckBox(tr("abstract"), bgUml2);
+    bgUml2->addWidget(abstract_cb);
 
     connect(classoperation_cb, SIGNAL(toggled(bool)), SLOT(classoper_toggled(bool)));
     connect(abstract_cb, SIGNAL(toggled(bool)), SLOT(abstract_toggled(bool)));
+    htabBgUml->addWidget(label = new QLabel("  ", htabBgUml));
+    htabBgUml->setStretchFactor(label, 0);
 
-    htabBgUml->setStretchFactor(new QLabel("  ", htabBgUml), 0);
-
-    bgUml3 = new Q3ButtonGroup(1, Qt::Horizontal, QString(), htabBgUml);
+    bgUml3 = new BButtonGroup(1, Qt::Horizontal, QString(), htabBgUml);
+    htabBgUml->addWidget(bgUml3);
     htabBgUml->setStretchFactor(bgUml3, 1000);
-    forcegenbody_cb = new QCheckBox(TR("force body generation"), bgUml3);
+    forcegenbody_cb = new QCheckBox(tr("force body generation"), bgUml3);
+    bgUml3->addWidget(forcegenbody_cb);
 
 
     connect(forcegenbody_cb, SIGNAL(toggled(bool)), SLOT(forcegenbody_toggled(bool)));
 
-    new QLabel(TR("parameters : "), umlGrid);
-    table = new ParamsTable(oper, umlGrid, list, this, !isWritable); //todo update the table
+    umlGrid->addWidget(new QLabel(tr("parameters : "), umlGrid));
+    umlGrid->addWidget(table = new ParamsTable(oper, umlGrid, list, this, !isWritable));
 
-    new QLabel(TR("exceptions : "), umlGrid);
-    etable = new ExceptionsTable(oper, umlGrid, list, !isWritable); //todo update the table
+    umlGrid->addWidget(new QLabel(tr("exceptions : "), umlGrid));
+    umlGrid->addWidget(etable = new ExceptionsTable(oper, umlGrid, list, !isWritable)); //todo update the table
 
-    Q3VBox * vtab = new Q3VBox(umlGrid);
-
-    new QLabel(TR("description :"), vtab);
-    pbEditor = new SmallPushButton(TR("Editor"), vtab);
-    pbDefault = new SmallPushButton(TR("Default"), vtab);
+    VVBox * vtab = new VVBox(umlGrid);
+    umlGrid->addWidget(vtab);
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
+    vtab->addWidget(pbEditor = new SmallPushButton(tr("Editor"), vtab));
+    vtab->addWidget(pbDefault = new SmallPushButton(tr("Default"), vtab));
 
     connect(pbEditor, SIGNAL(clicked()), this, SLOT(edit_description()));
     connect(pbDefault, SIGNAL(clicked()), this, SLOT(default_description()));
 
-    comment = new MultiLineEdit(umlGrid);
+    umlGrid->addWidget(comment = new MultiLineEdit(umlGrid));
 
-    vtab = new Q3VBox(umlGrid);
-    new QLabel(TR("constraint :"), vtab);
-    pbConstraintEditor = new SmallPushButton(TR("Editor"), vtab);
+    umlGrid->addWidget(vtab = new VVBox(umlGrid));
+    vtab->addWidget(new QLabel(tr("constraint :"), vtab));
+    vtab->addWidget(pbConstraintEditor = new SmallPushButton(tr("Editor"), vtab));
     connect(pbConstraintEditor, SIGNAL(clicked()), this, SLOT(edit_constraint()));
 
-    constraint = new MultiLineEdit(umlGrid);
+    umlGrid->addWidget(constraint = new MultiLineEdit(umlGrid));
 
     addTab(umlGrid, "Uml");
 }
@@ -275,21 +290,21 @@ void OperationDialog::FillUmlTab(OperationData * oper)
     edname->setText(operationName);
     edname->setReadOnly(!isWritable);
     edstereotype->clear();
-    edstereotype->insertItem(toUnicode(oper->stereotype));
+    edstereotype->addItem(toUnicode(oper->stereotype));
 
     if (oper->is_get_or_set) {
         edstereotype->setEnabled(FALSE);
     }
     else if (isWritable) {
         edstereotype->setEnabled(true);
-        edstereotype->insertStringList(BrowserOperation::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlOperation));
+        edstereotype->addItems(BrowserOperation::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlOperation));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
     if (oper->is_get_or_set)
@@ -299,7 +314,7 @@ void OperationDialog::FillUmlTab(OperationData * oper)
 
 
     edreturn_type->clear();
-    edreturn_type->insertItem(oper->get_return_type().get_full_type());
+    edreturn_type->addItem(oper->get_return_type().get_full_type());
 
     if (oper->is_get_or_set)
         edreturn_type->setEnabled(FALSE);
@@ -308,14 +323,14 @@ void OperationDialog::FillUmlTab(OperationData * oper)
         QStringList l = GenerationSettings::basic_types();
 
         cl->addFormals(l);
-        edreturn_type->insertStringList(l);
+        edreturn_type->addItems(l);
         edreturn_type_offset = edreturn_type->count();
-        edreturn_type->insertStringList(list);
+        edreturn_type->addItems(list);
         edreturn_type->setAutoCompletion(completion());
         view = oper->browser_node->container(UmlClass);
     }
 
-    edreturn_type->setCurrentItem(0);
+    edreturn_type->setCurrentIndex(0);
 
     edreturn_type->setSizePolicy(sp);
 
@@ -352,14 +367,17 @@ void OperationDialog::FillUmlTab(OperationData * oper)
         forcegenbody_cb->setChecked(false);
 
     init_get_set();
-    table->update(oper, list, this, !isWritable); //todo update the table
+    table->update(oper, list, this, !isWritable);
     if (oper->is_get_or_set)
         table->setEnabled(FALSE);
     else
         table->setEnabled(true);
 
-    //etable->update(oper,oper->browser_node->children(inh, UmlGeneralisation, UmlRealize));
-            //= new ExceptionsTable(oper, umlGrid, list, !isWritable); //todo update the table
+    etable->Reinitialize(oper,list, isWritable);
+
+    //    BrowserNodeList inh;
+    //    cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize);
+    //    etable->update(oper,inh);
     pbEditor->setEnabled(isWritable);
     pbDefault->setEnabled(isWritable);
     comment->setText(oper->get_browser_node()->get_comment());
@@ -388,17 +406,21 @@ void OperationDialog::init_cpp()
 
     RegisterTab("C++", cppTab);
 
-    tabBgCppModifiers = new Q3HBox();
-    tabBgCppModifiers->setStretchFactor(new QLabel("      ", tabBgCppModifiers), 0);
-
-
-    visibilityBg = cpp_visibility.init(tabBgCppModifiers, oper->get_cpp_visibility(), FALSE, 0, TR("follow uml")); // update this
-    bgCppModifiers = new Q3ButtonGroup(5, Qt::Horizontal, QString(), tabBgCppModifiers);
-    cbCppConst = new QCheckBox("const", bgCppModifiers);
-    cbCppVolatile = new QCheckBox("volatile", bgCppModifiers);
-    cbCppFriend = new QCheckBox("friend", bgCppModifiers);
-    cbCppVirtual = new QCheckBox("virtual", bgCppModifiers);
-    cbCppInline = new QCheckBox("inline", bgCppModifiers);
+    tabBgCppModifiers = new HHBox();
+    QLabel *label;
+    tabBgCppModifiers->addWidget(label = new QLabel("      ", tabBgCppModifiers));
+    tabBgCppModifiers->setStretchFactor(label, 0);
+
+
+    visibilityBg = cpp_visibility.init(tabBgCppModifiers, oper->get_cpp_visibility(), FALSE, 0, tr("follow uml")); // update this
+    tabBgCppModifiers->addWidget(visibilityBg);
+    bgCppModifiers = new BButtonGroup(5, Qt::Horizontal, QString(), tabBgCppModifiers);
+    tabBgCppModifiers->addWidget(bgCppModifiers);
+    bgCppModifiers->addWidget(cbCppConst = new QCheckBox("const", bgCppModifiers));
+    bgCppModifiers->addWidget(cbCppVolatile = new QCheckBox("volatile", bgCppModifiers));
+    bgCppModifiers->addWidget(cbCppFriend = new QCheckBox("friend", bgCppModifiers));
+    bgCppModifiers->addWidget(cbCppVirtual = new QCheckBox("virtual", bgCppModifiers));
+    bgCppModifiers->addWidget(cbCppInline = new QCheckBox("inline", bgCppModifiers));
     QHBoxLayout * layout = new QHBoxLayout();
     layout->addWidget(tabBgCppModifiers);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -448,7 +470,7 @@ void OperationDialog::FillcppTab(OperationData * oper)
             cppTab->ui->cbCppFrozen->setChecked(TRUE);
     }
 
-    visibilityBg = cpp_visibility.init(tabBgCppModifiers, oper->get_cpp_visibility(), FALSE, 0, TR("follow uml")); // update this
+    visibilityBg = cpp_visibility.init(tabBgCppModifiers, oper->get_cpp_visibility(), FALSE, 0, tr("follow uml")); // update this
     visibilityBg->setEnabled(isWritable);
 
     SilentCall(cbCppConst)->setChecked(oper->get_cpp_const());
@@ -499,6 +521,9 @@ void OperationDialog::FillcppTab(OperationData * oper)
     cppTab->ui->pbNotGeneratedInCpp->setEnabled(isWritable && !oper->is_get_or_set);
     cppTab->ui->pbEditParameters->setEnabled(isWritable);
 
+    //    if(oper->get_is_abstract())
+    //        cpp_default_def();
+    //    else
     cppTab->ui->edCppDefProto->setText(oper->get_cppdef());
     cppTab->ui->edCppDefProto->setFont(comment->font());
     cppTab->ui->edCppDefProto->setReadOnly(!isWritable);
@@ -511,7 +536,7 @@ void OperationDialog::FillcppTab(OperationData * oper)
     cppTab->ui->edCppDefActual->setFont(comment->font());
 
     bool bodyEditable = (!isWritable || (preserve_bodies() && !forcegenbody_cb->isChecked()));
-    QString buttonText = bodyEditable ? TR("Show body") : TR("Edit body");
+    QString buttonText = bodyEditable ? tr("Show body") : tr("Edit body");
     cppTab->ui->editcppbody->setText(buttonText);
 
     char * b = oper->get_body('c');
@@ -521,6 +546,7 @@ void OperationDialog::FillcppTab(OperationData * oper)
         delete [] b;
     }
 
+    //cppTab->ui->edCppDefProto
     cppTab->ui->pbDefaultDefinition->setEnabled(isWritable);
     cppTab->ui->pbFromDeclaration->setEnabled(isWritable);
     cppTab->ui->pb2NotGeneratedInCpp->setEnabled(isWritable && !oper->is_get_or_set);
@@ -544,46 +570,48 @@ void OperationDialog::FillcppTab(OperationData * oper)
 void OperationDialog::init_java()
 {
 
-    Q3Grid * grid;
-    Q3HBox * htab = 0;
-    Q3ButtonGroup * bg;
+    GridBox * grid;
+    HHBox * htab = 0;
+    BButtonGroup * bg;
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     javatab = grid;
     RegisterTab("Java", javatab);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    javafrozen_cb = new QCheckBox(TR("frozen"), grid);
+    grid->addWidget(javafrozen_cb = new QCheckBox(tr("frozen"), grid));
 
-    bg = new Q3ButtonGroup(2, Qt::Horizontal, QString(), grid);
+    grid->addWidget(bg = new BButtonGroup(2, Qt::Horizontal, QString(), grid));
 
-    javafinal_cb = new QCheckBox("final", bg);
+    bg->addWidget(javafinal_cb = new QCheckBox("final", bg));
 
     connect(javafinal_cb, SIGNAL(toggled(bool)), SLOT(java_finalsynchronized_toggled(bool)));
 
-    synchronized_cb = new QCheckBox("synchronized", bg);
+    bg->addWidget(synchronized_cb = new QCheckBox("synchronized", bg));
 
     connect(synchronized_cb, SIGNAL(toggled(bool)), SLOT(java_finalsynchronized_toggled(bool)));
 
-    lblNameFormJava = new QLabel(TR("Name form : "), grid);
-    namespecTab = new Q3HBox(grid);
-    edjavanamespec = new LineEdit(htab);
+    grid->addWidget(lblNameFormJava = new QLabel(tr("Name form : "), grid));
+    grid->addWidget(namespecTab = new HHBox(grid));
+            htab = namespecTab;
+    htab->addWidget(edjavanamespec = new LineEdit(htab));
 
 
-    new QLabel(TR("Definition :"), grid);
-    edjavadef = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Definition :"), grid));
+    grid->addWidget(edjavadef = new MultiLineEdit(grid));
     connect(edjavadef, SIGNAL(textChanged()), this, SLOT(java_update_def()));
 
-    Q3VBox * vtab = new Q3VBox(grid);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
 
-    new QLabel(TR("Result after\nsubstitution : "), vtab);
+    vtab->addWidget(new QLabel(tr("Result after\nsubstitution : "), vtab));
 
-    indentjavabody_cb = new QCheckBox(TR("contextual\nbody indent"), vtab);
+    vtab->addWidget(indentjavabody_cb = new QCheckBox(tr("contextual\nbody indent"), vtab));
 
-    showjavadef = new MultiLineEdit(grid);
+    grid->addWidget(showjavadef = new MultiLineEdit(grid));
 
-    editjavabody = new QPushButton("",  grid);
+    grid->addWidget(editjavabody = new QPushButton("",  grid));
     connect(editjavabody, SIGNAL(clicked()), this, SLOT(java_edit_body()));
 
     char * b = oper->get_body('j');
@@ -593,14 +621,14 @@ void OperationDialog::init_java()
         delete [] b;
     }
 
-    htab = new Q3HBox(grid);
+    grid->addWidget(htab = new HHBox(grid));
 
-    pbDefaultDeclarationJava = new QPushButton(TR("Default declaration"), htab);
-    pbNotGeneratedInJava = new QPushButton(TR("Not generated in Java"), htab);
+    htab->addWidget(pbDefaultDeclarationJava = new QPushButton(tr("Default declaration"), htab));
+    htab->addWidget(pbNotGeneratedInJava = new QPushButton(tr("Not generated in Java"), htab));
     connect(pbDefaultDeclarationJava, SIGNAL(clicked()), this, SLOT(java_default_def()));
     connect(pbNotGeneratedInJava, SIGNAL(clicked()), this, SLOT(java_unmapped_def()));
 
-    editjavaannotation = new QPushButton(" ", htab);
+    htab->addWidget(editjavaannotation = new QPushButton(" ", htab));
     connect(editjavaannotation, SIGNAL(clicked()), this, SLOT(java_edit_annotation()));
 
     addTab(grid, "Java");
@@ -645,7 +673,7 @@ void OperationDialog::FillJavaTab(OperationData * oper)
     showjavadef->setFont(comment->font());
 
     bool bodyEditable = (!isWritable || (preserve_bodies() && !forcegenbody_cb->isChecked()));
-    QString buttonText = bodyEditable ? TR("Show body") : TR("Edit body");
+    QString buttonText = bodyEditable ? tr("Show body") : tr("Edit body");
     editjavabody->setText(buttonText);
 
     char * b = oper->get_body('j');
@@ -660,7 +688,7 @@ void OperationDialog::FillJavaTab(OperationData * oper)
 
     javaannotation = (const char *) oper->java_annotation;
 
-    editjavaannotation->setText((!isWritable) ? TR("Show annotation") : TR("Edit annotation"));
+    editjavaannotation->setText((!isWritable) ? tr("Show annotation") : tr("Edit annotation"));
 
     if (!GenerationSettings::java_get_default_defs())
         HideTab("Java");
@@ -674,42 +702,44 @@ void OperationDialog::FillJavaTab(OperationData * oper)
 // Php
 void OperationDialog::init_php()
 {
-    Q3Grid * grid;
-    Q3HBox * htab = 0;
-    Q3ButtonGroup * bgPhp;
+    GridBox * grid;
+    HHBox * htab = 0;
+    BButtonGroup * bgPhp;
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     phptab = grid;
     RegisterTab("Php", phptab);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    phpfrozen_cb = new QCheckBox(TR("frozen"), grid);
+    grid->addWidget(phpfrozen_cb = new QCheckBox(tr("frozen"), grid));
 
-    bgPhp = new Q3ButtonGroup(2, Qt::Horizontal, QString(), grid);
+    grid->addWidget(bgPhp = new BButtonGroup(2, Qt::Horizontal, QString(), grid));
 
-    phpfinal_cb = new QCheckBox("final", bgPhp);
+    bgPhp->addWidget(phpfinal_cb = new QCheckBox("final", bgPhp));
 
     connect(phpfinal_cb, SIGNAL(toggled(bool)), SLOT(php_final_toggled(bool)));
 
-    lblNameFormPhp = new QLabel(TR("Name form : "), grid);
-    namespecTab = new Q3HBox(grid);
-    edphpnamespec = new LineEdit(htab);
+    grid->addWidget(lblNameFormPhp = new QLabel(tr("Name form : "), grid));
+    grid->addWidget(namespecTab = new HHBox(grid));
+            htab = namespecTab;
+    htab->addWidget(edphpnamespec = new LineEdit(htab));
 
 
-    new QLabel(TR("Definition :"), grid);
-    edphpdef = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Definition :"), grid));
+    grid->addWidget(edphpdef = new MultiLineEdit(grid));
     connect(edphpdef, SIGNAL(textChanged()), this, SLOT(php_update_def()));
 
-    Q3VBox * vtab = new Q3VBox(grid);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
 
-    new QLabel(TR("Result after\nsubstitution : "), vtab);
+    vtab->addWidget(new QLabel(tr("Result after\nsubstitution : "), vtab));
 
-    indentphpbody_cb = new QCheckBox(TR("contextual\nbody indent"), vtab);
+    vtab->addWidget(indentphpbody_cb = new QCheckBox(tr("contextual\nbody indent"), vtab));
 
-    showphpdef = new MultiLineEdit(grid);
+    grid->addWidget(showphpdef = new MultiLineEdit(grid));
 
-    editphpbody = new QPushButton("",  grid);
+    grid->addWidget(editphpbody = new QPushButton("",  grid));
     connect(editphpbody, SIGNAL(clicked()), this, SLOT(php_edit_body()));
 
     char * b = oper->get_body('p');
@@ -719,11 +749,11 @@ void OperationDialog::init_php()
         delete [] b;
     }
 
-    htab = new Q3HBox(grid);
+    grid->addWidget(htab = new HHBox(grid));
 
-    pbDefaultDeclarationPhp = new QPushButton(TR("Default declaration"), htab);
-    pbNotGeneratedInPhp = new QPushButton(TR("Not generated in Php"), htab);
-    pbEditParametersPhp = new QPushButton(TR("Edit parameters"), htab);
+    htab->addWidget(pbDefaultDeclarationPhp = new QPushButton(tr("Default declaration"), htab));
+    htab->addWidget(pbNotGeneratedInPhp = new QPushButton(tr("Not generated in Php"), htab));
+    htab->addWidget(pbEditParametersPhp = new QPushButton(tr("Edit parameters"), htab));
     connect(pbDefaultDeclarationPhp, SIGNAL(clicked()), this, SLOT(php_default_def()));
     connect(pbNotGeneratedInPhp, SIGNAL(clicked()), this, SLOT(php_unmapped_def()));
     connect(pbEditParametersPhp, SIGNAL(clicked()), this, SLOT(php_edit_param()));
@@ -773,7 +803,7 @@ void OperationDialog::FillPhpTab(OperationData *)
     showphpdef->setFont(comment->font());
 
     bool bodyEditable = (!isWritable || (preserve_bodies() && !forcegenbody_cb->isChecked()));
-    QString buttonText = bodyEditable ? TR("Show body") : TR("Edit body");
+    QString buttonText = bodyEditable ? tr("Show body") : tr("Edit body");
     editphpbody->setText(buttonText);
 
     char * b = oper->get_body('p');
@@ -788,7 +818,7 @@ void OperationDialog::FillPhpTab(OperationData *)
 
     ///phpannotation = (const char *) oper->php_annotation; todo
 
-    pbEditParametersPhp->setText((!isWritable) ? TR("Show parameters") : TR("Edit parameters"));
+    pbEditParametersPhp->setText((!isWritable) ? tr("Show parameters") : tr("Edit parameters"));
 
     if (!GenerationSettings::php_get_default_defs())
         HideTab("Php");
@@ -803,36 +833,38 @@ void OperationDialog::FillPhpTab(OperationData *)
 // Python_1
 void OperationDialog::init_python()
 {
-    Q3Grid * grid;
-    Q3HBox * htab = 0;
-    grid = new Q3Grid(2, this);
+    GridBox * grid;
+    HHBox * htab = 0;
+    grid = new GridBox(2, this);
     pythontab = grid;
     RegisterTab("Python", pythontab);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    pythonfrozen_cb = new QCheckBox(TR("frozen"), grid);
+    grid->addWidget(pythonfrozen_cb = new QCheckBox(tr("frozen"), grid));
 
-    bgPython = new Q3ButtonGroup(2, Qt::Horizontal, QString(), grid);
+    grid->addWidget(bgPython = new BButtonGroup(2, Qt::Horizontal, QString(), grid));
 
-    lblNameFormPython = new QLabel(TR("Name form : "), grid);
-    pythonNamespecTab = new Q3HBox(grid);
-    edpythonnamespec = new LineEdit(htab);
+    grid->addWidget(lblNameFormPython = new QLabel(tr("Name form : "), grid));
+    grid->addWidget(pythonNamespecTab = new HHBox(grid));
+            htab = pythonNamespecTab;
+    htab->addWidget(edpythonnamespec = new LineEdit(htab));
 
 
-    new QLabel(TR("Definition :"), grid);
-    edpythondef = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Definition :"), grid));
+    grid->addWidget(edpythondef = new MultiLineEdit(grid));
     connect(edpythondef, SIGNAL(textChanged()), this, SLOT(python_update_def()));
 
-    Q3VBox * vtab = new Q3VBox(grid);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
 
-    new QLabel(TR("Result after\nsubstitution : "), vtab);
+    vtab->addWidget(new QLabel(tr("Result after\nsubstitution : "), vtab));
 
-    indentpythonbody_cb = new QCheckBox(TR("contextual\nbody indent"), vtab);
+    vtab->addWidget(indentpythonbody_cb = new QCheckBox(tr("contextual\nbody indent"), vtab));
 
-    showpythondef = new MultiLineEdit(grid);
+    grid->addWidget(showpythondef = new MultiLineEdit(grid));
 
-    editpythonbody = new QPushButton("",  grid);
+    grid->addWidget(editpythonbody = new QPushButton("",  grid));
     connect(editpythonbody, SIGNAL(clicked()), this, SLOT(python_edit_body()));
 
     char * b = oper->get_body('y');
@@ -842,17 +874,17 @@ void OperationDialog::init_python()
         delete [] b;
     }
 
-    htab = new Q3HBox(grid);
+    grid->addWidget(htab = new HHBox(grid));
 
-    pbDefaultDeclarationPython = new QPushButton(TR("Default declaration"), htab);
-    pbNotGeneratedInPython = new QPushButton(TR("Not generated in Python"), htab);
-    pbEditParamsPython = new QPushButton(TR("Edit parameters"), htab);
+    htab->addWidget(pbDefaultDeclarationPython = new QPushButton(tr("Default declaration"), htab));
+    htab->addWidget(pbNotGeneratedInPython = new QPushButton(tr("Not generated in Python"), htab));
+    htab->addWidget(pbEditParamsPython = new QPushButton(tr("Edit parameters"), htab));
     connect(pbDefaultDeclarationPython, SIGNAL(clicked()), this, SLOT(python_default_def()));
     connect(pbNotGeneratedInPython, SIGNAL(clicked()), this, SLOT(python_unmapped_def()));
     connect(pbEditParamsPython, SIGNAL(clicked()), this, SLOT(python_edit_param()));
 
     pythondecorator = (const char *) oper->python_decorator;
-    editpythondecorator = new QPushButton("",  htab);
+    htab->addWidget(editpythondecorator = new QPushButton("",  htab));
     connect(editpythondecorator, SIGNAL(clicked()), this, SLOT(python_edit_decorator()));
 
     addTab(pythontab, "Python");
@@ -905,7 +937,7 @@ void OperationDialog::FillPythonTab(OperationData *)
     showpythondef->setFont(comment->font());
 
     bool bodyEditable = (!isWritable || (preserve_bodies() && !forcegenbody_cb->isChecked()));
-    QString buttonText = bodyEditable ? TR("Show body") : TR("Edit body");
+    QString buttonText = bodyEditable ? tr("Show body") : tr("Edit body");
     editpythonbody->setText(buttonText);
 
     char * b = oper->get_body('y');
@@ -919,7 +951,7 @@ void OperationDialog::FillPythonTab(OperationData *)
     pbNotGeneratedInPython->setEnabled(isWritable);
     pbEditParamsPython->setEnabled(isWritable);
     pythondecorator = (const char *) oper->python_decorator;
-    editpythondecorator->setText((!isWritable) ? TR("Show decorators") : TR("Edit decorators"));
+    editpythondecorator->setText((!isWritable) ? tr("Show decorators") : tr("Edit decorators"));
 
     if (!GenerationSettings::python_get_default_defs())
         HideTab("Python");
@@ -933,45 +965,48 @@ void OperationDialog::FillPythonTab(OperationData *)
 // idl
 void OperationDialog::init_idl()
 {
-    Q3Grid * grid;
-    Q3HBox * htab = 0;
+    GridBox * grid;
+    HHBox * htab = 0;
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     idltab = grid;
     RegisterTab("Idl", idltab);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    idlfrozen_cb = new QCheckBox(TR("frozen"), grid);
+    grid->addWidget(idlfrozen_cb = new QCheckBox(tr("frozen"), grid));
 
-    bgIdl = new Q3ButtonGroup(2, Qt::Horizontal, QString(), grid);
+    grid->addWidget(bgIdl = new BButtonGroup(2, Qt::Horizontal, QString(), grid));
 
-    oneway_cb = new QCheckBox("final", bgIdl);
+    bgIdl->addWidget(oneway_cb = new QCheckBox("final", bgIdl));
 
     connect(oneway_cb, SIGNAL(toggled(bool)), SLOT(oneway_toggled(bool)));
 
-    lblNameFormIdl = new QLabel(TR("Name form : "), grid);
-    namespecTabIdl = new Q3HBox(grid);
-    edidlnamespec = new LineEdit(htab);
+    grid->addWidget(lblNameFormIdl = new QLabel(tr("Name form : "), grid));
+    grid->addWidget(namespecTabIdl = new HHBox(grid));
+           htab = namespecTabIdl;
+    htab->addWidget(edidlnamespec = new LineEdit(htab));
 
 
-    new QLabel(TR("Definition :"), grid);
-    edidldecl = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("Definition :"), grid));
+    grid->addWidget(edidldecl = new MultiLineEdit(grid));
     connect(edidldecl, SIGNAL(textChanged()), this, SLOT(idl_update_decl()));
 
-    Q3VBox * vtab = new Q3VBox(grid);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
 
-    new QLabel(TR("Result after\nsubstitution : "), vtab);
+    vtab->addWidget(new QLabel(tr("Result after\nsubstitution : "), vtab));
 
-    showidldecl = new MultiLineEdit(grid);
+    grid->addWidget(showidldecl = new MultiLineEdit(grid));
 
-//    editidlbody = new QPushButton("",  grid);
-//    connect(editidlbody, SIGNAL(clicked()), this, SLOT(idl_edit_body()));
+    //    editidlbody = new QPushButton("",  grid));
+    //    connect(editidlbody, SIGNAL(clicked()), this, SLOT(idl_edit_body()));
 
-    htab = new Q3HBox(grid);
+    grid->addWidget(new QLabel("", grid));
+    grid->addWidget(htab = new HHBox(grid));
 
-    pbDefaultDeclarationIdl = new QPushButton(TR("Default declaration"), htab);
-    pbNotGeneratedInIdl = new QPushButton(TR("Not generated in Idl"), htab);
+    htab->addWidget(pbDefaultDeclarationIdl = new QPushButton(tr("Default declaration"), htab));
+    htab->addWidget(pbNotGeneratedInIdl = new QPushButton(tr("Not generated in Idl"), htab));
     connect(pbDefaultDeclarationIdl, SIGNAL(clicked()), this, SLOT(idl_default_def()));
     connect(pbNotGeneratedInIdl, SIGNAL(clicked()), this, SLOT(idl_unmapped_def()));
     addTab(grid, "Idl");
@@ -1050,28 +1085,28 @@ void OperationDialog::FillGeneric(/*OperationData * oper*/)
 
 
     unique = (GenerationSettings::cpp_get_default_defs())
-             ? ((cppTab != 0) ? CppView : DefaultDrawingLanguage)
-                 : UmlView;
+            ? ((cppTab != 0) ? CppView : DefaultDrawingLanguage)
+            : UmlView;
 
     if (GenerationSettings::java_get_default_defs())
         unique = ((unique == UmlView) && (javatab != 0))
-                 ? JavaView
-                 : DefaultDrawingLanguage;
+                ? JavaView
+                : DefaultDrawingLanguage;
 
     if (GenerationSettings::php_get_default_defs())
         unique = ((unique == UmlView) && (phptab != 0))
-                 ? PhpView
-                 : DefaultDrawingLanguage;
+                ? PhpView
+                : DefaultDrawingLanguage;
 
     if (GenerationSettings::python_get_default_defs())
         unique = ((unique == UmlView) && (pythontab != 0))
-                 ? PythonView
-                 : DefaultDrawingLanguage;
+                ? PythonView
+                : DefaultDrawingLanguage;
 
     if (GenerationSettings::idl_get_default_defs())
         unique = ((unique == UmlView) && (idltab != 0))
-                 ? IdlView
-                 : DefaultDrawingLanguage;
+                ? IdlView
+                : DefaultDrawingLanguage;
 
     if (unique == DefaultDrawingLanguage)
         unique = UmlView;
@@ -1120,15 +1155,15 @@ void OperationDialog::FillGeneric(/*OperationData * oper*/)
 
 void OperationDialog::menu_returntype()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edreturn_type->currentText().stripWhiteSpace());
+    int index = list.indexOf(edreturn_type->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -1136,50 +1171,52 @@ void OperationDialog::menu_returntype()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlClass) && !bn->deletedp())
-            m.insertItem(TR("Choose class selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose class selected in browser"), 1);
         else
             bn = 0;
 
-        m.insertItem(TR("Create class and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create class and choose it"), 2);
     }
 
     if (isWritable || (index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            nodes.at(index)->select_in_browser();
-            break;
+        QAction *retAction = m.exec(QCursor::pos());
+        if(retAction)
+            switch (retAction->data().toInt()) {
+            case 0:
+                nodes.at(index)->select_in_browser();
+                break;
 
-        case 2:
-            bn = BrowserClass::add_class(FALSE, view);
+            case 2:
+                bn = BrowserClass::add_class(FALSE, view);
 
-            if (bn == 0)
-                return;
+                if (bn == 0)
+                    return;
 
-            bn->select_in_browser();
+                bn->select_in_browser();
 
-            // no break
-        case 1: {
-            QString s = bn->full_name(TRUE);
+                // no break
+            case 1: {
+                QString s = bn->full_name(TRUE);
 
-            if ((index = list.findIndex(s)) == -1) {
-                // new class, may be created through an other dialog
-                index = 0;
-                QStringList::Iterator iter = list.begin();
-                QStringList::Iterator iter_end = list.end();
+                if ((index = list.indexOf(s)) == -1) {
+                    // new class, may be created through an other dialog
+                    index = 0;
+                    QStringList::Iterator iter = list.begin();
+                    QStringList::Iterator iter_end = list.end();
 
-                while ((iter != iter_end) && (*iter < s)) {
-                    ++iter;
-                    index += 1;
-                }
+                    while ((iter != iter_end) && (*iter < s)) {
+                        ++iter;
+                        index += 1;
+                    }
 
-                nodes.insert((unsigned) index, bn);
-                list.insert(iter, s);
-                edreturn_type->insertItem(s, index + edreturn_type_offset);
+                    nodes.insert((unsigned) index, bn);
+                    list.insert(iter, s);
+                    edreturn_type->addItem(s, index + edreturn_type_offset);
+                }
             }
-        }
 
-        edreturn_type->setCurrentItem(index + edreturn_type_offset);
-        }
+                edreturn_type->setCurrentIndex(index + edreturn_type_offset);
+            }
     }
 }
 
@@ -1190,7 +1227,7 @@ void OperationDialog::default_description()
 
 void OperationDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          oper, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -1201,7 +1238,7 @@ void OperationDialog::post_edit_description(OperationDialog * d, QString s)
 
 void OperationDialog::edit_constraint()
 {
-    edit(constraint->text(), edname->text().stripWhiteSpace() + "_constraint",
+    edit(constraint->text(), edname->text().trimmed() + "_constraint",
          oper, TxtEdit, this, (post_edit) post_edit_constraint, edits);
 }
 
@@ -1214,7 +1251,7 @@ void OperationDialog::accept()
 {
 
     if(SaveData())
-        Q3TabDialog::accept();
+        TabDialog::accept();
 }
 
 void OperationDialog::classoper_toggled(bool on)
@@ -1240,7 +1277,7 @@ void OperationDialog::abstract_toggled(bool on)
 void OperationDialog::forcegenbody_toggled(bool on)
 {
     bool ro = (!isWritable || (preserve_bodies() && !on));
-    QString lbl = (ro) ? TR("Show body") : TR("Edit body");
+    QString lbl = (ro) ? tr("Show body") : tr("Edit body");
 
     if (!cpp_undef)
         cppTab->ui->editcppbody->setText(lbl);
@@ -1269,8 +1306,9 @@ void OperationDialog::forcegenbody_toggled(bool on)
     }
 }
 
-void OperationDialog::update_all_tabs(QWidget * w)
+void OperationDialog::update_all_tabs(int index)
 {
+    QWidget * w = m_tabWidget->widget(index);
     table->forceUpdateCells();
     etable->forceUpdateCells();
 
@@ -1443,11 +1481,11 @@ void OperationDialog::cpp_default_decl()
     }
     else
     {
-        QString s = oper->default_cpp_decl(edname->text().stripWhiteSpace());
+        QString s = oper->default_cpp_decl(edname->text().trimmed());
 
         GenerationSettings::set_cpp_return_type(the_type(edreturn_type->currentText()
-                                                .stripWhiteSpace(),
-                                                list, nodes),
+                                                         .trimmed(),
+                                                         list, nodes),
                                                 s);
 
         int index;
@@ -1457,11 +1495,11 @@ void OperationDialog::cpp_default_decl()
 
         for (index = 0; index != nparams; index += 1, sep = ", ")
             params += sep + GenerationSettings::cpp(the_type(table->type(index),
-                                                    list, nodes),
+                                                             list, nodes),
                                                     table->dir(index), index)
-                      + "${v" + QString().setNum(index) + "}";
+                    + "${v" + QString().setNum(index) + "}";
 
-        if ((index = s.find("${)}")) != -1)
+        if ((index = s.indexOf("${)}")) != -1)
             s.insert(index, params);
 
         cppTab->ui->edCppDeclProto->setText(s);
@@ -1480,7 +1518,7 @@ void OperationDialog::cpp_unmapped_decl()
 
 void OperationDialog::cpp_decl_from_def()
 {
-    QString dcl = oper->default_cpp_decl(edname->text().stripWhiteSpace());
+    QString dcl = oper->default_cpp_decl(edname->text().trimmed());
     QString def = cppTab->ui->edCppDefProto->text();
     int index1;
     int index2;
@@ -1488,10 +1526,10 @@ void OperationDialog::cpp_decl_from_def()
     int index4;
 
     // copy args
-    if (((index1 = def.find("${(}") + 4) == (-1 + 4)) ||
-        ((index2 = def.find("${)}", index1)) == -1) ||
-        ((index3 = dcl.find("${(}") + 4) == (-1 + 4)) ||
-        ((index4 = dcl.find("${)}", index3)) == -1))
+    if (((index1 = def.indexOf("${(}") + 4) == (-1 + 4)) ||
+            ((index2 = def.indexOf("${)}", index1)) == -1) ||
+            ((index3 = dcl.indexOf("${(}") + 4) == (-1 + 4)) ||
+            ((index4 = dcl.indexOf("${)}", index3)) == -1))
         // wrong specification(s)
         return;
 
@@ -1502,10 +1540,10 @@ void OperationDialog::cpp_decl_from_def()
         dcl.insert(index3, def.mid(index1, index2 - index1));
 
     // copy return type modifications
-    if (((index1 = def.find("${type}")) != -1) &&
-        ((index2 = def.find("${class}", index1 + 7)) != -1) &&
-        ((index3 = dcl.find("${type}")) != -1) &&
-        ((index4 = dcl.find("${name}", index3 + 7)) != -1)) {
+    if (((index1 = def.indexOf("${type}")) != -1) &&
+            ((index2 = def.indexOf("${class}", index1 + 7)) != -1) &&
+            ((index3 = dcl.indexOf("${type}")) != -1) &&
+            ((index4 = dcl.indexOf("${name}", index3 + 7)) != -1)) {
         // valid specification
         while ((index1 != 0) && (def.at(index1 - 1) != QChar('}')))
             index1 -= 1;
@@ -1518,22 +1556,22 @@ void OperationDialog::cpp_decl_from_def()
     }
 
     // manage const
-    if ((def.find("${const}") == -1) && // const removed
-        ((index1 = dcl.find("${const}")) != -1))
+    if ((def.indexOf("${const}") == -1) && // const removed
+            ((index1 = dcl.indexOf("${const}")) != -1))
         // remove const
         dcl.remove(index1, 8);
 
     // manage throw
-    if ((def.find("${throw}") == -1) && // throw removed
-        ((index1 = dcl.find("${throw}")) != -1))
+    if ((def.indexOf("${throw}") == -1) && // throw removed
+            ((index1 = dcl.indexOf("${throw}")) != -1))
         // remove throw
         dcl.remove(index1, 8);
 
     //add default param value
     index1 = 0;
 
-    while (((index2 = dcl.find("${p", index1)) != -1) &&
-           ((index3 = dcl.find('}', index2 + 3)) != -1)) {
+    while (((index2 = dcl.indexOf("${p", index1)) != -1) &&
+           ((index3 = dcl.indexOf('}', index2 + 3)) != -1)) {
         dcl.insert(index3 + 1, "${v" + dcl.mid(index2 + 3, index3 - index2 - 2));
         index1 = index3 + index3 - index2 + 2;
     }
@@ -1548,8 +1586,9 @@ void OperationDialog::cpp_edit_param_decl()
     QString form = cppTab->ui->edCppDeclProto->text();
     int index;
 
-    if (((index = form.find("${(}")) != 0) &&
-        (form.find("${)}", index + 4) != 0)) {
+    if (((index = form.indexOf("${(}")) != 0) &&
+            (form.indexOf("${)}", index + 4) != 0))
+    {
         CppParamsDialog d(this, table, cppTab->ui->edCppDeclProto, TRUE);
 
         if (d.exec() == QDialog::Accepted)
@@ -1560,7 +1599,7 @@ void OperationDialog::cpp_edit_param_decl()
         }
     }
     else
-        msg_warning("Douml", TR("wrong specification"));
+        msg_warning("Douml", tr("wrong specification"));
 }
 
 
@@ -1590,12 +1629,12 @@ QString OperationDialog::compute_name(LineEdit * spec)
 {
     if (spec->isVisible())
     {
-        QString s = spec->text().stripWhiteSpace();
+        QString s = spec->text().trimmed();
         int index;
 
-        if ((index = s.find("${name}")) != -1)
+        if ((index = s.indexOf("${name}")) != -1)
             s.replace(index, 7, ((BrowserOperation *) oper->browser_node)->get_of_name());
-        else if ((index = s.find("${Name}")) != -1)
+        else if ((index = s.indexOf("${Name}")) != -1)
             s.replace(index, 7,
                       capitalize(((BrowserOperation *) oper->browser_node)->get_of_name()));
 
@@ -1608,7 +1647,7 @@ QString OperationDialog::compute_name(LineEdit * spec)
 void OperationDialog::manage_init(unsigned rank, QString & s)
 {
     if (rank < table->nparams()) {
-        QString v = table->value(rank).stripWhiteSpace();
+        QString v = table->value(rank).trimmed();
 
         if (! v.isEmpty())
             s += " = " + v;
@@ -1641,12 +1680,12 @@ void OperationDialog::manage_cpp_exceptions(QString & s)
         s += " throw ()";
 }
 
-bool CompareAgainstTag(QString & currentTag, QString tagToCompare, const char * p)
+bool CompareAgainstTag(QString & currentTag, const QString & tagToCompare, const char * p)
 {
     currentTag = tagToCompare;
-    tagToCompare = "${" + tagToCompare + "}";
 
-    if (!strncmp(p, tagToCompare, tagToCompare.length()))
+    const QString tagToCompareBracketed = "${" + tagToCompare + "}";
+    if (!strncmp(p, tagToCompareBracketed.toLatin1().constData(), tagToCompareBracketed.length()))
         return true;
 
     return false;
@@ -1660,7 +1699,8 @@ void OperationDialog::cpp_update_decl()
     //	const char * p = edcppdecl->text();
     // because the QString is immediatly destroyed !
     QString def = cppTab->ui->edCppDeclProto->text();
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     QString indent = "";
     QString s;
@@ -1724,7 +1764,7 @@ void OperationDialog::cpp_update_decl()
         }
         else if (!strncmp(p, "${type}", 7)) {
             p += 7;
-            s += get_cpp_name(the_type(edreturn_type->currentText().stripWhiteSpace(),
+            s += get_cpp_name(the_type(edreturn_type->currentText().trimmed(),
                                        list, nodes));
         }
         else if (!strncmp(p, "${name}", 7)) {
@@ -1885,7 +1925,7 @@ QString OperationDialog::cpp_decl(const BrowserOperation * op, bool withname,
             break;
         else if (sscanf(p, "${t%u}", &rank) == 1) {
             if (rank < d->nparams)
-                s += GenerationSettings::cpp_type(d->params[rank].get_type().get_type(mode));
+                s += GenerationSettings::cpp_type(d->params[rank]->get_type().get_type(mode));
             else {
                 s += "${t";
                 s += QString::number(rank);
@@ -1897,7 +1937,7 @@ QString OperationDialog::cpp_decl(const BrowserOperation * op, bool withname,
         else if (sscanf(p, "${p%u}", &rank) == 1) {
             if (withname) {
                 if (rank < d->nparams)
-                    s += d->params[rank].get_name();
+                    s += d->params[rank]->get_name();
                 else {
                     s += "${p";
                     s += QString::number(rank);
@@ -1909,7 +1949,7 @@ QString OperationDialog::cpp_decl(const BrowserOperation * op, bool withname,
         }
         else if (sscanf(p, "${v%u}", &rank) == 1) {
             if (rank < d->nparams) {
-                WrapperStr v = d->params[rank].get_default_value();
+                WrapperStr v = d->params[rank]->get_default_value();
 
                 if (!v.isEmpty())
                     s += " = " + v;
@@ -1998,11 +2038,11 @@ void OperationDialog::cpp_default_def()
         cppTab->ui->edCppDefProto->setText(def);
     }
     else {
-        QString s = oper->default_cpp_def(edname->text().stripWhiteSpace());
+        QString s = oper->default_cpp_def(edname->text().trimmed());
 
         GenerationSettings::set_cpp_return_type(the_type(edreturn_type->currentText()
-                                                .stripWhiteSpace(),
-                                                list, nodes),
+                                                         .trimmed(),
+                                                         list, nodes),
                                                 s);
 
         QString params;
@@ -2012,10 +2052,10 @@ void OperationDialog::cpp_default_def()
 
         for (index = 0; index != nparams; index += 1, sep = ", ")
             params += sep + GenerationSettings::cpp(the_type(table->type(index),
-                                                    list, nodes),
+                                                             list, nodes),
                                                     table->dir(index), index);
 
-        if ((index = s.find("${)}")) != -1)
+        if ((index = s.indexOf("${)}")) != -1)
             s.insert(index, params);
 
         cppTab->ui->edCppDefProto->setText(s);
@@ -2032,7 +2072,7 @@ void OperationDialog::cpp_unmapped_def()
 struct UserTag
 {
     UserTag(QString _tag, QString _leftContext,QString _rightContext):
-         leftContext(_leftContext),rightContext(_rightContext),tag(_tag)
+        leftContext(_leftContext),rightContext(_rightContext),tag(_tag)
     {}
     QString leftContext;
     QString rightContext;
@@ -2059,21 +2099,21 @@ void OperationDialog::cpp_def_from_decl()
 
 
     // manage abstract
-    if ((dcl.find("${abstract}") == -1) || // abstract removed
-        !abstract_cb->isChecked()) {
+    if (/*(dcl.indexOf("${abstract}") == -1) || !abstract_cb->isChecked()*/true)
+    {
         // probably not abstract
         int index1;
         int index2;
         int index3;
         int index4;
 
-        def = oper->default_cpp_def(edname->text().stripWhiteSpace());
+        def = oper->default_cpp_def(edname->text().trimmed());
 
         // copy args
-        if (((index1 = dcl.find("${(}") + 4) == (-1 + 4)) ||
-            ((index2 = dcl.find("${)}", index1)) == -1) ||
-            ((index3 = def.find("${(}") + 4) == (-1 + 4)) ||
-            ((index4 = def.find("${)}", index3)) == -1))
+        if (((index1 = dcl.indexOf("${(}") + 4) == (-1 + 4)) ||
+                ((index2 = dcl.indexOf("${)}", index1)) == -1) ||
+                ((index3 = def.indexOf("${(}") + 4) == (-1 + 4)) ||
+                ((index4 = def.indexOf("${)}", index3)) == -1))
             // wrong specification(s)
             return;
 
@@ -2084,10 +2124,10 @@ void OperationDialog::cpp_def_from_decl()
             def.insert(index3, dcl.mid(index1, index2 - index1));
 
         // copy return type modifications
-        if (((index1 = dcl.find("${type}")) != -1) &&
-            ((index2 = dcl.find("${name}", index1 + 7)) != -1) &&
-            ((index3 = def.find("${type}")) != -1) &&
-            ((index4 = def.find("${class}", index3 + 7)) != -1)) {
+        if (((index1 = dcl.indexOf("${type}")) != -1) &&
+                ((index2 = dcl.indexOf("${name}", index1 + 7)) != -1) &&
+                ((index3 = def.indexOf("${type}")) != -1) &&
+                ((index4 = def.indexOf("${class}", index3 + 7)) != -1)) {
             // valid specifications
             while ((index1 != 0) && (dcl.at(index1 - 1) != QChar('}')))
                 index1 -= 1;
@@ -2100,31 +2140,35 @@ void OperationDialog::cpp_def_from_decl()
         }
 
         // manage const
-        if ((dcl.find("${const}") == -1) && // const removed
-            ((index1 = def.find("${const}")) != -1))
+        if ((dcl.indexOf("${const}") == -1) && // const removed
+                ((index1 = def.indexOf("${const}")) != -1))
             // remove const
             def.remove(index1, 8);
 
         // manage throw
-        if ((dcl.find("${throw}") == -1) && // throws removed
-            ((index1 = def.find("${throw}")) != -1))
+        if ((dcl.indexOf("${throw}") == -1) && // throws removed
+                ((index1 = def.indexOf("${throw}")) != -1))
             // remove throw
             def.remove(index1, 8);
 
         // remove inits
-        index1 = def.find("${(}");
-        index4 = def.find("${)}", index1 + 4);
+        index1 = def.indexOf("${(}");
+        index4 = def.indexOf("${)}", index1 + 4);
 
-        while (((index2 = def.find("${v", index1)) != -1) &&
+        while (((index2 = def.indexOf("${v", index1)) != -1) &&
                (index2 < index4) &&
-               ((index3 = def.find('}', index2 + 3)) != -1)) {
+               ((index3 = def.indexOf('}', index2 + 3)) != -1)) {
             def.remove(index2, index3 - index2 + 1);
             index1 = index2;
         }
     }
+
     QList<UserTag> failedTags;
-    for(auto tag : tags)
+    for (const auto& tag : tags)
     {
+        //we remove all instances of the tag that might have been left
+        def = def.replace(QString("@{") + tag.tag + QString("}"), "");
+
         //first we try to find left context in the new definition
         QRegExp rx(QRegExp::escape(tag.leftContext));
         int index = rx.indexIn(def);
@@ -2143,18 +2187,21 @@ void OperationDialog::cpp_def_from_decl()
         }
         failedTags.append(tag);
     }
-    if(failedTags.size() > 0)
+    if (failedTags.size() > 0)
     {
         QString tagString;
-        for(auto tag : failedTags)
+        for (const auto& tag : failedTags)
             tagString.append(tag.tag + tr(","));
-        if(tagString.length() > 0)
+        if (tagString.length() > 0)
             tagString.chop(1);
-        QMessageBox::critical(0, tr("Warning!"), tr("Could not find correct place for these tags: " + tagString), QMessageBox::Ok);
+        QMessageBox::critical(0, tr("Warning!"), tr("Could not find correct place for these tags: ").arg(tagString), QMessageBox::Ok);
     }
 
+
     // update def
     cppTab->ui->edCppDefProto->setText(def);
+    if(oper->is_abstract)
+        return;
     cpp_update_def();
 }
 
@@ -2163,8 +2210,8 @@ void OperationDialog::cpp_edit_param_def()
     QString form = cppTab->ui->edCppDefProto->text();
     int index;
 
-    if (((index = form.find("${(}")) != 0) &&
-        (form.find("${)}", index + 4) != 0)) {
+    if (((index = form.indexOf("${(}")) != 0) &&
+            (form.indexOf("${)}", index + 4) != 0)) {
         CppParamsDialog d(this, table, cppTab->ui->edCppDefProto, FALSE);
 
         d.raise();
@@ -2173,7 +2220,7 @@ void OperationDialog::cpp_edit_param_def()
             cpp_update_def();
     }
     else
-        msg_warning("Douml", TR("wrong specification"));
+        msg_warning("Douml", tr("wrong specification"));
 }
 
 // return TRUE if stop on ${commnt} or ${description}
@@ -2256,21 +2303,22 @@ void OperationDialog::cpp_update_def()
     QString def = cppTab->ui->edCppDefProto->text();
 
     if (cppTab->ui->cbCppDefaulted->isChecked() ||
-        cppTab->ui->cbCppDeleted->isChecked()) {
+            cppTab->ui->cbCppDeleted->isChecked()) {
         cppTab->ui->edCppDefActual->setText("");
         forcegenbody_toggled(forcegenbody_cb->isChecked());	// update indent*body_cb
         return;
     }
 
     bool template_oper = cppTab->ui->edCppDeclProto->text().isEmpty()
-                         && oper->is_template_operation(def);
+            && oper->is_template_operation(def);
     QString s;
 
     if (!abstract_cb->isChecked()) {
         // do NOT write
         //	const char * p = edcppdef->text()
         // because the QString is immediatly destroyed !
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
         const char * pp = 0;
         QString indent = "";
         unsigned rank;
@@ -2279,8 +2327,8 @@ void OperationDialog::cpp_update_def()
             indent += *p++;
 
         bool re_template = !templates.isEmpty() &&
-                           insert_template((template_oper) ? templates_tmplop : templates,
-                                           p, s, indent);
+                insert_template((template_oper) ? templates_tmplop : templates,
+                                p, s, indent);
 
         if (*p != '#')
             s += indent;
@@ -2308,7 +2356,7 @@ void OperationDialog::cpp_update_def()
             if (!strncmp(p, "${comment}", 10)) {
                 if (!manage_comment(comment->text(), p, pp,
                                     GenerationSettings::cpp_javadoc_style())
-                    && re_template)
+                        && re_template)
                     s += templates;
             }
             else if (!strncmp(p, "${description}", 14)) {
@@ -2323,7 +2371,7 @@ void OperationDialog::cpp_update_def()
             }
             else if (!strncmp(p, "${type}", 7)) {
                 p += 7;
-                s += get_cpp_name(the_type(edreturn_type->currentText().stripWhiteSpace(),
+                s += get_cpp_name(the_type(edreturn_type->currentText().trimmed(),
                                            list, nodes));
             }
             else if (!strncmp(p, "${class}", 8)) {
@@ -2398,12 +2446,14 @@ void OperationDialog::cpp_update_def()
                     s += indent;
             }
             else if (*p == '@')
+            {
                 manage_alias(oper->browser_node, p, s, kvtable);
+            }
             else
                 s += *p++;
         }
 
-        cppTab->ui->editcppbody->setEnabled(def.find("${body}") != -1);
+        cppTab->ui->editcppbody->setEnabled(def.indexOf("${body}") != -1);
     }
     else
         cppTab->ui->editcppbody->setEnabled(FALSE);
@@ -2417,16 +2467,16 @@ static QString Marker = " ---- header including this line will be automatically
 
 static QString add_profile(QString b, const char * comment = "//")
 {
-    return b.left(b.find("${body}")) + comment + Marker;
+    return b.left(b.indexOf("${body}")) + comment + Marker;
 }
 
 static QString remove_profile(QString b)
 {
-    int index = b.find(Marker);
+    int index = b.indexOf(Marker);
 
     return (index == -1)
-           ? b
-           : b.mid(index + Marker.length());
+            ? b
+            : b.mid(index + Marker.length());
 }
 
 void OperationDialog::cpp_edit_body()
@@ -2438,7 +2488,7 @@ void OperationDialog::cpp_edit_body()
     else
         b = cppbody;
 
-    edit(b, edname->text().stripWhiteSpace() + "_body",
+    edit(b, edname->text().trimmed() + "_body",
          oper, CppEdit, this,
          (preserve_bodies() && !forcegenbody_cb->isChecked())
          ? (post_edit) 0
@@ -2523,7 +2573,7 @@ void OperationDialog::java_default_def()
         edjavadef->setText(def);
     }
     else {
-        QString s = oper->default_java_def(edname->text().stripWhiteSpace());
+        QString s = oper->default_java_def(edname->text().trimmed());
         QString params;
         int index;
         int nparams = (int) table->nparams();
@@ -2536,7 +2586,7 @@ void OperationDialog::java_default_def()
             params += p;
         }
 
-        if ((index = s.find("${)}")) != -1)
+        if ((index = s.indexOf("${)}")) != -1)
             s.insert(index, params);
 
         edjavadef->setText(s);
@@ -2579,7 +2629,8 @@ void OperationDialog::java_update_def()
     QString ste = GenerationSettings::java_class_stereotype(cl->get_stereotype());
     bool interf = (ste == "interface") || (ste == "@interface");
     bool nobody = (abstract_cb->isChecked() || interf);
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     const char * afterparam = 0;
     QString indent = "";
@@ -2643,7 +2694,7 @@ void OperationDialog::java_update_def()
         }
         else if (!strncmp(p, "${type}", 7)) {
             p += 7;
-            s += get_java_name(the_type(edreturn_type->currentText().stripWhiteSpace(),
+            s += get_java_name(the_type(edreturn_type->currentText().trimmed(),
                                         list, nodes));
         }
         else if (!strncmp(p, "${name}", 7)) {
@@ -2701,7 +2752,7 @@ void OperationDialog::java_update_def()
         else if ((*p == '{') && nobody) {
             if (afterparam != 0) {
                 if ((ste == "@interface") &&
-                    (strstr(afterparam, "default") != 0))
+                        (strstr(afterparam, "default") != 0))
                     afterparam = 0;
                 else {
                     s += ';';
@@ -2719,7 +2770,7 @@ void OperationDialog::java_update_def()
                 s += "${@}";
             else if (! javaannotation.isEmpty()) {
                 pp = p;
-                p = javaannotation;
+                p = javaannotation.toLatin1().constData();
             }
         }
         else if (*p == '@')
@@ -2728,8 +2779,8 @@ void OperationDialog::java_update_def()
             s += *p++;
     }
 
-    editjavabody->setEnabled(!nobody && (def.find("${body}") != -1));
-    editjavaannotation->setEnabled(def.find("${@}") != -1);
+    editjavabody->setEnabled(!nobody && (def.indexOf("${body}") != -1));
+    editjavaannotation->setEnabled(def.indexOf("${@}") != -1);
 
     showjavadef->setText(s);
 
@@ -2790,7 +2841,7 @@ QString OperationDialog::java_decl(const BrowserOperation * op, bool withname,
         }
         else if (sscanf(p, "${t%u}", &rank) == 1) {
             if (rank < d->nparams)
-                s += GenerationSettings::java_type(d->params[rank].get_type().get_type(mode));
+                s += GenerationSettings::java_type(d->params[rank]->get_type().get_type(mode));
             else {
                 s += "${t";
                 s += QString::number(rank);
@@ -2802,7 +2853,7 @@ QString OperationDialog::java_decl(const BrowserOperation * op, bool withname,
         else if (sscanf(p, "${p%u}", &rank) == 1) {
             if (withname) {
                 if (rank < d->nparams)
-                    s += d->params[rank].get_name();
+                    s += d->params[rank]->get_name();
                 else {
                     s += "${p";
                     s += QString::number(rank);
@@ -2852,7 +2903,7 @@ void OperationDialog::java_edit_body()
     else
         b = javabody;
 
-    edit(b, edname->text().stripWhiteSpace() + "_body",
+    edit(b, edname->text().trimmed() + "_body",
          oper, JavaEdit, this,
          (preserve_bodies() && !forcegenbody_cb->isChecked())
          ? (post_edit) 0
@@ -2924,7 +2975,7 @@ void OperationDialog::php_default_def()
     }
     else {
         QString ste = GenerationSettings::php_class_stereotype(cl->get_stereotype());
-        QString s = oper->default_php_def(edname->text().stripWhiteSpace(),
+        QString s = oper->default_php_def(edname->text().trimmed(),
                                           abstract_cb->isChecked() || (ste == "interface"));
         QString params;
         int index;
@@ -2938,7 +2989,7 @@ void OperationDialog::php_default_def()
             params += p;
         }
 
-        if ((index = s.find("${)}")) != -1)
+        if ((index = s.indexOf("${)}")) != -1)
             s.insert(index, params);
 
         edphpdef->setText(s);
@@ -2962,7 +3013,8 @@ void OperationDialog::php_update_def()
     QString ste = GenerationSettings::php_class_stereotype(cl->get_stereotype());
     bool interf = (ste == "interface");
     bool nobody = (abstract_cb->isChecked() || interf);
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     QString indent = "";
     QString s;
@@ -3068,14 +3120,14 @@ void OperationDialog::php_update_def()
         else if (!strncmp(p, "${type}", 7)) {
             // for comment
             p += 7;
-            s += get_php_name(the_type(edreturn_type->currentText().stripWhiteSpace(),
+            s += get_php_name(the_type(edreturn_type->currentText().trimmed(),
                                        list, nodes));
         }
         else
             s += *p++;
     }
 
-    editphpbody->setEnabled(!nobody && (def.find("${body}") != -1));
+    editphpbody->setEnabled(!nobody && (def.indexOf("${body}") != -1));
 
     showphpdef->setText(s);
 
@@ -3133,7 +3185,7 @@ QString OperationDialog::php_decl(const BrowserOperation * op, bool withname,
         }
         else if (sscanf(p, "${t%u}", &rank) == 1) {
             if (rank < d->nparams)
-                s += d->params[rank].get_type().get_type(mode);
+                s += d->params[rank]->get_type().get_type(mode);
             else {
                 s += "${t";
                 s += QString::number(rank);
@@ -3145,7 +3197,7 @@ QString OperationDialog::php_decl(const BrowserOperation * op, bool withname,
         else if (sscanf(p, "${p%u}", &rank) == 1) {
             if (withname) {
                 if (rank < d->nparams)
-                    s += WrapperStr("$") + d->params[rank].get_name();
+                    s += WrapperStr("$") + d->params[rank]->get_name();
                 else {
                     s += "${p";
                     s += QString::number(rank);
@@ -3157,7 +3209,7 @@ QString OperationDialog::php_decl(const BrowserOperation * op, bool withname,
         }
         else if (sscanf(p, "${v%u}", &rank) == 1) {
             if (rank < d->nparams) {
-                WrapperStr v = d->params[rank].get_default_value();
+                WrapperStr v = d->params[rank]->get_default_value();
 
                 if (!v.isEmpty())
                     s += " = " + v;
@@ -3202,7 +3254,7 @@ void OperationDialog::php_edit_body()
     else
         b = phpbody;
 
-    edit(b, edname->text().stripWhiteSpace() + "_body",
+    edit(b, edname->text().trimmed() + "_body",
          oper, PhpEdit, this,
          (preserve_bodies() && !forcegenbody_cb->isChecked())
          ? (post_edit) 0
@@ -3217,18 +3269,21 @@ void OperationDialog::post_php_edit_body(OperationDialog * d, QString s)
 
 bool OperationDialog::SaveData()
 {
+
     BrowserClass* containingClass = static_cast<BrowserClass*>(oper->browser_node->get_container(UmlClass));
     QList<BrowserNode *>  passedNodes;
-    QList<OperationData*> inheritanceSiblings;
     bool goBack = true;
+    QList<OperationData*> inheritanceSiblings;
     inheritanceSiblings = containingClass->CollectSameThroughInheritance(oper, passedNodes, goBack);
     bool propagateThroughInheritance = false;
     OperationData* operCopy = new OperationData(oper, (BrowserOperation*)oper->get_browser_node());
 
     SaveData(operCopy);
-    bool equals = *oper == *operCopy;
-    bool newst = operCopy->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool equals = *oper == *operCopy && kvtable->EqualData(static_cast<HaveKeyValueData*>(oper->browser_node));
+    bool newst = operCopy->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
     delete operCopy;
+    if(equals)
+        return true;
 
     if(!inheritanceSiblings.isEmpty() && !equals)
     {
@@ -3264,9 +3319,10 @@ bool OperationDialog::SaveData()
             inheritanceSiblings = containingClass->CollectSameThroughInheritance(oper,passedNodes, goBack);
         }
     }
+    kvtable->updateNodeFromThis(oper->get_browser_node());
     SaveData(oper);
     // user
-    kvtable->updateNodeFromThis(oper->get_browser_node());
+
 
     ProfiledStereotypes::modified(oper->get_browser_node(), newst);
 
@@ -3297,13 +3353,13 @@ bool OperationDialog::SaveData(OperationData *oper)
         return true;
 
     BrowserNode * bn = oper->browser_node;
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
 
     if ((s != oper->name()) &&
-        ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlOperation,
-                bn->allow_spaces(),
-                bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+            ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlOperation,
+                                                             bn->allow_spaces(),
+                                                             bn->allow_empty()))
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else
     {
         bn->set_name(s);
@@ -3311,10 +3367,10 @@ bool OperationDialog::SaveData(OperationData *oper)
         {
             AType t;
 
-            s = edreturn_type->currentText().stripWhiteSpace();
+            s = edreturn_type->currentText().trimmed();
 
             if (! s.isEmpty()) {
-                int index = list.findIndex(edreturn_type->currentText());
+                int index = list.indexOf(edreturn_type->currentText());
 
                 if (index >= 0)
                     t.type = (BrowserClass *) nodes.at(index);
@@ -3324,7 +3380,7 @@ bool OperationDialog::SaveData(OperationData *oper)
 
             oper->set_return_type(t);
 
-            bool newst = oper->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+            bool newst = oper->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
             Q_UNUSED(newst);
         }
 
@@ -3341,11 +3397,12 @@ bool OperationDialog::SaveData(OperationData *oper)
         bn->set_comment(comment->text());
         UmlWindow::update_comment_if_needed(bn);
 
-        oper->constraint = constraint->stripWhiteSpaceText();
+        oper->constraint = constraint->trimmedText();
 
         // C++
 
-        if (cpp_undef) {
+        if (cpp_undef)
+        {
             oper->cpp_decl = QString();
             oper->cpp_def.assign(QString(), TRUE);
 
@@ -3353,8 +3410,9 @@ bool OperationDialog::SaveData(OperationData *oper)
                 oper->new_body(QString(), 'c');
         }
         else {
-            if (oper->is_get_or_set) {
-                oper->cpp_name_spec = cppTab->ui->leCppNamespec->text().stripWhiteSpace();
+            if (oper->is_get_or_set)
+            {
+                oper->cpp_name_spec = cppTab->ui->leCppNamespec->text().trimmed();
                 oper->cpp_body.length = 0;
                 oper->cpp_get_set_frozen = cppTab->ui->cbCppFrozen->isChecked();
             }
@@ -3362,14 +3420,15 @@ bool OperationDialog::SaveData(OperationData *oper)
                 oper->cpp_indent_body = cppTab->ui->cbIndentCppBody->isChecked();
 
             if (!abstract_cb->isChecked() &&
-                (cppTab->ui->edCppDefProto->text().find("${body}") != -1)) {
+                    (cppTab->ui->edCppDefProto->text().indexOf("${body}") != -1))
+            {
                 if (cppbody != oldcppbody)
                     oper->new_body(cppbody, 'c');
             }
             else if (!oldcppbody.isEmpty())
                 oper->new_body(QString(), 'c');
 
-            oper->cpp_decl = cppTab->ui->edCppDeclProto->text();
+
             oper->cpp_visibility = cpp_visibility.value();
 
             oper->cpp_const = cbCppConst->isChecked();
@@ -3381,22 +3440,23 @@ bool OperationDialog::SaveData(OperationData *oper)
             oper->cpp_delete = cppTab->ui->cbCppDeleted->isChecked();
             oper->cpp_override = cppTab->ui->cbCppOverride->isChecked();
             oper->cpp_final = cppTab->ui->cbCppFinal->isChecked();
+            oper->cpp_decl = cppTab->ui->edCppDeclProto->text();
             oper->cpp_def.assign(cppTab->ui->edCppDefProto->text(),
                                  abstract_cb->isChecked() ||
-                                 (cppTab->ui->edCppDefProto->text().find("${body}") != -1));
+                                 (cppTab->ui->edCppDefProto->text().indexOf("${body}") != -1));
         }
 
         // java
 
         if (java_undef) {
-            oper->java_def.assign(QString(), TRUE);
+            oper->java_def.assign("", TRUE);
 
             if (!oldjavabody.isEmpty())
                 oper->new_body(QString(), 'j');
         }
         else {
             if (oper->is_get_or_set) {
-                oper->java_name_spec = edjavanamespec->text().stripWhiteSpace();
+                oper->java_name_spec = edjavanamespec->text().trimmed();
                 oper->java_get_set_frozen = javafrozen_cb->isChecked();
             }
             else
@@ -3406,7 +3466,7 @@ bool OperationDialog::SaveData(OperationData *oper)
             bool interf = (ste == "interface") || (ste == "@interface");
 
             if (!abstract_cb->isChecked() && !interf &&
-                (edjavadef->text().find("${body}") != -1)) {
+                    (edjavadef->text().indexOf("${body}") != -1)) {
                 if (javabody != oldjavabody)
                     oper->new_body(javabody, 'j');
             }
@@ -3417,7 +3477,7 @@ bool OperationDialog::SaveData(OperationData *oper)
             oper->java_synchronized = synchronized_cb->isChecked();
             oper->java_def.assign(edjavadef->text(),
                                   abstract_cb->isChecked() || interf ||
-                                  (edjavadef->text().find("${body}") != -1));
+                                  (edjavadef->text().indexOf("${body}") != -1));
 
             oper->java_annotation = javaannotation;
         }
@@ -3425,14 +3485,14 @@ bool OperationDialog::SaveData(OperationData *oper)
         // php
 
         if (php_undef) {
-            oper->php_def.assign(QString(), TRUE);
+            oper->php_def.assign("", TRUE);
 
             if (!oldphpbody.isEmpty())
                 oper->new_body(QString(), 'p');
         }
         else {
             if (oper->is_get_or_set) {
-                oper->php_name_spec = edphpnamespec->text().stripWhiteSpace();
+                oper->php_name_spec = edphpnamespec->text().trimmed();
                 oper->php_get_set_frozen = phpfrozen_cb->isChecked();
             }
             else
@@ -3442,7 +3502,7 @@ bool OperationDialog::SaveData(OperationData *oper)
             bool interf = (ste == "interface");
 
             if (!abstract_cb->isChecked() && !interf &&
-                (edphpdef->text().find("${body}") != -1)) {
+                    (edphpdef->text().indexOf("${body}") != -1)) {
                 if (phpbody != oldphpbody)
                     oper->new_body(phpbody, 'p');
             }
@@ -3452,27 +3512,27 @@ bool OperationDialog::SaveData(OperationData *oper)
             oper->php_final = phpfinal_cb->isChecked();
             oper->php_def.assign(edphpdef->text(),
                                  abstract_cb->isChecked() || interf ||
-                                 (edphpdef->text().find("${body}") != -1));
+                                 (edphpdef->text().indexOf("${body}") != -1));
         }
 
         // python
 
         if (python_undef) {
-            oper->python_def.assign(QString(), TRUE);
+            oper->python_def.assign("", TRUE);
 
             if (!oldpythonbody.isEmpty())
                 oper->new_body(QString(), 'y');
         }
         else {
             if (oper->is_get_or_set) {
-                oper->python_name_spec = edpythonnamespec->text().stripWhiteSpace();
+                oper->python_name_spec = edpythonnamespec->text().trimmed();
                 oper->python_get_set_frozen = pythonfrozen_cb->isChecked();
             }
             else
                 oper->python_indent_body = indentpythonbody_cb->isChecked();
 
             // rmq : abstractmethod have body !
-            if (edpythondef->text().find("${body}") != -1) {
+            if (edpythondef->text().indexOf("${body}") != -1) {
                 if (pythonbody != oldpythonbody)
                     oper->new_body(pythonbody, 'y');
             }
@@ -3481,7 +3541,7 @@ bool OperationDialog::SaveData(OperationData *oper)
 
             oper->python_def.assign(edpythondef->text(),
                                     // rmq : abstractmethod have body !
-                                    (edpythondef->text().find("${body}") != -1));
+                                    (edpythondef->text().indexOf("${body}") != -1));
 
             oper->python_decorator = pythondecorator;
         }
@@ -3492,7 +3552,7 @@ bool OperationDialog::SaveData(OperationData *oper)
             oper->idl_decl = QString();
         else {
             if (oper->is_get_or_set) {
-                oper->idl_name_spec = edidlnamespec->text().stripWhiteSpace();
+                oper->idl_name_spec = edidlnamespec->text().trimmed();
                 oper->idl_get_set_frozen = idlfrozen_cb->isChecked();
             }
 
@@ -3510,15 +3570,15 @@ void OperationDialog::php_edit_param()
     QString form = edphpdef->text();
     int index;
 
-    if (((index = form.find("${(}")) != 0) &&
-        (form.find("${)}", index + 4) != 0)) {
+    if (((index = form.indexOf("${(}")) != 0) &&
+            (form.indexOf("${)}", index + 4) != 0)) {
         PhpParamsDialog d(this, table, edphpdef);
 
         if (d.exec() == QDialog::Accepted)
             php_update_def();
     }
     else
-        msg_warning("Douml", TR("wrong specification"));
+        msg_warning("Douml", tr("wrong specification"));
 }
 
 // Python
@@ -3581,7 +3641,7 @@ void OperationDialog::python_default_def()
     }
     else {
         // rmq : abstractmethod have body !
-        QString s = oper->default_python_def(edname->text().stripWhiteSpace());
+        QString s = oper->default_python_def(edname->text().trimmed());
         QString params;
         int index;
         int nparams = (int) table->nparams();
@@ -3604,12 +3664,12 @@ void OperationDialog::python_default_def()
             }
         }
 
-        int index2;
+        int index2 = -1;
 
-        if (((index = s.find("${(}") + 4) != (-1 + 4)) &&
-            ((index2 = s.find("${)}", index)) != -1)) {
-            int index3 = s.find("${type}", index2 + 4);
-            int index4 = s.find(":", index2 + 4);
+        if (((index = s.indexOf("${(}") + 4) != (-1 + 4)) &&
+                ((index2 = s.indexOf("${)}", index)) != -1)) {
+            int index3 = s.indexOf("${type}", index2 + 4);
+            int index4 = s.indexOf(":", index2 + 4);
 
             if (GenerationSettings::python_default_operation3()) {
                 if ((index3 == -1) || (index3 > index4))
@@ -3643,7 +3703,7 @@ void OperationDialog::manage_decorators(QString & s, QString indent,
         int index = 0;
         int index2;
 
-        while ((index2 = pythondecorator.find("\n", index)) != -1) {
+        while ((index2 = pythondecorator.indexOf("\n", index)) != -1) {
             if (indent_needed)
                 s += indent;
             else
@@ -3670,7 +3730,8 @@ void OperationDialog::python_update_def()
     //	const char * p = edpythondef->text();
     // because the QString is immediatly destroyed !
     QString def = edpythondef->text();
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
 
     if (p == 0)
         return;
@@ -3682,7 +3743,7 @@ void OperationDialog::python_update_def()
     QString indent;
     QString saved_indent = indent;
     QString indent_step =
-        GenerationSettings::python_get_indent_step();
+            GenerationSettings::python_get_indent_step();
     QString s;
     unsigned rank;
 
@@ -3779,7 +3840,7 @@ void OperationDialog::python_update_def()
         else if (*p == '@')
             manage_alias(oper->browser_node, p, s, kvtable);
         else if (!strncmp(p, "${body}", 7)) {
-            if (edname->text().stripWhiteSpace() == "__init__")
+            if (edname->text().trimmed() == "__init__")
                 s += ClassDialog::python_instance_att_rel(cl->get_browser_node());
 
             s += "${body}";
@@ -3789,7 +3850,7 @@ void OperationDialog::python_update_def()
         else if (!strncmp(p, "${type}", 7)) {
             p += 7;
 
-            QString t = get_python_name(the_type(edreturn_type->currentText().stripWhiteSpace(),
+            QString t = get_python_name(the_type(edreturn_type->currentText().trimmed(),
                                                  list, nodes));
 
             if (!t.isEmpty())
@@ -3805,7 +3866,7 @@ void OperationDialog::python_update_def()
 
             // get/set with multiplicity > 1
             s += ((BrowserOperation *) oper->browser_node)
-                 ->get_of_association().get_type();
+                    ->get_of_association().get_type();
         }
         else {
             if (indent_needed) {
@@ -3832,8 +3893,8 @@ void OperationDialog::python_update_def()
         }
     }
 
-    editpythonbody->setEnabled(!nobody && (def.find("${body}") != -1));
-    editpythondecorator->setEnabled(def.find("${@}") != -1);
+    editpythonbody->setEnabled(!nobody && (def.indexOf("${body}") != -1));
+    editpythondecorator->setEnabled(def.indexOf("${@}") != -1);
 
     showpythondef->setText(s);
 
@@ -3895,7 +3956,7 @@ QString OperationDialog::python_decl(const BrowserOperation * op, bool withname,
         }
         else if (sscanf(p, "${t%u}", &rank) == 1) {
             if (rank < d->nparams) {
-                QString t = d->params[rank].get_type().get_type(mode);
+                QString t = d->params[rank]->get_type().get_type(mode);
 
                 if (!t.isEmpty()) {
                     if (in_params)
@@ -3915,7 +3976,7 @@ QString OperationDialog::python_decl(const BrowserOperation * op, bool withname,
         else if (sscanf(p, "${p%u}", &rank) == 1) {
             if (withname) {
                 if (rank < d->nparams)
-                    s += d->params[rank].get_name();
+                    s += d->params[rank]->get_name();
                 else {
                     s += "${p";
                     s += QString::number(rank);
@@ -3927,7 +3988,7 @@ QString OperationDialog::python_decl(const BrowserOperation * op, bool withname,
         }
         else if (sscanf(p, "${v%u}", &rank) == 1) {
             if (rank < d->nparams) {
-                WrapperStr v = d->params[rank].get_default_value();
+                WrapperStr v = d->params[rank]->get_default_value();
 
                 if (!v.isEmpty())
                     s += " = " + v;
@@ -3967,7 +4028,7 @@ void OperationDialog::python_edit_body()
     else
         b = pythonbody;
 
-    edit(b, edname->text().stripWhiteSpace() + "_body",
+    edit(b, edname->text().trimmed() + "_body",
          oper, PythonEdit, this,
          (preserve_bodies() && !forcegenbody_cb->isChecked())
          ? (post_edit) 0
@@ -3985,15 +4046,15 @@ void OperationDialog::python_edit_param()
     QString form = edpythondef->text();
     int index;
 
-    if (((index = form.find("${(}")) != 0) &&
-        (form.find("${)}", index + 4) != 0)) {
+    if (((index = form.indexOf("${(}")) != 0) &&
+            (form.indexOf("${)}", index + 4) != 0)) {
         PythonParamsDialog d(this, table, edpythondef);
 
         if (d.exec() == QDialog::Accepted)
             python_update_def();
     }
     else
-        msg_warning("Douml", TR("wrong specification"));
+        msg_warning("Douml", tr("wrong specification"));
 }
 
 void OperationDialog::python_edit_decorator()
@@ -4094,7 +4155,7 @@ void OperationDialog::idl_default_def()
         edidldecl->setText(decl);
     }
     else {
-        QString s = oper->default_idl_decl(edname->text().stripWhiteSpace());
+        QString s = oper->default_idl_decl(edname->text().trimmed());
         QString params;
         int index;
         int nparams = (int) table->nparams();
@@ -4107,7 +4168,7 @@ void OperationDialog::idl_default_def()
             params += p;
         }
 
-        if ((index = s.find("${)}")) != -1)
+        if ((index = s.indexOf("${)}")) != -1)
             s.insert(index, params);
 
         edidldecl->setText(s);
@@ -4128,7 +4189,8 @@ void OperationDialog::idl_update_decl()
     //	const char * p = edidldecl->text();
     // because the QString is immediatly destroyed !
     QString def = edidldecl->text();
-    const char * p = def;
+    QByteArray defArray = def.toLatin1();
+    const char * p = defArray.constData();
     const char * pp = 0;
     QString indent = "";
     QString s;
@@ -4166,7 +4228,7 @@ void OperationDialog::idl_update_decl()
         }
         else if (!strncmp(p, "${type}", 7)) {
             p += 7;
-            s += get_idl_name(the_type(edreturn_type->currentText().stripWhiteSpace(),
+            s += get_idl_name(the_type(edreturn_type->currentText().trimmed(),
                                        list, nodes));
         }
         else if (!strncmp(p, "${name}", 7)) {
@@ -4273,7 +4335,7 @@ QString OperationDialog::idl_decl(const BrowserOperation * op, bool withdir,
         else if (sscanf(p, "${d%u}", &rank) == 1) {
             if (withdir) {
                 if (rank < d->nparams)
-                    switch (d->params[rank].get_dir()) {
+                    switch (d->params[rank]->get_dir()) {
                     case UmlIn:
                         s += "in";
                         break;
@@ -4298,7 +4360,7 @@ QString OperationDialog::idl_decl(const BrowserOperation * op, bool withdir,
         else if (sscanf(p, "${t%u}", &rank) == 1) {
             if (withname) {
                 if (rank < d->nparams)
-                    s += GenerationSettings::idl_type(d->params[rank].get_type().get_type(mode));
+                    s += GenerationSettings::idl_type(d->params[rank]->get_type().get_type(mode));
                 else {
                     s += "${t";
                     s += QString::number(rank);
@@ -4310,7 +4372,7 @@ QString OperationDialog::idl_decl(const BrowserOperation * op, bool withdir,
         }
         else if (sscanf(p, "${p%u}", &rank) == 1) {
             if (rank < d->nparams)
-                s += d->params[rank].get_name();
+                s += d->params[rank]->get_name();
             else {
                 s += "${p";
                 s += QString::number(rank);
@@ -4354,220 +4416,6 @@ QString OperationDialog::idl_decl(const BrowserOperation * op, bool withdir,
     return s;
 }
 
-// automatic add / remove param when only one language is set
-
-static int bypass_string(const char * s, int index)
-{
-    // index is just after the "
-    for (;;) {
-        switch (s[index]) {
-        case '"':
-            return index + 1;
-
-        case '\\':
-            if (s[index + 1] == 0)
-                return index + 1;
-
-            index += 2;
-            break;
-
-        case 0:
-            return index;
-
-        default:
-            index += 1;
-        }
-    }
-}
-
-static int bypass_char(const char * s, int index)
-{
-    // index is just after the '
-    for (;;) {
-        switch (s[index]) {
-        case '\'':
-            return index + 1;
-
-        case '\\':
-            if (s[index + 1] == 0)
-                return index + 1;
-
-            index += 2;
-            break;
-
-        case 0:
-            return index;
-
-        default:
-            index += 1;
-        }
-    }
-}
-
-static int bypass_cpp_comment(const char * s, int index)
-{
-    // index is just after the //
-    const char * p = strchr(s, '\n');
-
-    return (p == 0)
-           ? index + strlen(s + index)
-           : p - s;
-}
-
-static int bypass_c_comment(const char * s, int index)
-{
-    // index is just after the /*
-    for (;;) {
-        switch (s[index]) {
-        case '*':
-            if (s[index + 1] == '/')
-                return index + 2;
-
-            break;
-
-        case 0:
-            return index;
-        }
-
-        index += 1;
-    }
-}
-
-static int supOf(const char * s, int index)
-{
-    // return the index after of the parameter form
-    // s at least contains ${)}
-    int ouvr = 0;
-
-    for (;;) {
-        switch (s[index]) {
-        case '$':
-            if (strncmp(s + index, "${)}", 4) == 0)
-                return index;
-
-            index += 1;
-            break;
-
-        case '(':
-        case '[':
-        case '{':
-            ouvr += 1;
-            index += 1;
-            break;
-
-        case ')':
-        case ']':
-        case '}':
-            ouvr -= 1;
-            index += 1;
-            break;
-
-        case '"':
-            index = bypass_string(s, index + 1);
-            break;
-
-        case '\'':
-            index = bypass_char(s, index + 1);
-            break;
-
-        case '/':
-            switch (s[index + 1]) {
-            case '/':
-                index = bypass_cpp_comment(s, index + 2);
-                break;
-
-            case '*':
-                index = bypass_c_comment(s, index + 2);
-                break;
-
-            default:
-                index += 1;
-            }
-
-            break;
-
-        case 0:
-            // in case ${)} is in a comment etc ...
-            return index;
-
-        case ',':
-            if (ouvr == 0)
-                return index;
-
-            // no break
-        default:
-            index += 1;
-        }
-    }
-}
-
-static int param_begin(QString s, int rank)
-{
-    // return position of ',' or '}' (inside ${(}),
-    // or '$' (inside ${)}) or -1 on error
-    const char * p = s;
-    const char * b = strstr(p, "${(}");
-
-    if ((b == 0) || (strstr(b + 4, "${)}") == 0))
-        return -1;
-
-    int index  = (b - p) + 3;	// '}'
-
-    while (rank != 0) {
-        int end = supOf(p, index + 1);
-
-        switch (p[end]) {
-        case ',':
-            index = end;
-            break;
-
-        case '$': // ${)}
-            return (rank == 1) ? end : -1;
-
-        default:
-            return -1;
-        }
-
-        rank -= 1;
-    }
-
-    return index;
-}
-
-static void renumber(QString & form, int rank,
-                     int delta, bool equal = FALSE)
-{
-    int index = form.find("${(}");
-
-    if (index == -1)
-        return;
-
-    index += 4;
-
-    int index_sup = form.find("${)}", index);
-
-    while (index < index_sup) {
-        index = form.find("${", index);
-
-        if (index == -1)
-            break;
-
-        int index2 = form.find('}', index + 3);
-        QString n = form.mid(index + 3, index2 - index - 3);
-        bool ok = FALSE;
-        int r = n.toInt(&ok);
-
-        if (!ok || ((equal) ? (r != rank) : (r < rank)))
-            index = index2 + 1;
-        else {
-            char nn[16];
-
-            sprintf(nn, "%d", r + delta);
-            form.replace(index + 3, n.length(), nn);
-            index = form.find('}', index + 3) + 1;
-        }
-    }
-}
 
 void OperationDialog::force_param(int rank, bool recompute)
 {
@@ -4583,12 +4431,12 @@ void OperationDialog::force_param(int rank, bool recompute)
     switch (unique) {
     case CppView: {
         QString theo =
-            GenerationSettings::cpp(the_type(table->type(rank), list, nodes),
-                                    table->dir(rank), rank);
+                GenerationSettings::cpp(the_type(table->type(rank), list, nodes),
+                                        table->dir(rank), rank);
 
         s = cppTab->ui->edCppDeclProto->text();
 
-        if ((s.find(t) == -1) && (s.find(p) == -1)) {
+        if ((s.indexOf(t) == -1) && (s.indexOf(p) == -1)) {
             add_param(s, rank, theo + QString(v));
             cppTab->ui->edCppDeclProto->setText(s);
         }
@@ -4599,7 +4447,7 @@ void OperationDialog::force_param(int rank, bool recompute)
 
         s = cppTab->ui->edCppDefProto->text();
 
-        if ((s.find(t) == -1) && (s.find(p) == -1)) {
+        if ((s.indexOf(t) == -1) && (s.indexOf(p) == -1)) {
             add_param(s, rank, theo);
             cppTab->ui->edCppDefProto->setText(s);
         }
@@ -4608,12 +4456,12 @@ void OperationDialog::force_param(int rank, bool recompute)
             cppTab->ui->edCppDefProto->setText(s);
         }
     }
-    break;
+        break;
 
     case JavaView:
         s = edjavadef->text();
 
-        if ((s.find(t) == -1) && (s.find(p) == -1)) {
+        if ((s.indexOf(t) == -1) && (s.indexOf(p) == -1)) {
             add_param(s, rank, QString(t) + QString(" ") + QString(p));
             edjavadef->setText(s);
         }
@@ -4623,7 +4471,7 @@ void OperationDialog::force_param(int rank, bool recompute)
     case PhpView:
         s = edphpdef->text();
 
-        if (s.find(p) == -1) {
+        if (s.indexOf(p) == -1) {
             add_param(s, rank, QString(p) + QString(v));
             edphpdef->setText(s);
         }
@@ -4633,7 +4481,7 @@ void OperationDialog::force_param(int rank, bool recompute)
     case PythonView:
         s = edpythondef->text();
 
-        if (s.find(p) == -1) {
+        if (s.indexOf(p) == -1) {
             add_param(s, rank, QString(p) + QString(v));
             edpythondef->setText(s);
         }
@@ -4643,7 +4491,7 @@ void OperationDialog::force_param(int rank, bool recompute)
     case IdlView:
         s = edidldecl->text();
 
-        if ((s.find(t) == -1) && (s.find(p) == -1)) {
+        if ((s.indexOf(t) == -1) && (s.indexOf(p) == -1)) {
             char d[16];
 
             sprintf(d, "${d%d}", rank);
@@ -4660,7 +4508,7 @@ void OperationDialog::force_param(int rank, bool recompute)
 
 void OperationDialog::add_param(QString & form, int rank, QString s)
 {
-    int index = param_begin(form, rank);
+    int index = OperationFuncs::param_begin(form, rank);
 
     if (index == -1)
         return;
@@ -4681,12 +4529,12 @@ void OperationDialog::add_param(QString & form, int rank, QString s)
 
 void OperationDialog::replace_param(QString & form, int rank, QString s)
 {
-    int index_start = param_begin(form, rank);
+    int index_start = OperationFuncs::param_begin(form, rank);
 
     if (index_start == -1)
         return;
 
-    const char * p = form;
+    const char * p = form.toLatin1().constData();
 
     switch (p[index_start]) {
     case '$':
@@ -4704,7 +4552,7 @@ void OperationDialog::replace_param(QString & form, int rank, QString s)
         index_start += 1;
     }
 
-    int index_sup = supOf(p, index_start);
+    int index_sup = OperationFuncs::supOf(p, index_start);
 
     switch (p[index_sup]) {
     case ',':
@@ -4754,7 +4602,7 @@ void OperationDialog::insert_param(int rank, MultiLineEdit * ed)
     // just renumber
     QString form = ed->text();
 
-    renumber(form, rank, 1);
+    OperationFuncs::renumber(form, rank, 1);
     ed->setText(form);
 }
 
@@ -4792,12 +4640,12 @@ QString OperationDialog::delete_param(int rank, MultiLineEdit * ed)
 {
     // remove
     QString form = ed->text();
-    int index = param_begin(form, rank);
+    int index = OperationFuncs::param_begin(form, rank);
 
     if (index == -1)
         return "";
 
-    const char * p = form;
+    const char * p = form.toLatin1().constData();
     int index_sup;
 
     switch (p[index]) {
@@ -4807,12 +4655,12 @@ QString OperationDialog::delete_param(int rank, MultiLineEdit * ed)
         return "";
 
     case ',':
-        index_sup = supOf(p, index + 1);
+        index_sup = OperationFuncs::supOf(p, index + 1);
         break;
 
     default: // first param, index point to '}' ending ${(}
         index += 1;
-        index_sup = supOf(p, index);
+        index_sup = OperationFuncs::supOf(p, index);
         break;
     }
 
@@ -4856,7 +4704,7 @@ QString OperationDialog::delete_param(int rank, MultiLineEdit * ed)
     form.remove(index, index_sup - index);
 
     // renumber
-    renumber(form, rank, -1);
+    OperationFuncs::renumber(form, rank, -1);
 
     ed->setText(form);
     return result;
@@ -4900,11 +4748,11 @@ void OperationDialog::move_param(int old_rank, int new_rank,
         return;
 
     s = "${(}" + s + "${)}";
-    renumber(s, old_rank, new_rank - old_rank, TRUE);
+    OperationFuncs::renumber(s, old_rank, new_rank - old_rank, TRUE);
 
     QString form = ed->text();
 
-    renumber(form, new_rank, 1);
+    OperationFuncs::renumber(form, new_rank, 1);
     add_param(form, new_rank, s.mid(4, s.length() - 8));
 
     ed->setText(form);
@@ -4931,28 +4779,33 @@ ParamsTable::ParamsTable(OperationData * o, QWidget * parent,
     int index;
     int sup = o->get_n_params();
 
-    setSorting(-1);
+    setSortingEnabled(false);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
-    horizontalHeader()->setLabel(0, TR("Direction"));
-    horizontalHeader()->setLabel(1, TR("Name"));
-    horizontalHeader()->setLabel(2, TR("Type"));
-    horizontalHeader()->setLabel(3, TR("Default value"));
-
+    verticalHeader()->setSectionsMovable(true);
+    QStringList headerList;
+    headerList<<tr("Direction")
+             <<tr("Name")
+            <<tr("Type")
+           <<tr("Default value");
+
+    m_delegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(0,m_delegate);
+    setItemDelegateForColumn(2,m_delegate);
     if (isReadOnly) {
         for (index = 0; index < sup; index += 1) {
-            setItem(index, 0, new TableItem(this, Q3TableItem::Never, stringify(o->get_param_dir(index))));
-            setItem(index, 1, new TableItem(this, Q3TableItem::Never, o->get_param_name(index)));
-            setItem(index, 2, new TableItem(this, Q3TableItem::Never, o->get_param_type(index).get_full_type()));
-            setItem(index, 3, new TableItem(this, Q3TableItem::Never, o->get_param_default_value(index)));
+            setItem(index, 0, new TableItem(TableItem::Never, stringify(o->get_param_dir(index)), TableItem::TableItemType));
+            setItem(index, 1, new TableItem(TableItem::Never, o->get_param_name(index), TableItem::TableItemType));
+            setItem(index, 2, new TableItem(TableItem::Never, o->get_param_type(index).get_full_type(), TableItem::TableItemType));
+            setItem(index, 3, new TableItem(TableItem::Never, o->get_param_default_value(index), TableItem::TableItemType));
         }
     }
     else {
-        horizontalHeader()->setLabel(4, TR("do"));
+        //setHorizontalHeaderLabel(4, TR("do"));
+        headerList << tr("do");
 
         alltypes = GenerationSettings::basic_types();
         ((ClassData *)((BrowserNode *) o->get_browser_node()->parent())->get_data())
-        ->addFormals(alltypes);
+                ->addFormals(alltypes);
 
         for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
             alltypes.append(*it);
@@ -4969,34 +4822,34 @@ ParamsTable::ParamsTable(OperationData * o, QWidget * parent,
         }
 
         for (index = 0; index < sup; index += 1) {
-            setItem(index, 0, new ComboItem(this, stringify(o->get_param_dir(index)), DirList, FALSE));
+            setItem(index, 0, new ComboItem(stringify(o->get_param_dir(index)), DirList, FALSE));
             setText(index, 1, o->get_param_name(index));
-            setItem(index, 2, new ComboItem(this, o->get_param_type(index).get_full_type(), alltypes));
+            setItem(index, 2, new ComboItem(o->get_param_type(index).get_full_type(), alltypes));
             setText(index, 3, o->get_param_default_value(index));
             setText(index, 4, QString());
         }
 
-        setItem(index, 0, new ComboItem(this, stringify(UmlIn), DirList, FALSE));
+        setItem(index, 0, new ComboItem(stringify(UmlIn), DirList, FALSE));
         setText(index, 1, QString());
-        setItem(index, 2, new ComboItem(this, QString(), alltypes));
+        setItem(index, 2, new ComboItem(QString(), alltypes));
         setText(index, 3, QString());
         setText(index, 4, QString());
     }
-
-    adjustColumn(0);
+    setHorizontalHeaderLabels(headerList);
+    ////adjustColumn(0);
     //setColumnStretchable (1, TRUE);
-    horizontalHeader()->setResizeEnabled(TRUE, 1);
+    //  horizontalHeader()->setResizeEnabled(TRUE, 1);
     setColumnStretchable(2, TRUE);
     //setColumnStretchable (3, TRUE);
-    horizontalHeader()->setResizeEnabled(TRUE, 3);
+    // horizontalHeader()->setResizeEnabled(TRUE, 3);
 
     if (!isReadOnly) {
-        adjustColumn(4);
+        //adjustColumn(4);
         setColumnStretchable(4, FALSE);
 
-        connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-                this, SLOT(button_pressed(int, int, int, const QPoint &)));
-        connect(this, SIGNAL(valueChanged(int, int)),
+        connect(this, SIGNAL(pressed(QModelIndex)),
+                this, SLOT(button_pressed(QModelIndex)));
+        connect(this, SIGNAL(cellChanged(int, int)),
                 this, SLOT(value_changed(int, int)));
     }
 }
@@ -5006,13 +4859,13 @@ void ParamsTable::update(OperationData *o, const QStringList &list, OperationDia
 
     if (!isReadOnly)
     {
-        if(numCols() == 4)
-            insertColumns(4);
-        horizontalHeader()->setLabel(4, TR("do"));
+        if(columnCount() == 4)
+            insertColumn(4);
+        setHorizontalHeaderLabel(4, tr("do"));
     }
     else
     {
-        if(numCols() == 5)
+        if(columnCount() == 5)
             removeColumn(4);
     }
 
@@ -5020,39 +4873,39 @@ void ParamsTable::update(OperationData *o, const QStringList &list, OperationDia
     int index;
     int sup = o->get_n_params();
 
-    setSorting(-1);
+    setSortingEnabled(false);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
+    verticalHeader()->setSectionsMovable(true);
 
-    disconnect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
-    disconnect(this, SIGNAL(valueChanged(int, int)),
-            this, SLOT(value_changed(int, int)));
+    disconnect(this, SIGNAL(pressed(QModelIndex)),
+               this, SLOT(button_pressed(QModelIndex)));
+    disconnect(this, SIGNAL(cellChanged(int, int)),
+               this, SLOT(value_changed(int, int)));
 
-    int rowCount = numRows();
-    for (index = rowCount - 1; index > sup; index -= 1)
+    int rowC = rowCount();
+    for (index = rowC - 1; index > sup; index -= 1)
         removeRow(index);
 
     if (isReadOnly)
     {
         for (index = 0; index < sup; index += 1)
         {
-            if(index == numRows())
-                insertRows(numRows());
+            if(index == rowCount())
+                insertRow(rowCount());
 
-            setItem(index, 0, new TableItem(this, Q3TableItem::Never, stringify(o->get_param_dir(index))));
-            setItem(index, 1, new TableItem(this, Q3TableItem::Never, o->get_param_name(index)));
-            setItem(index, 2, new TableItem(this, Q3TableItem::Never, o->get_param_type(index).get_full_type()));
-            setItem(index, 3, new TableItem(this, Q3TableItem::Never, o->get_param_default_value(index)));
+            setItem(index, 0, new TableItem(TableItem::Never, stringify(o->get_param_dir(index)), TableItem::TableItemType));
+            setItem(index, 1, new TableItem(TableItem::Never, o->get_param_name(index), TableItem::TableItemType));
+            setItem(index, 2, new TableItem(TableItem::Never, o->get_param_type(index).get_full_type(), TableItem::TableItemType));
+            setItem(index, 3, new TableItem(TableItem::Never, o->get_param_default_value(index), TableItem::TableItemType));
         }
     }
     else
     {
-        horizontalHeader()->setLabel(4, TR("do"));
+        setHorizontalHeaderLabel(4, tr("do"));
 
         alltypes = GenerationSettings::basic_types();
         ((ClassData *)((BrowserNode *) o->get_browser_node()->parent())->get_data())
-        ->addFormals(alltypes);
+                ->addFormals(alltypes);
 
         for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
             alltypes.append(*it);
@@ -5071,42 +4924,42 @@ void ParamsTable::update(OperationData *o, const QStringList &list, OperationDia
 
         for (index = 0; index < sup; index += 1)
         {
-            if(index == numRows())
-                insertRows(numRows());
+            if(index == rowCount())
+                insertRow(rowCount());
 
-            setItem(index, 0, new ComboItem(this, stringify(o->get_param_dir(index)), DirList, FALSE));
+            setItem(index, 0, new ComboItem(stringify(o->get_param_dir(index)), DirList, FALSE));
             setText(index, 1, o->get_param_name(index));
-            setItem(index, 2, new ComboItem(this, o->get_param_type(index).get_full_type(), alltypes));
+            setItem(index, 2, new ComboItem(o->get_param_type(index).get_full_type(), alltypes));
             setText(index, 3, o->get_param_default_value(index));
             setText(index, 4, QString());
         }
 
         //int columnCount = numCols();
-        if(index == numRows())
-            insertRows(numRows());
-        setItem(index, 0, new ComboItem(this, stringify(UmlIn), DirList, FALSE));
+        if(index == rowCount())
+            insertRow(rowCount());
+        setItem(index, 0, new ComboItem(stringify(UmlIn), DirList, FALSE));
         setText(index, 1, QString());
-        setItem(index, 2, new ComboItem(this, QString(), alltypes));
+        setItem(index, 2, new ComboItem(QString(), alltypes));
         setText(index, 3, QString());
         setText(index, 4, QString());
 
 
 
-        connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-                this, SLOT(button_pressed(int, int, int, const QPoint &)));
-        connect(this, SIGNAL(valueChanged(int, int)),
+        connect(this, SIGNAL(pressed(QModelIndex)),
+                this, SLOT(button_pressed(QModelIndex)));
+        connect(this, SIGNAL(cellChanged(int, int)),
                 this, SLOT(value_changed(int, int)));
     }
 
-    adjustColumn(0);
+    ////adjustColumn(0);
     //setColumnStretchable (1, TRUE);
-    horizontalHeader()->setResizeEnabled(TRUE, 1);
+    // horizontalHeader()->setResizeEnabled(TRUE, 1);
     setColumnStretchable(2, TRUE);
     //setColumnStretchable (3, TRUE);
-    horizontalHeader()->setResizeEnabled(TRUE, 3);
+    //horizontalHeader()->setResizeEnabled(TRUE, 3);
 
     if (!isReadOnly) {
-        adjustColumn(4);
+        //adjustColumn(4);
         setColumnStretchable(4, FALSE);
     }
 }
@@ -5118,12 +4971,12 @@ void ParamsTable::activateNextCell()
 
     if (col == 3) {
         // goto next line
-        if (++row == numRows()) {
+        if (++row == rowCount()) {
             // adds a new line
-            setNumRows(row + 1);
-            setItem(row, 0, new ComboItem(this, stringify(UmlIn), DirList, FALSE));
+            setRowCount(row + 1);
+            setItem(row, 0, new ComboItem(stringify(UmlIn), DirList, FALSE));
             setText(row, 1, QString());
-            setItem(row, 2, new ComboItem(this, QString(), alltypes));
+            setItem(row, 2, new ComboItem(QString(), alltypes));
             setText(row, 3, QString());
             setText(row, 4, QString());
         }
@@ -5136,177 +4989,154 @@ void ParamsTable::activateNextCell()
 
 void ParamsTable::value_changed(int row, int col)
 {
-    if ((row == (numRows() - 1)) && (col != 0) && !text(row, col).isEmpty())
+    if ((row == (rowCount() - 1)) && (col != 0) && !text(row, col).isEmpty())
         insert_row_after(row);
 
     if ((col <= 3) && (!text(row, 1).isEmpty() || !text(row, 2).isEmpty()))
         dialog->force_param(row, col != 1);
 }
 
-void ParamsTable::button_pressed(int row, int col, int, const QPoint &)
+void ParamsTable::button_pressed(const QModelIndex &index)
 {
+    int row = index.row();
+    int col = index.column();
     if (col == 4) {
         int n = nparams();
         char s[16];
-        Q3PopupMenu m;
+        QMenu m;
 
         sprintf(s, "%d", row + 1);
-        m.insertItem(TR("param %1", s), -1);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("param %1").arg(s), -1);
+        m.addSeparator();
 
         if (row < n) {
-            m.insertItem(TR("Insert param before"), 0);
-            m.insertItem(TR("Insert param after"), 1);
-            m.insertSeparator();
-            m.insertItem(TR("Delete param"), 2);
-            m.insertSeparator();
-            m.insertItem(TR("Copy param"), 3);
-            m.insertItem(TR("Cut param"), 4);
+            MenuFactory::addItem(m, tr("Insert param before"), 0);
+            MenuFactory::addItem(m, tr("Insert param after"), 1);
+            m.addSeparator();
+            MenuFactory::addItem(m, tr("Delete param"), 2);
+            m.addSeparator();
+            MenuFactory::addItem(m, tr("Copy param"), 3);
+            MenuFactory::addItem(m, tr("Cut param"), 4);
         }
 
         if (!name_copy.isEmpty() || !type_copy.isEmpty())
-            m.insertItem(TR("Paste param"), 5);
+            MenuFactory::addItem(m, tr("Paste param"), 5);
 
-        Q3PopupMenu mv;
+        QMenu mv;
         int rank;
 
         if (row < n) {
             for (rank = 0; rank != n; rank += 1)
                 if (rank != row)
-                    mv.insertItem(QString::number(rank + 1), 10 + rank);
+                    MenuFactory::addItem(mv, QString::number(rank + 1), 10 + rank);
 
-            if (mv.count() != 0) {
-                m.insertSeparator();
-                m.insertItem(TR("Move param"), &mv);
+            if (mv.actions().count() != 0) {
+                m.addSeparator();
+                MenuFactory::insertItem(m, tr("Move param"), &mv);
             }
         }
+        QAction *retAction = m.exec(QCursor::pos());
+        if(retAction)
+            switch (rank = retAction->data().toInt()) {
+            case 0:
+                insert_row_before(row);
+                dialog->insert_param(row);
+                dialog->force_param(row, TRUE);
+                break;
 
-        switch (rank = m.exec(QCursor::pos())) {
-        case 0:
-            insert_row_before(row);
-            dialog->insert_param(row);
-            dialog->force_param(row, TRUE);
-            break;
+            case 1:
+                insert_row_after(row);
+                dialog->insert_param(row + 1);
+                dialog->force_param(row + 1, TRUE);
+                break;
 
-        case 1:
-            insert_row_after(row);
-            dialog->insert_param(row + 1);
-            dialog->force_param(row + 1, TRUE);
-            break;
+            case 2:
+                delete_row(row);
+                dialog->delete_param(row);
+                break;
 
-        case 2:
-            delete_row(row);
-            dialog->delete_param(row);
-            break;
+            case 3:
+                copy_row(row);
+                break;
 
-        case 3:
-            copy_row(row);
-            break;
+            case 4:
+                cut_row(row);
+                dialog->delete_param(row);
+                break;
 
-        case 4:
-            cut_row(row);
-            dialog->delete_param(row);
-            break;
+            case 5:
+                paste_row(row);
+                dialog->force_param(row, TRUE);
+                break;
 
-        case 5:
-            paste_row(row);
-            dialog->force_param(row, TRUE);
-            break;
+            default:
+                if (rank >= 10) {
+                    move_row(row, rank - 10);
+                    dialog->move_param(row, rank - 10);
+                }
 
-        default:
-            if (rank >= 10) {
-                move_row(row, rank - 10);
-                dialog->move_param(row, rank - 10);
+                break;
             }
-
-            break;
-        }
     }
 }
 
 void ParamsTable::insert_row_before(int row)
 {
-    int n = numRows();
-    int index;
-
-    setNumRows(n + 1);
-
-    for (index = n; index != row; index -= 1) {
-        Q3TableItem * it;
-
-        it = item(index - 1, 0);
-        takeItem(it);
-        setItem(index, 0, it);
-        setText(index, 1, text(index - 1, 1));
-        it = item(index - 1, 2);
-        takeItem(it);
-        setItem(index, 2, it);
-        setText(index, 3, text(index - 1, 3));
-    }
-
-    setItem(row, 0, new ComboItem(this, stringify(UmlIn), DirList, FALSE));
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row);
+    setItem(row, 0, new ComboItem(stringify(UmlIn), DirList, FALSE));
     setText(row, 1, QString());
-    setItem(row, 2, new ComboItem(this, QString(), alltypes));
+    setItem(row, 2, new ComboItem(QString(), alltypes));
     setText(row, 3, QString());
     setText(row, 4, QString());
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void ParamsTable::insert_row_after(int row)
 {
-    int n = numRows();
-    int index;
-
-    setNumRows(n + 1);
-
-    for (index = n; index > row + 1; index -= 1) {
-        Q3TableItem * it;
-
-        it = item(index - 1, 0);
-        takeItem(it);
-        setItem(index, 0, it);
-        setText(index, 1, text(index - 1, 1));
-        it = item(index - 1, 2);
-        takeItem(it);
-        setItem(index, 2, it);
-        setText(index, 3, text(index - 1, 3));
-    }
-
-    setItem(row + 1, 0, new ComboItem(this, stringify(UmlIn), DirList, FALSE));
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row+1);
+    setItem(row + 1, 0, new ComboItem(stringify(UmlIn), DirList, FALSE));
     setText(row + 1, 1, QString());
-    setItem(row + 1, 2, new ComboItem(this, QString(), alltypes));
+    setItem(row + 1, 2, new ComboItem(QString(), alltypes));
     setText(row + 1, 3, QString());
     setText(row + 1, 4, QString());
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void ParamsTable::delete_row(int row)
 {
-    int n = numRows();
+    int n = rowCount();
     int index;
 
-    clearCellWidget(row, 1);
+    removeCellWidget(row, 1);
 
     if (row == (n - 1)) {
         // the last line : empty it
-        setItem(row, 0, new ComboItem(this, stringify(UmlIn), DirList, FALSE));
+        setItem(row, 0, new ComboItem(stringify(UmlIn), DirList, FALSE));
         setText(row, 1, QString());
-        setItem(row, 2, new ComboItem(this, QString(), alltypes));
+        setItem(row, 2, new ComboItem(QString(), alltypes));
         setText(row, 3, QString());
     }
     else {
         for (index = row; index != n - 1; index += 1) {
-            Q3TableItem * it;
+            QTableWidgetItem * it;
 
             it = item(index + 1, 0);
-            takeItem(it);
+            takeItem(it->row(), it->column());
             setItem(index, 0, it);
             setText(index, 1, text(index + 1, 1));
             it = item(index + 1, 2);
-            takeItem(it);
+            takeItem(it->row(), it->column());
             setItem(index, 2, it);
             setText(index, 3, text(index + 1, 3));
         }
 
-        setNumRows(n - 1);
+        setRowCount(n - 1);
     }
 }
 
@@ -5331,10 +5161,10 @@ void ParamsTable::paste_row(int row)
     setText(row, 2, type_copy);
     setText(row, 3, default_value_copy);
 
-    if ((row == (numRows() - 1)) &&
-        (!dir_copy.isEmpty() ||
-         !name_copy.isEmpty() ||
-         !type_copy.isEmpty()))
+    if ((row == (rowCount() - 1)) &&
+            (!dir_copy.isEmpty() ||
+             !name_copy.isEmpty() ||
+             !type_copy.isEmpty()))
         insert_row_after(row);
 }
 
@@ -5371,15 +5201,15 @@ void ParamsTable::update(OperationData * oper,
     oper->set_n_params(n);
 
     for (index = 0; index != n; index += 1) {
-        oper->set_param_dir(index, (UmlParamDirection) DirList.findIndex(text(index, 0)));
+        oper->set_param_dir(index, (UmlParamDirection) DirList.indexOf(text(index, 0)));
 
-        oper->set_param_name(index, text(index, 1).stripWhiteSpace());
+        oper->set_param_name(index, text(index, 1).trimmed().toLatin1().constData());
 
         AType t;
-        QString s = text(index, 2).stripWhiteSpace();
+        QString s = text(index, 2).trimmed();
 
         if (! s.isEmpty()) {
-            int rank = types.findIndex(s);
+            int rank = types.indexOf(s);
 
             if (rank != -1)
                 t.type = (BrowserClass *) nodes.at(rank);
@@ -5389,13 +5219,13 @@ void ParamsTable::update(OperationData * oper,
 
         oper->set_param_type(index, t);
 
-        oper->set_param_default_value(index, text(index, 3).stripWhiteSpace());
+        oper->set_param_default_value(index, text(index, 3).trimmed().toLatin1().constData());
     }
 }
 
 unsigned ParamsTable::nparams() const
 {
-    int n = numRows();
+    int n = rowCount();
 
     while (n && text(n - 1, 1).isEmpty() && text(n - 1, 2).isEmpty())
         n -= 1;
@@ -5415,7 +5245,7 @@ QString ParamsTable::type(unsigned rank) const
 
 UmlParamDirection ParamsTable::dir(unsigned rank) const
 {
-    return (UmlParamDirection) DirList.findIndex(text(rank, 0));
+    return (UmlParamDirection) DirList.indexOf(text(rank, 0));
 }
 
 QString ParamsTable::value(unsigned rank) const
@@ -5461,55 +5291,138 @@ QStringList ParamsTable::all_values()
 QString ExceptionsTable::type_copy;
 
 ExceptionsTable::ExceptionsTable(OperationData * o, QWidget * parent,
-                                 const QStringList & list, bool visit)
+                                 QStringList & list, bool visit)
     : MyTable(o->get_n_exceptions() + 1, (visit) ? 1 : 2, parent), types(list)
 {
     int index;
     int sup = o->get_n_exceptions();
 
-    setSorting(-1);
+    setSortingEnabled(false);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
-    horizontalHeader()->setLabel(0, TR("Type"));
+    verticalHeader()->setSectionsMovable(true);
+    setHorizontalHeaderLabel(0, tr("Type"));
 
-    if (visit) {
+
+    m_delegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(0,m_delegate);
+    if (visit)
+    {
         for (index = 0; index < sup; index += 1)
-            setItem(index, 0, new TableItem(this, Q3TableItem::Never, o->get_exception(index).get_full_type()));
+            setItem(index, 0, new TableItem(TableItem::Never, o->get_exception(index).get_full_type(), TableItem::TableItemType));
     }
     else {
-        horizontalHeader()->setLabel(1, TR("do"));
+        setHorizontalHeaderLabel(1, tr("do"));
 
         for (index = 0; index < sup; index += 1) {
-            setItem(index, 0, new ComboItem(this, o->get_exception(index).get_full_type(), types));
+            setItem(index, 0, new ComboItem(o->get_exception(index).get_full_type(), types));
             setText(index, 1, QString());
         }
 
-        setItem(index, 0, new ComboItem(this, QString(), types));
+        setItem(index, 0, new ComboItem(QString(), types));
         setText(index, 1, QString());
     }
 
     setColumnStretchable(0, TRUE);
 
     if (!visit) {
-        adjustColumn(1);
+        //adjustColumn(1);
         setColumnStretchable(1, FALSE);
 
-        connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-                this, SLOT(button_pressed(int, int, int, const QPoint &)));
-        connect(this, SIGNAL(valueChanged(int, int)),
+        connect(this, SIGNAL(pressed(QModelIndex)),
+                this, SLOT(button_pressed(QModelIndex)));
+        connect(this, SIGNAL(cellChanged(int, int)),
                 this, SLOT(value_changed(int, int)));
     }
 }
 
+void ExceptionsTable::Reinitialize(OperationData *o, QStringList &list, bool isWritable)
+{
+    types = list;
+    int oldRowCount = rowCount()-1;
+    for (int index =  oldRowCount; index > -1; index -= 1) {
+        removeRow(index);
+    }
+    int sup = o->get_n_exceptions();
+    setRowCount(sup+1);
+
+    if (!isWritable)
+    {
+        disconnect(this, SIGNAL(pressed(QModelIndex)),
+                   this, SLOT(button_pressed(QModelIndex)));
+        disconnect(this, SIGNAL(cellChanged(int, int)),
+                   this, SLOT(value_changed(int, int)));
+        setColumnCount(1);
+        for (int index = 0; index < sup; index += 1)
+            setItem(index, 0, new TableItem(TableItem::Never, o->get_exception(index).get_full_type(), TableItem::TableItemType));
+    }
+    else
+    {
+        setColumnCount(2);
+        setHorizontalHeaderLabel(1, tr("do"));
+        setColumnStretchable(1, FALSE);
+        //adjustColumn(1);
+
+        int index;
+        for (index = 0; index < sup; index += 1) {
+            setItem(index, 0, new ComboItem(o->get_exception(index).get_full_type(), types));
+            setText(index, 1, QString());
+        }
+
+        setItem(index, 0, new ComboItem(QString(), types));
+        setText(index, 1, QString());
+
+        //disconnect if already connected
+        disconnect(this, SIGNAL(pressed(QModelIndex)),
+                this, SLOT(button_pressed(QModelIndex)));
+        connect(this, SIGNAL(pressed(QModelIndex)),
+                this, SLOT(button_pressed(QModelIndex)));
+        //disconnect if already connected
+        disconnect(this, SIGNAL(cellChanged(int, int)),
+                this, SLOT(value_changed(int, int)));
+        connect(this, SIGNAL(cellChanged(int, int)),
+                this, SLOT(value_changed(int, int)));
+
+    }
+
+}
+
+
+void ExceptionsTable::update(OperationData * oper,
+                             BrowserNodeList & nodes)
+{
+    forceUpdateCells();
+
+    int n = nexceptions();
+    int index;
+
+    oper->set_n_exceptions(n);
+
+    for (index = 0; index != n; index += 1) {
+        AType t;
+        QString s = text(index, 0).trimmed();
+
+        if (!s.isEmpty()) {
+            int rank = types.indexOf(s);
+
+            if (rank != -1)
+                t.type = (BrowserClass *) nodes.at(rank);
+            else
+                t.explicit_type = s;
+        }
+
+        oper->set_exception(index, t);
+    }
+}
+
 void ExceptionsTable::activateNextCell()
 {
     int row = currentRow();
 
     // goto next line
-    if (++row == numRows()) {
+    if (++row == rowCount()) {
         // adds a new line
-        setNumRows(row + 1);
-        setItem(row, 0, new ComboItem(this, QString(), types));
+        setRowCount(row + 1);
+        setItem(row, 0, new ComboItem(QString(), types));
         setText(row, 1, QString());
     }
 
@@ -5518,138 +5431,155 @@ void ExceptionsTable::activateNextCell()
 
 void ExceptionsTable::value_changed(int row, int col)
 {
-    if ((row == (numRows() - 1)) && !text(row, col).isEmpty())
+    if ((row == (rowCount() - 1)) && !text(row, col).isEmpty())
         insert_row_after(row);
 }
 
-void ExceptionsTable::button_pressed(int row, int col, int, const QPoint &)
+void ExceptionsTable::button_pressed(const QModelIndex &index)
 {
+    if(!index.isValid())
+        return;
+    int row = index.row();
+    int col = index.column();
     if (col == 1) {
         int n = nexceptions();
         char s[16];
-        Q3PopupMenu m;
+        QMenu m;
 
         sprintf(s, "%d", row + 1);
-        m.insertItem(TR("exception %1", s), -1);
-        m.insertSeparator();
+        MenuFactory::addItem(m, tr("exception %1").arg(s), -1);
+        m.addSeparator();
 
         if (row < n) {
-            m.insertItem(TR("Insert exception before"), 0);
-            m.insertItem(TR("Insert exception after"), 1);
-            m.insertSeparator();
-            m.insertItem(TR("Delete exception"), 2);
-            m.insertSeparator();
-            m.insertItem(TR("Copy exception"), 3);
-            m.insertItem(TR("Cut exception"), 4);
+            MenuFactory::addItem(m, tr("Insert exception before"), 0);
+            MenuFactory::addItem(m, tr("Insert exception after"), 1);
+            m.addSeparator();
+            MenuFactory::addItem(m, tr("Delete exception"), 2);
+            m.addSeparator();
+            MenuFactory::addItem(m, tr("Copy exception"), 3);
+            MenuFactory::addItem(m, tr("Cut exception"), 4);
         }
 
         if (!type_copy.isEmpty())
-            m.insertItem(TR("Paste exception"), 5);
+            MenuFactory::addItem(m, tr("Paste exception"), 5);
 
-        Q3PopupMenu mv;
+        QMenu mv;
         int rank;
 
         if (row < n) {
             for (rank = 0; rank != n; rank += 1)
                 if (rank != row)
-                    mv.insertItem(QString::number(rank + 1), 10 + rank);
+                    MenuFactory::addItem(mv, QString::number(rank + 1), 10 + rank);
 
-            if (mv.count() != 0) {
-                m.insertSeparator();
-                m.insertItem(TR("Move exception"), &mv);
+            if (mv.actions().count() != 0) {
+                m.addSeparator();
+                MenuFactory::insertItem(m, tr("Move exception"), &mv);
             }
         }
 
-        switch (rank = m.exec(QCursor::pos())) {
-        case 0:
-            insert_row_before(row);
-            break;
+        QAction *retAction = m.exec(QCursor::pos());
+        if(retAction)
+            switch (rank = retAction->data().toInt()){
+            case 0:
+                insert_row_before(row);
+                break;
 
-        case 1:
-            insert_row_after(row);
-            break;
+            case 1:
+                insert_row_after(row);
+                break;
 
-        case 2:
-            delete_row(row);
-            break;
+            case 2:
+                delete_row(row);
+                break;
 
-        case 3:
-            copy_row(row);
-            break;
+            case 3:
+                copy_row(row);
+                break;
 
-        case 4:
-            cut_row(row);
-            break;
+            case 4:
+                cut_row(row);
+                break;
 
-        case 5:
-            paste_row(row);
-            break;
+            case 5:
+                paste_row(row);
+                break;
 
-        default:
-            if (rank >= 10)
-                move_row(row, rank - 10);
+            default:
+                if (rank >= 10)
+                    move_row(row, rank - 10);
 
-            break;
-        }
+                break;
+            }
     }
 }
 
 void ExceptionsTable::insert_row_before(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index != row; index -= 1) {
-        Q3TableItem * it = item(index - 1, 0);
-
-        takeItem(it);
-        setItem(index, 0, it);
-    }
+        QTableWidgetItem * it = item(index - 1, 0);
 
-    setItem(row, 0, new ComboItem(this, QString(), types));
+        if(it)
+        {
+            takeItem(it->row(), it->column());
+            setItem(index, 0, it);
+        }
+    }*/
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row);
+    setItem(row, 0, new ComboItem(QString(), types));
     setText(row, 1, QString());
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void ExceptionsTable::insert_row_after(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index > row + 1; index -= 1) {
-        Q3TableItem * it = item(index - 1, 0);
+        QTableWidgetItem * it = item(index - 1, 0);
 
-        takeItem(it);
+        takeItem(it->row(), it->column());
         setItem(index, 0, it);
-    }
-
-    setItem(row + 1, 0, new ComboItem(this, QString(), types));
+    }*/
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row+1);
+    setItem(row + 1, 0, new ComboItem(QString(), types));
     setText(row + 1, 1, QString());
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void ExceptionsTable::delete_row(int row)
 {
-    int n = numRows();
+    int n = rowCount();
     int index;
 
-    clearCellWidget(row, 1);
+    removeCellWidget(row, 1);
 
     if (row == (n - 1)) {
         // the last line : empty it
-        setItem(0, 0, new ComboItem(this, QString(), types));
+        setItem(0, 0, new ComboItem(QString(), types));
         setText(0, 1, QString());
     }
     else {
         for (index = row; index != n - 1; index += 1) {
-            Q3TableItem * it = item(index + 1, 0);
-            takeItem(it);
+            QTableWidgetItem * it = item(index + 1, 0);
+            takeItem(it->row(), it->column());
             setItem(index, 0, it);
         }
 
-        setNumRows(n - 1);
+        setRowCount(n - 1);
     }
 }
 
@@ -5668,7 +5598,7 @@ void ExceptionsTable::paste_row(int row)
 {
     setText(row, 0, type_copy);
 
-    if ((row == (numRows() - 1)) && !type_copy.isEmpty())
+    if ((row == (rowCount() - 1)) && !type_copy.isEmpty())
         insert_row_after(row);
 }
 
@@ -5688,36 +5618,10 @@ void ExceptionsTable::move_row(int from, int to)
     type_copy = save_type_copy;
 }
 
-void ExceptionsTable::update(OperationData * oper,
-                             BrowserNodeList & nodes)
-{
-    forceUpdateCells();
-
-    int n = nexceptions();
-    int index;
-
-    oper->set_n_exceptions(n);
-
-    for (index = 0; index != n; index += 1) {
-        AType t;
-        QString s = text(index, 0).stripWhiteSpace();
-
-        if (!s.isEmpty()) {
-            int rank = types.findIndex(s);
-
-            if (rank != -1)
-                t.type = (BrowserClass *) nodes.at(rank);
-            else
-                t.explicit_type = s;
-        }
-
-        oper->set_exception(index, t);
-    }
-}
 
 unsigned ExceptionsTable::nexceptions() const
 {
-    int n = numRows();
+    int n = rowCount();
 
     while (n && text(n - 1, 0).isEmpty())
         n -= 1;
@@ -5748,45 +5652,52 @@ CppParamsTable::CppParamsTable(ParamsTable * p, MultiLineEdit * f,
     : MyTable(0, (decl) ? 8 : 7, parent), params(p), edform(f), dcl(decl)
 {
 
-    setSorting(-1);
+    m_delegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(1,m_delegate);
+    setItemDelegateForColumn(2,m_delegate);
+    setItemDelegateForColumn(3,m_delegate);
+    setItemDelegateForColumn(4,m_delegate);
+    setItemDelegateForColumn(5,m_delegate);
+
+    setSortingEnabled(false);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
-    horizontalHeader()->setLabel(0, TR("Name"));
-    horizontalHeader()->setLabel(1, TR("Specifier"));
-    horizontalHeader()->setLabel(2, "${t<i>}");
-    horizontalHeader()->setLabel(3, TR("Pointer"));
-    horizontalHeader()->setLabel(4, "${p<i>}");
+    verticalHeader()->setSectionsMovable(true);
+    setHorizontalHeaderLabel(0, tr("Name"));
+    setHorizontalHeaderLabel(1, tr("Specifier"));
+    setHorizontalHeaderLabel(2, "${t<i>}");
+    setHorizontalHeaderLabel(3, tr("Pointer"));
+    setHorizontalHeaderLabel(4, "${p<i>}");
 
     if (decl) {
-        horizontalHeader()->setLabel(5, "${v<i>}");
-        horizontalHeader()->setLabel(6, TR("Modifier"));
-        horizontalHeader()->setLabel(7, TR("do"));
+        setHorizontalHeaderLabel(5, "${v<i>}");
+        setHorizontalHeaderLabel(6, tr("Modifier"));
+        setHorizontalHeaderLabel(7, tr("do"));
     }
     else {
-        horizontalHeader()->setLabel(5, TR("Modifier"));
-        horizontalHeader()->setLabel(6, TR("do"));
+        setHorizontalHeaderLabel(5, tr("Modifier"));
+        setHorizontalHeaderLabel(6, tr("do"));
     }
 
     setColumnStretchable(0, TRUE);
     setColumnStretchable(1, TRUE);
     setColumnStretchable(2, TRUE);
-    adjustColumn(3);
+    //adjustColumn(3);
     setColumnStretchable(4, TRUE);
     setColumnStretchable(5, TRUE);
 
     if (decl) {
         setColumnStretchable(6, TRUE);
-        adjustColumn(7);
+        //adjustColumn(7);
         setColumnStretchable(7, FALSE);
     }
     else {
-        adjustColumn(6);
+        //adjustColumn(6);
         setColumnStretchable(6, FALSE);
     }
 
     QString form = edform->text();
     //the presence of ${(} and ${)} was checked
-    int form_index = form.find("${(}") + 4;
+    int form_index = form.indexOf("${(}") + 4;
     int tbl_index = 0;
 
     while (extract(tbl_index, form_index, form)) {
@@ -5797,8 +5708,8 @@ CppParamsTable::CppParamsTable(ParamsTable * p, MultiLineEdit * f,
     if (tbl_index == 0)
         insert_row_before(0);
 
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
 
     if (SpecifierList.isEmpty()) {
         SpecifierList.append("");
@@ -5817,7 +5728,7 @@ CppParamsTable::CppParamsTable(ParamsTable * p, MultiLineEdit * f,
     ParamRankList.clear();
     ValueRankList.clear();
 
-    for (int rank = 0; rank != params->numRows(); rank += 1) {
+    for (int rank = 0; rank != params->rowCount(); rank += 1) {
         if (!params->name(rank).isEmpty() || !params->type(rank).isEmpty()) {
             QString s;
 
@@ -5833,14 +5744,14 @@ CppParamsTable::CppParamsTable(ParamsTable * p, MultiLineEdit * f,
 
 void CppParamsTable::init_row(int row)
 {
-    setItem(row, 0, new Q3TableItem(this, Q3TableItem::Never, QString()));
-    setItem(row, 1, new ComboItem(this, QString(), SpecifierList));
-    setItem(row, 2, new ComboItem(this, QString(), TypeRankList));
-    setItem(row, 3, new ComboItem(this, QString(), PtrList));
-    setItem(row, 4, new ComboItem(this, QString(), ParamRankList));
+    setItem(row, 0, new QTableWidgetItem(/*this, TableItem::Never,*/ QString()));
+    setItem(row, 1, new ComboItem(QString(), SpecifierList));
+    setItem(row, 2, new ComboItem(QString(), TypeRankList));
+    setItem(row, 3, new ComboItem(QString(), PtrList));
+    setItem(row, 4, new ComboItem(QString(), ParamRankList));
 
     if (dcl) {
-        setItem(row, 5, new ComboItem(this, QString(), ValueRankList));
+        setItem(row, 5, new ComboItem(QString(), ValueRankList));
         setText(row, 6, QString());
         setText(row, 7, QString());
     }
@@ -5856,9 +5767,9 @@ bool CppParamsTable::extract(int tblindex, int & strindex, QString s)
     while (s.at(strindex).isSpace())
         strindex += 1;
 
-    int sup = supOf(s, strindex);
+    int sup = OperationFuncs::supOf(s.toLatin1().constData(), strindex);
 
-    if (s.mid(strindex, sup - strindex).stripWhiteSpace().isEmpty())
+    if (s.mid(strindex, sup - strindex).trimmed().isEmpty())
         return FALSE;
 
     QString specifier;
@@ -5866,86 +5777,86 @@ bool CppParamsTable::extract(int tblindex, int & strindex, QString s)
     QString ptr;
     QString p_i;
     QString modifier;
-    int index = s.find("${t", strindex);
+    int index = s.indexOf("${t", strindex);
 
     if ((index == -1) || (index >= sup)) {
         // no $type
-        index = s.find("${p", strindex);
+        index = s.indexOf("${p", strindex);
 
         if ((index == -1) || (index >= sup))
             // no $type, no $name
-            specifier = s.mid(strindex, sup - strindex).stripWhiteSpace();
+            specifier = s.mid(strindex, sup - strindex).trimmed();
         else {
             // no $type
-            t_i = s.mid(strindex, index - strindex).stripWhiteSpace();
+            t_i = s.mid(strindex, index - strindex).trimmed();
 
             // extract ptr
-            int ip = t_i.find('*');
-            int ir = t_i.find('&');
+            int ip = t_i.indexOf('*');
+            int ir = t_i.indexOf('&');
 
             if (ip != -1) {
                 if ((ir != -1) && (ir < ip)) {
-                    ptr = t_i.mid(ir).stripWhiteSpace();
-                    t_i = t_i.left(ir).stripWhiteSpace();
+                    ptr = t_i.mid(ir).trimmed();
+                    t_i = t_i.left(ir).trimmed();
                 }
                 else  {
-                    ptr = t_i.mid(ip).stripWhiteSpace();
-                    t_i = t_i.left(ip).stripWhiteSpace();
+                    ptr = t_i.mid(ip).trimmed();
+                    t_i = t_i.left(ip).trimmed();
                 }
             }
             else if (ir != -1) {
-                ptr = t_i.mid(ir).stripWhiteSpace();
-                t_i = t_i.left(ir).stripWhiteSpace();
+                ptr = t_i.mid(ir).trimmed();
+                t_i = t_i.left(ir).trimmed();
             }
 
-            if (((strindex = s.find('}', index + 2)) == -1) || (strindex >= sup))
+            if (((strindex = s.indexOf('}', index + 2)) == -1) || (strindex >= sup))
                 return FALSE;
             else {
                 strindex += 1;
                 p_i = s.mid(index, strindex - index);
-                modifier = s.mid(strindex, sup - strindex).stripWhiteSpace();
+                modifier = s.mid(strindex, sup - strindex).trimmed();
             }
         }
     }
     else {
-        specifier = s.mid(strindex, index - strindex).stripWhiteSpace();
+        specifier = s.mid(strindex, index - strindex).trimmed();
 
-        if (((strindex = s.find('}', index + 2)) == -1) || (strindex >= sup))
+        if (((strindex = s.indexOf('}', index + 2)) == -1) || (strindex >= sup))
             return FALSE;
 
         strindex += 1;
         t_i = s.mid(index, strindex - index);
 
-        index = s.find("${p", strindex);
+        index = s.indexOf("${p", strindex);
 
         if ((index == -1) || (index >= sup))
             // unnamed
-            modifier = s.mid(strindex, sup - strindex).stripWhiteSpace();
+            modifier = s.mid(strindex, sup - strindex).trimmed();
         else {
-            ptr = s.mid(strindex, index - strindex).stripWhiteSpace();
+            ptr = s.mid(strindex, index - strindex).trimmed();
 
-            if (((strindex = s.find('}', index + 2)) == -1) || (strindex >= sup))
+            if (((strindex = s.indexOf('}', index + 2)) == -1) || (strindex >= sup))
                 return FALSE;
             else {
                 strindex += 1;
                 p_i = s.mid(index, strindex - index);
-                modifier = s.mid(strindex, sup - strindex).stripWhiteSpace();
+                modifier = s.mid(strindex, sup - strindex).trimmed();
             }
         }
     }
 
-    setNumRows(tblindex + 1);
+    setRowCount(tblindex + 1);
 
-    setItem(tblindex, 1, new ComboItem(this, specifier, SpecifierList));
-    setItem(tblindex, 2, new ComboItem(this, t_i, TypeRankList));
-    setItem(tblindex, 3, new ComboItem(this, ptr, PtrList));
-    setItem(tblindex, 4, new ComboItem(this, p_i, ParamRankList));
+    setItem(tblindex, 1, new ComboItem(specifier, SpecifierList));
+    setItem(tblindex, 2, new ComboItem(t_i, TypeRankList));
+    setItem(tblindex, 3, new ComboItem(ptr, PtrList));
+    setItem(tblindex, 4, new ComboItem(p_i, ParamRankList));
 
     if (dcl) {
         QString v_i;
 
         if ((modifier.length() >= 5) && (modifier.left(3) == "${v")) {
-            if ((strindex = modifier.find('}', 3)) == -1)
+            if ((strindex = modifier.indexOf('}', 3)) == -1)
                 return FALSE;
             else {
                 strindex += 1;
@@ -5954,7 +5865,7 @@ bool CppParamsTable::extract(int tblindex, int & strindex, QString s)
             }
         }
 
-        setItem(tblindex, 5, new ComboItem(this, v_i, ValueRankList));
+        setItem(tblindex, 5, new ComboItem(v_i, ValueRankList));
         setText(tblindex, 6, modifier);
     }
     else
@@ -5965,9 +5876,9 @@ bool CppParamsTable::extract(int tblindex, int & strindex, QString s)
     return TRUE;
 }
 
-void CppParamsTable::setItem(int row, int col, Q3TableItem * item)
+void CppParamsTable::setItem(int row, int col, QTableWidgetItem *item)
 {
-    Q3Table::setItem(row, col, item);
+    QTableWidget::setItem(row, col, item);
 
     if ((col == 2) || (col == 4))
         update_name(row);
@@ -5975,13 +5886,13 @@ void CppParamsTable::setItem(int row, int col, Q3TableItem * item)
 
 void CppParamsTable::setCurrentCell(int row, int col)
 {
-    Q3Table::setCurrentCell(row, col);
+    QTableWidget::setCurrentCell(row, col);
     update_names();
 }
 
 void CppParamsTable::update_names()
 {
-    int n = numRows();
+    int n = rowCount();
     int row;
 
     for (row = 0; row != n; row += 1)
@@ -5996,197 +5907,214 @@ void CppParamsTable::update_name(int row)
     unsigned p_i;
 
     if (!text(row, 2).isEmpty() &&
-        (sscanf((const char *) text(row, 2), "${t%u}", &t_i) == 1))
+            (sscanf((const char *) text(row, 2).toLatin1().constData(), "${t%u}", &t_i) == 1))
         t_set = TRUE;
     else
         t_set = FALSE;
 
     if (!text(row, 4).isEmpty() &&
-        (sscanf((const char *) text(row, 4), "${p%u}", &p_i) == 1))
+            (sscanf((const char *) text(row, 4).toLatin1().constData(), "${p%u}", &p_i) == 1))
         p_set = TRUE;
     else
         p_set = FALSE;
 
     if (t_set) {
         if (p_set)
-            Q3Table::setItem(row, 0,
-                             new Q3TableItem(this, Q3TableItem::Never,
-                                             ((t_i == p_i) && (t_i < params->nparams()))
-                                             ? params->name(t_i) : QString()));
+            QTableWidget::setItem(row, 0,
+                                  new QTableWidgetItem(/*this, TableItem::Never,*/
+                                                       ((t_i == p_i) && (t_i < params->nparams()))
+                                                       ? params->name(t_i) : QString()));
         else
-            Q3Table::setItem(row, 0,
-                             new Q3TableItem(this, Q3TableItem::Never,
-                                             (t_i < params->nparams())
-                                             ? params->name(t_i) : QString()));
+            QTableWidget::setItem(row, 0,
+                                  new QTableWidgetItem(/*this, TableItem::Never,*/
+                                                       (t_i < params->nparams())
+                                                       ? params->name(t_i) : QString()));
     }
     else
-        Q3Table::setItem(row, 0,
-                         new Q3TableItem(this, Q3TableItem::Never,
-                                         (p_set && (p_i < params->nparams()))
-                                         ? params->name(p_i) : QString()));
+        QTableWidget::setItem(row, 0,
+                              new QTableWidgetItem(/*this, TableItem::Never,*/
+                                                   (p_set && (p_i < params->nparams()))
+                                                   ? params->name(p_i) : QString()));
 }
 
-void CppParamsTable::button_pressed(int row, int col, int, const QPoint &)
+void CppParamsTable::button_pressed(const QModelIndex &index)
 {
+    int row = index.row();
+    int col = index.column();
     if (col == ((dcl) ? 7 : 6)) {
         char s[16];
-        Q3PopupMenu m;
+        QMenu m;
 
         sprintf(s, "%d", row + 1);
-        m.insertItem(TR("param %1", s), -1);
-        m.insertSeparator();
-        m.insertItem(TR("Insert param before"), 0);
-        m.insertItem(TR("Insert param after"), 1);
-        m.insertSeparator();
-        m.insertItem(TR("Delete param"), 2);
-        m.insertSeparator();
-        m.insertItem(TR("Copy param"), 3);
-        m.insertItem(TR("Cut param"), 4);
-        m.insertItem(TR("Paste param"), 5);
-        m.insertSeparator();
-
-        Q3PopupMenu mv;
+        MenuFactory::addItem(m, tr("param %1").arg(s), -1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Insert param before"), 0);
+        MenuFactory::addItem(m, tr("Insert param after"), 1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Delete param"), 2);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Copy param"), 3);
+        MenuFactory::addItem(m, tr("Cut param"), 4);
+        MenuFactory::addItem(m, tr("Paste param"), 5);
+        m.addSeparator();
+
+        QMenu mv;
         int rank;
 
-        for (rank = 0; rank != numRows(); rank += 1)
+        for (rank = 0; rank != rowCount(); rank += 1)
             if (rank != row)
-                mv.insertItem(QString::number(rank + 1), 10 + rank);
+                MenuFactory::addItem(mv, QString::number(rank + 1), 10 + rank);
 
-        m.insertItem(TR("Move param"), &mv);
-        m.insertSeparator();
+        MenuFactory::insertItem(m, tr("Move param"), &mv);
+        m.addSeparator();
 
-        Q3PopupMenu rk;
+        QMenu rk;
         int t_i;
         int p_i;
         int v_i;
 
         if (text(row, 2).isEmpty() ||
-            (sscanf((const char *) text(row, 2), "${t%d}", &t_i) != 1))
+                (sscanf((const char *) text(row, 2).toLatin1().constData(), "${t%d}", &t_i) != 1))
             t_i = -1;
 
         if (text(row, 4).isEmpty() ||
-            (sscanf((const char *) text(row, 4), "${p%d}", &p_i) != 1))
+                (sscanf((const char *) text(row, 4).toLatin1().constData(), "${p%d}", &p_i) != 1))
             p_i = -1;
 
         if (!dcl ||
-            text(row, 5).isEmpty() ||
-            (sscanf((const char *) text(row, 5), "${v%d}", &v_i) != 1))
+                text(row, 5).isEmpty() ||
+                (sscanf((const char *) text(row, 5).toLatin1().constData(), "${v%d}", &v_i) != 1))
             v_i = -1;
 
-        for (rank = 0; rank != params->numRows(); rank += 1)
+        for (rank = 0; rank != params->rowCount(); rank += 1)
             if ((!params->name(rank).isEmpty() || !params->type(rank).isEmpty()) &&
-                ((rank != t_i) || (rank != p_i)))
-                rk.insertItem(QString::number(rank), 100 + rank);
+                    ((rank != t_i) || (rank != p_i)))
+                MenuFactory::addItem(rk,QString::number(rank), 100 + rank);
 
-        m.insertItem(TR("Set rank <i>"), &rk);
+        MenuFactory::insertItem(m, tr("Set rank <i>"), &rk);
 
-        switch (rank = m.exec(QCursor::pos())) {
-        case 0:
-            insert_row_before(row);
-            break;
+        QAction *retAction = m.exec(QCursor::pos());
+        if(retAction)
+            switch (rank = retAction->data().toInt()) {
+            case 0:
+                insert_row_before(row);
+                break;
 
-        case 1:
-            insert_row_after(row);
-            break;
+            case 1:
+                insert_row_after(row);
+                break;
 
-        case 2:
-            delete_row(row);
-            break;
+            case 2:
+                delete_row(row);
+                break;
 
-        case 3:
-            copy_row(row);
-            break;
+            case 3:
+                copy_row(row);
+                break;
 
-        case 4:
-            cut_row(row);
-            break;
+            case 4:
+                cut_row(row);
+                break;
 
-        case 5:
-            paste_row(row);
-            break;
+            case 5:
+                paste_row(row);
+                break;
 
-        default:
-            if (rank >= 100) {
-                char s[32];
+            default:
+                if (rank >= 100) {
+                    char s[32];
 
-                if (t_i != -1) {
-                    sprintf(s, "${t%d}", rank - 100);
-                    setItem(row, 2, new ComboItem(this, s, TypeRankList));
-                }
+                    if (t_i != -1) {
+                        sprintf(s, "${t%d}", rank - 100);
+                        setItem(row, 2, new ComboItem(s, TypeRankList));
+                    }
 
-                if (p_i != -1) {
-                    sprintf(s, "${p%d}", rank - 100);
-                    setItem(row, 4, new ComboItem(this, s, ParamRankList));
-                }
+                    if (p_i != -1) {
+                        sprintf(s, "${p%d}", rank - 100);
+                        setItem(row, 4, new ComboItem(s, ParamRankList));
+                    }
 
-                if (v_i != -1) {
-                    sprintf(s, "${v%d}", rank - 100);
-                    setItem(row, 5, new ComboItem(this, s, ParamRankList));
+                    if (v_i != -1) {
+                        sprintf(s, "${v%d}", rank - 100);
+                        setItem(row, 5, new ComboItem(s, ParamRankList));
+                    }
                 }
-            }
-            else if (rank >= 10)
-                move_row(row, rank - 10);
+                else if (rank >= 10)
+                    move_row(row, rank - 10);
 
-            break;
-        }
+                break;
+            }
     }
 }
 
 void CppParamsTable::insert_row_before(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
     int col;
     int mcol = ((dcl) ? 6 : 5);
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index != row; index -= 1) {
         for (col = 0; col != mcol; col += 1) {
-            Q3TableItem * it = item(index - 1, col);
+            QTableWidgetItem * it = item(index - 1, col);
 
-            takeItem(it);
-            setItem(index, col, it);
+            if(it)
+            {
+                takeItem(it->row(), it->column());
+                setItem(index, col, it);
+            }
         }
 
         setText(index, mcol, text(index - 1, mcol));
         setText(index, mcol + 1, text(index - 1, mcol + 1));
     }
-
+    */
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row);
     init_row(row);
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void CppParamsTable::insert_row_after(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
     int col;
     int mcol = ((dcl) ? 6 : 5);
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index > row + 1; index -= 1) {
         for (col = 0; col != mcol; col += 1) {
-            Q3TableItem * it = item(index - 1, col);
+            QTableWidgetItem * it = item(index - 1, col);
 
-            takeItem(it);
+            takeItem(it->row(), it->column());
             setItem(index, col, it);
         }
 
         setText(index, mcol, text(index - 1, col));
         setText(index, mcol + 1, text(index - 1, col));
     }
-
+    */
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row+1);
     init_row(row + 1);
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void CppParamsTable::delete_row(int row)
 {
-    int n = numRows();
+    int n = rowCount();
     int index;
     int col;
 
-    clearCellWidget(row, 1);
+    removeCellWidget(row, 1);
 
     if (row == (n - 1)) {
         // the last line : empty it
@@ -6197,9 +6125,9 @@ void CppParamsTable::delete_row(int row)
 
         for (index = row; index != n - 1; index += 1) {
             for (col = 0; col != mcol; col += 1) {
-                Q3TableItem * it = item(index + 1, col);
+                QTableWidgetItem * it = item(index + 1, col);
 
-                takeItem(it);
+                takeItem(it->row(), it->column());
                 setItem(index, col, it);
             }
 
@@ -6207,7 +6135,7 @@ void CppParamsTable::delete_row(int row)
             setText(index, mcol + 1, text(index + 1, col));
         }
 
-        setNumRows(n - 1);
+        setRowCount(n - 1);
     }
 }
 
@@ -6264,7 +6192,7 @@ void CppParamsTable::update_edform()
     QString s;
     const char * sep = "";
 
-    int n = numRows();
+    int n = rowCount();
     int index;
     int mcol = ((dcl) ? 6 : 5);
 
@@ -6293,7 +6221,7 @@ void CppParamsTable::update_edform()
                 p += " " + text(index, mcol);
         }
 
-        p = p.stripWhiteSpace();
+        p = p.trimmed();
 
         if (! p.isEmpty()) {
             s += sep + p;
@@ -6303,9 +6231,9 @@ void CppParamsTable::update_edform()
 
     QString form = edform->text();
 
-    index = form.find("${(}");
+    index = form.indexOf("${(}");
 
-    form.replace(index + 4, form.find("${)}") - index - 4, s);
+    form.replace(index + 4, form.indexOf("${)}") - index - 4, s);
     edform->setText(form);
 }
 
@@ -6317,21 +6245,22 @@ QSize CppParamsDialog::previous_size;
 
 CppParamsDialog::CppParamsDialog(QWidget * parent, ParamsTable * params,
                                  MultiLineEdit * form, bool decl)
-    : QDialog(parent, "C++ parameters dialog", TRUE)
+    : QDialog(parent/*, "C++ parameters dialog", TRUE*/)
 {
-    setCaption(TR("C++ parameters dialog"));
+    setWindowTitle(tr("C++ parameters dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
     tbl = new CppParamsTable(params, form, this, decl);
     vbox->addWidget(tbl);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -6352,7 +6281,7 @@ CppParamsDialog::~CppParamsDialog()
 
 void CppParamsDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -6379,26 +6308,32 @@ PhpParamsTable::PhpParamsTable(QWidget * parent, ParamsTable * p, MultiLineEdit
     : MyTable(0, 6, parent), params(p), edform(f)
 {
 
-    setSorting(-1);
+    m_delegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(1,m_delegate);
+    setItemDelegateForColumn(2,m_delegate);
+    setItemDelegateForColumn(3,m_delegate);
+    setItemDelegateForColumn(4,m_delegate);
+
+    setSortingEnabled(false);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
-    horizontalHeader()->setLabel(0, TR("Name"));
-    horizontalHeader()->setLabel(1, "${t<i>}/array");
-    horizontalHeader()->setLabel(2, TR("Ref."));
-    horizontalHeader()->setLabel(3, "${p<i>}");
-    horizontalHeader()->setLabel(4, "${v<i>}");
-    horizontalHeader()->setLabel(5, TR("do"));
+    verticalHeader()->setSectionsMovable(true);
+    setHorizontalHeaderLabel(0, tr("Name"));
+    setHorizontalHeaderLabel(1, "${t<i>}/array");
+    setHorizontalHeaderLabel(2, tr("Ref."));
+    setHorizontalHeaderLabel(3, "${p<i>}");
+    setHorizontalHeaderLabel(4, "${v<i>}");
+    setHorizontalHeaderLabel(5, tr("do"));
     setColumnStretchable(0, TRUE);
     setColumnStretchable(1, TRUE);
-    adjustColumn(2);
+    //adjustColumn(2);
     setColumnStretchable(3, TRUE);
     setColumnStretchable(4, TRUE);
-    adjustColumn(5);
+    //adjustColumn(5);
 
 
     QString form = edform->text();
     //the presence of ${(} and ${)} was checked
-    int form_index = form.find("${(}") + 4;
+    int form_index = form.indexOf("${(}") + 4;
     int tbl_index = 0;
 
     while (extract(tbl_index, form_index, form)) {
@@ -6409,8 +6344,8 @@ PhpParamsTable::PhpParamsTable(QWidget * parent, ParamsTable * p, MultiLineEdit
     if (tbl_index == 0)
         insert_row_before(0);
 
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
 
     if (PhpRefList.isEmpty()) {
         PhpRefList.append("");
@@ -6421,7 +6356,7 @@ PhpParamsTable::PhpParamsTable(QWidget * parent, ParamsTable * p, MultiLineEdit
     PhpParamRankList.clear();
     PhpValueRankList.clear();
 
-    for (int rank = 0; rank != params->numRows(); rank += 1) {
+    for (int rank = 0; rank != params->rowCount(); rank += 1) {
         if (!params->name(rank).isEmpty() || !params->type(rank).isEmpty()) {
             QString s;
 
@@ -6434,16 +6369,16 @@ PhpParamsTable::PhpParamsTable(QWidget * parent, ParamsTable * p, MultiLineEdit
         }
     }
 
-    PhpTypeRankList.append(TR("array"));
+    PhpTypeRankList.append(tr("array"));
 }
 
 void PhpParamsTable::init_row(int row)
 {
-    setItem(row, 0, new Q3TableItem(this, Q3TableItem::Never, QString()));
-    setItem(row, 1, new ComboItem(this, QString(), PhpTypeRankList));
-    setItem(row, 2, new ComboItem(this, QString(), PhpRefList));
-    setItem(row, 3, new ComboItem(this, QString(), PhpParamRankList));
-    setItem(row, 4, new ComboItem(this, QString(), PhpValueRankList));
+    setItem(row, 0, new QTableWidgetItem(/*this, TableItem::Never,*/ QString()));
+    setItem(row, 1, new ComboItem(QString(), PhpTypeRankList));
+    setItem(row, 2, new ComboItem(QString(), PhpRefList));
+    setItem(row, 3, new ComboItem(QString(), PhpParamRankList));
+    setItem(row, 4, new ComboItem(QString(), PhpValueRankList));
     setText(row, 5, QString());
 }
 
@@ -6453,34 +6388,34 @@ bool PhpParamsTable::extract(int tblindex, int & strindex, QString s)
     while (s.at(strindex).isSpace())
         strindex += 1;
 
-    int sup = supOf(s, strindex);
+    int sup = OperationFuncs::supOf(s.toLatin1().constData(), strindex);
 
-    if (s.mid(strindex, sup - strindex).stripWhiteSpace().isEmpty())
+    if (s.mid(strindex, sup - strindex).trimmed().isEmpty())
         return FALSE;
 
     QString t_i;
     QString ptr;
     QString p_i;
     QString v_i;
-    int index = s.find("${t", strindex);
+    int index = s.indexOf("${t", strindex);
 
     if ((index == -1) || (index >= sup)) {
         // no $type
-        index = s.find("${p", strindex);
+        index = s.indexOf("${p", strindex);
 
         if ((index != -1) && (index < sup)) {
             // no $type, have name
-            t_i = s.mid(strindex, index - strindex).stripWhiteSpace();
+            t_i = s.mid(strindex, index - strindex).trimmed();
 
             // extract ptr
-            int ir = t_i.find('&');
+            int ir = t_i.indexOf('&');
 
             if (ir != -1) {
-                ptr = t_i.mid(ir).stripWhiteSpace();
-                t_i = t_i.left(ir).stripWhiteSpace();
+                ptr = t_i.mid(ir).trimmed();
+                t_i = t_i.left(ir).trimmed();
             }
 
-            if (((strindex = s.find('}', index + 2)) == -1) || (strindex >= sup))
+            if (((strindex = s.indexOf('}', index + 2)) == -1) || (strindex >= sup))
                 return FALSE;
             else {
                 strindex += 1;
@@ -6490,19 +6425,19 @@ bool PhpParamsTable::extract(int tblindex, int & strindex, QString s)
         }
     }
     else {
-        if (((strindex = s.find('}', index + 2)) == -1) || (strindex >= sup))
+        if (((strindex = s.indexOf('}', index + 2)) == -1) || (strindex >= sup))
             return FALSE;
 
         strindex += 1;
         t_i = s.mid(index, strindex - index);
 
-        index = s.find("${p", strindex);
+        index = s.indexOf("${p", strindex);
 
         if ((index != -1) && (index < sup)) {
             // named
-            ptr = s.mid(strindex, index - strindex).stripWhiteSpace();
+            ptr = s.mid(strindex, index - strindex).trimmed();
 
-            if (((strindex = s.find('}', index + 2)) == -1) || (strindex >= sup))
+            if (((strindex = s.indexOf('}', index + 2)) == -1) || (strindex >= sup))
                 return FALSE;
             else {
                 strindex += 1;
@@ -6513,7 +6448,7 @@ bool PhpParamsTable::extract(int tblindex, int & strindex, QString s)
     }
 
     if ((v_i.length() >= 5) && (v_i.left(3) == "${v")) {
-        if ((strindex = v_i.find('}', 3)) == -1)
+        if ((strindex = v_i.indexOf('}', 3)) == -1)
             return FALSE;
         else
             v_i = v_i.left(strindex + 1);
@@ -6521,21 +6456,21 @@ bool PhpParamsTable::extract(int tblindex, int & strindex, QString s)
     else
         v_i = "";
 
-    setNumRows(tblindex + 1);
+    setRowCount(tblindex + 1);
 
-    setItem(tblindex, 1, new ComboItem(this, t_i, PhpTypeRankList));
-    setItem(tblindex, 2, new ComboItem(this, ptr, PhpRefList));
-    setItem(tblindex, 3, new ComboItem(this, p_i, PhpParamRankList));
-    setItem(tblindex, 4, new ComboItem(this, v_i, PhpValueRankList));
+    setItem(tblindex, 1, new ComboItem(t_i, PhpTypeRankList));
+    setItem(tblindex, 2, new ComboItem(ptr, PhpRefList));
+    setItem(tblindex, 3, new ComboItem(p_i, PhpParamRankList));
+    setItem(tblindex, 4, new ComboItem(v_i, PhpValueRankList));
 
     strindex = (s.at(sup) == QChar(',')) ? sup + 1 : sup;
 
     return TRUE;
 }
 
-void PhpParamsTable::setItem(int row, int col, Q3TableItem * item)
+void PhpParamsTable::setItem(int row, int col, QTableWidgetItem * item)
 {
-    Q3Table::setItem(row, col, item);
+    QTableWidget::setItem(row, col, item);
 
     if ((col == 1) || (col == 3))
         update_name(row);
@@ -6543,13 +6478,13 @@ void PhpParamsTable::setItem(int row, int col, Q3TableItem * item)
 
 void PhpParamsTable::setCurrentCell(int row, int col)
 {
-    Q3Table::setCurrentCell(row, col);
+    QTableWidget::setCurrentCell(row, col);
     update_names();
 }
 
 void PhpParamsTable::update_names()
 {
-    int n = numRows();
+    int n = rowCount();
     int row;
 
     for (row = 0; row != n; row += 1)
@@ -6564,192 +6499,209 @@ void PhpParamsTable::update_name(int row)
     unsigned p_i;
 
     if (!text(row, 1).isEmpty() &&
-        (sscanf((const char *) text(row, 1), "${t%u}", &t_i) == 1))
+            (sscanf((const char *) text(row, 1).toLatin1().constData(), "${t%u}", &t_i) == 1))
         t_set = TRUE;
     else
         t_set = FALSE;
 
     if (!text(row, 3).isEmpty() &&
-        (sscanf((const char *) text(row, 3), "${p%u}", &p_i) == 1))
+            (sscanf((const char *) text(row, 3).toLatin1().constData(), "${p%u}", &p_i) == 1))
         p_set = TRUE;
     else
         p_set = FALSE;
 
     if (t_set) {
         if (p_set)
-            Q3Table::setItem(row, 0,
-                             new Q3TableItem(this, Q3TableItem::Never,
-                                             ((t_i == p_i) && (t_i < params->nparams()))
-                                             ? params->name(t_i) : QString()));
+            QTableWidget::setItem(row, 0,
+                                  new QTableWidgetItem(/*this, TableItem::Never,*/
+                                                       ((t_i == p_i) && (t_i < params->nparams()))
+                                                       ? params->name(t_i) : QString()));
         else
-            Q3Table::setItem(row, 0,
-                             new Q3TableItem(this, Q3TableItem::Never,
-                                             (t_i < params->nparams())
-                                             ? params->name(t_i) : QString()));
+            QTableWidget::setItem(row, 0,
+                                  new QTableWidgetItem(/*this, TableItem::Never,*/
+                                                       (t_i < params->nparams())
+                                                       ? params->name(t_i) : QString()));
     }
     else
-        Q3Table::setItem(row, 0,
-                         new Q3TableItem(this, Q3TableItem::Never,
-                                         (p_set && (p_i < params->nparams()))
-                                         ? params->name(p_i) : QString()));
+        QTableWidget::setItem(row, 0,
+                              new QTableWidgetItem(/*this, TableItem::Never,*/
+                                                   (p_set && (p_i < params->nparams()))
+                                                   ? params->name(p_i) : QString()));
 }
 
-void PhpParamsTable::button_pressed(int row, int col, int, const QPoint &)
+void PhpParamsTable::button_pressed(const QModelIndex &index)
 {
+    int row = index.row();
+    int col = index.column();
     if (col == 5) {
         char s[16];
-        Q3PopupMenu m;
+        QMenu m;
 
         sprintf(s, "%d", row + 1);
-        m.insertItem(TR("param %1", s), -1);
-        m.insertSeparator();
-        m.insertItem(TR("Insert param before"), 0);
-        m.insertItem(TR("Insert param after"), 1);
-        m.insertSeparator();
-        m.insertItem(TR("Delete param"), 2);
-        m.insertSeparator();
-        m.insertItem(TR("Copy param"), 3);
-        m.insertItem(TR("Cut param"), 4);
-        m.insertItem(TR("Paste param"), 5);
-        m.insertSeparator();
-
-        Q3PopupMenu mv;
+        MenuFactory::addItem(m, tr("param %1").arg(s), -1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Insert param before"), 0);
+        MenuFactory::addItem(m, tr("Insert param after"), 1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Delete param"), 2);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Copy param"), 3);
+        MenuFactory::addItem(m, tr("Cut param"), 4);
+        MenuFactory::addItem(m, tr("Paste param"), 5);
+        m.addSeparator();
+
+        QMenu mv;
         int rank;
 
-        for (rank = 0; rank != numRows(); rank += 1)
+        for (rank = 0; rank != rowCount(); rank += 1)
             if (rank != row)
-                mv.insertItem(QString::number(rank + 1), 10 + rank);
+                MenuFactory::addItem(mv, QString::number(rank + 1), 10 + rank);
 
-        m.insertItem(TR("Move param"), &mv);
-        m.insertSeparator();
+        MenuFactory::insertItem(m, tr("Move param"), &mv);
+        m.addSeparator();
 
-        Q3PopupMenu rk;
+        QMenu rk;
         int t_i;
         int p_i;
         int v_i;
 
         if (text(row, 1).isEmpty() ||
-            (sscanf((const char *) text(row, 1), "${t%d}", &t_i) != 1))
+                (sscanf((const char *) text(row, 1).toLatin1().constData(), "${t%d}", &t_i) != 1))
             t_i = -1;
 
         if (text(row, 3).isEmpty() ||
-            (sscanf((const char *) text(row, 3), "${p%d}", &p_i) != 1))
+                (sscanf((const char *) text(row, 3).toLatin1().constData(), "${p%d}", &p_i) != 1))
             p_i = -1;
 
         if (text(row, 4).isEmpty() ||
-            (sscanf((const char *) text(row, 4), "${v%d}", &v_i) != 1))
+                (sscanf((const char *) text(row, 4).toLatin1().constData(), "${v%d}", &v_i) != 1))
             v_i = -1;
 
-        for (rank = 0; rank != params->numRows(); rank += 1)
+        for (rank = 0; rank != params->rowCount(); rank += 1)
             if ((!params->name(rank).isEmpty() || !params->type(rank).isEmpty()) &&
-                ((rank != t_i) || (rank != p_i)))
-                rk.insertItem(QString::number(rank), 100 + rank);
+                    ((rank != t_i) || (rank != p_i)))
+                MenuFactory::addItem(rk,QString::number(rank), 100 + rank);
 
-        m.insertItem(TR("Set rank <i>"), &rk);
+        MenuFactory::insertItem(m, tr("Set rank <i>"), &rk);
 
-        switch (rank = m.exec(QCursor::pos())) {
-        case 0:
-            insert_row_before(row);
-            break;
+        QAction *retAction = m.exec(QCursor::pos());
+        if(retAction)
+            switch (rank = retAction->data().toInt()){
+            case 0:
+                insert_row_before(row);
+                break;
 
-        case 1:
-            insert_row_after(row);
-            break;
+            case 1:
+                insert_row_after(row);
+                break;
 
-        case 2:
-            delete_row(row);
-            break;
+            case 2:
+                delete_row(row);
+                break;
 
-        case 3:
-            copy_row(row);
-            break;
+            case 3:
+                copy_row(row);
+                break;
 
-        case 4:
-            cut_row(row);
-            break;
+            case 4:
+                cut_row(row);
+                break;
 
-        case 5:
-            paste_row(row);
-            break;
+            case 5:
+                paste_row(row);
+                break;
 
-        default:
-            if (rank >= 100) {
-                char s[32];
+            default:
+                if (rank >= 100) {
+                    char s[32];
 
-                if (t_i != -1) {
-                    sprintf(s, "${t%d}", rank - 100);
-                    setItem(row, 1, new ComboItem(this, s, PhpTypeRankList));
-                }
+                    if (t_i != -1) {
+                        sprintf(s, "${t%d}", rank - 100);
+                        setItem(row, 1, new ComboItem(s, PhpTypeRankList));
+                    }
 
-                if (p_i != -1) {
-                    sprintf(s, "${p%d}", rank - 100);
-                    setItem(row, 3, new ComboItem(this, s, PhpParamRankList));
-                }
+                    if (p_i != -1) {
+                        sprintf(s, "${p%d}", rank - 100);
+                        setItem(row, 3, new ComboItem(s, PhpParamRankList));
+                    }
 
-                if (v_i != -1) {
-                    sprintf(s, "${v%d}", rank - 100);
-                    setItem(row, 4, new ComboItem(this, s, PhpValueRankList));
+                    if (v_i != -1) {
+                        sprintf(s, "${v%d}", rank - 100);
+                        setItem(row, 4, new ComboItem(s, PhpValueRankList));
+                    }
                 }
-            }
-            else if (rank >= 10)
-                move_row(row, rank - 10);
+                else if (rank >= 10)
+                    move_row(row, rank - 10);
 
-            break;
-        }
+                break;
+            }
     }
 }
 
 void PhpParamsTable::insert_row_before(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
     int col;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index != row; index -= 1) {
         for (col = 0; col != 5; col += 1) {
-            Q3TableItem * it = item(index - 1, col);
-
-            takeItem(it);
-            setItem(index, col, it);
+            QTableWidgetItem * it = item(index - 1, col);
+            if(it)
+            {
+                takeItem(it->row(), it->column());
+                setItem(index, col, it);
+            }
         }
 
         setText(index, 5, text(index - 1, 5));
     }
-
+    */
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row);
     init_row(row);
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
+
 }
 
 void PhpParamsTable::insert_row_after(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
     int col;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index > row + 1; index -= 1) {
         for (col = 0; col != 5; col += 1) {
-            Q3TableItem * it = item(index - 1, col);
+            QTableWidgetItem * it = item(index - 1, col);
 
-            takeItem(it);
+            takeItem(it->row(), it->column());
             setItem(index, col, it);
         }
 
         setText(index, 5, text(index - 1, col));
     }
-
+    */
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row+1);
     init_row(row + 1);
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void PhpParamsTable::delete_row(int row)
 {
-    int n = numRows();
+    int n = rowCount();
     int index;
     int col;
 
-    clearCellWidget(row, 1);
+    removeCellWidget(row, 1);
 
     if (row == (n - 1)) {
         // the last line : empty it
@@ -6758,16 +6710,16 @@ void PhpParamsTable::delete_row(int row)
     else {
         for (index = row; index != n - 1; index += 1) {
             for (col = 0; col != 5; col += 1) {
-                Q3TableItem * it = item(index + 1, col);
+                QTableWidgetItem * it = item(index + 1, col);
 
-                takeItem(it);
+                takeItem(it->row(), it->column());
                 setItem(index, col, it);
             }
 
             setText(index, 5, text(index + 1, col));
         }
 
-        setNumRows(n - 1);
+        setRowCount(n - 1);
     }
 }
 
@@ -6821,7 +6773,7 @@ void PhpParamsTable::update_edform()
     QString s;
     const char * sep = "";
 
-    int n = numRows();
+    int n = rowCount();
     int index;
 
     for (index = 0; index != n; index += 1) {
@@ -6842,7 +6794,7 @@ void PhpParamsTable::update_edform()
             }
         }
 
-        p = p.stripWhiteSpace();
+        p = p.trimmed();
 
         if (! p.isEmpty()) {
             s += sep + p;
@@ -6852,9 +6804,9 @@ void PhpParamsTable::update_edform()
 
     QString form = edform->text();
 
-    index = form.find("${(}");
+    index = form.indexOf("${(}");
 
-    form.replace(index + 4, form.find("${)}") - index - 4, s);
+    form.replace(index + 4, form.indexOf("${)}") - index - 4, s);
     edform->setText(form);
 }
 
@@ -6865,21 +6817,22 @@ void PhpParamsTable::update_edform()
 QSize PhpParamsDialog::previous_size;
 
 PhpParamsDialog::PhpParamsDialog(QWidget * parent, ParamsTable * params, MultiLineEdit * form)
-    : QDialog(parent, "Php parameters dialog", TRUE)
+    : QDialog(parent/*, "Php parameters dialog", TRUE*/)
 {
-    setCaption(TR("Php parameters dialog"));
+    setWindowTitle(tr("Php parameters dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
     tbl = new PhpParamsTable(this, params, form);
     vbox->addWidget(tbl);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -6900,7 +6853,7 @@ PhpParamsDialog::~PhpParamsDialog()
 
 void PhpParamsDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -6928,26 +6881,32 @@ PythonParamsTable::PythonParamsTable(QWidget * parent, ParamsTable * p, MultiLin
     : MyTable(0, 6, parent), params(p), edform(f)
 {
 
-    setSorting(-1);
+    m_delegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(1,m_delegate);
+    setItemDelegateForColumn(2,m_delegate);
+    setItemDelegateForColumn(3,m_delegate);
+    setItemDelegateForColumn(4,m_delegate);
+
+    setSortingEnabled(false);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
-    horizontalHeader()->setLabel(0, TR("Name"));
-    horizontalHeader()->setLabel(1, TR("Modifier"));
-    horizontalHeader()->setLabel(2, "${p<i>}");
-    horizontalHeader()->setLabel(3, "${t<i>}");
-    horizontalHeader()->setLabel(4, "${v<i>}");
-    horizontalHeader()->setLabel(5, TR("do"));
+    verticalHeader()->setSectionsMovable(true);
+    setHorizontalHeaderLabel(0, tr("Name"));
+    setHorizontalHeaderLabel(1, tr("Modifier"));
+    setHorizontalHeaderLabel(2, "${p<i>}");
+    setHorizontalHeaderLabel(3, "${t<i>}");
+    setHorizontalHeaderLabel(4, "${v<i>}");
+    setHorizontalHeaderLabel(5, tr("do"));
     setColumnStretchable(0, TRUE);
-    adjustColumn(1);
+    //adjustColumn(1);
     setColumnStretchable(2, TRUE);
     setColumnStretchable(3, TRUE);
     setColumnStretchable(4, TRUE);
-    adjustColumn(5);
+    //adjustColumn(5);
 
 
     QString form = edform->text();
     //the presence of ${(} and ${)} was checked
-    int form_index = form.find("${(}") + 4;
+    int form_index = form.indexOf("${(}") + 4;
     int tbl_index = 0;
 
     while (extract(tbl_index, form_index, form)) {
@@ -6958,8 +6917,8 @@ PythonParamsTable::PythonParamsTable(QWidget * parent, ParamsTable * p, MultiLin
     if (tbl_index == 0)
         insert_row_before(0);
 
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
 
     if (PythonModList.isEmpty()) {
         PythonModList.append("");
@@ -6971,7 +6930,7 @@ PythonParamsTable::PythonParamsTable(QWidget * parent, ParamsTable * p, MultiLin
     PythonTypeRankList.clear();
     PythonValueRankList.clear();
 
-    for (int rank = 0; rank != params->numRows(); rank += 1) {
+    for (int rank = 0; rank != params->rowCount(); rank += 1) {
         if (!params->name(rank).isEmpty()) {
             QString s;
 
@@ -6989,11 +6948,11 @@ PythonParamsTable::PythonParamsTable(QWidget * parent, ParamsTable * p, MultiLin
 
 void PythonParamsTable::init_row(int row)
 {
-    setItem(row, 0, new Q3TableItem(this, Q3TableItem::Never, QString()));
-    setItem(row, 1, new ComboItem(this, QString(), PythonModList));
-    setItem(row, 2, new ComboItem(this, QString(), PythonParamRankList));
-    setItem(row, 3, new ComboItem(this, QString(), PythonTypeRankList));
-    setItem(row, 4, new ComboItem(this, QString(), PythonValueRankList));
+    setItem(row, 0, new QTableWidgetItem(/*this, TableItem::Never,*/ QString()));
+    setItem(row, 1, new ComboItem(QString(), PythonModList));
+    setItem(row, 2, new ComboItem(QString(), PythonParamRankList));
+    setItem(row, 3, new ComboItem(QString(), PythonTypeRankList));
+    setItem(row, 4, new ComboItem(QString(), PythonValueRankList));
     setText(row, 5, QString());
 }
 
@@ -7003,9 +6962,9 @@ bool PythonParamsTable::extract(int tblindex, int & strindex, QString s)
     while (s.at(strindex).isSpace())
         strindex += 1;
 
-    int sup = supOf(s, strindex);
+    int sup = OperationFuncs::supOf(s.toLatin1().constData(), strindex);
 
-    if (s.mid(strindex, sup - strindex).stripWhiteSpace().isEmpty())
+    if (s.mid(strindex, sup - strindex).trimmed().isEmpty())
         return FALSE;
 
     QString p_i;
@@ -7013,19 +6972,19 @@ bool PythonParamsTable::extract(int tblindex, int & strindex, QString s)
     QString v_i;
     QString ptr;
     QString m_i;
-    int index = s.find("${p", strindex);
+    int index = s.indexOf("${p", strindex);
 
     if ((index != -1) && (index < sup)) {
         // have name
-        m_i = s.mid(strindex, index - strindex).stripWhiteSpace();
+        m_i = s.mid(strindex, index - strindex).trimmed();
 
         // extract modifier
-        if (m_i.find("**") != -1)
+        if (m_i.indexOf("**") != -1)
             m_i = "**";
-        else if (m_i.find("*") != -1)
+        else if (m_i.indexOf("*") != -1)
             m_i = "*";
 
-        if (((strindex = s.find('}', index + 2)) == -1) || (strindex >= sup))
+        if (((strindex = s.indexOf('}', index + 2)) == -1) || (strindex >= sup))
             return FALSE;
         else {
             strindex += 1;
@@ -7037,7 +6996,7 @@ bool PythonParamsTable::extract(int tblindex, int & strindex, QString s)
         return FALSE;
 
     if ((t_i.length() >= 5) && (t_i.left(3) == "${t")) {
-        if ((strindex = t_i.find('}', 3)) == -1)
+        if ((strindex = t_i.indexOf('}', 3)) == -1)
             return FALSE;
         else {
             strindex += 1;
@@ -7051,7 +7010,7 @@ bool PythonParamsTable::extract(int tblindex, int & strindex, QString s)
     }
 
     if ((v_i.length() >= 5) && (v_i.left(3) == "${v")) {
-        if ((strindex = v_i.find('}', 3)) == -1)
+        if ((strindex = v_i.indexOf('}', 3)) == -1)
             return FALSE;
         else
             v_i = v_i.left(strindex + 1);
@@ -7059,21 +7018,21 @@ bool PythonParamsTable::extract(int tblindex, int & strindex, QString s)
     else
         v_i = "";
 
-    setNumRows(tblindex + 1);
+    setRowCount(tblindex + 1);
 
-    setItem(tblindex, 1, new ComboItem(this, m_i, PythonModList));
-    setItem(tblindex, 2, new ComboItem(this, p_i, PythonParamRankList));
-    setItem(tblindex, 3, new ComboItem(this, t_i, PythonTypeRankList));
-    setItem(tblindex, 4, new ComboItem(this, v_i, PythonValueRankList));
+    setItem(tblindex, 1, new ComboItem(m_i, PythonModList));
+    setItem(tblindex, 2, new ComboItem(p_i, PythonParamRankList));
+    setItem(tblindex, 3, new ComboItem(t_i, PythonTypeRankList));
+    setItem(tblindex, 4, new ComboItem(v_i, PythonValueRankList));
 
     strindex = (s.at(sup) == QChar(',')) ? sup + 1 : sup;
 
     return TRUE;
 }
 
-void PythonParamsTable::setItem(int row, int col, Q3TableItem * item)
+void PythonParamsTable::setItem(int row, int col, QTableWidgetItem * item)
 {
-    Q3Table::setItem(row, col, item);
+    QTableWidget::setItem(row, col, item);
 
     if (col == 2)
         update_name(row);
@@ -7081,13 +7040,13 @@ void PythonParamsTable::setItem(int row, int col, Q3TableItem * item)
 
 void PythonParamsTable::setCurrentCell(int row, int col)
 {
-    Q3Table::setCurrentCell(row, col);
+    QTableWidget::setCurrentCell(row, col);
     update_names();
 }
 
 void PythonParamsTable::update_names()
 {
-    int n = numRows();
+    int n = rowCount();
     int row;
 
     for (row = 0; row != n; row += 1)
@@ -7100,172 +7059,190 @@ void PythonParamsTable::update_name(int row)
     unsigned p_i;
 
     if (!text(row, 2).isEmpty() &&
-        (sscanf((const char *) text(row, 2), "${p%u}", &p_i) == 1))
+            (sscanf((const char *) text(row, 2).toLatin1().constData(), "${p%u}", &p_i) == 1))
         p_set = TRUE;
     else
         p_set = FALSE;
 
-    Q3Table::setItem(row, 0,
-                     new Q3TableItem(this, Q3TableItem::Never,
-                                     (p_set && (p_i < params->nparams()))
-                                     ? params->name(p_i) : QString()));
+    QTableWidget::setItem(row, 0,
+                          new QTableWidgetItem(/*this, TableItem::Never,*/
+                                               (p_set && (p_i < params->nparams()))
+                                               ? params->name(p_i) : QString()));
 }
 
-void PythonParamsTable::button_pressed(int row, int col, int, const QPoint &)
+void PythonParamsTable::button_pressed(const QModelIndex &index)
 {
+    int row = index.row();
+    int col = index.column();
     if (col == 5) {
         char s[16];
-        Q3PopupMenu m;
+        QMenu m;
 
         sprintf(s, "%d", row + 1);
-        m.insertItem(TR("param %1", s), -1);
-        m.insertSeparator();
-        m.insertItem(TR("Insert param before"), 0);
-        m.insertItem(TR("Insert param after"), 1);
-        m.insertSeparator();
-        m.insertItem(TR("Delete param"), 2);
-        m.insertSeparator();
-        m.insertItem(TR("Copy param"), 3);
-        m.insertItem(TR("Cut param"), 4);
-        m.insertItem(TR("Paste param"), 5);
-        m.insertSeparator();
-
-        Q3PopupMenu mv;
+        MenuFactory::addItem(m, tr("param %1").arg(s), -1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Insert param before"), 0);
+        MenuFactory::addItem(m, tr("Insert param after"), 1);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Delete param"), 2);
+        m.addSeparator();
+        MenuFactory::addItem(m, tr("Copy param"), 3);
+        MenuFactory::addItem(m, tr("Cut param"), 4);
+        MenuFactory::addItem(m, tr("Paste param"), 5);
+        m.addSeparator();
+
+        QMenu mv;
         int rank;
 
-        for (rank = 0; rank != numRows(); rank += 1)
+        for (rank = 0; rank != rowCount(); rank += 1)
             if (rank != row)
-                mv.insertItem(QString::number(rank + 1), 10 + rank);
+                MenuFactory::addItem(mv, QString::number(rank + 1), 10 + rank);
 
-        m.insertItem(TR("Move param"), &mv);
-        m.insertSeparator();
+        MenuFactory::insertItem(m, tr("Move param"), &mv);
+        m.addSeparator();
 
-        Q3PopupMenu rk;
+        QMenu rk;
         int p_i;
         int v_i;
         int t_i;
 
         if (text(row, 2).isEmpty() ||
-            (sscanf((const char *) text(row, 2), "${p%d}", &p_i) != 1))
+                (sscanf((const char *) text(row, 2).toLatin1().constData(), "${p%d}", &p_i) != 1))
             p_i = -1;
 
         if (text(row, 3).isEmpty() ||
-            (sscanf((const char *) text(row, 3), "${t%d}", &t_i) != 1))
+                (sscanf((const char *) text(row, 3).toLatin1().constData(), "${t%d}", &t_i) != 1))
             t_i = -1;
 
         if (text(row, 4).isEmpty() ||
-            (sscanf((const char *) text(row, 4), "${v%d}", &v_i) != 1))
+                (sscanf((const char *) text(row, 4).toLatin1().constData(), "${v%d}", &v_i) != 1))
             v_i = -1;
 
-        for (rank = 0; rank != params->numRows(); rank += 1)
+        for (rank = 0; rank != params->rowCount(); rank += 1)
             if (!params->name(rank).isEmpty() && (rank != p_i))
-                rk.insertItem(QString::number(rank), 100 + rank);
+                MenuFactory::addItem(rk,QString::number(rank), 100 + rank);
 
-        m.insertItem(TR("Set rank <i>"), &rk);
+        MenuFactory::insertItem(m, tr("Set rank <i>"), &rk);
 
-        switch (rank = m.exec(QCursor::pos())) {
-        case 0:
-            insert_row_before(row);
-            break;
+        QAction *retAction = m.exec(QCursor::pos());
+        if(retAction)
+            switch (rank = retAction->data().toInt()){
+            case 0:
+                insert_row_before(row);
+                break;
 
-        case 1:
-            insert_row_after(row);
-            break;
+            case 1:
+                insert_row_after(row);
+                break;
 
-        case 2:
-            delete_row(row);
-            break;
+            case 2:
+                delete_row(row);
+                break;
 
-        case 3:
-            copy_row(row);
-            break;
+            case 3:
+                copy_row(row);
+                break;
 
-        case 4:
-            cut_row(row);
-            break;
+            case 4:
+                cut_row(row);
+                break;
 
-        case 5:
-            paste_row(row);
-            break;
+            case 5:
+                paste_row(row);
+                break;
 
-        default:
-            if (rank >= 100) {
-                char s[32];
+            default:
+                if (rank >= 100) {
+                    char s[32];
 
-                if (p_i != -1) {
-                    sprintf(s, "${p%d}", rank - 100);
-                    setItem(row, 2, new ComboItem(this, s, PythonParamRankList));
-                }
+                    if (p_i != -1) {
+                        sprintf(s, "${p%d}", rank - 100);
+                        setItem(row, 2, new ComboItem(s, PythonParamRankList));
+                    }
 
-                if (v_i != -1) {
-                    sprintf(s, "${t%d}", rank - 100);
-                    setItem(row, 3, new ComboItem(this, s, PythonTypeRankList));
-                }
+                    if (v_i != -1) {
+                        sprintf(s, "${t%d}", rank - 100);
+                        setItem(row, 3, new ComboItem(s, PythonTypeRankList));
+                    }
 
-                if (v_i != -1) {
-                    sprintf(s, "${v%d}", rank - 100);
-                    setItem(row, 4, new ComboItem(this, s, PythonValueRankList));
+                    if (v_i != -1) {
+                        sprintf(s, "${v%d}", rank - 100);
+                        setItem(row, 4, new ComboItem(s, PythonValueRankList));
+                    }
                 }
-            }
-            else if (rank >= 10)
-                move_row(row, rank - 10);
+                else if (rank >= 10)
+                    move_row(row, rank - 10);
 
-            break;
-        }
+                break;
+            }
     }
 }
 
 void PythonParamsTable::insert_row_before(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
     int col;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index != row; index -= 1) {
         for (col = 0; col != 5; col += 1) {
-            Q3TableItem * it = item(index - 1, col);
+            QTableWidgetItem * it = item(index - 1, col);
 
-            takeItem(it);
-            setItem(index, col, it);
+            if(it)
+            {
+                takeItem(it->row(), it->column());
+                setItem(index, col, it);
+            }
         }
 
         setText(index, col, text(index - 1, col));
-    }
-
+    }*/
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row);
     init_row(row);
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void PythonParamsTable::insert_row_after(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
     int col;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index > row + 1; index -= 1) {
         for (col = 0; col != 5; col += 1) {
-            Q3TableItem * it = item(index - 1, col);
+            QTableWidgetItem * it = item(index - 1, col);
 
-            takeItem(it);
-            setItem(index, col, it);
+            if(it)
+            {
+                takeItem(it->row(), it->column());
+                setItem(index, col, it);
+            }
         }
 
         setText(index, col, text(index - 1, col));
-    }
-
+    }*/
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row+1);
     init_row(row + 1);
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void PythonParamsTable::delete_row(int row)
 {
-    int n = numRows();
+    int n = rowCount();
     int index;
     int col;
 
-    clearCellWidget(row, 1);
+    removeCellWidget(row, 1);
 
     if (row == (n - 1)) {
         // the last line : empty it
@@ -7274,16 +7251,16 @@ void PythonParamsTable::delete_row(int row)
     else {
         for (index = row; index != n - 1; index += 1) {
             for (col = 0; col != 5; col += 1) {
-                Q3TableItem * it = item(index + 1, col);
+                QTableWidgetItem * it = item(index + 1, col);
 
-                takeItem(it);
+                takeItem(it->row(), it->column());
                 setItem(index, col, it);
             }
 
             setText(index, col, text(index + 1, col));
         }
 
-        setNumRows(n - 1);
+        setRowCount(n - 1);
     }
 }
 
@@ -7337,7 +7314,7 @@ void PythonParamsTable::update_edform()
     QString s;
     const char * sep = "";
 
-    int n = numRows();
+    int n = rowCount();
     int index;
 
     for (index = 0; index != n; index += 1) {
@@ -7348,7 +7325,7 @@ void PythonParamsTable::update_edform()
             if (!text(index, col).isEmpty())
                 p += text(index, col);
 
-        p = p.stripWhiteSpace();
+        p = p.trimmed();
 
         if (! p.isEmpty()) {
             s += sep + p;
@@ -7358,9 +7335,9 @@ void PythonParamsTable::update_edform()
 
     QString form = edform->text();
 
-    index = form.find("${(}");
+    index = form.indexOf("${(}");
 
-    form.replace(index + 4, form.find("${)}") - index - 4, s);
+    form.replace(index + 4, form.indexOf("${)}") - index - 4, s);
     edform->setText(form);
 }
 
@@ -7371,21 +7348,22 @@ void PythonParamsTable::update_edform()
 QSize PythonParamsDialog::previous_size;
 
 PythonParamsDialog::PythonParamsDialog(QWidget * parent, ParamsTable * params, MultiLineEdit * form)
-    : QDialog(parent, "Python parameters dialog", TRUE)
+    : QDialog(parent/*, "Python parameters dialog", TRUE*/)
 {
-    setCaption(TR("Python parameters dialog"));
+    setWindowTitle(tr("Python parameters dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
     tbl = new PythonParamsTable(this, params, form);
     vbox->addWidget(tbl);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -7406,7 +7384,7 @@ PythonParamsDialog::~PythonParamsDialog()
 
 void PythonParamsDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -7421,13 +7399,12 @@ void PythonParamsDialog::accept()
 void OperationDialog::InitGui()
 {
     init_uml();
-
-    InitPropertiesTab();
     init_cpp();
     init_java();
     init_php();
     init_python();
     init_idl();
+    InitPropertiesTab();
 
 }
 
@@ -7481,36 +7458,34 @@ uint OperationDialog::TypeID()
     return TypeIdentifier<OperationDialog>::id();
 }
 
-QSharedPointer<OperationDialog> OperationDialog::Instance(OperationData * o, DrawingLanguage l)
+OperationDialog* OperationDialog::Instance(OperationData * o, DrawingLanguage l)
 {
-    if (instance.isNull())
-        instance = QSharedPointer<OperationDialog>(new OperationDialog(o, l));
-    else {
-        instance->drawingLanguage = l;
-        instance->FillGuiElements(o);
-    }
-
-    return instance;
+    OperationDialog* dialog = new OperationDialog(o, l);
+    //dialog->setWindowFlags(Qt::WDestructiveClose);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    return dialog;
 }
 
 void OperationDialog::InitPropertiesTab()
 {
     // USER : list key - value
 
-    Q3Grid  *  grid = new Q3Grid(2, this);
+    GridBox  *  grid = new GridBox(2, this);
 
-    grid->setMargin(5);
-    grid->setSpacing(5);
+    RegisterTab("Properties", grid);
+    grid->setMargin(1);
+    grid->setSpacing(1);
 
     kvtable = new KeyValuesTable(oper->get_browser_node(), grid, !isWritable); //update this table
-    RegisterTab("Properties", grid);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable);
+    addTab(grid, tr("Properties"));
 
 }
 
 void OperationDialog::FillPropertiesTab(OperationData * o)
 {
     kvtable->updateThisFromNode(o->browser_node, !isWritable);
+    ShowTab("Properties");
 }
 
 
diff --git a/src/dialog/OperationDialog.h b/src/dialog/OperationDialog.h
index 9dad64f33..276dc4f8d 100644
--- a/src/dialog/OperationDialog.h
+++ b/src/dialog/OperationDialog.h
@@ -28,10 +28,10 @@
 #ifndef OPERATIONDIALOG_H
 #define  OPERATIONDIALOG_H
 
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 //Added by qt3to4:
-#include <Q3PtrList>
-#include <Q3Grid>
+//
+#include <gridbox.h>
 #include <QVBoxLayout>
 #include <QLabel>
 
@@ -39,9 +39,9 @@
 #include "BrowserNode.h"
 #include "VisibilityGroup.h"
 #include "dialog/EdgeMenuDialog.h"
-#include <Q3HBox>
+#include <hhbox.h>
 
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QRadioButton;
 class QPushButton;
@@ -66,13 +66,13 @@ class OperationDialog : public EdgeMenuDialog
     Q_OBJECT
 
 protected:
-    virtual void closeEvent(QCloseEvent *);
+    virtual void closeEvent(QCloseEvent *) override;
     bool visit;
     OperationData * oper;
     ClassData * cl;
     QStringList list;
     BrowserNodeList nodes;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
     BrowserNode * view;
     AttributeData * get_of_attr;
     AttributeData * set_of_attr;
@@ -83,11 +83,11 @@ class OperationDialog : public EdgeMenuDialog
 
     // uml tab
     QWidget * umltab;
-    Q3Grid * umlGrid;
+    GridBox * umlGrid;
     LineEdit * edname;
-    Q3ComboBox * edreturn_type;
+    QComboBox * edreturn_type;
     int edreturn_type_offset;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     VisibilityGroup uml_visibility;
     QCheckBox * classoperation_cb;
     QCheckBox * abstract_cb;
@@ -106,11 +106,11 @@ class OperationDialog : public EdgeMenuDialog
     QCheckBox * cbCppVolatile;
     QCheckBox * cbCppVirtual;
     QCheckBox * cbCppInline;
-    Q3ButtonGroup * cppBg;
-    Q3ButtonGroup * cppBg2;
+    BButtonGroup * cppBg;
+    BButtonGroup * cppBg2;
 
-    Q3HBox * htabBgCpp1;
-    Q3HBox * tabBgCppModifiers;
+    HHBox * htabBgCpp1;
+    HHBox * tabBgCppModifiers;
 
 
     CppParamsTable * paramcppdecltable;
@@ -189,22 +189,22 @@ class OperationDialog : public EdgeMenuDialog
     QPushButton * pbEditor;
     QPushButton * pbDefault;
     QPushButton * pbConstraintEditor;
-    Q3ButtonGroup * bgUml1;
-    Q3ButtonGroup * bgUml2;
-    Q3ButtonGroup * bgUml3;
+    BButtonGroup * bgUml1;
+    BButtonGroup * bgUml2;
+    BButtonGroup * bgUml3;
 
-    Q3ButtonGroup * notableBg;
-    Q3ButtonGroup * bgPhp;
-    Q3ButtonGroup * bgPython;
-    Q3ButtonGroup * bgIdl;
-    Q3ButtonGroup * bgCppModifiers;
-    Q3ButtonGroup * bgCpp11Modifiers;
-    Q3ButtonGroup * visibilityBg;
+    BButtonGroup * notableBg;
+    BButtonGroup * bgPhp;
+    BButtonGroup * bgPython;
+    BButtonGroup * bgIdl;
+    BButtonGroup * bgCppModifiers;
+    BButtonGroup * bgCpp11Modifiers;
+    BButtonGroup * visibilityBg;
 
-    Q3HBox * htabBgUml;
-    Q3HBox * namespecTab;
-    Q3HBox * namespecTabIdl;
-    Q3HBox * pythonNamespecTab;
+    HHBox * htabBgUml;
+    HHBox * namespecTab;
+    HHBox * namespecTabIdl;
+    HHBox * pythonNamespecTab;
 
 
 
@@ -226,14 +226,14 @@ class OperationDialog : public EdgeMenuDialog
     QPushButton * pbDefaultDeclarationIdl;
     QPushButton * pbNotGeneratedInIdl;
 
-    virtual void InitGui();
+    virtual void InitGui() override;
     virtual void FillGuiElements(OperationData *);
-    virtual void FillGuiElements(BrowserNode *);
-    virtual uint TypeID();
+    virtual void FillGuiElements(BrowserNode *) override;
+    virtual uint TypeID() override;
 
     DrawingLanguage drawingLanguage;
 
-    static QSharedPointer<OperationDialog> instance;
+    //static QSharedPointer<OperationDialog> instance;
 
 
 protected:
@@ -283,7 +283,7 @@ class OperationDialog : public EdgeMenuDialog
     static void post_python_edit_body(OperationDialog * d, QString s);
     static void post_php_edit_body(OperationDialog * d, QString s);
 
-    bool SaveData() override;
+    virtual bool SaveData() override;
     bool SaveData(OperationData* oper);
 
 public:
@@ -305,11 +305,11 @@ class OperationDialog : public EdgeMenuDialog
     void insert_param(int rank);
     void delete_param(int rank);
     void move_param(int old_rank, int new_rank);
-    static QSharedPointer<OperationDialog> Instance(OperationData * , DrawingLanguage l);
+    static OperationDialog *Instance(OperationData * , DrawingLanguage l);
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void default_description();
     void edit_description();
     void edit_constraint();
@@ -357,7 +357,7 @@ protected slots:
     void idl_unmapped_def();
     void idl_update_decl();
     void oneway_toggled(bool on);
-    void update_all_tabs(QWidget *);
+    void update_all_tabs(int index);
     void menu_returntype();
 };
 
@@ -408,8 +408,10 @@ class ParamsTable : public MyTable
     QStringList all_values();
 
 protected slots:
-    void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    void button_pressed(const QModelIndex &index);
     void value_changed(int row, int col);
+private:
+    TableWidgetItemDelegate* m_delegate;
 };
 
 class ExceptionsTable : public MyTable
@@ -417,13 +419,14 @@ class ExceptionsTable : public MyTable
     Q_OBJECT
 
 protected:
-    const QStringList & types;
+    QStringList & types;
 
     static QString type_copy;		// copy/cut/paste
 
 public:
     ExceptionsTable(OperationData * a, QWidget * parent,
-                    const QStringList & list, bool visit);
+                    QStringList & list, bool visit);
+    void Reinitialize(OperationData * a, QStringList & list, bool visit);
 
 protected:
     virtual void activateNextCell();
@@ -442,8 +445,10 @@ class ExceptionsTable : public MyTable
     QString type(unsigned rank) const;
 
 protected slots:
-    void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    void button_pressed(const QModelIndex &index);
     void value_changed(int row, int col);
+private:
+    TableWidgetItemDelegate* m_delegate;
 };
 
 class CppParamsTable : public MyTable
@@ -476,11 +481,13 @@ class CppParamsTable : public MyTable
     void update_name(int row);
     void update_names();
 
-    virtual void setItem(int row, int col, Q3TableItem * item);
+    virtual void setItem(int row, int col, QTableWidgetItem * item);
 
 protected slots:
-    void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    void button_pressed(const QModelIndex &index);
     virtual void setCurrentCell(int row, int col);
+private:
+    TableWidgetItemDelegate* m_delegate;
 };
 
 class CppParamsDialog : public QDialog
@@ -531,11 +538,13 @@ class PhpParamsTable : public MyTable
     void update_name(int row);
     void update_names();
 
-    virtual void setItem(int row, int col, Q3TableItem * item);
+    virtual void setItem(int row, int col, QTableWidgetItem * item);
 
 protected slots:
-    void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    void button_pressed(const QModelIndex &index);
     virtual void setCurrentCell(int row, int col);
+private:
+    TableWidgetItemDelegate* m_delegate;
 };
 
 class PhpParamsDialog : public QDialog
@@ -585,11 +594,13 @@ class PythonParamsTable : public MyTable
     void update_name(int row);
     void update_names();
 
-    virtual void setItem(int row, int col, Q3TableItem * item);
+    virtual void setItem(int row, int col, QTableWidgetItem * item);
 
 protected slots:
-    void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    void button_pressed(const QModelIndex &index);
     virtual void setCurrentCell(int row, int col);
+private:
+    TableWidgetItemDelegate* m_delegate;
 };
 
 class PythonParamsDialog : public QDialog
diff --git a/src/dialog/OperationListDialog.cpp b/src/dialog/OperationListDialog.cpp
index d3bc051a5..3bb4e4272 100644
--- a/src/dialog/OperationListDialog.cpp
+++ b/src/dialog/OperationListDialog.cpp
@@ -31,14 +31,10 @@
 
 #include <qcursor.h>
 #include <qlayout.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3HBoxLayout>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 #include "OperationListDialog.h"
 #include "BrowserOperation.h"
 #include "OperationData.h"
@@ -47,35 +43,36 @@
 
 QSize OperationListDialog::previous_size;
 
-OperationListDialog::OperationListDialog(const char * m,
-        Q3PtrList<BrowserOperation> & l)
-    : QDialog(0, m, TRUE)
+OperationListDialog::OperationListDialog(QString m,
+        QList<BrowserOperation *> & l)
+    : QDialog(0)
 {
-    setCaption(m);
+    setWindowTitle(m);
     move(QCursor::pos());
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    cb = new Q3ComboBox(FALSE, this);
+    cb = new QComboBox(this);
     vbox->addWidget(cb);
 
-    for (BrowserOperation * oper = l.first(); oper; oper = l.next()) {
+    foreach (BrowserOperation *oper, l) {
         QString s = ((BrowserNode *) oper->parent())->get_name() +
                     QString("::") + oper->get_data()->definition(TRUE, FALSE);
 
         if (((OperationData *) oper->get_data())->get_is_abstract())
-            cb->insertItem("[a] " + s);
+            cb->addItem("[a] " + s);
         else
-            cb->insertItem(s);
+            cb->addItem(s);
     }
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     ok->setDefault(TRUE);
@@ -98,5 +95,5 @@ OperationListDialog::~OperationListDialog()
 
 int OperationListDialog::choosen()
 {
-    return cb->currentItem();
+    return cb->currentIndex();
 }
diff --git a/src/dialog/OperationListDialog.h b/src/dialog/OperationListDialog.h
index 3c13c1ac8..6782a9a0e 100644
--- a/src/dialog/OperationListDialog.h
+++ b/src/dialog/OperationListDialog.h
@@ -27,23 +27,21 @@
 
 #ifndef OPERATIONLISTDIALOG_H
 #define OPERATIONLISTDIALOG_H
-
-#include <q3ptrlist.h>
 #include <qdialog.h>
-#include <q3ptrlist.h>
-
-class Q3ComboBox;
+class QComboBox;
 class BrowserOperation;
 
 class OperationListDialog : public QDialog
 {
+    Q_OBJECT
+    
 protected:
-    Q3ComboBox * cb;
+    QComboBox * cb;
 
     static QSize previous_size;
 
 public:
-    OperationListDialog(const char * m, Q3PtrList<BrowserOperation> & l);
+    OperationListDialog(QString m, QList<BrowserOperation *> & l);
     virtual ~OperationListDialog();
 
     int choosen();
diff --git a/src/dialog/PackageDialog.cpp b/src/dialog/PackageDialog.cpp
index d5abf833a..861fd13af 100644
--- a/src/dialog/PackageDialog.cpp
+++ b/src/dialog/PackageDialog.cpp
@@ -30,13 +30,12 @@
 
 
 #include <stdio.h>
-
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 
 #include "PackageDialog.h"
 #include "PackageData.h"
@@ -51,75 +50,79 @@
 #include "strutil.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "hhbox.h"
 static QString Relative;
 static QString Absolute;
 
 QSize PackageDialog::previous_size;
 
 PackageDialog::PackageDialog(PackageData * da)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), pa(da)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), pa(da)
 {
-    Relative = TR("Set it relative");
-    Absolute = TR("Set it absolute");
+    setAttribute(Qt::WA_DeleteOnClose, true);
+    Relative = QObject::tr("Set it relative");
+    Absolute = QObject::tr("Set it absolute");
 
     da->browser_node->edit_start();
 
     bool visit = !da->browser_node->is_writable();
 
     if (!visit) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("Package dialog"));
-
-    Q3Grid * grid;
-    Q3VBox * vtab;
-    Q3HBox * htab;
+    setWindowTitle(tr("Package dialog"));
+    GridBox * grid;
+    VVBox * vtab;
+    HHBox * htab;
     QPushButton * button;
 
     // general tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     grid->setSpacing(5);
     grid->setMargin(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(pa->name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(pa->name(), grid));
     edname->setReadOnly(!da->browser_node->is_writable() ||
                         (da->browser_node == BrowserView::get_project()));
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(pa->stereotype));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(pa->stereotype));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserPackage::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlPackage));
+        edstereotype->addItems(BrowserPackage::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlPackage));
         edstereotype->setAutoCompletion(completion());
         connect(edstereotype, SIGNAL(activated(const QString &)),
                 this, SLOT(edStereotypeActivated(const QString &)));
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
+    SmallPushButton *sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
-
-    comment = new MultiLineEdit(grid);
+        vtab->addWidget(sButton);
+    }
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(da->browser_node->get_comment());
     QFont font = comment->font();
@@ -134,81 +137,84 @@ PackageDialog::PackageDialog(PackageData * da)
 
     // C++
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     cppTab = vtab;
-    vtab->setMargin(5);
+    vtab->setMargin(1);
 
-    htab = new Q3HBox(vtab);
-    htab->setMargin(5);
-    new QLabel(TR("The generation directories may be relative in case the root directory\n\
-is specified (through the project menu entry 'edit generation settings')\n\n"), htab);
+    vtab->addWidget( htab = new HHBox(vtab));
+    htab->setMargin(1);
+    htab->addWidget(new QLabel(tr("The generation directories may be relative in case the root directory\n\
+is specified (through the project menu entry 'edit generation settings')\n\n"), htab));
 
-    htab = new Q3HBox(vtab);
-    htab->setMargin(5);
-    QLabel * lbl1 = new QLabel(TR("headers directory : "), htab);
-    edcpphdir = new LineEdit(pa->cpp_h_dir, htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->setMargin(1);
+    QLabel * lbl1;
+    htab->addWidget(lbl1 = new QLabel(tr("headers directory : "), htab));
+    htab->addWidget(edcpphdir = new LineEdit(pa->cpp_h_dir, htab));
 
     if (visit)
         edcpphdir->setReadOnly(TRUE);
     else {
-        htab = new Q3HBox(vtab);
-        new QLabel("", htab);
-        button = new QPushButton(TR("Browse"), htab);
+        vtab->addWidget(htab = new HHBox(vtab));
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(button = new QPushButton(tr("Browse"), htab));
         connect(button, SIGNAL(clicked()), this, SLOT(cpph_browse()));
-        new QLabel("", htab);
-        cpphbutton = new QPushButton((pa->cpp_h_dir.isEmpty() ||
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(cpphbutton = new QPushButton((pa->cpp_h_dir.isEmpty() ||
                                       QDir::isRelativePath(pa->cpp_h_dir))
-                                     ? Absolute : Relative, htab);
+                                     ? Absolute : Relative, htab));
 
         if (GenerationSettings::get_cpp_root_dir().isEmpty())
             cpphbutton->setEnabled(FALSE);
 
         connect(cpphbutton, SIGNAL(clicked()), this, SLOT(cpph_relative()));
-        new QLabel("", htab);
+        htab->addWidget(new QLabel("", htab));
     }
 
-    htab = new Q3HBox(vtab);
-    htab->setMargin(5);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->setMargin(1);
     new QLabel("", htab);
 
-    htab = new Q3HBox(vtab);
-    htab->setMargin(5);
-    QLabel * lbl2 = new QLabel(TR("sources directory : "), htab);
-    edcppsrcdir = new LineEdit(pa->cpp_src_dir, htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->setMargin(1);
+    QLabel * lbl2;
+    htab->addWidget(lbl2 = new QLabel(tr("sources directory : "), htab));
+    htab->addWidget(edcppsrcdir = new LineEdit(pa->cpp_src_dir, htab));
 
     if (visit)
         edcppsrcdir->setReadOnly(TRUE);
     else {
-        htab = new Q3HBox(vtab);
-        new QLabel("", htab);
-        button = new QPushButton(TR("Browse"), htab);
+        vtab->addWidget(htab = new HHBox(vtab));
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(button = new QPushButton(tr("Browse"), htab));
         connect(button, SIGNAL(clicked()), this, SLOT(cppsrc_browse()));
-        new QLabel("", htab);
-        cppsrcbutton =
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(cppsrcbutton =
             new QPushButton((pa->cpp_src_dir.isEmpty() ||
                              QDir::isRelativePath(pa->cpp_src_dir))
-                            ? Absolute : Relative, htab);
+                            ? Absolute : Relative, htab));
 
         if (GenerationSettings::get_cpp_root_dir().isEmpty())
             cppsrcbutton->setEnabled(FALSE);
 
         connect(cppsrcbutton, SIGNAL(clicked()), this, SLOT(cppsrc_relative()));
-        new QLabel("", htab);
+        htab->addWidget(new QLabel("", htab));
     }
 
-    htab = new Q3HBox(vtab);
-    htab->setMargin(5);
-    new QLabel("", htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->setMargin(1);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    QLabel * lbl3 = new QLabel("namespace : ", htab);
-    edcppnamespace = new LineEdit(pa->cpp_namespace, htab);
+    QLabel * lbl3;
+    htab->addWidget(lbl3 = new QLabel("namespace : ", htab));
+    htab->addWidget(edcppnamespace = new LineEdit(pa->cpp_namespace, htab));
     edcppnamespace->setReadOnly(visit);
 
     same_width(lbl1, lbl2, lbl3);
 
-    vtab->setStretchFactor(new Q3HBox(vtab), 1000);
+    vtab->setStretchFactor(new HHBox(vtab), 1000);
 
     addTab(vtab, "C++");
 
@@ -217,52 +223,52 @@ is specified (through the project menu entry 'edit generation settings')\n\n"),
 
     // Java
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     javatab = vtab;
-    vtab->setMargin(5);
+    vtab->setMargin(1);
 
-    htab = new Q3HBox(vtab);
-    htab->setMargin(5);
-    new QLabel(TR("The generation directory may be relative in case the root directory\n\
-is specified (through the project menu entry 'edit generation settings')\n\n"), htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->setMargin(1);
+    htab->addWidget(new QLabel(tr("The generation directory may be relative in case the root directory\n\
+is specified (through the project menu entry 'edit generation settings')\n\n"), htab));
 
-    htab = new Q3HBox(vtab);
-    htab->setMargin(5);
-    lbl1 = new QLabel(TR("directory : "), htab);
-    edjavadir = new LineEdit(pa->java_dir, htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->setMargin(1);
+    htab->addWidget(lbl1 = new QLabel(tr("directory : "), htab));
+    htab->addWidget(edjavadir = new LineEdit(pa->java_dir, htab));
 
     if (visit)
         edjavadir->setReadOnly(TRUE);
     else {
-        htab = new Q3HBox(vtab);
-        new QLabel("", htab);
-        button = new QPushButton(TR("Browse"), htab);
+        vtab->addWidget(htab = new HHBox(vtab));
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(button = new QPushButton(tr("Browse"), htab));
         connect(button, SIGNAL(clicked()), this, SLOT(java_browse()));
-        new QLabel("", htab);
-        javabutton = new QPushButton((pa->java_dir.isEmpty() ||
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(javabutton = new QPushButton((pa->java_dir.isEmpty() ||
                                       QDir::isRelativePath(pa->java_dir))
-                                     ? Absolute : Relative, htab);
+                                     ? Absolute : Relative, htab));
 
         if (GenerationSettings::get_java_root_dir().isEmpty())
             javabutton->setEnabled(FALSE);
 
         connect(javabutton, SIGNAL(clicked()), this, SLOT(java_relative()));
-        new QLabel("", htab);
+        htab->addWidget(new QLabel("", htab));
     }
 
-    htab = new Q3HBox(vtab);
-    htab->setMargin(5);
-    new QLabel("", htab);
+    vtab->addWidget(htab = new HHBox(vtab));
+    htab->setMargin(1);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2 = new QLabel("package : ", htab);
-    edjavapackage = new LineEdit(pa->java_package, htab);
+    htab->addWidget(lbl2 = new QLabel("package : ", htab));
+    htab->addWidget(edjavapackage = new LineEdit(pa->java_package, htab));
     edjavapackage->setReadOnly(visit);
 
     same_width(lbl1, lbl2);
 
-    vtab->setStretchFactor(new Q3HBox(vtab), 1000);
+    vtab->setStretchFactor(new HHBox(vtab), 1000);
 
     addTab(vtab, "Java");
 
@@ -271,52 +277,52 @@ is specified (through the project menu entry 'edit generation settings')\n\n"),
 
     // Php
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     phptab = vtab;
     vtab->setMargin(5);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    new QLabel(TR("The generation directory may be relative in case the root directory\n\
-is specified (through the project menu entry 'edit generation settings')\n\n"), htab);
+    htab->addWidget(new QLabel(tr("The generation directory may be relative in case the root directory\n\
+is specified (through the project menu entry 'edit generation settings')\n\n"), htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1 = new QLabel(TR("directory : "), htab);
-    edphpdir = new LineEdit(pa->php_dir, htab);
+    htab->addWidget(lbl1 = new QLabel(tr("directory : "), htab));
+    htab->addWidget(edphpdir = new LineEdit(pa->php_dir, htab));
 
     if (visit)
         edphpdir->setReadOnly(TRUE);
     else {
-        htab = new Q3HBox(vtab);
-        new QLabel("", htab);
-        button = new QPushButton(TR("Browse"), htab);
+        vtab->addWidget(htab = new HHBox(vtab));
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(button = new QPushButton(tr("Browse"), htab));
         connect(button, SIGNAL(clicked()), this, SLOT(php_browse()));
-        new QLabel("", htab);
-        phpbutton = new QPushButton((pa->php_dir.isEmpty() ||
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(phpbutton = new QPushButton((pa->php_dir.isEmpty() ||
                                      QDir::isRelativePath(pa->php_dir))
-                                    ? Absolute : Relative, htab);
+                                    ? Absolute : Relative, htab));
 
         if (GenerationSettings::get_php_root_dir().isEmpty())
             phpbutton->setEnabled(FALSE);
 
         connect(phpbutton, SIGNAL(clicked()), this, SLOT(php_relative()));
-        new QLabel("", htab);
+        htab->addWidget(new QLabel("", htab));
     }
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2 = new QLabel("namespace : ", htab);
-    edphpnamespace = new LineEdit(pa->php_namespace, htab);
+    htab->addWidget(lbl2 = new QLabel("namespace : ", htab));
+    htab->addWidget(edphpnamespace = new LineEdit(pa->php_namespace, htab));
     edphpnamespace->setReadOnly(visit);
 
     same_width(lbl1, lbl2);
 
-    vtab->setStretchFactor(new Q3HBox(vtab), 1000);
+    vtab->setStretchFactor(new HHBox(vtab), 1000);
 
     addTab(vtab, "Php");
 
@@ -325,52 +331,52 @@ is specified (through the project menu entry 'edit generation settings')\n\n"),
 
     // Python
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     pythontab = vtab;
     vtab->setMargin(5);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    new QLabel(TR("The generation directory may be relative in case the root directory\n\
-is specified (through the project menu entry 'edit generation settings')\n\n"), htab);
+    htab->addWidget(new QLabel(tr("The generation directory may be relative in case the root directory\n\
+is specified (through the project menu entry 'edit generation settings')\n\n"), htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1 = new QLabel(TR("directory : "), htab);
-    edpythondir = new LineEdit(pa->python_dir, htab);
+    htab->addWidget(lbl1 = new QLabel(tr("directory : "), htab));
+    htab->addWidget(edpythondir = new LineEdit(pa->python_dir, htab));
 
     if (visit)
         edpythondir->setReadOnly(TRUE);
     else {
-        htab = new Q3HBox(vtab);
-        new QLabel("", htab);
-        button = new QPushButton(TR("Browse"), htab);
+        vtab->addWidget(htab = new HHBox(vtab));
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(button = new QPushButton(tr("Browse"), htab));
         connect(button, SIGNAL(clicked()), this, SLOT(python_browse()));
-        new QLabel("", htab);
-        pythonbutton = new QPushButton((pa->python_dir.isEmpty() ||
+       htab->addWidget( new QLabel("", htab));
+        htab->addWidget(pythonbutton = new QPushButton((pa->python_dir.isEmpty() ||
                                         QDir::isRelativePath(pa->python_dir))
-                                       ? Absolute : Relative, htab);
+                                       ? Absolute : Relative, htab));
 
         if (GenerationSettings::get_python_root_dir().isEmpty())
             pythonbutton->setEnabled(FALSE);
 
         connect(pythonbutton, SIGNAL(clicked()), this, SLOT(python_relative()));
-        new QLabel("", htab);
+        htab->addWidget(new QLabel("", htab));
     }
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2 = new QLabel("package : ", htab);
-    edpythonpackage = new LineEdit(pa->python_package, htab);
+    htab->addWidget(lbl2 = new QLabel("package : ", htab));
+    htab->addWidget(edpythonpackage = new LineEdit(pa->python_package, htab));
     edpythonpackage->setReadOnly(visit);
 
     same_width(lbl1, lbl2);
 
-    vtab->setStretchFactor(new Q3HBox(vtab), 1000);
+    vtab->setStretchFactor(new HHBox(vtab), 1000);
 
     addTab(vtab, "Python");
 
@@ -379,52 +385,52 @@ is specified (through the project menu entry 'edit generation settings')\n\n"),
 
     // IDL
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     idltab = vtab;
     vtab->setMargin(5);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    new QLabel(TR("The generation directory may be relative in case the root directory\n\
-is specified (through the project menu entry 'edit generation settings')\n\n"), htab);
+    htab->addWidget(new QLabel(tr("The generation directory may be relative in case the root directory\n\
+is specified (through the project menu entry 'edit generation settings')\n\n"), htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1 = new QLabel(TR("directory : "), htab);
-    edidldir = new LineEdit(pa->idl_dir, htab);
+    htab->addWidget(lbl1 = new QLabel(tr("directory : "), htab));
+    htab->addWidget(edidldir = new LineEdit(pa->idl_dir, htab));
 
     if (visit)
         edidldir->setReadOnly(TRUE);
     else {
-        htab = new Q3HBox(vtab);
-        new QLabel("", htab);
-        button = new QPushButton(TR("Browse"), htab);
+        vtab->addWidget(htab = new HHBox(vtab));
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(button = new QPushButton(tr("Browse"), htab));
         connect(button, SIGNAL(clicked()), this, SLOT(idl_browse()));
-        new QLabel("", htab);
-        idlbutton = new QPushButton((pa->idl_dir.isEmpty() ||
+        htab->addWidget(new QLabel("", htab));
+        htab->addWidget(idlbutton = new QPushButton((pa->idl_dir.isEmpty() ||
                                      QDir::isRelativePath(pa->idl_dir))
-                                    ? Absolute : Relative, htab);
+                                    ? Absolute : Relative, htab));
 
         if (GenerationSettings::get_idl_root_dir().isEmpty())
             idlbutton->setEnabled(FALSE);
 
         connect(idlbutton, SIGNAL(clicked()), this, SLOT(idl_relative()));
-        new QLabel("", htab);
+        htab->addWidget(new QLabel("", htab));
     }
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2 = new QLabel("module : ", htab);
-    edidlmodule = new LineEdit(pa->idl_module, htab);
+    htab->addWidget(lbl2 = new QLabel("module : ", htab));
+    htab->addWidget(edidlmodule = new LineEdit(pa->idl_module, htab));
     edidlmodule->setReadOnly(visit);
 
     same_width(lbl1, lbl2);
 
-    vtab->setStretchFactor(new Q3HBox(vtab), 1000);
+    vtab->setStretchFactor(new HHBox(vtab), 1000);
 
     addTab(vtab, "IDL");
 
@@ -433,59 +439,59 @@ is specified (through the project menu entry 'edit generation settings')\n\n"),
 
     // Profile
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     profiletab = vtab;
     vtab->setMargin(5);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl1 = new QLabel(TR("meta model : \nreference"), htab);
-    edmetamodelReference =
-        new LineEdit(pa->browser_node->get_value("metamodelReference"), htab);
+    htab->addWidget(lbl1 = new QLabel(tr("meta model : \nreference"), htab));
+    htab->addWidget(edmetamodelReference =
+        new LineEdit(pa->browser_node->get_value("metamodelReference"), htab));
     edmetamodelReference->setReadOnly(visit);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    new QLabel("", htab);
+    htab->addWidget(new QLabel("", htab));
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(5);
-    lbl2 = new QLabel(TR("meta class : \nreference"), htab);
-    edmetaclassreference =
-        new LineEdit(pa->browser_node->get_value("metaclassreference"), htab);
+    htab->addWidget(lbl2 = new QLabel(tr("meta class : \nreference"), htab));
+    htab->addWidget(edmetaclassreference =
+        new LineEdit(pa->browser_node->get_value("metaclassreference"), htab));
     edidlmodule->setReadOnly(visit);
 
     same_width(lbl1, lbl2);
 
-    vtab->setStretchFactor(new Q3HBox(vtab), 1000);
+    vtab->setStretchFactor(new HHBox(vtab), 1000);
 
-    addTab(vtab, TR("Profile"));
+    addTab(vtab, QObject::tr("Profile"));
 
     // USER : list key - value
 
-    vtab = new Q3VBox(this);
-    kvtable = new KeyValuesTable(da->browser_node, vtab, visit);
+    vtab = new VVBox(this);
+    vtab->addWidget(kvtable = new KeyValuesTable(da->browser_node, vtab, visit));
+
     kvtable->remove("metamodelReference");
     kvtable->remove("metaclassreference");
-    addTab(vtab, TR("Properties"));
+    addTab(vtab, QObject::tr("Properties"));
 
     //
 
     edStereotypeActivated(edstereotype->currentText());
-
-    connect(this, SIGNAL(currentChanged(QWidget *)),
-            this, SLOT(change_tabs(QWidget *)));
+    connect(this->m_tabWidget, SIGNAL(currentChanged(int)),
+            this, SLOT(change_tabs(int)));
 
     open_dialog(this);
 }
 
 void PackageDialog::polish()
 {
-    Q3TabDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -493,17 +499,16 @@ PackageDialog::~PackageDialog()
 {
     pa->browser_node->edit_end();
     previous_size = size();
-
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
 
 void PackageDialog::edStereotypeActivated(const QString & s)
 {
-    bool np = (s.stripWhiteSpace() != "profile");
-
+    bool np = (s.trimmed() != "profile");
     if (GenerationSettings::cpp_get_default_defs())
         setTabEnabled(cppTab, np);
 
@@ -520,15 +525,15 @@ void PackageDialog::edStereotypeActivated(const QString & s)
         setTabEnabled(pythontab, np);
 
     setTabEnabled(profiletab, !np);
-
     if (!np &&
-        edmetamodelReference->text().simplifyWhiteSpace().isEmpty() &&
-        edmetaclassreference->text().simplifyWhiteSpace().isEmpty())
+        edmetamodelReference->text().simplified().isEmpty() &&
+        edmetaclassreference->text().simplified().isEmpty())
         edmetamodelReference->setText("http://schema.omg.org/spec/UML/2.1/uml.xml");
 }
 
-void PackageDialog::change_tabs(QWidget * w)
+void PackageDialog::change_tabs(int index)
 {
+    QWidget * w = m_tabWidget->widget(index);
     if (hasOkButton()) {
         if (w == umltab)
             edname->setFocus();
@@ -547,8 +552,9 @@ void PackageDialog::change_tabs(QWidget * w)
 
 void PackageDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          pa, TxtEdit, this, (post_edit) post_edit_description, edits);
+
 }
 
 void PackageDialog::post_edit_description(PackageDialog * d, QString s)
@@ -564,21 +570,21 @@ void PackageDialog::accept()
     BrowserPackage * bn = (BrowserPackage *) pa->browser_node;
     QString oldname = pa->name();
     bool was_pr = !strcmp(pa->get_stereotype(), "profile");
-    QString st = fromUnicode(edstereotype->currentText().stripWhiteSpace());
+    QString st = fromUnicode(edstereotype->currentText().trimmed());
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if (s != oldname) {
         if (((BrowserNode *) bn->parent())->wrong_child_name(s, UmlPackage,
                 bn->allow_spaces(),
                 bn->allow_empty())) {
-            msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+            msg_critical(tr("Error"), s + QObject::tr("\n\nillegal name or already used"));
             return;
         }
 
         if ((st == "profile") && !ProfiledStereotypes::canAddPackage(bn, s)) {
-            msg_critical(TR("Error"), TR("conflict on stereotypes"));
+            msg_critical(tr("Error"), QObject::tr("conflict on stereotypes"));
             return;
         }
 
@@ -587,23 +593,23 @@ void PackageDialog::accept()
     else if ((st == "profile") &&
              !was_pr &&
              !ProfiledStereotypes::canAddPackage(bn, s)) {
-        msg_critical(TR("Error"), TR("conflict on stereotypes"));
+        msg_critical(tr("Error"), QObject::tr("conflict on stereotypes"));
         return;
     }
 
     bool newst = pa->set_stereotype(st);
 
-    pa->cpp_h_dir = edcpphdir->text().simplifyWhiteSpace();
-    pa->cpp_src_dir = edcppsrcdir->text().simplifyWhiteSpace();
-    pa->cpp_namespace = edcppnamespace->text().simplifyWhiteSpace();
-    pa->java_dir = edjavadir->text().simplifyWhiteSpace();
-    pa->java_package = edjavapackage->text().simplifyWhiteSpace();
-    pa->php_dir = edphpdir->text().simplifyWhiteSpace();
-    pa->php_namespace = edphpnamespace->text().simplifyWhiteSpace();
-    pa->python_dir = edpythondir->text().simplifyWhiteSpace();
-    pa->python_package = edpythonpackage->text().simplifyWhiteSpace();
-    pa->idl_dir = edidldir->text().simplifyWhiteSpace();
-    pa->idl_module = edidlmodule->text().simplifyWhiteSpace();
+    pa->cpp_h_dir = edcpphdir->text().simplified();
+    pa->cpp_src_dir = edcppsrcdir->text().simplified();
+    pa->cpp_namespace = edcppnamespace->text().simplified();
+    pa->java_dir = edjavadir->text().simplified();
+    pa->java_package = edjavapackage->text().simplified();
+    pa->php_dir = edphpdir->text().simplified();
+    pa->php_namespace = edphpnamespace->text().simplified();
+    pa->python_dir = edpythondir->text().simplified();
+    pa->python_package = edpythonpackage->text().simplified();
+    pa->idl_dir = edidldir->text().simplified();
+    pa->idl_module = edidlmodule->text().simplified();
 
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
@@ -615,16 +621,16 @@ void PackageDialog::accept()
 
         bn->set_n_keys(n + 2);
         bn->set_key(n, "metamodelReference");
-        bn->set_value(n, fromUnicode(edmetamodelReference->text().simplifyWhiteSpace()));
+        bn->set_value(n, fromUnicode(edmetamodelReference->text().simplified()));
         bn->set_key(n + 1, "metaclassreference");
-        bn->set_value(n + 1, fromUnicode(edmetaclassreference->text().simplifyWhiteSpace()));
+        bn->set_value(n + 1, fromUnicode(edmetaclassreference->text().simplified()));
 
         if (was_pr && (oldname != bn->get_name()))
             ProfiledStereotypes::renamed(bn, oldname);
     }
     else if (was_pr) {
-        bool propag = (msg_warning(TR("Question"),
-                                   TR("Propagate the removal of the profile ?"),
+        bool propag = (msg_warning(tr("Question"),
+                                   QObject::tr("Propagate the removal of the profile ?"),
                                    1, 2)
                        == 1);
 
@@ -635,12 +641,11 @@ void PackageDialog::accept()
 
     bn->package_modified();
     pa->modified();
-
-    Q3TabDialog::accept();
+    QDialog::accept();
 }
 
 void PackageDialog::browse(LineEdit * ed, QPushButton * button,
-                           const char * caption, QString root)
+                           QString caption, QString root)
 {
     QString s = ed->text();
     bool rel = FALSE;
@@ -652,14 +657,14 @@ void PackageDialog::browse(LineEdit * ed, QPushButton * button,
         s = root + s;
     }
 
-    const QString ns = Q3FileDialog::getExistingDirectory(s, this, 0, caption);
+    const QString ns = QFileDialog::getExistingDirectory(this, caption, s);
 
 
     if (! ns.isNull()) {
         int len = root.length();
 
         if (rel &&
-            (ns.find(root) == 0) &&
+            (ns.indexOf(root) == 0) &&
             (ns.length() >= len))
             ed->setText(ns.mid(len));
         else {
@@ -671,44 +676,44 @@ void PackageDialog::browse(LineEdit * ed, QPushButton * button,
 
 void PackageDialog::cpph_browse()
 {
-    browse(edcpphdir, cpphbutton, TR("C++ header directory"),
+    browse(edcpphdir, cpphbutton, QObject::tr("C++ header directory"),
            GenerationSettings::get_cpp_root_dir());
 }
 
 void PackageDialog::cppsrc_browse()
 {
-    browse(edcppsrcdir, cppsrcbutton, TR("C++ source directory"),
+    browse(edcppsrcdir, cppsrcbutton, QObject::tr("C++ source directory"),
            GenerationSettings::get_cpp_root_dir());
 }
 
 void PackageDialog::java_browse()
 {
-    browse(edjavadir, javabutton, TR("Java directory"),
+    browse(edjavadir, javabutton, QObject::tr("Java directory"),
            GenerationSettings::get_java_root_dir());
 }
 
 void PackageDialog::php_browse()
 {
-    browse(edphpdir, phpbutton, TR("Php directory"),
+    browse(edphpdir, phpbutton, QObject::tr("Php directory"),
            GenerationSettings::get_php_root_dir());
 }
 
 void PackageDialog::python_browse()
 {
-    browse(edpythondir, pythonbutton, TR("Python directory"),
+    browse(edpythondir, pythonbutton, QObject::tr("Python directory"),
            GenerationSettings::get_python_root_dir());
 }
 
 void PackageDialog::idl_browse()
 {
-    browse(edidldir, idlbutton, TR("Idl directory"),
+    browse(edidldir, idlbutton, QObject::tr("Idl directory"),
            GenerationSettings::get_idl_root_dir());
 }
 
 void PackageDialog::relative(LineEdit * ed, QPushButton * button,
                              QString root)
 {
-    const QString s = ed->text();
+    const QString s = QDir::toNativeSeparators(ed->text());
 
     if (QDir::isRelativePath(root))
         root = BrowserView::get_dir().filePath(root);
@@ -717,11 +722,7 @@ void PackageDialog::relative(LineEdit * ed, QPushButton * button,
         int len = root.length();
 
         if (
-
-
-
-            (s.find(root) == 0) &&
-
+            (s.indexOf(root) == 0) &&
             (s.length() >= len)) {
             ed->setText(s.mid(len));
             button->setText(Absolute);
diff --git a/src/dialog/PackageDialog.h b/src/dialog/PackageDialog.h
index 52dd93980..5b0c76ee0 100644
--- a/src/dialog/PackageDialog.h
+++ b/src/dialog/PackageDialog.h
@@ -27,13 +27,9 @@
 
 #ifndef PACKAGEDIALOG_H
 #define  PACKAGEDIALOG_H
-
-#include <q3table.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
-class Q3ComboBox;
+#include "tabdialog.h"
+#include <QDialog>
+class QComboBox;
 class QCheckBox;
 class QPushButton;
 
@@ -44,7 +40,7 @@ class BrowserNode;
 class KeyValuesTable;
 class BodyDialog;
 
-class PackageDialog : public Q3TabDialog
+class PackageDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -52,9 +48,9 @@ class PackageDialog : public Q3TabDialog
     QWidget * umltab;
     PackageData * pa;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     // C++
     QWidget * cppTab;
@@ -103,7 +99,7 @@ class PackageDialog : public Q3TabDialog
     virtual ~PackageDialog();
 
 protected:
-    void browse(LineEdit * ed, QPushButton * button, const char * caption,
+    void browse(LineEdit * ed, QPushButton * button, QString caption,
                 QString root);
     void relative(LineEdit * ed, QPushButton * button, QString root);
 
@@ -111,7 +107,7 @@ class PackageDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
     void edStereotypeActivated(const QString &);
     void cppsrc_browse();
@@ -127,7 +123,7 @@ protected slots:
     void python_relative();
     void idl_relative();
 
-    void change_tabs(QWidget *);
+    void change_tabs(int index);
 };
 
 #endif
diff --git a/src/dialog/ParameterDialog.cpp b/src/dialog/ParameterDialog.cpp
index c75ce93fe..3c879214c 100644
--- a/src/dialog/ParameterDialog.cpp
+++ b/src/dialog/ParameterDialog.cpp
@@ -29,17 +29,15 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3buttongroup.h>
+#include <qcombobox.h>
+#include <bbuttongroup.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
 #include <qcursor.h>
-
 #include "ParameterDialog.h"
 #include "ParameterData.h"
 #include "BrowserView.h"
@@ -55,39 +53,42 @@
 #include "GenerationSettings.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
+#include "hhbox.h"
+#include "menufactory.h"
+
 
 QSize ParameterDialog::previous_size;
 
 ParameterDialog::ParameterDialog(ParameterData * pa)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), param(pa)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), param(pa)
 {
     pa->browser_node->edit_start();
 
     if (pa->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     visit = !hasOkButton();
-    setCaption(TR("Parameter dialog"));
+    setWindowTitle(tr("Parameter dialog"));
 
-    Q3Grid * grid;
-    Q3HBox * htab;
+    GridBox * grid;
+    HHBox * htab;
     QString s;
 
     // general tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name :"), grid);
-    edname = new LineEdit(pa->name(), grid);
+    grid->addWidget(new QLabel(tr("name :"), grid));
+    grid->addWidget(edname = new LineEdit(pa->name(), grid));
     edname->setReadOnly(visit);
 
     QFont font = edname->font();
@@ -97,162 +98,171 @@ ParameterDialog::ParameterDialog(ParameterData * pa)
 
     font.setFixedPitch(TRUE);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(pa->stereotype));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(pa->stereotype));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserParameter::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlParameter));
+        edstereotype->addItems(BrowserParameter::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlParameter));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
 
     QSizePolicy sp = edstereotype->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    connect(new SmallPushButton(TR("type :"), grid), SIGNAL(clicked()),
+    SmallPushButton* sButton;
+    connect(sButton = new SmallPushButton(tr("type :"), grid), SIGNAL(clicked()),
             this, SLOT(menu_type()));
 
-    edtype = new Q3ComboBox(!visit, grid);
-    edtype->insertItem(pa->get_type().get_full_type());
+    grid->addWidget(sButton);
+    grid->addWidget(edtype = new QComboBox( grid));
+    edtype->setEditable(!visit);
+    edtype->addItem(pa->get_type().get_full_type());
 
     if (!visit) {
         BrowserClass::instances(nodes);
         nodes.full_names(list);
 
-        edtype->insertStringList(GenerationSettings::basic_types());
+        edtype->addItems(GenerationSettings::basic_types());
         offset = edtype->count();
-        edtype->insertStringList(list);
+        edtype->addItems(list);
         edtype->setAutoCompletion(completion());
         view = pa->browser_node->container(UmlClass);
     }
 
-    edtype->setCurrentItem(0);
+    edtype->setCurrentIndex(0);
     edtype->setSizePolicy(sp);
 
-    new QLabel(TR("direction :"), grid);
-    htab = new Q3HBox(grid);
-    eddir = new Q3ComboBox(FALSE, htab);
+    grid->addWidget(new QLabel(tr("direction :"), grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(eddir = new QComboBox(htab));
 
     UmlParamDirection dir = pa->get_dir();
 
-    eddir->insertItem(stringify(dir));
+    eddir->addItem(stringify(dir));
 
     if (! visit) {
         if (dir != UmlInOut)
-            eddir->insertItem(stringify(UmlInOut));
+            eddir->addItem(stringify(UmlInOut));
 
         if (dir != UmlIn)
-            eddir->insertItem(stringify(UmlIn));
+            eddir->addItem(stringify(UmlIn));
 
         if (dir != UmlOut)
-            eddir->insertItem(stringify(UmlOut));
+            eddir->addItem(stringify(UmlOut));
 
         if (dir != UmlReturn)
-            eddir->insertItem(stringify(UmlReturn));
+            eddir->addItem(stringify(UmlReturn));
     }
 
-    new QLabel(TR("   multiplicity : "), htab);
-    edmultiplicity = new Q3ComboBox(!visit, htab);
+    htab->addWidget(new QLabel(tr("   multiplicity : "), htab));
+    htab->addWidget( edmultiplicity = new QComboBox(htab));
+    edmultiplicity->setEditable(!visit);
     edmultiplicity->setSizePolicy(sp);
-    edmultiplicity->insertItem(pa->get_multiplicity());
+    edmultiplicity->addItem(pa->get_multiplicity());
 
     if (!visit) {
-        edmultiplicity->insertItem("1");
-        edmultiplicity->insertItem("0..1");
-        edmultiplicity->insertItem("*");
-        edmultiplicity->insertItem("1..*");
+        edmultiplicity->addItem("1");
+        edmultiplicity->addItem("0..1");
+        edmultiplicity->addItem("*");
+        edmultiplicity->addItem("1..*");
     }
 
-    new QLabel(TR("   ordering : "), htab);
-    edordering = new Q3ComboBox(FALSE, htab);
+    htab->addWidget(new QLabel(tr("   ordering : "), htab));
+    htab->addWidget(edordering = new QComboBox(htab));
 
     UmlOrderingKind o = pa->get_ordering();
 
-    edordering->insertItem(stringify(o));
+    edordering->addItem(stringify(o));
 
     if (!visit) {
         if (o != UmlUnordered)
-            edordering->insertItem(stringify(UmlUnordered));
+            edordering->addItem(stringify(UmlUnordered));
 
         if (o != UmlOrdered)
-            edordering->insertItem(stringify(UmlOrdered));
+            edordering->addItem(stringify(UmlOrdered));
 
         if (o != UmlLifo)
-            edordering->insertItem(stringify(UmlLifo));
+            edordering->addItem(stringify(UmlLifo));
 
         if (o != UmlFifo)
-            edordering->insertItem(stringify(UmlFifo));
+            edordering->addItem(stringify(UmlFifo));
     }
 
-    new QLabel(TR("   effect : "), htab);
-    edeffect = new Q3ComboBox(FALSE, htab);
+    htab->addWidget(new QLabel(tr("   effect : "), htab));
+    htab->addWidget(edeffect = new QComboBox(htab));
 
     UmlParamEffect e = pa->get_effect();
 
-    edeffect->insertItem(stringify(e));
+    edeffect->addItem(stringify(e));
 
     if (!visit) {
         if (e != UmlNoEffect)
-            edeffect->insertItem(stringify(UmlNoEffect));
+            edeffect->addItem(stringify(UmlNoEffect));
 
         if (e != UmlCreate)
-            edeffect->insertItem(stringify(UmlCreate));
+            edeffect->addItem(stringify(UmlCreate));
 
         if (e != UmlRead)
-            edeffect->insertItem(stringify(UmlRead));
+            edeffect->addItem(stringify(UmlRead));
 
         if (e != UmlUpdate)
-            edeffect->insertItem(stringify(UmlUpdate));
+            edeffect->addItem(stringify(UmlUpdate));
 
         if (e != UmlDelete)
-            edeffect->insertItem(stringify(UmlDelete));
+            edeffect->addItem(stringify(UmlDelete));
     }
 
-    new QLabel(TR("in state : "), grid);
-    edin_state = new LineEdit(pa->in_state, grid);
+    grid->addWidget(new QLabel(tr("in state : "), grid));
+    grid->addWidget(edin_state = new LineEdit(pa->in_state, grid));
     edin_state->setReadOnly(visit);
 
-    new QLabel(TR("default value :"), grid);
-    htab = new Q3HBox(grid);
-    edinit = new LineEdit(pa->get_default_value(), htab);
+    grid->addWidget(new QLabel(tr("default value :"), grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(edinit = new LineEdit(pa->get_default_value(), htab));
 
     if (visit)
+    {
         edinit->setReadOnly(TRUE);
+    }
     else
-        connect(new SmallPushButton(TR("Editor"), htab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), htab), SIGNAL(clicked()),
                 this, SLOT(edit_init()));
+        htab->addWidget(sButton);
+    }
 
-    new QLabel(grid);
-    htab = new Q3HBox(grid);
-    Q3ButtonGroup * bg =
-        new Q3ButtonGroup(2, Qt::Horizontal, QString(), htab);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(htab = new HHBox(grid));
+    BButtonGroup * bg ;
+    htab->addWidget( bg = new BButtonGroup(2, Qt::Horizontal, QString(), htab));
 
-    is_control_cb = new QCheckBox(TR("is_control"), bg);
+    bg->addWidget(is_control_cb = new QCheckBox(tr("is_control"), bg));
 
     if (pa->is_control)
         is_control_cb->setChecked(TRUE);
 
     is_control_cb->setDisabled(visit);
 
-    unique_cb = new QCheckBox(TR("unique"), bg);
+    bg->addWidget(unique_cb = new QCheckBox(tr("unique"), bg));
 
     if (pa->unique)
         unique_cb->setChecked(TRUE);
 
     unique_cb->setDisabled(visit);
 
-    bg =
-        new Q3ButtonGroup(3, Qt::Horizontal, QString(), htab);
+    htab->addWidget(bg = new BButtonGroup(3, Qt::Horizontal, QString(), htab));
     bg->setExclusive(TRUE);
 
-    standard_rb = new QRadioButton(TR("standard"), bg);
-    exception_rb = new QRadioButton(TR("exception"), bg);
-    stream_rb = new QRadioButton(TR("stream"), bg);
+    bg->addWidget(standard_rb = new QRadioButton(tr("standard"), bg));
+    bg->addWidget(exception_rb = new QRadioButton(tr("exception"), bg));
+    bg->addWidget(stream_rb = new QRadioButton(tr("stream"), bg));
 
     if (pa->exception)
         exception_rb->setChecked(TRUE);
@@ -261,15 +271,17 @@ ParameterDialog::ParameterDialog(ParameterData * pa)
     else
         standard_rb->setChecked(TRUE);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
     }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(pa->browser_node->get_comment());
     comment->setFont(font);
@@ -291,12 +303,12 @@ ParameterDialog::ParameterDialog(ParameterData * pa)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(pa->browser_node, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(pa->browser_node, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -311,8 +323,9 @@ ParameterDialog::~ParameterDialog()
     param->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -333,7 +346,7 @@ void ParameterDialog::change_tabs(QWidget * w)
 
 void ParameterDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -341,20 +354,25 @@ void ParameterDialog::init_tab(QWidget *& tab, MultiLineEdit *& ed, const char *
                                const char * lbl, const char * sl, bool enabled)
 {
     bool visit = !hasOkButton();
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     tab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    Q3VBox * vtab = new Q3VBox(grid);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
 
-    new QLabel(TR("selection : "), vtab);
+    vtab->addWidget(new QLabel(tr("selection : "), vtab));
 
+    SmallPushButton* sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl);
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl);
+        vtab->addWidget(sButton);
+    }
 
-    ed = new MultiLineEdit(grid);
+    grid->addWidget(ed = new MultiLineEdit(grid));
 
     QFont font = ed->font();
 
@@ -376,15 +394,15 @@ void ParameterDialog::init_tab(QWidget *& tab, MultiLineEdit *& ed, const char *
 
 void ParameterDialog::menu_type()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edtype->currentText().stripWhiteSpace());
+    int index = list.indexOf(edtype->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -392,67 +410,71 @@ void ParameterDialog::menu_type()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlClass) && !bn->deletedp())
-            m.insertItem(TR("Choose class selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose class selected in browser"), 1);
         else
             bn = 0;
 
-        m.insertItem(TR("Create class and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create class and choose it"), 2);
     }
 
     if (!visit || (index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            nodes.at(index)->select_in_browser();
-            break;
-
-        case 2:
-            bn = BrowserClass::add_class(FALSE, view);
-
-            if (bn == 0)
-                return;
-
-            bn->select_in_browser();
-
-            // no break
-        case 1: {
-            QString s = bn->full_name(TRUE);
-
-            if ((index = list.findIndex(s)) == -1) {
-                // new class, may be created through an other dialog
-                index = 0;
-                QStringList::Iterator iter = list.begin();
-                QStringList::Iterator iter_end = list.end();
-
-                while ((iter != iter_end) && (*iter < s)) {
-                    ++iter;
-                    index += 1;
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+            switch (retAction->data().toInt()) {
+            case 0:
+                nodes.at(index)->select_in_browser();
+                break;
+
+            case 2:
+                bn = BrowserClass::add_class(FALSE, view);
+
+                if (bn == 0)
+                    return;
+
+                bn->select_in_browser();
+
+                // no break
+            case 1: {
+                QString s = bn->full_name(TRUE);
+
+                if ((index = list.indexOf(s)) == -1) {
+                    // new class, may be created through an other dialog
+                    index = 0;
+                    QStringList::Iterator iter = list.begin();
+                    QStringList::Iterator iter_end = list.end();
+
+                    while ((iter != iter_end) && (*iter < s)) {
+                        ++iter;
+                        index += 1;
+                    }
+
+                    nodes.insert((unsigned) index, bn);
+                    list.insert(iter, s);
+                    edtype->insertItem(index + offset,s);
                 }
-
-                nodes.insert((unsigned) index, bn);
-                list.insert(iter, s);
-                edtype->insertItem(s, index + offset);
             }
-        }
 
-        edtype->setCurrentItem(index + offset);
-        break;
+                edtype->setCurrentIndex(index + offset);
+                break;
 
-        default:
-            break;
+            default:
+                break;
+            }
         }
     }
 }
 
 #define DEF_EDIT(lang, Lang) \
-void ParameterDialog::edit_##lang##_selection() {	\
-  edit(ed##lang##_selection->text(), "object_"#lang"_selection", param, Lang,  \
-       this, (post_edit) post_edit_##lang##_##selection, edits);	\
-} \
-  \
-void ParameterDialog::post_edit_##lang##_selection(ParameterDialog * d, QString s) \
+    void ParameterDialog::edit_##lang##_selection() {	\
+    edit(ed##lang##_selection->text(), "object_"#lang"_selection", param, Lang,  \
+    this, (post_edit) post_edit_##lang##_##selection, edits);	\
+    } \
+    \
+    void ParameterDialog::post_edit_##lang##_selection(ParameterDialog * d, QString s) \
 { \
-  d->ed##lang##_selection->setText(s); \
-}
+    d->ed##lang##_selection->setText(s); \
+    }
 
 DEF_EDIT(uml, TxtEdit)
 DEF_EDIT(cpp, CppEdit)
@@ -466,13 +488,13 @@ void ParameterDialog::accept()
     BrowserNode * bn = param->browser_node;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if ((s != param->name()) &&
-        ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlParameter,
-                bn->allow_spaces(),
-                bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+            ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlParameter,
+                                                             bn->allow_spaces(),
+                                                             bn->allow_empty()))
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else {
         // check consistency
         UmlParamDirection dir = direction(eddir->currentText());
@@ -481,18 +503,18 @@ void ParameterDialog::accept()
         QString err;
 
         if ((dir == UmlIn) && exception)
-            err = TR("An input parameter cannot be an exception.\n");
+            err = tr("An input parameter cannot be an exception.\n");
 
         switch (effect) {
         case UmlDelete:
             if ((dir != UmlIn) && (dir != UmlInOut))
-                err += TR("Only in and inout parameter may have a delete effect.");
+                err += tr("Only in and inout parameter may have a delete effect.");
 
             break;
 
         case UmlCreate:
             if ((dir != UmlOut) && (dir != UmlInOut) && (dir != UmlReturn))
-                err += TR("Only out, inout and return parameter may have a create effect.");
+                err += tr("Only out, inout and return parameter may have a create effect.");
 
             break;
 
@@ -501,17 +523,17 @@ void ParameterDialog::accept()
         }
 
         if (!err.isEmpty())
-            msg_critical(TR("Error"), err);
+            msg_critical(tr("Error"), err);
         else {
             bn->set_name(s);
 
-            bool newst = param->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+            bool newst = param->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
             AType t;
 
-            s = edtype->currentText().stripWhiteSpace();
+            s = edtype->currentText().trimmed();
 
             if (!s.isEmpty()) {
-                int index = list.findIndex(s);
+                int index = list.indexOf(s);
 
                 if (index >= 0)
                     t.type = (BrowserClass *) nodes.at(index);
@@ -522,18 +544,18 @@ void ParameterDialog::accept()
             param->set_type(t);
             param->dir = dir;
             param->multiplicity =
-                edmultiplicity->currentText().stripWhiteSpace();
-            param->ordering = ordering(edordering->currentText());
+                    edmultiplicity->currentText().trimmed();
+            param->ordering = ordering(edordering->currentText().toLatin1());
             param->effect = effect;
             param->is_control = is_control_cb->isChecked();
             param->unique = unique_cb->isChecked();
             param->exception = exception;
             param->stream = stream_rb->isChecked();
-            param->in_state = edin_state->text().stripWhiteSpace();
+            param->in_state = edin_state->text().trimmed();
             param->default_value = edinit->text();
-            param->uml_selection = eduml_selection->text().stripWhiteSpace();
-            param->cpp_selection = edcpp_selection->text().stripWhiteSpace();
-            param->java_selection = edjava_selection->text().stripWhiteSpace();
+            param->uml_selection = eduml_selection->text().trimmed();
+            param->cpp_selection = edcpp_selection->text().trimmed();
+            param->java_selection = edjava_selection->text().trimmed();
 
             bn->set_comment(comment->text());
             UmlWindow::update_comment_if_needed(bn);
@@ -546,14 +568,14 @@ void ParameterDialog::accept()
             bn->package_modified();
             param->modified();
 
-            Q3TabDialog::accept();
+            TabDialog::accept();
         }
     }
 }
 
 void ParameterDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          param, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -564,7 +586,7 @@ void ParameterDialog::post_edit_description(ParameterDialog * d, QString s)
 
 void ParameterDialog::edit_init()
 {
-    edit(edinit->text(), edname->text().stripWhiteSpace() + "_initialization",
+    edit(edinit->text(), edname->text().trimmed() + "_initialization",
          param, TxtEdit, this, (post_edit) post_edit_init, edits);
 }
 
diff --git a/src/dialog/ParameterDialog.h b/src/dialog/ParameterDialog.h
index 7d6a2c662..cbfe23063 100644
--- a/src/dialog/ParameterDialog.h
+++ b/src/dialog/ParameterDialog.h
@@ -33,13 +33,10 @@
 
 
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QRadioButton;
 
@@ -51,7 +48,7 @@ class MultiLineEdit;
 class KeyValuesTable;
 class BodyDialog;
 
-class ParameterDialog : public Q3TabDialog
+class ParameterDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -60,7 +57,7 @@ class ParameterDialog : public Q3TabDialog
     ParameterData * param;
     QStringList list;
     BrowserNodeList nodes;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
     BrowserNode * view;
     int offset;
 
@@ -68,12 +65,12 @@ class ParameterDialog : public Q3TabDialog
     QWidget * umltab;
     LineEdit * edname;
     LineEdit * edinit;
-    Q3ComboBox * edtype;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * eddir;
-    Q3ComboBox * edordering;
-    Q3ComboBox * edeffect;
-    Q3ComboBox * edmultiplicity;
+    QComboBox * edtype;
+    QComboBox * edstereotype;
+    QComboBox * eddir;
+    QComboBox * edordering;
+    QComboBox * edeffect;
+    QComboBox * edmultiplicity;
     LineEdit * edin_state;
     QCheckBox * is_control_cb;
     QCheckBox * unique_cb;
@@ -108,7 +105,7 @@ class ParameterDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edit_init();
     void edit_description();
diff --git a/src/dialog/ParameterSetDialog.cpp b/src/dialog/ParameterSetDialog.cpp
index 8a51b3de4..32af4cce0 100644
--- a/src/dialog/ParameterSetDialog.cpp
+++ b/src/dialog/ParameterSetDialog.cpp
@@ -30,14 +30,12 @@
 
 
 #include <qsplitter.h>
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-
+#include <qcombobox.h>
+#include <QList>
 #include "ParameterSetDialog.h"
 #include "UmlDesktop.h"
 #include "BrowserParameterSet.h"
@@ -53,38 +51,39 @@
 #include "BodyDialog.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
+#include "hhbox.h"
 
 QSize ParameterSetDialog::previous_size;
 
 ParameterSetDialog::ParameterSetDialog(ParameterSetData * nd)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), data(nd)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), data(nd)
 {
     nd->browser_node->edit_start();
 
     if (nd->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("ParameterSet dialog"));
+    setWindowTitle(tr("ParameterSet dialog"));
 
     init_uml_tab();
     init_pins_tab();
 
     // USER : list key - value
 
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable((BrowserParameterSet *) data->get_browser_node(),
-                                 grid, !hasOkButton());
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable((BrowserParameterSet *) data->get_browser_node(),
+                                 grid, !hasOkButton()));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -99,8 +98,9 @@ ParameterSetDialog::~ParameterSetDialog()
     data->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -113,7 +113,7 @@ void ParameterSetDialog::change_tabs(QWidget * w)
 
 void ParameterSetDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -123,41 +123,43 @@ void ParameterSetDialog::init_uml_tab()
 
     BrowserParameterSet * bn =
         (BrowserParameterSet *) data->get_browser_node();
-    Q3VBox * vbox;
-    Q3Grid * grid = new Q3Grid(2, this);
+    VVBox * vbox;
+    GridBox * grid = new GridBox(2, this);
 
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(TRUE, grid);
-    edstereotype->insertItem(toUnicode(data->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(true);
+    edstereotype->addItem(toUnicode(data->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserParameterSet::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlParameterSet));
+        edstereotype->addItems(BrowserParameterSet::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlParameterSet));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    vbox = new Q3VBox(grid);
-    new QLabel(TR("description :"), vbox);
-
+    grid->addWidget(vbox = new VVBox(grid));
+    vbox->addWidget(new QLabel(tr("description :"), vbox));
+    SmallPushButton* b;
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vbox), SIGNAL(clicked()),
+        connect( b = new SmallPushButton(tr("Editor"), vbox), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vbox->addWidget(b);
     }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     QFont font = comment->font();
@@ -174,61 +176,66 @@ void ParameterSetDialog::init_uml_tab()
 void ParameterSetDialog::init_pins_tab()
 {
     bool visit = !hasOkButton();
-    Q3HBox * hbox;
+    HHBox * hbox;
     QPushButton * button;
-    Q3VBox * vbox = new Q3VBox(this);
-    Q3VBox * page = vbox;
-    const Q3ValueList<BrowserPin *> & inpins = data->pins;
-    Q3ValueList<BrowserPin *>::ConstIterator it;
-
+    VVBox * vbox = new VVBox(this);
+    VVBox * page = vbox;
+    const QList<BrowserPin *> & inpins = data->pins;
+    QList<BrowserPin *>::ConstIterator it;
+    QLabel* l;
     if (!visit) {
-        hbox = new Q3HBox(vbox);
-        vbox = new Q3VBox(hbox);
+        vbox->addWidget(hbox = new HHBox(vbox));
+        hbox->addWidget(vbox = new VVBox(hbox));
         vbox->setMargin(5);
-        (new QLabel(TR("Parameters out of Parameter Set"), vbox))->setAlignment(Qt::AlignCenter);
-        lb_available = new Q3ListBox(vbox);
-        lb_available->setSelectionMode(Q3ListBox::Multi);
+        (l = new QLabel(tr("Parameters out of Parameter Set"), vbox))->setAlignment(Qt::AlignCenter);
+        vbox->addWidget(l);
+        vbox->addWidget(lb_available = new QListWidget(vbox));
+        lb_available->setSelectionMode(QListWidget::MultiSelection);
 
         BrowserParameterSet * bn =
             (BrowserParameterSet *) data->get_browser_node();
-        Q3ValueList<BrowserPin *> allpins =
+        QList<BrowserPin *> allpins =
             ((BrowserActivityAction *) bn->parent())->get_pins();
 
         for (it = allpins.begin(); it != allpins.end(); it++)
-            if (inpins.find(*it) == inpins.end())
-                lb_available->insertItem(new ListBoxBrowserNode(*it, (*it)->full_name(TRUE)));
+            if (!inpins.contains(*it))
+                lb_available->addItem(new ListBoxBrowserNode(*it, (*it)->full_name(TRUE)));
 
-        lb_available->sort();
+        lb_available->sortItems();
 
-        vbox = new Q3VBox(hbox);
+        hbox->addWidget(vbox = new VVBox(hbox));
         vbox->setMargin(5);
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        button = new QPushButton(vbox);
-        button->setPixmap(*rightPixmap);
+        (l = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(l);
+        vbox->addWidget(button = new QPushButton(vbox));
+        button->setIcon(*rightPixmap);
         connect(button, SIGNAL(clicked()), this, SLOT(associate_cls()));
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        button = new QPushButton(vbox);
-        button->setPixmap(*leftPixmap);
+        (l =new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(l);
+        vbox->addWidget(button = new QPushButton(vbox));
+        button->setIcon(*leftPixmap);
         connect(button, SIGNAL(clicked()), this, SLOT(unassociate_cls()));
-        (new QLabel("", vbox))->setScaledContents(TRUE);
-        vbox = new Q3VBox(hbox);
+        (l = new QLabel("", vbox))->setScaledContents(TRUE);
+        vbox->addWidget(l);
+        hbox->addWidget(vbox = new VVBox(hbox));
     }
 
     vbox->setMargin(5);
-    (new QLabel(TR("Parameters in Parameter Set"), vbox))->setAlignment(Qt::AlignCenter);
-    lb_member = new Q3ListBox(vbox);
-    lb_member->setSelectionMode((visit) ? Q3ListBox::NoSelection
-                                : Q3ListBox::Multi);
+    (l = new QLabel(tr("Parameters in Parameter Set"), vbox))->setAlignment(Qt::AlignCenter);
+    vbox->addWidget(l);
+    vbox->addWidget(lb_member = new QListWidget(vbox));
+    lb_member->setSelectionMode((visit) ? QListWidget::NoSelection
+                                : QListWidget::MultiSelection);
 
     for (it = inpins.begin(); it != inpins.end(); ++it)
-        lb_member->insertItem(new ListBoxBrowserNode(*it, (*it)->full_name(TRUE)));
+        lb_member->addItem(new ListBoxBrowserNode(*it, (*it)->full_name(TRUE)));
 
-    addTab(page, TR("Parameters"));
+    addTab(page, tr("Parameters"));
 }
 
 void ParameterSetDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          data, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -239,38 +246,38 @@ void ParameterSetDialog::post_edit_description(ParameterSetDialog * d, QString s
 
 void ParameterSetDialog::associate_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i < lb_available->count()) {
-        Q3ListBoxItem * item = lb_available->item(i);
+        QListWidgetItem * item = lb_available->item(i);
 
-        if (item->selected()) {
-            lb_available->takeItem(item);
-            lb_member->insertItem(item);
+        if (item->isSelected()) {
+            lb_available->takeItem(lb_available->row(item));
+            lb_member->addItem(item);
         }
         else
             i += 1;
     }
 
-    lb_member->sort();
+    lb_member->sortItems();
 }
 
 void ParameterSetDialog::unassociate_cls()
 {
-    unsigned int i = 0;
+    int i = 0;
 
     while (i < lb_member->count()) {
-        Q3ListBoxItem * item = lb_member->item(i);
+        QListWidgetItem * item = lb_member->item(i);
 
-        if (item->selected()) {
-            lb_member->takeItem(item);
-            lb_available->insertItem(item);
+        if (item->isSelected()) {
+            lb_member->takeItem(lb_member->row(item));
+            lb_available->addItem(item);
         }
         else
             i += 1;
     }
 
-    lb_available->sort();
+    lb_available->sortItems();
 }
 
 void ParameterSetDialog::accept()
@@ -278,7 +285,7 @@ void ParameterSetDialog::accept()
     if (!check_edits(edits) || !kvtable->check_unique())
         return;
 
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
     BrowserParameterSet * bn =
         (BrowserParameterSet *) data->get_browser_node();
 
@@ -286,16 +293,16 @@ void ParameterSetDialog::accept()
         ((BrowserNode *) bn->parent())->wrong_child_name(s, bn->get_type(),
                 bn->allow_spaces(),
                 bn->allow_empty()))
-        msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+        msg_critical(tr("Error"), edname->text() + tr("\n\nillegal name or already used"));
     else {
         bn->set_name(s);
         bn->set_comment(comment->text());
         UmlWindow::update_comment_if_needed(bn);
 
         QString stereotype =
-            fromUnicode(edstereotype->currentText().stripWhiteSpace());
+            fromUnicode(edstereotype->currentText().trimmed());
         bool newst = data->set_stereotype(stereotype);
-        Q3ValueList<BrowserPin *> l;
+        QList<BrowserPin *> l;
         unsigned n = lb_member->count();
 
         for (unsigned i = 0; i != n; i += 1)
@@ -313,6 +320,6 @@ void ParameterSetDialog::accept()
         bn->package_modified();
         data->modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
diff --git a/src/dialog/ParameterSetDialog.h b/src/dialog/ParameterSetDialog.h
index f7db2a500..ddefbd2e5 100644
--- a/src/dialog/ParameterSetDialog.h
+++ b/src/dialog/ParameterSetDialog.h
@@ -32,24 +32,20 @@
 
 
 
-#include <q3ptrdict.h>
 #include <qmap.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserParameterSet.h"
 
-class Q3ComboBox;
-class Q3ListBox;
-class Q3VBox;
+class QComboBox;
+class QListWidget;
+class VVBox;
 class LineEdit;
 class MultiLineEdit;
 class ParameterSetData;
 class KeyValuesTable;
 class BodyDialog;
 
-class ParameterSetDialog : public Q3TabDialog
+class ParameterSetDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -57,13 +53,13 @@ class ParameterSetDialog : public Q3TabDialog
     QWidget * umltab;
     ParameterSetData * data;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     // associated classes
-    Q3ListBox * lb_available;
-    Q3ListBox * lb_member;
+    QListWidget * lb_available;
+    QListWidget * lb_member;
 
     // user
     KeyValuesTable * kvtable;
@@ -81,7 +77,7 @@ class ParameterSetDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
     void associate_cls();
     void unassociate_cls();
diff --git a/src/dialog/PinDialog.cpp b/src/dialog/PinDialog.cpp
index 8d4f4f18f..4f3c8ce47 100644
--- a/src/dialog/PinDialog.cpp
+++ b/src/dialog/PinDialog.cpp
@@ -29,17 +29,15 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3buttongroup.h>
+#include <qcombobox.h>
+#include <bbuttongroup.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-#include <q3popupmenu.h>
 #include <qcursor.h>
-
 #include "PinDialog.h"
 #include "PinData.h"
 #include "BrowserClass.h"
@@ -54,39 +52,41 @@
 #include "BodyDialog.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
+#include "hhbox.h"
+#include "menufactory.h"
 
 QSize PinDialog::previous_size;
 
 PinDialog::PinDialog(PinData * pi)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), pin(pi)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), pin(pi)
 {
     pi->browser_node->edit_start();
 
     if (pi->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     visit = !hasOkButton();
-    setCaption(TR("Pin dialog"));
+    setWindowTitle(tr("Pin dialog"));
 
-    Q3Grid * grid;
-    Q3HBox * htab;
+    GridBox * grid;
+    HHBox * htab;
     QString s;
 
     // general tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name :"), grid);
-    edname = new LineEdit(pi->name(), grid);
+    grid->addWidget(new QLabel(tr("name :"), grid));
+    grid->addWidget(edname = new LineEdit(pi->name(), grid));
     edname->setReadOnly(visit);
 
     QFont font = edname->font();
@@ -96,150 +96,153 @@ PinDialog::PinDialog(PinData * pi)
 
     font.setFixedPitch(TRUE);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(pi->stereotype));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox( grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(pi->stereotype));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserPin::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlActivityPin));
+        edstereotype->addItems(BrowserPin::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlActivityPin));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
 
     QSizePolicy sp = edstereotype->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
-
-    connect(new SmallPushButton(TR("type :"), grid), SIGNAL(clicked()),
+    SmallPushButton* sButton;
+    connect(sButton = new SmallPushButton(tr("type :"), grid), SIGNAL(clicked()),
             this, SLOT(menu_type()));
+    grid->addWidget(sButton);
 
-    edtype = new Q3ComboBox(!visit, grid);
-    edtype->insertItem(pi->get_type().get_full_type());
+    grid->addWidget(edtype = new QComboBox(grid));
+    edtype->setEditable(!visit);
+    edtype->addItem(pi->get_type().get_full_type());
 
     if (!visit) {
         BrowserClass::instances(nodes);
         nodes.full_names(list);
 
-        edtype->insertStringList(GenerationSettings::basic_types());
+        edtype->addItems(GenerationSettings::basic_types());
         offset = edtype->count();
-        edtype->insertStringList(list);
+        edtype->addItems(list);
         edtype->setAutoCompletion(completion());
         view = pi->browser_node->container(UmlClass);
     }
 
-    edtype->setCurrentItem(0);
+    edtype->setCurrentIndex(0);
     edtype->setSizePolicy(sp);
 
-    new QLabel(TR("direction :"), grid);
-    htab = new Q3HBox(grid);
-    eddir = new Q3ComboBox(FALSE, htab);
+    grid->addWidget(new QLabel(tr("direction :"), grid));
+    grid->addWidget(htab = new HHBox(grid));
+    htab->addWidget(eddir = new QComboBox(htab));
 
     UmlParamDirection dir = pi->get_dir();
 
-    eddir->insertItem(stringify(dir));
+    eddir->addItem(stringify(dir));
 
     if (! visit) {
         // note : inout not allowed
         if (dir != UmlIn)
-            eddir->insertItem(stringify(UmlIn));
+            eddir->addItem(stringify(UmlIn));
 
         if (dir != UmlOut)
-            eddir->insertItem(stringify(UmlOut));
+            eddir->addItem(stringify(UmlOut));
 
         if (dir != UmlReturn)
-            eddir->insertItem(stringify(UmlReturn));
+            eddir->addItem(stringify(UmlReturn));
     }
 
-    new QLabel(TR("   multiplicity : "), htab);
-    edmultiplicity = new Q3ComboBox(!visit, htab);
+    htab->addWidget(new QLabel(tr("   multiplicity : "), htab));
+    htab->addWidget(edmultiplicity = new QComboBox( htab));
+    edmultiplicity->setEditable(!visit);
     edmultiplicity->setSizePolicy(sp);
-    edmultiplicity->insertItem(pi->get_multiplicity());
+    edmultiplicity->addItem(pi->get_multiplicity());
 
     if (!visit) {
-        edmultiplicity->insertItem("1");
-        edmultiplicity->insertItem("0..1");
-        edmultiplicity->insertItem("*");
-        edmultiplicity->insertItem("1..*");
+        edmultiplicity->addItem("1");
+        edmultiplicity->addItem("0..1");
+        edmultiplicity->addItem("*");
+        edmultiplicity->addItem("1..*");
     }
 
-    new QLabel(TR("   ordering : "), htab);
-    edordering = new Q3ComboBox(FALSE, htab);
+    htab->addWidget(new QLabel(tr("   ordering : "), htab));
+    htab->addWidget(edordering = new QComboBox(htab));
 
     UmlOrderingKind o = pi->get_ordering();
 
-    edordering->insertItem(stringify(o));
+    edordering->addItem(stringify(o));
 
     if (!visit) {
         if (o != UmlUnordered)
-            edordering->insertItem(stringify(UmlUnordered));
+            edordering->addItem(stringify(UmlUnordered));
 
         if (o != UmlOrdered)
-            edordering->insertItem(stringify(UmlOrdered));
+            edordering->addItem(stringify(UmlOrdered));
 
         if (o != UmlLifo)
-            edordering->insertItem(stringify(UmlLifo));
+            edordering->addItem(stringify(UmlLifo));
 
         if (o != UmlFifo)
-            edordering->insertItem(stringify(UmlFifo));
+            edordering->addItem(stringify(UmlFifo));
     }
 
-    new QLabel(TR("   effect : "), htab);
-    edeffect = new Q3ComboBox(FALSE, htab);
+    htab->addWidget(new QLabel(tr("   effect : "), htab));
+    htab->addWidget(edeffect = new QComboBox(htab));
 
     UmlParamEffect e = pi->get_effect();
 
-    edeffect->insertItem(stringify(e));
+    edeffect->addItem(stringify(e));
 
     if (!visit) {
         if (e != UmlNoEffect)
-            edeffect->insertItem(stringify(UmlNoEffect));
+            edeffect->addItem(stringify(UmlNoEffect));
 
         if (e != UmlCreate)
-            edeffect->insertItem(stringify(UmlCreate));
+            edeffect->addItem(stringify(UmlCreate));
 
         if (e != UmlRead)
-            edeffect->insertItem(stringify(UmlRead));
+            edeffect->addItem(stringify(UmlRead));
 
         if (e != UmlUpdate)
-            edeffect->insertItem(stringify(UmlUpdate));
+            edeffect->addItem(stringify(UmlUpdate));
 
         if (e != UmlDelete)
-            edeffect->insertItem(stringify(UmlDelete));
+            edeffect->addItem(stringify(UmlDelete));
     }
 
-    new QLabel(TR("in state : "), grid);
-    edin_state = new LineEdit(pi->in_state, grid);
+    grid->addWidget(new QLabel(tr("in state : "), grid));
+    grid->addWidget(edin_state = new LineEdit(pi->in_state, grid));
     edin_state->setReadOnly(visit);
 
-    new QLabel(grid);
-    htab = new Q3HBox(grid);
-    Q3ButtonGroup * bg =
-        new Q3ButtonGroup(2, Qt::Horizontal, QString(), htab);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(htab = new HHBox(grid));
+    BButtonGroup * bg;
+    htab->addWidget(bg = new BButtonGroup(2, Qt::Horizontal, QString(), htab));
 
-    is_control_cb = new QCheckBox(TR("is_control"), bg);
+    bg->addWidget(is_control_cb = new QCheckBox(tr("is_control"), bg));
 
     if (pi->is_control)
         is_control_cb->setChecked(TRUE);
 
     is_control_cb->setDisabled(visit);
 
-    unique_cb = new QCheckBox(TR("unique"), bg);
+    bg->addWidget(unique_cb = new QCheckBox(tr("unique"), bg));
 
     if (pi->unique)
         unique_cb->setChecked(TRUE);
 
     unique_cb->setDisabled(visit);
 
-    bg =
-        new Q3ButtonGroup(3, Qt::Horizontal, QString(), htab);
+    htab->addWidget(bg = new BButtonGroup(3, Qt::Horizontal, QString(), htab));
     bg->setExclusive(TRUE);
 
-    standard_rb = new QRadioButton(TR("standard"), bg);
-    exception_rb = new QRadioButton(TR("exception"), bg);
-    stream_rb = new QRadioButton(TR("stream"), bg);
+    bg->addWidget(standard_rb = new QRadioButton(tr("standard"), bg));
+    bg->addWidget(exception_rb = new QRadioButton(tr("exception"), bg));
+    bg->addWidget(stream_rb = new QRadioButton(tr("stream"), bg));
 
     if (pi->exception)
         exception_rb->setChecked(TRUE);
@@ -248,15 +251,17 @@ PinDialog::PinDialog(PinData * pi)
     else
         standard_rb->setChecked(TRUE);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit) {
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
     }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(pi->browser_node->get_comment());
     comment->setFont(font);
@@ -278,12 +283,12 @@ PinDialog::PinDialog(PinData * pi)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(pi->browser_node, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(pi->browser_node, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -298,8 +303,9 @@ PinDialog::~PinDialog()
     pin->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -320,7 +326,7 @@ void PinDialog::change_tabs(QWidget * w)
 
 void PinDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -328,20 +334,24 @@ void PinDialog::init_tab(QWidget *& tab, MultiLineEdit *& ed, const char * v,
                          const char * lbl, const char * sl, bool enabled)
 {
     bool visit = !hasOkButton();
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
 
     tab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-
-    new QLabel(TR("selection : "), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
 
+    vtab->addWidget(new QLabel(tr("selection : "), vtab));
+            SmallPushButton *sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl);
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl);
+        vtab->addWidget(sButton);
+    }
 
-    ed = new MultiLineEdit(grid);
+    grid->addWidget(ed = new MultiLineEdit(grid));
 
     QFont font = ed->font();
 
@@ -363,15 +373,15 @@ void PinDialog::init_tab(QWidget *& tab, MultiLineEdit *& ed, const char * v,
 
 void PinDialog::menu_type()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edtype->currentText().stripWhiteSpace());
+    int index = list.indexOf(edtype->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -379,21 +389,24 @@ void PinDialog::menu_type()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlClass) && !bn->deletedp())
-            m.insertItem(TR("Choose class selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose class selected in browser"), 1);
         else
             bn = 0;
 
-        m.insertItem(TR("Create class and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create class and choose it"), 2);
     }
 
     if (!visit || (index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0:
             nodes.at(index)->select_in_browser();
             break;
 
         case 2:
-            bn = BrowserClass::add_class(FALSE, view);
+            bn = BrowserClass::add_class(true, view,"");
 
             if (bn == 0)
                 return;
@@ -404,7 +417,7 @@ void PinDialog::menu_type()
         case 1: {
             QString s = bn->full_name(TRUE);
 
-            if ((index = list.findIndex(s)) == -1) {
+            if ((index = list.indexOf(s)) == -1) {
                 // new class, may be created through an other dialog
                 index = 0;
                 QStringList::Iterator iter = list.begin();
@@ -417,16 +430,17 @@ void PinDialog::menu_type()
 
                 nodes.insert((unsigned) index, bn);
                 list.insert(iter, s);
-                edtype->insertItem(s, index + offset);
+                edtype->insertItem(index + offset,s);
             }
         }
 
-        edtype->setCurrentItem(index + offset);
+        edtype->setCurrentIndex(index + offset);
         break;
 
         default:
             break;
         }
+        }
     }
 }
 
@@ -453,13 +467,13 @@ void PinDialog::accept()
     BrowserNode * bn = pin->browser_node;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if ((s != pin->name()) &&
         ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlActivityPin,
                 bn->allow_spaces(),
                 bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else {
         // check consistency
         UmlParamDirection dir = direction(eddir->currentText());
@@ -468,18 +482,18 @@ void PinDialog::accept()
         QString err;
 
         if ((dir == UmlIn) && exception)
-            err = TR("An input pin cannot be an exception.\n");
+            err = tr("An input pin cannot be an exception.\n");
 
         switch (effect) {
         case UmlDelete:
             if ((dir != UmlIn) && (dir != UmlInOut))
-                err += TR("Only in and inout pin may have a delete effect.");
+                err += tr("Only in and inout pin may have a delete effect.");
 
             break;
 
         case UmlCreate:
             if ((dir != UmlOut) && (dir != UmlInOut) && (dir != UmlReturn))
-                err += TR("Only out, inout and return pin may have a create effect.");
+                err += tr("Only out, inout and return pin may have a create effect.");
 
             break;
 
@@ -488,17 +502,17 @@ void PinDialog::accept()
         }
 
         if (!err.isEmpty())
-            msg_critical(TR("Error"), err);
+            msg_critical(tr("Error"), err);
         else {
             bn->set_name(s);
 
-            bool newst = pin->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+            bool newst = pin->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
             AType t;
 
-            s = edtype->currentText().stripWhiteSpace();
+            s = edtype->currentText().trimmed();
 
             if (!s.isEmpty()) {
-                int index = list.findIndex(s);
+                int index = list.indexOf(s);
 
                 if (index >= 0)
                     t.type = (BrowserClass *) nodes.at(index);
@@ -509,17 +523,17 @@ void PinDialog::accept()
             pin->set_type(t);
             pin->dir = dir;
             pin->multiplicity =
-                edmultiplicity->currentText().stripWhiteSpace();
+                edmultiplicity->currentText().trimmed();
             pin->ordering = ordering(edordering->currentText());
             pin->effect = effect;
             pin->is_control = is_control_cb->isChecked();
             pin->unique = unique_cb->isChecked();
-            pin->in_state = edin_state->text().stripWhiteSpace();
+            pin->in_state = edin_state->text().trimmed();
             pin->exception = exception;
             pin->stream = stream_rb->isChecked();
-            pin->uml_selection = eduml_selection->text().stripWhiteSpace();
-            pin->cpp_selection = edcpp_selection->text().stripWhiteSpace();
-            pin->java_selection = edjava_selection->text().stripWhiteSpace();
+            pin->uml_selection = eduml_selection->text().trimmed();
+            pin->cpp_selection = edcpp_selection->text().trimmed();
+            pin->java_selection = edjava_selection->text().trimmed();
 
             bn->set_comment(comment->text());
             UmlWindow::update_comment_if_needed(bn);
@@ -532,14 +546,14 @@ void PinDialog::accept()
             bn->package_modified();
             pin->modified();
 
-            Q3TabDialog::accept();
+            TabDialog::accept();
         }
     }
 }
 
 void PinDialog::edit_description()
 {
-    edit(comment->text(), edname->text().stripWhiteSpace() + "_description",
+    edit(comment->text(), edname->text().trimmed() + "_description",
          pin, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
diff --git a/src/dialog/PinDialog.h b/src/dialog/PinDialog.h
index 35471d513..764fc1f2b 100644
--- a/src/dialog/PinDialog.h
+++ b/src/dialog/PinDialog.h
@@ -33,13 +33,13 @@
 
 
 #include <qstringlist.h>
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QRadioButton;
 
@@ -51,7 +51,7 @@ class MultiLineEdit;
 class KeyValuesTable;
 class BodyDialog;
 
-class PinDialog : public Q3TabDialog
+class PinDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -60,19 +60,19 @@ class PinDialog : public Q3TabDialog
     PinData * pin;
     QStringList list;
     BrowserNodeList nodes;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
     BrowserNode * view;
     int offset;
 
     // uml tab
     QWidget * umltab;
     LineEdit * edname;
-    Q3ComboBox * edtype;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * eddir;
-    Q3ComboBox * edordering;
-    Q3ComboBox * edeffect;
-    Q3ComboBox * edmultiplicity;
+    QComboBox * edtype;
+    QComboBox * edstereotype;
+    QComboBox * eddir;
+    QComboBox * edordering;
+    QComboBox * edeffect;
+    QComboBox * edmultiplicity;
     LineEdit * edin_state;
     QCheckBox * is_control_cb;
     QCheckBox * unique_cb;
@@ -106,7 +106,7 @@ class PinDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edit_description();
     void edit_uml_selection();
diff --git a/src/dialog/PseudoStateDialog.cpp b/src/dialog/PseudoStateDialog.cpp
index 549acb292..474152c3d 100644
--- a/src/dialog/PseudoStateDialog.cpp
+++ b/src/dialog/PseudoStateDialog.cpp
@@ -29,14 +29,12 @@
 
 
 
-#include <q3grid.h>
+#include <gridbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
-#include <q3popupmenu.h>
+#include <qcombobox.h>
 #include <qcursor.h>
-#include <q3vbox.h>
-
+#include <vvbox.h>
 #include "PseudoStateDialog.h"
 #include "BrowserPseudoState.h"
 #include "BrowserState.h"
@@ -51,14 +49,15 @@
 #include "strutil.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "menufactory.h"
 QSize PseudoStateDialog::previous_size;
 
 PseudoStateDialog::PseudoStateDialog(PseudoStateData * ps)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), pst(ps)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), pst(ps)
 {
     BrowserPseudoState * bn = (BrowserPseudoState *) pst->browser_node;
     BrowserState * refst;
+    SmallPushButton* sButton;
 
     switch (bn->get_type()) {
     case EntryPointPS:
@@ -76,53 +75,54 @@ PseudoStateDialog::PseudoStateDialog(PseudoStateData * ps)
     bn->edit_start();
 
     if (bn->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     QString s = stringify(bn->get_type());
-    int index = s.find("_");
+    int index = s.indexOf("_");
 
     if (index != -1)
         s.replace(index, 1, " ");
 
-    setCaption(TR(s + " dialog"));
+    setCaption((s + " dialog"));
 
     visit = !hasOkButton();
 
     // general tab
 
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(pst->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(pst->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserPseudoState::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(bn->get_type()));
+        edstereotype->addItems(BrowserPseudoState::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(bn->get_type()));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
     if (refst != 0) {
-        connect(new SmallPushButton(TR("reference :"), grid), SIGNAL(clicked()),
+        connect(new SmallPushButton(tr("reference :"), grid), SIGNAL(clicked()),
                 this, SLOT(menu_reference()));
-        edreference = new Q3ComboBox(FALSE, grid);
+        grid->addWidget(edreference = new QComboBox(grid));
         edreference->setSizePolicy(sp);
 
         BrowserNode * ref = ((pst->get_reference() == 0) ||
@@ -131,15 +131,15 @@ PseudoStateDialog::PseudoStateDialog(PseudoStateData * ps)
 
         if (visit) {
             if (ref == 0)
-                edreference->insertItem("");
+                edreference->addItem("");
             else
-                edreference->insertItem(ref->full_name(TRUE));
+                edreference->addItem(ref->full_name(TRUE));
         }
         else {
-            edreference->insertItem("");
+            edreference->addItem("");
             edreference->setAutoCompletion(completion());
 
-            Q3ListViewItem * child;
+            BrowserNode * child;
             UmlCode k = bn->get_type();
 
             for (child = refst->firstChild();
@@ -151,7 +151,7 @@ PseudoStateDialog::PseudoStateDialog(PseudoStateData * ps)
                     if (kk == k)
                         pseudostates.append((BrowserNode *) child);
                     else if (kk == UmlRegion) {
-                        for (Q3ListViewItem * schild = child->firstChild();
+                        for (BrowserNode * schild = child->firstChild();
                              schild != 0;
                              schild = schild->nextSibling()) {
                             if (!((BrowserNode *) schild)->deletedp() &&
@@ -164,23 +164,27 @@ PseudoStateDialog::PseudoStateDialog(PseudoStateData * ps)
 
             pseudostates.sort();
             pseudostates.full_names(reflist);
-            edreference->insertStringList(reflist);
-            edreference->setCurrentItem((ref == 0)
+            edreference->addItems(reflist);
+            edreference->setCurrentIndex((ref == 0)
                                         ? 0
-                                        : pseudostates.findRef(ref) + 1);
+                                        : pseudostates.indexOf(ref) + 1);
         }
     }
     else
         edreference = 0;
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
 
@@ -196,19 +200,19 @@ PseudoStateDialog::PseudoStateDialog(PseudoStateData * ps)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     open_dialog(this);
 }
 
 void PseudoStateDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -217,23 +221,24 @@ PseudoStateDialog::~PseudoStateDialog()
     pst->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
 
 void PseudoStateDialog::menu_reference()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = reflist.findIndex(edreference->currentText());
+    int index = reflist.indexOf(edreference->currentText());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -243,13 +248,16 @@ void PseudoStateDialog::menu_reference()
         if ((bn != 0) &&
             !bn->deletedp() &&
             ((BrowserPseudoState *) pst->browser_node)->can_reference(bn))
-            m.insertItem(TR("Choose pseudo state selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose pseudo state selected in browser"), 1);
         else
             bn = 0;
     }
 
     if ((index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0:
             pseudostates.at(index)->select_in_browser();
             break;
@@ -257,7 +265,7 @@ void PseudoStateDialog::menu_reference()
         case 1: {
             QString s = bn->full_name(TRUE);
 
-            if ((index = reflist.findIndex(s)) == -1) {
+            if ((index = reflist.indexOf(s)) == -1) {
                 // new state, may be created through an other dialog
                 index = 0;
                 QStringList::Iterator iter = reflist.begin();
@@ -270,16 +278,17 @@ void PseudoStateDialog::menu_reference()
 
                 pseudostates.insert((unsigned) index, bn);
                 reflist.insert(iter, s);
-                edreference->insertItem(s, index + 1);
+                edreference->insertItem(index + 1, s);
             }
         }
 
-        edreference->setCurrentItem(index + 1);
+        edreference->setCurrentIndex(index + 1);
         break;
 
         default:
             break;
         }
+        }
     }
 }
 
@@ -287,7 +296,7 @@ void PseudoStateDialog::edit_description()
 {
     edit(comment->text(),
          (edname == 0) ? QString("description")
-         : edname->text().stripWhiteSpace() + "_description",
+         : edname->text().trimmed() + "_description",
          pst, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -301,20 +310,20 @@ void PseudoStateDialog::accept()
     if (!check_edits(edits) || !kvtable->check_unique())
         return;
 
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
     BrowserPseudoState * bn = (BrowserPseudoState *) pst->browser_node;
 
     if ((s != bn->get_name()) &&
         ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlPseudoState,
                 bn->allow_spaces(),
                 bn->allow_empty())) {
-        msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+        msg_critical(tr("Error"), edname->text() + tr("\n\nillegal name or already used"));
         return;
     }
     else
         bn->set_name(s);
 
-    bool newst = pst->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool newst = pst->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
@@ -322,7 +331,7 @@ void PseudoStateDialog::accept()
     kvtable->updateNodeFromThis(bn);
 
     if (edreference != 0) {
-        int index = reflist.findIndex(edreference->currentText());
+        int index = reflist.indexOf(edreference->currentText());
         BrowserPseudoState * ps;
 
         if (index != -1) {
@@ -343,5 +352,5 @@ void PseudoStateDialog::accept()
     bn->package_modified();
     pst->modified();
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/PseudoStateDialog.h b/src/dialog/PseudoStateDialog.h
index 28ace4a28..72b40524c 100644
--- a/src/dialog/PseudoStateDialog.h
+++ b/src/dialog/PseudoStateDialog.h
@@ -32,21 +32,17 @@
 
 
 
-#include <q3ptrlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 class LineEdit;
 class MultiLineEdit;
 class PseudoStateData;
 class KeyValuesTable;
 class BodyDialog;
 
-class PseudoStateDialog : public Q3TabDialog
+class PseudoStateDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -56,11 +52,11 @@ class PseudoStateDialog : public Q3TabDialog
     QStringList reflist;
     BrowserNodeList pseudostates;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * edreference;
+    QComboBox * edstereotype;
+    QComboBox * edreference;
     MultiLineEdit * comment;
     KeyValuesTable * kvtable;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     static QSize previous_size;
 
@@ -72,7 +68,7 @@ class PseudoStateDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void menu_reference();
     void edit_description();
 };
diff --git a/src/dialog/ReferenceDialog.cpp b/src/dialog/ReferenceDialog.cpp
index bb2a030a5..5840971e1 100644
--- a/src/dialog/ReferenceDialog.cpp
+++ b/src/dialog/ReferenceDialog.cpp
@@ -31,14 +31,13 @@
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 //Added by qt3to4:
-#include <Q3PtrList>
 
 #include "ReferenceDialog.h"
 #include "BrowserView.h"
@@ -50,36 +49,37 @@ ReferenceDialog * ReferenceDialog::the;
 QSize ReferenceDialog::previous_size;
 
 ReferenceDialog::ReferenceDialog(BrowserNode * bn)
-    : QDialog(0, "Referenced By dialog", FALSE, Qt::WDestructiveClose)
+    : QDialog(0/*, "Referenced By dialog", Qt::WA_DeleteOnClose*/)
 {
     the = this;
     target = bn;
 
-    setCaption(TR("Referenced By dialog"));
+    setWindowTitle(tr("Referenced By dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
     QString s = target->get_name();
 
-    s += TR(" is referenced by :");
+    s += QObject::tr(" is referenced by :");
 
     vbox->addWidget(new QLabel(s, this));
 
-    results = new Q3ComboBox(FALSE, this);
+    results = new QComboBox(this);
     vbox->addWidget(results);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
-    QPushButton * search_b = new QPushButton(TR("Recompute"), this);
-    QPushButton * close_b = new QPushButton(TR("Close"), this);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
+    QPushButton * search_b = new QPushButton(tr("Recompute"), this);
+    QPushButton * close_b = new QPushButton(tr("Close"), this);
 
     hbox->setMargin(5);
     hbox->addWidget(search_b);
-    hbox->addWidget(select_b = new QPushButton(TR("Select"), this));
-    hbox->addWidget(mark_unmark_b = new QPushButton(TR("Unmark"), this));
-    hbox->addWidget(mark_them_b = new QPushButton(TR("Mark them"), this));
-    hbox->addWidget(unmark_all_b = new QPushButton(TR("Unmark all"), this));
+    hbox->addWidget(select_b = new QPushButton(tr("Select"), this));
+    hbox->addWidget(mark_unmark_b = new QPushButton(tr("Unmark"), this));
+    hbox->addWidget(mark_them_b = new QPushButton(tr("Mark them"), this));
+    hbox->addWidget(unmark_all_b = new QPushButton(tr("Unmark all"), this));
     hbox->addWidget(close_b);
 
     search_b->setDefault(TRUE);
@@ -107,44 +107,40 @@ ReferenceDialog::~ReferenceDialog()
 
 void ReferenceDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
 void ReferenceDialog::compute()
 {
-    QApplication::setOverrideCursor(Qt::waitCursor);
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
-    Q3PtrList<BrowserNode> l;
-    BrowserNode * bn;
+    QList<BrowserNode *> l;
 
     nodes.clear();
     results->clear();
     target->referenced_by(l);
 
-    for (bn = l.first(); bn; bn = l.next())
+    foreach (BrowserNode * bn, l)
         nodes.append(bn);
 
     nodes.sort();
 
     // remove duplicats
-    nodes.first();
-
-    while ((bn = nodes.current()) != 0)
-        if (bn == nodes.next())
-            nodes.remove();
+    BrowserNode *prevNode = 0;
+    foreach (BrowserNode * bn, l) {
+        if (prevNode == bn)
+            nodes.removeOne(bn);
+    }
 
     QStringList names;
 
     nodes.full_names(names);
-
-    QStringList::Iterator it;
-
-    for (bn = nodes.first(), it = names.begin();
-         bn;
-         bn = nodes.next(), ++it)
-        results->insertItem(*(bn->pixmap(0)), *it);
-
+    QStringList::Iterator it = names.begin();
+    foreach (BrowserNode * bn, nodes) {
+        results->addItem(*(bn->pixmap(0)), *it);
+        ++it;
+    }
     selected((nodes.isEmpty()) ? -1 : 0);
 
     QApplication::restoreOverrideCursor();
@@ -161,7 +157,7 @@ void ReferenceDialog::selected(int index)
         select_b->setEnabled(TRUE);
         mark_unmark_b->setEnabled(TRUE);
         mark_unmark_b->setText((nodes.at(index)->markedp())
-                               ? TR("Unmark") : TR("Mark"));
+                               ? QObject::tr("Unmark") : QObject::tr("Mark"));
         mark_them_b->setEnabled(TRUE);
     }
 
@@ -170,7 +166,7 @@ void ReferenceDialog::selected(int index)
 
 void ReferenceDialog::mark_unmark()
 {
-    BrowserNode * bn = nodes.at(results->currentItem());
+    BrowserNode * bn = nodes.at(results->currentIndex());
 
     bn->toggle_mark();  	// call update
     BrowserView::force_visible(bn);
@@ -178,14 +174,13 @@ void ReferenceDialog::mark_unmark()
 
 void ReferenceDialog::mark_them()
 {
-    BrowserNode * bn;
-
-    for (bn = nodes.first(); bn != 0; bn = nodes.next()) {
+    foreach (BrowserNode *bn, nodes) {
         if (! bn->markedp()) {
             bn->toggle_mark();  	// call update
             BrowserView::force_visible(bn);
         }
     }
+
 }
 
 void ReferenceDialog::unmark_all()
@@ -196,18 +191,18 @@ void ReferenceDialog::unmark_all()
 void ReferenceDialog::select()
 {
     if (!nodes.isEmpty())
-        nodes.at(results->currentItem())->select_in_browser();
+        nodes.at(results->currentIndex())->select_in_browser();
 }
 
 void ReferenceDialog::update()
 {
-    selected((results->count() != 0) ? results->currentItem() : -1);
+    selected((results->count() != 0) ? results->currentIndex() : -1);
 }
 
 void ReferenceDialog::show(BrowserNode * target)
 {
     if (the != 0)
-        the->close(TRUE);
+        the->close();
 
     (new ReferenceDialog(target))->QDialog::show();
 }
diff --git a/src/dialog/ReferenceDialog.h b/src/dialog/ReferenceDialog.h
index 73d3cb009..afdbc3754 100644
--- a/src/dialog/ReferenceDialog.h
+++ b/src/dialog/ReferenceDialog.h
@@ -32,7 +32,7 @@
 
 #include "BrowserNode.h"
 
-class Q3ComboBox;
+class QComboBox;
 
 class ReferenceDialog : public QDialog
 {
@@ -41,7 +41,7 @@ class ReferenceDialog : public QDialog
 protected:
     BrowserNode * target;
     BrowserNodeList nodes;
-    Q3ComboBox * results;
+    QComboBox * results;
     QPushButton * select_b;
     QPushButton * mark_unmark_b;
     QPushButton * mark_them_b;
diff --git a/src/dialog/RelatedElementsDialog.cpp b/src/dialog/RelatedElementsDialog.cpp
index 196420bb0..e37d8c94a 100644
--- a/src/dialog/RelatedElementsDialog.cpp
+++ b/src/dialog/RelatedElementsDialog.cpp
@@ -35,12 +35,9 @@
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
-#include <q3buttongroup.h>
-#include <q3ptrdict.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-
+#include <bbuttongroup.h>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include "RelatedElementsDialog.h"
 #include "DialogUtil.h"
 #include "UmlDesktop.h"
@@ -50,47 +47,49 @@
 #include "RelationData.h"
 #include "SimpleRelationData.h"
 #include "translate.h"
-
+#include <QHash>
 QSize RelatedElementsDialog::previous_size;
 
-RelatedElementsDialog::RelatedElementsDialog(BrowserNode * e, const char * what,
+RelatedElementsDialog::RelatedElementsDialog(BrowserNode * e, QString what,
         bool inh, bool assoc, BrowserNodeList & l)
-    : QDialog(0, "Related elements dialog", TRUE), elt(e), elts(l)
+    : QDialog(0), elt(e), elts(l)
 {
-    setCaption(TR("Related elements dialog"));
+    setWindowTitle(tr("Related elements dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(new QLabel(TR("Search for : "), this));
-    referenced_rb = new QCheckBox(TR("referenced elements  "), this);
+    hbox->addWidget(new QLabel(tr("Search for : "), this));
+    referenced_rb = new QCheckBox(tr("referenced elements  "), this);
     referenced_rb->setChecked(TRUE);
     hbox->addWidget(referenced_rb);
-    referencing_rb = new QCheckBox(TR("referencing elements  "), this);
+    referencing_rb = new QCheckBox(tr("referencing elements  "), this);
     hbox->addWidget(referencing_rb);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(new QLabel(TR("Through relations : "), this));
+    hbox->addWidget(new QLabel(tr("Through relations : "), this));
 
     if (inh) {
-        inh_rb = new QCheckBox(TR("generalization  "), this);
+        inh_rb = new QCheckBox(tr("generalization  "), this);
         inh_rb->setChecked(TRUE);
         hbox->addWidget(inh_rb);
     }
     else
         inh_rb = 0;
 
-    dep_rb = new QCheckBox(TR("dependency  "), this);
+    dep_rb = new QCheckBox(tr("dependency  "), this);
     dep_rb->setChecked(TRUE);
     hbox->addWidget(dep_rb);
 
     if (assoc) {
-        assoc_rb = new QCheckBox(TR("other"), this);
+        assoc_rb = new QCheckBox(tr("other"), this);
         assoc_rb->setChecked(TRUE);
         hbox->addWidget(assoc_rb);
     }
@@ -99,22 +98,29 @@ RelatedElementsDialog::RelatedElementsDialog(BrowserNode * e, const char * what,
 
     hbox->addWidget(new QLabel(this), 1000);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    sametype_rb = new QCheckBox(TR("Search only for %1", what), this);
+    sametype_rb = new QCheckBox(tr("Search only for %1").arg(what), this);
     sametype_rb->setChecked(TRUE);
     hbox->addWidget(sametype_rb);
     hbox->addWidget(new QLabel(this), 1000);
-    hbox->addWidget(new QLabel(TR("     Search on "), this));
-    sb_level = new QSpinBox(1, 10, 1, this, TR("levels"));
+    hbox->addWidget(new QLabel(tr("     Search on "), this));
+    //sb_level = new QSpinBox(1, 10, 1, this, TR("levels"));
+    sb_level = new QSpinBox(this);
+    sb_level->setMinimum(1);
+    sb_level->setMaximum(10);
+    sb_level->setSingleStep(1);
+    sb_level->setObjectName(tr("levels"));
     sb_level->setValue(1);
     hbox->addWidget(sb_level);
-    hbox->addWidget(new QLabel(TR("levels"), this));
+    hbox->addWidget(new QLabel(tr("levels"), this));
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -130,7 +136,7 @@ RelatedElementsDialog::RelatedElementsDialog(BrowserNode * e, const char * what,
 
 void RelatedElementsDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -153,7 +159,7 @@ void RelatedElementsDialog::accept()
 
     elts.clear();
 
-    Q3PtrDict<BrowserNode> d(71);
+    QHash<BrowserNode*, BrowserNode*> d;
     BrowserNodeList added;
     int lvl = sb_level->value();
 
@@ -162,14 +168,9 @@ void RelatedElementsDialog::accept()
 
     do {
         BrowserNodeList newones;
-        Q3PtrListIterator<BrowserNode> it(added);
-
-        for (; it.current() != 0; ++it) {
-            BrowserNode * e = (BrowserNode *) it.current();
-            BrowserNode * bn;
-
+        foreach (BrowserNode *e, added) {
             if (referenced_rb->isChecked()) {
-                for (bn = (BrowserNode *) e->firstChild();
+                for (BrowserNode *bn = (BrowserNode *) e->firstChild();
                      bn != 0;
                      bn = (BrowserNode *) bn->nextSibling()) {
                     if (! bn->deletedp()) {
@@ -217,7 +218,7 @@ void RelatedElementsDialog::accept()
                         }
 
                         if ((sametype && (target->get_type() != k)) ||
-                            (d[target] != 0))
+                            (d.value(target) != 0))
                             continue;
 
                         d.insert(target, target);
@@ -240,11 +241,11 @@ void RelatedElementsDialog::accept()
 
     d.remove(elt);
 
-    Q3PtrDictIterator<BrowserNode> it(d);
+    QHashIterator<BrowserNode*, BrowserNode*> it(d);
 
-    while (it.current()) {
-        elts.append(it.current());
-        ++it;
+    while (it.hasNext()) {
+        it.next();
+        elts.append(it.value());
     }
 
     QDialog::accept();
diff --git a/src/dialog/RelatedElementsDialog.h b/src/dialog/RelatedElementsDialog.h
index f4cf7ac1a..27671be05 100644
--- a/src/dialog/RelatedElementsDialog.h
+++ b/src/dialog/RelatedElementsDialog.h
@@ -54,13 +54,13 @@ class RelatedElementsDialog : public QDialog
     static QSize previous_size;
 
 public:
-    RelatedElementsDialog(BrowserNode *, const char * what,
+    RelatedElementsDialog(BrowserNode *, QString what,
                           bool inh, bool assoc, BrowserNodeList &);
     virtual ~RelatedElementsDialog();
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/RelationDialog.cpp b/src/dialog/RelationDialog.cpp
index 28f5e7bce..5d3ea1eb0 100644
--- a/src/dialog/RelationDialog.cpp
+++ b/src/dialog/RelationDialog.cpp
@@ -29,19 +29,16 @@
 
 
 
-#include <q3vbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3buttongroup.h>
+#include <qcombobox.h>
+#include <bbuttongroup.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qsplitter.h>
-#include <q3popupmenu.h>
 #include <qcursor.h>
-//Added by qt3to4:
 #include <QPixmap>
-
 #include "RelationDialog.h"
 #include "RelationData.h"
 #include "BrowserRelation.h"
@@ -60,6 +57,8 @@
 #include "AnnotationDialog.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
+#include "gridbox.h"
+#include "menufactory.h"
 
 QSize RelationDialog::previous_size;
 
@@ -103,21 +102,21 @@ static const struct {
 };
 
 RelationDialog::RelationDialog(RelationData * r)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), rel(r)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), rel(r)
 {
-    setCaption(TR("Relation dialog"));
+    setWindowTitle(tr("Relation dialog"));
 
     visit = a.ro = !r->start->is_writable();
     b.ro = (r->end) ? !r->end->is_writable()
            : !r->end_removed_from->is_writable();
 
     if (!a.ro || !b.ro) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     r->start->edit_start();
@@ -134,24 +133,26 @@ RelationDialog::RelationDialog(RelationData * r)
     // general tab
     //
 
-    Q3VBox * vtab = new Q3VBox(this);
-    Q3HBox * htab;
-    Q3GroupBox  * bg;
+    VVBox * vtab = new VVBox(this);
+    HHBox * htab;
+    GridBox  * bg;
 
     umltab = vtab;
     vtab->setMargin(3);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(3);
-    QLabel * lbl1 = new QLabel(TR("name : "), htab);
-    edname = new LineEdit(rel->get_name(), htab);
+    QLabel * lbl1;
+    htab->addWidget(lbl1 = new QLabel(tr("name : "), htab));
+    htab->addWidget(edname = new LineEdit(rel->get_name(), htab));
     edname->setReadOnly(visit);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(3);
-    QLabel * lbl2 = new QLabel(TR("type : "), htab);
+    QLabel * lbl2;
+    htab->addWidget(lbl2 = new QLabel(tr("type : "), htab));
 
-    edtype = new Q3ComboBox(FALSE, htab);
+    htab->addWidget(edtype = new QComboBox( htab));
 
     int index;
 
@@ -159,8 +160,8 @@ RelationDialog::RelationDialog(RelationData * r)
         // relation kind cannot be changed
         for (index = 0; index != sizeof(RelTypes) / sizeof(*RelTypes); index += 1) {
             if (RelTypes[index].type == type) {
-                edtype->insertItem(**RelTypes[index].pix, RelTypes[index].lbl);
-                edtype->setCurrentItem(0);
+                edtype->addItem(**RelTypes[index].pix, RelTypes[index].lbl);
+                edtype->setCurrentIndex(0);
                 break;
             }
         }
@@ -171,90 +172,96 @@ RelationDialog::RelationDialog(RelationData * r)
             if (r->end == 0) {
                 // unidir
                 for (index = 0; index != sizeof(UniRelTypes) / sizeof(*UniRelTypes); index += 1) {
-                    edtype->insertItem(**UniRelTypes[index].pix, UniRelTypes[index].lbl);
+                    edtype->addItem(**UniRelTypes[index].pix, UniRelTypes[index].lbl);
 
                     if (UniRelTypes[index].type == type)
-                        edtype->setCurrentItem(index);
+                        edtype->setCurrentIndex(index);
                 }
             }
             else {
                 // bidir
                 for (index = 0; index != sizeof(BiRelTypes) / sizeof(*BiRelTypes); index += 1) {
-                    edtype->insertItem(**BiRelTypes[index].pix, BiRelTypes[index].lbl);
+                    edtype->addItem(**BiRelTypes[index].pix, BiRelTypes[index].lbl);
 
                     if (BiRelTypes[index].type == type)
-                        edtype->setCurrentItem(index);
+                        edtype->setCurrentIndex(index);
                 }
             }
         }
         else {
             for (index = 0; index != sizeof(RelTypes) / sizeof(*RelTypes); index += 1) {
-                edtype->insertItem(**RelTypes[index].pix, RelTypes[index].lbl);
+                edtype->addItem(**RelTypes[index].pix, RelTypes[index].lbl);
 
                 if (RelTypes[index].type == type)
-                    edtype->setCurrentItem(index);
+                    edtype->setCurrentIndex(index);
             }
         }
 
         connect(edtype, SIGNAL(activated(int)), this, SLOT(edTypeActivated(int)));
     }
 
-    new QLabel(TR("    stereotype : "), htab);
-    edstereotype = new Q3ComboBox(!visit, htab);
-    edstereotype->insertItem(toUnicode(rel->get_stereotype()));
+    htab->addWidget(new QLabel(tr("    stereotype : "), htab));
+    htab->addWidget(edstereotype = new QComboBox(htab));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(rel->get_stereotype()));
 
     if (!visit) {
-        edstereotype->insertStringList(rel->get_start_class()
+        edstereotype->addItems(rel->get_start_class()
                                        ->default_stereotypes(type,
                                                rel->get_end_class()));
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlRelations));
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlRelations));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    htab = new Q3HBox(vtab);
+    vtab->addWidget(htab = new HHBox(vtab));
     htab->setMargin(3);
 
-    SmallPushButton * button_assoc =
-        new SmallPushButton(TR("association :"), htab);
+    SmallPushButton * button_assoc;
+    htab->addWidget(button_assoc =
+        new SmallPushButton(tr("association :"), htab));
 
     connect(button_assoc, SIGNAL(clicked()), this, SLOT(menu_assoc()));
 
-    edassociation = new Q3ComboBox(!visit, htab);
-    edassociation->insertItem(rel->association.get_full_type());
+    htab->addWidget(edassociation = new QComboBox(htab));
+    edassociation->setEditable(!visit);
+    edassociation->addItem(rel->association.get_full_type());
     BrowserClass::instances(nodes);
     nodes.full_names(list);
 
     if (!visit) {
-        edassociation->insertStringList(GenerationSettings::basic_types());
+        edassociation->addItems(GenerationSettings::basic_types());
         offset = edassociation->count();
-        edassociation->insertStringList(list);
+        edassociation->addItems(list);
         edassociation->setAutoCompletion(completion());
         view = rel->get_start_class()->container(UmlClass);
     }
 
-    edassociation->setCurrentItem(0);
+    edassociation->setCurrentIndex(0);
     edassociation->setSizePolicy(sp);
 
     same_width(lbl1, lbl2, button_assoc);
 
-    QSplitter * split = new QSplitter(Qt::Vertical, vtab);
+    QSplitter * split;
+    vtab->addWidget(split = new QSplitter(Qt::Vertical, vtab));
 
     split->setOpaqueResize(TRUE);
 
-    QString ina = TR("in ") + rel->get_start_class()->full_name(TRUE);
-    QString inb = TR("in ") + rel->get_end_class()->full_name(TRUE);
+    QString ina = tr("in ") + rel->get_start_class()->full_name(TRUE);
+    QString inb = tr("in ") + rel->get_end_class()->full_name(TRUE);
 
     // role A
-    bg = new Q3GroupBox(2, Qt::Horizontal, ina, split);
+    split->addWidget(bg = new GridBox(2, split, ina));
     init_uml_role(a, rel->a, bg, rel->get_start_class());
+    aOldText = rel->a.role.operator QString();
+    bOldText = rel->b.role.operator QString();
 
     // role B
-    bg = new Q3GroupBox(2, Qt::Horizontal, inb, split);
+    split->addWidget(bg = new GridBox(2, split, inb));
     init_uml_role(b, rel->b, bg, rel->get_end_class());
 
     addTab(vtab, "Uml");
@@ -263,14 +270,14 @@ RelationDialog::RelationDialog(RelationData * r)
     // C++
     //
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     cppTab = vtab;
     vtab->setMargin(5);
 
     // A
-    bg = new Q3GroupBox(2, Qt::Horizontal, ina, vtab);
-    new QLabel(bg);
-    a.cpp_virtual_inheritance_cb = new QCheckBox("virtual", bg);
+    vtab->addWidget(bg = new GridBox(2, vtab, ina));
+    bg->addWidget(new QLabel(bg));
+    bg->addWidget(a.cpp_virtual_inheritance_cb = new QCheckBox("virtual", bg));
 
     if (rel->a.cpp_virtual_inheritance)
         a.cpp_virtual_inheritance_cb->setChecked(TRUE);
@@ -285,10 +292,10 @@ RelationDialog::RelationDialog(RelationData * r)
                   SLOT(cpp_include_in_header()));
 
     // B
-    htab = new Q3HBox(vtab);	// to have a vertical margin
+    vtab->addWidget(htab = new HHBox(vtab));	// to have a vertical margin
     htab->setMargin(5);
 
-    cpp_b = new Q3GroupBox(2, Qt::Horizontal, inb, vtab);
+    vtab->addWidget(cpp_b = new GridBox(2, vtab, inb));
     b.cpp_virtual_inheritance_cb = 0;
     init_cpp_role(b, rel->b, cpp_b, SLOT(cpp_update_b()),
                   SLOT(cpp_default_b()), SLOT(cpp_unmapped_b()), 0);
@@ -302,20 +309,20 @@ RelationDialog::RelationDialog(RelationData * r)
     // Java
     //
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     javatab = vtab;
     vtab->setMargin(5);
 
     // A
-    bg = new Q3GroupBox(2, Qt::Horizontal, ina, vtab);
+    vtab->addWidget(bg = new GridBox(2, vtab, ina));
     init_java_role(a, rel->a, bg, SLOT(java_update_a()), SLOT(java_default_a()),
                    SLOT(java_unmapped_a()), SLOT(java_edit_annotation_a()));
 
     // B
-    htab = new Q3HBox(vtab);	// to have a vertical margin
+    vtab->addWidget(htab = new HHBox(vtab));	// to have a vertical margin
     htab->setMargin(5);
 
-    java_b = new Q3GroupBox(2, Qt::Horizontal, inb, vtab);
+    vtab->addWidget(java_b = new GridBox(2, vtab, inb));
     init_java_role(b, rel->b, java_b, SLOT(java_update_b()), SLOT(java_default_b()),
                    SLOT(java_unmapped_b()), SLOT(java_edit_annotation_b()));
 
@@ -328,20 +335,20 @@ RelationDialog::RelationDialog(RelationData * r)
     // Php
     //
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     phptab = vtab;
     vtab->setMargin(5);
 
     // A
-    bg = new Q3GroupBox(2, Qt::Horizontal, ina, vtab);
+    vtab->addWidget(bg = new GridBox(2, vtab, ina));
     init_php_role(a, rel->a, bg, SLOT(php_update_a()),
                   SLOT(php_default_a()), SLOT(php_unmapped_a()));
 
     // B
-    htab = new Q3HBox(vtab);	// to have a vertical margin
+    vtab->addWidget(htab = new HHBox(vtab));	// to have a vertical margin
     htab->setMargin(5);
 
-    php_b = new Q3GroupBox(2, Qt::Horizontal, inb, vtab);
+    vtab->addWidget(php_b = new GridBox(2, vtab, inb));
     init_php_role(b, rel->b, php_b, SLOT(php_update_b()),
                   SLOT(php_default_b()), SLOT(php_unmapped_b()));
 
@@ -354,20 +361,20 @@ RelationDialog::RelationDialog(RelationData * r)
     // Python
     //
 
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     pythontab = vtab;
     vtab->setMargin(5);
 
     // A
-    bg = new Q3GroupBox(2, Qt::Horizontal, ina, vtab);
+    vtab->addWidget(bg = new GridBox(2, vtab, ina));
     init_python_role(a, rel->a, rel->get_start_class(), bg, SLOT(python_update_a()),
                      SLOT(python_default_a()), SLOT(python_unmapped_a()));
 
     // B
-    htab = new Q3HBox(vtab);	// to have a vertical margin
+    vtab->addWidget(htab = new HHBox(vtab));	// to have a vertical margin
     htab->setMargin(5);
 
-    python_b = new Q3GroupBox(2, Qt::Horizontal, inb, vtab);
+    vtab->addWidget(python_b = new GridBox(2, vtab, inb));
     init_python_role(b, rel->b, rel->get_end_class(),
                      python_b, SLOT(python_update_b()),
                      SLOT(python_default_b()), SLOT(python_unmapped_b()));
@@ -380,12 +387,12 @@ RelationDialog::RelationDialog(RelationData * r)
     //
     // IDL
     //
-    vtab = new Q3VBox(this);
+    vtab = new VVBox(this);
     idltab = vtab;
     vtab->setMargin(5);
 
     // A
-    bg = new Q3GroupBox(2, Qt::Horizontal, ina, vtab);
+    vtab->addWidget(bg = new GridBox(2, vtab, ina));
 
     ClassData * start_data = (ClassData *) rel->get_start_class()->get_data();
     ClassData * end_data = (ClassData *) rel->get_end_class()->get_data();
@@ -394,8 +401,8 @@ RelationDialog::RelationDialog(RelationData * r)
          == "valuetype") &&
         (ClassDialog::idl_stereotype(end_data->get_stereotype())
          == "valuetype")) {
-        new QLabel(bg);
-        a.idl_truncatable_inheritance_cb = new QCheckBox("truncatable", bg);
+        bg->addWidget(new QLabel(bg));
+        bg->addWidget(a.idl_truncatable_inheritance_cb = new QCheckBox("truncatable", bg));
 
         if (rel->a.idl_truncatable_inheritance)
             a.idl_truncatable_inheritance_cb->setChecked(TRUE);
@@ -413,10 +420,10 @@ RelationDialog::RelationDialog(RelationData * r)
                   SLOT(idl_default_a()), SLOT(idl_unmapped_a()));
 
     // B
-    htab = new Q3HBox(vtab);	// to have a vertical margin
+    vtab->addWidget(htab = new HHBox(vtab));	// to have a vertical margin
     htab->setMargin(5);
 
-    idl_b = new Q3GroupBox(2, Qt::Horizontal, inb, vtab);
+    vtab->addWidget(idl_b = new GridBox(2, vtab, inb));
     b.idl_truncatable_inheritance_cb = 0;
     init_idl_role(b, rel->b, end_data, idl_b, SLOT(idl_update_b()),
                   SLOT(idl_default_b()), SLOT(idl_unmapped_b()));
@@ -430,21 +437,21 @@ RelationDialog::RelationDialog(RelationData * r)
     // USER : list key - value
     //
 
-    vtab = new Q3VBox(this);
-    bg = new Q3GroupBox(1, Qt::Horizontal, ina, vtab);
-    a.kvtable = new KeyValuesTable(rel->get_start(), bg, a.ro);
-    new QLabel(vtab);
-    bg = new Q3GroupBox(1, Qt::Horizontal, inb, vtab);
+    vtab = new VVBox(this);
+    vtab->addWidget(bg = new GridBox(1, vtab, ina));
+    bg->addWidget(a.kvtable = new KeyValuesTable(rel->get_start(), bg, a.ro));
+    vtab->addWidget(new QLabel(vtab));
+    vtab->addWidget(bg = new GridBox(1, vtab, inb));
     b.opt.append(bg);
-    b.kvtable = new KeyValuesTable(rel->get_end(), bg, b.ro);
-    addTab(vtab, TR("Properties"));
+    bg->addWidget(b.kvtable = new KeyValuesTable(rel->get_end(), bg, b.ro));
+    addTab(vtab, tr("Properties"));
 
     //
 
-    edTypeActivated(edtype->currentItem());
+    edTypeActivated(edtype->currentIndex());
 
-    connect(this, SIGNAL(currentChanged(QWidget *)),
-            this, SLOT(update_all_tabs(QWidget *)));
+    connect(m_tabWidget, SIGNAL(currentChanged(int)),
+            this, SLOT(update_all_tabs(int)));
 
     open_dialog(this);
 }
@@ -454,20 +461,21 @@ RelationDialog::~RelationDialog()
     rel->start->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
 
 void RelationDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
 void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
-                                   Q3GroupBox * bg, BrowserClass * cl1)
+                                   GridBox * bg, BrowserClass * cl1)
 {
     bool roleb = (&role == &b);
     QString stereotype = ((ClassData *) cl1->get_data())->get_stereotype();
@@ -493,9 +501,9 @@ void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
     role.idl_in_union = (st == "union");
     role.idl_in_valuetype = (st == "valuetype");
 
-    lbl = new QLabel(TR("name : "), bg);
+    bg->addWidget(lbl = new QLabel(tr("name : "), bg));
     role.opt.append(lbl);
-    role.edrole = new LineEdit(rel.role, bg);
+    bg->addWidget(role.edrole = new LineEdit(rel.role, bg));
     role.edrole->setReadOnly(visit);
     role.opt.append(role.edrole);
 
@@ -504,31 +512,33 @@ void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
         groupb.append(lbl);
     }
 
-    Q3HBox * htab;
+    HHBox * htab;
     QSizePolicy sp;
 
-    role.opt.append(new QLabel(TR("multiplicity : "), bg));
-    htab = new Q3HBox(bg);
+    role.opt.append(lbl = new QLabel(tr("multiplicity : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(htab = new HHBox(bg));
     htab->setMargin(0);
-    role.multiplicity = new Q3ComboBox(!visit, htab);
+    htab->addWidget(role.multiplicity = new QComboBox(htab));
+    role.multiplicity->setEditable(!visit);
     sp = role.multiplicity->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     role.multiplicity->setSizePolicy(sp);
     role.previous_multiplicity = (const char *) rel.multiplicity;
-    role.multiplicity->insertItem(rel.multiplicity);
+    role.multiplicity->addItem(rel.multiplicity);
 
     if (!visit) {
-        role.multiplicity->insertItem("1");
-        role.multiplicity->insertItem("0..1");
-        role.multiplicity->insertItem("*");
-        role.multiplicity->insertItem("1..*");
+        role.multiplicity->addItem("1");
+        role.multiplicity->addItem("0..1");
+        role.multiplicity->addItem("*");
+        role.multiplicity->addItem("1..*");
     }
 
     role.opt.append(role.multiplicity);
 
-    lbl = new QLabel(TR("   initial value : "), htab);
+    htab->addWidget(lbl = new QLabel(tr("   initial value : "), htab));
     role.opt.append(lbl);
-    role.edinit = new LineEdit(rel.init_value, htab);
+    htab->addWidget(role.edinit = new LineEdit(rel.init_value, htab));
     role.opt.append(role.edinit);
 
     if (roleb) {
@@ -539,7 +549,8 @@ void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
     if (visit)
         role.edinit->setReadOnly(TRUE);
     else {
-        SmallPushButton * bt = new SmallPushButton(TR("Editor"), htab);
+        SmallPushButton * bt;
+        htab->addWidget(bt = new SmallPushButton(tr("Editor"), htab));
 
         connect(bt, SIGNAL(clicked()),
                 this, (roleb) ? SLOT(edit_init_b()) : SLOT(edit_init_a()));
@@ -548,46 +559,48 @@ void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
             groupb.append(bt);
     }
 
-    (void) new QLabel(bg);
-    htab = new Q3HBox(bg);
+    bg->addWidget( new QLabel(bg));
+    bg->addWidget(htab = new HHBox(bg));
     htab->setMargin(0);
 
-    Q3ButtonGroup * vg = role.uml_visibility.init(htab, rel.uml_visibility, TRUE);
+    BButtonGroup * vg;
+    htab->addWidget(vg = role.uml_visibility.init(htab, rel.uml_visibility, TRUE));
 
     if (visit)
         vg ->setEnabled(FALSE);
     else if (roleb)
         groupb.append(vg);
 
-    Q3ButtonGroup * bg2 = new Q3ButtonGroup(7, Qt::Horizontal, QString(), htab);
+    BButtonGroup * bg2;
+    htab->addWidget(bg2 = new BButtonGroup(7, Qt::Horizontal, QString(), htab));
 
     role.opt.append(bg2);
 
     if (roleb)
         groupb.append(bg2);
 
-    role.classrelation_cb = new QCheckBox("static", bg2);
+    bg2->addWidget(role.classrelation_cb = new QCheckBox("static", bg2));
 
     if (rel.isa_class_relation)
         role.classrelation_cb->setChecked(TRUE);
 
     role.classrelation_cb->setDisabled(visit);
 
-    role.volatile_cb = new QCheckBox("volatile", bg2);
+    bg2->addWidget(role.volatile_cb = new QCheckBox("volatile", bg2));
 
     if (rel.isa_volatile_relation)
         role.volatile_cb->setChecked(TRUE);
 
     role.volatile_cb->setDisabled(visit);
 
-    role.constrelation_cb = new QCheckBox(TR("read-only"), bg2);
+    bg2->addWidget(role.constrelation_cb = new QCheckBox(tr("read-only"), bg2));
 
     if (rel.isa_const_relation)
         role.constrelation_cb->setChecked(TRUE);
 
     role.constrelation_cb->setDisabled(visit);
 
-    role.derived_cb = new QCheckBox(TR("derived"), bg2);
+    bg2->addWidget(role.derived_cb = new QCheckBox(tr("derived"), bg2));
 
     if (rel.is_derived)
         role.derived_cb->setChecked(TRUE);
@@ -597,34 +610,34 @@ void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
             (roleb) ? SLOT(derived_changed_b(bool))
             : SLOT(derived_changed_a(bool)));
 
-    role.derivedunion_cb = new QCheckBox("union", bg2);
+    bg2->addWidget(role.derivedunion_cb = new QCheckBox("union", bg2));
 
     if (rel.is_derivedunion)
         role.derivedunion_cb->setChecked(TRUE);
 
     role.derivedunion_cb->setDisabled(visit || !role.derived_cb->isChecked());
 
-    role.ordered_cb = new QCheckBox(TR("ordered"), bg2);
+    bg2->addWidget(role.ordered_cb = new QCheckBox(tr("ordered"), bg2));
 
     if (rel.is_ordered)
         role.ordered_cb->setChecked(TRUE);
 
     role.ordered_cb->setDisabled(visit);
 
-    role.unique_cb = new QCheckBox("unique", bg2);
+    bg2->addWidget(role.unique_cb = new QCheckBox("unique", bg2));
 
     if (rel.is_unique)
         role.unique_cb->setChecked(TRUE);
 
     role.unique_cb->setDisabled(visit);
 
-    lbl = new QLabel(TR("description : "), bg);
+    bg->addWidget(lbl = new QLabel(tr("description : "), bg));
 
     if (roleb)
         groupb.append(lbl);
 
-    htab = new Q3HBox(bg);
-    role.comment = new MultiLineEdit(htab);
+    bg->addWidget(htab = new HHBox(bg));
+    htab->addWidget(role.comment = new MultiLineEdit(htab));
     role.comment->setText(rel.comment);
     QFont font = role.comment->font();
 
@@ -637,13 +650,16 @@ void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
     if (visit)
         role.comment->setReadOnly(TRUE);
     else {
-        Q3VBox * vtab = new Q3VBox(htab);
-        SmallPushButton * bt1 = new SmallPushButton(TR("Editor"), vtab);
+        VVBox * vtab;
+        htab->addWidget(vtab = new VVBox(htab));
+        SmallPushButton * bt1;
+        vtab->addWidget(bt1 = new SmallPushButton(tr("Editor"), vtab));
 
         connect(bt1, SIGNAL(clicked()), this,
                 (roleb) ? SLOT(edit_description_b()) : SLOT(edit_description_a()));
 
-        SmallPushButton * bt2 = new SmallPushButton(TR("Default"), vtab);
+        SmallPushButton * bt2;
+        vtab->addWidget(bt2 = new SmallPushButton(tr("Default"), vtab));
 
         connect(bt2, SIGNAL(clicked()), this,
                 (roleb) ? SLOT(default_description_b()) : SLOT(default_description_a()));
@@ -656,21 +672,23 @@ void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
         }
     }
 
-    lbl = new QLabel(TR("constraint : "), bg);
+    bg->addWidget(lbl = new QLabel(tr("constraint : "), bg));
 
     if (roleb)
         groupb.append(lbl);
 
-    htab = new Q3HBox(bg);
-    role.constraint = new MultiLineEdit(htab);
+    bg->addWidget(htab = new HHBox(bg));
+    htab->addWidget(role.constraint = new MultiLineEdit(htab));
     role.constraint->setText(rel.constraint);
     role.constraint->setFont(font);
 
     if (visit)
         role.constraint->setReadOnly(TRUE);
     else {
-        Q3VBox * vtab = new Q3VBox(htab);
-        SmallPushButton * bt1 = new SmallPushButton(TR("Editor"), vtab);
+        VVBox * vtab;
+        htab->addWidget(vtab = new VVBox(htab));
+        SmallPushButton * bt1;
+        vtab->addWidget(bt1 = new SmallPushButton(tr("Editor"), vtab));
 
         connect(bt1, SIGNAL(clicked()), this,
                 (roleb) ? SLOT(edit_constraint_b()) : SLOT(edit_constraint_a()));
@@ -684,8 +702,8 @@ void RelationDialog::init_uml_role(RoleDialog & role, const RoleData & rel,
 
 void RelationDialog::default_defs_if_needed(UmlCode prev_type)
 {
-    QString am = a.multiplicity->currentText().stripWhiteSpace();
-    QString bm = b.multiplicity->currentText().stripWhiteSpace();
+    QString am = a.multiplicity->currentText().trimmed();
+    QString bm = b.multiplicity->currentText().trimmed();
 
     if ((prev_type != current_type) || (am != a.previous_multiplicity)) {
         default_a_cpp_if_needed(prev_type, a.previous_multiplicity, am);
@@ -715,7 +733,7 @@ void RelationDialog::default_description_a()
 
 void RelationDialog::edit_description_a()
 {
-    edit(a.comment->text(), a.edrole->text().stripWhiteSpace() + "_description",
+    edit(a.comment->text(), a.edrole->text().trimmed() + "_description",
          &rel->a, TxtEdit, this, (post_edit) post_edit_description_a, edits);
 }
 
@@ -731,7 +749,7 @@ void RelationDialog::default_description_b()
 
 void RelationDialog::edit_description_b()
 {
-    edit(b.comment->text(), a.edrole->text().stripWhiteSpace() + "_description",
+    edit(b.comment->text(), a.edrole->text().trimmed() + "_description",
          &rel->b, TxtEdit, this, (post_edit) post_edit_description_b, edits);
 }
 
@@ -742,7 +760,7 @@ void RelationDialog::post_edit_description_b(RelationDialog * d, QString s)
 
 void RelationDialog::edit_constraint_a()
 {
-    edit(a.constraint->text(), a.edrole->text().stripWhiteSpace() + "_constraint",
+    edit(a.constraint->text(), a.edrole->text().trimmed() + "_constraint",
          &rel->a, TxtEdit, this, (post_edit) post_edit_constraint_a, edits);
 }
 
@@ -753,7 +771,7 @@ void RelationDialog::post_edit_constraint_a(RelationDialog * d, QString s)
 
 void RelationDialog::edit_constraint_b()
 {
-    edit(b.constraint->text(), a.edrole->text().stripWhiteSpace() + "_constraint",
+    edit(b.constraint->text(), a.edrole->text().trimmed() + "_constraint",
          &rel->b, TxtEdit, this, (post_edit) post_edit_constraint_b, edits);
 }
 
@@ -773,22 +791,23 @@ void RelationDialog::derived_changed_b(bool on)
 }
 
 void RelationDialog::init_cpp_role(RoleDialog & role, const RoleData & rel,
-                                   Q3GroupBox * bg,
+                                   GridBox * bg,
                                    const char * cpp_update_slot,
                                    const char * cpp_default_slot,
                                    const char * cpp_unmapped_slot,
                                    const char * cpp_include_in_header_slot)
 {
-    Q3HBox * htab;
+    HHBox * htab;
 
-    new QLabel(TR("Visibility : "), bg);
-    htab = new Q3HBox(bg);
-    role.cpp_visibility.init(htab, rel.cpp_visibility, FALSE, 0, TR("follow uml"))
-    ->setEnabled(!visit);
+    bg->addWidget(new QLabel(tr("Visibility : "), bg));
+    bg->addWidget(htab = new HHBox(bg));
+    BButtonGroup* bg2;
+    htab->addWidget(bg2 = role.cpp_visibility.init(htab, rel.cpp_visibility, FALSE, 0, tr("follow uml")));
+    bg2->setEnabled(!visit);
 
-    new QLabel(" ", htab);
+    htab->addWidget(new QLabel(" ", htab));
 
-    role.mutable_cb = new QCheckBox("mutable", htab);
+    htab->addWidget(role.mutable_cb = new QCheckBox("mutable", htab));
     role.opt.append(role.mutable_cb);
 
     if (rel.cpp_mutable)
@@ -799,8 +818,10 @@ void RelationDialog::init_cpp_role(RoleDialog & role, const RoleData & rel,
     else
         connect(role.mutable_cb, SIGNAL(toggled(bool)), this, cpp_update_slot);
 
-    role.opt.append(new QLabel(TR("Declaration : "), bg));
-    role.edcppdecl = new MultiLineEdit(bg);
+    QLabel* lbl;
+    role.opt.append(lbl = new QLabel(tr("Declaration : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.edcppdecl = new MultiLineEdit(bg));
     QFont font = role.edcppdecl->font();
 
     if (! hasCodec())
@@ -816,42 +837,42 @@ void RelationDialog::init_cpp_role(RoleDialog & role, const RoleData & rel,
     else
         connect(role.edcppdecl, SIGNAL(textChanged()), this, cpp_update_slot);
 
-    new QLabel(TR("Result after\nsubstitution : "), bg);
-    role.showcppdecl = new MultiLineEdit(bg);
+    bg->addWidget(new QLabel(tr("Result after\nsubstitution : "), bg));
+    bg->addWidget(role.showcppdecl = new MultiLineEdit(bg));
     role.showcppdecl->setReadOnly(TRUE);
     role.showcppdecl->setFont(font);
 
     if (! visit) {
-        new QLabel("", bg);
-        htab = new Q3HBox(bg);
+        bg->addWidget(new QLabel("", bg));
+        bg->addWidget(htab = new HHBox(bg));
         htab->setMargin(5);
 
-        role.cpp_default_decl_bt = new QPushButton(TR("Default declaration"), htab);
+        htab->addWidget(role.cpp_default_decl_bt = new QPushButton(tr("Default declaration"), htab));
         connect(role.cpp_default_decl_bt, SIGNAL(clicked()),
                 this, cpp_default_slot);
 
         if (cpp_include_in_header_slot != 0) {
-            role.cpp_include_in_header = new QPushButton(TR("#include in header"), htab);
+            htab->addWidget(role.cpp_include_in_header = new QPushButton(tr("#include in header"), htab));
             connect(role.cpp_include_in_header , SIGNAL(clicked()),
                     this, cpp_include_in_header_slot);
         }
 
-        role.cpp_unmapped_decl_bt = new QPushButton(TR("Not generated in C++"), htab);
+        htab->addWidget(role.cpp_unmapped_decl_bt = new QPushButton(tr("Not generated in C++"), htab));
         connect(role.cpp_unmapped_decl_bt, SIGNAL(clicked()),
                 this, cpp_unmapped_slot);
     }
 }
 
 void RelationDialog::init_java_role(RoleDialog & role, const RoleData & rel,
-                                    Q3GroupBox * bg,
+                                    GridBox * bg,
                                     const char * java_update_slot,
                                     const char * java_default_slot,
                                     const char * java_unmapped_slot,
                                     const char * java_edit_annotation)
 {
     if (! role.java_undef) {
-        new QLabel("", bg);
-        role.transient_cb = new QCheckBox("transient", bg);
+        bg->addWidget(new QLabel("", bg));
+        bg->addWidget(role.transient_cb = new QCheckBox("transient", bg));
         role.opt.append(role.transient_cb);
 
         if (rel.java_transient)
@@ -863,8 +884,10 @@ void RelationDialog::init_java_role(RoleDialog & role, const RoleData & rel,
             connect(role.transient_cb, SIGNAL(toggled(bool)), this, java_update_slot);
     }
 
-    role.opt.append(new QLabel(TR("Declaration : "), bg));
-    role.edjavadecl = new MultiLineEdit(bg);
+    QLabel* lbl;
+    role.opt.append(lbl = new QLabel(tr("Declaration : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.edjavadecl = new MultiLineEdit(bg));
     role.opt.append(role.edjavadecl);
     QFont font = role.edjavadecl->font();
 
@@ -880,41 +903,45 @@ void RelationDialog::init_java_role(RoleDialog & role, const RoleData & rel,
     else
         connect(role.edjavadecl, SIGNAL(textChanged()), this, java_update_slot);
 
-    role.opt.append(new QLabel(TR("Result after\nsubstitution : "), bg));
-    role.showjavadecl = new MultiLineEdit(bg);
+    role.opt.append(lbl = new QLabel(tr("Result after\nsubstitution : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.showjavadecl = new MultiLineEdit(bg));
     role.opt.append(role.showjavadecl);
     role.showjavadecl->setReadOnly(TRUE);
     role.showjavadecl->setFont(font);
 
-    new QLabel("", bg);
-    Q3HBox * htab = new Q3HBox(bg);
+    bg->addWidget(new QLabel("", bg));
+    HHBox * htab;
+    bg->addWidget(htab = new HHBox(bg));
     htab->setMargin(5);
 
     if (! visit) {
-        role.java_default_decl_bt = new QPushButton(TR("Default declaration"), htab);
+        htab->addWidget(role.java_default_decl_bt = new QPushButton(tr("Default declaration"), htab));
         connect(role.java_default_decl_bt, SIGNAL(clicked()),
                 this, java_default_slot);
-        role.java_unmapped_decl_bt = new QPushButton(TR("Not generated in Java"), htab);
+        htab->addWidget(role.java_unmapped_decl_bt = new QPushButton(tr("Not generated in Java"), htab));
         connect(role.java_unmapped_decl_bt, SIGNAL(clicked()),
                 this, java_unmapped_slot);
     }
 
     role.javaannotation = (const char *) rel.java_annotation;
-    role.editjavaannotation =
-        new QPushButton((visit) ? TR("Show annotation") : TR("Edit annotation"),
-                        htab);
+    htab->addWidget(role.editjavaannotation =
+        new QPushButton((visit) ? tr("Show annotation") : tr("Edit annotation"),
+                        htab));
     connect(role.editjavaannotation, SIGNAL(clicked()),
             this, java_edit_annotation);
 }
 
 void RelationDialog::init_php_role(RoleDialog & role, const RoleData & rel,
-                                   Q3GroupBox * bg,
+                                   GridBox * bg,
                                    const char * php_update_slot,
                                    const char * php_default_slot,
                                    const char * php_unmapped_slot)
 {
-    role.opt.append(new QLabel(TR("Declaration : "), bg));
-    role.edphpdecl = new MultiLineEdit(bg);
+    QLabel* lbl;
+    role.opt.append(lbl = new QLabel(tr("Declaration : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.edphpdecl = new MultiLineEdit(bg));
     role.opt.append(role.edphpdecl);
     QFont font = role.edphpdecl->font();
 
@@ -930,28 +957,30 @@ void RelationDialog::init_php_role(RoleDialog & role, const RoleData & rel,
     else
         connect(role.edphpdecl, SIGNAL(textChanged()), this, php_update_slot);
 
-    role.opt.append(new QLabel(TR("Result after\nsubstitution : "), bg));
-    role.showphpdecl = new MultiLineEdit(bg);
+    role.opt.append(lbl = new QLabel(tr("Result after\nsubstitution : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.showphpdecl = new MultiLineEdit(bg));
     role.opt.append(role.showphpdecl);
     role.showphpdecl->setReadOnly(TRUE);
     role.showphpdecl->setFont(font);
 
-    new QLabel("", bg);
-    Q3HBox * htab = new Q3HBox(bg);
+    bg->addWidget(new QLabel("", bg));
+    HHBox * htab;
+    bg->addWidget(htab = new HHBox(bg));
     htab->setMargin(5);
 
     if (! visit) {
-        role.php_default_decl_bt = new QPushButton(TR("Default declaration"), htab);
+        htab->addWidget(role.php_default_decl_bt = new QPushButton(tr("Default declaration"), htab));
         connect(role.php_default_decl_bt, SIGNAL(clicked()),
                 this, php_default_slot);
-        role.php_unmapped_decl_bt = new QPushButton(TR("Not generated in Php"), htab);
+        htab->addWidget(role.php_unmapped_decl_bt = new QPushButton(tr("Not generated in Php"), htab));
         connect(role.php_unmapped_decl_bt, SIGNAL(clicked()),
                 this, php_unmapped_slot);
     }
 }
 
 void RelationDialog::init_python_role(RoleDialog & role, const RoleData & rel,
-                                      BrowserClass * cl, Q3GroupBox * bg,
+                                      BrowserClass * cl, GridBox * bg,
                                       const char * python_update_slot,
                                       const char * python_default_slot,
                                       const char * python_unmapped_slot)
@@ -959,8 +988,10 @@ void RelationDialog::init_python_role(RoleDialog & role, const RoleData & rel,
     role.python_self =
         BrowserOperation::python_init_self(cl) + ".";
 
-    role.opt.append(new QLabel(TR("Declaration : "), bg));
-    role.edpythondecl = new MultiLineEdit(bg);
+    QLabel* lbl;
+    role.opt.append(lbl = new QLabel(tr("Declaration : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.edpythondecl = new MultiLineEdit(bg));
     role.opt.append(role.edpythondecl);
     QFont font = role.edpythondecl->font();
 
@@ -976,36 +1007,41 @@ void RelationDialog::init_python_role(RoleDialog & role, const RoleData & rel,
     else
         connect(role.edpythondecl, SIGNAL(textChanged()), this, python_update_slot);
 
-    role.opt.append(new QLabel(TR("Result after\nsubstitution : "), bg));
-    role.showpythondecl = new MultiLineEdit(bg);
+    role.opt.append(lbl = new QLabel(tr("Result after\nsubstitution : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.showpythondecl = new MultiLineEdit(bg));
     role.opt.append(role.showpythondecl);
     role.showpythondecl->setReadOnly(TRUE);
     role.showpythondecl->setFont(font);
 
-    new QLabel("", bg);
-    Q3HBox * htab = new Q3HBox(bg);
+    bg->addWidget(new QLabel("", bg));
+    HHBox * htab;
+    bg->addWidget(htab = new HHBox(bg));
     htab->setMargin(5);
 
     if (! visit) {
-        role.python_default_decl_bt = new QPushButton(TR("Default declaration"), htab);
+        htab->addWidget(role.python_default_decl_bt = new QPushButton(tr("Default declaration"), htab));
         connect(role.python_default_decl_bt, SIGNAL(clicked()),
                 this, python_default_slot);
-        role.python_unmapped_decl_bt = new QPushButton(TR("Not generated in Python"), htab);
+        htab->addWidget(role.python_unmapped_decl_bt = new QPushButton(tr("Not generated in Python"), htab));
         connect(role.python_unmapped_decl_bt, SIGNAL(clicked()),
                 this, python_unmapped_slot);
     }
 }
 
 void RelationDialog::init_idl_role(RoleDialog & role, const RoleData & rel,
-                                   ClassData * cld, Q3GroupBox * bg,
+                                   ClassData * cld, GridBox * bg,
                                    const char * idl_update_slot,
                                    const char * idl_default_slot,
                                    const char * idl_unmapped_slot)
 {
+    QLabel* lbl;
     if (role.idl_in_union) {
-        role.opt.append(new QLabel("Case : ", bg));
-        role.edcase = new Q3ComboBox(!visit, bg);
-        role.edcase->insertItem(RelationData::get_idlcase(rel));
+        role.opt.append(lbl = new QLabel("Case : ", bg));
+        bg->addWidget(lbl);
+        bg->addWidget(role.edcase = new QComboBox( bg));
+        role.edcase->setEditable(!visit);
+        role.edcase->addItem(RelationData::get_idlcase(rel));
 
         if (!visit) {
             role.edcase->setAutoCompletion(completion());
@@ -1015,23 +1051,24 @@ void RelationDialog::init_idl_role(RoleDialog & role, const RoleData & rel,
             if (switch_type.type != 0) {
                 switch_type.type->children(role.enums, UmlAttribute);
                 role.enums.names(role.enum_names);
-                role.edcase->insertStringList(role.enum_names);
+                role.edcase->addItems(role.enum_names);
             }
         }
 
-        role.edcase->setCurrentItem(0);
+        role.edcase->setCurrentIndex(0);
 
         QSizePolicy sp = role.edcase->sizePolicy();
 
-        sp.setHorData(QSizePolicy::Expanding);
+        sp.setHorizontalPolicy(QSizePolicy::Expanding);
         role.edcase->setSizePolicy(sp);
 
         if (!visit)
             connect(role.edcase, SIGNAL(activated(int)), this, idl_update_slot);
     }
 
-    role.opt.append(new QLabel(TR("Declaration : "), bg));
-    role.edidldecl = new MultiLineEdit(bg);
+    role.opt.append(lbl = new QLabel(tr("Declaration : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.edidldecl = new MultiLineEdit(bg));
     role.opt.append(role.edidldecl);
     role.edidldecl->setText(rel.idl_decl);
     QFont font = role.edidldecl->font();
@@ -1047,20 +1084,22 @@ void RelationDialog::init_idl_role(RoleDialog & role, const RoleData & rel,
     else
         connect(role.edidldecl, SIGNAL(textChanged()), this, idl_update_slot);
 
-    role.opt.append(new QLabel(TR("Result after\nsubstitution : "), bg));
-    role.showidldecl = new MultiLineEdit(bg);
+    role.opt.append(lbl = new QLabel(tr("Result after\nsubstitution : "), bg));
+    bg->addWidget(lbl);
+    bg->addWidget(role.showidldecl = new MultiLineEdit(bg));
     role.opt.append(role.showidldecl);
     role.showidldecl->setReadOnly(TRUE);
     role.showidldecl->setFont(font);
 
     if (! visit) {
-        new QLabel("", bg);
-        Q3HBox * htab = new Q3HBox(bg);
+        bg->addWidget(new QLabel("", bg));
+        HHBox * htab;
+        bg->addWidget(htab = new HHBox(bg));
         htab->setMargin(5);
-        role.idl_default_decl_bt = new QPushButton(TR("Default declaration"), htab);
+        htab->addWidget(role.idl_default_decl_bt = new QPushButton(tr("Default declaration"), htab));
         connect(role.idl_default_decl_bt, SIGNAL(clicked()),
                 this, idl_default_slot);
-        role.idl_unmapped_decl_bt = new QPushButton(TR("Not generated in Idl"), htab);
+        htab->addWidget(role.idl_unmapped_decl_bt = new QPushButton(tr("Not generated in Idl"), htab));
         connect(role.idl_unmapped_decl_bt, SIGNAL(clicked()),
                 this, idl_unmapped_slot);
     }
@@ -1176,12 +1215,12 @@ void RelationDialog::edTypeActivated(int r)
 
         if (!visit) {
             edstereotype->clear();
-            edstereotype->insertItem("");
-            edstereotype->insertStringList(rel->get_start_class()
+            edstereotype->addItem("");
+            edstereotype->addItems(rel->get_start_class()
                                            ->default_stereotypes(type,
                                                    rel->get_end_class()));
-            edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlRelations));
-            edstereotype->setCurrentItem(0);
+            edstereotype->addItems(ProfiledStereotypes::defaults(UmlRelations));
+            edstereotype->setCurrentIndex(0);
 
             default_defs_if_needed(t);
         }
@@ -1194,15 +1233,15 @@ void RelationDialog::edTypeActivated(int r)
 
 void RelationDialog::menu_assoc()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edassociation->currentText().stripWhiteSpace());
+    int index = list.indexOf(edassociation->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -1210,15 +1249,18 @@ void RelationDialog::menu_assoc()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlClass) && !bn->deletedp())
-            m.insertItem(TR("Choose class selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose class selected in browser"), 1);
         else
             bn = 0;
 
-        m.insertItem(TR("Create class and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create class and choose it"), 2);
     }
 
     if (!visit || (index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0:
             nodes.at(index)->select_in_browser();
             break;
@@ -1235,7 +1277,7 @@ void RelationDialog::menu_assoc()
         case 1: {
             QString s = bn->full_name(TRUE);
 
-            if ((index = list.findIndex(s)) == -1) {
+            if ((index = list.indexOf(s)) == -1) {
                 // new class, may be created through an other dialog
                 index = 0;
                 QStringList::Iterator iter = list.begin();
@@ -1248,45 +1290,47 @@ void RelationDialog::menu_assoc()
 
                 nodes.insert((unsigned) index, bn);
                 list.insert(iter, s);
-                edassociation->insertItem(s, index + offset);
+                edassociation->insertItem(index + offset,s);
             }
         }
 
-        edassociation->setCurrentItem(index + offset);
+        edassociation->setCurrentIndex(index + offset);
         break;
 
         default:
             break;
         }
+        }
     }
 }
 
-void RelationDialog::update_all_tabs(QWidget * w)
+void RelationDialog::update_all_tabs(int index)
 {
+    QWidget * w = m_tabWidget->widget(index);
     if (!visit)
         default_defs_if_needed(current_type);
 
     if (current_type == UmlDependency) {
-        QString s = a.edcppdecl->text().stripWhiteSpace();
+        QString s = a.edcppdecl->text().trimmed();
 
-        if (GenerationSettings::cpp_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()))
+        if (GenerationSettings::cpp_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()))
             != "friend") {
             if (! visit) {
                 a.cpp_include_in_header->show();
-                a.cpp_default_decl_bt->setText(TR("#include in source"));
+                a.cpp_default_decl_bt->setText(tr("#include in source"));
                 a.cpp_default_decl_bt->setEnabled(TRUE);
                 a.cpp_unmapped_decl_bt->setEnabled(TRUE);
             }
 
             if (!s.isEmpty() &&
-                (s != TR("#include in source")) &&
-                (s != TR("#include in header")))
-                s = TR("#include in header");
+                (s != tr("#include in source")) &&
+                (s != tr("#include in header")))
+                s = tr("#include in header");
         }
         else {
             if (! visit) {
                 a.cpp_include_in_header->hide();
-                a.cpp_default_decl_bt->setText(TR("Default declaration"));
+                a.cpp_default_decl_bt->setText(tr("Default declaration"));
                 a.cpp_default_decl_bt->setEnabled(FALSE);
                 a.cpp_unmapped_decl_bt->setEnabled(FALSE);
             }
@@ -1300,12 +1344,12 @@ void RelationDialog::update_all_tabs(QWidget * w)
     }
     else if (! visit) {
         a.cpp_include_in_header->hide();
-        a.cpp_default_decl_bt->setText(TR("Default declaration"));
+        a.cpp_default_decl_bt->setText(tr("Default declaration"));
         a.cpp_default_decl_bt->setEnabled(TRUE);
     }
 
-    a.edrole->setText(a.edrole->text().stripWhiteSpace());
-    b.edrole->setText(b.edrole->text().stripWhiteSpace());
+    a.edrole->setText(a.edrole->text().trimmed());
+    b.edrole->setText(b.edrole->text().trimmed());
 
     if (w == umltab) {
         if (! visit)
@@ -1350,7 +1394,7 @@ void RelationDialog::update_all_tabs(QWidget * w)
 
 void RelationDialog::edit_init_a()
 {
-    edit(a.edinit->text(), a.edrole->text().stripWhiteSpace() + "_initialization",
+    edit(a.edinit->text(), a.edrole->text().trimmed() + "_initialization",
          &rel->a, TxtEdit, this, (post_edit) post_edit_init_a, edits);
 }
 
@@ -1361,7 +1405,7 @@ void RelationDialog::post_edit_init_a(RelationDialog * d, QString s)
 
 void RelationDialog::edit_init_b()
 {
-    edit(b.edinit->text(), b.edrole->text().stripWhiteSpace() + "_initialization",
+    edit(b.edinit->text(), b.edrole->text().trimmed() + "_initialization",
          &rel->b, TxtEdit, this, (post_edit) post_edit_init_b, edits);
 }
 
@@ -1385,7 +1429,8 @@ void RelationDialog::cpp_update(RoleDialog & role, BrowserClass * cl, BrowserNod
         //	const char * p = role.edcppdecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edcppdecl->text();
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
 
         while (*p) {
             if (!strncmp(p, "${type}", 7)) {
@@ -1415,7 +1460,8 @@ void RelationDialog::cpp_update(RoleDialog & role, BrowserClass * cl, BrowserNod
         //	const char * p = role.edcppdecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edcppdecl->text();
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
         const char * pp = 0;
         QString indent = "";
 
@@ -1487,18 +1533,18 @@ void RelationDialog::cpp_update(RoleDialog & role, BrowserClass * cl, BrowserNod
             else if (!strncmp(p, "${multiplicity}", 15)) {
                 p += 15;
 
-                QString m = role.multiplicity->currentText().stripWhiteSpace();
+                QString m = role.multiplicity->currentText().trimmed();
 
-                s += (*m == '[') ? m : QString("[") + m + "]";
+                s += (m.at(0) == '[') ? m : QString("[") + m + "]";
             }
             else if (!strncmp(p, "${stereotype}", 13)) {
                 p += 13;
-                s += GenerationSettings::cpp_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+                s += GenerationSettings::cpp_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
             }
             else if (!strncmp(p, "${h_value}", 10)) {
                 p += 10;
 
-                if (!role.edinit->text().stripWhiteSpace().isEmpty() &&
+                if (!role.edinit->text().trimmed().isEmpty() &&
                     role.classrelation_cb->isChecked()) {
                     if (role.edinit->text().at(0) == QChar('='))
                         s += " ";
@@ -1510,7 +1556,7 @@ void RelationDialog::cpp_update(RoleDialog & role, BrowserClass * cl, BrowserNod
                 p += 8;
             else if (!strncmp(p, "${association}", 14)) {
                 p += 14;
-                s += GenerationSettings::cpp_type(type(edassociation->currentText().stripWhiteSpace(),
+                s += GenerationSettings::cpp_type(type(edassociation->currentText().trimmed(),
                                                        list, nodes));
             }
             else if (*p == '\n') {
@@ -1547,20 +1593,20 @@ void RelationDialog::cpp_default_a()
         a.edcppdecl->setText(QString());
     else if (RelationData::isa_association(current_type))
         a.edcppdecl->setText(GenerationSettings::cpp_default_rel_decl(current_type,
-                             a.multiplicity->currentText().stripWhiteSpace()));
+                             a.multiplicity->currentText().trimmed()));
     else {
         if (current_type != UmlDependency)
             a.edcppdecl->setText("${type}");
-        else if (GenerationSettings::cpp_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()))
+        else if (GenerationSettings::cpp_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()))
                  != "friend")
-            a.edcppdecl->setText(TR("#include in source"));
+            a.edcppdecl->setText(tr("#include in source"));
         else
             a.edcppdecl->setText("friend " +
                                  ClassDialog::cpp_stereotype(rel->get_end_class()->get_stereotype()) +
                                  " ${type};");
 
         if (! visit)
-            a.cpp_unmapped_decl_bt->setOn(FALSE);
+            a.cpp_unmapped_decl_bt->setChecked(FALSE);
     }
 
     cpp_update_a();
@@ -1587,10 +1633,10 @@ void RelationDialog::default_a_cpp_if_needed(UmlCode prev_type,
 
 void RelationDialog::cpp_include_in_header()
 {
-    a.edcppdecl->setText(TR("#include in header"));
+    a.edcppdecl->setText(tr("#include in header"));
 
     if (! visit)
-        a.cpp_unmapped_decl_bt->setOn(FALSE);
+        a.cpp_unmapped_decl_bt->setChecked(FALSE);
 
     cpp_update_a();
 }
@@ -1601,7 +1647,7 @@ void RelationDialog::cpp_unmapped_a()
     a.showcppdecl->setText(QString());
 
     if (!RelationData::isa_association(current_type) && !visit)
-        a.cpp_default_decl_bt->setOn(FALSE);
+        a.cpp_default_decl_bt->setChecked(FALSE);
 }
 
 void RelationDialog::cpp_default_b()
@@ -1610,7 +1656,7 @@ void RelationDialog::cpp_default_b()
         b.edcppdecl->setText(QString());
     else
         b.edcppdecl->setText(GenerationSettings::cpp_default_rel_decl(UmlAssociation,
-                             b.multiplicity->currentText().stripWhiteSpace()));
+                             b.multiplicity->currentText().trimmed()));
 
     cpp_update_b();
 }
@@ -1648,7 +1694,8 @@ void RelationDialog::java_update(RoleDialog & role, BrowserClass * cl, BrowserNo
             //	const char * p = role.edjavadecl->text();
             // because the QString is immediatly destroyed !
             QString def = role.edjavadecl->text();
-            const char * p = def;
+            QByteArray defArray = def.toLatin1();
+            const char * p = defArray.constData();
 
             while (*p) {
                 if (!strncmp(p, "${type}", 7)) {
@@ -1673,7 +1720,9 @@ void RelationDialog::java_update(RoleDialog & role, BrowserClass * cl, BrowserNo
         //	const char * p = role.edjavadecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edjavadecl->text();
-        const char * p = def;
+        QByteArray javaAnnotationArray;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
         const char * pp = 0;
         QString indent = "";
 
@@ -1748,14 +1797,14 @@ void RelationDialog::java_update(RoleDialog & role, BrowserClass * cl, BrowserNo
             }
             else if (!strncmp(p, "${multiplicity}", 15)) {
                 p += 15;
-                s += java_multiplicity(role.multiplicity->currentText().stripWhiteSpace());
+                s += java_multiplicity(role.multiplicity->currentText().trimmed());
             }
             else if (!strncmp(p, "${stereotype}", 13)) {
                 p += 13;
-                s += GenerationSettings::java_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+                s += GenerationSettings::java_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
             }
             else if (!strncmp(p, "${value}", 8)) {
-                QString i = role.edinit->text().stripWhiteSpace();
+                QString i = role.edinit->text().trimmed();
 
                 if (!i.isEmpty()) {
                     if (need_equal(p, i, FALSE))
@@ -1768,7 +1817,7 @@ void RelationDialog::java_update(RoleDialog & role, BrowserClass * cl, BrowserNo
             }
             else if (!strncmp(p, "${association}", 14)) {
                 p += 14;
-                s += GenerationSettings::java_type(type(edassociation->currentText().stripWhiteSpace(),
+                s += GenerationSettings::java_type(type(edassociation->currentText().trimmed(),
                                                         list, nodes));
             }
             else if (!strncmp(p, "${@}", 4)) {
@@ -1778,7 +1827,8 @@ void RelationDialog::java_update(RoleDialog & role, BrowserClass * cl, BrowserNo
                     s += "${@}";
                 else if (!role.javaannotation.isEmpty()) {
                     pp = p;
-                    p = role.javaannotation;
+                    javaAnnotationArray = role.javaannotation.toLatin1();
+                    p = javaAnnotationArray.constData();
                 }
             }
             else if (*p == '\n') {
@@ -1793,7 +1843,7 @@ void RelationDialog::java_update(RoleDialog & role, BrowserClass * cl, BrowserNo
                 s += *p++;
         }
 
-        role.editjavaannotation->setEnabled(def.find("${@}") != -1);
+        role.editjavaannotation->setEnabled(def.indexOf("${@}") != -1);
     }
     }
 
@@ -1816,10 +1866,10 @@ void RelationDialog::java_default_a()
     if (a.java_undef)
         a.edjavadecl->setText(QString());
     else if (RelationData::isa_association(current_type))
-        a.edjavadecl->setText(GenerationSettings::java_default_rel_decl(a.multiplicity->currentText().stripWhiteSpace()));
+        a.edjavadecl->setText(GenerationSettings::java_default_rel_decl(a.multiplicity->currentText().trimmed()));
     else {
         a.edjavadecl->setText("${type}");
-        a.java_unmapped_decl_bt->setOn(FALSE);
+        a.java_unmapped_decl_bt->setChecked(FALSE);
     }
 
     java_update_a();
@@ -1850,7 +1900,7 @@ void RelationDialog::java_unmapped_a()
     a.showjavadecl->setText(QString());
 
     if (!RelationData::isa_association(current_type))
-        a.java_default_decl_bt->setOn(FALSE);
+        a.java_default_decl_bt->setChecked(FALSE);
 }
 
 void RelationDialog::java_default_b()
@@ -1858,7 +1908,7 @@ void RelationDialog::java_default_b()
     if (b.java_undef)
         b.edjavadecl->setText(QString());
     else
-        b.edjavadecl->setText(GenerationSettings::java_default_rel_decl(b.multiplicity->currentText().stripWhiteSpace()));
+        b.edjavadecl->setText(GenerationSettings::java_default_rel_decl(b.multiplicity->currentText().trimmed()));
 
     java_update_b();
 }
@@ -1910,7 +1960,8 @@ void RelationDialog::php_update(RoleDialog & role, BrowserClass * cl, BrowserNod
         //	const char * p = role.edphpdecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edphpdecl->text();
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
 
         while (*p) {
             if (!strncmp(p, "${type}", 7)) {
@@ -1934,7 +1985,8 @@ void RelationDialog::php_update(RoleDialog & role, BrowserClass * cl, BrowserNod
         //	const char * p = role.edphpdecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edphpdecl->text();
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
         const char * pp = 0;
         QString indent = "";
 
@@ -2004,7 +2056,7 @@ void RelationDialog::php_update(RoleDialog & role, BrowserClass * cl, BrowserNod
                     s += "var ";
             }
             else if (!strncmp(p, "${value}", 8)) {
-                QString i = role.edinit->text().stripWhiteSpace();
+                QString i = role.edinit->text().trimmed();
 
                 if (!i.isEmpty()) {
                     if (need_equal(p, i, FALSE))
@@ -2060,7 +2112,7 @@ void RelationDialog::php_default_a()
         a.edphpdecl->setText(GenerationSettings::php_default_rel_decl());
     else {
         a.edphpdecl->setText("${type}");
-        a.php_unmapped_decl_bt->setOn(FALSE);
+        a.php_unmapped_decl_bt->setChecked(FALSE);
     }
 
     php_update_a();
@@ -2087,7 +2139,7 @@ void RelationDialog::php_unmapped_a()
     a.showphpdecl->setText(QString());
 
     if (!RelationData::isa_association(current_type))
-        a.php_default_decl_bt->setOn(FALSE);
+        a.php_default_decl_bt->setChecked(FALSE);
 }
 
 void RelationDialog::php_default_b()
@@ -2126,7 +2178,8 @@ void RelationDialog::python_update(RoleDialog & role, BrowserClass * cl, Browser
         //	const char * p = role.edpythondecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edpythondecl->text();
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
 
         while (*p) {
             if (!strncmp(p, "${type}", 7)) {
@@ -2153,7 +2206,8 @@ void RelationDialog::python_update(RoleDialog & role, BrowserClass * cl, Browser
         //	const char * p = role.edpythondecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edpythondecl->text();
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
         const char * pp = 0;
 
         for (;;) {
@@ -2184,7 +2238,7 @@ void RelationDialog::python_update(RoleDialog & role, BrowserClass * cl, Browser
                     s += ((&role == &a) ? b : a).edrole->text();
             }
             else if (!strncmp(p, "${value}", 8)) {
-                QString i = role.edinit->text().stripWhiteSpace();
+                QString i = role.edinit->text().trimmed();
 
                 if (!i.isEmpty()) {
                     if (need_equal(p, i, FALSE))
@@ -2207,7 +2261,7 @@ void RelationDialog::python_update(RoleDialog & role, BrowserClass * cl, Browser
             }
             else if (!strncmp(p, "${stereotype}", 13)) {
                 p += 13;
-                s += GenerationSettings::python_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+                s += GenerationSettings::python_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
             }
             else if (!strncmp(p, "${type}", 7)) {
                 p += 7;
@@ -2215,7 +2269,7 @@ void RelationDialog::python_update(RoleDialog & role, BrowserClass * cl, Browser
             }
             else if (!strncmp(p, "${association}", 14)) {
                 p += 14;
-                s += type(edassociation->currentText().stripWhiteSpace(),
+                s += type(edassociation->currentText().trimmed(),
                           list, nodes);
             }
             else if (*p == '@')
@@ -2246,10 +2300,10 @@ void RelationDialog::python_default_a()
         a.edpythondecl->setText(QString());
     else if (RelationData::isa_association(current_type))
         a.edpythondecl->setText(GenerationSettings::python_default_rel_decl(current_type,
-                                a.multiplicity->currentText().stripWhiteSpace()));
+                                a.multiplicity->currentText().trimmed()));
     else {
         a.edpythondecl->setText("${type}");
-        a.python_unmapped_decl_bt->setOn(FALSE);
+        a.python_unmapped_decl_bt->setChecked(FALSE);
     }
 
     python_update_a();
@@ -2280,7 +2334,7 @@ void RelationDialog::python_unmapped_a()
     a.showpythondecl->setText(QString());
 
     if (!RelationData::isa_association(current_type))
-        a.python_default_decl_bt->setOn(FALSE);
+        a.python_default_decl_bt->setChecked(FALSE);
 }
 
 void RelationDialog::python_default_b()
@@ -2289,7 +2343,7 @@ void RelationDialog::python_default_b()
         b.edpythondecl->setText(QString());
     else
         b.edpythondecl->setText(GenerationSettings::python_default_rel_decl(UmlAssociation,
-                                b.multiplicity->currentText().stripWhiteSpace()));
+                                b.multiplicity->currentText().trimmed()));
 
     python_update_b();
 }
@@ -2325,7 +2379,8 @@ void RelationDialog::idl_update(RoleDialog & role, BrowserClass * cl, BrowserNod
         //	const char * p = role.edidldecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edidldecl->text();
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
 
         while (*p) {
             if (!strncmp(p, "${type}", 7)) {
@@ -2353,7 +2408,8 @@ void RelationDialog::idl_update(RoleDialog & role, BrowserClass * cl, BrowserNod
         //	const char * p = role.edidldecl->text();
         // because the QString is immediatly destroyed !
         QString def = role.edidldecl->text();
-        const char * p = def;
+        QByteArray defArray = def.toLatin1();
+        const char * p = defArray.constData();
         const char * pp = 0;
         QString indent = "";
 
@@ -2390,7 +2446,7 @@ void RelationDialog::idl_update(RoleDialog & role, BrowserClass * cl, BrowserNod
             }
             else if (role.idl_in_union && !strncmp(p, "${case}", 7)) {
                 p += 7;
-                s += role.edcase->currentText().stripWhiteSpace();
+                s += role.edcase->currentText().trimmed();
             }
             else if (!strncmp(p, "${attribut}", 11)) {
                 // old version
@@ -2433,15 +2489,15 @@ void RelationDialog::idl_update(RoleDialog & role, BrowserClass * cl, BrowserNod
             }
             else if (!strncmp(p, "${stereotype}", 13)) {
                 p += 13;
-                s += GenerationSettings::idl_relationattribute_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+                s += GenerationSettings::idl_relationattribute_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
             }
             else if (!strncmp(p, "${multiplicity}", 15)) {
                 p += 15;
-                s += role.multiplicity->currentText().stripWhiteSpace();
+                s += role.multiplicity->currentText().trimmed();
             }
             else if (!strncmp(p, "${association}", 14)) {
                 p += 14;
-                s += GenerationSettings::idl_type(type(edassociation->currentText().stripWhiteSpace(),
+                s += GenerationSettings::idl_type(type(edassociation->currentText().trimmed(),
                                                        list, nodes));
             }
             else if (*p == '\n') {
@@ -2477,7 +2533,7 @@ void RelationDialog::idl_default_a()
     if (a.idl_undef)
         a.edidldecl->setText(QString());
     else if (RelationData::isa_association(current_type)) {
-        QString mult = a.multiplicity->currentText().stripWhiteSpace();
+        QString mult = a.multiplicity->currentText().trimmed();
 
         a.edidldecl->setText((a.idl_in_union)
                              ? GenerationSettings::idl_default_union_rel_decl(mult)
@@ -2487,7 +2543,7 @@ void RelationDialog::idl_default_a()
     }
     else {
         a.edidldecl->setText("${type}");
-        a.idl_unmapped_decl_bt->setOn(FALSE);
+        a.idl_unmapped_decl_bt->setChecked(FALSE);
     }
 
     idl_update_a();
@@ -2532,7 +2588,7 @@ void RelationDialog::idl_unmapped_a()
     a.showidldecl->setText(QString());
 
     if (!RelationData::isa_association(current_type))
-        a.idl_default_decl_bt->setOn(FALSE);
+        a.idl_default_decl_bt->setChecked(FALSE);
 }
 
 void RelationDialog::idl_default_b()
@@ -2540,7 +2596,7 @@ void RelationDialog::idl_default_b()
     if (b.idl_undef)
         b.edidldecl->setText(QString());
     else {
-        QString mult = b.multiplicity->currentText().stripWhiteSpace();
+        QString mult = b.multiplicity->currentText().trimmed();
 
         b.edidldecl->setText((b.idl_in_union)
                              ? GenerationSettings::idl_default_union_rel_decl(mult)
@@ -2614,22 +2670,22 @@ static void accept_role(RoleDialog & role, RoleData & rel,
         rel.java_transient = !role.java_undef && role.transient_cb->isChecked();
     }
 
-    rel.role = role.edrole->text().stripWhiteSpace();
-    rel.multiplicity = role.multiplicity->currentText().stripWhiteSpace();
+    rel.role = role.edrole->text().trimmed();
+    rel.multiplicity = role.multiplicity->currentText().trimmed();
     rel.init_value = role.edinit->text();
     rel.comment = role.comment->text();
-    rel.constraint = role.constraint->stripWhiteSpaceText();
+    rel.constraint = role.constraint->trimmedText();
 
     rel.cpp_visibility = role.cpp_visibility.value();
 
     if (role.idl_in_union) {
         int index;
-        QString s = role.edcase->currentText().stripWhiteSpace();
+        QString s = role.edcase->currentText().trimmed();
 
-        if (!s.isEmpty() && ((index = role.enum_names.findIndex(s)) != -1))
+        if (!s.isEmpty() && ((index = role.enum_names.indexOf(s)) != -1))
             r->set_idlcase(rel, ((BrowserAttribute *) role.enums.at(index)), "");
         else
-            r->set_idlcase(rel, 0, s);
+            r->set_idlcase(rel, 0, s.toLatin1().constData());
     }
 
     rel.cpp_decl = role.edcppdecl->text();
@@ -2647,15 +2703,16 @@ void RelationDialog::accept()
         !b.kvtable->check_unique())
         return;
 
-    QString ra = a.edrole->text().stripWhiteSpace();
-    QString rb = b.edrole->text().stripWhiteSpace();
-
-    if (rel->wrong_role_a_name(ra))
-        msg_critical(TR("Error"), ra + TR("\n\nillegal name or already used"));
-    else if (rel->wrong_role_b_name(rb))
-        msg_critical(TR("Error"), rb + TR("\n\nillegal name or already used"));
+    QString ra = a.edrole->text().trimmed();
+    QString rb = b.edrole->text().trimmed();
+    bool aTextSame = ra == aOldText;
+    bool bTextSame = rb == bOldText;
+    if (!aTextSame && rel->wrong_role_a_name(ra))
+        msg_critical(tr("Error"), ra + tr("\n\nillegal name or already used"));
+    else if (!bTextSame && rel->wrong_role_b_name(rb))
+        msg_critical(tr("Error"), rb + tr("\n\nillegal name or already used"));
     else {
-        rel->name = edname->text().stripWhiteSpace();
+        rel->name = edname->text().trimmed();
 
         int index = 0;
         QString s = edtype->currentText();
@@ -2667,16 +2724,16 @@ void RelationDialog::accept()
         rel->type = RelTypes[index].type;
 
         bool isinherit = RelationData::isa_inherit(rel->type);
-        bool newst = !visit && rel->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+        bool newst = !visit && rel->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
         bool assoc = RelationData::isa_association(rel->get_type());
 
         if (!visit && assoc) {
             AType t;
 
-            s = edassociation->currentText().stripWhiteSpace();
+            s = edassociation->currentText().trimmed();
 
             if (!s.isEmpty()) {
-                index = list.findIndex(s);
+                index = list.indexOf(s);
 
                 if (index >= 0)
                     t.type = (BrowserClass *) nodes.at(index);
@@ -2730,6 +2787,6 @@ void RelationDialog::accept()
         if (!a.ro || !b.ro)
             rel->modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
diff --git a/src/dialog/RelationDialog.h b/src/dialog/RelationDialog.h
index 3c176d0a5..210ed7287 100644
--- a/src/dialog/RelationDialog.h
+++ b/src/dialog/RelationDialog.h
@@ -30,20 +30,17 @@
 
 #include <qwidget.h>
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 #include "VisibilityGroup.h"
 
 class QWidget;
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 class QPushButton;
-class Q3GroupBox;
-class Q3ButtonGroup;
-class Q3VBox;
+class GridBox;
+class BButtonGroup;
+class VVBox;
 class QRadioButton;
 
 class LineEdit;
@@ -59,7 +56,7 @@ class BodyDialog;
 struct RoleDialog {
     // Uml
     LineEdit * edrole;
-    Q3ComboBox * multiplicity;
+    QComboBox * multiplicity;
     QString previous_multiplicity;
     LineEdit * edinit;
     VisibilityGroup uml_visibility;
@@ -116,7 +113,7 @@ struct RoleDialog {
     bool idl_in_union;
     bool idl_in_valuetype;
     QCheckBox * idl_truncatable_inheritance_cb;
-    Q3ComboBox * edcase;
+    QComboBox * edcase;
     BrowserNodeList enums;
     QStringList enum_names;
     MultiLineEdit * edidldecl;
@@ -129,7 +126,7 @@ struct RoleDialog {
     KeyValuesTable * kvtable;
 };
 
-class RelationDialog : public Q3TabDialog
+class RelationDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -144,21 +141,23 @@ class RelationDialog : public Q3TabDialog
     QWidget * idltab;
     RelationData * rel;
     LineEdit * edname;
-    Q3ComboBox * edtype;
-    Q3ComboBox * edstereotype;
+    QComboBox * edtype;
+    QComboBox * edstereotype;
     RoleDialog a;
     RoleDialog b;
     UmlCode current_type;
     QStringList list;
     BrowserNodeList nodes;
-    Q3ComboBox * edassociation;
+    QString aOldText;
+    QString bOldText;
+    QComboBox * edassociation;
     QWidgetList groupb;
-    Q3GroupBox * cpp_b;
-    Q3GroupBox * java_b;
-    Q3GroupBox * php_b;
-    Q3GroupBox * python_b;
-    Q3GroupBox * idl_b;
-    Q3PtrList<BodyDialog> edits;
+    GridBox * cpp_b;
+    GridBox * java_b;
+    GridBox * php_b;
+    GridBox * python_b;
+    GridBox * idl_b;
+    QList<BodyDialog *> edits;
     BrowserNode * view;
     int offset;
 
@@ -166,25 +165,25 @@ class RelationDialog : public Q3TabDialog
 
 protected:
     void init_uml_role(RoleDialog & role, const RoleData & rel,
-                       Q3GroupBox * bg, BrowserClass * cl1);
+                       GridBox * bg, BrowserClass * cl1);
     void init_cpp_role(RoleDialog & role, const RoleData & rel,
-                       Q3GroupBox * bg, const char * cpp_update_slot,
+                       GridBox * bg, const char * cpp_update_slot,
                        const char * cpp_default_slot,
                        const char * cpp_unmapped_slot,
                        const char * cpp_include_in_header_slot);
     void init_java_role(RoleDialog & role, const RoleData & rel,
-                        Q3GroupBox * bg, const char * java_update_slot,
+                        GridBox * bg, const char * java_update_slot,
                         const char * java_default_slot,
                         const char * java_unmapped_slot,
                         const char * java_edit_annotation);
     void init_php_role(RoleDialog & role, const RoleData & rel,
-                       Q3GroupBox * bg, const char * php_update_slot,
+                       GridBox * bg, const char * php_update_slot,
                        const char * php_default_slot, const char * php_unmapped_slot);
     void init_python_role(RoleDialog & role, const RoleData & rel, BrowserClass *,
-                          Q3GroupBox * bg, const char * python_update_slot,
+                          GridBox * bg, const char * python_update_slot,
                           const char * python_default_slot, const char * python_unmapped_slot);
     void init_idl_role(RoleDialog & role, const RoleData & rel, ClassData * cld,
-                       Q3GroupBox * bg, const char * idl_update_slot,
+                       GridBox * bg, const char * idl_update_slot,
                        const char * idl_default_slot, const char * idl_unmapped_slot);
     void cpp_update(RoleDialog & role, BrowserClass * cl, BrowserNode * rl);
     void java_update(RoleDialog & role, BrowserClass * cl, BrowserNode * rl);
@@ -218,7 +217,7 @@ class RelationDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void default_description_a();
     void default_description_b();
@@ -265,7 +264,7 @@ protected slots:
     void idl_unmapped_a();
     void idl_default_b();
     void idl_unmapped_b();
-    void update_all_tabs(QWidget *);
+    void update_all_tabs(int index);
 };
 
 #endif
diff --git a/src/dialog/RevSettingsDialog.cpp b/src/dialog/RevSettingsDialog.cpp
index d824a837e..7c24789a4 100644
--- a/src/dialog/RevSettingsDialog.cpp
+++ b/src/dialog/RevSettingsDialog.cpp
@@ -30,15 +30,15 @@
 
 
 #include <qlayout.h>
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
-#include <q3combobox.h>
-#include <q3textview.h>
+#include <qcombobox.h>
+#include <qtextedit.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "RevSettingsDialog.h"
 #include "HelpRegexpDialog.h"
@@ -46,152 +46,159 @@
 #include "DialogUtil.h"
 #include "UmlDesktop.h"
 #include "translate.h"
+#include "hhbox.h"
 
 
 QSize RevSettingsDialog::previous_size;
 
 RevSettingsDialog::RevSettingsDialog()
-    : QDialog(0, "Reverse/Roundtrip Settings dialog", TRUE)
+    : QDialog(0/*, "Reverse/Roundtrip Settings dialog", TRUE*/)
 {
-    setCaption(TR("Reverse/Roundtrip Settings dialog"));
+    setWindowTitle(tr("Reverse/Roundtrip Settings dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     vbox->setMargin(5);
 
-    Q3Grid * grid = new Q3Grid(3, this);
-    Q3HBox * htab;
+    GridBox * grid = new GridBox(3, this);
+    HHBox * htab;
 
     vbox->addWidget(grid);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(grid);
-    new QLabel(TR("To specify through regular expression the directories\n"
-                  "and/or files to bypass during reverse and roundtrip"), grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(tr("To specify through regular expression the directories\n"
+                  "and/or files to bypass during reverse and roundtrip"), grid));
 
-    SmallPushButton * help = new SmallPushButton(TR("Help regexp"), grid);
+    SmallPushButton * help;
+    grid->addWidget(help = new SmallPushButton(tr("Help regexp"), grid));
 
     connect(help, SIGNAL(clicked()), this, SLOT(show_regexp_help()));
 
-    new QLabel(grid);
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("C++ directory : "), grid);
-    cpp_dir = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("C++ directory : "), grid));
+    grid->addWidget(cpp_dir = new LineEdit(grid));
     cpp_dir->setText(GenerationSettings::cpp_dir_filter.regexp);
-    cpp_dir_case_sensitive = new QCheckBox(TR("case sensitive"), grid);
+    grid->addWidget(cpp_dir_case_sensitive = new QCheckBox(tr("case sensitive"), grid));
 
     if (GenerationSettings::cpp_dir_filter.case_sensitive)
         cpp_dir_case_sensitive->setChecked(TRUE);
 
-    new QLabel(TR("C++ file : "), grid);
-    cpp_file = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("C++ file : "), grid));
+    grid->addWidget(cpp_file = new LineEdit(grid));
     cpp_file->setText(GenerationSettings::cpp_file_filter.regexp);
-    cpp_file_case_sensitive = new QCheckBox(TR("case sensitive"), grid);
+    grid->addWidget(cpp_file_case_sensitive = new QCheckBox(tr("case sensitive"), grid));
 
     if (GenerationSettings::cpp_file_filter.case_sensitive)
         cpp_file_case_sensitive->setChecked(TRUE);
 
-    new QLabel(grid);
-    htab = new Q3HBox(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(htab = new HHBox(grid));
+    grid->addWidget(new QLabel(grid));
 
     htab->setMargin(3);
-    htab->setStretchFactor(new QLabel(TR("generated/reversed \nheader file extension : "), htab), 0);
-    edcpp_h_extension = new Q3ComboBox(TRUE, htab);
+    htab->setStretchFactor(new QLabel(tr("generated/reversed \nheader file extension : "), htab), 0);
+    edcpp_h_extension = new QComboBox(htab);
+    edcpp_h_extension->setEditable(true);
     htab->setStretchFactor(edcpp_h_extension, 100);
-    edcpp_h_extension->insertItem(GenerationSettings::cpp_h_extension);
-    edcpp_h_extension->setCurrentItem(0);
-    edcpp_h_extension->insertItem("h");
-    edcpp_h_extension->insertItem("hh");
-
-    htab->setStretchFactor(new QLabel(TR("    generated/reversed \n    source file extension : "), htab), 0);
-    edcpp_src_extension = new Q3ComboBox(TRUE, htab);
+    edcpp_h_extension->addItem(GenerationSettings::cpp_h_extension);
+    edcpp_h_extension->setCurrentIndex(0);
+    edcpp_h_extension->addItem("h");
+    edcpp_h_extension->addItem("hh");
+
+    htab->setStretchFactor(new QLabel(tr("    generated/reversed \n    source file extension : "), htab), 0);
+    edcpp_src_extension = new QComboBox(htab);
+    edcpp_src_extension->setEditable(true);
     htab->setStretchFactor(edcpp_src_extension, 100);
-    edcpp_src_extension->insertItem(GenerationSettings::cpp_src_extension);
-    edcpp_src_extension->setCurrentItem(0);
-    edcpp_src_extension->insertItem("cpp");
-    edcpp_src_extension->insertItem("cc");
+    edcpp_src_extension->addItem(GenerationSettings::cpp_src_extension);
+    edcpp_src_extension->setCurrentIndex(0);
+    edcpp_src_extension->addItem("cpp");
+    edcpp_src_extension->addItem("cc");
 
-    new QLabel(grid);
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Java directory : "), grid);
-    java_dir = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("Java directory : "), grid));
+    grid->addWidget(java_dir = new LineEdit(grid));
     java_dir->setText(GenerationSettings::java_dir_filter.regexp);
-    java_dir_case_sensitive = new QCheckBox(TR("case sensitive"), grid);
+    grid->addWidget(java_dir_case_sensitive = new QCheckBox(tr("case sensitive"), grid));
 
     if (GenerationSettings::java_dir_filter.case_sensitive)
         java_dir_case_sensitive->setChecked(TRUE);
 
-    new QLabel(TR("Java file : "), grid);
-    java_file = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("Java file : "), grid));
+    grid->addWidget(java_file = new LineEdit(grid));
     java_file->setText(GenerationSettings::java_file_filter.regexp);
-    java_file_case_sensitive = new QCheckBox(TR("case sensitive"), grid);
+    grid->addWidget(java_file_case_sensitive = new QCheckBox(tr("case sensitive"), grid));
 
     if (GenerationSettings::java_file_filter.case_sensitive)
         java_file_case_sensitive->setChecked(TRUE);
 
-    new QLabel(grid);
-    htab = new Q3HBox(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(htab = new HHBox(grid));
+    grid->addWidget(new QLabel(grid));
 
     htab->setMargin(3);
-    htab->setStretchFactor(new QLabel(TR("generated/reversed file extension : "), htab), 0);
-    edjava_extension = new Q3ComboBox(TRUE, htab);
+    htab->setStretchFactor(new QLabel(tr("generated/reversed file extension : "), htab), 0);
+    edjava_extension = new QComboBox(htab);
+    edjava_extension->setEditable(true);
     htab->setStretchFactor(edjava_extension, 100);
-    edjava_extension->insertItem(GenerationSettings::java_extension);
-    edjava_extension->setCurrentItem(0);
-    edjava_extension->insertItem("java");
+    edjava_extension->addItem(GenerationSettings::java_extension);
+    edjava_extension->setCurrentIndex(0);
+    edjava_extension->addItem("java");
 
-    new QLabel(grid);
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    new QLabel(TR("Php directory : "), grid);
-    php_dir = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("Php directory : "), grid));
+    grid->addWidget(php_dir = new LineEdit(grid));
     php_dir->setText(GenerationSettings::php_dir_filter.regexp);
-    php_dir_case_sensitive = new QCheckBox(TR("case sensitive"), grid);
+    grid->addWidget(php_dir_case_sensitive = new QCheckBox(tr("case sensitive"), grid));
 
     if (GenerationSettings::php_dir_filter.case_sensitive)
         php_dir_case_sensitive->setChecked(TRUE);
 
-    new QLabel(TR("Php file : "), grid);
-    php_file = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("Php file : "), grid));
+    grid->addWidget(php_file = new LineEdit(grid));
     php_file->setText(GenerationSettings::php_file_filter.regexp);
-    php_file_case_sensitive = new QCheckBox(TR("case sensitive"), grid);
+    grid->addWidget(php_file_case_sensitive = new QCheckBox(tr("case sensitive"), grid));
 
     if (GenerationSettings::php_file_filter.case_sensitive)
         php_file_case_sensitive->setChecked(TRUE);
 
-    new QLabel(grid);
-    htab = new Q3HBox(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(htab = new HHBox(grid));
+    grid->addWidget(new QLabel(grid));
 
     htab->setMargin(3);
-    htab->setStretchFactor(new QLabel(TR("generated / reversed file extension : "), htab), 0);
-    edphp_extension = new Q3ComboBox(TRUE, htab);
+    htab->setStretchFactor(new QLabel(tr("generated / reversed file extension : "), htab), 0);
+    edphp_extension = new QComboBox(htab);
+    edphp_extension->setEditable(true);
     htab->setStretchFactor(edphp_extension, 100);
-    edphp_extension->insertItem(GenerationSettings::php_extension);
-    edphp_extension->setCurrentItem(0);
-    edphp_extension->insertItem("php");
+    edphp_extension->addItem(GenerationSettings::php_extension);
+    edphp_extension->setCurrentIndex(0);
+    edphp_extension->addItem("php");
 
-    new QLabel(grid);
-    new QLabel(grid);
-    new QLabel(grid);
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
+    grid->addWidget(new QLabel(grid));
 
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
     accept->setFixedSize(bs);
     cancel->setFixedSize(bs);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
 
     hbox->addWidget(accept);
     hbox->addWidget(cancel);
@@ -202,7 +209,7 @@ RevSettingsDialog::RevSettingsDialog()
 
 void RevSettingsDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -217,20 +224,20 @@ void RevSettingsDialog::accept()
     GenerationSettings::cpp_dir_filter.case_sensitive = cpp_dir_case_sensitive->isChecked();
     GenerationSettings::cpp_file_filter.regexp = cpp_file->text();
     GenerationSettings::cpp_file_filter.case_sensitive = cpp_file_case_sensitive->isChecked();
-    GenerationSettings::cpp_h_extension = edcpp_h_extension->currentText().stripWhiteSpace();
-    GenerationSettings::cpp_src_extension = edcpp_src_extension->currentText().stripWhiteSpace();
+    GenerationSettings::cpp_h_extension = edcpp_h_extension->currentText().trimmed();
+    GenerationSettings::cpp_src_extension = edcpp_src_extension->currentText().trimmed();
 
     GenerationSettings::java_dir_filter.regexp = java_dir->text();
     GenerationSettings::java_dir_filter.case_sensitive = java_dir_case_sensitive->isChecked();
     GenerationSettings::java_file_filter.regexp = java_file->text();
     GenerationSettings::java_file_filter.case_sensitive = java_file_case_sensitive->isChecked();
-    GenerationSettings::java_extension = edjava_extension->currentText().stripWhiteSpace();
+    GenerationSettings::java_extension = edjava_extension->currentText().trimmed();
 
     GenerationSettings::php_dir_filter.regexp = php_dir->text();
     GenerationSettings::php_dir_filter.case_sensitive = php_dir_case_sensitive->isChecked();
     GenerationSettings::php_file_filter.regexp = php_file->text();
     GenerationSettings::php_file_filter.case_sensitive = php_file_case_sensitive->isChecked();
-    GenerationSettings::php_extension = edphp_extension->currentText().stripWhiteSpace();
+    GenerationSettings::php_extension = edphp_extension->currentText().trimmed();
 
     QDialog::accept();
 }
@@ -248,13 +255,13 @@ void RevSettingsDialog::show_regexp_help()
 QSize HelpRegexpDialog::previous_size;
 
 HelpRegexpDialog::HelpRegexpDialog()
-    : QDialog(0, "Help, regular expression", TRUE)
+    : QDialog(0/*, "Help, regular expression", TRUE*/)
 {
-    setCaption(TR("Help regular expression"));
+    setWindowTitle(tr("Help regular expression"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
-    Q3TextView * txt = new Q3TextView(this);
+    QTextEdit * txt = new QTextEdit(this);
 
     txt->setText("<p>Extracted from the QT documentation :</p><hr>"
                  "<ul>"
@@ -273,12 +280,13 @@ HelpRegexpDialog::HelpRegexpDialog()
                  "<li><b>]</b> Ends the character set definition. To include the character ']' itself in the set, escape it or place it first (but after the negation operator '^', if present)</li>"
                  "</ul>"
                  "<p>Thus, <i>[a-zA-Z0-9.]</i> matches upper and lower case ASCII letters, digits and dot.</p>");
-    vbox->add(txt);
+    vbox->addWidget(txt);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
-    QPushButton * close = new QPushButton(TR("Close"), this);
+    QPushButton * close = new QPushButton(tr("Close"), this);
 
     close->setDefault(TRUE);
 
diff --git a/src/dialog/RevSettingsDialog.h b/src/dialog/RevSettingsDialog.h
index fc4086323..c0ca958b2 100644
--- a/src/dialog/RevSettingsDialog.h
+++ b/src/dialog/RevSettingsDialog.h
@@ -31,7 +31,7 @@
 #include <qdialog.h>
 
 class QCheckBox;
-class Q3ComboBox;
+class QComboBox;
 class LineEdit;
 
 class RevSettingsDialog : public QDialog
@@ -43,20 +43,20 @@ class RevSettingsDialog : public QDialog
     LineEdit * cpp_file;
     QCheckBox * cpp_dir_case_sensitive;
     QCheckBox * cpp_file_case_sensitive;
-    Q3ComboBox * edcpp_h_extension;
-    Q3ComboBox * edcpp_src_extension;
+    QComboBox * edcpp_h_extension;
+    QComboBox * edcpp_src_extension;
 
     LineEdit * java_dir;
     LineEdit * java_file;
     QCheckBox * java_dir_case_sensitive;
     QCheckBox * java_file_case_sensitive;
-    Q3ComboBox * edjava_extension;
+    QComboBox * edjava_extension;
 
     LineEdit * php_dir;
     LineEdit * php_file;
     QCheckBox * php_dir_case_sensitive;
     QCheckBox * php_file_case_sensitive;
-    Q3ComboBox * edphp_extension;
+    QComboBox * edphp_extension;
 
     static QSize previous_size;
 
@@ -66,7 +66,7 @@ class RevSettingsDialog : public QDialog
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
     void show_regexp_help();
 };
 
diff --git a/src/dialog/SaveProgress.cpp b/src/dialog/SaveProgress.cpp
index e3977a1db..7e998a39f 100644
--- a/src/dialog/SaveProgress.cpp
+++ b/src/dialog/SaveProgress.cpp
@@ -34,8 +34,9 @@
 #include "UmlDesktop.h"
 
 SaveProgress::SaveProgress(int n)
-    : Q3ProgressDialog(0, 0, n, 0, 0, FALSE, Qt::WDestructiveClose)
+    : QProgressDialog(0/*, 0, n, 0, 0, FALSE, Qt::WDestructiveClose*/)
 {
+    Q_UNUSED(n);
 
     if (UmlDesktop::fixed())
         UmlDesktop::tocenter(this);
diff --git a/src/dialog/SaveProgress.h b/src/dialog/SaveProgress.h
index 199832018..e43954dd0 100644
--- a/src/dialog/SaveProgress.h
+++ b/src/dialog/SaveProgress.h
@@ -28,9 +28,9 @@
 #ifndef SAVE_PROGRESS_H
 #define SAVE_PROGRESS_H
 
-#include <q3progressdialog.h>
-
-class SaveProgress : public Q3ProgressDialog
+//#include <q3progressdialog.h>
+#include <QProgressDialog>
+class SaveProgress : public QProgressDialog
 {
 public:
     SaveProgress(int);
diff --git a/src/dialog/SdMsgDialog.cpp b/src/dialog/SdMsgDialog.cpp
index 72c199e40..d842963de 100644
--- a/src/dialog/SdMsgDialog.cpp
+++ b/src/dialog/SdMsgDialog.cpp
@@ -33,17 +33,14 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
-#include <q3hbox.h>
+#include <qcombobox.h>
+#include <hhbox.h>
 #include <qpushbutton.h>
-#include <q3buttongroup.h>
+#include <bbuttongroup.h>
 #include <qradiobutton.h>
-#include <q3popupmenu.h>
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include "SdMsgDialog.h"
 #include "SdMsgBaseCanvas.h"
 #include "BrowserClass.h"
@@ -56,33 +53,36 @@
 #include "UmlDesktop.h"
 #include "BrowserView.h"
 #include "translate.h"
+#include "menufactory.h"
 
 QSize SdMsgDialog::previous_size;
 
 SdMsgDialog::SdMsgDialog(SdMsgBaseCanvas * a, const QStringList & defaults)
-    : QDialog(0, "Message editor", TRUE), mc(a)
+    : QDialog(0/*, "Message editor", TRUE*/), mc(a)
 {
-    setCaption(TR("Message dialog"));
+    setWindowTitle(tr("Message dialog"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
-    SmallPushButton * b = new SmallPushButton(TR("message :"), this);
+    SmallPushButton * b = new SmallPushButton(tr("message :"), this);
 
     hbox->addWidget(b);
     connect(b, SIGNAL(clicked()), this, SLOT(menu_op()));
 
-    edoper = new Q3ComboBox(TRUE, this);
+    edoper = new QComboBox(this);
+    edoper->setEditable(true);
 
     if (a->msg == 0)
-        edoper->insertItem(a->explicit_msg);
+        edoper->addItem(a->explicit_msg);
     else
-        edoper->insertItem(a->msg->definition(TRUE, FALSE));
+        edoper->addItem(a->msg->definition(TRUE, FALSE));
 
     edoper->setAutoCompletion(completion());
 
@@ -92,81 +92,89 @@ SdMsgDialog::SdMsgDialog(SdMsgBaseCanvas * a, const QStringList & defaults)
     else if ((cl = ((SdDurationCanvas *) a->get_dest())->get_line()->get_obj()->get_class())
              != 0) {
         cl->get_opers(opers, list);
-        edoper->insertStringList(list);
+        edoper->addItems(list);
 
         if (!cl->is_writable())
             cl = 0;
     }
 
-    edoper->setCurrentItem(0);
+    edoper->setCurrentIndex(0);
 
     QSizePolicy sp = edoper->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edoper->setSizePolicy(sp);
 
     hbox->addWidget(edoper);
 
     //
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(new QLabel(TR("stereotype : "), this));
-    edst = new Q3ComboBox(TRUE, this);
+    hbox->addWidget(new QLabel(tr("stereotype : "), this));
+    edst = new QComboBox(this);
+    edst->setEditable(true);
 
     if (a->stereotype != 0) {
         QString s = a->stereotype->get_name();
 
         s = s.mid(2, s.length() - 4);
-        edst->insertItem(s);
+        edst->addItem(s);
     }
     else
-        edst->insertItem("");
+        edst->addItem("");
 
-    edst->setCurrentItem(0);
-    edst->insertStringList(defaults);
+    edst->setCurrentIndex(0);
+    edst->addItems(defaults);
     edst->setAutoCompletion(completion());
     hbox->addWidget(edst);
     edst->setSizePolicy(sp);
 
     //
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
-    Q3HBox * htab = new Q3HBox(this);
+    HHBox * htab = new HHBox(this);
 
     htab->setMargin(5);
 
-    Q3ButtonGroup * bg = new Q3ButtonGroup(2, Qt::Horizontal, TR("Message type"), htab);
+    BButtonGroup * bg = new BButtonGroup(2, Qt::Horizontal, tr("Message type"), htab);
 
     bg->setExclusive(TRUE);
-    synchronous_rb = new QRadioButton(TR("synchronous"), bg);
-    asynchronous_rb = new QRadioButton(TR("asynchronous"), bg);
+    synchronous_rb = new QRadioButton(tr("synchronous"), bg);
+    asynchronous_rb = new QRadioButton(tr("asynchronous"), bg);
 
     if (a->is_synchronous())
         synchronous_rb->setChecked(TRUE);
     else
         asynchronous_rb->setChecked(TRUE);
+    bg->addWidget(synchronous_rb);
+    bg->addWidget(asynchronous_rb);
 
+    htab->addWidget(bg);
     hbox->addWidget(htab);
 
-    vbox->addWidget(new QLabel(TR("\n\nWhen the arguments are specified they replace the \
+    vbox->addWidget(new QLabel(tr("\n\nWhen the arguments are specified they replace the \
 operation's parameter(s) without any check"),
                                this));
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    hbox->addWidget(new QLabel(TR("arguments : "), this));
+    hbox->addWidget(new QLabel(tr("arguments : "), this));
     edargs = new MultiLineEdit(this);
     edargs->setText(a->get_args());
     hbox->addWidget(edargs);
     edargs->setFocus();
 
-    hbox = new Q3HBoxLayout(vbox);
+    hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * ok = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * ok = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     ok->setDefault(TRUE);
@@ -182,7 +190,7 @@ operation's parameter(s) without any check"),
 
 void SdMsgDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -193,31 +201,34 @@ SdMsgDialog::~SdMsgDialog()
 
 void SdMsgDialog::menu_op()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = list.findIndex(edoper->currentText().stripWhiteSpace());
+    int index = list.indexOf(edoper->currentText().trimmed());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = BrowserView::selected_item();
 
     if ((bn != 0) &&
         (bn->get_type() == UmlOperation) &&
         !bn->deletedp() &&
-        (opers.findIndex((OperationData *) bn->get_data()) != -1))
-        m.insertItem(TR("Choose operation selected in browser"), 1);
+        (opers.indexOf((OperationData *) bn->get_data()) != -1))
+        MenuFactory::addItem(m, tr("Choose operation selected in browser"), 1);
     else
         bn = 0;
 
     if (cl != 0)
-        m.insertItem(TR("Create operation and choose it"), 2);
+        MenuFactory::addItem(m, tr("Create operation and choose it"), 2);
 
     if ((index != -1) || (bn != 0) || (cl != 0)) {
-        switch (m.exec(QCursor::pos())) {
+        QAction* retAction = m.exec(QCursor::pos());
+        if(retAction)
+        {
+        switch (retAction->data().toInt()) {
         case 0:
             opers[index]->get_browser_node()->select_in_browser();
             break;
@@ -234,40 +245,41 @@ void SdMsgDialog::menu_op()
         case 1: {
             OperationData * od = (OperationData *) bn->get_data();
 
-            if ((index = opers.findIndex(od)) == -1) {
+            if ((index = opers.indexOf(od)) == -1) {
                 index = opers.count();
                 opers.append(od);
 
                 QString s = od->definition(TRUE, FALSE);
 
                 list.append(s);
-                edoper->insertItem(s);
+                edoper->addItem(s);
             }
         }
 
-        edoper->setCurrentItem(index + 1);
+        edoper->setCurrentIndex(index + 1);
+        }
         }
     }
 }
 
 void SdMsgDialog::accept()
 {
-    QString s = edoper->currentText().stripWhiteSpace();
+    QString s = edoper->currentText().trimmed();
 
     if (!s.isEmpty()) {
-        int index = list.findIndex(s);
+        int index = list.indexOf(s);
 
         if (index >= 0)
-            mc->set_msg(opers[index], QString(), edargs->text().stripWhiteSpace());
+            mc->set_msg(opers[index], QString(), edargs->text().trimmed());
         else
-            mc->set_msg(0, s, edargs->text().stripWhiteSpace());
+            mc->set_msg(0, s, edargs->text().trimmed());
     }
     else
         mc->set_msg(0, QString(), QString());
 
     mc->set_synchronous(synchronous_rb->isChecked());
 
-    s = edst->currentText().stripWhiteSpace();
+    s = edst->currentText().trimmed();
 
     if (!s.isEmpty())
         s = "<<" + s + ">>";
diff --git a/src/dialog/SdMsgDialog.h b/src/dialog/SdMsgDialog.h
index ffa4abca6..431459a00 100644
--- a/src/dialog/SdMsgDialog.h
+++ b/src/dialog/SdMsgDialog.h
@@ -31,9 +31,9 @@
 #include <qdialog.h>
 #include <qstringlist.h>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
-class Q3ComboBox;
+class QComboBox;
 class QRadioButton;
 
 class MultiLineEdit;
@@ -49,9 +49,9 @@ class SdMsgDialog : public QDialog
     SdMsgBaseCanvas * mc;
     BrowserClass * cl;
     QStringList list;
-    Q3ValueList<const OperationData *> opers;
-    Q3ComboBox * edoper;
-    Q3ComboBox * edst;
+    QList<const OperationData *> opers;
+    QComboBox * edoper;
+    QComboBox * edst;
     MultiLineEdit * edargs;
     QRadioButton * synchronous_rb;
     QRadioButton * asynchronous_rb;
@@ -65,7 +65,7 @@ class SdMsgDialog : public QDialog
 protected slots:
     void menu_op();
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/SettingsDialog.cpp b/src/dialog/SettingsDialog.cpp
index aa4e50609..4da4be01a 100644
--- a/src/dialog/SettingsDialog.cpp
+++ b/src/dialog/SettingsDialog.cpp
@@ -29,11 +29,10 @@
 
 
 
-
-#include <q3hbox.h>
-#include <q3grid.h>
+#include <hhbox.h>
+#include <gridbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 
 #include "Settings.h"
@@ -41,7 +40,8 @@
 #include "UmlPixmap.h"
 #include "UmlDesktop.h"
 #include "translate.h"
-
+#include "widgetwithlayout.h"
+#include <QLayout>
 void ColorSpecVector::resize(int s)
 {
     ColorSpec * v = new ColorSpec[s];
@@ -54,7 +54,7 @@ void ColorSpecVector::resize(int s)
     _size = s;
 }
 
-class ComboStates : public Q3ComboBox
+class ComboStates : public QComboBox
 {
 public:
     ComboStates(QWidget * parent, Uml3States v, bool nodefault, bool unchanged);
@@ -63,133 +63,134 @@ class ComboStates : public Q3ComboBox
     ComboStates(QWidget * parent, ShowContextMode v, bool nodefault, bool unchanged);
     ComboStates(QWidget * parent, char v, bool nodefault, bool unchanged);
 
-    virtual QSize sizeHint() const;
+    virtual QSize sizeHint() const override;
 };
 
 ComboStates::ComboStates(QWidget * parent, Uml3States v,
                          bool nodefault, bool unchanged)
-    : Q3ComboBox(FALSE, parent)
+    : QComboBox(parent)
 {
-    insertItem(TR(stringify((Uml3States) 0)));
-    insertItem(TR(stringify((Uml3States) 1)));
+    this->setEditable(false);
+    addItem(tr(stringify((Uml3States) 0)));
+    addItem(tr(stringify((Uml3States) 1)));
 
     // the last value MUST be default
     if (!nodefault)
-        insertItem(TR(stringify((Uml3States) 2)));
+        addItem(tr(stringify((Uml3States) 2)));
 
     if (unchanged) {
-        insertItem(TR("<unchanged>"));
-        setCurrentItem(count() - 1);
+        addItem(tr("<unchanged>"));
+        setCurrentIndex(count() - 1);
     }
     else
-        setCurrentItem(v);
+        setCurrentIndex(v);
 }
 
 ComboStates::ComboStates(QWidget * parent, ClassDrawingMode v,
                          bool nodefault, bool unchanged)
-    : Q3ComboBox(FALSE, parent)
+    : QComboBox( parent)
 {
     int i;
-
+    this->setEditable(false);
     for (i = 0; i != (int) DefaultClassDrawingMode; i += 1)
-        insertItem(TR(stringify((ClassDrawingMode) i)));
+        addItem(tr(stringify((ClassDrawingMode) i)));
 
     // the last value MUST be default
     if (!nodefault)
-        insertItem(TR(stringify((ClassDrawingMode) i)));
+        addItem(tr(stringify((ClassDrawingMode) i)));
 
     if (unchanged) {
-        insertItem(TR("<unchanged>"));
-        setCurrentItem(count() - 1);
+        addItem(tr("<unchanged>"));
+        setCurrentIndex(count() - 1);
     }
     else
-        setCurrentItem(v);
+        setCurrentIndex(v);
 }
 
 ComboStates::ComboStates(QWidget * parent, DrawingLanguage v,
                          bool nodefault, bool unchanged)
-    : Q3ComboBox(FALSE, parent)
+    : QComboBox(parent)
 {
     int i;
-
+    this->setEditable(false);
     for (i = 0; i != (int) DefaultDrawingLanguage; i += 1)
-        insertItem(stringify((DrawingLanguage) i));
+        addItem(stringify((DrawingLanguage) i));
 
     // the last value MUST be default
     if (!nodefault)
-        insertItem(TR(stringify((DrawingLanguage) i)));
+        addItem(tr(stringify((DrawingLanguage) i)));
 
     if (unchanged) {
-        insertItem(TR("<unchanged>"));
-        setCurrentItem(count() - 1);
+        addItem(tr("<unchanged>"));
+        setCurrentIndex(count() - 1);
     }
     else
-        setCurrentItem(v);
+        setCurrentIndex(v);
 }
 
 static QString _2space(QString s)
 {
-    int index = s.find("_");
+    int index = s.indexOf("_");
 
     return (index == -1) ? s : s.replace(index, 1, " ");
 }
 
 ComboStates::ComboStates(QWidget * parent, ShowContextMode v,
                          bool nodefault, bool unchanged)
-    : Q3ComboBox(FALSE, parent)
+    : QComboBox(parent)
 {
     int i;
-
+    this->setEditable(false);
     for (i = 0; i != (int) DefaultShowContextMode; i += 1)
-        insertItem(_2space(TR(stringify((ShowContextMode) i))));
+        addItem(_2space(tr(stringify((ShowContextMode) i))));
 
     // the last value MUST be default
     if (!nodefault)
-        insertItem(_2space(TR(stringify((ShowContextMode) i))));
+        addItem(_2space(tr(stringify((ShowContextMode) i))));
 
     if (unchanged) {
-        insertItem(TR("<unchanged>"));
-        setCurrentItem(count() - 1);
+        addItem(tr("<unchanged>"));
+        setCurrentIndex(count() - 1);
     }
     else
-        setCurrentItem(v);
+        setCurrentIndex(v);
 }
 
 
 ComboStates::ComboStates(QWidget * parent, char v,
                          bool nodefault, bool unchanged)
-    : Q3ComboBox(FALSE, parent)
+    : QComboBox(parent)
 {
     int i;
-
+    this->setEditable(false);
     for (i = MinMemberWidthValue; i != SupMemberWidthValue; i += 1) {
         char s[4];
 
         sprintf(s, "%d", i);
-        insertItem(s);
+        addItem(s);
     }
 
-    insertItem(TR("unlimited"));
+    addItem(tr("unlimited"));
 
     if (!nodefault)
-        insertItem(TR("default"));
+        addItem(tr("default"));
 
     if (unchanged) {
-        insertItem(TR("<unchanged>"));
-        setCurrentItem(count() - 1);
+        addItem(tr("<unchanged>"));
+        setCurrentIndex(count() - 1);
     }
     else {
         switch (v) {
         case UmlDefaultMaxMemberWidth:
-            setCurrentItem(SupMemberWidthValue - MinMemberWidthValue + 1);
+            setCurrentIndex(SupMemberWidthValue - MinMemberWidthValue + 1);
             break;
 
         case UmlUnlimitedMemberWidth:
-            setCurrentItem(SupMemberWidthValue - MinMemberWidthValue);
+            setCurrentIndex(SupMemberWidthValue - MinMemberWidthValue);
             break;
 
         default:
-            setCurrentItem(v - MinMemberWidthValue);
+            setCurrentIndex(v - MinMemberWidthValue);
             break;
         }
     }
@@ -197,14 +198,14 @@ ComboStates::ComboStates(QWidget * parent, char v,
 
 QSize ComboStates::sizeHint() const
 {
-    QSize sz = Q3ComboBox::sizeHint();
+    QSize sz = QComboBox::sizeHint();
 
-    sz.setHeight(fontMetrics().height() + 4);
+    sz.setHeight(fontMetrics().height() + 1);
     return sz;
 }
 
 
-class ComboColor : public Q3ComboBox
+class ComboColor : public QComboBox
 {
 public:
     ComboColor(QWidget * parent, UmlColor v,
@@ -213,157 +214,157 @@ class ComboColor : public Q3ComboBox
 
 ComboColor::ComboColor(QWidget * parent, UmlColor v,
                        bool nodefault, bool unchanged)
-    : Q3ComboBox(FALSE, parent)
+    : QComboBox(parent)
 {
-    QString s_transparent = TR("Transparent");
-    QString s_unknown_color = TR("Unknown color");
-
+    QString s_transparent = QObject::tr("Transparent");
+    QString s_unknown_color = QObject::tr("Unknown color");
+    this->setEditable(false);
     // the last value MUST be default
     for (int i = 0; i != (int) UmlDefaultColor; i += 1) {
         // use switch to not be dependant on the colors items order and number
         switch (i) {
         case UmlTransparent:
-            insertItem(s_transparent);
+            addItem(s_transparent);
             break;
 
         case UmlWhite:
-            insertItem(* WhitePixmap);
+            addItem(QIcon(* WhitePixmap), "");
             break;
 
         case UmlLightYellow:
-            insertItem(* LightYellowPixmap);
+            addItem(QIcon(* LightYellowPixmap), "");
             break;
 
         case UmlYellow:
-            insertItem(* YellowPixmap);
+            addItem(QIcon(* YellowPixmap), "");
             break;
 
         case UmlMediumYellow:
-            insertItem(* MediumYellowPixmap);
+            addItem(QIcon(* MediumYellowPixmap), "");
             break;
 
         case UmlDarkYellow:
-            insertItem(* DarkYellowPixmap);
+            addItem(QIcon(* DarkYellowPixmap), "");
             break;
 
         case UmlLightBlue:
-            insertItem(* LightBluePixmap);
+            addItem(QIcon(* LightBluePixmap), "");
             break;
 
         case UmlBlue:
-            insertItem(* BluePixmap);
+            addItem(QIcon(* BluePixmap), "");
             break;
 
         case UmlLightMediumBlue:
-            insertItem(* LightMediumBluePixmap);
+            addItem(QIcon(* LightMediumBluePixmap), "");
             break;
 
         case UmlMediumBlue:
-            insertItem(* MediumBluePixmap);
+            addItem(QIcon(* MediumBluePixmap), "");
             break;
 
         case UmlDarkBlue:
-            insertItem(* DarkBluePixmap);
+            addItem(QIcon(* DarkBluePixmap), "");
             break;
 
         case UmlLightGreen:
-            insertItem(* LightGreenPixmap);
+            addItem(QIcon(* LightGreenPixmap), "");
             break;
 
         case UmlGreen:
-            insertItem(* GreenPixmap);
+            addItem(QIcon(* GreenPixmap), "");
             break;
 
         case UmlLightMediumGreen:
-            insertItem(* LightMediumGreenPixmap);
+            addItem(QIcon(* LightMediumGreenPixmap), "");
             break;
 
         case UmlMediumGreen:
-            insertItem(* MediumGreenPixmap);
+            addItem(QIcon(* MediumGreenPixmap), "");
             break;
 
         case UmlDarkGreen:
-            insertItem(* DarkGreenPixmap);
+            addItem(QIcon(* DarkGreenPixmap), "");
             break;
 
         case UmlLightRed:
-            insertItem(* LightRedPixmap);
+            addItem(QIcon(* LightRedPixmap), "");
             break;
 
         case UmlMidRed:
-            insertItem(* MidRedPixmap);
+            addItem(QIcon(* MidRedPixmap), "");
             break;
 
         case UmlRed:
-            insertItem(* RedPixmap);
+            addItem(QIcon(* RedPixmap), "");
             break;
 
         case UmlVeryLightOrange:
-            insertItem(* VeryLightOrangePixmap);
+            addItem(QIcon(* VeryLightOrangePixmap), "");
             break;
 
         case UmlLightOrange:
-            insertItem(* LightOrangePixmap);
+            addItem(QIcon(* LightOrangePixmap), "");
             break;
 
         case UmlOrange:
-            insertItem(* OrangePixmap);
+            addItem(QIcon(* OrangePixmap), "");
             break;
 
         case UmlDarkOrange:
-            insertItem(* DarkOrangePixmap);
+            addItem(QIcon(* DarkOrangePixmap), "");
             break;
 
         case UmlLightMagenta:
-            insertItem(* LightMagentaPixmap);
+            addItem(QIcon(* LightMagentaPixmap), "");
             break;
 
         case UmlMagenta:
-            insertItem(* MagentaPixmap);
+            addItem(QIcon(* MagentaPixmap), "");
             break;
 
         case UmlMidMagenta:
-            insertItem(* MidMagentaPixmap);
+            addItem(QIcon(* MidMagentaPixmap), "");
             break;
 
         case UmlDarkMagenta:
-            insertItem(* DarkMagentaPixmap);
+            addItem(QIcon(* DarkMagentaPixmap), "");
             break;
 
         case UmlVeryLightGray:
-            insertItem(* VeryLightGrayPixmap);
+            addItem(QIcon(* VeryLightGrayPixmap), "");
             break;
 
         case UmlLightGray:
-            insertItem(* LightGrayPixmap);
+            addItem(QIcon(* LightGrayPixmap), "");
             break;
 
         case UmlGray:
-            insertItem(* GrayPixmap);
+            addItem(QIcon(* GrayPixmap), "");
             break;
 
         case UmlDarkGray:
-            insertItem(* DarkGrayPixmap);
+            addItem(QIcon(* DarkGrayPixmap), "");
             break;
 
         case UmlBlack:
-            insertItem(* BlackPixmap);
+            addItem(QIcon(* BlackPixmap), "");
             break;
 
         default:
-            insertItem(s_unknown_color);
+            addItem(s_unknown_color);
         }
     }
 
     if (!nodefault)
-        insertItem(TR(stringify(UmlDefaultColor)));
+        addItem(tr(stringify(UmlDefaultColor)));
 
     if (unchanged) {
-        insertItem(TR("<unchanged>"));
-        setCurrentItem(count() - 1);
+        addItem(tr("<unchanged>"));
+        setCurrentIndex(count() - 1);
     }
     else
-        setCurrentItem(v);
+        setCurrentIndex(v);
 
 
 
@@ -378,26 +379,29 @@ QString SettingsDialog::previous_active_tab;
 
 SettingsDialog::SettingsDialog(StateSpecVector * st, ColorSpecVector * co,
                                bool nodefault, bool unchanged, QString title)
-    : Q3TabDialog(0, title, TRUE),
+    : TabDialog(0, title, TRUE),
       states(st), colors(co), first_visible_page(0),
       several(unchanged), did_apply(FALSE)
 {
-    setCaption((title.isEmpty()) ? TR("Diagram Drawing Settings dialog") : title);
+    this->setModal(true);
+    setWindowTitle((title.isEmpty()) ? QObject::tr("Diagram Drawing Settings dialog") : title);
+
+    QString s_diagram = QObject::tr("diagram");
+
+    QWidget * grid = 0;
 
-    QString s_diagram = TR("diagram");
-    Q3Grid * grid = 0;
     QString tabname;
     unsigned i;
     unsigned n;
 
     if (states != 0) {
         n = states->size();
-        cbstates = new Q3PtrVector<ComboStates>(n);
+        cbstates = new QHash<int,ComboStates*>;
 
         for (i = 0; i != n; i += 1) {
             StateSpec & st = states->at(i);
             QString s = st.name;
-            int index = s.find('#');
+            int index = s.indexOf('#');
             QString tbn;
 
             if (index != -1) {
@@ -410,116 +414,122 @@ SettingsDialog::SettingsDialog(StateSpecVector * st, ColorSpecVector * co,
             if ((grid == 0) || (tabname != tbn)) {
                 if (grid != 0) {
                     addTab(grid, tabname);
-                    grid->setName(tabname);
-
+                    grid->setObjectName(tabname);
                     if (tabname == previous_active_tab)
                         first_visible_page = grid;
                 }
 
-                grid = new Q3Grid(5, this);
-                grid->setMargin(2);
-                grid->setSpacing(2);
+                grid = WidgetWithLayout::gridBox(5, this);
+                grid->layout()->setMargin(0);
+                grid->layout()->setSpacing(0);
                 tabname = tbn;
             }
 
-            new QLabel("", grid);
-            new QLabel(s + " : ", grid);
-            Q3HBox * hb = new Q3HBox(grid);
-
+            QGridLayout *gridLayout = (QGridLayout *)grid->layout();
+            int currentRow = gridLayout->rowCount();
+            //gridLayout->addWidget(new QLabel("", grid), currentRow, 0);
+            gridLayout->addWidget(new QLabel(s + " : ", grid), currentRow, 1);
+            QWidget * hb = WidgetWithLayout::hBox( grid);
+            QHBoxLayout* hLayout;
+            hLayout = (QHBoxLayout*)hb->layout();
+            hLayout->setMargin(0);
+            gridLayout->addWidget(hb,  currentRow, 2);
+
+            ComboStates* widget;
             switch (st.who) {
             case StateSpec::is3states:
-                cbstates->insert(i, new ComboStates(hb, *((Uml3States *) st.state), nodefault, unchanged));
+                cbstates->insert(i, widget = new ComboStates(hb, *((Uml3States *) st.state), nodefault, unchanged));
                 break;
 
             case StateSpec::isClassDrawingMode:
-                cbstates->insert(i, new ComboStates(hb, *((ClassDrawingMode *) st.state),
+                cbstates->insert(i, widget = new ComboStates(hb, *((ClassDrawingMode *) st.state),
                                                     nodefault, unchanged));
                 break;
 
             case StateSpec::isDrawingLanguage:
-                cbstates->insert(i, new ComboStates(hb, *((DrawingLanguage *) st.state),
+                cbstates->insert(i, widget = new ComboStates(hb, *((DrawingLanguage *) st.state),
                                                     nodefault, unchanged));
                 break;
 
             case StateSpec::isShowContextMode:
-                cbstates->insert(i, new ComboStates(hb, *((ShowContextMode *) st.state),
+                cbstates->insert(i, widget = new ComboStates(hb, *((ShowContextMode *) st.state),
                                                     nodefault, unchanged));
                 break;
 
             default:
-                cbstates->insert(i, new ComboStates(hb, *((char *) st.state),
+                cbstates->insert(i, widget = new ComboStates(hb, *((char *) st.state),
                                                     nodefault, unchanged));
             }
-
-            new QLabel("", hb);
-            new QLabel("", grid);
-            new QLabel("", grid);
+            hLayout->addWidget(widget);
+            hLayout->addWidget(new QLabel("", hb));
+            gridLayout->addWidget(new QLabel("", grid),currentRow, 3);
+            gridLayout->addWidget(new QLabel("", grid),currentRow, 4);
         }
 
         addTab(grid, tabname);
-        grid->setName(tabname);
-
+        grid->setObjectName(tabname);
         if (tabname == previous_active_tab)
             first_visible_page = grid;
     }
 
     if (colors != 0) {
-        QString lbl = TR("color");
-        QString s_default = TR("default ");
+        QString lbl = QObject::tr("color");
+        QString s_default = QObject::tr("default ");
 
         n = colors->size();
-        cbcolors = new Q3PtrVector<ComboColor>(n);
-        grid = new Q3Grid(5, this);
-        grid->setMargin(2);
-        grid->setSpacing(2);
+        cbcolors = new QHash<int, ComboColor*>;
+        GridBox *gridBox = new GridBox( 5, this);
+        gridBox->setMargin(2);
+        gridBox->setSpacing(2);
 
         for (i = 0; i != n; i += 1) {
             if (i == 11) {
-                lbl = TR("color [1]");
-                addTab(grid, lbl);
-                grid->setName(lbl);
-
+                lbl = QObject::tr("color [1]");
+                addTab(gridBox, lbl);
+                gridBox->setObjectName(lbl);
                 if (previous_active_tab == lbl)
-                    first_visible_page = grid;
+                    first_visible_page = gridBox;
 
-                lbl = TR("color [2]");
-                grid = new Q3Grid(5, this);
-                grid->setMargin(2);
-                grid->setSpacing(2);
+                lbl = QObject::tr("color [2]");
+                gridBox = new GridBox(5, this);
+                gridBox->setMargin(2);
+                gridBox->setSpacing(2);
             }
 
-            new QLabel("", grid);
+            gridBox->addWidget(new QLabel("", grid));
 
             QString s = colors->at(i).name;
 
             s += " : ";
-            new QLabel(s, grid);
-            cbcolors->insert(i, new ComboColor(grid, *(colors->at(i).color),
-                                               nodefault, unchanged));
-            new QLabel("", grid);
-            new QLabel("", grid);
+            gridBox->addWidget(new QLabel(s, grid));
+            ComboColor *ccolor = new ComboColor(grid, *(colors->at(i).color),nodefault, unchanged);
+            gridBox->addWidget(ccolor);
+            cbcolors->insert(i, ccolor);
+            gridBox->addWidget(new QLabel("", grid));
+            gridBox->addWidget(new QLabel("", grid));
         }
 
-        addTab(grid, lbl);
-        grid->setName(lbl);
-
+        addTab(gridBox, lbl);
+        gridBox->setObjectName(lbl);
         if (previous_active_tab == lbl)
-            first_visible_page = grid;
+            first_visible_page = gridBox;
     }
-
+    setHelpButton(tr("Apply"));
     // use help rather than apply because when the OK button is clicked,
     // the applyButtonPressed() signal is emitted
-    setOkButton(TR("OK"));
-    setHelpButton(TR("Apply"));
-    setCancelButton(TR("Cancel"));
+    setOkButton(tr("OK"));
+    setCancelButton(tr("Cancel"));
 
     connect(this, SIGNAL(helpButtonPressed()),
             this, SLOT(apply()));
+    polish();
+
 }
 
 void SettingsDialog::polish()
 {
-    Q3TabDialog::polish();
+
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 
     if (first_visible_page != 0) {
@@ -527,6 +537,7 @@ void SettingsDialog::polish()
         previous_active_tab = "";
         showPage(first_visible_page);
     }
+
 }
 
 SettingsDialog::~SettingsDialog()
@@ -542,17 +553,19 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::apply()
 {
+
     did_apply = TRUE;
     previous_position = pos();
-    previous_active_tab = currentPage()->name();
+    previous_active_tab = m_tabWidget->currentWidget()->objectName();
     accept();
+
 }
 
 void SettingsDialog::accept()
 {
-    QString s_unchanged = TR("<unchanged>");
-    QString s_default = TR("default");
-    QString s_unlimited = TR("unlimited");
+    QString s_unchanged = QObject::tr("<unchanged>");
+    QString s_default = QObject::tr("default");
+    QString s_unlimited = QObject::tr("unlimited");
     unsigned i, n;
 
     if (states != 0) {
@@ -560,7 +573,7 @@ void SettingsDialog::accept()
 
         for (i = 0; i != n; i += 1) {
             StateSpec & st = states->at(i);
-            QString s = cbstates->at(i)->currentText();
+            QString s = cbstates->value(i)->currentText();
 
             if (s == s_unchanged)
                 st.name = QString();
@@ -570,10 +583,10 @@ void SettingsDialog::accept()
                 else if (s == s_unlimited)
                     st.set_state(UmlUnlimitedMemberWidth);
                 else
-                    st.set_state(cbstates->at(i)->currentItem() + MinMemberWidthValue);
+                    st.set_state(cbstates->value(i)->currentIndex() + MinMemberWidthValue);
             }
             else
-                st.set_state(cbstates->at(i)->currentItem());
+                st.set_state(cbstates->value(i)->currentIndex());
         }
     }
 
@@ -581,10 +594,10 @@ void SettingsDialog::accept()
         n = colors->size();
 
         for (i = 0; i != n; i += 1) {
-            if (cbcolors->at(i)->currentText() == s_unchanged)
+            if (cbcolors->value(i)->currentText() == s_unchanged)
                 colors->at(i).name = QString();
             else
-                *(colors->at(i).color) = (UmlColor) cbcolors->at(i)->currentItem();
+                *(colors->at(i).color) = (UmlColor) cbcolors->value(i)->currentIndex();
         }
     }
 
diff --git a/src/dialog/SettingsDialog.h b/src/dialog/SettingsDialog.h
index e7500b337..08e58da01 100644
--- a/src/dialog/SettingsDialog.h
+++ b/src/dialog/SettingsDialog.h
@@ -28,12 +28,10 @@
 #ifndef DEFAULTSDIALOG_H
 #define DEFAULTSDIALOG_H
 
-#include <q3tabdialog.h>
-#include <q3memarray.h>
-#include <q3ptrvector.h>
-
+#include <tabdialog.h>
+#include <QDialog>
 #include "StateSpec.h"
-#include <q3ptrvector.h>
+
 
 class ComboStates;
 class ComboColor;
@@ -75,15 +73,15 @@ class ColorSpecVector
     ColorSpec * _v;
 };
 
-class SettingsDialog : public Q3TabDialog
+class SettingsDialog : public TabDialog
 {
     Q_OBJECT
 
 protected:
     StateSpecVector * states;
     ColorSpecVector * colors;
-    Q3PtrVector<ComboStates> * cbstates;
-    Q3PtrVector<ComboColor> * cbcolors;
+    QHash<int, ComboStates*> * cbstates;
+    QHash<int, ComboColor*> * cbcolors;
     QWidget * first_visible_page;
     bool several;
     bool did_apply;
@@ -103,7 +101,7 @@ class SettingsDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void apply();
 };
 
diff --git a/src/dialog/ShortcutDialog.cpp b/src/dialog/ShortcutDialog.cpp
index 03f7a1efb..ac0106337 100644
--- a/src/dialog/ShortcutDialog.cpp
+++ b/src/dialog/ShortcutDialog.cpp
@@ -32,12 +32,12 @@
 #include <stdio.h>
 
 #include <qcursor.h>
-#include <q3vbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QPixmap>
 
@@ -48,14 +48,17 @@
 #include "UmlDesktop.h"
 #include "ComboItem.h"
 #include "translate.h"
+#include "widgetwithlayout.h"
+#include "menufactory.h"
+#include <QHeaderView>
 
 QSize ShortcutDialog::previous_size;
 
-ShortcutDialog::ShortcutDialog() : Q3TabDialog(0, 0, TRUE)
+ShortcutDialog::ShortcutDialog() : TabDialog(0, 0, TRUE)
 {
-    setOkButton(TR("OK"));
-    setCancelButton(TR("Cancel"));
-    setCaption(TR("Shortcut dialog"));
+    setOkButton(tr("OK"));
+    setCancelButton(tr("Cancel"));
+    setWindowTitle(tr("Shortcut dialog"));
 
     // count number of entries
 
@@ -66,7 +69,7 @@ ShortcutDialog::ShortcutDialog() : Q3TabDialog(0, 0, TRUE)
     int ncmds = 0;
 
     for (iter = shortcuts.begin(); iter != shortcuts.end(); ++iter) {
-        if (tools.findIndex(iter.data()) != -1)
+        if (tools.indexOf(iter.value()) != -1)
             ntools += 1;
         else
             ncmds += 1;
@@ -74,41 +77,31 @@ ShortcutDialog::ShortcutDialog() : Q3TabDialog(0, 0, TRUE)
 
     // tab for command
 
-    Q3VBox * vtab;
+    VVBox * vtab;
 
-    vtab = new Q3VBox(this);
-    vtab->setSpacing(5);
+    vtab = new VVBox(this);
+    //vtab->setSpacing(5);
     vtab->setMargin(5);
 
-    (new QLabel(TR("Here are the shortcuts to do a command (menu entry)"), vtab))
-    ->setAlignment(::Qt::AlignHCenter);
+    vtab->addWidget((new QLabel(tr("Here are the shortcuts to do a command (menu entry)"), vtab)));
 
-#ifdef __APPLE__
-    (new QLabel(TR("Note : sometimes the key 'Alt' is named 'Option'"), vtab))
-    ->setAlignment(::Qt::AlignHCenter);
-#endif
-
-    cmd_table = new ShortcutTable(vtab, FALSE, ncmds);
+    vtab->addWidget(cmd_table = new ShortcutTable(vtab, FALSE, ncmds));
 
-    addTab(vtab, TR("Command"));
+    addTab(vtab, QObject::tr("Command"));
 
     // tab for tool
 
-    vtab = new Q3VBox(this);
-    vtab->setSpacing(5);
-    vtab->setMargin(5);
+    vtab = new VVBox(this);
+    //vtab->setSpacing(5);
+    //vtab->setMargin(5);
 
-    (new QLabel(TR("Here are the shortcuts to call a tool (plug-out)"), vtab))
-    ->setAlignment(::Qt::AlignHCenter);
+    QLabel *label;
+    vtab->addWidget((label = new QLabel(tr("Here are the shortcuts to call a tool (plug-out)"), vtab)));
+    label->setAlignment(::Qt::AlignHCenter);
 
-#ifdef __APPLE__
-    (new QLabel(TR("Note : sometimes the key 'Alt' is named 'Option'"), vtab))
-    ->setAlignment(::Qt::AlignHCenter);
+    vtab->addWidget(tool_table = new ShortcutTable(vtab, TRUE, ntools));
 
-#endif
-    tool_table = new ShortcutTable(vtab, TRUE, ntools);
-
-    addTab(vtab, TR("Tool"));
+    addTab(vtab, QObject::tr("Tool"));
 }
 
 ShortcutDialog::~ShortcutDialog()
@@ -118,7 +111,7 @@ ShortcutDialog::~ShortcutDialog()
 
 void ShortcutDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -131,7 +124,7 @@ void ShortcutDialog::accept()
         cmd_table->accept();
         tool_table->accept();
         Shortcut::save();
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
 
@@ -144,22 +137,28 @@ void ShortcutDialog::accept()
 ShortcutTable::ShortcutTable(QWidget * parent, bool tool, int n)
     : MyTable(n + 1, 6, parent), for_tool(tool)
 {
-    setSorting(true);
+    //setSortingEnabled(true);
+    m_delegate = new TableWidgetItemDelegate(this);
+    setItemDelegateForColumn(3,m_delegate);
+    setItemDelegateForColumn(4,m_delegate);
+    verticalHeader()->setSectionsMovable(true);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
-    horizontalHeader()->setLabel(0, TR("Shift"));
+    QStringList headerLabels;
+    headerLabels.append(tr("Shift"));
 #ifdef __APPLE__
-#include "../xpm/pomme_xpm.xpm"
-    QPixmap pomme_xpm((const char **) pomme);
-    QIcon ic(pomme_xpm);
-    horizontalHeader()->setLabel(1, ic, "");
+	//#include "../xpm/pomme_xpm.xpm"
+	//    QPixmap pomme_xpm((const char **) pomme);
+	//    QIcon ic(pomme_xpm);
+	//    headerLabels.append(ic, "");
+    headerLabels.append(tr("Cmd"));
 #else
-    horizontalHeader()->setLabel(1, TR("Ctrl"));
+    headerLabels.append(tr("Ctrl"));
 #endif
-    horizontalHeader()->setLabel(2, TR("Alt"));
-    horizontalHeader()->setLabel(3, TR("Key"));
-    horizontalHeader()->setLabel(4, (tool) ? TR("tool display") : TR("command"));
-    horizontalHeader()->setLabel(5, TR("do"));
+    headerLabels.append(tr("Alt"));
+    headerLabels.append( QObject::tr("Key"));
+    headerLabels.append((tool) ? QObject::tr("tool display") : QObject::tr("command"));
+    headerLabels.append(tr("do"));
+    setHorizontalHeaderLabels(headerLabels);
 
     QStringList tools = Tool::all_display();
 
@@ -172,7 +171,9 @@ ShortcutTable::ShortcutTable(QWidget * parent, bool tool, int n)
         const QStringList & cmds = Shortcut::cmds();
 
         for (QStringList::ConstIterator it = cmds.begin(); it != cmds.end(); ++it)
-            values.append(TR(*it));
+            values.append(
+                        *it
+                        );
     }
 
     keys += Shortcut::keys();
@@ -182,7 +183,7 @@ ShortcutTable::ShortcutTable(QWidget * parent, bool tool, int n)
     int row = 0;
 
     for (iter = shortcuts.begin(); iter != shortcuts.end(); ++iter) {
-        int tool_index = tools.findIndex(iter.data());
+        int tool_index = tools.indexOf(iter.value());
 
         if ((tool) ? (tool_index != -1) : (tool_index == -1)) {
             BooL shift;
@@ -190,48 +191,46 @@ ShortcutTable::ShortcutTable(QWidget * parent, bool tool, int n)
             BooL alt;
             QString key = Shortcut::extract(iter.key(), shift, ctrl, alt);
 
-            if (shift) setText(row, 0, TR("yes"));
+            if (shift) setText(row, 0, QObject::tr("yes"));
 
-            if (ctrl) setText(row, 1, TR("yes"));
+            if (ctrl) setText(row, 1, QObject::tr("yes"));
 
-            if (alt) setText(row, 2, TR("yes"));
+            if (alt) setText(row, 2, QObject::tr("yes"));
 
-            setItem(row, 3, new ComboItem(this, key, keys, FALSE));
-            setItem(row, 4, new ComboItem(this, (tool) ? iter.data() : TR(iter.data()), values, FALSE));
+            setItem(row, 3, new ComboItem(key, keys, FALSE));
+            setItem(row, 4, new ComboItem((tool) ? iter.value() : iter.value(), values, FALSE));
             row += 1;
         }
     }
-
-    sortColumn(3, TRUE, TRUE);
-
-    setItem(row, 3, new ComboItem(this, QString(), Shortcut::keys(), FALSE));
-    setItem(row, 4, new ComboItem(this, QString(), values, FALSE));
-
+    sortByColumn(3);
+    setItem(row, 3, new ComboItem(QString(), Shortcut::keys(), FALSE));
+    setItem(row, 4, new ComboItem(QString(), values, FALSE));
     adjustColumn(0);
     adjustColumn(1);
     adjustColumn(2);
-
-    setColumnStretchable(4, TRUE);
-
     adjustColumn(5);
+    setColumnStretchable(4, TRUE);
     setColumnStretchable(5, FALSE);
 
-    connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-            this, SLOT(button_pressed(int, int, int, const QPoint &)));
-    connect(this, SIGNAL(valueChanged(int, int)),
+    connect(this, SIGNAL(pressed(QModelIndex)),
+            this, SLOT(button_pressed(QModelIndex)));
+    connect(this, SIGNAL(cellChanged(int, int)),
             this, SLOT(value_changed(int, int)));
 }
 
 void ShortcutTable::value_changed(int row, int col)
 {
-    if ((row == (numRows() - 1)) && (col == 3) && !text(row, 3).isEmpty())
+    if ((row == (rowCount() - 1)) && (col == 3) && !text(row, 3).isEmpty())
         insert_row_after(row);
 }
 
-void ShortcutTable::button_pressed(int row, int col, int, const QPoint &)
+void ShortcutTable::button_pressed(const QModelIndex &index)
 {
+    int row = index.row();
+    int col = index.column();
     if (col < 3) {
-        setText(row, col, (text(row, col).isEmpty()) ? TR("yes") : QString());
+        setText(row, col, text(row, col).isEmpty() ? QObject::tr("yes") : QString());
+        //item(row, col)->setText(text(row, col).isEmpty() ? QObject::tr("yes") : QString());
     }
 
     if (col == 5) {
@@ -239,138 +238,128 @@ void ShortcutTable::button_pressed(int row, int col, int, const QPoint &)
 
         sprintf(s, "%d", row + 1);
 
-        Q3PopupMenu m;
-        m.insertItem(TR("shortcut ") + QString(s), -1);
-        m.insertSeparator();
-        m.insertItem(TR("Insert shortcut before"), 0);
-        m.insertItem(TR("Insert shortcut after"), 1);
-        m.insertSeparator();
-        m.insertItem(TR("Delete shortcut"), 2);
-        m.insertSeparator();
-        m.insertItem(TR("Copy shortcut"), 3);
-        m.insertItem(TR("Cut shortcut"), 4);
-        m.insertItem(TR("Paste shortcut"), 5);
-        m.insertSeparator();
-
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            insert_row_before(row);
-            break;
-
-        case 1:
-            insert_row_after(row);
-            break;
-
-        case 2:
-            delete_row(row);
-            break;
-
-        case 3:
-            copy_row(row);
-            break;
-
-        case 4:
-            cut_row(row);
-            break;
-
-        case 5:
-            paste_row(row);
-            break;
-
-        default:
-            break;
-        }
+        QMenu m;
+        MenuFactory::addItem(m, QObject::tr("shortcut ") + QString(s), -1);
+        m.addSeparator();
+        MenuFactory::addItem(m,tr("Insert shortcut before"), 0);
+        MenuFactory::addItem(m,tr("Insert shortcut after"), 1);
+        m.addSeparator();
+        MenuFactory::addItem(m,tr("Delete shortcut"), 2);
+        m.addSeparator();
+        MenuFactory::addItem(m,tr("Copy shortcut"), 3);
+        MenuFactory::addItem(m,tr("Cut shortcut"), 4);
+        MenuFactory::addItem(m,tr("Paste shortcut"), 5);
+        m.addSeparator();
+        QAction *retAction = m.exec(QCursor::pos());
+        if(retAction)
+            switch (retAction->data().toInt()) {
+            case 0:
+                insert_row_before(row);
+                break;
+
+            case 1:
+                insert_row_after(row);
+                break;
+
+            case 2:
+                delete_row(row);
+                break;
+
+            case 3:
+                copy_row(row);
+                break;
+
+            case 4:
+                cut_row(row);
+                break;
+
+            case 5:
+                paste_row(row);
+                break;
+
+            default:
+                break;
+            }
     }
 }
 
 void ShortcutTable::insert_row_before(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index != row; index -= 1) {
-        Q3TableItem * it;
+        QTableWidgetItem * it;
 
-        setText(index, 0, text(index - 1, 0));
-        setText(index, 1, text(index - 1, 1));
-        setText(index, 2, text(index - 1, 2));
+        item(index, 0)->setText( item(index - 1, 0)->text());
+        item(index, 1)->setText( item(index - 1, 1)->text());
+        item(index, 2)->setText(item(index - 1, 2)->text());
         it = item(index - 1, 3);
-        takeItem(it);
-        setItem(index, 3, it);
+
+        if(it)
+        {
+            takeItem(it->row(), it->column());
+            setItem(index, 3, it);
+        }
         it = item(index - 1, 4);
-        takeItem(it);
-        setItem(index, 4, it);
+        if(it)
+        {
+            takeItem(it->row(), it->column());
+            setItem(index, 4, it);
+        }
     }
-
+    */
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row);
     setText(row, 0, QString());
     setText(row, 1, QString());
     setText(row, 2, QString());
-    setItem(row, 3, new ComboItem(this, QString(), Shortcut::keys(), FALSE));
-    setItem(row, 4, new ComboItem(this, QString(), values, FALSE));
+    setItem(row, 3, new ComboItem(QString(), Shortcut::keys(), FALSE));
+    setItem(row, 4, new ComboItem(QString(), values, FALSE));
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void ShortcutTable::insert_row_after(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index > row + 1; index -= 1) {
-        Q3TableItem * it;
+        QTableWidgetItem * it;
 
-        setText(index, 0, text(index - 1, 0));
-        setText(index, 1, text(index - 1, 1));
-        setText(index, 2, text(index - 1, 2));
+        item(index, 0)->setText( item(index - 1, 0)->text());;
+        item(index, 1)->setText( item(index - 1, 1)->text());;
+        item(index, 2)->setText( item(index - 1, 2)->text());;
         it = item(index - 1, 3);
-        takeItem(it);
+        takeItem(it->row(), it->column());
         setItem(index, 3, it);
         it = item(index - 1, 4);
-        takeItem(it);
+        takeItem(it->row(), it->column());
         setItem(index, 4, it);
     }
-
+    */
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row+1);
     setText(row + 1, 0, QString());
     setText(row + 1, 1, QString());
     setText(row + 1, 2, QString());
-    setItem(row + 1, 3, new ComboItem(this, QString(), Shortcut::keys(), FALSE));
-    setItem(row + 1, 4, new ComboItem(this, QString(), values, FALSE));
+    setItem(row + 1, 3, new ComboItem(QString(), Shortcut::keys(), FALSE));
+    setItem(row + 1, 4, new ComboItem(QString(), values, FALSE));
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void ShortcutTable::delete_row(int row)
 {
-    int n = numRows();
-    int index;
-
-    clearCellWidget(row, 1);
-
-    if (row == (n - 1)) {
-        // the last line : empty it
-        setText(row, 0, QString());
-        setText(row, 1, QString());
-        setText(row, 2, QString());
-        setItem(row, 3, new ComboItem(this, QString(), Shortcut::keys(), FALSE));
-        setItem(row, 4, new ComboItem(this, QString(), values, FALSE));
-    }
-    else {
-        for (index = row; index != n - 1; index += 1) {
-            Q3TableItem * it;
-
-            setText(index, 0, text(index + 1, 0));
-            setText(index, 1, text(index + 1, 1));
-            setText(index, 2, text(index + 1, 2));
-            it = item(index + 1, 3);
-            takeItem(it);
-            setItem(index, 3, it);
-            it = item(index + 1, 4);
-            takeItem(it);
-            setItem(index, 4, it);
-        }
-
-        setNumRows(n - 1);
-    }
+    removeCellWidget(row, 1);
+    removeRow(row);
 }
 
 void ShortcutTable::copy_row(int row)
@@ -396,9 +385,9 @@ void ShortcutTable::paste_row(int row)
     setText(row, 3, key_copy);
     setText(row, 4, val_copy);
 
-    if ((row == (numRows() - 1)) &&
-        (!key_copy.isEmpty() ||
-         !val_copy.isEmpty()))
+    if ((row == (rowCount() - 1)) &&
+            (!key_copy.isEmpty() ||
+             !val_copy.isEmpty()))
         insert_row_after(row);
 }
 
@@ -406,7 +395,7 @@ bool ShortcutTable::check(QStringList & bindings)
 {
     forceUpdateCells();
 
-    int n = numRows();
+    int n = rowCount();
     int row;
 
     for (row = 0; row != n; row += 1) {
@@ -414,25 +403,25 @@ bool ShortcutTable::check(QStringList & bindings)
             QString s;
 
             if (!text(row, 0).isEmpty())
-                s = TR("Shift ");
+                s = QObject::tr("Shift ");
 
             if (!text(row, 1).isEmpty())
 #ifdef __APPLE__
                 s += "Apple ";
 
 #else
-                s += TR("Ctrl ");
+                s += QObject::tr("Ctrl ");
 #endif
 
             if (!text(row, 2).isEmpty())
-                s += TR("Alt ");
+                s += QObject::tr("Alt ");
 
             s += text(row, 3);
 
-            if (bindings.findIndex(s) == -1)
+            if (bindings.indexOf(s) == -1)
                 bindings.append(s);
             else {
-                msg_warning(TR("Shortcut"), TR("Several use of the shortcut '%1'", s));
+                msg_warning(tr("Shortcut"), tr("Several use of the shortcut '%1'").arg(s));
                 return FALSE;
             }
         }
@@ -444,12 +433,12 @@ bool ShortcutTable::check(QStringList & bindings)
 void ShortcutTable::accept()
 {
     const QStringList & cmds = Shortcut::cmds();
-    int n = numRows();
+    int n = rowCount();
     int row;
 
     for (row = 0; row != n; row += 1)
         if (!text(row, 3).isEmpty() && !text(row, 4).isEmpty())
             Shortcut::add(text(row, 3), !text(row, 0).isEmpty(),
                           !text(row, 1).isEmpty(), !text(row, 2).isEmpty(),
-                          (for_tool) ? text(row, 4) : cmds[values.findIndex(text(row, 4)) - 1]);
+                          (for_tool) ? text(row, 4) : cmds[values.indexOf(text(row, 4)) - 1]);
 }
diff --git a/src/dialog/ShortcutDialog.h b/src/dialog/ShortcutDialog.h
index b0655bfb5..1a4d64d79 100644
--- a/src/dialog/ShortcutDialog.h
+++ b/src/dialog/ShortcutDialog.h
@@ -28,16 +28,16 @@
 #ifndef SHORTCUTDIALOG_H
 #define SHORTCUTDIALOG_H
 
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 
 #include "MyTable.h"
 
-class Q3ComboBox;
+class QComboBox;
 class QPushButton;
 
 class ShortcutTable;
 
-class ShortcutDialog : public Q3TabDialog
+class ShortcutDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -55,7 +55,7 @@ class ShortcutDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 };
 
 class ShortcutTable : public MyTable
@@ -89,8 +89,10 @@ class ShortcutTable : public MyTable
     void accept();
 
 protected slots:
-    void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    void button_pressed(const QModelIndex &index);
     void value_changed(int row, int col);
+private:
+    TableWidgetItemDelegate* m_delegate;
 };
 
 #endif
diff --git a/src/dialog/SimpleRelationDialog.cpp b/src/dialog/SimpleRelationDialog.cpp
index c7b02b3b8..8f9470388 100644
--- a/src/dialog/SimpleRelationDialog.cpp
+++ b/src/dialog/SimpleRelationDialog.cpp
@@ -29,11 +29,11 @@
 
 
 
-#include <q3grid.h>
+#include <gridbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
-#include <q3vbox.h>
+#include <qcombobox.h>
+#include <vvbox.h>
 
 #include "SimpleRelationDialog.h"
 #include "SimpleRelationData.h"
@@ -51,17 +51,17 @@
 QSize SimpleRelationDialog::previous_size;
 
 SimpleRelationDialog::SimpleRelationDialog(SimpleRelationData * r)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), rel(r)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), rel(r)
 {
     r->browser_node->edit_start();
 
     if (r->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
     bool visit = !hasOkButton();
@@ -69,54 +69,59 @@ SimpleRelationDialog::SimpleRelationDialog(SimpleRelationData * r)
     // general tab
 
     BrowserNode * bn = rel->get_browser_node();
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
     switch (rel->get_type()) {
     case UmlInherit:
-        setCaption(TR("Generalisation dialog"));
+        setWindowTitle(tr("Generalisation dialog"));
         break;
 
     case UmlDependOn:
-        setCaption(TR("Dependency dialog"));
+        setWindowTitle(tr("Dependency dialog"));
         break;
 
     default:
-        setCaption(TR("unknown relation dialog"));
+        setWindowTitle(tr("unknown relation dialog"));
         break;
     }
 
-    new QLabel(TR("from : "), grid);
-    new QLabel(rel->get_start_node()->full_name(TRUE), grid);
-    new QLabel(TR("to : "), grid);
-    new QLabel(rel->get_end_node()->full_name(TRUE), grid);
+    grid->addWidget(new QLabel(tr("from : "), grid));
+    grid->addWidget(new QLabel(rel->get_start_node()->full_name(TRUE), grid));
+    grid->addWidget(new QLabel(tr("to : "), grid));
+    grid->addWidget(new QLabel(rel->get_end_node()->full_name(TRUE), grid));
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(rel->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(rel->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(rel->get_start_node()
+        edstereotype->addItems(rel->get_start_node()
                                        ->default_stereotypes(rel->get_type(),
                                                rel->get_end_node()));
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlRelations));
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlRelations));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
-
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
+            SmallPushButton* sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     QFont font = comment->font();
@@ -131,19 +136,19 @@ SimpleRelationDialog::SimpleRelationDialog(SimpleRelationData * r)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     open_dialog(this);
 }
 
 void SimpleRelationDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -152,8 +157,9 @@ SimpleRelationDialog::~SimpleRelationDialog()
     rel->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -175,7 +181,7 @@ void SimpleRelationDialog::accept()
         return;
 
     BrowserNode * bn = rel->get_browser_node();
-    bool newst = rel->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool newst = rel->set_stereotype(fromUnicode(edstereotype->currentText().trimmed().toLatin1().constData()));
 
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
@@ -187,5 +193,5 @@ void SimpleRelationDialog::accept()
     bn->package_modified();
     rel->modified();
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/SimpleRelationDialog.h b/src/dialog/SimpleRelationDialog.h
index a55ff4883..9a8f02a88 100644
--- a/src/dialog/SimpleRelationDialog.h
+++ b/src/dialog/SimpleRelationDialog.h
@@ -27,29 +27,26 @@
 
 #ifndef SIMPLERELATIONDIALOG_H
 #define SIMPLERELATIONDIALOG_H
-
-#include <q3ptrlist.h>
-#include <q3tabdialog.h>
-#include <q3ptrlist.h>
-
+#include "tabdialog.h"
+#include <QDialog>
 #include "UmlEnum.h"
 
-class Q3ComboBox;
+class QComboBox;
 class MultiLineEdit;
 class SimpleRelationData;
 class KeyValuesTable;
 class BodyDialog;
 
-class SimpleRelationDialog : public Q3TabDialog
+class SimpleRelationDialog : public TabDialog
 {
     Q_OBJECT
 
 protected:
     SimpleRelationData * rel;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
     KeyValuesTable * kvtable;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     static QSize previous_size;
 
@@ -61,7 +58,7 @@ class SimpleRelationDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
 };
 
diff --git a/src/dialog/SourceDialog.cpp b/src/dialog/SourceDialog.cpp
index b8b435039..732bcc0cd 100644
--- a/src/dialog/SourceDialog.cpp
+++ b/src/dialog/SourceDialog.cpp
@@ -38,8 +38,8 @@
 #include <qlabel.h>
 //Added by qt3to4:
 #include <QEvent>
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "SourceDialog.h"
 #include "UmlDesktop.h"
@@ -54,8 +54,8 @@ bool NumberedMultiLineEdit::event(QEvent * e)
     bool r = MultiLineEdit::event(e);
     int l;
     int c;
-
-    getCursorPosition(&l, &c);
+    l = textCursor().blockNumber();
+    c = textCursor().columnNumber();
 
     if ((c != old_c) || (l != old_l)) {
         old_c = c;
@@ -69,14 +69,15 @@ bool NumberedMultiLineEdit::event(QEvent * e)
 QSize SourceDialog::previous_size;
 
 SourceDialog::SourceDialog(QString p, BooL & flg, unsigned & edn)
-    : QDialog(0, 0, FALSE, Qt::WDestructiveClose),
+    : QDialog(0),
       path(p), edited(flg), edition_number(edn)
 {
+    setAttribute(Qt::WA_DeleteOnClose);
     QFileInfo fi(p);
 
-    setCaption(fi.fileName());
+    setWindowTitle(fi.fileName());
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
     e = new NumberedMultiLineEdit(this);
     QFont font = e->font();
@@ -88,7 +89,8 @@ SourceDialog::SourceDialog(QString p, BooL & flg, unsigned & edn)
     e->setFont(font);
     vbox->addWidget(e);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
 
     lineColumn = new QLabel(this);
@@ -99,12 +101,12 @@ SourceDialog::SourceDialog(QString p, BooL & flg, unsigned & edn)
     updateCursorPos(0, 0);
 
     QFile f(p);
-    unsigned size = fi.size();
+    qint64 size = fi.size();
 
     if (f.open(QIODevice::ReadOnly)) {
         char * s = new char[size + 1];
 
-        if (f.readBlock(s, size) != -1) {
+        if (f.read(s, size) != -1) {
             edited = TRUE;
             edition_number += 1;
 
@@ -129,13 +131,13 @@ SourceDialog::SourceDialog(QString p, BooL & flg, unsigned & edn)
 #endif
         }
         else
-            e->setText(TR("cannot read %1", p));
+            e->setText(tr("cannot read %1"/*, p*/));
 
         delete [] s;
         f.close();
     }
     else
-        e->setText(TR("cannot read %1", p));
+        e->setText(tr("cannot read %1"/*, p*/));
 
 #if 0
     QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
diff --git a/src/dialog/SourceDialog.h b/src/dialog/SourceDialog.h
index bdf220a7d..10e00411a 100644
--- a/src/dialog/SourceDialog.h
+++ b/src/dialog/SourceDialog.h
@@ -45,7 +45,7 @@ class NumberedMultiLineEdit : public MultiLineEdit
     NumberedMultiLineEdit(QWidget * w) : MultiLineEdit(w) { };
 
 protected:
-    virtual bool event(QEvent * e);
+    virtual bool event(QEvent * e) override;
 
 signals:
     void cursorMoved(int l, int c);
diff --git a/src/dialog/StateActionDialog.cpp b/src/dialog/StateActionDialog.cpp
index caccdb117..b1c9f3703 100644
--- a/src/dialog/StateActionDialog.cpp
+++ b/src/dialog/StateActionDialog.cpp
@@ -29,10 +29,10 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 
 #include "StateActionDialog.h"
@@ -51,56 +51,61 @@
 QSize StateActionDialog::previous_size;
 
 StateActionDialog::StateActionDialog(StateActionData * d)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), action(d)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), action(d)
 {
     d->browser_node->edit_start();
 
     if (d->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("State Action dialog"));
+    setWindowTitle(tr("State Action dialog"));
     visit = !hasOkButton();
 
     BrowserNode * bn = action->browser_node;
-    Q3Grid * grid;
+    GridBox * grid;
 
     //
     // general tab
     //
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(action->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(true);
+    edstereotype->addItem(toUnicode(action->get_stereotype()));
 
     if (!visit) {
-        edstereotype->insertStringList(BrowserStateAction::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlStateAction));
+        edstereotype->addItems(BrowserStateAction::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlStateAction));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
-
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        SmallPushButton* sButton;
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     //comment->setFont(font);
@@ -108,13 +113,13 @@ StateActionDialog::StateActionDialog(StateActionData * d)
     addTab(grid, "Uml");
 
     // OCL
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("behavior"), grid);
-    uml = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("behavior"), grid));
+    grid->addWidget(uml = new MultiLineEdit(grid));
     uml->setText(action->uml);
 
     if (visit)
@@ -123,13 +128,13 @@ StateActionDialog::StateActionDialog(StateActionData * d)
     addTab(grid, "Ocl");
 
     // CPP
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     cppTab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("behavior"), grid);
-    cpp = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("behavior"), grid));
+    grid->addWidget(cpp = new MultiLineEdit(grid));
     cpp->setText(action->cpp);
 
     if (visit)
@@ -141,13 +146,13 @@ StateActionDialog::StateActionDialog(StateActionData * d)
         removePage(grid);
 
     // Java
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     javatab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("behavior"), grid);
-    java = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("behavior"), grid));
+    grid->addWidget(java = new MultiLineEdit(grid));
     java->setText(action->java);
 
     if (visit)
@@ -160,12 +165,12 @@ StateActionDialog::StateActionDialog(StateActionData * d)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -180,8 +185,9 @@ StateActionDialog::~StateActionDialog()
     action->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -200,7 +206,7 @@ void StateActionDialog::change_tabs(QWidget * w)
 
 void StateActionDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -221,7 +227,7 @@ void StateActionDialog::accept()
         return;
 
     BrowserNode * bn = action->browser_node;
-    bool newst = action->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool newst = action->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
     action->uml = uml->text();
     action->cpp = cpp->text();
@@ -238,5 +244,5 @@ void StateActionDialog::accept()
     bn->package_modified();
     action->modified();
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/StateActionDialog.h b/src/dialog/StateActionDialog.h
index 6041711c9..acd21140a 100644
--- a/src/dialog/StateActionDialog.h
+++ b/src/dialog/StateActionDialog.h
@@ -30,14 +30,11 @@
 
 #include <qwidget.h>
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 
 class QPushButton;
-class Q3ComboBox;
+class QComboBox;
 
 class LineEdit;
 class MultiLineEdit;
@@ -46,16 +43,16 @@ class BrowserNode;
 class KeyValuesTable;
 class BodyDialog;
 
-class StateActionDialog : public Q3TabDialog
+class StateActionDialog : public TabDialog
 {
     Q_OBJECT
 
 protected:
     bool visit;
     StateActionData * action;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     QWidget * umltab;
     QWidget * cppTab;
@@ -77,7 +74,7 @@ class StateActionDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edit_description();
 
diff --git a/src/dialog/StateDialog.cpp b/src/dialog/StateDialog.cpp
index b4c23c0c3..ba63a3e66 100644
--- a/src/dialog/StateDialog.cpp
+++ b/src/dialog/StateDialog.cpp
@@ -29,16 +29,14 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <q3buttongroup.h>
-#include <q3popupmenu.h>
+#include <bbuttongroup.h>
 #include <qcursor.h>
-
 #include "StateDialog.h"
 #include "StateData.h"
 #include "BrowserState.h"
@@ -53,121 +51,122 @@
 #include "GenerationSettings.h"
 #include "ProfiledStereotypes.h"
 #include "translate.h"
-
+#include "menufactory.h"
 QSize StateDialog::previous_size;
 
 StateDialog::StateDialog(StateData * d)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), state(d)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), state(d)
 {
     d->browser_node->edit_start();
 
     if (d->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("State dialog"));
+    setWindowTitle(tr("State dialog"));
     visit = !hasOkButton();
 
     BrowserNode * bn = state->browser_node;
-    Q3Grid * grid;
+    GridBox * grid;
 
     //
     // general tab
     //
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(state->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox( grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(state->get_stereotype()));
 
     if (!visit) {
-        edstereotype->insertStringList(BrowserState::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlState));
+        edstereotype->addItems(BrowserState::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlState));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
-
-    connect(new SmallPushButton(TR("specification :"), grid), SIGNAL(clicked()),
+    SmallPushButton* sButton;
+    connect(sButton = new SmallPushButton(tr("specification :"), grid), SIGNAL(clicked()),
             this, SLOT(menu_specification()));
-    edspecification = new Q3ComboBox(FALSE, grid);
+    grid->addWidget(sButton);
+    grid->addWidget(edspecification = new QComboBox(grid));
     edspecification->setSizePolicy(sp);
 
     if (visit) {
         if (state->get_specification() == 0)
-            edspecification->insertItem("");
+            edspecification->addItem("");
         else
-            edspecification->insertItem(state->get_specification()->full_name(TRUE));
+            edspecification->addItem(state->get_specification()->full_name(TRUE));
     }
     else {
-        edspecification->insertItem("");
+        edspecification->addItem("");
         edspecification->setAutoCompletion(completion());
         BrowserOperation::instances(opers);
         opers.full_names(speclist);
-        edspecification->insertStringList(speclist);
-        edspecification->setCurrentItem((state->get_specification() == 0)
-                                        ? 0
-                                        : opers.findRef(state->get_specification()) + 1);
+        edspecification->addItems(speclist);
+        edspecification->setCurrentIndex((state->get_specification() == 0)
+                                         ? 0
+                                         : opers.indexOf(state->get_specification()) + 1);
     }
 
     switch (((BrowserNode *) bn->parent())->get_type()) {
     case UmlState:
     case UmlRegion:
         if ((state->get_reference() != 0) || (bn->firstChild() == 0)) {
-            connect(new SmallPushButton(TR("reference :"), grid), SIGNAL(clicked()),
+            connect(sButton = new SmallPushButton(tr("reference :"), grid), SIGNAL(clicked()),
                     this, SLOT(menu_reference()));
-            edreference = new Q3ComboBox(FALSE, grid);
+            grid->addWidget(sButton);
+            grid->addWidget(edreference = new QComboBox(grid));
             edreference->setSizePolicy(sp);
 
             if (visit) {
                 if (state->get_reference() == 0)
-                    edreference->insertItem("");
+                    edreference->addItem("");
                 else
-                    edreference->insertItem(state->get_reference()->full_name(TRUE));
+                    edreference->addItem(state->get_reference()->full_name(TRUE));
             }
             else {
-                edreference->insertItem("");
+                edreference->addItem("");
                 edreference->setAutoCompletion(completion());
 
                 if (((BrowserState *) bn)->can_reference()) {
                     BrowserState::instances(states, TRUE);
 
-                    BrowserNode * st = states.first();
+                    QMutableListIterator<BrowserNode *> it(states);
 
-                    while (st != 0) {
-                        if (!((BrowserState *) bn)->can_reference((BrowserState *) st) ||
-                            ((BrowserState *) st)->is_ref()) {
-                            states.remove();
-                            st = states.current();
+                    while (it.hasNext()) {
+                        BrowserState *state = (BrowserState *)it.next();
+                        if (!((BrowserState *) bn)->can_reference(state) ||
+                                state->is_ref()) {
+                            it.remove();
                         }
-                        else
-                            st = states.next();
                     }
                 }
                 else
                     states.append(state->get_reference());
 
                 states.full_names(reflist);
-                edreference->insertStringList(reflist);
-                edreference->setCurrentItem((state->get_reference() == 0)
-                                            ? 0
-                                            : states.findRef(state->get_reference()) + 1);
+                edreference->addItems(reflist);
+                edreference->setCurrentIndex((state->get_reference() == 0)
+                                             ? 0
+                                             : states.indexOf(state->get_reference()) + 1);
 
                 connect(edreference, SIGNAL(activated(int)), this, SLOT(ed_ref_activated(int)));
             }
@@ -180,25 +179,29 @@ StateDialog::StateDialog(StateData * d)
         edreference = 0;
     }
 
-    new QLabel(grid);
-    Q3ButtonGroup * bg =
-        new Q3ButtonGroup(1, Qt::Horizontal, QString(), grid);
+    grid->addWidget(new QLabel(grid));
+    BButtonGroup * bg;
+
+    grid->addWidget(bg = new BButtonGroup(1, Qt::Horizontal, QString(), grid));
 
-    active_cb = new QCheckBox(TR("active"), bg);
+    bg->addWidget( active_cb = new QCheckBox(tr("active"), bg));
 
     if (state->is_active)
         active_cb->setChecked(TRUE);
 
     active_cb->setDisabled(visit);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
-
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
 
@@ -220,17 +223,17 @@ StateDialog::StateDialog(StateData * d)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
     if (edreference != 0)
-        ed_ref_activated(edreference->currentItem());
+        ed_ref_activated(edreference->currentIndex());
 
     connect(this, SIGNAL(currentChanged(QWidget *)),
             this, SLOT(change_tabs(QWidget *)));
@@ -243,8 +246,9 @@ StateDialog::~StateDialog()
     state->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -265,13 +269,13 @@ void StateDialog::change_tabs(QWidget * w)
 
 void StateDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
 void StateDialog::ed_ref_activated(int r)
 {
-    bool enabled = edreference->text(r).isEmpty();
+    bool enabled = edreference->itemText(r).isEmpty();
 
     edspecification->setEnabled(enabled);
     active_cb->setEnabled(enabled);
@@ -288,15 +292,15 @@ void StateDialog::ed_ref_activated(int r)
 
 void StateDialog::menu_specification()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = speclist.findIndex(edspecification->currentText());
+    int index = speclist.indexOf(edspecification->currentText());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -304,57 +308,61 @@ void StateDialog::menu_specification()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) && (bn->get_type() == UmlOperation) && !bn->deletedp())
-            m.insertItem(TR("Choose operation selected in browser"), 1);
+            MenuFactory::addItem(m, tr("Choose operation selected in browser"), 1);
         else
             bn = 0;
     }
 
     if ((index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            opers.at(index)->select_in_browser();
-            break;
-
-        case 1: {
-            QString s = bn->full_name(TRUE);
-
-            if ((index = speclist.findIndex(s)) == -1) {
-                // new operation, may be created through an other dialog
-                index = 0;
-                QStringList::Iterator iter = speclist.begin();
-                QStringList::Iterator iter_end = speclist.end();
+        QAction *retActon = m.exec(QCursor::pos());
+        if(retActon)
+        {
+            switch (retActon->data().toInt()) {
+            case 0:
+                opers.at(index)->select_in_browser();
+                break;
+
+            case 1: {
+                QString s = bn->full_name(TRUE);
+
+                if ((index = speclist.indexOf(s)) == -1) {
+                    // new operation, may be created through an other dialog
+                    index = 0;
+                    QStringList::Iterator iter = speclist.begin();
+                    QStringList::Iterator iter_end = speclist.end();
+
+                    while ((iter != iter_end) && (*iter < s)) {
+                        ++iter;
+                        index += 1;
+                    }
 
-                while ((iter != iter_end) && (*iter < s)) {
-                    ++iter;
-                    index += 1;
+                    opers.insert((unsigned) index, bn);
+                    speclist.insert(iter, s);
+                    edspecification->insertItem(index + 1, s);
                 }
-
-                opers.insert((unsigned) index, bn);
-                speclist.insert(iter, s);
-                edspecification->insertItem(s, index + 1);
             }
-        }
 
-        edspecification->setCurrentItem(index + 1);
-        break;
+                edspecification->setCurrentIndex(index + 1);
+                break;
 
-        default:
-            break;
+            default:
+                break;
+            }
         }
     }
 }
 
 void StateDialog::menu_reference()
 {
-    Q3PopupMenu m(0);
+    QMenu m(0);
 
-    m.insertItem(TR("Choose"), -1);
-    m.insertSeparator();
+    MenuFactory::addItem(m, tr("Choose"), -1);
+    m.addSeparator();
 
-    int index = reflist.findIndex(edreference->currentText());
+    int index = reflist.indexOf(edreference->currentText());
 
     if (index != -1)
-        m.insertItem(TR("Select in browser"), 0);
+        MenuFactory::addItem(m, tr("Select in browser"), 0);
 
     BrowserNode * bn = 0;
 
@@ -362,45 +370,49 @@ void StateDialog::menu_reference()
         bn = BrowserView::selected_item();
 
         if ((bn != 0) &&
-            (bn->get_type() == UmlState) &&
-            !bn->deletedp() &&
-            ((BrowserState *)state->browser_node)->can_reference((BrowserState *) bn))
-            m.insertItem(TR("Choose state selected in browser"), 1);
+                (bn->get_type() == UmlState) &&
+                !bn->deletedp() &&
+                ((BrowserState *)state->browser_node)->can_reference((BrowserState *) bn))
+            MenuFactory::addItem(m, tr("Choose state selected in browser"), 1);
         else
             bn = 0;
     }
 
     if ((index != -1) || (bn != 0)) {
-        switch (m.exec(QCursor::pos())) {
-        case 0:
-            states.at(index)->select_in_browser();
-            break;
-
-        case 1: {
-            QString s = bn->full_name(TRUE);
-
-            if ((index = reflist.findIndex(s)) == -1) {
-                // new state, may be created through an other dialog
-                index = 0;
-                QStringList::Iterator iter = reflist.begin();
-                QStringList::Iterator iter_end = reflist.end();
+        QAction *retActon = m.exec(QCursor::pos());
+        if(retActon)
+        {
+            switch (retActon->data().toInt()) {
+            case 0:
+                states.at(index)->select_in_browser();
+                break;
+
+            case 1: {
+                QString s = bn->full_name(TRUE);
+
+                if ((index = reflist.indexOf(s)) == -1) {
+                    // new state, may be created through an other dialog
+                    index = 0;
+                    QStringList::Iterator iter = reflist.begin();
+                    QStringList::Iterator iter_end = reflist.end();
+
+                    while ((iter != iter_end) && (*iter < s)) {
+                        ++iter;
+                        index += 1;
+                    }
 
-                while ((iter != iter_end) && (*iter < s)) {
-                    ++iter;
-                    index += 1;
+                    states.insert((unsigned) index, bn);
+                    reflist.insert(iter, s);
+                    edreference->insertItem(index + 1, s);
                 }
-
-                states.insert((unsigned) index, bn);
-                reflist.insert(iter, s);
-                edreference->insertItem(s, index + 1);
             }
-        }
 
-        edreference->setCurrentItem(index + 1);
-        break;
+                edreference->setCurrentIndex(index + 1);
+                break;
 
-        default:
-            break;
+            default:
+                break;
+            }
         }
     }
 }
@@ -410,20 +422,23 @@ void StateDialog::init_tab(QWidget *& tab, StDialog & d, StateBehavior & st,
                            const char * sl_exbeh, const char * sl_beh,
                            bool enabled)
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3VBox * vtab;
+    GridBox * grid = new GridBox(2, this);
+    VVBox * vtab;
 
     tab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("Entry\nbehavior : "), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("Entry\nbehavior : "), vtab));
 
+    SmallPushButton* sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl_enbeh);
-
-    d.edentry = new MultiLineEdit(grid);
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl_enbeh);
+        vtab->addWidget(sButton);
+    }
+    grid->addWidget(d.edentry = new MultiLineEdit(grid));
 
     QFont font = d.edentry->font();
 
@@ -437,26 +452,30 @@ void StateDialog::init_tab(QWidget *& tab, StDialog & d, StateBehavior & st,
     if (visit)
         d.edentry->setReadOnly(TRUE);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("Exit\nbehavior : "), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("Exit\nbehavior : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl_exbeh);
-
-    d.edexit = new MultiLineEdit(grid);
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl_exbeh);
+        vtab->addWidget(sButton);
+    }
+    grid->addWidget(d.edexit = new MultiLineEdit(grid));
     d.edexit->setFont(font);
     d.edexit->setText(st.on_exit);
 
     if (visit)
         d.edexit->setReadOnly(TRUE);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("Do\nbehavior : "), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("Do\nbehavior : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()), this, sl_beh);
-
-    d.edactivity = new MultiLineEdit(grid);
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()), this, sl_beh);
+        vtab->addWidget(sButton);
+    }
+    grid->addWidget(d.edactivity = new MultiLineEdit(grid));
     d.edactivity->setFont(font);
     d.edactivity->setText(st.do_activity);
 
@@ -483,15 +502,15 @@ void StateDialog::post_edit_description(StateDialog * d, QString s)
 }
 
 #define DEF_EDIT(attr, lang, Lang) \
-void StateDialog::edit_##lang##_##attr() {	\
-  edit(lang.ed##attr->text(), "state_"#lang"_"#attr, state, Lang,  \
-       this, (post_edit) post_edit_##lang##_##attr, edits);	\
-} \
-  \
-void StateDialog::post_edit_##lang##_##attr(StateDialog * d, QString s) \
+    void StateDialog::edit_##lang##_##attr() {	\
+    edit(lang.ed##attr->text(), "state_"#lang"_"#attr, state, Lang,  \
+    this, (post_edit) post_edit_##lang##_##attr, edits);	\
+    } \
+    \
+    void StateDialog::post_edit_##lang##_##attr(StateDialog * d, QString s) \
 { \
-  d->lang.ed##attr->setText(s); \
-}
+    d->lang.ed##attr->setText(s); \
+    }
 
 DEF_EDIT(entry, uml, TxtEdit)
 DEF_EDIT(entry, cpp, CppEdit)
@@ -513,26 +532,26 @@ void StateDialog::accept()
     BrowserNode * bn = state->browser_node;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if ((s != bn->get_name()) &&
-        ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlState,
-                bn->allow_spaces(),
-                bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+            ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlState,
+                                                             bn->allow_spaces(),
+                                                             bn->allow_empty()))
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else {
         bn->set_name(s);
 
-        bool newst = state->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+        bool newst = state->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
         int index;
 
-        index = speclist.findIndex(edspecification->currentText());
+        index = speclist.indexOf(edspecification->currentText());
         state->set_specification((index != -1)
                                  ? (BrowserOperation *) opers.at(index)
                                  : 0);
 
         if (edreference != 0) {
-            index = reflist.findIndex(edreference->currentText());
+            index = reflist.indexOf(edreference->currentText());
             state->set_reference((index != -1)
                                  ? (BrowserState *) states.at(index)
                                  : 0);
@@ -555,7 +574,7 @@ void StateDialog::accept()
         bn->package_modified();
         state->modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
 
diff --git a/src/dialog/StateDialog.h b/src/dialog/StateDialog.h
index 83db93fd7..7f255afd1 100644
--- a/src/dialog/StateDialog.h
+++ b/src/dialog/StateDialog.h
@@ -30,14 +30,11 @@
 
 #include <qwidget.h>
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 
 class QPushButton;
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 
 class LineEdit;
@@ -56,7 +53,7 @@ struct StDialog {
     void accept(StateBehavior &);
 };
 
-class StateDialog : public Q3TabDialog
+class StateDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -69,12 +66,12 @@ class StateDialog : public Q3TabDialog
     QStringList reflist;
     BrowserNodeList states;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
-    Q3ComboBox * edspecification;
-    Q3ComboBox * edreference;
+    QComboBox * edstereotype;
+    QComboBox * edspecification;
+    QComboBox * edreference;
     QCheckBox * active_cb;
     MultiLineEdit * comment;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     QWidget * ocltab;
     QWidget * cppTab;
@@ -109,7 +106,7 @@ class StateDialog : public Q3TabDialog
                   bool enabled);
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void menu_specification();
     void menu_reference();
diff --git a/src/dialog/StereotypeDialog.cpp b/src/dialog/StereotypeDialog.cpp
index b2527902a..98b7566e2 100644
--- a/src/dialog/StereotypeDialog.cpp
+++ b/src/dialog/StereotypeDialog.cpp
@@ -31,11 +31,11 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qpushbutton.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "StereotypeDialog.h"
 #include "DialogUtil.h"
@@ -47,48 +47,49 @@ QSize StereotypeDialog::previous_size;
 StereotypeDialog::StereotypeDialog(const QStringList & defaults,
                                    QString & st, QString & la,
                                    QString cap, QString lbl)
-    : QDialog(0, cap, TRUE), ste(st), lab(la)
+    : QDialog(0/*, cap, TRUE*/), ste(st), lab(la)
 {
-    setCaption(cap);
+    setWindowTitle(cap);
 
     if (! ste.isEmpty())
         // removes << and >>
         ste = ste.mid(2, ste.length() - 4);
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
-    Q3HBoxLayout * hbox;
+    QVBoxLayout * vbox = new QVBoxLayout(this);
+    QHBoxLayout * hbox;
     QLabel * label1;
     QLabel * label2;
 
     vbox->setMargin(5);
 
-    hbox = new Q3HBoxLayout(vbox);
+    vbox->addLayout(hbox = new QHBoxLayout());
     hbox->setMargin(5);
     hbox->addWidget(label1 = new QLabel(lbl, this));
     ed = new LineEdit(la, this);
     hbox->addWidget(ed);
 
-    hbox = new Q3HBoxLayout(vbox);
+    vbox->addLayout(hbox = new QHBoxLayout());
     hbox->setMargin(5);
-    hbox->addWidget(label2 = new QLabel(TR("stereotype : "), this));
-    cb = new Q3ComboBox(TRUE, this);
-    cb->insertItem(ste);
-    cb->setCurrentItem(0);
-    cb->insertStringList(defaults);
+    hbox->addWidget(label2 = new QLabel(tr("stereotype : "), this));
+    cb = new QComboBox(this);
+    cb->setEditable(true);
+    cb->addItem(ste);
+    cb->setCurrentIndex(0);
+    cb->addItems(defaults);
     cb->setAutoCompletion(completion());
     hbox->addWidget(cb);
 
     QSizePolicy sp = cb->sizePolicy();
 
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     cb->setSizePolicy(sp);
 
     same_width(label1, label2);
 
-    hbox = new Q3HBoxLayout(vbox);
+    vbox->addLayout(hbox = new QHBoxLayout());
     hbox->setMargin(5);
-    QPushButton * accept = new QPushButton(TR("&OK"), this);
-    QPushButton * cancel = new QPushButton(TR("&Cancel"), this);
+    QPushButton * accept = new QPushButton(tr("&OK"), this);
+    QPushButton * cancel = new QPushButton(tr("&Cancel"), this);
     QSize bs(cancel->sizeHint());
 
     accept->setDefault(TRUE);
@@ -109,13 +110,13 @@ StereotypeDialog::~StereotypeDialog()
 
 void StereotypeDialog::polish()
 {
-    QDialog::polish();
+    QDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
 void StereotypeDialog::accept()
 {
-    ste = cb->currentText().stripWhiteSpace();
+    ste = cb->currentText().trimmed();
 
     if (!ste.isEmpty())
         ste = QString("<<") + ste + ">>";
diff --git a/src/dialog/StereotypeDialog.h b/src/dialog/StereotypeDialog.h
index fc98b2137..777986e27 100644
--- a/src/dialog/StereotypeDialog.h
+++ b/src/dialog/StereotypeDialog.h
@@ -31,7 +31,7 @@
 #include <qdialog.h>
 #include <qstringlist.h>
 
-class Q3ComboBox;
+class QComboBox;
 
 class LineEdit;
 
@@ -42,7 +42,7 @@ class StereotypeDialog : public QDialog
 protected:
     QString & ste;
     QString & lab;
-    Q3ComboBox * cb;
+    QComboBox * cb;
     LineEdit * ed;
 
     static QSize previous_size;
@@ -54,7 +54,7 @@ class StereotypeDialog : public QDialog
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/StereotypesDialog.cpp b/src/dialog/StereotypesDialog.cpp
index f6fc478ce..be0b72b9e 100644
--- a/src/dialog/StereotypesDialog.cpp
+++ b/src/dialog/StereotypesDialog.cpp
@@ -31,8 +31,8 @@
 
 #include <stdio.h>
 
-#include <q3grid.h>
-#include <q3vbox.h>
+//#include <gridbox.h>
+//#include <q3vbox.h>
 #include <qlabel.h>
 
 #include "StereotypesDialog.h"
@@ -78,284 +78,301 @@
 #include "UmlPixmap.h"
 #include "strutil.h"
 #include "translate.h"
-
+#include "widgetwithlayout.h"
+#include <QLayout>
+#include <QHeaderView>
+#include "gridbox.h"
 QSize StereotypesDialog::previous_size;
 
 StereotypesDialog::StereotypesDialog()
-    : Q3TabDialog(0, "Default stereotypes dialog", TRUE, 0)
+    : TabDialog(0, "Default stereotypes dialog", TRUE)
 {
-    setCaption(TR("Default stereotypes dialog"));
+    setWindowTitle(tr("Default stereotypes dialog"));
 
-    setOkButton(TR("OK"));
-    setCancelButton(TR("Cancel"));
+    setOkButton(tr("OK"));
+    setCancelButton(tr("Cancel"));
 
     const QString space(" ");
-    Q3Grid * grid;
+    GridBox * grid;
 
     // package tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("package\nstereotypes : "), grid);
-    package_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("package\nstereotypes : "), grid));
+    package_list = new LineEdit("",grid);
+    grid->addWidget(package_list);
     package_list->setTheText(BrowserPackage::its_default_stereotypes.join(space));
 
-    new QLabel(TR("relations\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("relations\nstereotypes : "), grid));
     packagetable = new MyTable(1, 1, grid);
-    packagetable->horizontalHeader()->setLabel(0, TR("Stereotypes"));
-    packagetable->verticalHeader()->setLabel(0, QIcon(*dependencyButton), "");
+    grid->addWidget(packagetable);
+    packagetable->setHorizontalHeaderLabels(QStringList()<<tr("Stereotypes"));
+
+    packagetable->setVerticalHeaderLabel(0, QIcon(*dependencyButton), "");
     packagetable->setText(0, 0, BrowserPackage::relation_default_stereotypes.join(space));
     packagetable->setColumnStretchable(0, TRUE);
     packagetable->setRowStretchable(0, TRUE);
 
-    addTab(grid, TR("Package"));
+    addTab(grid, QObject::tr("Package"));
 
     // class tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("class\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("class\nstereotypes : "), grid));
     class_list = new LineEdit(grid);
+    grid->addWidget(class_list);
     class_list->setTheText(BrowserClass::its_default_stereotypes.join(space));
 
-    new QLabel(TR("attribute\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("attribute\nstereotypes : "), grid));
     attribute_list = new LineEdit(grid);
+    grid->addWidget(attribute_list);
     attribute_list->setTheText(BrowserAttribute::its_default_stereotypes.join(space));
 
-    new QLabel(TR("operation\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("operation\nstereotypes : "), grid));
     operation_list = new LineEdit(grid);
+    grid->addWidget(operation_list);
     operation_list->setTheText(BrowserOperation::its_default_stereotypes.join(space));
 
-    new QLabel(TR("relations\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("relations\nstereotypes : "), grid));
     classtable = new MyTable(9, 1, grid);
-    classtable->horizontalHeader()->setLabel(0, TR("Stereotypes"));
-    classtable->verticalHeader()->setLabel(0, QIcon(*generalisationButton), "");
+    grid->addWidget(classtable);
+    classtable->setHorizontalHeaderLabel(0, QObject::tr("Stereotypes"));
+    classtable->setVerticalHeaderLabel(0, QIcon(*generalisationButton), "");
     classtable->setText(0, 0, BrowserClass::relations_default_stereotypes[UmlGeneralisation].join(space));
-    classtable->verticalHeader()->setLabel(1, QIcon(*directionalAssociationButton), "");
+    classtable->setVerticalHeaderLabel(1, QIcon(*directionalAssociationButton), "");
     classtable->setText(1, 0, BrowserClass::relations_default_stereotypes[UmlDirectionalAssociation].join(space));
-    classtable->verticalHeader()->setLabel(2, QIcon(*associationButton), "");
+    classtable->setVerticalHeaderLabel(2, QIcon(*associationButton), "");
     classtable->setText(2, 0, BrowserClass::relations_default_stereotypes[UmlAssociation].join(space));
-    classtable->verticalHeader()->setLabel(3, QIcon(*aggregationButton), "");
+    classtable->setVerticalHeaderLabel(3, QIcon(*aggregationButton), "");
     classtable->setText(3, 0, BrowserClass::relations_default_stereotypes[UmlAggregation].join(space));
-    classtable->verticalHeader()->setLabel(4, QIcon(*aggregationByValueButton), "");
+    classtable->setVerticalHeaderLabel(4, QIcon(*aggregationByValueButton), "");
     classtable->setText(4, 0, BrowserClass::relations_default_stereotypes[UmlAggregationByValue].join(space));
-    classtable->verticalHeader()->setLabel(5, QIcon(*directionalAggregationButton), "");
+    classtable->setVerticalHeaderLabel(5, QIcon(*directionalAggregationButton), "");
     classtable->setText(5, 0, BrowserClass::relations_default_stereotypes[UmlDirectionalAggregation].join(space));
-    classtable->verticalHeader()->setLabel(6, QIcon(*directionalAggregationByValueButton), "");
+    classtable->setVerticalHeaderLabel(6, QIcon(*directionalAggregationByValueButton), "");
     classtable->setText(6, 0, BrowserClass::relations_default_stereotypes[UmlDirectionalAggregationByValue].join(space));
-    classtable->verticalHeader()->setLabel(7, QIcon(*dependencyButton), "");
+    classtable->setVerticalHeaderLabel(7, QIcon(*dependencyButton), "");
     classtable->setText(7, 0, BrowserClass::relations_default_stereotypes[UmlDependency].join(space));
-    classtable->verticalHeader()->setLabel(8, QIcon(*realizeButton), "");
+    classtable->setVerticalHeaderLabel(8, QIcon(*realizeButton), "");
     classtable->setText(8, 0, BrowserClass::relations_default_stereotypes[UmlRealize].join(space));
     classtable->setColumnStretchable(0, TRUE);
 
-    addTab(grid, TR("Class"));
+    addTab(grid, QObject::tr("Class"));
 
     // Use case
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("use case\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("use case\nstereotypes : "), grid));
     usecase_list = new LineEdit(grid);
+    grid->addWidget(usecase_list);
     usecase_list->setTheText(BrowserUseCase::its_default_stereotypes.join(space));
 
-    (void) new QLabel(TR("relations\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("relations\nstereotypes : "), grid));
     usecasetable = new MyTable(3, 1, grid);
-    usecasetable->horizontalHeader()->setLabel(0, TR("Stereotypes"));
-    usecasetable->verticalHeader()->setLabel(0, QIcon(*generalisationButton), "");
+    grid->addWidget(usecasetable);
+
+    usecasetable->setHorizontalHeaderLabel(0, QObject::tr("Stereotypes"));
+    usecasetable->setVerticalHeaderLabel(0, QIcon(*generalisationButton), "");
     usecasetable->setText(0, 0, BrowserUseCase::relations_default_stereotypes[UmlGeneralisation].join(space));
-    usecasetable->verticalHeader()->setLabel(1, QIcon(*associationButton), "");
+    usecasetable->setVerticalHeaderLabel(1, QIcon(*associationButton), "");
     usecasetable->setText(1, 0, BrowserUseCase::relations_default_stereotypes[UmlAssociation].join(space));
-    usecasetable->verticalHeader()->setLabel(2, QIcon(*dependencyButton), "");
+    usecasetable->setVerticalHeaderLabel(2, QIcon(*dependencyButton), "");
     usecasetable->setText(2, 0, BrowserUseCase::relations_default_stereotypes[UmlDependency].join(space));
     usecasetable->setColumnStretchable(0, TRUE);
     usecasetable->setRowStretchable(0, TRUE);
     usecasetable->setRowStretchable(1, TRUE);
     usecasetable->setRowStretchable(2, TRUE);
 
-    addTab(grid, TR("Use Case"));
+    addTab(grid, QObject::tr("Use Case"));
 
     // artifact tab
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("artifact\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("artifact\nstereotypes : "), grid));
     artifact_list = new LineEdit(grid);
+    grid->addWidget(artifact_list);
     artifact_list->setTheText(BrowserArtifact::its_default_stereotypes.join(space));
 
-    new QLabel(TR("relations\nstereotypes : "), grid);
+    grid->addWidget(new QLabel(tr("relations\nstereotypes : "), grid));
     artifacttable = new MyTable(1, 1, grid);
-    artifacttable->horizontalHeader()->setLabel(0, TR("Stereotypes"));
-    artifacttable->verticalHeader()->setLabel(0, QIcon(*dependencyButton), "");
+    grid->addWidget(artifacttable);
+    artifacttable->setHorizontalHeaderLabel(0, QObject::tr("Stereotypes"));
+    artifacttable->setVerticalHeaderLabel(0, QIcon(*dependencyButton), "");
     artifacttable->setText(0, 0, BrowserArtifact::relation_default_stereotypes.join(space));
     artifacttable->setColumnStretchable(0, TRUE);
     artifacttable->setRowStretchable(0, TRUE);
 
-    addTab(grid, TR("Artifact"));
+    addTab(grid, QObject::tr("Artifact"));
 
     // view
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("class view\nstereotypes : "), grid);
-    classview_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("class view\nstereotypes : "), grid));
+    grid->addWidget(classview_list = new LineEdit(grid));
     classview_list->setTheText(BrowserClassView::its_default_stereotypes.join(space));
 
-    new QLabel(TR("use case view\nstereotypes : "), grid);
-    usecaseview_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("use case view\nstereotypes : "), grid));
+    grid->addWidget(usecaseview_list = new LineEdit(grid));
     usecaseview_list->setTheText(BrowserUseCaseView::its_default_stereotypes.join(space));
 
-    new QLabel(TR("component view\nstereotypes : "), grid);
-    componentview_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("component view\nstereotypes : "), grid));
+    grid->addWidget(componentview_list = new LineEdit(grid));
     componentview_list->setTheText(BrowserComponentView::its_default_stereotypes.join(space));
 
-    new QLabel(TR("deployment view\nstereotypes : "), grid);
-    deploymentview_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("deployment view\nstereotypes : "), grid));
+    grid->addWidget(deploymentview_list = new LineEdit(grid));
     deploymentview_list->setTheText(BrowserDeploymentView::its_default_stereotypes.join(space));
 
-    addTab(grid, TR("Views"));
+    addTab(grid, QObject::tr("Views"));
 
     // diagrams
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("class diagram\nstereotypes : "), grid);
-    classdiagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("class diagram\nstereotypes : "), grid));
+    grid->addWidget(classdiagram_list = new LineEdit(grid));
     classdiagram_list->setTheText(BrowserClassDiagram::its_default_stereotypes.join(space));
 
-    new QLabel(TR("object diagram\nstereotypes : "), grid);
-    objectdiagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("object diagram\nstereotypes : "), grid));
+    grid->addWidget(objectdiagram_list = new LineEdit(grid));
     objectdiagram_list->setTheText(BrowserObjectDiagram::its_default_stereotypes.join(space));
 
-    new QLabel(TR("communication diagram\nstereotypes : "), grid);
-    coldiagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("communication diagram\nstereotypes : "), grid));
+    grid->addWidget(coldiagram_list = new LineEdit(grid));
     coldiagram_list->setTheText(BrowserColDiagram::its_default_stereotypes.join(space));
 
-    new QLabel(TR("sequence diagram\nstereotypes : "), grid);
-    seqdiagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("sequence diagram\nstereotypes : "), grid));
+    grid->addWidget(seqdiagram_list = new LineEdit(grid));
     seqdiagram_list->setTheText(BrowserSeqDiagram::its_default_stereotypes.join(space));
 
-    new QLabel(TR("use case diagram\nstereotypes : "), grid);
-    usecasediagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("use case diagram\nstereotypes : "), grid));
+    grid->addWidget(usecasediagram_list = new LineEdit(grid));
     usecasediagram_list->setTheText(BrowserUseCaseDiagram::its_default_stereotypes.join(space));
 
-    new QLabel(TR("state diagram\nstereotypes : "), grid);
-    statediagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("state diagram\nstereotypes : "), grid));
+    grid->addWidget(statediagram_list = new LineEdit(grid));
     statediagram_list->setTheText(BrowserStateDiagram::its_default_stereotypes.join(space));
 
-    new QLabel(TR("activity diagram\nstereotypes : "), grid);
-    activitydiagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("activity diagram\nstereotypes : "), grid));
+    grid->addWidget(activitydiagram_list = new LineEdit(grid));
     activitydiagram_list->setTheText(BrowserActivityDiagram::its_default_stereotypes.join(space));
 
-    new QLabel(TR("component diagram\nstereotypes : "), grid);
-    componentdiagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("component diagram\nstereotypes : "), grid));
+    grid->addWidget(componentdiagram_list = new LineEdit(grid));
     componentdiagram_list->setTheText(BrowserComponentDiagram::its_default_stereotypes.join(space));
 
-    new QLabel(TR("deployment diagram\nstereotypes : "), grid);
-    deploymentdiagram_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("deployment diagram\nstereotypes : "), grid));
+    grid->addWidget(deploymentdiagram_list = new LineEdit(grid));
     deploymentdiagram_list->setTheText(BrowserDeploymentDiagram::its_default_stereotypes.join(space));
 
-    addTab(grid, TR("Diagrams"));
+    addTab(grid, QObject::tr("Diagrams"));
 
     // activities
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("activity\nstereotypes : "), grid);
-    activity_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("activity\nstereotypes : "), grid));
+    grid->addWidget(activity_list = new LineEdit(grid));
     activity_list->setTheText(BrowserActivity::its_default_stereotypes.join(space));
 
-    new QLabel(TR("interruptible activity\nregion stereotypes : "), grid);
-    interruptibleactivityregion_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("interruptible activity\nregion stereotypes : "), grid));
+    grid->addWidget(interruptibleactivityregion_list = new LineEdit(grid));
     interruptibleactivityregion_list->setTheText(BrowserInterruptibleActivityRegion::its_default_stereotypes.join(space));
 
-    new QLabel(TR("expansion region\nstereotypes : "), grid);
-    expansionregion_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("expansion region\nstereotypes : "), grid));
+    grid->addWidget(expansionregion_list = new LineEdit(grid));
+
     expansionregion_list->setTheText(BrowserExpansionRegion::its_default_stereotypes.join(space));
 
-    new QLabel(TR("partition\nstereotypes : "), grid);
-    activitypartition_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("partition\nstereotypes : "), grid));
+    grid->addWidget(activitypartition_list = new LineEdit(grid));
     activitypartition_list->setTheText(BrowserActivityPartition::its_default_stereotypes.join(space));
 
-    new QLabel(TR("parameter\nstereotypes : "), grid);
-    parameter_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("parameter\nstereotypes : "), grid));
+    grid->addWidget(parameter_list = new LineEdit(grid));
     parameter_list->setTheText(BrowserParameter::its_default_stereotypes.join(space));
 
-    new QLabel(TR("parameter set\nstereotypes : "), grid);
-    parameterset_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("parameter set\nstereotypes : "), grid));
+    grid->addWidget(parameterset_list = new LineEdit(grid));
     parameterset_list->setTheText(BrowserParameterSet::its_default_stereotypes.join(space));
 
-    new QLabel(TR("activity control node\nstereotypes : "), grid);
-    activitynode_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("activity control node\nstereotypes : "), grid));
+    grid->addWidget(activitynode_list = new LineEdit(grid));
     activitynode_list->setTheText(BrowserActivityNode::its_default_stereotypes.join(space));
 
-    new QLabel(TR("activity action\nstereotypes : "), grid);
-    activityaction_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("activity action\nstereotypes : "), grid));
+    grid->addWidget(activityaction_list = new LineEdit(grid));
     activityaction_list->setTheText(BrowserActivityAction::its_default_stereotypes.join(space));
 
-    new QLabel(TR("activity object node\nstereotypes : "), grid);
-    activityobject_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("activity object node\nstereotypes : "), grid));
+    grid->addWidget(activityobject_list = new LineEdit(grid));
     activityobject_list->setTheText(BrowserActivityObject::its_default_stereotypes.join(space));
 
-    new QLabel(TR("pin\nstereotypes : "), grid);
-    pin_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("pin\nstereotypes : "), grid));
+    grid->addWidget(pin_list = new LineEdit(grid));
     pin_list->setTheText(BrowserPin::its_default_stereotypes.join(space));
 
-    new QLabel(TR("expansion node\nstereotypes : "), grid);
-    expansionnode_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("expansion node\nstereotypes : "), grid));
+    grid->addWidget(expansionnode_list = new LineEdit(grid));
+
     expansionnode_list->setTheText(BrowserExpansionNode::its_default_stereotypes.join(space));
 
-    new QLabel(TR("flow\nstereotypes : "), grid);
-    flow_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("flow\nstereotypes : "), grid));
+    grid->addWidget(flow_list = new LineEdit(grid));
     flow_list->setTheText(BrowserFlow::its_default_stereotypes.join(space));
 
-    addTab(grid, TR("Activities"));
+    addTab(grid, QObject::tr("Activities"));
 
     // others
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("state\nstereotypes : "), grid);
-    state_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("state\nstereotypes : "), grid));
+    grid->addWidget(state_list = new LineEdit(grid));
     state_list->setTheText(BrowserState::its_default_stereotypes.join(space));
 
-    new QLabel(TR("pseudostate\nstereotypes : "), grid);
-    pseudostate_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("pseudostate\nstereotypes : "), grid));
+    grid->addWidget(pseudostate_list = new LineEdit(grid));
     pseudostate_list->setTheText(BrowserPseudoState::its_default_stereotypes.join(space));
 
-    new QLabel(TR("state action\nstereotypes : "), grid);
-    stateaction_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("state action\nstereotypes : "), grid));
+    grid->addWidget(stateaction_list = new LineEdit(grid));
     stateaction_list->setTheText(BrowserStateAction::its_default_stereotypes.join(space));
 
-    new QLabel(TR("component\nstereotypes : "), grid);
-    component_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("component\nstereotypes : "), grid));
+    grid->addWidget(component_list = new LineEdit(grid));
     component_list->setTheText(BrowserComponent::its_default_stereotypes.join(space));
 
-    new QLabel(TR("node\nstereotypes : "), grid);
-    node_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("node\nstereotypes : "), grid));
+    grid->addWidget(node_list = new LineEdit(grid));
     node_list->setTheText(BrowserDeploymentNode::its_default_stereotypes.join(space));
 
-    new QLabel(TR("message\nstereotypes : "), grid);
-    msg_list = new LineEdit(grid);
+    grid->addWidget(new QLabel(tr("message\nstereotypes : "), grid));
+    grid->addWidget(msg_list = new LineEdit(grid));
     msg_list->setTheText(BrowserSeqDiagram::message_default_stereotypes.join(space));
 
-    addTab(grid, TR("Others"));
+    addTab(grid, QObject::tr("Others"));
 }
 
 StereotypesDialog::~StereotypesDialog()
@@ -365,7 +382,7 @@ StereotypesDialog::~StereotypesDialog()
 
 void StereotypesDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -379,147 +396,147 @@ void StereotypesDialog::accept()
     const QString space(" ");
 
     BrowserPackage::its_default_stereotypes =
-        QStringList::split(space, package_list->theText());
+        package_list->theText().split(space);
 
     BrowserPackage::relation_default_stereotypes =
-        QStringList::split(space, packagetable->text(0, 0));
+        packagetable->text(0, 0).split(space);
 
     BrowserClass::its_default_stereotypes =
-        QStringList::split(space, class_list->theText());
+        class_list->theText().split(space);
 
     BrowserClass::relations_default_stereotypes[UmlGeneralisation] =
-        QStringList::split(space, classtable->text(0, 0));
+        classtable->text(0, 0).split(space);
     BrowserClass::relations_default_stereotypes[UmlDirectionalAssociation] =
-        QStringList::split(space, classtable->text(1, 0));
+        classtable->text(1, 0).split(space);
     BrowserClass::relations_default_stereotypes[UmlAssociation] =
-        QStringList::split(space, classtable->text(2, 0));
+        classtable->text(2, 0).split(space);
     BrowserClass::relations_default_stereotypes[UmlAggregation] =
-        QStringList::split(space, classtable->text(3, 0));
+        classtable->text(3, 0).split(space);
     BrowserClass::relations_default_stereotypes[UmlAggregationByValue] =
-        QStringList::split(space, classtable->text(4, 0));
+        classtable->text(4, 0).split(space);
     BrowserClass::relations_default_stereotypes[UmlDirectionalAggregation] =
-        QStringList::split(space, classtable->text(5, 0));
+        classtable->text(5, 0).split(space);
     BrowserClass::relations_default_stereotypes[UmlDirectionalAggregationByValue] =
-        QStringList::split(space, classtable->text(6, 0));
+        classtable->text(6, 0).split(space);
     BrowserClass::relations_default_stereotypes[UmlDependency] =
-        QStringList::split(space, classtable->text(7, 0));
+        classtable->text(7, 0).split(space);
     BrowserClass::relations_default_stereotypes[UmlRealize] =
-        QStringList::split(space, classtable->text(8, 0));
+        classtable->text(8, 0).split(space);
 
     BrowserUseCase::its_default_stereotypes =
-        QStringList::split(space, usecase_list->theText());
+        usecase_list->theText().split(space);
 
     BrowserUseCase::relations_default_stereotypes[UmlGeneralisation] =
-        QStringList::split(space, usecasetable->text(0, 0));
+        usecasetable->text(0, 0).split(space);
     BrowserUseCase::relations_default_stereotypes[UmlAssociation] =
-        QStringList::split(space, usecasetable->text(1, 0));
+        usecasetable->text(1, 0).split(space);
     BrowserUseCase::relations_default_stereotypes[UmlDependency] =
-        QStringList::split(space, usecasetable->text(2, 0));
+        usecasetable->text(2, 0).split(space);
 
     BrowserArtifact::its_default_stereotypes =
-        QStringList::split(space, artifact_list->theText());
+        artifact_list->theText().split(space);
 
     BrowserArtifact::relation_default_stereotypes =
-        QStringList::split(space, artifacttable->text(0, 0));
+        artifacttable->text(0, 0).split(space);
 
     BrowserAttribute::its_default_stereotypes =
-        QStringList::split(space, attribute_list->theText());
+        attribute_list->theText().split(space);
 
     BrowserOperation::its_default_stereotypes =
-        QStringList::split(space, operation_list->theText());
+        operation_list->theText().split(space );
 
     BrowserState::its_default_stereotypes =
-        QStringList::split(space, state_list->theText());
+        state_list->theText().split(space );
 
     BrowserPseudoState::its_default_stereotypes =
-        QStringList::split(space, pseudostate_list->theText());
+        pseudostate_list->theText().split(space );
 
     BrowserStateAction::its_default_stereotypes =
-        QStringList::split(space, stateaction_list->theText());
+        stateaction_list->theText().split(space );
 
     BrowserActivity::its_default_stereotypes =
-        QStringList::split(space, activity_list->theText());
+        activity_list->theText().split(space );
 
     BrowserInterruptibleActivityRegion::its_default_stereotypes =
-        QStringList::split(space, interruptibleactivityregion_list->theText());
+        interruptibleactivityregion_list->theText().split(space );
 
     BrowserExpansionRegion::its_default_stereotypes =
-        QStringList::split(space, expansionregion_list->theText());
+        expansionregion_list->theText().split(space );
 
     BrowserActivityPartition::its_default_stereotypes =
-        QStringList::split(space, activitypartition_list->theText());
+        activitypartition_list->theText().split(space );
 
     BrowserParameter::its_default_stereotypes =
-        QStringList::split(space, parameter_list->theText());
+        parameter_list->theText().split(space );
 
     BrowserParameterSet::its_default_stereotypes =
-        QStringList::split(space, parameterset_list->theText());
+        parameterset_list->theText().split(space );
 
     BrowserActivityNode::its_default_stereotypes =
-        QStringList::split(space, activitynode_list->theText());
+        activitynode_list->theText().split(space );
 
     BrowserActivityAction::its_default_stereotypes =
-        QStringList::split(space, activityaction_list->theText());
+        activityaction_list->theText().split(space );
 
     BrowserActivityObject::its_default_stereotypes =
-        QStringList::split(space, activityobject_list->theText());
+        activityobject_list->theText().split(space );
 
     BrowserPin::its_default_stereotypes =
-        QStringList::split(space, pin_list->theText());
+        pin_list->theText().split(space );
 
     BrowserExpansionNode::its_default_stereotypes =
-        QStringList::split(space, expansionnode_list->theText());
+        expansionnode_list->theText().split(space );
 
     BrowserFlow::its_default_stereotypes =
-        QStringList::split(space, flow_list->theText());
+        flow_list->theText().split(space );
 
     BrowserComponent::its_default_stereotypes =
-        QStringList::split(space, component_list->theText());
+        component_list->theText().split(space );
 
     BrowserDeploymentNode::its_default_stereotypes =
-        QStringList::split(space, node_list->theText());
+        node_list->theText().split(space );
 
     BrowserSeqDiagram::message_default_stereotypes =
-        QStringList::split(space, msg_list->theText());
+        msg_list->theText().split(space );
 
     BrowserClassView::its_default_stereotypes =
-        QStringList::split(space, classview_list->theText());
+        classview_list->theText().split(space );
 
     BrowserUseCaseView::its_default_stereotypes =
-        QStringList::split(space, usecaseview_list->theText());
+        usecaseview_list->theText().split(space );
 
     BrowserComponentView::its_default_stereotypes =
-        QStringList::split(space, componentview_list->theText());
+        componentview_list->theText().split(space );
 
     BrowserDeploymentView::its_default_stereotypes =
-        QStringList::split(space, deploymentview_list->theText());
+        deploymentview_list->theText().split(space );
 
     BrowserClassDiagram::its_default_stereotypes =
-        QStringList::split(space, classdiagram_list->theText());
+        classdiagram_list->theText().split(space );
 
     BrowserObjectDiagram::its_default_stereotypes =
-        QStringList::split(space, objectdiagram_list->theText());
+        objectdiagram_list->theText().split(space );
 
     BrowserColDiagram::its_default_stereotypes =
-        QStringList::split(space, coldiagram_list->theText());
+        coldiagram_list->theText().split(space );
 
     BrowserSeqDiagram::its_default_stereotypes =
-        QStringList::split(space, seqdiagram_list->theText());
+        seqdiagram_list->theText().split(space );
 
     BrowserUseCaseDiagram::its_default_stereotypes =
-        QStringList::split(space, usecasediagram_list->theText());
+        usecasediagram_list->theText().split(space );
 
     BrowserStateDiagram::its_default_stereotypes =
-        QStringList::split(space, statediagram_list->theText());
+        statediagram_list->theText().split(space );
 
     BrowserActivityDiagram::its_default_stereotypes =
-        QStringList::split(space, activitydiagram_list->theText());
+        activitydiagram_list->theText().split(space );
 
     BrowserComponentDiagram::its_default_stereotypes =
-        QStringList::split(space, componentdiagram_list->theText());
+        componentdiagram_list->theText().split(space );
 
     BrowserDeploymentDiagram::its_default_stereotypes =
-        QStringList::split(space, deploymentdiagram_list->theText());
+        deploymentdiagram_list->theText().split(space );
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/StereotypesDialog.h b/src/dialog/StereotypesDialog.h
index 77ef39cd4..749fa9d26 100644
--- a/src/dialog/StereotypesDialog.h
+++ b/src/dialog/StereotypesDialog.h
@@ -28,14 +28,14 @@
 #ifndef STEREOTYPESDIALOG_H
 #define STEREOTYPESDIALOG_H
 
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 
 #include <UmlEnum.h>
 
 class LineEdit;
 class MyTable;
 
-class StereotypesDialog : public Q3TabDialog
+class StereotypesDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -90,7 +90,7 @@ class StereotypesDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    void accept();
+    virtual void accept() override;
 };
 
 #endif
diff --git a/src/dialog/StringTable.cpp b/src/dialog/StringTable.cpp
index 831880049..6a1c6e48c 100644
--- a/src/dialog/StringTable.cpp
+++ b/src/dialog/StringTable.cpp
@@ -29,25 +29,28 @@
 
 
 
-#include <q3popupmenu.h>
+#include <qmenu.h>
 #include <qcursor.h>
 
 #include "StringTable.h"
 #include "translate.h"
+#include "ui/menufactory.h"
+#include <QHeaderView>
 
-StringTable::StringTable(int numRows, int numCols, QWidget * parent, bool visit)
-    : MyTable(numRows, numCols, parent)
+StringTable::StringTable(int rowCount, int columnCount, QWidget * parent, bool visit)
+    : MyTable(rowCount, columnCount, parent)
 {
-    setSorting(-1);
+
+    //setSortingEnabled(-1);
     setSelectionMode(NoSelection);	// single does not work
-    setRowMovingEnabled(TRUE);
+    verticalHeader()->setSectionsMovable(true);
 
-    copy = new QString[numCols];
+    copy = new QString[columnCount];
 
     if (! visit) {
-        connect(this, SIGNAL(pressed(int, int, int, const QPoint &)),
-                this, SLOT(button_pressed(int, int, int, const QPoint &)));
-        connect(this, SIGNAL(valueChanged(int, int)),
+        connect(this, SIGNAL(pressed(QModelIndex)),
+                this, SLOT(button_pressed(QModelIndex)));
+        connect(this, SIGNAL(cellChanged(int,int)),
                 this, SLOT(value_changed(int, int)));
     }
 }
@@ -62,15 +65,14 @@ void StringTable::activateNextCell()
     int row = currentRow();
     int col = currentColumn();
 
-    if (col == (numCols() - 2)) {
+    if (col == (columnCount() - 2)) {
         // goto next line
-        if (++row == numRows()) {
+        if (++row == rowCount()) {
             // adds a new line
-            setNumRows(row + 1);
+            setRowCount(row + 1);
             init_row(row);
-            setText(row, numCols() - 1, QString());
+            setText(row, columnCount() - 1, QString());
         }
-
         setCurrentCell(row, 0);
     }
     else
@@ -79,129 +81,154 @@ void StringTable::activateNextCell()
 
 void StringTable::value_changed(int row, int col)
 {
-    if ((row == (numRows() - 1)) && (col != 0) && !text(row, col).isEmpty())
+    if ((row == (rowCount() - 1)) && (col != 0) && !text(row, col).isEmpty())
         insert_row_after(row);
 }
 
-void StringTable::button_pressed(int row, int col, int, const QPoint &)
+void StringTable::button_pressed(const QModelIndex &modelindex)
 {
-    if (col == numCols() - 1) {
+    int col = modelindex.column();
+    int index = modelindex.row();
+    if (col == columnCount() - 1) {
         QString s;
-        Q3PopupMenu m;
-
-        s.sprintf("%d", row + 1);
-        m.insertItem(TR("row %1", s), -1);
-        m.insertSeparator();
-        m.insertItem(TR("Insert row before"), 0);
-        m.insertItem(TR("Insert row after"), 1);
-        m.insertSeparator();
-        m.insertItem(TR("Delete row"), 2);
-        m.insertSeparator();
-        m.insertItem(TR("Copy row"), 3);
-        m.insertItem(TR("Cut row"), 4);
-        m.insertItem(TR("Paste row"), 5);
-        m.insertSeparator();
-
-        Q3PopupMenu mv;
+        QMenu m;
+
+        s.sprintf("%d", index + 1);
+        MenuFactory::addItem(m,tr("row %1").arg(s), -1);
+        m.addSeparator();
+        MenuFactory::addItem(m,tr("Insert row before"), 0);
+        MenuFactory::addItem(m,tr("Insert row after"), 1);
+        m.addSeparator();
+        MenuFactory::addItem(m,tr("Delete row"), 2);
+        m.addSeparator();
+        MenuFactory::addItem(m,tr("Copy row"), 3);
+        MenuFactory::addItem(m,tr("Cut row"), 4);
+        MenuFactory::addItem(m,tr("Paste row"), 5);
+        m.addSeparator();
+
+        QMenu mv;
         int rank;
 
-        for (rank = 0; rank != numRows(); rank += 1)
-            if (rank != row)
-                mv.insertItem(QString::number(rank + 1), 10 + rank);
-
-        m.insertItem(TR("Move row"), &mv);
-
-        switch (rank = m.exec(QCursor::pos())) {
-        case 0:
-            insert_row_before(row);
-            break;
-
-        case 1:
-            insert_row_after(row);
-            break;
-
-        case 2:
-            delete_row(row);
-            break;
-
-        case 3:
-            copy_row(row);
-            break;
-
-        case 4:
-            cut_row(row);
-            break;
-
-        case 5:
-            paste_row(row);
-            break;
-
-        default:
-            if (rank >= 10)
-                move_row(row, rank - 10);
-
-            break;
+        for (rank = 0; rank != rowCount(); rank += 1)
+            if (rank != index)
+                MenuFactory::addItem(mv, QString::number(rank + 1), 10 + rank);
+
+        mv.setTitle(tr("Move row"));
+        //MenuFactory::addItem(m,TR("Move row"), &mv);
+        m.addMenu(&mv);
+
+        QAction * action = m.exec(QCursor::pos());
+        if(action)
+        {
+            rank = action->data().toInt();
+            switch (rank) {
+            case 0:
+                insert_row_before(index);
+                break;
+
+            case 1:
+                insert_row_after(index);
+                break;
+
+            case 2:
+                delete_row(index);
+                break;
+
+            case 3:
+                copy_row(index);
+                break;
+
+            case 4:
+                cut_row(index);
+                break;
+
+            case 5:
+                paste_row(index);
+                break;
+
+            default:
+                if (rank >= 10)
+                    move_row(index, rank - 10);
+
+                break;
+            }
         }
     }
 }
 
 void StringTable::insert_row_before(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index != row; index -= 1) {
         int col;
 
-        for (col = 0; col <= numCols() - 1; col += 1)
-            setText(index, col, text(index - 1, col));
-    }
-
+        for (col = 0; col <= columnCount() - 1; col += 1)
+        {
+            QTableWidgetItem * it;
+            it = item(index, col);
+            if(it)
+            {
+                it->setText( itemAt(index - 1, col)->text());
+            }
+        }
+    }*/
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row);
     init_row(row);
-    setText(row, numCols() - 1, QString());
+    setText(row, columnCount() - 1, QString());
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void StringTable::insert_row_after(int row)
 {
-    int n = numRows();
+    /*int n = rowCount();
     int index;
 
-    setNumRows(n + 1);
+    setRowCount(n + 1);
 
     for (index = n; index > row + 1; index -= 1) {
         int col;
 
-        for (col = 0; col <= numCols() - 1; col += 1)
-            setText(index, col, text(index - 1, col));
+        for (col = 0; col <= columnCount() - 1; col += 1)
+            itemAt(index, col)->setText(itemAt(index - 1, col)->text());
     }
-
+    */
+    blockSignals(true);
+    DISABLESORTINGMYTABLE;
+    insertRow(row+1);
     init_row(row + 1);
-    setText(row + 1, numCols() - 1, QString());
+    setText(row + 1, columnCount() - 1, QString());
+    ENABLESORTINGMYTABLE;
+    blockSignals(false);
 }
 
 void StringTable::delete_row(int row)
 {
-    int n = numRows();
+    int n = rowCount();
     int index;
 
-    clearCellWidget(row, 1);
+    removeCellWidget(row, 1);
 
     if (n == 1) {
         // the alone line : empty it
         init_row(0);
-        setText(0, numCols() - 1, QString());
+        setText(0, columnCount() - 1, QString());
     }
     else {
         for (index = row; index != n - 1; index += 1) {
             int col;
 
-            for (col = 0; col <= numCols() - 1; col += 1)
-                setText(index, col, text(index + 1, col));
+            for (col = 0; col <= columnCount() - 1; col += 1)
+                item(index, col)->setText( text(index + 1, col));
         }
 
-        setNumRows(n - 1);
+        setRowCount(n - 1);
     }
 }
 
@@ -209,7 +236,7 @@ void StringTable::copy_row(int row)
 {
     int col;
 
-    for (col = 0; col <= numCols() - 1; col += 1)
+    for (col = 0; col <= columnCount() - 1; col += 1)
         copy[col] = text(row, col);
 }
 
@@ -223,19 +250,19 @@ void StringTable::paste_row(int row)
 {
     int col;
 
-    for (col = 0; col <= numCols() - 1; col += 1)
+    for (col = 0; col <= columnCount() - 1; col += 1)
         setText(row, col, copy[col]);
 
-    if (row == (numRows() - 1))
+    if (row == (rowCount() - 1))
         insert_row_after(row);
 }
 
 void StringTable::move_row(int from, int to)
 {
-    QString * save = new QString[numCols()];
+    QString * save = new QString[columnCount()];
     int col;
 
-    for (col = 0; col <= numCols() - 1; col += 1)
+    for (col = 0; col <= columnCount() - 1; col += 1)
         save[col] = copy[col];
 
     cut_row(from);
@@ -247,7 +274,7 @@ void StringTable::move_row(int from, int to)
 
     paste_row(to);
 
-    for (col = 0; col <= numCols() - 1; col += 1)
+    for (col = 0; col <= columnCount() - 1; col += 1)
         copy[col] = save[col];
 
     delete [] save;
diff --git a/src/dialog/StringTable.h b/src/dialog/StringTable.h
index 055ae2cbc..a19e42cb9 100644
--- a/src/dialog/StringTable.h
+++ b/src/dialog/StringTable.h
@@ -55,7 +55,7 @@ class StringTable : public MyTable
     void move_row(int from, int to);
 
 protected slots:
-    virtual void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    virtual void button_pressed(const QModelIndex & index);
     void value_changed(int row, int col);
 };
 
diff --git a/src/dialog/ToolDialog.cpp b/src/dialog/ToolDialog.cpp
index 67e89c878..50980b3e3 100644
--- a/src/dialog/ToolDialog.cpp
+++ b/src/dialog/ToolDialog.cpp
@@ -34,7 +34,7 @@
 #include "UmlPixmap.h"
 #include "UmlDesktop.h"
 #include "translate.h"
-
+#include <QHeaderView>
 static const ToolColumnDef Classes[] = {
     { UmlClass, &classButton },
     { UmlOperation, &PublicOperationIcon },
@@ -135,15 +135,15 @@ static Tbl Tables[] = {
 
 QSize ToolDialog::previous_size;
 
-ToolDialog::ToolDialog() : Q3TabDialog(0, "ToolDialog", TRUE, 0)
+ToolDialog::ToolDialog() : TabDialog(0, "ToolDialog", TRUE)
 {
-    setCaption(TR("Tools dialog"));
-    setOkButton(TR("OK"));
-    setCancelButton(TR("Cancel"));
+    setWindowTitle(tr("Tools dialog"));
+    setOkButton(tr("OK"));
+    setCancelButton(tr("Cancel"));
 
     for (unsigned i = 0; i != sizeof(Tables) / sizeof(Tbl); i += 1) {
         Tables[i].tbl = new ToolTable(this, Tables[i].cd, Tables[i].ncol);
-        addTab(Tables[i].tbl, TR(Tables[i].label));
+        addTab(Tables[i].tbl, tr(Tables[i].label));
     }
 }
 
@@ -154,7 +154,7 @@ ToolDialog::~ToolDialog()
 
 void ToolDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.9, 0.9);
 }
 
@@ -173,7 +173,7 @@ void ToolDialog::accept()
     for (i = 0; i != sizeof(Tables) / sizeof(Tbl); i += 1)
         n = Tables[i].tbl->update(n);
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
 
 // ToolTable
@@ -197,26 +197,29 @@ ToolTable::ToolTable(QWidget * parent,
         }
     }
 
-    setNumRows(nrows);
+    setRowCount(nrows);
 
-    horizontalHeader()->setLabel(0, TR("executable"));
-    horizontalHeader()->setLabel(1, TR("display"));
+    setHorizontalHeaderLabel(0, QObject::tr("executable"));
+    setHorizontalHeaderLabel(1, QObject::tr("display"));
     setColumnStretchable(0, FALSE);
     setColumnStretchable(1, FALSE);
 
     for (col = 0; col != ncols; col += 1) {
         if (cd[col].pixmap == 0) {
-            horizontalHeader()->setLabel(col + 2, "Prj");
-            adjustColumn(col + 2);
+            setHorizontalHeaderLabel(col + 2, "Prj");
+            resizeColumnToContents(col + 2);
         }
         else
-            horizontalHeader()->setLabel(col + 2, QIcon(**(cd[col].pixmap)), "", 24);
+        {
+            setHorizontalHeaderLabel(col + 2, QIcon(**(cd[col].pixmap)), ""/*, 24*/);
+            resizeColumnToContents(col + 2);
+        }
 
         setColumnStretchable(col, FALSE);
     }
 
-    horizontalHeader()->setLabel(ncols + 2, TR("do"));
-    adjustColumn(ncols + 2);
+    setHorizontalHeaderLabel(ncols + 2, QObject::tr("do"));
+    resizeColumnToContents(ncols + 2);
     setColumnStretchable(ncols + 2, FALSE);
 
     nrows = 0;
@@ -242,37 +245,39 @@ ToolTable::ToolTable(QWidget * parent,
         }
     }
 
-    adjustColumn(0);
-    adjustColumn(1);
+    resizeColumnToContents(0);
+    resizeColumnToContents(1);
 }
 
 void ToolTable::init_row(int row)
 {
     int index;
-    int n = numCols();
+    int n = columnCount();
 
     setText(row, 0, QString());
     setText(row, 1, QString());
 
     for (index = 2; index != n; index += 1)
         setItem(row, index,
-                new TableItem(this, Q3TableItem::Never, ""));
+                new TableItem(TableItem::Never, "", TableItem::TableItemType));
 }
 
-void ToolTable::button_pressed(int row, int col, int b, const QPoint & p)
+void ToolTable::button_pressed(const QModelIndex &index)
 {
-    if ((col >= 2) && (col != (numCols() - 1))) {
-        setText(row, col, text(row, col).isEmpty() ? " X" : "");
+    int col = index.column();
+    int row = index.row();
+    if ((col >= 2) && (col != (columnCount() - 1))) {
+        item(row, col)->setText(text(row, col).isEmpty() ? " X" : "");
     }
     else
-        StringTable::button_pressed(row,  col, b, p);
+        StringTable::button_pressed( this->model()->index(row,  col)/* b, p*/);
 }
 
 unsigned ToolTable::ntools()
 {
     forceUpdateCells();
 
-    int n = numRows();
+    int n = rowCount();
 
     return (text(n - 1, 0).isEmpty() || text(n - 1, 1).isEmpty())
            ? (unsigned) n - 1 : (unsigned) n;
@@ -280,8 +285,8 @@ unsigned ToolTable::ntools()
 
 unsigned ToolTable::update(unsigned rank)
 {
-    int n = numRows();
-    int ncol = numCols();
+    int n = rowCount();
+    int ncol = columnCount();
 
     if (text(n - 1, 0).isEmpty() || text(n - 1, 1).isEmpty())
         n -= 1;
@@ -289,12 +294,12 @@ unsigned ToolTable::update(unsigned rank)
     for (int row = 0; row != n; row += 1) {
         ATool & tool = Tool::tools[rank];
 
-        tool.cmd = text(row, 0).stripWhiteSpace();
-        tool.display = text(row, 1).stripWhiteSpace();
+        tool.cmd = text(row, 0).trimmed();
+        tool.display = text(row, 1).trimmed();
 
         for (int index = 2; index != ncol - 1; index += 1)
             tool.applicable[cd[index - 2].kind] =
-                !text(row, index).stripWhiteSpace().isEmpty();
+                !text(row, index).trimmed().isEmpty();
 
         rank += 1;
     }
diff --git a/src/dialog/ToolDialog.h b/src/dialog/ToolDialog.h
index 83e233d8d..5e65fcd28 100644
--- a/src/dialog/ToolDialog.h
+++ b/src/dialog/ToolDialog.h
@@ -28,7 +28,7 @@
 #ifndef TOOLDIALOG_H
 #define TOOLDIALOG_H
 
-#include <q3tabdialog.h>
+#include <tabdialog.h>
 //Added by qt3to4:
 #include <QPixmap>
 
@@ -42,7 +42,7 @@ struct ToolColumnDef {
     QPixmap ** pixmap;
 };
 
-class ToolDialog : public Q3TabDialog
+class ToolDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -54,7 +54,7 @@ class ToolDialog : public Q3TabDialog
     static QSize previous_size;
 
 protected slots:
-    virtual void accept();
+    virtual void accept() override;
     virtual void polish();
 };
 
@@ -68,13 +68,13 @@ class ToolTable : public StringTable
 public:
     ToolTable(QWidget * parent, const ToolColumnDef * tcd, unsigned ncols);
 
-    virtual void init_row(int r);
+    virtual void init_row(int r) override;
 
     unsigned ntools();
     unsigned update(unsigned rank);
 
 protected slots:
-    virtual void button_pressed(int row, int col, int button, const QPoint & mousePos);
+    virtual void button_pressed(const QModelIndex &index) override;
 };
 
 #endif
diff --git a/src/dialog/TraceDialog.cpp b/src/dialog/TraceDialog.cpp
index 8e82bbec7..ab86bba99 100644
--- a/src/dialog/TraceDialog.cpp
+++ b/src/dialog/TraceDialog.cpp
@@ -30,14 +30,14 @@
 
 
 #include <stdio.h>
-#include <q3textview.h>
+#include <QTextEdit>
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <QTextStream>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include <myio.h>
 
 #include "TraceDialog.h"
@@ -46,27 +46,29 @@
 #include "translate.h"
 
 TraceDialog * TraceDialog::the;
-Q3TextView * TraceDialog::txt;
+QTextEdit * TraceDialog::txt;
 bool TraceDialog::AutoRaise;
 QString TraceDialog::content;
 
 QSize TraceDialog::previous_size;
 
-TraceDialog::TraceDialog() : QDialog(0, "", FALSE, Qt::WDestructiveClose)
+TraceDialog::TraceDialog() : QDialog(0/*, "", FALSE, Qt::WDestructiveClose*/)
 {
-    setCaption(TR("Trace"));
+    setAttribute(Qt::WA_DeleteOnClose);
+    setWindowTitle(tr("Trace"));
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(this);
+    QVBoxLayout * vbox = new QVBoxLayout(this);
 
-    txt = new Q3TextView(this);
+    txt = new QTextEdit(this);
     txt->setText(content);
-    vbox->add(txt);
+    vbox->addWidget(txt);
 
-    Q3HBoxLayout * hbox = new Q3HBoxLayout(vbox);
+    QHBoxLayout * hbox = new QHBoxLayout();
+    vbox->addLayout(hbox);
     hbox->setMargin(5);
-    QPushButton * cl = new QPushButton(TR("Clear"), this);
-    QPushButton * save = new QPushButton(TR("Save"), this);
-    QPushButton * close = new QPushButton(TR("Close"), this);
+    QPushButton * cl = new QPushButton(tr("Clear"), this);
+    QPushButton * save = new QPushButton(tr("Save"), this);
+    QPushButton * close = new QPushButton(tr("Close"), this);
     QSize bs(cl->sizeHint());
 
     close->setDefault(TRUE);
@@ -105,10 +107,10 @@ void TraceDialog::clr()
 void TraceDialog::save()
 {
     QString filename =
-        Q3FileDialog::getSaveFileName(last_used_directory(), "*.html", this);
+        QFileDialog::getSaveFileName(this,"",last_used_directory(), "*.html");
 
     if (!filename.isNull()) {
-        if (filename.right(5).lower() != ".html")
+        if (filename.right(5).toLower() != ".html")
             filename += ".html";
 
         set_last_used_directory(filename);
@@ -118,7 +120,7 @@ void TraceDialog::save()
         if (file.open(QIODevice::WriteOnly)) {
             QTextStream stream(&file);
 
-            stream << "<html>\n" << txt->text() << "\n</html>\n";
+            stream << "<html>\n" << txt->toHtml() << "\n</html>\n";
             stream.flush();
             file.close();
         }
diff --git a/src/dialog/TraceDialog.h b/src/dialog/TraceDialog.h
index 184fa4106..2cae16573 100644
--- a/src/dialog/TraceDialog.h
+++ b/src/dialog/TraceDialog.h
@@ -30,7 +30,7 @@
 
 #include "qdialog.h"
 
-class Q3TextView;
+class QTextEdit;
 
 class TraceDialog : public QDialog
 {
@@ -38,7 +38,7 @@ class TraceDialog : public QDialog
 
 protected:
     static TraceDialog * the;
-    static Q3TextView * txt;
+    static QTextEdit * txt;
     static bool AutoRaise;
     static QString content;
 
diff --git a/src/dialog/TransitionDialog.cpp b/src/dialog/TransitionDialog.cpp
index 2b62bd2a8..3d6d9ed03 100644
--- a/src/dialog/TransitionDialog.cpp
+++ b/src/dialog/TransitionDialog.cpp
@@ -29,13 +29,12 @@
 
 
 
-#include <q3grid.h>
-#include <q3vbox.h>
+#include <gridbox.h>
+#include <vvbox.h>
 #include <qlabel.h>
-#include <q3combobox.h>
+#include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-
 #include "TransitionDialog.h"
 #include "TransitionData.h"
 #include "BrowserTransition.h"
@@ -52,69 +51,75 @@
 QSize TransitionDialog::previous_size;
 
 TransitionDialog::TransitionDialog(TransitionData * r)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), rel(r)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), rel(r)
 {
     r->browser_node->edit_start();
 
     if (r->browser_node->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("Transition dialog"));
+    setWindowTitle(tr("Transition dialog"));
     visit = !hasOkButton();
 
     BrowserNode * bn = rel->browser_node;
-    Q3Grid * grid;
+    GridBox * grid;
 
     //
     // general tab
     //
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     umltab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(rel->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox(grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(rel->get_stereotype()));
 
     if (!visit) {
-        //edstereotype->insertStringList(rel->get_start()->default_stereotypes(type));
+        //edstereotype->addItems(rel->get_start()->default_stereotypes(type));
         edstereotype->setAutoCompletion(completion());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlTransition));
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlTransition));
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
     if (r->get_start_node() != r->get_end_node())
         internal_cb = 0;
     else {
-        new QLabel(grid);
-        internal_cb = new QCheckBox(TR("internal"), grid);
+        grid->addWidget(new QLabel(grid));
+        grid->addWidget(internal_cb = new QCheckBox(tr("internal"), grid));
         internal_cb->setChecked(r->internal());
     }
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        SmallPushButton* sButton;
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     //comment->setFont(font);
@@ -137,12 +142,12 @@ TransitionDialog::TransitionDialog(TransitionData * r)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     //
 
@@ -157,8 +162,9 @@ TransitionDialog::~TransitionDialog()
     rel->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -179,7 +185,7 @@ void TransitionDialog::change_tabs(QWidget * w)
 
 void TransitionDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_center(this, previous_size, 0.8, 0.8);
 }
 
@@ -188,21 +194,24 @@ void TransitionDialog::init_tab(QWidget *& tab, TransDialog & d, TransDef & td,
                                 const char * sl_guard, const char * sl_expr,
                                 bool enabled)
 {
-    Q3Grid * grid = new Q3Grid(2, this);
-    Q3VBox * vtab;
-
+    GridBox * grid = new GridBox(2, this);
+    VVBox * vtab;
+    SmallPushButton* sButton;
     tab = grid;
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("trigger : "), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("trigger : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, sl_trigger);
+        vtab->addWidget(sButton);
+    }
 
-    d.edtrigger = new MultiLineEdit(grid);
+    grid->addWidget(d.edtrigger = new MultiLineEdit(grid));
 
     QFont font = d.edtrigger->font();
 
@@ -216,28 +225,34 @@ void TransitionDialog::init_tab(QWidget *& tab, TransDialog & d, TransDef & td,
     if (visit)
         d.edtrigger->setReadOnly(TRUE);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("guard\nconstraint : "), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("guard\nconstraint : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, sl_guard);
+        vtab->addWidget(sButton);
+    }
 
-    d.edguard = new MultiLineEdit(grid);
+    grid->addWidget(d.edguard = new MultiLineEdit(grid));
     d.edguard->setFont(font);
     d.edguard->setText(td.guard);
 
     if (visit)
         d.edguard->setReadOnly(TRUE);
 
-    vtab = new Q3VBox(grid);
-    new QLabel(TR("activity\nexpression : "), vtab);
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("activity\nexpression : "), vtab));
 
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, sl_expr);
+        vtab->addWidget(sButton);
+    }
 
-    d.edexpr = new MultiLineEdit(grid);
+    grid->addWidget(d.edexpr = new MultiLineEdit(grid));
     d.edexpr->setFont(font);
     d.edexpr->setText(td.expr);
 
@@ -292,7 +307,7 @@ void TransitionDialog::accept()
     BrowserNode * bn = rel->browser_node;
     QString s;
 
-    s = edname->text().stripWhiteSpace();
+    s = edname->text().trimmed();
 
     if (s.isEmpty())
         s = "<transition>";
@@ -301,11 +316,11 @@ void TransitionDialog::accept()
         ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlTransition,
                 bn->allow_spaces(),
                 bn->allow_empty()))
-        msg_critical(TR("Error"), s + TR("\n\nillegal name or already used"));
+        msg_critical(tr("Error"), s + tr("\n\nillegal name or already used"));
     else {
         bn->set_name(s);
 
-        bool newst = rel->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+        bool newst = rel->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
         if (internal_cb != 0)
             rel->set_internal(internal_cb->isChecked());
@@ -325,7 +340,7 @@ void TransitionDialog::accept()
         bn->package_modified();
         rel->modified();
 
-        Q3TabDialog::accept();
+        TabDialog::accept();
     }
 }
 
diff --git a/src/dialog/TransitionDialog.h b/src/dialog/TransitionDialog.h
index 98781f3fe..bc63da6a9 100644
--- a/src/dialog/TransitionDialog.h
+++ b/src/dialog/TransitionDialog.h
@@ -30,14 +30,11 @@
 
 #include <qwidget.h>
 #include <qstringlist.h>
-#include <q3tabdialog.h>
-//Added by qt3to4:
-#include <Q3PtrList>
-
+#include <tabdialog.h>
 #include "BrowserNode.h"
 
 class QPushButton;
-class Q3ComboBox;
+class QComboBox;
 class QCheckBox;
 
 class LineEdit;
@@ -56,7 +53,7 @@ struct TransDialog {
     void accept(TransDef &);
 };
 
-class TransitionDialog : public Q3TabDialog
+class TransitionDialog : public TabDialog
 {
     Q_OBJECT
 
@@ -66,9 +63,9 @@ class TransitionDialog : public Q3TabDialog
     TransitionData * rel;
     LineEdit * edname;
     QCheckBox * internal_cb;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * comment;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     QWidget * ocltab;
     QWidget * cppTab;
@@ -104,7 +101,7 @@ class TransitionDialog : public Q3TabDialog
                   const char * sl_expr, bool enabled);
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
 
     void edit_description();
     void edit_uml_trigger();
diff --git a/src/dialog/UseCaseDialog.cpp b/src/dialog/UseCaseDialog.cpp
index 4a35460f7..863c03f4f 100644
--- a/src/dialog/UseCaseDialog.cpp
+++ b/src/dialog/UseCaseDialog.cpp
@@ -29,12 +29,11 @@
 
 
 
-#include <q3grid.h>
+#include <gridbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <q3combobox.h>
-#include <q3vbox.h>
-
+#include <qcombobox.h>
+#include <vvbox.h>
 #include "UseCaseDialog.h"
 #include "BrowserUseCase.h"
 #include "UseCaseData.h"
@@ -50,52 +49,53 @@
 QSize UseCaseDialog::previous_size;
 
 UseCaseDialog::UseCaseDialog(UseCaseData * u)
-    : Q3TabDialog(0, 0, FALSE, Qt::WDestructiveClose), uc(u)
+    : TabDialog(0, 0, true, Qt::WA_DeleteOnClose), uc(u)
 {
     BrowserNode * bn = u->browser_node;
 
     bn->edit_start();
 
     if (bn->is_writable()) {
-        setOkButton(TR("OK"));
-        setCancelButton(TR("Cancel"));
+        setOkButton(tr("OK"));
+        setCancelButton(tr("Cancel"));
     }
     else {
         setOkButton(QString());
-        setCancelButton(TR("Close"));
+        setCancelButton(tr("Close"));
     }
 
-    setCaption(TR("Use Case dialog"));
+    setWindowTitle(tr("Use Case dialog"));
 
     bool visit = !hasOkButton();
 
     // general tab
 
-    Q3Grid * grid = new Q3Grid(2, this);
+    GridBox * grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    new QLabel(TR("name : "), grid);
-    edname = new LineEdit(bn->get_name(), grid);
+    grid->addWidget(new QLabel(tr("name : "), grid));
+    grid->addWidget(edname = new LineEdit(bn->get_name(), grid));
     edname->setReadOnly(visit);
 
-    new QLabel(TR("stereotype : "), grid);
-    edstereotype = new Q3ComboBox(!visit, grid);
-    edstereotype->insertItem(toUnicode(uc->get_stereotype()));
+    grid->addWidget(new QLabel(tr("stereotype : "), grid));
+    grid->addWidget(edstereotype = new QComboBox( grid));
+    edstereotype->setEditable(!visit);
+    edstereotype->addItem(toUnicode(uc->get_stereotype()));
 
     if (! visit) {
-        edstereotype->insertStringList(BrowserUseCase::default_stereotypes());
-        edstereotype->insertStringList(ProfiledStereotypes::defaults(UmlUseCase));
+        edstereotype->addItems(BrowserUseCase::default_stereotypes());
+        edstereotype->addItems(ProfiledStereotypes::defaults(UmlUseCase));
         edstereotype->setAutoCompletion(completion());
     }
 
-    edstereotype->setCurrentItem(0);
+    edstereotype->setCurrentIndex(0);
     QSizePolicy sp = edstereotype->sizePolicy();
-    sp.setHorData(QSizePolicy::Expanding);
+    sp.setHorizontalPolicy(QSizePolicy::Expanding);
     edstereotype->setSizePolicy(sp);
 
-    new QLabel(TR("extension \npoints : "), grid);
-    extension_points = new MultiLineEdit(grid);
+    grid->addWidget(new QLabel(tr("extension \npoints : "), grid));
+    grid->addWidget(extension_points = new MultiLineEdit(grid));
     extension_points->setReadOnly(visit);
     extension_points->setText(uc->get_extension_points());
     QFont font = extension_points->font();
@@ -106,14 +106,19 @@ UseCaseDialog::UseCaseDialog(UseCaseData * u)
     font.setFixedPitch(TRUE);
     extension_points->setFont(font);
 
-    Q3VBox * vtab = new Q3VBox(grid);
-    new QLabel(TR("description :"), vtab);
+    VVBox * vtab;
+    grid->addWidget(vtab = new VVBox(grid));
+    vtab->addWidget(new QLabel(tr("description :"), vtab));
 
+            SmallPushButton *sButton;
     if (! visit)
-        connect(new SmallPushButton(TR("Editor"), vtab), SIGNAL(clicked()),
+    {
+        connect(sButton = new SmallPushButton(tr("Editor"), vtab), SIGNAL(clicked()),
                 this, SLOT(edit_description()));
+        vtab->addWidget(sButton);
+    }
 
-    comment = new MultiLineEdit(grid);
+    grid->addWidget(comment = new MultiLineEdit(grid));
     comment->setReadOnly(visit);
     comment->setText(bn->get_comment());
     comment->setFont(font);
@@ -122,19 +127,19 @@ UseCaseDialog::UseCaseDialog(UseCaseData * u)
 
     // USER : list key - value
 
-    grid = new Q3Grid(2, this);
+    grid = new GridBox(2, this);
     grid->setMargin(5);
     grid->setSpacing(5);
 
-    kvtable = new KeyValuesTable(bn, grid, visit);
-    addTab(grid, TR("Properties"));
+    grid->addWidget(kvtable = new KeyValuesTable(bn, grid, visit));
+    addTab(grid, tr("Properties"));
 
     open_dialog(this);
 }
 
 void UseCaseDialog::polish()
 {
-    Q3TabDialog::polish();
+    TabDialog::ensurePolished();
     UmlDesktop::limitsize_move(this, previous_size, 0.8, 0.8);
 }
 
@@ -143,8 +148,9 @@ UseCaseDialog::~UseCaseDialog()
     uc->browser_node->edit_end();
     previous_size = size();
 
-    while (!edits.isEmpty())
-        edits.take(0)->close();
+    foreach (BodyDialog *dialog, edits)
+        dialog->close();
+    edits.clear();
 
     close_dialog(this);
 }
@@ -152,7 +158,7 @@ UseCaseDialog::~UseCaseDialog()
 void UseCaseDialog::edit_description()
 {
     edit(comment->text(),
-         edname->text().stripWhiteSpace() + "_description",
+         edname->text().trimmed() + "_description",
          uc, TxtEdit, this, (post_edit) post_edit_description, edits);
 }
 
@@ -166,27 +172,27 @@ void UseCaseDialog::accept()
     if (!check_edits(edits) || !kvtable->check_unique())
         return;
 
-    QString s = edname->text().stripWhiteSpace();
+    QString s = edname->text().trimmed();
     BrowserNode * bn = uc->browser_node;
 
     if ((s != bn->get_name()) &&
         ((BrowserNode *) bn->parent())->wrong_child_name(s, UmlUseCase,
                 bn->allow_spaces(),
                 bn->allow_empty())) {
-        msg_critical(TR("Error"), edname->text() + TR("\n\nillegal name or already used"));
+        msg_critical(tr("Error"), edname->text() + tr("\n\nillegal name or already used"));
         return;
     }
     else
         bn->set_name(s);
 
-    bool newst = uc->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace()));
+    bool newst = uc->set_stereotype(fromUnicode(edstereotype->currentText().trimmed()));
 
     bn->set_comment(comment->text());
     UmlWindow::update_comment_if_needed(bn);
 
     kvtable->updateNodeFromThis(bn);
 
-    uc->set_extension_points(extension_points->text().stripWhiteSpace());
+    uc->set_extension_points(extension_points->text().trimmed());
 
     ProfiledStereotypes::modified(bn, newst);
 
@@ -194,5 +200,5 @@ void UseCaseDialog::accept()
     bn->package_modified();
     uc->modified();
 
-    Q3TabDialog::accept();
+    TabDialog::accept();
 }
diff --git a/src/dialog/UseCaseDialog.h b/src/dialog/UseCaseDialog.h
index 0bd1883bc..f436e0c3c 100644
--- a/src/dialog/UseCaseDialog.h
+++ b/src/dialog/UseCaseDialog.h
@@ -28,32 +28,27 @@
 #ifndef USECASEDIALOG_H
 #define USECASEDIALOG_H
 
+#include <tabdialog.h>
 
-
-
-#include <q3ptrlist.h>
-#include <q3ptrlist.h>
-#include <q3tabdialog.h>
-
-class Q3ComboBox;
+class QComboBox;
 class LineEdit;
 class MultiLineEdit;
 class UseCaseData;
 class KeyValuesTable;
 class BodyDialog;
 
-class UseCaseDialog : public Q3TabDialog
+class UseCaseDialog : public TabDialog
 {
     Q_OBJECT
 
 protected:
     UseCaseData * uc;
     LineEdit * edname;
-    Q3ComboBox * edstereotype;
+    QComboBox * edstereotype;
     MultiLineEdit * extension_points;
     MultiLineEdit * comment;
     KeyValuesTable * kvtable;
-    Q3PtrList<BodyDialog> edits;
+    QList<BodyDialog *> edits;
 
     static QSize previous_size;
 
@@ -65,7 +60,7 @@ class UseCaseDialog : public Q3TabDialog
 
 protected slots:
     virtual void polish();
-    virtual void accept();
+    virtual void accept() override;
     void edit_description();
 };
 
diff --git a/src/dialog/VisibilityGroup.cpp b/src/dialog/VisibilityGroup.cpp
index 1df5265d3..d44e6a152 100644
--- a/src/dialog/VisibilityGroup.cpp
+++ b/src/dialog/VisibilityGroup.cpp
@@ -29,23 +29,29 @@
 
 
 
-#include <q3buttongroup.h>
+#include <qgroupbox.h>
 #include <qradiobutton.h>
 
 #include "VisibilityGroup.h"
-
-Q3ButtonGroup * VisibilityGroup::init(QWidget * parent, UmlVisibility v, bool pack_allowed,
-                                      const char * title,
-                                      const char * default_prefix)
+#include "bbuttongroup.h"
+BButtonGroup * VisibilityGroup::init(QWidget * parent, UmlVisibility v, bool pack_allowed,
+                                      QString title,
+                                      QString default_prefix)
 {
     if (!bgroup) {
-        bgroup = new Q3ButtonGroup((default_prefix != 0) ? 5 : 4, Qt::Horizontal, title, parent);
+        bgroup = new BButtonGroup(/*(default_prefix != 0) ? 5 : 4, Qt::Horizontal,*/ title, parent);
         public_rb = new QRadioButton("public", bgroup);
+        bgroup->addWidget(public_rb);
         protected_rb = new QRadioButton("protected", bgroup);
+        bgroup->addWidget(protected_rb);
         private_rb = new QRadioButton("private", bgroup);
+        bgroup->addWidget(private_rb);
         package_rb = (pack_allowed) ? new QRadioButton("package", bgroup) : 0;
+        if(package_rb)
+            bgroup->addWidget(package_rb);
         default_visibility_rb =
             new QRadioButton(default_pfix + " (protected)", bgroup);
+        bgroup->addWidget(default_visibility_rb);
     }
 
     bgroup->setExclusive(TRUE);
diff --git a/src/dialog/VisibilityGroup.h b/src/dialog/VisibilityGroup.h
index 4ffa6a291..649cd1174 100644
--- a/src/dialog/VisibilityGroup.h
+++ b/src/dialog/VisibilityGroup.h
@@ -33,12 +33,12 @@
 #include "UmlEnum.h"
 
 class QRadioButton;
-class Q3ButtonGroup;
+class BButtonGroup;
 
 class VisibilityGroup
 {
 protected:
-    Q3ButtonGroup * bgroup;
+    BButtonGroup * bgroup;
     QRadioButton * public_rb;
     QRadioButton * protected_rb;
     QRadioButton * private_rb;
@@ -52,10 +52,10 @@ class VisibilityGroup
         bgroup = 0;
     }
 
-    Q3ButtonGroup * init(QWidget * parent,
+    BButtonGroup * init(QWidget * parent,
                          UmlVisibility v,
                          bool pack_allowed = 0,
-                         const char * title = 0, const char * default_prefix = 0);
+                         QString title = QString(), QString default_prefix = 0);
     void update_default(const VisibilityGroup & default_grp);
     void connect(const char *, QWidget *, const char *);
     void follow(const VisibilityGroup & other);
diff --git a/src/dialog/edgemenudialogbase.cpp b/src/dialog/edgemenudialogbase.cpp
index ce7541f2d..a3745ef36 100644
--- a/src/dialog/edgemenudialogbase.cpp
+++ b/src/dialog/edgemenudialogbase.cpp
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -53,16 +53,17 @@ void EdgeMenuDialogBase::PickNextSibling()
 
     while (continueSearch)
     {
+
         nextNode = dynamic_cast<BrowserNode *>(currentNode->itemAbove());
         QLOG_INFO() << "CurrentNode is: "<< currentNode->get_name();
-
-        QLOG_INFO() << "NEXT: " << nextNode->get_name() << " " << nextNode->depth();
         if (!nextNode)
             break;
 
+        QLOG_INFO() << "NEXT: " << nextNode->get_name() << " " << nextNode->depth();
+
+
         QLOG_INFO() << "NextNode is: "<< nextNode->get_name();
         bool sameLevel = originalNode->depth() == nextNode->depth();
-
         bool sameType = originalNode->get_stype() == nextNode->get_stype();
 
         QLOG_INFO() << originalNode->get_stype();
@@ -111,7 +112,6 @@ void EdgeMenuDialogBase::PickPreviousSibling()
 
         currentNode = previousNode;
     }
-
     if (previousNode == 0)
         return;
 
@@ -121,7 +121,11 @@ void EdgeMenuDialogBase::PickPreviousSibling()
 
 void EdgeMenuDialogBase::SetToolBar(EdgeMenuToolBar * newToolbar)
 {
+#ifdef EDGETOOLENABLED
     toolbar = newToolbar;
+#else
+    Q_UNUSED(newToolbar);
+#endif
 }
 
 void EdgeMenuDialogBase::InitGui()
diff --git a/src/dialog/edgemenudialogbase.h b/src/dialog/edgemenudialogbase.h
index 85d8e9c77..ce9c07650 100644
--- a/src/dialog/edgemenudialogbase.h
+++ b/src/dialog/edgemenudialogbase.h
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -71,7 +71,9 @@ class EdgeMenuDialogBase
     void SetToolBar(EdgeMenuToolBar*);
 
     bool isConnectedToToolBar;
+#ifdef EDGETOOLENABLED
     EdgeMenuToolBar* toolbar = 0;
+#endif
     BrowserNode * currentNode;
     EWidgetModificationMode modificationMode;
     QPoint modificationOrigin;
diff --git a/src/dialog/edgemenudialogqt4.h b/src/dialog/edgemenudialogqt4.h
index 5568aedfd..ab73b68b5 100644
--- a/src/dialog/edgemenudialogqt4.h
+++ b/src/dialog/edgemenudialogqt4.h
@@ -21,8 +21,10 @@
 // e-mail : doumleditor@gmail.com
 //
 // *************************************************************************
+
 #ifndef EDGEMENUDIALOGQT4_H
 #define EDGEMENUDIALOGQT4_H
+
 #include <QWidget>
 #include <QMouseEvent>
 #include <QList>
@@ -32,8 +34,11 @@
 #include "CustomWidgets/MultiPurposeDragArea.h"
 #include "CustomWidgets/EdgeMenuToolBar.h"
 #include "edgemenudialogbase.h"
+
 unsigned int ClosestEdge(QWidget *, QPoint);
+
 class BrowserNode;
+
 class EdgeMenuDialogQt4 : public QDialog, public EdgeMenuDialogBase
 {
     Q_OBJECT
@@ -54,48 +59,48 @@ class EdgeMenuDialogQt4 : public QDialog, public EdgeMenuDialogBase
 protected:
 
     //! called when user leaves the window
-    void leaveEvent(QEvent * event);
+    virtual void leaveEvent(QEvent * event) override;
 
     //! called when user enters the window
-    void enterEvent(QEvent * event) override;
+    virtual void enterEvent(QEvent * event) override;
 
-    void closeEvent(QCloseEvent *) override;
+    virtual void closeEvent(QCloseEvent *) override;
 
-    void hideEvent(QHideEvent *) override;
+    virtual void hideEvent(QHideEvent *) override;
 
-    void moveEvent(QMoveEvent *) override;
+    virtual void moveEvent(QMoveEvent *) override;
 
-    void focusOutEvent(QFocusEvent *) override;
+    virtual void focusOutEvent(QFocusEvent *) override;
 
     //! called on window show()
-    void showEvent(QShowEvent * event);
+    virtual void showEvent(QShowEvent * event) override;
     //! called when user srolls with mouse wheel
 
 
     //! if data contains unsaved changes this shoould pop up to warn the user
     void ShowSaveDataWarning();
 
-    void IntitiateMove(QPoint);
-    void InitiateResize(QPoint);
-    void ResizeThis(QPoint, QPoint);
+    virtual void IntitiateMove(QPoint) override;
+    virtual void InitiateResize(QPoint) override;
+    virtual void ResizeThis(QPoint, QPoint) override;
     void MoveThis(QPoint, QPoint);
 
     //! Returns the current node associated with this dialog
-    virtual BrowserNode * GetCurrentNode();
+    virtual BrowserNode * GetCurrentNode() override;
     //! Assigns a browser node(listview node effectively) to this dialog
     void SetCurrentNode(BrowserNode *);
 
     // these functions should be pure virtual in the end
     //! Initializes GUI elements
-    virtual void InitGui();
+    virtual void InitGui() override;
     //! fills GUI elements with values from a new BrowserNode
-    virtual void FillGuiElements(BrowserNode *);
+    virtual void FillGuiElements(BrowserNode *) override;
     //! Tells if there have been any changes in the data associated with the dialog
     bool ContainsUnsavedChanges();
     //! Called on accept() and saves GUI elements
-    virtual bool SaveData();
+    virtual bool SaveData() override;
     //! Called on reject() and discards gui data
-    virtual void RejectData();
+    virtual void RejectData() override;
 
 
 
diff --git a/src/dialog/tabdialog.cpp b/src/dialog/tabdialog.cpp
new file mode 100644
index 000000000..32b593022
--- /dev/null
+++ b/src/dialog/tabdialog.cpp
@@ -0,0 +1,110 @@
+#include "tabdialog.h"
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+TabDialog::TabDialog(QWidget *parent, QString name, bool modal, Qt::WidgetAttribute f) :
+    QDialog(parent/*, f*/),
+    m_okButton(NULL), m_cancelButton(NULL), m_helpButton(NULL)
+{
+    if(f != Qt::WA_Disabled)
+        setAttribute(f);
+    setWindowTitle(name);
+    setModal(modal);
+    m_tabWidget = new QTabWidget(this);
+    QVBoxLayout *layout = new QVBoxLayout();
+    this->setLayout(layout);
+
+    m_buttonLayout = new QHBoxLayout();
+    layout->addWidget(m_tabWidget);
+    layout->addLayout(m_buttonLayout);
+    connect(m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(onCurrentTabChanged(int)));
+
+
+}
+
+void TabDialog::addTab(QWidget *tabWidget, QString name)
+{
+    m_tabWidget->addTab(tabWidget, name);
+}
+void TabDialog::insertTab(QWidget *tabWidget, QString name, int index)
+{
+    m_tabWidget->addTab(tabWidget, name);
+    m_tabWidget->insertTab(index, tabWidget,name);
+}
+
+void TabDialog::setTabEnabled(QWidget *w, bool isEnabled)
+{
+    m_tabWidget->setTabEnabled(m_tabWidget->indexOf(w), isEnabled);
+}
+
+void TabDialog::onCurrentTabChanged(int i)
+{
+    emit currentChanged(m_tabWidget->widget(i));
+}
+void TabDialog::removePage(QWidget *page)
+{
+    m_tabWidget->removeTab(m_tabWidget->indexOf(page));
+}
+
+void TabDialog::setOkButton(QString name)
+{
+    if(name.isEmpty()){
+        if(m_okButton)
+        {
+            delete m_okButton;
+            m_okButton = NULL;
+        }
+        return;
+    }
+    if(m_okButton)
+        return;
+    m_okButton = new QPushButton(name,this);
+    connect(m_okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    m_buttonLayout->addWidget(m_okButton);
+}
+
+void TabDialog::setCancelButton(QString name)
+{
+    if(name.isEmpty()){
+        if(m_cancelButton)
+        {
+            delete m_cancelButton;
+            m_cancelButton = NULL;
+        }
+        return;
+    }
+    if(m_cancelButton)
+        return;
+    m_cancelButton = new QPushButton(name,this);
+    connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+    m_buttonLayout->addWidget(m_cancelButton);
+}
+
+void TabDialog::setHelpButton(QString name)
+{
+    if(name.isEmpty()){
+        if(m_helpButton)
+        {
+            delete m_helpButton;
+            m_helpButton = NULL;
+        }
+        return;
+    }
+    if(m_helpButton)
+        return;
+    m_helpButton = new QPushButton(name,this);
+    connect(m_helpButton, SIGNAL(clicked()), this, SIGNAL(helpButtonPressed()));
+    m_buttonLayout->addWidget(m_helpButton);
+
+}
+
+void TabDialog::showPage(QWidget *page)
+{
+    m_tabWidget->setCurrentWidget(page);
+}
+
+void TabDialog::setCaption(QString cap)
+{
+    setWindowTitle(cap);
+}
+
diff --git a/src/dialog/tabdialog.h b/src/dialog/tabdialog.h
new file mode 100644
index 000000000..10162e477
--- /dev/null
+++ b/src/dialog/tabdialog.h
@@ -0,0 +1,43 @@
+#ifndef TABDIALOG_H
+#define TABDIALOG_H
+
+#include <QDialog>
+#include <QTabWidget>
+#include "QScrollArea"
+class QHBoxLayout;
+class TabDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit TabDialog(QWidget * parent = 0, QString name = QString(), bool modal = false, Qt::WidgetAttribute f = Qt::WA_Disabled);
+    void addTab(QWidget* tabWidget, QString name);
+    void removePage(QWidget* page);
+    void setOkButton(QString name);
+    void setCancelButton(QString name);
+    void setHelpButton(QString name);
+    void showPage(QWidget* page);
+    void setCaption(QString cap);
+    bool hasOkButton( ) {return (m_okButton != NULL);}
+
+    void insertTab(QWidget *tabWidget, QString name, int index);
+
+    QTabBar *tabBar(){ return m_tabWidget->tabBar();}
+
+    void setTabEnabled(QWidget *w, bool isEnabled);
+signals:
+    void currentChanged(QWidget *);
+    void helpButtonPressed();
+public slots:
+    void onCurrentTabChanged(int i);
+private:
+protected:
+    QTabWidget* m_tabWidget;
+    QPushButton *m_okButton;
+    QPushButton *m_cancelButton;
+    QPushButton *m_helpButton;
+    QHBoxLayout *m_buttonLayout;
+    QScrollArea m_scrollArea;
+
+};
+
+#endif // TABDIALOG_H
diff --git a/src/dialog/tablewidgetitemdelegate.cpp b/src/dialog/tablewidgetitemdelegate.cpp
new file mode 100644
index 000000000..0f2b30e52
--- /dev/null
+++ b/src/dialog/tablewidgetitemdelegate.cpp
@@ -0,0 +1,104 @@
+#include "tablewidgetitemdelegate.h"
+#include <QComboBox>
+#include "ComboItem.h"
+#include "MLinesItem.h"
+TableWidgetItemDelegate::TableWidgetItemDelegate(QTableWidget *parent, bool edit)
+    : QStyledItemDelegate(parent), isEditable(edit)
+{
+    m_tableWidget = parent;
+}
+
+QWidget *TableWidgetItemDelegate::createEditor(QWidget *parent,
+                                               const QStyleOptionViewItem & option ,
+                                               const QModelIndex & index ) const
+{
+    if(m_tableWidget->item(index.row(), index.column())) //no item is set in read only mode
+    {
+        if(m_tableWidget->item(index.row(), index.column())->type() == TableItem::ComboType)
+        {
+            QComboBox *editor = new QComboBox(parent);
+            return editor;
+        }
+        else if(m_tableWidget->item(index.row(), index.column())->type() == TableItem::MLinesType)
+        {
+            QTextEdit *editor = new QTextEdit(parent);
+            return editor;
+        }
+    }
+    return QStyledItemDelegate::createEditor(parent, option, index);
+}
+
+void TableWidgetItemDelegate::setEditorData(QWidget *editor,
+                                            const QModelIndex &index) const
+{
+    if(m_tableWidget->item(index.row(), index.column())) //no item is set in read only mode
+    {
+        if(m_tableWidget->item(index.row(), index.column())->type() == TableItem::ComboType)
+        {
+            if(m_tableWidget->item(index.row(), index.column()))
+            {
+                ComboItem *it = static_cast<ComboItem *> (m_tableWidget->item(index.row(), index.column()));
+                m_types = it->getTypes();
+                isEditable = it->getEditable();
+            }
+            QComboBox *cb = static_cast<QComboBox*>(editor);
+            cb->clear();
+            cb->setEditable(isEditable);
+            if(index.model()->data(index, Qt::DisplayRole).isValid())
+                cb->addItem(index.model()->data(index, Qt::DisplayRole).toString());
+            cb->addItems(m_types);
+            cb->setAutoCompletion(completion());
+            int cbIndex = m_types.indexOf(index.model()->data(index, Qt::DisplayRole).toString());
+            if (cbIndex != -1)
+                cb->setCurrentIndex(cbIndex + 1);
+            return;
+        }
+        else if(m_tableWidget->item(index.row(), index.column())->type() == TableItem::MLinesType)
+        {
+            QTextEdit *te = static_cast<QTextEdit*>(editor);
+            te->clear();
+            te->setReadOnly(false);
+            te->setText(index.model()->data(index, Qt::DisplayRole).toString());
+            return;
+        }
+    }
+    QStyledItemDelegate::setEditorData(editor, index);
+}
+
+void TableWidgetItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
+                                           const QModelIndex &index) const
+{
+    if(m_tableWidget->item(index.row(), index.column())) //no item is set in read only mode
+    {
+        if(m_tableWidget->item(index.row(), index.column())->type() == TableItem::ComboType)
+        {
+            QComboBox *cb = static_cast<QComboBox*>(editor);
+            model->setData(index, cb->currentText(), Qt::EditRole);
+            return;
+        }
+        else if(m_tableWidget->item(index.row(), index.column())->type() == TableItem::MLinesType)
+        {
+            QTextEdit *te = static_cast<QTextEdit*>(editor);
+            model->setData(index, te->toPlainText(), Qt::EditRole);
+            return;
+        }
+    }
+    QStyledItemDelegate::setModelData(editor, model, index);
+
+}
+
+
+void TableWidgetItemDelegate::setTypes(QStringList &value)
+{
+    m_types = value;
+}
+bool TableWidgetItemDelegate::getEditable() const
+{
+    return isEditable;
+}
+
+void TableWidgetItemDelegate::setEditable(bool value)
+{
+    isEditable = value;
+}
+
diff --git a/src/dialog/tablewidgetitemdelegate.h b/src/dialog/tablewidgetitemdelegate.h
new file mode 100644
index 000000000..e77fd874e
--- /dev/null
+++ b/src/dialog/tablewidgetitemdelegate.h
@@ -0,0 +1,27 @@
+#ifndef TABLEWIDGETITEMDELEGATE_H
+#define TABLEWIDGETITEMDELEGATE_H
+#include <QStyledItemDelegate>
+#include <QTableWidget>
+class TableWidgetItemDelegate : public QStyledItemDelegate
+{
+public:
+    TableWidgetItemDelegate(QTableWidget *parent = 0, bool edit = true);
+
+     virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
+                           const QModelIndex &index) const;
+
+     virtual void setEditorData(QWidget *editor, const QModelIndex &index) const;
+     virtual void setModelData(QWidget *editor, QAbstractItemModel *model,
+                       const QModelIndex &index) const;
+     void setTypes(QStringList &value);
+
+     bool getEditable() const;
+     void setEditable(bool value);
+
+private:
+     mutable QStringList m_types;
+     mutable bool isEditable;
+     QTableWidget *m_tableWidget;
+};
+
+#endif // TABLEWIDGETITEMDELEGATE_H
diff --git a/src/dialog/version.h b/src/dialog/version.h
new file mode 100644
index 000000000..44eed4a21
--- /dev/null
+++ b/src/dialog/version.h
@@ -0,0 +1,36 @@
+// *************************************************************************
+//
+// Copyright 2004-2010 Bruno PAGES  .
+// Copyright 2012-2013 Nikolai Marchenko.
+// Copyright 2012-2013 Leonardo Guilherme.
+//
+// This file is part of the DOUML Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+// home   : http://sourceforge.net/projects/douml
+//
+// *************************************************************************
+
+#ifndef VERSION_H
+
+#define DOUML_VERSION    "1.0.8"
+
+#define DOUML_BUILD_DATE  __DATE__
+#define DOUML_BUILD_TIME   __TIME__
+
+
+#endif /* VERSION_H */
diff --git a/src/douml.pro b/src/douml.pro
index 3ff76651c..12375523b 100644
--- a/src/douml.pro
+++ b/src/douml.pro
@@ -1,573 +1,665 @@
 TEMPLATE  =  app
 INCLUDEPATH    += browser data diagram dialog misc tool xpm
 DEPENDPATH += browser data diagram dialog misc tool xpm
-INCLUDEPATH += boost src ui .. $$PWD
-#CONFIG        += qt warn_on debug
-CONFIG(debug, debug|release) {
-    CONFIG -= debug release
-    CONFIG += qt warn_on debug
-    QMAKE_POST_LINK = " "
-}
-CONFIG(release, debug|release) {
-    CONFIG -= debug release
-    CONFIG += qt release
-    QMAKE_POST_LINK = " "
-}
+INCLUDEPATH += boost src ui ..  Libs/L_UniversalModels
+CONFIG += qt warn_on c++11
+QMAKE_POST_LINK = " "
+
+DEFINES += QT_DEPRECATED_WARNINGS
+
 HEADERS        = \
-        data/ActualParamData.h \
-        data/BasicData.h \
-        data/SimpleData.h \
-        data/ClassMemberData.h \
-        data/AttributeData.h \
-        data/ExtraMemberData.h \
-        data/ClassData.h \
-        data/ArtifactData.h \
-        data/ExceptionData.h \
-        data/FormalParamData.h \
-        data/HaveKeyValueData.h \
-        data/KeyValueData.h \
-        data/OperationData.h \
-        data/PackageData.h \
-        data/ParamData.h \
-        data/RelationData.h \
-        data/SimpleRelationData.h \
-        data/TransitionData.h \
-        data/StateData.h \
-        data/PseudoStateData.h \
-        data/StateActionData.h \
-        data/ActivityData.h \
-        data/ParameterData.h \
-        data/ObjectData.h \
-        data/PinParamData.h \
-        data/ParameterSetData.h \
-        data/InfoData.h \
-        data/ActivityActionData.h \
-        data/PinData.h \
-        data/ExpansionRegionData.h \
-        data/ActivityObjectData.h \
-        data/ActivityPartitionData.h \
-        data/FlowData.h \
-        data/ClassInstanceData.h \
-        data/UseCaseData.h \
-        diagram/ArrowCanvas.h \
-        diagram/HubCanvas.h \
-        diagram/AssocContainCanvas.h \
-        diagram/ArrowPointCanvas.h \
-        diagram/BrowserView.h \
-        diagram/CdClassCanvas.h \
-        diagram/ClassDiagramView.h \
-        diagram/ClassDiagramWindow.h \
-        diagram/DiagramCanvas.h \
-        diagram/DiagramItem.h \
-        diagram/DiagramView.h \
-        diagram/DiagramWindow.h \
-        diagram/FragmentCanvas.h \
-        diagram/SubjectCanvas.h \
-        diagram/LabelCanvas.h \
-        diagram/NoteCanvas.h \
-        diagram/ImageCanvas.h \
-        diagram/PackageCanvas.h \
-        diagram/RelationCanvas.h \
-        diagram/SimpleRelationCanvas.h \
-        diagram/TransitionCanvas.h \
-        diagram/ObjectLinkCanvas.h \
-        diagram/ClassInstCanvas.h \
-        diagram/SdClassInstCanvas.h \
-        diagram/SdDurationCanvas.h \
-        diagram/SdContinuationCanvas.h \
-        diagram/SdLifeLineCanvas.h \
-        diagram/SdMsgBaseCanvas.h \
-        diagram/SdMsgCanvas.h \
-        diagram/SdObjCanvas.h \
-        diagram/SdLostFoundMsgSupportCanvas.h \
-        diagram/SdSelfMsgCanvas.h \
-        diagram/SelectAreaCanvas.h \
-        diagram/SeqDiagramView.h \
-        diagram/SeqDiagramWindow.h \
-        diagram/TextCanvas.h \
-        diagram/IconCanvas.h \
-        diagram/UcClassCanvas.h \
-        diagram/UcUseCaseCanvas.h \
-        diagram/UmlCanvas.h \
-        diagram/UmlWindow.h \
-        diagram/UmlDesktop.h \
-        diagram/UseCaseDiagramView.h \
-        diagram/UseCaseDiagramWindow.h \
-        diagram/ColDiagramView.h \
-        diagram/ColDiagramWindow.h \
-        diagram/ObjectDiagramView.h \
-        diagram/ObjectDiagramWindow.h \
-        diagram/CodClassInstCanvas.h \
-        diagram/OdClassInstCanvas.h \
-        diagram/CodObjCanvas.h \
-        diagram/CodLinkCanvas.h \
-        diagram/CodSelfLinkCanvas.h \
-        diagram/CodDirsCanvas.h \
-        diagram/ComponentDiagramView.h \
-        diagram/ComponentDiagramWindow.h \
-        diagram/DeploymentDiagramView.h \
-        diagram/DeploymentDiagramWindow.h \
-        diagram/ComponentCanvas.h \
-        diagram/ArtifactCanvas.h \
-        diagram/DeploymentNodeCanvas.h \
-        diagram/ArrowJunctionCanvas.h \
-        diagram/StateDiagramView.h \
-        diagram/StateDiagramWindow.h \
-        diagram/StateCanvas.h \
-        diagram/PseudoStateCanvas.h \
-        diagram/StateActionCanvas.h \
-        diagram/ActivityDiagramView.h \
-        diagram/ActivityDiagramWindow.h \
-        diagram/ActivityContainerCanvas.h \
-        diagram/ActivityCanvas.h \
-        diagram/ActivityNodeCanvas.h \
-        diagram/ActivityActionCanvas.h \
-        diagram/ParameterCanvas.h \
-        diagram/PinCanvas.h \
-        diagram/InfoCanvas.h \
-        diagram/ParameterSetCanvas.h \
-        diagram/InterruptibleActivityRegionCanvas.h \
-        diagram/ExpansionRegionCanvas.h \
-        diagram/ActivityObjectCanvas.h \
-        diagram/ActivityPartitionCanvas.h \
-        diagram/ExpansionNodeCanvas.h \
-        diagram/FlowCanvas.h \
-        diagram/FragmentSeparatorCanvas.h \
-        diagram/ConstraintCanvas.h \
-        diagram/StereotypePropertiesCanvas.h \
-        dialog/AttributeDialog.h \
-        dialog/ExtraMemberDialog.h \
-        dialog/BasicDialog.h \
-        dialog/ClassDialog.h \
-        dialog/ClassListDialog.h \
-        dialog/ClassViewDialog.h \
-        dialog/ClassSettingsDialog.h \
-        dialog/RevSettingsDialog.h \
-        dialog/HelpRegexpDialog.h \
-        dialog/FragmentDialog.h \
-        dialog/ContinuationDialog.h \
-        dialog/ComboItem.h \
-        dialog/MyTable.h \
-        dialog/ComponentDialog.h \
-        dialog/ArtifactDialog.h \
-        dialog/GenerationSettingsDialog.h \
-        dialog/SettingsDialog.h \
-        dialog/KeyValueTable.h \
-        dialog/MLEDialog.h \
-        dialog/ReferenceDialog.h \
-        dialog/SourceDialog.h \
-        dialog/BodyDialog.h \
-        dialog/MLinesItem.h \
-        dialog/MyInputDialog.h \
-        dialog/OperationDialog.h \
-        dialog/OperationListDialog.h \
-        dialog/PackageDialog.h \
-        dialog/RelationDialog.h \
-        dialog/SimpleRelationDialog.h \
-        dialog/StateDialog.h \
-        dialog/PseudoStateDialog.h \
-        dialog/StateActionDialog.h \
-        dialog/TransitionDialog.h \
-        dialog/InstanceDialog.h \
-        dialog/ClassInstanceDialog.h \
-        dialog/SdMsgDialog.h \
-        dialog/StereotypeDialog.h \
-        dialog/StereotypesDialog.h \
-        dialog/StringTable.h \
-        dialog/ToolDialog.h \
-        dialog/TraceDialog.h \
-        dialog/VisibilityGroup.h \
-        dialog/CodAddMsgDialog.h \
-        dialog/CodEditMsgDialog.h \
-        dialog/MenuFont.h \
-        dialog/ColMsgTable.h \
-        dialog/CodChangeMsgDialog.h \
-        dialog/HideShowDialog.h \
-        dialog/BrowserSearchDialog.h \
-        dialog/DialogTimer.h \
-        dialog/SaveProgress.h \
-        dialog/AnnotationDialog.h \
-        dialog/ObjectLinkDialog.h \
-        dialog/ActivityDialog.h \
-        dialog/ParameterDialog.h \
-        dialog/ParameterSetDialog.h \
-        dialog/PinDialog.h \
-        dialog/ActivityActionDialog.h \
-        dialog/ExpansionRegionDialog.h \
-        dialog/ActivityObjectDialog.h \
-        dialog/ActivityPartitionDialog.h \
-        dialog/FlowDialog.h \
-        dialog/ShortcutDialog.h \
-        dialog/UseCaseDialog.h \
-        dialog/ConstraintDialog.h \
-        dialog/DecoratorDialog.h \
-        dialog/HelpDialog.h \
-        dialog/EnvDialog.h \
-        dialog/GreetingsDialog.h \
-        dialog/RelatedElementsDialog.h \
-        dialog/ImageDialog.h \
-        dialog/DialogUtil.h \
-        misc/Settings.h \
-        misc/UmlDrag.h \
-        misc/UmlEnum.h \
-        misc/UmlGlobal.h \
-        misc/Labeled.h \
-        misc/myio.h \
-        misc/mu.h \
-        misc/ProfiledStereotypes.h \
-        misc/Images.h \
-        tool/Tool.h \
-        tool/Socket.h \
-        tool/ToolCom.h \
-        xpm/UmlPixmap.h \
-        ui/menufactory.h \
-        Factories/EdgeMenuFactory.h \
-        dialog/EdgeMenuDialog.h \
-        CustomWidgets/EdgeMenuToolBar.h \
-        Factories/DialogConnections.h \
-        Factories/EdgeToolBarCreation.h \
-        CustomWidgets/MultiPurposeDragArea.h \
-        misc/ClipboardManager.h \
-        ui/operationwidgetcpp.h \
-    ui/constructorinitializerdialog.h \
-    tagmanagement/cpptagmanagement.h \
+    browser/BrowserActivityAction.h \
+    browser/BrowserActivityDiagram.h \
+    browser/BrowserActivityElement.h \
+    browser/BrowserActivity.h \
+    browser/BrowserActivityNode.h \
+    browser/BrowserActivityObject.h \
+    browser/BrowserActivityPartition.h \
+    browser/BrowserArtifact.h \
+    browser/BrowserAttribute.h \
+    browser/BrowserClassDiagram.h \
+    browser/BrowserClass.h \
+    browser/BrowserClassInstance.h \
+    browser/BrowserClassView.h \
+    browser/BrowserColDiagram.h \
+    browser/BrowserComponentDiagram.h \
+    browser/BrowserComponent.h \
+    browser/BrowserComponentView.h \
+    browser/BrowserDeploymentDiagram.h \
+    browser/BrowserDeploymentNode.h \
+    browser/BrowserDeploymentView.h \
+    browser/BrowserDiagram.h \
+    browser/BrowserExpansionNode.h \
+    browser/BrowserExpansionRegion.h \
+    browser/BrowserExtraMember.h \
+    browser/BrowserFlow.h \
+    browser/BrowserInterruptibleActivityRegion.h \
+    browser/BrowserNodeDummy.h \
+    browser/BrowserNode.h \
+    browser/BrowserObjectDiagram.h \
+    browser/BrowserOperationAttribute.h \
+    browser/BrowserOperation.h \
+    browser/BrowserPackage.h \
+    browser/BrowserParameter.h \
+    browser/BrowserParameterSet.h \
+    browser/BrowserPin.h \
+    browser/BrowserPseudoState.h \
+    browser/BrowserRegion.h \
+    browser/BrowserRelation.h \
+    browser/BrowserSeqDiagram.h \
+    browser/BrowserSimpleRelation.h \
+    browser/BrowserStateAction.h \
+    browser/BrowserStateDiagram.h \
+    browser/BrowserState.h \
+    browser/BrowserTransition.h \
+    browser/BrowserUseCaseDiagram.h \
+    browser/BrowserUseCase.h \
+    browser/BrowserUseCaseView.h \
+    browserfunctions/operationfuncs.h \
+    CustomWidgets/EdgeMenuToolBar.h \
+    CustomWidgets/GenericDelegate.h \
+    CustomWidgets/MultiPurposeDragArea.h \
+    CustomWidgets/quickedit.h \
+    data/ActivityActionData.h \
+    data/ActivityData.h \
+    data/ActivityObjectData.h \
+    data/ActivityPartitionData.h \
+    data/ActualParamData.h \
+    data/ArtifactData.h \
+    data/AttributeData.h \
+    data/AType.h \
+    data/BasicData.h \
+    data/ClassData.h \
+    data/ClassInstanceData.h \
+    data/ClassMemberData.h \
+    data/ExceptionData.h \
+    data/ExpansionRegionData.h \
+    data/ExtraMemberData.h \
+    data/FlowData.h \
+    data/FormalParamData.h \
+    data/HaveKeyValueData.h \
+    data/InfoData.h \
+    data/KeyValueData.h \
+    data/MultipleDependency.h \
+    data/ObjectData.h \
+    data/OperationData.h \
+    data/PackageData.h \
+    data/ParamData.h \
+    data/ParameterData.h \
+    data/ParameterSetData.h \
+    data/PinData.h \
+    data/PinParamData.h \
+    data/PseudoStateData.h \
+    data/RelationData.h \
+    data/SimpleData.h \
+    data/SimpleRelationData.h \
+    data/StateActionData.h \
+    data/StateData.h \
+    data/TransitionData.h \
+    data/UseCaseData.h \
+    diagram/ActivityActionCanvas.h \
+    diagram/ActivityCanvas.h \
+    diagram/ActivityContainerCanvas.h \
+    diagram/ActivityDiagramView.h \
+    diagram/ActivityDiagramWindow.h \
+    diagram/ActivityNodeCanvas.h \
+    diagram/ActivityObjectCanvas.h \
+    diagram/ActivityPartitionCanvas.h \
+    diagram/ArrowCanvas.h \
+    diagram/ArrowJunctionCanvas.h \
+    diagram/ArrowPointCanvas.h \
+    diagram/ArtifactCanvas.h \
+    diagram/AssocContainCanvas.h \
+    diagram/BrowserView.h \
+    diagram/CdClassCanvas.h \
+    diagram/ClassDiagramView.h \
+    diagram/ClassDiagramWindow.h \
+    diagram/ClassInstCanvas.h \
+    diagram/CodClassInstCanvas.h \
+    diagram/CodDirsCanvas.h \
+    diagram/CodLinkCanvas.h \
+    diagram/CodMsgSupport.h \
+    diagram/CodObjCanvas.h \
+    diagram/CodSelfLinkCanvas.h \
+    diagram/ColDiagramView.h \
+    diagram/ColDiagramWindow.h \
+    diagram/ColMsg.h \
+    diagram/ComponentCanvas.h \
+    diagram/ComponentDiagramView.h \
+    diagram/ComponentDiagramWindow.h \
+    diagram/ConstraintCanvas.h \
+    diagram/DeploymentDiagramView.h \
+    diagram/DeploymentDiagramWindow.h \
+    diagram/DeploymentNodeCanvas.h \
+    diagram/DiagramCanvas.h \
+    diagram/DiagramItem.h \
+    diagram/DiagramView.h \
+    diagram/DiagramWindow.h \
+    diagram/ExpansionNodeCanvas.h \
+    diagram/ExpansionRegionCanvas.h \
+    diagram/FlowCanvas.h \
+    diagram/FragmentCanvas.h \
+    diagram/FragmentSeparatorCanvas.h \
+    diagram/HubCanvas.h \
+    diagram/IconCanvas.h \
+    diagram/ImageCanvas.h \
+    diagram/InfoCanvas.h \
+    diagram/Instance.h \
+    diagram/InterruptibleActivityRegionCanvas.h \
+    diagram/LabelCanvas.h \
+    diagram/NoteCanvas.h \
+    diagram/ObjectDiagramView.h \
+    diagram/ObjectDiagramWindow.h \
+    diagram/ObjectLinkCanvas.h \
+    diagram/OdClassInstCanvas.h \
+    diagram/PackageCanvas.h \
+    diagram/ParameterCanvas.h \
+    diagram/ParameterSetCanvas.h \
+    diagram/PinCanvas.h \
+    diagram/PseudoStateCanvas.h \
+    diagram/RelationCanvas.h \
+    diagram/SdClassInstCanvas.h \
+    diagram/SdContinuationCanvas.h \
+    diagram/SdDurationCanvas.h \
+    diagram/SdDurationSupport.h \
+    diagram/SdLifeLineCanvas.h \
+    diagram/SdLostFoundMsgSupportCanvas.h \
+    diagram/SdMsgBaseCanvas.h \
+    diagram/SdMsgCanvas.h \
+    diagram/SdMsgSupport.h \
+    diagram/SdObjCanvas.h \
+    diagram/SdSelfMsgCanvas.h \
+    diagram/SelectAreaCanvas.h \
+    diagram/SeqDiagramView.h \
+    diagram/SeqDiagramWindow.h \
+    diagram/SimpleRelationCanvas.h \
+    diagram/StateActionCanvas.h \
+    diagram/StateCanvas.h \
+    diagram/StateDiagramView.h \
+    diagram/StateDiagramWindow.h \
+    diagram/StereotypePropertiesCanvas.h \
+    diagram/SubjectCanvas.h \
+    diagram/TemplateCanvas.h \
+    diagram/TextCanvas.h \
+    diagram/TransitionCanvas.h \
+    diagram/UcClassCanvas.h \
+    diagram/UcUseCaseCanvas.h \
+    diagram/UmlCanvas.h \
+    diagram/UmlDesktop.h \
+    diagram/UmlWindow.h \
+    diagram/UseCaseDiagramView.h \
+    diagram/UseCaseDiagramWindow.h \
+    dialog/About.h \
+    dialog/ActivityActionDialog.h \
+    dialog/ActivityDialog.h \
+    dialog/ActivityObjectDialog.h \
+    dialog/ActivityPartitionDialog.h \
+    dialog/AnnotationDialog.h \
+    dialog/ArtifactDialog.h \
+    dialog/AttributeDialog.h \
+    dialog/BasicDialog.h \
+    dialog/BodyDialog.h \
+    dialog/BrowserSearchDialog.h \
+#   dialog/CharSetDialog.h \
+    dialog/ClassDialog.h \
+    dialog/ClassInstanceDialog.h \
+#   dialog/ClassInstDialog.h \
+    dialog/ClassListDialog.h \
+    dialog/ClassSettingsDialog.h \
+    dialog/ClassViewDialog.h \
+    dialog/CodAddMsgDialog.h \
+    dialog/CodChangeMsgDialog.h \
+    dialog/CodEditMsgDialog.h \
+    dialog/ColMsgTable.h \
+    dialog/ComboItem.h \
+    dialog/ComponentDialog.h \
+    dialog/ConstraintDialog.h \
+    dialog/ContinuationDialog.h \
+    dialog/DecoratorDialog.h \
+    dialog/DialogTimer.h \
+    dialog/DialogUtil.h \
+    dialog/edgemenudialogbase.h \
+    dialog/EdgeMenuDialog.h \
     dialog/edgemenudialogqt4.h \
-    dialog/edgemenudialogbase.h
-
+#   dialog/Editable.h \
+    dialog/EnvDialog.h \
+    dialog/ExpansionRegionDialog.h \
+    dialog/ExtraMemberDialog.h \
+    dialog/FlowDialog.h \
+    dialog/FragmentDialog.h \
+    dialog/GenerationSettingsBuiltinTable.h \
+    dialog/GenerationSettingsDialog.h \
+    dialog/GreetingsDialog.h \
+    dialog/HelpDialog.h \
+    dialog/HelpRegexpDialog.h \
+    dialog/HideShowDialog.h \
+    dialog/ImageDialog.h \
+    dialog/InstanceDialog.h \
+    dialog/KeyValueTable.h \
+    dialog/ListBoxBrowserNode.h \
+#   dialog/MenuFont.h \
+    dialog/MLEDialog.h \
+    dialog/MLinesItem.h \
+    dialog/MyInputDialog.h \
+#   dialog/MyTabDialog.h \
+    dialog/MyTable.h \
+#   dialog/NodeInstDialog.h \
+    dialog/ObjectLinkDialog.h \
+    dialog/OperationDialog.h \
+    dialog/OperationListDialog.h \
+    dialog/PackageDialog.h \
+    dialog/ParameterDialog.h \
+    dialog/ParameterSetDialog.h \
+    dialog/PinDialog.h \
+    dialog/PseudoStateDialog.h \
+    dialog/ReferenceDialog.h \
+    dialog/RelatedElementsDialog.h \
+    dialog/RelationDialog.h \
+    dialog/RevSettingsDialog.h \
+    dialog/SaveProgress.h \
+    dialog/SdMsgDialog.h \
+    dialog/SettingsDialog.h \
+    dialog/ShortcutDialog.h \
+    dialog/SimpleRelationDialog.h \
+    dialog/SourceDialog.h \
+    dialog/StateActionDialog.h \
+    dialog/StateDialog.h \
+    dialog/StateSpec.h \
+    dialog/StereotypeDialog.h \
+    dialog/StereotypesDialog.h \
+    dialog/StringTable.h \
+    dialog/tabdialog.h \
+    dialog/tablewidgetitemdelegate.h \
+    dialog/ToolDialog.h \
+    dialog/TraceDialog.h \
+    dialog/TransitionDialog.h \
+    dialog/UseCaseDialog.h \
+    dialog/version.h \
+    dialog/VisibilityGroup.h \
+    Factories/DialogConnections.h \
+    Factories/EdgeMenuFactory.h \
+    Factories/EdgeToolBarCreation.h \
+    Logging/QsDebugOutput.h \
+    Logging/QsLog.h \
+    Logging/QsLogDest.h \
+    misc/ClipboardManager.h \
+    misc/codec.h \
+    misc/err.h \
+    misc/GenerateTypeId.h \
+    misc/GenerationSettings.h \
+    misc/Images.h \
+    misc/Labeled.h \
+    misc/mu.h \
+    misc/myio.h \
+    misc/mystr.h \
+    misc/ProfiledStereotypes.h \
+    misc/Settings.h \
+    misc/Shortcut.h \
+    misc/SingletonHolder.h \
+    misc/strutil.h \
+    misc/translate.h \
+    misc/TypeIdentifier.h \
+    misc/UmlDrag.h \
+    misc/UmlEnum.h \
+    misc/UmlGlobal.h \
+    tagmanagement/cpptagmanagement.h \
+    tool/snippets.h \
+    tool/Socket.h \
+    tool/ToolCom.h \
+    tool/Tool.h \
+    ui/bbuttongroup.h \
+    ui/catalogwidget.h \
+    ui/constructorinitializerdialog.h \
+    ui/gridbox.h \
+    ui/hhbox.h \
+    ui/menufactory.h \
+    ui/operationwidgetcpp.h \
+    ui/toolbarfactory.h \
+    ui/vvbox.h \
+    ui/widgetwithlayout.h \
+    xpm/UmlPixmap.h
 
 SOURCES = \
-        browser/BrowserAttribute.cpp \
-        browser/BrowserExtraMember.cpp \
-        browser/BrowserClass.cpp \
-        browser/BrowserClassDiagram.cpp \
-        browser/BrowserClassView.cpp \
-        browser/BrowserDiagram.cpp \
-        browser/BrowserNode.cpp \
-        browser/BrowserOperation.cpp \
-        browser/BrowserPackage.cpp \
-        browser/BrowserRelation.cpp \
-        browser/BrowserSimpleRelation.cpp \
-        browser/BrowserTransition.cpp \
-        browser/BrowserSeqDiagram.cpp \
-        browser/BrowserUseCase.cpp \
-        browser/BrowserUseCaseDiagram.cpp \
-        browser/BrowserUseCaseView.cpp \
-        browser/BrowserColDiagram.cpp \
-        browser/BrowserObjectDiagram.cpp \
-        browser/BrowserComponent.cpp \
-        browser/BrowserComponentView.cpp \
-        browser/BrowserComponentDiagram.cpp \
-        browser/BrowserDeploymentNode.cpp \
-        browser/BrowserDeploymentView.cpp \
-        browser/BrowserDeploymentDiagram.cpp \
-        browser/BrowserArtifact.cpp \
-        browser/BrowserState.cpp \
-        browser/BrowserRegion.cpp \
-        browser/BrowserPseudoState.cpp \
-        browser/BrowserStateAction.cpp \
-        browser/BrowserStateDiagram.cpp \
-        browser/BrowserActivity.cpp \
-        browser/BrowserActivityNode.cpp \
-        browser/BrowserActivityDiagram.cpp \
-        browser/BrowserParameter.cpp \
-        browser/BrowserParameterSet.cpp \
-        browser/BrowserActivityAction.cpp \
-        browser/BrowserPin.cpp \
-        browser/BrowserInterruptibleActivityRegion.cpp \
-        browser/BrowserExpansionRegion.cpp \
-        browser/BrowserExpansionNode.cpp \
-        browser/BrowserActivityObject.cpp \
-        browser/BrowserActivityPartition.cpp \
-        browser/BrowserFlow.cpp \
-        browser/BrowserClassInstance.cpp \
-        data/ActualParamData.cpp \
-        data/AttributeData.cpp \
-        data/ExtraMemberData.cpp \
-        data/AType.cpp \
-        data/ClassData.cpp \
-        data/ArtifactData.cpp \
-        data/ExceptionData.cpp \
-        data/FormalParamData.cpp \
-        data/HaveKeyValueData.cpp \
-        data/KeyValueData.cpp \
-        data/BasicData.cpp \
-        data/ClassMemberData.cpp \
-        data/SimpleData.cpp \
-        data/OperationData.cpp \
-        data/PackageData.cpp \
-        data/ParamData.cpp \
-        data/RelationData.cpp \
-        data/SimpleRelationData.cpp \
-        data/TransitionData.cpp \
-        data/StateData.cpp \
-        data/PseudoStateData.cpp \
-        data/StateActionData.cpp \
-        data/ActivityData.cpp \
-        data/ParameterData.cpp \
-        data/ObjectData.cpp \
-        data/PinParamData.cpp \
-        data/ParameterSetData.cpp \
-        data/InfoData.cpp \
-        data/ActivityActionData.cpp \
-        data/PinData.cpp \
-        data/ExpansionRegionData.cpp \
-        data/ActivityObjectData.cpp \
-        data/ActivityPartitionData.cpp \
-        data/FlowData.cpp \
-        data/ClassInstanceData.cpp \
-        data/UseCaseData.cpp \
-        diagram/ArrowCanvas.cpp \
-        diagram/HubCanvas.cpp \
-        diagram/AssocContainCanvas.cpp \
-        diagram/ArrowPointCanvas.cpp \
-        diagram/BrowserView.cpp \
-        diagram/CdClassCanvas.cpp \
-        diagram/ClassDiagramView.cpp \
-        diagram/ClassDiagramWindow.cpp \
-        diagram/DiagramCanvas.cpp \
-        diagram/DiagramItem.cpp \
-        diagram/DiagramView.cpp \
-        diagram/DiagramWindow.cpp \
-        diagram/FragmentCanvas.cpp \
-        diagram/SubjectCanvas.cpp \
-        diagram/LabelCanvas.cpp \
-        diagram/NoteCanvas.cpp \
-        diagram/ImageCanvas.cpp \
-        diagram/PackageCanvas.cpp \
-        diagram/RelationCanvas.cpp \
-        diagram/SimpleRelationCanvas.cpp \
-        diagram/TransitionCanvas.cpp \
-        diagram/ObjectLinkCanvas.cpp \
-        diagram/ClassInstCanvas.cpp \
-        diagram/SdClassInstCanvas.cpp \
-        diagram/SdDurationCanvas.cpp \
-        diagram/SdContinuationCanvas.cpp \
-        diagram/SdLifeLineCanvas.cpp \
-        diagram/SdMsgBaseCanvas.cpp \
-        diagram/SdMsgCanvas.cpp \
-        diagram/SdObjCanvas.cpp \
-        diagram/SdLostFoundMsgSupportCanvas.cpp \
-        diagram/SdSelfMsgCanvas.cpp \
-        diagram/SelectAreaCanvas.cpp \
-        diagram/SeqDiagramView.cpp \
-        diagram/SeqDiagramWindow.cpp \
-        diagram/TemplateCanvas.cpp \
-        diagram/TextCanvas.cpp \
-        diagram/IconCanvas.cpp \
-        diagram/UcClassCanvas.cpp \
-        diagram/UcUseCaseCanvas.cpp \
-        diagram/UmlCanvas.cpp \
-        diagram/UmlWindow.cpp \
-        diagram/UmlDesktop.cpp \
-        diagram/UseCaseDiagramView.cpp \
-        diagram/UseCaseDiagramWindow.cpp \
-        diagram/ColDiagramView.cpp \
-        diagram/ColDiagramWindow.cpp \
-        diagram/ObjectDiagramView.cpp \
-        diagram/ObjectDiagramWindow.cpp \
-        diagram/CodClassInstCanvas.cpp \
-        diagram/OdClassInstCanvas.cpp \
-        diagram/CodObjCanvas.cpp \
-        diagram/CodLinkCanvas.cpp \
-        diagram/CodSelfLinkCanvas.cpp \
-        diagram/CodDirsCanvas.cpp \
-        diagram/ColMsg.cpp \
-        diagram/CodMsgSupport.cpp \
-        diagram/ComponentDiagramView.cpp \
-        diagram/ComponentDiagramWindow.cpp \
-        diagram/DeploymentDiagramView.cpp \
-        diagram/DeploymentDiagramWindow.cpp \
-        diagram/DeploymentNodeCanvas.cpp \
-        diagram/ComponentCanvas.cpp \
-        diagram/ArtifactCanvas.cpp \
-        diagram/ArrowJunctionCanvas.cpp \
-        diagram/StateDiagramView.cpp \
-        diagram/StateDiagramWindow.cpp \
-        diagram/StateCanvas.cpp \
-        diagram/PseudoStateCanvas.cpp \
-        diagram/StateActionCanvas.cpp \
-        diagram/ActivityDiagramView.cpp \
-        diagram/ActivityDiagramWindow.cpp \
-        diagram/ActivityContainerCanvas.cpp \
-        diagram/ActivityCanvas.cpp \
-        diagram/ActivityNodeCanvas.cpp \
-        diagram/ActivityActionCanvas.cpp \
-        diagram/ParameterCanvas.cpp \
-        diagram/PinCanvas.cpp \
-        diagram/InfoCanvas.cpp \
-        diagram/ParameterSetCanvas.cpp \
-        diagram/InterruptibleActivityRegionCanvas.cpp \
-        diagram/ExpansionRegionCanvas.cpp \
-        diagram/ActivityObjectCanvas.cpp \
-        diagram/ActivityPartitionCanvas.cpp \
-        diagram/ExpansionNodeCanvas.cpp \
-        diagram/FlowCanvas.cpp \
-        diagram/FragmentSeparatorCanvas.cpp \
-        diagram/ConstraintCanvas.cpp \
-        diagram/StereotypePropertiesCanvas.cpp \
-        dialog/AttributeDialog.cpp \
-        dialog/ExtraMemberDialog.cpp \
-        dialog/BasicDialog.cpp \
-        dialog/ClassDialog.cpp \
-        dialog/ClassListDialog.cpp \
-        dialog/ClassViewDialog.cpp \
-        dialog/ClassSettingsDialog.cpp \
-        dialog/RevSettingsDialog.cpp \
-        dialog/ComboItem.cpp \
-        dialog/FragmentDialog.cpp \
-        dialog/ContinuationDialog.cpp \
-        dialog/MyTable.cpp \
-        dialog/ComponentDialog.cpp \
-        dialog/ArtifactDialog.cpp \
-        dialog/DialogUtil.cpp \
-        dialog/GenerationSettingsDialog.cpp \
-        dialog/SettingsDialog.cpp \
-        dialog/StateSpec.cpp \
-        dialog/KeyValueTable.cpp \
-        dialog/MLEDialog.cpp \
-        dialog/SourceDialog.cpp \
-        dialog/BodyDialog.cpp \
-        dialog/MLinesItem.cpp \
-        dialog/MyInputDialog.cpp \
-        dialog/OperationDialog.cpp \
-        dialog/OperationListDialog.cpp \
-        dialog/PackageDialog.cpp \
-        dialog/RelationDialog.cpp \
-        dialog/ReferenceDialog.cpp \
-        dialog/SimpleRelationDialog.cpp \
-        dialog/StateDialog.cpp \
-        dialog/PseudoStateDialog.cpp \
-        dialog/StateActionDialog.cpp \
-        dialog/TransitionDialog.cpp \
-        dialog/InstanceDialog.cpp \
-        dialog/ClassInstanceDialog.cpp \
-        dialog/SdMsgDialog.cpp \
-        dialog/StereotypeDialog.cpp \
-        dialog/StereotypesDialog.cpp \
-        dialog/StringTable.cpp \
-        dialog/ToolDialog.cpp \
-        dialog/TraceDialog.cpp \
-        dialog/VisibilityGroup.cpp \
-        dialog/CodAddMsgDialog.cpp \
-        dialog/CodEditMsgDialog.cpp \
-        dialog/MenuFont.cpp \
-        dialog/ColMsgTable.cpp \
-        dialog/CodChangeMsgDialog.cpp \
-        dialog/HideShowDialog.cpp \
-        dialog/BrowserSearchDialog.cpp \
-        dialog/DialogTimer.cpp \
-        dialog/About.cpp \
-        dialog/SaveProgress.cpp \
-        dialog/AnnotationDialog.cpp \
-        dialog/ObjectLinkDialog.cpp \
-        dialog/ActivityDialog.cpp \
-        dialog/ParameterDialog.cpp \
-        dialog/ParameterSetDialog.cpp \
-        dialog/PinDialog.cpp \
-        dialog/ActivityActionDialog.cpp \
-        dialog/ExpansionRegionDialog.cpp \
-        dialog/ActivityObjectDialog.cpp \
-        dialog/ActivityPartitionDialog.cpp \
-        dialog/FlowDialog.cpp \
-        dialog/ShortcutDialog.cpp \
-        dialog/UseCaseDialog.cpp \
-        dialog/ConstraintDialog.cpp \
-        dialog/DecoratorDialog.cpp \
-        dialog/HelpDialog.cpp \
-        dialog/EnvDialog.cpp \
-        dialog/GreetingsDialog.cpp \
-        dialog/RelatedElementsDialog.cpp \
-        dialog/ImageDialog.cpp \
-        misc/Settings.cpp \
-        misc/UmlDrag.cpp \
-        misc/UmlGlobal.cpp \
-        misc/GenerationSettings.cpp \
-        misc/myio.cpp \
-        misc/mu.cpp \
-        misc/Labeled.cpp \
-        misc/mystr.cpp \
-        misc/strutil.cpp \
-        misc/Shortcut.cpp \
-        misc/ProfiledStereotypes.cpp \
-        misc/Images.cpp \
-        misc/translate.cpp \
-        tool/Tool.cpp \
-        tool/ToolCom.cpp \
-        xpm/UmlPixmap.cpp \
-        ui/menufactory.cpp \
-        Logging/QsLogDest.cpp \
-        Logging/QsLog.cpp \
-        Logging/QsDebugOutput.cpp \
-        main.cpp \
-        Factories/EdgeMenuFactory.cpp \
-        dialog/EdgeMenuDialog.cpp \
-        misc/GenerateTypeId.cpp \
-        Factories/EdgeToolBarCreation.cpp \
-        CustomWidgets/MultiPurposeDragArea.cpp \
-        CustomWidgets/EdgeMenuToolBar.cpp \
-        misc/ClipboardManager.cpp \
-        ui/operationwidgetcpp.cpp \
-    ui/constructorinitializerdialog.cpp \
-    tagmanagement/cpptagmanagement.cpp \
-    dialog/edgemenudialogqt4.cpp \
+    browser/BrowserActivityAction.cpp \
+    browser/BrowserActivity.cpp \
+    browser/BrowserActivityDiagram.cpp \
+    browser/BrowserActivityNode.cpp \
+    browser/BrowserActivityObject.cpp \
+    browser/BrowserActivityPartition.cpp \
+    browser/BrowserArtifact.cpp \
+    browser/BrowserAttribute.cpp \
+    browser/BrowserClass.cpp \
+    browser/BrowserClassDiagram.cpp \
+    browser/BrowserClassInstance.cpp \
+    browser/BrowserClassView.cpp \
+    browser/BrowserColDiagram.cpp \
+    browser/BrowserComponent.cpp \
+    browser/BrowserComponentDiagram.cpp \
+    browser/BrowserComponentView.cpp \
+    browser/BrowserDeploymentDiagram.cpp \
+    browser/BrowserDeploymentNode.cpp \
+    browser/BrowserDeploymentView.cpp \
+    browser/BrowserDiagram.cpp \
+    browser/BrowserExpansionNode.cpp \
+    browser/BrowserExpansionRegion.cpp \
+    browser/BrowserExtraMember.cpp \
+    browser/BrowserFlow.cpp \
+    browser/BrowserInterruptibleActivityRegion.cpp \
+    browser/BrowserNode.cpp \
+    browser/BrowserNodeDummy.cpp \
+    browser/BrowserObjectDiagram.cpp \
+    browser/BrowserOperationAttribute.cpp \
+    browser/BrowserOperation.cpp \
+    browser/BrowserPackage.cpp \
+    browser/BrowserParameter.cpp \
+    browser/BrowserParameterSet.cpp \
+    browser/BrowserPin.cpp \
+    browser/BrowserPseudoState.cpp \
+    browser/BrowserRegion.cpp \
+    browser/BrowserRelation.cpp \
+    browser/BrowserSeqDiagram.cpp \
+    browser/BrowserSimpleRelation.cpp \
+    browser/BrowserStateAction.cpp \
+    browser/BrowserState.cpp \
+    browser/BrowserStateDiagram.cpp \
+    browser/BrowserTransition.cpp \
+    browser/BrowserUseCase.cpp \
+    browser/BrowserUseCaseDiagram.cpp \
+    browser/BrowserUseCaseView.cpp \
+    browserfunctions/operationfuncs.cpp \
+    CustomWidgets/EdgeMenuToolBar.cpp \
+    CustomWidgets/GenericDelegate.cpp \
+    CustomWidgets/MultiPurposeDragArea.cpp \
+    CustomWidgets/quickeditcontrollersetup.cpp \
+    CustomWidgets/quickedit.cpp \
+    data/ActivityActionData.cpp \
+    data/ActivityData.cpp \
+    data/ActivityObjectData.cpp \
+    data/ActivityPartitionData.cpp \
+    data/ActualParamData.cpp \
+    data/ArtifactData.cpp \
+    data/AttributeData.cpp \
+    data/AType.cpp \
+    data/BasicData.cpp \
+    data/ClassData.cpp \
+    data/ClassInstanceData.cpp \
+    data/ClassMemberData.cpp \
+#   data/ComponentData.cpp \
+    data/ExceptionData.cpp \
+    data/ExpansionRegionData.cpp \
+    data/ExtraMemberData.cpp \
+    data/FlowData.cpp \
+    data/FormalParamData.cpp \
+    data/HaveKeyValueData.cpp \
+    data/InfoData.cpp \
+    data/KeyValueData.cpp \
+    data/ObjectData.cpp \
+    data/OperationData.cpp \
+    data/PackageData.cpp \
+    data/ParamData.cpp \
+    data/ParameterData.cpp \
+    data/ParameterSetData.cpp \
+    data/PinData.cpp \
+    data/PinParamData.cpp \
+    data/PseudoStateData.cpp \
+    data/RelationData.cpp \
+    data/SimpleData.cpp \
+    data/SimpleRelationData.cpp \
+    data/StateActionData.cpp \
+    data/StateData.cpp \
+    data/TransitionData.cpp \
+    data/UseCaseData.cpp \
+    diagram/ActivityActionCanvas.cpp \
+    diagram/ActivityCanvas.cpp \
+    diagram/ActivityContainerCanvas.cpp \
+    diagram/ActivityDiagramView.cpp \
+    diagram/ActivityDiagramWindow.cpp \
+    diagram/ActivityNodeCanvas.cpp \
+    diagram/ActivityObjectCanvas.cpp \
+    diagram/ActivityPartitionCanvas.cpp \
+    diagram/ArrowCanvas.cpp \
+    diagram/ArrowJunctionCanvas.cpp \
+    diagram/ArrowPointCanvas.cpp \
+    diagram/ArtifactCanvas.cpp \
+    diagram/AssocContainCanvas.cpp \
+    diagram/BrowserView.cpp \
+    diagram/CdClassCanvas.cpp \
+    diagram/ClassDiagramView.cpp \
+    diagram/ClassDiagramWindow.cpp \
+    diagram/ClassInstCanvas.cpp \
+    diagram/CodClassInstCanvas.cpp \
+    diagram/CodDirsCanvas.cpp \
+    diagram/CodLinkCanvas.cpp \
+    diagram/CodMsgSupport.cpp \
+    diagram/CodObjCanvas.cpp \
+    diagram/CodSelfLinkCanvas.cpp \
+    diagram/ColDiagramView.cpp \
+    diagram/ColDiagramWindow.cpp \
+    diagram/ColMsg.cpp \
+    diagram/ComponentCanvas.cpp \
+    diagram/ComponentDiagramView.cpp \
+    diagram/ComponentDiagramWindow.cpp \
+    diagram/ConstraintCanvas.cpp \
+    diagram/DeploymentDiagramView.cpp \
+    diagram/DeploymentDiagramWindow.cpp \
+    diagram/DeploymentNodeCanvas.cpp \
+    diagram/DiagramCanvas.cpp \
+    diagram/DiagramItem.cpp \
+    diagram/DiagramView.cpp \
+    diagram/DiagramWindow.cpp \
+    diagram/ExpansionNodeCanvas.cpp \
+    diagram/ExpansionRegionCanvas.cpp \
+    diagram/FlowCanvas.cpp \
+    diagram/FragmentCanvas.cpp \
+    diagram/FragmentSeparatorCanvas.cpp \
+    diagram/HubCanvas.cpp \
+    diagram/IconCanvas.cpp \
+    diagram/ImageCanvas.cpp \
+    diagram/InfoCanvas.cpp \
+    diagram/InterruptibleActivityRegionCanvas.cpp \
+    diagram/LabelCanvas.cpp \
+    diagram/NoteCanvas.cpp \
+    diagram/ObjectDiagramView.cpp \
+    diagram/ObjectDiagramWindow.cpp \
+    diagram/ObjectLinkCanvas.cpp \
+    diagram/OdClassInstCanvas.cpp \
+    diagram/PackageCanvas.cpp \
+    diagram/ParameterCanvas.cpp \
+    diagram/ParameterSetCanvas.cpp \
+    diagram/PinCanvas.cpp \
+    diagram/PseudoStateCanvas.cpp \
+    diagram/RelationCanvas.cpp \
+    diagram/SdClassInstCanvas.cpp \
+    diagram/SdContinuationCanvas.cpp \
+    diagram/SdDurationCanvas.cpp \
+    diagram/SdLifeLineCanvas.cpp \
+    diagram/SdLostFoundMsgSupportCanvas.cpp \
+    diagram/SdMsgBaseCanvas.cpp \
+    diagram/SdMsgCanvas.cpp \
+    diagram/SdObjCanvas.cpp \
+    diagram/SdSelfMsgCanvas.cpp \
+    diagram/SelectAreaCanvas.cpp \
+    diagram/SeqDiagramView.cpp \
+    diagram/SeqDiagramWindow.cpp \
+    diagram/SimpleRelationCanvas.cpp \
+    diagram/StateActionCanvas.cpp \
+    diagram/StateCanvas.cpp \
+    diagram/StateDiagramView.cpp \
+    diagram/StateDiagramWindow.cpp \
+    diagram/StereotypePropertiesCanvas.cpp \
+    diagram/SubjectCanvas.cpp \
+    diagram/TemplateCanvas.cpp \
+    diagram/TextCanvas.cpp \
+    diagram/TransitionCanvas.cpp \
+    diagram/UcClassCanvas.cpp \
+    diagram/UcUseCaseCanvas.cpp \
+    diagram/UmlCanvas.cpp \
+    diagram/UmlDesktop.cpp \
+    diagram/UmlWindow.cpp \
+    diagram/UseCaseDiagramView.cpp \
+    diagram/UseCaseDiagramWindow.cpp \
+    dialog/About.cpp \
+    dialog/ActivityActionDialog.cpp \
+    dialog/ActivityDialog.cpp \
+    dialog/ActivityObjectDialog.cpp \
+    dialog/ActivityPartitionDialog.cpp \
+    dialog/AnnotationDialog.cpp \
+    dialog/ArtifactDialog.cpp \
+    dialog/AttributeDialog.cpp \
+    dialog/BasicDialog.cpp \
+    dialog/BodyDialog.cpp \
+    dialog/BrowserSearchDialog.cpp \
+#   dialog/CharSetDialog.cpp \
+    dialog/ClassDialog.cpp \
+    dialog/ClassInstanceDialog.cpp \
+    dialog/ClassListDialog.cpp \
+    dialog/ClassSettingsDialog.cpp \
+    dialog/ClassViewDialog.cpp \
+    dialog/CodAddMsgDialog.cpp \
+    dialog/CodChangeMsgDialog.cpp \
+    dialog/CodEditMsgDialog.cpp \
+    dialog/ColMsgTable.cpp \
+    dialog/ComboItem.cpp \
+    dialog/ComponentDialog.cpp \
+    dialog/ConstraintDialog.cpp \
+    dialog/ContinuationDialog.cpp \
+    dialog/DecoratorDialog.cpp \
+    dialog/DialogTimer.cpp \
+    dialog/DialogUtil.cpp \
     dialog/edgemenudialogbase.cpp \
-    misc/codec.cpp
+    dialog/EdgeMenuDialog.cpp \
+    dialog/edgemenudialogqt4.cpp \
+    dialog/EnvDialog.cpp \
+    dialog/ExpansionRegionDialog.cpp \
+    dialog/ExtraMemberDialog.cpp \
+    dialog/FlowDialog.cpp \
+    dialog/FragmentDialog.cpp \
+    dialog/GenerationSettingsBuiltinTable.cpp \
+    dialog/GenerationSettingsDialog.cpp \
+    dialog/GreetingsDialog.cpp \
+    dialog/HelpDialog.cpp \
+    dialog/HideShowDialog.cpp \
+    dialog/ImageDialog.cpp \
+    dialog/InstanceDialog.cpp \
+    dialog/KeyValueTable.cpp \
+#   dialog/MenuFont.cpp \
+    dialog/MLEDialog.cpp \
+    dialog/MLinesItem.cpp \
+    dialog/MyInputDialog.cpp \
+#   dialog/MyTabDialog.cpp \
+    dialog/MyTable.cpp \
+    dialog/ObjectLinkDialog.cpp \
+    dialog/OperationDialog.cpp \
+    dialog/OperationListDialog.cpp \
+    dialog/PackageDialog.cpp \
+    dialog/ParameterDialog.cpp \
+    dialog/ParameterSetDialog.cpp \
+    dialog/PinDialog.cpp \
+    dialog/PseudoStateDialog.cpp \
+    dialog/ReferenceDialog.cpp \
+    dialog/RelatedElementsDialog.cpp \
+    dialog/RelationDialog.cpp \
+    dialog/RevSettingsDialog.cpp \
+    dialog/SaveProgress.cpp \
+    dialog/SdMsgDialog.cpp \
+    dialog/SettingsDialog.cpp \
+    dialog/ShortcutDialog.cpp \
+    dialog/SimpleRelationDialog.cpp \
+    dialog/SourceDialog.cpp \
+    dialog/StateActionDialog.cpp \
+    dialog/StateDialog.cpp \
+    dialog/StateSpec.cpp \
+    dialog/StereotypeDialog.cpp \
+    dialog/StereotypesDialog.cpp \
+    dialog/StringTable.cpp \
+    dialog/tabdialog.cpp \
+    dialog/tablewidgetitemdelegate.cpp \
+    dialog/ToolDialog.cpp \
+    dialog/TraceDialog.cpp \
+    dialog/TransitionDialog.cpp \
+    dialog/UseCaseDialog.cpp \
+    dialog/VisibilityGroup.cpp \
+    Factories/EdgeMenuFactory.cpp \
+    Factories/EdgeToolBarCreation.cpp \
+    Logging/QsDebugOutput.cpp \
+    Logging/QsLog.cpp \
+    Logging/QsLogDest.cpp \
+    main.cpp \
+    misc/ClipboardManager.cpp \
+    misc/codec.cpp \
+    misc/GenerateTypeId.cpp \
+    misc/GenerationSettings.cpp \
+    misc/Images.cpp \
+    misc/Labeled.cpp \
+    misc/mu.cpp \
+    misc/myio.cpp \
+    misc/mystr.cpp \
+    misc/ProfiledStereotypes.cpp \
+    misc/Settings.cpp \
+    misc/Shortcut.cpp \
+    misc/strutil.cpp \
+    misc/translate.cpp \
+    misc/UmlDrag.cpp \
+    misc/UmlGlobal.cpp \
+    tagmanagement/cpptagmanagement.cpp \
+    tool/ToolCom.cpp \
+    tool/Tool.cpp \
+    ui/bbuttongroup.cpp \
+    ui/catalogwidget.cpp \
+    ui/constructorinitializerdialog.cpp \
+    ui/gridbox.cpp \
+    ui/hhbox.cpp \
+    ui/menufactory.cpp \
+    ui/operationwidgetcpp.cpp \
+    ui/toolbarfactory.cpp \
+    ui/vvbox.cpp \
+    ui/widgetwithlayout.cpp \
+    xpm/UmlPixmap.cpp
 
 TARGET = douml
-DEFINES = BooL=bool DEBUGCOM
+DEFINES += BooL=bool  FALSE=false TRUE=true
+#DEFINES += _RUN_PLUGOUT_EXTERNAL_
+#DEBUGCOM
+
+DEFINES += __sil__
 
 #The following line was inserted by qt3to4
-QT += core gui network  qt3support
+QT += core gui network  widgets printsupport
+#qt3support
 
-#release{
-#    MOC_DIR = bin/douml/MOC_release
-#    OBJECTS_DIR = bin/douml/OBJ_release
-#}
-#
-#debug{
-#    MOC_DIR = bin/douml/MOC_debug
-#    OBJECTS_DIR = bin/douml/OBJ_debug
-#}
+UI_DIR = ui
+DESTDIR = ../bin
 
-win32{
-    Release:
-        MOC_DIR = $$PWD/../bin/release/win32/$$TARGET
-        OBJECTS_DIR = $$PWD/../bin/release/win32/$$TARGET
-        DESTDIR = $$PWD/../bin/release/win32/$$TARGET
-    Debug:
-        MOC_DIR = $$PWD/../bin/debug/win32/$$TARGET
-        OBJECTS_DIR = $$PWD/../bin/debug/win32/$$TARGET
-        DESTDIR = $$PWD/../bin/debug/win32/$$TARGET
-}
-macx{
-    Release:
-        MOC_DIR = $$PWD/../bin/release/macx/$$TARGET
-        OBJECTS_DIR = $$PWD/../bin/release/macx/$$TARGET
-        DESTDIR = $$PWD/../bin/release/macx/$$TARGET
-    Debug:
-        MOC_DIR = $$PWD/../bin/debug/macx/$$TARGET
-        OBJECTS_DIR = $$PWD/../bin/debug/macx/$$TARGET
-        DESTDIR = $$PWD/../bin/debug/macx/$$TARGET
-}
-unix{
-    Release:
-        MOC_DIR = $$PWD/../bin/release/unix/$$TARGET
-        OBJECTS_DIR = $$PWD/../bin/release/unix/$$TARGET
-        DESTDIR = $$PWD/../bin/release/unix/$$TARGET
-    Debug:
-        MOC_DIR = $$PWD/../bin/debug/unix/$$TARGET
-        OBJECTS_DIR = $$PWD/../bin/debug/unix/$$TARGET
-        DESTDIR = $$PWD/../bin/debug/unix/$$TARGET
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG
+    MOC_DIR = $${DESTDIR}/moc_release/douml
+    OBJECTS_DIR = $${DESTDIR}/obj_release/douml
 }
 
-UI_DIR = ui
-DESTDIR = ../bin
+CONFIG(debug, debug|release) {
+    DEFINES += TRACE DEBUG DEBUG_DOUML
+    MOC_DIR = $${DESTDIR}/moc_debug/douml
+    OBJECTS_DIR = $${DESTDIR}/obj_debug/douml
+}
 
 QMAKE_CXXFLAGS += -std=gnu++11
+mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++
+mac:LIBS += -lc++
+LIBS += -L../bin -lUniversalModels -lz
+RESOURCES += icons.qrc ../douml.qrc
+
+INCLUDEPATH += $${PWD}
 
-RESOURCES += icons.qrc
 
 FORMS += \
     ui/operationwidgetcpp.ui \
-    ui/constructorinitializerdialog.ui
+    ui/constructorinitializerdialog.ui \
+    ui/catalogwidget.ui \
+    ui/quickedit.ui
+win32:RC_ICONS += ../douml.ico
+mac:ICON = ../douml.icns
 
+TRANSLATIONS += translations/frFR.ts\
+                translations/deDE.ts\
+                translations/esES.ts\
+                translations/ptBR.ts
diff --git a/src/icons.qrc b/src/icons.qrc
index b69c3fdb5..c85dec2e1 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -11,5 +11,9 @@
         <file>icons/reject.png</file>
         <file>icons/right.png</file>
         <file>icons/up.png</file>
+        <file>icons/bullet_add.png</file>
+        <file>icons/arrow_refresh.png</file>
+        <file>icons/date_empty.png</file>
+        <file>icons/photo_edit.png</file>
     </qresource>
 </RCC>
diff --git a/src/icons.qrc.bak b/src/icons.qrc.bak
new file mode 100644
index 000000000..b69c3fdb5
--- /dev/null
+++ b/src/icons.qrc.bak
@@ -0,0 +1,15 @@
+<RCC>
+    <qresource prefix="/root">
+        <file>icons/accept.png</file>
+        <file>icons/accept_doc.png</file>
+        <file>icons/down.png</file>
+        <file>icons/dump.png</file>
+        <file>icons/left.png</file>
+        <file>icons/mouse_control.png</file>
+        <file>icons/next_folder.png</file>
+        <file>icons/previous folder.png</file>
+        <file>icons/reject.png</file>
+        <file>icons/right.png</file>
+        <file>icons/up.png</file>
+    </qresource>
+</RCC>
diff --git a/src/icons/arrow_redo.png b/src/icons/arrow_redo.png
new file mode 100644
index 000000000..a05f1a385
Binary files /dev/null and b/src/icons/arrow_redo.png differ
diff --git a/src/icons/arrow_refresh.png b/src/icons/arrow_refresh.png
new file mode 100644
index 000000000..edcfa3e7e
Binary files /dev/null and b/src/icons/arrow_refresh.png differ
diff --git a/src/icons/arrow_undo.png b/src/icons/arrow_undo.png
new file mode 100644
index 000000000..66ccde94e
Binary files /dev/null and b/src/icons/arrow_undo.png differ
diff --git a/src/icons/bullet_add.png b/src/icons/bullet_add.png
new file mode 100644
index 000000000..1599f1792
Binary files /dev/null and b/src/icons/bullet_add.png differ
diff --git a/src/icons/date_empty.png b/src/icons/date_empty.png
new file mode 100644
index 000000000..66fa2a396
Binary files /dev/null and b/src/icons/date_empty.png differ
diff --git a/src/icons/note_edit.png b/src/icons/note_edit.png
new file mode 100644
index 000000000..206ef21e4
Binary files /dev/null and b/src/icons/note_edit.png differ
diff --git a/src/icons/photo_edit.png b/src/icons/photo_edit.png
new file mode 100644
index 000000000..f16e8a8af
Binary files /dev/null and b/src/icons/photo_edit.png differ
diff --git a/src/main.cpp b/src/main.cpp
index deef1cc78..c54a74108 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,39 +31,39 @@
 #include <qapplication.h>
 #include <QTextCodec>
 //Added by qt3to4:
-#include "misc/mystr.h"
-#include <QTextCodec>
 
-#include "UmlWindow.h"
-#include "UmlPixmap.h"
-#include "UmlGlobal.h"
-#include "UmlDesktop.h"
+#include "misc/mystr.h"
 #include "ToolCom.h"
 #include "BrowserView.h"
 #include "BrowserPackage.h"
 #include "Shortcut.h"
+#include "err.h"
+
+#include "UmlWindow.h"
+#include "UmlGlobal.h"
+#include "UmlPixmap.h"
+#include <QTextCodec>
+#include "UmlDesktop.h"
 #include "DialogUtil.h"
 #include "mu.h"
-#include "err.h"
 #include "EnvDialog.h"
 #include "Logging/QsLogDest.h"
 #include "Logging/QsLog.h"
 #include "Factories/EdgeMenuFactory.h"
 #include "Factories/DialogConnections.h"
 #include "Factories/EdgeToolBarCreation.h"
-#include "dialog/ClassDialog.h"
 #include "dialog/ArtifactDialog.h"
 #include "dialog/OperationDialog.h"
 #include "ui/constructorinitializerdialog.h"
+#include "dialog/ClassDialog.h"
 #include "misc/TypeIdentifier.h"
+#include "misc/Shortcut.h"
 #include <QSettings>
-#include <QFileInfo>
-
-
-
-
 #include "translate.h"
-
+#include <QIcon>
+#include <QDir>
+#include <QSettings>
+#include <QMessageBox>
 bool ExitOnError = FALSE;
 int main(int argc, char ** argv)
 {
@@ -71,12 +71,17 @@ int main(int argc, char ** argv)
     ExitOnError = FALSE;
 
     QApplication a(argc, argv);
+    a.setWindowIcon(QIcon(QString(":/douml.64.png")));
 
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+    QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
 
-#ifdef DEBUG
+//#ifdef DEBUG
     QsLogging::Logger & logger = QsLogging::Logger::instance();
-    logger.setLoggingLevel(QsLogging::TraceLevel);
+#ifdef DEBUG
+    logger.setLoggingLevel(QsLogging::HaltingLevel);
+#else
+    logger.setLoggingLevel(QsLogging::FatalLevel);
+#endif
     QDir dir;
     dir.setPath(qApp->applicationDirPath());
     dir.remove(QString("douml") + QString(".log"));
@@ -86,14 +91,13 @@ int main(int argc, char ** argv)
     logger.addDestination(debugDestination.get());
     logger.addDestination(fileDestination.get());
     QLOG_INFO() << "Starting the log";
-#endif
-
+//#endif /* DEBUG */
 
     An<EdgeMenuFactory> factory;
-    factory->AddFactory(TypeIdentifier<ClassDialog>::id(), CreateClassDialogMenu);
-    factory->AddConnectionFunctor(TypeIdentifier<ClassDialog>::id(), ConnectToClassDialog<EdgeMenuDialog>);
-    factory->AddFactory(TypeIdentifier<OperationDialog>::id(), CreateClassDialogMenu);
     factory->AddConnectionFunctor(TypeIdentifier<OperationDialog>::id(), ConnectToClassDialog<EdgeMenuDialog>);
+    factory->AddFactory(TypeIdentifier<OperationDialog>::id(), CreateClassDialogMenu);
+    factory->AddConnectionFunctor(TypeIdentifier<ClassDialog>::id(), ConnectToClassDialog<EdgeMenuDialog>);
+    factory->AddFactory(TypeIdentifier<ClassDialog>::id(), CreateClassDialogMenu);
     factory->AddFactory(TypeIdentifier<ArtifactDialog>::id(), CreateLimitedDialogMenu);
     factory->AddConnectionFunctor(TypeIdentifier<ArtifactDialog>::id(), ConnectToLimitedDialog<EdgeMenuDialog>);
     factory->AddFactory(TypeIdentifier<ConstructorInitializerDialog>::id(), CreateLimitedDialogMenu);
@@ -101,36 +105,45 @@ int main(int argc, char ** argv)
 
 
     UmlDesktop::init();
-    QSettings settings("settings.ini", QSettings::IniFormat);
+
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
     settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+    QFileInfo info(settings.fileName());
+    bool conv_env = !info.exists();
+    if(conv_env)
+    {
+      settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
+      settings.setValue("/test", "test");
+      settings.setValue("Main/compatibility_save", "1");
+      settings.setValue("Main/fileformat", "77");
+      settings.setValue("Main/encoding", "UTF-8");
+      settings.setValue("Failing_Tools/Tools", "Import Rose,Uml projection,C++ state machine,Generate XMI 1.2,Generate .pro");
+      //settings.setValue("headers/quickedit", 0);
+      settings.setValue("quickedit_checkboxes/cpp", "true");
+      settings.setValue("quickedit_checkboxes/java", "false");
+      settings.setValue("quickedit_checkboxes/php", "false");
+      settings.setValue("quickedit_checkboxes/python", "false");
+      settings.setValue("quickedit_checkboxes/idl", "false");
+      settings.setValue("window/size", QSize(927, 595));
+      settings.sync();
+    }
+
     bool overridePresent = QFileInfo("override_transition.txt").exists();
     if(settings.value("Main/compatibility_save") .toInt() == 1 && !overridePresent)
     {
-    QMessageBox::warning(0, QObject::tr("Warning"),
-                         QObject::tr("Douml is working in transitional mode.\n All UI improvements are yours to use,  "
-                                     "but saving is done in the format of Bouml 4.22 "
-                                     "which loses all new c++11 and hierarchy specifiers\n\n"
-                                     "To suppress this warning place empty file override_transition.txt into the application folder\n"
-                                     "To disable the mode - change compatibility_save parameter to 0 in settings.ini\n"));
+      QMessageBox::warning(0, QObject::tr("Warning"),
+         QObject::tr("Douml is working in transitional mode.\n All UI improvements are yours to use,  "
+                     "but saving is done in the format of Bouml 4.22 "
+                     "which loses all new c++11 and hierarchy specifiers\n\n"
+                     "To suppress this warning place empty file override_transition.txt into the application folder\n"
+                     "To disable the mode - change compatibility_save parameter to 0 in %1\n").arg(settings.fileName()));
     }
-
-    // note : bool conv_env = !QDir::home().exists(".doumlrc") doesn't work
-    // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = QDir::home().absFilePath(".doumlrc");
-    FILE * fp = fopen((const char *) s, "r");
-    bool conv_env = (fp == 0);
-
-
     if (conv_env)
-        EnvDialog::edit(TRUE);
-    else
-        fclose(fp);
-
-    read_doumlrc();	// for virtual desktop
+       EnvDialog::edit(TRUE);
+    read_doumlrc(); // for virtual desktop
     init_pixmaps();
     init_font();
     Shortcut::init(conv_env);
-
     bool exec = FALSE;
     bool no_gui = FALSE;
 
@@ -140,7 +153,6 @@ int main(int argc, char ** argv)
         else
             exec = !strcmp(argv[2], "-exec");
     }
-
     UmlWindow * uw = new UmlWindow(exec);
 
     if (no_gui)
@@ -149,14 +161,13 @@ int main(int argc, char ** argv)
     {
         uw->showMaximized();
     }
-
     if (argc > 1) {
         try {
             if ((argc == 3) &&
                 !strcmp(argv[2], "-root") &&
-                (msg_critical(TR("DO NOT CONFIRM"),
-                              TR("Root mode protection\n\n"
-                                 "This mode allows me to develop BOUML\n\n"
+                (msg_critical(QObject::tr("DO NOT CONFIRM"),
+                              QObject::tr("Root mode protection\n\n"
+                                 "This mode allows us to develop DoUML\n\n"
                                  "do NOT confirm to avoid a disaster !!!\n\n"
                                  "confirm ?"),
                               QMessageBox::Yes, QMessageBox::No)
@@ -193,11 +204,12 @@ int main(int argc, char ** argv)
 
                 for (index = 4; index != argc; index += 1)
                     cmd += space + WrapperStr(argv[index]);
-
                 ToolCom::run((const char *) cmd, BrowserView::get_project(), with_exit);
             }
             else
-                msg_warning(TR("Error"), TR("Bouml was called with wrong parameters, ignore them"));
+            {
+                msg_warning(QObject::tr("Error"), QObject::tr("DoUML was called with wrong parameters, ignore them"));
+            }
         }
 
 
@@ -207,7 +219,5 @@ int main(int argc, char ** argv)
     catch (...) {
         ;
     }
-
-
     return exit_value();
 }
diff --git a/src/misc/ClipboardManager.cpp b/src/misc/ClipboardManager.cpp
index 31b528239..2dd488bdd 100644
--- a/src/misc/ClipboardManager.cpp
+++ b/src/misc/ClipboardManager.cpp
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -24,7 +24,7 @@
 #include "misc/ClipboardManager.h"
 #include <QClipboard>
 #include <QApplication>
-#include <QMimeSource>
+//#include <QMimeSource>
 #include <QMimeData>
 
 
@@ -35,6 +35,18 @@ QStringList ClipboardManager::GetStrings()
 {
     return strings;
 }
+
+QMenu* ClipboardManager::GetMenuInstance(int base, QMenu* existingMenu)
+{
+    if(!existingMenu)
+    {
+        if(!clipboardMenu)
+            clipboardMenu = new QMenu();
+        existingMenu = clipboardMenu;
+    }
+    FillClipboardMenu(existingMenu, base);
+    return existingMenu;
+}
 ClipboardManager::~ClipboardManager()
 {}
 
@@ -53,3 +65,65 @@ void ClipboardManager::OnPutItemIntoClipboard(QString text)
     clipboard->setText(text);
 }
 
+void ClipboardManager::OnPutItemIntoClipboardRequested()
+{
+    QAction * senderAction = qobject_cast<QAction *>(sender());
+    OnPutItemIntoClipboard(senderAction->data().toString());
+}
+
+void ClipboardManager::OnClipboardRequested()
+{
+
+}
+
+void ClipboardManager::OnMoreClipboardRequested()
+{
+    FillClipboardMenu(clipboardMenu, lastClipboardItemShown);
+}
+
+void ClipboardManager::OnLessClipboardRequested()
+{
+    FillClipboardMenu(clipboardMenu, lastClipboardItemShown - clipboardListSize);
+}
+
+void ClipboardManager::FillClipboardMenu(QMenu * clipboardMenu, int base)
+{
+    clipboardMenu->clear();
+    if (base != 0)
+    {
+        QAction * lessClipboard = new QAction("Less Clipboard", clipboardMenu);
+        connect(lessClipboard, SIGNAL(triggered()), this, SLOT(OnLessClipboardRequested()));
+        clipboardMenu->addAction(lessClipboard);
+    }
+
+    int maxItems = strings.size() > 10 ? 10 : strings.size();
+    int i = base;
+
+    for (; i < maxItems; ++i) {
+        QString text = strings.at(strings.size() - 1 - i);
+        this->blockSignals(true);
+        QString itemText;
+
+        if (text.length() < 15)
+            itemText = text;
+        else {
+            itemText = text.left(15) + "...";
+        }
+
+        QAction * action = new QAction(itemText, clipboardMenu);
+        action->setData(text);
+        connect(action, SIGNAL(triggered()), this, SLOT(OnPutItemIntoClipboardRequested()));
+        this->blockSignals(false);
+        clipboardMenu->addAction(action);
+
+    }
+
+    lastClipboardItemShown += i;
+
+    if (lastClipboardItemShown < strings.size()) {
+        QAction * moreClipboard = new QAction("More Clipboard", clipboardMenu);
+        connect(moreClipboard, SIGNAL(triggered()), this, SLOT(OnMoreClipboardRequested()));
+        clipboardMenu->addAction(moreClipboard);
+    }
+}
+
diff --git a/src/misc/ClipboardManager.h b/src/misc/ClipboardManager.h
index c805c5d83..8efa7cbc8 100644
--- a/src/misc/ClipboardManager.h
+++ b/src/misc/ClipboardManager.h
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -25,6 +25,7 @@
 #define CLIPBOARDMANAGER_H
 
 #include <QObject>
+#include <QMenu>
 #include <QStringList>
 #include "misc/SingletonHolder.h"
 
@@ -35,12 +36,24 @@ class ClipboardManager : public QObject
     ClipboardManager(QObject * _parent = 0);
     ~ClipboardManager();
     QStringList GetStrings();
+    QMenu* GetMenuInstance(int base = 0, QMenu * existingMenu = nullptr);
 public slots:
     virtual void OnClipboardUpdate();
-    //void OnClipboardDataRequested();
     virtual void OnPutItemIntoClipboard(QString);
+
+    virtual void OnPutItemIntoClipboardRequested();
+    virtual void OnClipboardRequested();
+    virtual void OnMoreClipboardRequested();
+    virtual void OnLessClipboardRequested();
+
 private:
+    void FillClipboardMenu(QMenu* clipboardMenu, int base);
     QStringList strings;
+    QMenu* clipboardMenu = nullptr;
+
+    int lastClipboardItemShown = 0;
+    int clipboardListSize = 10;
+
 };
 BIND_TO_SELF_SINGLE(ClipboardManager);
 #endif // CLIPBOARDMANAGER_H
diff --git a/src/misc/GenerateTypeId.cpp b/src/misc/GenerateTypeId.cpp
index 34e384b9c..b249d7219 100644
--- a/src/misc/GenerateTypeId.cpp
+++ b/src/misc/GenerateTypeId.cpp
@@ -11,9 +11,15 @@
 
 #include <string>
 #include <unordered_map>
+#ifdef _USE_BOOST_
 #include <boost/crc.hpp>
+#else
+#include <zlib.h>
+#endif
 #include <cassert>
 #include <cstring>
+#include <QtCore>
+#include <stdint.h>
 
 
 
@@ -59,6 +65,10 @@ namespace
 {
 void EnsureUniqueIdOrDie(const char * typeName, unsigned int id)
 {
+#ifndef _DEBUG
+    Q_UNUSED(typeName);
+    Q_UNUSED(id);
+#endif
 #ifdef _DEBUG
     typedef std::unordered_map<unsigned int, const char *> id_to_type_map_t;
 
@@ -83,22 +93,26 @@ int GenerateCrcChecksum
     if (checksumSize == 0)
         return 0;
 
+    int numberOfBytesToCopy = checksumSize;
+    #ifdef _USE_BOOST_
     boost::crc_32_type crcGenerator;
     int dataSize = std::strlen(data) * sizeof(uint8_t) / sizeof(char);
     crcGenerator.process_bytes(data, dataSize);
-
     boost::crc_32_type::value_type crc = crcGenerator.checksum();
-
     int crcSize = sizeof(boost::crc_32_type::value_type) / sizeof(uint8_t);
-    int numberOfBytesToCopy
-        = (crcSize < checksumSize) ? crcSize : checksumSize;
-
+    numberOfBytesToCopy = (crcSize < checksumSize) ? crcSize : checksumSize;
     uint8_t * crcAsByteArray = reinterpret_cast<uint8_t *>(&crc);
-
     for (int i = 0; i < numberOfBytesToCopy; ++i) {
         (*checksum)[i] = crcAsByteArray[i];
     }
-
+    #else
+    unsigned long  crc = crc32(0L, Z_NULL, 0);
+    crc = crc32(crc, (const unsigned char*)data, strlen(data));
+    uint8_t * crcAsByteArray = reinterpret_cast<uint8_t *>(&crc);
+    for (int i = 0; i < numberOfBytesToCopy; ++i) {
+        (*checksum)[i] = crcAsByteArray[i];
+    }
+    #endif
     return numberOfBytesToCopy;
 }
 }
diff --git a/src/misc/GenerationSettings.cpp b/src/misc/GenerationSettings.cpp
index 9431c207b..607860b7d 100644
--- a/src/misc/GenerationSettings.cpp
+++ b/src/misc/GenerationSettings.cpp
@@ -30,7 +30,7 @@
 
 
 #include <qcursor.h>
-#include <q3filedialog.h>
+//#include <q3filedialog.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -43,14 +43,15 @@
 #include "BrowserClass.h"
 #include "BrowserView.h"
 #include "ClassData.h"
-#include "AType.h"
+#include "err.h"
 #include "myio.h"
 #include "ToolCom.h"
 #include "Logging/QsLog.h"
-#include "err.h"
-
+#include "AType.h"
+#include <QTextCodec>
+#include <QFileDialog>
 int GenerationSettings::nbuiltins;
-Builtin * GenerationSettings::builtins;
+QList<Builtin> GenerationSettings::builtins;
 QStringList GenerationSettings::umltypes;
 
 bool GenerationSettings::cpp_default_defs;
@@ -366,312 +367,374 @@ void GenerationSettings::read_declaration_defaults()
 
 void GenerationSettings::init()
 {
-    if (builtins != 0)
-        delete [] builtins;
-
-    read_declaration_defaults();
-
-    nbuiltins = 15;
-    builtins = new Builtin[nbuiltins];
-
-    builtins[0].set("void", "void", "void", "void");
-    builtins[1].set("any", "void *", "Object", "any");
-    builtins[1].cpp_in =  "const ${type}";
-    builtins[1].cpp_out = builtins[0].cpp_inout = "${type}";
-    builtins[2].set("bool", "bool", "boolean", "boolean");
-    builtins[3].set("char", "char", "char", "char");
-    builtins[4].set("uchar", "unsigned char", "char", "octet");
-    builtins[5].set("byte", "unsigned char", "byte", "octet");
-    builtins[6].set("short", "short", "short", "short");
-    builtins[7].set("ushort", "unsigned short", "short", "unsigned short");
-    builtins[8].set("int", "int", "int", "long");
-    builtins[9].set("uint", "unsigned int", "int", "unsigned long");
-    builtins[10].set("long", "long", "long", "long");
-    builtins[11].set("ulong", "unsigned long", "long", "unsigned long");
-    builtins[12].set("float", "float", "float", "float");
-    builtins[13].set("double", "double", "double", "double");
-    builtins[14].set("string", "string", "String", "string");
-
-    cpp_h_content = CPP_H_CONTENT;
-
-    cpp_src_content = CPP_SRC_CONTENT;
-    cpp_h_extension = "h";
-    cpp_src_extension = "cpp";
-
-
-    java_src_content = JAVA_SRC_CONTENT;
-    java_extension = "java";
-
-
-    php_src_content = PHP_SRC_CONTENT;
-    php_extension = "php";
-
-    python_src_content = PYTHON_SRC_CONTENT;
-    python_extension = "py";
-
-
-    idl_src_content = IDL_SRC_CONTENT;
-    idl_extension = "idl";
-
-    if (relattr_stereotypes != 0)
+//    if (builtins != 0)
+//        delete [] builtins;
+
+      nbuiltins = 15;
+      //builtins = new Builtin[nbuiltins];
+      builtins.clear();
+      builtins.append(Builtin("void", "void", "void", "void"));
+      builtins.append(Builtin("any", "void *", "Object", "any"));
+
+      builtins[1].cpp_in =  "const ${type}";
+      builtins[1].cpp_out = builtins[0].cpp_inout = "${type}";
+
+      builtins.append(Builtin("bool", "bool", "boolean", "boolean"));
+      builtins.append(Builtin("char", "char", "char", "char"));
+      builtins.append(Builtin("uchar", "unsigned char", "char", "octet"));
+      builtins.append(Builtin("byte", "unsigned char", "byte", "octet"));
+      builtins.append(Builtin("short", "short", "short", "short"));
+      builtins.append(Builtin("ushort", "unsigned short", "short", "unsigned short"));
+      builtins.append(Builtin("int", "int", "int", "long"));
+      builtins.append(Builtin("uint", "unsigned int", "int", "unsigned long"));
+      builtins.append(Builtin("long", "long", "long", "long"));
+      builtins.append(Builtin("ulong", "unsigned long", "long", "unsigned long"));
+      builtins.append(Builtin("float", "float", "float", "float"));
+      builtins.append(Builtin("double", "double", "double", "double"));
+      builtins.append(Builtin("string", "string", "String", "string"));
+
+#define CPP_H_CONTENT "#ifndef ${NAMESPACE}_${NAME}_H\n\
+#define ${NAMESPACE}_${NAME}_H\n\
+\n\
+${comment}\n\
+${includes}\n\
+${declarations}\n\
+${namespace_start}\n\
+${definition}\n\
+${namespace_end}\n\
+#endif\n"
+  cpp_h_content = CPP_H_CONTENT;
+#define CPP_SRC_CONTENT "${comment}\n\
+${includes}\n\
+${namespace_start}\n\
+${members}\n\
+${namespace_end}"
+      cpp_src_content = CPP_SRC_CONTENT;
+      cpp_h_extension = "h";
+      cpp_src_extension = "cpp";
+
+#define JAVA_SRC_CONTENT "${comment}\n\
+${package}\n\
+${imports}\n\
+${definition}";
+      java_src_content = JAVA_SRC_CONTENT;
+      java_extension = "java";
+
+#define PHP_SRC_CONTENT "<?php\n\
+${comment}\n\
+${namespace}\n\
+${require_once}\n\
+${definition}\n\
+?>\n";
+      php_src_content = PHP_SRC_CONTENT;
+      php_extension = "php";
+
+#define PYTHON_SRC_CONTENT "${comment}\n\
+${import}\n\
+${definition}";
+      python_src_content = PYTHON_SRC_CONTENT;
+      python_extension = "py";
+
+#define IDL_SRC_CONTENT "#ifndef ${MODULE}_${NAME}_H\n\
+#define ${MODULE}_${NAME}_H\n\
+\n\
+${comment}\n\
+${includes}\n\
+${module_start}\n\
+${definition}\n\
+${module_end}\n\
+#endif\n"
+      idl_src_content = IDL_SRC_CONTENT;
+      idl_extension = "idl";
+
+      if (relattr_stereotypes != 0)
         delete [] relattr_stereotypes;
 
-    nrelattrstereotypes = 5;
-    relattr_stereotypes = new Stereotype[nrelattrstereotypes];
+      nrelattrstereotypes = 5;
+      relattr_stereotypes = new Stereotype[nrelattrstereotypes];
 
-    relattr_stereotypes[0].set("sequence", "vector", "Vector", "", "list", "sequence");
-    relattr_stereotypes[1].set("vector", "vector", "Vector", "", "list", "sequence");
-    relattr_stereotypes[2].set("list", "list", "List", "", "list", "sequence");
-    relattr_stereotypes[3].set("set", "set", "Set", "", "set", "sequence");
-    relattr_stereotypes[4].set("map", "map", "Map", "", "dict", "sequence");
+      relattr_stereotypes[0].set("sequence", "vector", "Vector", "", "list", "sequence");
+      relattr_stereotypes[1].set("vector", "vector", "Vector", "", "list", "sequence");
+      relattr_stereotypes[2].set("list", "list", "List", "", "list", "sequence");
+      relattr_stereotypes[3].set("set", "set", "Set", "", "set", "sequence");
+      relattr_stereotypes[4].set("map", "map", "Map", "", "dict", "sequence");
 
-    if (class_stereotypes != 0)
+      if (class_stereotypes != 0)
         delete [] class_stereotypes;
 
-    nclassstereotypes = 14;
-    class_stereotypes = new Stereotype[nclassstereotypes];
-
-    class_stereotypes[0].set("class", "class", "class", "class", "class", "valuetype");
-    class_stereotypes[1].set("interface", "class", "interface", "interface", "class", "interface");
-    class_stereotypes[2].set("exception", "class", "class", "class", "class", "exception");
-    class_stereotypes[3].set("enum", "enum", "enum", "enum", "enum", "enum");
-    class_stereotypes[4].set("enum_pattern", "enum", "enum_pattern", "enum", "enum", "enum");
-    class_stereotypes[5].set("struct", "struct", "class", "class", "class", "struct");
-    class_stereotypes[6].set("union", "union", "class", "class", "class", "union");
-    class_stereotypes[7].set("typedef", "typedef", "ignored", "ignored", "ignored", "typedef");
-    class_stereotypes[8].set("boundary", "class", "class", "class", "class", "interface");
-    class_stereotypes[9].set("control", "class", "class", "class", "class", "valuetype");
-    class_stereotypes[10].set("entity", "class", "class", "class", "class", "valuetype");
-    class_stereotypes[11].set("actor", "ignored", "ignored", "ignored", "ignored", "ignored");
-    class_stereotypes[12].set("@interface", "ignored", "@interface", "ignored", "ignored", "ignored");
-    class_stereotypes[13].set("stereotype", "ignored", "ignored", "ignored", "ignored", "ignored");
-
-    cpp_enum_in = "${type}";
-    cpp_enum_out = "${type} &";
-    cpp_enum_inout = "${type} &";
-    cpp_enum_return = "${type}";
-
-    cpp_in = "const ${type} &";
-    cpp_out = "${type} &";
-    cpp_inout = "${type} &";
-    cpp_return = "${type}";
-
-    cpp_class_decl = "${comment}${template}class ${name}${inherit} {\n${members}};\n${inlines}\n";
-    cpp_external_class_decl = "${name}\n#include <${name}.h>\n";
-    cpp_struct_decl = "${comment}${template}struct ${name}${inherit} {\n${members}};\n${inlines}\n";
-    cpp_union_decl = "${comment}${template}union ${name} {\n${members}};\n${inlines}\n";
-    cpp_enum_decl = "${comment}enum ${name} {\n${items}\n};\n";
-    cpp_typedef_decl = "${comment}typedef ${type} ${name};\n";
-
-    cpp_attr_decl[0] = "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};\n";
-    cpp_attr_decl[1] = CPP_ATTR_DECL1;
-    cpp_attr_decl[2] = CPP_ATTR_DECL2;
-    cpp_enum_item_decl = "  ${name}${value},${comment}";
-    cpp_rel_decl[0][0] = "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};\n";
-    cpp_rel_decl[0][1] = "    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type} *> ${name}${value};\n";
-    cpp_rel_decl[0][2] = "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${multiplicity}${value};\n";
-    cpp_rel_decl[1][0] = "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};\n";
-    cpp_rel_decl[1][1] = "    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value};\n";
-    cpp_rel_decl[1][2] = "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};\n";
-
-    QSettings settings("settings.ini", QSettings::IniFormat);
-    settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
-    if(settings.value("Main/compatibility_save") .toInt() != 1)
-        cpp_oper_decl = "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract}${default}${delete}${override}${final};\n";
-    else
-        cpp_oper_decl = "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}${abstract};\n";
-    cpp_oper_def = "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{\n  ${body}}\n";
-    cpp_force_throw = FALSE;
-    cpp_get_visibility = UmlPublic;
-    cpp_get_name = "get_${name}";
-    cpp_get_inline = TRUE;
-    cpp_get_const = TRUE;
-    cpp_get_value_const = TRUE;
-    cpp_set_visibility = UmlPublic;
-    cpp_set_name = "set_${name}";
-    cpp_set_inline = FALSE;
-    cpp_set_param_const = FALSE;
-    cpp_set_param_ref = FALSE;
-    cpp_include_with_path = FALSE;
-    cpp_relative_path = FALSE;
-    cpp_root_relative_path = FALSE;
-    cpp_force_namespace_gen = FALSE;
-    cpp_inline_force_incl_in_h = FALSE;
-    cpp_javadoc_comment = FALSE;
-    cpp_indent_visibility = "  ";
-
-    java_class_decl = "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {\n${members}}\n";
-    java_external_class_decl = "${name}";
-    java_interface_decl = "${comment}${@}${visibility}interface ${name}${extends} {\n${members}}\n";
-    java_enum_decl = "${comment}${@}${visibility}${final}${abstract}enum ${name}${implements} {\n${items};\n${members}}\n";
-    java_enum_pattern_decl = "${comment}${@}${visibility}final class ${name} {\n${members}\n\
-  private final int value;\n\n\
-  public int value() {\n\
-    return value;\n\
-  }\n\n\
-  public static ${name} fromInt(int value) {\n\
-    switch (value) {\n\
-${cases}    default: throw new Error();\n\
-    }\n\n\
-  }\n\
-  private ${name}(int v) { value = v; };\n}\n";
-    java_attr_decl[0] = "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};\n";
-    java_attr_decl[1] = JAVA_ATTR_DECL1;
-    java_attr_decl[2] = JAVA_ATTR_DECL2;
-    java_enum_item_decl = "  ${@}${name}${value},${comment}";
-    java_enum_pattern_item_decl = "  ${comment}${@}public static final int _${name}${value};\n\
-public static final ${class} ${name} = new ${class}(_${name});\n";
-    java_enum_pattern_item_case = "    case _${name}: return ${name};\n";
-    java_rel_decl[0] = "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};\n";
-    java_rel_decl[1] = "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};\n";
-    java_rel_decl[2] = "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};\n";
-    java_oper_def = "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{\n  ${body}}\n";
-    noncpp_get_visibility = UmlPublic;
-    java_get_name = "get${Name}";
-    java_get_final = TRUE;
-    noncpp_set_visibility = UmlPublic;
-    java_set_name = "set${Name}";
-    java_set_final = FALSE;
-    java_set_param_final = FALSE;
-    java_javadoc_comment = TRUE;
-    java_force_package_gen = TRUE;
-
-
-    php_class_decl = PHP_CLASS;
-    php_external_class_decl = "${name}";
-
-    php_enum_decl = PHP_ENUM;
-
-    php_interface_decl = PHP_INTERFACE;
-
-    php_attr_decl = PHP_ATTR;
-
-    php_enum_item_decl = PHP_ENUMITEM;
-
-    php_rel_decl = PHP_REL;
-
-    // PHP_OPER known by php reverse
-    php_oper_def = PHP_OPER;
-    php_get_name = "get${Name}";
-    php_get_final = TRUE;
-    php_set_name = "set${Name}";
-    php_set_final = FALSE;
-    php_javadoc_comment = FALSE;
-    php_req_with_path = FALSE;
-    php_relative_path = FALSE;
-    php_root_relative_path = FALSE;
-    php_force_namespace_gen = FALSE;
-
-    python_2_2 = TRUE;
-    python_3_operation = FALSE;
-
-    python_indent_step = PYTHON_INDENT_STEP_;
-
-    python_class_decl = PYTHON_CLASS;
-    python_external_class_decl = "${name}";
-
-    python_enum_decl = PYTHON_ENUM;
-    python_attr_decl[0] = PYTHON_ATTR1;
-    python_attr_decl[1] = PYTHON_ATTR2;
-
-    python_enum_item_decl = PYTHON_ENUMITEM;
-    python_rel_decl[0][0] = PYTHON_REL1;
-    python_rel_decl[0][1] = PYTHON_REL2;
-    python_rel_decl[1][0] = PYTHON_REL_COMP;
-    python_rel_decl[1][1] = PYTHON_REL2;
-
-    python_oper_def = PYTHON_OPER;
-
-    python_initoper_def = PYTHON_INITOPER;
-    python_get_name = "get${Name}";
-    python_set_name = "set${Name}";
-
-
-    idl_external_class_decl = IDL_EXTERNAL_CLASS_DECL;
-    idl_interface_decl = "${comment}${abstract}${local}interface ${name}${inherit} {\n${members}};\n";
-
-    idl_valuetype_decl = IDL_VALUETYPE_DECL;
-    idl_struct_decl = "${comment}struct ${name} {\n${members}};\n";
-    idl_typedef_decl = "${comment}typedef ${type} ${name};\n";
-    idl_exception_decl = "${comment}exception ${name} {\n${members}};\n";
-    idl_union_decl = "${comment}union ${name} switch(${switch}) {\n${members}};\n";
-    idl_enum_decl = "${comment}enum ${name} {\n${items}};\n";
-    idl_attr_decl[0] = "  ${comment}${readonly}${attribute}${type} ${name};\n";
-    idl_attr_decl[1] = IDL_ATTR_DECL1;
-    idl_attr_decl[2] = IDL_ATTR_DECL2;
-    idl_valuetype_attr_decl[0] = IDL_VALUETYPE_ATTRIBUTE_DECL0;
-    idl_valuetype_attr_decl[1] = IDL_VALUETYPE_ATTRIBUTE_DECL1;
-    idl_valuetype_attr_decl[2] = IDL_VALUETYPE_ATTRIBUTE_DECL2;
-    idl_const_decl[0] = "  ${comment}const ${type} ${name}${value};\n";
-    idl_const_decl[1] = IDL_CONST_ATTR_DECL1;
-    idl_const_decl[2] = IDL_CONST_ATTR_DECL2;
-    idl_union_item_decl[0] = "  ${comment}case ${case} : ${readonly}${type} ${name};";
-    idl_union_item_decl[1] = IDL_UNION_ATTR_DECL1;
-    idl_union_item_decl[2] = IDL_UNION_ATTR_DECL2;
-    idl_enum_item_decl = "  ${name},${comment}";
-    idl_rel_decl[0] = "  ${comment}${readonly}${attribute}${type} ${name};\n";
-    idl_rel_decl[1] = "  ${comment}${readonly}${attribute}${stereotype}<${type}> ${name};\n";
-    idl_rel_decl[2] = "  ${comment}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};\n";
-    idl_valuetype_rel_decl[0] = IDL_VALUETYPE_REL_DECL0;
-    idl_valuetype_rel_decl[1] = IDL_VALUETYPE_REL_DECL1;
-    idl_valuetype_rel_decl[2] = IDL_VALUETYPE_REL_DECL2;
-    idl_union_rel_decl[0] = "  ${comment}case ${case} : ${readonly}${type} ${name};";
-    idl_union_rel_decl[1] = "  ${comment}case ${case} : ${readonly}${stereotype}<${type}> ${name};";
-    idl_union_rel_decl[2] = "  ${comment}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};";
-    idl_oper_decl = "  ${comment}${oneway}${type} ${name}${(}${)}${raisesnl}${raises};\n";
-    idl_get_name = "get_${name}";
-    idl_set_name = "set_${name}";
-    idl_set_oneway = FALSE;
-
-    uml_get_name = UmlView;
-    uml_set_name = UmlView;
-
-    int i;
-
-    umltypes.clear();
-
-    for (i = 0; i != nbuiltins; i += 1)
+      nclassstereotypes = 14;
+      class_stereotypes = new Stereotype[nclassstereotypes];
+
+      class_stereotypes[0].set("class", "class", "class", "class", "class", "valuetype");
+      class_stereotypes[1].set("interface", "class", "interface", "interface", "class", "interface");
+      class_stereotypes[2].set("exception", "class", "class", "class", "class", "exception");
+      class_stereotypes[3].set("enum", "enum", "enum", "enum", "enum", "enum");
+      class_stereotypes[4].set("enum_pattern", "enum", "enum_pattern", "enum", "enum", "enum");
+      class_stereotypes[5].set("struct", "struct", "class", "class", "class", "struct");
+      class_stereotypes[6].set("union", "union", "class", "class", "class", "union");
+      class_stereotypes[7].set("typedef", "typedef", "ignored", "ignored", "ignored", "typedef");
+      class_stereotypes[8].set("boundary", "class", "class", "class", "class", "interface");
+      class_stereotypes[9].set("control", "class", "class", "class", "class", "valuetype");
+      class_stereotypes[10].set("entity", "class", "class", "class", "class", "valuetype");
+      class_stereotypes[11].set("actor", "ignored", "ignored", "ignored", "ignored", "ignored");
+      class_stereotypes[12].set("@interface", "ignored", "@interface", "ignored", "ignored", "ignored");
+      class_stereotypes[13].set("stereotype", "ignored", "ignored", "ignored", "ignored", "ignored");
+
+      cpp_enum_in = "${type}";
+      cpp_enum_out = "${type} &";
+      cpp_enum_inout = "${type} &";
+      cpp_enum_return = "${type}";
+
+      cpp_in = "const ${type} &";
+      cpp_out = "${type} &";
+      cpp_inout = "${type} &";
+      cpp_return = "${type}";
+
+      cpp_class_decl = "${comment}${template}class ${name}${inherit} {\n${members}};\n${inlines}\n";
+      cpp_external_class_decl = "${name}\n#include <${name}.h>\n";
+      cpp_struct_decl = "${comment}${template}struct ${name}${inherit} {\n${members}};\n${inlines}\n";
+      cpp_union_decl = "${comment}${template}union ${name} {\n${members}};\n${inlines}\n";
+      cpp_enum_decl = "${comment}enum ${name} {\n${items}\n};\n";
+      cpp_typedef_decl = "${comment}typedef ${type} ${name};\n";
+#define CPP_ATTR_DECL1	"    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value};\n"
+#define CPP_ATTR_DECL2	"    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};\n"
+#define CPP_ATTR_DESCR1	"    ${description}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value};\n"
+#define CPP_ATTR_DESCR2	"    ${description}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};\n"
+      cpp_attr_decl[0] = "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};\n";
+      cpp_attr_decl[1] = CPP_ATTR_DECL1;
+      cpp_attr_decl[2] = CPP_ATTR_DECL2;
+      cpp_enum_item_decl = "  ${name}${value},${comment}";
+      cpp_rel_decl[0][0] = "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${value};\n";
+      cpp_rel_decl[0][1] = "    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type} *> ${name}${value};\n";
+      cpp_rel_decl[0][2] = "    ${comment}${static}${mutable}${volatile}${const}${type} * ${name}${multiplicity}${value};\n";
+      cpp_rel_decl[1][0] = "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value};\n";
+      cpp_rel_decl[1][1] = "    ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value};\n";
+      cpp_rel_decl[1][2] = "    ${comment}${static}${mutable}${volatile}${const}${type} ${name}${multiplicity}${value};\n";
+      cpp_oper_decl = "    ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${final}${override}${volatile}${throw}${abstract}${default}${delete};\n";
+      cpp_oper_def = "${comment}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${throw}${staticnl}{\n  ${body}}\n";
+      cpp_force_throw = FALSE;
+      cpp_get_visibility = UmlPublic;
+      cpp_get_name = "get_${name}";
+      cpp_get_inline = TRUE;
+      cpp_get_const = TRUE;
+      cpp_get_value_const = TRUE;
+      cpp_set_visibility = UmlPublic;
+      cpp_set_name = "set_${name}";
+      cpp_set_inline = FALSE;
+      cpp_set_param_const = FALSE;
+      cpp_set_param_ref = FALSE;
+      cpp_include_with_path = FALSE;
+      cpp_relative_path = FALSE;
+      cpp_root_relative_path = FALSE;
+      cpp_force_namespace_gen = FALSE;
+      cpp_inline_force_incl_in_h = FALSE;
+      cpp_javadoc_comment = FALSE;
+#define CPP_INDENT_VISIBILITY "  "
+      cpp_indent_visibility = CPP_INDENT_VISIBILITY;
+
+      java_class_decl = "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {\n${members}}\n";
+      java_external_class_decl = "${name}";
+      java_interface_decl = "${comment}${@}${visibility}interface ${name}${extends} {\n${members}}\n";
+      java_enum_decl = "${comment}${@}${visibility}${final}${abstract}enum ${name}${implements} {\n${items};\n${members}}\n";
+      java_enum_pattern_decl = "${comment}${@}${visibility}final class ${name} {\n${members}\n\
+      private final int value;\n\n\
+      public int value() {\n\
+        return value;\n\
+      }\n\n\
+      public static ${name} fromInt(int value) {\n\
+        switch (value) {\n\
+    ${cases}    default: throw new Error();\n\
+        }\n\n\
+      }\n\
+      private ${name}(int v) { value = v; };\n}\n";
+#define JAVA_ATTR_DECL1	"  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};\n"
+#define JAVA_ATTR_DECL2	"  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};\n"
+#define JAVA_ATTR_DESCR1	"  ${description}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};\n"
+#define JAVA_ATTR_DESCR2	"  ${description}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};\n"
+      java_attr_decl[0] = "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};\n";
+      java_attr_decl[1] = JAVA_ATTR_DECL1;
+      java_attr_decl[2] = JAVA_ATTR_DECL2;
+      java_enum_item_decl = "  ${@}${name}${value},${comment}";
+      java_enum_pattern_item_decl = "  ${comment}${@}public static final int _${name}${value};\n\
+    public static final ${class} ${name} = new ${class}(_${name});\n";
+      java_enum_pattern_item_case = "    case _${name}: return ${name};\n";
+      java_rel_decl[0] = "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};\n";
+      java_rel_decl[1] = "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${stereotype}<${type}> ${name}${value};\n";
+      java_rel_decl[2] = "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type}${multiplicity} ${name}${value};\n";
+      java_oper_def = "  ${comment}${@}${visibility}${final}${static}${abstract}${synchronized}${type} ${name}${(}${)}${throws}${staticnl}{\n  ${body}}\n";
+      noncpp_get_visibility = UmlPublic;
+      java_get_name = "get${Name}";
+      java_get_final = TRUE;
+      noncpp_set_visibility = UmlPublic;
+      java_set_name = "set${Name}";
+      java_set_final = FALSE;
+      java_set_param_final = FALSE;
+      java_javadoc_comment = TRUE;
+      java_force_package_gen = TRUE;
+
+    #define PHP_CLASS "${comment}${final}${abstract}class ${name}${extends}${implements} {\n${members}}\n"
+      php_class_decl = PHP_CLASS;
+      php_external_class_decl = "${name}";
+    #define PHP_ENUM "${comment}${visibility}final class ${name} {\n${items}}\n"
+      php_enum_decl = PHP_ENUM;
+    #define PHP_INTERFACE "${comment}interface ${name} {\n${members}}\n"
+      php_interface_decl = PHP_INTERFACE;
+    #define PHP_ATTR "  ${comment}${visibility}${const}${static}${var}${name}${value};\n"
+      php_attr_decl = PHP_ATTR;
+    #define PHP_ENUMITEM "  const ${name}${value};${comment}\n"
+      php_enum_item_decl = PHP_ENUMITEM;
+    #define PHP_REL PHP_ATTR
+      php_rel_decl = PHP_REL;
+    #define PHP_OPER "  ${comment}${final}${visibility}${abstract}${static}function ${name}${(}${)}\n{\n  ${body}}\n"
+      // PHP_OPER known by php reverse
+      php_oper_def = PHP_OPER;
+      php_get_name = "get${Name}";
+      php_get_final = TRUE;
+      php_set_name = "set${Name}";
+      php_set_final = FALSE;
+      php_javadoc_comment = FALSE;
+      php_req_with_path = FALSE;
+      php_relative_path = FALSE;
+      php_root_relative_path = FALSE;
+      php_force_namespace_gen = FALSE;
+
+      python_2_2 = TRUE;
+      python_3_operation = FALSE;
+    #define PYTHON_INDENT_STEP "    "
+      python_indent_step = PYTHON_INDENT_STEP;
+    #define PYTHON_CLASS "class ${name}${inherit}:\n${docstring}${members}\n"
+      python_class_decl = PYTHON_CLASS;
+      python_external_class_decl = "${name}";
+    #define PYTHON_ENUM "class ${name}:\n${docstring}${members}\n"
+      python_enum_decl = PYTHON_ENUM;
+    #define PYTHON_ATTR1 "${comment}${self}${name} = ${value}\n"
+    #define PYTHON_ATTR2 "${comment}${self}${name} = ${stereotype}()\n"
+      python_attr_decl[0] = PYTHON_ATTR1;
+      python_attr_decl[1] = PYTHON_ATTR2;
+    #define PYTHON_ENUMITEM PYTHON_ATTR1
+      python_enum_item_decl = PYTHON_ENUMITEM;
+    #define PYTHON_REL1 PYTHON_ATTR1
+    #define PYTHON_REL2 PYTHON_ATTR2
+    #define PYTHON_REL_COMP "${comment}${self}${name} = ${type}()\n"
+      python_rel_decl[0][0] = PYTHON_REL1;
+      python_rel_decl[0][1] = PYTHON_REL2;
+      python_rel_decl[1][0] = PYTHON_REL_COMP;
+      python_rel_decl[1][1] = PYTHON_REL2;
+    #define PYTHON_OPER "${@}${static}${abstract}def ${name}${(}${)}:\n${docstring}${body}\n"
+      python_oper_def = PYTHON_OPER;
+    #define PYTHON_INITOPER "${@}${static}${abstract}def ${name}${(}${p0}${v0}${)}:\n${docstring}super(${class}, ${p0}).__init__()\n${body}\n"
+      python_initoper_def = PYTHON_INITOPER;
+      python_get_name = "get${Name}";
+      python_set_name = "set${Name}";
+
+    #define  IDL_EXTERNAL_CLASS_DECL "${name}\n#include \"${name}.idl\"\n";
+      idl_external_class_decl = IDL_EXTERNAL_CLASS_DECL;
+      idl_interface_decl = "${comment}${abstract}${local}interface ${name}${inherit} {\n${members}};\n";
+    #define IDL_VALUETYPE_DECL "${comment}${abstract}${custom}valuetype ${name}${inherit} {\n${members}};\n";
+      idl_valuetype_decl = IDL_VALUETYPE_DECL;
+      idl_struct_decl = "${comment}struct ${name} {\n${members}};\n";
+      idl_typedef_decl = "${comment}typedef ${type} ${name};\n";
+      idl_exception_decl = "${comment}exception ${name} {\n${members}};\n";
+      idl_union_decl = "${comment}union ${name} switch(${switch}) {\n${members}};\n";
+      idl_enum_decl = "${comment}enum ${name} {\n${items}};\n";
+    #define IDL_ATTR_DECL1	"  ${comment}${readonly}${attribute}${stereotype}<${type}> ${name};\n"
+    #define IDL_ATTR_DECL2	"  ${comment}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};\n"
+    #define IDL_ATTR_DESCR1	"  ${description}${readonly}${attribute}${stereotype}<${type}> ${name};\n"
+    #define IDL_ATTR_DESCR2	"  ${description}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};\n"
+      idl_attr_decl[0] = "  ${comment}${readonly}${attribute}${type} ${name};\n";
+      idl_attr_decl[1] = IDL_ATTR_DECL1;
+      idl_attr_decl[2] = IDL_ATTR_DECL2;
+    #define IDL_VALUETYPE_ATTRIBUTE_DECL0 "  ${comment}${visibility}${type} ${name};\n"
+    #define IDL_VALUETYPE_ATTRIBUTE_DECL1 "  ${comment}${visibility}${stereotype}<${type}> ${name};\n"
+    #define IDL_VALUETYPE_ATTRIBUTE_DECL2 "  ${comment}${visibility}${stereotype}<${type},${multiplicity}> ${name};\n"
+    #define IDL_VALUETYPE_ATTRIBUTE_DESCR1 "  ${description}${visibility}${stereotype}<${type}> ${name};\n"
+    #define IDL_VALUETYPE_ATTRIBUTE_DESCR2 "  ${description}${visibility}${stereotype}<${type},${multiplicity}> ${name};\n"
+      idl_valuetype_attr_decl[0] = IDL_VALUETYPE_ATTRIBUTE_DECL0;
+      idl_valuetype_attr_decl[1] = IDL_VALUETYPE_ATTRIBUTE_DECL1;
+      idl_valuetype_attr_decl[2] = IDL_VALUETYPE_ATTRIBUTE_DECL2;
+    #define IDL_CONST_ATTR_DECL1  "  ${comment}const ${stereotype}<${type}> ${name}${value};\n"
+    #define IDL_CONST_ATTR_DECL2  "  ${comment}const ${stereotype}<${type},${multiplicity}> ${name}${value};\n"
+    #define IDL_CONST_ATTR_DESCR1  "  ${description}const ${stereotype}<${type}> ${name}${value};\n"
+    #define IDL_CONST_ATTR_DESCR2  "  ${description}const ${stereotype}<${type},${multiplicity}> ${name}${value};\n"
+      idl_const_decl[0] = "  ${comment}const ${type} ${name}${value};\n";
+      idl_const_decl[1] = IDL_CONST_ATTR_DECL1;
+      idl_const_decl[2] = IDL_CONST_ATTR_DECL2;
+    #define IDL_UNION_ATTR_DECL1  "  ${comment}case ${case} : ${readonly}${stereotype}<${type}> ${name};";
+    #define IDL_UNION_ATTR_DECL2  "  ${comment}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};";
+    #define IDL_UNION_ATTR_DESCR1  "  ${description}case ${case} : ${readonly}${stereotype}<${type}> ${name};";
+    #define IDL_UNION_ATTR_DESCR2  "  ${description}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};";
+      idl_union_item_decl[0] = "  ${comment}case ${case} : ${readonly}${type} ${name};";
+      idl_union_item_decl[1] = IDL_UNION_ATTR_DECL1;
+      idl_union_item_decl[2] = IDL_UNION_ATTR_DECL2;
+      idl_enum_item_decl = "  ${name},${comment}";
+      idl_rel_decl[0] = "  ${comment}${readonly}${attribute}${type} ${name};\n";
+      idl_rel_decl[1] = "  ${comment}${readonly}${attribute}${stereotype}<${type}> ${name};\n";
+      idl_rel_decl[2] = "  ${comment}${readonly}${attribute}${stereotype}<${type},${multiplicity}> ${name};\n";
+    #define IDL_VALUETYPE_REL_DECL0 "  ${comment}${visibility}${type} ${name};\n"
+    #define IDL_VALUETYPE_REL_DECL1 "  ${comment}${visibility}${stereotype}<${type}> ${name};\n"
+    #define IDL_VALUETYPE_REL_DECL2 "  ${comment}${visibility}${stereotype}<${type},${multiplicity}> ${name};\n"
+    #define IDL_VALUETYPE_REL_DESCR1 "  ${description}${visibility}${stereotype}<${type}> ${name};\n"
+    #define IDL_VALUETYPE_REL_DESCR2 "  ${description}${visibility}${stereotype}<${type},${multiplicity}> ${name};\n"
+      idl_valuetype_rel_decl[0] = IDL_VALUETYPE_REL_DECL0;
+      idl_valuetype_rel_decl[1] = IDL_VALUETYPE_REL_DECL1;
+      idl_valuetype_rel_decl[2] = IDL_VALUETYPE_REL_DECL2;
+      idl_union_rel_decl[0] = "  ${comment}case ${case} : ${readonly}${type} ${name};";
+      idl_union_rel_decl[1] = "  ${comment}case ${case} : ${readonly}${stereotype}<${type}> ${name};";
+      idl_union_rel_decl[2] = "  ${comment}case ${case} : ${readonly}${stereotype}<${type},${multiplicity}> ${name};";
+      idl_oper_decl = "  ${comment}${oneway}${type} ${name}${(}${)}${raisesnl}${raises};\n";
+      idl_get_name = "get_${name}";
+      idl_set_name = "set_${name}";
+      idl_set_oneway = FALSE;
+
+      uml_get_name = UmlView;
+      uml_set_name = UmlView;
+
+      int i;
+
+      umltypes.clear();
+
+      for (i = 0; i != nbuiltins; i += 1)
         umltypes.append(builtins[i].uml);
 
-    if (umltypes.findIndex("void") == -1)
+      if (umltypes.indexOf("void") == -1)
         umltypes.append("void");
 
-    cpp_includes.types.clear();
-    cpp_includes.includes.clear();
-
-    cpp_includes.types.append("vector");
-    cpp_includes.includes.append("#include <vector>\nusing namespace std;");
-    cpp_includes.types.append("list");
-    cpp_includes.includes.append("#include <list>\nusing namespace std;");
-    cpp_includes.types.append("map");
-    cpp_includes.includes.append("#include <map>\nusing namespace std;");
-    cpp_includes.types.append("string");
-    cpp_includes.includes.append("#include <string>\nusing namespace std;");
-
-    artifact_default_description = QString();
-    class_default_description = QString();
-    operation_default_description = QString();
-    attribute_default_description = QString();
-    relation_default_description = QString();
-
-    cpp_root_dir = QString();
-    java_root_dir = QString();
-    php_root_dir = QString();
-    python_root_dir = QString();
-    idl_root_dir = QString();
-
-    cpp_set_default_defs(FALSE);
-    java_set_default_defs(FALSE);
-    php_set_default_defs(FALSE);
-    python_set_default_defs(FALSE);
-    idl_set_default_defs(FALSE);
-
-    cpp_dir_filter.case_sensitive =
+      cpp_includes.types.clear();
+      cpp_includes.includes.clear();
+
+      cpp_includes.types.append("vector");
+      cpp_includes.includes.append("#include <vector>\nusing namespace std;");
+      cpp_includes.types.append("list");
+      cpp_includes.includes.append("#include <list>\nusing namespace std;");
+      cpp_includes.types.append("map");
+      cpp_includes.includes.append("#include <map>\nusing namespace std;");
+      cpp_includes.types.append("string");
+      cpp_includes.includes.append("#include <string>\nusing namespace std;");
+
+      artifact_default_description = QString();
+      class_default_description = QString();
+      operation_default_description = QString();
+      attribute_default_description = QString();
+      relation_default_description = QString();
+
+      cpp_root_dir = QString();
+      java_root_dir = QString();
+      php_root_dir = QString();
+      python_root_dir = QString();
+      idl_root_dir = QString();
+
+      cpp_set_default_defs(FALSE);
+      java_set_default_defs(FALSE);
+      php_set_default_defs(FALSE);
+      python_set_default_defs(FALSE);
+      idl_set_default_defs(FALSE);
+
+      cpp_dir_filter.case_sensitive =
         cpp_file_filter.case_sensitive =
-            java_dir_filter.case_sensitive =
-                java_file_filter.case_sensitive =
-                    php_dir_filter.case_sensitive =
-                        php_file_filter.case_sensitive = FALSE;
+          java_dir_filter.case_sensitive =
+        java_file_filter.case_sensitive =
+          php_dir_filter.case_sensitive =
+            php_file_filter.case_sensitive = FALSE;
 }
 
 int GenerationSettings::find_type(const QString & s)
@@ -691,7 +754,6 @@ bool GenerationSettings::cpp_set_default_defs(bool y)
 
     if (p != 0)
         p->modified();
-
     return cpp_default_defs = y;
 }
 
@@ -708,7 +770,6 @@ bool GenerationSettings::java_set_default_defs(bool y)
 
     if (p != 0)
         p->modified();
-
     return java_default_defs = y;
 }
 
@@ -725,27 +786,25 @@ bool GenerationSettings::php_set_default_defs(bool y)
 
     if (p != 0)
         p->modified();
-
     return php_default_defs = y;
 }
 
 bool GenerationSettings::python_set_default_defs(bool y)
 {
-    BrowserPackage * p = BrowserView::get_project();
 
+    BrowserPackage * p = BrowserView::get_project();
     if (p != 0)
         p->modified();
-
     return python_default_defs = y;
 }
 
 bool GenerationSettings::idl_set_default_defs(bool y)
 {
+
     BrowserPackage * p = BrowserView::get_project();
 
     if (p != 0)
         p->modified();
-
     return idl_default_defs = y;
 }
 
@@ -761,7 +820,7 @@ static unsigned multiplicity_column(const QString & mult)
     if (mult.isEmpty() || (mult == "1"))
         return 0;
 
-    if ((mult == "*") || (mult.find("..") != -1))
+    if ((mult == "*") || (mult.indexOf("..") != -1))
         return 1;
 
     return 2;
@@ -777,9 +836,8 @@ const QString GenerationSettings::cpp(const AType & type,
 {
     QString s;
     int index;
-
     if ((type.type != 0) &&
-        !strcmp(cpp_class_stereotype(((ClassData *) type.type->get_data())->get_stereotype()),
+        !strcmp(cpp_class_stereotype(((ClassData *) type.type->get_data())->get_stereotype()).toLatin1().constData(),
                 "enum")) {
         switch (dir) {
         case UmlIn:
@@ -815,7 +873,7 @@ const QString GenerationSettings::cpp(const AType & type,
         }
     }
 
-    if ((index = s.find("${type}")) == -1)
+    if ((index = s.indexOf("${type}")) == -1)
         return s;
 
     QString t;
@@ -828,11 +886,10 @@ void GenerationSettings::set_cpp_return_type(const AType & type, QString & s)
 {
     int index;
 
-    if ((index = s.find("${type}")) == -1)
+    if ((index = s.indexOf("${type}")) == -1)
         return;
-
     if ((type.type != 0) &&
-        !strcmp(cpp_class_stereotype(((ClassData *) type.type->get_data())->get_stereotype()),
+        !strcmp(cpp_class_stereotype(((ClassData *) type.type->get_data())->get_stereotype()).toLatin1().constData(),
                 "enum"))
         s.replace(index, 7, cpp_enum_return);
     else {
@@ -1030,6 +1087,8 @@ QString GenerationSettings::idl_class_stereotype(const QString & s)
 bool GenerationSettings::edit()
 {
     GenerationSettingsDialog d;
+    //d.resize(1200,600);
+    //d.adjustSize();
 
     return (d.exec() == QDialog::Accepted);
 }
@@ -1508,7 +1567,8 @@ void GenerationSettings::send_idl_def(ToolCom * com)
 bool GenerationSettings::tool_global_uml_cmd(ToolCom * com, const char * args)
 {
     //QLOG_INFO() << "Command will be: " + QString(stringify(static_cast<UmlSettingsCmd>((unsigned char) args[-1])));
-    QLOG_INFO() << "Command will be: " + (unsigned char) args[-1];
+    QLOG_INFO() << "Command will be: " << (unsigned char) args[-1];
+
     switch ((unsigned char) args[-1]) {
     case getUmlSettingsCmd:
         QLOG_INFO() << "Using getUmlSettingsCmd";
@@ -1584,23 +1644,11 @@ Builtin & GenerationSettings::get_type(const char * u)
         if (builtins[index].uml == u)
             return builtins[index];
 
-    // not find, add it
-
-    Builtin * b = new Builtin[index + 1];
-
-    for (index = 0; index != nbuiltins; index += 1)
-        b[index] = builtins[index];
-
-    b[index].set(u, u, u, u);
-    b[index].cpp_in =  "const ${type}";
-
-    if (builtins)
-        delete [] builtins;
-
-    builtins = b;
+    Builtin newBuiltin(u,u,u,u);
+    newBuiltin.cpp_in =  "const ${type}";
     nbuiltins += 1;
-
-    return b[index];
+    builtins.append(newBuiltin);
+    return builtins.last();
 }
 
 Stereotype & GenerationSettings::get_stereotype(int & n, Stereotype *& st,
@@ -1948,8 +1996,8 @@ bool GenerationSettings::tool_global_cpp_cmd(ToolCom * com,
             com->write_bool(TRUE);
             BrowserView::get_project()->package_modified();
         }
+        break;
     }
-
     return TRUE;
 }
 
@@ -2136,6 +2184,7 @@ bool GenerationSettings::tool_global_java_cmd(ToolCom * com,
             com->write_bool(TRUE);
             BrowserView::get_project()->package_modified();
         }
+        break;
     }
 
     return TRUE;
@@ -2275,6 +2324,7 @@ bool GenerationSettings::tool_global_php_cmd(ToolCom * com,
             com->write_bool(TRUE);
             BrowserView::get_project()->package_modified();
         }
+        break;
     }
 
     return TRUE;
@@ -2400,6 +2450,7 @@ bool GenerationSettings::tool_global_python_cmd(ToolCom * com,
             com->write_bool(TRUE);
             BrowserView::get_project()->package_modified();
         }
+        break;
     }
 
     return TRUE;
@@ -2591,6 +2642,7 @@ bool GenerationSettings::tool_global_idl_cmd(ToolCom * com,
             com->write_bool(TRUE);
             BrowserView::get_project()->package_modified();
         }
+        break;
     }
 
     return TRUE;
@@ -2598,10 +2650,10 @@ bool GenerationSettings::tool_global_idl_cmd(ToolCom * com,
 
 static void save_includes_imports(IncludesSpec & sp, const char * filename)
 {
-    QSharedPointer<QByteArray> newdef(new QByteArray());
-    QTextStream st(newdef.data(), QIODevice::WriteOnly);
-
-    st.setEncoding(QTextStream::Latin1);
+    QString newdef;
+    QTextStream st(&newdef, QIODevice::WriteOnly);
+    st.setCodec("UTF-8");
+    st.setCodec(QTextCodec::codecForName("UTF-8"));
 
     st << "// \"a type\" \"needed " << filename << "\"\n";
 
@@ -2610,9 +2662,9 @@ static void save_includes_imports(IncludesSpec & sp, const char * filename)
     QStringList::Iterator it_incl = sp.includes.begin();
 
     for (int index = 0; index != sup; index += 1, it_type++, it_incl++) {
-        save_string(*it_type, st);
+        save_string((*it_type), st);
         st << " ";
-        save_string(*it_incl, st);
+        save_string((*it_incl), st);
         st << "\n\n";
     }
 
@@ -2693,10 +2745,9 @@ void GenerationSettings::save_descriptions(QTextStream & st)
 
 void GenerationSettings::save()
 {
-    QSharedPointer<QByteArray> newdef(new QByteArray());
-    QTextStream st(newdef.data(), QIODevice::WriteOnly);
-
-    st.setEncoding(QTextStream::Latin1);
+    QString newdef;
+    QTextStream st(&newdef, QIODevice::WriteOnly);
+    st.setCodec("UTF-8");
 
     nl_indent(st);
 
@@ -2785,7 +2836,8 @@ void GenerationSettings::save()
 
     int index;
 
-    for (index = 0; index != nbuiltins; index += 1) {
+    for (index = 0; index != nbuiltins; index += 1)
+    {
         Builtin & b = builtins[index];
 
         nl_indent(st);
@@ -3590,19 +3642,19 @@ void GenerationSettings::read(char *& st, char *& k)
     bool new_types = !strcmp(k, "type_forms");
 
     if (old_types || new_types) {
-        if (builtins != 0)
-            delete [] builtins;
+        if (!builtins.isEmpty())
+            builtins.clear();
 
         nbuiltins = (int) read_unsigned(st);
-        builtins = new Builtin[nbuiltins];
+        //builtins = new Builtin[nbuiltins];
 
         umltypes.clear();
 
         int index;
 
-        for (index = 0; index != nbuiltins; index += 1) {
-            Builtin & b = builtins[index];
-
+        for (index = 0; index != nbuiltins; index += 1)
+        {
+            Builtin b;
             b.uml = read_string(st);
             b.cpp = read_string(st);
             b.java = read_string(st);
@@ -3616,10 +3668,12 @@ void GenerationSettings::read(char *& st, char *& k)
             else
                 b.cpp_return = "${type}";
 
+            builtins.append(b);
+
             umltypes.append(b.uml);
         }
 
-        if (umltypes.findIndex("void") == -1)
+        if (umltypes.indexOf("void") == -1)
             umltypes.append("void");
 
         read_keyword(st, "relations_stereotypes");
@@ -4389,7 +4443,7 @@ void GenerationSettings::read()
     }
 }
 
-static bool read_incl(IncludesSpec & sp, const char * filename)
+static bool read_incl(IncludesSpec & sp, QString filename)
 {
     char * s = read_file(filename);
 
@@ -4421,7 +4475,7 @@ static bool read_incl(IncludesSpec & sp, const char * filename)
 
 bool GenerationSettings::import()
 {
-    QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), "generation_settings");
+    QString fn = QFileDialog::getOpenFileName(0, "generation_settings",last_used_directory());
 
     if (!fn.isEmpty()) {
         set_last_used_directory(fn);
@@ -4449,10 +4503,10 @@ bool GenerationSettings::import()
             POST_TRY;
             delete [] s;
 
-            read_incl(cpp_includes, fn.replace(fn.findRev("generation_settings"), 19, "cpp_includes"));
-            read_incl(java_imports, fn.replace(fn.findRev("cpp_includes"), 12, "java_imports"));
-            read_incl(python_imports, fn.replace(fn.findRev("java_imports"), 12, "python_imports"));
-            read_incl(idl_includes, fn.replace(fn.findRev("python_imports"), 14, "idl_includes"));
+            read_incl(cpp_includes, fn.replace(fn.lastIndexOf("generation_settings"), 19, "cpp_includes"));
+            read_incl(java_imports, fn.replace(fn.lastIndexOf("cpp_includes"), 12, "java_imports"));
+            read_incl(python_imports, fn.replace(fn.lastIndexOf("java_imports"), 12, "python_imports"));
+            read_incl(idl_includes, fn.replace(fn.lastIndexOf("python_imports"), 14, "idl_includes"));
 
             return TRUE;
         }
@@ -4590,7 +4644,6 @@ void GenerationSettings::read_includes_imports()
 
         d.rename("import", "java_imports");
     }
-
     read_incl(python_imports, "python_imports");
     read_incl(idl_includes, "idl_includes");
 }
@@ -4713,3 +4766,4 @@ void ReverseRoundtripFilter::read(const char * key, char *& st, char *& k)
         }
     }
 }
+
diff --git a/src/misc/GenerationSettings.h b/src/misc/GenerationSettings.h
index 5e71149de..5aa166864 100644
--- a/src/misc/GenerationSettings.h
+++ b/src/misc/GenerationSettings.h
@@ -44,18 +44,37 @@ class ToolCom;
 class Builtin
 {
 public:
+    Builtin(){}
+    Builtin(QString _uml,QString _cpp,QString _java,QString _idl)
+    {
+        uml = _uml;
+        cpp = _cpp;
+        java = _java;
+        idl = _idl;
+    }
+
     QString uml;
-    QString cpp;
-    QString java;
-    QString idl;
-    QString cpp_in;
-    QString cpp_out;
-    QString cpp_inout;
-    QString cpp_return;
+    QString cpp = "DEFAULT";
+    QString java = "DEFAULT";
+    QString idl = "DEFAULT";
+    QString cpp_in = "${type}";
+    QString cpp_out = "${type} &";
+    QString cpp_inout = "${type} &";
+    QString cpp_return = "${type}";
 
     void set(const char * u, const char * c, const char * j, const char * i);
 };
-
+inline bool operator==(const Builtin & s1, const Builtin & s2)
+{
+    return s1.uml==s2.uml &&
+            s1.cpp==s2.cpp &&
+            s1.java==s2.java &&
+            s1.idl==s2.idl &&
+            s1.cpp_in==s2.cpp_in &&
+            s1.cpp_out==s2.cpp_out &&
+            s1.cpp_inout==s2.cpp_inout &&
+            s1.cpp_return==s2.cpp_return;
+}
 class Stereotype
 {
 public:
@@ -95,8 +114,9 @@ class GenerationSettings
     friend class StereotypesTable;
 
 protected:
+    friend class BuiltinTable;
     static int nbuiltins;
-    static Builtin * builtins;
+    static QList<Builtin> builtins;
     static QStringList umltypes;
 
     static bool cpp_default_defs;
diff --git a/src/misc/Images.cpp b/src/misc/Images.cpp
index 0942b2792..868a4e1c5 100644
--- a/src/misc/Images.cpp
+++ b/src/misc/Images.cpp
@@ -24,14 +24,10 @@
 // home   : http://sourceforge.net/projects/douml
 //
 // *************************************************************************
-
-#include <q3ptrdict.h>
-#include <q3dict.h>
+////
 #include <qdir.h>
 #include <qimage.h>
-//Added by qt3to4:
 #include <QPixmap>
-
 #include "Images.h"
 #include "UmlWindow.h"
 #include "BrowserView.h"
@@ -39,16 +35,16 @@
 #include "DialogUtil.h"
 
 // all the pixmap for diagram with scale 100, key = path,
-static Q3Dict<QPixmap> DiagramPixmap;
+static QMap<QString, QPixmap*> DiagramPixmap;
 
 // all the pixmap for diagram, key = path,
 // value is QPtrDict with key = width
-static Q3Dict<Q3PtrDict<QPixmap> > DiagramScaledPixmap;
+static QMap<QString, QMap<void*,QPixmap*> *> DiagramScaledPixmap;
 
 // return pixmap for zoom 100%
-QPixmap * get_pixmap(const char * path)
+QPixmap * get_pixmap(QString path)
 {
-    QPixmap * px = DiagramPixmap.find(path);
+    QPixmap * px = DiagramPixmap.value(path);
 
     if (px == 0) {
         QString abspath;
@@ -56,28 +52,28 @@ QPixmap * get_pixmap(const char * path)
         if (!QDir::isRelativePath(path))
             abspath = path;
         else if ((UmlWindow::images_root_dir().isEmpty() ||
-                  !QFile::exists(abspath = QDir::cleanDirPath(UmlWindow::images_root_dir() + '/' + path))) &&
+                  !QFile::exists(abspath = QDir::cleanPath(UmlWindow::images_root_dir() + '/' + path))) &&
                  !QFile::exists(abspath = path))
-            abspath = BrowserView::get_dir().absFilePath(path);
+            abspath = BrowserView::get_dir().absoluteFilePath(path);
 
         px = new QPixmap(abspath);
 
         DiagramPixmap.insert(path, px);
 
         if (px->isNull()) {
-            msg_critical(TR("Error"),
-                         QString(path) + TR("\ndoesn't exist or is not a know image format"));
+            msg_critical(QObject::tr("Error"),
+                         QString(path) + QObject::tr("\ndoesn't exist or is not a know image format"));
             return 0;
         }
 
-        DiagramScaledPixmap.insert(path, new Q3PtrDict<QPixmap>());
+        DiagramScaledPixmap.insert(path, new QMap<void*,QPixmap*>());
     }
 
     return (px->isNull()) ? 0 : px;
 }
 
 // return pixmap for a given zoom != 100
-QPixmap * get_pixmap(const char * path, double zoom)
+QPixmap * get_pixmap(QString path, double zoom)
 {
     QPixmap * px = get_pixmap(path);
 
@@ -87,14 +83,14 @@ QPixmap * get_pixmap(const char * path, double zoom)
     if (((int)(zoom * 100)) == 100)
         return px;
 
-    Q3PtrDict<QPixmap> * d = DiagramScaledPixmap[path]; // != 0
+    QMap<void*,QPixmap*> * d = DiagramScaledPixmap[path]; // != 0
     intptr_t scaled_w = static_cast<intptr_t>(px->width() * zoom);
     void * k = (void *) scaled_w;
-    QPixmap * scaled_px = d->find(k);
+    QPixmap * scaled_px = d->value(k);
 
     if (scaled_px == 0) {
         QImage img =
-            px->convertToImage().smoothScale(scaled_w, (int)(px->height() * zoom));
+            px->toImage().scaled(scaled_w, (int)(px->height() * zoom));
 
         scaled_px = new QPixmap();
         scaled_px->convertFromImage(img);
@@ -106,9 +102,20 @@ QPixmap * get_pixmap(const char * path, double zoom)
 
 void init_images()
 {
-    DiagramPixmap.setAutoDelete(TRUE);
+    //DiagramPixmap.setAutoDelete(TRUE);
+
+
+    QList<QPixmap*> pList = DiagramPixmap.values();
+    while(!pList.isEmpty())
+        delete pList.takeFirst();
     DiagramPixmap.clear();
 
-    DiagramScaledPixmap.setAutoDelete(TRUE);
+    //DiagramScaledPixmap.setAutoDelete(TRUE);
+
+
+    QList<QMap<void*,QPixmap*> *> pSList = DiagramScaledPixmap.values();
+    while(!pSList.isEmpty())
+        delete pSList.takeFirst();
+
     DiagramScaledPixmap.clear();
 }
diff --git a/src/misc/Images.h b/src/misc/Images.h
index 9d328ffe2..7c1d6331d 100644
--- a/src/misc/Images.h
+++ b/src/misc/Images.h
@@ -32,8 +32,8 @@
 
 class QPixmap;
 
-QPixmap * get_pixmap(const char * path);
-QPixmap * get_pixmap(const char * path, double zoom);
+QPixmap * get_pixmap(QString path);
+QPixmap * get_pixmap(QString path, double zoom);
 void init_images();
 
 #endif
diff --git a/src/misc/Labeled.cpp b/src/misc/Labeled.cpp
index f31b7fe40..d1c070cd1 100644
--- a/src/misc/Labeled.cpp
+++ b/src/misc/Labeled.cpp
@@ -28,13 +28,8 @@
 
 
 
-
-#include <q3intdict.h>
 #include <qdatetime.h>
 #include <qmessagebox.h>
-#include <q3ptrlist.h>
-#include <q3ptrlist.h>
-
 #include "mu.h"
 #include "Labeled.h"
 #include "myio.h"
@@ -65,8 +60,8 @@ bool in_lib_import()
 
 int place(IdDict<void> & d, int id, void * x)
 {
-    const int uid = user_id();
 
+    const int uid = user_id();
     if (id != -1) {
         // id is relevant
         bool check = TRUE;
@@ -80,10 +75,14 @@ int place(IdDict<void> & d, int id, void * x)
         }
         else if (d.old_diagram) {
             // place id unchanged among the old ones
-            d.dict[1].replace(id, x);
+            //d.dict[1].replace(id, x);
+            d.dict[1].remove(id);
+            d.dict[1].insert(id, x);
 
             if ((d.dict[1].count() / 2) >= d.dict[1].size())
-                d.dict[1].resize(d.dict[1].size() * 2 - 1);
+            {
+                d.dict[1].reserve(d.dict[1].size() * 2 - 1);
+            }
 
             // id doesn't contains a user_id field
             // create new one for the current user_id
@@ -94,10 +93,13 @@ int place(IdDict<void> & d, int id, void * x)
         }
         else if (NeedRenumber) {
             // place id unchanged among the old ones
-            d.dict[1].replace(id, x);
+            //d.dict[1].replace(id, x);
+            d.dict[1].remove(id);
+            d.dict[1].insert(id, x);
+
 
             if ((d.dict[1].count() / 2) >= d.dict[1].size())
-                d.dict[1].resize(d.dict[1].size() * 2 - 1);
+                d.dict[1].reserve(d.dict[1].size() * 2 - 1);
 
             int nid;
 
@@ -158,9 +160,8 @@ int place(IdDict<void> & d, int id, void * x)
         d.dict[0].insert(id, x);
 
         if ((d.dict[0].count() / 2) >= d.dict[0].size())
-            d.dict[0].resize(d.dict[0].size() * 2 - 1);
+            d.dict[0].reserve(d.dict[0].size() * 2 - 1);
     }
-
     return id;
 }
 
@@ -189,7 +190,7 @@ struct NeedChange {
     NeedChange(IdDict<void> & d, int & id, void * e) : dict(d), ident(id), elt(e) {}
 };
 
-static Q3PtrList<NeedChange> MustBeRenumered;
+static QList<NeedChange *> MustBeRenumered;
 
 void will_change_id(IdDict<void> & d, int & id, void * x)
 {
@@ -201,7 +202,7 @@ void do_change_shared_ids()
     int user = user_id();
 
     while (!MustBeRenumered.isEmpty()) {
-        NeedChange * x = MustBeRenumered.take(0);
+        NeedChange * x = MustBeRenumered.takeFirst();
 
         x->ident = new_place(x->dict, user, x->elt);
         delete x;
diff --git a/src/misc/Labeled.h b/src/misc/Labeled.h
index e4efec13d..dd201b202 100644
--- a/src/misc/Labeled.h
+++ b/src/misc/Labeled.h
@@ -28,7 +28,7 @@
 #ifndef LABELED_H
 #define LABELED_H
 
-#include <q3intdict.h>
+//#include <q3intdict.h>
 #include "misc/mystr.h"
 // id 1 user 1
 #define PROJECT_ID (1*128 + 1)
@@ -46,7 +46,7 @@ template <class X> class Labeled;
 template <class X> class IdIterator;
 template <class X> class IdDict;
 
-extern void set_in_import(bool y, bool as_lib = FALSE);
+extern void set_in_import(bool y, bool as_lib = false);
 extern bool in_import();
 extern bool in_lib_import();
 
@@ -75,8 +75,8 @@ template <class X> class IdDict
 #else
 public:
 #endif
-    Q3IntDict<X> dict[2];
-    Q3IntDict<char> dictlib;
+    QHash<int,X*> dict[2];
+    QHash<int,char*> dictlib;
     int idmax;
     bool old_diagram;
 
@@ -89,7 +89,7 @@ template <class X> class IdDict
     IdDict(int sz, const char * who) {
         old_diagram = false;
         idmax = 0;
-        dict[0].resize(sz);
+        dict[0].reserve(sz);
         memo_idmax_loc(idmax, who);
     }
 
@@ -113,16 +113,18 @@ template <class X> class IdDict
     }
 
     void update_idmax_for_root() {
-        Q3IntDictIterator<X> it(dict[0]);
 
-        while (it.current()) {
-            int id = it.currentKey();
+        QHashIterator<int,X*> it(dict[0]);
+
+        while (it.hasNext()) {
+            it.next();
+            int id = it.key();
 
             if ((((unsigned)(id & ~127)) > ((unsigned) idmax)) &&
                 ((id & 127) == 0))
                 idmax = id & ~127;
 
-            ++it;
+            //++it;
         }
     }
 
@@ -130,22 +132,21 @@ template <class X> class IdDict
         old_diagram = y;
     }
 
-    void memo_id_oid(intptr_t id, int oid) {
-        dict[0].remove(static_cast<long>(id));
-        dictlib.replace(static_cast<long>(oid), reinterpret_cast<char *>(id));
-
-        if ((dictlib.count() / 2) >= dictlib.size()) {
-            dictlib.resize(dictlib.size() * 2 - 1);
-        }
+    void memo_id_oid(int id, int oid) {
+        dict[0].remove(id);
+        dictlib.insert(oid, reinterpret_cast<char *>(id));
     }
 };
 
-template <class X> class IdIterator : public Q3IntDictIterator<X>
+template <class X> class IdIterator
+        : public QHashIterator<int,X*>
+
 {
 public:
-    IdIterator(IdDict<X> & ids) : Q3IntDictIterator<X>(ids.dict[0]) {}
+    IdIterator(IdDict<X> & ids)
+        : QHashIterator<int,X*>(ids.dict[0])
+    {}
 };
-
 template <class X> class Labeled
 {
 private:
diff --git a/src/misc/ProfiledStereotypes.cpp b/src/misc/ProfiledStereotypes.cpp
index 065684665..3a4da372d 100644
--- a/src/misc/ProfiledStereotypes.cpp
+++ b/src/misc/ProfiledStereotypes.cpp
@@ -25,13 +25,13 @@
 //
 // *************************************************************************
 
-#include <q3ptrdict.h>
-#include <q3dict.h>
-#include <q3popupmenu.h>
+#include <qhash.h>
+////
+//#include <q3popupmenu.h>
 #include <qstack.h>
 #include <qimage.h>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 
 #include <QPixmap>
 
@@ -49,15 +49,14 @@
 #include "DialogUtil.h"
 #include "Images.h"
 #include "translate.h"
-
-#include <q3ptrstack.h>
+#include <qstack.h>
 
 struct ProfiledStereotype {
     ProfiledStereotype() : cl(0), properties_set(FALSE), browser_icon(0) {}
 
     BrowserClass * cl;
     QStringList propertiesFullName; // profile:stereotype:property
-    Q3ValueList<BrowserAttribute *> properties;
+    QList<BrowserAttribute *> properties;
     bool properties_set;
     QPixmap * browser_icon;
 
@@ -75,11 +74,11 @@ struct ProfiledStereotype {
 };
 
 // stereotypable element kind form -> code
-static Q3Dict<UmlCode> UnPretty2Code;
+static QMap<QString, UmlCode*> UnPretty2Code;
 
 // pretty <-> encoded element kind
-static Q3Dict<QString> Pretty;
-static Q3Dict<QString> UnPretty;
+static QMap<QString, QString*> Pretty;
+static QMap<QString, QString*> UnPretty;
 
 // all unpretty element kinds
 static QStringList Targets;
@@ -90,13 +89,13 @@ static QStringList Defaults[BrowserNodeSup];
 
 // key = an element (BrowserNode), give the stereotype
 // if its stereotype is modeled
-static Q3PtrDict<ProfiledStereotype> ProfiledStereotyped(257);
+static QHash<void*, ProfiledStereotype*> ProfiledStereotyped;
 
 // all the stereotype, key = profile:stereotype
-static Q3Dict<ProfiledStereotype> All;
+static QMap<QString, ProfiledStereotype*> All;
 
 // all the pixmap for browser, key = path
-static Q3Dict<QPixmap> BrowserPixmap;
+static QMap<QString ,QPixmap*> BrowserPixmap;
 
 // to continue to apply check recursively
 struct CheckCell {
@@ -106,7 +105,7 @@ struct CheckCell {
     CheckCell(BrowserNode * b, bool n) : bn(b), next(n) {}
 };
 
-static Q3PtrStack<CheckCell> CheckStack;
+static QStack<CheckCell*> CheckStack;
 
 void ProfiledStereotype::clear_properties()
 {
@@ -166,69 +165,71 @@ void ProfiledStereotype::set_properties()
 // an attribute is renamed, st is pack:class
 void ProfiledStereotype::renamed(BrowserAttribute * at)
 {
-    int rank = properties.findIndex(at);
+    int rank = properties.indexOf(at);
 
     if (rank == -1)
         return;
 
     QString prop_oldname = propertiesFullName[rank];
     QString prop_newname =
-        prop_oldname.left(prop_oldname.findRev(':') + 1) + at->get_name();
-    const char * oldprop = (const char *) prop_oldname;
-    const char * newprop = (const char *) prop_newname;
+        prop_oldname.left(prop_oldname.lastIndexOf(':') + 1) + at->get_name();
+    QString oldprop = prop_oldname;
+    QString newprop = prop_newname;
 
     propertiesFullName[rank] = prop_newname;
 
-    Q3PtrDictIterator<ProfiledStereotype> it(ProfiledStereotyped);
+    QHashIterator<void*,ProfiledStereotype*> it(ProfiledStereotyped);
 
-    while (it.current() != 0) {
+    while (it.hasNext() != 0) {
+        it.next();
         // update properties
-        // even if it.current() != this because of inheritances
-        BrowserNode * bn = (BrowserNode *) it.currentKey();
+        // even if it.value() != this because of inheritances
+        BrowserNode * bn = (BrowserNode *) it.key();
         unsigned nprop = bn->get_n_keys();
 
         for (unsigned index = 0; index != nprop; index += 1) {
-            if (!strcmp(bn->get_key(index), oldprop)) {
+            if (bn->get_key(index) == oldprop) {
                 bn->set_key(index, newprop);
                 break;
             }
         }
 
-        ++it;
+        //++it;
     }
 }
 
 // the attribute is deleted
 void ProfiledStereotype::deleted(BrowserAttribute * at)
 {
-    int rank = properties.findIndex(at);
+    int rank = properties.indexOf(at);
 
     if (rank == -1)
         return;
 
     QString prop_name = propertiesFullName[rank];
-    const char * prop = (const char *) prop_name;
+    QString prop = prop_name;
 
-    propertiesFullName.remove(propertiesFullName.at(rank));
-    properties.remove(properties.at(rank));
+    propertiesFullName.removeOne(propertiesFullName.at(rank));
+    properties.removeOne(properties.at(rank));
 
-    Q3PtrDictIterator<ProfiledStereotype> it(ProfiledStereotyped);
+    QHashIterator<void*, ProfiledStereotype*> it(ProfiledStereotyped);
 
-    while (it.current() != 0) {
+    while (it.hasNext()) {
+        it.next();
         // update properties
-        // even if it.current() != this because of inheritances
-        BrowserNode * bn = (BrowserNode *) it.currentKey();
+        // even if it.value() != this because of inheritances
+        BrowserNode * bn = (BrowserNode *) it.key();
         unsigned nprop = bn->get_n_keys();
 
         for (unsigned index = 0; index != nprop; index += 1) {
-            if (!strcmp(bn->get_key(index), prop)) {
+            if (bn->get_key(index) == prop) {
                 bn->remove_key_value(index);
                 bn->modified();
                 break;
             }
         }
 
-        ++it;
+        //++it;
     }
 }
 
@@ -236,7 +237,7 @@ void ProfiledStereotype::deleted(BrowserAttribute * at)
 // if its type return TRUE and set 'l' to the enum's items
 bool ProfiledStereotype::enumerated(QString k, QStringList & l) const
 {
-    int index = propertiesFullName.findIndex(k);
+    int index = propertiesFullName.indexOf(k);
 
     if (index == -1)
         // non consistent
@@ -266,12 +267,12 @@ void ProfiledStereotype::setIcon()
 {
     browser_icon = 0;
 
-    const char * path = cl->get_value("stereotypeIconPath");
+    QString path = cl->get_value("stereotypeIconPath");
 
-    if ((path == 0) || (*path == 0))
+    if (path.isEmpty())
         return;
 
-    QPixmap * px = BrowserPixmap.find(path);
+    QPixmap * px = BrowserPixmap[path];
 
     if (px != 0) {
         if (!(px->isNull()))
@@ -295,7 +296,7 @@ void ProfiledStereotype::setIcon()
                 h = 16;
             }
 
-            QImage img = px->convertToImage().smoothScale(w, h);
+            QImage img = px->toImage().scaled(w, h);
 
             browser_icon = new QPixmap();
             browser_icon->convertFromImage(img);
@@ -306,22 +307,24 @@ void ProfiledStereotype::setIcon()
 
 void ProfiledStereotype::updateStereotypedIcon()
 {
-    Q3PtrDictIterator<ProfiledStereotype> it(ProfiledStereotyped);
+    QHashIterator<void*,ProfiledStereotype*> it(ProfiledStereotyped);
     ProfiledStereotype * pst;
 
-    while ((pst = it.current()) != 0) {
+    while (it.hasNext()) {
+        it.next();
+        pst = it.value();
         if (pst == this)
-            ((BrowserNode *) it.currentKey())->iconChanged();
+            ((BrowserNode *) it.key())->iconChanged();
 
-        ++it;
+        //++it;
     }
 }
 
 const QPixmap * ProfiledStereotype::diagramPixmap(double zoom)
 {
-    const char * path = cl->get_value("stereotypeIconPath");
+    QString path = cl->get_value("stereotypeIconPath");
 
-    return (path == 0) ? 0 : get_pixmap(path, zoom);
+    return (path.isEmpty()) ? 0 : get_pixmap(path, zoom);
 }
 
 //
@@ -330,9 +333,12 @@ void ProfiledStereotypes::init()
 {
     init_images();
 
-    CheckStack.setAutoDelete(TRUE);
+    /*CheckStack.setAutoDelete(TRUE);
     CheckStack.clear();
     CheckStack.setAutoDelete(FALSE);
+    */
+    while(!CheckStack.isEmpty())
+        delete CheckStack.pop();
 
     int index;
 
@@ -341,17 +347,26 @@ void ProfiledStereotypes::init()
 
     ProfiledStereotyped.clear();
 
-    All.setAutoDelete(TRUE);
+    /*All.setAutoDelete(TRUE);
     All.clear();
     All.setAutoDelete(FALSE);
+    */
+    QList<ProfiledStereotype*> allVals = All.values();
+    while(!allVals.empty())
+        delete allVals.takeFirst();
+    All.clear();
 
-    BrowserPixmap.setAutoDelete(TRUE);
+    //BrowserPixmap.setAutoDelete(TRUE);
+    //BrowserPixmap.clear();
+    QList<QPixmap*> brList = BrowserPixmap.values();
+    while(!brList.isEmpty())
+        delete brList.takeFirst();
     BrowserPixmap.clear();
 
     if (UnPretty2Code.isEmpty()) {
-        UnPretty2Code.setAutoDelete(TRUE); // for valgrind
-        Pretty.setAutoDelete(TRUE); // for valgrind
-        UnPretty.setAutoDelete(TRUE); // for valgrind
+        //UnPretty2Code.setAutoDelete(TRUE); // for valgrind
+        //Pretty.setAutoDelete(TRUE); // for valgrind
+        //UnPretty.setAutoDelete(TRUE); // for valgrind
 
         UmlCode * pcode;
 
@@ -462,7 +477,7 @@ static void setDefault(QString st, QString sl)
 {
     if (! sl.isEmpty()) {
         QChar sep(' ');
-        QStringList ls = QStringList::split(sep, sl);
+        QStringList ls = sl.split(sep); //QStringList::split(sep, sl);
         QStringList::Iterator it;
 
         for (it = ls.begin(); it != ls.end(); ++it) {
@@ -483,7 +498,7 @@ void renamed(BrowserClass * cl, QString oldname, QString oldpkname)
     unsigned index;
 
     for (index = 0; index != BrowserNodeSup; index += 1)
-        Defaults[index].remove(oldst);
+        Defaults[index].removeOne(oldst);
 
     setDefault(newst, cl->get_value("stereotypeApplyOn"));
 
@@ -494,28 +509,29 @@ void renamed(BrowserClass * cl, QString oldname, QString oldpkname)
 
     oldst += ":";
 
-    Q3PtrDictIterator<ProfiledStereotype> it(ProfiledStereotyped);
-    const char * oldsst = (const char *) oldst;
+    QHashIterator<void*, ProfiledStereotype*> it(ProfiledStereotyped);
+    QString oldsst =  oldst;
     int oldlen = oldst.length();
-    WrapperStr newcst = (const char *) newst;
+    WrapperStr newcst =  newst;
 
     newcst += ":";
 
-    while (it.current()) {
-        BrowserNode * bn = (BrowserNode *) it.currentKey();
+    while (it.hasNext()) {
+        it.next();
+        BrowserNode * bn = (BrowserNode *) it.key();
 
         // update stereotype
-        if (it.current() == pst)
+        if (it.value() == pst)
             bn->get_data()->set_stereotype(newst);
 
         // update properties
-        // even if it.current() != pst because of inheritances
+        // even if it.value() != pst because of inheritances
         unsigned nprop = bn->get_n_keys();
 
         for (index = 0; index != nprop; index += 1) {
-            const char * k = bn->get_key(index);
+            QString k = bn->get_key(index);
 
-            if (!strncmp(k, oldsst, oldlen)) {
+            if (k.startsWith(oldsst)) {
                 WrapperStr newk = newcst + (k + oldlen);
 
                 bn->set_key(index, (const char *) newk);
@@ -524,7 +540,7 @@ void renamed(BrowserClass * cl, QString oldname, QString oldpkname)
 
         bn->modified();
 
-        ++it;
+       // ++it;
     }
 }
 
@@ -573,28 +589,30 @@ static bool deleted(QString pfix, BrowserClass * cl, bool propag)
 {
     pfix += cl->get_name();
 
-    ProfiledStereotype * pst = All.find(pfix);
+    ProfiledStereotype * pst = All.value(pfix);
 
     if (pst != 0) {
-        Q3PtrDictIterator<ProfiledStereotype> it(ProfiledStereotyped);
-
-        while (it.current()) {
-            if (it.current() == pst) {
+        QHashIterator<void*, ProfiledStereotype*> it(ProfiledStereotyped);
+        while (it.hasNext()) {
+            it.next();
+            if (it.value() == pst) {
                 if (propag) {
-                    ((BrowserNode *) it.currentKey())->get_data()->set_stereotype("");
-                    ((BrowserNode *) it.currentKey())->modified();
+                    ((BrowserNode *) it.key())->get_data()->set_stereotype("");
+                    ((BrowserNode *) it.key())->modified();
                 }
 
-                ProfiledStereotyped.remove(it.currentKey());
+                ProfiledStereotyped.remove(it.key());
             }
             else
-                ++it;
+            {
+                //++it;
+            }
         }
 
         All.remove(pfix);
 
         for (unsigned index = 0; index != BrowserNodeSup; index += 1)
-            Defaults[index].remove(pfix);
+            Defaults[index].removeOne(pfix);
 
         delete pst;
         return TRUE;
@@ -639,13 +657,13 @@ QString ProfiledStereotypes::canAddStereotype(BrowserClass * cl, QString name)
 
     if ((pf->get_type() != UmlPackage) ||
         (strcmp(pf->get_data()->get_stereotype(), "profile") != 0))
-        return TR("isn't in a profile");
+        return QObject::tr("isn't in a profile");
     else {
         ProfiledStereotype * st =
             All[pf->get_name() + QString(":") + name];
 
         return ((st != 0) && (st->cl != cl))
-               ? TR("is already a stereotype")
+               ? QObject::tr("is already a stereotype")
                : QString();
     }
 }
@@ -656,13 +674,13 @@ QString ProfiledStereotypes::canAddStereotype(BrowserClassView * v, QString name
     BrowserNode * pf = (BrowserNode *) v->parent();
 
     if (strcmp(pf->get_data()->get_stereotype(), "profile") != 0)
-        return TR("isn't in a profile");
+        return QObject::tr("isn't in a profile");
     else {
         ProfiledStereotype * st =
             All[pf->get_name() + QString(":") + name];
 
         return (st != 0)
-               ? TR("is already a stereotype")
+               ? QObject::tr("is already a stereotype")
                : QString();
     }
 }
@@ -678,10 +696,9 @@ void ProfiledStereotypes::added(BrowserClass * cl)
 
         if (All[s] != 0) {
             // only possible during a load / import
-            msg_critical(TR("Unconsistency"),
-                         TR("stereotype '%1' defined several times,\n"
-                            "redondant definition is not managed as a stereotype",
-                            s));
+            msg_critical(QObject::tr("Unconsistency"),
+                         QObject::tr("stereotype '%1' defined several times,\n"
+                            "redondant definition is not managed as a stereotype").arg(s));
             cl->get_data()->set_stereotype("redondantProfiledStereotype");
         }
         else {
@@ -711,7 +728,7 @@ void ProfiledStereotypes::changed(BrowserClass * cl, QString oldname, bool newic
         unsigned index;
 
         for (index = 0; index != BrowserNodeSup; index += 1)
-            Defaults[index].remove(oldst);
+            Defaults[index].removeOne(oldst);
 
         setDefault(newst, cl->get_value("stereotypeApplyOn"));
     }
@@ -742,7 +759,7 @@ void ProfiledStereotypes::added(BrowserAttribute *)
 // attribute part of stereotype is modified
 void ProfiledStereotypes::changed(BrowserAttribute * at, QString oldname)
 {
-    if (strcmp(oldname, at->get_name())) {
+    if (strcmp(oldname.toLatin1().constData(), at->get_name().toLatin1().constData())) {
         QString sts = ((BrowserNode *) at->parent()->parent()->parent())->get_name() +
                       QString(":") + ((BrowserNode *) at->parent())->get_name();
         ProfiledStereotype * st = All[sts];
@@ -773,15 +790,16 @@ BrowserClass * ProfiledStereotypes::isModeled(QString s, bool case_sensitive)
     else if (case_sensitive)
         return 0;
 
-    Q3DictIterator<ProfiledStereotype> it(All);
+    QMapIterator<QString, ProfiledStereotype*> it(All);
 
-    s = s.lower();
+    s = s.toLower();
 
-    while (it.current() != 0) {
-        if (s == it.currentKey().lower())
-            return it.current()->cl;
+    while (it.hasNext()) {
+        it.next();
+        if (s == it.key().toLower())
+            return it.value()->cl;
 
-        ++it;
+        //++it;
     }
 
     return 0;
@@ -813,7 +831,8 @@ void ProfiledStereotypes::recompute(BrowserNode * bn)
     ProfiledStereotype * st;
 
     if (!s_st.isEmpty() && ((st = All[s_st]) != 0)) {
-        ProfiledStereotyped.replace(bn, st);
+        //ProfiledStereotyped.replace(bn, st);
+        ProfiledStereotyped.insert(bn, st);
 
         // search for extra properties
         unsigned nprop = bn->get_n_keys();
@@ -822,15 +841,12 @@ void ProfiledStereotypes::recompute(BrowserNode * bn)
         unsigned index = 0;
 
         while (index != nprop) {
-            const char * k = bn->get_key(index);
-            int nseps = 0;
+            QString k = bn->get_key(index);
+            QStringList p = k.split(':');
 
-            for (const char * p = k; *p; p += 1)
-                if (*p == ':')
-                    nseps += 1;
 
-            if (nseps == 2) {
-                if (st->propertiesFullName.findIndex(k) == -1) {
+            if (p.count() == 3) {
+                if (st->propertiesFullName.indexOf(k) == -1) {
                     // extra property, remove it
                     bn->remove_key_value(index);
                     nprop -= 1;
@@ -856,15 +872,15 @@ void ProfiledStereotypes::recompute(BrowserNode * bn)
             unsigned insertindex = nprop;
             QStringList::Iterator its =
                 st->propertiesFullName.begin();
-            Q3ValueList<BrowserAttribute *>::Iterator ita =
+            QList<BrowserAttribute *>::Iterator ita =
                 st->properties.begin();
 
             for (;;) {
                 QString s = *its;
-                const char * k = s;
+                const char * k = s.toLatin1().constData();
 
                 for (index = 0; index != nprop; index += 1)
-                    if (strcmp(k, bn->get_key(index)) == 0)
+                    if (k == bn->get_key(index))
                         break;
 
                 if (index == nprop) {
@@ -893,14 +909,9 @@ void ProfiledStereotypes::recompute(BrowserNode * bn)
         unsigned index = 0;
 
         while (index != nprop) {
-            const char * k = bn->get_key(index);
-            int nseps = 0;
-
-            for (const char * p = k; *p; p += 1)
-                if (*p == ':')
-                    nseps += 1;
-
-            if (nseps == 2) {
+            QString k = bn->get_key(index);
+            QStringList p = k.split(':');
+            if(p.count() == 3){
                 // extra property, remove it
                 bn->remove_key_value(index);
                 modified = TRUE;
@@ -931,9 +942,13 @@ static void recompute_recur(BrowserNode * bn)
 
 static void recompute_st_list()
 {
-    All.setAutoDelete(TRUE);
+    /*All.setAutoDelete(TRUE);
+    All.clear();
+    All.setAutoDelete(FALSE);*/
+    QList<ProfiledStereotype*> allVals = All.values();
+    while(!allVals.empty())
+        delete allVals.takeFirst();
     All.clear();
-    All.setAutoDelete(FALSE);
 
     int index;
 
@@ -945,7 +960,7 @@ static void recompute_st_list()
     BrowserClass::instances(l, "stereotype", TRUE);
 
     while (! l.isEmpty()) {
-        BrowserClass * cl = (BrowserClass *) l.take(0);
+        BrowserClass * cl = (BrowserClass *) l.takeFirst();
         BrowserNode * pf = (BrowserNode *) cl->parent()->parent();
 
         if ((pf->get_type() == UmlPackage) &&
@@ -953,9 +968,9 @@ static void recompute_st_list()
             QString s = pf->get_name() + QString(":") + cl->get_name();
 
             if (All[s] != 0) {
-                msg_critical(TR("Unconsistency"),
-                             TR("stereotype '%1' defined several times,\n"
-                                "redondant definition is not managed as a stereotype",
+                msg_critical(QObject::tr("Unconsistency"),
+                             QObject::tr("stereotype '%1' defined several times,\n"
+                                "redondant definition is not managed as a stereotype").arg(
                                 s));
                 cl->get_data()->set_stereotype("redondantProfiledStereotype");
             }
@@ -975,31 +990,38 @@ static void recompute_st_list()
 void ProfiledStereotypes::recompute(bool warm)
 {
     // compute stereotype attributes
-    Q3DictIterator<ProfiledStereotype> it(All);
+    QMapIterator<QString, ProfiledStereotype*> it(All);
     ProfiledStereotype * st;
 
     if (! warm)
         recompute_st_list();
     else {
-        while ((st = it.current()) != 0) {
-            st->clear_properties();
-            ++it;
+        while (it.hasNext()/*(st = it.value()) != 0*/) {
+            it.next();
+            st = it.value();
+            if(st)
+                st->clear_properties();
+            //++it;
         }
     }
 
-    it.toFirst();
+    QMapIterator<QString, ProfiledStereotype*> it2(All);
 
-    while ((st = it.current()) != 0) {
-        st->set_properties();
-        ++it;
+    while (it2.hasNext()/*(st = it.value()) != 0*/) {
+        it2.next();
+        st = it2.value();
+        if(st)
+            st->set_properties();
+        //++it;
     }
 
     if (warm) {
-        Q3PtrDictIterator<ProfiledStereotype> it(ProfiledStereotyped);
+        QHashIterator<void*, ProfiledStereotype*> it(ProfiledStereotyped);
 
-        while (it.current()) {
-            recompute((BrowserNode *) it.currentKey());
-            ++it;
+        while (it.hasNext()) {
+            it.next();
+            recompute((BrowserNode *) it.key());
+            //++it;
         }
     }
     else {
@@ -1017,15 +1039,16 @@ void ProfiledStereotypes::modified(BrowserNode * bn, bool newst)
 
     if (st != 0) {
         if (newst) {
-            ProfiledStereotyped.replace(bn, st);	// add it if needed
+            //ProfiledStereotyped.replace(bn, st);	// add it if needed
+            ProfiledStereotyped.insert(bn, st);
             recompute(bn);
         }
 
-        const char * s =
+        QString s =
             st->cl->get_value((newst) ? "stereotypeSet" : "stereotypeCheck");
 
-        if ((s != 0) && ((s = Tool::command(s)) != 0)) {
-            const char * args = st->cl->get_value((newst) ? "stereotypeSetParameters"
+        if (s ==  Tool::command(s)) {
+            QString args = st->cl->get_value((newst) ? "stereotypeSetParameters"
                                                   : "stereotypeCheckParameters");
 
             if (args == 0)
@@ -1052,7 +1075,8 @@ void ProfiledStereotypes::applyStereotype(BrowserNode * bn)
     ProfiledStereotype * st = All[sts];
 
     if (st != 0) {
-        ProfiledStereotyped.replace(bn, st);	// add it if needed
+        //ProfiledStereotyped.replace(bn, st);	// add it if needed
+        ProfiledStereotyped.insert(bn, st);	// add it if needed
         recompute(bn);
     }
     else if (ProfiledStereotyped.remove(bn))
@@ -1093,9 +1117,9 @@ void ProfiledStereotypes::callCheck(BrowserNode * bn, bool rec)
     bool applied = FALSE;
 
     if (st != 0) {
-        const char * s = st->cl->get_value("stereotypeCheck");
+        QString s = st->cl->get_value("stereotypeCheck");
 
-        if ((s != 0) && ((s = Tool::command(s)) != 0)) {
+        if (!(s = Tool::command(s)).isEmpty()) {
             ToolCom::run(s, bn, FALSE, FALSE, (rec) ? &callCheckCont : 0);
             applied = TRUE;
         }
@@ -1117,9 +1141,9 @@ static bool haveCheck(BrowserNode * bn)
     ProfiledStereotype * st = All[sts];
 
     if (st != 0) {
-        const char * s = st->cl->get_value("stereotypeCheck");
+        QString s = st->cl->get_value("stereotypeCheck");
 
-        if ((s != 0) && (Tool::command(s) != 0))
+        if (!Tool::command(s).isEmpty())
             return TRUE;
     }
 
@@ -1133,20 +1157,24 @@ static bool haveCheck(BrowserNode * bn)
 }
 
 // add menu entries if relevant
-void ProfiledStereotypes::menu(Q3PopupMenu & m, BrowserNode * bn, int bias)
+void ProfiledStereotypes::menu(QMenu & m, BrowserNode * bn, int bias)
 {
     QString sts = bn->get_data()->get_stereotype();
     ProfiledStereotype * st = All[sts];
     bool separatorinserted = FALSE;
 
     if (st != 0) {
-        const char * s = st->cl->get_value("stereotypeCheck");
+        QString s = st->cl->get_value("stereotypeCheck");
 
-        if ((s != 0) && (Tool::command(s) != 0)) {
+        if (!Tool::command(s).isEmpty()) {
             separatorinserted = TRUE;
-            m.insertSeparator();
-            m.setWhatsThis(m.insertItem(TR("Check"), bias),
-                           TR("to call the <i>check plug-out</i> associated to the stereotype"));
+            m.addSeparator();
+            QAction *action;
+            action = m.addAction(QObject::tr("Check"));
+            action->setData(bias);
+            action->setWhatsThis(QObject::tr("to call the <i>check plug-out</i> associated to the stereotype"));
+            //MenuFactory::addItem(m, QObject::tr("Check"), bias),
+              //             QObject::tr("to call the <i>check plug-out</i> associated to the stereotype"));
         }
     }
 
@@ -1161,15 +1189,29 @@ void ProfiledStereotypes::menu(Q3PopupMenu & m, BrowserNode * bn, int bias)
 
     if (have) {
         if (! separatorinserted)
-            m.insertSeparator();
+            m.addSeparator();
 
-        m.setWhatsThis(m.insertItem(TR("Force stereotype consistency"), bias + 2),
-                       TR("to recompute all concerning the profiles"));
+        QAction *action;
+        action = m.addAction(QObject::tr("Force stereotype consistency"));
+        action->setData(bias+2);
+        action->setWhatsThis(QObject::tr("to recompute all concerning the profiles"));
+
+
+        //MenuFactory::addItem(m, QObject::tr("Force stereotype consistency"), bias + 2),
+          //             QObject::tr("to recompute all concerning the profiles"));
 
         if (!ProfiledStereotyped.isEmpty() && haveCheck(bn))
-            m.setWhatsThis(m.insertItem(TR("Check recursively"), bias + 1),
-                           TR("to call the <i>check plug-out</i> associated to the stereotypes,"
-                              "doing down recursively"));
+        {
+            QAction *action;
+            action = m.addAction(QObject::tr("Check recursively"));
+            action->setData(bias+1);
+            action->setWhatsThis(QObject::tr("to call the <i>check plug-out</i> associated to the stereotypes,"
+                                             "doing down recursively"));
+
+            //MenuFactory::addItem(m, QObject::tr("Check recursively"), bias + 1),
+              //             QObject::tr("to call the <i>check plug-out</i> associated to the stereotypes,"
+                //              "doing down recursively"));
+        }
     }
 }
 
@@ -1201,7 +1243,7 @@ void ProfiledStereotypes::choiceManagement(BrowserNode * bn, int choice)
 
 bool ProfiledStereotypes::enumerated(QString k, QStringList & l)
 {
-    QString st = k.left(k.findRev(':'));
+    QString st = k.left(k.lastIndexOf(':'));
     ProfiledStereotype * pst = All[st];
 
     return (pst == 0) ? FALSE : pst->enumerated(k, l);
diff --git a/src/misc/ProfiledStereotypes.h b/src/misc/ProfiledStereotypes.h
index e163f2727..b1db19c93 100644
--- a/src/misc/ProfiledStereotypes.h
+++ b/src/misc/ProfiledStereotypes.h
@@ -26,11 +26,11 @@
 // *************************************************************************
 
 #ifndef PROFILEDSTEREOTYPES_H
-#define ProfiledSTEREOTYPES_H
+#define PROFILEDSTEREOTYPES_H
 
 #include <qstringlist.h>
 //Added by qt3to4:
-#include <Q3PopupMenu>
+#include <QMenu>
 #include <QPixmap>
 
 #include "UmlEnum.h"
@@ -71,7 +71,7 @@ class ProfiledStereotypes
     static BrowserClass * isModeled(QString, bool case_sensitive = TRUE);
     static void modified(BrowserNode *, bool);
     static void applyStereotype(BrowserNode * bn);
-    static void menu(Q3PopupMenu & m, BrowserNode * bn, int bias);
+    static void menu(QMenu & m, BrowserNode * bn, int bias);
     static void choiceManagement(BrowserNode * bn, int choice);
     static void callCheck(BrowserNode *, bool rec);
     static bool enumerated(QString st, QStringList &);
diff --git a/src/misc/Settings.cpp b/src/misc/Settings.cpp
index 46876b466..b08fddc3b 100644
--- a/src/misc/Settings.cpp
+++ b/src/misc/Settings.cpp
@@ -447,126 +447,126 @@ void ClassDiagramSettings::complete(StateSpecVector & a, UmlCode who)
         // order known by ClassDiagramSettings::set
         a.resize(i + 18);
 
-        a[i].set(TR("drawing language"), &drawing_language);
-        a[i + 1].set(TR("drawing mode"), &class_drawing_mode);
-        a[i + 2].set(TR("show context"), &show_context_mode);
-        a[i + 3].set(TR("hide attributes"), &hide_attributes);
-        a[i + 4].set(TR("hide operations"), &hide_operations);
-        a[i + 5].set(TR("hide get/set operations"), &hide_getset_operations);
-        a[i + 6].set(TR("show members full definition"),
+        a[i].set(QObject::tr("drawing language"), &drawing_language);
+        a[i + 1].set(QObject::tr("drawing mode"), &class_drawing_mode);
+        a[i + 2].set(QObject::tr("show context"), &show_context_mode);
+        a[i + 3].set(QObject::tr("hide attributes"), &hide_attributes);
+        a[i + 4].set(QObject::tr("hide operations"), &hide_operations);
+        a[i + 5].set(QObject::tr("hide get/set operations"), &hide_getset_operations);
+        a[i + 6].set(QObject::tr("show members full definition"),
                      &show_full_members_definition);
-        a[i + 7].set(TR("show members visibility"),
+        a[i + 7].set(QObject::tr("show members visibility"),
                      &show_members_visibility);
-        a[i + 8].set(TR("show members stereotype"),
+        a[i + 8].set(QObject::tr("show members stereotype"),
                      &show_members_stereotype);
-        a[i + 9].set(TR("show context in members definition"),
+        a[i + 9].set(QObject::tr("show context in members definition"),
                      &show_members_context);
-        a[i + 10].set(TR("show attributes multiplicity"),
+        a[i + 10].set(QObject::tr("show attributes multiplicity"),
                       &show_members_multiplicity);
-        a[i + 11].set(TR("show attributes initialisation"),
+        a[i + 11].set(QObject::tr("show attributes initialisation"),
                       &show_members_initialization);
-        a[i + 12].set(TR("show attribute modifiers"),
+        a[i + 12].set(QObject::tr("show attribute modifiers"),
                       &show_attribute_modifiers);
-        a[i + 13].set(TR("show parameter direction"),
+        a[i + 13].set(QObject::tr("show parameter direction"),
                       &show_parameter_dir);
-        a[i + 14].set(TR("show parameter name"),
+        a[i + 14].set(QObject::tr("show parameter name"),
                       &show_parameter_name);
-        a[i + 15].set(TR("members max width"),
+        a[i + 15].set(QObject::tr("members max width"),
                       &member_max_width);
-        a[i + 16].set(TR("show information note"),
+        a[i + 16].set(QObject::tr("show information note"),
                       &show_infonote);
-        a[i + 17].set(TR("show stereotype properties"),
+        a[i + 17].set(QObject::tr("show stereotype properties"),
                       &show_stereotype_properties);
         break;
 
     case UmlPackage:
         a.resize(i + 3);
 
-        a[i].set(TR("name in tab"), &package_name_in_tab);
-        a[i + 1].set(TR("show context"), &show_context_mode);
-        a[i + 2].set(TR("show stereotype properties"), &show_stereotype_properties);
+        a[i].set(QObject::tr("name in tab"), &package_name_in_tab);
+        a[i + 1].set(QObject::tr("show context"), &show_context_mode);
+        a[i + 2].set(QObject::tr("show stereotype properties"), &show_stereotype_properties);
         break;
 
     case UmlClassDiagram:
         a.resize(i + 24);
 
-        a[i].set(TR("drawing language"), &drawing_language);
-        a[i + 1].set(TR("classes drawing mode"), &class_drawing_mode);
-        a[i + 2].set(TR("hide classes attributes"), &hide_attributes);
-        a[i + 3].set(TR("hide classes operations"), &hide_operations);
-        a[i + 4].set(TR("hide classes get/set operations"), &hide_getset_operations);
-        a[i + 5].set(TR("show classes members full definition"),
+        a[i].set(QObject::tr("drawing language"), &drawing_language);
+        a[i + 1].set(QObject::tr("classes drawing mode"), &class_drawing_mode);
+        a[i + 2].set(QObject::tr("hide classes attributes"), &hide_attributes);
+        a[i + 3].set(QObject::tr("hide classes operations"), &hide_operations);
+        a[i + 4].set(QObject::tr("hide classes get/set operations"), &hide_getset_operations);
+        a[i + 5].set(QObject::tr("show classes members full definition"),
                      &show_full_members_definition);
-        a[i + 6].set(TR("show members visibility"),
+        a[i + 6].set(QObject::tr("show members visibility"),
                      &show_members_visibility);
-        a[i + 7].set(TR("show members stereotype"),
+        a[i + 7].set(QObject::tr("show members stereotype"),
                      &show_members_stereotype);
-        a[i + 8].set(TR("show context in members definition"),
+        a[i + 8].set(QObject::tr("show context in members definition"),
                      &show_members_context);
-        a[i + 9].set(TR("show attributes multiplicity"),
+        a[i + 9].set(QObject::tr("show attributes multiplicity"),
                      &show_members_multiplicity);
-        a[i + 10].set(TR("show attributes initialization"),
+        a[i + 10].set(QObject::tr("show attributes initialization"),
                       &show_members_initialization);
-        a[i + 11].set(TR("show attribute modifiers"),
+        a[i + 11].set(QObject::tr("show attribute modifiers"),
                       &show_attribute_modifiers);
-        a[i + 12].set(TR("show parameter direction"),
+        a[i + 12].set(QObject::tr("show parameter direction"),
                       &show_parameter_dir);
-        a[i + 13].set(TR("show parameter name"),
+        a[i + 13].set(QObject::tr("show parameter name"),
                       &show_parameter_name);
-        a[i + 14].set(TR("members max width"),
+        a[i + 14].set(QObject::tr("members max width"),
                       &member_max_width);
-        a[i + 15].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 16].set(TR("show relation modifiers"), &show_relation_modifiers);
-        a[i + 17].set(TR("show relation visibility"), &show_relation_visibility);
-        a[i + 18].set(TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 19].set(TR("show classes and packages context"), &show_context_mode);
-        a[i + 20].set(TR("automatic labels position"), &auto_label_position);
-        a[i + 21].set(TR("show information note"), &show_infonote);
-        a[i + 22].set(TR("show stereotype properties"),
+        a[i + 15].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 16].set(QObject::tr("show relation modifiers"), &show_relation_modifiers);
+        a[i + 17].set(QObject::tr("show relation visibility"), &show_relation_visibility);
+        a[i + 18].set(QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 19].set(QObject::tr("show classes and packages context"), &show_context_mode);
+        a[i + 20].set(QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 21].set(QObject::tr("show information note"), &show_infonote);
+        a[i + 22].set(QObject::tr("show stereotype properties"),
                       &show_stereotype_properties);
-        a[i + 23].set(TR("draw shadow"), &shadow);
+        a[i + 23].set(QObject::tr("draw shadow"), &shadow);
         break;
 
     default: {
-        QString s = TR("class") + "#";
+        QString s = QObject::tr("class") + "#";
 
         a.resize(i + 24);
 
-        a[i].set(s + TR("drawing language"), &drawing_language);
-        a[i + 1].set(s + TR("classes drawing mode"), &class_drawing_mode);
-        a[i + 2].set(s + TR("hide classes attributes"), &hide_attributes);
-        a[i + 3].set(s + TR("hide classes operations"), &hide_operations);
-        a[i + 4].set(s + TR("hide classes get/set operations"), &hide_getset_operations);
-        a[i + 5].set(s + TR("show classes members full definition"),
+        a[i].set(s + QObject::tr("drawing language"), &drawing_language);
+        a[i + 1].set(s + QObject::tr("classes drawing mode"), &class_drawing_mode);
+        a[i + 2].set(s + QObject::tr("hide classes attributes"), &hide_attributes);
+        a[i + 3].set(s + QObject::tr("hide classes operations"), &hide_operations);
+        a[i + 4].set(s + QObject::tr("hide classes get/set operations"), &hide_getset_operations);
+        a[i + 5].set(s + QObject::tr("show classes members full definition"),
                      &show_full_members_definition);
-        a[i + 6].set(s + TR("show classes members visibility"),
+        a[i + 6].set(s + QObject::tr("show classes members visibility"),
                      &show_members_visibility);
-        a[i + 7].set(s + TR("show classes members stereotype"),
+        a[i + 7].set(s + QObject::tr("show classes members stereotype"),
                      &show_members_stereotype);
-        a[i + 8].set(s + TR("show context in classes members definition"),
+        a[i + 8].set(s + QObject::tr("show context in classes members definition"),
                      &show_members_context);
-        a[i + 9].set(s + TR("show attribute multiplicity"),
+        a[i + 9].set(s + QObject::tr("show attribute multiplicity"),
                      &show_members_multiplicity);
-        a[i + 10].set(s + TR("show attribute initialization"),
+        a[i + 10].set(s + QObject::tr("show attribute initialization"),
                       &show_members_initialization);
-        a[i + 11].set(s + TR("show attribute modifiers"),
+        a[i + 11].set(s + QObject::tr("show attribute modifiers"),
                       &show_attribute_modifiers);
-        a[i + 12].set(s + TR("show operation parameter direction"),
+        a[i + 12].set(s + QObject::tr("show operation parameter direction"),
                       &show_parameter_dir);
-        a[i + 13].set(s + TR("show operation parameter name"),
+        a[i + 13].set(s + QObject::tr("show operation parameter name"),
                       &show_parameter_name);
-        a[i + 14].set(s + TR("max members width"),
+        a[i + 14].set(s + QObject::tr("max members width"),
                       &member_max_width);
-        a[i + 15].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 16].set(s + TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 17].set(s + TR("show relation modifiers"), &show_relation_modifiers);
-        a[i + 18].set(s + TR("show relation visibility"), &show_relation_visibility);
-        a[i + 19].set(s + TR("show classes and packages context"), &show_context_mode);
-        a[i + 20].set(s + TR("automatic labels position"), &auto_label_position);
-        a[i + 21].set(s + TR("show information note"), &show_infonote);
-        a[i + 22].set(s + TR("show stereotype properties"),
+        a[i + 15].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 16].set(s + QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 17].set(s + QObject::tr("show relation modifiers"), &show_relation_modifiers);
+        a[i + 18].set(s + QObject::tr("show relation visibility"), &show_relation_visibility);
+        a[i + 19].set(s + QObject::tr("show classes and packages context"), &show_context_mode);
+        a[i + 20].set(s + QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 21].set(s + QObject::tr("show information note"), &show_infonote);
+        a[i + 22].set(s + QObject::tr("show stereotype properties"),
                       &show_stereotype_properties);
-        a[i + 23].set(s + TR("draw shadow"), &shadow);
+        a[i + 23].set(s + QObject::tr("draw shadow"), &shadow);
     }
     }
 }
@@ -679,9 +679,9 @@ void SimpleClassDiagramSettings::complete(StateSpecVector & a)
 
     a.resize(i + 3);
 
-    a[i].set(TR("drawing mode"), &class_drawing_mode);
-    a[i + 1].set(TR("show context"), &show_context_mode);
-    a[i + 2].set(TR("show stereotype properties"), &show_stereotype_properties);
+    a[i].set(QObject::tr("drawing mode"), &class_drawing_mode);
+    a[i + 1].set(QObject::tr("show context"), &show_context_mode);
+    a[i + 2].set(QObject::tr("show stereotype properties"), &show_stereotype_properties);
 }
 
 // to update class canvas settings
@@ -820,28 +820,28 @@ void SequenceDiagramSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 9);
 
     if (local) {
-        a[i].set(TR("drawing language"), &drawing_language);
-        a[i + 1].set(TR("instances drawing mode"), &instances_drawing_mode);
-        a[i + 2].set(TR("show operations full definition"), &show_full_operations_definition);
-        a[i + 3].set(TR("write name:type horizontally"), &write_horizontally);
-        a[i + 4].set(TR("show classes context"), &show_class_context_mode);
-        a[i + 5].set(TR("show messages context"), &show_msg_context_mode);
-        a[i + 6].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 7].set(TR("show stereotype properties"), &show_stereotype_properties);
-        a[i + 8].set(TR("draw shadow"), &shadow);
+        a[i].set(QObject::tr("drawing language"), &drawing_language);
+        a[i + 1].set(QObject::tr("instances drawing mode"), &instances_drawing_mode);
+        a[i + 2].set(QObject::tr("show operations full definition"), &show_full_operations_definition);
+        a[i + 3].set(QObject::tr("write name:type horizontally"), &write_horizontally);
+        a[i + 4].set(QObject::tr("show classes context"), &show_class_context_mode);
+        a[i + 5].set(QObject::tr("show messages context"), &show_msg_context_mode);
+        a[i + 6].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 7].set(QObject::tr("show stereotype properties"), &show_stereotype_properties);
+        a[i + 8].set(QObject::tr("draw shadow"), &shadow);
     }
     else {
-        QString s = TR("sequence") + "#";
+        QString s = QObject::tr("sequence") + "#";
 
-        a[i].set(s + TR("drawing language"), &drawing_language);
-        a[i + 1].set(s + TR("instances drawing mode"), &instances_drawing_mode);
-        a[i + 2].set(s + TR("show operations full definition"), &show_full_operations_definition);
-        a[i + 3].set(s + TR("write name:type horizontally"), &write_horizontally);
-        a[i + 4].set(s + TR("show classes context"), &show_class_context_mode);
-        a[i + 5].set(s + TR("show messages context"), &show_msg_context_mode);
-        a[i + 6].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 7].set(s + TR("show stereotype properties"), &show_stereotype_properties);
-        a[i + 8].set(s + TR("draw shadow"), &shadow);
+        a[i].set(s + QObject::tr("drawing language"), &drawing_language);
+        a[i + 1].set(s + QObject::tr("instances drawing mode"), &instances_drawing_mode);
+        a[i + 2].set(s + QObject::tr("show operations full definition"), &show_full_operations_definition);
+        a[i + 3].set(s + QObject::tr("write name:type horizontally"), &write_horizontally);
+        a[i + 4].set(s + QObject::tr("show classes context"), &show_class_context_mode);
+        a[i + 5].set(s + QObject::tr("show messages context"), &show_msg_context_mode);
+        a[i + 6].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 7].set(s + QObject::tr("show stereotype properties"), &show_stereotype_properties);
+        a[i + 8].set(s + QObject::tr("draw shadow"), &shadow);
     }
 }
 
@@ -988,37 +988,37 @@ void CollaborationDiagramSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 10);
 
     if (local) {
-        a[i].set(TR("drawing language"), &drawing_language);
-        a[i + 1].set(TR("show operations full definition"),
+        a[i].set(QObject::tr("drawing language"), &drawing_language);
+        a[i + 1].set(QObject::tr("show operations full definition"),
                      &show_full_operations_definition);
-        a[i + 2].set(TR("show hierarchical rank"),
+        a[i + 2].set(QObject::tr("show hierarchical rank"),
                      &show_hierarchical_rank);
-        a[i + 3].set(TR("write name:type horizontally"),
+        a[i + 3].set(QObject::tr("write name:type horizontally"),
                      &write_horizontally);
-        a[i + 4].set(TR("packages name in tab"), &package_name_in_tab);
-        a[i + 5].set(TR("show classes and packages context"), &show_class_pack_context_mode);
-        a[i + 6].set(TR("show messages context"), &show_msg_context_mode);
-        a[i + 7].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 8].set(TR("show stereotype properties"), &show_stereotype_properties);
-        a[i + 9].set(TR("draw shadow"), &shadow);
+        a[i + 4].set(QObject::tr("packages name in tab"), &package_name_in_tab);
+        a[i + 5].set(QObject::tr("show classes and packages context"), &show_class_pack_context_mode);
+        a[i + 6].set(QObject::tr("show messages context"), &show_msg_context_mode);
+        a[i + 7].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 8].set(QObject::tr("show stereotype properties"), &show_stereotype_properties);
+        a[i + 9].set(QObject::tr("draw shadow"), &shadow);
     }
     else {
-        QString s = TR("communication") + "#";
+        QString s = QObject::tr("communication") + "#";
 
-        a[i].set(s + TR("drawing language"),
+        a[i].set(s + QObject::tr("drawing language"),
                  &drawing_language);
-        a[i + 1].set(s + TR("show operations full definition"),
+        a[i + 1].set(s + QObject::tr("show operations full definition"),
                      &show_full_operations_definition);
-        a[i + 2].set(s + TR("show hierarchical rank"),
+        a[i + 2].set(s + QObject::tr("show hierarchical rank"),
                      &show_hierarchical_rank);
-        a[i + 3].set(s + TR("write name:type horizontally"),
+        a[i + 3].set(s + QObject::tr("write name:type horizontally"),
                      &write_horizontally);
-        a[i + 4].set(s + TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 5].set(s + TR("show classes and packages context"), &show_class_pack_context_mode);
-        a[i + 6].set(s + TR("show messages context"), &show_msg_context_mode);
-        a[i + 7].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 8].set(s + TR("show stereotype properties"), &show_stereotype_properties);
-        a[i + 9].set(s + TR("draw shadow"), &shadow);
+        a[i + 4].set(s + QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 5].set(s + QObject::tr("show classes and packages context"), &show_class_pack_context_mode);
+        a[i + 6].set(s + QObject::tr("show messages context"), &show_msg_context_mode);
+        a[i + 7].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 8].set(s + QObject::tr("show stereotype properties"), &show_stereotype_properties);
+        a[i + 9].set(s + QObject::tr("draw shadow"), &shadow);
     }
 }
 
@@ -1027,11 +1027,11 @@ void CollaborationDiagramSettings::complete_msg(StateSpecVector & a)
     int i = a.size();
 
     a.resize(i + 4);
-    a[i].set(TR("drawing language"), &drawing_language);
-    a[i + 1].set(TR("show operations full definition"),
+    a[i].set(QObject::tr("drawing language"), &drawing_language);
+    a[i + 1].set(QObject::tr("show operations full definition"),
                  &show_full_operations_definition);
-    a[i + 2].set(TR("show messages context"), &show_msg_context_mode);
-    a[i + 3].set(TR("show hierarchical rank"),
+    a[i + 2].set(QObject::tr("show messages context"), &show_msg_context_mode);
+    a[i + 3].set(QObject::tr("show hierarchical rank"),
                  &show_hierarchical_rank);
 }
 
@@ -1132,24 +1132,24 @@ void ObjectDiagramSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 7);
 
     if (local) {
-        a[i].set(TR("write name:type horizontally"), &write_horizontally);
-        a[i + 1].set(TR("packages name in tab"), &package_name_in_tab);
-        a[i + 2].set(TR("show classes and packages context"), &show_class_pack_context_mode);
-        a[i + 3].set(TR("automatic labels position"), &auto_label_position);
-        a[i + 4].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 5].set(TR("show stereotype properties"), &show_stereotype_properties);
-        a[i + 6].set(TR("draw shadow"), &shadow);
+        a[i].set(QObject::tr("write name:type horizontally"), &write_horizontally);
+        a[i + 1].set(QObject::tr("packages name in tab"), &package_name_in_tab);
+        a[i + 2].set(QObject::tr("show classes and packages context"), &show_class_pack_context_mode);
+        a[i + 3].set(QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 4].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 5].set(QObject::tr("show stereotype properties"), &show_stereotype_properties);
+        a[i + 6].set(QObject::tr("draw shadow"), &shadow);
     }
     else {
-        QString s = TR("object") + "#";
+        QString s = QObject::tr("object") + "#";
 
-        a[i].set(s + TR("write name:type horizontally"), &write_horizontally);
-        a[i + 1].set(s + TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 2].set(s + TR("show classes and packages context"), &show_class_pack_context_mode);
-        a[i + 3].set(s + TR("automatic labels position"), &auto_label_position);
-        a[i + 4].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 5].set(s + TR("show stereotype properties"), &show_stereotype_properties);
-        a[i + 6].set(s + TR("draw shadow"), &shadow);
+        a[i].set(s + QObject::tr("write name:type horizontally"), &write_horizontally);
+        a[i + 1].set(s + QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 2].set(s + QObject::tr("show classes and packages context"), &show_class_pack_context_mode);
+        a[i + 3].set(s + QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 4].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 5].set(s + QObject::tr("show stereotype properties"), &show_stereotype_properties);
+        a[i + 6].set(s + QObject::tr("draw shadow"), &shadow);
     }
 }
 
@@ -1260,24 +1260,24 @@ void UseCaseDiagramSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 7);
 
     if (local) {
-        a[i].set(TR("packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(TR("show packages context"), &show_context_mode);
-        a[i + 2].set(TR("automatic labels position"), &auto_label_position);
-        a[i + 3].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 4].set(TR("class drawing mode"), &class_drawing_mode);
-        a[i + 5].set(TR("show stereotype properties"), &show_stereotype_properties);
-        a[i + 6].set(TR("draw shadow"), &shadow);
+        a[i].set(QObject::tr("packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 3].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 4].set(QObject::tr("class drawing mode"), &class_drawing_mode);
+        a[i + 5].set(QObject::tr("show stereotype properties"), &show_stereotype_properties);
+        a[i + 6].set(QObject::tr("draw shadow"), &shadow);
     }
     else {
-        QString s = TR("use case") + "#";
+        QString s = QObject::tr("use case") + "#";
 
-        a[i].set(s + TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(s + TR("show packages context"), &show_context_mode);
-        a[i + 2].set(s + TR("automatic labels position"), &auto_label_position);
-        a[i + 3].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 4].set(s + TR("class drawing mode"), &class_drawing_mode);
-        a[i + 5].set(s + TR("show stereotype properties"), &show_stereotype_properties);
-        a[i + 6].set(s + TR("draw shadow"), &shadow);
+        a[i].set(s + QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(s + QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(s + QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 3].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 4].set(s + QObject::tr("class drawing mode"), &class_drawing_mode);
+        a[i + 5].set(s + QObject::tr("show stereotype properties"), &show_stereotype_properties);
+        a[i + 6].set(s + QObject::tr("draw shadow"), &shadow);
     }
 }
 
@@ -1365,20 +1365,20 @@ void ComponentDiagramSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 5);
 
     if (local) {
-        a[i].set(TR("packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(TR("show packages context"), &show_context_mode);
-        a[i + 2].set(TR("automatic labels position"), &auto_label_position);
-        a[i + 3].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 4].set(TR("draw shadow"), &shadow);
+        a[i].set(QObject::tr("packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 3].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 4].set(QObject::tr("draw shadow"), &shadow);
     }
     else {
-        QString s = TR("component") + "#";
+        QString s = QObject::tr("component") + "#";
 
-        a[i].set(s + TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(s + TR("show packages context"), &show_context_mode);
-        a[i + 2].set(s + TR("automatic labels position"), &auto_label_position);
-        a[i + 3].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 4].set(s + TR("draw shadow"), &shadow);
+        a[i].set(s + QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(s + QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(s + QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 3].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 4].set(s + QObject::tr("draw shadow"), &shadow);
     }
 
     componentdrawingsettings.complete(a, local, FALSE);
@@ -1478,22 +1478,22 @@ void DeploymentDiagramSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 6);
 
     if (local) {
-        a[i].set(TR("packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(TR("show packages context"), &show_context_mode);
-        a[i + 2].set(TR("write node instance horizontally"), &write_horizontally);
-        a[i + 3].set(TR("automatic labels position"), &auto_label_position);
-        a[i + 4].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 5].set(TR("draw shadow"), &shadow);
+        a[i].set(QObject::tr("packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(QObject::tr("write node instance horizontally"), &write_horizontally);
+        a[i + 3].set(QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 4].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 5].set(QObject::tr("draw shadow"), &shadow);
     }
     else  {
-        QString s = TR("deployment") + "#";
+        QString s = QObject::tr("deployment") + "#";
 
-        a[i].set(s + TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(s + TR("show packages context"), &show_context_mode);
-        a[i + 2].set(s + TR("write node instances horizontally"), &write_horizontally);
-        a[i + 3].set(s + TR("automatic labels position"), &auto_label_position);
-        a[i + 4].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 5].set(s + TR("draw shadow"), &shadow);
+        a[i].set(s + QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(s + QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(s + QObject::tr("write node instances horizontally"), &write_horizontally);
+        a[i + 3].set(s + QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 4].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 5].set(s + QObject::tr("draw shadow"), &shadow);
     }
 
     componentdrawingsettings.complete(a, local, TRUE);
@@ -1570,25 +1570,25 @@ void ComponentDrawingSettings::assign(const ComponentDiagramSettings & from)
 void ComponentDrawingSettings::complete(StateSpecVector & a,
                                         bool local, bool depl)
 {
-    QString s = ((depl) ? TR("deployment") : TR("component")) + "#";
+    QString s = ((depl) ? QObject::tr("deployment") : QObject::tr("component")) + "#";
     int i = a.size();
 
     a.resize(i + 4);
-    a[i].set((local) ? TR("draw component as icon")
-             : s + ((depl) ? TR("draw component as icon")
-                    : TR("draw component as icon")),
+    a[i].set((local) ? QObject::tr("draw component as icon")
+             : s + ((depl) ? QObject::tr("draw component as icon")
+                    : QObject::tr("draw component as icon")),
              &draw_component_as_icon);
-    a[i + 1].set((local) ? TR("show component's required\nand provided interfaces")
-                 : s + ((depl) ? TR("show component's required\nand provided interfaces")
-                        : TR("show component's required\nand provided interfaces")),
+    a[i + 1].set((local) ? QObject::tr("show component's required\nand provided interfaces")
+                 : s + ((depl) ? QObject::tr("show component's required\nand provided interfaces")
+                        : QObject::tr("show component's required\nand provided interfaces")),
                  &show_component_req_prov);
-    a[i + 2].set((local) ? TR("show component's realizations")
-                 : s + ((depl) ? TR("show component's realizations")
-                        : TR("show component's realizations")),
+    a[i + 2].set((local) ? QObject::tr("show component's realizations")
+                 : s + ((depl) ? QObject::tr("show component's realizations")
+                        : QObject::tr("show component's realizations")),
                  &show_component_rea);
-    a[i + 3].set((local) ? TR("show stereotype properties")
-                 : s + ((depl) ? TR("show stereotype properties")
-                        : TR("show stereotype properties")),
+    a[i + 3].set((local) ? QObject::tr("show stereotype properties")
+                 : s + ((depl) ? QObject::tr("show stereotype properties")
+                        : QObject::tr("show stereotype properties")),
                  &show_stereotype_properties);
 }
 
@@ -1694,24 +1694,24 @@ void StateDiagramSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 7);
 
     if (local) {
-        a[i].set(TR("packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(TR("show packages context"), &show_context_mode);
-        a[i + 2].set(TR("automatic labels position"), &auto_label_position);
-        a[i + 3].set(TR("write transition horizontally"), &write_label_horizontally);
-        a[i + 4].set(TR("show transition definition"), &show_trans_definition);
-        a[i + 5].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 6].set(TR("draw shadow"), &shadow);
+        a[i].set(QObject::tr("packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 3].set(QObject::tr("write transition horizontally"), &write_label_horizontally);
+        a[i + 4].set(QObject::tr("show transition definition"), &show_trans_definition);
+        a[i + 5].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 6].set(QObject::tr("draw shadow"), &shadow);
     }
     else {
-        QString s = TR("state") + "#";
+        QString s = QObject::tr("state") + "#";
 
-        a[i].set(s + TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(s + TR("show packages context"), &show_context_mode);
-        a[i + 2].set(s + TR("automatic labels position"), &auto_label_position);
-        a[i + 3].set(s + TR("write transition horizontally"), &write_label_horizontally);
-        a[i + 4].set(s + TR("show transition definition"), &show_trans_definition);
-        a[i + 5].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 6].set(s + TR("draw shadow"), &shadow);
+        a[i].set(s + QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(s + QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(s + QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 3].set(s + QObject::tr("write transition horizontally"), &write_label_horizontally);
+        a[i + 4].set(s + QObject::tr("show transition definition"), &show_trans_definition);
+        a[i + 5].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 6].set(s + QObject::tr("draw shadow"), &shadow);
     }
 
     statedrawingsettings.complete(a, local);
@@ -1786,18 +1786,18 @@ void StateDrawingSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 4);
 
     if (local) {
-        a[i].set(TR("show state activities"), &show_activities);
-        a[i + 1].set(TR("draw state's regions horizontally"), &region_horizontally);
-        a[i + 2].set(TR("drawing language"), &drawing_language);
-        a[i + 3].set(TR("show stereotype properties"), &show_stereotype_properties);
+        a[i].set(QObject::tr("show state activities"), &show_activities);
+        a[i + 1].set(QObject::tr("draw state's regions horizontally"), &region_horizontally);
+        a[i + 2].set(QObject::tr("drawing language"), &drawing_language);
+        a[i + 3].set(QObject::tr("show stereotype properties"), &show_stereotype_properties);
     }
     else {
-        QString s = TR("state") + "#";
+        QString s = QObject::tr("state") + "#";
 
-        a[i].set(s + TR("show state activities"), &show_activities);
-        a[i + 1].set(s + TR("draw state's regions horizontally"), &region_horizontally);
-        a[i + 2].set(s + TR("drawing language"), &drawing_language);
-        a[i + 3].set(s + TR("show stereotype properties"), &show_stereotype_properties);
+        a[i].set(s + QObject::tr("show state activities"), &show_activities);
+        a[i + 1].set(s + QObject::tr("draw state's regions horizontally"), &region_horizontally);
+        a[i + 2].set(s + QObject::tr("drawing language"), &drawing_language);
+        a[i + 3].set(s + QObject::tr("show stereotype properties"), &show_stereotype_properties);
     }
 }
 
@@ -1903,24 +1903,24 @@ void ActivityDiagramSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 7);
 
     if (local) {
-        a[i].set(TR("packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(TR("show packages context"), &show_context_mode);
-        a[i + 2].set(TR("automatic labels position"), &auto_label_position);
-        a[i + 3].set(TR("write flow label horizontally"), &write_label_horizontally);
-        a[i + 4].set(TR("show opaque action definition"), &show_opaque_action_definition);
-        a[i + 5].set(TR("draw all relations"), &draw_all_relations);
-        a[i + 6].set(TR("draw shadow"), &shadow);
+        a[i].set(QObject::tr("packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 3].set(QObject::tr("write flow label horizontally"), &write_label_horizontally);
+        a[i + 4].set(QObject::tr("show opaque action definition"), &show_opaque_action_definition);
+        a[i + 5].set(QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 6].set(QObject::tr("draw shadow"), &shadow);
     }
     else {
-        QString s = TR("activity") + "#";
+        QString s = QObject::tr("activity") + "#";
 
-        a[i].set(s + TR("show packages name in tab"), &package_name_in_tab);
-        a[i + 1].set(s + TR("show packages context"), &show_context_mode);
-        a[i + 2].set(s + TR("automatic labels position"), &auto_label_position);
-        a[i + 3].set(s + TR("write flow label horizontally"), &write_label_horizontally);
-        a[i + 4].set(s + TR("show opaque action definition"), &show_opaque_action_definition);
-        a[i + 5].set(s + TR("draw all relations"), &draw_all_relations);
-        a[i + 6].set(s + TR("draw shadow"), &shadow);
+        a[i].set(s + QObject::tr("show packages name in tab"), &package_name_in_tab);
+        a[i + 1].set(s + QObject::tr("show packages context"), &show_context_mode);
+        a[i + 2].set(s + QObject::tr("automatic labels position"), &auto_label_position);
+        a[i + 3].set(s + QObject::tr("write flow label horizontally"), &write_label_horizontally);
+        a[i + 4].set(s + QObject::tr("show opaque action definition"), &show_opaque_action_definition);
+        a[i + 5].set(s + QObject::tr("draw all relations"), &draw_all_relations);
+        a[i + 6].set(s + QObject::tr("draw shadow"), &shadow);
     }
 
     activitydrawingsettings.complete(a, local);
@@ -1986,16 +1986,16 @@ void ActivityDrawingSettings::complete(StateSpecVector & a, bool local)
     a.resize(i + 3);
 
     if (local) {
-        a[i].set(TR("show information note"), &show_infonote);
-        a[i + 1].set(TR("drawing language"), &drawing_language);
-        a[i + 2].set(TR("show stereotype properties"), &show_stereotype_properties);
+        a[i].set(QObject::tr("show information note"), &show_infonote);
+        a[i + 1].set(QObject::tr("drawing language"), &drawing_language);
+        a[i + 2].set(QObject::tr("show stereotype properties"), &show_stereotype_properties);
     }
     else {
-        QString s = TR("activity") + "#";
+        QString s = QObject::tr("activity") + "#";
 
-        a[i].set(s + TR("show information note"), &show_infonote);
-        a[i + 1].set(s + TR("drawing language"), &drawing_language);
-        a[i + 2].set(s + TR("show stereotype properties"), &show_stereotype_properties);
+        a[i].set(s + QObject::tr("show information note"), &show_infonote);
+        a[i + 1].set(s + QObject::tr("drawing language"), &drawing_language);
+        a[i + 2].set(s + QObject::tr("show stereotype properties"), &show_stereotype_properties);
     }
 }
 
diff --git a/src/misc/Shortcut.cpp b/src/misc/Shortcut.cpp
index a8b1dc599..85b43e8f9 100644
--- a/src/misc/Shortcut.cpp
+++ b/src/misc/Shortcut.cpp
@@ -52,28 +52,28 @@ void Shortcut::init(bool conv)
 {
 #define MEMOKEY(name, code) \
 	NameToCode[#name] = code; \
-	CodeToName[code - 0x1000 + 128] = #name; \
+    CodeToName[code - Qt::Key_Escape + 128] = #name; \
 	ShortcutKeys.append(#name)
 
-    MEMOKEY(Escape, 0x1000);
-    MEMOKEY(Tab, 0x1001);
-    MEMOKEY(Backtab, 0x1002);
-    MEMOKEY(Backspace, 0x1003);
-    MEMOKEY(Return, 0x1004);
-    MEMOKEY(Enter, 0x1005);
-    MEMOKEY(Insert, 0x1006);
-    MEMOKEY(Delete, 0x1007);
-    MEMOKEY(Pause, 0x1008);
-    MEMOKEY(Print, 0x1009);
-    MEMOKEY(SysReq, 0x100a);
-    MEMOKEY(Home, 0x1010);
-    MEMOKEY(End, 0x1011);
-    MEMOKEY(Qt::DockLeft, 0x1012);
-    MEMOKEY(Up, 0x1013);
-    MEMOKEY(Qt::DockRight, 0x1014);
-    MEMOKEY(Down, 0x1015);
-    MEMOKEY(PageUp, 0x1016);
-    MEMOKEY(PageDown, 0x1017);
+    MEMOKEY(Escape, Qt::Key_Escape);
+    MEMOKEY(Tab, Qt::Key_Tab);
+    MEMOKEY(Backtab, Qt::Key_Backtab);
+    MEMOKEY(Backspace, Qt::Key_Backspace);
+    MEMOKEY(Return, Qt::Key_Return);
+    MEMOKEY(Enter, Qt::Key_Enter);
+    MEMOKEY(Insert, Qt::Key_Insert);
+    MEMOKEY(Delete, Qt::Key_Delete);
+    MEMOKEY(Pause, Qt::Key_Pause);
+    MEMOKEY(Print, Qt::Key_Print);
+    MEMOKEY(SysReq, Qt::Key_SysReq);
+    MEMOKEY(Home, Qt::Key_Home);
+    MEMOKEY(End, Qt::Key_End);
+    MEMOKEY(Qt::DockLeft, Qt::Key_Left);
+    MEMOKEY(Up, Qt::Key_Up);
+    MEMOKEY(Qt::DockRight, Qt::Key_Right);
+    MEMOKEY(Down, Qt::Key_Down);
+    MEMOKEY(PageUp, Qt::Key_PageUp);
+    MEMOKEY(PageDown, Qt::Key_PageDown);
 
 #undef MEMOKEY
 
@@ -81,10 +81,10 @@ void Shortcut::init(bool conv)
     int code;
     char name[4];
 
-    for (i = 1, code = 0x1030; i != 36; i += 1, code += 1) {
+    for (i = 1, code = Qt::Key_F1; i != 36; i += 1, code += 1) {
         sprintf(name, "F%d", i);
         NameToCode[name] = code;
-        CodeToName[code - 0x1000 + 128] = name;
+        CodeToName[code - Qt::Key_Escape + 128] = name;
         ShortcutKeys.append(name);
     }
 
@@ -229,7 +229,9 @@ void Shortcut::init(bool conv)
         "Upper",
         "Zoom +",
         "Zoom -",
-        "Zoom 100%"
+        "Zoom 100%",
+        "Expand All",
+        "Collapse All"
     };
 
     for (i = 0; i != sizeof(cmds) / sizeof(cmds[0]); i += 1)
@@ -240,12 +242,13 @@ void Shortcut::init(bool conv)
 
 int codeToIndex(int c)
 {
-    return (c >= 0x1000) ? c - 0x1000 + 128 : c;
+    return (c >= Qt::Key_Escape) ? c - Qt::Key_Escape + 128 : c;
 }
 
+
 int indexToCode(int i)
 {
-    return (i >= 128) ? i - 128 + 0x1000 : i;
+    return (i >= 128) ? i - 128 + Qt::Key_Escape : i;
 }
 
 QString codeToName(int c)
@@ -286,7 +289,8 @@ const QMap<QString, QString> & Shortcut::shortcuts()
 
 QString Shortcut::extract(QString k, BooL & shift, BooL & ctrl, BooL & alt)
 {
-    const char * p = k;
+    QByteArray kArray = k.toLatin1();
+    const char * p = kArray.constData();
 
     shift = ((p[0] & 1) != 0);
     ctrl = ((p[0] & 2) != 0);
@@ -295,7 +299,7 @@ QString Shortcut::extract(QString k, BooL & shift, BooL & ctrl, BooL & alt)
     return k.mid(1);
 }
 
-QString Shortcut::shortcut(int key, int buttons)
+QString Shortcut::shortcut(int key, Qt::KeyboardModifiers buttons)
 {
     char flags[2];
 
@@ -339,18 +343,19 @@ void Shortcut::add(QString k, bool shift, bool ctrl, bool alt, QString s)
 
 void Shortcut::save()
 {
-    // note : QFile fp(QDir::home().absFilePath(".douml_shortcuts")) doesn't work
+    // note : QFile fp(QDir::home().absoluteFilePath(".douml_shortcuts")) doesn't work
     // if the path contains non latin1 characters, for instance cyrillic !
-    QString s = homeDir().absFilePath(".douml_shortcuts");
-    FILE * fp = fopen((const char *) s, "w");
+    QString s = homeDir().absoluteFilePath(".douml_shortcuts");
+    FILE * fp = fopen((const char *) s.toLatin1().constData(), "w");
 
     if (fp != 0) {
         QMap<QString, QString>::ConstIterator it;
 
         for (it = Shortcuts.begin(); it != Shortcuts.end(); ++it) {
             QString k = it.key();
-            QString d = it.data();
-            const char * p = k;
+            QByteArray keyArray = k.toLatin1();
+            QString d = it.value();
+            const char * p = keyArray.constData();
 
             if (p[0] & 1)
                 fwrite("shift ", 1, 6, fp);
@@ -363,7 +368,7 @@ void Shortcut::save()
 
             fwrite(p + 1, 1, k.length() - 1, fp);
             fputc(' ', fp);
-            fwrite((const char *) d, 1, d.length(), fp);
+            fwrite((const char *) d.toLatin1().constData(), 1, d.length(), fp);
             fputc('\n', fp);
         }
 
@@ -418,10 +423,10 @@ void Shortcut::load(bool conv)
     QString f = shortcut_file_path(conv);
 
     if (!f.isEmpty())  {
-        // note : QFile fp(QDir::home().absFilePath(f)) doesn't work
+        // note : QFile fp(QDir::home().absoluteFilePath(f)) doesn't work
         // if the path contains non latin1 characters, for instance cyrillic !
-        QString s = homeDir().absFilePath(f);
-        FILE * fp = fopen((const char *) s, "r");
+        QString s = homeDir().absoluteFilePath(f);
+        FILE * fp = fopen((const char *) s.toLatin1().constData(), "r");
 
         if (fp != 0) {
             char line[512];
@@ -450,7 +455,7 @@ void Shortcut::load(bool conv)
                     index += 4;
                 }
 
-                int index2 = ln.find(" ", index);
+                int index2 = ln.indexOf(" ", index);
 
                 if (index2 != -1) {
                     QString s = ln.mid(index2 + 1);
diff --git a/src/misc/Shortcut.h b/src/misc/Shortcut.h
index 43fe45285..055cb8164 100644
--- a/src/misc/Shortcut.h
+++ b/src/misc/Shortcut.h
@@ -41,7 +41,7 @@ class Shortcut
     static const QMap<QString, QString> & shortcuts();
     static QString extract(QString, BooL & shift, BooL & ctrl, BooL & alt);
 
-    static QString shortcut(int key, int buttons);
+    static QString shortcut(int key, Qt::KeyboardModifiers buttons);
 
     static void raz();
     static void add(QString k, bool shift, bool ctrl, bool alt, QString s);
diff --git a/src/misc/SingletonHolder.h b/src/misc/SingletonHolder.h
index 02f9de413..d54f78ba4 100644
--- a/src/misc/SingletonHolder.h
+++ b/src/misc/SingletonHolder.h
@@ -48,6 +48,7 @@ struct An {
 template<typename T>
 inline void anFill(An<T> & a)
 {
+    Q_UNUSED(a);
     throw std::runtime_error(std::string("Cannot find implementation for interface: ")
                              + typeid(T).name());
 }
diff --git a/src/misc/UmlDrag.cpp b/src/misc/UmlDrag.cpp
index aa4f48aa3..023652933 100644
--- a/src/misc/UmlDrag.cpp
+++ b/src/misc/UmlDrag.cpp
@@ -33,23 +33,25 @@
 
 #include "UmlDrag.h"
 #include "BrowserNode.h"
-//Added by qt3to4:
 #include <QDragMoveEvent>
 #include <QDropEvent>
 
 const QString UmlDrag::Key = "Bouml/";
 QString UmlDrag::postfix;
 bool UmlDrag::ro;
+BrowserNode* UmlDrag::node = nullptr;
 
 UmlDrag::UmlDrag(BrowserNode * bn, QWidget * parent, const char * name)
-    : Q3StoredDrag(UmlDrag::Key + bn->drag_key(), parent, name)
 {
-    // stay in the same application : can use address directly
-    QByteArray a(sizeof(bn));
+    Q_UNUSED(parent);
+    Q_UNUSED(name);
 
-    memcpy(a.data(), &bn, sizeof(bn));
-    setEncodedData(a);
+    // stay in the same application : can use address directly
 
+    QByteArray a((char *)&bn, sizeof(bn));
+    QString thisKey = UmlDrag::Key + bn->drag_key();
+    node = bn;
+    setData(thisKey, a);
     postfix = bn->drag_postfix();
     ro = ((bn->parent() != 0) &&
           !((BrowserNode *) bn->parent())->is_writable());
@@ -63,20 +65,20 @@ bool UmlDrag::canDecode(QDragMoveEvent * e, UmlCode type,
         return FALSE;
 
     return (e->source() != 0) &&
-           e->provides((withpostfix) ? UmlDrag::Key + QString::number(type) + postfix
+           e->mimeData()->hasFormat((withpostfix) ? UmlDrag::Key + QString::number(type) + postfix
                        : UmlDrag::Key + QString::number(type));
 }
 
 bool UmlDrag::canDecode(QDragMoveEvent * e, const QString & type)
 {
-    return !ro && (e->source() != 0) && e->provides(UmlDrag::Key + type);
+    return !ro && (e->source() != 0) && e->mimeData()->hasFormat(UmlDrag::Key + type);
 }
 
 BrowserNode * UmlDrag::decode(QDropEvent * e, UmlCode type,
                               bool withpostfix)
 {
     QByteArray payload =
-        e->data((withpostfix) ? UmlDrag::Key + QString::number(type) + postfix
+        e->mimeData()->data((withpostfix) ? UmlDrag::Key + QString::number(type) + postfix
                 : UmlDrag::Key + QString::number(type));
 
     if (payload.size()) {
@@ -92,7 +94,7 @@ BrowserNode * UmlDrag::decode(QDropEvent * e, UmlCode type,
 
 BrowserNode * UmlDrag::decode(QDropEvent * e, const QString & type)
 {
-    QByteArray payload = e->data(UmlDrag::Key + type);
+    QByteArray payload = e->mimeData()->data(UmlDrag::Key + type);
 
     if (payload.size()) {
         e->accept();
@@ -105,3 +107,8 @@ BrowserNode * UmlDrag::decode(QDropEvent * e, const QString & type)
     return 0;
 }
 
+BrowserNode *UmlDrag::get_node()
+{
+    return node;
+}
+
diff --git a/src/misc/UmlDrag.h b/src/misc/UmlDrag.h
index 6172e17ff..56a234d01 100644
--- a/src/misc/UmlDrag.h
+++ b/src/misc/UmlDrag.h
@@ -26,19 +26,21 @@
 // *************************************************************************
 
 #ifndef UMLDRAG_H
-#define UMLGRAG_H
+#define UMLDRAG_H
 
-#include <q3dragobject.h>
+//#include <q3dragobject.h>
 #include <qstring.h>
 //Added by qt3to4:
 #include <QDragMoveEvent>
 #include <QDropEvent>
 
 #include "UmlEnum.h"
+#include "browser/BrowserNode.h"
+#include <QMimeData>
 
-class BrowserNode;
+//class BrowserNode;
 
-class UmlDrag : public Q3StoredDrag
+class UmlDrag : public QMimeData
 {
 private:
     static QString postfix;
@@ -46,6 +48,7 @@ class UmlDrag : public Q3StoredDrag
 
 public:
     static const QString Key;
+    static BrowserNode* node;
 
     UmlDrag(BrowserNode * bn, QWidget * parent = 0, const char * name = 0);
     virtual ~UmlDrag() {};
@@ -56,6 +59,7 @@ class UmlDrag : public Q3StoredDrag
     static bool canDecode(QDragMoveEvent * e, const QString & type);
     static BrowserNode * decode(QDropEvent * e, UmlCode type, bool withpostfix = FALSE);
     static BrowserNode * decode(QDropEvent * e, const QString & type);
+    static BrowserNode* get_node();
 };
 
 #endif
diff --git a/src/misc/UmlEnum.h b/src/misc/UmlEnum.h
index 68801b79e..abdd19fa9 100644
--- a/src/misc/UmlEnum.h
+++ b/src/misc/UmlEnum.h
@@ -31,7 +31,7 @@
 #define RTTI_ARROW	1000
 #define RTTI_COL_MSG	1001
 #define RTTI_LABEL	1002
-
+#include <QGraphicsItem>
 // warning : enums items order are linked with the ones in api.h
 // and known by ToolCom.cpp
 
@@ -107,6 +107,11 @@ enum UmlCode {
 
     UmlCodeSup
 };
+enum GraphicsItemType
+{
+    DiagramItemTypeStart = QGraphicsItem::UserType,
+    DiagramItemTypeEnd = DiagramItemTypeStart + 10000
+};
 
 #define IsaRelation(x) (x < UmlRelations)
 #define IsaPseudoState(x) ((x >= InitialPS) && (x <= JoinPS))
@@ -252,25 +257,25 @@ extern const char * stringify(UmlParamEffect);
 extern const char * stringify(UmlActionKind);
 extern const char * stringify(UmlExpansionKind);
 extern const char * stringify(UmlOrderingKind);
-extern UmlCode arrow_type(const char *);
+extern UmlCode arrow_type(QString);
 extern bool IsaSimpleRelation(UmlCode);
-extern UmlVisibility visibility(const char * s);
-extern UmlCode relation_type(const char * s,
+extern UmlVisibility visibility(QString s);
+extern UmlCode relation_type(QString s,
                              bool simple_relation = 0);
-extern UmlParamDirection direction(const char * s);
-extern UmlParamEffect effect(const char * s);
-extern Uml3States state(const char * s);
-extern UmlColor color(const char * s);
-extern UmlFont font(const char * s);
-extern ClassDrawingMode drawing_mode(const char * s);
-extern DrawingLanguage drawing_language(const char * s);
-extern ShowContextMode context_mode(const char * s);
-extern CanvasFormat canvas_format(const char * s);
-extern UmlCode pseudo_state_kind(const char * s);
-extern LineGeometry line_geometry(const char * s);
-extern UmlCode activity_node_kind(const char * s);
-extern UmlActionKind activity_action_kind(const char * s);
-extern UmlExpansionKind expansion_mode_kind(const char * s);
-extern UmlOrderingKind ordering(const char * s);
+extern UmlParamDirection direction(QString s);
+extern UmlParamEffect effect(QString s);
+extern Uml3States state(QString s);
+extern UmlColor color(QString s);
+extern UmlFont font(QString s);
+extern ClassDrawingMode drawing_mode(QString s);
+extern DrawingLanguage drawing_language(QString s);
+extern ShowContextMode context_mode(QString s);
+extern CanvasFormat canvas_format(QString s);
+extern UmlCode pseudo_state_kind(QString s);
+extern LineGeometry line_geometry(QString s);
+extern UmlCode activity_node_kind(QString s);
+extern UmlActionKind activity_action_kind(QString s);
+extern UmlExpansionKind expansion_mode_kind(QString s);
+extern UmlOrderingKind ordering(QString s);
 
 #endif
diff --git a/src/misc/UmlGlobal.cpp b/src/misc/UmlGlobal.cpp
index d7708f5b7..35f384018 100644
--- a/src/misc/UmlGlobal.cpp
+++ b/src/misc/UmlGlobal.cpp
@@ -103,18 +103,18 @@ void init_font()
 
 void resize_font(int i)
 {
-    NormalFont.setPointSizeFloat(i);
-    BoldFont.setPointSizeFloat(i);
-    ItalicFont.setPointSizeFloat(i);
-    BoldItalicFont.setPointSizeFloat(i);
-    UnderlineFont.setPointSizeFloat(i);
-    BoldUnderlineFont.setPointSizeFloat(i);
-    StrikeOutFont.setPointSizeFloat(i);
+    NormalFont.setPointSizeF(i);
+    BoldFont.setPointSizeF(i);
+    ItalicFont.setPointSizeF(i);
+    BoldItalicFont.setPointSizeF(i);
+    UnderlineFont.setPointSizeF(i);
+    BoldUnderlineFont.setPointSizeF(i);
+    StrikeOutFont.setPointSizeF(i);
 
     QFont fn = QApplication::font();
 
-    fn.setPointSizeFloat(i);
-    QApplication::setFont(fn, TRUE);
+    fn.setPointSizeF(i);
+    QApplication::setFont(fn);
 }
 
 const QColor & color(UmlColor c)
diff --git a/src/misc/codec.cpp b/src/misc/codec.cpp
index ec58332e5..3657c31ae 100644
--- a/src/misc/codec.cpp
+++ b/src/misc/codec.cpp
@@ -38,10 +38,10 @@ bool hasCodec()
 QString codec()
 {
     if (Codec != 0) {
-        QString na = Codec->name();
+        QByteArray na = Codec->name();
         int pos = 0;
 
-        while ((pos = na.find(" ", pos)) != -1)
+        while ((pos = na.indexOf(" ", pos)) != -1)
             na.replace(pos, 1, "_");
 
         if (QTextCodec::codecForName(na) == Codec)
@@ -56,7 +56,7 @@ void set_codec(QString s)
     if (s.isEmpty())
         Codec = 0;
     else
-        Codec = QTextCodec::codecForName(s);
+        Codec = QTextCodec::codecForName(s.toLatin1());
 }
 
 QString toUnicode(const char * str)
@@ -76,7 +76,7 @@ void latinize(QString & s)
     while (i != 0) {
         QChar c = s.at(--i);
 
-        if (c.latin1() == 0) {
+        if (c.toLatin1() == 0) {
             if (c.unicode() == 8217)
                 // special case for the pseudo ' returned by microsoft editors
                 c = '\'';
@@ -108,7 +108,7 @@ WrapperStr fromUnicode(const QString & s)
 
 void remove_crlf(char * s)
 {
-    int len = strlen(s);
+    size_t len = strlen(s);
 
     if (len != 0) {
         if (s[len - 1] == '\n')
diff --git a/src/misc/codec.h b/src/misc/codec.h
index eba68867d..58e0e87e6 100644
--- a/src/misc/codec.h
+++ b/src/misc/codec.h
@@ -29,6 +29,7 @@
 #define CODEC_H
 #include "qstring.h"
 #include "misc/mystr.h"
+#include <QTextCodec>
 //#include
 //#include "mystr.h"
 
diff --git a/src/misc/mu.cpp b/src/misc/mu.cpp
index 08e674e17..868dcbaf8 100644
--- a/src/misc/mu.cpp
+++ b/src/misc/mu.cpp
@@ -41,7 +41,7 @@
 #include "DialogUtil.h"
 #include "EnvDialog.h"
 #include "translate.h"
-
+#include <QDir>
 static int Uid = -1;
 static int RootPermission;	// old Uid or 0
 
@@ -63,10 +63,11 @@ int user_id()
 
         if (dir.exists("all.lock")) {
             msg_critical("Douml",
-                         TR("\
+                         QObject::tr("\
                             The project is open in read-only mode because it is\n\
                             under the control of 'Project control' or 'Project merge'\n\
-                            (the directory '%1' exists", dir.absFilePath("all.lock")));
+                            (the directory '%1' exists").arg(dir.absoluteFilePath("all.lock")));
+
             force_read_only(TRUE);
         }
         else
@@ -83,17 +84,18 @@ int user_id()
 
             if (! dir.mkdir(fn)) {
                 if (!dir.exists(fn)) {
-                    msg_critical(TR("User Own Identifier"),
-                                 TR("Can't create directory '%1',\nthe project is open in read-only mode",
-                                    dir.absFilePath(fn)));
+                    msg_critical (QObject::tr("User Own Identifier"),
+                                 QObject::tr("Can't create directory '%1',\nthe project is open in read-only mode").arg(dir.absoluteFilePath(fn)));
+
                     force_read_only(TRUE);
                 }
                 else {
-                    int retCode = msg_critical(TR("User Own Identifier"),
-                                               TR("\It seems that you are already editing the project.\n\n"
+                    int retCode = QMessageBox::Ok;
+                   retCode = msg_critical (QObject::tr("User Own Identifier"),
+                                               QObject::tr("It seems that you are already editing the project %1.\n\n"
                                                   "If you're SURE that this is not the case and\n"
                                                   "another user does not have an identifier equal\n"
-                                                  "to yours you can gain ownership of the lock.").arg(dir.absFilePath(fn))
+                                                  "to yours you can gain ownership of the lock.").arg(dir.absoluteFilePath(fn))
                                                , QMessageBox::Ok, QMessageBox::Close);
 
                     if (retCode == QMessageBox::Ok) {
@@ -128,12 +130,12 @@ int root_permission()
 const char * user_name()
 {
     static bool done = FALSE;
-    static WrapperStr name;
+    static QByteArray name;
 
     if (! done) {
-        name = homeDir().dirName();
+        name = QDir::homePath().toLatin1();
         done = TRUE;
     }
 
-    return name;
+    return name.constData();
 }
diff --git a/src/misc/myio.cpp b/src/misc/myio.cpp
index b9d9f7b34..84c43b8e4 100644
--- a/src/misc/myio.cpp
+++ b/src/misc/myio.cpp
@@ -33,46 +33,41 @@
 #include <qdir.h>
 #include <qfile.h>
 #include <qstring.h>
-#include <q3canvas.h>
-#include <Q3TextEdit>
-#include <q3textview.h>
 #include <qlayout.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qfont.h>
-#include <qworkspace.h>
 #include <qstringlist.h>
 #include <qapplication.h>
 #include <qbuffer.h>
 //Added by qt3to4:
-#include <Q3VBoxLayout>
 
-#include <Q3PointArray>
 #include <QTextCodec>
 #include <QFileInfo>
 
 #include "myio.h"
 #include "UmlWindow.h"
 #include "BrowserView.h"
-#include "Labeled.h"
 #include "strutil.h"
+#include "codec.h"
+#include "Labeled.h"
 #include "DialogUtil.h"
 #include "mu.h"
 #include "UmlGlobal.h"
 #include "err.h"
 #include "translate.h"
 #include "Logging/QsLog.h"
-
+#include <QTextEdit>
 // QFile::baseName() return string before the first '.' rather than the last
 
 QString my_baseName(QFileInfo & fi)
 {
     QString fn = fi.fileName();
-    int index = fn.findRev('.');
+    int index = fn.lastIndexOf('.');
 
     return (index == -1)
-           ? fn
-           : fn.left(index);
+            ? fn
+            : fn.left(index);
 }
 
 static ReadContext Context;
@@ -783,30 +778,30 @@ const char * stringify(LineGeometry v)
     }
 }
 
-UmlCode arrow_type(const char * s)
+UmlCode arrow_type(QString s)
 {
-    if (!strcmp(s, "---|>"))
+    if (s =="---|>")
         return UmlGeneralisation;
 
-    if (!strcmp(s, "----"))
+    if (s =="----")
         return UmlAssociation;
 
-    if (!strcmp(s, "--->"))
+    if (s =="--->")
         return UmlDirectionalAssociation;
 
-    if (!strcmp(s, "-_->"))
+    if (s =="-_->")
         return UmlDependency;
 
-    if (!strcmp(s, "-_-_"))
+    if (s =="-_-_")
         return UmlAnchor;
 
-    if (!strcmp(s, "---("))
+    if (s =="---(")
         return UmlRequired;
 
-    if (!strcmp(s, "---O"))
+    if (s =="---O")
         return UmlProvided;
 
-    if (!strcmp(s, "---+"))
+    if (s =="---+")
         return UmlInner;
 
     msg_critical("Error",
@@ -814,37 +809,37 @@ UmlCode arrow_type(const char * s)
     THROW_ERROR 0;
 }
 
-UmlCode relation_type(const char * s, bool simple_relation)
+UmlCode relation_type(QString s, bool simple_relation)
 {
-    if (!strcmp(s, "----"))
+    if (s =="----")
         return UmlAssociation;
 
-    if (!strcmp(s, "--->"))
+    if (s =="--->")
         return UmlDirectionalAssociation;
 
-    if (!strcmp(s, "---|>"))
+    if (s =="---|>")
         return (simple_relation)
-               ? UmlInherit
-               : UmlGeneralisation;
+                ? UmlInherit
+                : UmlGeneralisation;
 
-    if (!strcmp(s, "o---"))
+    if (s =="o---")
         return UmlAggregation;
 
-    if (!strcmp(s, "*---"))
+    if (s =="*---")
         return UmlAggregationByValue;
 
-    if (!strcmp(s, "<>-->") || !strcmp(s, "o-->"))
+    if (s =="<>-->" || s =="o-->")
         return UmlDirectionalAggregation;
 
-    if (!strcmp(s, "<#>-->") || !strcmp(s, "*-->"))
+    if (s =="<#>-->" || s =="*-->")
         return UmlDirectionalAggregationByValue;
 
-    if (!strcmp(s, "-_->"))
+    if (s =="-_->")
         return (simple_relation)
-               ? UmlDependOn
-               : UmlDependency;
+                ? UmlDependOn
+                : UmlDependency;
 
-    if (!strcmp(s, "-_-|>"))
+    if (s =="-_-|>")
         return UmlRealize;
 
     msg_critical("Error",
@@ -864,610 +859,610 @@ bool IsaSimpleRelation(UmlCode c)
     }
 }
 
-UmlVisibility visibility(const char * s)
+UmlVisibility visibility(QString s)
 {
-    if (!strcmp(s, "public"))
+    if (s == "public")
         return UmlPublic;
-    else if (!strcmp(s, "protected"))
+    else if (s == "protected")
         return UmlProtected;
-    else if (!strcmp(s, "private"))
+    else if (s == "private")
         return UmlPrivate;
-    else if (!strcmp(s, "package"))
+    else if (s == "package")
         return UmlPackageVisibility;
-    else if (!strcmp(s, "default"))
+    else if (s == "default")
         return UmlDefaultVisibility;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a visibility"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a visibility"));
     THROW_ERROR 0;
 }
 
-UmlParamDirection direction(const char * s)
+UmlParamDirection direction(QString s)
 {
-    if (!strcmp(s, "inout"))
+    if (s =="inout")
         return UmlInOut;
 
-    if (!strcmp(s, "in"))
+    if (s =="in")
         return UmlIn;
 
-    if (!strcmp(s, "out"))
+    if (s =="out")
         return UmlOut;
 
-    if (!strcmp(s, "return"))
+    if (s =="return")
         return UmlReturn;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a direction"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a direction"));
     THROW_ERROR 0;
 }
 
-UmlParamEffect effect(const char * s)
+UmlParamEffect effect(QString s)
 {
-    if (!strcmp(s, "none"))
+    if (s =="none")
         return UmlNoEffect;
 
-    if (!strcmp(s, "create"))
+    if (s =="create")
         return UmlCreate;
 
-    if (!strcmp(s, "read"))
+    if (s =="read")
         return UmlRead;
 
-    if (!strcmp(s, "update"))
+    if (s =="update")
         return UmlUpdate;
 
-    if (!strcmp(s, "delete"))
+    if (s =="delete")
         return UmlDelete;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a parameter effect"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a parameter effect"));
     THROW_ERROR 0;
 }
 
-UmlActionKind activity_action_kind(const char * s)
+UmlActionKind activity_action_kind(QString s)
 {
-    if (!strcmp(s, "opaque_action"))
+    if (s =="opaque_action")
         return UmlOpaqueAction;
 
-    if (!strcmp(s, "accept_event_action"))
+    if (s =="accept_event_action")
         return UmlAcceptEventAction;
 
-    if (!strcmp(s, "read_variable_value_action"))
+    if (s =="read_variable_value_action")
         return UmlReadVariableValueAction;
 
-    if (!strcmp(s, "clear_variable_value_action"))
+    if (s =="clear_variable_value_action")
         return UmlClearVariableValueAction;
 
-    if (!strcmp(s, "write_variable_value_action"))
+    if (s =="write_variable_value_action")
         return UmlWriteVariableValueAction;
 
-    if (!strcmp(s, "add_variable_value_action"))
+    if (s =="add_variable_value_action")
         return UmlAddVariableValueAction;
 
-    if (!strcmp(s, "remove_variable_value_action"))
+    if (s =="remove_variable_value_action")
         return UmlRemoveVariableValueAction;
 
-    if (!strcmp(s, "call_behavior_action"))
+    if (s =="call_behavior_action")
         return UmlCallBehaviorAction;
 
-    if (!strcmp(s, "call_operation_action"))
+    if (s =="call_operation_action")
         return UmlCallOperationAction;
 
-    if (!strcmp(s, "send_object_action"))
+    if (s =="send_object_action")
         return UmlSendObjectAction;
 
-    if (!strcmp(s, "send_signal_action"))
+    if (s =="send_signal_action")
         return UmlSendSignalAction;
 
-    if (!strcmp(s, "broadcast_signal_action"))
+    if (s =="broadcast_signal_action")
         return UmlBroadcastSignalAction;
 
-    if (!strcmp(s, "unmarshall_action"))
+    if (s =="unmarshall_action")
         return UmlUnmarshallAction;
 
-    if (!strcmp(s, "value_specification_action"))
+    if (s =="value_specification_action")
         return UmlValueSpecificationAction;
 
-    if (!strcmp(s, "accept_call_action"))
+    if (s =="accept_call_action")
         return UmlAcceptCallAction;
 
-    if (!strcmp(s, "reply_action"))
+    if (s =="reply_action")
         return UmlReplyAction;
 
-    if (!strcmp(s, "create_object_action"))
+    if (s =="create_object_action")
         return UmlCreateObjectAction;
 
-    if (!strcmp(s, "destroy_object_action"))
+    if (s =="destroy_object_action")
         return UmlDestroyObjectAction;
 
-    if (!strcmp(s, "test_identity_action"))
+    if (s =="test_identity_action")
         return UmlTestIdentityAction;
 
-    if (!strcmp(s, "raise_exception_action"))
+    if (s =="raise_exception_action")
         return UmlRaiseExceptionAction;
 
-    if (!strcmp(s, "reduce_action"))
+    if (s =="reduce_action")
         return UmlReduceAction;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not an activity action kind"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not an activity action kind"));
     THROW_ERROR 0;
 }
 
-UmlExpansionKind expansion_mode_kind(const char * s)
+UmlExpansionKind expansion_mode_kind(QString s)
 {
-    if (! strcmp(s, "parallel"))
+    if (s =="parallel")
         return UmlParallel;
 
-    if (! strcmp(s, "iterative"))
+    if (s =="iterative")
         return UmlIterative;
 
-    if (! strcmp(s, "stream"))
+    if (s =="stream")
         return UmlStream;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not an expansion node kind"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not an expansion node kind"));
     THROW_ERROR 0;
 }
 
-UmlOrderingKind ordering(const char * s)
+UmlOrderingKind ordering(QString s)
 {
-    if (! strcmp(s, "unordered"))
+    if (s == "unordered")
         return UmlUnordered;
 
-    if (! strcmp(s, "ordered"))
+    if (s =="ordered")
         return UmlOrdered;
 
-    if (! strcmp(s, "lifo"))
+    if (s =="lifo")
         return UmlLifo;
 
-    if (! strcmp(s, "fifo"))
+    if (s =="fifo")
         return UmlFifo;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not an ordering"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not an ordering"));
     THROW_ERROR 0;
 }
 
-Uml3States state(const char * s)
+Uml3States state(QString s)
 {
-    if (!strcmp(s, "yes"))
+    if (s =="yes")
         return UmlYes;
 
-    if (!strcmp(s, "no"))
+    if (s =="no")
         return UmlNo;
 
-    if (!strcmp(s, "default"))
+    if (s =="default")
         return UmlDefaultState;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a state"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a state"));
     THROW_ERROR 0;
 }
 
-ClassDrawingMode drawing_mode(const char * s)
+ClassDrawingMode drawing_mode(QString s)
 {
-    if (!strcmp(s, "class"))
+    if (s =="class")
         return asClass;
 
-    if (!strcmp(s, "interface"))
+    if (s =="interface")
         return asInterface;
 
-    if (!strcmp(s, "control"))
+    if (s =="control")
         return asControl;
 
-    if (!strcmp(s, "boundary"))
+    if (s =="boundary")
         return asBoundary;
 
-    if (!strcmp(s, "entity"))
+    if (s =="entity")
         return asEntity;
 
-    if (!strcmp(s, "actor"))
+    if (s =="actor")
         return asActor;
 
-    if (!strcmp(s, "natural"))
+    if (s =="natural")
         return Natural;
 
-    if (!strcmp(s, "default"))
+    if (s =="default")
         return DefaultClassDrawingMode;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a class drawing mode"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a class drawing mode"));
     THROW_ERROR 0;
 }
 
-DrawingLanguage drawing_language(const char * s)
+DrawingLanguage drawing_language(QString s)
 {
-    if (!strcmp(s, "uml"))
+    if (s =="uml")
         return UmlView;
 
-    if (!strcmp(s, "c++"))
+    if (s =="c++")
         return CppView;
 
-    if (!strcmp(s, "java"))
+    if (s =="java")
         return JavaView;
 
-    if (!strcmp(s, "php"))
+    if (s =="php")
         return PhpView;
 
-    if (!strcmp(s, "python"))
+    if (s =="python")
         return PythonView;
 
-    if (!strcmp(s, "idl"))
+    if (s =="idl")
         return IdlView;
 
-    if (!strcmp(s, "default"))
+    if (s =="default")
         return DefaultDrawingLanguage;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a drawing language"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a drawing language"));
     THROW_ERROR 0;
 }
 
-ShowContextMode context_mode(const char * s)
+ShowContextMode context_mode(QString s)
 {
-    if (!strcmp(s, "no"))
+    if (s =="no")
         return noContext;
 
-    if (!strcmp(s, "uml"))
+    if (s =="uml")
         return umlContext;
 
-    if (!strcmp(s, "namespace"))
+    if (s =="namespace")
         return namespaceContext;
 
-    if (!strcmp(s, "package") || !strcmp(s, "java_package"))
+    if (s =="package" || s =="java_package")
         return javaPackageContext;
 
-    if (!strcmp(s, "python_package"))
+    if (s =="python_package")
         return pythonPackageContext;
 
-    if (!strcmp(s, "module"))
+    if (s =="module")
         return moduleContext;
 
-    if (!strcmp(s, "default"))
+    if (s =="default")
         return DefaultShowContextMode;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a context mode"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a context mode"));
     THROW_ERROR 0;
 }
 
-UmlColor color(const char * s)
+UmlColor color(QString s)
 {
-    if (!strcmp(s, "transparent"))
+    if (s =="transparent")
         return UmlTransparent;
 
-    if (!strcmp(s, "white"))
+    if (s =="white")
         return UmlWhite;
 
-    if (!strcmp(s, "lightyellow"))
+    if (s =="lightyellow")
         return UmlLightYellow;
 
-    if (!strcmp(s, "yellow"))
+    if (s =="yellow")
         return UmlYellow;
 
-    if (!strcmp(s, "mediumyellow"))
+    if (s =="mediumyellow")
         return UmlMediumYellow;
 
-    if (!strcmp(s, "gold"))
+    if (s =="gold")
         return UmlDarkYellow;
 
-    if (!strcmp(s, "lightblue"))
+    if (s =="lightblue")
         return UmlLightBlue;
 
-    if (!strcmp(s, "lightmediumblue"))
+    if (s =="lightmediumblue")
         return UmlLightMediumBlue;
 
-    if (!strcmp(s, "mediumblue"))
+    if (s =="mediumblue")
         return UmlMediumBlue;
 
-    if (!strcmp(s, "blue"))
+    if (s =="blue")
         return UmlBlue;
 
-    if (!strcmp(s, "darkblue"))
+    if (s =="darkblue")
         return UmlDarkBlue;
 
-    if (!strcmp(s, "lightgreen"))
+    if (s =="lightgreen")
         return UmlLightGreen;
 
-    if (!strcmp(s, "green"))
+    if (s =="green")
         return UmlGreen;
 
-    if (!strcmp(s, "lightmediumgreen"))
+    if (s =="lightmediumgreen")
         return UmlLightMediumGreen;
 
-    if (!strcmp(s, "mediumgreen"))
+    if (s =="mediumgreen")
         return UmlMediumGreen;
 
-    if (!strcmp(s, "darkgreen"))
+    if (s =="darkgreen")
         return UmlDarkGreen;
 
-    if (! strcmp(s, "lightred"))
+    if (s =="lightred")
         return UmlLightRed;
 
-    if (! strcmp(s, "midred"))
+    if (s =="midred")
         return UmlMidRed;
 
-    if (!strcmp(s, "red"))
+    if (s =="red")
         return UmlRed;
 
-    if (!strcmp(s, "verylightgray"))
+    if (s =="verylightgray")
         return UmlVeryLightGray;
 
-    if (!strcmp(s, "lightgray"))
+    if (s =="lightgray")
         return UmlLightGray;
 
-    if (!strcmp(s, "gray"))
+    if (s =="gray")
         return UmlGray;
 
-    if (!strcmp(s, "darkgray"))
+    if (s =="darkgray")
         return UmlDarkGray;
 
-    if (!strcmp(s, "black"))
+    if (s =="black")
         return UmlBlack;
 
-    if (! strcmp(s, "verylightorange"))
+    if (s =="verylightorange")
         return UmlVeryLightOrange;
 
-    if (! strcmp(s, "lightorange"))
+    if (s =="lightorange")
         return UmlLightOrange;
 
-    if (! strcmp(s, "orange"))
+    if (s =="orange")
         return UmlOrange;
 
-    if (! strcmp(s, "darkorange"))
+    if (s =="darkorange")
         return UmlDarkOrange;
 
-    if (! strcmp(s, "lightmagenta"))
+    if (s =="lightmagenta")
         return UmlLightMagenta;
 
-    if (! strcmp(s, "magenta"))
+    if (s =="magenta")
         return UmlMagenta;
 
-    if (! strcmp(s, "midmagenta"))
+    if (s =="midmagenta")
         return UmlMidMagenta;
 
-    if (! strcmp(s, "darkmagenta"))
+    if (s =="darkmagenta")
         return UmlDarkMagenta;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a color"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a color"));
     THROW_ERROR 0;
 }
 
-UmlFont font(const char * s)
+UmlFont font(QString s)
 {
-    if (!strcmp(s, "normal"))
+    if (s =="normal")
         return UmlNormalFont;
 
-    if (!strcmp(s, "bold"))
+    if (s =="bold")
         return UmlNormalBoldFont;
 
-    if (!strcmp(s, "italic"))
+    if (s =="italic")
         return UmlNormalItalicFont;
 
-    if (!strcmp(s, "bold_italic"))
+    if (s =="bold_italic")
         return UmlNormalBoldItalicFont;
 
-    if (!strcmp(s, "small"))
+    if (s =="small")
         return UmlSmallFont;
 
-    if (!strcmp(s, "small_bold"))
+    if (s =="small_bold")
         return UmlSmallBoldFont;
 
-    if (!strcmp(s, "small_italic"))
+    if (s =="small_italic")
         return UmlSmallItalicFont;
 
-    if (!strcmp(s, "small_bold_italic"))
+    if (s =="small_bold_italic")
         return UmlSmallBoldItalicFont;
 
-    if (!strcmp(s, "large"))
+    if (s =="large")
         return UmlLargeFont;
 
-    if (!strcmp(s, "large_bold"))
+    if (s =="large_bold")
         return UmlLargeBoldFont;
 
-    if (!strcmp(s, "large_italic"))
+    if (s =="large_italic")
         return UmlLargeItalicFont;
 
-    if (!strcmp(s, "large_bold_italic"))
+    if (s =="large_bold_italic")
         return UmlLargeBoldItalicFont;
 
-    if (!strcmp(s, "underlined"))
+    if (s =="underlined")
         return UmlNormalUnderlinedFont;
 
-    if (!strcmp(s, "strikeout"))
+    if (s =="strikeout")
         return UmlNormalStrikeOutFont;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a font"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a font"));
     THROW_ERROR 0;
 }
 
-CanvasFormat canvas_format(const char * s)
+CanvasFormat canvas_format(QString s)
 {
-    if (! strcmp(s, "A0"))
+    if (s =="A0")
         return IsoA0;
 
-    if (! strcmp(s, "A1"))
+    if (s =="A1")
         return IsoA1;
 
-    if (! strcmp(s, "A2"))
+    if (s =="A2")
         return IsoA2;
 
-    if (! strcmp(s, "A3"))
+    if (s =="A3")
         return IsoA3;
 
-    if (! strcmp(s, "A4"))
+    if (s =="A4")
         return IsoA4;
 
-    if (! strcmp(s, "A5"))
+    if (s =="A5")
         return IsoA5;
 
-    if (! strcmp(s, "A"))
+    if (s =="A")
         return UsA;
 
-    if (! strcmp(s, "B"))
+    if (s =="B")
         return UsB;
 
-    if (! strcmp(s, "C"))
+    if (s =="C")
         return UsC;
 
-    if (! strcmp(s, "D"))
+    if (s =="D")
         return UsD;
 
-    if (! strcmp(s, "E"))
+    if (s =="E")
         return UsE;
 
-    if (! strcmp(s, "Letter"))
+    if (s =="Letter")
         return UsLetter;
 
-    if (! strcmp(s, "Legal"))
+    if (s =="Legal")
         return UsLegal;
 
-    if (! strcmp(s, "Tabloid"))
+    if (s =="Tabloid")
         return UsTabloid;
 
-    if (! strcmp(s, "A0-Landscape"))
+    if (s =="A0-Landscape")
         return IsoA0Landscape;
 
-    if (! strcmp(s, "A1-Landscape"))
+    if (s =="A1-Landscape")
         return IsoA1Landscape;
 
-    if (! strcmp(s, "A2-Landscape"))
+    if (s =="A2-Landscape")
         return IsoA2Landscape;
 
-    if (! strcmp(s, "A3-Landscape"))
+    if (s =="A3-Landscape")
         return IsoA3Landscape;
 
-    if (! strcmp(s, "A4-Landscape"))
+    if (s =="A4-Landscape")
         return IsoA4Landscape;
 
-    if (! strcmp(s, "A5-Landscape"))
+    if (s =="A5-Landscape")
         return IsoA5Landscape;
 
-    if (! strcmp(s, "A-Landscape"))
+    if (s =="A-Landscape")
         return UsALandscape;
 
-    if (! strcmp(s, "B-Landscape"))
+    if (s =="B-Landscape")
         return UsBLandscape;
 
-    if (! strcmp(s, "C-Landscape"))
+    if (s =="C-Landscape")
         return UsCLandscape;
 
-    if (! strcmp(s, "D-Landscape"))
+    if (s =="D-Landscape")
         return UsDLandscape;
 
-    if (! strcmp(s, "E-Landscape"))
+    if (s =="E-Landscape")
         return UsELandscape;
 
-    if (! strcmp(s, "Letter-Landscape"))
+    if (s =="Letter-Landscape")
         return UsLetterLandscape;
 
-    if (! strcmp(s, "Legal-Landscape"))
+    if (s =="Legal-Landscape")
         return UsLegalLandscape;
 
-    if (! strcmp(s, "Ledger"))
+    if (s =="Ledger")
         return UsLedger;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a canvas format"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a canvas format"));
     THROW_ERROR 0;
 }
 
-UmlCode pseudo_state_kind(const char * s)
+UmlCode pseudo_state_kind(QString s)
 {
-    if (! strcmp(s, "initial"))
+    if (s =="initial")
         return InitialPS;
 
-    if (! strcmp(s, "entry_point"))
+    if (s =="entry_point")
         return EntryPointPS;
 
-    if (! strcmp(s, "final"))
+    if (s =="final")
         return FinalPS;
 
-    if (! strcmp(s, "terminate"))
+    if (s =="terminate")
         return TerminatePS;
 
-    if (! strcmp(s, "exit_point"))
+    if (s =="exit_point")
         return ExitPointPS;
 
-    if (! strcmp(s, "deep_history"))
+    if (s =="deep_history")
         return DeepHistoryPS;
 
-    if (! strcmp(s, "shallow_history"))
+    if (s =="shallow_history")
         return ShallowHistoryPS;
 
-    if (! strcmp(s, "junction"))
+    if (s =="junction")
         return JunctionPS;
 
-    if (! strcmp(s, "choice"))
+    if (s =="choice")
         return ChoicePS;
 
-    if (! strcmp(s, "fork"))
+    if (s =="fork")
         return ForkPS;
 
-    if (! strcmp(s, "join"))
+    if (s =="join")
         return JoinPS;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a pseudo state kind"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a pseudo state kind"));
     THROW_ERROR 0;
 }
 
-UmlCode activity_node_kind(const char * s)
+UmlCode activity_node_kind(QString s)
 {
-    if (! strcmp(s, "initial"))
+    if (s =="initial")
         // old releases
         return InitialAN;
 
-    if (! strcmp(s, "initial_node"))
+    if (s =="initial_node")
         return InitialAN;
 
-    if (! strcmp(s, "flow_final"))
+    if (s =="flow_final")
         return FlowFinalAN;
 
-    if (! strcmp(s, "activity_final"))
+    if (s =="activity_final")
         return ActivityFinalAN;
 
-    if (! strcmp(s, "decision"))
+    if (s =="decision")
         return DecisionAN;
 
-    if (! strcmp(s, "merge"))
+    if (s =="merge")
         return MergeAN;
 
-    if (! strcmp(s, "fork"))
+    if (s =="fork")
         return ForkAN;
 
-    if (! strcmp(s, "join"))
+    if (s =="join")
         return JoinAN;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not an activity node kind"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not an activity node kind"));
     THROW_ERROR 0;
 }
 
-LineGeometry line_geometry(const char * s)
+LineGeometry line_geometry(QString s)
 {
-    if (! strcmp(s, "HV"))
+    if (s =="HV")
         return HVGeometry;
 
-    if (! strcmp(s, "HVr"))
+    if (s =="HVr")
         return HVrGeometry;
 
-    if (! strcmp(s, "VH"))
+    if (s =="VH")
         return VHGeometry;
 
-    if (! strcmp(s, "VHr"))
+    if (s =="VHr")
         return VHrGeometry;
 
-    if (! strcmp(s, "HVH"))
+    if (s =="HVH")
         return HVHGeometry;
 
-    if (! strcmp(s, "VHV"))
+    if (s =="VHV")
         return VHVGeometry;
 
-    msg_critical(TR("Error"),
-                 Context.filename + " : " + s + TR(" is not a line geometry"));
+    msg_critical(QObject::tr("Error"),
+                 Context.filename + " : " + s + QObject::tr(" is not a line geometry"));
     THROW_ERROR 0;
 }
 
@@ -1501,7 +1496,7 @@ static void set_previous_word(char * s)
     Context.previous_word = s;
 }
 
-void backup(QDir & d, QString fn)
+void backup(QDir & d, const QString & fn)
 {
     QString s;
 
@@ -1510,48 +1505,42 @@ void backup(QDir & d, QString fn)
     while (d.exists(fn) &&
            !d.rename(fn, fn + s) &&
            (msg_warning("Uml",
-                        d.absFilePath(fn) +
-                        TR("\ncannot be renamed ") + fn + s +
-                        TR(", retry ?\n"),
+                        d.absoluteFilePath(fn) +
+                        QObject::tr("\ncannot be renamed ") + fn + s +
+                        QObject::tr(", retry ?\n"),
                         QMessageBox::Yes, QMessageBox::No)
             == QMessageBox::Yes))
         ;
 }
 
-void delete_backup(QDir & d)
+void delete_backup(const QDir & d)
 {
-    QString s;
-
-    s.sprintf("*_%u.bak", user_id());
+    QStringList s;
 
+    s.append(QString("*_%1.bak").arg(user_id()));
     //[lgfreitas] entryInfoList des not return a pointer anymore
     QFileInfoList l = d.entryInfoList(s);
 
     if (!l.empty()) {
-        //Q3PtrListIterator<QFileInfo> it(l);
-        QFileInfoList::iterator it = l.begin(); //[lgfreitas] above iterator was not working.
-        //QFileInfo fi;
-
-        while (it != l.end())  {
-            QFile::remove((*it).absFilePath());
-            it++;
+        for (const auto& fileInfo : l) {
+            QFile::remove(fileInfo.absoluteFilePath());
         }
     }
 }
 
-int open_file(QFile & fp, int mode, bool silent)
+qint64 open_file(QFile & fp, int mode, bool silent)
 {
-    Context.filename = fp.name();
+    Context.filename = fp.fileName();
 
     while (! fp.open(QFlag(mode))) { //[lgfreitas] it does not accept a int anymore, but a QFlag. Hopefully, this does the trick
         if (silent ||
-            (msg_critical("Uml",
-                          Context.filename +
-                          ((mode != QIODevice::ReadOnly)
-                           ? TR("\ncannot be opened for write, retry ?\n")
-                           : TR("\ncannot be opened for read, retry ?\n")),
-                          QMessageBox::Yes, QMessageBox::No)
-             != QMessageBox::Yes))
+                (msg_critical("Uml",
+                              Context.filename +
+                              ((mode != QIODevice::ReadOnly)
+                               ? QObject::tr("\ncannot be opened for write, retry ?\n")
+                               : QObject::tr("\ncannot be opened for read, retry ?\n")),
+                              QMessageBox::Yes, QMessageBox::No)
+                 != QMessageBox::Yes))
             return -1;
     }
 
@@ -1569,19 +1558,19 @@ int open_file(QFile & fp, int mode, bool silent)
 
 bool copy_file(QFileInfo * src, const QDir & dest)
 {
-    QString src_path = src->absFilePath();
+    QString src_path = src->absoluteFilePath();
     FILE * fp_src;
 
-    if ((fp_src = fopen((const char *) src_path, "rb")) == 0) {
-        msg_critical("Error", TR("cannot open %1 to read it", src_path));
+    if ((fp_src = fopen((const char *) src_path.toLatin1().constData(), "rb")) == 0) {
+        msg_critical("Error", QObject::tr("cannot open %1 to read it").arg(src_path),0,0,0);
         return FALSE;
     }
 
-    QString dest_path = dest.absFilePath(src->fileName());
+    QString dest_path = dest.absoluteFilePath(src->fileName());
     FILE * fp_dest;
 
-    if ((fp_dest = fopen((const char *) dest_path, "wb")) == 0) {
-        msg_critical("Error", TR("cannot create %1", dest_path));
+    if ((fp_dest = fopen((const char *) dest_path.toLatin1().constData(), "wb")) == 0) {
+        msg_critical("Error", QObject::tr("cannot create %1").arg(dest_path),0,0,0);
         fclose(fp_src);
         return FALSE;
     }
@@ -1591,7 +1580,7 @@ bool copy_file(QFileInfo * src, const QDir & dest)
 
     while ((n = fread(b, 1, sizeof(b) - 1, fp_src)) > 0) {
         if (fwrite(b, 1, n, fp_dest) != n) {
-            msg_critical("Error", TR("error when writing %1", dest_path));
+            msg_critical("Error", QObject::tr("error when writing %1").arg(dest_path));
             fclose(fp_src);
             fclose(fp_dest);
             return FALSE;
@@ -1599,7 +1588,7 @@ bool copy_file(QFileInfo * src, const QDir & dest)
     }
 
     if (! feof(fp_src)) {
-        msg_critical("Error", TR("error when reading %1", src_path));
+        msg_critical("Error", QObject::tr("error when reading %1").arg(src_path));
         fclose(fp_src);
         fclose(fp_dest);
         return FALSE;
@@ -1610,57 +1599,42 @@ bool copy_file(QFileInfo * src, const QDir & dest)
     return TRUE;
 }
 
-void save_if_needed(const char * filename, QSharedPointer<QByteArray> newdef)
+void save_if_needed(const char * filename, QString& newdef)
 {
     QDir d = BrowserView::get_dir();
-    QString path = d.absFilePath(filename);
-    FILE * fp = fopen((const char *) path, "rb");
-    bool needed;
+    QString path = d.absoluteFilePath(filename);
+    FILE * fp = fopen(path.toLatin1().constData(), "rb");
+    bool needed = false;
 
     if (fp == 0)
         needed = TRUE;
     else {
-        int c;
-        const char * new_contains = newdef->constData();
-
-        needed = FALSE;
-
-        while ((c = fgetc(fp)) != EOF) {
-            if (c != *new_contains++) {
-                needed = TRUE;
-                break;
-            }
-        }
-
+        QString oldDef;
+        QTextStream st(fp, QIODevice::ReadOnly);
+        st.setCodec("UTF-8");
+        st>>oldDef;
+        st.flush();
+        if(newdef != oldDef)
+            needed = true;
         fclose(fp);
-
-        needed |= (*new_contains != 0);
     }
 
     if (needed) {
         backup(d, filename);
 
         for (;;) {
-            while ((fp = fopen((const char *) path, "wb")) == 0)
-                (void) msg_critical("Error", TR("Cannot create file\n") + path,
+            while ((fp = fopen(path.toLatin1().constData(), "wb")) == 0)
+                (void) msg_critical("Error", QObject::tr("Cannot create file\n") + path,
                                     QMessageBox::Retry);
 
-            QLOG_INFO() << newdef.data();
+            QLOG_INFO() << newdef;
+
+            QTextStream st(fp);
+            st.setCodec("UTF-8");
+            st<<newdef;
+            st.flush();
+            break;
 
-            if (!newdef->isEmpty()) {
-                if (fputs(newdef->constData(), fp) < 0) {
-                    fclose(fp);
-                    (void) msg_critical(TR("Error"),
-                                        TR("Error while writting in\n%1\nmay be your disk is full", path),
-                                        QMessageBox::Retry);
-                }
-                else
-                    // ok
-                    break;
-            }
-            else
-                // ok
-                break;
         }
 
         fclose(fp);
@@ -1670,17 +1644,17 @@ void save_if_needed(const char * filename, QSharedPointer<QByteArray> newdef)
 char * read_file(QString filename)
 {
     filename = (in_import())
-               ? BrowserView::get_import_dir().absFilePath(filename)
-               : BrowserView::get_dir().absFilePath(filename);
+            ? BrowserView::get_import_dir().absoluteFilePath(filename)
+            : BrowserView::get_dir().absoluteFilePath(filename);
 
     QFile fp(filename);
-    int size;
+    qint64 size;
 
     if ((size = open_file(fp, QIODevice::ReadOnly, TRUE)) != -1) {
         char * s = new char[size + 1];
 
-        if (fp.readBlock(s, size) == -1) {
-            msg_critical(TR("Error"), TR("%1 cannot be read", filename));
+        if (fp.read(s, size) == -1) {
+            msg_critical(QObject::tr("Error"), QObject::tr("%1 cannot be read").arg(filename));
             delete [] s;
             return 0;
         }
@@ -1697,7 +1671,6 @@ char * read_file(QString filename)
 QString abs_file_path(int id, const char * ext)
 {
     QString s;
-
     if (ext[1] == 0)
         s.sprintf("%d_%d.%c", id,
                   root_permission() ? root_permission() : user_id(),
@@ -1705,7 +1678,7 @@ QString abs_file_path(int id, const char * ext)
     else
         s.sprintf("%d.%s", id, ext);
 
-    return BrowserView::get_dir().absFilePath(s);
+    return BrowserView::get_dir().absoluteFilePath(s);
 }
 
 char * read_definition(int id, const char * ext)
@@ -1732,19 +1705,19 @@ char * read_definition(int id, const char * ext)
     return read_file(s);
 }
 
-char * read_file(QString filename, int offset, int len)
+char * read_file(QString filename, qint64 offset, qint64 len)
 {
-    filename = BrowserView::get_dir().absFilePath(filename);
+    filename = BrowserView::get_dir().absoluteFilePath(filename);
 
     QFile fp(filename);
 
     if (open_file(fp, QIODevice::ReadOnly, TRUE) != -1) {
         char * s = new char[len + 1];
 
-        fp.at(offset);
+        fp.seek(offset);
 
-        if (fp.readBlock(s, len) == -1) {
-            msg_critical(TR("Error"), TR("%1 cannot be read", filename));
+        if (fp.read(s, len) == -1) {
+            msg_critical(QObject::tr("Error"), QObject::tr("%1 cannot be read").arg(filename));
             delete [] s;
             return 0;
         }
@@ -1758,7 +1731,7 @@ char * read_file(QString filename, int offset, int len)
         return 0;
 }
 
-char * read_definition(int id, const char * ext, int offset, int len)
+char * read_definition(int id, const char * ext, qint64 offset, qint64 len)
 {
     if (len == 0)
         return 0;
@@ -1785,7 +1758,7 @@ char * read_definition(int id, const char * ext, int offset, int len)
     return read_file(s, offset, len);
 }
 
-void save_definition(int id, const char * ext, const char * def,
+void save_definition(int id, const char * ext, QString def,
                      BooL & is_new)
 {
     QString s;
@@ -1807,29 +1780,19 @@ void save_definition(int id, const char * ext, const char * def,
                   root_permission() ? root_permission() : user_id(),
                   ext);
 
-    s = d.absFilePath(s);
+    s = d.absoluteFilePath(s);
 
     for (;;) {
-        while ((fp = fopen((const char *) s, "wb")) == 0)
-            (void) msg_critical(TR("Error"),
-                                TR("Cannot create file\n") + s,
+        while ((fp = fopen(s.toLatin1().constData(), "wb")) == 0)
+            (void) msg_critical(QObject::tr("Error"),
+                                QObject::tr("Cannot create file\n") + s,
                                 QMessageBox::Retry);
 
-        if ((def != 0) && *def) {
-            if (fputs(def, fp) < 0) {
-                fclose(fp);
-                (void) msg_critical(TR("Error"),
-                                    TR("Cannot save definition in\n%1\nmay be your disk is full",
-                                       s),
-                                    QMessageBox::Retry);
-            }
-            else
-                // ok
-                break;
-        }
-        else
-            // ok
-            break;
+        QTextStream st(fp);
+        st.setCodec("UTF-8");
+        st<<def;
+        st.flush();
+        break;
     }
 
     fclose(fp);
@@ -1848,7 +1811,7 @@ void delete_definition(int id, const char * ext)
     else {
         // modified definition
         s.sprintf("%d_%d.%s", id, user_id(), ext);
-        QFile::remove(d.absFilePath(s));
+        QFile::remove(d.absoluteFilePath(s));
     }
 }
 
@@ -1862,79 +1825,37 @@ void read_in(const QString & s)
 
 static QString where()
 {
-    return Context.filename + TR(" line ") + QString::number(Context.linenum) + "\n";
+    return Context.filename + QObject::tr(" line ") + QString::number(Context.linenum) + "\n";
 }
 
 //
 
-void save_string(const char * p, QTextStream & st)
+void save_string(QString p, QTextStream & st)
 {
-    if ((p == 0) || (*p == 0))
-        st << "\"\"";
-    else {
+    QString toWrite = p;
+    toWrite.replace('\\',"\\\\");
+    toWrite.replace('"',"\\\"");
         st << '"';
-
-        for (;;) {
-            const char * p2 = strchr(p, '"');
-            const char * p3 = strchr(p, '\\');
-
-            if ((p2 != 0) || (p3 != 0)) {
-                if ((p2 == 0) || ((p3 != 0) && (p3 < p2)))
-                    p2 = p3;
-
-                // do NOT use writeRawBytes !
-                while (p != p2)
-                {
-
-                    QString temp1 = QTextCodec::codecForLocale()->toUnicode(p).left(1);
-                    int size = QTextCodec::codecForLocale()->fromUnicode(temp1).size();
-                    st << temp1;
-                    p+=size;
-
-
-                }
-
-                st << '\\';
-                QString temp1 = QTextCodec::codecForLocale()->toUnicode(p).left(1);
-                int size =  QTextCodec::codecForLocale()->fromUnicode(temp1).size();
-                p+=size;
-                st << temp1;
-
-
-                if (*p == 0)
-                    break;
-            }
-            else {
-                st << p;
-                break;
-            }
-        }
-
+        st << toWrite;
         st << '"';
-    }
 }
 
-void save_string_list(QStringList & list, QTextStream & st)
+void save_string_list(const QStringList & list, QTextStream & st)
 {
     st << " " << list.count();
 
-    for (QStringList::Iterator it = list.begin();
-         it != list.end();
-         ++it) {
+    for (const auto& s : list) {
         st << " ";
-        save_string(*it, st);
+        save_string(s, st);
     }
 }
 
-void save_unicode_string_list(QStringList & list, QTextStream & st)
+void save_unicode_string_list(const QStringList & list, QTextStream & st)
 {
     st << " " << list.count();
-
-    for (QStringList::Iterator it = list.begin();
-         it != list.end();
-         ++it) {
+    for (const auto& s : list) {
         st << " ";
-        save_string(fromUnicode(*it), st);
+        save_string(s, st);
     }
 }
 
@@ -2009,20 +1930,19 @@ bool at_end(char *& st)
     return (*st == 0);
 }
 
-char * read_string(char *& st)
+QString read_string(char *& st)
 {
     skip_whitespace_comment(st);
 
     if (*st == 0) {
-        msg_critical(TR("Error"),
-                     where() + TR("premature end of file, string expected"));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("premature end of file, string expected"));
         THROW_ERROR 0;
     }
 
     if (*st != '"') {
-        msg_critical(TR("Error"),
-                     where() + TR("string expected after '%1'",
-                                  Context.previous_word));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("string expected after '%1'").arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2032,8 +1952,8 @@ char * read_string(char *& st)
     for (;;) {
         switch (*++st) {
         case 0:
-            msg_critical(TR("Error"),
-                         where() + TR("premature end of file reading a string"));
+            msg_critical(QObject::tr("Error"),
+                         where() + QObject::tr("premature end of file reading a string"));
             THROW_ERROR 0;
 
         case '"':
@@ -2048,12 +1968,12 @@ char * read_string(char *& st)
 
             Context.previous_word = new char[p - r + 1];
             memcpy(Context.previous_word, r, p - r + 1);
-            return r;
+            return QString::fromUtf8(r);
 
         case '\\':
             if (*++st  == 0) {
-                msg_critical(TR("Error"),
-                             where() + TR("premature end of file reading a string"));
+                msg_critical(QObject::tr("Error"),
+                             where() + QObject::tr("premature end of file reading a string"));
                 THROW_ERROR 0;
             }
 
@@ -2078,16 +1998,15 @@ char * read_keyword(char *& st)
     skip_whitespace_comment(st);
 
     if (*st == 0) {
-        msg_critical(TR("Error"),
-                     where() + TR("premature end of file, keyword expected"));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("premature end of file, keyword expected"));
         THROW_ERROR 0;
     }
 
     if (*st == '"') {
-        msg_critical(TR("Error"),
+        msg_critical(QObject::tr("Error"),
                      where() +
-                     TR("keyword expected after '%1'",
-                        Context.previous_word));
+                     QObject::tr("keyword expected after '%1'").arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2110,18 +2029,17 @@ char * read_keyword(char *& st, const char * expected)
     skip_whitespace_comment(st);
 
     if (*st == 0) {
-        msg_critical(TR("Error"),
+        msg_critical(QObject::tr("Error"),
                      where() +
-                     TR("premature end of file, '%1' expected",
-                        expected));
+                     QObject::tr("premature end of file, '%1' expected",
+                                 expected));
         THROW_ERROR 0;
     }
 
     if (*st == '"') {
         msg_critical("Error",
                      where() +
-                     TR("'%1' expected rather than a string after '%2'",
-                        expected, Context.previous_word));
+                     QObject::tr("'%1' expected rather than a string after '%2'").arg(expected).arg(Context.previous_word),0,0,0);
         THROW_ERROR 0;
     }
 
@@ -2138,8 +2056,7 @@ char * read_keyword(char *& st, const char * expected)
     if (strcmp(r, expected)) {
         msg_critical("Error",
                      where() +
-                     TR("'%1' expected rather than '%2' after '%3'",
-                        expected, r, + Context.previous_word));
+                     QObject::tr("'%1' expected rather than '%2' after '%3'").arg(expected).arg(r).arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2158,16 +2075,14 @@ char * read_keyword(char *& st, const char * expected1,
     if (*st == 0) {
         msg_critical("Error",
                      where() +
-                     TR("premature end of file, '%1' expected" ,
-                        expected1));
+                     QObject::tr("premature end of file, '%1' expected").arg(expected1));
         THROW_ERROR 0;
     }
 
     if (*st == '"') {
         msg_critical("Error",
                      where() +
-                     TR("'%1' expected rather than a string after '%2'",
-                        expected1, Context.previous_word));
+                     QObject::tr("'%1' expected rather than a string after '%2'").arg(expected1).arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2184,8 +2099,7 @@ char * read_keyword(char *& st, const char * expected1,
     if (strcmp(r, expected1) && strcmp(r, expected2)) {
         msg_critical("Error",
                      where() +
-                     TR("'%1' expected rather than '%2' after '%3'",
-                        expected1, r, Context.previous_word));
+                     QObject::tr("'%1' expected rather than '%2' after '%3'").arg(expected1).arg(r).arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2212,13 +2126,13 @@ int read_id(char *& st)
 
     if (*st == 0) {
         msg_critical("Error",
-                     where() + TR("premature end of file, id expected"));
+                     where() + QObject::tr("premature end of file, id expected"));
         THROW_ERROR 0;
     }
 
     if (*st == '"') {
         msg_critical("Error",
-                     where() + TR("id expected after '%1'", Context.previous_word));
+                     where() + QObject::tr("id expected after '%1'").arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2226,8 +2140,8 @@ int read_id(char *& st)
     int result = (int) strtol(r, &st, 10);
 
     if (st == r) {
-        msg_critical(TR("Error"),
-                     where() + TR("id expected after '%1'", Context.previous_word));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("id expected after '%1'").arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2243,14 +2157,14 @@ unsigned read_unsigned(char *& st)
     skip_whitespace_comment(st);
 
     if (*st == 0) {
-        msg_critical(TR("Error"),
-                     where() + TR("premature end of file, unsigned expected"));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("premature end of file, unsigned expected"));
         THROW_ERROR 0;
     }
 
     if (*st == '"') {
-        msg_critical(TR("Error"),
-                     where() + TR("unsigned expected after '%1'", Context.previous_word));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("unsigned expected after '%1'").arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2262,8 +2176,8 @@ unsigned read_unsigned(char *& st)
         result = result * 10 + c - '0';
 
     if (st == r + 1) {
-        msg_critical(TR("Error"),
-                     where() + TR("unsigned expected after '%1'", Context.previous_word));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("unsigned expected after '%1'").arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2279,14 +2193,14 @@ double read_double(char *& st)
     skip_whitespace_comment(st);
 
     if (*st == 0) {
-        msg_critical(TR("Error"),
-                     where() + TR("premature end of file, float expected"));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("premature end of file, float expected"));
         THROW_ERROR 0;
     }
 
     if (*st == '"') {
-        msg_critical(TR("Error"),
-                     where() + TR("float expected after '%1'", Context.previous_word));
+        msg_critical(QObject::tr("Error"),
+                     where() + QObject::tr("float expected after '%1'").arg(Context.previous_word));
         THROW_ERROR 0;
     }
 
@@ -2302,22 +2216,21 @@ double read_double(char *& st)
 
     if (!ok) {
         // '.' or ',' problem ?
-        int index = s.find(',');
+        int index = s.indexOf(',');
 
         if (index != -1) {
             s.replace(index, 1, ".");
             result = s.toDouble(&ok);
         }
-        else if ((index = s.find('.')) != -1) {
+        else if ((index = s.indexOf('.')) != -1) {
             s.replace(index, 1, ",");
             result = s.toDouble(&ok);
         }
 
         if (!ok) {
-            msg_critical(TR("Error"),
+            msg_critical(QObject::tr("Error"),
                          where() +
-                         TR("float expected rather than '%1' after '%2'",
-                            s, Context.previous_word));
+                         QObject::tr("float expected rather than '%1' after '%2'").arg(s).arg(Context.previous_word));
             THROW_ERROR 0;
         }
     }
@@ -2346,7 +2259,7 @@ void read_unicode_string_list(QStringList & list, char *& st)
     list.clear();
 
     while (n--)
-        list.append(toUnicode(read_string(st)));
+        list.append(read_string(st));
 }
 
 char * skip_until(char *& st, const char * expected)
@@ -2357,8 +2270,8 @@ char * skip_until(char *& st, const char * expected)
         skip_whitespace_comment(st);
 
         if (*st == 0) {
-            msg_critical(TR("Error"),
-                         where() + TR("premature end of file"));
+            msg_critical(QObject::tr("Error"),
+                         where() + QObject::tr("premature end of file"));
             THROW_ERROR 0;
         }
 
@@ -2371,30 +2284,29 @@ char * skip_until(char *& st, const char * expected)
 
 void wrong_keyword(const char * k, const char * expected)
 {
-    msg_critical(TR("Error"),
-                 where() + TR("'%1' expected rather than '%2'", expected, k));
+    msg_critical(QObject::tr("Error"),
+                 where() + QObject::tr("'%1' expected rather than '%2'").arg(expected).arg(k));
     THROW_ERROR 0;
 }
 
 void unknown_keyword(const char * k)
 {
-    msg_critical(TR("Error"),
-                 where() + TR("unknown or unexpected keyword '%1'", k));
+    msg_critical(QObject::tr("Error"),
+                 where() + QObject::tr("unknown or unexpected keyword '%1'").arg(k));
     THROW_ERROR 0;
 }
 
 void unknown_ref(const char * kind, int id)
 {
-    msg_critical(TR("Error"),
+    msg_critical(QObject::tr("Error"),
                  where() +
-                 TR("%1 unknown %2 identifier",
-                    QString::number(id), QString(kind)));
+                 QObject::tr("%1 unknown %2 identifier").arg(QString::number(id).arg(QString(kind))));
     THROW_ERROR 0;
 }
 
 //
 
-void save_xy(QTextStream & st, const Q3CanvasItem * c, const char * s)
+void save_xy(QTextStream & st, const QGraphicsItem * c, const char * s)
 {
 #ifdef FORCE_INT_COORD
     st << s << " " << (int) c->x() << " " << (int) c->y();
@@ -2405,31 +2317,35 @@ void save_xy(QTextStream & st, const Q3CanvasItem * c, const char * s)
 #endif
 }
 
-void save_xyz(QTextStream & st, const Q3CanvasItem * c, const char * s)
+void save_xyz(QTextStream & st, const QGraphicsItem * c, const char * s)
 {
 #ifdef FORCE_INT_COORD
     st << s << " " << (int) c->x() << " " << (int) c->y() << " " << (int) c->z();
 #else
     QString xs, ys, zs;
 
-    st << s << " " << xs.setNum(c->x()) << " " << ys.setNum(c->y()) << " " << zs.setNum(c->z());
+    st << s << " " << xs.setNum(c->x()) << " " << ys.setNum(c->y()) << " " << zs.setNum(0);
 #endif
 }
 
-void save_xyzwh(QTextStream & st, const Q3CanvasRectangle * c, const char * s)
+void save_xyzwh(QTextStream & st, const QGraphicsRectItem *c, const char * s)
 {
 #ifdef FORCE_INT_COORD
     st << s << " " << (int) c->x() << " " << (int) c->y() << " " << (int) c->z()
        << " " << (int) c->width() << " " << (int) c->height();
 #else
     QString xs, ys, zs;
+/*
+    st << s << " " << xs.setNum(c->boundingRect().x()) << " " << ys.setNum(c->boundingRect().y()) << " " << zs.setNum(0)
+       << " " << (int) c->boundingRect().width() << " " << (int) c->boundingRect().height();
+       */
+    st << s << " " << xs.setNum(c->x()) << " " << ys.setNum(c->y()) << " " << zs.setNum(c->zValue())
+       << " " << (int) c->rect().width() << " " << (int) c->rect().height();
 
-    st << s << " " << xs.setNum(c->x()) << " " << ys.setNum(c->y()) << " " << zs.setNum(c->z())
-       << " " << (int) c->width() << " " << (int) c->height();
 #endif
 }
 
-void read_xy(char *& st, Q3CanvasItem * c)
+void read_xy(char *& st, QGraphicsItem * c)
 {
     double px = read_double(st);
     double py = read_double(st);
@@ -2443,35 +2359,34 @@ void bypass_xy(char *& st)
     read_double(st);
 }
 
-void read_xyz(char *& st, Q3CanvasItem * c)
+void read_xyz(char *& st, QGraphicsItem * c)
 {
     double px = read_double(st);
     double py = read_double(st);
 
     c->moveBy(px - c->x(), py - c->y());
-    c->setZ(read_double(st));
+    c->setZValue(read_double(st));
 }
 
-void read_xyzwh(char *& st, Q3CanvasRectangle * c)
+void read_xyzwh(char *& st, QGraphicsRectItem * c)
 {
     double px = read_double(st);
     double py = read_double(st);
 
     c->moveBy(px - c->x(), py - c->y());
-    c->setZ(read_double(st));
+    c->setZValue(read_double(st));
 
     double w = read_double(st);
 
-    c->setSize((int) w, (int) read_double(st));
+    c->setRect(0,0,(int) w, (int) read_double(st));
 }
 
-void read_zwh(char *& st, Q3CanvasRectangle * c)
+void read_zwh(char *& st, QGraphicsRectItem * c)
 {
-    c->setZ(read_double(st));
+    c->setZValue(read_double(st));
 
     double w = read_double(st);
-
-    c->setSize((int) w, (int) read_double(st));
+    c->setRect(0,0,(int) w, (int) read_double(st));
 }
 
 void save_color(QTextStream & st, const char * s, UmlColor c, BooL & nl)
@@ -2515,35 +2430,33 @@ void warn(const QString & s)
     // not showed dialog to compute needed size
 
     QDialog d_aux;
-    Q3VBoxLayout * vbox_aux = new Q3VBoxLayout(&d_aux);
+    QVBoxLayout * vbox_aux = new QVBoxLayout(&d_aux);
 
     vbox_aux->setMargin(5);
-    Q3TextEdit * e = new Q3TextEdit(&d_aux);
+    QTextEdit * e = new QTextEdit(&d_aux);
     e->setText(s);
 
     // showed dialog
 
     QDialog * d = new QDialog;
 
-    d->setCaption("Uml");
+    d->setWindowTitle("Uml");
 
-    Q3VBoxLayout * vbox = new Q3VBoxLayout(d);
+    QVBoxLayout * vbox = new QVBoxLayout(d);
 
     vbox->setMargin(5);
-
-    Q3TextView * t = new Q3TextView(d);
+    QTextEdit * t = new QTextEdit(d);
     QFontMetrics fm(QApplication::font());
     //int w = e->maxLineWidth() + e->minimumSizeHint().width();
     int maxw = (UmlWindow::get_workspace()->width() * 4) / 5;
     int maxh = (UmlWindow::get_workspace()->height() * 4) / 5;
-    int he = (e->lines() + 5) * fm.height();
+    int he = (e->toPlainText().count('\n') + 5) * fm.height();
 
     t->setText(s);
     t->setMinimumSize(maxw, //(w > maxw) ? maxw : w,
                       (he > maxh) ? maxh : he);
 
     vbox->addWidget(t);
-
     d->show();
 }
 
@@ -2551,27 +2464,27 @@ void warn(const QString & s)
 
 void save(const DiagramItem * di, QBuffer & b)
 {
-    b.writeBlock((char *) &di, sizeof(di));
+    b.write((char *) &di, sizeof(di));
 }
 
 DiagramItem * load_item(QBuffer & b)
 {
     DiagramItem * di;
 
-    b.readBlock((char *) &di, sizeof(di));
+    b.read((char *) &di, sizeof(di));
     return di;
 }
 
 void save_ptr(const void * ptr, QBuffer & b)
 {
-    b.writeBlock((char *) &ptr, sizeof(ptr));
+    b.write((char *) &ptr, sizeof(ptr));
 }
 
 void * load_ptr(QBuffer & b)
 {
     void * ptr;
 
-    b.readBlock((char *) &ptr, sizeof(ptr));
+    b.read((char *) &ptr, sizeof(ptr));
     return ptr;
 }
 
@@ -2580,23 +2493,23 @@ void save(const QPoint & p, QBuffer & b)
     int i;
 
     i = p.x();
-    b.writeBlock((char *) &i, sizeof(i));
+    b.write((char *) &i, sizeof(i));
     i = p.y();
-    b.writeBlock((char *) &i, sizeof(i));
+    b.write((char *) &i, sizeof(i));
 }
 
 void load(QPoint & p, QBuffer & b)
 {
     int i;
 
-    b.readBlock((char *) &i, sizeof(i));
+    b.read((char *) &i, sizeof(i));
     p.setX(i);
 
-    b.readBlock((char *) &i, sizeof(i));
+    b.read((char *) &i, sizeof(i));
     p.setY(i);
 }
 
-void save(const Q3PointArray & a, QBuffer & b)
+void save(const QPolygon & a, QBuffer & b)
 {
     const QPoint * p = a.data();
 
@@ -2604,7 +2517,7 @@ void save(const Q3PointArray & a, QBuffer & b)
         save(*p++, b);
 }
 
-void load(Q3PointArray & a, QBuffer & b)
+void load(QPolygon & a, QBuffer & b)
 {
     QPoint * p = a.data();
 
@@ -2614,48 +2527,48 @@ void load(Q3PointArray & a, QBuffer & b)
 
 void save(double d, QBuffer & b)
 {
-    b.writeBlock((char *) &d, sizeof(d));
+    b.write((char *) &d, sizeof(d));
 }
 
 void load(double & d, QBuffer & b)
 {
-    b.readBlock((char *) &d, sizeof(d));
+    b.read((char *) &d, sizeof(d));
 }
 
 double load_double(QBuffer & b)
 {
     double d;
 
-    b.readBlock((char *) &d, sizeof(d));
+    b.read((char *) &d, sizeof(d));
     return d;
 }
 
 void save(float f, QBuffer & b)
 {
-    b.writeBlock((char *) &f, sizeof(f));
+    b.write((char *) &f, sizeof(f));
 }
 
 void load(float & f, QBuffer & b)
 {
-    b.readBlock((char *) &f, sizeof(f));
+    b.read((char *) &f, sizeof(f));
 }
 
 double load_float(QBuffer & b)
 {
     float f;
 
-    b.readBlock((char *) &f, sizeof(f));
+    b.read((char *) &f, sizeof(f));
     return f;
 }
 
 void save(int i, QBuffer & b)
 {
-    b.writeBlock((char *) &i, sizeof(i));
+    b.write((char *) &i, sizeof(i));
 }
 
 void load(int & i, QBuffer & b)
 {
-    b.readBlock((char *) &i, sizeof(i));
+    b.read((char *) &i, sizeof(i));
 }
 
 // svg
@@ -2663,9 +2576,9 @@ void load(int & i, QBuffer & b)
 static FILE * svg_fp;
 static int pict_height;
 
-bool start_svg(const char * f, int w, int h)
+bool start_svg(QString f, int w, int h)
 {
-    svg_fp = fopen(f, "w");
+    svg_fp = fopen(f.toLatin1().constData(), "w");
 
     if (svg_fp == 0)
         return FALSE;
@@ -2719,10 +2632,10 @@ const char * svg_color(UmlColor c)
     return r;
 }
 
-void draw_poly(FILE * fp, Q3PointArray & poly, UmlColor color, bool stroke)
+void draw_poly(FILE * fp, QPolygon & poly, UmlColor color, bool stroke)
 {
     (void) fprintf(fp, (stroke) ? "\t<polygon fill=\"%s\" stroke=\"black\" stroke-opacity=\"1\""
-                   : "\t<polygon fill=\"%s\" stroke=\"none\"",
+                                : "\t<polygon fill=\"%s\" stroke=\"none\"",
                    svg_color(color));
 
     const char * sep = " points=\"";
@@ -2737,7 +2650,7 @@ void draw_poly(FILE * fp, Q3PointArray & poly, UmlColor color, bool stroke)
     (void) fputs("\" />\n", fp);
 }
 
-void draw_shadow(FILE * fp, Q3PointArray & poly)
+void draw_shadow(FILE * fp, QPolygon & poly)
 {
     (void) fprintf(fp, "\t<polygon fill=\"#%06x\" stroke=\"none\"",
                    QColor(::Qt::darkGray).rgb() & 0xffffff);
@@ -2754,15 +2667,15 @@ void draw_shadow(FILE * fp, Q3PointArray & poly)
     (void) fputs("\" />\n", fp);
 }
 
-void draw_text(const QRect & r, int align, QString s, const QFont & fn, FILE * fp)
+void draw_text(const QRect & r, int align, const QString & s, const QFont & fn, FILE * fp)
 {
     draw_text(r.left(), r.top(), r.width(), r.height(),
               align, s, fn, fp);
 }
 
-static void xml_text(FILE * fp, QString s)
+static void xml_text(FILE * fp, const QString & s)
 {
-    WrapperStr cs = s.utf8();
+    WrapperStr cs = s.toUtf8();
     const char * p = cs;
 
     for (;;) {
@@ -2797,15 +2710,17 @@ static void xml_text(FILE * fp, QString s)
 }
 
 void draw_text(int x, int y, int w, int h, int align,
-               QString s, const QFont & fn, FILE * fp,
+               const QString & sInit, const QFont & fn, FILE * fp,
                UmlColor fg, UmlColor bg)
 {
+    QString s = sInit;
+    
     if (s.isEmpty())
         return;
 
     if (bg != UmlTransparent)
         (void) fprintf(fp, "\t<rect fill=\"%s\" stroke=\"none\" stroke-opacity=\"1\""
-                       " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
+                           " x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" />\n",
                        svg_color(bg), x, y, w, h);
 
     if (fg == UmlTransparent)
@@ -2816,7 +2731,7 @@ void draw_text(int x, int y, int w, int h, int align,
     char header[256];
 
     sprintf(header, "\t<text font-family=\"%s\" font-size=\"%d\" fill=\"%s\" xml:space=\"preserve\"",
-            (const char *) fn.family(),
+            (const char *) fn.family().toLatin1().constData(),
             // decrease size to help to have enough area
             (ps == -1) ? /* Qt3 */ pts : ps - 1,
             svg_color(fg));
@@ -2836,7 +2751,7 @@ void draw_text(int x, int y, int w, int h, int align,
 
     bool wb = align & ::Qt::TextWordWrap;
 
-    if ((s.find('\n') == -1) && !wb) {
+    if ((s.indexOf('\n') == -1) && !wb) {
         // one line
         (void) fputs(header, fp);
 
@@ -2860,7 +2775,7 @@ void draw_text(int x, int y, int w, int h, int align,
         int index = s.length();
         QChar lf('\n');
 
-        while ((index = s.find('\r')) != -1)
+        while ((index = s.indexOf('\r')) != -1)
             s.remove(index, 1);
 
         index = s.length();
@@ -2873,7 +2788,7 @@ void draw_text(int x, int y, int w, int h, int align,
 
         s.truncate(index);
 
-        QStringList l = QStringList::split(lf, s, TRUE);
+        QStringList l = s.split(lf);
 
         // cut lines too large
         QFontMetrics fm(fn);
@@ -2956,7 +2871,7 @@ void draw_text(int x, int y, int w, int h, int align,
     }
 }
 
-void draw_rotate_text(int cx, int cy, int angle, QString s,
+void draw_rotate_text(int cx, int cy, int angle, const QString & s,
                       const QFont & fn, FILE * fp, UmlColor fg)
 {
     if (s.isEmpty())
@@ -2966,7 +2881,7 @@ void draw_rotate_text(int cx, int cy, int angle, QString s,
     int pts = fn.pointSize();
 
     (void) fprintf(fp, "\t<text font-family=\"%s\" font-size=\"%d\" fill=\"%s\" xml:space=\"preserve\"",
-                   (const char *) fn.family(),
+                   (const char *) fn.family().toLatin1().constData(),
                    // decrease size to help to have enough area
                    (ps == -1) ? /* Qt3 */ pts : ps - 1,
                    svg_color(fg));
@@ -3005,16 +2920,16 @@ QString last_used_directory()
     return Last_Used_Directory;
 }
 
-void set_last_used_directory(QString s)
+void set_last_used_directory(const QString & s)
 {
     QFileInfo fi(s);
 
-    Last_Used_Directory = fi.dirPath();
+    Last_Used_Directory = fi.dir().path();
 }
 
 unsigned api_format(bool useTrueFormat)
 {
-    QSettings settings("settings.ini", QSettings::IniFormat);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
     settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
     int compat = settings.value("Main/compatibility_save").toInt();
     if((compat != 1) || useTrueFormat)
diff --git a/src/misc/myio.h b/src/misc/myio.h
index 3d62bdaf0..b6a20e8c0 100644
--- a/src/misc/myio.h
+++ b/src/misc/myio.h
@@ -1,3 +1,4 @@
+
 // *************************************************************************
 //
 // Copyright 2004-2010 Bruno PAGES  .
@@ -32,10 +33,10 @@
 #include "UmlEnum.h"
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PointArray>
+//#include <QPolygon>
 #include <QSettings>
 #include <QSharedPointer>
-
+#include <QGraphicsItem>
 
 #define FILEFORMAT 77
 
@@ -43,12 +44,9 @@ class QDir;
 class QFile;
 class QFileInfo;
 class QStringList;
-class Q3CanvasItem;
 class QTextStream;
-class Q3CanvasRectangle;
 class QBuffer;
 class QPoint;
-class Q3PointArray;
 class QColor;
 class QRect;
 class QFont;
@@ -80,39 +78,39 @@ extern void force_read_only(bool y);
 extern bool on_load_diagram();
 extern void set_on_load_diagram(bool);
 
-extern void backup(QDir & d, QString fn);
-extern void delete_backup(QDir & d);
+extern void backup(QDir & d, const QString & fn);
+extern void delete_backup(const QDir & d);
 
-extern int open_file(QFile & fp, int mode, bool silent = FALSE);
+extern qint64 open_file(QFile & fp, int mode, bool silent = FALSE);
 extern void read_in(const QString &);
 extern bool copy_file(QFileInfo * src, const QDir & dest);
-extern void save_if_needed(const char * filename, QSharedPointer<QByteArray>);
+extern void save_if_needed(const char * filename, QString& newdef);
 
 extern char * read_file(QString filename);
-extern char * read_file(QString filename, int offset, int len);
+extern char * read_file(QString filename, qint64 offset, qint64 len);
 
 extern QString last_used_directory();
-extern void set_last_used_directory(QString);
+extern void set_last_used_directory(const QString &);
 
 extern void set_read_file_format(unsigned);
 extern unsigned read_file_format();
 
 extern QString abs_file_path(int id, const char * ext);
 extern char * read_definition(int id, const char * ext);
-char * read_definition(int id, const char * ext, int offset, int len);
-extern void save_definition(int id, const char * ext, const char * def, BooL & is_new);
+char * read_definition(int id, const char * ext, qint64 offset, qint64 len);
+extern void save_definition(int id, const char * ext, QString def, BooL & is_new);
 extern void delete_definition(int id, const char * ext);
 
-extern void save_string(const char *, QTextStream & st);
-extern void save_string_list(QStringList & list, QTextStream & st);
-extern void save_unicode_string_list(QStringList & list, QTextStream & st);
+extern void save_string(QString, QTextStream & st);
+extern void save_string_list(const QStringList & list, QTextStream & st);
+extern void save_unicode_string_list(const QStringList & list, QTextStream & st);
 extern void nl_indent(QTextStream & st);
 extern void indent(int);
 extern int indent();
 extern void indent0();
 
 extern bool at_end(char *& st);
-extern char * read_string(char *& st);
+extern QString read_string(char *& st);
 extern char * read_keyword(char *& st);
 extern char * read_keyword(char *& st, const char * expected);
 extern char * read_keyword(char *& st, const char * expected1,
@@ -131,13 +129,13 @@ extern void unknown_ref(const char * kind, int id);
 
 // ifdef save as int to bypass bug in << float in qt 3.3.3
 #undef FORCE_INT_COORD
-extern void save_xy(QTextStream & st, const Q3CanvasItem * c, const char * s);
-extern void save_xyz(QTextStream & st, const Q3CanvasItem * c, const char * s);
-extern void save_xyzwh(QTextStream & st, const Q3CanvasRectangle * c, const char * s);
-extern void read_xy(char *& st, Q3CanvasItem * c);
-extern void read_xyz(char *& st, Q3CanvasItem * c);
-extern void read_xyzwh(char *& st, Q3CanvasRectangle * c);
-extern void read_zwh(char *& st, Q3CanvasRectangle * c);
+extern void save_xy(QTextStream & st, const QGraphicsItem * c, const char * s);
+extern void save_xyz(QTextStream & st, const QGraphicsItem * c, const char * s);
+extern void save_xyzwh(QTextStream & st, const QGraphicsRectItem *c, const char * s);
+extern void read_xy(char *& st, QGraphicsItem * c);
+extern void read_xyz(char *& st, QGraphicsItem * c);
+extern void read_xyzwh(char *& st, QGraphicsRectItem * c);
+extern void read_zwh(char *& st, QGraphicsRectItem * c);
 extern void bypass_xy(char *& st);
 extern void save_color(QTextStream & st, const char *, UmlColor, BooL &);
 extern void read_color(char *& st, const char *, UmlColor &, char *&);
@@ -157,8 +155,8 @@ extern void * load_ptr(QBuffer &);
 extern void save(const QPoint & p, QBuffer &);
 extern void load(QPoint & p, QBuffer &);
 
-extern void save(const Q3PointArray & a, QBuffer &);
-extern void load(Q3PointArray & a, QBuffer &);
+extern void save(const QPolygon & a, QBuffer &);
+extern void load(QPolygon & a, QBuffer &);
 
 extern void save(double, QBuffer &);
 extern void load(double &, QBuffer &);
@@ -174,19 +172,19 @@ extern void load(int &, QBuffer &);
 
 // svg
 
-extern bool start_svg(const char * f, int w, int h);
+extern bool start_svg(QString f, int w, int h);
 extern void end_svg();
 extern FILE * svg();
 extern int svg_height();
 extern const char * svg_color(UmlColor);
-extern void draw_shadow(FILE * fp, Q3PointArray & poly);
-extern void draw_poly(FILE * fp, Q3PointArray & poly,
+extern void draw_shadow(FILE * fp, QPolygon & poly);
+extern void draw_poly(FILE * fp, QPolygon & poly,
                       UmlColor color, bool stroke = TRUE);
-extern void draw_text(const QRect & r, int align, QString s, const QFont &, FILE *);
-extern void draw_text(int x, int y, int w, int h, int align, QString s,
+extern void draw_text(const QRect & r, int align, const QString & s, const QFont &, FILE *);
+extern void draw_text(int x, int y, int w, int h, int align, const QString & s,
                       const QFont &, FILE *, UmlColor fg = UmlBlack,
                       UmlColor bg = UmlTransparent);
-extern void draw_rotate_text(int cx, int cy, int angle, QString s,
+extern void draw_rotate_text(int cx, int cy, int angle, const QString & s,
                              const QFont &, FILE *, UmlColor fg = UmlBlack);
 
 // windows wrong home dir
diff --git a/src/misc/mystr.cpp b/src/misc/mystr.cpp
index 5c74342b4..a99bb259d 100644
--- a/src/misc/mystr.cpp
+++ b/src/misc/mystr.cpp
@@ -30,11 +30,9 @@
 
 
 #include <qstring.h>
-//Added by qt3to4:
-#include <Q3StrList>
-
+#include <QStringList>
 #include "Logging/QsLog.h"
-
+#include <QTextCodec>
 #include "mystr.h"
 char WrapperStr::returnableNullPtr[1] = { 0 };
 QByteArray WrapperStr::ba[20];
@@ -82,7 +80,7 @@ bool operator !=(const WrapperStr &s1, const WrapperStr &s2)
 
 bool operator!=(const QString & s1, const WrapperStr & s2)
 {
-    return s1 == s2.wrappedString ;
+    return s1 != s2.wrappedString ;
 }
 
 
@@ -126,6 +124,12 @@ QTextStream & operator<<(QTextStream & ds, const WrapperStr &str)
     ds << QTextCodec::codecForLocale()->toUnicode(str.operator const char *());
     return ds;
 }
+QDebug operator<<(QDebug dbg, const WrapperStr& str)
+{
+    QDebugStateSaver saver(dbg);
+    dbg << str.wrappedString;
+    return dbg;
+}
 //
 bool neq(const WrapperStr & s1, const WrapperStr & s2)
 {
@@ -141,7 +145,7 @@ bool neq(const WrapperStr & s1, const WrapperStr & s2)
             return (*p2 != 0);
 
         if (*p1 != *p2)
-            return TRUE;
+            return true;
 
         p1 += 1;
         p2 += 1;
diff --git a/src/misc/mystr.h b/src/misc/mystr.h
index cc5976a75..d6a0a0d71 100644
--- a/src/misc/mystr.h
+++ b/src/misc/mystr.h
@@ -28,9 +28,9 @@
 #ifndef MY_STR_H
 #define MY_STR_H
 
-#include <q3strlist.h>
+//#include <q3strlist.h>
 #include <QString>
-#include <Q3CString>
+#include <QTextStream>
 #include "Logging/QsLog.h"
 
 
@@ -49,16 +49,20 @@ class WrapperStr
     }
     WrapperStr(const QString & other) {
         this->wrappedString = other;
+        this->byteArray = this->wrappedString.toLatin1();
     }
     WrapperStr(const QByteArray & other) {
         this->wrappedString = QString(other);
+        this->byteArray = this->wrappedString.toLatin1();
     }
     WrapperStr(const char* other) {
         this->wrappedString = QString(other);
+        this->byteArray = this->wrappedString.toLatin1();
     }
     //QString get(){return s;}
-    WrapperStr & operator=(const Q3CString & cstr) {
+    WrapperStr & operator=(const QByteArray & cstr) {
         this->wrappedString = QByteArray(cstr);
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     bool isEmpty() const {
@@ -76,6 +80,7 @@ class WrapperStr
 
     WrapperStr & operator=(const WrapperStr & other) {
         this->wrappedString = other.wrappedString;
+       this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
 //    WrapperStr & operator=(const WrapperStr & other) {
@@ -84,18 +89,22 @@ class WrapperStr
 //    }
     WrapperStr & operator=(const char * c) {
         this->wrappedString = QString(QLatin1String(c));
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr & operator+=(const char * c) {
         this->wrappedString += QString(QLatin1String(c));
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr & operator+=(const QString& str) {
         this->wrappedString += str;
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr & operator+=(const WrapperStr& str) {
         this->wrappedString += str.wrappedString;
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
 //    WrapperStr & operator+=(const char* str) {
@@ -104,27 +113,30 @@ class WrapperStr
 //    }
     WrapperStr & operator+=(char c) {
         this->wrappedString += QString(c);
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr & operator=(const QString & other) {
         this->wrappedString = other;
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
 
     operator const char * () const
     {
-        return wrappedString;
+        return byteArray.constData();
     }
-    operator WrapperStr() const {
-         //QLOG_INFO()() << Q_FUNC_INFO;
-         //QLOG_INFO()() << this->wrappedString.toLatin1();
-         return this->wrappedString.toLatin1();
-     }
 
     operator QString() const {
         return this->wrappedString;
     }
 
+    void sprintf(QString proto, unsigned val)
+    {
+        proto.replace("%u", QString::number(val));
+        this->wrappedString = proto;
+    }
+
     friend bool operator==(const WrapperStr & s1, const char * s2);
     friend bool operator==(const char * s1, const WrapperStr & s2);
     friend bool operator==(const WrapperStr & s1, const QString & s2);
@@ -144,20 +156,24 @@ class WrapperStr
     friend WrapperStr operator+(const WrapperStr & s1, const QString & s2);
     friend WrapperStr operator+(const QString & s1, const WrapperStr & s2);
     friend QTextStream & operator<<(QTextStream & ds, const WrapperStr &str);
+    friend QDebug operator<<(QDebug dbg, const WrapperStr& str);
 
-    void assign(const char * c, int len) {
+    void assign(QString c, int len) {
         Q_UNUSED(len);
-        this->wrappedString = QString(QLatin1String(c));
+        this->wrappedString = c;
+        this->byteArray = this->wrappedString.toLatin1();
     }
 
     WrapperStr& replace(int pos, int len, const char* c)
     {
-        wrappedString.replace(pos, len, c);
+        wrappedString = wrappedString.replace(pos, len, c);
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr& insert(int pos, const char* c)
     {
-        wrappedString.insert(pos, c);
+        wrappedString  = wrappedString.insert(pos, c);
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr left(int len) const
@@ -183,7 +199,8 @@ class WrapperStr
 
     WrapperStr& remove(int pos, int len)
     {
-        wrappedString.remove(pos, len);
+        wrappedString = wrappedString.remove(pos, len);
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr mid(int pos, int len = -1) const
@@ -192,12 +209,14 @@ class WrapperStr
     }
     WrapperStr& setNum(int num)
     {
-        wrappedString.setNum(num);
+        wrappedString = wrappedString.setNum(num);
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     void truncate(int pos)
     {
-        wrappedString.left(pos);
+        wrappedString = wrappedString.left(pos);
+        this->byteArray = this->wrappedString.toLatin1();
     }
     QString upper() const
     {
@@ -218,21 +237,24 @@ class WrapperStr
     }
     int find(QChar c, int from = 0) const
     {
-        return wrappedString.toAscii().find(c, from);
+        return wrappedString.toLatin1().indexOf(c, from);
     }
     WrapperStr & append ( const char * str )
     {
         wrappedString += QString(str);
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr & append (QString str )
     {
         wrappedString += str;
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     WrapperStr & append (const WrapperStr& str )
     {
         wrappedString += str.wrappedString;
+        this->byteArray = this->wrappedString.toLatin1();
         return *this;
     }
     bool isNull() const
@@ -253,6 +275,7 @@ class WrapperStr
     static char returnableNullPtr[1];
 
     QString wrappedString;
+    QByteArray byteArray;
 };
 
 bool operator==(const WrapperStr & s1, const char * s2);
@@ -271,6 +294,7 @@ WrapperStr operator+(const char * s1, const WrapperStr & s2);
 WrapperStr operator+(const WrapperStr & s1, const QString & s2);
 WrapperStr operator+(const QString & s1, const WrapperStr & s2);
 QTextStream & operator<<(QTextStream & ds, const WrapperStr &str);
+QDebug operator<<(QDebug dbg, const WrapperStr& str);
 bool neq(const WrapperStr & s1, const WrapperStr & s2);
 
 #endif
diff --git a/src/misc/strutil.cpp b/src/misc/strutil.cpp
index 7c23c86d1..3448ca283 100644
--- a/src/misc/strutil.cpp
+++ b/src/misc/strutil.cpp
@@ -48,7 +48,7 @@ bool manage_comment(QString comment, const char *& p,
         comment.isEmpty())
         return FALSE;
 
-    const char * co = comment;
+    const char * co = comment.toLatin1().constData();
 
     if (javadoc) {
         the_comment = "/**\n * ";
@@ -82,7 +82,7 @@ bool manage_comment(QString comment, const char *& p,
     }
 
     pp = p;
-    p = the_comment;
+    p = the_comment.toLatin1().constData();
     return TRUE;
 }
 
@@ -102,7 +102,7 @@ bool manage_description(QString comment, const char *& p, const char *& pp)
         the_comment += '\n';
 
     pp = p;
-    p = the_comment;
+    p = the_comment.toLatin1().constData();
     return TRUE;
 }
 
@@ -117,7 +117,7 @@ bool manage_python_comment(QString comment, const char *& p,
         comment.isEmpty())
         return FALSE;
 
-    const char * co = comment;
+    const char * co = comment.toLatin1().constData();
 
     the_comment = "#";
 
@@ -133,7 +133,7 @@ bool manage_python_comment(QString comment, const char *& p,
         the_comment += '\n';
 
     pp = p;
-    p = the_comment;
+    p = the_comment.toLatin1().constData();
     return TRUE;
 }
 
@@ -158,7 +158,7 @@ void manage_python_docstring(QString comment, const char *& p, const char *& pp,
 
     int index = 0;
 
-    while ((index = the_comment.find("\"\"\"", index)) != -1) {
+    while ((index = the_comment.indexOf("\"\"\"", index)) != -1) {
         the_comment.insert(index, "\\");
         index += 2;
     }
@@ -171,7 +171,7 @@ void manage_python_docstring(QString comment, const char *& p, const char *& pp,
     }
 
     pp = p;
-    p = the_comment;
+    p = the_comment.toLatin1().constData();
     saved_indent =  indent;
     indent = "";
 }
@@ -186,13 +186,13 @@ bool is_char_of_name(char c)
 
 QString extract_name(QString s)
 {
-    int index = s.find("${name}");
+    int index = s.indexOf("${name}");
 
     if (index == -1)
         // !!
         return QString();
 
-    const char * p = s;
+    const char * p = s.toLatin1().constData();
 
     int start = index;
 
@@ -212,26 +212,26 @@ QString true_name(const QString & name, const QString & decl)
     int index;
     QString n;
 
-    n = ((index = name.find(" ")) == -1)
+    n = ((index = name.indexOf(" ")) == -1)
         ? name
         : name.left(index);
 
     QString s = extract_name(decl);
 
-    return (s.isEmpty()) ? n : s.replace(s.find("${name}"), 7, n);
+    return (s.isEmpty()) ? n : s.replace(s.indexOf("${name}"), 7, n);
 }
 
 QString capitalize(const QString & s)
 {
     return (s.isEmpty())
            ? s
-           : s.left(1).upper() + s.mid(1);
+           : s.left(1).toUpper() + s.mid(1);
 }
 
 QString quote(QString s)
 {
     QString result;
-    const char * p = s;
+    const char * p = s.toLatin1().constData();
 
     for (;;) {
         switch (*p) {
@@ -268,12 +268,12 @@ void remove_comments(QString & s)
 {
     int index1 = 0;
 
-    while ((index1 = s.find('/', index1)) != -1) {
+    while ((index1 = s.indexOf('/', index1)) != -1) {
         int index2;
 
-        switch (((const char *) s)[index1 + 1]) {
+        switch (((const char *) s.toLatin1().constData())[index1 + 1]) {
         case '/':
-            if ((index2 = s.find('\n', index1 + 2)) != -1)
+            if ((index2 = s.indexOf('\n', index1 + 2)) != -1)
                 s.remove(index1, index2 - index1 + 1);
             else
                 s.truncate(index1);
@@ -281,7 +281,7 @@ void remove_comments(QString & s)
             break;
 
         case '*':
-            if ((index2 = s.find("*/", index1 + 2)) != -1)
+            if ((index2 = s.indexOf("*/", index1 + 2)) != -1)
                 s.replace(index1, index2 - index1 + 2, " ");
             else
                 s.truncate(index1);
@@ -312,10 +312,10 @@ void remove_python_comments(QString & s)
 {
     int index1 = 0;
 
-    while ((index1 = s.find('/', index1)) != -1) {
+    while ((index1 = s.indexOf('/', index1)) != -1) {
         int index2;
 
-        if ((index2 = s.find('\n', index1 + 2)) != -1)
+        if ((index2 = s.indexOf('\n', index1 + 2)) != -1)
             s.remove(index1, index2 - index1 + 1);
         else
             s.truncate(index1);
@@ -331,14 +331,14 @@ void remove_preprocessor(QString & s)
 {
     int index = 0;
 
-    while ((index = s.find('#', index)) != -1) {
+    while ((index = s.indexOf('#', index)) != -1) {
         // remove all up to the end of line
         int index2 = index + 1;
         int index3;
 
-        while ((index3 = s.find('\n', index2)) != -1) {
+        while ((index3 = s.indexOf('\n', index2)) != -1) {
             // manage multi lines #define
-            if (((const char *) s)[index3 - 1] != '\\')
+            if (((const char *) s.toLatin1().constData())[index3 - 1] != '\\')
                 break;
             else
                 index2 = index3 + 1;
@@ -357,11 +357,11 @@ QString java_multiplicity(QString m)
     QString r;
 
     if (! m.isEmpty()) {
-        if (*m != '[')
+        if (*m.toLatin1().constData() != '[')
             r += "[]";
         else {
             for (int index = 0; index != m.length(); index += 1) {
-                switch (m.at(index).latin1()) {
+                switch (m.at(index).toLatin1()) {
                 case '[':
                     r += '[';
                     break;
@@ -453,8 +453,8 @@ bool is_referenced(const char * s, int id, const char * kc, const char * kr)
     if (s != 0) {
         if (kc != 0) {
             // search a form kc <n> kr id
-            int lkc = strlen(kc);
-            int lkr = strlen(kr);
+            size_t lkc = strlen(kc);
+            size_t lkr = strlen(kr);
 
             while ((s = strstr(s, kc)) != 0) {
                 s += lkc;
@@ -477,7 +477,7 @@ bool is_referenced(const char * s, int id, const char * kc, const char * kr)
         }
         else {
             // search a form  kr id
-            int lkr = strlen(kr);
+            size_t lkr = strlen(kr);
 
             while ((s = strstr(s, kr)) != 0) {
                 s += lkr;
diff --git a/src/misc/translate.cpp b/src/misc/translate.cpp
index 90dbf7975..1df3af06f 100644
--- a/src/misc/translate.cpp
+++ b/src/misc/translate.cpp
@@ -26,83 +26,46 @@
 // *************************************************************************
 
 #include <stdio.h>
-#include <q3dict.h>
+////
 #include <qmessagebox.h>
 
 #include "translate.h"
-
-static Q3Dict<QString> * CurrentTranslation = 0;
+#include <QApplication>
+#include <QTranslator>
+//static QMap<QString> * CurrentTranslation = 0;
 static QString CurrentLang;
-
+static QTranslator translator;
 QString current_lang()
 {
     return CurrentLang;
 }
-
 void set_lang(QString l)
 {
     if (l != CurrentLang) {
         if (l.isEmpty()) {
-            delete CurrentTranslation;
-            CurrentTranslation = 0;
             CurrentLang = "";
+            qApp->removeTranslator(&translator);
+            translator.load("");
+            qApp->installTranslator(&translator);
+
         }
         else {
-            FILE * fp = fopen((const char *) l, "rb");
-
-            if (fp == 0) {
+            qApp->removeTranslator(&translator);
+            if (!translator.load(l)) {
                 QMessageBox::critical(0, "Douml",
                                       "cannot open file " +
                                       l +
                                       "\n, still use " +
                                       ((CurrentLang.isEmpty()) ? "english" : CurrentLang));
-
+                qApp->installTranslator(&translator);
                 return;
             }
-
+            qApp->installTranslator(&translator);
             CurrentLang = l;
-
-            if (CurrentTranslation == 0) {
-                CurrentTranslation = new Q3Dict<QString>(997);
-                CurrentTranslation->setAutoDelete(TRUE);
-            }
-            else
-                CurrentTranslation->clear();
-
-            int len, c, i;
-
-            while ((len = fgetc(fp)) != EOF) {
-                len += (fgetc(fp) << 8);
-
-                QString en((const QChar *) 0, (unsigned) len);
-
-                for (i = 0; i != len; i += 1) {
-                    c = fgetc(fp);
-
-                    en[i] = QChar(fgetc(fp), c);
-                }
-
-                len = fgetc(fp);
-                len += (fgetc(fp) << 8);
-
-                if (len != 0) {
-                    QString * s = new QString((QChar *) 0, (unsigned) len); //[lgfreitas] why the const was here?
-
-                    for (i = 0; i != len; i += 1) {
-                        c = fgetc(fp);
-                        s->replace(i, 1, QChar(fgetc(fp), c));
-                        //s->at(i) = QChar(fgetc(fp), c); //[lgfreitas] at() now returns const
-                    }
-
-                    CurrentTranslation->insert(en, s);
-                }
-            }
-
-            fclose(fp);
         }
     }
 }
-
+/*
 static void translate(QString & s)
 {
     if (CurrentTranslation == 0)
@@ -211,3 +174,4 @@ QString TR(QString s, QString a1, QString a2, QString a3)
 
     return s;
 }
+*/
diff --git a/src/misc/translate.h b/src/misc/translate.h
index b75039d2f..2a8d0ef95 100644
--- a/src/misc/translate.h
+++ b/src/misc/translate.h
@@ -28,11 +28,11 @@
 #ifndef TRANSLATION_H
 #define TRANSLATION_H
 
-extern QString TR(QString s);
+/*extern QString TR(QString s);
 extern QString TR(QString s, QString a1); // s contains %1
 extern QString TR(QString s, QString a1, QString a2); // s contains %1 and %2
 extern QString TR(QString s, QString a1, QString a2, QString a3); // s contains %1 %2 and %3
-
+*/
 extern QString current_lang();
 extern void set_lang(QString);
 
diff --git a/src/tagmanagement/cpptagmanagement.cpp b/src/tagmanagement/cpptagmanagement.cpp
index 4254ee648..d7efaa9b3 100644
--- a/src/tagmanagement/cpptagmanagement.cpp
+++ b/src/tagmanagement/cpptagmanagement.cpp
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -22,7 +22,7 @@
 //
 // *************************************************************************
 
-#include <q3ptrdict.h>
+//#include <q3ptrdict.h>
 //Added by qt3to4:
 #include <functional>
 #include <QRegExp>
@@ -174,7 +174,7 @@ void CppParamInit(TagTempStructure& updateData, QStringList values)
     int rank = rx.cap().toInt();
     if (rank < values.size())
     {
-        QString v = values[rank].stripWhiteSpace();
+        QString v = values[rank].trimmed();
 
         if (! v.isEmpty())
             updateData.s += " = " + v;
@@ -275,7 +275,7 @@ void SetupManagerStruct(TagManagers::TagTempStructure& tempStruct, OperationData
     QStringList list;
     BrowserClass::instances(nodes);
     nodes.full_names(list);
-    QString name = static_cast<BrowserOperation*>(oper->get_browser_node())->compute_name(oper->get_cpp_name_spec());
+    QString name = static_cast<BrowserOperation*>(oper->get_browser_node())->compute_name(oper->get_cpp_name_spec().toLatin1().constData());
     // got all necessary data
 
     using namespace TagManagers::Cpp;
@@ -312,7 +312,8 @@ QString updated_def(OperationData* oper)
 
 
         tempStruct.def = oper->get_cppdef();
-        tempStruct.p = tempStruct.def;
+        QByteArray defArray = tempStruct.def.toLatin1();
+        tempStruct.p = defArray.constData();
         tempStruct.pp = 0;
 
         tempStruct.indent = "";
diff --git a/src/tool/Socket.h b/src/tool/Socket.h
index ce27c9c4d..6f66a62e1 100644
--- a/src/tool/Socket.h
+++ b/src/tool/Socket.h
@@ -28,29 +28,36 @@
 #ifndef SOCKET_H
 #define SOCKET_H
 
-#include <q3socketdevice.h>
+//#include <q3socketdevice.h>
 #include <qsocketnotifier.h>
-
+#include <QTcpSocket>
+#include <QTcpServer>
 class ToolCom;
 
-class Socket : /* public QObject, */ public Q3SocketDevice
+class Server : /* public QObject, */ public QTcpServer
 {
     Q_OBJECT
 
 protected:
     ToolCom * com;
-    QSocketNotifier * notifier;
+    //QSocketNotifier * notifier;
     bool on_error;
 
 public:
-    Socket(ToolCom * c);
-    Socket(ToolCom * c, int s);
-    virtual ~Socket();
+    Server(ToolCom * c);
+    Server(ToolCom * c, int s);
+    virtual ~Server();
 
     bool write_block(char * data, unsigned int len);
 
+    qint64 read(char* buff, qint64 len);
+
 protected slots:
     void data_received();
+private:
+    QTcpSocket *m_socket;
+public slots:
+    void onNewConnection();
 };
 
 #endif
diff --git a/src/tool/Tool.cpp b/src/tool/Tool.cpp
index 4f2e2e864..8243fea69 100644
--- a/src/tool/Tool.cpp
+++ b/src/tool/Tool.cpp
@@ -29,9 +29,9 @@
 
 
 
-#include <q3popupmenu.h>
+//#include <q3popupmenu.h>
 #include <QTextStream>
-#include <q3filedialog.h>
+//#include <q3filedialog.h>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -39,7 +39,9 @@
 #include "myio.h"
 #include "BrowserView.h"
 #include "err.h"
-
+#include <QTextCodec>
+#include <QFileDialog>
+#include <menufactory.h>
 unsigned Tool::ntools;
 ATool * Tool::tools;
 bool Tool::already_read;
@@ -158,46 +160,61 @@ void Tool::defaults()
 
 QList<QString> SetupFailingTools()
 {
-    QSettings settings("settings.ini", QSettings::IniFormat);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
     settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
     return settings.value("Failing_Tools/Tools").toString().split(",");
 }
 
-bool Tool::menu_insert(Q3PopupMenu * tool, UmlCode target,
+bool Tool::menu_insert(QMenu * tool, UmlCode target,
                        const QObject * receiver, const char * member)
 {
     unsigned index;
     bool first = TRUE;
-
+    QAction *action;
     static QList<QString> failingTools = SetupFailingTools();
 
     for (index = 0; index != ntools; index += 1) {
-        if (tools[index].applicable[target] && !failingTools.contains(tools[index].display)) {
+        if (tools[index].applicable[target]
+        #ifdef habip
+                && !failingTools.contains(tools[index].display)
+        #endif
+                ) {
             if (first) {
-                tool->insertSeparator();
+                tool->addSeparator();
                 first = FALSE;
             }
-
-            tool->setItemParameter(tool->insertItem(tools[index].display,
-                                                    receiver, member),
-                                   index);
+            action = tool->addAction(tools[index].display);//new QAction(tools[index].display, tool);
+            action->setData(index);
+            QObject::connect(action, SIGNAL(triggered()), receiver, member);
+            action->setData(index);
+            //tool->addAction(action);
+            //tool->setItemParameter(tool->insertItem(tools[index].display,
+            //                                        receiver, member),
+            //                       index);
         }
     }
 
     return !first;
 }
 
-bool Tool::menu_insert(Q3PopupMenu * tool, UmlCode target, int first_id)
+bool Tool::menu_insert(QMenu * tool, UmlCode target, int first_id)
 {
     unsigned index;
     bool have = FALSE;
-
+    QAction *action;
     static QList<QString> failingTools = SetupFailingTools();
 
     for (index = 0; index != ntools; index += 1) {
-        if (tools[index].applicable[target] && !failingTools.contains(tools[index].display)) {
+        if (tools[index].applicable[target]
+        #ifdef habip
+                && !failingTools.contains(tools[index].display)
+        #endif
+                ) {
             have = TRUE;
-            tool->insertItem(tools[index].display, first_id + index);
+            action = new QAction(tools[index].display,tool);
+            action->setData(first_id + index);
+            tool->addAction(action);
+            //tool->insertItem(tools[index].display, first_id + index);
         }
     }
 
@@ -226,7 +243,7 @@ QStringList Tool::all_display()
     for (index = 0; index != ntools; index += 1) {
         QString s = tools[index].display;
 
-        if (r.findIndex(s) == -1)
+        if (r.indexOf(s) == -1)
             r.append(s);
     }
 
@@ -234,20 +251,22 @@ QStringList Tool::all_display()
     return r;
 }
 
-const char * Tool::command(int rank)
+QString Tool::command(int rank)
 {
     return tools[rank].cmd;
 }
 
-const char * Tool::command(const char * d)
+QString Tool::command(QString d)
 {
     unsigned index;
 
     for (index = 0; index != ntools; index += 1)
-        if (strcmp(d, tools[index].display) == 0)
+        if (d == tools[index].display)
+        {
             return tools[index].cmd;
+        }
 
-    return 0;
+    return QString();
 }
 
 void Tool::set_ntools(unsigned n)
@@ -336,11 +355,9 @@ static const struct {
 
 void Tool::save()
 {
-    QSharedPointer<QByteArray> newdef(new QByteArray());
-    QTextStream st(newdef.data(), QIODevice::WriteOnly);
-
-    st.setEncoding(QTextStream::Latin1);
-
+    QString newdef;
+    QTextStream st(&newdef, QIODevice::WriteOnly);
+    st.setCodec(QTextCodec::codecForName("UTF-8"));
     st << "// 'tool' \"the executable\" \"displayed string\" {target}+";
 
     for (unsigned rank = 0; rank != ntools; rank += 1) {
@@ -411,13 +428,13 @@ bool Tool::read(const char * f)
 
 bool Tool::import()
 {
-    QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), "tools");
+    QString fn = QFileDialog::getOpenFileName(0,"tools",last_used_directory());
 
     if (!fn.isEmpty()) {
         set_last_used_directory(fn);
         already_read = FALSE;
         set_ntools(0);
-        return read((const char *) fn);
+        return read((const char *) fn.toLatin1().constData());
     }
 
     return FALSE;
@@ -545,7 +562,7 @@ void Tool::read(char *& st, char *& k, bool new_format)
         tool.cmd = read_string(st);
 
         // fixe ghtml default conf bug
-        int index = tool.cmd.find("ghtml - flat");
+        int index = tool.cmd.indexOf("ghtml - flat");
 
         if (index != -1)
             tool.cmd.remove(index + 7, 1);
diff --git a/src/tool/Tool.h b/src/tool/Tool.h
index 20c0d3ad1..51cb1f3a3 100644
--- a/src/tool/Tool.h
+++ b/src/tool/Tool.h
@@ -31,11 +31,10 @@
 #include <qstring.h>
 //Added by qt3to4:
 #include <QTextStream>
-#include <Q3PopupMenu>
+////#include <QMenu>
 
 #include "UmlEnum.h"
-
-class Q3PopupMenu;
+#include <QMenu>
 class QObject;
 class QTextStream;
 
@@ -62,13 +61,13 @@ class Tool
     static void read(char *& st, char *& k, bool new_format);
 
 public:
-    static bool menu_insert(Q3PopupMenu * tool, UmlCode target,
+    static bool menu_insert(QMenu * tool, UmlCode target,
                             const QObject * receiver, const char * member);
-    static bool menu_insert(Q3PopupMenu * tool, UmlCode target, int first_id);
+    static bool menu_insert(QMenu * tool, UmlCode target, int first_id);
     static void shortcut(QString s, int & choice, UmlCode target, int first_id);
     static QStringList all_display();
-    static const char * command(int rank);
-    static const char * command(const char *);
+    static QString command(int rank);
+    static QString command(QString);
 
     static void save();
     static bool read(const char * = 0);
diff --git a/src/tool/ToolCom.cpp b/src/tool/ToolCom.cpp
index f6eb3e544..5ccead0c5 100644
--- a/src/tool/ToolCom.cpp
+++ b/src/tool/ToolCom.cpp
@@ -35,11 +35,13 @@
 #ifdef DEBUGCOM
 #include <iostream>
 //Added by qt3to4:
-#include <Q3PtrList>
+//
 using namespace std;
 #endif
 #include <QCoreApplication>
 #include <QProcess>
+#include <QDir>
+#include <QDebug>
 #include <qtimer.h>
 #include "ToolCom.h"
 #include "Socket.h"
@@ -56,31 +58,35 @@ using namespace std;
 #include "mu.h"
 #include "err.h"
 #include "Logging/QsLog.h"
-
-Socket::Socket(ToolCom * c)
-    : Q3SocketDevice(Q3SocketDevice::Stream), com(c)
+#include <QHostAddress>
+Server::Server(ToolCom * c)
+    : QTcpServer(c), com(c)
 {
-    setAddressReusable(TRUE);
-    notifier = new QSocketNotifier(socket(), QSocketNotifier::Read);
-    QObject::connect(notifier, SIGNAL(activated(int)),
-                     this, SLOT(data_received()));
+    //setAddressReusable(TRUE);
+    //notifier = new QSocketNotifier(socketDescriptor(), QSocketNotifier::Read);
+    //QObject::connect(notifier, SIGNAL(activated(int)),
+      //               this, SLOT(data_received()));
+    connect(this, SIGNAL(newConnection()), this, SLOT(onNewConnection()));
 }
 
-Socket::Socket(ToolCom * c, int s)
-    : Q3SocketDevice(s, Q3SocketDevice::Stream), com(c)
+Server::Server(ToolCom * c, int s)
+    : QTcpServer(c), com(c)
 {
-    setAddressReusable(TRUE);
-    notifier = new QSocketNotifier(s, QSocketNotifier::Read);
-    QObject::connect(notifier, SIGNAL(activated(int)),
-                     this, SLOT(data_received()));
+
+        setSocketDescriptor(s);
+    //setAddressReusable(TRUE);
+    //notifier = new QSocketNotifier(s, QSocketNotifier::Read);
+    //QObject::connect(notifier, SIGNAL(activated(int)),
+       //              this, SLOT(data_received()));
+    connect(this, SIGNAL(newConnection()), this, SLOT(onNewConnection()));
 }
 
-Socket::~Socket()
+Server::~Server()
 {
-    delete notifier;
+    //delete notifier;
 }
 
-bool Socket::write_block(char * data, unsigned int len)
+bool Server::write_block(char * data, unsigned int len)
 {
     /* the four first bytes of data are free to contains the length
      these are taken into account by len */
@@ -92,36 +98,45 @@ bool Socket::write_block(char * data, unsigned int len)
 
 #ifdef DEBUGCOM
     QLOG_INFO() << "ToolCom write " << len << "bytes\n";
-#endif
-
     QLOG_INFO() << QByteArray(data, len);
+#endif
     len += 4;
 
     for (;;) {
-        int sent = writeBlock(data, len);
+        qint64 sent = m_socket->write(data, len);
 
         if (sent == -1)
             return FALSE;
         else if ((len -= sent) == 0) {
-            flush();
+            m_socket->flush();
             return TRUE;
         }
         else {
-            waitForMore(100);
+            m_socket->waitForReadyRead(100);
             data += sent;
         }
     }
 }
 
-void Socket::data_received()
+qint64 Server::read(char *buff, qint64 len)
+{
+    return m_socket->read(buff, len);
+}
+
+void Server::data_received()
+{
+    com->data_received(this);
+}
+
+void Server::onNewConnection()
 {
     com->data_received(this);
 }
 
 //
 
-Q3PtrList<ToolCom> ToolCom::used;
-Q3PtrList<ToolCom> ToolCom::unused;
+QList<ToolCom *> ToolCom::used;
+QList<ToolCom *> ToolCom::unused;
 int ToolCom::exitvalue;
 
 ToolCom::ToolCom()
@@ -152,22 +167,20 @@ ToolCom::~ToolCom()
     DisconnectExternalProcess();
 }
 
-int ToolCom::run(const char * cmd, BrowserNode * bn,
+int ToolCom::run(QString cmd, BrowserNode * bn,
                  bool exit, bool clr, void (*pf)())
 {
     QLOG_TRACE() << Q_FUNC_INFO << " called";
 
     if (exit)
         exitvalue = -1;
-
     TraceDialog::trace_auto_raise(TRUE);
 
     if (clr)
         TraceDialog::clear();
-
     ToolCom * com = (unused.isEmpty())
             ? new ToolCom
-            : unused.take(0);
+            : unused.takeFirst();
 
     com->DisconnectExternalProcess();
 
@@ -182,15 +195,15 @@ int ToolCom::run(const char * cmd, BrowserNode * bn,
     com->cont = pf;
 
     com->exit_bouml = exit;
-    com->cmd = strdup(cmd);
+    com->cmd = strdup(cmd.toLatin1().constData());
     com->timer = new QTimer(com);
     connect(com->timer, SIGNAL(timeout()), com, SLOT(connexion_timeout()));
-    com->timer->start(30 * 10000, TRUE);
+    com->timer->start(30 * 10000);
 
     unsigned port = com->bind(1024);
 
-
-    QStringList commandList = QString(cmd).split(" ");
+    qDebug() << QDir::currentPath();
+    QStringList commandList = cmd.split(" ");
     QString command = commandList.at(0);
     commandList.removeAt(0);
     com->externalProcess = new QProcess();
@@ -200,9 +213,17 @@ int ToolCom::run(const char * cmd, BrowserNode * bn,
     QStringList arguments;
     arguments.append(commandList << QString::number(port));
     com->exitStaged = exit;
+#ifdef Q_OS_UNIX
+    qDebug() << QCoreApplication::applicationDirPath() + "/" + command;
+    com->externalProcess->start(QCoreApplication::applicationDirPath() + "/" + command, arguments);
+#endif
+#ifdef Q_OS_WIN
+#ifndef _RUN_PLUGOUT_EXTERNAL_
     com->externalProcess->start(command, arguments);
+#endif
+#endif
+    qDebug() << "error was:" << com->externalProcess->error();
     com->start = TRUE;
-
     return com->id;
 }
 
@@ -213,10 +234,8 @@ int exit_value()
 
 bool ToolCom::is_running(int id)
 {
-    Q3PtrListIterator<ToolCom> it(used);
-
-    for (; it.current(); ++it)
-        if (it.current()->id == id)
+    foreach (ToolCom *item, used)
+        if (item->id == id)
             return TRUE;
 
     return FALSE;
@@ -224,7 +243,7 @@ bool ToolCom::is_running(int id)
 
 unsigned ToolCom::bind(unsigned port)
 {
-    listen_sock = new Socket(this);
+    listen_sock = new Server(this);
 
     if (buffer_in_size == 0) {
         buffer_in_size = 1024;
@@ -242,14 +261,11 @@ unsigned ToolCom::bind(unsigned port)
 
     ha.setAddress("127.0.0.1");
 
-    if (listen_sock->bind(ha, 0))
-        port = listen_sock->port();
+    if (listen_sock->listen(ha, 5000))
+        port = listen_sock->serverPort();
     else
-        while (!listen_sock->bind(ha, port))
+        while (!listen_sock->listen(ha, port))
             port += 1;
-
-    listen_sock->listen(1);
-
     return port;
 }
 
@@ -266,15 +282,15 @@ void ToolCom::close()
             cmd = 0;
         }
 
-        delete listen_sock;
-        listen_sock = 0;
-
         if (sock != 0) {
-            delete sock;
+            sock->deleteLater();
             sock = 0;
         }
+        listen_sock->deleteLater();
+        listen_sock = 0;
 
-        used.remove(this);
+
+        used.removeOne(this);
         unused.append(this);
     }
 }
@@ -291,7 +307,7 @@ const char * ToolCom::read_buffer()
     {
         char s[4];
 
-        while ((sock->readBlock(s, 4) != 4));
+        while ((sock->read(s, 4) != 4));
 
         const char * p = s;
 
@@ -307,7 +323,7 @@ const char * ToolCom::read_buffer()
         buffer_in = new char[buffer_in_size];
     }
 
-    int nread = sock->readBlock(buffer_in + already_read, wanted);
+    qint64 nread = sock->read(buffer_in + already_read, wanted);
 
     if (nread == -1) {
         fatal_error("ToolCom read error");
@@ -418,9 +434,9 @@ void ToolCom::skip_type(const char *& p)
 
 //
 
-void ToolCom::check_size_out(unsigned n)
+void ToolCom::check_size_out(size_t n)
 {
-    unsigned used = p_buffer_out - buffer_out;
+    ptrdiff_t used = p_buffer_out - buffer_out;
 
     if ((used + n) >= buffer_out_size) {
         buffer_out_size = used + n + 1024;
@@ -469,9 +485,9 @@ void ToolCom::write_id(void * id)
 #endif
 }
 
-void ToolCom::write_id(BrowserNode * bn, char k, const char * s)
+void ToolCom::write_id(BrowserNode * bn, char k, QString s)
 {
-    unsigned ln = strlen(s) + 1;
+    size_t ln = strlen(s.toLatin1().constData()) + 1;
 
     check_size_out(ln + 2 + sizeof(void *));
 
@@ -487,7 +503,7 @@ void ToolCom::write_id(BrowserNode * bn, char k, const char * s)
         k -= 7;
 
     p_buffer_out[sizeof(void *) + 1] = k;
-    memcpy(p_buffer_out + sizeof(void *) + 2, s, ln);
+    memcpy(p_buffer_out + sizeof(void *) + 2, s.toLatin1().constData(), ln);
 
     ToolCom::p_buffer_out += ln + 2 + sizeof(void *);
 #ifdef DEBUGCOM
@@ -512,7 +528,7 @@ void ToolCom::write_string(const char * p)
         // from a QString()
         p = "";
 
-    int len = strlen(p) + 1;
+    size_t len = strlen(p) + 1;
 
     check_size_out(len);
     memcpy(p_buffer_out, p, len);
@@ -572,7 +588,6 @@ void ToolCom::connexion_timeout()
     msg_critical("Douml",
                  QString("connexion timeout for '") + QString(cmd) + QString("'"));
     close();
-
     if (exit_bouml) {
         BrowserView::remove_temporary_files();
         set_user_id(-1);    // delete lock
@@ -581,26 +596,27 @@ void ToolCom::connexion_timeout()
     }
 }
 
-void ToolCom::data_received(Socket * who)
+void ToolCom::data_received(Server * who)
 {
     bool do_exit = FALSE;
     void (*pf)() = 0;
 
     if (who == listen_sock) {
         if (sock == 0) {
-            int s = listen_sock->accept();
-
-#ifdef DEBUGCOM
-            QLOG_INFO() << "ToolCom::connexion() accept ok " << s << '\n';
-#endif
+               // int s = listen_sock->socketDescriptor();
 
-            if (s != -1) {
+            if (who->hasPendingConnections()) {
                 if (timer != 0) {
                     delete timer;
                     timer = 0;
                 }
 
-                sock = new Socket(this, s);
+
+                sock = who->nextPendingConnection();//new Server(this, s);
+                connect(sock, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
+#ifdef DEBUGCOM
+            QLOG_INFO() << "ToolCom::connexion() accept ok " << sock->socketDescriptor() << '\n';
+#endif
                 return;
             }
         }
@@ -622,7 +638,6 @@ void ToolCom::data_received(Socket * who)
             if (start) {
                 // plug-out start, get API version
                 start = FALSE;
-
                 api_version = get_unsigned(p);
                 if (api_version < 11) {
                     TraceDialog::add("<font color =\"red\"><b>the plug-out was written for a BDUML release less or equal to 1.5<b></font>");
@@ -748,17 +763,16 @@ void ToolCom::data_received(Socket * who)
                         break;
 
                     case allMarkedCmd: {
-                        Q3PtrList<BrowserNode> marked = BrowserNode::marked_nodes();
+                        QList<BrowserNode *> marked = BrowserNode::marked_nodes();
                         unsigned n = 0;
-                        BrowserNode * bn;
 
-                        for (bn = marked.first(); bn != 0; bn = marked.next())
+                        foreach (BrowserNode *bn, marked)
                             if (bn->api_compatible(api_format(true)))
                                 n += 1;
 
                         write_unsigned(n);
 
-                        for (bn = marked.first(); bn != 0; bn = marked.next())
+                        foreach (BrowserNode *bn, marked)
                             if (bn->api_compatible(api_format(true)))
                                 bn->write_id(this);
                     }
@@ -939,8 +953,8 @@ void ToolCom::data_received(Socket * who)
                     throw 0;
                 }
 
-                if (sock && (p_buffer_out != buffer_out + 4)) {
-                    if (!sock->write_block(buffer_out, p_buffer_out - buffer_out))
+                    if (sock && (p_buffer_out != buffer_out + 4)) {
+                    if (!write_block(buffer_out, p_buffer_out - buffer_out))
                         fatal_error("write error");
                     else {
                         p_buffer_out = buffer_out + 4/*bytes for length*/;
@@ -954,14 +968,12 @@ void ToolCom::data_received(Socket * who)
 
         POST_TRY;
     }
-
     if (do_exit) {
         BrowserView::remove_temporary_files();
         set_user_id(-1);    // delete lock
 
         THROW_ERROR 0;
     }
-
     if (pf != 0)
         pf();
 }
@@ -970,7 +982,7 @@ void ToolCom::processFinished()
 {
     QLOG_TRACE() << "Disconnecting external process signals";
 
-    if (errno != 0) {
+    /*if (errno != 0) {
         msg_critical("Douml",
                      "error while executing '" + QString(cmd) + "'\n"
                      "perhaps you must specify its absolute path"
@@ -985,9 +997,14 @@ void ToolCom::processFinished()
         }
 
         //else
-    }
+    }*/
 
+}
 
+void ToolCom::onReadyRead()
+{
+        while(sock&&sock->bytesAvailable())
+            data_received(NULL);
 }
 
 void ToolCom::DisconnectExternalProcess()
@@ -1000,3 +1017,35 @@ void ToolCom::DisconnectExternalProcess()
     }
 }
 
+bool ToolCom::write_block(char * data, size_t len)
+{
+    /* the four first bytes of data are free to contains the length
+     these are taken into account by len */
+    len -= 4;
+    data[0] = len >> 24;
+    data[1] = len >> 16;
+    data[2] = len >> 8;
+    data[3] = len;
+
+#ifdef DEBUGCOM
+    QLOG_INFO() << "ToolCom write " << len << "bytes\n";
+#endif
+
+    QLOG_INFO() << QByteArray(data, len).toHex();
+    len += 4;
+
+    for (;;) {
+        qint64 sent = sock->write(data, len);
+
+        if (sent == -1)
+            return FALSE;
+        else if ((len -= sent) == 0) {
+            sock->flush();
+            return TRUE;
+        }
+        else {
+            sock->waitForBytesWritten(100);
+            data += sent;
+        }
+    }
+}
diff --git a/src/tool/ToolCom.h b/src/tool/ToolCom.h
index 59d45f2ca..3d697e6b0 100644
--- a/src/tool/ToolCom.h
+++ b/src/tool/ToolCom.h
@@ -29,27 +29,27 @@
 #define TOOLCOM_H
 
 #include <qobject.h>
-#include <q3ptrlist.h>
+//
 #include <QProcess>
 //Added by qt3to4:
-#include <Q3PtrList>
-
+//
 #include "BrowserNode.h"
 #include <QSettings>
 #include "../Tools/ApiCmd.h"
+#include <QTextCodec>
+#include <QTcpSocket>
 
-class Socket;
+class Server;
 class AType;
 class QRect;
 class QTimer;
-
 class ToolCom  : public QObject
 {
     Q_OBJECT
 
 protected:
-    static Q3PtrList<ToolCom> used;
-    static Q3PtrList<ToolCom> unused;
+    static QList<ToolCom *> used;
+    static QList<ToolCom *> unused;
     static int exitvalue;
 
     bool start;
@@ -61,25 +61,25 @@ class ToolCom  : public QObject
     bool exit_bouml;
     BrowserNode * target;
     void (*cont)();
-    Socket * listen_sock;
-    Socket * sock;
+    Server * listen_sock;
+    QTcpSocket * sock;
     QTimer * timer;
     char * cmd;
     unsigned api_version;
     int id;		// for UmlBaseItem::isToolRunning
-    unsigned wanted;
-    int already_read;
+    size_t wanted;
+    size_t already_read;
     char * buffer_in;
-    unsigned buffer_in_size;
+    size_t buffer_in_size;
     char * buffer_out;
     char * p_buffer_out;
-    unsigned buffer_out_size;
+    size_t buffer_out_size;
     QProcess * externalProcess;
     ToolCom();
 
 
     void DisconnectExternalProcess();
-    void check_size_out(unsigned n);
+    void check_size_out(size_t n);
     const char * read_buffer();
 
     unsigned bind(unsigned port);
@@ -89,7 +89,7 @@ class ToolCom  : public QObject
 
 public:
     unsigned api_format(bool trueFormat = false) const {
-        QSettings settings("settings.ini", QSettings::IniFormat);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings");
         settings.setIniCodec(QTextCodec::codecForName("UTF-8"));
         if((settings.value("Main/compatibility_save") .toInt() != 1) || trueFormat)
             return api_version;
@@ -98,12 +98,12 @@ class ToolCom  : public QObject
     }
     virtual ~ToolCom();
 
-    static int run(const char * cmd, BrowserNode *,
+    static int run(QString cmd, BrowserNode *,
                    bool exit = FALSE, bool clr = TRUE,
                    void (*pf)() = 0);
     friend int exit_value();
 
-    void data_received(Socket * who);
+    void data_received(Server * who);
 
     unsigned get_unsigned(const char *& p);
     bool get_bool(const char *& p);
@@ -119,7 +119,7 @@ class ToolCom  : public QObject
 
     void write_unsigned(unsigned u);
     void write_bool(bool);
-    void write_id(BrowserNode * bn, char kind, const char * name);
+    void write_id(BrowserNode * bn, char kind, QString name);
     void write_id(void * id);
     void write_string(QString str);
     void write_string(WrapperStr str);
@@ -131,12 +131,14 @@ class ToolCom  : public QObject
 
     static void close_all();
 
+    bool write_block(char *data, size_t len);
 signals:
     void closed();
 
 public slots:
     void connexion_timeout();
     void processFinished();
+     void onReadyRead();
 };
 
 #endif
diff --git a/src/tool/snippets.h b/src/tool/snippets.h
new file mode 100644
index 000000000..9d30a3fae
--- /dev/null
+++ b/src/tool/snippets.h
@@ -0,0 +1,13 @@
+#ifndef _SNIPPETS_H
+#define _SNIPPETS_H
+#include <array>
+// some really insane code from stackoverflow that allows to shorten lengthy ifs
+template <typename T0, typename T1, std::size_t N>
+bool operator *(const T0& lhs, const std::array<T1, N>& rhs) {
+    return std::find(begin(rhs), end(rhs), lhs) != end(rhs);
+}
+
+template<class T0, class...T> std::array<T0, 1+sizeof...(T)> in(T0 arg0, T...args) {
+    return {{arg0, args...}};
+}
+#endif
diff --git a/src/translations/deDE.qm b/src/translations/deDE.qm
new file mode 100644
index 000000000..1494556e8
Binary files /dev/null and b/src/translations/deDE.qm differ
diff --git a/src/translations/deDE.ts b/src/translations/deDE.ts
new file mode 100644
index 000000000..b7e296fe4
--- /dev/null
+++ b/src/translations/deDE.ts
@@ -0,0 +1,17615 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../dialog/About.cpp" line="+45"/>
+        <source>About DoUML</source>
+        <translation type="unfinished">About DoUML</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+</context>
+<context>
+    <name>AccessVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+1083"/>
+        <location line="+37"/>
+        <source>variable - Ocl</source>
+        <translation type="unfinished">variable - Ocl</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <source>class : </source>
+        <translation type="unfinished">Klasse : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>variable :</source>
+        <translation type="unfinished">variable :</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Choose variable selected in browser</source>
+        <translation type="unfinished">Choose variable selected in browser</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Create attribute and choose it</source>
+        <translation type="unfinished">Create attribute and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityActionCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityActionCanvas.cpp" line="+861"/>
+        <source>Add pin</source>
+        <translation type="unfinished">Pin hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity action</source>
+        <translation type="unfinished">Aktivitätsaktion bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select %1 in browser</source>
+        <translation type="unfinished">%1 in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set associated diagram from behavior</source>
+        <translation type="unfinished">Set associated diagram from behavior</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <location line="+31"/>
+        <source>show opaque definition</source>
+        <translation type="unfinished">show opaque definition</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+31"/>
+        <source>action color</source>
+        <translation type="unfinished">Farbe (Aktion)</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityActionDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-1141"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity Action dialog</source>
+        <translation type="unfinished">Activity Action dialog</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>kind : </source>
+        <translation type="unfinished">kind : </translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+13"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+145"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityCanvas.cpp" line="+628"/>
+        <source>Add parameter</source>
+        <translation type="unfinished">Parameter hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity</source>
+        <translation type="unfinished">Edit activity</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <location line="+31"/>
+        <source>show conditions</source>
+        <translation type="unfinished">show conditions</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+31"/>
+        <source>drawing language</source>
+        <translation type="unfinished">drawing language</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+31"/>
+        <source>activity color</source>
+        <translation type="unfinished">Farbe (Aktivität)</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+8"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDiagramView</name>
+    <message>
+        <location filename="../diagram/ActivityDiagramView.cpp" line="+85"/>
+        <source>Activity diagram menu</source>
+        <translation type="unfinished">Activity diagram menu</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <location line="+29"/>
+        <location line="+31"/>
+        <location line="+60"/>
+        <location line="+28"/>
+        <location line="+31"/>
+        <location line="+182"/>
+        <location line="+19"/>
+        <location line="+24"/>
+        <location line="+24"/>
+        <location line="+24"/>
+        <location line="+20"/>
+        <source>already drawn</source>
+        <translation type="unfinished">bereits gezeichnet</translation>
+    </message>
+    <message>
+        <location line="-184"/>
+        <location line="+264"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="-260"/>
+        <source>Draw activity</source>
+        <translation type="unfinished">Aktivität zeichnen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add a call behavior</source>
+        <translation type="unfinished">Add a call behavior</translation>
+    </message>
+    <message>
+        <location line="+260"/>
+        <source>Add a read variable value action</source>
+        <translation type="unfinished">Add a read variable value action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a clear variable value action</source>
+        <translation type="unfinished">Add a clear variable value action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a write variable value action</source>
+        <translation type="unfinished">Add a write variable value action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a add variable value action</source>
+        <translation type="unfinished">Add a add variable value action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a remove variable value action</source>
+        <translation type="unfinished">Add a remove variable value action</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ActivityDiagramWindow.cpp" line="+128"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Package</source>
+        <translation type="unfinished">Neues Paket</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Fragment</source>
+        <translation type="unfinished">New Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Activity</source>
+        <translation type="unfinished">Neue Aktivität</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Interruptible Activity Region</source>
+        <translation type="unfinished">Neuer unterbrechbarer Aktivitätsbereich</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>New Expansion Region</source>
+        <translation type="unfinished">Neuer Erweiterungsbereich</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>New Activity Partition</source>
+        <translation type="unfinished">Neue Partition</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>New Action</source>
+        <translation type="unfinished">Neue Aktion</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Object Node</source>
+        <translation type="unfinished">Neuer Objektknoten</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Initial node</source>
+        <translation type="unfinished">New Initial node</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Activity Final</source>
+        <translation type="unfinished">New Activity Final</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Flow Final</source>
+        <translation type="unfinished">New Flow Final</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Merge</source>
+        <translation type="unfinished">New Merge</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Decision</source>
+        <translation type="unfinished">New Decision</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Fork</source>
+        <translation type="unfinished">New Fork</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Join</source>
+        <translation type="unfinished">New Join</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Flow</source>
+        <translation type="unfinished">New Flow</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Abhängigkeit</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Notiz</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anker</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDialog</name>
+    <message>
+        <location filename="../dialog/ActivityDialog.cpp" line="+64"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity dialog</source>
+        <translation type="unfinished">Activity dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>specification :</source>
+        <translation type="unfinished">specification :</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>read only</source>
+        <translation type="unfinished">nur lesender Zugriff</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>single execution</source>
+        <translation type="unfinished">single execution</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>active</source>
+        <translation type="unfinished">aktiv</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+14"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Pre
+condition : </source>
+        <translation type="unfinished">Pre
+condition : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Post
+condition : </source>
+        <translation type="unfinished">Post
+condition : </translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityNodeCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityNodeCanvas.cpp" line="+481"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">draw vertically</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">draw horizontally</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit activity node</source>
+        <translation type="unfinished">Edit activity node</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityObjectCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityObjectCanvas.cpp" line="+516"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity object</source>
+        <translation type="unfinished">Aktivitätsobjekt bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Klasse in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <location line="+33"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">write name:type 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+33"/>
+        <source>activity object color</source>
+        <translation type="unfinished">activity object color</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityObjectDialog</name>
+    <message>
+        <location filename="../dialog/ActivityObjectDialog.cpp" line="+66"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>name :</source>
+        <translation type="unfinished">Name :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>multiplicity : </source>
+        <translation type="unfinished">multiplicity : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordering : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>in state : </source>
+        <translation type="unfinished">in state : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>is control</source>
+        <translation type="unfinished">is control</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+94"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>selection : </source>
+        <translation type="unfinished">Auswahl : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityPartitionCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityPartitionCanvas.cpp" line="+414"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">draw vertically</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">draw horizontally</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity partition</source>
+        <translation type="unfinished">Partition bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+154"/>
+        <location line="+25"/>
+        <source>activity partition color</source>
+        <translation type="unfinished">Farbe (Partition)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityPartitionDialog</name>
+    <message>
+        <location filename="../dialog/ActivityPartitionDialog.cpp" line="+61"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity Partition dialog</source>
+        <translation type="unfinished">Activity Partition dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>represents :</source>
+        <translation type="unfinished">represents :</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>is dimension</source>
+        <translation type="unfinished">is dimension</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>is external</source>
+        <translation type="unfinished">is external</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose element selected in browser</source>
+        <translation type="unfinished">Choose element selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose element marked in browser</source>
+        <translation type="unfinished">Choose element marked in browser</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>AddVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+924"/>
+        <source>replace all</source>
+        <translation type="unfinished">alle ersetzen</translation>
+    </message>
+</context>
+<context>
+    <name>AnnotationDialog</name>
+    <message>
+        <location filename="../dialog/AnnotationDialog.cpp" line="+72"/>
+        <source>
+To add an annotation at the cursor position
+you may select it in the list and press &apos;add&apos;
+</source>
+        <translation type="unfinished">
+To add an annotation at the cursor position
+you may select it in the list and press &apos;add&apos;
+</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add </source>
+        <translation type="unfinished">Hinzufügen </translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">S&amp;chliessen</translation>
+    </message>
+</context>
+<context>
+    <name>ArrowCanvas</name>
+    <message>
+        <location filename="../diagram/ArrowCanvas.cpp" line="+861"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>a relation can&apos;t have a relation</source>
+        <translation type="unfinished">a relation can&apos;t have a relation</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>stereotype/label dialog</source>
+        <translation type="unfinished">stereotype/label dialog</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>label : </source>
+        <translation type="unfinished">Beschriftung : </translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>line</source>
+        <translation type="unfinished">Zeile</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Select stereotype and label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Default stereotype and label position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach label to this segment</source>
+        <translation type="unfinished">Attach label to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attach stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometrie (Strg+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>None</source>
+        <translation type="unfinished">(leer)</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Recenter begin</source>
+        <translation type="unfinished">Recenter begin</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Recenter end</source>
+        <translation type="unfinished">Recenter end</translation>
+    </message>
+</context>
+<context>
+    <name>ArrowJunctionCanvas</name>
+    <message>
+        <location filename="../diagram/ArrowJunctionCanvas.cpp" line="+217"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ArtifactCanvas</name>
+    <message>
+        <location filename="../diagram/ArtifactCanvas.cpp" line="+578"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit artifact</source>
+        <translation type="unfinished">Edit artifact</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Generate</source>
+        <translation type="unfinished">Codeerzeugung</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <location line="+34"/>
+        <source>artifact</source>
+        <translation type="unfinished">artifact</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+25"/>
+        <source>artifact color</source>
+        <translation type="unfinished">artifact color</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+8"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">nur lesender Zugriff</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>illegal for a source artifact</source>
+        <translation type="unfinished">illegal for a source artifact</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+14"/>
+        <location line="+6"/>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ArtifactDialog</name>
+    <message>
+        <location filename="../dialog/ArtifactDialog.cpp" line="+68"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>artifact dialog</source>
+        <translation type="unfinished">artifact dialog</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+58"/>
+        <location line="+47"/>
+        <location line="+61"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-349"/>
+        <source>Default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Header file 
+definition : </source>
+        <translation type="unfinished">Header file 
+definition : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+47"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Standarddefinition</translation>
+    </message>
+    <message>
+        <location line="-292"/>
+        <location line="+47"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Nicht in C++ generiert</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+47"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Result after
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-285"/>
+        <source>C++ header</source>
+        <translation type="unfinished">C++ header</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Source file 
+definition : </source>
+        <translation type="unfinished">Source file 
+definition : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>C++ source</source>
+        <translation type="unfinished">C++ source</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>File 
+definition : </source>
+        <translation type="unfinished">File 
+definition : </translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Nicht in Java generiert</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Java source</source>
+        <translation type="unfinished">Java source</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Php source</source>
+        <translation type="unfinished">Php source</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Python source</source>
+        <translation type="unfinished">Python source</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Not generated in Idl</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Idl source</source>
+        <translation type="unfinished">Idl source</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Classes without artifact</source>
+        <translation type="unfinished">Classes without artifact</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+46"/>
+        <source>Associated classes</source>
+        <translation type="unfinished">Associated classes</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>go up</source>
+        <translation type="unfinished">hoch</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>go down</source>
+        <translation type="unfinished">runter</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Stereotype filtering  </source>
+        <translation type="unfinished">Stereotype filtering  </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Unassociated artifacts</source>
+        <translation type="unfinished">Unassociated artifacts</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+7"/>
+        <source>Associated artifacts</source>
+        <translation type="unfinished">Associated artifacts</translation>
+    </message>
+    <message>
+        <location line="+1234"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>AssocContainCanvas</name>
+    <message>
+        <location filename="../diagram/AssocContainCanvas.cpp" line="+87"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Select stereotype and label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Default stereotype and label position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach label to this segment</source>
+        <translation type="unfinished">Attach label to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attach stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometrie (Strg+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AttributeDialog</name>
+    <message>
+        <location filename="../dialog/AttributeDialog.cpp" line="+75"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Enum item dialog</source>
+        <translation type="unfinished">Enum item dialog</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Attribute dialog</source>
+        <translation type="unfinished">Attribute dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>class : </source>
+        <translation type="unfinished">Klasse : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>name :</source>
+        <translation type="unfinished">Name :</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">Stereotyp :</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>    multiplicity :  </source>
+        <translation type="unfinished">    multiplicity :  </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>initial value :</source>
+        <translation type="unfinished">initial value :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>value :</source>
+        <translation type="unfinished">Wert :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+77"/>
+        <location line="+20"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-63"/>
+        <source>read-only</source>
+        <translation type="unfinished">nur-lesen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>derived</source>
+        <translation type="unfinished">derived</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordered</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Visibility :</source>
+        <translation type="unfinished">Sichtbarkeit :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>follow uml</source>
+        <translation type="unfinished">follow uml</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+59"/>
+        <location line="+71"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Declaration :</source>
+        <translation type="unfinished">Deklaration :</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+59"/>
+        <location line="+71"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Result after
+substitution :</source>
+        <translation type="unfinished">Result after
+substitution :</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+70"/>
+        <location line="+60"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Standarddeklaration</translation>
+    </message>
+    <message>
+        <location line="-248"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Nicht in C++ generiert</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Default item declaration</source>
+        <translation type="unfinished">Default item declaration</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+188"/>
+        <source>Default attribute declaration</source>
+        <translation type="unfinished">Default attribute declaration</translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Nicht in Java generiert</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Show annotation</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Edit annotation</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <source>Default state declaration</source>
+        <translation type="unfinished">Default state declaration</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Default constant declaration</source>
+        <translation type="unfinished">Default constant declaration</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Not generated in Idl</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>BasicDialog</name>
+    <message>
+        <location filename="../dialog/BasicDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source> dialog</source>
+        <translation type="unfinished"> dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserItemNameValidator</name>
+    <message>
+        <location filename="../browser/BrowserNode.cpp" line="+138"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserSearchDialog</name>
+    <message>
+        <location filename="../dialog/BrowserSearchDialog.cpp" line="+118"/>
+        <source>Browser search</source>
+        <translation type="unfinished">Browser-Suche</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Kind</source>
+        <translation type="unfinished">Gattung</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Containing</source>
+        <translation type="unfinished">Containing</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>case sensitive</source>
+        <translation type="unfinished">Groß-/Kleinschreibung</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>even deleted</source>
+        <translation type="unfinished">even deleted</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>stereotype</source>
+        <translation type="unfinished">Stereotyp</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>description</source>
+        <translation type="unfinished">Beschreibung</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>declaration/definition/body</source>
+        <translation type="unfinished">declaration/definition/body</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Result</source>
+        <translation type="unfinished">Ergebnis</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Search</source>
+        <translation type="unfinished">Suche</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Markierung aufheben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mark them</source>
+        <translation type="unfinished">Mark them</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Alle Markierungen aufheben</translation>
+    </message>
+</context>
+<context>
+    <name>BuiltinTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsBuiltinTable.cpp" line="+99"/>
+        <location line="+8"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Uml/Cpp/Java/Idl fields cannot be empty</source>
+        <translation type="unfinished">Uml/Cpp/Java/Idl fields cannot be empty</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Duplicate Uml entries are not allowed</source>
+        <translation type="unfinished">Duplicate Uml entries are not allowed</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cpp parameter controls must contain ${type}</source>
+        <translation type="unfinished">Cpp parameter controls must contain ${type}</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Add type</source>
+        <translation type="unfinished">Add type</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Language visibility:</source>
+        <translation type="unfinished">Language visibility:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Search:</source>
+        <translation type="unfinished">Suche:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Copy row</source>
+        <translation type="unfinished">Zeile kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste row</source>
+        <translation type="unfinished">Zeile einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut row</source>
+        <translation type="unfinished">Zeile ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete row</source>
+        <translation type="unfinished">Zeile löschen</translation>
+    </message>
+</context>
+<context>
+    <name>CallBehaviorDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+336"/>
+        <location line="+25"/>
+        <source>behavior - Ocl</source>
+        <translation type="unfinished">behavior - Ocl</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchron</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>behavior :</source>
+        <translation type="unfinished">behavior :</translation>
+    </message>
+</context>
+<context>
+    <name>CallOperationDialog</name>
+    <message>
+        <location line="-320"/>
+        <location line="+46"/>
+        <source>operation - Ocl</source>
+        <translation type="unfinished">operation - Ocl</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchron</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>class : </source>
+        <translation type="unfinished">Klasse : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>operation :</source>
+        <translation type="unfinished">Operation :</translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Create operation and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>CatalogWidget</name>
+    <message>
+        <location filename="../ui/catalogwidget.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Visited</source>
+        <translation type="unfinished">Visited</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Marked</source>
+        <translation type="unfinished">Marked</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Favourites</source>
+        <translation type="unfinished">Favourites</translation>
+    </message>
+    <message>
+        <location filename="../ui/catalogwidget.cpp" line="+301"/>
+        <source>Remove from favourites</source>
+        <translation type="unfinished">Remove from favourites</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Markierung aufheben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Alle Markierungen aufheben</translation>
+    </message>
+</context>
+<context>
+    <name>CdClassCanvas</name>
+    <message>
+        <location filename="../diagram/CdClassCanvas.cpp" line="+1281"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show nesting relation</source>
+        <translation type="unfinished">Show nesting relation</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Individual attribute visibility</source>
+        <translation type="unfinished">Individual attribute visibility</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Individual operation visibility</source>
+        <translation type="unfinished">Individual operation visibility</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit class</source>
+        <translation type="unfinished">Klasse bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+12"/>
+        <source>Add item</source>
+        <translation type="unfinished">Element hinzufügen</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+19"/>
+        <source>Add attribute</source>
+        <translation type="unfinished">Attribut hinzufügen</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Edit item or attribute</source>
+        <translation type="unfinished">Element / Attribut bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+18"/>
+        <source>Add operation</source>
+        <translation type="unfinished">Operation hinzufügen</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Edit item</source>
+        <translation type="unfinished">Element bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Edit attribute</source>
+        <translation type="unfinished">Attribut bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+22"/>
+        <source>Add inherited operation</source>
+        <translation type="unfinished">Geerbte Operartion hinzufügen</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Choose operation</source>
+        <translation type="unfinished">Choose operation</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+2"/>
+        <source>Edit operation</source>
+        <translation type="unfinished">Edit operation</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Generate</source>
+        <translation type="unfinished">Codeerzeugung</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+139"/>
+        <source>class</source>
+        <translation type="unfinished">Klasse</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+31"/>
+        <source>class color</source>
+        <translation type="unfinished">Farbe (Klasse)</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+4"/>
+        <location line="+6"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ChangeVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-199"/>
+        <source>variable - Ocl</source>
+        <translation type="unfinished">variable - Ocl</translation>
+    </message>
+</context>
+<context>
+    <name>ClassDiagramView</name>
+    <message>
+        <location filename="../diagram/ClassDiagramView.cpp" line="+131"/>
+        <source>Class diagram menu</source>
+        <translation type="unfinished">Klassendiagramm-Menü</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add classes of the selected class view</source>
+        <translation type="unfinished">Klassen zur gewählten Klassensicht hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+6"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Add marked elements</translation>
+    </message>
+</context>
+<context>
+    <name>ClassDialog</name>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="+2537"/>
+        <source>Class dialog</source>
+        <translation type="unfinished">Class dialog</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>base type : </source>
+        <translation type="unfinished">base type : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>artifact : </source>
+        <translation type="unfinished">artifact : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+10"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>
+Enter formals in case the class is parameterized
+</source>
+        <translation type="unfinished">
+Enter formals in case the class is parameterized
+</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>
+Specify actuals else formals default value will be used
+</source>
+        <translation type="unfinished">
+Specify actuals else formals default value will be used
+</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <location line="+184"/>
+        <source>Declaration : </source>
+        <translation type="unfinished">Deklaration : </translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <location line="+39"/>
+        <location line="+44"/>
+        <location line="+44"/>
+        <location line="+60"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Result after
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-181"/>
+        <location line="+189"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Standarddeklaration</translation>
+    </message>
+    <message>
+        <location line="-188"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Nicht in C++ generiert</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+42"/>
+        <location line="+47"/>
+        <source>Definition : </source>
+        <translation type="unfinished">Definition : </translation>
+    </message>
+    <message>
+        <location line="-76"/>
+        <location line="+46"/>
+        <location line="+45"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Standarddefinition</translation>
+    </message>
+    <message>
+        <location line="-90"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Nicht in Java generiert</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>switch type : </source>
+        <translation type="unfinished">switch type : </translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Not generated in IDL</source>
+        <translation type="unfinished">Not generated in IDL</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Initialization 
+plug-out :</source>
+        <translation type="unfinished">Initialization 
+plug-out :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+7"/>
+        <source>  parameter(s) : </source>
+        <translation type="unfinished">  parameter(s) : </translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>Check 
+plug-out :</source>
+        <translation type="unfinished">Check 
+plug-out :</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Icon path :</source>
+        <translation type="unfinished">Icon path :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Apply on : </source>
+        <translation type="unfinished">Anwenden auf : </translation>
+    </message>
+    <message>
+        <location line="+795"/>
+        <location line="+6"/>
+        <location line="+9"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>ClassInstanceDialog</name>
+    <message>
+        <location filename="../dialog/ClassInstanceDialog.cpp" line="+134"/>
+        <source>Class instance dialog</source>
+        <translation type="unfinished">Class instance dialog</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">Stereotyp :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>class :</source>
+        <translation type="unfinished">Klasse :</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> Attribute </source>
+        <translation type="unfinished"> Attribut </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> Class </source>
+        <translation type="unfinished"> Klasse </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> Value </source>
+        <translation type="unfinished"> Wert </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Attributes</source>
+        <translation type="unfinished">Attribute</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Relations</source>
+        <translation type="unfinished">Relations</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>Yes</source>
+        <translation type="unfinished">Ja</translation>
+    </message>
+</context>
+<context>
+    <name>ClassListDialog</name>
+    <message>
+        <location filename="../dialog/ClassListDialog.cpp" line="+72"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>ClassSettingsDialog</name>
+    <message>
+        <location filename="../dialog/ClassSettingsDialog.cpp" line="+71"/>
+        <source>Class Settings dialog</source>
+        <translation type="unfinished">Class Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>default attributes visibility : </source>
+        <translation type="unfinished">default attributes visibility : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>default relations visibility : </source>
+        <translation type="unfinished">default relations visibility : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>default operations visibility : </source>
+        <translation type="unfinished">default operations visibility : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>ClassViewDialog</name>
+    <message>
+        <location filename="../dialog/ClassViewDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>class view dialog</source>
+        <translation type="unfinished">class view dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+18"/>
+        <source>deployment
+view : </source>
+        <translation type="unfinished">deployment
+view : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>CodAddMsgDialog</name>
+    <message>
+        <location filename="../dialog/CodAddMsgDialog.cpp" line="+62"/>
+        <source>Add message dialog</source>
+        <translation type="unfinished">Add message dialog</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Add message to %1</source>
+        <translation type="unfinished">Add message to %1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>rank : </source>
+        <translation type="unfinished">rank : </translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Create operation and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>CodChangeMsgDialog</name>
+    <message>
+        <location filename="../dialog/CodChangeMsgDialog.cpp" line="+57"/>
+        <source>Communicationg message dialog</source>
+        <translation type="unfinished">Communicationg message dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Create operation and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>CodClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/CodClassInstCanvas.cpp" line="+238"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Klasse in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Exit from model</source>
+        <translation type="unfinished">Exit from model</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert in model</source>
+        <translation type="unfinished">Insert in model</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace it</source>
+        <translation type="unfinished">Replace it</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">write name:type 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">Eigenschaften von Stereotypen
+anzeigen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">Farbe (Klasseninstanz)</translation>
+    </message>
+</context>
+<context>
+    <name>CodDirsCanvas</name>
+    <message>
+        <location filename="../diagram/CodDirsCanvas.cpp" line="+362"/>
+        <location line="+6"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>CodLinkCanvas</name>
+    <message>
+        <location filename="../diagram/CodLinkCanvas.cpp" line="+125"/>
+        <source>Link</source>
+        <translation type="unfinished">Link</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <source>add messages to </source>
+        <translation type="unfinished">add messages to </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit its messages</source>
+        <translation type="unfinished">Edit its messages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Alle Nachrichten bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometrie (Strg+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+</context>
+<context>
+    <name>CodSelfLinkCanvas</name>
+    <message>
+        <location filename="../diagram/CodSelfLinkCanvas.cpp" line="+278"/>
+        <source>Self link</source>
+        <translation type="unfinished">Self link</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add messages</source>
+        <translation type="unfinished">Add messages</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit its messages</source>
+        <translation type="unfinished">Edit its messages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Alle Nachrichten bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ColDiagramView</name>
+    <message>
+        <location filename="../diagram/ColDiagramView.cpp" line="+110"/>
+        <source>Communication diagram menu</source>
+        <translation type="unfinished">Kommunikationsdiagramm-Menü</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Alle Nachrichten bearbeiten</translation>
+    </message>
+</context>
+<context>
+    <name>ColDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ColDiagramWindow.cpp" line="+78"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Add modeled Class instance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Add Class instance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Link</source>
+        <translation type="unfinished">Add Link</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Self Link</source>
+        <translation type="unfinished">Add Self Link</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Notiz</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anker</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ColMsgTable</name>
+    <message>
+        <location filename="../dialog/ColMsgTable.cpp" line="+142"/>
+        <source>Rank</source>
+        <translation type="unfinished">Rank</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hierarchical rank</source>
+        <translation type="unfinished">Hierarchical rank</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>From</source>
+        <translation type="unfinished">Von</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Message</source>
+        <translation type="unfinished">Nachricht</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">An</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+95"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="-71"/>
+        <source>rank </source>
+        <translation type="unfinished">rank </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit message</source>
+        <translation type="unfinished">Nachricht bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change ranks</source>
+        <translation type="unfinished">Change ranks</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete it</source>
+        <translation type="unfinished">Löschen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete recursively</source>
+        <translation type="unfinished">Rekursiv löschen</translation>
+    </message>
+    <message>
+        <location line="+104"/>
+        <source>Enter new hierarchical rank</source>
+        <translation type="unfinished">Enter new hierarchical rank</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Hierarchical rank : </source>
+        <translation type="unfinished">Hierarchical rank : </translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Warning</source>
+        <translation type="unfinished">Warnung</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Invalid hierarchical rank</source>
+        <translation type="unfinished">Invalid hierarchical rank</translation>
+    </message>
+</context>
+<context>
+    <name>ComboColor</name>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="+363"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unverändert&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ComboStates</name>
+    <message>
+        <location line="-281"/>
+        <location line="+21"/>
+        <location line="+21"/>
+        <location line="+28"/>
+        <location line="+27"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unverändert&gt;</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>unlimited</source>
+        <translation type="unfinished">unbegrenzt</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentCanvas</name>
+    <message>
+        <location filename="../diagram/ComponentCanvas.cpp" line="+380"/>
+        <source>Choose class</source>
+        <translation type="unfinished">Klasse auswählen</translation>
+    </message>
+    <message>
+        <location line="+479"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit component</source>
+        <translation type="unfinished">Komponente bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+34"/>
+        <source>component</source>
+        <translation type="unfinished">Komponente</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+32"/>
+        <source>drawn as icon</source>
+        <translation type="unfinished">drawn as icon</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show required and provided interfaces</source>
+        <translation type="unfinished">show required and provided interfaces</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show realizations</source>
+        <translation type="unfinished">show realizations</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show stereotype properties</source>
+        <translation type="unfinished">show stereotype properties</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>component color</source>
+        <translation type="unfinished">Farbe (Komponente)</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">nur lesender Zugriff</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>no provided interfaces</source>
+        <translation type="unfinished">keine Schnittstellen angegeben</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>no required interfaces</source>
+        <translation type="unfinished">keine benötigten Schnittstellen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+31"/>
+        <location line="+22"/>
+        <location line="+4"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source>not required</source>
+        <translation type="unfinished">nicht benötigt</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>not provided</source>
+        <translation type="unfinished">nicht angegeben</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDiagramView</name>
+    <message>
+        <location filename="../diagram/ComponentDiagramView.cpp" line="+113"/>
+        <source>Component diagram menu</source>
+        <translation type="unfinished">Component diagram menu</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Add marked elements</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ComponentDiagramWindow.cpp" line="+82"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Component</source>
+        <translation type="unfinished">Komponente hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Inheritance</source>
+        <translation type="unfinished">Vererbung</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Abhängigkeit</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Required interface</source>
+        <translation type="unfinished">Required interface</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Provided interface</source>
+        <translation type="unfinished">Provided interface</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Notiz</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anker</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDialog</name>
+    <message>
+        <location filename="../dialog/ComponentDialog.cpp" line="+57"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>component dialog</source>
+        <translation type="unfinished">component dialog</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Required classes</source>
+        <translation type="unfinished">Required classes</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Provided classes</source>
+        <translation type="unfinished">Provided classes</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Realizing classes</source>
+        <translation type="unfinished">Realizing classes</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Stereotype filtering  </source>
+        <translation type="unfinished">Stereotype filtering  </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Available classes</source>
+        <translation type="unfinished">Available classes</translation>
+    </message>
+    <message>
+        <location line="+245"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintCanvas</name>
+    <message>
+        <location filename="../diagram/ConstraintCanvas.cpp" line="+140"/>
+        <source>Constraint</source>
+        <translation type="unfinished">Bedingung</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Font</source>
+        <translation type="unfinished">Schriftart</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <location line="+61"/>
+        <source>note color</source>
+        <translation type="unfinished">Farbe (Hinweis)</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintDialog</name>
+    <message>
+        <location filename="../dialog/ConstraintDialog.cpp" line="+55"/>
+        <source>Constraints visibility dialog</source>
+        <translation type="unfinished">Constraints visibility dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Specify visible elements rather than hidden ones</source>
+        <translation type="unfinished">Specify visible elements rather than hidden ones</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show all</source>
+        <translation type="unfinished">Alle anzeigen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide all</source>
+        <translation type="unfinished">Alle verstecken</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide inherited</source>
+        <translation type="unfinished">Hide inherited</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintTable</name>
+    <message>
+        <location line="+71"/>
+        <source>visible</source>
+        <translation type="unfinished">sichtbar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>element</source>
+        <translation type="unfinished">element</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>constraint</source>
+        <translation type="unfinished">constraint</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location line="+43"/>
+        <location line="+9"/>
+        <location line="+16"/>
+        <source>  yes</source>
+        <translation type="unfinished">  ja</translation>
+    </message>
+</context>
+<context>
+    <name>ConstructorInitializerDialog</name>
+    <message>
+        <location filename="../ui/constructorinitializerdialog.ui" line="+14"/>
+        <source>Dialog</source>
+        <translation type="unfinished">Dialog</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>All attributes:</source>
+        <translation type="unfinished">All attributes:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Initializer
+text:</source>
+        <translation type="unfinished">Initializer
+text:</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Constructor
+prototype:</source>
+        <translation type="unfinished">Constructor
+prototype:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Result after
+substitution:</source>
+        <translation type="unfinished">Result after
+substitution:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../ui/constructorinitializerdialog.cpp" line="+49"/>
+        <source>Constructor-initializer setup</source>
+        <translation type="unfinished">Constructor-initializer setup</translation>
+    </message>
+</context>
+<context>
+    <name>ContinuationDialog</name>
+    <message>
+        <location filename="../dialog/ContinuationDialog.cpp" line="+49"/>
+        <source>stereotype/continuation dialog</source>
+        <translation type="unfinished">stereotype/continuation dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>label : </source>
+        <translation type="unfinished">Beschriftung : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>CppParamsDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="+6241"/>
+        <source>C++ parameters dialog</source>
+        <translation type="unfinished">C++ parameters dialog</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>CppParamsTable</name>
+    <message>
+        <location line="-598"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specifier</source>
+        <translation type="unfinished">Specifier</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pointer</source>
+        <translation type="unfinished">Pointer</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+4"/>
+        <source>Modifier</source>
+        <translation type="unfinished">Modifier</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+4"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+271"/>
+        <source>param %1</source>
+        <translation type="unfinished">Parameter %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Parameter davor einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Parameter danach einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Parameter entfernen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Parameter kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Parameter ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Parameter einfügen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Parameter verschieben</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Set rank &lt;i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>DecoratorDialog</name>
+    <message>
+        <location filename="../dialog/DecoratorDialog.cpp" line="+54"/>
+        <source>decorator dialog</source>
+        <translation type="unfinished">decorator dialog</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+To add an decorator at the cursor position
+you may select it in the list and press &apos;add&apos;
+
+Set operation static to add @staticmethod,
+set operation abstract to add @abstractmethod
+</source>
+        <translation type="unfinished">
+To add an decorator at the cursor position
+you may select it in the list and press &apos;add&apos;
+
+Set operation static to add @staticmethod,
+set operation abstract to add @abstractmethod
+</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Add </source>
+        <translation type="unfinished">Hinzufügen </translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">S&amp;chliessen</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentDiagramView</name>
+    <message>
+        <location filename="../diagram/DeploymentDiagramView.cpp" line="+122"/>
+        <source>Deployment diagram menu</source>
+        <translation type="unfinished">Deployment diagram menu</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Add marked elements</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentDiagramWindow</name>
+    <message>
+        <location filename="../diagram/DeploymentDiagramWindow.cpp" line="+88"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Deployment Node</source>
+        <translation type="unfinished">Add Deployment Node</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Artifact</source>
+        <translation type="unfinished">Add Artifact</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Component</source>
+        <translation type="unfinished">Komponente hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Network connexion/ending</source>
+        <translation type="unfinished">Network connexion/ending</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Network</source>
+        <translation type="unfinished">Netzwerk</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Inheritance</source>
+        <translation type="unfinished">Vererbung</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Abhängigkeit</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Notiz</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anker</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentNodeCanvas</name>
+    <message>
+        <location filename="../diagram/DeploymentNodeCanvas.cpp" line="+485"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select node in browser</source>
+        <translation type="unfinished">Knoten in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set node associated diagram</source>
+        <translation type="unfinished">Set node associated diagram</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+34"/>
+        <source>node</source>
+        <translation type="unfinished">Knoten</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location line="+30"/>
+        <source>write node instance 
+horizontally</source>
+        <translation type="unfinished">write node instance 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">Eigenschaften von Stereotyp
+anzeigen</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Node color</source>
+        <translation type="unfinished">Farbe (Knoten)</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>read only</source>
+        <translation type="unfinished">nur lesender Zugriff</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>DiagramView</name>
+    <message>
+        <location filename="../diagram/DiagramView.cpp" line="+1101"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Align</source>
+        <translation type="unfinished">Anordnen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>same width</source>
+        <translation type="unfinished">same width</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>same height</source>
+        <translation type="unfinished">same height</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>same width and height</source>
+        <translation type="unfinished">same width and height</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size</source>
+        <translation type="unfinished">Size</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Copy selected (Ctrl+c)</source>
+        <translation type="unfinished">Auswahl kopieren (Strg+C)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Cut selected (Ctrl+x, remove from diagram)</source>
+        <translation type="unfinished">Cut selected (Ctrl+x, remove from diagram)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove selected from view (Suppr)</source>
+        <translation type="unfinished">Auswahl aus Sicht entfernen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete selected (Ctrl+d)</source>
+        <translation type="unfinished">Auswahl löschen (Strg+D)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+775"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="-774"/>
+        <source>Same drawing settings</source>
+        <translation type="unfinished">Same drawing settings</translation>
+    </message>
+    <message>
+        <location line="+778"/>
+        <source>Select diagram in browser</source>
+        <translation type="unfinished">Diagramm in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select all (Ctrl+a)</source>
+        <translation type="unfinished">Alles auswählen (Strg+A)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find selected browser element</source>
+        <translation type="unfinished">Gewähltes Browserelement suchen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy optimal picture part</source>
+        <translation type="unfinished">Optimalen Bildbereich kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy visible picture part</source>
+        <translation type="unfinished">Sichtbaren Bildbereich kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save optimal picture part (png)</source>
+        <translation type="unfinished">Optimalen Bildbereich speichern (als PNG)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save visible picture part (png)</source>
+        <translation type="unfinished">Sichtbaren Bildbereich speichern (als PNG)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save optimal picture part (svg)</source>
+        <translation type="unfinished">Optimalen Bildbereich speichern (als SVG)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save visible picture part (svg)</source>
+        <translation type="unfinished">Sichtbaren Bildbereich speichern (als SVG)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste copied items (Ctrl+v)</source>
+        <translation type="unfinished">Kopierte Inhalte einfügen (Strg+V)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Optimal scale</source>
+        <translation type="unfinished">Optimale Skalierung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Optimal window size</source>
+        <translation type="unfinished">Optimale Fenstergröße</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set preferred size and scale</source>
+        <translation type="unfinished">Bevorzugte Größe und Skalierung setzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set preferred scale (size unset)</source>
+        <translation type="unfinished">Bevorzugte Skalierung setzen (Größe wird zurückgesetzt)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Restore preferred size and scale</source>
+        <translation type="unfinished">Bevorzugte Größe und Skalierung wiederherstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unset preferred size and scale</source>
+        <translation type="unfinished">Bevorzugte Größe und Skalierung zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Restore preferred scale</source>
+        <translation type="unfinished">Bevorzugte Skalierung wiederherstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unset preferred scale</source>
+        <translation type="unfinished">Bevorzugte Skalierung zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Format</source>
+        <translation type="unfinished">Format</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Undo all changes</source>
+        <translation type="unfinished">Alle Änderungen rückgängig machen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Undo (Ctrl+z or Ctrl+u)</source>
+        <translation type="unfinished">Rückgängig (Strg+Z oder Strg+U)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Redo (Ctrl+y or Ctrl+r)</source>
+        <translation type="unfinished">Wiederholen (Strg+Y oder Strg+R)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+150"/>
+        <source>Landscape formats</source>
+        <translation type="unfinished">Querformat</translation>
+    </message>
+</context>
+<context>
+    <name>DiagramWindow</name>
+    <message>
+        <location filename="../diagram/DiagramWindow.cpp" line="+130"/>
+        <source>edit</source>
+        <translation type="unfinished">bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>scale</source>
+        <translation type="unfinished">Skalierung</translation>
+    </message>
+</context>
+<context>
+    <name>EnvDialog</name>
+    <message>
+        <location filename="../dialog/EnvDialog.cpp" line="+74"/>
+        <source>Environment dialog</source>
+        <translation type="unfinished">Environment dialog</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>MANDATORY, choose a value between 2 and 127 not used by an other person working at the same time on a project with you.
+To be safe, if possible choose a value not used by an other person even not working on a given project with you</source>
+        <translation type="unfinished">MANDATORY, choose a value between 2 and 127 not used by an other person working at the same time on a project with you.
+To be safe, if possible choose a value not used by an other person even not working on a given project with you</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Own identifier </source>
+        <translation type="unfinished">Own identifier </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   The identifier can&apos;t be modified while a project is load</source>
+        <translation type="unfinished">   The identifier can&apos;t be modified while a project is load</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>
+Optional, to indicate where are the HTML pages of the reference manual. Used by the help (called by the F1 key) to show the
+chapter corresponding to the kind of the element selected in the browser</source>
+        <translation type="unfinished">
+Optional, to indicate where are the HTML pages of the reference manual. Used by the help (called by the F1 key) to show the
+chapter corresponding to the kind of the element selected in the browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Manual path</source>
+        <translation type="unfinished">Manual path</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+18"/>
+        <location line="+16"/>
+        <location line="+19"/>
+        <location line="+14"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <source>
+Optional, to indicate a web navigator program. If it is not defined the reference manual will be shown with an internal simple viewer</source>
+        <translation type="unfinished">
+Optional, to indicate a web navigator program. If it is not defined the reference manual will be shown with an internal simple viewer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Navigator</source>
+        <translation type="unfinished">Navigator</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>
+Optional, to indicate a template project. This allows to create new projects getting all the template project settings</source>
+        <translation type="unfinished">
+Optional, to indicate a template project. This allows to create new projects getting all the template project settings</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+Optional, to indicate a text editor (it must creates an own window). Else DoUML will use an internal editor</source>
+        <translation type="unfinished">
+Optional, to indicate a text editor (it must creates an own window). Else DoUML will use an internal editor</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>
+In case you have a multiple screens configuration the best for you is to ask DoUML to place by default the dialogs in one of these
+screens giving the area, else the dialogs will be shown on the center of the virtual screen.</source>
+        <translation type="unfinished">
+In case you have a multiple screens configuration the best for you is to ask DoUML to place by default the dialogs in one of these
+screens giving the area, else the dialogs will be shown on the center of the virtual screen.</translation>
+    </message>
+    <message>
+        <location line="-72"/>
+        <source>Editor path </source>
+        <translation type="unfinished">Editor path </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+Optional, to choose a language for menus and dialogs (default is English). You may have to select a corresponding character set</source>
+        <translation type="unfinished">
+Optional, to choose a language for menus and dialogs (default is English). You may have to select a corresponding character set</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Translation file path </source>
+        <translation type="unfinished">Translation file path </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>
+Optional, to indicate a character set in case you use non ISO_8859-1/latin1 characters. For instance KOI8-R or KOI8-RU for Cyrillic</source>
+        <translation type="unfinished">
+Optional, to indicate a character set in case you use non ISO_8859-1/latin1 characters. For instance KOI8-R or KOI8-RU for Cyrillic</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Character set </source>
+        <translation type="unfinished">Character set </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Default screen </source>
+        <translation type="unfinished">Default screen </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>left: </source>
+        <translation type="unfinished">links: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      top: </source>
+        <translation type="unfinished">      oben: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      right: </source>
+        <translation type="unfinished">      rechts: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      bottom: </source>
+        <translation type="unfinished">      unten: </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>documentation directory</source>
+        <translation type="unfinished">documentation directory</translation>
+    </message>
+</context>
+<context>
+    <name>ExceptionsTable</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-682"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+47"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>exception %1</source>
+        <translation type="unfinished">Exception %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert exception before</source>
+        <translation type="unfinished">Insert exception before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert exception after</source>
+        <translation type="unfinished">Insert exception after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete exception</source>
+        <translation type="unfinished">Delete exception</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy exception</source>
+        <translation type="unfinished">Copy exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut exception</source>
+        <translation type="unfinished">Cut exception</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste exception</source>
+        <translation type="unfinished">Paste exception</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Move exception</source>
+        <translation type="unfinished">Move exception</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionNodeCanvas</name>
+    <message>
+        <location filename="../diagram/ExpansionNodeCanvas.cpp" line="+330"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit expansion node</source>
+        <translation type="unfinished">Edit expansion node</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <location line="+25"/>
+        <source>expansion node color</source>
+        <translation type="unfinished">expansion node color</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location line="+9"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionRegionCanvas</name>
+    <message>
+        <location filename="../diagram/ExpansionRegionCanvas.cpp" line="+460"/>
+        <source>Add expansion node</source>
+        <translation type="unfinished">Erweiterungsknoten hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit expansion region</source>
+        <translation type="unfinished">Erweiterungsbereich bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <location line="+25"/>
+        <source>expansion region color</source>
+        <translation type="unfinished">Farbe (Erweiterungsbereich)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionRegionDialog</name>
+    <message>
+        <location filename="../dialog/ExpansionRegionDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Expansion Region dialog</source>
+        <translation type="unfinished">Expansion Region dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>mode :</source>
+        <translation type="unfinished">mode :</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>must isolate</source>
+        <translation type="unfinished">must isolate</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>description</source>
+        <translation type="unfinished">Beschreibung</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>ExtraMemberDialog</name>
+    <message>
+        <location filename="../dialog/ExtraMemberDialog.cpp" line="+61"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Extra Class Member dialog</source>
+        <translation type="unfinished">Extra Class Member dialog</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name :</source>
+        <translation type="unfinished">Name :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">Stereotyp :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+33"/>
+        <location line="+15"/>
+        <location line="+25"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-122"/>
+        <source>C++ 
+declaration :</source>
+        <translation type="unfinished">C++
+Deklaration :</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>C++ 
+definition :</source>
+        <translation type="unfinished">C++
+Definition :</translation>
+    </message>
+    <message>
+        <location line="+129"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+</context>
+<context>
+    <name>FlowCanvas</name>
+    <message>
+        <location filename="../diagram/FlowCanvas.cpp" line="+155"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+90"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Select labels</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Labels default position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach flow label to this segment</source>
+        <translation type="unfinished">Attach flow label to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attach stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometrie (Strg+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <location line="+34"/>
+        <source>write horizontally</source>
+        <translation type="unfinished">horizontal schreiben</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+34"/>
+        <source>Flow Drawing Settings dialog</source>
+        <translation type="unfinished">Flow Drawing Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>flow already drawn</source>
+        <translation type="unfinished">flow already drawn</translation>
+    </message>
+</context>
+<context>
+    <name>FlowDialog</name>
+    <message>
+        <location filename="../dialog/FlowDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Flow dialog</source>
+        <translation type="unfinished">Flow dialog</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+97"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>weight : </source>
+        <translation type="unfinished">weight : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>guard : </source>
+        <translation type="unfinished">guard : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>selection : </source>
+        <translation type="unfinished">Auswahl : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>transformation : </source>
+        <translation type="unfinished">transformation : </translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>FormalParamsTable</name>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="-1690"/>
+        <source>formal param %1</source>
+        <translation type="unfinished">formal param %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Parameter davor einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Parameter danach einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Parameter entfernen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Parameter kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Parameter ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Parameter einfügen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Parameter verschieben</translation>
+    </message>
+</context>
+<context>
+    <name>FragmentCanvas</name>
+    <message>
+        <location filename="../diagram/FragmentCanvas.cpp" line="+354"/>
+        <source>Fragment</source>
+        <translation type="unfinished">Fragment</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add separator</source>
+        <translation type="unfinished">Trennlinie hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show referenced diagram</source>
+        <translation type="unfinished">Show referenced diagram</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+25"/>
+        <source>fragment color</source>
+        <translation type="unfinished">Farbe (Fragment)</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>FragmentDialog</name>
+    <message>
+        <location filename="../dialog/FragmentDialog.cpp" line="+55"/>
+        <source>Fragment dialog</source>
+        <translation type="unfinished">Fragment dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>refer to : </source>
+        <translation type="unfinished">refer to : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>arguments 
+/ value : </source>
+        <translation type="unfinished">arguments 
+/ value : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose diagram selected in browser</source>
+        <translation type="unfinished">Choose diagram selected in browser</translation>
+    </message>
+</context>
+<context>
+    <name>GenerationSettingsDialog</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+73"/>
+        <source>Generation settings dialog</source>
+        <translation type="unfinished">Generation settings dialog</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Types correspondence, and C++ operation argument default passing for them :</source>
+        <translation type="unfinished">Types correspondence, and C++ operation argument default passing for them :</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Attributes and 
+Relations
+stereotypes 
+correspondence : </source>
+        <translation type="unfinished">Attributes and 
+Relations
+stereotypes 
+correspondence : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Classes&apos;s 
+stereotypes 
+correspondence : </source>
+        <translation type="unfinished">Classes&apos;s 
+stereotypes 
+correspondence : </translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Header file
+default content :</source>
+        <translation type="unfinished">Header file
+default content :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Source file
+default content :</source>
+        <translation type="unfinished">Source file
+default content :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>generated/reversed 
+header file extension : </source>
+        <translation type="unfinished">generated/reversed 
+header file extension : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generated/reversed 
+    source file extension : </source>
+        <translation type="unfinished">    generated/reversed 
+    source file extension : </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+682"/>
+        <source>without path</source>
+        <translation type="unfinished">without path</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with absolute path</source>
+        <translation type="unfinished">with absolute path</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with relative path</source>
+        <translation type="unfinished">with relative path</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with root relative path</source>
+        <translation type="unfinished">with root relative path</translation>
+    </message>
+    <message>
+        <location line="-667"/>
+        <source>force namespace 
+prefix generation : </source>
+        <translation type="unfinished">force namespace 
+prefix generation : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            inline operation force 
+            includes in header : </source>
+        <translation type="unfinished">            inline operation force 
+            includes in header : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            generate Javadoc 
+            style comment : </source>
+        <translation type="unfinished">            generate Javadoc 
+            style comment : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            visibility indent : </source>
+        <translation type="unfinished">            visibility indent : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+366"/>
+        <location line="+287"/>
+        <location line="+179"/>
+        <source>Class default 
+declaration :</source>
+        <translation type="unfinished">Class default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-821"/>
+        <location line="+1058"/>
+        <source>Struct default 
+declaration :</source>
+        <translation type="unfinished">Struct default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+1058"/>
+        <source>Union default 
+declaration :</source>
+        <translation type="unfinished">Union default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+355"/>
+        <location line="+287"/>
+        <location line="+181"/>
+        <location line="+235"/>
+        <source>Enum default 
+declaration :</source>
+        <translation type="unfinished">Enum default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+1058"/>
+        <source>Typedef default 
+declaration :</source>
+        <translation type="unfinished">Typedef default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-1038"/>
+        <location line="+355"/>
+        <location line="+453"/>
+        <source>Attribute 
+default 
+declaration :</source>
+        <translation type="unfinished">Attribute 
+default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-805"/>
+        <location line="+29"/>
+        <location line="+25"/>
+        <source>Multiplicity</source>
+        <translation type="unfinished">Multiplicity</translation>
+    </message>
+    <message>
+        <location line="-50"/>
+        <source>unspecified,
+or 1</source>
+        <translation type="unfinished">unspecified,
+or 1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+38"/>
+        <location line="+21"/>
+        <source>* or a..b</source>
+        <translation type="unfinished">* or a..b</translation>
+    </message>
+    <message>
+        <location line="-57"/>
+        <location line="+38"/>
+        <location line="+21"/>
+        <source>X (means [X])
+or [...]...[...]</source>
+        <translation type="unfinished">X (means [X])
+or [...]...[...]</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Association
+and
+aggregation
+default
+declaration :</source>
+        <translation type="unfinished">Association
+and
+aggregation
+default
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Association </source>
+        <translation type="unfinished">Association </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>  and aggregation </source>
+        <translation type="unfinished">  and aggregation </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>unspecified,
+1 or 0..1</source>
+        <translation type="unfinished">unspecified,
+1 or 0..1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+810"/>
+        <source>Composition
+default
+declaration :</source>
+        <translation type="unfinished">Composition
+default
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-804"/>
+        <source>Composition </source>
+        <translation type="unfinished">Composition </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>unspecified
+or 1</source>
+        <translation type="unfinished">unspecified
+or 1</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <location line="+338"/>
+        <location line="+234"/>
+        <location line="+214"/>
+        <location line="+359"/>
+        <source>Get operation
+default definition : </source>
+        <translation type="unfinished">Get operation
+default definition : </translation>
+    </message>
+    <message>
+        <location line="-1139"/>
+        <location line="+38"/>
+        <source>Visibility</source>
+        <translation type="unfinished">Sichtbarkeit</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+37"/>
+        <location line="+299"/>
+        <source>Modifiers</source>
+        <translation type="unfinished">Modifiers</translation>
+    </message>
+    <message>
+        <location line="-333"/>
+        <source>const value</source>
+        <translation type="unfinished">const value</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+37"/>
+        <location line="+295"/>
+        <location line="+28"/>
+        <location line="+206"/>
+        <location line="+26"/>
+        <location line="+179"/>
+        <location line="+17"/>
+        <location line="+360"/>
+        <source>  name : </source>
+        <translation type="unfinished">  Name : </translation>
+    </message>
+    <message>
+        <location line="-1136"/>
+        <location line="+31"/>
+        <location line="+295"/>
+        <location line="+28"/>
+        <location line="+206"/>
+        <location line="+26"/>
+        <location line="+179"/>
+        <location line="+17"/>
+        <location line="+341"/>
+        <location line="+19"/>
+        <source>also in uml</source>
+        <translation type="unfinished">also in uml</translation>
+    </message>
+    <message>
+        <location line="-1134"/>
+        <location line="+326"/>
+        <location line="+234"/>
+        <location line="+205"/>
+        <location line="+358"/>
+        <source>Set operation
+default definition : </source>
+        <translation type="unfinished">Set operation
+default definition : </translation>
+    </message>
+    <message>
+        <location line="-1112"/>
+        <source>const param</source>
+        <translation type="unfinished">const param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>by ref</source>
+        <translation type="unfinished">by ref</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+244"/>
+        <location line="+246"/>
+        <location line="+145"/>
+        <source>Enumeration item 
+default definition :</source>
+        <translation type="unfinished">Enumeration item 
+default definition :</translation>
+    </message>
+    <message>
+        <location line="-627"/>
+        <source>Default type forms
+for the enums :</source>
+        <translation type="unfinished">Default type forms
+for the enums :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <source>input
+parameter : </source>
+        <translation type="unfinished">input
+parameter : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   output
+   parameter : </source>
+        <translation type="unfinished">   output
+   parameter : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   input output 
+   parameter : </source>
+        <translation type="unfinished">   input output 
+   parameter : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   operation 
+   return : </source>
+        <translation type="unfinished">   operation 
+   return : </translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Default type forms for
+the types not given
+in the first tab:</source>
+        <translation type="unfinished">Default type forms for
+the types not given
+in the first tab:</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Operation default 
+declaration :</source>
+        <translation type="unfinished">Operation default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Operation default 
+definition :</source>
+        <translation type="unfinished">Operation default 
+definition :</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>External classes : 
+name making
+#include, using</source>
+        <translation type="unfinished">External classes : 
+name making
+#include, using</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>External types :
+#include form(s),
+using, etc...</source>
+        <translation type="unfinished">External types :
+#include form(s),
+using, etc...</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Include etc...</source>
+        <translation type="unfinished">Include etc...</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+267"/>
+        <location line="+220"/>
+        <location line="+223"/>
+        <source>file default 
+content :</source>
+        <translation type="unfinished">file default 
+content :</translation>
+    </message>
+    <message>
+        <location line="-687"/>
+        <source>    generated/reversed file extension </source>
+        <translation type="unfinished">    generated/reversed file extension </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generate Javadoc style comment </source>
+        <translation type="unfinished">    generate Javadoc style comment </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>    force package prefix generation </source>
+        <translation type="unfinished">    force package prefix generation </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+287"/>
+        <location line="+399"/>
+        <source>Interface default 
+declaration :</source>
+        <translation type="unfinished">Interface default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-676"/>
+        <source>Enum pattern 
+default declaration :</source>
+        <translation type="unfinished">Enum pattern 
+default declaration :</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+25"/>
+        <location line="+430"/>
+        <location line="+30"/>
+        <location line="+24"/>
+        <location line="+199"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>multiplicity &apos;1&apos;
+or unspecified</source>
+        <translation type="unfinished">multiplicity &apos;1&apos;
+or unspecified</translation>
+    </message>
+    <message>
+        <location line="-850"/>
+        <location line="+25"/>
+        <location line="+683"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>multiplicity &apos;*&apos;
+or &apos;a..b&apos;</source>
+        <translation type="unfinished">multiplicity &apos;*&apos;
+or &apos;a..b&apos;</translation>
+    </message>
+    <message>
+        <location line="-850"/>
+        <location line="+25"/>
+        <location line="+683"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>X (probably a
+number)</source>
+        <translation type="unfinished">X (probably a
+number)</translation>
+    </message>
+    <message>
+        <location line="-833"/>
+        <location line="+269"/>
+        <location line="+191"/>
+        <location line="+296"/>
+        <source>Association and
+aggregation
+default
+declaration :</source>
+        <translation type="unfinished">Association and
+aggregation
+default
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-713"/>
+        <source>Enum pattern item 
+default definition :</source>
+        <translation type="unfinished">Enum pattern item 
+default definition :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Enum pattern item 
+&apos;case&apos; in &apos;from_int&apos; :</source>
+        <translation type="unfinished">Enum pattern item 
+&apos;case&apos; in &apos;from_int&apos; :</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+26"/>
+        <source>Visibility (shared with Php)</source>
+        <translation type="unfinished">Visibility (shared with Php)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>final parameter</source>
+        <translation type="unfinished">final parameter</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+232"/>
+        <location line="+196"/>
+        <source>Operation
+default definition :</source>
+        <translation type="unfinished">Operation
+default definition :</translation>
+    </message>
+    <message>
+        <location line="-403"/>
+        <location line="+215"/>
+        <source>External classes : 
+name making</source>
+        <translation type="unfinished">External classes : 
+name making</translation>
+    </message>
+    <message>
+        <location line="-207"/>
+        <source>External types :
+import form(s) etc...</source>
+        <translation type="unfinished">External types :
+import form(s) etc...</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>    generated / reversed file extension : </source>
+        <translation type="unfinished">    generated / reversed file extension : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generate Javadoc style comment : </source>
+        <translation type="unfinished">    generate Javadoc style comment : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>    require_once : </source>
+        <translation type="unfinished">    require_once : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>    force namespace prefix generation : </source>
+        <translation type="unfinished">    force namespace prefix generation : </translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+427"/>
+        <source>Attribute default 
+declaration :</source>
+        <translation type="unfinished">Attribute default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-392"/>
+        <location line="+26"/>
+        <source>Visibility (shared with Java)</source>
+        <translation type="unfinished">Visibility (shared with Java)</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>indent step :</source>
+        <translation type="unfinished">indent step :</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>    generated /
+    reversed
+    file extension : </source>
+        <translation type="unfinished">    generated /
+    reversed
+    file extension : </translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>    classes of Python 2.2 </source>
+        <translation type="unfinished">    classes of Python 2.2 </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+39"/>
+        <location line="+15"/>
+        <source>other
+multiplicity</source>
+        <translation type="unfinished">other
+multiplicity</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>    operation of Python 3 (pep-3107) </source>
+        <translation type="unfinished">    operation of Python 3 (pep-3107) </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Operation __init__
+default definition :</source>
+        <translation type="unfinished">Operation __init__
+default definition :</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>External classes : 
+name making
+import</source>
+        <translation type="unfinished">External classes : 
+name making
+import</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>External types :
+import form(s)</source>
+        <translation type="unfinished">External types :
+import form(s)</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>    file extension : </source>
+        <translation type="unfinished">    file extension : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Valuetype default 
+declaration :</source>
+        <translation type="unfinished">Valuetype default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Exception default 
+declaration :</source>
+        <translation type="unfinished">Exception default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Attribute default 
+declaration in
+valuetype :</source>
+        <translation type="unfinished">Attribute default 
+declaration in
+valuetype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Constant default 
+declaration :</source>
+        <translation type="unfinished">Constant default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Association and
+aggregation
+default
+declaration in
+valuetype :</source>
+        <translation type="unfinished">Association and
+aggregation
+default
+declaration in
+valuetype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Association and
+aggregation
+default
+declaration in
+union:</source>
+        <translation type="unfinished">Association and
+aggregation
+default
+declaration in
+union:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Union item 
+default 
+declaration :</source>
+        <translation type="unfinished">Union item 
+default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Enumeration item 
+default declaration :</source>
+        <translation type="unfinished">Enumeration item 
+default declaration :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Operation default 
+declaration : </source>
+        <translation type="unfinished">Operation default 
+declaration : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>External classes : 
+name making
+#include</source>
+        <translation type="unfinished">External classes : 
+name making
+#include</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>External types :
+#include form(s)
+etc...</source>
+        <translation type="unfinished">External types :
+#include form(s)
+etc...</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Artifact
+default
+description : </source>
+        <translation type="unfinished">Artifact
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Class
+default
+description : </source>
+        <translation type="unfinished">Class
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Operation
+default
+description : </source>
+        <translation type="unfinished">Operation
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Attribute
+default
+description : </source>
+        <translation type="unfinished">Attribute
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Relation
+default
+description : </source>
+        <translation type="unfinished">Relation
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Defining a project root directory allows to specify                                   packages&apos;s generation directory relative to the root directory rather                                   than absolute.
+A root directory may itself be relative to the project path</source>
+        <translation type="unfinished">Defining a project root directory allows to specify                                   packages&apos;s generation directory relative to the root directory rather                                   than absolute.
+A root directory may itself be relative to the project path</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>C++ root dir : </source>
+        <translation type="unfinished">C++ root dir : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <location line="+19"/>
+        <location line="+19"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Java root dir : </source>
+        <translation type="unfinished">Java root dir : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Php root dir : </source>
+        <translation type="unfinished">Php root dir : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Python root dir : </source>
+        <translation type="unfinished">Python root dir : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Idl root dir : </source>
+        <translation type="unfinished">Idl root dir : </translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+10"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>HelpDialog</name>
+    <message>
+        <location filename="../dialog/HelpDialog.cpp" line="+80"/>
+        <source>DoUML Help</source>
+        <translation type="unfinished">DoUML-Hilfe</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>To set the navigator by setting the environment through the menu Miscellaneous allows to see all the documentation in better conditions</source>
+        <translation type="unfinished">To set the navigator by setting the environment through the menu Miscellaneous allows to see all the documentation in better conditions</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+</context>
+<context>
+    <name>HelpRegexpDialog</name>
+    <message>
+        <location filename="../dialog/RevSettingsDialog.cpp" line="+260"/>
+        <source>Help regular expression</source>
+        <translation type="unfinished">Help regular expression</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+</context>
+<context>
+    <name>HideShowDialog</name>
+    <message>
+        <location filename="../dialog/HideShowDialog.cpp" line="+56"/>
+        <source>Settings dialog</source>
+        <translation type="unfinished">Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Visible</source>
+        <translation type="unfinished">Sichtbar</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Hidden</source>
+        <translation type="unfinished">Versteckt</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Show all</source>
+        <translation type="unfinished">Alle anzeigen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide all</source>
+        <translation type="unfinished">Alle verstecken</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide private ones</source>
+        <translation type="unfinished">Hide private ones</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide private and
+protected ones</source>
+        <translation type="unfinished">Hide private and
+protected ones</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Specify visible members rather than hidden ones</source>
+        <translation type="unfinished">Specify visible members rather than hidden ones</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>IconCanvas</name>
+    <message>
+        <location filename="../diagram/IconCanvas.cpp" line="+141"/>
+        <source>
+short cut</source>
+        <translation type="unfinished">
+short cut</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open</source>
+        <translation type="unfinished">Öffnen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select diagram in browser</source>
+        <translation type="unfinished">Diagramm in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ImageDialog</name>
+    <message>
+        <location filename="../dialog/ImageDialog.cpp" line="+57"/>
+        <source>Image dialog</source>
+        <translation type="unfinished">Image dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Image path :</source>
+        <translation type="unfinished">Image path :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set it relative to image root</source>
+        <translation type="unfinished">Set it relative to image root</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it relative to project</source>
+        <translation type="unfinished">Set it relative to project</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it absolute</source>
+        <translation type="unfinished">Set it absolute</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>IncludeTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+611"/>
+        <source>External type</source>
+        <translation type="unfinished">External type</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+</context>
+<context>
+    <name>InfoCanvas</name>
+    <message>
+        <location filename="../diagram/InfoCanvas.cpp" line="+124"/>
+        <source>Information</source>
+        <translation type="unfinished">Information</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Font</source>
+        <translation type="unfinished">Schriftart</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location line="+61"/>
+        <source>note color</source>
+        <translation type="unfinished">Farbe (Hinweis)</translation>
+    </message>
+</context>
+<context>
+    <name>InstanceDialog</name>
+    <message>
+        <location filename="../dialog/InstanceDialog.cpp" line="+63"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Choose </source>
+        <translation type="unfinished">Choose </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> selected in browser</source>
+        <translation type="unfinished"> selected in browser</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Create </source>
+        <translation type="unfinished">Create </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> and choose it</source>
+        <translation type="unfinished"> and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>InterruptibleActivityRegionCanvas</name>
+    <message>
+        <location filename="../diagram/InterruptibleActivityRegionCanvas.cpp" line="+259"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit interruptible activity region</source>
+        <translation type="unfinished">Edit interruptible activity region</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <location line="+25"/>
+        <source>interruptible activity region color</source>
+        <translation type="unfinished">interruptible activity region color</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>KeyValuesTable</name>
+    <message>
+        <location filename="../dialog/KeyValueTable.cpp" line="+90"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>MLEDialog</name>
+    <message>
+        <location filename="../dialog/MLEDialog.cpp" line="+57"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+</context>
+<context>
+    <name>MyInputDialog</name>
+    <message>
+        <location filename="../dialog/MyInputDialog.cpp" line="+77"/>
+        <location line="+75"/>
+        <location line="+56"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="-130"/>
+        <location line="+75"/>
+        <location line="+56"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>NoteCanvas</name>
+    <message>
+        <location filename="../diagram/NoteCanvas.cpp" line="+219"/>
+        <source>Note</source>
+        <translation type="unfinished">Notiz</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Color of text</source>
+        <translation type="unfinished">Farbe (Text)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Font</source>
+        <translation type="unfinished">Schriftart</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>color</source>
+        <translation type="unfinished">Farbe</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Text color dialog</source>
+        <translation type="unfinished">Text color dialog</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <location line="+25"/>
+        <source>note color</source>
+        <translation type="unfinished">Farbe (Hinweis)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectDiagramView</name>
+    <message>
+        <location filename="../diagram/ObjectDiagramView.cpp" line="+71"/>
+        <source>Object diagram menu</source>
+        <translation type="unfinished">Objektdiagramm-Menü</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ObjectDiagramWindow.cpp" line="+75"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Add modeled Class instance</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Add Class instance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Link between instances</source>
+        <translation type="unfinished">Add Link between instances</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Notiz</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anker</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectLinkCanvas</name>
+    <message>
+        <location filename="../diagram/ObjectLinkCanvas.cpp" line="+315"/>
+        <source>Relation already drawn</source>
+        <translation type="unfinished">Relation already drawn</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Object link</source>
+        <translation type="unfinished">Object link</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select relation in browser</source>
+        <translation type="unfinished">Select relation in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Select labels</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Labels default position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s name to this segment</source>
+        <translation type="unfinished">Attach relation&apos;s name to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s stereotype to this segment</source>
+        <translation type="unfinished">Attach relation&apos;s stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometrie (Strg+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectLinkDialog</name>
+    <message>
+        <location filename="../dialog/ObjectLinkDialog.cpp" line="+55"/>
+        <source>Object link dialog</source>
+        <translation type="unfinished">Object link dialog</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>
+To set the association, select a cell or the first column with a single click, then press &apos;OK&apos;
+To unset the association press &apos;Unset&apos; then press &apos;OK&apos;
+</source>
+        <translation type="unfinished">
+To set the association, select a cell or the first column with a single click, then press &apos;OK&apos;
+To unset the association press &apos;Unset&apos; then press &apos;OK&apos;
+</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Neu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Unset</source>
+        <translation type="unfinished">&amp;Unset</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>Class Inst.</source>
+        <translation type="unfinished">Class Inst.</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+2"/>
+        <source>Role</source>
+        <translation type="unfinished">Role</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>kind</source>
+        <translation type="unfinished">kind</translation>
+    </message>
+</context>
+<context>
+    <name>OdClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/OdClassInstCanvas.cpp" line="+567"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Klasse in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">write name:type 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">Eigenschaften von Stereotypen
+anzeigen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">Farbe (Klasseninstanz)</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>OpaqueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-662"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Behavior : </source>
+        <translation type="unfinished">Behavior : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+</context>
+<context>
+    <name>OperationData</name>
+    <message>
+        <location filename="../data/OperationData.cpp" line="+3727"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>OperationDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-5368"/>
+        <source>Operation dialog</source>
+        <translation type="unfinished">Operation dialog</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>class : </source>
+        <translation type="unfinished">Klasse : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>value type :</source>
+        <translation type="unfinished">Werttyp :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>static</source>
+        <translation type="unfinished">statisch</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>abstract</source>
+        <translation type="unfinished">abstrakt</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>force body generation</source>
+        <translation type="unfinished">force body generation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>parameters : </source>
+        <translation type="unfinished">Parameter : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>exceptions : </source>
+        <translation type="unfinished">Exceptions : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+10"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+141"/>
+        <location line="+58"/>
+        <source>follow uml</source>
+        <translation type="unfinished">follow uml</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+137"/>
+        <location line="+130"/>
+        <location line="+134"/>
+        <location line="+340"/>
+        <source>Show body</source>
+        <translation type="unfinished">Quelltext anzeigen</translation>
+    </message>
+    <message>
+        <location line="-741"/>
+        <location line="+137"/>
+        <location line="+130"/>
+        <location line="+134"/>
+        <location line="+340"/>
+        <source>Edit body</source>
+        <translation type="unfinished">Quelltext bearbeiten</translation>
+    </message>
+    <message>
+        <location line="-697"/>
+        <location line="+132"/>
+        <location line="+129"/>
+        <location line="+133"/>
+        <source>frozen</source>
+        <translation type="unfinished">frozen</translation>
+    </message>
+    <message>
+        <location line="-382"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Name form : </source>
+        <translation type="unfinished">Name form : </translation>
+    </message>
+    <message>
+        <location line="-384"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Definition :</source>
+        <translation type="unfinished">Definition :</translation>
+    </message>
+    <message>
+        <location line="-383"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Result after
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-388"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <source>contextual
+body indent</source>
+        <translation type="unfinished">contextual
+body indent</translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+129"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Standarddeklaration</translation>
+    </message>
+    <message>
+        <location line="-381"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Nicht in Java generiert</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Show annotation</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Edit annotation</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+65"/>
+        <location line="+60"/>
+        <source>Edit parameters</source>
+        <translation type="unfinished">Parameter bearbeiten</translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <source>Show parameters</source>
+        <translation type="unfinished">Show parameters</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Show decorators</source>
+        <translation type="unfinished">Show decorators</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit decorators</source>
+        <translation type="unfinished">Edit decorators</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Not generated in Idl</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+424"/>
+        <location line="+621"/>
+        <location line="+1358"/>
+        <location line="+476"/>
+        <source>wrong specification</source>
+        <translation type="unfinished">wrong specification</translation>
+    </message>
+    <message>
+        <location line="-1969"/>
+        <source>[@][{][A-Za-z0-9]+[}]</source>
+        <translation type="unfinished">[@][{][A-Za-z0-9]+[}]</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>,</source>
+        <translation type="unfinished">,</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+1095"/>
+        <source>Warning!</source>
+        <translation type="unfinished">Warning!</translation>
+    </message>
+    <message>
+        <location line="-1095"/>
+        <source>Could not find correct place for these tags: </source>
+        <translation type="unfinished">Could not find correct place for these tags: </translation>
+    </message>
+    <message>
+        <location line="+1096"/>
+        <source>The Operation you are trying to change is
+inhertied from/to other classes.
+Do you want to propagate the changes to it
+ through the inheritance tree?</source>
+        <translation type="unfinished">The Operation you are trying to change is
+inhertied from/to other classes.
+Do you want to propagate the changes to it
+ through the inheritance tree?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Above</source>
+        <translation type="unfinished">Above</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Everywhere</source>
+        <translation type="unfinished">Everywhere</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Do not propagate</source>
+        <translation type="unfinished">Do not propagate</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+    <message>
+        <location line="+4110"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+</context>
+<context>
+    <name>OperationListDialog</name>
+    <message>
+        <location filename="../dialog/OperationListDialog.cpp" line="+74"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>OperationWidgetCpp</name>
+    <message>
+        <location filename="../ui/operationwidgetcpp.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>frozen</source>
+        <translation type="unfinished">frozen</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>delete</source>
+        <translation type="unfinished">delete</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>override</source>
+        <translation type="unfinished">override</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>final</source>
+        <translation type="unfinished">final</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Name form:</source>
+        <translation type="unfinished">Name form:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Declaration:</source>
+        <translation type="unfinished">Deklaration:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+76"/>
+        <source>Result after substitution:</source>
+        <translation type="unfinished">Result after substitution:</translation>
+    </message>
+    <message>
+        <location line="-50"/>
+        <source>Default Declaration</source>
+        <translation type="unfinished">Default Declaration</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>From Definition</source>
+        <translation type="unfinished">From Definition</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+90"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Nicht in C++ generiert</translation>
+    </message>
+    <message>
+        <location line="-83"/>
+        <location line="+90"/>
+        <source>Edit parameters</source>
+        <translation type="unfinished">Parameter bearbeiten</translation>
+    </message>
+    <message>
+        <location line="-77"/>
+        <source>Definition:</source>
+        <translation type="unfinished">Definition:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>contextual
+body indent :</source>
+        <translation type="unfinished">contextual
+body indent :</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>EditBody</source>
+        <translation type="unfinished">EditBody</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Standarddefinition</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>From Declaration</source>
+        <translation type="unfinished">From Declaration</translation>
+    </message>
+</context>
+<context>
+    <name>PackageCanvas</name>
+    <message>
+        <location filename="../diagram/PackageCanvas.cpp" line="+492"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location line="+34"/>
+        <source>package</source>
+        <translation type="unfinished">Paket</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+32"/>
+        <source>name in tab</source>
+        <translation type="unfinished">name in tab</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show context</source>
+        <translation type="unfinished">show context</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">Eigenschaften von Stereotyp
+anzeigen</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>Package color</source>
+        <translation type="unfinished">Farbe (Paket)</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">nur lesender Zugriff</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+9"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>PackageDialog</name>
+    <message>
+        <location filename="../dialog/PackageDialog.cpp" line="+71"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Package dialog</source>
+        <translation type="unfinished">Package dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>The generation directories may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</source>
+        <translation type="unfinished">The generation directories may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>headers directory : </source>
+        <translation type="unfinished">Headerdateien-Verzeichnis : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+29"/>
+        <location line="+56"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="-226"/>
+        <source>sources directory : </source>
+        <translation type="unfinished">Quelldateien-Verzeichnis : </translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>The generation directory may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</source>
+        <translation type="unfinished">The generation directory may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</translation>
+    </message>
+    <message>
+        <location line="-157"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>directory : </source>
+        <translation type="unfinished">Verzeichnis : </translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>meta model : 
+reference</source>
+        <translation type="unfinished">meta model : 
+reference</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>meta class : 
+reference</source>
+        <translation type="unfinished">meta class : 
+reference</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <location line="+5"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Question</source>
+        <translation type="unfinished">Frage</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterCanvas</name>
+    <message>
+        <location filename="../diagram/ParameterCanvas.cpp" line="+370"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Resize other like it</source>
+        <translation type="unfinished">Resize other like it</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit parameter</source>
+        <translation type="unfinished">Parameter bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Klasse in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+25"/>
+        <source>parameter node color</source>
+        <translation type="unfinished">Farbe (Parameter-Knoten)</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterDialog</name>
+    <message>
+        <location filename="../dialog/ParameterDialog.cpp" line="+68"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Parameter dialog</source>
+        <translation type="unfinished">Parameter dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name :</source>
+        <translation type="unfinished">Name :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>direction :</source>
+        <translation type="unfinished">direction :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>   multiplicity : </source>
+        <translation type="unfinished">   multiplicity : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordering : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   effect : </source>
+        <translation type="unfinished">   effect : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>in state : </source>
+        <translation type="unfinished">in state : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>default value :</source>
+        <translation type="unfinished">default value :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+43"/>
+        <location line="+92"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-125"/>
+        <source>is_control</source>
+        <translation type="unfinished">is_control</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unique</source>
+        <translation type="unfinished">unique</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>standard</source>
+        <translation type="unfinished">standard</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>exception</source>
+        <translation type="unfinished">Exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>stream</source>
+        <translation type="unfinished">Stream</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>selection : </source>
+        <translation type="unfinished">Auswahl : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <location line="+29"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>An input parameter cannot be an exception.
+</source>
+        <translation type="unfinished">An input parameter cannot be an exception.
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only in and inout parameter may have a delete effect.</source>
+        <translation type="unfinished">Only in and inout parameter may have a delete effect.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only out, inout and return parameter may have a create effect.</source>
+        <translation type="unfinished">Only out, inout and return parameter may have a create effect.</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterSetCanvas</name>
+    <message>
+        <location filename="../diagram/ParameterSetCanvas.cpp" line="+322"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit parameter set</source>
+        <translation type="unfinished">Parametersatz bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <location line="+25"/>
+        <source>parameter set color</source>
+        <translation type="unfinished">Farbe (Parametersatz)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterSetDialog</name>
+    <message>
+        <location filename="../dialog/ParameterSetDialog.cpp" line="+64"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>ParameterSet dialog</source>
+        <translation type="unfinished">ParameterSet dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Parameters out of Parameter Set</source>
+        <translation type="unfinished">Parameter im Parametersatz</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Parameters in Parameter Set</source>
+        <translation type="unfinished">Parameter im Parametersatz</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Parameters</source>
+        <translation type="unfinished">Parameter</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>ParamsTable</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-2686"/>
+        <source>Direction</source>
+        <translation type="unfinished">Direction</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default value</source>
+        <translation type="unfinished">Default value</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+60"/>
+        <location line="+40"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>param %1</source>
+        <translation type="unfinished">Parameter %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Parameter davor einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Parameter danach einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Parameter entfernen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Parameter kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Parameter ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Parameter einfügen</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Move param</source>
+        <translation type="unfinished">Parameter verschieben</translation>
+    </message>
+</context>
+<context>
+    <name>PhpParamsDialog</name>
+    <message>
+        <location line="+1778"/>
+        <source>Php parameters dialog</source>
+        <translation type="unfinished">Php parameters dialog</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>PhpParamsTable</name>
+    <message>
+        <location line="-515"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ref.</source>
+        <translation type="unfinished">Ref.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>array</source>
+        <translation type="unfinished">array</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>param %1</source>
+        <translation type="unfinished">Parameter %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Parameter davor einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Parameter danach einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Parameter entfernen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Parameter kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Parameter ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Parameter einfügen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Parameter verschieben</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Set rank &lt;i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>PinCanvas</name>
+    <message>
+        <location filename="../diagram/PinCanvas.cpp" line="+390"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit pin</source>
+        <translation type="unfinished">Pin bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Klasse in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <location line="+25"/>
+        <source>pin color</source>
+        <translation type="unfinished">Farbe (Pin)</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>PinDialog</name>
+    <message>
+        <location filename="../dialog/PinDialog.cpp" line="+66"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Pin dialog</source>
+        <translation type="unfinished">Pin dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name :</source>
+        <translation type="unfinished">Name :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>direction :</source>
+        <translation type="unfinished">direction :</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>   multiplicity : </source>
+        <translation type="unfinished">   multiplicity : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordering : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   effect : </source>
+        <translation type="unfinished">   effect : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>in state : </source>
+        <translation type="unfinished">in state : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>is_control</source>
+        <translation type="unfinished">is_control</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unique</source>
+        <translation type="unfinished">unique</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>standard</source>
+        <translation type="unfinished">standard</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>exception</source>
+        <translation type="unfinished">Exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>stream</source>
+        <translation type="unfinished">Stream</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+91"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>selection : </source>
+        <translation type="unfinished">Auswahl : </translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <location line="+29"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>An input pin cannot be an exception.
+</source>
+        <translation type="unfinished">An input pin cannot be an exception.
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only in and inout pin may have a delete effect.</source>
+        <translation type="unfinished">Only in and inout pin may have a delete effect.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only out, inout and return pin may have a create effect.</source>
+        <translation type="unfinished">Only out, inout and return pin may have a create effect.</translation>
+    </message>
+</context>
+<context>
+    <name>PseudoStateCanvas</name>
+    <message>
+        <location filename="../diagram/PseudoStateCanvas.cpp" line="+611"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">draw vertically</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">draw horizontally</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit pseudo state</source>
+        <translation type="unfinished">Pseudozustand bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <location line="+24"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>PseudoStateDialog</name>
+    <message>
+        <location filename="../dialog/PseudoStateDialog.cpp" line="+78"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>reference :</source>
+        <translation type="unfinished">reference :</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Choose pseudo state selected in browser</source>
+        <translation type="unfinished">Choose pseudo state selected in browser</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>PythonParamsDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="+768"/>
+        <source>Python parameters dialog</source>
+        <translation type="unfinished">Python parameters dialog</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>PythonParamsTable</name>
+    <message>
+        <location line="-473"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modifier</source>
+        <translation type="unfinished">Modifier</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+184"/>
+        <source>param %1</source>
+        <translation type="unfinished">Parameter %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Parameter davor einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Parameter danach einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Parameter entfernen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Parameter kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Parameter ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Parameter einfügen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Parameter verschieben</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Set rank &lt;i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../CustomWidgets/quickedit.cpp" line="+128"/>
+        <source>Quick Edit</source>
+        <translation type="unfinished">Quick Edit</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivity.cpp" line="+192"/>
+        <location line="+31"/>
+        <location line="+182"/>
+        <source>enter activity&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Aktivitätsdiagramm : </translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>enter parameter&apos;s name : </source>
+        <translation type="unfinished">Parametername : </translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <source>the activity</source>
+        <translation type="unfinished">the activity</translation>
+    </message>
+    <message>
+        <location line="+212"/>
+        <location filename="../misc/Settings.cpp" line="+1915"/>
+        <location line="+79"/>
+        <source>activity</source>
+        <translation type="unfinished">Aktivität</translation>
+    </message>
+    <message>
+        <location line="+249"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+260"/>
+        <location line="+9"/>
+        <location line="+17"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+288"/>
+        <location line="+26"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+197"/>
+        <location line="+9"/>
+        <location line="+17"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+182"/>
+        <location line="+9"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1777"/>
+        <location line="+18"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+166"/>
+        <location line="+9"/>
+        <location filename="../browser/BrowserPin.cpp" line="+237"/>
+        <location line="+9"/>
+        <location filename="../diagram/ArrowPointCanvas.cpp" line="+231"/>
+        <location line="+5"/>
+        <location filename="../diagram/CodObjCanvas.cpp" line="+96"/>
+        <location line="+11"/>
+        <location line="+3"/>
+        <location filename="../diagram/DiagramView.cpp" line="-1620"/>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="+170"/>
+        <location line="+5"/>
+        <location filename="../diagram/HubCanvas.cpp" line="+140"/>
+        <location line="+12"/>
+        <location line="+3"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="+266"/>
+        <location line="+5"/>
+        <location filename="../diagram/LabelCanvas.cpp" line="+347"/>
+        <location line="+5"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+201"/>
+        <location line="+8"/>
+        <location line="+3"/>
+        <location filename="../diagram/SdLostFoundMsgSupportCanvas.cpp" line="+145"/>
+        <location line="+7"/>
+        <location filename="../diagram/SdObjCanvas.cpp" line="+84"/>
+        <location line="+5"/>
+        <location filename="../diagram/TemplateCanvas.cpp" line="+195"/>
+        <location line="+5"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+308"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+741"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+307"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+444"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+596"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+881"/>
+        <location filename="../browser/BrowserClass.cpp" line="+2267"/>
+        <location line="+56"/>
+        <location line="+716"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1072"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+564"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+569"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+325"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+774"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+741"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+679"/>
+        <location filename="../browser/BrowserNode.cpp" line="+677"/>
+        <location line="+647"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-447"/>
+        <location line="+81"/>
+        <location line="+14"/>
+        <location line="+762"/>
+        <location line="+244"/>
+        <location line="+166"/>
+        <location line="+238"/>
+        <location line="+35"/>
+        <location line="+268"/>
+        <location line="+15"/>
+        <location line="+17"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+275"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+698"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+522"/>
+        <location filename="../browser/BrowserState.cpp" line="+924"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+489"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1080"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+946"/>
+        <location filename="../main.cpp" line="+211"/>
+        <location filename="../misc/Images.cpp" line="+64"/>
+        <location filename="../misc/myio.cpp" line="+875"/>
+        <location line="+19"/>
+        <location line="+22"/>
+        <location line="+70"/>
+        <location line="+16"/>
+        <location line="+19"/>
+        <location line="+16"/>
+        <location line="+31"/>
+        <location line="+28"/>
+        <location line="+28"/>
+        <location line="+103"/>
+        <location line="+49"/>
+        <location line="+91"/>
+        <location line="+40"/>
+        <location line="+32"/>
+        <location line="+25"/>
+        <location line="+178"/>
+        <location line="+30"/>
+        <location line="+63"/>
+        <location line="+67"/>
+        <location line="+7"/>
+        <location line="+202"/>
+        <location line="+6"/>
+        <location line="+12"/>
+        <location line="+20"/>
+        <location line="+26"/>
+        <location line="+6"/>
+        <location line="+26"/>
+        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+6"/>
+        <location line="+13"/>
+        <location line="+17"/>
+        <location line="+6"/>
+        <location line="+29"/>
+        <location line="+42"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+0"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+0"/>
+        <location filename="../browser/BrowserClass.cpp" line="-772"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+0"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+0"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+0"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+0"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+0"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserNode.cpp" line="-695"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-983"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+0"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+0"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserState.cpp" line="+0"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+0"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+0"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+0"/>
+        <source>Forbidden</source>
+        <translation type="unfinished">Unzulässig</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityAction.cpp" line="-768"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="-374"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="-471"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="-6"/>
+        <location filename="../browser/BrowserParameter.cpp" line="-281"/>
+        <location filename="../browser/BrowserPin.cpp" line="-6"/>
+        <source>not in the same activity</source>
+        <translation type="unfinished">nicht in derselben Aktivität</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <location line="+27"/>
+        <location line="+22"/>
+        <location line="+22"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+123"/>
+        <source>enter activity action&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">Bezeichnung für Aktion
+(kann leer bleiben) : </translation>
+    </message>
+    <message>
+        <location line="-89"/>
+        <source>New pin</source>
+        <translation type="unfinished">Neuer Pin</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Pin&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New parameter set</source>
+        <translation type="unfinished">Neuer Parametersatz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;Parameter Set&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Parametersatz&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+238"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+108"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+102"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="-370"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="-546"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+287"/>
+        <location filename="../browser/BrowserClass.cpp" line="-1612"/>
+        <location line="+41"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+284"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-821"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+225"/>
+        <location filename="../browser/BrowserComponent.cpp" line="-268"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+228"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-370"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+231"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="-159"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-564"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+30"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-512"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+150"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+216"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-448"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+226"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+648"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+32"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+160"/>
+        <location filename="../browser/BrowserPin.cpp" line="+33"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-278"/>
+        <location filename="../browser/BrowserRegion.cpp" line="-349"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+508"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+236"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+246"/>
+        <location filename="../browser/BrowserState.cpp" line="-574"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="-268"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+228"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+220"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-832"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+239"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="-82"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+130"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-143"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt; %1 &lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt; %1 &lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+20"/>
+        <location filename="../browser/BrowserClass.cpp" line="-38"/>
+        <location line="+41"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+3"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+26"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+6"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+6"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+7"/>
+        <source>Duplicate</source>
+        <translation type="unfinished">Duplizieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+1"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+1"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+1"/>
+        <source>to copy the &lt;i&gt;%1&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;%1&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select  %1</source>
+        <translation type="unfinished">Select  %1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+4"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+6"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+10"/>
+        <location filename="../browser/BrowserClass.cpp" line="-38"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+5"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+12"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+6"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+12"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+6"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+12"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+3"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+32"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+3"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+3"/>
+        <location filename="../browser/BrowserPin.cpp" line="+5"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+4"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+6"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+24"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+5"/>
+        <location filename="../browser/BrowserState.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+10"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+5"/>
+        <source>Delete</source>
+        <translation type="unfinished">Löschen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+90"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="-5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+84"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+7"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+7"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+15"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="-22"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+5"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+8"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+15"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+8"/>
+        <source>Referenced by</source>
+        <translation type="unfinished">wird referenziert von</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt;                                          through a flow or dependency</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt;                                          through a flow or dependency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+3"/>
+        <location filename="../browser/BrowserState.cpp" line="+3"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+3"/>
+        <source>the %1</source>
+        <translation type="unfinished">the %1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+6"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+9"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+8"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+9"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+18"/>
+        <location filename="../browser/BrowserClass.cpp" line="+57"/>
+        <location filename="../browser/BrowserClassDiagram.cpp" line="+248"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+9"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+54"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+9"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+13"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+9"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+66"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+9"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+8"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+12"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+8"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+8"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+34"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1461"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+9"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+8"/>
+        <location filename="../browser/BrowserPin.cpp" line="+8"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+9"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+25"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+12"/>
+        <location filename="../browser/BrowserState.cpp" line="+6"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+6"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+8"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+9"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-705"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="+104"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+5"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+8"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+5"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+5"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+4"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+7"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+7"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+16"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+4"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+5"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+5"/>
+        <source>Undelete</source>
+        <translation type="unfinished">Löschen rückgängig</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+1"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+1"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+1"/>
+        <source>to undelete the &lt;i&gt;%1&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;%1&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+7"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+7"/>
+        <location filename="../browser/BrowserClass.cpp" line="+10"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+3"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+3"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+3"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserState.cpp" line="+6"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+3"/>
+        <source>Undelete recursively</source>
+        <translation type="unfinished">Rekursives wiederherstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to undelete the &lt;i&gt;%1&lt;/i&gt; and its &lt;i&gt;pins&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt; (except if the element at the other side is also deleted)</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;%1&lt;/i&gt; and its &lt;i&gt;pins&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt; (except if the element at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="-121"/>
+        <location line="+147"/>
+        <source>enter activity diagram&apos;s name : </source>
+        <translation type="unfinished">enter activity diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-33"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-34"/>
+        <source>Show</source>
+        <translation type="unfinished">Anzeigen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to show and edit the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;activity diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-67"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-25"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-79"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-30"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+8"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to set how the &lt;i&gt;activity diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;activity diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;activity diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity diagram&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity diagram&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the activity diagram</source>
+        <translation type="unfinished">the activity diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;activity diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Activity diagram</source>
+        <translation type="unfinished">Aktivitätsdiagramm</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+174"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+503"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+132"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+125"/>
+        <source>activity color</source>
+        <translation type="unfinished">Farbe (Aktivität)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity region color</source>
+        <translation type="unfinished">Farbe (Aktivitätsbereich)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity partition color</source>
+        <translation type="unfinished">Farbe (Partition)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity action color</source>
+        <translation type="unfinished">Farbe (Aktivitätsaktion)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>parameter and pin color</source>
+        <translation type="unfinished">Farbe (Parameter und Pin)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-11"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+139"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+137"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+70"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+137"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+139"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+139"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-16"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+138"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+138"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-13"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+140"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-14"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+43"/>
+        <location line="+62"/>
+        <source>note color</source>
+        <translation type="unfinished">Farbe (Hinweis)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+2"/>
+        <source>package color</source>
+        <translation type="unfinished">Farbe (Paket)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>fragment color</source>
+        <translation type="unfinished">Farbe (Fragment)</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>activity diagram</source>
+        <translation type="unfinished">Aktivitätsdiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityNode.cpp" line="-165"/>
+        <location filename="../browser/BrowserParameter.cpp" line="-72"/>
+        <location filename="../browser/BrowserPin.cpp" line="-77"/>
+        <source>can&apos;t have outgoing flow</source>
+        <translation type="unfinished">can&apos;t have outgoing flow</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>can&apos;t have several outgoing flows</source>
+        <translation type="unfinished">can&apos;t have several outgoing flows</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>initial node can&apos;t have incoming flow</source>
+        <translation type="unfinished">initial node can&apos;t have incoming flow</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+40"/>
+        <source>fork can&apos;t have several incoming flow</source>
+        <translation type="unfinished">fork can&apos;t have several incoming flow</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+26"/>
+        <source>an input parameter can&apos;t have incoming flows</source>
+        <translation type="unfinished">an input parameter can&apos;t have incoming flows</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+3"/>
+        <source>parameter can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">parameter can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>pin can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">pin can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>can&apos;t have incoming data flow</source>
+        <translation type="unfinished">can&apos;t have incoming data flow</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-29"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="-29"/>
+        <source>to edit the &lt;i&gt;%1&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;%1&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+10"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+10"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt; through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt; through a flow</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityObject.cpp" line="-94"/>
+        <location line="+33"/>
+        <location line="+84"/>
+        <source>enter activity object&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">enter activity object&apos;s 
+name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>to edit the &lt;i&gt;activity object&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity object&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;activity object&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;activity object&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity object&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity object&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;activity object&lt;/i&gt;                                                                           through a flow or dependency</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;activity object&lt;/i&gt;                                                                           through a flow or dependency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the activity object</source>
+        <translation type="unfinished">the activity object</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity object&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Aktivitätsobjekt&lt;/i&gt; wiederherstellen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the &lt;i&gt;activity object&lt;/i&gt; and its &lt;i&gt;expansion nodes&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt;(except if the element at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;activity object&lt;/i&gt; and its &lt;i&gt;expansion nodes&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt;(except if the element at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>activity object</source>
+        <translation type="unfinished">Aktivitätsobjekt</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="-101"/>
+        <location line="+34"/>
+        <location line="+97"/>
+        <source>enter activity partition&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">Bezeichnung für Partition
+(kann leer bleiben) : </translation>
+    </message>
+    <message>
+        <location line="-70"/>
+        <source>New sub activity partition</source>
+        <translation type="unfinished">Neue untergeordnete Partition</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a sub &lt;i&gt;activity partition&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;untergeordnete Partition&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;activity partition&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity partition&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;activity partition&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">&lt;i&gt;Partition&lt;/i&gt; in eine neue Partition kopieren</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity partition&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity partition&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;partition&lt;/i&gt;</source>
+        <translation type="unfinished">Referenzen auf &lt;i&gt;Partition&lt;/i&gt; bestimmen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the activity partition</source>
+        <translation type="unfinished">the activity partition</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity partition&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Partition wiederherstellen&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the activity partition and its children</source>
+        <translation type="unfinished">Partition mit Kindelementen wiederherstellen</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>activity partition</source>
+        <translation type="unfinished">Partition</translation>
+    </message>
+    <message>
+        <location line="+174"/>
+        <location filename="../browser/BrowserClass.cpp" line="+1422"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+196"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+453"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+389"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+911"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+297"/>
+        <location filename="../browser/BrowserState.cpp" line="+512"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+661"/>
+        <source>move </source>
+        <translation type="unfinished">verschieben </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserClass.cpp" line="+2"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+2"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+2"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+4"/>
+        <location filename="../browser/BrowserState.cpp" line="+2"/>
+        <source>In </source>
+        <translation type="unfinished">In </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClass.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+1"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+2"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <source>After </source>
+        <translation type="unfinished">Nach </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserArtifact.cpp" line="-136"/>
+        <location filename="../browser/BrowserComponent.cpp" line="-331"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1623"/>
+        <source>already exist</source>
+        <translation type="unfinished">bereits vorhanden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+3"/>
+        <source>circular inheritance</source>
+        <translation type="unfinished">circular inheritance</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>to edit the &lt;i&gt;artifact&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;artifact&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;artifact&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;artifact&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location filename="../browser/BrowserClass.cpp" line="-1484"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-145"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-118"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+138"/>
+        <source>Generate</source>
+        <translation type="unfinished">Codeerzeugung</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+31"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+49"/>
+        <source>Roundtrip body</source>
+        <translation type="unfinished">Roundtrip body</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>C++ header file</source>
+        <translation type="unfinished">C++ Headerdatei</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ source file</source>
+        <translation type="unfinished">C++ Quelldatei</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Java source file</source>
+        <translation type="unfinished">Java Quelldatei</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Php source file</source>
+        <translation type="unfinished">PHP Quelldatei</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Python source file</source>
+        <translation type="unfinished">Python Quelldatei</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Idl source file</source>
+        <translation type="unfinished">Idl Quelldatei</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+30"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+27"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-5"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-10"/>
+        <source>Roundtrip</source>
+        <translation type="unfinished">Roundtrip</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>See file</source>
+        <translation type="unfinished">See file</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;artifact&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;artifact&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the artifact</source>
+        <translation type="unfinished">the artifact</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;artifact&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;artifact&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select the associated class</source>
+        <translation type="unfinished">Select the associated class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select the associated &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+12"/>
+        <source>Select an associated class</source>
+        <translation type="unfinished">Select an associated class</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+12"/>
+        <source>to select an associated &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select an associated &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+156"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+38"/>
+        <location line="+19"/>
+        <source>Choose class</source>
+        <translation type="unfinished">Klasse auswählen</translation>
+    </message>
+    <message>
+        <location line="+188"/>
+        <source>artifact</source>
+        <translation type="unfinished">artifact</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>choose existing artifact</source>
+        <translation type="unfinished">choose existing artifact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+17"/>
+        <source>enter artifact&apos;s name : </source>
+        <translation type="unfinished">enter artifact&apos;s name : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserAttribute.cpp" line="-51"/>
+        <location filename="../browser/BrowserOperation.cpp" line="-89"/>
+        <source>Up</source>
+        <translation type="unfinished">Up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+1"/>
+        <source>to return to parent node</source>
+        <translation type="unfinished">to return to parent node</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;item&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;item&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to edit the &lt;i&gt;attribute&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;attribute&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-44"/>
+        <source>New get operation</source>
+        <translation type="unfinished">Neuen Getter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;get operation&lt;/i&gt;</source>
+        <translation type="unfinished">to auto define the &lt;i&gt;get operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+3"/>
+        <source>New set operation</source>
+        <translation type="unfinished">Neuen Setter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;set operation&lt;/i&gt;</source>
+        <translation type="unfinished">to auto define the &lt;i&gt;set operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+3"/>
+        <source>New get and set operation</source>
+        <translation type="unfinished">Neue Getter/Setter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;get&lt;/i&gt; and &lt;i&gt;set operation&lt;/i&gt;s</source>
+        <translation type="unfinished">to auto define the &lt;i&gt;get&lt;/i&gt; and &lt;i&gt;set operation&lt;/i&gt;s</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to copy the &lt;i&gt;attribute&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;attribute&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;item&lt;/i&gt;.                                        Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;item&lt;/i&gt;.                                        Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to delete the &lt;i&gt;attribute&lt;/i&gt;.                                             Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;attribute&lt;/i&gt;.                                             Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>the attribute</source>
+        <translation type="unfinished">the attribute</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;item&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;item&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to undelete the &lt;i&gt;attribute&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;attribute&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+154"/>
+        <source>attribute</source>
+        <translation type="unfinished">Attribut</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClass.cpp" line="-240"/>
+        <source>Implement whole </source>
+        <translation type="unfinished">Implement whole </translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Add item</source>
+        <translation type="unfinished">Element hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;item&lt;/i&gt; to the &lt;i&gt;enum&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Element&lt;/i&gt; zur &lt;i&gt;Aufzählung&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add attribute</source>
+        <translation type="unfinished">Attribut hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;attribute&lt;/i&gt; to the </source>
+        <translation type="unfinished">&lt;i&gt;Attribut&lt;/i&gt; hinzufügen zu </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add operation</source>
+        <translation type="unfinished">Operation hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;operation&lt;/i&gt; to the </source>
+        <translation type="unfinished">&lt;i&gt;Operation&lt;/i&gt; hinzufügen zu </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+27"/>
+        <source>Add inherited operation</source>
+        <translation type="unfinished">Geerbte Operartion hinzufügen</translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+27"/>
+        <source>to redefine an inherited &lt;i&gt;operation&lt;/i&gt; in the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to redefine an inherited &lt;i&gt;operation&lt;/i&gt; in the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>Choose operation to add it</source>
+        <translation type="unfinished">Choose operation to add it</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Add nested class</source>
+        <translation type="unfinished">Add nested class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;nested class&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;nested class&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Add extra member</source>
+        <translation type="unfinished">Add extra member</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;extra member&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;extra member&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+41"/>
+        <source>to edit the </source>
+        <translation type="unfinished">to edit the </translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+41"/>
+        <source>to duplicate the </source>
+        <translation type="unfinished">to duplicate the </translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <source>to delete the </source>
+        <translation type="unfinished">to delete the </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Create source artifact</source>
+        <translation type="unfinished">Create source artifact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt; in the &lt;i&gt;deployment view&lt;/i&gt; associated to the &lt;i&gt;class view&lt;/i&gt;, this artifact will contain the generated code of the class</source>
+        <translation type="unfinished">to add a &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt; in the &lt;i&gt;deployment view&lt;/i&gt; associated to the &lt;i&gt;class view&lt;/i&gt;, this artifact will contain the generated code of the class</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Select associated artifact</source>
+        <translation type="unfinished">Select associated artifact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt;</source>
+        <translation type="unfinished">to select the associated &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select associated component</source>
+        <translation type="unfinished">Select associated component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select the &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Choose component</source>
+        <translation type="unfinished">Komponente auswählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select an associated component</source>
+        <translation type="unfinished">Select an associated component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select a &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select a &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>to know who reference the </source>
+        <translation type="unfinished">to know who reference the </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the class</source>
+        <translation type="unfinished">the class</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+10"/>
+        <source>undelete the </source>
+        <translation type="unfinished">undelete the </translation>
+    </message>
+    <message>
+        <location line="+265"/>
+        <location line="+1199"/>
+        <location line="+30"/>
+        <source>enter class&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Klasse : </translation>
+    </message>
+    <message>
+        <location line="-1199"/>
+        <source>Choose inherited operation</source>
+        <translation type="unfinished">Choose inherited operation</translation>
+    </message>
+    <message>
+        <location line="+238"/>
+        <source>enter item&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Element : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>enter attribute&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Attribut : </translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>enter operation&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Operation : </translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location line="+11"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <source>read only</source>
+        <translation type="unfinished">nur lesender Zugriff</translation>
+    </message>
+    <message>
+        <location line="-47"/>
+        <source>typedef can&apos;t generalize / realize several times</source>
+        <translation type="unfinished">typedef can&apos;t generalize / realize several times</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>a typedef can&apos;t have relation</source>
+        <translation type="unfinished">a typedef can&apos;t have relation</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+858"/>
+        <source>an union can&apos;t generalize / realize</source>
+        <translation type="unfinished">an union can&apos;t generalize / realize</translation>
+    </message>
+    <message>
+        <location line="-828"/>
+        <source>can&apos;t have anchor between classes</source>
+        <translation type="unfinished">can&apos;t have anchor between classes</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <location filename="../misc/Settings.cpp" line="-1463"/>
+        <source>class</source>
+        <translation type="unfinished">Klasse</translation>
+    </message>
+    <message>
+        <location line="+697"/>
+        <source>enter stereotype&apos;s name : </source>
+        <translation type="unfinished">enter stereotype&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>one of the two classes is not a stereotype</source>
+        <translation type="unfinished">one of the two classes is not a stereotype</translation>
+    </message>
+    <message>
+        <location line="+653"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1905"/>
+        <location filename="../misc/myio.cpp" line="-734"/>
+        <source>Error while writting in
+%1
+may be your disk is full</source>
+        <translation type="unfinished">Fehler beim Schreiben in
+%1
+Möglicherweise ist der Datenträger voll</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassDiagram.cpp" line="-6"/>
+        <source>the class diagram</source>
+        <translation type="unfinished">der klassendiagramm</translation>
+    </message>
+    <message>
+        <location line="+167"/>
+        <source>class diagram</source>
+        <translation type="unfinished">Klassendiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassInstance.cpp" line="-28"/>
+        <source>to edit the &lt;i&gt;class instance&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;class instance&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;class instance&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;class instance&lt;/i&gt;.                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;class instance&lt;/i&gt;.                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;class instance&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;class instance&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the class instance</source>
+        <translation type="unfinished">the class instance</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;class instance&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <source>class instance</source>
+        <translation type="unfinished">Klasseninstanz</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+50"/>
+        <source>enter class instance&apos;s name (may be empty) : </source>
+        <translation type="unfinished">enter class instance&apos;s name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>choose existing instance : </source>
+        <translation type="unfinished">choose existing instance : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassView.cpp" line="-167"/>
+        <source>enter class view&apos;s name : </source>
+        <translation type="unfinished">enter class view&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>New stereotype</source>
+        <translation type="unfinished">New stereotype</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;stereotype&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;stereotype&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-813"/>
+        <source>New class diagram</source>
+        <translation type="unfinished">Neues Klassendiagramm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;class diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-5"/>
+        <source>New sequence diagram</source>
+        <translation type="unfinished">Neues Sequenzdiagramm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New communication diagram</source>
+        <translation type="unfinished">Neues Kommunikationsdiagramm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;communication diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+3"/>
+        <source>New object diagram</source>
+        <translation type="unfinished">Neues Objektdiagramm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;object diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+6"/>
+        <source>New class</source>
+        <translation type="unfinished">Neue Klasse</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New class instance</source>
+        <translation type="unfinished">Neue Klasseninstanz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;class instance&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New state machine</source>
+        <translation type="unfinished">Neuer Zustandsautomat</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;state machine&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;state machine&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New activity</source>
+        <translation type="unfinished">Neue Aktivität</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;activity&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;class view&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;class view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit class settings</source>
+        <translation type="unfinished">Klasseneinstellungen bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to set the sub classes&apos;s settings</source>
+        <translation type="unfinished">to set the sub classes&apos;s settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to set how the sub &lt;i&gt;class diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the sub &lt;i&gt;class diagrams&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;class view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;class view&lt;/i&gt; and its sub items. Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the class view</source>
+        <translation type="unfinished">the class view</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>undelete the &lt;i&gt;class view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;class view&lt;/i&gt;. Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;class view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;class view&lt;/i&gt; and its sub items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select associated deployment view</source>
+        <translation type="unfinished">Select associated deployment view</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;deployment view&lt;/i&gt;</source>
+        <translation type="unfinished">to select the associated &lt;i&gt;deployment view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+92"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1382"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+147"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+4"/>
+        <source>class color</source>
+        <translation type="unfinished">Farbe (Klasse)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+6"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-9"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-2"/>
+        <source>duration color</source>
+        <translation type="unfinished">Farbe (Dauer)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>continuation color</source>
+        <translation type="unfinished">Farbe (Fortsetzung)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-4"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+2"/>
+        <source>state color</source>
+        <translation type="unfinished">Farbe (Zustand)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>state action color</source>
+        <translation type="unfinished">state action color</translation>
+    </message>
+    <message>
+        <location line="+252"/>
+        <source>class view</source>
+        <translation type="unfinished">Klassensicht</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-234"/>
+        <location line="+148"/>
+        <source>enter communication diagram&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Kommunikationsdiagramm : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Kommunikationsdiagramm&lt;/i&gt; anzeigen und bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Kommunikationsdiagramm&lt;/i&gt; bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;communication diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">festlegen, wie die Elemente des &lt;i&gt;Kommunikationsdiagramms&lt;/i&gt; dargestellt werden sollen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Kommunikationsdiagramm&lt;/i&gt; duplizieren</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;communication diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;communication diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the communication diagram</source>
+        <translation type="unfinished">der kommunikationsdiagramm</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Löschen des &lt;i&gt;Kommunikationsdiagramms&lt;/i&gt; rückgängig machen</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Communication diagram</source>
+        <translation type="unfinished">Kommunikationsdiagramm</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-2"/>
+        <source>class instance 
+color</source>
+        <translation type="unfinished">Farbe
+(Klasseninstanz)</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>communication diagram</source>
+        <translation type="unfinished">Kommunikationsdiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponent.cpp" line="-37"/>
+        <source>Select the %1 class</source>
+        <translation type="unfinished">Select the %1 class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the %1 &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select the %1 &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+16"/>
+        <source>Select a %1 class</source>
+        <translation type="unfinished">Select a %1 class</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <location line="+16"/>
+        <source>to select a %1 &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select a %1 &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>New nested component</source>
+        <translation type="unfinished">New nested component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;nested component&lt;/i&gt; to the &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;nested component&lt;/i&gt; to the &lt;i&gt;component&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to edit the &lt;i&gt;component&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;component&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;component&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;component&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;component&lt;/i&gt; through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;component&lt;/i&gt; through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the component</source>
+        <translation type="unfinished">the component</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;component&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the &lt;i&gt;component&lt;/i&gt; and its nested &lt;i&gt;components&lt;/i&gt; and &lt;i&gt;relations&lt;/i&gt; (except if the component at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;component&lt;/i&gt; and its nested &lt;i&gt;components&lt;/i&gt; and &lt;i&gt;relations&lt;/i&gt; (except if the component at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <location filename="../misc/Settings.cpp" line="+844"/>
+        <location line="+198"/>
+        <source>component</source>
+        <translation type="unfinished">Komponente</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>choose existing component</source>
+        <translation type="unfinished">choose existing component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+16"/>
+        <source>enter component&apos;s name : </source>
+        <translation type="unfinished">enter component&apos;s name : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="-238"/>
+        <location line="+150"/>
+        <source>enter component diagram&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Komponentendiagramm : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Komponentendiagramm&lt;/i&gt; anzeigen und bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Komponentendiagramm&lt;/i&gt; bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;component diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">festlegen, wie die Elemente des &lt;i&gt;Komponentendiagramms&lt;/i&gt; dargestellt werden sollen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Komponentendiagramm&lt;/i&gt; duplizieren</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;component diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;component diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the component diagram</source>
+        <translation type="unfinished">der komponentendiagramm</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Löschen des &lt;i&gt;Komponentendiagramms&lt;/i&gt; rückgängig machen</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Component diagram</source>
+        <translation type="unfinished">Komponentendiagramm</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-3"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+89"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-4"/>
+        <source>component color</source>
+        <translation type="unfinished">Farbe (Komponente)</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>component diagram</source>
+        <translation type="unfinished">Komponentendiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponentView.cpp" line="-156"/>
+        <source>enter component view&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Komponentensicht : </translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source>New component diagram</source>
+        <translation type="unfinished">Neues Komponentendiagramm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Komponentendiagramm&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New component</source>
+        <translation type="unfinished">Neue Komponente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Komponente&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;component view&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Komponentensicht&lt;/i&gt; bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to set how the sub &lt;i&gt;component diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">Anzeigeeinstellungen für das untergeordnete &lt;i&gt;Komponentendiagramm&lt;/i&gt; bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;component view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">&lt;i&gt;Komponentensicht&lt;/i&gt; und untergeordnete Elemente löschen. Hinweis: Der Vorgang kann rückgängig gemacht werden</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the component view</source>
+        <translation type="unfinished">the component view</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>undelete the &lt;i&gt;component view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">Löschen der &lt;i&gt;Komponentensicht&lt;/i&gt; rückgängig machen ohne Wiederherstellung untergeordneter Elemente</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;component view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">Löschen der &lt;i&gt;Komponentensicht&lt;/i&gt; rückgängig machen mit Wiederherstellung untergeordneter Elemente</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <location line="+109"/>
+        <source>Component view</source>
+        <translation type="unfinished">Komponentensicht</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>component view</source>
+        <translation type="unfinished">Komponentensicht</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-237"/>
+        <location line="+149"/>
+        <source>enter deployment diagram&apos;s name : </source>
+        <translation type="unfinished">enter deployment diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;deployment diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;deployment diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;deployment diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;deployment diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the deployment diagram</source>
+        <translation type="unfinished">the deployment diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Deployment diagram</source>
+        <translation type="unfinished">Verteilungsdiagramm</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <source>artifact color</source>
+        <translation type="unfinished">artifact color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <source>node color</source>
+        <translation type="unfinished">Farbe (Knoten)</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>deployment diagram</source>
+        <translation type="unfinished">Verteilungsdiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="-26"/>
+        <source>to edit the &lt;i&gt;node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;node&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;node&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;node&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;node&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the node</source>
+        <translation type="unfinished">the node</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;node&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;node&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+66"/>
+        <source>Node</source>
+        <translation type="unfinished">Knoten</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>node</source>
+        <translation type="unfinished">Knoten</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+18"/>
+        <source>enter node&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Knoten eingeben : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-229"/>
+        <source>enter deployment view&apos;s name : </source>
+        <translation type="unfinished">enter deployment view&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>New deployment diagram</source>
+        <translation type="unfinished">New deployment diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New node</source>
+        <translation type="unfinished">Neuer Knoten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;node&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;node&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New artifact</source>
+        <translation type="unfinished">New artifact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;artifact&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;artifact&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;deployment view&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;deployment view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to set how the sub &lt;i&gt;deployment diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the sub &lt;i&gt;deployment diagrams&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items. Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the deployment view</source>
+        <translation type="unfinished">the deployment view</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>undelete the &lt;i&gt;deployment view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;deployment view&lt;/i&gt;. Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+214"/>
+        <source>Deployment view</source>
+        <translation type="unfinished">Verteilungssicht</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>deployment view</source>
+        <translation type="unfinished">Verteilungssicht</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="-150"/>
+        <location line="+168"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-298"/>
+        <source>enter expansion node&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">enter expansion node&apos;s 
+name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>expansion node can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">expansion node can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>expansion node can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">expansion node can&apos;t accept data flow (is &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;expansion node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;expansion node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;expansion node&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;expansion node&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;expansion node&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;expansion node&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;expansion node&lt;/i&gt;                                                                               through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;expansion node&lt;/i&gt;                                                                               through a flow</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the expansion node</source>
+        <translation type="unfinished">the expansion node</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;expansion node&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;expansion node&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <source>Expansion Node</source>
+        <translation type="unfinished">Expansion Node</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>expansion node</source>
+        <translation type="unfinished">expansion node</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-259"/>
+        <location line="+33"/>
+        <location line="+106"/>
+        <source>enter expansion region&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">enter expansion region&apos;s 
+name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-86"/>
+        <source>New expansion node</source>
+        <translation type="unfinished">New expansion node</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;expansion node&lt;/i&gt; to the &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;expansion node&lt;/i&gt; to the &lt;i&gt;expansion region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New nested expansion region</source>
+        <translation type="unfinished">New nested expansion region</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-435"/>
+        <source>to add a nested &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">untergeordneten &lt;i&gt;Erweiterungsbereich&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New interruptible activity region</source>
+        <translation type="unfinished">Neuer unterbrechbarer Aktivitätsbereich</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;interruptible activity region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>Add activity action</source>
+        <translation type="unfinished">Aktivitätsaktion hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity action&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Aktivitätsaktion&lt;/i&gt; zum &lt;i&gt;Bereich&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>Add object node</source>
+        <translation type="unfinished">Objektknoten hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity object node&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Aktivitätsobjektknoten&lt;/i&gt; zur &lt;i&gt;Region&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;expansion region&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;expansion region&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;expansion region&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;expansion region&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;expansion region&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;expansion region&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="-12"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+20"/>
+        <source>to know who reference the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the expansion region</source>
+        <translation type="unfinished">the expansion region</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;expansion region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the expansion region and its children</source>
+        <translation type="unfinished">undelete the expansion region and its children</translation>
+    </message>
+    <message>
+        <location line="+197"/>
+        <source>expansion region</source>
+        <translation type="unfinished">expansion region</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExtraMember.cpp" line="-26"/>
+        <source>to edit the &lt;i&gt;extra member&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;extra member&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;extra member&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;extra member&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;extra member&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;extra member&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>the extra member</source>
+        <translation type="unfinished">the extra member</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;extra member&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;extra member&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <source>extra member</source>
+        <translation type="unfinished">extra member</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserFlow.cpp" line="-122"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-376"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-157"/>
+        <location filename="../browser/BrowserTransition.cpp" line="-137"/>
+        <source>from</source>
+        <translation type="unfinished">von</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-2"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+2"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+2"/>
+        <source>to</source>
+        <translation type="unfinished">zu</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>to edit the &lt;i&gt;flow&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;flow&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;flow&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;flow&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+120"/>
+        <source>Select </source>
+        <translation type="unfinished">Auswählen </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+143"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+1"/>
+        <source>to select the destination</source>
+        <translation type="unfinished">Ziel auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>the flow</source>
+        <translation type="unfinished">the flow</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;flow&lt;/i&gt;                                          (except if the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;flow&lt;/i&gt;                                          (except if the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+110"/>
+        <source>flow</source>
+        <translation type="unfinished">flow</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-88"/>
+        <location line="+141"/>
+        <source>enter interruptible activity 
+region&apos;s name (may be empty) : </source>
+        <translation type="unfinished">Bezeichnung für unterbrechbare Aktivität
+(kann leer bleiben) : </translation>
+    </message>
+    <message>
+        <location line="-107"/>
+        <source> enter interruptible activity 
+region&apos;s name (may be empty) : </source>
+        <translation type="unfinished"> Bezeichnung für unterbrechbare Aktivität
+(kann leer bleiben) : </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>New nested interruptible activity region</source>
+        <translation type="unfinished">Neuer eingebetteter Aktivitätsbereich</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a nested &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">neuen eingebetteten &lt;i&gt;unterbrechbaren Aktivitätsbereich&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New expansion region</source>
+        <translation type="unfinished">Neuer Erweiterungsbereich</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>to edit the &lt;i&gt;interruptible activity region&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;interruptible activity region&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;interruptible activity region&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;interruptible activity region&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;interruptible activity region&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;interruptible activity region&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the interruptible activity region</source>
+        <translation type="unfinished">the interruptible activity region</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;interruptible activity region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the interruptible activity region and its children</source>
+        <translation type="unfinished">undelete the interruptible activity region and its children</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>interruptible activity region</source>
+        <translation type="unfinished">unterbrechbarer Aktivitätsbereich</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserNode.cpp" line="-608"/>
+        <source> cannot be deleted because :</source>
+        <translation type="unfinished"> cannot be deleted because :</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>%1 is read-only</source>
+        <translation type="unfinished">%1 ist im nur-lesenden Zugriff</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>%1 referenced by the read-only component %2</source>
+        <translation type="unfinished">%1 referenced by the read-only component %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 referenced by the read-only artifact %2</source>
+        <translation type="unfinished">%1 referenced by the read-only artifact %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 is the target of the read-only relation %2</source>
+        <translation type="unfinished">%1 is the target of the read-only relation %2</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Some items cannot be undeleted</source>
+        <translation type="unfinished">Einige Elemente können nicht wiederhergestellt werden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Some items are renamed</source>
+        <translation type="unfinished">Einige Elemente werden umbenannt</translation>
+    </message>
+    <message>
+        <location line="+536"/>
+        <source>already generalize / realize</source>
+        <translation type="unfinished">already generalize / realize</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>can&apos;t have circular generalization / realization</source>
+        <translation type="unfinished">can&apos;t have circular generalization / realization</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <source>to recurcivelly duplicate the marked items into %1</source>
+        <translation type="unfinished">to recurcivelly duplicate the marked items into %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to recurcivelly duplicate the marked items after %1</source>
+        <translation type="unfinished">to recurcivelly duplicate the marked items after %1</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>to unmark %1</source>
+        <translation type="unfinished">to unmark %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to unmark all the marked items</source>
+        <translation type="unfinished">Alle Markierungen von gewählten Elementen aufheben</translation>
+    </message>
+    <message>
+        <location line="+433"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+104"/>
+        <source>illegal name or already used</source>
+        <translation type="unfinished">ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <source>nothing available</source>
+        <translation type="unfinished">nothing available</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Empty name</source>
+        <translation type="unfinished">Leere Namen</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Nonunicode name</source>
+        <translation type="unfinished">Nicht Unicode-Namen</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Name starting with witespace</source>
+        <translation type="unfinished">Nennen mit Leerzeichen beginnen</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+12"/>
+        <source>Name containing illegal character: </source>
+        <translation type="unfinished">Namen enthält illegale Zeichen:</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Name already used</source>
+        <translation type="unfinished">Name bereits verwendet</translation>
+    </message>
+    <message>
+        <location line="+490"/>
+        <source>&lt;p&gt;&lt;b&gt;Warning, the model is not consistent because some elements have
+the same internal identifier.&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Users working on the same project have the same use identifier,
+or you had change the model files, or used Project synchro
+without following the mandatory rules&lt;/p&gt;
+</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;Warning, the model is not consistent because some elements have
+the same internal identifier.&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Users working on the same project have the same use identifier,
+or you had change the model files, or used Project synchro
+without following the mandatory rules&lt;/p&gt;
+</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>These elements was &lt;b&gt;removed&lt;/b&gt;</source>
+        <translation type="unfinished">These elements was &lt;b&gt;removed&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The internal identifier of these elements was changed,
+but &lt;u&gt;I can&apos;t garantee the references to them are the right one&lt;/u&gt;,
+check your model</source>
+        <translation type="unfinished">The internal identifier of these elements was changed,
+but &lt;u&gt;I can&apos;t garantee the references to them are the right one&lt;/u&gt;,
+check your model</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-235"/>
+        <location line="+147"/>
+        <source>enter object diagram&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Objektdiagramm : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Objektdiagramm&lt;/i&gt; anzeigen und bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Objektdiagramm&lt;/i&gt; bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;object diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;object diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;object diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;object diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;object diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the object diagram</source>
+        <translation type="unfinished">das Objektdiagramm</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;object diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+137"/>
+        <source>Object diagram</source>
+        <translation type="unfinished">Objektdiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserOperation.cpp" line="+4"/>
+        <source>Add constructor initializer</source>
+        <translation type="unfinished">Add constructor initializer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;operation&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit C++ body</source>
+        <translation type="unfinished">C++-Quellcode bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its C++ body</source>
+        <translation type="unfinished">&lt;i&gt;Operation&lt;/i&gt; und deren C++-Quellode bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Java body</source>
+        <translation type="unfinished">Java-Quellcode bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Java body</source>
+        <translation type="unfinished">&lt;i&gt;Operation&lt;/i&gt; und deren Java-Quellcode bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Php body</source>
+        <translation type="unfinished">PHP-Quellcode bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Php body</source>
+        <translation type="unfinished">&lt;i&gt;Operation&lt;/i&gt; und deren PHP-Quellcode bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Python body</source>
+        <translation type="unfinished">Python-Quellcode bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Python body</source>
+        <translation type="unfinished">&lt;i&gt;Operation&lt;/i&gt; und deren Python-Quellcode bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;operation&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">&lt;i&gt;Operation&lt;/i&gt; in eine neue Operation kopieren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add implementing activity</source>
+        <translation type="unfinished">Implementierende Aktivität hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Aktivität&lt;/i&gt;, die diese &lt;i&gt;Operation&lt;/i&gt; implementiert, hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add implementing state</source>
+        <translation type="unfinished">Implementierenden Zustand hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;state&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Zustand&lt;/i&gt;, der diese &lt;i&gt;Operation&lt;/i&gt; implementiert, hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">Referenzen auf die &lt;i&gt;Operation&lt;/i&gt; bestimmen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select implementing behavior</source>
+        <translation type="unfinished">Implementierendes Verhalten auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select a &lt;i&gt;state&lt;/i&gt; or &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Zustand&lt;/i&gt; oder &lt;i&gt;Aktivität&lt;/i&gt;, welche(r) diese Operation implementiert, auswählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Choose behavior</source>
+        <translation type="unfinished">Verhalten festlegen</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to delete the &lt;i&gt;operation&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;operation&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>the operation</source>
+        <translation type="unfinished">die Operation</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to undelete the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Operation&lt;/i&gt; wiederherstellen</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>operation</source>
+        <translation type="unfinished">Operation</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPackage.cpp" line="-791"/>
+        <source>New package</source>
+        <translation type="unfinished">Neues Paket</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new sub &lt;i&gt;package&lt;/i&gt;</source>
+        <translation type="unfinished">to add a new sub &lt;i&gt;package&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New use case view</source>
+        <translation type="unfinished">Neue Anwendungssicht</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;use case view&lt;/i&gt;</source>
+        <translation type="unfinished">to add a new &lt;i&gt;use case view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <location filename="../diagram/UmlWindow.cpp" line="+797"/>
+        <source>to set how an Uml type is compiled in C++ etc...,to set the default parameter passing, to set the default codeproduced for an attribute etc..., and to set the root directories</source>
+        <translation type="unfinished">to set how an Uml type is compiled in C++ etc...,to set the default parameter passing, to set the default codeproduced for an attribute etc..., and to set the root directories</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>the package</source>
+        <translation type="unfinished">das Paket</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Reverse</source>
+        <translation type="unfinished">UML-Erzeugung aus Code</translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>Question</source>
+        <translation type="unfinished">Frage</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../dialog/PackageDialog.cpp" line="+1"/>
+        <source>Propagate the removal of the profile ?</source>
+        <translation type="unfinished">Propagate the removal of the profile ?</translation>
+    </message>
+    <message>
+        <location line="+351"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-4"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-5"/>
+        <source>subject color</source>
+        <translation type="unfinished">subject color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-3"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-3"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-3"/>
+        <source>use case color</source>
+        <translation type="unfinished">Farbe (Anwendungsfall)</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>choose existing package : </source>
+        <translation type="unfinished">existierendes Paket auswählen : </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>enter profile&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Profil : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>enter package&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Paket : </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Do you want to be the owner of this new package ?
+(other users can&apos;t modify it while you are the owner)</source>
+        <translation type="unfinished">Eigentum für das Paket übernehmen?
+(andere Benutzer können das Paket nicht verändern, solange Sie Eigentümer sind)</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>The project is modified and need to be saved first.
+If you don&apos;t want to save your modifications reload
+the project then ask again for the update
+
+Save it to perform update ?
+</source>
+        <translation type="unfinished">Das Projekt wurde verändert und muß zuerst gespeichert werden.
+Falls die Änderungen nicht übernommen werden sollen, laden Sie das Projekt und
+starten Sie die Aktualisierung erneut.
+
+Speichern zum Durchführen der Aktualisierung?
+</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>file &apos;%1&apos; is read only, update aborted</source>
+        <translation type="unfinished">Datei &apos;%1&apos; ist im nur-lesen Zugriff, Aktualisierung abgebrochen</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>you didn&apos;t select project &apos;%1&apos;</source>
+        <translation type="unfinished">Projekt &apos;%1&apos; ist nicht ausgewählt worden</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>package</source>
+        <translation type="unfinished">Paket</translation>
+    </message>
+    <message>
+        <location line="+949"/>
+        <location filename="../misc/myio.cpp" line="-9"/>
+        <location line="+169"/>
+        <source>Cannot create file
+</source>
+        <translation type="unfinished">Kann Datei nicht erstellen
+</translation>
+    </message>
+    <message>
+        <location line="+406"/>
+        <source>cannot be read</source>
+        <translation type="unfinished">Fehler beim Lesen</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+293"/>
+        <source>Your version of DOUML is too old to read this project</source>
+        <translation type="unfinished">Your version of DOUML is too old to read this project</translation>
+    </message>
+    <message>
+        <location line="-283"/>
+        <source>Sorry, the imported project has a too old format.
+To change its format : load this project and save it.</source>
+        <translation type="unfinished">Das importierte Projekt liegt in einem veralteten Format vor.
+Um das Format zu aktualisieren, laden und speichern Sie das Projekt.</translation>
+    </message>
+    <message>
+        <location line="+267"/>
+        <source>can&apos;t read project file</source>
+        <translation type="unfinished">Projekt kann nicht gelesen werden</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>can&apos;t find project file</source>
+        <translation type="unfinished">Projekt kann nicht gefunden werden</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserParameter.cpp" line="+1"/>
+        <source>parameter can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">parameter can&apos;t accept data flow (is &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;parameter&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;parameter&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;parameter&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;parameter&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;parameter&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;parameter&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;parameter&lt;/i&gt;                                                                               through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;parameter&lt;/i&gt;                                                                               through a flow</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the parameter</source>
+        <translation type="unfinished">der Parameter</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;parameter&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;parameter&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>parameter</source>
+        <translation type="unfinished">parameter</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserParameterSet.cpp" line="-25"/>
+        <source>to edit the &lt;i&gt;parameter set&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;parameter set&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;parameter set&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;parameter set&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;parameter set&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;parameter set&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;parameter set&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;parameter set&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the parameter set</source>
+        <translation type="unfinished">the parameter set</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;parameter set&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;parameter set&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>parameter set</source>
+        <translation type="unfinished">Parametersatz</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPin.cpp" line="-36"/>
+        <source>enter pin&apos;s name
+(may be empty) : </source>
+        <translation type="unfinished">enter pin&apos;s name
+(may be empty) : </translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>target pin can&apos;t have incoming flow</source>
+        <translation type="unfinished">target pin can&apos;t have incoming flow</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>target pin can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">target pin can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>target pin can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">target pin can&apos;t accept data flow (is &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;pin&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;pin&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to copy the &lt;i&gt;pin&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;pin&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;pin&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;pin&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;pin&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the pin</source>
+        <translation type="unfinished">the pin</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to undelete the &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;pin&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>pin</source>
+        <translation type="unfinished">pin</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-171"/>
+        <source>can&apos;t have transition</source>
+        <translation type="unfinished">can&apos;t have transition</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>can&apos;t have several transition</source>
+        <translation type="unfinished">can&apos;t have several transition</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>can&apos;t have a transition to initial pseudo state</source>
+        <translation type="unfinished">can&apos;t have a transition to initial pseudo state</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>fork can&apos;t have several input transitions</source>
+        <translation type="unfinished">fork can&apos;t have several input transitions</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+34"/>
+        <location line="+106"/>
+        <location filename="../browser/BrowserState.cpp" line="-465"/>
+        <source>enter </source>
+        <translation type="unfinished">enter </translation>
+    </message>
+    <message>
+        <location line="-140"/>
+        <location line="+34"/>
+        <location line="+106"/>
+        <location filename="../browser/BrowserState.cpp" line="+0"/>
+        <source>&apos;s name : </source>
+        <translation type="unfinished">&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>already have a deep history</source>
+        <translation type="unfinished">already have a deep history</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>already have a shallow history</source>
+        <translation type="unfinished">already have a shallow history</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt; through a transition</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt; through a transition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the </source>
+        <translation type="unfinished">the </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserRegion.cpp" line="-331"/>
+        <location filename="../browser/BrowserState.cpp" line="-101"/>
+        <location line="+7"/>
+        <source>New state</source>
+        <translation type="unfinished">Neuer Zustand</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;region&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;region&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;region&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;region&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>the region</source>
+        <translation type="unfinished">der Bereich</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">um den &lt;i&gt;Bereich&lt;/i&gt; wiederherzustellen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the region and its children</source>
+        <translation type="unfinished">undelete the region and its children</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location line="+16"/>
+        <source>Region</source>
+        <translation type="unfinished">Bereich</translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+665"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+551"/>
+        <source>In %1</source>
+        <translation type="unfinished">In %1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>After %1</source>
+        <translation type="unfinished">After %1</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserRelation.cpp" line="+10"/>
+        <source>because &lt;b&gt;%1&lt;/b&gt; cannot (or already) inherit on &lt;b&gt;%2&lt;/b&gt;</source>
+        <translation type="unfinished">because &lt;b&gt;%1&lt;/b&gt; cannot (or already) inherit on &lt;b&gt;%2&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+342"/>
+        <source>to edit the &lt;i&gt;relation&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;relation&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to copy the &lt;i&gt;relation&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;relation&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-4"/>
+        <source>to know who reference the &lt;i&gt;relation&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;relation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;relation&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;relation&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+2"/>
+        <source>select </source>
+        <translation type="unfinished">auswählen </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to select the destination class</source>
+        <translation type="unfinished">to select the destination class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+3"/>
+        <source>the relation</source>
+        <translation type="unfinished">the relation</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>undelete the &lt;i&gt;relation&lt;/i&gt;                                          (except if the class at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;relation&lt;/i&gt;                                          (except if the class at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+125"/>
+        <location filename="../data/RelationData.cpp" line="+390"/>
+        <source>relation</source>
+        <translation type="unfinished">relation</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-240"/>
+        <location line="+153"/>
+        <source>enter sequence diagram&apos;s name : </source>
+        <translation type="unfinished">enter sequence diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;sequence diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;sequence diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;sequence diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;sequence diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the sequence diagram</source>
+        <translation type="unfinished">das Sequenzdiagramm</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+139"/>
+        <source>Sequence diagram</source>
+        <translation type="unfinished">Sequenzdiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-143"/>
+        <source>to edit the &lt;i&gt;relation&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;relation&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;relation&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;relation&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>undelete the &lt;i&gt;relation&lt;/i&gt; (except if the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;relation&lt;/i&gt; (except if the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserState.cpp" line="-98"/>
+        <location line="+33"/>
+        <source>enter state&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Zustand : </translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>New state diagram</source>
+        <translation type="unfinished">Neues Zustandsdiagramm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Zustandsdiagramm&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New submachine</source>
+        <translation type="unfinished">Neuer eingebetteter Zustandsautomat</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;submachine&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</source>
+        <translation type="unfinished">neuen &lt;i&gt;eingebetteten Zustandsautomaten&lt;/i&gt; dem &lt;i&gt;Automaten&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</source>
+        <translation type="unfinished">neuen &lt;i&gt;Zustand&lt;/i&gt; dem &lt;i&gt;Automaten&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New nested state</source>
+        <translation type="unfinished">Neuer untergeordneter Zustand</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;nested state&lt;/i&gt; to the &lt;i&gt;state&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;untergeordneten Zustand&lt;/i&gt; dem &lt;i&gt;Zustand&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;submachine&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Zustand&lt;/i&gt; dem &lt;i&gt;eingebetteten Zustandsautomaten&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New region</source>
+        <translation type="unfinished">Neuer Bereich</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Bereich&lt;/i&gt; hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;%1&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;%1&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;state&lt;/i&gt;                                                                           through a transition or a reference</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;state&lt;/i&gt;                                                                           through a transition or a reference</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>undelete the %1 and its children</source>
+        <translation type="unfinished">undelete the %1 and its children</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <location line="+136"/>
+        <source>state machine</source>
+        <translation type="unfinished">Zustandsautomat</translation>
+    </message>
+    <message>
+        <location line="-133"/>
+        <source>state submachine</source>
+        <translation type="unfinished">eingebetteter Zustandsautomat</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+134"/>
+        <location filename="../misc/Settings.cpp" line="+133"/>
+        <location line="+89"/>
+        <source>state</source>
+        <translation type="unfinished">Zustand</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>state machine reference</source>
+        <translation type="unfinished">state machine reference</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserStateAction.cpp" line="+118"/>
+        <source>receive-signal action</source>
+        <translation type="unfinished">receive-signal action</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>send-signal action</source>
+        <translation type="unfinished">send-signal action</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>state action</source>
+        <translation type="unfinished">Zustandsaktion</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-239"/>
+        <location line="+153"/>
+        <source>enter state diagram&apos;s name : </source>
+        <translation type="unfinished">enter state diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>to show and edit the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;state diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;state diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;state diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;state diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the state diagram</source>
+        <translation type="unfinished">das Zustandsdiagramm</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>to undelete the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>State diagram</source>
+        <translation type="unfinished">Zustandsdiagramm</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>state diagram</source>
+        <translation type="unfinished">Zustandsdiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserTransition.cpp" line="-18"/>
+        <source>to edit the &lt;i&gt;transition&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">&lt;i&gt;Übergang&lt;/i&gt; bearbeiten, alternativ mittels Doppelklick mit der linken Maustaste</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;transition&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">&lt;i&gt;Übergang&lt;/i&gt; löschen. Hinweis: Der Vorgang kann rückgängig gemacht werden</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>to know who reference the &lt;i&gt;transition&lt;/i&gt;</source>
+        <translation type="unfinished">Referenzen auf den &lt;i&gt;Übergang&lt;/i&gt; bestimmen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the transition</source>
+        <translation type="unfinished">der Übergang</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;transition&lt;/i&gt; (except if the other side is also deleted)</source>
+        <translation type="unfinished">Löschen des &lt;i&gt;Übergangs&lt;/i&gt; rückgängig machen (Ausnahme: die Gegenseite wurde ebenfalls gelöscht)</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>transition</source>
+        <translation type="unfinished">Übergang</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCase.cpp" line="-822"/>
+        <source>New use case diagram</source>
+        <translation type="unfinished">New use case diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>New use case</source>
+        <translation type="unfinished">Neuer Anwendungsfall</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;use case&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;use case&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New actor</source>
+        <translation type="unfinished">New actor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;actor&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;actor&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to edit the &lt;i&gt;use case&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;use case&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../diagram/UmlWindow.cpp" line="+17"/>
+        <source>to set how the sub &lt;i&gt;diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the sub &lt;i&gt;diagrams&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;use case and its sub items&lt;/i&gt;.                                                      Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;use case and its sub items&lt;/i&gt;.                                                      Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>to know who reference the &lt;i&gt;use case&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;use case&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the use case</source>
+        <translation type="unfinished">der Anwendungsfall</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;use case&lt;/i&gt;.                                          Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;use case&lt;/i&gt;.                                          Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;use case&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;use case&lt;/i&gt; and its sub items</translation>
+    </message>
+    <message>
+        <location line="+290"/>
+        <location line="+16"/>
+        <source>enter use case&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Anwendungsfall eingeben : </translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../misc/Settings.cpp" line="-523"/>
+        <source>use case</source>
+        <translation type="unfinished">Anwendungsfall</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-236"/>
+        <location line="+147"/>
+        <source>enter use case diagram&apos;s name : </source>
+        <translation type="unfinished">Bezeichnung für Anwendungsfalldiagramm eingeben : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;use case diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;use case diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;use case diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;use case diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the use case diagram</source>
+        <translation type="unfinished">das Anwendungsfalldiagramm</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+142"/>
+        <source>Use Case diagram</source>
+        <translation type="unfinished">Anwendungsfalldiagramm</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-777"/>
+        <source>enter use case view&apos;s name : </source>
+        <translation type="unfinished">enter use case view&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>the use case view</source>
+        <translation type="unfinished">the use case view</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <location line="+197"/>
+        <location line="+10"/>
+        <source>Use case view</source>
+        <translation type="unfinished">Use case view</translation>
+    </message>
+    <message>
+        <location filename="../data/OperationData.cpp" line="+0"/>
+        <source>Expected nparams instead of </source>
+        <translation type="unfinished">Expected nparams instead of </translation>
+    </message>
+    <message>
+        <location filename="../diagram/ActivityDiagramWindow.cpp" line="-214"/>
+        <source>Click this button to add an &lt;i&gt;activity&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;activity&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;interruptible activity region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the interruptible activity region from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;interruptible activity region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the interruptible activity region from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;expansion region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the expansion region from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;expansion region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the expansion region from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;activity partition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity partition from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;activity partition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity partition from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Click this button to add an &lt;i&gt;initial node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;initial node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;activity final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;activity final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;activity final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;activity final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;flow final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;flow final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;decision node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;decision node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;decision node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;decision node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;merge node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;merge node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;merge node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;merge node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add an &lt;i&gt;action&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;action&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;object node&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;object node&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;flow&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;flow&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ArrowPointCanvas.cpp" line="-27"/>
+        <source>Line break</source>
+        <translation type="unfinished">Zeilenumbruch</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="+19"/>
+        <location filename="../diagram/HubCanvas.cpp" line="-39"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="+8"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+12"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location filename="../diagram/BrowserView.cpp" line="+74"/>
+        <source>browser          </source>
+        <translation type="unfinished">Browser          </translation>
+    </message>
+    <message>
+        <location filename="../diagram/CdClassCanvas.cpp" line="-176"/>
+        <source>Choose operation to edit</source>
+        <translation type="unfinished">Choose operation to edit</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Choose inherited operation to add it</source>
+        <translation type="unfinished">Choose inherited operation to add it</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ClassDiagramWindow.cpp" line="+49"/>
+        <source>Click this button to add a &lt;i&gt;class&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;class&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;package&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the package from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;package&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the package from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Click this button to create a &lt;i&gt;dependency&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;dependency&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to create an &lt;i&gt;unidirectional association&lt;/i&gt; or an &lt;i&gt;extension&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create an &lt;i&gt;unidirectional association&lt;/i&gt; or an &lt;i&gt;extension&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create an &lt;i&gt;aggregation&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create an &lt;i&gt;aggregation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;composition&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;composition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;directional aggregation&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;directional aggregation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;directional composition&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;directional composition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;realization&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;realization&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+120"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+103"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class</source>
+        <translation type="unfinished">Add Class</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+25"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+8"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+24"/>
+        <source>Generalisation</source>
+        <translation type="unfinished">Generalisation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Realize</source>
+        <translation type="unfinished">Realize</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Abhängigkeit</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-12"/>
+        <location line="+6"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Association / Extension</source>
+        <translation type="unfinished">Directional Association / Extension</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Aggregation</source>
+        <translation type="unfinished">Aggregation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Composition</source>
+        <translation type="unfinished">Composition</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Aggregation</source>
+        <translation type="unfinished">Gerichtete Aggregation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Composition</source>
+        <translation type="unfinished">Gerichtete Komposition</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+98"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+18"/>
+        <source>Note</source>
+        <translation type="unfinished">Notiz</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor / Class association</source>
+        <translation type="unfinished">Anchor / Class association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+14"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-19"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+12"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="-15"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+7"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ColDiagramWindow.cpp" line="-82"/>
+        <source>Click this button to add a &lt;i&gt;link&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;link&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;self link&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;self link&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ComponentDiagramWindow.cpp" line="-99"/>
+        <source>Click this button to add a &lt;i&gt;component&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the component from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;component&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the component from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Click this button to show an interface required by a &lt;i&gt;component&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to show an interface required by a &lt;i&gt;component&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to show an interface provided by a &lt;i&gt;component&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to show an interface provided by a &lt;i&gt;component&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DeploymentDiagramWindow.cpp" line="-123"/>
+        <source>Click this button to add a &lt;i&gt;node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the node from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the node from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add a &lt;i&gt;network&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;network&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;network connexion/ending&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;network connexion/ending&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;artifact&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;artifact&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramItem.cpp" line="+175"/>
+        <source>some elements already present in the diagram are NOT paste</source>
+        <translation type="unfinished">some elements already present in the diagram are NOT paste</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramView.cpp" line="+583"/>
+        <source>Multiple selection menu</source>
+        <translation type="unfinished">Menü für Mehrfachauswahl</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>align top</source>
+        <translation type="unfinished">oben ausrichten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align bottom</source>
+        <translation type="unfinished">unten ausrichten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align left</source>
+        <translation type="unfinished">links ausrichten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align right</source>
+        <translation type="unfinished">rechts ausrichten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center</source>
+        <translation type="unfinished">zentriert ausrichten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center verticaly</source>
+        <translation type="unfinished">vertikal zentriert ausrichten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center horizontaly</source>
+        <translation type="unfinished">horizontal zentriert ausrichten</translation>
+    </message>
+    <message>
+        <location line="+1507"/>
+        <source>SVG file (*.svg)</source>
+        <translation type="unfinished">SVG-Datei (Scalable Vector Graphics) (*.svg)</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PNG file (*.png)</source>
+        <translation type="unfinished">PNG-Datei (Portable Network Graphics) (*.png)</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramWindow.cpp" line="-82"/>
+        <source>Enter a new scale value or use the arrows to change the &lt;i&gt;scale&lt;/i&gt;</source>
+        <translation type="unfinished">Enter a new scale value or use the arrows to change the &lt;i&gt;scale&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to compute the &lt;i&gt;fit scale&lt;/i&gt; allowing to try to show all the diagram</source>
+        <translation type="unfinished">Click this button to compute the &lt;i&gt;fit scale&lt;/i&gt; allowing to try to show all the diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to compute the smallest window size allowing to show all the diagram</source>
+        <translation type="unfinished">Click this button to compute the smallest window size allowing to show all the diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to call the diagram menu like on a right mouse click done out of any element</source>
+        <translation type="unfinished">Click this button to call the diagram menu like on a right mouse click done out of any element</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>optimal scale</source>
+        <translation type="unfinished">Optimale Skalierung</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>optimal window size</source>
+        <translation type="unfinished">Optimale Fenstergröße</translation>
+    </message>
+    <message>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="-2"/>
+        <source>Separator</source>
+        <translation type="unfinished">Trennlinie</translation>
+    </message>
+    <message>
+        <location filename="../diagram/HubCanvas.cpp" line="-2"/>
+        <source>Network connexion</source>
+        <translation type="unfinished">Netzwerkverbindung</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ImageCanvas.cpp" line="+2"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+193"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="-114"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+10"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+10"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ObjectDiagramWindow.cpp" line="-74"/>
+        <source>Click this button to add a &lt;i&gt;link&lt;/i&gt; between instances</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;link&lt;/i&gt; between instances</translation>
+    </message>
+    <message>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="-5"/>
+        <source>Life line</source>
+        <translation type="unfinished">Lebenslinie</translation>
+    </message>
+    <message>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="-198"/>
+        <source>Click this button to add a modeled &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class instance from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a modeled &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class instance from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Click this button to send a &lt;i&gt;synchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Button anklicken, um &lt;i&gt;synchrone Nachricht&lt;/i&gt; hinzuzufügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send an &lt;i&gt;asynchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Button anklicken, um &lt;i&gt;asynchrone Nachricht&lt;/i&gt; hinzuzufügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;reflexive synchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;reflexive synchronous message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;reflexive asynchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;reflexive asynchronous message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;synchronous lost message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;synchronous lost message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;asynchronous lost message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;asynchronous lost message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;synchronous found message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;synchronous found message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;asynchronous found message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;asynchronous found message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;explicitly return&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;explicitly return&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;explicit reflexive return&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;explicit reflexive return&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;text&lt;/i&gt;</source>
+        <translation type="unfinished">Button anklicken, um &lt;i&gt;Text&lt;/i&gt; hinzuzufügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;continuation&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;continuation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Add modeled Class instance</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Add Class instance</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Continuation</source>
+        <translation type="unfinished">Add Continuation</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous message</source>
+        <translation type="unfinished">Synchrone Nachricht</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous message</source>
+        <translation type="unfinished">Asynchrone Nachricht</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous Reflexive message</source>
+        <translation type="unfinished">Synchronous Reflexive message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous Reflexive message</source>
+        <translation type="unfinished">Asynchronous Reflexive message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous found message</source>
+        <translation type="unfinished">Synchronous found message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous found message</source>
+        <translation type="unfinished">Asynchronous found message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous lost message</source>
+        <translation type="unfinished">Synchronous lost message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous lost message</source>
+        <translation type="unfinished">Asynchronous lost message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Explicit return</source>
+        <translation type="unfinished">Explicit return</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Explicit reflexive return</source>
+        <translation type="unfinished">Explicit reflexive return</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-12"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anker</translation>
+    </message>
+    <message>
+        <location filename="../diagram/StateDiagramWindow.cpp" line="+45"/>
+        <source>Click this button to add a &lt;i&gt;state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the state from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the state from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Click this button to add a &lt;i&gt;entry point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;entry point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;entry point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;entry point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;exit point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;exit point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;exit point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;exit point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;initial pseudo state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial pseudo state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;initial pseudo state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial pseudo state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;final state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;final state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;final state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;final state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;terminate node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;terminate node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;terminate node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;terminate node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;deep history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;deep history&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;deep history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;deep history&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;shallow history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;shallow history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;junction&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;junction&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;junction&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;junction&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;choice&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;choice&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;choice&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;choice&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;fork&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;foek&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;fork&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;foek&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;join&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;join&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;join&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;join&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;transition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;transition&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;transition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;transition&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;region&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;region&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;receive signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;receive signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;send signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;send signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="-15"/>
+        <source>Stereotype Properties</source>
+        <translation type="unfinished">Eigenschaften von Stereotyp</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-5"/>
+        <source>Font</source>
+        <translation type="unfinished">Schriftart</translation>
+    </message>
+    <message>
+        <location filename="../diagram/TextCanvas.cpp" line="-1"/>
+        <source>Color</source>
+        <translation type="unfinished">Farbe</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>foreground</source>
+        <translation type="unfinished">Vordergrund</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>background</source>
+        <translation type="unfinished">Hintergrund</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Text color dialog</source>
+        <translation type="unfinished">Text color dialog</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UmlWindow.cpp" line="-680"/>
+        <source>To create a &lt;i&gt;new project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</source>
+        <translation type="unfinished">To create a &lt;i&gt;new project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>To create a &lt;i&gt;new project&lt;/i&gt; from an already existing one.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</source>
+        <translation type="unfinished">To create a &lt;i&gt;new project&lt;/i&gt; from an already existing one.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>To open a &lt;i&gt;project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the Project menu.</source>
+        <translation type="unfinished">To open a &lt;i&gt;project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the Project menu.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To save the project.&lt;br&gt;&lt;br&gt;You can also select the Save command from the Project menu.</source>
+        <translation type="unfinished">To save the project.&lt;br&gt;&lt;br&gt;You can also select the Save command from the Project menu.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To save all in a new project.</source>
+        <translation type="unfinished">To save all in a new project.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To print the current diagram.</source>
+        <translation type="unfinished">To print the current diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To manage or not C++ and to set or not the C++ definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not C++ and to set or not the C++ definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Java and to set or not the Java definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not Java and to set or not the Java definition to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Php and to set or not the Php definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not Php and to set or not the Php definition to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Python and to set or not the Python definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not Python and to set or not the Python definition to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not IDL and to set or not the IDL definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not IDL and to set or not the IDL definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To ask or not for a verbose code generation</source>
+        <translation type="unfinished">To ask or not for a verbose code generation</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To preserve or not the operations&apos;s body</source>
+        <translation type="unfinished">To preserve or not the operations&apos;s body</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To write the operation profile at the beginning of the temporary file when you edit an operation&apos;s body</source>
+        <translation type="unfinished">To write the operation profile at the beginning of the temporary file when you edit an operation&apos;s body</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To show or hide the &lt;i&gt;stereotypes&lt;/i&gt; in the &lt;b&gt;Browser&lt;/b&gt;.</source>
+        <translation type="unfinished">To show or hide the &lt;i&gt;stereotypes&lt;/i&gt; in the &lt;b&gt;Browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To select the &lt;i&gt;browser&lt;/i&gt; current item&apos;s parent.</source>
+        <translation type="unfinished">To select the &lt;i&gt;browser&lt;/i&gt; current item&apos;s parent.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To search an item in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">To search an item in the &lt;i&gt;browser&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To get information about items.</source>
+        <translation type="unfinished">To get information about items.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To set the point size of the base font used in the &lt;i&gt;browser&lt;/i&gt; and the diagrams.</source>
+        <translation type="unfinished">To set the point size of the base font used in the &lt;i&gt;browser&lt;/i&gt; and the diagrams.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To set the default format of the diagrams.</source>
+        <translation type="unfinished">To set the default format of the diagrams.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To select the previously selected element in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">To select the previously selected element in the &lt;i&gt;browser&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To select the next selected element in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">To select the next selected element in the &lt;i&gt;browser&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To ask or not for an auto completion (non case sensitive) in choice list (&lt;i&gt;combo box&lt;/i&gt;)</source>
+        <translation type="unfinished">To ask or not for an auto completion (non case sensitive) in choice list (&lt;i&gt;combo box&lt;/i&gt;)</translation>
+    </message>
+    <message>
+        <location line="+114"/>
+        <location line="+406"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Neu</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create from &amp;Template</source>
+        <translation type="unfinished">Aus &amp;Vorlage erstellen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Öffnen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Speichern</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save &amp;as...</source>
+        <translation type="unfinished">Speichern &amp;unter...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">S&amp;chliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">&amp;Beenden</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>to set the default stereotypes list</source>
+        <translation type="unfinished">Standard-Stereotypenliste festlegen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to set the sub classes settings</source>
+        <translation type="unfinished">to set the sub classes settings</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Nothing available while a dialog is opened</source>
+        <translation type="unfinished">Nothing available while a dialog is opened</translation>
+    </message>
+    <message>
+        <location line="+234"/>
+        <source>Do not forget to set the target languages list
+through the &apos;Languages&apos; menu
+
+If you program in Java, the Java Catalog plug-out
+will help you, use it !</source>
+        <translation type="unfinished">Nicht vergessen die Zielsprache(n) über das &apos;Sprachen&apos;-Menü
+festzulegen.
+
+Falls Sie Java-Anwendungen erstellen, kann sich das Java-Katalog plug-out als
+hilfreich erweisen, nutzen Sie es!</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cannot create directory </source>
+        <translation type="unfinished">Verzeichnis kann nicht erstellt werden </translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>The name of the project and the name of
+the directory containing it must be the same
+
+</source>
+        <translation type="unfinished">Der Name des Verzeichnisses und des darin enthaltenen Projekts
+müssen übereinstimmen
+
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Project name : </source>
+        <translation type="unfinished">Projekt : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Directory name : </source>
+        <translation type="unfinished">Verzeichnis : </translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Saving can&apos;t be done while a dialog is opened</source>
+        <translation type="unfinished">Saving can&apos;t be done while a dialog is opened</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>&apos;empty&apos; is reserved to the empty plug-out</source>
+        <translation type="unfinished">&apos;empty&apos; is reserved to the empty plug-out</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cannot create directory
+</source>
+        <translation type="unfinished">Verzeichnis kann nicht erstellt werden
+</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>The project is modified, save it ?
+</source>
+        <translation type="unfinished">Das Projekt wurde verändert. Speichern?
+</translation>
+    </message>
+    <message>
+        <location line="+371"/>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+853"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+26"/>
+        <source>Unchanged : project is read-only</source>
+        <translation type="unfinished">Unchanged : project is read-only</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; set to false.&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</source>
+        <translation type="unfinished">Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; set to false.&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; toggle is cleared !&lt;br&gt;&lt;br&gt;Next code generations will replace operations&apos;s body&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</source>
+        <translation type="unfinished">Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; toggle is cleared !&lt;br&gt;&lt;br&gt;Next code generations will replace operations&apos;s body&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Project file is read-only, new font size will not be saved, continue ?
+</source>
+        <translation type="unfinished">Project file is read-only, new font size will not be saved, continue ?
+</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Project file is read-only, default format will not be saved, continue ?
+</source>
+        <translation type="unfinished">Project file is read-only, default format will not be saved, continue ?
+</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UseCaseDiagramView.cpp" line="+121"/>
+        <source>Use case diagram menu</source>
+        <translation type="unfinished">Anwendungsfalldiagramm-Menü</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-119"/>
+        <source>Click this button to add an &lt;i&gt;actor&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;actor&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;use case&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the use case from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;use case&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the use case from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Click this button to add a &lt;i&gt;fragment&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;fragment&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;subject&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;subject&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create an &lt;i&gt;association&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create an &lt;i&gt;association&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to create a &lt;i&gt;generalisation&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;generalisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;note&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;note&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a connection between a &lt;i&gt;note&lt;/i&gt; and any other item, or between an &lt;i&gt;association&lt;/i&gt; and a &lt;i&gt;class&lt;/i&gt; in case of an &lt;i&gt;association class&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to create a connection between a &lt;i&gt;note&lt;/i&gt; and any other item, or between an &lt;i&gt;association&lt;/i&gt; and a &lt;i&gt;class&lt;/i&gt; in case of an &lt;i&gt;association class&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add an &lt;i&gt;image&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;image&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Actor</source>
+        <translation type="unfinished">Akteur</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../dialog/StereotypesDialog.cpp" line="+195"/>
+        <source>Use Case</source>
+        <translation type="unfinished">Use Case</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Subject</source>
+        <translation type="unfinished">Add Subject</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-1068"/>
+        <source>Pre
+condition : </source>
+        <translation type="unfinished">Pre
+condition : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Post
+condition : </source>
+        <translation type="unfinished">Post
+condition : </translation>
+    </message>
+    <message>
+        <location line="+285"/>
+        <location line="+25"/>
+        <location line="+922"/>
+        <location line="+13"/>
+        <location line="+62"/>
+        <location line="+13"/>
+        <source>trigger - Ocl</source>
+        <translation type="unfinished">trigger - Ocl</translation>
+    </message>
+    <message>
+        <location line="-1029"/>
+        <source>unmarshall</source>
+        <translation type="unfinished">unmarshall</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>time event</source>
+        <translation type="unfinished">time event</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+22"/>
+        <location line="+19"/>
+        <location line="+896"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <location line="+36"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <source>trigger : </source>
+        <translation type="unfinished">trigger : </translation>
+    </message>
+    <message>
+        <location line="-1031"/>
+        <location line="+12"/>
+        <location line="+923"/>
+        <location line="+12"/>
+        <location line="+63"/>
+        <location line="+12"/>
+        <source>trigger - C++</source>
+        <translation type="unfinished">trigger - C++</translation>
+    </message>
+    <message>
+        <location line="-1003"/>
+        <location line="+12"/>
+        <location line="+923"/>
+        <location line="+12"/>
+        <location line="+63"/>
+        <location line="+12"/>
+        <source>trigger - Java</source>
+        <translation type="unfinished">trigger - Java</translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+13"/>
+        <source>signal - Ocl</source>
+        <translation type="unfinished">signal - Ocl</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <source>signal : </source>
+        <translation type="unfinished">signal : </translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location line="+12"/>
+        <source>signal - C++</source>
+        <translation type="unfinished">signal - C++</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+12"/>
+        <source>signal - Java</source>
+        <translation type="unfinished">signal - Java</translation>
+    </message>
+    <message>
+        <location line="+497"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Choose behavior selected in browser</source>
+        <translation type="unfinished">Choose behavior selected in browser</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Create activity and choose it</source>
+        <translation type="unfinished">Create activity and choose it</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Create state machine and choose it</source>
+        <translation type="unfinished">Create state machine and choose it</translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <location line="+13"/>
+        <source>classifier - Ocl</source>
+        <translation type="unfinished">classifier - Ocl</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>classifier : </source>
+        <translation type="unfinished">classifier : </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location line="+20"/>
+        <source>flags - Ocl</source>
+        <translation type="unfinished">flags - Ocl</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>links</source>
+        <translation type="unfinished">links</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>owned objects</source>
+        <translation type="unfinished">owned objects</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BasicDialog.cpp" line="-49"/>
+        <location filename="../dialog/ClassDialog.cpp" line="+866"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-152"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <location filename="../dialog/ClassDialog.cpp" line="+783"/>
+        <location filename="../dialog/PackageDialog.cpp" line="+101"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BodyDialog.cpp" line="+81"/>
+        <source>Note : operation bodies preserved</source>
+        <translation type="unfinished">Note : operation bodies preserved</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can specify the editor through the environment dialog</source>
+        <translation type="unfinished">You can specify the editor through the environment dialog</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BrowserSearchDialog.cpp" line="+95"/>
+        <location filename="../dialog/ReferenceDialog.cpp" line="+160"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Markierung aufheben</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location filename="../dialog/ReferenceDialog.cpp" line="+0"/>
+        <source>Mark</source>
+        <translation type="unfinished">Markierung</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="-3428"/>
+        <location filename="../dialog/ImageDialog.cpp" line="+27"/>
+        <source>Select image</source>
+        <translation type="unfinished">Bild wählen</translation>
+    </message>
+    <message>
+        <location line="+1599"/>
+        <source>Type (C++)</source>
+        <translation type="unfinished">Typ (C++)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default value (C++)</source>
+        <translation type="unfinished">Standardwert (C++)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+72"/>
+        <location filename="../dialog/ToolDialog.cpp" line="+221"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+369"/>
+        <source>inherited class formal</source>
+        <translation type="unfinished">inherited class formal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>actual</source>
+        <translation type="unfinished">gegenwärtig</translation>
+    </message>
+    <message>
+        <location line="+147"/>
+        <source>element kind</source>
+        <translation type="unfinished">element kind</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>applicable</source>
+        <translation type="unfinished">applicable</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+22"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="+90"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+34"/>
+        <source>yes</source>
+        <translation type="unfinished">ja</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Parameterized</source>
+        <translation type="unfinished">Parameterized</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Instantiate</source>
+        <translation type="unfinished">Instantiate</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+490"/>
+        <source>follow uml</source>
+        <translation type="unfinished">follow uml</translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <source>Stereotype</source>
+        <translation type="unfinished">Stereotyp</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>source</source>
+        <translation type="unfinished">Quelle</translation>
+    </message>
+    <message>
+        <location line="+204"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Show annotation</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Edit annotation</translation>
+    </message>
+    <message>
+        <location line="+303"/>
+        <source>Set it relative to image root</source>
+        <translation type="unfinished">Set it relative to image root</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it relative to project</source>
+        <translation type="unfinished">Set it relative to project</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="-907"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-518"/>
+        <source>Set it absolute</source>
+        <translation type="unfinished">Set it absolute</translation>
+    </message>
+    <message>
+        <location line="+156"/>
+        <location filename="../misc/Images.cpp" line="+1"/>
+        <source>
+doesn&apos;t exist or is not a know image format</source>
+        <translation type="unfinished">
+existiert nicht oder ist kein bekanntes Bildformat</translation>
+    </message>
+    <message>
+        <location filename="../dialog/CodEditMsgDialog.cpp" line="+47"/>
+        <source>Communication diagram message dialog</source>
+        <translation type="unfinished">Communication diagram message dialog</translation>
+    </message>
+    <message>
+        <location filename="../dialog/DialogUtil.cpp" line="+315"/>
+        <source>Cannot open &apos;%1&apos;</source>
+        <translation type="unfinished">Cannot open &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Sub dialog(s) still opened
+If you choose &apos;Ok&apos; the dialog will be closed
+without taking into account it content</source>
+        <translation type="unfinished">Sub dialog(s) still opened
+If you choose &apos;Ok&apos; the dialog will be closed
+without taking into account it content</translation>
+    </message>
+    <message>
+        <location filename="../dialog/EdgeMenuDialog.cpp" line="+149"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location filename="../dialog/EnvDialog.cpp" line="-75"/>
+        <source>Invalid identifier, must be an integer between 2 and 127</source>
+        <translation type="unfinished">Invalid identifier, must be an integer between 2 and 127</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Invalid DEFAULT SCREEN : coordinates can&apos;t be negative</source>
+        <translation type="unfinished">Invalid DEFAULT SCREEN : coordinates can&apos;t be negative</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid DEFAULT SCREEN : the right must be greater than the left</source>
+        <translation type="unfinished">Invalid DEFAULT SCREEN : the right must be greater than the left</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid DEFAULT SCREEN : the bottom must be greater than the top</source>
+        <translation type="unfinished">Invalid DEFAULT SCREEN : the bottom must be greater than the top</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>small DEFAULT SCREEN, width less than 500 points !</source>
+        <translation type="unfinished">small DEFAULT SCREEN, width less than 500 points !</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>small DEFAULT SCREEN, height less than 500 points !</source>
+        <translation type="unfinished">small DEFAULT SCREEN, height less than 500 points !</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Invalid DEFAULT SCREENTo not specify the desktop all values must be empty or null.Else the values must be non negative, the right must be greater
+than the left, and the bottom must be greater than the top</source>
+        <translation type="unfinished">Invalid DEFAULT SCREENTo not specify the desktop all values must be empty or null.Else the values must be non negative, the right must be greater
+than the left, and the bottom must be greater than the top</translation>
+    </message>
+    <message>
+        <location line="+195"/>
+        <source>Own identifier missing or invalid</source>
+        <translation type="unfinished">Own identifier missing or invalid</translation>
+    </message>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="-1576"/>
+        <source>Types</source>
+        <translation type="unfinished">Types</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-50"/>
+        <location line="+38"/>
+        <location line="+28"/>
+        <source>Stereotypes</source>
+        <translation type="unfinished">Stereotypes</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>empty</source>
+        <translation type="unfinished">empty</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>1 space</source>
+        <translation type="unfinished">1 space</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>1 tab</source>
+        <translation type="unfinished">1 tab</translation>
+    </message>
+    <message>
+        <location line="+625"/>
+        <location line="+208"/>
+        <location line="+26"/>
+        <source>Modifiers</source>
+        <translation type="unfinished">Modifiers</translation>
+    </message>
+    <message>
+        <location line="+663"/>
+        <source>Description</source>
+        <translation type="unfinished">Description</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-1"/>
+        <source>Set it relative</source>
+        <translation type="unfinished">Set it relative</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>Directory</source>
+        <translation type="unfinished">Verzeichnis</translation>
+    </message>
+    <message>
+        <location line="+144"/>
+        <source>C++ &apos;in&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;in&apos; enum argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;out&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;out&apos; enum argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;inout&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;inout&apos; enum argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;return&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;return&apos; enum argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>C++ &apos;in&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;in&apos; argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;out&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;out&apos; argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;inout&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;inout&apos; argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;return&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;return&apos; argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+299"/>
+        <source>C++ root directory</source>
+        <translation type="unfinished">C++ root directory</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Java root directory</source>
+        <translation type="unfinished">Java root directory</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Php root directory</source>
+        <translation type="unfinished">Php root directory</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Python root directory</source>
+        <translation type="unfinished">Python root directory</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Idl root directory</source>
+        <translation type="unfinished">Idl root directory</translation>
+    </message>
+    <message>
+        <location filename="../dialog/HelpDialog.cpp" line="+63"/>
+        <source>HelpDialog : error while executing &apos;%1&apos;
+perhaps you must specify its absolute pathor set the environment variable PATH ?</source>
+        <translation type="unfinished">HelpDialog : error while executing &apos;%1&apos;
+perhaps you must specify its absolute pathor set the environment variable PATH ?</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>The documentation is too old.&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished">Die Dokumentation ist veraltet.&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The documentation isn&apos;t installed.&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished">Die Dokumentation ist nicht installiert.&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The &quot;.tar.gz&quot; or &quot;.7z&quot; archives are available here:&lt;ul&gt;&lt;li&gt;http://bouml.sourceforge.net/documentation.html&lt;/li&gt;&lt;li&gt;http://sourceforge.net/projects/douml/documentation.html&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;Extract an archive and set the environment through the Miscellaneousmenu to indicate where the directory &quot;doc&quot; is then close this dialog and redo</source>
+        <translation type="unfinished">The &quot;.tar.gz&quot; or &quot;.7z&quot; archives are available here:&lt;ul&gt;&lt;li&gt;http://bouml.sourceforge.net/documentation.html&lt;/li&gt;&lt;li&gt;http://sourceforge.net/projects/douml/documentation.html&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;Extract an archive and set the environment through the Miscellaneousmenu to indicate where the directory &quot;doc&quot; is then close this dialog and redo</translation>
+    </message>
+    <message>
+        <location filename="../dialog/KeyValueTable.cpp" line="-44"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-74"/>
+        <source>Key</source>
+        <translation type="unfinished">Key</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Wert</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do</source>
+        <translation type="unfinished">Do</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>key &apos;%1&apos; used several times</source>
+        <translation type="unfinished">key &apos;%1&apos; used several times</translation>
+    </message>
+    <message>
+        <location filename="../dialog/PackageDialog.cpp" line="+409"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <location line="+9"/>
+        <source>conflict on stereotypes</source>
+        <translation type="unfinished">conflict on stereotypes</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>C++ header directory</source>
+        <translation type="unfinished">C++-Header-Verzeichnis</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ source directory</source>
+        <translation type="unfinished">C++-Quelldatei-Verzeichnis</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Java directory</source>
+        <translation type="unfinished">Java-Verzeichnis</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Php directory</source>
+        <translation type="unfinished">PHP-Verzeichnis</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Python directory</source>
+        <translation type="unfinished">Python-Verzeichnis</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Idl directory</source>
+        <translation type="unfinished">Idl-Verzeichnis</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ReferenceDialog.cpp" line="-95"/>
+        <source> is referenced by :</source>
+        <translation type="unfinished"> is referenced by :</translation>
+    </message>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="+43"/>
+        <source>Transparent</source>
+        <translation type="unfinished">Transparent</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unknown color</source>
+        <translation type="unfinished">Unbekannte Farbe</translation>
+    </message>
+    <message>
+        <location line="+166"/>
+        <source>Diagram Drawing Settings dialog</source>
+        <translation type="unfinished">Diagram Drawing Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>diagram</source>
+        <translation type="unfinished">Diagramm</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>color</source>
+        <translation type="unfinished">Farbe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>default </source>
+        <translation type="unfinished">Standard </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>color [1]</source>
+        <translation type="unfinished">Farbe [1]</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>color [2]</source>
+        <translation type="unfinished">Farbe [2]</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unverändert&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>unlimited</source>
+        <translation type="unfinished">unbegrenzt</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-68"/>
+        <source>Command</source>
+        <translation type="unfinished">Command</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>tool display</source>
+        <translation type="unfinished">tool display</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>command</source>
+        <translation type="unfinished">command</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>shortcut </source>
+        <translation type="unfinished">shortcut </translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Shift </source>
+        <translation type="unfinished">Umschalt </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Ctrl </source>
+        <translation type="unfinished">Strg </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Alt </source>
+        <translation type="unfinished">Alt </translation>
+    </message>
+    <message>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-92"/>
+        <source>Package</source>
+        <translation type="unfinished">Package</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Class</source>
+        <translation type="unfinished">Klasse</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Artifact</source>
+        <translation type="unfinished">Artifact</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Views</source>
+        <translation type="unfinished">Views</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Diagrams</source>
+        <translation type="unfinished">Diagrams</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Activities</source>
+        <translation type="unfinished">Activities</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Others</source>
+        <translation type="unfinished">Others</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ToolDialog.cpp" line="-19"/>
+        <source>executable</source>
+        <translation type="unfinished">ausführbar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>display</source>
+        <translation type="unfinished">display</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="-77"/>
+        <source>Warning</source>
+        <translation type="unfinished">Warnung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Douml is working in transitional mode.
+ All UI improvements are yours to use,  but saving is done in the format of Bouml 4.22 which loses all new c++11 and hierarchy specifiers
+
+To suppress this warning place empty file override_transition.txt into the application folder
+To disable the mode - change compatibility_save parameter to 0 in settings.ini
+</source>
+        <translation type="unfinished">Douml is working in transitional mode.
+ All UI improvements are yours to use,  but saving is done in the format of Bouml 4.22 which loses all new c++11 and hierarchy specifiers
+
+To suppress this warning place empty file override_transition.txt into the application folder
+To disable the mode - change compatibility_save parameter to 0 in settings.ini
+</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>DO NOT CONFIRM</source>
+        <translation type="unfinished">DO NOT CONFIRM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Root mode protection
+
+This mode allows us to develop DoUML
+
+do NOT confirm to avoid a disaster !!!
+
+confirm ?</source>
+        <translation type="unfinished">Root mode protection
+
+This mode allows us to develop DoUML
+
+do NOT confirm to avoid a disaster !!!
+
+confirm ?</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>DoUML was called with wrong parameters, ignore them</source>
+        <translation type="unfinished">DoUML was called with wrong parameters, ignore them</translation>
+    </message>
+    <message>
+        <location filename="../misc/ProfiledStereotypes.cpp" line="+660"/>
+        <location line="+17"/>
+        <source>isn&apos;t in a profile</source>
+        <translation type="unfinished">ist kein Profil</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+17"/>
+        <source>is already a stereotype</source>
+        <translation type="unfinished">ist bereits ein Stereotyp</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+280"/>
+        <source>Unconsistency</source>
+        <translation type="unfinished">Inkonsistenz</translation>
+    </message>
+    <message>
+        <location line="-279"/>
+        <location line="+280"/>
+        <source>stereotype &apos;%1&apos; defined several times,
+redondant definition is not managed as a stereotype</source>
+        <translation type="unfinished">stereotype &apos;%1&apos; defined several times,
+redondant definition is not managed as a stereotype</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>Check</source>
+        <translation type="unfinished">Überprüfen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotype</source>
+        <translation type="unfinished">to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotype</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Force stereotype consistency</source>
+        <translation type="unfinished">Force stereotype consistency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to recompute all concerning the profiles</source>
+        <translation type="unfinished">to recompute all concerning the profiles</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Check recursively</source>
+        <translation type="unfinished">Check recursively</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotypes,doing down recursively</source>
+        <translation type="unfinished">to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotypes,doing down recursively</translation>
+    </message>
+    <message>
+        <location filename="../misc/Settings.cpp" line="-822"/>
+        <location line="+43"/>
+        <location line="+42"/>
+        <location line="+288"/>
+        <location line="+13"/>
+        <location line="+155"/>
+        <location line="+17"/>
+        <location line="+22"/>
+        <location line="+761"/>
+        <location line="+8"/>
+        <location line="+191"/>
+        <location line="+7"/>
+        <source>drawing language</source>
+        <translation type="unfinished">drawing language</translation>
+    </message>
+    <message>
+        <location line="-1546"/>
+        <location line="+231"/>
+        <source>drawing mode</source>
+        <translation type="unfinished">drawing mode</translation>
+    </message>
+    <message>
+        <location line="-230"/>
+        <location line="+34"/>
+        <location line="+197"/>
+        <source>show context</source>
+        <translation type="unfinished">show context</translation>
+    </message>
+    <message>
+        <location line="-230"/>
+        <source>hide attributes</source>
+        <translation type="unfinished">Attribute verstecken</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>hide operations</source>
+        <translation type="unfinished">Operationen verstecken</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>hide get/set operations</source>
+        <translation type="unfinished">Getters/Setters verstecken</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>show members full definition</source>
+        <translation type="unfinished">show members full definition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+42"/>
+        <source>show members visibility</source>
+        <translation type="unfinished">show members visibility</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show members stereotype</source>
+        <translation type="unfinished">show members stereotype</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show context in members definition</source>
+        <translation type="unfinished">show context in members definition</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show attributes multiplicity</source>
+        <translation type="unfinished">show attributes multiplicity</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>show attributes initialisation</source>
+        <translation type="unfinished">show attributes initialisation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+42"/>
+        <location line="+42"/>
+        <source>show attribute modifiers</source>
+        <translation type="unfinished">show attribute modifiers</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <location line="+42"/>
+        <source>show parameter direction</source>
+        <translation type="unfinished">show parameter direction</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show parameter name</source>
+        <translation type="unfinished">show parameter name</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>members max width</source>
+        <translation type="unfinished">members max width</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+48"/>
+        <location line="+42"/>
+        <location line="+1423"/>
+        <location line="+7"/>
+        <source>show information note</source>
+        <translation type="unfinished">show information note</translation>
+    </message>
+    <message>
+        <location line="-1518"/>
+        <location line="+9"/>
+        <location line="+38"/>
+        <location line="+42"/>
+        <location line="+117"/>
+        <location line="+146"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+117"/>
+        <location line="+11"/>
+        <location line="+310"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location line="+201"/>
+        <location line="+8"/>
+        <location line="+191"/>
+        <location line="+7"/>
+        <source>show stereotype properties</source>
+        <translation type="unfinished">show stereotype properties</translation>
+    </message>
+    <message>
+        <location line="-1513"/>
+        <source>name in tab</source>
+        <translation type="unfinished">name in tab</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+42"/>
+        <source>classes drawing mode</source>
+        <translation type="unfinished">classes drawing mode</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes attributes</source>
+        <translation type="unfinished">hide classes attributes</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes operations</source>
+        <translation type="unfinished">hide classes operations</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes get/set operations</source>
+        <translation type="unfinished">hide classes get/set operations</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>show classes members full definition</source>
+        <translation type="unfinished">show classes members full definition</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <source>show attributes initialization</source>
+        <translation type="unfinished">show attributes initialization</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+42"/>
+        <location line="+269"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+116"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+207"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>draw all relations</source>
+        <translation type="unfinished">draw all relations</translation>
+    </message>
+    <message>
+        <location line="-1403"/>
+        <location line="+43"/>
+        <source>show relation modifiers</source>
+        <translation type="unfinished">show relation modifiers</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+43"/>
+        <source>show relation visibility</source>
+        <translation type="unfinished">show relation visibility</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+40"/>
+        <location line="+455"/>
+        <location line="+131"/>
+        <location line="+127"/>
+        <location line="+103"/>
+        <location line="+114"/>
+        <location line="+217"/>
+        <location line="+209"/>
+        <source>show packages name in tab</source>
+        <translation type="unfinished">show packages name in tab</translation>
+    </message>
+    <message>
+        <location line="-1395"/>
+        <location line="+42"/>
+        <location line="+435"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <source>show classes and packages context</source>
+        <translation type="unfinished">show classes and packages context</translation>
+    </message>
+    <message>
+        <location line="-625"/>
+        <location line="+42"/>
+        <location line="+573"/>
+        <location line="+11"/>
+        <location line="+116"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+205"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>automatic labels position</source>
+        <translation type="unfinished">automatic labels position</translation>
+    </message>
+    <message>
+        <location line="-1392"/>
+        <location line="+42"/>
+        <location line="+262"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+117"/>
+        <location line="+11"/>
+        <location line="+92"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+207"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>draw shadow</source>
+        <translation type="unfinished">draw shadow</translation>
+    </message>
+    <message>
+        <location line="-1381"/>
+        <source>show classes members visibility</source>
+        <translation type="unfinished">show classes members visibility</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show classes members stereotype</source>
+        <translation type="unfinished">show classes members stereotype</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show context in classes members definition</source>
+        <translation type="unfinished">show context in classes members definition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show attribute multiplicity</source>
+        <translation type="unfinished">show attribute multiplicity</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show attribute initialization</source>
+        <translation type="unfinished">show attribute initialization</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>show operation parameter direction</source>
+        <translation type="unfinished">show operation parameter direction</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show operation parameter name</source>
+        <translation type="unfinished">show operation parameter name</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>max members width</source>
+        <translation type="unfinished">max members width</translation>
+    </message>
+    <message>
+        <location line="+266"/>
+        <location line="+13"/>
+        <source>instances drawing mode</source>
+        <translation type="unfinished">instances drawing mode</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <location line="+13"/>
+        <location line="+154"/>
+        <location line="+18"/>
+        <location line="+21"/>
+        <source>show operations full definition</source>
+        <translation type="unfinished">show operations full definition</translation>
+    </message>
+    <message>
+        <location line="-205"/>
+        <location line="+13"/>
+        <location line="+157"/>
+        <location line="+18"/>
+        <location line="+121"/>
+        <location line="+11"/>
+        <source>write name:type horizontally</source>
+        <translation type="unfinished">write name:type horizontally</translation>
+    </message>
+    <message>
+        <location line="-319"/>
+        <location line="+13"/>
+        <source>show classes context</source>
+        <translation type="unfinished">show classes context</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+15"/>
+        <source>show messages context</source>
+        <translation type="unfinished">show messages context</translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <source>sequence</source>
+        <translation type="unfinished">Sequenz</translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+18"/>
+        <location line="+22"/>
+        <source>show hierarchical rank</source>
+        <translation type="unfinished">show hierarchical rank</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <location line="+138"/>
+        <location line="+127"/>
+        <location line="+105"/>
+        <location line="+113"/>
+        <location line="+216"/>
+        <location line="+209"/>
+        <source>packages name in tab</source>
+        <translation type="unfinished">packages name in tab</translation>
+    </message>
+    <message>
+        <location line="-900"/>
+        <source>communication</source>
+        <translation type="unfinished">communication</translation>
+    </message>
+    <message>
+        <location line="+138"/>
+        <source>object</source>
+        <translation type="unfinished">Objekt</translation>
+    </message>
+    <message>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+104"/>
+        <location line="+10"/>
+        <location line="+206"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>show packages context</source>
+        <translation type="unfinished">show packages context</translation>
+    </message>
+    <message>
+        <location line="-651"/>
+        <location line="+11"/>
+        <source>class drawing mode</source>
+        <translation type="unfinished">class drawing mode</translation>
+    </message>
+    <message>
+        <location line="+205"/>
+        <source>write node instance horizontally</source>
+        <translation type="unfinished">write node instance horizontally</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+84"/>
+        <source>deployment</source>
+        <translation type="unfinished">Verteilung</translation>
+    </message>
+    <message>
+        <location line="-80"/>
+        <source>write node instances horizontally</source>
+        <translation type="unfinished">write node instances horizontally</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>draw component as icon</source>
+        <translation type="unfinished">draw component as icon</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>show component&apos;s required
+and provided interfaces</source>
+        <translation type="unfinished">show component&apos;s required
+and provided interfaces</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>show component&apos;s realizations</source>
+        <translation type="unfinished">show component&apos;s realizations</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <location line="+11"/>
+        <source>write transition horizontally</source>
+        <translation type="unfinished">write transition horizontally</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location line="+11"/>
+        <source>show transition definition</source>
+        <translation type="unfinished">show transition definition</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <location line="+8"/>
+        <source>show state activities</source>
+        <translation type="unfinished">show state activities</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>draw state&apos;s regions horizontally</source>
+        <translation type="unfinished">draw state&apos;s regions horizontally</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+11"/>
+        <source>write flow label horizontally</source>
+        <translation type="unfinished">write flow label horizontally</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location line="+11"/>
+        <source>show opaque action definition</source>
+        <translation type="unfinished">show opaque action definition</translation>
+    </message>
+    <message>
+        <location filename="../misc/mu.cpp" line="+66"/>
+        <source>                            The project is open in read-only mode because it is
+                            under the control of &apos;Project control&apos; or &apos;Project merge&apos;
+                            (the directory &apos;%1&apos; exists</source>
+        <translation type="unfinished">                            The project is open in read-only mode because it is
+                            under the control of &apos;Project control&apos; or &apos;Project merge&apos;
+                            (the directory &apos;%1&apos; exists</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+7"/>
+        <source>User Own Identifier</source>
+        <translation type="unfinished">User Own Identifier</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Can&apos;t create directory &apos;%1&apos;,
+the project is open in read-only mode</source>
+        <translation type="unfinished">Can&apos;t create directory &apos;%1&apos;,
+the project is open in read-only mode</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>It seems that you are already editing the project %1.
+
+If you&apos;re SURE that this is not the case and
+another user does not have an identifier equal
+to yours you can gain ownership of the lock.</source>
+        <translation type="unfinished">It seems that you are already editing the project %1.
+
+If you&apos;re SURE that this is not the case and
+another user does not have an identifier equal
+to yours you can gain ownership of the lock.</translation>
+    </message>
+    <message>
+        <location filename="../misc/myio.cpp" line="-927"/>
+        <source> is not a visibility</source>
+        <translation type="unfinished"> is not a visibility</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source> is not a direction</source>
+        <translation type="unfinished"> is not a direction</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source> is not a parameter effect</source>
+        <translation type="unfinished"> is not a parameter effect</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source> is not an activity action kind</source>
+        <translation type="unfinished"> is not an activity action kind</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source> is not an expansion node kind</source>
+        <translation type="unfinished"> is not an expansion node kind</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source> is not an ordering</source>
+        <translation type="unfinished"> is not an ordering</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source> is not a state</source>
+        <translation type="unfinished"> is not a state</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source> is not a class drawing mode</source>
+        <translation type="unfinished"> is not a class drawing mode</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> is not a drawing language</source>
+        <translation type="unfinished"> is not a drawing language</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> is not a context mode</source>
+        <translation type="unfinished"> is not a context mode</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source> is not a color</source>
+        <translation type="unfinished"> is not a color</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source> is not a font</source>
+        <translation type="unfinished"> is not a font</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <source> is not a canvas format</source>
+        <translation type="unfinished"> is not a canvas format</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source> is not a pseudo state kind</source>
+        <translation type="unfinished"> is not a pseudo state kind</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source> is not an activity node kind</source>
+        <translation type="unfinished"> is not an activity node kind</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source> is not a line geometry</source>
+        <translation type="unfinished"> is not a line geometry</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>
+cannot be renamed </source>
+        <translation type="unfinished">
+kann nicht umbenannt werden </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>, retry ?
+</source>
+        <translation type="unfinished">, nochmals versuchen?
+</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>
+cannot be opened for write, retry ?
+</source>
+        <translation type="unfinished">
+kann nicht zum Schreiben geöffnet werden, nochmals versuchen?
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>
+cannot be opened for read, retry ?
+</source>
+        <translation type="unfinished">
+kann nicht zum Lesen geöffnet werden, nochmals versuchen?
+</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>cannot open %1 to read it</source>
+        <translation type="unfinished">kann %1 nicht zum Lesen öffnen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>cannot create %1</source>
+        <translation type="unfinished">kann %1 nicht erstellen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>error when writing %1</source>
+        <translation type="unfinished">Fehler beim Schreiben von %1</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>error when reading %1</source>
+        <translation type="unfinished">Fehler beim Lesen von %1</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <location line="+63"/>
+        <source>%1 cannot be read</source>
+        <translation type="unfinished">%1 kann nicht gelesen werden</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Cannot save definition in
+%1
+may be your disk is full</source>
+        <translation type="unfinished">Cannot save definition in
+%1
+may be your disk is full</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source> line </source>
+        <translation type="unfinished"> Zeile </translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <source>premature end of file, string expected</source>
+        <translation type="unfinished">vorzeitiges Dateiende, Zeichenkette erwartet</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>string expected after &apos;%1&apos;</source>
+        <translation type="unfinished">Zeichenkette erwartet nach &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+20"/>
+        <source>premature end of file reading a string</source>
+        <translation type="unfinished">vorzeitiges Dateiende beim Lesen der Zeichenkette</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>premature end of file, keyword expected</source>
+        <translation type="unfinished">vorzeitiges Dateiende, Schlüsselwort erwartet</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>keyword expected after &apos;%1&apos;</source>
+        <translation type="unfinished">Schlüsselwort erwartet nach &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+44"/>
+        <source>premature end of file, &apos;%1&apos; expected</source>
+        <translation type="unfinished">vorzeitiges Dateiende, &apos;%1&apos; erwartet</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <location line="+44"/>
+        <source>&apos;%1&apos; expected rather than a string after &apos;%2&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; expected rather than a string after &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="-27"/>
+        <location line="+44"/>
+        <source>&apos;%1&apos; expected rather than &apos;%2&apos; after &apos;%3&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; expected rather than &apos;%2&apos; after &apos;%3&apos;</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>premature end of file, id expected</source>
+        <translation type="unfinished">premature end of file, id expected</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+9"/>
+        <source>id expected after &apos;%1&apos;</source>
+        <translation type="unfinished">ID erwartet nach &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>premature end of file, unsigned expected</source>
+        <translation type="unfinished">premature end of file, unsigned expected</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+13"/>
+        <source>unsigned expected after &apos;%1&apos;</source>
+        <translation type="unfinished">unsigned expected after &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>premature end of file, float expected</source>
+        <translation type="unfinished">premature end of file, float expected</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>float expected after &apos;%1&apos;</source>
+        <translation type="unfinished">float expected after &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>float expected rather than &apos;%1&apos; after &apos;%2&apos;</source>
+        <translation type="unfinished">float expected rather than &apos;%1&apos; after &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>premature end of file</source>
+        <translation type="unfinished">premature end of file</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>&apos;%1&apos; expected rather than &apos;%2&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; expected rather than &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unknown or unexpected keyword &apos;%1&apos;</source>
+        <translation type="unfinished">unknown or unexpected keyword &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>%1 unknown %2 identifier</source>
+        <translation type="unfinished">%1 unknown %2 identifier</translation>
+    </message>
+</context>
+<context>
+    <name>QuickEdit</name>
+    <message>
+        <location filename="../ui/quickedit.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Previous Item</source>
+        <translation type="unfinished">Previous Item</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Next Item</source>
+        <translation type="unfinished">Next Item</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>C++</source>
+        <translation type="unfinished">C++</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Java</source>
+        <translation type="unfinished">Java</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Python</source>
+        <translation type="unfinished">Python</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Php</source>
+        <translation type="unfinished">Php</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Idl</source>
+        <translation type="unfinished">Idl</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Operation</source>
+        <translation type="unfinished">Operation</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Parameter</source>
+        <translation type="unfinished">Parameter</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Attribut</translation>
+    </message>
+    <message>
+        <location filename="../CustomWidgets/quickedit.cpp" line="+136"/>
+        <source>Collapse/Expand</source>
+        <translation type="unfinished">Collapse/Expand</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Self</source>
+        <translation type="unfinished">Self</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Parent</source>
+        <translation type="unfinished">Parent</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move marked before</source>
+        <translation type="unfinished">Move marked before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move marked after</source>
+        <translation type="unfinished">Move marked after</translation>
+    </message>
+</context>
+<context>
+    <name>ReduceDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+103"/>
+        <location line="+25"/>
+        <source>reducer - Ocl</source>
+        <translation type="unfinished">reducer - Ocl</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordered</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>reducer :</source>
+        <translation type="unfinished">reducer :</translation>
+    </message>
+</context>
+<context>
+    <name>ReferenceDialog</name>
+    <message>
+        <location filename="../dialog/ReferenceDialog.cpp" line="-8"/>
+        <source>Referenced By dialog</source>
+        <translation type="unfinished">Referenced By dialog</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Recompute</source>
+        <translation type="unfinished">Neu berechnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Markierung aufheben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mark them</source>
+        <translation type="unfinished">Mark them</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Alle Markierungen aufheben</translation>
+    </message>
+</context>
+<context>
+    <name>RelTable</name>
+    <message>
+        <location filename="../dialog/ClassInstanceDialog.cpp" line="-375"/>
+        <location line="+4"/>
+        <source>Class Inst.</source>
+        <translation type="unfinished">Class Inst.</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+2"/>
+        <source>Role</source>
+        <translation type="unfinished">Role</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>kind</source>
+        <translation type="unfinished">kind</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished">Löschen</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>   Yes</source>
+        <translation type="unfinished">   Ja</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedElementsDialog</name>
+    <message>
+        <location filename="../dialog/RelatedElementsDialog.cpp" line="+57"/>
+        <source>Related elements dialog</source>
+        <translation type="unfinished">Related elements dialog</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Search for : </source>
+        <translation type="unfinished">Search for : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>referenced elements  </source>
+        <translation type="unfinished">referenced elements  </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>referencing elements  </source>
+        <translation type="unfinished">referencing elements  </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Through relations : </source>
+        <translation type="unfinished">Through relations : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generalization  </source>
+        <translation type="unfinished">generalization  </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>dependency  </source>
+        <translation type="unfinished">dependency  </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>other</source>
+        <translation type="unfinished">other</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Search only for %1</source>
+        <translation type="unfinished">Search only for %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>     Search on </source>
+        <translation type="unfinished">     Search on </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>levels</source>
+        <translation type="unfinished">levels</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>RelationCanvas</name>
+    <message>
+        <location filename="../diagram/RelationCanvas.cpp" line="+157"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+234"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Select labels</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Labels default position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s name to this segment</source>
+        <translation type="unfinished">Attach relation&apos;s name to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s stereotype to this segment</source>
+        <translation type="unfinished">Attach relation&apos;s stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometrie (Strg+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+718"/>
+        <source>relation already drawn</source>
+        <translation type="unfinished">relation already drawn</translation>
+    </message>
+    <message>
+        <location line="+173"/>
+        <source>read-only relation</source>
+        <translation type="unfinished">read-only relation</translation>
+    </message>
+</context>
+<context>
+    <name>RelationDialog</name>
+    <message>
+        <location filename="../dialog/RelationDialog.cpp" line="+107"/>
+        <source>Relation dialog</source>
+        <translation type="unfinished">Relation dialog</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+358"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="-351"/>
+        <source>type : </source>
+        <translation type="unfinished">type : </translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>    stereotype : </source>
+        <translation type="unfinished">    Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>association :</source>
+        <translation type="unfinished">Assoziation :</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+1"/>
+        <source>in </source>
+        <translation type="unfinished">in </translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>multiplicity : </source>
+        <translation type="unfinished">multiplicity : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   initial value : </source>
+        <translation type="unfinished">   initial value : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+103"/>
+        <location line="+35"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-95"/>
+        <source>read-only</source>
+        <translation type="unfinished">nur-lesen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>derived</source>
+        <translation type="unfinished">derived</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordered</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>description : </source>
+        <translation type="unfinished">Beschreibung : </translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>constraint : </source>
+        <translation type="unfinished">constraint : </translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Visibility : </source>
+        <translation type="unfinished">Sichtbarkeit : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>follow uml</source>
+        <translation type="unfinished">follow uml</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location line="+66"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+77"/>
+        <source>Declaration : </source>
+        <translation type="unfinished">Deklaration : </translation>
+    </message>
+    <message>
+        <location line="-229"/>
+        <location line="+66"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+77"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Result after
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <location line="+69"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+76"/>
+        <location line="+234"/>
+        <location line="+14"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Standarddeklaration</translation>
+    </message>
+    <message>
+        <location line="-492"/>
+        <location line="+472"/>
+        <location line="+1"/>
+        <location line="+308"/>
+        <source>#include in header</source>
+        <translation type="unfinished">#include in header</translation>
+    </message>
+    <message>
+        <location line="-776"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Nicht in C++ generiert</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Nicht in Java generiert</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Show annotation</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Edit annotation</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Not generated in Idl</translation>
+    </message>
+    <message>
+        <location line="+136"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+6"/>
+        <location line="+276"/>
+        <source>#include in source</source>
+        <translation type="unfinished">#include in source</translation>
+    </message>
+    <message>
+        <location line="+1109"/>
+        <location line="+2"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+2"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>RemoveVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-699"/>
+        <source>remove duplicates</source>
+        <translation type="unfinished">Duplikate entfernen</translation>
+    </message>
+</context>
+<context>
+    <name>RevSettingsDialog</name>
+    <message>
+        <location filename="../dialog/RevSettingsDialog.cpp" line="-232"/>
+        <source>Reverse/Roundtrip Settings dialog</source>
+        <translation type="unfinished">Reverse/Roundtrip Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>To specify through regular expression the directories
+and/or files to bypass during reverse and roundtrip</source>
+        <translation type="unfinished">To specify through regular expression the directories
+and/or files to bypass during reverse and roundtrip</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Help regexp</source>
+        <translation type="unfinished">Help regexp</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>C++ directory : </source>
+        <translation type="unfinished">C++ directory : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+8"/>
+        <location line="+35"/>
+        <location line="+8"/>
+        <location line="+25"/>
+        <location line="+8"/>
+        <source>case sensitive</source>
+        <translation type="unfinished">Groß-/Kleinschreibung</translation>
+    </message>
+    <message>
+        <location line="-79"/>
+        <source>C++ file : </source>
+        <translation type="unfinished">C++ file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated/reversed 
+header file extension : </source>
+        <translation type="unfinished">generated/reversed 
+header file extension : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generated/reversed 
+    source file extension : </source>
+        <translation type="unfinished">    generated/reversed 
+    source file extension : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Java directory : </source>
+        <translation type="unfinished">Java-Verzeichnis : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Java file : </source>
+        <translation type="unfinished">Java file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated/reversed file extension : </source>
+        <translation type="unfinished">generated/reversed file extension : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Php directory : </source>
+        <translation type="unfinished">PHP-Verzeichnis : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Php file : </source>
+        <translation type="unfinished">Php file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated / reversed file extension : </source>
+        <translation type="unfinished">generated / reversed file extension : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>SdClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/SdClassInstCanvas.cpp" line="+379"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Become immortal</source>
+        <translation type="unfinished">Als unsterblich deklarieren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Become mortal</source>
+        <translation type="unfinished">Als sterblich deklarieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show life line</source>
+        <translation type="unfinished">Show life line</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Hide life line</source>
+        <translation type="unfinished">Hide life line</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Klasse in Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit from model</source>
+        <translation type="unfinished">Exit from model</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert in model</source>
+        <translation type="unfinished">Insert in model</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace it</source>
+        <translation type="unfinished">Replace it</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <location line="+36"/>
+        <source>drawing mode</source>
+        <translation type="unfinished">drawing mode</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">write name:type 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">Eigenschaften von Stereotypen
+anzeigen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">Farbe (Klasseninstanz)</translation>
+    </message>
+</context>
+<context>
+    <name>SdContinuationCanvas</name>
+    <message>
+        <location filename="../diagram/SdContinuationCanvas.cpp" line="+205"/>
+        <source>Continuation</source>
+        <translation type="unfinished">Continuation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <location line="+25"/>
+        <source>continuation color</source>
+        <translation type="unfinished">Farbe (Fortsetzung)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>SdDurationCanvas</name>
+    <message>
+        <location filename="../diagram/SdDurationCanvas.cpp" line="+326"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+    <message>
+        <location line="+420"/>
+        <source>Activity bar</source>
+        <translation type="unfinished">Activity bar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Draw as activity bar</source>
+        <translation type="unfinished">Draw as activity bar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Draw as a coregion</source>
+        <translation type="unfinished">Draw as a coregion</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cut here</source>
+        <translation type="unfinished">Hier ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Merge juxtaposed activity bars</source>
+        <translation type="unfinished">Merge juxtaposed activity bars</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Collapse in parent bar</source>
+        <translation type="unfinished">Collapse in parent bar</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location line="+25"/>
+        <source>duration color</source>
+        <translation type="unfinished">Farbe (Dauer)</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgBaseCanvas</name>
+    <message>
+        <location filename="../diagram/SdMsgBaseCanvas.cpp" line="+239"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Return</source>
+        <translation type="unfinished">Return</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>value :</source>
+        <translation type="unfinished">Wert :</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgCanvas</name>
+    <message>
+        <location filename="../diagram/SdMsgCanvas.cpp" line="+252"/>
+        <source>Message</source>
+        <translation type="unfinished">Nachricht</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select operation in browser</source>
+        <translation type="unfinished">Select operation in browser</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Select stereotype and label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Default stereotype and label position</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start from new overlapping bar</source>
+        <translation type="unfinished">Start from new overlapping bar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Start from parent bar</source>
+        <translation type="unfinished">Start from parent bar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to new overlapping bar</source>
+        <translation type="unfinished">Go to new overlapping bar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to parent bar</source>
+        <translation type="unfinished">Go to parent bar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+29"/>
+        <source>operation drawing language</source>
+        <translation type="unfinished">operation drawing language</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show full operation definition</source>
+        <translation type="unfinished">vollständige Definition der Operation anzeigen</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show context mode</source>
+        <translation type="unfinished">show context mode</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgDialog</name>
+    <message>
+        <location filename="../dialog/SdMsgDialog.cpp" line="+63"/>
+        <source>Message dialog</source>
+        <translation type="unfinished">Message dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Message type</source>
+        <translation type="unfinished">Message type</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchron</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>asynchronous</source>
+        <translation type="unfinished">asynchronous</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>
+
+When the arguments are specified they replace the operation&apos;s parameter(s) without any check</source>
+        <translation type="unfinished">
+
+When the arguments are specified they replace the operation&apos;s parameter(s) without any check</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>arguments : </source>
+        <translation type="unfinished">arguments : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Create operation and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>SdSelfMsgCanvas</name>
+    <message>
+        <location filename="../diagram/SdSelfMsgCanvas.cpp" line="+249"/>
+        <source>Message</source>
+        <translation type="unfinished">Nachricht</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select operation in browser</source>
+        <translation type="unfinished">Select operation in browser</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Select stereotype and label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Default stereotype and label position</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Go to new overlapping bar</source>
+        <translation type="unfinished">Go to new overlapping bar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to parent bar</source>
+        <translation type="unfinished">Go to parent bar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <location line="+29"/>
+        <source>operation drawing language</source>
+        <translation type="unfinished">operation drawing language</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show full operation definition</source>
+        <translation type="unfinished">vollständige Definition der Operation anzeigen</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show context mode</source>
+        <translation type="unfinished">show context mode</translation>
+    </message>
+</context>
+<context>
+    <name>SeqDiagramView</name>
+    <message>
+        <location filename="../diagram/SeqDiagramView.cpp" line="+77"/>
+        <source>Sequence diagram menu</source>
+        <translation type="unfinished">Sequenzdiagramm-Menü</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Transform to flat activity bars</source>
+        <translation type="unfinished">Transform to flat activity bars</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transform to overlapping activity bars</source>
+        <translation type="unfinished">Transform to overlapping activity bars</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="-51"/>
+        <source>Apply</source>
+        <translation type="unfinished">Apply</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutDialog</name>
+    <message>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-358"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Shortcut dialog</source>
+        <translation type="unfinished">Shortcut dialog</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Here are the shortcuts to do a command (menu entry)</source>
+        <translation type="unfinished">Here are the shortcuts to do a command (menu entry)</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Here are the shortcuts to call a tool (plug-out)</source>
+        <translation type="unfinished">Here are the shortcuts to call a tool (plug-out)</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutTable</name>
+    <message>
+        <location line="+48"/>
+        <source>Shift</source>
+        <translation type="unfinished">Umschalt</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cmd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ctrl</source>
+        <translation type="unfinished">Strg</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Alt</source>
+        <translation type="unfinished">Alt</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>Insert shortcut before</source>
+        <translation type="unfinished">Insert shortcut before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert shortcut after</source>
+        <translation type="unfinished">Insert shortcut after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete shortcut</source>
+        <translation type="unfinished">Delete shortcut</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy shortcut</source>
+        <translation type="unfinished">Copy shortcut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut shortcut</source>
+        <translation type="unfinished">Cut shortcut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste shortcut</source>
+        <translation type="unfinished">Paste shortcut</translation>
+    </message>
+    <message>
+        <location line="+173"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Shortcut</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Several use of the shortcut &apos;%1&apos;</source>
+        <translation type="unfinished">Several use of the shortcut &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SimpleRelationDialog</name>
+    <message>
+        <location filename="../dialog/SimpleRelationDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Generalisation dialog</source>
+        <translation type="unfinished">Generalisation dialog</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Dependency dialog</source>
+        <translation type="unfinished">Dependency dialog</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>unknown relation dialog</source>
+        <translation type="unfinished">unknown relation dialog</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>from : </source>
+        <translation type="unfinished">von : </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to : </source>
+        <translation type="unfinished">zu : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+</context>
+<context>
+    <name>SourceDialog</name>
+    <message>
+        <location filename="../dialog/SourceDialog.cpp" line="+134"/>
+        <location line="+6"/>
+        <source>cannot read %1</source>
+        <translation type="unfinished">cannot read %1</translation>
+    </message>
+</context>
+<context>
+    <name>StateActionCanvas</name>
+    <message>
+        <location filename="../diagram/StateActionCanvas.cpp" line="+530"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit state action</source>
+        <translation type="unfinished">Zustandsaktion bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <location line="+30"/>
+        <source>drawing language</source>
+        <translation type="unfinished">drawing language</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">Eigenschaften von Stereotyp
+anzeigen</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+30"/>
+        <source>state action color</source>
+        <translation type="unfinished">state action color</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+22"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>StateActionDialog</name>
+    <message>
+        <location filename="../dialog/StateActionDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State Action dialog</source>
+        <translation type="unfinished">State Action dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+15"/>
+        <location line="+18"/>
+        <source>behavior</source>
+        <translation type="unfinished">behavior</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+</context>
+<context>
+    <name>StateCanvas</name>
+    <message>
+        <location filename="../diagram/StateCanvas.cpp" line="+1270"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide decomposition indicator</source>
+        <translation type="unfinished">Hide decomposition indicator</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show decomposition indicator</source>
+        <translation type="unfinished">Show decomposition indicator</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit state</source>
+        <translation type="unfinished">Zustand bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select referenced state in browser</source>
+        <translation type="unfinished">Select referenced state in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+116"/>
+        <location line="+33"/>
+        <source>show activities</source>
+        <translation type="unfinished">show activities</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+33"/>
+        <source>draw regions horizontally</source>
+        <translation type="unfinished">draw regions horizontally</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+33"/>
+        <source>drawing language</source>
+        <translation type="unfinished">drawing language</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+33"/>
+        <source>state color</source>
+        <translation type="unfinished">Farbe (Zustand)</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <location line="+22"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>StateDiagramView</name>
+    <message>
+        <location filename="../diagram/StateDiagramView.cpp" line="+72"/>
+        <source>State diagram menu</source>
+        <translation type="unfinished">Zustandsdiagramm-Menü</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+199"/>
+        <location line="+34"/>
+        <location line="+21"/>
+        <source>already drawn</source>
+        <translation type="unfinished">bereits gezeichnet</translation>
+    </message>
+    <message>
+        <location line="-53"/>
+        <location line="+34"/>
+        <location line="+21"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>StateDiagramWindow</name>
+    <message>
+        <location filename="../diagram/StateDiagramWindow.cpp" line="+16"/>
+        <source>Select</source>
+        <translation type="unfinished">Auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add State</source>
+        <translation type="unfinished">Zustand hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Region</source>
+        <translation type="unfinished">Bereich hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Initial pseudo state</source>
+        <translation type="unfinished">Pseudozustand hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Entry Point</source>
+        <translation type="unfinished">Einstiegspunkt hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Final state</source>
+        <translation type="unfinished">Endzustand hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Exit Point</source>
+        <translation type="unfinished">Add Exit Point</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Terminate node</source>
+        <translation type="unfinished">Add Terminate node</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Deep History</source>
+        <translation type="unfinished">Add Deep History</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Shallow History</source>
+        <translation type="unfinished">Add Shallow History</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Junction</source>
+        <translation type="unfinished">Add Junction</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Choice</source>
+        <translation type="unfinished">Add Choice</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fork</source>
+        <translation type="unfinished">Add Fork</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Join</source>
+        <translation type="unfinished">Add Join</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Action</source>
+        <translation type="unfinished">Add Action</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add receive signal action</source>
+        <translation type="unfinished">Add receive signal action</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add send signal action</source>
+        <translation type="unfinished">Add send signal action</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Transition</source>
+        <translation type="unfinished">Add Transition</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Note</source>
+        <translation type="unfinished">Notiz</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anker</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>StateDialog</name>
+    <message>
+        <location filename="../dialog/StateDialog.cpp" line="+63"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State dialog</source>
+        <translation type="unfinished">State dialog</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>specification :</source>
+        <translation type="unfinished">specification :</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>reference :</source>
+        <translation type="unfinished">reference :</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>active</source>
+        <translation type="unfinished">aktiv</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+239"/>
+        <location line="+22"/>
+        <location line="+15"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+62"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="-56"/>
+        <location line="+62"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Choose state selected in browser</source>
+        <translation type="unfinished">Choose state selected in browser</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Entry
+behavior : </source>
+        <translation type="unfinished">Entry
+behavior : </translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Exit
+behavior : </source>
+        <translation type="unfinished">Exit
+behavior : </translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Do
+behavior : </source>
+        <translation type="unfinished">Do
+behavior : </translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>StereotypeDialog</name>
+    <message>
+        <location filename="../dialog/StereotypeDialog.cpp" line="+73"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">Abbre&amp;chen</translation>
+    </message>
+</context>
+<context>
+    <name>StereotypesDialog</name>
+    <message>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-285"/>
+        <source>Default stereotypes dialog</source>
+        <translation type="unfinished">Default stereotypes dialog</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>package
+stereotypes : </source>
+        <translation type="unfinished">package
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+33"/>
+        <location line="+37"/>
+        <location line="+29"/>
+        <source>relations
+stereotypes : </source>
+        <translation type="unfinished">relations
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Stereotypes</source>
+        <translation type="unfinished">Stereotypes</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>class
+stereotypes : </source>
+        <translation type="unfinished">class
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>attribute
+stereotypes : </source>
+        <translation type="unfinished">attribute
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>operation
+stereotypes : </source>
+        <translation type="unfinished">operation
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>use case
+stereotypes : </source>
+        <translation type="unfinished">use case
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>artifact
+stereotypes : </source>
+        <translation type="unfinished">artifact
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>class view
+stereotypes : </source>
+        <translation type="unfinished">class view
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>use case view
+stereotypes : </source>
+        <translation type="unfinished">use case view
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component view
+stereotypes : </source>
+        <translation type="unfinished">component view
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>deployment view
+stereotypes : </source>
+        <translation type="unfinished">deployment view
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>class diagram
+stereotypes : </source>
+        <translation type="unfinished">class diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>object diagram
+stereotypes : </source>
+        <translation type="unfinished">object diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>communication diagram
+stereotypes : </source>
+        <translation type="unfinished">communication diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>sequence diagram
+stereotypes : </source>
+        <translation type="unfinished">sequence diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>use case diagram
+stereotypes : </source>
+        <translation type="unfinished">use case diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>state diagram
+stereotypes : </source>
+        <translation type="unfinished">state diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity diagram
+stereotypes : </source>
+        <translation type="unfinished">activity diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component diagram
+stereotypes : </source>
+        <translation type="unfinished">component diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>deployment diagram
+stereotypes : </source>
+        <translation type="unfinished">deployment diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>activity
+stereotypes : </source>
+        <translation type="unfinished">activity
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>interruptible activity
+region stereotypes : </source>
+        <translation type="unfinished">interruptible activity
+region stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>expansion region
+stereotypes : </source>
+        <translation type="unfinished">expansion region
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>partition
+stereotypes : </source>
+        <translation type="unfinished">partition
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>parameter
+stereotypes : </source>
+        <translation type="unfinished">parameter
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>parameter set
+stereotypes : </source>
+        <translation type="unfinished">parameter set
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity control node
+stereotypes : </source>
+        <translation type="unfinished">activity control node
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity action
+stereotypes : </source>
+        <translation type="unfinished">activity action
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity object node
+stereotypes : </source>
+        <translation type="unfinished">activity object node
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>pin
+stereotypes : </source>
+        <translation type="unfinished">pin
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>expansion node
+stereotypes : </source>
+        <translation type="unfinished">expansion node
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>flow
+stereotypes : </source>
+        <translation type="unfinished">flow
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>state
+stereotypes : </source>
+        <translation type="unfinished">state
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>pseudostate
+stereotypes : </source>
+        <translation type="unfinished">pseudostate
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>state action
+stereotypes : </source>
+        <translation type="unfinished">state action
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component
+stereotypes : </source>
+        <translation type="unfinished">component
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>node
+stereotypes : </source>
+        <translation type="unfinished">node
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>message
+stereotypes : </source>
+        <translation type="unfinished">message
+stereotypes : </translation>
+    </message>
+</context>
+<context>
+    <name>StereotypesTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+148"/>
+        <location line="+32"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+</context>
+<context>
+    <name>StringTable</name>
+    <message>
+        <location filename="../dialog/StringTable.cpp" line="+97"/>
+        <source>row %1</source>
+        <translation type="unfinished">Zeile %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert row before</source>
+        <translation type="unfinished">Zeile davor einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert row after</source>
+        <translation type="unfinished">Zeile danach einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete row</source>
+        <translation type="unfinished">Zeile löschen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy row</source>
+        <translation type="unfinished">Zeile kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut row</source>
+        <translation type="unfinished">Zeile ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste row</source>
+        <translation type="unfinished">Zeile einfügen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move row</source>
+        <translation type="unfinished">Zeile verschieben</translation>
+    </message>
+</context>
+<context>
+    <name>SubjectCanvas</name>
+    <message>
+        <location filename="../diagram/SubjectCanvas.cpp" line="+152"/>
+        <source>Subject dialog</source>
+        <translation type="unfinished">Subject dialog</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>subject : </source>
+        <translation type="unfinished">subject : </translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Subject</source>
+        <translation type="unfinished">Subject</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <location line="+25"/>
+        <source>subject color</source>
+        <translation type="unfinished">subject color</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>ToolDialog</name>
+    <message>
+        <location filename="../dialog/ToolDialog.cpp" line="-63"/>
+        <source>Tools dialog</source>
+        <translation type="unfinished">Tools dialog</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+</context>
+<context>
+    <name>TraceDialog</name>
+    <message>
+        <location filename="../dialog/TraceDialog.cpp" line="+58"/>
+        <source>Trace</source>
+        <translation type="unfinished">Protokoll</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Clear</source>
+        <translation type="unfinished">Clear</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save</source>
+        <translation type="unfinished">Speichern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+</context>
+<context>
+    <name>TransitionDialog</name>
+    <message>
+        <location filename="../dialog/TransitionDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transition dialog</source>
+        <translation type="unfinished">Transition dialog</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>internal</source>
+        <translation type="unfinished">internal</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+92"/>
+        <location line="+24"/>
+        <location line="+17"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-100"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>trigger : </source>
+        <translation type="unfinished">trigger : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>guard
+constraint : </source>
+        <translation type="unfinished">guard
+constraint : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>activity
+expression : </source>
+        <translation type="unfinished">activity
+expression : </translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>UcClassCanvas</name>
+    <message>
+        <location filename="../diagram/UcClassCanvas.cpp" line="+604"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Hoch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Runter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Im Browser auswählen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+34"/>
+        <source>class/actor</source>
+        <translation type="unfinished">Klasse/Akteur</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+31"/>
+        <source>class color</source>
+        <translation type="unfinished">Farbe (Klasse)</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>read only</source>
+        <translation type="unfinished">nur lesender Zugriff</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+12"/>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>UcUseCaseCanvas</name>
+    <message>
+        <location filename="../diagram/UcUseCaseCanvas.cpp" line="+415"/>
+        <location line="+34"/>
+        <source>use case</source>
+        <translation type="unfinished">Anwendungsfall</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">nur lesender Zugriff</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+21"/>
+        <location line="+5"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ungültig</translation>
+    </message>
+</context>
+<context>
+    <name>UmlWindow</name>
+    <message>
+        <location filename="../diagram/UmlWindow.cpp" line="-1751"/>
+        <source>Generate:</source>
+        <translation type="unfinished">Codeerzeugung:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Project</source>
+        <translation type="unfinished">&amp;Projekt</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished">&amp;Fenster</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Tools</source>
+        <translation type="unfinished">&amp;Werkzeuge</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Languages</source>
+        <translation type="unfinished">&amp;Sprachen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ management and default declaration/definition</source>
+        <translation type="unfinished">C++ management and default declaration/definition</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Java management and default definition</source>
+        <translation type="unfinished">Java management and default definition</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Php management and default definition</source>
+        <translation type="unfinished">Php management and default definition</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Python management and default definition</source>
+        <translation type="unfinished">Python management and default definition</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Idl management and default declaration</source>
+        <translation type="unfinished">Idl management and default declaration</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Verbose code generation</source>
+        <translation type="unfinished">Verbose code generation</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Preserve operations&apos;s body</source>
+        <translation type="unfinished">Preserve operations&apos;s body</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Add operation profile on body edition</source>
+        <translation type="unfinished">Add operation profile on body edition</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Miscellaneous</source>
+        <translation type="unfinished">&amp;Verschiedenes</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show s&amp;tereotypes in browser</source>
+        <translation type="unfinished">S&amp;tereotypen im Browser anzeigen</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Completion in dialog</source>
+        <translation type="unfinished">Completion in dialog</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Style</source>
+        <translation type="unfinished">Anzeigestil</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Font size</source>
+        <translation type="unfinished">Schriftgröße</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Diagram default format</source>
+        <translation type="unfinished">Standardformat für Diagramme</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Landscape formats</source>
+        <translation type="unfinished">Querformat</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Edit shortcuts</source>
+        <translation type="unfinished">Tastenkürzel bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Set environment</source>
+        <translation type="unfinished">Programmeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Set images root dir</source>
+        <translation type="unfinished">Set images root dir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+17"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Hilfe</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>&amp;About</source>
+        <translation type="unfinished">&amp;Über</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>About&amp;Qt</source>
+        <translation type="unfinished">Über &amp;Qt</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>C++</source>
+        <translation type="unfinished">C++</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Java</source>
+        <translation type="unfinished">Java</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Php</source>
+        <translation type="unfinished">Php</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Python</source>
+        <translation type="unfinished">Python</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Idl</source>
+        <translation type="unfinished">Idl</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <location line="+473"/>
+        <source>File%1</source>
+        <translation type="unfinished">File%1</translation>
+    </message>
+    <message>
+        <location line="-460"/>
+        <source>Ready</source>
+        <translation type="unfinished">Fertig</translation>
+    </message>
+    <message>
+        <location line="+123"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit generation settings</source>
+        <translation type="unfinished">Einstellungen für Codeerzeugung bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Edit default stereotypes</source>
+        <translation type="unfinished">Standard-Stereotypen bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit class settings</source>
+        <translation type="unfinished">Klasseneinstellungen bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>to open this project.&lt;br&gt;&lt;br&gt;The historic is saved in &lt;i&gt;settings.ini&lt;/i&gt;</source>
+        <translation type="unfinished">to open this project.&lt;br&gt;&lt;br&gt;The historic is saved in &lt;i&gt;settings.ini&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Loading aborted as supplied project id is out of history array bounds</source>
+        <translation type="unfinished">Loading aborted as supplied project id is out of history array bounds</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Loading aborted as currently opened project unloading failed</source>
+        <translation type="unfinished">Loading aborted as currently opened project unloading failed</translation>
+    </message>
+    <message>
+        <location line="-487"/>
+        <location line="+527"/>
+        <source>Show &amp;Trace Window</source>
+        <translation type="unfinished">Pro&amp;tokoll anzeigen</translation>
+    </message>
+    <message>
+        <location line="-327"/>
+        <source>What&apos;s This?</source>
+        <translation type="unfinished">Was ist das?</translation>
+    </message>
+    <message>
+        <location line="+337"/>
+        <source>Generate C++</source>
+        <translation type="unfinished">C++-Code erzeugen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Java</source>
+        <translation type="unfinished">Java-Code erzeugen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Php</source>
+        <translation type="unfinished">PHP-Code erzeugen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Python</source>
+        <translation type="unfinished">Python-Code erzeugen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Idl</source>
+        <translation type="unfinished">Idl-Code erzeugen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Reverse C++</source>
+        <translation type="unfinished">Reverse-Engineering (C++)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Roundtrip C++</source>
+        <translation type="unfinished">Roundtrip C++</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Java</source>
+        <translation type="unfinished">Reverse-Engineering (Java)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Roundtrip Java</source>
+        <translation type="unfinished">Roundtrip Java</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Php</source>
+        <translation type="unfinished">Reverse-Engineering (PHP)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Java Catalog</source>
+        <translation type="unfinished">Java-Katalog</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Roundtrip C++ bodies</source>
+        <translation type="unfinished">Roundtrip C++ bodies</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Java bodies</source>
+        <translation type="unfinished">Roundtrip Java bodies</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Php bodies</source>
+        <translation type="unfinished">Roundtrip Php bodies</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Python bodies</source>
+        <translation type="unfinished">Roundtrip Python bodies</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Plug-out upgrade</source>
+        <translation type="unfinished">Plug-out-Aktualisierung</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tools settings</source>
+        <translation type="unfinished">Einstellungen für Werkzeuge</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import settings</source>
+        <translation type="unfinished">Einstellungen importieren</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <location line="+266"/>
+        <source>Enter a folder name, this folder will be created and will name the new project</source>
+        <translation type="unfinished">Enter a folder name, this folder will be created and will name the new project</translation>
+    </message>
+    <message>
+        <location line="-252"/>
+        <location line="+8"/>
+        <source>New project</source>
+        <translation type="unfinished">Neues Projekt</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Loading aborted</source>
+        <translation type="unfinished">Ladevorgang abgebrochen</translation>
+    </message>
+    <message>
+        <location line="+282"/>
+        <location line="+4"/>
+        <source>Close aborted</source>
+        <translation type="unfinished">Close aborted</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Print on 1 page</source>
+        <translation type="unfinished">Auf 1 Seite drucken</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print on 4 pages</source>
+        <translation type="unfinished">Auf 4 Seiten drucken</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print on 9 pages</source>
+        <translation type="unfinished">Auf 9 Seiten drucken</translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Select images root directory</source>
+        <translation type="unfinished">Select images root directory</translation>
+    </message>
+    <message>
+        <location line="-1584"/>
+        <location line="+2048"/>
+        <source>&amp;Cascade</source>
+        <translation type="unfinished">&amp;Cascade</translation>
+    </message>
+    <message>
+        <location line="-1309"/>
+        <source>Select DoUML project file</source>
+        <translation type="unfinished">Wählen DoUML Projektdatei</translation>
+    </message>
+    <message>
+        <location line="+1310"/>
+        <source>&amp;Tile</source>
+        <translation type="unfinished">&amp;Tile</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Preferred geometry</source>
+        <translation type="unfinished">Bevorzugte &amp;Geometrie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C&amp;lose all</source>
+        <translation type="unfinished">Alles sch&amp;liessen</translation>
+    </message>
+</context>
+<context>
+    <name>UseCaseDiagramView</name>
+    <message>
+        <location filename="../diagram/UseCaseDiagramView.cpp" line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Add marked elements</translation>
+    </message>
+</context>
+<context>
+    <name>UseCaseDialog</name>
+    <message>
+        <location filename="../dialog/UseCaseDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Schliessen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use Case dialog</source>
+        <translation type="unfinished">Use Case dialog</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name : </source>
+        <translation type="unfinished">Name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">Stereotyp : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>extension 
+points : </source>
+        <translation type="unfinished">extension 
+points : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>description :</source>
+        <translation type="unfinished">Beschreibung :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Eigenschaften</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+ungültiger oder bereits vorhandener Bezeichner</translation>
+    </message>
+</context>
+<context>
+    <name>ValueSpecificationDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-467"/>
+        <location line="+27"/>
+        <source>value - Ocl</source>
+        <translation type="unfinished">Wert (OCL)</translation>
+    </message>
+    <message>
+        <location line="-22"/>
+        <location line="+32"/>
+        <location line="+31"/>
+        <source>Value : </source>
+        <translation type="unfinished">Wert : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+24"/>
+        <source>value - C++</source>
+        <translation type="unfinished">Wert (C++)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+24"/>
+        <source>value - Java</source>
+        <translation type="unfinished">Wert (Java)</translation>
+    </message>
+</context>
+</TS>
diff --git a/src/translations/esES.qm b/src/translations/esES.qm
new file mode 100644
index 000000000..08b865f73
Binary files /dev/null and b/src/translations/esES.qm differ
diff --git a/src/translations/esES.ts b/src/translations/esES.ts
new file mode 100644
index 000000000..f99568ff6
--- /dev/null
+++ b/src/translations/esES.ts
@@ -0,0 +1,17621 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="es">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../dialog/About.cpp" line="+45"/>
+        <source>About DoUML</source>
+        <translation type="unfinished">About DoUML</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+</context>
+<context>
+    <name>AccessVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+1083"/>
+        <location line="+37"/>
+        <source>variable - Ocl</source>
+        <translation type="unfinished">variable - Ocl</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <source>class : </source>
+        <translation type="unfinished">clase : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>variable :</source>
+        <translation type="unfinished">variable :</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Choose variable selected in browser</source>
+        <translation type="unfinished">Escoger la variable seleccionada en el navegador</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Create attribute and choose it</source>
+        <translation type="unfinished">Crear un atributo y seleccionarlo</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityActionCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityActionCanvas.cpp" line="+861"/>
+        <source>Add pin</source>
+        <translation type="unfinished">Agregar pin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity action</source>
+        <translation type="unfinished">Editar acción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select %1 in browser</source>
+        <translation type="unfinished">Seleccionar %1 en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set associated diagram from behavior</source>
+        <translation type="unfinished">Establecer el diagrama asociado desde el comportamiento</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <location line="+31"/>
+        <source>show opaque definition</source>
+        <translation type="unfinished">mostrar la definición de la acción Opacar</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+31"/>
+        <source>action color</source>
+        <translation type="unfinished">color de la Acción</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityActionDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-1141"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity Action dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Acción</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>kind : </source>
+        <translation type="unfinished">tipo : </translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+13"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>constraint :</source>
+        <translation type="unfinished">restricción :</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+145"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityCanvas.cpp" line="+628"/>
+        <source>Add parameter</source>
+        <translation type="unfinished">Agregar parámetro</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity</source>
+        <translation type="unfinished">Editar actividad</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <location line="+31"/>
+        <source>show conditions</source>
+        <translation type="unfinished">Mostrar condiciones</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+31"/>
+        <source>drawing language</source>
+        <translation type="unfinished">lenguaje de dibujo</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+31"/>
+        <source>activity color</source>
+        <translation type="unfinished">color de la actividad</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+8"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDiagramView</name>
+    <message>
+        <location filename="../diagram/ActivityDiagramView.cpp" line="+85"/>
+        <source>Activity diagram menu</source>
+        <translation type="unfinished">menu del diagrama de Actividad</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <location line="+29"/>
+        <location line="+31"/>
+        <location line="+60"/>
+        <location line="+28"/>
+        <location line="+31"/>
+        <location line="+182"/>
+        <location line="+19"/>
+        <location line="+24"/>
+        <location line="+24"/>
+        <location line="+24"/>
+        <location line="+20"/>
+        <source>already drawn</source>
+        <translation type="unfinished">Ya se encuentra dibujado</translation>
+    </message>
+    <message>
+        <location line="-184"/>
+        <location line="+264"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="-260"/>
+        <source>Draw activity</source>
+        <translation type="unfinished">Dibujar actividad</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add a call behavior</source>
+        <translation type="unfinished">Agregar una acción Invocar comportamiento</translation>
+    </message>
+    <message>
+        <location line="+260"/>
+        <source>Add a read variable value action</source>
+        <translation type="unfinished">Agregar una acción Leer valor de variable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a clear variable value action</source>
+        <translation type="unfinished">Agregar una acción Limpiar valor de variable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a write variable value action</source>
+        <translation type="unfinished">Agregar una acción Escribir valor de variable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a add variable value action</source>
+        <translation type="unfinished">Agregar una acción Agregar valor a variable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a remove variable value action</source>
+        <translation type="unfinished">Agregar una acción Remover valor de variable</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ActivityDiagramWindow.cpp" line="+128"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Package</source>
+        <translation type="unfinished">Nuevo paquete</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Fragment</source>
+        <translation type="unfinished">Nuefvo fragmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Activity</source>
+        <translation type="unfinished">Nueva actividad</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Interruptible Activity Region</source>
+        <translation type="unfinished">Nueva Región de Actividad Interrumpible</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>New Expansion Region</source>
+        <translation type="unfinished">Nueva Región de expansión</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>New Activity Partition</source>
+        <translation type="unfinished">Nueva Partición de actividad</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>New Action</source>
+        <translation type="unfinished">Nueva Acción</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Object Node</source>
+        <translation type="unfinished">Nuevo nodo objeto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Initial node</source>
+        <translation type="unfinished">Nuevo nodo inicial</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Activity Final</source>
+        <translation type="unfinished">Nuevo final de actividad</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Flow Final</source>
+        <translation type="unfinished">Nuevo final de flujo</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Merge</source>
+        <translation type="unfinished">Nuevo Combinar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Decision</source>
+        <translation type="unfinished">Nueva Decisión</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Fork</source>
+        <translation type="unfinished">Nueva Bifurcación</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Join</source>
+        <translation type="unfinished">Nueva Unión</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Flow</source>
+        <translation type="unfinished">Nuevo Flujo</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dependencia</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Nota</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDialog</name>
+    <message>
+        <location filename="../dialog/ActivityDialog.cpp" line="+64"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity dialog</source>
+        <translation type="unfinished">cuadro de diálogo Actividad</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>specification :</source>
+        <translation type="unfinished">especificación :</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>read only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>single execution</source>
+        <translation type="unfinished">ejecución individual</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>active</source>
+        <translation type="unfinished">activo</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+14"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>constraint :</source>
+        <translation type="unfinished">restricción :</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Escoger la operación seleccionada en el navegador</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Pre
+condition : </source>
+        <translation type="unfinished">Pre
+Condición : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Post
+condition : </source>
+        <translation type="unfinished">Post
+condición : </translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityNodeCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityNodeCanvas.cpp" line="+481"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">dibujar verticalmente</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">dibujar horizontalmente</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit activity node</source>
+        <translation type="unfinished">Editar nodo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityObjectCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityObjectCanvas.cpp" line="+516"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity object</source>
+        <translation type="unfinished">Editar objeto</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Seleccionar la clase en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <location line="+33"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">escribir nombre:tipo
+horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+33"/>
+        <source>activity object color</source>
+        <translation type="unfinished">activity object color</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityObjectDialog</name>
+    <message>
+        <location filename="../dialog/ActivityObjectDialog.cpp" line="+66"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>name :</source>
+        <translation type="unfinished">nombre :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>type :</source>
+        <translation type="unfinished">tipo :</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>multiplicity : </source>
+        <translation type="unfinished">multiplicidad : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   orden : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>in state : </source>
+        <translation type="unfinished">Estado en (in) : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>is control</source>
+        <translation type="unfinished">es control</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+94"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>selection : </source>
+        <translation type="unfinished">selección : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador la clase elegida</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Crear clase y seleccionarla</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityPartitionCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityPartitionCanvas.cpp" line="+414"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">dibujar verticalmente</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">dibujar horizontalmente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity partition</source>
+        <translation type="unfinished">Editar partición de actividad</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+154"/>
+        <location line="+25"/>
+        <source>activity partition color</source>
+        <translation type="unfinished">color de la partición de la actividad</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityPartitionDialog</name>
+    <message>
+        <location filename="../dialog/ActivityPartitionDialog.cpp" line="+61"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity Partition dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Partición</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>represents :</source>
+        <translation type="unfinished">representa :</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>is dimension</source>
+        <translation type="unfinished">es dimensión</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>is external</source>
+        <translation type="unfinished">es externo</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose element selected in browser</source>
+        <translation type="unfinished">Escoger el elemento seleccionado en el navegador</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose element marked in browser</source>
+        <translation type="unfinished">Escoger el elemento marcado en el navegador</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>AddVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+924"/>
+        <source>replace all</source>
+        <translation type="unfinished">reemplazar todo</translation>
+    </message>
+</context>
+<context>
+    <name>AnnotationDialog</name>
+    <message>
+        <location filename="../dialog/AnnotationDialog.cpp" line="+72"/>
+        <source>
+To add an annotation at the cursor position
+you may select it in the list and press &apos;add&apos;
+</source>
+        <translation type="unfinished">
+Para adicionar una anotación en la posición del cursor
+se debe seleccionar de la lista y presionar &apos;Agregar&apos;
+</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add </source>
+        <translation type="unfinished">Agregar </translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>ArrowCanvas</name>
+    <message>
+        <location filename="../diagram/ArrowCanvas.cpp" line="+861"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dibujar todas las relaciones&lt;/i&gt; forzadas a &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>a relation can&apos;t have a relation</source>
+        <translation type="unfinished">una relación no puede tener una relación</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>stereotype/label dialog</source>
+        <translation type="unfinished">cuadro de diálogo Estereotipo/etiqueta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>label : </source>
+        <translation type="unfinished">etiqueta : </translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>line</source>
+        <translation type="unfinished">línea</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Selecionar estereotipo y etiqueta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Posión predeterminada del estereotipo y la etiqueta</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach label to this segment</source>
+        <translation type="unfinished">Vincular etiqueta a este segmento</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Vincular estereotipo a este segmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometría (Ctrl+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>None</source>
+        <translation type="unfinished">Ninguno</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Recenter begin</source>
+        <translation type="unfinished">Volver a centrar inicio</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Recenter end</source>
+        <translation type="unfinished">Volver a centrar fin</translation>
+    </message>
+</context>
+<context>
+    <name>ArrowJunctionCanvas</name>
+    <message>
+        <location filename="../diagram/ArrowJunctionCanvas.cpp" line="+217"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ArtifactCanvas</name>
+    <message>
+        <location filename="../diagram/ArtifactCanvas.cpp" line="+578"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Agregar elementos relacionados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit artifact</source>
+        <translation type="unfinished">Editar artefacto</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Generate</source>
+        <translation type="unfinished">Generar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <location line="+34"/>
+        <source>artifact</source>
+        <translation type="unfinished">artefacto</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+25"/>
+        <source>artifact color</source>
+        <translation type="unfinished">color del artefacto</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+8"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>illegal for a source artifact</source>
+        <translation type="unfinished">ilegal para un artefacto fuente</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+14"/>
+        <location line="+6"/>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ArtifactDialog</name>
+    <message>
+        <location filename="../dialog/ArtifactDialog.cpp" line="+68"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>artifact dialog</source>
+        <translation type="unfinished">cuadro de diálogo Artefacto</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+58"/>
+        <location line="+47"/>
+        <location line="+61"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-349"/>
+        <source>Default</source>
+        <translation type="unfinished">Valor por omisión</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Header file 
+definition : </source>
+        <translation type="unfinished">Definición del
+archivo de cabecera : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+47"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Definición predeterminada</translation>
+    </message>
+    <message>
+        <location line="-292"/>
+        <location line="+47"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">No generado en C++</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+47"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Resultado después
+de la sustitución : </translation>
+    </message>
+    <message>
+        <location line="-285"/>
+        <source>C++ header</source>
+        <translation type="unfinished">encabezado C++</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Source file 
+definition : </source>
+        <translation type="unfinished">Definición del
+archivo fuente : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>C++ source</source>
+        <translation type="unfinished">fuente C++</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>File 
+definition : </source>
+        <translation type="unfinished">Definición de
+archivo : </translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">No generado en Java</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Java source</source>
+        <translation type="unfinished">fuente Java</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">No generado en PHP</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Php source</source>
+        <translation type="unfinished">fuente PHP</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">No generado en Python</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Python source</source>
+        <translation type="unfinished">fuente Python</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">No generado en Idl</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Idl source</source>
+        <translation type="unfinished">fuente Idl</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Classes without artifact</source>
+        <translation type="unfinished">Clases sin artefactos</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+46"/>
+        <source>Associated classes</source>
+        <translation type="unfinished">Clases asociadas</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>go up</source>
+        <translation type="unfinished">subir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>go down</source>
+        <translation type="unfinished">bajar</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Stereotype filtering  </source>
+        <translation type="unfinished">Filtro de estereotipo  </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Unassociated artifacts</source>
+        <translation type="unfinished">Artefactos no asociados</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+7"/>
+        <source>Associated artifacts</source>
+        <translation type="unfinished">Artefactos asociados</translation>
+    </message>
+    <message>
+        <location line="+1234"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>AssocContainCanvas</name>
+    <message>
+        <location filename="../diagram/AssocContainCanvas.cpp" line="+87"/>
+        <source>Association</source>
+        <translation type="unfinished">Asociación</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Selecionar estereotipo y etiqueta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Posión predeterminada del estereotipo y la etiqueta</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach label to this segment</source>
+        <translation type="unfinished">Vincular etiqueta a este segmento</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Vincular estereotipo a este segmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometría (Ctrl+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dibujar todas las relaciones&lt;/i&gt; forzadas a &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AttributeDialog</name>
+    <message>
+        <location filename="../dialog/AttributeDialog.cpp" line="+75"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Enum item dialog</source>
+        <translation type="unfinished">cuadro de diálogo Enuemración</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Attribute dialog</source>
+        <translation type="unfinished">cuadro de diálogo Atributo</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>class : </source>
+        <translation type="unfinished">clase : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>name :</source>
+        <translation type="unfinished">nombre :</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">estereotipo :</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>    multiplicity :  </source>
+        <translation type="unfinished">    multiplicidad :  </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>type :</source>
+        <translation type="unfinished">tipo :</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>initial value :</source>
+        <translation type="unfinished">valor inicial :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>value :</source>
+        <translation type="unfinished">valor :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+77"/>
+        <location line="+20"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-63"/>
+        <source>read-only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>derived</source>
+        <translation type="unfinished">derivado</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordenado</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Default</source>
+        <translation type="unfinished">Valor por omisión</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>constraint :</source>
+        <translation type="unfinished">restricción :</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Visibility :</source>
+        <translation type="unfinished">Visibilidad :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>follow uml</source>
+        <translation type="unfinished">seguir UML</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+59"/>
+        <location line="+71"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Declaration :</source>
+        <translation type="unfinished">Declaración :</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+59"/>
+        <location line="+71"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Result after
+substitution :</source>
+        <translation type="unfinished">Resultado después
+de la sustitución :</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+70"/>
+        <location line="+60"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Declaración predeterminada</translation>
+    </message>
+    <message>
+        <location line="-248"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">No generado en C++</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Default item declaration</source>
+        <translation type="unfinished">Declaración predeterminada del item</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+188"/>
+        <source>Default attribute declaration</source>
+        <translation type="unfinished">Declaración predeterminada del atributo</translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">No generado en Java</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Mostrar anotación</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Editar anotación</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">No generado en PHP</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">No generado en Python</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <source>Default state declaration</source>
+        <translation type="unfinished">Declaración predeterminada del estado</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Default constant declaration</source>
+        <translation type="unfinished">Declaración predeterminada de la constante</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">No generado en Idl</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador la clase elegida</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Crear clase y seleccionarla</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>BasicDialog</name>
+    <message>
+        <location filename="../dialog/BasicDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source> dialog</source>
+        <translation type="unfinished"> dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserItemNameValidator</name>
+    <message>
+        <location filename="../browser/BrowserNode.cpp" line="+138"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserSearchDialog</name>
+    <message>
+        <location filename="../dialog/BrowserSearchDialog.cpp" line="+118"/>
+        <source>Browser search</source>
+        <translation type="unfinished">Buscar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Kind</source>
+        <translation type="unfinished">Tipo</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Containing</source>
+        <translation type="unfinished">Conteniendo</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>case sensitive</source>
+        <translation type="unfinished">distinguir entre mayúsculas y minúsculas</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>even deleted</source>
+        <translation type="unfinished">incluso podría suprimirse</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name</source>
+        <translation type="unfinished">nombre</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>stereotype</source>
+        <translation type="unfinished">estereotipo</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>description</source>
+        <translation type="unfinished">descripción</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>declaration/definition/body</source>
+        <translation type="unfinished">declaración/definición/cuerpo</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Result</source>
+        <translation type="unfinished">Resultado</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Search</source>
+        <translation type="unfinished">Búsqueda</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Desmarcar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mark them</source>
+        <translation type="unfinished">Marcarlos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Desmarcar todo</translation>
+    </message>
+</context>
+<context>
+    <name>BuiltinTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsBuiltinTable.cpp" line="+99"/>
+        <location line="+8"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Uml/Cpp/Java/Idl fields cannot be empty</source>
+        <translation type="unfinished">Uml/Cpp/Java/Idl fields cannot be empty</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Duplicate Uml entries are not allowed</source>
+        <translation type="unfinished">Duplicate Uml entries are not allowed</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cpp parameter controls must contain ${type}</source>
+        <translation type="unfinished">Cpp parameter controls must contain ${type}</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Add type</source>
+        <translation type="unfinished">Add type</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Language visibility:</source>
+        <translation type="unfinished">Language visibility:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Search:</source>
+        <translation type="unfinished">Búsqueda:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Copy row</source>
+        <translation type="unfinished">Copiar fila</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste row</source>
+        <translation type="unfinished">Pegar fila</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut row</source>
+        <translation type="unfinished">Cortar fila</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete row</source>
+        <translation type="unfinished">Borrar fila</translation>
+    </message>
+</context>
+<context>
+    <name>CallBehaviorDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+336"/>
+        <location line="+25"/>
+        <source>behavior - Ocl</source>
+        <translation type="unfinished">comportamiento - Ocl</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>synchronous</source>
+        <translation type="unfinished">síncrono</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>behavior :</source>
+        <translation type="unfinished">comportamiento :</translation>
+    </message>
+</context>
+<context>
+    <name>CallOperationDialog</name>
+    <message>
+        <location line="-320"/>
+        <location line="+46"/>
+        <source>operation - Ocl</source>
+        <translation type="unfinished">operación -Ocl</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>synchronous</source>
+        <translation type="unfinished">síncrono</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>class : </source>
+        <translation type="unfinished">clase : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>operation :</source>
+        <translation type="unfinished">operación :</translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Escoger la operación seleccionada en el navegador</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Crear una operación y seleccionarla</translation>
+    </message>
+</context>
+<context>
+    <name>CatalogWidget</name>
+    <message>
+        <location filename="../ui/catalogwidget.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Visited</source>
+        <translation type="unfinished">Visited</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Marked</source>
+        <translation type="unfinished">Marked</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Favourites</source>
+        <translation type="unfinished">Favourites</translation>
+    </message>
+    <message>
+        <location filename="../ui/catalogwidget.cpp" line="+301"/>
+        <source>Remove from favourites</source>
+        <translation type="unfinished">Remove from favourites</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Desmarcar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Desmarcar todo</translation>
+    </message>
+</context>
+<context>
+    <name>CdClassCanvas</name>
+    <message>
+        <location filename="../diagram/CdClassCanvas.cpp" line="+1281"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Agregar elementos relacionados</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show nesting relation</source>
+        <translation type="unfinished">Show nesting relation</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Individual attribute visibility</source>
+        <translation type="unfinished">Visibilidad del atributo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Individual operation visibility</source>
+        <translation type="unfinished">Visibilidad de la operación</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit class</source>
+        <translation type="unfinished">Editar la clase</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+12"/>
+        <source>Add item</source>
+        <translation type="unfinished">Agregar item</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+19"/>
+        <source>Add attribute</source>
+        <translation type="unfinished">Agregar atributo</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Edit item or attribute</source>
+        <translation type="unfinished">Editar ítem o atributo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+18"/>
+        <source>Add operation</source>
+        <translation type="unfinished">Agregar operación</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Edit item</source>
+        <translation type="unfinished">Editar item</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Edit attribute</source>
+        <translation type="unfinished">Editar atributo</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+22"/>
+        <source>Add inherited operation</source>
+        <translation type="unfinished">Agregar operación heredada</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Choose operation</source>
+        <translation type="unfinished">Seleccionar operación</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+2"/>
+        <source>Edit operation</source>
+        <translation type="unfinished">Editar operación</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Generate</source>
+        <translation type="unfinished">Generar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+139"/>
+        <source>class</source>
+        <translation type="unfinished">clase</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+31"/>
+        <source>class color</source>
+        <translation type="unfinished">color de la clase</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+4"/>
+        <location line="+6"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ChangeVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-199"/>
+        <source>variable - Ocl</source>
+        <translation type="unfinished">variable - Ocl</translation>
+    </message>
+</context>
+<context>
+    <name>ClassDiagramView</name>
+    <message>
+        <location filename="../diagram/ClassDiagramView.cpp" line="+131"/>
+        <source>Class diagram menu</source>
+        <translation type="unfinished">Menú del Diagrama de Clases</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add classes of the selected class view</source>
+        <translation type="unfinished">Agregar clases de la vista de clase seleccionada</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+6"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Agregar elementos marcados</translation>
+    </message>
+</context>
+<context>
+    <name>ClassDialog</name>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="+2537"/>
+        <source>Class dialog</source>
+        <translation type="unfinished">cuadro de diálogo Clase</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>base type : </source>
+        <translation type="unfinished">tipo base : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>artifact : </source>
+        <translation type="unfinished">artefacto : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+10"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Default</source>
+        <translation type="unfinished">Valor por omisión</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>constraint :</source>
+        <translation type="unfinished">restricción :</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>
+Enter formals in case the class is parameterized
+</source>
+        <translation type="unfinished">
+Ingresar formales en el caso de que la clase esté parametrizada
+</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>
+Specify actuals else formals default value will be used
+</source>
+        <translation type="unfinished">
+Especificar actuales, de otra forma los valores formales predeterminados serán usados
+</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <location line="+184"/>
+        <source>Declaration : </source>
+        <translation type="unfinished">Declaración : </translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <location line="+39"/>
+        <location line="+44"/>
+        <location line="+44"/>
+        <location line="+60"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Resultado después
+de la sustitución : </translation>
+    </message>
+    <message>
+        <location line="-181"/>
+        <location line="+189"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Declaración predeterminada</translation>
+    </message>
+    <message>
+        <location line="-188"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">No generado en C++</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+42"/>
+        <location line="+47"/>
+        <source>Definition : </source>
+        <translation type="unfinished">Definición : </translation>
+    </message>
+    <message>
+        <location line="-76"/>
+        <location line="+46"/>
+        <location line="+45"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Definición predeterminada</translation>
+    </message>
+    <message>
+        <location line="-90"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">No generado en Java</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">No generado en PHP</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">No generado en Python</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>switch type : </source>
+        <translation type="unfinished">tipo conmutador(switch) : </translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Not generated in IDL</source>
+        <translation type="unfinished">No generado en IDL</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Initialization 
+plug-out :</source>
+        <translation type="unfinished">Inicialización del
+plug-out :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+7"/>
+        <source>  parameter(s) : </source>
+        <translation type="unfinished">  parámetro(s) : </translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>Check 
+plug-out :</source>
+        <translation type="unfinished">Verificar
+plug-out :</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Icon path :</source>
+        <translation type="unfinished">Ruta del icono :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Browse</source>
+        <translation type="unfinished">Navegar</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Apply on : </source>
+        <translation type="unfinished">Aplicar a : </translation>
+    </message>
+    <message>
+        <location line="+795"/>
+        <location line="+6"/>
+        <location line="+9"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>ClassInstanceDialog</name>
+    <message>
+        <location filename="../dialog/ClassInstanceDialog.cpp" line="+134"/>
+        <source>Class instance dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">estereotipo :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>class :</source>
+        <translation type="unfinished">clase :</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> Attribute </source>
+        <translation type="unfinished"> Atributo </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> Class </source>
+        <translation type="unfinished"> Clase </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> Value </source>
+        <translation type="unfinished"> Valor </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Attributes</source>
+        <translation type="unfinished">Atributos</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Relations</source>
+        <translation type="unfinished">Relaciones</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador la clase elegida</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Crear clase y seleccionarla</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>Yes</source>
+        <translation type="unfinished">Si</translation>
+    </message>
+</context>
+<context>
+    <name>ClassListDialog</name>
+    <message>
+        <location filename="../dialog/ClassListDialog.cpp" line="+72"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>ClassSettingsDialog</name>
+    <message>
+        <location filename="../dialog/ClassSettingsDialog.cpp" line="+71"/>
+        <source>Class Settings dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Configuración de la Clase</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>default attributes visibility : </source>
+        <translation type="unfinished">Visibilidad predeterminada de los atributos : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>default relations visibility : </source>
+        <translation type="unfinished">visibilidad predeterminada de las relaciones : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>default operations visibility : </source>
+        <translation type="unfinished">visibilidad predeterminada de las operaciones : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>ClassViewDialog</name>
+    <message>
+        <location filename="../dialog/ClassViewDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>class view dialog</source>
+        <translation type="unfinished">cuadro de diálogo Vista de clases</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+18"/>
+        <source>deployment
+view : </source>
+        <translation type="unfinished">
+Vista de
+despliegue : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>CodAddMsgDialog</name>
+    <message>
+        <location filename="../dialog/CodAddMsgDialog.cpp" line="+62"/>
+        <source>Add message dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Agregar mensaje</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Add message to %1</source>
+        <translation type="unfinished">Agregar mensaje a %1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>rank : </source>
+        <translation type="unfinished">rango : </translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>message :</source>
+        <translation type="unfinished">mensaje :</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Escoger la operación seleccionada en el navegador</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Crear una operación y seleccionarla</translation>
+    </message>
+</context>
+<context>
+    <name>CodChangeMsgDialog</name>
+    <message>
+        <location filename="../dialog/CodChangeMsgDialog.cpp" line="+57"/>
+        <source>Communicationg message dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Mensaje de comunicación</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>message :</source>
+        <translation type="unfinished">mensaje :</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Escoger la operación seleccionada en el navegador</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Crear una operación y seleccionarla</translation>
+    </message>
+</context>
+<context>
+    <name>CodClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/CodClassInstCanvas.cpp" line="+238"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Seleccionar la clase en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Exit from model</source>
+        <translation type="unfinished">Salir del modelo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert in model</source>
+        <translation type="unfinished">Insertar en el modelo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace it</source>
+        <translation type="unfinished">Reemplazar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">escribir nombre:tipo
+horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">Mostrar las propiedades
+de los estereotipos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">color de la instancia de clase</translation>
+    </message>
+</context>
+<context>
+    <name>CodDirsCanvas</name>
+    <message>
+        <location filename="../diagram/CodDirsCanvas.cpp" line="+362"/>
+        <location line="+6"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>CodLinkCanvas</name>
+    <message>
+        <location filename="../diagram/CodLinkCanvas.cpp" line="+125"/>
+        <source>Link</source>
+        <translation type="unfinished">Enlace</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <source>add messages to </source>
+        <translation type="unfinished">Agregar mensajes a </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit its messages</source>
+        <translation type="unfinished">Editar sus mensajes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Editar todos los mensajes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometría (Ctrl+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+</context>
+<context>
+    <name>CodSelfLinkCanvas</name>
+    <message>
+        <location filename="../diagram/CodSelfLinkCanvas.cpp" line="+278"/>
+        <source>Self link</source>
+        <translation type="unfinished">Auto enlace</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add messages</source>
+        <translation type="unfinished">Agregar mensajes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit its messages</source>
+        <translation type="unfinished">Editar sus mensajes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Editar todos los mensajes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ColDiagramView</name>
+    <message>
+        <location filename="../diagram/ColDiagramView.cpp" line="+110"/>
+        <source>Communication diagram menu</source>
+        <translation type="unfinished">Menú del diagrama de comunicación</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Editar todos los mensajes</translation>
+    </message>
+</context>
+<context>
+    <name>ColDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ColDiagramWindow.cpp" line="+78"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Agregar paquete</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Agregar fragmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Agregar una instancias de clase modelada</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Agregar una instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Link</source>
+        <translation type="unfinished">Agregar enlace</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Self Link</source>
+        <translation type="unfinished">Agregar auto enlace</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Nota</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ColMsgTable</name>
+    <message>
+        <location filename="../dialog/ColMsgTable.cpp" line="+142"/>
+        <source>Rank</source>
+        <translation type="unfinished">Rango</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hierarchical rank</source>
+        <translation type="unfinished">Rango jerérquico</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>From</source>
+        <translation type="unfinished">Desde</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Message</source>
+        <translation type="unfinished">Mensaje</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">Hasta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+95"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="-71"/>
+        <source>rank </source>
+        <translation type="unfinished">rango </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit message</source>
+        <translation type="unfinished">Editar densaje</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change ranks</source>
+        <translation type="unfinished">Cambiar rangos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete it</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete recursively</source>
+        <translation type="unfinished">Borrar recursivamente</translation>
+    </message>
+    <message>
+        <location line="+104"/>
+        <source>Enter new hierarchical rank</source>
+        <translation type="unfinished">Ingresar nuevo rango jerárquico</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Hierarchical rank : </source>
+        <translation type="unfinished">Rango jerérquico : </translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Warning</source>
+        <translation type="unfinished">Alerta</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Invalid hierarchical rank</source>
+        <translation type="unfinished">Rango jerárquico no válido</translation>
+    </message>
+</context>
+<context>
+    <name>ComboColor</name>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="+363"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unchanged&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ComboStates</name>
+    <message>
+        <location line="-281"/>
+        <location line="+21"/>
+        <location line="+21"/>
+        <location line="+28"/>
+        <location line="+27"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unchanged&gt;</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>unlimited</source>
+        <translation type="unfinished">ilimitado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>default</source>
+        <translation type="unfinished">predeterminado</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentCanvas</name>
+    <message>
+        <location filename="../diagram/ComponentCanvas.cpp" line="+380"/>
+        <source>Choose class</source>
+        <translation type="unfinished">Seleccionar clase</translation>
+    </message>
+    <message>
+        <location line="+479"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Agregar elementos relacionados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit component</source>
+        <translation type="unfinished">Editar componente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+34"/>
+        <source>component</source>
+        <translation type="unfinished">componente</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+32"/>
+        <source>drawn as icon</source>
+        <translation type="unfinished">dibujar como ícono</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show required and provided interfaces</source>
+        <translation type="unfinished">mostrar las interfaces proveidas y requeridas</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show realizations</source>
+        <translation type="unfinished">mostrar las realizaciones</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show stereotype properties</source>
+        <translation type="unfinished">mostrar las propiedades del estereotipo</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>component color</source>
+        <translation type="unfinished">color del componente</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>no provided interfaces</source>
+        <translation type="unfinished">interfaces no proveidas</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>no required interfaces</source>
+        <translation type="unfinished">interfaces no requeridas</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+31"/>
+        <location line="+22"/>
+        <location line="+4"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source>not required</source>
+        <translation type="unfinished">no requerido</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>not provided</source>
+        <translation type="unfinished">no proveido</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDiagramView</name>
+    <message>
+        <location filename="../diagram/ComponentDiagramView.cpp" line="+113"/>
+        <source>Component diagram menu</source>
+        <translation type="unfinished">Menú del diagrama de componentes</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Agregar elementos marcados</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ComponentDiagramWindow.cpp" line="+82"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Agregar paquete</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Agregar fragmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Component</source>
+        <translation type="unfinished">Agregar componente</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Inheritance</source>
+        <translation type="unfinished">Herencia</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dependencia</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Required interface</source>
+        <translation type="unfinished">Interface requerida</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Provided interface</source>
+        <translation type="unfinished">Interface proveida</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Nota</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDialog</name>
+    <message>
+        <location filename="../dialog/ComponentDialog.cpp" line="+57"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>component dialog</source>
+        <translation type="unfinished">cuadro de diálogo Componente</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Required classes</source>
+        <translation type="unfinished">Clases requeridas</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Provided classes</source>
+        <translation type="unfinished">Clases proveidas</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Realizing classes</source>
+        <translation type="unfinished">Clases de realización</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Stereotype filtering  </source>
+        <translation type="unfinished">Filtro de estereotipo  </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Available classes</source>
+        <translation type="unfinished">Clases disponibles</translation>
+    </message>
+    <message>
+        <location line="+245"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintCanvas</name>
+    <message>
+        <location filename="../diagram/ConstraintCanvas.cpp" line="+140"/>
+        <source>Constraint</source>
+        <translation type="unfinished">Restricción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Font</source>
+        <translation type="unfinished">tipo de letra</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <location line="+61"/>
+        <source>note color</source>
+        <translation type="unfinished">color de la nota</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintDialog</name>
+    <message>
+        <location filename="../dialog/ConstraintDialog.cpp" line="+55"/>
+        <source>Constraints visibility dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Visibilidad de las restricciones</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Specify visible elements rather than hidden ones</source>
+        <translation type="unfinished">Especificar los elementos visibles en lugar de los ocultos</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show all</source>
+        <translation type="unfinished">Mostrar todo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide all</source>
+        <translation type="unfinished">Ocultar todo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide inherited</source>
+        <translation type="unfinished">Ocultar heredados</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintTable</name>
+    <message>
+        <location line="+71"/>
+        <source>visible</source>
+        <translation type="unfinished">visible</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>element</source>
+        <translation type="unfinished">elemento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>constraint</source>
+        <translation type="unfinished">restricción</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location line="+43"/>
+        <location line="+9"/>
+        <location line="+16"/>
+        <source>  yes</source>
+        <translation type="unfinished">  si</translation>
+    </message>
+</context>
+<context>
+    <name>ConstructorInitializerDialog</name>
+    <message>
+        <location filename="../ui/constructorinitializerdialog.ui" line="+14"/>
+        <source>Dialog</source>
+        <translation type="unfinished">Dialog</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>All attributes:</source>
+        <translation type="unfinished">All attributes:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Initializer
+text:</source>
+        <translation type="unfinished">Initializer
+text:</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Constructor
+prototype:</source>
+        <translation type="unfinished">Constructor
+prototype:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Result after
+substitution:</source>
+        <translation type="unfinished">Resultado después
+de la sustitución:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../ui/constructorinitializerdialog.cpp" line="+49"/>
+        <source>Constructor-initializer setup</source>
+        <translation type="unfinished">Constructor-initializer setup</translation>
+    </message>
+</context>
+<context>
+    <name>ContinuationDialog</name>
+    <message>
+        <location filename="../dialog/ContinuationDialog.cpp" line="+49"/>
+        <source>stereotype/continuation dialog</source>
+        <translation type="unfinished">cuadro de diálogo estereotipo/continuación</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>label : </source>
+        <translation type="unfinished">etiqueta : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>CppParamsDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="+6241"/>
+        <source>C++ parameters dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Parámetros de C++</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>CppParamsTable</name>
+    <message>
+        <location line="-598"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specifier</source>
+        <translation type="unfinished">Especificador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pointer</source>
+        <translation type="unfinished">Puntero</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+4"/>
+        <source>Modifier</source>
+        <translation type="unfinished">Modificador</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+4"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="+271"/>
+        <source>param %1</source>
+        <translation type="unfinished">parámetro %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insertar parámetro antes de</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insertar parámetro después de</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Borrar parámetro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copiar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cortar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Pegar parámetro</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Mover parámetro</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Especificar rango</translation>
+    </message>
+</context>
+<context>
+    <name>DecoratorDialog</name>
+    <message>
+        <location filename="../dialog/DecoratorDialog.cpp" line="+54"/>
+        <source>decorator dialog</source>
+        <translation type="unfinished">cuadro de diálogo Adorno</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+To add an decorator at the cursor position
+you may select it in the list and press &apos;add&apos;
+
+Set operation static to add @staticmethod,
+set operation abstract to add @abstractmethod
+</source>
+        <translation type="unfinished">
+Para agregar un adorno en la posición del cursor
+debe seleccionarlo de la lista y presionar &apos;Agregar&apos;
+
+Establecer la operación estática a:  add @staticmethod,
+establecer la operación abstracta a: add @abstractmethod
+</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Add </source>
+        <translation type="unfinished">Agregar </translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentDiagramView</name>
+    <message>
+        <location filename="../diagram/DeploymentDiagramView.cpp" line="+122"/>
+        <source>Deployment diagram menu</source>
+        <translation type="unfinished">Menú del Diagrama de Despliegue</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Agregar elementos marcados</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentDiagramWindow</name>
+    <message>
+        <location filename="../diagram/DeploymentDiagramWindow.cpp" line="+88"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Agregar paquete</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Agregar fragmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Deployment Node</source>
+        <translation type="unfinished">Agregar node de despliegue</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Artifact</source>
+        <translation type="unfinished">Agregar artefacto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Component</source>
+        <translation type="unfinished">Agregar componente</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Network connexion/ending</source>
+        <translation type="unfinished">Conexión/terminación de red</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Network</source>
+        <translation type="unfinished">Red</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Inheritance</source>
+        <translation type="unfinished">Herencia</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Association</source>
+        <translation type="unfinished">Asociación</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dependencia</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Nota</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentNodeCanvas</name>
+    <message>
+        <location filename="../diagram/DeploymentNodeCanvas.cpp" line="+485"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Agregar elementos relacionados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select node in browser</source>
+        <translation type="unfinished">Seleccionar nodo en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set node associated diagram</source>
+        <translation type="unfinished">Especificar nodo de diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+34"/>
+        <source>node</source>
+        <translation type="unfinished">nodo</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location line="+30"/>
+        <source>write node instance 
+horizontally</source>
+        <translation type="unfinished">Escribir la instancia de nodo
+horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">Mostrar las propiedades
+del estereotipo</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Node color</source>
+        <translation type="unfinished">Color del Nodo</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>read only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>DiagramView</name>
+    <message>
+        <location filename="../diagram/DiagramView.cpp" line="+1101"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Align</source>
+        <translation type="unfinished">Alinear</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>same width</source>
+        <translation type="unfinished">mismo ancho</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>same height</source>
+        <translation type="unfinished">misma altura</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>same width and height</source>
+        <translation type="unfinished">misma anchura y altura</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size</source>
+        <translation type="unfinished">Bulto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Copy selected (Ctrl+c)</source>
+        <translation type="unfinished">Copiar la selección (Ctrl+c)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Cut selected (Ctrl+x, remove from diagram)</source>
+        <translation type="unfinished">Cut selected (Ctrl+x, remove from diagram)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove selected from view (Suppr)</source>
+        <translation type="unfinished">Quitar la selección de la vista (Supr)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete selected (Ctrl+d)</source>
+        <translation type="unfinished">Borrar la selección (Ctrl+d)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+775"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="-774"/>
+        <source>Same drawing settings</source>
+        <translation type="unfinished">Same drawing settings</translation>
+    </message>
+    <message>
+        <location line="+778"/>
+        <source>Select diagram in browser</source>
+        <translation type="unfinished">Seleccionar diagrma en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select all (Ctrl+a)</source>
+        <translation type="unfinished">Seleccionar todo (Ctrl+d)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find selected browser element</source>
+        <translation type="unfinished">Encontrar el elemento seleccionado en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy optimal picture part</source>
+        <translation type="unfinished">Copiar parte óptima de la imagen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy visible picture part</source>
+        <translation type="unfinished">Copiar la parte visible de la imagen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save optimal picture part (png)</source>
+        <translation type="unfinished">Guardar parte óptima de la imagen (png)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save visible picture part (png)</source>
+        <translation type="unfinished">Guardar la parte visible de la imagen (png)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save optimal picture part (svg)</source>
+        <translation type="unfinished">Guardar parte óptima de la imagen (svg)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save visible picture part (svg)</source>
+        <translation type="unfinished">Guardar la parte visible de la imagen (svg)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste copied items (Ctrl+v)</source>
+        <translation type="unfinished">Pegar los elementos copiados (Ctrl+v)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Optimal scale</source>
+        <translation type="unfinished">Escala óptima</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Optimal window size</source>
+        <translation type="unfinished">Tamaño de ventana óptimo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set preferred size and scale</source>
+        <translation type="unfinished">Establecer tamaño y escala</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set preferred scale (size unset)</source>
+        <translation type="unfinished">Establecer escala (desestablecer tamaño)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Restore preferred size and scale</source>
+        <translation type="unfinished">Restablecer tamaño y escala preferidos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unset preferred size and scale</source>
+        <translation type="unfinished">Desestablecer escala y tamaño preferido</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Restore preferred scale</source>
+        <translation type="unfinished">Restablecer escala preferida</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unset preferred scale</source>
+        <translation type="unfinished">Desestablecer escala preferida</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Format</source>
+        <translation type="unfinished">Formato</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Undo all changes</source>
+        <translation type="unfinished">Deshacer todos los cambios</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Undo (Ctrl+z or Ctrl+u)</source>
+        <translation type="unfinished">Deshacer (Ctrl+z o Ctrl+u)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Redo (Ctrl+y or Ctrl+r)</source>
+        <translation type="unfinished">Rehacer (Ctrl+y o Ctrl+r)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+150"/>
+        <source>Landscape formats</source>
+        <translation type="unfinished">Formatos landscape</translation>
+    </message>
+</context>
+<context>
+    <name>DiagramWindow</name>
+    <message>
+        <location filename="../diagram/DiagramWindow.cpp" line="+130"/>
+        <source>edit</source>
+        <translation type="unfinished">editar</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>scale</source>
+        <translation type="unfinished">escala</translation>
+    </message>
+</context>
+<context>
+    <name>EnvDialog</name>
+    <message>
+        <location filename="../dialog/EnvDialog.cpp" line="+74"/>
+        <source>Environment dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Entorno</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>MANDATORY, choose a value between 2 and 127 not used by an other person working at the same time on a project with you.
+To be safe, if possible choose a value not used by an other person even not working on a given project with you</source>
+        <translation type="unfinished">OBLIGATORIO. seleccione un valor entre 2 y 127 que no esté siendo utilizado por otra persona que esté trabajando al mismo tiempo en el proyecto.
+Para estar seguro, escoja un valor que no este siendo utilizado por ningún usuario</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Own identifier </source>
+        <translation type="unfinished">Identificador </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   The identifier can&apos;t be modified while a project is load</source>
+        <translation type="unfinished">   El identificador no puede ser modificado mientras el proyecto esté cargado</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>
+Optional, to indicate where are the HTML pages of the reference manual. Used by the help (called by the F1 key) to show the
+chapter corresponding to the kind of the element selected in the browser</source>
+        <translation type="unfinished">
+Opcional, especificar la ubicación de las páginas HTML del manual de referencia. Está ubicación será utilizada por la ayuda (invocada al presionar F1) para mostrar
+el capítulo correspondiente al elemento seleccionado en el navegador del proyecto</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Manual path</source>
+        <translation type="unfinished">Selección manual de la ruta</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+18"/>
+        <location line="+16"/>
+        <location line="+19"/>
+        <location line="+14"/>
+        <source>Browse</source>
+        <translation type="unfinished">Navegar</translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <source>
+Optional, to indicate a web navigator program. If it is not defined the reference manual will be shown with an internal simple viewer</source>
+        <translation type="unfinished">
+Opcional, indicar un navegadro web. Si no se define, el manual de referencia se mostrará en un visor interno básico</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Navigator</source>
+        <translation type="unfinished">Navegador</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>
+Optional, to indicate a template project. This allows to create new projects getting all the template project settings</source>
+        <translation type="unfinished">
+Opcional, indicar una plantilla para el proyecto. Permite crear nuevos proyectos obteniendo toda la configuración de la plantilla</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+Optional, to indicate a text editor (it must creates an own window). Else DoUML will use an internal editor</source>
+        <translation type="unfinished">
+Opcional, indicar un editor de texto (se mostrará en su propia ventana). Si no se especifica DoUML utilizará un editor interno</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>
+In case you have a multiple screens configuration the best for you is to ask DoUML to place by default the dialogs in one of these
+screens giving the area, else the dialogs will be shown on the center of the virtual screen.</source>
+        <translation type="unfinished">
+En caso de que se tenga múltiples configuraciones de pantalla lo mejor es configurar DoUML para que coloque de forma predeterminada los cuadros de diálogo en una de las áreas de dichas pantallas. Si no se especifica, los cuadros de diálogo se mostrarán en el centro de la pantalla virtual.</translation>
+    </message>
+    <message>
+        <location line="-72"/>
+        <source>Editor path </source>
+        <translation type="unfinished">Ruta al editor </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+Optional, to choose a language for menus and dialogs (default is English). You may have to select a corresponding character set</source>
+        <translation type="unfinished">
+Opcional, seleccionar un lenguaje para los menús y los cuadros de diálogo (el predeterminado es Inglés). Se debe colocar para poder seleccionar la codificación correspondiente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Translation file path </source>
+        <translation type="unfinished">Ruta al archivo de traducción </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>
+Optional, to indicate a character set in case you use non ISO_8859-1/latin1 characters. For instance KOI8-R or KOI8-RU for Cyrillic</source>
+        <translation type="unfinished">
+Opcional, indicar una codificación en el caso en que se utilicen caracteres no especificadoes en ISO_8859-1/latin1. Por ejemplo KOI8-R o KOI8-RU para Cirílico</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Character set </source>
+        <translation type="unfinished">Conjunto de Caracteres </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Default screen </source>
+        <translation type="unfinished">Pantalla predeterminada </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>left: </source>
+        <translation type="unfinished">izquierda: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      top: </source>
+        <translation type="unfinished">      superior: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      right: </source>
+        <translation type="unfinished">      derecha: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      bottom: </source>
+        <translation type="unfinished">      inferior: </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>documentation directory</source>
+        <translation type="unfinished">directorio de la documentación</translation>
+    </message>
+</context>
+<context>
+    <name>ExceptionsTable</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-682"/>
+        <source>Type</source>
+        <translation type="unfinished">Tipo</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+47"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>exception %1</source>
+        <translation type="unfinished">excepción %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert exception before</source>
+        <translation type="unfinished">Insertar excepción antes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert exception after</source>
+        <translation type="unfinished">Insertar excepción después</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete exception</source>
+        <translation type="unfinished">Borrar excepción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy exception</source>
+        <translation type="unfinished">Copiar excepción</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut exception</source>
+        <translation type="unfinished">Cortar excepción</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste exception</source>
+        <translation type="unfinished">Pegar excepción</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Move exception</source>
+        <translation type="unfinished">Mover excepción</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionNodeCanvas</name>
+    <message>
+        <location filename="../diagram/ExpansionNodeCanvas.cpp" line="+330"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit expansion node</source>
+        <translation type="unfinished">Editar nodo Expansión</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <location line="+25"/>
+        <source>expansion node color</source>
+        <translation type="unfinished">color del nodo Expansión</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location line="+9"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionRegionCanvas</name>
+    <message>
+        <location filename="../diagram/ExpansionRegionCanvas.cpp" line="+460"/>
+        <source>Add expansion node</source>
+        <translation type="unfinished">Agregar nodo Expansión</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit expansion region</source>
+        <translation type="unfinished">Editar región de expansión</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <location line="+25"/>
+        <source>expansion region color</source>
+        <translation type="unfinished">color de la región de expansión</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionRegionDialog</name>
+    <message>
+        <location filename="../dialog/ExpansionRegionDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Expansion Region dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Región de expansión</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>mode :</source>
+        <translation type="unfinished">modo :</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>must isolate</source>
+        <translation type="unfinished">debe ser aislado</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>description</source>
+        <translation type="unfinished">descripción</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>ExtraMemberDialog</name>
+    <message>
+        <location filename="../dialog/ExtraMemberDialog.cpp" line="+61"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Extra Class Member dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Miebro extra de la clase</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name :</source>
+        <translation type="unfinished">nombre :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">estereotipo :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+33"/>
+        <location line="+15"/>
+        <location line="+25"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-122"/>
+        <source>C++ 
+declaration :</source>
+        <translation type="unfinished">Declaración
+C++ :</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>C++ 
+definition :</source>
+        <translation type="unfinished">Definición
+C++ :</translation>
+    </message>
+    <message>
+        <location line="+129"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+</context>
+<context>
+    <name>FlowCanvas</name>
+    <message>
+        <location filename="../diagram/FlowCanvas.cpp" line="+155"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dibujar todas las relaciones&lt;/i&gt; forzadas a &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+90"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Seleccionar etiquetas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Posición predeterminada de las etiquetas</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach flow label to this segment</source>
+        <translation type="unfinished">Asociar una etiqueta de flujo a este segmento</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Vincular estereotipo a este segmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometría (Ctrl+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <location line="+34"/>
+        <source>write horizontally</source>
+        <translation type="unfinished">escribir horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+34"/>
+        <source>Flow Drawing Settings dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Configuración para el dibujado de Flujos</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>flow already drawn</source>
+        <translation type="unfinished">El flujo ya está dibujado</translation>
+    </message>
+</context>
+<context>
+    <name>FlowDialog</name>
+    <message>
+        <location filename="../dialog/FlowDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Flow dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Flujo</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+97"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>weight : </source>
+        <translation type="unfinished">peso : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>guard : </source>
+        <translation type="unfinished">guarda : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>selection : </source>
+        <translation type="unfinished">selección : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>transformation : </source>
+        <translation type="unfinished">transformar : </translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>FormalParamsTable</name>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="-1690"/>
+        <source>formal param %1</source>
+        <translation type="unfinished">parámetro formal %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insertar parámetro antes de</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insertar parámetro después de</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Borrar parámetro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copiar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cortar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Pegar parámetro</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Mover parámetro</translation>
+    </message>
+</context>
+<context>
+    <name>FragmentCanvas</name>
+    <message>
+        <location filename="../diagram/FragmentCanvas.cpp" line="+354"/>
+        <source>Fragment</source>
+        <translation type="unfinished">Fragmento</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add separator</source>
+        <translation type="unfinished">Agregar separador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show referenced diagram</source>
+        <translation type="unfinished">Mostrar el diagrama al cual hace referencia</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+25"/>
+        <source>fragment color</source>
+        <translation type="unfinished">color del fragmento</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>FragmentDialog</name>
+    <message>
+        <location filename="../dialog/FragmentDialog.cpp" line="+55"/>
+        <source>Fragment dialog</source>
+        <translation type="unfinished">cuadro de diálogo Fragmento</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>refer to : </source>
+        <translation type="unfinished">se refiere a : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>arguments 
+/ value : </source>
+        <translation type="unfinished">argumentos
+/valor : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose diagram selected in browser</source>
+        <translation type="unfinished">Escoger el diagrama seleccionado en el navegador</translation>
+    </message>
+</context>
+<context>
+    <name>GenerationSettingsDialog</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+73"/>
+        <source>Generation settings dialog</source>
+        <translation type="unfinished">Cuadro de dialogo Configuración para la generación de Código</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Types correspondence, and C++ operation argument default passing for them :</source>
+        <translation type="unfinished">Correspondencia de Tipos y argumentos predeterminados de la operación C++ :</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Attributes and 
+Relations
+stereotypes 
+correspondence : </source>
+        <translation type="unfinished">Correspondencia de
+estereotipos de los
+Atributos y las Relaciones : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Classes&apos;s 
+stereotypes 
+correspondence : </source>
+        <translation type="unfinished">Correspondencia de
+estereotipos de las
+Clases : </translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Header file
+default content :</source>
+        <translation type="unfinished">Contenido predeterminado
+del archivo de cabecera :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Source file
+default content :</source>
+        <translation type="unfinished">Contenido predeterminado
+del archivo fuente :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>generated/reversed 
+header file extension : </source>
+        <translation type="unfinished">extensión del archivo de
+cabecera generado/reconstruido : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generated/reversed 
+    source file extension : </source>
+        <translation type="unfinished">    extensión del archivo de
+código fuente generado/reconstruido : </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+682"/>
+        <source>without path</source>
+        <translation type="unfinished">sin ruta</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with absolute path</source>
+        <translation type="unfinished">con ruta absoluta</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with relative path</source>
+        <translation type="unfinished">con ruta relativa</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with root relative path</source>
+        <translation type="unfinished">con ruta relativa a la raíz</translation>
+    </message>
+    <message>
+        <location line="-667"/>
+        <source>force namespace 
+prefix generation : </source>
+        <translation type="unfinished">forzar la generación
+del prefijo del namespace : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            inline operation force 
+            includes in header : </source>
+        <translation type="unfinished">            las operaciones inline forzan
+includes en la cabecera : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            generate Javadoc 
+            style comment : </source>
+        <translation type="unfinished">            generar estilo de
+comentarios Javadoc : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            visibility indent : </source>
+        <translation type="unfinished">            visibility indent : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+366"/>
+        <location line="+287"/>
+        <location line="+179"/>
+        <source>Class default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la Clase :</translation>
+    </message>
+    <message>
+        <location line="-821"/>
+        <location line="+1058"/>
+        <source>Struct default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la Estructura :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+1058"/>
+        <source>Union default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la Unión :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+355"/>
+        <location line="+287"/>
+        <location line="+181"/>
+        <location line="+235"/>
+        <source>Enum default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la Enumeración :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+1058"/>
+        <source>Typedef default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+dl Typedef :</translation>
+    </message>
+    <message>
+        <location line="-1038"/>
+        <location line="+355"/>
+        <location line="+453"/>
+        <source>Attribute 
+default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+del atributo :</translation>
+    </message>
+    <message>
+        <location line="-805"/>
+        <location line="+29"/>
+        <location line="+25"/>
+        <source>Multiplicity</source>
+        <translation type="unfinished">Multiplicidad</translation>
+    </message>
+    <message>
+        <location line="-50"/>
+        <source>unspecified,
+or 1</source>
+        <translation type="unfinished">no especificado 
+o 1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+38"/>
+        <location line="+21"/>
+        <source>* or a..b</source>
+        <translation type="unfinished">* ó a..b</translation>
+    </message>
+    <message>
+        <location line="-57"/>
+        <location line="+38"/>
+        <location line="+21"/>
+        <source>X (means [X])
+or [...]...[...]</source>
+        <translation type="unfinished">X (significa [X])
+o [...]...[...]</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Association
+and
+aggregation
+default
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la Asociación y
+la Agregación :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Association </source>
+        <translation type="unfinished">Asociación </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>  and aggregation </source>
+        <translation type="unfinished">  agregación and </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>unspecified,
+1 or 0..1</source>
+        <translation type="unfinished">no especificado,
+1 o 0..1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+810"/>
+        <source>Composition
+default
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la composición :</translation>
+    </message>
+    <message>
+        <location line="-804"/>
+        <source>Composition </source>
+        <translation type="unfinished">Composición </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>unspecified
+or 1</source>
+        <translation type="unfinished">no especificado
+o 1</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <location line="+338"/>
+        <location line="+234"/>
+        <location line="+214"/>
+        <location line="+359"/>
+        <source>Get operation
+default definition : </source>
+        <translation type="unfinished">Declaración predeterminada
+de la operación Get : </translation>
+    </message>
+    <message>
+        <location line="-1139"/>
+        <location line="+38"/>
+        <source>Visibility</source>
+        <translation type="unfinished">Visibilidad</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+37"/>
+        <location line="+299"/>
+        <source>Modifiers</source>
+        <translation type="unfinished">Modificadores</translation>
+    </message>
+    <message>
+        <location line="-333"/>
+        <source>const value</source>
+        <translation type="unfinished">valor constante</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+37"/>
+        <location line="+295"/>
+        <location line="+28"/>
+        <location line="+206"/>
+        <location line="+26"/>
+        <location line="+179"/>
+        <location line="+17"/>
+        <location line="+360"/>
+        <source>  name : </source>
+        <translation type="unfinished">  nombre : </translation>
+    </message>
+    <message>
+        <location line="-1136"/>
+        <location line="+31"/>
+        <location line="+295"/>
+        <location line="+28"/>
+        <location line="+206"/>
+        <location line="+26"/>
+        <location line="+179"/>
+        <location line="+17"/>
+        <location line="+341"/>
+        <location line="+19"/>
+        <source>also in uml</source>
+        <translation type="unfinished">también en uml</translation>
+    </message>
+    <message>
+        <location line="-1134"/>
+        <location line="+326"/>
+        <location line="+234"/>
+        <location line="+205"/>
+        <location line="+358"/>
+        <source>Set operation
+default definition : </source>
+        <translation type="unfinished">Declaración predeterminada
+de la operación Set : </translation>
+    </message>
+    <message>
+        <location line="-1112"/>
+        <source>const param</source>
+        <translation type="unfinished">constante (const param)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>by ref</source>
+        <translation type="unfinished">por referencia (by ref)</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+244"/>
+        <location line="+246"/>
+        <location line="+145"/>
+        <source>Enumeration item 
+default definition :</source>
+        <translation type="unfinished">Declaración predeterminada
+del elemento de la Enumeración :</translation>
+    </message>
+    <message>
+        <location line="-627"/>
+        <source>Default type forms
+for the enums :</source>
+        <translation type="unfinished">Tipo predeterminado para
+los elementos de la enumeración :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <source>input
+parameter : </source>
+        <translation type="unfinished">
+parámetro de
+entrada : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   output
+   parameter : </source>
+        <translation type="unfinished">   
+parámetro de
+salida : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   input output 
+   parameter : </source>
+        <translation type="unfinished">   parámetro de
+entrada salida : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   operation 
+   return : </source>
+        <translation type="unfinished">   
+retorno de la
+operación : </translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Default type forms for
+the types not given
+in the first tab:</source>
+        <translation type="unfinished">Tipo predeterminado
+para los tipos que no
+se consideran en la primera pestaña:</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Operation default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la operación :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Operation default 
+definition :</source>
+        <translation type="unfinished">Definición predeterminada
+de la operación :</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>External classes : 
+name making
+#include, using</source>
+        <translation type="unfinished">Clases externas:
+nombrarlas haciendo
+#include, using</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>External types :
+#include form(s),
+using, etc...</source>
+        <translation type="unfinished">Tipos externos:
+#include,
+using, etc...</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Include etc...</source>
+        <translation type="unfinished">Include etc...</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+267"/>
+        <location line="+220"/>
+        <location line="+223"/>
+        <source>file default 
+content :</source>
+        <translation type="unfinished">Contenido predeterminado
+del archivo :</translation>
+    </message>
+    <message>
+        <location line="-687"/>
+        <source>    generated/reversed file extension </source>
+        <translation type="unfinished">    extensión de los archivos generados/reconstruidos </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generate Javadoc style comment </source>
+        <translation type="unfinished">    generar comentarios estilo Javadoc </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>    force package prefix generation </source>
+        <translation type="unfinished">    forzar la generación del prefijo del paquete </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+287"/>
+        <location line="+399"/>
+        <source>Interface default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la Interfaz :</translation>
+    </message>
+    <message>
+        <location line="-676"/>
+        <source>Enum pattern 
+default declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+del patrón Enumeración :</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+25"/>
+        <location line="+430"/>
+        <location line="+30"/>
+        <location line="+24"/>
+        <location line="+199"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>multiplicity &apos;1&apos;
+or unspecified</source>
+        <translation type="unfinished">multiplicidad &apos;1&apos;
+o no especificada</translation>
+    </message>
+    <message>
+        <location line="-850"/>
+        <location line="+25"/>
+        <location line="+683"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>multiplicity &apos;*&apos;
+or &apos;a..b&apos;</source>
+        <translation type="unfinished">multiplicidad &apos;*&apos;
+o &apos;a..b&apos;</translation>
+    </message>
+    <message>
+        <location line="-850"/>
+        <location line="+25"/>
+        <location line="+683"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>X (probably a
+number)</source>
+        <translation type="unfinished">X (probablemente
+un número)</translation>
+    </message>
+    <message>
+        <location line="-833"/>
+        <location line="+269"/>
+        <location line="+191"/>
+        <location line="+296"/>
+        <source>Association and
+aggregation
+default
+declaration :</source>
+        <translation type="unfinished">Declaración
+predeterminada de
+agregación y
+asociación :</translation>
+    </message>
+    <message>
+        <location line="-713"/>
+        <source>Enum pattern item 
+default definition :</source>
+        <translation type="unfinished">Definición predeterminada
+del elemento del patrón
+Enumeración :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Enum pattern item 
+&apos;case&apos; in &apos;from_int&apos; :</source>
+        <translation type="unfinished">Elemento del patrón Enum
+&apos;case&apos; en &apos;from_int&apos; :</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+26"/>
+        <source>Visibility (shared with Php)</source>
+        <translation type="unfinished">Visibilidad (compartida con PHP)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>final parameter</source>
+        <translation type="unfinished">parámetro de Fin</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+232"/>
+        <location line="+196"/>
+        <source>Operation
+default definition :</source>
+        <translation type="unfinished">Definición predeterminada
+de la operación :</translation>
+    </message>
+    <message>
+        <location line="-403"/>
+        <location line="+215"/>
+        <source>External classes : 
+name making</source>
+        <translation type="unfinished">Clase externas:
+nombre</translation>
+    </message>
+    <message>
+        <location line="-207"/>
+        <source>External types :
+import form(s) etc...</source>
+        <translation type="unfinished">Tipos extermos:
+importar form(s) etc...</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>    generated / reversed file extension : </source>
+        <translation type="unfinished">    generated / reversed file extension : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generate Javadoc style comment : </source>
+        <translation type="unfinished">    generar comentarios estilo Javadoc : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>    require_once : </source>
+        <translation type="unfinished">    require_once : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>    force namespace prefix generation : </source>
+        <translation type="unfinished">    force namespace prefix generation : </translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+427"/>
+        <source>Attribute default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+del atributo :</translation>
+    </message>
+    <message>
+        <location line="-392"/>
+        <location line="+26"/>
+        <source>Visibility (shared with Java)</source>
+        <translation type="unfinished">Visibilidad (compartido con Java)</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>indent step :</source>
+        <translation type="unfinished">sangría :</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>    generated /
+    reversed
+    file extension : </source>
+        <translation type="unfinished">    extensión del archivo
+generado/reconstruido : </translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>    classes of Python 2.2 </source>
+        <translation type="unfinished">    clases de Python 2.2 </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+39"/>
+        <location line="+15"/>
+        <source>other
+multiplicity</source>
+        <translation type="unfinished">otra
+multiplicidad</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>    operation of Python 3 (pep-3107) </source>
+        <translation type="unfinished">    operación de Python 3 (pep - 3107) </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Operation __init__
+default definition :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la operación __init__ :</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>External classes : 
+name making
+import</source>
+        <translation type="unfinished">Clases externas:
+name making
+import</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>External types :
+import form(s)</source>
+        <translation type="unfinished">Tipos externos:
+importar form(s)</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>    file extension : </source>
+        <translation type="unfinished">    extensión de archivos : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Valuetype default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+del Valuetype :</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Exception default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+de la Excepción :</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Attribute default 
+declaration in
+valuetype :</source>
+        <translation type="unfinished">Declaración predeterminada
+del atributo en el valuetype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Constant default 
+declaration :</source>
+        <translation type="unfinished">Declaración
+predeterminada de
+la constante :</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Association and
+aggregation
+default
+declaration in
+valuetype :</source>
+        <translation type="unfinished">Declaración
+predeterminada de
+la Asociación y la
+Agregación en el
+valuetype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Association and
+aggregation
+default
+declaration in
+union:</source>
+        <translation type="unfinished">Declaración
+predeterminada de
+la Asociación y la
+Agregación dentro
+de la unión:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Union item 
+default 
+declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+del elemento Unión :</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Enumeration item 
+default declaration :</source>
+        <translation type="unfinished">Declaración predeterminada
+del elemento Enumeración :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Operation default 
+declaration : </source>
+        <translation type="unfinished">Declaración predeterminada
+de la operación : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>External classes : 
+name making
+#include</source>
+        <translation type="unfinished">Clases externas:
+name making
+#include</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>External types :
+#include form(s)
+etc...</source>
+        <translation type="unfinished">Tipos externos:
+#include
+etc...</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Artifact
+default
+description : </source>
+        <translation type="unfinished">Descripción 
+predeterminada
+del artefacto : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Class
+default
+description : </source>
+        <translation type="unfinished">Descripción 
+predeterminada
+de la Clase : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Operation
+default
+description : </source>
+        <translation type="unfinished">Descripción 
+predeterminada
+de la operación : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Attribute
+default
+description : </source>
+        <translation type="unfinished">Descripción 
+predeterminada
+del atributo : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Relation
+default
+description : </source>
+        <translation type="unfinished">Descripción 
+predeterminada
+de la relación : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Defining a project root directory allows to specify                                   packages&apos;s generation directory relative to the root directory rather                                   than absolute.
+A root directory may itself be relative to the project path</source>
+        <translation type="unfinished">Defining a project root directory allows to specify                                   packages&apos;s generation directory relative to the root directory rather                                   than absolute.
+A root directory may itself be relative to the project path</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>C++ root dir : </source>
+        <translation type="unfinished">Directorio raiz de C++ : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <location line="+19"/>
+        <location line="+19"/>
+        <source>Browse</source>
+        <translation type="unfinished">Navegar</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Java root dir : </source>
+        <translation type="unfinished">Directorio raiz de Java : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Php root dir : </source>
+        <translation type="unfinished">Directorio Raíz de PHP : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Python root dir : </source>
+        <translation type="unfinished">Directorio raiz de Python : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Idl root dir : </source>
+        <translation type="unfinished">Directorio raíz de Idl : </translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+10"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>HelpDialog</name>
+    <message>
+        <location filename="../dialog/HelpDialog.cpp" line="+80"/>
+        <source>DoUML Help</source>
+        <translation type="unfinished">Ayuda de DoUML</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>To set the navigator by setting the environment through the menu Miscellaneous allows to see all the documentation in better conditions</source>
+        <translation type="unfinished">Especificando un navegador a través del cuadro de diálogo Entorno del menú Miscelanea, permite ver toda la documentación en mejores condiciones</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>HelpRegexpDialog</name>
+    <message>
+        <location filename="../dialog/RevSettingsDialog.cpp" line="+260"/>
+        <source>Help regular expression</source>
+        <translation type="unfinished">Help regular expression</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>HideShowDialog</name>
+    <message>
+        <location filename="../dialog/HideShowDialog.cpp" line="+56"/>
+        <source>Settings dialog</source>
+        <translation type="unfinished">Cuadro de dialogo Propiedades</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Visible</source>
+        <translation type="unfinished">Visible</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Hidden</source>
+        <translation type="unfinished">Oculto</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Show all</source>
+        <translation type="unfinished">Mostrar todo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide all</source>
+        <translation type="unfinished">Ocultar todo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide private ones</source>
+        <translation type="unfinished">Ocultar elementos privados</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide private and
+protected ones</source>
+        <translation type="unfinished">Ocultar privados
+y protegidos</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Specify visible members rather than hidden ones</source>
+        <translation type="unfinished">Especificar los miembros visibles en lugar de los ocultos</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>IconCanvas</name>
+    <message>
+        <location filename="../diagram/IconCanvas.cpp" line="+141"/>
+        <source>
+short cut</source>
+        <translation type="unfinished">
+Acceso directo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open</source>
+        <translation type="unfinished">Abrir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select diagram in browser</source>
+        <translation type="unfinished">Seleccionar diagrma en el navegador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ImageDialog</name>
+    <message>
+        <location filename="../dialog/ImageDialog.cpp" line="+57"/>
+        <source>Image dialog</source>
+        <translation type="unfinished">Image dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Image path :</source>
+        <translation type="unfinished">Image path :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set it relative to image root</source>
+        <translation type="unfinished">Set it relative to image root</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it relative to project</source>
+        <translation type="unfinished">Set it relative to project</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it absolute</source>
+        <translation type="unfinished">Establecer como absoluto</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Browse</source>
+        <translation type="unfinished">Navegar</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>IncludeTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+611"/>
+        <source>External type</source>
+        <translation type="unfinished">tipo External</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+</context>
+<context>
+    <name>InfoCanvas</name>
+    <message>
+        <location filename="../diagram/InfoCanvas.cpp" line="+124"/>
+        <source>Information</source>
+        <translation type="unfinished">Información</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Font</source>
+        <translation type="unfinished">tipo de letra</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location line="+61"/>
+        <source>note color</source>
+        <translation type="unfinished">color de la nota</translation>
+    </message>
+</context>
+<context>
+    <name>InstanceDialog</name>
+    <message>
+        <location filename="../dialog/InstanceDialog.cpp" line="+63"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Choose </source>
+        <translation type="unfinished">Seleccionar </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> selected in browser</source>
+        <translation type="unfinished"> selected in browser</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Create </source>
+        <translation type="unfinished">Create </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> and choose it</source>
+        <translation type="unfinished"> and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>InterruptibleActivityRegionCanvas</name>
+    <message>
+        <location filename="../diagram/InterruptibleActivityRegionCanvas.cpp" line="+259"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit interruptible activity region</source>
+        <translation type="unfinished">Editar la Región de actividad interrumpible</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <location line="+25"/>
+        <source>interruptible activity region color</source>
+        <translation type="unfinished">color de la Región de actividad interrumpible</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>KeyValuesTable</name>
+    <message>
+        <location filename="../dialog/KeyValueTable.cpp" line="+90"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>MLEDialog</name>
+    <message>
+        <location filename="../dialog/MLEDialog.cpp" line="+57"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>MyInputDialog</name>
+    <message>
+        <location filename="../dialog/MyInputDialog.cpp" line="+77"/>
+        <location line="+75"/>
+        <location line="+56"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="-130"/>
+        <location line="+75"/>
+        <location line="+56"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>NoteCanvas</name>
+    <message>
+        <location filename="../diagram/NoteCanvas.cpp" line="+219"/>
+        <source>Note</source>
+        <translation type="unfinished">Nota</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Color of text</source>
+        <translation type="unfinished">Color del texto</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Font</source>
+        <translation type="unfinished">tipo de letra</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>color</source>
+        <translation type="unfinished">color</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Text color dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Color de Texto</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <location line="+25"/>
+        <source>note color</source>
+        <translation type="unfinished">color de la nota</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectDiagramView</name>
+    <message>
+        <location filename="../diagram/ObjectDiagramView.cpp" line="+71"/>
+        <source>Object diagram menu</source>
+        <translation type="unfinished">Menú del diagrama de objetos</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ObjectDiagramWindow.cpp" line="+75"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Agregar paquete</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Agregar fragmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Agregar una instancias de clase modelada</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Agregar una instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Link between instances</source>
+        <translation type="unfinished">Agregar enlace entre instancias</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Nota</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectLinkCanvas</name>
+    <message>
+        <location filename="../diagram/ObjectLinkCanvas.cpp" line="+315"/>
+        <source>Relation already drawn</source>
+        <translation type="unfinished">La relación ya está dibujada</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dibujar todas las relaciones&lt;/i&gt; forzadas a &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Object link</source>
+        <translation type="unfinished">Enlace objeto</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select relation in browser</source>
+        <translation type="unfinished">Seleccionar relación en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Seleccionar etiquetas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Posición predeterminada de las etiquetas</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s name to this segment</source>
+        <translation type="unfinished">Vincular el nombre de la relación a este segmento</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s stereotype to this segment</source>
+        <translation type="unfinished">Vincular el estereotipo de la relación a este segmento</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometría (Ctrl+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectLinkDialog</name>
+    <message>
+        <location filename="../dialog/ObjectLinkDialog.cpp" line="+55"/>
+        <source>Object link dialog</source>
+        <translation type="unfinished">cuadro de diálogo Enlace</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>
+To set the association, select a cell or the first column with a single click, then press &apos;OK&apos;
+To unset the association press &apos;Unset&apos; then press &apos;OK&apos;
+</source>
+        <translation type="unfinished">
+para establecer la asociación seleccionela pulsando el ratón sobre una celula o sobre la primera columna y luego presione &apos;OK&apos;
+para desestablecer la asociación presione &apos;desestablecer&apos; (unset) y luego &apos;OK&apos;
+</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nuevo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Unset</source>
+        <translation type="unfinished">&amp;Desestablecer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>Class Inst.</source>
+        <translation type="unfinished">Instancia de Clase</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+2"/>
+        <source>Role</source>
+        <translation type="unfinished">Rol</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>kind</source>
+        <translation type="unfinished">tipo</translation>
+    </message>
+</context>
+<context>
+    <name>OdClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/OdClassInstCanvas.cpp" line="+567"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Seleccionar la clase en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">escribir nombre:tipo
+horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">Mostrar las propiedades
+de los estereotipos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">color de la instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>OpaqueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-662"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Behavior : </source>
+        <translation type="unfinished">Comportamiento : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+</context>
+<context>
+    <name>OperationData</name>
+    <message>
+        <location filename="../data/OperationData.cpp" line="+3727"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>OperationDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-5368"/>
+        <source>Operation dialog</source>
+        <translation type="unfinished">cuadro de diálogo Operación</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>class : </source>
+        <translation type="unfinished">clase : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>value type :</source>
+        <translation type="unfinished">tipo de dato :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>static</source>
+        <translation type="unfinished">static</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>abstract</source>
+        <translation type="unfinished">abstract</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>force body generation</source>
+        <translation type="unfinished">forzar la generación del cuerpo</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>parameters : </source>
+        <translation type="unfinished">parámetros : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>exceptions : </source>
+        <translation type="unfinished">excepciones : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+10"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Default</source>
+        <translation type="unfinished">Valor por omisión</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>constraint :</source>
+        <translation type="unfinished">restricción :</translation>
+    </message>
+    <message>
+        <location line="+141"/>
+        <location line="+58"/>
+        <source>follow uml</source>
+        <translation type="unfinished">seguir UML</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+137"/>
+        <location line="+130"/>
+        <location line="+134"/>
+        <location line="+340"/>
+        <source>Show body</source>
+        <translation type="unfinished">Mostrar cuerpo</translation>
+    </message>
+    <message>
+        <location line="-741"/>
+        <location line="+137"/>
+        <location line="+130"/>
+        <location line="+134"/>
+        <location line="+340"/>
+        <source>Edit body</source>
+        <translation type="unfinished">Editar cuerpo</translation>
+    </message>
+    <message>
+        <location line="-697"/>
+        <location line="+132"/>
+        <location line="+129"/>
+        <location line="+133"/>
+        <source>frozen</source>
+        <translation type="unfinished">congelado</translation>
+    </message>
+    <message>
+        <location line="-382"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Name form : </source>
+        <translation type="unfinished">Nombre del formulario : </translation>
+    </message>
+    <message>
+        <location line="-384"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Definition :</source>
+        <translation type="unfinished">Definición :</translation>
+    </message>
+    <message>
+        <location line="-383"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Resultado después
+de la sustitución : </translation>
+    </message>
+    <message>
+        <location line="-388"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <source>contextual
+body indent</source>
+        <translation type="unfinished">sangría contextual
+del cuerpo</translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+129"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Declaración predeterminada</translation>
+    </message>
+    <message>
+        <location line="-381"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">No generado en Java</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Mostrar anotación</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Editar anotación</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">No generado en PHP</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+65"/>
+        <location line="+60"/>
+        <source>Edit parameters</source>
+        <translation type="unfinished">Editar los parámetros</translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <source>Show parameters</source>
+        <translation type="unfinished">Show parameters</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">No generado en Python</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Show decorators</source>
+        <translation type="unfinished">Mostrar adornos</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit decorators</source>
+        <translation type="unfinished">Editar adornos</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">No generado en Idl</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador la clase elegida</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Crear clase y seleccionarla</translation>
+    </message>
+    <message>
+        <location line="+424"/>
+        <location line="+621"/>
+        <location line="+1358"/>
+        <location line="+476"/>
+        <source>wrong specification</source>
+        <translation type="unfinished">especificación incorrecta</translation>
+    </message>
+    <message>
+        <location line="-1969"/>
+        <source>[@][{][A-Za-z0-9]+[}]</source>
+        <translation type="unfinished">[@][{][A-Za-z0-9]+[}]</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>,</source>
+        <translation type="unfinished">,</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+1095"/>
+        <source>Warning!</source>
+        <translation type="unfinished">Warning!</translation>
+    </message>
+    <message>
+        <location line="-1095"/>
+        <source>Could not find correct place for these tags: </source>
+        <translation type="unfinished">Could not find correct place for these tags: </translation>
+    </message>
+    <message>
+        <location line="+1096"/>
+        <source>The Operation you are trying to change is
+inhertied from/to other classes.
+Do you want to propagate the changes to it
+ through the inheritance tree?</source>
+        <translation type="unfinished">The Operation you are trying to change is
+inhertied from/to other classes.
+Do you want to propagate the changes to it
+ through the inheritance tree?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Above</source>
+        <translation type="unfinished">Above</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Everywhere</source>
+        <translation type="unfinished">Everywhere</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Do not propagate</source>
+        <translation type="unfinished">Do not propagate</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+    <message>
+        <location line="+4110"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+</context>
+<context>
+    <name>OperationListDialog</name>
+    <message>
+        <location filename="../dialog/OperationListDialog.cpp" line="+74"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>OperationWidgetCpp</name>
+    <message>
+        <location filename="../ui/operationwidgetcpp.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>frozen</source>
+        <translation type="unfinished">congelado</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>default</source>
+        <translation type="unfinished">predeterminado</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>delete</source>
+        <translation type="unfinished">delete</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>override</source>
+        <translation type="unfinished">override</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>final</source>
+        <translation type="unfinished">fin</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Name form:</source>
+        <translation type="unfinished">Nombre del formulario:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Declaration:</source>
+        <translation type="unfinished">Declaración:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+76"/>
+        <source>Result after substitution:</source>
+        <translation type="unfinished">Result after substitution:</translation>
+    </message>
+    <message>
+        <location line="-50"/>
+        <source>Default Declaration</source>
+        <translation type="unfinished">Default Declaration</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>From Definition</source>
+        <translation type="unfinished">From Definition</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+90"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">No generado en C++</translation>
+    </message>
+    <message>
+        <location line="-83"/>
+        <location line="+90"/>
+        <source>Edit parameters</source>
+        <translation type="unfinished">Editar los parámetros</translation>
+    </message>
+    <message>
+        <location line="-77"/>
+        <source>Definition:</source>
+        <translation type="unfinished">Definición:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>contextual
+body indent :</source>
+        <translation type="unfinished">sangría contextual
+del cuerpo :</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>EditBody</source>
+        <translation type="unfinished">EditBody</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Definición predeterminada</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>From Declaration</source>
+        <translation type="unfinished">From Declaration</translation>
+    </message>
+</context>
+<context>
+    <name>PackageCanvas</name>
+    <message>
+        <location filename="../diagram/PackageCanvas.cpp" line="+492"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Agregar elementos relacionados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location line="+34"/>
+        <source>package</source>
+        <translation type="unfinished">paquete</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+32"/>
+        <source>name in tab</source>
+        <translation type="unfinished">nombre en pestaña</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show context</source>
+        <translation type="unfinished">mostrar contexto</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">Mostrar las propiedades
+del estereotipo</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>Package color</source>
+        <translation type="unfinished">color del paquete</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+9"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>PackageDialog</name>
+    <message>
+        <location filename="../dialog/PackageDialog.cpp" line="+71"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Package dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Paquete</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>The generation directories may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</source>
+        <translation type="unfinished">La ruta de los directorios de generación serán relativas cuando se ha
+especificado un directorio raíz (a través del menu &apos;Proyecto&apos;
+en la entrada &apos;Editar configuración de generación&apos;)
+
+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>headers directory : </source>
+        <translation type="unfinished">directorio de los encabezados : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+29"/>
+        <location line="+56"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>Browse</source>
+        <translation type="unfinished">Navegar</translation>
+    </message>
+    <message>
+        <location line="-226"/>
+        <source>sources directory : </source>
+        <translation type="unfinished">directorio de los código fuente : </translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>The generation directory may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</source>
+        <translation type="unfinished">La ruta del directorio de generación será relativa cuando se ha
+especificado un directorio raíz (a través del menu &apos;Proyecto&apos;
+en la entrada &apos;Editar configuración de generación&apos;)
+
+</translation>
+    </message>
+    <message>
+        <location line="-157"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>directory : </source>
+        <translation type="unfinished">directorio : </translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>meta model : 
+reference</source>
+        <translation type="unfinished">meta modelo :
+de referencia</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>meta class : 
+reference</source>
+        <translation type="unfinished">meta clase:
+de referencia</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <location line="+5"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Question</source>
+        <translation type="unfinished">Pregunta</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterCanvas</name>
+    <message>
+        <location filename="../diagram/ParameterCanvas.cpp" line="+370"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Resize other like it</source>
+        <translation type="unfinished">Redimensionar otro elemento similar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit parameter</source>
+        <translation type="unfinished">Editar parámetro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Seleccionar la clase en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+25"/>
+        <source>parameter node color</source>
+        <translation type="unfinished">color del nodo Parámetro</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterDialog</name>
+    <message>
+        <location filename="../dialog/ParameterDialog.cpp" line="+68"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Parameter dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Parámetro</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name :</source>
+        <translation type="unfinished">nombre :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>type :</source>
+        <translation type="unfinished">tipo :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>direction :</source>
+        <translation type="unfinished">dirección :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>   multiplicity : </source>
+        <translation type="unfinished">   multiplicidad : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   orden : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   effect : </source>
+        <translation type="unfinished">   efecto : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>in state : </source>
+        <translation type="unfinished">Estado en (in) : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>default value :</source>
+        <translation type="unfinished">valor por omisión :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+43"/>
+        <location line="+92"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-125"/>
+        <source>is_control</source>
+        <translation type="unfinished">is_control</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unique</source>
+        <translation type="unfinished">unico</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>standard</source>
+        <translation type="unfinished">estándar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>exception</source>
+        <translation type="unfinished">excepción</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>stream</source>
+        <translation type="unfinished">flujo (stream)</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>selection : </source>
+        <translation type="unfinished">selección : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador la clase elegida</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Crear clase y seleccionarla</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <location line="+29"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>An input parameter cannot be an exception.
+</source>
+        <translation type="unfinished">Un parámetro de entrada no puede ser una excepción.
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only in and inout parameter may have a delete effect.</source>
+        <translation type="unfinished">Solo los parámetros in e inout puede tener un efecto Eliminar.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only out, inout and return parameter may have a create effect.</source>
+        <translation type="unfinished">Solo los parámetros in. inout y return pueden tener un efecto Crear.</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterSetCanvas</name>
+    <message>
+        <location filename="../diagram/ParameterSetCanvas.cpp" line="+322"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit parameter set</source>
+        <translation type="unfinished">Editar conjunto de parámetros</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <location line="+25"/>
+        <source>parameter set color</source>
+        <translation type="unfinished">color del conjunto de parámetros</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterSetDialog</name>
+    <message>
+        <location filename="../dialog/ParameterSetDialog.cpp" line="+64"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>ParameterSet dialog</source>
+        <translation type="unfinished">cuadro de díalogo Conjunto de Parámetros</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Parameters out of Parameter Set</source>
+        <translation type="unfinished">Parámetros fuera del conjunto de parámetros</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Parameters in Parameter Set</source>
+        <translation type="unfinished">Parámetros en el Conjunto de parámetros</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Parameters</source>
+        <translation type="unfinished">Parámetros</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>ParamsTable</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-2686"/>
+        <source>Direction</source>
+        <translation type="unfinished">Dirección</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Tipo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default value</source>
+        <translation type="unfinished">Valor predeterminado</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+60"/>
+        <location line="+40"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>param %1</source>
+        <translation type="unfinished">parámetro %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insertar parámetro antes de</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insertar parámetro después de</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Borrar parámetro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copiar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cortar parámetro</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Pegar parámetro</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Move param</source>
+        <translation type="unfinished">Mover parámetro</translation>
+    </message>
+</context>
+<context>
+    <name>PhpParamsDialog</name>
+    <message>
+        <location line="+1778"/>
+        <source>Php parameters dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Parámetros de PHP</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>PhpParamsTable</name>
+    <message>
+        <location line="-515"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ref.</source>
+        <translation type="unfinished">Ref.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>array</source>
+        <translation type="unfinished">arreglo</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>param %1</source>
+        <translation type="unfinished">parámetro %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insertar parámetro antes de</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insertar parámetro después de</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Borrar parámetro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copiar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cortar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Pegar parámetro</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Mover parámetro</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Especificar rango</translation>
+    </message>
+</context>
+<context>
+    <name>PinCanvas</name>
+    <message>
+        <location filename="../diagram/PinCanvas.cpp" line="+390"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit pin</source>
+        <translation type="unfinished">Editar pin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Seleccionar la clase en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <location line="+25"/>
+        <source>pin color</source>
+        <translation type="unfinished">color del pin</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>PinDialog</name>
+    <message>
+        <location filename="../dialog/PinDialog.cpp" line="+66"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Pin dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Pin</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name :</source>
+        <translation type="unfinished">nombre :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>type :</source>
+        <translation type="unfinished">tipo :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>direction :</source>
+        <translation type="unfinished">dirección :</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>   multiplicity : </source>
+        <translation type="unfinished">   multiplicidad : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   orden : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   effect : </source>
+        <translation type="unfinished">   efecto : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>in state : </source>
+        <translation type="unfinished">Estado en (in) : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>is_control</source>
+        <translation type="unfinished">is_control</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unique</source>
+        <translation type="unfinished">unico</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>standard</source>
+        <translation type="unfinished">estándar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>exception</source>
+        <translation type="unfinished">excepción</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>stream</source>
+        <translation type="unfinished">flujo (stream)</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+91"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>selection : </source>
+        <translation type="unfinished">selección : </translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador la clase elegida</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Crear clase y seleccionarla</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <location line="+29"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>An input pin cannot be an exception.
+</source>
+        <translation type="unfinished">Un pin de entrada no puede ser una excepción.
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only in and inout pin may have a delete effect.</source>
+        <translation type="unfinished">Solo los pin in e inout pueden tener un efecto Eliminar.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only out, inout and return pin may have a create effect.</source>
+        <translation type="unfinished">Solo los pin in, inout y return pueden tener un efecto Crear.</translation>
+    </message>
+</context>
+<context>
+    <name>PseudoStateCanvas</name>
+    <message>
+        <location filename="../diagram/PseudoStateCanvas.cpp" line="+611"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">dibujar verticalmente</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">dibujar horizontalmente</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit pseudo state</source>
+        <translation type="unfinished">Editar pseudo estado</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <location line="+24"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>PseudoStateDialog</name>
+    <message>
+        <location filename="../dialog/PseudoStateDialog.cpp" line="+78"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>reference :</source>
+        <translation type="unfinished">reference :</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Choose pseudo state selected in browser</source>
+        <translation type="unfinished">Choose pseudo state selected in browser</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>PythonParamsDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="+768"/>
+        <source>Python parameters dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Parámetros de Python</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>PythonParamsTable</name>
+    <message>
+        <location line="-473"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modifier</source>
+        <translation type="unfinished">Modificador</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="+184"/>
+        <source>param %1</source>
+        <translation type="unfinished">parámetro %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insertar parámetro antes de</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insertar parámetro después de</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Borrar parámetro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copiar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cortar parámetro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Pegar parámetro</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Mover parámetro</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Especificar rango</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../CustomWidgets/quickedit.cpp" line="+128"/>
+        <source>Quick Edit</source>
+        <translation type="unfinished">Quick Edit</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivity.cpp" line="+192"/>
+        <location line="+31"/>
+        <location line="+182"/>
+        <source>enter activity&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre de la actividad : </translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>enter parameter&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del parámetro : </translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <source>the activity</source>
+        <translation type="unfinished">la actividad</translation>
+    </message>
+    <message>
+        <location line="+212"/>
+        <location filename="../misc/Settings.cpp" line="+1915"/>
+        <location line="+79"/>
+        <source>activity</source>
+        <translation type="unfinished">actividad</translation>
+    </message>
+    <message>
+        <location line="+249"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+260"/>
+        <location line="+9"/>
+        <location line="+17"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+288"/>
+        <location line="+26"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+197"/>
+        <location line="+9"/>
+        <location line="+17"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+182"/>
+        <location line="+9"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1777"/>
+        <location line="+18"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+166"/>
+        <location line="+9"/>
+        <location filename="../browser/BrowserPin.cpp" line="+237"/>
+        <location line="+9"/>
+        <location filename="../diagram/ArrowPointCanvas.cpp" line="+231"/>
+        <location line="+5"/>
+        <location filename="../diagram/CodObjCanvas.cpp" line="+96"/>
+        <location line="+11"/>
+        <location line="+3"/>
+        <location filename="../diagram/DiagramView.cpp" line="-1620"/>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="+170"/>
+        <location line="+5"/>
+        <location filename="../diagram/HubCanvas.cpp" line="+140"/>
+        <location line="+12"/>
+        <location line="+3"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="+266"/>
+        <location line="+5"/>
+        <location filename="../diagram/LabelCanvas.cpp" line="+347"/>
+        <location line="+5"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+201"/>
+        <location line="+8"/>
+        <location line="+3"/>
+        <location filename="../diagram/SdLostFoundMsgSupportCanvas.cpp" line="+145"/>
+        <location line="+7"/>
+        <location filename="../diagram/SdObjCanvas.cpp" line="+84"/>
+        <location line="+5"/>
+        <location filename="../diagram/TemplateCanvas.cpp" line="+195"/>
+        <location line="+5"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+308"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+741"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+307"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+444"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+596"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+881"/>
+        <location filename="../browser/BrowserClass.cpp" line="+2267"/>
+        <location line="+56"/>
+        <location line="+716"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1072"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+564"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+569"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+325"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+774"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+741"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+679"/>
+        <location filename="../browser/BrowserNode.cpp" line="+677"/>
+        <location line="+647"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-447"/>
+        <location line="+81"/>
+        <location line="+14"/>
+        <location line="+762"/>
+        <location line="+244"/>
+        <location line="+166"/>
+        <location line="+238"/>
+        <location line="+35"/>
+        <location line="+268"/>
+        <location line="+15"/>
+        <location line="+17"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+275"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+698"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+522"/>
+        <location filename="../browser/BrowserState.cpp" line="+924"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+489"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1080"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+946"/>
+        <location filename="../main.cpp" line="+211"/>
+        <location filename="../misc/Images.cpp" line="+64"/>
+        <location filename="../misc/myio.cpp" line="+875"/>
+        <location line="+19"/>
+        <location line="+22"/>
+        <location line="+70"/>
+        <location line="+16"/>
+        <location line="+19"/>
+        <location line="+16"/>
+        <location line="+31"/>
+        <location line="+28"/>
+        <location line="+28"/>
+        <location line="+103"/>
+        <location line="+49"/>
+        <location line="+91"/>
+        <location line="+40"/>
+        <location line="+32"/>
+        <location line="+25"/>
+        <location line="+178"/>
+        <location line="+30"/>
+        <location line="+63"/>
+        <location line="+67"/>
+        <location line="+7"/>
+        <location line="+202"/>
+        <location line="+6"/>
+        <location line="+12"/>
+        <location line="+20"/>
+        <location line="+26"/>
+        <location line="+6"/>
+        <location line="+26"/>
+        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+6"/>
+        <location line="+13"/>
+        <location line="+17"/>
+        <location line="+6"/>
+        <location line="+29"/>
+        <location line="+42"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+0"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+0"/>
+        <location filename="../browser/BrowserClass.cpp" line="-772"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+0"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+0"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+0"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+0"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+0"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserNode.cpp" line="-695"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-983"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+0"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+0"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserState.cpp" line="+0"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+0"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+0"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+0"/>
+        <source>Forbidden</source>
+        <translation type="unfinished">Prohibido</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityAction.cpp" line="-768"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="-374"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="-471"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="-6"/>
+        <location filename="../browser/BrowserParameter.cpp" line="-281"/>
+        <location filename="../browser/BrowserPin.cpp" line="-6"/>
+        <source>not in the same activity</source>
+        <translation type="unfinished">no está en la misma actividad</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <location line="+27"/>
+        <location line="+22"/>
+        <location line="+22"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+123"/>
+        <source>enter activity action&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">ingresar el nombre
+de la acción
+(puede quedar vacio) : </translation>
+    </message>
+    <message>
+        <location line="-89"/>
+        <source>New pin</source>
+        <translation type="unfinished">Nuevo pin</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;pin&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New parameter set</source>
+        <translation type="unfinished">Nuevo conjunto de parámetros</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;Parameter Set&lt;/i&gt;</source>
+        <translation type="unfinished">agregar &lt;i&gt;Conjunto de Parámetros&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+238"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+108"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+102"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="-370"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="-546"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+287"/>
+        <location filename="../browser/BrowserClass.cpp" line="-1612"/>
+        <location line="+41"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+284"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-821"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+225"/>
+        <location filename="../browser/BrowserComponent.cpp" line="-268"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+228"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-370"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+231"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="-159"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-564"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+30"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-512"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+150"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+216"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-448"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+226"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+648"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+32"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+160"/>
+        <location filename="../browser/BrowserPin.cpp" line="+33"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-278"/>
+        <location filename="../browser/BrowserRegion.cpp" line="-349"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+508"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+236"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+246"/>
+        <location filename="../browser/BrowserState.cpp" line="-574"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="-268"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+228"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+220"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-832"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+239"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="-82"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+130"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-143"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt; %1 &lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt; %1 &lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+20"/>
+        <location filename="../browser/BrowserClass.cpp" line="-38"/>
+        <location line="+41"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+3"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+26"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+6"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+6"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+7"/>
+        <source>Duplicate</source>
+        <translation type="unfinished">Duplicar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+1"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+1"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+1"/>
+        <source>to copy the &lt;i&gt;%1&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;%1&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select  %1</source>
+        <translation type="unfinished">Select  %1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+4"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+6"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+10"/>
+        <location filename="../browser/BrowserClass.cpp" line="-38"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+5"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+12"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+6"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+12"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+6"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+12"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+3"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+32"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+3"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+3"/>
+        <location filename="../browser/BrowserPin.cpp" line="+5"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+4"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+6"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+24"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+5"/>
+        <location filename="../browser/BrowserState.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+10"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+5"/>
+        <source>Delete</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+90"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="-5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+84"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+7"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+7"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+15"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="-22"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+5"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+8"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+15"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+8"/>
+        <source>Referenced by</source>
+        <translation type="unfinished">Referenciado por</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt;                                          through a flow or dependency</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt;                                          through a flow or dependency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+3"/>
+        <location filename="../browser/BrowserState.cpp" line="+3"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+3"/>
+        <source>the %1</source>
+        <translation type="unfinished">the %1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+6"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+9"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+8"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+9"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+18"/>
+        <location filename="../browser/BrowserClass.cpp" line="+57"/>
+        <location filename="../browser/BrowserClassDiagram.cpp" line="+248"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+9"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+54"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+9"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+13"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+9"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+66"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+9"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+8"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+12"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+8"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+8"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+34"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1461"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+9"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+8"/>
+        <location filename="../browser/BrowserPin.cpp" line="+8"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+9"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+25"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+12"/>
+        <location filename="../browser/BrowserState.cpp" line="+6"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+6"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+8"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+9"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-705"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="+104"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+5"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+8"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+5"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+5"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+4"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+7"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+7"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+16"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+4"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+5"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+5"/>
+        <source>Undelete</source>
+        <translation type="unfinished">Deshacer borrado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+1"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+1"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+1"/>
+        <source>to undelete the &lt;i&gt;%1&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;%1&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+7"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+7"/>
+        <location filename="../browser/BrowserClass.cpp" line="+10"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+3"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+3"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+3"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserState.cpp" line="+6"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+3"/>
+        <source>Undelete recursively</source>
+        <translation type="unfinished">restablecer recursivamente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to undelete the &lt;i&gt;%1&lt;/i&gt; and its &lt;i&gt;pins&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt; (except if the element at the other side is also deleted)</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;%1&lt;/i&gt; and its &lt;i&gt;pins&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt; (except if the element at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="-121"/>
+        <location line="+147"/>
+        <source>enter activity diagram&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del diagrama de actividad : </translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-33"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-34"/>
+        <source>Show</source>
+        <translation type="unfinished">Mostrar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to show and edit the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">mostrar y editar el &lt;i&gt;diagrama de actividades&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">editar el &lt;i&gt;diagrama de actividades&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-67"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-25"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-79"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-30"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+8"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to set how the &lt;i&gt;activity diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">especificar como deben ser dibujados los item del &lt;i&gt;diagrama de actividad&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">duplicar el &lt;i&gt;diagrama de actividad&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity diagram&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">borrar el &lt;i&gt;diagrama de actividad&lt;/i&gt;. Puede ser restablecido posteriormente</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the activity diagram</source>
+        <translation type="unfinished">el diagrama de actividad</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;diagrama de actividad&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Activity diagram</source>
+        <translation type="unfinished">diagrama de actividad</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+174"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+503"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+132"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+125"/>
+        <source>activity color</source>
+        <translation type="unfinished">color de la actividad</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity region color</source>
+        <translation type="unfinished">color de la región de la actividad</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity partition color</source>
+        <translation type="unfinished">color de la partición de la actividad</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity action color</source>
+        <translation type="unfinished">color de la acción de la actividad</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>parameter and pin color</source>
+        <translation type="unfinished">color de parámetro y pin</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-11"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+139"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+137"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+70"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+137"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+139"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+139"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-16"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+138"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+138"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-13"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+140"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-14"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+43"/>
+        <location line="+62"/>
+        <source>note color</source>
+        <translation type="unfinished">color de la nota</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+2"/>
+        <source>package color</source>
+        <translation type="unfinished">color del paquete</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>fragment color</source>
+        <translation type="unfinished">color del fragmento</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>activity diagram</source>
+        <translation type="unfinished">diagrama de actividad</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityNode.cpp" line="-165"/>
+        <location filename="../browser/BrowserParameter.cpp" line="-72"/>
+        <location filename="../browser/BrowserPin.cpp" line="-77"/>
+        <source>can&apos;t have outgoing flow</source>
+        <translation type="unfinished">no puede tener flujos de salida</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>can&apos;t have several outgoing flows</source>
+        <translation type="unfinished">No se puede tener varios flujos de salida</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>initial node can&apos;t have incoming flow</source>
+        <translation type="unfinished">el nodo de inicialización no puede tener flujo de entrada</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+40"/>
+        <source>fork can&apos;t have several incoming flow</source>
+        <translation type="unfinished">la bifurcación no puede tener varios flujos de entrada</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+26"/>
+        <source>an input parameter can&apos;t have incoming flows</source>
+        <translation type="unfinished">un parámetro de entrada no puede tener flujos entrantes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+3"/>
+        <source>parameter can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">el parámetro no puede aceptar flujos Control (no es &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">no puede aceptar flujo Control (no es &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>pin can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">el pin no puede aceptar flujo Control (no es &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>can&apos;t have incoming data flow</source>
+        <translation type="unfinished">no puede tener un flujo de entrada de datos</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-29"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="-29"/>
+        <source>to edit the &lt;i&gt;%1&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;%1&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+10"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+10"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt; through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt; through a flow</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityObject.cpp" line="-94"/>
+        <location line="+33"/>
+        <location line="+84"/>
+        <source>enter activity object&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">ingrese el nombre del
+objeto (puede quedar vacio) : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>to edit the &lt;i&gt;activity object&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity object&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;activity object&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar el &lt;i&gt;objeto&lt;/i&gt; en uno nuevo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity object&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity object&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;activity object&lt;/i&gt;                                                                           through a flow or dependency</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;activity object&lt;/i&gt;                                                                           through a flow or dependency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the activity object</source>
+        <translation type="unfinished">el objeto de actividad</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity object&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;objeto de actividad&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the &lt;i&gt;activity object&lt;/i&gt; and its &lt;i&gt;expansion nodes&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt;(except if the element at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;activity object&lt;/i&gt; and its &lt;i&gt;expansion nodes&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt;(except if the element at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>activity object</source>
+        <translation type="unfinished">objeto</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="-101"/>
+        <location line="+34"/>
+        <location line="+97"/>
+        <source>enter activity partition&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">ingresar el nombre de la
+partición (puede quedar vacio) : </translation>
+    </message>
+    <message>
+        <location line="-70"/>
+        <source>New sub activity partition</source>
+        <translation type="unfinished">Nueva sub partición</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a sub &lt;i&gt;activity partition&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una sub &lt;i&gt;partición&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;activity partition&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity partition&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;activity partition&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar la &lt;partición&lt;/i&gt; en una nueva</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity partition&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity partition&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;partition&lt;/i&gt;</source>
+        <translation type="unfinished">conocer quien referencia la &lt;i&gt;partición&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the activity partition</source>
+        <translation type="unfinished">la partición</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity partition&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;partición&lt;/&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the activity partition and its children</source>
+        <translation type="unfinished">restablecer la partición y sus hijos</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>activity partition</source>
+        <translation type="unfinished">partición</translation>
+    </message>
+    <message>
+        <location line="+174"/>
+        <location filename="../browser/BrowserClass.cpp" line="+1422"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+196"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+453"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+389"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+911"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+297"/>
+        <location filename="../browser/BrowserState.cpp" line="+512"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+661"/>
+        <source>move </source>
+        <translation type="unfinished">mover </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserClass.cpp" line="+2"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+2"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+2"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+4"/>
+        <location filename="../browser/BrowserState.cpp" line="+2"/>
+        <source>In </source>
+        <translation type="unfinished">Dentro </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClass.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+1"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+2"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <source>After </source>
+        <translation type="unfinished">Detrás </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserArtifact.cpp" line="-136"/>
+        <location filename="../browser/BrowserComponent.cpp" line="-331"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1623"/>
+        <source>already exist</source>
+        <translation type="unfinished">Ya existe</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+3"/>
+        <source>circular inheritance</source>
+        <translation type="unfinished">herencia circular</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>to edit the &lt;i&gt;artifact&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;artifact&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;artifact&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;artifact&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location filename="../browser/BrowserClass.cpp" line="-1484"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-145"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-118"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+138"/>
+        <source>Generate</source>
+        <translation type="unfinished">Generar</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+31"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+49"/>
+        <source>Roundtrip body</source>
+        <translation type="unfinished">Rountrip al cuerpo</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>C++ header file</source>
+        <translation type="unfinished">archivo de cabecera C++</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ source file</source>
+        <translation type="unfinished">archivo fuente C++</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Java source file</source>
+        <translation type="unfinished">archivo fuente Java</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Php source file</source>
+        <translation type="unfinished">archivo fuente PHP</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Python source file</source>
+        <translation type="unfinished">archivo fuente Python</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Idl source file</source>
+        <translation type="unfinished">archivo fuente Idl</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+30"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+27"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-5"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-10"/>
+        <source>Roundtrip</source>
+        <translation type="unfinished">Roundtrip</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>See file</source>
+        <translation type="unfinished">Ver archivo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;artifact&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;artifact&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the artifact</source>
+        <translation type="unfinished">al artefacto</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;artifact&lt;/i&gt;</source>
+        <translation type="unfinished">deshacer el borrado del&lt;i&gt;artifacto&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select the associated class</source>
+        <translation type="unfinished">Seleccionar la clase asociada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">seleccionar la &lt;i&gt;clase&lt;/i&gt; asociada</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+12"/>
+        <source>Select an associated class</source>
+        <translation type="unfinished">Seleccione una clase asociada</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+12"/>
+        <source>to select an associated &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">seleccionar una &lt;i&gt;clase&lt;/i&gt; asociada</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+156"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+38"/>
+        <location line="+19"/>
+        <source>Choose class</source>
+        <translation type="unfinished">Seleccionar clase</translation>
+    </message>
+    <message>
+        <location line="+188"/>
+        <source>artifact</source>
+        <translation type="unfinished">artefacto</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>choose existing artifact</source>
+        <translation type="unfinished">Seleccionar un artefacto existente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+17"/>
+        <source>enter artifact&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del artefacto : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserAttribute.cpp" line="-51"/>
+        <location filename="../browser/BrowserOperation.cpp" line="-89"/>
+        <source>Up</source>
+        <translation type="unfinished">Up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+1"/>
+        <source>to return to parent node</source>
+        <translation type="unfinished">to return to parent node</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;item&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;item&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to edit the &lt;i&gt;attribute&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;attribute&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-44"/>
+        <source>New get operation</source>
+        <translation type="unfinished">Nueva operación get</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;get operation&lt;/i&gt;</source>
+        <translation type="unfinished">auto definir la &lt;i&gt;operación get&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+3"/>
+        <source>New set operation</source>
+        <translation type="unfinished">Nueva operación set</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;set operation&lt;/i&gt;</source>
+        <translation type="unfinished">auto definir la &lt;i&gt;operación set&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+3"/>
+        <source>New get and set operation</source>
+        <translation type="unfinished">Nuevas operaciones get y set</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;get&lt;/i&gt; and &lt;i&gt;set operation&lt;/i&gt;s</source>
+        <translation type="unfinished">auto definir las operaciones &lt;i&gt;set&lt;/i&gt; y &lt;i&gt;get&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to copy the &lt;i&gt;attribute&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar el &lt;i&gt;atributo&lt;/i&gt; a uno nuevo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">conocer quien referencia la &lt;i&gt;clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;item&lt;/i&gt;.                                        Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;item&lt;/i&gt;.                                        Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to delete the &lt;i&gt;attribute&lt;/i&gt;.                                             Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;attribute&lt;/i&gt;.                                             Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>the attribute</source>
+        <translation type="unfinished">el atributo</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;item&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;item&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to undelete the &lt;i&gt;attribute&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;atributo&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+154"/>
+        <source>attribute</source>
+        <translation type="unfinished">atributo</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClass.cpp" line="-240"/>
+        <source>Implement whole </source>
+        <translation type="unfinished">Implement whole </translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Add item</source>
+        <translation type="unfinished">Agregar item</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;item&lt;/i&gt; to the &lt;i&gt;enum&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;item&lt;/i&gt; a la &lt;i&gt;enumeración&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add attribute</source>
+        <translation type="unfinished">Agregar atributo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;attribute&lt;/i&gt; to the </source>
+        <translation type="unfinished">agregar un &lt;i&gt;atributo&lt;/i&gt; a </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add operation</source>
+        <translation type="unfinished">Agregar operación</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;operation&lt;/i&gt; to the </source>
+        <translation type="unfinished">agregar una &lt;i&gt;operación&lt;/i&gt; a </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+27"/>
+        <source>Add inherited operation</source>
+        <translation type="unfinished">Agregar operación heredada</translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+27"/>
+        <source>to redefine an inherited &lt;i&gt;operation&lt;/i&gt; in the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">redefinir una &lt;i&gt;operación&lt;/i&gt; heredada</translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>Choose operation to add it</source>
+        <translation type="unfinished">Seleccionar la operación que será agregada</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Add nested class</source>
+        <translation type="unfinished">Agregar clase anidada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;nested class&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;clase anidada&lt;/i&gt; a la &lt;i&gt;clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Add extra member</source>
+        <translation type="unfinished">Agregar un miembro extra</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;extra member&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">Agregar un &lt;i&gt;miembro extra&lt;/i&gt; a la &lt;i&gt;clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+41"/>
+        <source>to edit the </source>
+        <translation type="unfinished">to edit the </translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+41"/>
+        <source>to duplicate the </source>
+        <translation type="unfinished">to duplicate the </translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <source>to delete the </source>
+        <translation type="unfinished">to delete the </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Create source artifact</source>
+        <translation type="unfinished">Crear artefacto fuente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt; in the &lt;i&gt;deployment view&lt;/i&gt; associated to the &lt;i&gt;class view&lt;/i&gt;, this artifact will contain the generated code of the class</source>
+        <translation type="unfinished">agregar un &lt;i&gt;artefacto fuente&lt;/i&gt; a la &lt;i&gt;vista de despliegue&lt;/i&gt; asociada a la &lt;i&gt;vista de clases&lt;/i&gt;, este artefacto contendrá el código generado de la clase</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Select associated artifact</source>
+        <translation type="unfinished">Seleccionar artefacto asociado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt;</source>
+        <translation type="unfinished">seleccionar el &lt;i&gt;artefacto fuente&lt;/i&gt; asociado</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select associated component</source>
+        <translation type="unfinished">Seleccionar componente asociado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">seleccionar el &lt;i&gt;componente&lt;/i&gt; que provee esta &lt;i&gt;clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Choose component</source>
+        <translation type="unfinished">Seleccionar componente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select an associated component</source>
+        <translation type="unfinished">Seleccionar un componente asociado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select a &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">seleccionar un &lt;i&gt;componente&lt;/i&gt; que provee esta &lt;i&gt;clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>to know who reference the </source>
+        <translation type="unfinished">to know who reference the </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the class</source>
+        <translation type="unfinished">la clase</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+10"/>
+        <source>undelete the </source>
+        <translation type="unfinished">undelete the </translation>
+    </message>
+    <message>
+        <location line="+265"/>
+        <location line="+1199"/>
+        <location line="+30"/>
+        <source>enter class&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre de la clase : </translation>
+    </message>
+    <message>
+        <location line="-1199"/>
+        <source>Choose inherited operation</source>
+        <translation type="unfinished">Seleccionar operación heredada</translation>
+    </message>
+    <message>
+        <location line="+238"/>
+        <source>enter item&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del item : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>enter attribute&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del atributo : </translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>enter operation&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre de la operación : </translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location line="+11"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <source>read only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="-47"/>
+        <source>typedef can&apos;t generalize / realize several times</source>
+        <translation type="unfinished">typedef no puede ser generalizado/realizo varias veces</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>a typedef can&apos;t have relation</source>
+        <translation type="unfinished">un typedef no puede tener una relación</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+858"/>
+        <source>an union can&apos;t generalize / realize</source>
+        <translation type="unfinished">una unión no puede ser generalizada/realizada</translation>
+    </message>
+    <message>
+        <location line="-828"/>
+        <source>can&apos;t have anchor between classes</source>
+        <translation type="unfinished">no se puede tener un ancla entre clases</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <location filename="../misc/Settings.cpp" line="-1463"/>
+        <source>class</source>
+        <translation type="unfinished">clase</translation>
+    </message>
+    <message>
+        <location line="+697"/>
+        <source>enter stereotype&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>one of the two classes is not a stereotype</source>
+        <translation type="unfinished">una de las dos clases no es un estereotipo</translation>
+    </message>
+    <message>
+        <location line="+653"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1905"/>
+        <location filename="../misc/myio.cpp" line="-734"/>
+        <source>Error while writting in
+%1
+may be your disk is full</source>
+        <translation type="unfinished">Error mientras se 
+escribia en
+%1
+quizás el disco esté lleno o
+protegido contra escritura</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassDiagram.cpp" line="-6"/>
+        <source>the class diagram</source>
+        <translation type="unfinished">el diagrama de clases</translation>
+    </message>
+    <message>
+        <location line="+167"/>
+        <source>class diagram</source>
+        <translation type="unfinished">diagrama de clases</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassInstance.cpp" line="-28"/>
+        <source>to edit the &lt;i&gt;class instance&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;class instance&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">duplicar la &lt;i&gt;instancia de clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;class instance&lt;/i&gt;.                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;class instance&lt;/i&gt;.                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;class instance&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;class instance&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the class instance</source>
+        <translation type="unfinished">la instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;instancia de clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <source>class instance</source>
+        <translation type="unfinished">instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+50"/>
+        <source>enter class instance&apos;s name (may be empty) : </source>
+        <translation type="unfinished">Ingrese el nombre de la instancia de clase (puede quedar vacio) : </translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>choose existing instance : </source>
+        <translation type="unfinished">seleccionar una instancia existente : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassView.cpp" line="-167"/>
+        <source>enter class view&apos;s name : </source>
+        <translation type="unfinished">ingrese el nombre de la vista de clases : </translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>New stereotype</source>
+        <translation type="unfinished">Nuevo estereotipo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;stereotype&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;estereotipo&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-813"/>
+        <source>New class diagram</source>
+        <translation type="unfinished">Nuevo diagrama de clases</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class diagram&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;diagrama de clases&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-5"/>
+        <source>New sequence diagram</source>
+        <translation type="unfinished">Nuevo diagrama de secuencia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;diagrama de secuencia&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New communication diagram</source>
+        <translation type="unfinished">Nuevo diagrama de comunicación</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;diagrama de comunicación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+3"/>
+        <source>New object diagram</source>
+        <translation type="unfinished">Nuevo diagrama de objetos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;diagrama de objetos&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+6"/>
+        <source>New class</source>
+        <translation type="unfinished">Nueva clase</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New class instance</source>
+        <translation type="unfinished">Nueva instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;instancia de clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New state machine</source>
+        <translation type="unfinished">Nueva máquina de estados</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;state machine&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;máquina de estados&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New activity</source>
+        <translation type="unfinished">Nueva actividad</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;actividad&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;class view&lt;/i&gt;</source>
+        <translation type="unfinished">editar la &lt;i&gt;vista de clase&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit class settings</source>
+        <translation type="unfinished">Editar la configuración de la clase</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to set the sub classes&apos;s settings</source>
+        <translation type="unfinished">especificar la configuración de las sub-clases</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to set how the sub &lt;i&gt;class diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">establecer como deben ser dibujados los elementos de los &lt;i&gt;diagramas de clases&lt;i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;class view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">eliminar la &lt;i&gt;vista de clase&lt;/i&gt; y sus sub-items. Podrá restablecerla posteriormente</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the class view</source>
+        <translation type="unfinished">la vista de clases</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>undelete the &lt;i&gt;class view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;vista de clases&lt;/i&gt;. No restablecer sus subitems</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;class view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;vista de clases&lt;/i&gt; y sus subitems</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select associated deployment view</source>
+        <translation type="unfinished">Seleccione la vista de despliegue asociada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;deployment view&lt;/i&gt;</source>
+        <translation type="unfinished">seleccionar la &lt;i&gt;vista de despliegue&lt;/i&gt; asociada</translation>
+    </message>
+    <message>
+        <location line="+92"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1382"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+147"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+4"/>
+        <source>class color</source>
+        <translation type="unfinished">color de la clase</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+6"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-9"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-2"/>
+        <source>duration color</source>
+        <translation type="unfinished">color de la Duración</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>continuation color</source>
+        <translation type="unfinished">color de la Continuación</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-4"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+2"/>
+        <source>state color</source>
+        <translation type="unfinished">color del estado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>state action color</source>
+        <translation type="unfinished">color del estado</translation>
+    </message>
+    <message>
+        <location line="+252"/>
+        <source>class view</source>
+        <translation type="unfinished">vista de clase</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-234"/>
+        <location line="+148"/>
+        <source>enter communication diagram&apos;s name : </source>
+        <translation type="unfinished">Ingresar el nombre del diagrama de comunicación : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Mostrar y Editar el &lt;i&gt;diagrama de comunicación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Editar el &lt;i&gt;diagrama de comunicación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;communication diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">Establecer como deben ser dibujados los item del &lt;i&gt;diagrama de comunicación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Duplicar el &lt;i&gt;diagrama de comunicación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;communication diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;communication diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the communication diagram</source>
+        <translation type="unfinished">el diagrama de comunicación</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Deshacer el borrado del &lt;i&gt;diagrama de comunicación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Communication diagram</source>
+        <translation type="unfinished">Diagrama de Comunicación</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-2"/>
+        <source>class instance 
+color</source>
+        <translation type="unfinished">color de
+la instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>communication diagram</source>
+        <translation type="unfinished">diagrama de comunicación</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponent.cpp" line="-37"/>
+        <source>Select the %1 class</source>
+        <translation type="unfinished">Select the %1 class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the %1 &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select the %1 &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+16"/>
+        <source>Select a %1 class</source>
+        <translation type="unfinished">Select a %1 class</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <location line="+16"/>
+        <source>to select a %1 &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select a %1 &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>New nested component</source>
+        <translation type="unfinished">Nuevo componente anidado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;nested component&lt;/i&gt; to the &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un nuevo &lt;i&gt;componente&lt;/i&gt; anidado al &lt;i&gt;componente&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to edit the &lt;i&gt;component&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">editar el &lt;i&gt;componente&lt;/i&gt;, un doble-click del boton izquierdo del ratón produce el mismo resultado</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;component&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">eliminar el &lt;i&gt;componente&lt;/i&gt;. Podrá restablecerlo posteriormente</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;component&lt;/i&gt; through a relation</source>
+        <translation type="unfinished">conocer quien referencia al &lt;i&gt;componente&lt;/i&gt; a través de una relación</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the component</source>
+        <translation type="unfinished">al componente</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;componente&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the &lt;i&gt;component&lt;/i&gt; and its nested &lt;i&gt;components&lt;/i&gt; and &lt;i&gt;relations&lt;/i&gt; (except if the component at the other side is also deleted)</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;componente&lt;/i&gt;, sus &lt;i&gt;componentes&lt;/i&gt; asociados y sus &lt;i&gt;relaciones&lt;/i&gt; (excepto si los elementos del otro lado también han sido borrados)</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <location filename="../misc/Settings.cpp" line="+844"/>
+        <location line="+198"/>
+        <source>component</source>
+        <translation type="unfinished">componente</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>choose existing component</source>
+        <translation type="unfinished">seleccionar un componente existente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+16"/>
+        <source>enter component&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del componente : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="-238"/>
+        <location line="+150"/>
+        <source>enter component diagram&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del diagrama de componentes : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Mostrar y Editar el &lt;i&gt;diagrama de componentes&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Editar el &lt;i&gt;diagrama de componentes&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;component diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">Establecer como deben ser dibujados los item del &lt;i&gt;diagrama de componentes&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Duplicar el &lt;i&gt;diagrama de componentes&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;component diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;component diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the component diagram</source>
+        <translation type="unfinished">el diagrama de componentes</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">Deshacer el borrado del &lt;i&gt;diagrama de componentes&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Component diagram</source>
+        <translation type="unfinished">Diagrama de Componentes</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-3"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+89"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-4"/>
+        <source>component color</source>
+        <translation type="unfinished">color del componente</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>component diagram</source>
+        <translation type="unfinished">diagrama de componentes</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponentView.cpp" line="-156"/>
+        <source>enter component view&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre de la vista de componente : </translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source>New component diagram</source>
+        <translation type="unfinished">Nuevo diagrama de componentes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;diagrama de componentes&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New component</source>
+        <translation type="unfinished">Nuevo Componente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;componente&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;component view&lt;/i&gt;</source>
+        <translation type="unfinished">editar la &lt;i&gt;vista de componentes&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to set how the sub &lt;i&gt;component diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">especificar como deben dibujarse los item de los &lt;i&gt;diagramas de componentes&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;component view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">Borrar la &lt;i&gt;vista de componentes&lt;/i&gt; y los sub items.  Pueden ser reestablecidos posteriormente</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the component view</source>
+        <translation type="unfinished">la vista de componentes</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>undelete the &lt;i&gt;component view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;vista de componentes&lt;/i&gt; sin deshacer el borrado de los subitems</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;component view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">deshacer el borrado de la &lt;i&gt;vista de componentes&lt;/i&gt; y de los subitems</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <location line="+109"/>
+        <source>Component view</source>
+        <translation type="unfinished">Vista de componentes</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>component view</source>
+        <translation type="unfinished">vista de componentes</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-237"/>
+        <location line="+149"/>
+        <source>enter deployment diagram&apos;s name : </source>
+        <translation type="unfinished">Ingrese el nombre del diagrama de despliegue : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">mostrar y editar el &lt;i&gt;diagrama de despliegue&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">editar el &lt;i&gt;diagrama de despliegue&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;deployment diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">especificar como deben ser dibujados los item del &lt;i&gt;diagrama de despliegue&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">duplicar el &lt;i&gt;diagrama de despliegue&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;deployment diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;deployment diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the deployment diagram</source>
+        <translation type="unfinished">el diagrama de despliegue</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;diagrama de despliegue&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Deployment diagram</source>
+        <translation type="unfinished">Diagrama de despliegue</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <source>artifact color</source>
+        <translation type="unfinished">color del artefacto</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <source>node color</source>
+        <translation type="unfinished">color del nodo</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>deployment diagram</source>
+        <translation type="unfinished">diagrama de despliegue</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="-26"/>
+        <source>to edit the &lt;i&gt;node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;node&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;node&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;node&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;node&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the node</source>
+        <translation type="unfinished">el nodo</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;node&lt;/i&gt;</source>
+        <translation type="unfinished">borrar el &lt;i&gt;nodo&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+66"/>
+        <source>Node</source>
+        <translation type="unfinished">Nodo</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>node</source>
+        <translation type="unfinished">nodo</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+18"/>
+        <source>enter node&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del nodo : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-229"/>
+        <source>enter deployment view&apos;s name : </source>
+        <translation type="unfinished">ingrese el nombre del diagrama de despliegue : </translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>New deployment diagram</source>
+        <translation type="unfinished">Nuevo diagrama de despliegue</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;diagrama de despliegue&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New node</source>
+        <translation type="unfinished">Nuevo nodo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;node&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;nodo&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New artifact</source>
+        <translation type="unfinished">Nuevo Artefacto</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;artifact&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;artefacto&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;deployment view&lt;/i&gt;</source>
+        <translation type="unfinished">editar la &lt;i&gt;vista de despliegue&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to set how the sub &lt;i&gt;deployment diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">establecer como deben se dibujados los elementos de los &lt;i&gt;diagramas de despliegue&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">borrar la &lt;i&gt;vista de despliegue&lt;/i&gt; y sus sub-items. Podrá ser reestablecida posteriormente</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the deployment view</source>
+        <translation type="unfinished">la vista de despliegue</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>undelete the &lt;i&gt;deployment view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;vista de despliegue&lt;/i&gt;. No restablecer los sub-items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;vista de despliegue&lt;/i&gt; y los sub-items</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+214"/>
+        <source>Deployment view</source>
+        <translation type="unfinished">vista de Despliegue</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>deployment view</source>
+        <translation type="unfinished">vista de despliegue</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="-150"/>
+        <location line="+168"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-298"/>
+        <source>enter expansion node&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">ingrese el nombre
+del nodo expansión
+(puede quedar vacio) : </translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>expansion node can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">el nodo expansión no puede aceptar flujo Control (no es &apos;is-control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>expansion node can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">el nodo de expansión no puede aceptar flujo de datos (es &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;expansion node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;expansion node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;expansion node&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar el &lt;i&gt;nodo de expansión&lt;/i&gt; en uno nuevo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;expansion node&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;expansion node&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;expansion node&lt;/i&gt;                                                                               through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;expansion node&lt;/i&gt;                                                                               through a flow</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the expansion node</source>
+        <translation type="unfinished">el nodo de expansión</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;expansion node&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;nodo de expansión&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <source>Expansion Node</source>
+        <translation type="unfinished">Nodo Expansión</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>expansion node</source>
+        <translation type="unfinished">nodo de expansión</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-259"/>
+        <location line="+33"/>
+        <location line="+106"/>
+        <source>enter expansion region&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">Ingrese le nombre de la
+región de expansión
+(podrá quedar vacio) : </translation>
+    </message>
+    <message>
+        <location line="-86"/>
+        <source>New expansion node</source>
+        <translation type="unfinished">Nuevo nodo expansión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;expansion node&lt;/i&gt; to the &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;nodo expansión&lt;/i&gt; a la &lt;i&gt;región de expansión&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New nested expansion region</source>
+        <translation type="unfinished">Nueva región de expansión anidada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-435"/>
+        <source>to add a nested &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;región de expansión&lt;/i&gt; anidada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New interruptible activity region</source>
+        <translation type="unfinished">Nueva Región de actividad interrumpible</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;región de actividad interrumpible&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>Add activity action</source>
+        <translation type="unfinished">Agregar acción</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity action&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;ì&gt;acción&lt;/i&gt; a la &lt;i&gt;región&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>Add object node</source>
+        <translation type="unfinished">Agregar nodo objeto</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity object node&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;ì&gt;nodo Objeto&lt;/i&gt; a la &lt;i&gt;región&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;expansion region&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">editar la &lt;i&gt;región de expansión&lt;/i&gt;, un doble-click del boton izquierdo del ratón produce el mismo resultado</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;expansion region&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar la &lt;i&gt;región de expansión&lt;/i&gt; en una nueva</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;expansion region&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">eliminar la &lt;i&gt;región de expansión&lt;/i&gt;. Podrá restablecerla posteriormente</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="-12"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+20"/>
+        <source>to know who reference the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">conocer quien referencia la &lt;i&gt;región&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the expansion region</source>
+        <translation type="unfinished">la región de expansión</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;región de expansión&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the expansion region and its children</source>
+        <translation type="unfinished">restablecer la región de expansión y sus hijos</translation>
+    </message>
+    <message>
+        <location line="+197"/>
+        <source>expansion region</source>
+        <translation type="unfinished">región de expansión</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExtraMember.cpp" line="-26"/>
+        <source>to edit the &lt;i&gt;extra member&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">editar el &lt;i&gt;miembro extra&lt;/i&gt;, un doble-click del boton izquierdo del ratón produce el mismo resultado</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;extra member&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar el &lt;i&gt;miembro extra&lt;/i&gt; en uno nuevo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;extra member&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">eliminar el &lt;i&gt;miembro extra&lt;/i&gt;. Podrá restablecerlo posteriormente</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>the extra member</source>
+        <translation type="unfinished">el miembro extra</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;extra member&lt;/i&gt;</source>
+        <translation type="unfinished">borrar &lt;i&gt;miembro extra&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <source>extra member</source>
+        <translation type="unfinished">miembro extra</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserFlow.cpp" line="-122"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-376"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-157"/>
+        <location filename="../browser/BrowserTransition.cpp" line="-137"/>
+        <source>from</source>
+        <translation type="unfinished">desde</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-2"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+2"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+2"/>
+        <source>to</source>
+        <translation type="unfinished">a</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>to edit the &lt;i&gt;flow&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;flow&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;flow&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;flow&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+120"/>
+        <source>Select </source>
+        <translation type="unfinished">Seleccionar </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+143"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+1"/>
+        <source>to select the destination</source>
+        <translation type="unfinished">Seleccionar el destino</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>the flow</source>
+        <translation type="unfinished">el flujo</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;flow&lt;/i&gt;                                          (except if the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;flow&lt;/i&gt;                                          (except if the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+110"/>
+        <source>flow</source>
+        <translation type="unfinished">flujo</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-88"/>
+        <location line="+141"/>
+        <source>enter interruptible activity 
+region&apos;s name (may be empty) : </source>
+        <translation type="unfinished">ingrese el nombre de la 
+región de actividad interrumpible
+(puede quedar vacio) : </translation>
+    </message>
+    <message>
+        <location line="-107"/>
+        <source> enter interruptible activity 
+region&apos;s name (may be empty) : </source>
+        <translation type="unfinished"> ingrese el nombre de la 
+región de actividad interrumpible
+(puede quedar vacio) : </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>New nested interruptible activity region</source>
+        <translation type="unfinished">Nueva región de actividad interrumpible anidada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a nested &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;región de actividad interrumpible&lt;/i&gt; anidada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New expansion region</source>
+        <translation type="unfinished">Nueva región de expansión</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>to edit the &lt;i&gt;interruptible activity region&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;interruptible activity region&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;interruptible activity region&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar la &lt;i&gt;región de actividad interrumpible&lt;/i&gt; en una nueva</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;interruptible activity region&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;interruptible activity region&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the interruptible activity region</source>
+        <translation type="unfinished">la región de actividad interrumpible</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;región de actividad interrumpible&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the interruptible activity region and its children</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;región de actividad interrumpible&lt;/i&gt; y sus hijos</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>interruptible activity region</source>
+        <translation type="unfinished">región de actividad interrumpible</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserNode.cpp" line="-608"/>
+        <source> cannot be deleted because :</source>
+        <translation type="unfinished"> no puede ser eliminado porque :</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>%1 is read-only</source>
+        <translation type="unfinished">%1 es de solo lectura</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>%1 referenced by the read-only component %2</source>
+        <translation type="unfinished">%1 referenciado por el componente de solo lectura %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 referenced by the read-only artifact %2</source>
+        <translation type="unfinished">%1 referenciado por el artefacto de solo lectura %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 is the target of the read-only relation %2</source>
+        <translation type="unfinished">%1 es el objetivo de la relación de solo lectura %2</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Some items cannot be undeleted</source>
+        <translation type="unfinished">Algunos elementos no pueder ser restablecidos</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Some items are renamed</source>
+        <translation type="unfinished">Algunos elementos no pueden ser renombrados</translation>
+    </message>
+    <message>
+        <location line="+536"/>
+        <source>already generalize / realize</source>
+        <translation type="unfinished">ya está generalizado/realizado</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>can&apos;t have circular generalization / realization</source>
+        <translation type="unfinished">no puede tener una realización/generalización circular</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <source>to recurcivelly duplicate the marked items into %1</source>
+        <translation type="unfinished">duplicar de forma recursiva los elementos marcados dentro de %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to recurcivelly duplicate the marked items after %1</source>
+        <translation type="unfinished">duplicar de forma recursiva los elementos marcados después de %1</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>to unmark %1</source>
+        <translation type="unfinished">desmarcar %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to unmark all the marked items</source>
+        <translation type="unfinished">desmarcar todos los item marcados</translation>
+    </message>
+    <message>
+        <location line="+433"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+104"/>
+        <source>illegal name or already used</source>
+        <translation type="unfinished">nombre ilegal o actualmente en uso</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <source>nothing available</source>
+        <translation type="unfinished">No hay nada disponible</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Empty name</source>
+        <translation type="unfinished">Nombre vacío</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Nonunicode name</source>
+        <translation type="unfinished">Nombre no Unicode</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Name starting with witespace</source>
+        <translation type="unfinished">Nombre que comienza con un espacio en blanco</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+12"/>
+        <source>Name containing illegal character: </source>
+        <translation type="unfinished">Nombre que contiene un carácter no válido :</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Name already used</source>
+        <translation type="unfinished">Nombre ya utilizado</translation>
+    </message>
+    <message>
+        <location line="+490"/>
+        <source>&lt;p&gt;&lt;b&gt;Warning, the model is not consistent because some elements have
+the same internal identifier.&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Users working on the same project have the same use identifier,
+or you had change the model files, or used Project synchro
+without following the mandatory rules&lt;/p&gt;
+</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;Advertencia, el modelo no es consistente porque algunos elementos tienen
+el mismo identificador.&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Esto se debe a que los usuarios que trabajan en el proyecto tienen el mismo
+identificador o se se ha cambiado directamente los archivos del proyecto o se ha
+utilizado Sincronización de proyecto sin seguir las reglas obligatorias&lt;/p&gt;
+</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>These elements was &lt;b&gt;removed&lt;/b&gt;</source>
+        <translation type="unfinished">Esos elementos fueron &lt;b&gt;removidos&lt;b&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The internal identifier of these elements was changed,
+but &lt;u&gt;I can&apos;t garantee the references to them are the right one&lt;/u&gt;,
+check your model</source>
+        <translation type="unfinished">El identificador interno de los elementos se ha cambiado pero
+&lt;u&gt;no se puede garantizar que las referencias a ellos sean
+correctas&lt;/i&gt;. Por favor revise el modelo</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-235"/>
+        <location line="+147"/>
+        <source>enter object diagram&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del diagrama de objetos : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">mostrar y editar el &lt;i&gt;diagrama de objetos&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">editar el &lt;i&gt;diagrama de objetos&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;object diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">establecer como deben ser dibujados los elementos del &lt;i&gt;diagrama de objetos&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">duplicar el &lt;i&gt;diagrama de objetos&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;object diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;object diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the object diagram</source>
+        <translation type="unfinished">diagrama de objetos</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;diagrama de objetos&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+137"/>
+        <source>Object diagram</source>
+        <translation type="unfinished">Diagrama de objetos</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserOperation.cpp" line="+4"/>
+        <source>Add constructor initializer</source>
+        <translation type="unfinished">Add constructor initializer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;operation&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit C++ body</source>
+        <translation type="unfinished">Editar cuerpo C++</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its C++ body</source>
+        <translation type="unfinished">editar la &lt;i&gt;operación&lt;/i&gt; y su correspondiente cuerpo C++</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Java body</source>
+        <translation type="unfinished">Editar cuerpo Java</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Java body</source>
+        <translation type="unfinished">editar la &lt;i&gt;operación&lt;/i&gt; y su correspondiente cuerpo Java</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Php body</source>
+        <translation type="unfinished">Editar cuerpo PHP</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Php body</source>
+        <translation type="unfinished">editar la &lt;i&gt;operación&lt;/i&gt; y su correspondiente cuerpo en PHP</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Python body</source>
+        <translation type="unfinished">Editar cuerpo Python</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Python body</source>
+        <translation type="unfinished">editar la &lt;i&gt;operación&lt;/i&gt; y su correspondiente cuerpo en Python</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;operation&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar la &lt;i&gt;operación&lt;/i&gt; en una nueva</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add implementing activity</source>
+        <translation type="unfinished">Agregar actividad de implementación</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una nueva &lt;i&gt;actividad&lt;/i&gt; que implemente la &lt;i&gt;operación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add implementing state</source>
+        <translation type="unfinished">Agregar un estado de implementación</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;state&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un nuevo &lt;i&gt;estado&lt;/i&gt; que implemente la &lt;i&gt;operación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">conocer quien referencia la &lt;i&gt;operación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select implementing behavior</source>
+        <translation type="unfinished">Seleccionar comportamiento (implementing behavior)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select a &lt;i&gt;state&lt;/i&gt; or &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">seleccionar un &lt;i&gt;estado&lt;/i&gt; o una &lt;i&gt;actividad&lt;/i&gt; que implemente la &lt;i&gt;operación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Choose behavior</source>
+        <translation type="unfinished">Seleccionar comportamiento</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to delete the &lt;i&gt;operation&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;operation&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>the operation</source>
+        <translation type="unfinished">operación</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to undelete the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">borrar la &lt;i&gt;operación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>operation</source>
+        <translation type="unfinished">operación</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPackage.cpp" line="-791"/>
+        <source>New package</source>
+        <translation type="unfinished">Nuevo Paquete</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new sub &lt;i&gt;package&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un nuevo sub &lt;i&gt;paquete&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New use case view</source>
+        <translation type="unfinished">Nueva vista de caso de uso</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;use case view&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una nueva &lt;i&gt;vista de caso de uso&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <location filename="../diagram/UmlWindow.cpp" line="+797"/>
+        <source>to set how an Uml type is compiled in C++ etc...,to set the default parameter passing, to set the default codeproduced for an attribute etc..., and to set the root directories</source>
+        <translation type="unfinished">to set how an Uml type is compiled in C++ etc...,to set the default parameter passing, to set the default codeproduced for an attribute etc..., and to set the root directories</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>the package</source>
+        <translation type="unfinished">el paquete</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Reverse</source>
+        <translation type="unfinished">Ingeniería inversa</translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>Question</source>
+        <translation type="unfinished">Pregunta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../dialog/PackageDialog.cpp" line="+1"/>
+        <source>Propagate the removal of the profile ?</source>
+        <translation type="unfinished">¿Propagar la remoción del perfil?</translation>
+    </message>
+    <message>
+        <location line="+351"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-4"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-5"/>
+        <source>subject color</source>
+        <translation type="unfinished">color del asunto</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-3"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-3"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-3"/>
+        <source>use case color</source>
+        <translation type="unfinished">color del caso de uso</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>choose existing package : </source>
+        <translation type="unfinished">escoger un paquete existente : </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>enter profile&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del perfil : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>enter package&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del paquete : </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Do you want to be the owner of this new package ?
+(other users can&apos;t modify it while you are the owner)</source>
+        <translation type="unfinished">¿Desea ser el propietario de este nuevo paquete?
+(otros usuarios no podrán modificarlo mientras usted sea el dueño)</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>The project is modified and need to be saved first.
+If you don&apos;t want to save your modifications reload
+the project then ask again for the update
+
+Save it to perform update ?
+</source>
+        <translation type="unfinished">El proyecto ha sido modificado y se requiere
+que sea guardado. Si no se desea guardar los
+cambios recargar el proyecto y pregunte de nuevo para la actualización.
+
+¿ Guardarlo para realizar la actualización ?
+</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>file &apos;%1&apos; is read only, update aborted</source>
+        <translation type="unfinished">el archivo &apos;%1&apos; es de solo lectura, actualización cancelada</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>you didn&apos;t select project &apos;%1&apos;</source>
+        <translation type="unfinished">no se seleccionó el proyecto &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>package</source>
+        <translation type="unfinished">paquete</translation>
+    </message>
+    <message>
+        <location line="+949"/>
+        <location filename="../misc/myio.cpp" line="-9"/>
+        <location line="+169"/>
+        <source>Cannot create file
+</source>
+        <translation type="unfinished">No se puede crear el archivo
+</translation>
+    </message>
+    <message>
+        <location line="+406"/>
+        <source>cannot be read</source>
+        <translation type="unfinished">no se puede leer</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+293"/>
+        <source>Your version of DOUML is too old to read this project</source>
+        <translation type="unfinished">Your version of DOUML is too old to read this project</translation>
+    </message>
+    <message>
+        <location line="-283"/>
+        <source>Sorry, the imported project has a too old format.
+To change its format : load this project and save it.</source>
+        <translation type="unfinished">Lo sentimos, el proyecto importado tiene un formato muy antiguo.
+Cargue este proyecto y guardelo.</translation>
+    </message>
+    <message>
+        <location line="+267"/>
+        <source>can&apos;t read project file</source>
+        <translation type="unfinished">no se puede leer el archivo de proyecto</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>can&apos;t find project file</source>
+        <translation type="unfinished">no se puede encontrar el archivo del proyecto</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserParameter.cpp" line="+1"/>
+        <source>parameter can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">el parámetro no puede aceptar flujos de datos (es &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;parameter&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;parameter&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;parameter&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar el &lt;i&gt;parámetro&lt;/i&gt; en uno nuevo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;parameter&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;parameter&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;parameter&lt;/i&gt;                                                                               through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;parameter&lt;/i&gt;                                                                               through a flow</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the parameter</source>
+        <translation type="unfinished">parámetro</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;parameter&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;parámetro&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>parameter</source>
+        <translation type="unfinished">parámetro</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserParameterSet.cpp" line="-25"/>
+        <source>to edit the &lt;i&gt;parameter set&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">editar el &lt;i&gt;conjunto de parámetros&lt;/i&gt;, un doble-click del boton izquierdo del ratón produce el mismo resultado</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;parameter set&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar el &lt;i&gt;conjunto de parámteros&lt;/i&gt; en uno nuevo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;parameter set&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">eliminar el &lt;i&gt;conjunto de parámetros&lt;/i&gt;. Podrá restablecerlo posteriormente</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;parameter set&lt;/i&gt;</source>
+        <translation type="unfinished">conocer quien referencia el &lt;i&gt;conjunto de parámetros&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the parameter set</source>
+        <translation type="unfinished">conjunto de parámetros</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;parameter set&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;conjunto de parámetros&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>parameter set</source>
+        <translation type="unfinished">conjunto de parámetros</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPin.cpp" line="-36"/>
+        <source>enter pin&apos;s name
+(may be empty) : </source>
+        <translation type="unfinished">Ingresar el nombre del
+pin (puede ser vacio) : </translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>target pin can&apos;t have incoming flow</source>
+        <translation type="unfinished">el pin objetivo no puede tener flujos de entrada</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>target pin can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">el pin objetivo no puede aceptar flujos Control (no es &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>target pin can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">el pin objetivo no puede aceptar flujos de datos (es &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;pin&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">editar el &lt;i&gt;pin&lt;/i&gt;, un doble-click del boton izquierdo del ratón produce el mismo resultado</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to copy the &lt;i&gt;pin&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar el &lt;i&gt;pin&lt;/i&gt; en uno nuevo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;pin&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">eliminar el &lt;i&gt;pin&lt;/i&gt;. Podrá restablecerlos posteriormente</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">conocer quien referencia el &lt;i&gt;pin&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the pin</source>
+        <translation type="unfinished">el pin</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to undelete the &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;pin&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>pin</source>
+        <translation type="unfinished">pin</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-171"/>
+        <source>can&apos;t have transition</source>
+        <translation type="unfinished">no puede tener una transición</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>can&apos;t have several transition</source>
+        <translation type="unfinished">no puede tener varias transiciones</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>can&apos;t have a transition to initial pseudo state</source>
+        <translation type="unfinished">no puede tener una transición a un pseudo estado Inicio</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>fork can&apos;t have several input transitions</source>
+        <translation type="unfinished">una bifurcación noi puede tener varias transiciones de entrada</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+34"/>
+        <location line="+106"/>
+        <location filename="../browser/BrowserState.cpp" line="-465"/>
+        <source>enter </source>
+        <translation type="unfinished">enter </translation>
+    </message>
+    <message>
+        <location line="-140"/>
+        <location line="+34"/>
+        <location line="+106"/>
+        <location filename="../browser/BrowserState.cpp" line="+0"/>
+        <source>&apos;s name : </source>
+        <translation type="unfinished">&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>already have a deep history</source>
+        <translation type="unfinished">ya cuenta con una Historia extensa</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>already have a shallow history</source>
+        <translation type="unfinished">ya cuenta con una Historia poco extensa</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt; through a transition</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt; through a transition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the </source>
+        <translation type="unfinished">the </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserRegion.cpp" line="-331"/>
+        <location filename="../browser/BrowserState.cpp" line="-101"/>
+        <location line="+7"/>
+        <source>New state</source>
+        <translation type="unfinished">Nuevo estado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;estado&lt;/i&gt; a la &lt;i&gt;región&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;region&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">editar la &lt;i&gt;región&lt;/i&gt;, un doble-click del boton izquierdo del ratón produce el mismo resultado</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;region&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">borrar la &lt;i&gt;región&lt;/i&gt;. Puede ser restablecida posteriormente</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>the region</source>
+        <translation type="unfinished">región</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">Deshacer el borrado de la &lt;i&gt;región&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the region and its children</source>
+        <translation type="unfinished">Deshacer el borrado de la &lt;i&gt;región&lt;/i&gt; y sus hijos</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location line="+16"/>
+        <source>Region</source>
+        <translation type="unfinished">Región</translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+665"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+551"/>
+        <source>In %1</source>
+        <translation type="unfinished">In %1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>After %1</source>
+        <translation type="unfinished">After %1</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserRelation.cpp" line="+10"/>
+        <source>because &lt;b&gt;%1&lt;/b&gt; cannot (or already) inherit on &lt;b&gt;%2&lt;/b&gt;</source>
+        <translation type="unfinished">porque &lt;b&gt;%1&lt;/b&gt; no puede ser (o ya es) heredado de &lt;b&gt;%2&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+342"/>
+        <source>to edit the &lt;i&gt;relation&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;relation&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to copy the &lt;i&gt;relation&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copiar la &lt;i&gt;relación&lt;/i&gt; en una nueva</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-4"/>
+        <source>to know who reference the &lt;i&gt;relation&lt;/i&gt;</source>
+        <translation type="unfinished">conocer quien referencia la &lt;i&gt;operación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;relation&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;relation&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+2"/>
+        <source>select </source>
+        <translation type="unfinished">seleccionar </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to select the destination class</source>
+        <translation type="unfinished">seleccionar clase destino</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+3"/>
+        <source>the relation</source>
+        <translation type="unfinished">relación</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>undelete the &lt;i&gt;relation&lt;/i&gt;                                          (except if the class at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;relation&lt;/i&gt;                                          (except if the class at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+125"/>
+        <location filename="../data/RelationData.cpp" line="+390"/>
+        <source>relation</source>
+        <translation type="unfinished">relación</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-240"/>
+        <location line="+153"/>
+        <source>enter sequence diagram&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del diagrama de secuencia : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">mostrar y editar el &lt;i&gt;diagrama de secuencia&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">editar el &lt;i&gt;diagrama de secuencia&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;sequence diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">establecer el modo en que los elementos del &lt;i&gt;diagrama de secuencia&lt;/i&gt; serán dibujados</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">duplicar el &lt;i&gt;diagrama de secuencia&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;sequence diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;sequence diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the sequence diagram</source>
+        <translation type="unfinished">diagrama de secuencia</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;diagrama de secuencia&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+139"/>
+        <source>Sequence diagram</source>
+        <translation type="unfinished">Diagrama de secuencia</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-143"/>
+        <source>to edit the &lt;i&gt;relation&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">editar la &lt;i&gt;relación&lt;/i&gt;, doble-click del boton izquierdo del ratón produce el mismo resultado</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;relation&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">borrar la &lt;i&gt;relación&lt;/i&gt;. Podrá ser restablecida posteriormente</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>undelete the &lt;i&gt;relation&lt;/i&gt; (except if the other side is also deleted)</source>
+        <translation type="unfinished">restablecer la &lt;i&gt;relación&lt;/i&gt; (excepto si el elemento del otro lado ha sido eliminado)</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserState.cpp" line="-98"/>
+        <location line="+33"/>
+        <source>enter state&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del estado : </translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>New state diagram</source>
+        <translation type="unfinished">Nuevo diagrama de estados</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;diagrama de estados&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New submachine</source>
+        <translation type="unfinished">Nueva submáquina</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;submachine&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;submáquina&lt;/i&gt; a la &lt;i&gt;máquina&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;estado&lt;/i&gt; a la &lt;i&gt;máquina&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New nested state</source>
+        <translation type="unfinished">Nuevo estado anidado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;nested state&lt;/i&gt; to the &lt;i&gt;state&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;estado anidado&lt;/i&gt; al &lt;i&gt;estado&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;submachine&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;estado&lt;/i&gt; a la &lt;i&gt;submáquina&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New region</source>
+        <translation type="unfinished">Nueva Región</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">agregar una &lt;i&gt;región&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;%1&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;%1&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;state&lt;/i&gt;                                                                           through a transition or a reference</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;state&lt;/i&gt;                                                                           through a transition or a reference</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>undelete the %1 and its children</source>
+        <translation type="unfinished">undelete the %1 and its children</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <location line="+136"/>
+        <source>state machine</source>
+        <translation type="unfinished">máquina de estados</translation>
+    </message>
+    <message>
+        <location line="-133"/>
+        <source>state submachine</source>
+        <translation type="unfinished">submáquina de estados</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+134"/>
+        <location filename="../misc/Settings.cpp" line="+133"/>
+        <location line="+89"/>
+        <source>state</source>
+        <translation type="unfinished">estado</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>state machine reference</source>
+        <translation type="unfinished">state machine reference</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserStateAction.cpp" line="+118"/>
+        <source>receive-signal action</source>
+        <translation type="unfinished">acción señal-recibida</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>send-signal action</source>
+        <translation type="unfinished">acción señal-enviada</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>state action</source>
+        <translation type="unfinished">acción</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-239"/>
+        <location line="+153"/>
+        <source>enter state diagram&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del diagrama de estados : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>to show and edit the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">mostrar y editar el &lt;i&gt;diagrama de estados&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">editar el &lt;i&gt;diagrama de estados&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;state diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">establecer como deben ser dibujados los elementos del &lt;i&gt;diagrama de estados&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">duplicar el &lt;i&gt;diagrama de estados&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;state diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;state diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the state diagram</source>
+        <translation type="unfinished">diagrama de estados</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>to undelete the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;diagrama de estados&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>State diagram</source>
+        <translation type="unfinished">Diagrama de estados</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>state diagram</source>
+        <translation type="unfinished">diagrama de estados</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserTransition.cpp" line="-18"/>
+        <source>to edit the &lt;i&gt;transition&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">editar la &lt;i&gt;transición&lt;/i&gt;, un doble-click con el boton izquierdo del ratón produce el mismo resultado</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;transition&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">Borrar la &lt;i&gt;transición&lt;/i&gt;. Puede ser reestablecida posteriormente</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>to know who reference the &lt;i&gt;transition&lt;/i&gt;</source>
+        <translation type="unfinished">conocer quien referencia la &lt;i&gt;transición&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the transition</source>
+        <translation type="unfinished">transición</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;transition&lt;/i&gt; (except if the other side is also deleted)</source>
+        <translation type="unfinished">Deshacer el borrado de la &lt;i&gt;transición&lt;/i&gt; (excepto si el otro lado también es borrado)</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>transition</source>
+        <translation type="unfinished">transición</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCase.cpp" line="-822"/>
+        <source>New use case diagram</source>
+        <translation type="unfinished">Nuevo diagrama de caso de uso</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;diagrama de caso de uso&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>New use case</source>
+        <translation type="unfinished">Nuevo caso de uso</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;use case&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;caso de uso&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New actor</source>
+        <translation type="unfinished">Nuevo actor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;actor&lt;/i&gt;</source>
+        <translation type="unfinished">agregar un &lt;i&gt;actor&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to edit the &lt;i&gt;use case&lt;/i&gt;</source>
+        <translation type="unfinished">editar el &lt;i&gt;caso de uso&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../diagram/UmlWindow.cpp" line="+17"/>
+        <source>to set how the sub &lt;i&gt;diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">especificar como deben ser dibujados los item de los diagramas</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;use case and its sub items&lt;/i&gt;.                                                      Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;use case and its sub items&lt;/i&gt;.                                                      Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>to know who reference the &lt;i&gt;use case&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;use case&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the use case</source>
+        <translation type="unfinished">caso de uso</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;use case&lt;/i&gt;.                                          Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;use case&lt;/i&gt;.                                          Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;use case&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">restablecer el &lt;i&gt;caso de uso&lt;i&gt; y sus sub-items</translation>
+    </message>
+    <message>
+        <location line="+290"/>
+        <location line="+16"/>
+        <source>enter use case&apos;s name : </source>
+        <translation type="unfinished">ingresar el nombre del caso de uso : </translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../misc/Settings.cpp" line="-523"/>
+        <source>use case</source>
+        <translation type="unfinished">caso de uso</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-236"/>
+        <location line="+147"/>
+        <source>enter use case diagram&apos;s name : </source>
+        <translation type="unfinished">ingrese el nombre del diagrama de casos de uso : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">mostrar y editar el &lt;i&gt;diagrama de casos de uso&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">editar el &lt;i&gt;diagrama de casos de uso&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;use case diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">establecer como deben ser dibujados los elementos del &lt;i&gt;diagrama de casos de uso&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">duplicar el &lt;i&gt;diagrama de casos de uso&lt;/i</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;use case diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;use case diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the use case diagram</source>
+        <translation type="unfinished">el diagrama de casos de uso</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restablecer &lt;i&gt;diagrama de casos de uso&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+142"/>
+        <source>Use Case diagram</source>
+        <translation type="unfinished">diagrama de Caso de Uso</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-777"/>
+        <source>enter use case view&apos;s name : </source>
+        <translation type="unfinished">ingrese el nombre de la vista de casos de uso : </translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>the use case view</source>
+        <translation type="unfinished">vista de casos de uso</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <location line="+197"/>
+        <location line="+10"/>
+        <source>Use case view</source>
+        <translation type="unfinished">vista de Caso de Uso</translation>
+    </message>
+    <message>
+        <location filename="../data/OperationData.cpp" line="+0"/>
+        <source>Expected nparams instead of </source>
+        <translation type="unfinished">Expected nparams instead of </translation>
+    </message>
+    <message>
+        <location filename="../diagram/ActivityDiagramWindow.cpp" line="-214"/>
+        <source>Click this button to add an &lt;i&gt;activity&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presione este botón para agregar una &lt;i&gt;actividad&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar la actividad desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;interruptible activity region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the interruptible activity region from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;región de actividad interrumpible&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar la región de actividad interrumpible desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;expansion region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the expansion region from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;Región de expansión&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar la región de expansión desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;activity partition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity partition from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;partición de actividad&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar la partición de actividad desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Click this button to add an &lt;i&gt;initial node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;nodo inicial&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar el nodo inicial desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;activity final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;activity final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;nodo final de actividad&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar el nodo final de actividad desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;flow final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;nodo Fin de flujo&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar el nodo Fin de flujo desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;decision node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;decision node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;nodo Decisión&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar el nodo Decisión de actividad desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;merge node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;merge node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;nodo Combinación&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar el nodo Combinación desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add an &lt;i&gt;action&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;acción&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar la acción desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;object node&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;nodo Objeto&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar el nodo Objeto desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;flow&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;flujo&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar el flujo desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ArrowPointCanvas.cpp" line="-27"/>
+        <source>Line break</source>
+        <translation type="unfinished">Salto de línea</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="+19"/>
+        <location filename="../diagram/HubCanvas.cpp" line="-39"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="+8"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+12"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location filename="../diagram/BrowserView.cpp" line="+74"/>
+        <source>browser          </source>
+        <translation type="unfinished">Navegador          </translation>
+    </message>
+    <message>
+        <location filename="../diagram/CdClassCanvas.cpp" line="-176"/>
+        <source>Choose operation to edit</source>
+        <translation type="unfinished">Seleccionar la operación a editar</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Choose inherited operation to add it</source>
+        <translation type="unfinished">Seleccionar una operación heredada para adicionar</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ClassDiagramWindow.cpp" line="+49"/>
+        <source>Click this button to add a &lt;i&gt;class&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;clase&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la clase desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;package&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the package from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;paquete&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el paquete desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Click this button to create a &lt;i&gt;dependency&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para crear una &lt;i&gt;dependencia&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to create an &lt;i&gt;unidirectional association&lt;/i&gt; or an &lt;i&gt;extension&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para crear una &lt;i&gt;Asociación unidireccional&lt;/i&gt; o una &lt;i&gt;extensión&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create an &lt;i&gt;aggregation&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para crear una &lt;i&gt;Agregación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;composition&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para crear una &lt;i&gt;composición&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;directional aggregation&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para crear una &lt;i&gt;agregación direccional&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;directional composition&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para crear una &lt;i&gt;composición direccional&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;realization&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para crear una &lt;i&gt;realización&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+120"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+103"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class</source>
+        <translation type="unfinished">Agregar clase</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+25"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Agregar paquete</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+8"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Agregar fragmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+24"/>
+        <source>Generalisation</source>
+        <translation type="unfinished">Generalización</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Realize</source>
+        <translation type="unfinished">Realización</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dependencia</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-12"/>
+        <location line="+6"/>
+        <source>Association</source>
+        <translation type="unfinished">Asociación</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Association / Extension</source>
+        <translation type="unfinished">Asociación/Extensión direccional</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Aggregation</source>
+        <translation type="unfinished">Agregación</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Composition</source>
+        <translation type="unfinished">Composición</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Aggregation</source>
+        <translation type="unfinished">Agregación direccional</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Composition</source>
+        <translation type="unfinished">Composición direccional</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+98"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+18"/>
+        <source>Note</source>
+        <translation type="unfinished">Nota</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor / Class association</source>
+        <translation type="unfinished">Clase de asociación/ancla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+14"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-19"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+12"/>
+        <source>Text</source>
+        <translation type="unfinished">Texto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="-15"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+7"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ColDiagramWindow.cpp" line="-82"/>
+        <source>Click this button to add a &lt;i&gt;link&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;enlace&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;self link&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;auto enlace&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ComponentDiagramWindow.cpp" line="-99"/>
+        <source>Click this button to add a &lt;i&gt;component&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the component from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;componente&lt;/i&gt; al diagrama. &lt;br&gt;&lt;br&gt;También puede arrastrar el componente desde el &lt;b&gt;navegador&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Click this button to show an interface required by a &lt;i&gt;component&lt;/i&gt;.</source>
+        <translation type="unfinished">Presionar este botón para mostrar una interface requerida por un &lt;i&gt;componente&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to show an interface provided by a &lt;i&gt;component&lt;/i&gt;.</source>
+        <translation type="unfinished">Presionar este botón para mostrar una interface proveida por un &lt;i&gt;componente&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DeploymentDiagramWindow.cpp" line="-123"/>
+        <source>Click this button to add a &lt;i&gt;node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the node from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;nodo&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el nodo desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add a &lt;i&gt;network&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;red&lt;/i&gt; al diagrama.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;network connexion/ending&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;conexión/finalización de red&lt;/i&gt; al diagrama.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;artifact&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;artefacto&lt;/i&gt; al diagrama.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramItem.cpp" line="+175"/>
+        <source>some elements already present in the diagram are NOT paste</source>
+        <translation type="unfinished">algunos elementos que ya están presentes en el diagrama no han sido pegados</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramView.cpp" line="+583"/>
+        <source>Multiple selection menu</source>
+        <translation type="unfinished">Menu de selección múltiple</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>align top</source>
+        <translation type="unfinished">alinear arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align bottom</source>
+        <translation type="unfinished">alinear abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align left</source>
+        <translation type="unfinished">alinear a la izquierda</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align right</source>
+        <translation type="unfinished">alinear a la derecha</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center</source>
+        <translation type="unfinished">centrar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center verticaly</source>
+        <translation type="unfinished">centrar verticalmente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center horizontaly</source>
+        <translation type="unfinished">centrar horizontalmente</translation>
+    </message>
+    <message>
+        <location line="+1507"/>
+        <source>SVG file (*.svg)</source>
+        <translation type="unfinished">Archivo SVG (*.svg)</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PNG file (*.png)</source>
+        <translation type="unfinished">Archivo PNG (*.png)</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramWindow.cpp" line="-82"/>
+        <source>Enter a new scale value or use the arrows to change the &lt;i&gt;scale&lt;/i&gt;</source>
+        <translation type="unfinished">Ingrese un nuevo valor de escala o use las flechas para cambiar la &lt;i&gt;escala&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to compute the &lt;i&gt;fit scale&lt;/i&gt; allowing to try to show all the diagram</source>
+        <translation type="unfinished">Presionar este botón para calcular el &lt;i&gt;ajuste de escala&lt;/i&gt; que permita mostrar todo el diagrama</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to compute the smallest window size allowing to show all the diagram</source>
+        <translation type="unfinished">Presionar este botón para calcular el menor tamaño de ventana que permite mostrar el diagrama</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to call the diagram menu like on a right mouse click done out of any element</source>
+        <translation type="unfinished">Presionar este botón para llamar el menú del diagrama. También puede invocar el menú haciendo click con el botón derecho del ratón sobre el lienzo del diagrama (sin estar sobre ningún elemento)</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>optimal scale</source>
+        <translation type="unfinished">escala óptima</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>optimal window size</source>
+        <translation type="unfinished">tamaño de ventana óptimo</translation>
+    </message>
+    <message>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="-2"/>
+        <source>Separator</source>
+        <translation type="unfinished">Separador</translation>
+    </message>
+    <message>
+        <location filename="../diagram/HubCanvas.cpp" line="-2"/>
+        <source>Network connexion</source>
+        <translation type="unfinished">Conexión de red</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ImageCanvas.cpp" line="+2"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+193"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="-114"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+10"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+10"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ObjectDiagramWindow.cpp" line="-74"/>
+        <source>Click this button to add a &lt;i&gt;link&lt;/i&gt; between instances</source>
+        <translation type="unfinished">Presione este botón para agregar un &lt;i&gt;enlace&lt;/i&gt; entre instancias</translation>
+    </message>
+    <message>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="-5"/>
+        <source>Life line</source>
+        <translation type="unfinished">Linea de vida</translation>
+    </message>
+    <message>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="-198"/>
+        <source>Click this button to add a modeled &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class instance from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;instancia de clase&lt;/i&gt; modelada al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la instancia de clase modelada desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;instancia de clase&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la instancia de clase desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Click this button to send a &lt;i&gt;synchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para enviar un &lt;i&gt;Mensaje síncrono&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send an &lt;i&gt;asynchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para enviar un &lt;i&gt;Mensaje asíncrono&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;reflexive synchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para enviar un &lt;i&gt;Mensaje reflexivo síncrono&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;reflexive asynchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para enviar un &lt;i&gt;Mensaje reflexivo asíncrono&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;synchronous lost message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;synchronous lost message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;asynchronous lost message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;asynchronous lost message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;synchronous found message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;synchronous found message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;asynchronous found message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;asynchronous found message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;explicitly return&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;Retorno explícito&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;explicit reflexive return&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;Retorno reflexivo explícito&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;text&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;Texto&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;continuation&lt;/i&gt;</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;Continuación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Agregar una instancias de clase modelada</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Agregar una instancia de clase</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Continuation</source>
+        <translation type="unfinished">Agregar continuación</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous message</source>
+        <translation type="unfinished">Mensaje síncrono</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous message</source>
+        <translation type="unfinished">Mensaje asíncrono</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous Reflexive message</source>
+        <translation type="unfinished">Mensaje síncrono reflexivo</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous Reflexive message</source>
+        <translation type="unfinished">Mensaje asíncrono reflexivo</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous found message</source>
+        <translation type="unfinished">Synchronous found message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous found message</source>
+        <translation type="unfinished">Asynchronous found message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous lost message</source>
+        <translation type="unfinished">Synchronous lost message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous lost message</source>
+        <translation type="unfinished">Asynchronous lost message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Explicit return</source>
+        <translation type="unfinished">Retorno explícito</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Explicit reflexive return</source>
+        <translation type="unfinished">Retorno explícito reflexivo</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-12"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancla</translation>
+    </message>
+    <message>
+        <location filename="../diagram/StateDiagramWindow.cpp" line="+45"/>
+        <source>Click this button to add a &lt;i&gt;state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the state from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;estado&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el estado desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Click this button to add a &lt;i&gt;entry point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;entry point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;punto de entrada&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el punto de entrada desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;exit point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;exit point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;punto de salida&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el punto de salida desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;initial pseudo state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial pseudo state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;pseudo estado Inicio&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el punto de salida desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;final state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;final state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;estado Fin&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el punto de salida desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;terminate node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;terminate node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar un &lt;i&gt;nodo Terminación&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el punto de salida desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;deep history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;deep history&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;Historia extensa&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar una Historia extensa desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;shallow history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;Historia poco extensa&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar una Historia poco extensa desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;junction&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;junction&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;juntura&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la juntura desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;choice&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;choice&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;Alternativa&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la alternativa desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;fork&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;foek&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;bifurcación&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la bifurcación desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;join&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;join&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;Unión&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la unión desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;transition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;transition&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;transición&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la transición desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;region&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;región&lt;/i&gt; en un estado.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;acción&lt;/i&gt; en un estado.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;receive signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;acción Recibir señal&lt;/i&gt; en un estado.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;send signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Presionar este botón para agregar una &lt;i&gt;acción Enviar señal&lt;/i&gt; en un estado.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="-15"/>
+        <source>Stereotype Properties</source>
+        <translation type="unfinished">Propiedades del estereotipo</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-5"/>
+        <source>Font</source>
+        <translation type="unfinished">tipo de letra</translation>
+    </message>
+    <message>
+        <location filename="../diagram/TextCanvas.cpp" line="-1"/>
+        <source>Color</source>
+        <translation type="unfinished">Color</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>foreground</source>
+        <translation type="unfinished">Frente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>background</source>
+        <translation type="unfinished">Fondo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Text color dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Color de Texto</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UmlWindow.cpp" line="-680"/>
+        <source>To create a &lt;i&gt;new project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</source>
+        <translation type="unfinished">Crear un &lt;i&gt;nuevo proyecto&lt;/i&gt;&lt;br&gt;&lt;br&gt;Debe indicar donde crear el nuevo directorio con el nombre del proyecto en el cual se colocarán todos los archivos.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>To create a &lt;i&gt;new project&lt;/i&gt; from an already existing one.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</source>
+        <translation type="unfinished">Crear un &lt;i&gt;nuevo proyecto&lt;/i&gt; a partir de uno existente.&lt;br&gt;&lt;br&gt;Debe indicar donde crear el nuevo directorio en el cual se colocarán todos los archivos del proyecto.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>To open a &lt;i&gt;project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the Project menu.</source>
+        <translation type="unfinished">Abrir un proyecto.&lt;br&gt;&lt;br&gt;También se puede seleccionar la opción &lt;b&gt;Abrir&lt;/b&gt; desde el menú del proyecto.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To save the project.&lt;br&gt;&lt;br&gt;You can also select the Save command from the Project menu.</source>
+        <translation type="unfinished">Guardar el proyecto.&lt;br&gt;&lt;br&gt;También se puede seleccionar la opción &lt;b&gt;Guardar&lt;/b&gt; desde el menú del proyecto.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To save all in a new project.</source>
+        <translation type="unfinished">Guardar todo en un nuevo proyecto.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To print the current diagram.</source>
+        <translation type="unfinished">Imprimir el diagrama actual.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To manage or not C++ and to set or not the C++ definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gestionar o no C++ y establecer o no la definición/declaración de C++ al valor predeterminado cuando un(a) clase/operación/atributo/relación/artefacto es creado(a)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Java and to set or not the Java definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gestionar o no Java y establecer o no la definición de Java al valor predeterminado cuando un(a) clase/operación/atributo/relación/artefacto es creado(a)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Php and to set or not the Php definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gestionar o no PHP y establecer o no la definición de PHP al valor predeterminado cuando un(a) clase/operación/atributo/relación/artefacto es creado(a)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Python and to set or not the Python definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gestionar o no Python y establecer o no la definición de Python al valor predeterminado cuando un(a) clase/operación/atributo/relación/artefacto es creado(a)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not IDL and to set or not the IDL definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gestionar o no IDL y establecer o no la definición/declaración IDL al valor predeterminado cuando un(a) clase/operación/atributo/relación/artefacto es creado(a)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To ask or not for a verbose code generation</source>
+        <translation type="unfinished">Preguntar o no acerca de la generación de código informada</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To preserve or not the operations&apos;s body</source>
+        <translation type="unfinished">Preservar o no el cuerpo de las operaciones</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To write the operation profile at the beginning of the temporary file when you edit an operation&apos;s body</source>
+        <translation type="unfinished">Escribir el perfil de la operación al inicio del archivo temporal cuando se edite el cuerpo de la operación</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To show or hide the &lt;i&gt;stereotypes&lt;/i&gt; in the &lt;b&gt;Browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Mostrar u ocultar los &lt;i&gt;estereotipos&lt;/i&gt; en el &lt;i&gt;navegador&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To select the &lt;i&gt;browser&lt;/i&gt; current item&apos;s parent.</source>
+        <translation type="unfinished">Seleccionar el padre del elemento actualmente seleccionado en el &lt;i&gt;navegador&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To search an item in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">Buscar un elemento en el &lt;i&gt;navegador&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To get information about items.</source>
+        <translation type="unfinished">To get information about items.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To set the point size of the base font used in the &lt;i&gt;browser&lt;/i&gt; and the diagrams.</source>
+        <translation type="unfinished">Establecer el tamaño del punto de la letra usada en el &lt;i&gt;navegador&lt;/i&gt; y los diagramas.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To set the default format of the diagrams.</source>
+        <translation type="unfinished">Especificar el formato predeterminado de los diagramas.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To select the previously selected element in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">Escoger el elemento previamente seleccionado en el &lt;i&gt;navegador&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To select the next selected element in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">Escoger el siguiente elemento seleccionado en el &lt;i&gt;navegador&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To ask or not for an auto completion (non case sensitive) in choice list (&lt;i&gt;combo box&lt;/i&gt;)</source>
+        <translation type="unfinished">Preguntar o no acerca del auto completado (sin considerar mayúsculas y minúsculas) en la lista de selección (&lt;i&gt;combo box&lt;/i&gt;)</translation>
+    </message>
+    <message>
+        <location line="+114"/>
+        <location line="+406"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nuevo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create from &amp;Template</source>
+        <translation type="unfinished">Crear desde &amp;Plantilla</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Abrir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Guardar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save &amp;as...</source>
+        <translation type="unfinished">Guardar &amp;como...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">&amp;Salir</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>to set the default stereotypes list</source>
+        <translation type="unfinished">establecer la lista predeterminada de estereotipos</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to set the sub classes settings</source>
+        <translation type="unfinished">especificar la configuración para las sub-clases</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Nothing available while a dialog is opened</source>
+        <translation type="unfinished">Nada está disponible mientras exista un cuadro de diálogo abierto</translation>
+    </message>
+    <message>
+        <location line="+234"/>
+        <source>Do not forget to set the target languages list
+through the &apos;Languages&apos; menu
+
+If you program in Java, the Java Catalog plug-out
+will help you, use it !</source>
+        <translation type="unfinished">Recordar especificar la lista de lenguajes desde el menu &apos;Lenguajes&apos;.
+
+Si se programa en Java, el plug-out Catálogo de Java puede ser útil. Se recomienda su uso! </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cannot create directory </source>
+        <translation type="unfinished">No se puede crear el directorio </translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>The name of the project and the name of
+the directory containing it must be the same
+
+</source>
+        <translation type="unfinished">El proyecto y el directorio que lo contiene
+deben tener el mismo nombre
+
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Project name : </source>
+        <translation type="unfinished">Nombre del proyecto : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Directory name : </source>
+        <translation type="unfinished">Directorio del proyecto : </translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Saving can&apos;t be done while a dialog is opened</source>
+        <translation type="unfinished">No se puede guardar mientras un cuadro de diálogo esté abierto</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>&apos;empty&apos; is reserved to the empty plug-out</source>
+        <translation type="unfinished">&apos;empty&apos; está reservado para el plug-out vacio</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cannot create directory
+</source>
+        <translation type="unfinished">No se puede crear el directorio
+</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>The project is modified, save it ?
+</source>
+        <translation type="unfinished">El proyecto ha sido modificado. ¿Guardar los cambios?
+</translation>
+    </message>
+    <message>
+        <location line="+371"/>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+853"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+26"/>
+        <source>Unchanged : project is read-only</source>
+        <translation type="unfinished">Sin modificaciones: el proyecto es de solo lectura</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; set to false.&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</source>
+        <translation type="unfinished">Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; set to false.&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; toggle is cleared !&lt;br&gt;&lt;br&gt;Next code generations will replace operations&apos;s body&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</source>
+        <translation type="unfinished">Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; toggle is cleared !&lt;br&gt;&lt;br&gt;Next code generations will replace operations&apos;s body&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Project file is read-only, new font size will not be saved, continue ?
+</source>
+        <translation type="unfinished">El archivo del proyecto es de solo lectura, el nuevo tamaño de letra no será guardado. ¿Continuar?
+</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Project file is read-only, default format will not be saved, continue ?
+</source>
+        <translation type="unfinished">El archivo del proyecto de de solo lectura, el formato predeterminado no será guradado. ¿Continuar?
+</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UseCaseDiagramView.cpp" line="+121"/>
+        <source>Use case diagram menu</source>
+        <translation type="unfinished">Menu del diagrama de caso de uso</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-119"/>
+        <source>Click this button to add an &lt;i&gt;actor&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presione este botón para agregar un &lt;i&gt;actor&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar la clase desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;use case&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the use case from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Presione este botón para agregar un &lt;i&gt;caso de uso&lt;/i&gt; al diagrama.&lt;br&gt;&lt;br&gt;También se puede arrastrar el caso de uso desde el navegador para obtener el mismo resultado.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Click this button to add a &lt;i&gt;fragment&lt;/i&gt;.</source>
+        <translation type="unfinished">Presione este botón para agregar un &lt;i&gt;fragmento&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;subject&lt;/i&gt;.</source>
+        <translation type="unfinished">Presione este botón para agregar un &lt;i&gt;Asunto&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create an &lt;i&gt;association&lt;/i&gt;</source>
+        <translation type="unfinished">Presione este botón para crear una &lt;i&gt;asociación&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to create a &lt;i&gt;generalisation&lt;/i&gt;</source>
+        <translation type="unfinished">Presione este botón para crear una &lt;i&gt;generalización&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;note&lt;/i&gt;</source>
+        <translation type="unfinished">Presione este botón para crear una &lt;i&gt;nota&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a connection between a &lt;i&gt;note&lt;/i&gt; and any other item, or between an &lt;i&gt;association&lt;/i&gt; and a &lt;i&gt;class&lt;/i&gt; in case of an &lt;i&gt;association class&lt;/i&gt;.</source>
+        <translation type="unfinished">Presione este botón para crear una conexión entre una &lt;i&gt;nota&lt;/i&gt; y cualquier otro elemento, o entre una &lt;i&gt;asociación&lt;/i&gt; y una &lt;i&gt;clase&lt;/i&gt; cuando se trate de una &lt;i&gt;asociación de clase&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add an &lt;i&gt;image&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;image&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Actor</source>
+        <translation type="unfinished">Actor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../dialog/StereotypesDialog.cpp" line="+195"/>
+        <source>Use Case</source>
+        <translation type="unfinished">Caso de uso</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Subject</source>
+        <translation type="unfinished">Agregar Asunto</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-1068"/>
+        <source>Pre
+condition : </source>
+        <translation type="unfinished">Pre
+Condición : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Post
+condition : </source>
+        <translation type="unfinished">Post
+condición : </translation>
+    </message>
+    <message>
+        <location line="+285"/>
+        <location line="+25"/>
+        <location line="+922"/>
+        <location line="+13"/>
+        <location line="+62"/>
+        <location line="+13"/>
+        <source>trigger - Ocl</source>
+        <translation type="unfinished">disparador (trigger) - Ocl</translation>
+    </message>
+    <message>
+        <location line="-1029"/>
+        <source>unmarshall</source>
+        <translation type="unfinished">Resolver referencias (unmarshall)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>time event</source>
+        <translation type="unfinished">evento tiempo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+22"/>
+        <location line="+19"/>
+        <location line="+896"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <location line="+36"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <source>trigger : </source>
+        <translation type="unfinished">disparador (trigger) : </translation>
+    </message>
+    <message>
+        <location line="-1031"/>
+        <location line="+12"/>
+        <location line="+923"/>
+        <location line="+12"/>
+        <location line="+63"/>
+        <location line="+12"/>
+        <source>trigger - C++</source>
+        <translation type="unfinished">disparador (trigger) - C++</translation>
+    </message>
+    <message>
+        <location line="-1003"/>
+        <location line="+12"/>
+        <location line="+923"/>
+        <location line="+12"/>
+        <location line="+63"/>
+        <location line="+12"/>
+        <source>trigger - Java</source>
+        <translation type="unfinished">disparador (trigger) - Java</translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+13"/>
+        <source>signal - Ocl</source>
+        <translation type="unfinished">señal - Ocl</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <source>signal : </source>
+        <translation type="unfinished">señal : </translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location line="+12"/>
+        <source>signal - C++</source>
+        <translation type="unfinished">señal - C++</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+12"/>
+        <source>signal - Java</source>
+        <translation type="unfinished">señal - Java</translation>
+    </message>
+    <message>
+        <location line="+497"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Choose behavior selected in browser</source>
+        <translation type="unfinished">Escoger el comportamiento seleccionado en el navegador</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Create activity and choose it</source>
+        <translation type="unfinished">Crear una actividad y seleccionarla</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Create state machine and choose it</source>
+        <translation type="unfinished">Crear una máquina de estados y seleccionarla</translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <location line="+13"/>
+        <source>classifier - Ocl</source>
+        <translation type="unfinished">clasificador - Ocl</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>classifier : </source>
+        <translation type="unfinished">clasificador : </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location line="+20"/>
+        <source>flags - Ocl</source>
+        <translation type="unfinished">banderas (flags) - Ocl</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>links</source>
+        <translation type="unfinished">enlaces</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>owned objects</source>
+        <translation type="unfinished">objetos que posee</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BasicDialog.cpp" line="-49"/>
+        <location filename="../dialog/ClassDialog.cpp" line="+866"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-152"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <location filename="../dialog/ClassDialog.cpp" line="+783"/>
+        <location filename="../dialog/PackageDialog.cpp" line="+101"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BodyDialog.cpp" line="+81"/>
+        <source>Note : operation bodies preserved</source>
+        <translation type="unfinished">Nota: el cuerpo de la operación ha sido preservado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can specify the editor through the environment dialog</source>
+        <translation type="unfinished">Usted puede especificar el editor a través del cuadro de diálogo Entorno</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BrowserSearchDialog.cpp" line="+95"/>
+        <location filename="../dialog/ReferenceDialog.cpp" line="+160"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Desmarcar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location filename="../dialog/ReferenceDialog.cpp" line="+0"/>
+        <source>Mark</source>
+        <translation type="unfinished">Marca</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="-3428"/>
+        <location filename="../dialog/ImageDialog.cpp" line="+27"/>
+        <source>Select image</source>
+        <translation type="unfinished">Seleccionar imagen</translation>
+    </message>
+    <message>
+        <location line="+1599"/>
+        <source>Type (C++)</source>
+        <translation type="unfinished">Tipo (C++)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default value (C++)</source>
+        <translation type="unfinished">Valor predeterminado (C++)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+72"/>
+        <location filename="../dialog/ToolDialog.cpp" line="+221"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="+369"/>
+        <source>inherited class formal</source>
+        <translation type="unfinished">clase formal heredada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>actual</source>
+        <translation type="unfinished">actual</translation>
+    </message>
+    <message>
+        <location line="+147"/>
+        <source>element kind</source>
+        <translation type="unfinished">tipo del elemento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>applicable</source>
+        <translation type="unfinished">aplicable</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+22"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="+90"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+34"/>
+        <source>yes</source>
+        <translation type="unfinished">si</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Parameterized</source>
+        <translation type="unfinished">Parametrizado</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Instantiate</source>
+        <translation type="unfinished">Crear instancia</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+490"/>
+        <source>follow uml</source>
+        <translation type="unfinished">seguir UML</translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <source>Stereotype</source>
+        <translation type="unfinished">Estereotipo</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>source</source>
+        <translation type="unfinished">fuente</translation>
+    </message>
+    <message>
+        <location line="+204"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Mostrar anotación</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Editar anotación</translation>
+    </message>
+    <message>
+        <location line="+303"/>
+        <source>Set it relative to image root</source>
+        <translation type="unfinished">Set it relative to image root</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it relative to project</source>
+        <translation type="unfinished">Set it relative to project</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="-907"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-518"/>
+        <source>Set it absolute</source>
+        <translation type="unfinished">Establecer como absoluto</translation>
+    </message>
+    <message>
+        <location line="+156"/>
+        <location filename="../misc/Images.cpp" line="+1"/>
+        <source>
+doesn&apos;t exist or is not a know image format</source>
+        <translation type="unfinished">
+no existe o es un archivo de imagen desconocido</translation>
+    </message>
+    <message>
+        <location filename="../dialog/CodEditMsgDialog.cpp" line="+47"/>
+        <source>Communication diagram message dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Mensaje del Diagrama de comunicación</translation>
+    </message>
+    <message>
+        <location filename="../dialog/DialogUtil.cpp" line="+315"/>
+        <source>Cannot open &apos;%1&apos;</source>
+        <translation type="unfinished">No se puede abrir &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Sub dialog(s) still opened
+If you choose &apos;Ok&apos; the dialog will be closed
+without taking into account it content</source>
+        <translation type="unfinished">Cuadros de diálogos aún abiertos.
+
+Si selecciona &apos;OK&apos; el cuadro de diálogo se cerrará
+sin tener en cuenta su contenido</translation>
+    </message>
+    <message>
+        <location filename="../dialog/EdgeMenuDialog.cpp" line="+149"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location filename="../dialog/EnvDialog.cpp" line="-75"/>
+        <source>Invalid identifier, must be an integer between 2 and 127</source>
+        <translation type="unfinished">identificador no válido, debe ser un entero entre 2 y 127</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Invalid DEFAULT SCREEN : coordinates can&apos;t be negative</source>
+        <translation type="unfinished">PANTALLA PREDETERMINADA no válida: las coordenadas no pueden ser negativas</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid DEFAULT SCREEN : the right must be greater than the left</source>
+        <translation type="unfinished">PANTALLA PREDETERMINADA no válida: El valor derecho debe ser más grande que el izquierdo</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid DEFAULT SCREEN : the bottom must be greater than the top</source>
+        <translation type="unfinished">PANTALLA PREDETERMINADA no válida: El valor inferior debe ser más grande que el superior</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>small DEFAULT SCREEN, width less than 500 points !</source>
+        <translation type="unfinished">PANTALLA PREDETERMINADA muy pequeña. El ancho es menor a 500 puntos!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>small DEFAULT SCREEN, height less than 500 points !</source>
+        <translation type="unfinished">PANTALLA PREDETERMINADA muy pequeña. La altura es menor a 500 puntos!</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Invalid DEFAULT SCREENTo not specify the desktop all values must be empty or null.Else the values must be non negative, the right must be greater
+than the left, and the bottom must be greater than the top</source>
+        <translation type="unfinished">PANTALLA PREDETERMINADA no válida: si no se desea especificar un escritorio todos los valores deben estar vacios o ser nulos.
+En caso contrario, los valores deben ser mayores a cero, el valor derecho mayor que el izquierdo y el valor inferior mayor que el superior
+ </translation>
+    </message>
+    <message>
+        <location line="+195"/>
+        <source>Own identifier missing or invalid</source>
+        <translation type="unfinished">Falta el indentificador o el ingresado no es válido</translation>
+    </message>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="-1576"/>
+        <source>Types</source>
+        <translation type="unfinished">Tipos</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-50"/>
+        <location line="+38"/>
+        <location line="+28"/>
+        <source>Stereotypes</source>
+        <translation type="unfinished">estereotipos</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>empty</source>
+        <translation type="unfinished">empty</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>1 space</source>
+        <translation type="unfinished">1 space</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>1 tab</source>
+        <translation type="unfinished">1 tab</translation>
+    </message>
+    <message>
+        <location line="+625"/>
+        <location line="+208"/>
+        <location line="+26"/>
+        <source>Modifiers</source>
+        <translation type="unfinished">Modificadores</translation>
+    </message>
+    <message>
+        <location line="+663"/>
+        <source>Description</source>
+        <translation type="unfinished">Descripción</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-1"/>
+        <source>Set it relative</source>
+        <translation type="unfinished">Establecer como relativo</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>Directory</source>
+        <translation type="unfinished">Directorio</translation>
+    </message>
+    <message>
+        <location line="+144"/>
+        <source>C++ &apos;in&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++: el argumento de entrada (&apos;in&apos;) que es pasado de forma predeterminada debe contener ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;out&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++: el argumento de salida (&apos;out&apos;) que es pasado de forma predeterminada debe contener ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;inout&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++: el argumento de entrada/salida (&apos;inout&apos;) que es pasado de forma predeterminada debe contener ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;return&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++: el argumento de retorno (&apos;return&apos;) que es pasado de forma predeterminada debe contener ${type}</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>C++ &apos;in&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++: el argumento de entrada (&apos;in&apos;) que es pasado de forma predeterminada debe contener ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;out&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++: el argumento de salida (&apos;out&apos;) que es pasado de forma predeterminada debe contener ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;inout&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++: el argumento de entrada/salida (&apos;inout&apos;) que es pasado de forma predeterminada debe contener ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;return&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++: el argumento de retorno (&apos;return&apos;) que es pasado de forma predeterminada debe contener ${type}</translation>
+    </message>
+    <message>
+        <location line="+299"/>
+        <source>C++ root directory</source>
+        <translation type="unfinished">Directorio raiz C++</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Java root directory</source>
+        <translation type="unfinished">Directorio raiz Java</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Php root directory</source>
+        <translation type="unfinished">Directorio raiz PHP</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Python root directory</source>
+        <translation type="unfinished">Directorio raiz Python</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Idl root directory</source>
+        <translation type="unfinished">Directorio raiz Idl</translation>
+    </message>
+    <message>
+        <location filename="../dialog/HelpDialog.cpp" line="+63"/>
+        <source>HelpDialog : error while executing &apos;%1&apos;
+perhaps you must specify its absolute pathor set the environment variable PATH ?</source>
+        <translation type="unfinished">HelpDialog : error while executing &apos;%1&apos;
+perhaps you must specify its absolute pathor set the environment variable PATH ?</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>The documentation is too old.&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished">La documentación es muy antigua.&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The documentation isn&apos;t installed.&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished">La documentación no está instalada.&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The &quot;.tar.gz&quot; or &quot;.7z&quot; archives are available here:&lt;ul&gt;&lt;li&gt;http://bouml.sourceforge.net/documentation.html&lt;/li&gt;&lt;li&gt;http://sourceforge.net/projects/douml/documentation.html&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;Extract an archive and set the environment through the Miscellaneousmenu to indicate where the directory &quot;doc&quot; is then close this dialog and redo</source>
+        <translation type="unfinished">The &quot;.tar.gz&quot; or &quot;.7z&quot; archives are available here:&lt;ul&gt;&lt;li&gt;http://bouml.sourceforge.net/documentation.html&lt;/li&gt;&lt;li&gt;http://sourceforge.net/projects/douml/documentation.html&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;Extract an archive and set the environment through the Miscellaneousmenu to indicate where the directory &quot;doc&quot; is then close this dialog and redo</translation>
+    </message>
+    <message>
+        <location filename="../dialog/KeyValueTable.cpp" line="-44"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-74"/>
+        <source>Key</source>
+        <translation type="unfinished">Llave</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do</source>
+        <translation type="unfinished">Do</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>key &apos;%1&apos; used several times</source>
+        <translation type="unfinished">la llave &apos;%1&apos; se ha usado varias veces</translation>
+    </message>
+    <message>
+        <location filename="../dialog/PackageDialog.cpp" line="+409"/>
+        <source>Profile</source>
+        <translation type="unfinished">Perfil</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <location line="+9"/>
+        <source>conflict on stereotypes</source>
+        <translation type="unfinished">conflicto entre estereotipos</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>C++ header directory</source>
+        <translation type="unfinished">directorio de encabezado C++</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ source directory</source>
+        <translation type="unfinished">directorio de fuente C++</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Java directory</source>
+        <translation type="unfinished">directorio Java</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Php directory</source>
+        <translation type="unfinished">directorio PHP</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Python directory</source>
+        <translation type="unfinished">directorio Python</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Idl directory</source>
+        <translation type="unfinished">Directorio Idl</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ReferenceDialog.cpp" line="-95"/>
+        <source> is referenced by :</source>
+        <translation type="unfinished"> es referenciado por :</translation>
+    </message>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="+43"/>
+        <source>Transparent</source>
+        <translation type="unfinished">Transparente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unknown color</source>
+        <translation type="unfinished">Color desconocido</translation>
+    </message>
+    <message>
+        <location line="+166"/>
+        <source>Diagram Drawing Settings dialog</source>
+        <translation type="unfinished">Cuadro de dialogo Confiugraciones de dibujo del diagrama</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>diagram</source>
+        <translation type="unfinished">diagrama</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>color</source>
+        <translation type="unfinished">color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>default </source>
+        <translation type="unfinished">predeterminado </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>color [1]</source>
+        <translation type="unfinished">color [1]</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>color [2]</source>
+        <translation type="unfinished">color [2]</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unchanged&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>default</source>
+        <translation type="unfinished">predeterminado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>unlimited</source>
+        <translation type="unfinished">ilimitado</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-68"/>
+        <source>Command</source>
+        <translation type="unfinished">Orden</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>tool display</source>
+        <translation type="unfinished">pantalla de herramienta</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>command</source>
+        <translation type="unfinished">orden</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>shortcut </source>
+        <translation type="unfinished">acceso directo </translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Shift </source>
+        <translation type="unfinished">Shift </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Ctrl </source>
+        <translation type="unfinished">Ctrl </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Alt </source>
+        <translation type="unfinished">Alt </translation>
+    </message>
+    <message>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-92"/>
+        <source>Package</source>
+        <translation type="unfinished">Paquete</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Class</source>
+        <translation type="unfinished">Clase</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Artifact</source>
+        <translation type="unfinished">Artefacto</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Views</source>
+        <translation type="unfinished">Vistas</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Diagrams</source>
+        <translation type="unfinished">Diagramas</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Activities</source>
+        <translation type="unfinished">Actividades</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Others</source>
+        <translation type="unfinished">Otros</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ToolDialog.cpp" line="-19"/>
+        <source>executable</source>
+        <translation type="unfinished">ejecutable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>display</source>
+        <translation type="unfinished">pantalla</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="-77"/>
+        <source>Warning</source>
+        <translation type="unfinished">Alerta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Douml is working in transitional mode.
+ All UI improvements are yours to use,  but saving is done in the format of Bouml 4.22 which loses all new c++11 and hierarchy specifiers
+
+To suppress this warning place empty file override_transition.txt into the application folder
+To disable the mode - change compatibility_save parameter to 0 in settings.ini
+</source>
+        <translation type="unfinished">Douml is working in transitional mode.
+ All UI improvements are yours to use,  but saving is done in the format of Bouml 4.22 which loses all new c++11 and hierarchy specifiers
+
+To suppress this warning place empty file override_transition.txt into the application folder
+To disable the mode - change compatibility_save parameter to 0 in settings.ini
+</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>DO NOT CONFIRM</source>
+        <translation type="unfinished">NO CONFIRMAR</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Root mode protection
+
+This mode allows us to develop DoUML
+
+do NOT confirm to avoid a disaster !!!
+
+confirm ?</source>
+        <translation type="unfinished">Protección de Modo Raíz
+
+Este modo nos permite desarrollar DoUML
+
+no confirme para evitar un desatre!!!!
+
+¿Confirma?</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>DoUML was called with wrong parameters, ignore them</source>
+        <translation type="unfinished">DoUML fue invoca con parámetros incorrectos. Los parámetros incorrectos serán ignorados</translation>
+    </message>
+    <message>
+        <location filename="../misc/ProfiledStereotypes.cpp" line="+660"/>
+        <location line="+17"/>
+        <source>isn&apos;t in a profile</source>
+        <translation type="unfinished">no está en un perfil</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+17"/>
+        <source>is already a stereotype</source>
+        <translation type="unfinished">es un estereotipo</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+280"/>
+        <source>Unconsistency</source>
+        <translation type="unfinished">Inconsistencia</translation>
+    </message>
+    <message>
+        <location line="-279"/>
+        <location line="+280"/>
+        <source>stereotype &apos;%1&apos; defined several times,
+redondant definition is not managed as a stereotype</source>
+        <translation type="unfinished">stereotype &apos;%1&apos; defined several times,
+redondant definition is not managed as a stereotype</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>Check</source>
+        <translation type="unfinished">Verificar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotype</source>
+        <translation type="unfinished">llamar el &lt;i&gt;verificar plug-out&lt;/i&gt; asociado al estereotipo</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Force stereotype consistency</source>
+        <translation type="unfinished">Forzar consistencia de estereotipos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to recompute all concerning the profiles</source>
+        <translation type="unfinished">recalcular todo lo relacionado a los perfiles</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Check recursively</source>
+        <translation type="unfinished">Verificar de forma recursiva</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotypes,doing down recursively</source>
+        <translation type="unfinished">llamar el &lt;i&gt;verificar plug-out&lt;/i&gt; asociado a los estereotipos, hacerlo descendiendo de forma recursiva</translation>
+    </message>
+    <message>
+        <location filename="../misc/Settings.cpp" line="-822"/>
+        <location line="+43"/>
+        <location line="+42"/>
+        <location line="+288"/>
+        <location line="+13"/>
+        <location line="+155"/>
+        <location line="+17"/>
+        <location line="+22"/>
+        <location line="+761"/>
+        <location line="+8"/>
+        <location line="+191"/>
+        <location line="+7"/>
+        <source>drawing language</source>
+        <translation type="unfinished">lenguaje de dibujo</translation>
+    </message>
+    <message>
+        <location line="-1546"/>
+        <location line="+231"/>
+        <source>drawing mode</source>
+        <translation type="unfinished">modo de dibujo</translation>
+    </message>
+    <message>
+        <location line="-230"/>
+        <location line="+34"/>
+        <location line="+197"/>
+        <source>show context</source>
+        <translation type="unfinished">mostrar contexto</translation>
+    </message>
+    <message>
+        <location line="-230"/>
+        <source>hide attributes</source>
+        <translation type="unfinished">ocultar atributos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>hide operations</source>
+        <translation type="unfinished">ocultar operaciones</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>hide get/set operations</source>
+        <translation type="unfinished">ocultar operaciones get/set</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>show members full definition</source>
+        <translation type="unfinished">mostrar la definición completa de los miembros</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+42"/>
+        <source>show members visibility</source>
+        <translation type="unfinished">mostrar visibilidad de los miembros</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show members stereotype</source>
+        <translation type="unfinished">mostrar el estereotipo de los miembros</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show context in members definition</source>
+        <translation type="unfinished">show context in members definition</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show attributes multiplicity</source>
+        <translation type="unfinished">mostrar la multiplicidad de los atributos</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>show attributes initialisation</source>
+        <translation type="unfinished">mostrar la inicialización de atributos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+42"/>
+        <location line="+42"/>
+        <source>show attribute modifiers</source>
+        <translation type="unfinished">mostrar los modificadores de los atributos</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <location line="+42"/>
+        <source>show parameter direction</source>
+        <translation type="unfinished">mostrar la dirección de los parámetros</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show parameter name</source>
+        <translation type="unfinished">mostrar el nombre de los parámetros</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>members max width</source>
+        <translation type="unfinished">ancho máximo de los miembros</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+48"/>
+        <location line="+42"/>
+        <location line="+1423"/>
+        <location line="+7"/>
+        <source>show information note</source>
+        <translation type="unfinished">mostrar nota de información</translation>
+    </message>
+    <message>
+        <location line="-1518"/>
+        <location line="+9"/>
+        <location line="+38"/>
+        <location line="+42"/>
+        <location line="+117"/>
+        <location line="+146"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+117"/>
+        <location line="+11"/>
+        <location line="+310"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location line="+201"/>
+        <location line="+8"/>
+        <location line="+191"/>
+        <location line="+7"/>
+        <source>show stereotype properties</source>
+        <translation type="unfinished">mostrar las propiedades del estereotipo</translation>
+    </message>
+    <message>
+        <location line="-1513"/>
+        <source>name in tab</source>
+        <translation type="unfinished">nombre en pestaña</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+42"/>
+        <source>classes drawing mode</source>
+        <translation type="unfinished">modo de dibujo de las clases</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes attributes</source>
+        <translation type="unfinished">ocultar los atributos de las clases</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes operations</source>
+        <translation type="unfinished">ocultar las operaciones de las clases</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes get/set operations</source>
+        <translation type="unfinished">ocultar las operaciones get/set de las clases</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>show classes members full definition</source>
+        <translation type="unfinished">mostrar la definición completa de los miembros de las clases</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <source>show attributes initialization</source>
+        <translation type="unfinished">mostrar la inicialización de los atributos</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+42"/>
+        <location line="+269"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+116"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+207"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>draw all relations</source>
+        <translation type="unfinished">dibujar todas las relaciones</translation>
+    </message>
+    <message>
+        <location line="-1403"/>
+        <location line="+43"/>
+        <source>show relation modifiers</source>
+        <translation type="unfinished">mostrar los modificadores de las relaciones</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+43"/>
+        <source>show relation visibility</source>
+        <translation type="unfinished">mostrar la visibilidad de las relaciones</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+40"/>
+        <location line="+455"/>
+        <location line="+131"/>
+        <location line="+127"/>
+        <location line="+103"/>
+        <location line="+114"/>
+        <location line="+217"/>
+        <location line="+209"/>
+        <source>show packages name in tab</source>
+        <translation type="unfinished">mostrar los nombre de los paquete en pestañas</translation>
+    </message>
+    <message>
+        <location line="-1395"/>
+        <location line="+42"/>
+        <location line="+435"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <source>show classes and packages context</source>
+        <translation type="unfinished">mostrar el contexto de las clases y paquetes</translation>
+    </message>
+    <message>
+        <location line="-625"/>
+        <location line="+42"/>
+        <location line="+573"/>
+        <location line="+11"/>
+        <location line="+116"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+205"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>automatic labels position</source>
+        <translation type="unfinished">posición automática de las etiquetas</translation>
+    </message>
+    <message>
+        <location line="-1392"/>
+        <location line="+42"/>
+        <location line="+262"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+117"/>
+        <location line="+11"/>
+        <location line="+92"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+207"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>draw shadow</source>
+        <translation type="unfinished">dibujar sombra</translation>
+    </message>
+    <message>
+        <location line="-1381"/>
+        <source>show classes members visibility</source>
+        <translation type="unfinished">mostrar la visibilidad de los miembros de la clase</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show classes members stereotype</source>
+        <translation type="unfinished">mostrar los esterotipos de los miembros de clase</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show context in classes members definition</source>
+        <translation type="unfinished">show context in classes members definition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show attribute multiplicity</source>
+        <translation type="unfinished">mostrar la multiplicidad de los atributos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show attribute initialization</source>
+        <translation type="unfinished">mostrar la inicialización de los atributos</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>show operation parameter direction</source>
+        <translation type="unfinished">mostrar la dirección del parámetro de la operación</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show operation parameter name</source>
+        <translation type="unfinished">mostrar el nombre del parámetro de la operación</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>max members width</source>
+        <translation type="unfinished">longitud máxima de los miembros</translation>
+    </message>
+    <message>
+        <location line="+266"/>
+        <location line="+13"/>
+        <source>instances drawing mode</source>
+        <translation type="unfinished">modo de dibujo de las instancias</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <location line="+13"/>
+        <location line="+154"/>
+        <location line="+18"/>
+        <location line="+21"/>
+        <source>show operations full definition</source>
+        <translation type="unfinished">mostrar la definción completa de las operaciones</translation>
+    </message>
+    <message>
+        <location line="-205"/>
+        <location line="+13"/>
+        <location line="+157"/>
+        <location line="+18"/>
+        <location line="+121"/>
+        <location line="+11"/>
+        <source>write name:type horizontally</source>
+        <translation type="unfinished">escribir nombre:tipo horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-319"/>
+        <location line="+13"/>
+        <source>show classes context</source>
+        <translation type="unfinished">show classes context</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+15"/>
+        <source>show messages context</source>
+        <translation type="unfinished">show messages context</translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <source>sequence</source>
+        <translation type="unfinished">secuencia</translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+18"/>
+        <location line="+22"/>
+        <source>show hierarchical rank</source>
+        <translation type="unfinished">mostrar rango jeráquico</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <location line="+138"/>
+        <location line="+127"/>
+        <location line="+105"/>
+        <location line="+113"/>
+        <location line="+216"/>
+        <location line="+209"/>
+        <source>packages name in tab</source>
+        <translation type="unfinished">nombre de los paquetes en pestaña</translation>
+    </message>
+    <message>
+        <location line="-900"/>
+        <source>communication</source>
+        <translation type="unfinished">comunicación</translation>
+    </message>
+    <message>
+        <location line="+138"/>
+        <source>object</source>
+        <translation type="unfinished">objeto</translation>
+    </message>
+    <message>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+104"/>
+        <location line="+10"/>
+        <location line="+206"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>show packages context</source>
+        <translation type="unfinished">mostrar el contexto de los paquetes</translation>
+    </message>
+    <message>
+        <location line="-651"/>
+        <location line="+11"/>
+        <source>class drawing mode</source>
+        <translation type="unfinished">modo de dibujo de las clases</translation>
+    </message>
+    <message>
+        <location line="+205"/>
+        <source>write node instance horizontally</source>
+        <translation type="unfinished">escribir la instancia de nodo horizontalmente</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+84"/>
+        <source>deployment</source>
+        <translation type="unfinished">despliegue</translation>
+    </message>
+    <message>
+        <location line="-80"/>
+        <source>write node instances horizontally</source>
+        <translation type="unfinished">escribir las instancias de nodo horizontalmente</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>draw component as icon</source>
+        <translation type="unfinished">dibujar los componentes como iconos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>show component&apos;s required
+and provided interfaces</source>
+        <translation type="unfinished">mostrar las interfaces
+requeridas y proveidas
+del componente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>show component&apos;s realizations</source>
+        <translation type="unfinished">mostrar las realizaciones del componente</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <location line="+11"/>
+        <source>write transition horizontally</source>
+        <translation type="unfinished">escribir las transiciones horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location line="+11"/>
+        <source>show transition definition</source>
+        <translation type="unfinished">mostrar la definición de la transición</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <location line="+8"/>
+        <source>show state activities</source>
+        <translation type="unfinished">mostrar actividades</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>draw state&apos;s regions horizontally</source>
+        <translation type="unfinished">dibujar las regiones del estado horizontalmente</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+11"/>
+        <source>write flow label horizontally</source>
+        <translation type="unfinished">escribir la etiqueta del flujo horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location line="+11"/>
+        <source>show opaque action definition</source>
+        <translation type="unfinished">mostrar la definición de las acción Opacar</translation>
+    </message>
+    <message>
+        <location filename="../misc/mu.cpp" line="+66"/>
+        <source>                            The project is open in read-only mode because it is
+                            under the control of &apos;Project control&apos; or &apos;Project merge&apos;
+                            (the directory &apos;%1&apos; exists</source>
+        <translation type="unfinished">                            The project is open in read-only mode because it is
+                            under the control of &apos;Project control&apos; or &apos;Project merge&apos;
+                            (the directory &apos;%1&apos; exists</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+7"/>
+        <source>User Own Identifier</source>
+        <translation type="unfinished">Identificador de usuario</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Can&apos;t create directory &apos;%1&apos;,
+the project is open in read-only mode</source>
+        <translation type="unfinished">No se puede crear el directorio &apos;%1&apos;,
+el proyecto esta abierto en modo de solo lectura</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>It seems that you are already editing the project %1.
+
+If you&apos;re SURE that this is not the case and
+another user does not have an identifier equal
+to yours you can gain ownership of the lock.</source>
+        <translation type="unfinished">It seems that you are already editing the project %1.
+
+If you&apos;re SURE that this is not the case and
+another user does not have an identifier equal
+to yours you can gain ownership of the lock.</translation>
+    </message>
+    <message>
+        <location filename="../misc/myio.cpp" line="-927"/>
+        <source> is not a visibility</source>
+        <translation type="unfinished"> no es una visibilidad</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source> is not a direction</source>
+        <translation type="unfinished"> no es una dirección</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source> is not a parameter effect</source>
+        <translation type="unfinished"> no es un parámetro del Efecto</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source> is not an activity action kind</source>
+        <translation type="unfinished"> no es un tipo de Acción</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source> is not an expansion node kind</source>
+        <translation type="unfinished"> no es un tipo de Nodo de expansión</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source> is not an ordering</source>
+        <translation type="unfinished"> no es un ordenamiento</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source> is not a state</source>
+        <translation type="unfinished"> no es un estado</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source> is not a class drawing mode</source>
+        <translation type="unfinished"> no es un modo de dibujo de Clase (class drawing)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> is not a drawing language</source>
+        <translation type="unfinished"> no es un lenguaje de dibujo</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> is not a context mode</source>
+        <translation type="unfinished"> no es un modo de contexto</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source> is not a color</source>
+        <translation type="unfinished"> no es un color</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source> is not a font</source>
+        <translation type="unfinished"> no es una letra</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <source> is not a canvas format</source>
+        <translation type="unfinished"> no es un formato de lienzo</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source> is not a pseudo state kind</source>
+        <translation type="unfinished"> no es un tipo de pseudo estado</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source> is not an activity node kind</source>
+        <translation type="unfinished"> no es un tipo de nodo de actividad</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source> is not a line geometry</source>
+        <translation type="unfinished"> no es una geometría de línea (line geometry)</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>
+cannot be renamed </source>
+        <translation type="unfinished">
+no puede ser renombrado </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>, retry ?
+</source>
+        <translation type="unfinished">, reintentar ?
+</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>
+cannot be opened for write, retry ?
+</source>
+        <translation type="unfinished">
+no se puede abrir en modo escritura, reintentar?
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>
+cannot be opened for read, retry ?
+</source>
+        <translation type="unfinished">
+no se puede abrir en modo lectura, reintentar?
+</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>cannot open %1 to read it</source>
+        <translation type="unfinished">no se puede abrir %1 en modo lectura</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>cannot create %1</source>
+        <translation type="unfinished">no se puede crear %1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>error when writing %1</source>
+        <translation type="unfinished">error al escribir en %1</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>error when reading %1</source>
+        <translation type="unfinished">error al leer %1</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <location line="+63"/>
+        <source>%1 cannot be read</source>
+        <translation type="unfinished">%1 no puede ser leido</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Cannot save definition in
+%1
+may be your disk is full</source>
+        <translation type="unfinished">No se puede guardar la definición
+en %1. Quizás el disco este lleno</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source> line </source>
+        <translation type="unfinished"> línea </translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <source>premature end of file, string expected</source>
+        <translation type="unfinished">end of file prematuro, se esperaba una cadena de caracteres</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>string expected after &apos;%1&apos;</source>
+        <translation type="unfinished">se esperaba una cadena de caracteres despues de &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+20"/>
+        <source>premature end of file reading a string</source>
+        <translation type="unfinished">fin de archivo prematuro mientras se leia una cadena de caracteres (string)</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>premature end of file, keyword expected</source>
+        <translation type="unfinished">fin de archivo prematuro, se esperaba una palabra clave</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>keyword expected after &apos;%1&apos;</source>
+        <translation type="unfinished">se esperaba una palabra clave después de &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+44"/>
+        <source>premature end of file, &apos;%1&apos; expected</source>
+        <translation type="unfinished">fin de archivo prematuro, se esperaba &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <location line="+44"/>
+        <source>&apos;%1&apos; expected rather than a string after &apos;%2&apos;</source>
+        <translation type="unfinished">después de &apos;%2&apos; se esperaba &apos;%1&apos;, en lugar de una cadena de caracteres</translation>
+    </message>
+    <message>
+        <location line="-27"/>
+        <location line="+44"/>
+        <source>&apos;%1&apos; expected rather than &apos;%2&apos; after &apos;%3&apos;</source>
+        <translation type="unfinished">después de &apos;%3&apos; se esperaba &apos;%1&apos;, en lugar de &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>premature end of file, id expected</source>
+        <translation type="unfinished">fin de archivo prematuro, se esperaba un id</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+9"/>
+        <source>id expected after &apos;%1&apos;</source>
+        <translation type="unfinished">se esperaba un ID después de &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>premature end of file, unsigned expected</source>
+        <translation type="unfinished">fin de archivo prematuro. Se esperaba un dato sin signo</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+13"/>
+        <source>unsigned expected after &apos;%1&apos;</source>
+        <translation type="unfinished">dato sin signo esperado después de &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>premature end of file, float expected</source>
+        <translation type="unfinished">fin de archivo prematuro. Se esparaba un float</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>float expected after &apos;%1&apos;</source>
+        <translation type="unfinished">se espera un float después de &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>float expected rather than &apos;%1&apos; after &apos;%2&apos;</source>
+        <translation type="unfinished">después de &apos;%2&apos; se esperaba un float, en lugar de &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>premature end of file</source>
+        <translation type="unfinished">fin de archivo prematuro</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>&apos;%1&apos; expected rather than &apos;%2&apos;</source>
+        <translation type="unfinished">se esperaba &apos;%1&apos; en lugar de &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unknown or unexpected keyword &apos;%1&apos;</source>
+        <translation type="unfinished">la palabra clave &apos;%1&apos; es desconocida o no esperada</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>%1 unknown %2 identifier</source>
+        <translation type="unfinished">%1 identificador %2 desconocido</translation>
+    </message>
+</context>
+<context>
+    <name>QuickEdit</name>
+    <message>
+        <location filename="../ui/quickedit.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Previous Item</source>
+        <translation type="unfinished">Previous Item</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Next Item</source>
+        <translation type="unfinished">Next Item</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>C++</source>
+        <translation type="unfinished">C++</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Java</source>
+        <translation type="unfinished">Java</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Python</source>
+        <translation type="unfinished">Python</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Php</source>
+        <translation type="unfinished">Php</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Idl</source>
+        <translation type="unfinished">Idl</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Operation</source>
+        <translation type="unfinished">Operation</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Parameter</source>
+        <translation type="unfinished">Parameter</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Atributo</translation>
+    </message>
+    <message>
+        <location filename="../CustomWidgets/quickedit.cpp" line="+136"/>
+        <source>Collapse/Expand</source>
+        <translation type="unfinished">Collapse/Expand</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Self</source>
+        <translation type="unfinished">Self</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Parent</source>
+        <translation type="unfinished">Parent</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move marked before</source>
+        <translation type="unfinished">Move marked before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move marked after</source>
+        <translation type="unfinished">Mover el marcado después</translation>
+    </message>
+</context>
+<context>
+    <name>ReduceDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+103"/>
+        <location line="+25"/>
+        <source>reducer - Ocl</source>
+        <translation type="unfinished">reductor - Ocl</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordenado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>reducer :</source>
+        <translation type="unfinished">reductor :</translation>
+    </message>
+</context>
+<context>
+    <name>ReferenceDialog</name>
+    <message>
+        <location filename="../dialog/ReferenceDialog.cpp" line="-8"/>
+        <source>Referenced By dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Referenciado por</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Recompute</source>
+        <translation type="unfinished">Recalcular</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Desmarcar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mark them</source>
+        <translation type="unfinished">Marcarlos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Desmarcar todo</translation>
+    </message>
+</context>
+<context>
+    <name>RelTable</name>
+    <message>
+        <location filename="../dialog/ClassInstanceDialog.cpp" line="-375"/>
+        <location line="+4"/>
+        <source>Class Inst.</source>
+        <translation type="unfinished">Instancia de Clase</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+2"/>
+        <source>Role</source>
+        <translation type="unfinished">Rol</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>kind</source>
+        <translation type="unfinished">tipo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>   Yes</source>
+        <translation type="unfinished">   Si</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedElementsDialog</name>
+    <message>
+        <location filename="../dialog/RelatedElementsDialog.cpp" line="+57"/>
+        <source>Related elements dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Elementos relacionados</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Search for : </source>
+        <translation type="unfinished">Buscar : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>referenced elements  </source>
+        <translation type="unfinished">elementos referenciados  </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>referencing elements  </source>
+        <translation type="unfinished">referencia a elementos  </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Through relations : </source>
+        <translation type="unfinished">Relaciones a través (through) : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generalization  </source>
+        <translation type="unfinished">generalización  </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>dependency  </source>
+        <translation type="unfinished">dependencia  </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>other</source>
+        <translation type="unfinished">otro</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Search only for %1</source>
+        <translation type="unfinished">Buscar solo para %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>     Search on </source>
+        <translation type="unfinished">     Buscar sobre </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>levels</source>
+        <translation type="unfinished">niveles</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>RelationCanvas</name>
+    <message>
+        <location filename="../diagram/RelationCanvas.cpp" line="+157"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dibujar todas las relaciones&lt;/i&gt; forzadas a &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+234"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Seleccionar etiquetas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Posición predeterminada de las etiquetas</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s name to this segment</source>
+        <translation type="unfinished">Vincular el nombre de la relación a este segmento</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s stereotype to this segment</source>
+        <translation type="unfinished">Vincular el estereotipo de la relación a este segmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometría (Ctrl+I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+718"/>
+        <source>relation already drawn</source>
+        <translation type="unfinished">la relación ya está dibujada</translation>
+    </message>
+    <message>
+        <location line="+173"/>
+        <source>read-only relation</source>
+        <translation type="unfinished">relación de solo lectura</translation>
+    </message>
+</context>
+<context>
+    <name>RelationDialog</name>
+    <message>
+        <location filename="../dialog/RelationDialog.cpp" line="+107"/>
+        <source>Relation dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Relación</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+358"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="-351"/>
+        <source>type : </source>
+        <translation type="unfinished">tipo : </translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>    stereotype : </source>
+        <translation type="unfinished">    estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>association :</source>
+        <translation type="unfinished">asociación :</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+1"/>
+        <source>in </source>
+        <translation type="unfinished">en </translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>multiplicity : </source>
+        <translation type="unfinished">multiplicidad : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   initial value : </source>
+        <translation type="unfinished">   valor inicial : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+103"/>
+        <location line="+35"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-95"/>
+        <source>read-only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>derived</source>
+        <translation type="unfinished">derivado</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordenado</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>description : </source>
+        <translation type="unfinished">descripción : </translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Default</source>
+        <translation type="unfinished">Valor por omisión</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>constraint : </source>
+        <translation type="unfinished">restricción : </translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Visibility : </source>
+        <translation type="unfinished">Visibilidad : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>follow uml</source>
+        <translation type="unfinished">seguir UML</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location line="+66"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+77"/>
+        <source>Declaration : </source>
+        <translation type="unfinished">Declaración : </translation>
+    </message>
+    <message>
+        <location line="-229"/>
+        <location line="+66"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+77"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Resultado después
+de la sustitución : </translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <location line="+69"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+76"/>
+        <location line="+234"/>
+        <location line="+14"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Declaración predeterminada</translation>
+    </message>
+    <message>
+        <location line="-492"/>
+        <location line="+472"/>
+        <location line="+1"/>
+        <location line="+308"/>
+        <source>#include in header</source>
+        <translation type="unfinished">#include en cabecera</translation>
+    </message>
+    <message>
+        <location line="-776"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">No generado en C++</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">No generado en Java</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Mostrar anotación</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Editar anotación</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">No generado en PHP</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">No generado en Python</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">No generado en Idl</translation>
+    </message>
+    <message>
+        <location line="+136"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador la clase elegida</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Crear clase y seleccionarla</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+6"/>
+        <location line="+276"/>
+        <source>#include in source</source>
+        <translation type="unfinished">#include en fuente</translation>
+    </message>
+    <message>
+        <location line="+1109"/>
+        <location line="+2"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+2"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>RemoveVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-699"/>
+        <source>remove duplicates</source>
+        <translation type="unfinished">remover duplicados</translation>
+    </message>
+</context>
+<context>
+    <name>RevSettingsDialog</name>
+    <message>
+        <location filename="../dialog/RevSettingsDialog.cpp" line="-232"/>
+        <source>Reverse/Roundtrip Settings dialog</source>
+        <translation type="unfinished">Reverse/Roundtrip Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>To specify through regular expression the directories
+and/or files to bypass during reverse and roundtrip</source>
+        <translation type="unfinished">To specify through regular expression the directories
+and/or files to bypass during reverse and roundtrip</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Help regexp</source>
+        <translation type="unfinished">Help regexp</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>C++ directory : </source>
+        <translation type="unfinished">C++ directory : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+8"/>
+        <location line="+35"/>
+        <location line="+8"/>
+        <location line="+25"/>
+        <location line="+8"/>
+        <source>case sensitive</source>
+        <translation type="unfinished">distinguir entre mayúsculas y minúsculas</translation>
+    </message>
+    <message>
+        <location line="-79"/>
+        <source>C++ file : </source>
+        <translation type="unfinished">C++ file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated/reversed 
+header file extension : </source>
+        <translation type="unfinished">extensión del archivo de
+cabecera generado/reconstruido : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generated/reversed 
+    source file extension : </source>
+        <translation type="unfinished">    extensión del archivo de
+código fuente generado/reconstruido : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Java directory : </source>
+        <translation type="unfinished">directorio Java : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Java file : </source>
+        <translation type="unfinished">Java file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated/reversed file extension : </source>
+        <translation type="unfinished">extensión de los archivos generados/reconstruidos : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Php directory : </source>
+        <translation type="unfinished">directorio PHP : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Php file : </source>
+        <translation type="unfinished">Php file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated / reversed file extension : </source>
+        <translation type="unfinished">generated / reversed file extension : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>SdClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/SdClassInstCanvas.cpp" line="+379"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Become immortal</source>
+        <translation type="unfinished">Convertir en inmortal</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Become mortal</source>
+        <translation type="unfinished">Convertir en mortal</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show life line</source>
+        <translation type="unfinished">Show life line</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Hide life line</source>
+        <translation type="unfinished">Hide life line</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Seleccionar la clase en el navegador</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit from model</source>
+        <translation type="unfinished">Salir del modelo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert in model</source>
+        <translation type="unfinished">Insertar en el modelo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace it</source>
+        <translation type="unfinished">Reemplazar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <location line="+36"/>
+        <source>drawing mode</source>
+        <translation type="unfinished">modo de dibujo</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">escribir nombre:tipo
+horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">Mostrar las propiedades
+de los estereotipos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">color de la instancia de clase</translation>
+    </message>
+</context>
+<context>
+    <name>SdContinuationCanvas</name>
+    <message>
+        <location filename="../diagram/SdContinuationCanvas.cpp" line="+205"/>
+        <source>Continuation</source>
+        <translation type="unfinished">Continuación</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <location line="+25"/>
+        <source>continuation color</source>
+        <translation type="unfinished">color de la Continuación</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>SdDurationCanvas</name>
+    <message>
+        <location filename="../diagram/SdDurationCanvas.cpp" line="+326"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+    <message>
+        <location line="+420"/>
+        <source>Activity bar</source>
+        <translation type="unfinished">Barra de actividad</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Draw as activity bar</source>
+        <translation type="unfinished">Dibujar como barra de actividad</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Draw as a coregion</source>
+        <translation type="unfinished">Dibujar como coregión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cut here</source>
+        <translation type="unfinished">Cortar aqui</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Merge juxtaposed activity bars</source>
+        <translation type="unfinished">Combinar barras de estado yuxtapuestas</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Collapse in parent bar</source>
+        <translation type="unfinished">Solapar en la barra padre</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location line="+25"/>
+        <source>duration color</source>
+        <translation type="unfinished">color de la Duración</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgBaseCanvas</name>
+    <message>
+        <location filename="../diagram/SdMsgBaseCanvas.cpp" line="+239"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Return</source>
+        <translation type="unfinished">Retorno</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>value :</source>
+        <translation type="unfinished">valor :</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgCanvas</name>
+    <message>
+        <location filename="../diagram/SdMsgCanvas.cpp" line="+252"/>
+        <source>Message</source>
+        <translation type="unfinished">Mensaje</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select operation in browser</source>
+        <translation type="unfinished">Seleccionar operación en le navegador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Selecionar estereotipo y etiqueta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Posión predeterminada del estereotipo y la etiqueta</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start from new overlapping bar</source>
+        <translation type="unfinished">Iniciar desde una nueva barra solapada</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Start from parent bar</source>
+        <translation type="unfinished">Iniciar desde la barra padre</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to new overlapping bar</source>
+        <translation type="unfinished">Ir a una nueva barra sobrepuesta</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to parent bar</source>
+        <translation type="unfinished">Ir a la barra padre</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+29"/>
+        <source>operation drawing language</source>
+        <translation type="unfinished">idioma del dibujo de operación</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show full operation definition</source>
+        <translation type="unfinished">mostrar la definición completa de la operación</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show context mode</source>
+        <translation type="unfinished">show context mode</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgDialog</name>
+    <message>
+        <location filename="../dialog/SdMsgDialog.cpp" line="+63"/>
+        <source>Message dialog</source>
+        <translation type="unfinished">cuadro de diálogo Mensaje</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>message :</source>
+        <translation type="unfinished">mensaje :</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Message type</source>
+        <translation type="unfinished">tipo Mensaje</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>synchronous</source>
+        <translation type="unfinished">síncrono</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>asynchronous</source>
+        <translation type="unfinished">asíncrono</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>
+
+When the arguments are specified they replace the operation&apos;s parameter(s) without any check</source>
+        <translation type="unfinished">
+
+Cuando los argumentos están especificados reemplazarán los parámetros de la operación</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>arguments : </source>
+        <translation type="unfinished">argumentos : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Escoger la operación seleccionada en el navegador</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Crear una operación y seleccionarla</translation>
+    </message>
+</context>
+<context>
+    <name>SdSelfMsgCanvas</name>
+    <message>
+        <location filename="../diagram/SdSelfMsgCanvas.cpp" line="+249"/>
+        <source>Message</source>
+        <translation type="unfinished">Mensaje</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select operation in browser</source>
+        <translation type="unfinished">Seleccionar operación en le navegador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Selecionar estereotipo y etiqueta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Posión predeterminada del estereotipo y la etiqueta</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Go to new overlapping bar</source>
+        <translation type="unfinished">Ir a una nueva barra sobrepuesta</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to parent bar</source>
+        <translation type="unfinished">Ir a la barra padre</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <location line="+29"/>
+        <source>operation drawing language</source>
+        <translation type="unfinished">idioma del dibujo de operación</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show full operation definition</source>
+        <translation type="unfinished">mostrar la definición completa de la operación</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show context mode</source>
+        <translation type="unfinished">show context mode</translation>
+    </message>
+</context>
+<context>
+    <name>SeqDiagramView</name>
+    <message>
+        <location filename="../diagram/SeqDiagramView.cpp" line="+77"/>
+        <source>Sequence diagram menu</source>
+        <translation type="unfinished">Menú del diagrama de secuencia</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Transform to flat activity bars</source>
+        <translation type="unfinished">Cambiar a barras de actividad planas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transform to overlapping activity bars</source>
+        <translation type="unfinished">Cambiar a barras de actividad sobrepuestas</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="-51"/>
+        <source>Apply</source>
+        <translation type="unfinished">Apply</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutDialog</name>
+    <message>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-358"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Shortcut dialog</source>
+        <translation type="unfinished">cuadro de diálogo Acceso Directo</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Here are the shortcuts to do a command (menu entry)</source>
+        <translation type="unfinished">Aquí están los accesos directos para ejecutar una orden (entrada del menú)</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Here are the shortcuts to call a tool (plug-out)</source>
+        <translation type="unfinished">Aui están los accesos directos para llamar las herramientas (plug-out)</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutTable</name>
+    <message>
+        <location line="+48"/>
+        <source>Shift</source>
+        <translation type="unfinished">Shift</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cmd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ctrl</source>
+        <translation type="unfinished">Ctrl</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Alt</source>
+        <translation type="unfinished">Alt</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>Insert shortcut before</source>
+        <translation type="unfinished">insertar acceso directo antes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert shortcut after</source>
+        <translation type="unfinished">insertar acceso directo después</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete shortcut</source>
+        <translation type="unfinished">Borrar acceso directo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy shortcut</source>
+        <translation type="unfinished">Copiar acceso directo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut shortcut</source>
+        <translation type="unfinished">Cortar acceso directo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste shortcut</source>
+        <translation type="unfinished">Pegar acceso directo</translation>
+    </message>
+    <message>
+        <location line="+173"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Acceso directo</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Several use of the shortcut &apos;%1&apos;</source>
+        <translation type="unfinished">Muchos usos del acceso directo &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SimpleRelationDialog</name>
+    <message>
+        <location filename="../dialog/SimpleRelationDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Generalisation dialog</source>
+        <translation type="unfinished">cuadro de diálogo Generalización</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Dependency dialog</source>
+        <translation type="unfinished">cuadro de diálogo Dependencia</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>unknown relation dialog</source>
+        <translation type="unfinished">cuadro de diálogo Relación desconocida</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>from : </source>
+        <translation type="unfinished">desde : </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to : </source>
+        <translation type="unfinished">a : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+</context>
+<context>
+    <name>SourceDialog</name>
+    <message>
+        <location filename="../dialog/SourceDialog.cpp" line="+134"/>
+        <location line="+6"/>
+        <source>cannot read %1</source>
+        <translation type="unfinished">no se puede leer %1</translation>
+    </message>
+</context>
+<context>
+    <name>StateActionCanvas</name>
+    <message>
+        <location filename="../diagram/StateActionCanvas.cpp" line="+530"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit state action</source>
+        <translation type="unfinished">Editar acción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <location line="+30"/>
+        <source>drawing language</source>
+        <translation type="unfinished">lenguaje de dibujo</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">Mostrar las propiedades
+del estereotipo</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+30"/>
+        <source>state action color</source>
+        <translation type="unfinished">color del estado</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+22"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>StateActionDialog</name>
+    <message>
+        <location filename="../dialog/StateActionDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State Action dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Estado</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+15"/>
+        <location line="+18"/>
+        <source>behavior</source>
+        <translation type="unfinished">comportamiento</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+</context>
+<context>
+    <name>StateCanvas</name>
+    <message>
+        <location filename="../diagram/StateCanvas.cpp" line="+1270"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide decomposition indicator</source>
+        <translation type="unfinished">Ocultar indicador de decomposición</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show decomposition indicator</source>
+        <translation type="unfinished">Mostrar indicador de decomposición</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit state</source>
+        <translation type="unfinished">Editar estado</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select referenced state in browser</source>
+        <translation type="unfinished">Select referenced state in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Establecer diagrama asociado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remover la asociación entre diagramas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+116"/>
+        <location line="+33"/>
+        <source>show activities</source>
+        <translation type="unfinished">mostrar actividades</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+33"/>
+        <source>draw regions horizontally</source>
+        <translation type="unfinished">dibujar las regiones horizontalmente</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+33"/>
+        <source>drawing language</source>
+        <translation type="unfinished">lenguaje de dibujo</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+33"/>
+        <source>state color</source>
+        <translation type="unfinished">color del estado</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <location line="+22"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>StateDiagramView</name>
+    <message>
+        <location filename="../diagram/StateDiagramView.cpp" line="+72"/>
+        <source>State diagram menu</source>
+        <translation type="unfinished">Menú del diagrama de estados</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+199"/>
+        <location line="+34"/>
+        <location line="+21"/>
+        <source>already drawn</source>
+        <translation type="unfinished">Ya se encuentra dibujado</translation>
+    </message>
+    <message>
+        <location line="-53"/>
+        <location line="+34"/>
+        <location line="+21"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>StateDiagramWindow</name>
+    <message>
+        <location filename="../diagram/StateDiagramWindow.cpp" line="+16"/>
+        <source>Select</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Agregar paquete</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Agregar fragmento</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add State</source>
+        <translation type="unfinished">Agregar estado</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Region</source>
+        <translation type="unfinished">Agregar región</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Initial pseudo state</source>
+        <translation type="unfinished">Agregar pseudo estado inicial</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Entry Point</source>
+        <translation type="unfinished">Agregar punto de entrada</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Final state</source>
+        <translation type="unfinished">Agregar estado final</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Exit Point</source>
+        <translation type="unfinished">Agregar punto de salida</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Terminate node</source>
+        <translation type="unfinished">Agregar nodo de terminación</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Deep History</source>
+        <translation type="unfinished">Agregar Historia extensa</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Shallow History</source>
+        <translation type="unfinished">Agregar Historia poco extensa</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Junction</source>
+        <translation type="unfinished">Agregar Juntura</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Choice</source>
+        <translation type="unfinished">Agregar Alternativa</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fork</source>
+        <translation type="unfinished">Agregar bifurcación</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Join</source>
+        <translation type="unfinished">Agregar Unión</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Action</source>
+        <translation type="unfinished">Agregar Acción</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add receive signal action</source>
+        <translation type="unfinished">Agregar acción Recibir Señal</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add send signal action</source>
+        <translation type="unfinished">Agragar acción Enviar señal</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Transition</source>
+        <translation type="unfinished">Agregar transición</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Note</source>
+        <translation type="unfinished">Nota</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texto</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>StateDialog</name>
+    <message>
+        <location filename="../dialog/StateDialog.cpp" line="+63"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State dialog</source>
+        <translation type="unfinished">cuadro de diálogo Estado</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>specification :</source>
+        <translation type="unfinished">especificación :</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>reference :</source>
+        <translation type="unfinished">reference :</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>active</source>
+        <translation type="unfinished">activo</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+239"/>
+        <location line="+22"/>
+        <location line="+15"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+62"/>
+        <source>Choose</source>
+        <translation type="unfinished">Seleccionar</translation>
+    </message>
+    <message>
+        <location line="-56"/>
+        <location line="+62"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Escoger la operación seleccionada en el navegador</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Choose state selected in browser</source>
+        <translation type="unfinished">Choose state selected in browser</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Entry
+behavior : </source>
+        <translation type="unfinished">Comportamiento
+de ingreso (entry) : </translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Exit
+behavior : </source>
+        <translation type="unfinished">comportamiento
+Salir (Exit) : </translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Do
+behavior : </source>
+        <translation type="unfinished">comportamiento
+Hacer (Do) : </translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>StereotypeDialog</name>
+    <message>
+        <location filename="../dialog/StereotypeDialog.cpp" line="+73"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>StereotypesDialog</name>
+    <message>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-285"/>
+        <source>Default stereotypes dialog</source>
+        <translation type="unfinished">cuadro de diálogo Estereotipos predeterminados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>package
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+paquete : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+33"/>
+        <location line="+37"/>
+        <location line="+29"/>
+        <source>relations
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de las
+relaciones : </translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Stereotypes</source>
+        <translation type="unfinished">estereotipos</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>class
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de
+la clase : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>attribute
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+atributo : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>operation
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de
+la operación : </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>use case
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+del Caso de Uso : </translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>artifact
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+del artefacto : </translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>class view
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de
+la vista de clases : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>use case view
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de
+la vista de casos de uso : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component view
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de
+la vista de componentes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>deployment view
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de
+la vista de despliegue : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>class diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de Clases : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>object diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de objetos : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>communication diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de comunicación : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>sequence diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de secuencia : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>use case diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de casos de uso : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>state diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de estados : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de actividad : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de componentes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>deployment diagram
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+diagrama de despliegue : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>activity
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de 
+la actividad : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>interruptible activity
+region stereotypes : </source>
+        <translation type="unfinished">Estereotipos de la Región
+de actividad interrumpible : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>expansion region
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de la
+región de expansión : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>partition
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de 
+la partición : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>parameter
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos 
+del parámetro : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>parameter set
+stereotypes : </source>
+        <translation type="unfinished">estereotipos del
+conjunto de parámetros : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity control node
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del
+nodo control : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity action
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos de 
+la acción : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity object node
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos del 
+nodo Objeto : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>pin
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos 
+del pin : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>expansion node
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+del nodo de expansión : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>flow
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+del Flujo : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>state
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+del estado : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>pseudostate
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+del pseudoestado : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>state action
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+de la acción del
+estado : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+de componente : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>node
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+del nodo : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>message
+stereotypes : </source>
+        <translation type="unfinished">Estereotipos
+del mensaje : </translation>
+    </message>
+</context>
+<context>
+    <name>StereotypesTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+148"/>
+        <location line="+32"/>
+        <source>do</source>
+        <translation type="unfinished">hacer</translation>
+    </message>
+</context>
+<context>
+    <name>StringTable</name>
+    <message>
+        <location filename="../dialog/StringTable.cpp" line="+97"/>
+        <source>row %1</source>
+        <translation type="unfinished">fila %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert row before</source>
+        <translation type="unfinished">Insertar fila antes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert row after</source>
+        <translation type="unfinished">Insertar fila después</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete row</source>
+        <translation type="unfinished">Borrar fila</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy row</source>
+        <translation type="unfinished">Copiar fila</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut row</source>
+        <translation type="unfinished">Cortar fila</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste row</source>
+        <translation type="unfinished">Pegar fila</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move row</source>
+        <translation type="unfinished">Mover fila</translation>
+    </message>
+</context>
+<context>
+    <name>SubjectCanvas</name>
+    <message>
+        <location filename="../diagram/SubjectCanvas.cpp" line="+152"/>
+        <source>Subject dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Asunto</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>subject : </source>
+        <translation type="unfinished">asunto : </translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Subject</source>
+        <translation type="unfinished">Asunto</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <location line="+25"/>
+        <source>subject color</source>
+        <translation type="unfinished">color del asunto</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>ToolDialog</name>
+    <message>
+        <location filename="../dialog/ToolDialog.cpp" line="-63"/>
+        <source>Tools dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Herramientas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>TraceDialog</name>
+    <message>
+        <location filename="../dialog/TraceDialog.cpp" line="+58"/>
+        <source>Trace</source>
+        <translation type="unfinished">Seguimiento</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Clear</source>
+        <translation type="unfinished">Limpiar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save</source>
+        <translation type="unfinished">Guardar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>TransitionDialog</name>
+    <message>
+        <location filename="../dialog/TransitionDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transition dialog</source>
+        <translation type="unfinished">Cuadro de diálogo Transición</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>internal</source>
+        <translation type="unfinished">interior</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+92"/>
+        <location line="+24"/>
+        <location line="+17"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-100"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>trigger : </source>
+        <translation type="unfinished">disparador (trigger) : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>guard
+constraint : </source>
+        <translation type="unfinished">restricción
+guardia : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>activity
+expression : </source>
+        <translation type="unfinished">expresión : </translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>UcClassCanvas</name>
+    <message>
+        <location filename="../diagram/UcClassCanvas.cpp" line="+604"/>
+        <source>Upper</source>
+        <translation type="unfinished">más arriba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Más abajo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Subir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Bajar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Agregar elementos relacionados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Seleccionar en el navegador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Seleccionar item enlazados</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Borrar del modelo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Herramientas</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+34"/>
+        <source>class/actor</source>
+        <translation type="unfinished">clase/actor</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+31"/>
+        <source>class color</source>
+        <translation type="unfinished">color de la clase</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>read only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+12"/>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>UcUseCaseCanvas</name>
+    <message>
+        <location filename="../diagram/UcUseCaseCanvas.cpp" line="+415"/>
+        <location line="+34"/>
+        <source>use case</source>
+        <translation type="unfinished">caso de uso</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">solo lectura</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+21"/>
+        <location line="+5"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">ilegal</translation>
+    </message>
+</context>
+<context>
+    <name>UmlWindow</name>
+    <message>
+        <location filename="../diagram/UmlWindow.cpp" line="-1751"/>
+        <source>Generate:</source>
+        <translation type="unfinished">Generar:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Project</source>
+        <translation type="unfinished">&amp;Proyecto</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished">&amp;Ventana</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Tools</source>
+        <translation type="unfinished">&amp;Herramientas</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Languages</source>
+        <translation type="unfinished">&amp;Lenguajes</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ management and default declaration/definition</source>
+        <translation type="unfinished">C++ - Administración y definición/declaración predeterminada</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Java management and default definition</source>
+        <translation type="unfinished">Java - Administración y definición predeterminada</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Php management and default definition</source>
+        <translation type="unfinished">PHP - Administración y definición predeterminada</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Python management and default definition</source>
+        <translation type="unfinished">Python - Administraciçon y definición predeterminada</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Idl management and default declaration</source>
+        <translation type="unfinished">Idl - Administración y definición predeterminada</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Verbose code generation</source>
+        <translation type="unfinished">Generación de código </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Preserve operations&apos;s body</source>
+        <translation type="unfinished">Preservar el cuerpo de las operaciones</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Add operation profile on body edition</source>
+        <translation type="unfinished">Agregar perfil de la operación en la edición del cuerpo</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Miscellaneous</source>
+        <translation type="unfinished">&amp;Miscelanea</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show s&amp;tereotypes in browser</source>
+        <translation type="unfinished">Mostrar los es&amp;tereotipos en el navegador</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Completion in dialog</source>
+        <translation type="unfinished">cuadro de diálogo Completar</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Style</source>
+        <translation type="unfinished">Estilo</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Font size</source>
+        <translation type="unfinished">Tamaño de letra</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Diagram default format</source>
+        <translation type="unfinished">Formato predeterminado del diagrama</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Landscape formats</source>
+        <translation type="unfinished">Formatos landscape</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Edit shortcuts</source>
+        <translation type="unfinished">Editar accesos directos</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Set environment</source>
+        <translation type="unfinished">Configurar el entorno</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Set images root dir</source>
+        <translation type="unfinished">Set images root dir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+17"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished">A&amp;yuda</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>&amp;About</source>
+        <translation type="unfinished">&amp;Acerca de</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>About&amp;Qt</source>
+        <translation type="unfinished">Acerca de &amp;Qt</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>C++</source>
+        <translation type="unfinished">C++</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Java</source>
+        <translation type="unfinished">Java</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Php</source>
+        <translation type="unfinished">Php</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Python</source>
+        <translation type="unfinished">Python</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Idl</source>
+        <translation type="unfinished">Idl</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <location line="+473"/>
+        <source>File%1</source>
+        <translation type="unfinished">File%1</translation>
+    </message>
+    <message>
+        <location line="-460"/>
+        <source>Ready</source>
+        <translation type="unfinished">Listo</translation>
+    </message>
+    <message>
+        <location line="+123"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit generation settings</source>
+        <translation type="unfinished">Editar la configuración de generación</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Edit default stereotypes</source>
+        <translation type="unfinished">Editar los estereotipos usados por omisión</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit class settings</source>
+        <translation type="unfinished">Editar la configuración de la clase</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editar la configuración del dibujo</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>to open this project.&lt;br&gt;&lt;br&gt;The historic is saved in &lt;i&gt;settings.ini&lt;/i&gt;</source>
+        <translation type="unfinished">to open this project.&lt;br&gt;&lt;br&gt;The historic is saved in &lt;i&gt;settings.ini&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Loading aborted as supplied project id is out of history array bounds</source>
+        <translation type="unfinished">Loading aborted as supplied project id is out of history array bounds</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Loading aborted as currently opened project unloading failed</source>
+        <translation type="unfinished">Loading aborted as currently opened project unloading failed</translation>
+    </message>
+    <message>
+        <location line="-487"/>
+        <location line="+527"/>
+        <source>Show &amp;Trace Window</source>
+        <translation type="unfinished">Mos&amp;trar la ventana de seguimiento</translation>
+    </message>
+    <message>
+        <location line="-327"/>
+        <source>What&apos;s This?</source>
+        <translation type="unfinished">¿ Qué es esto ?</translation>
+    </message>
+    <message>
+        <location line="+337"/>
+        <source>Generate C++</source>
+        <translation type="unfinished">Generar C++</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Java</source>
+        <translation type="unfinished">Generar Java</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Php</source>
+        <translation type="unfinished">Generar PHP</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Python</source>
+        <translation type="unfinished">Generar Python</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Idl</source>
+        <translation type="unfinished">Generar Idl</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Reverse C++</source>
+        <translation type="unfinished">UML a partir de C++</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Roundtrip C++</source>
+        <translation type="unfinished">Roundtrip en C++</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Java</source>
+        <translation type="unfinished">UML a partir de Java</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Roundtrip Java</source>
+        <translation type="unfinished">Roundtrip en Java</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Php</source>
+        <translation type="unfinished">UML a partir de PHP</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Java Catalog</source>
+        <translation type="unfinished">Catálogo Java</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Roundtrip C++ bodies</source>
+        <translation type="unfinished">Rountrip a los cuerpos de operaciones C++</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Java bodies</source>
+        <translation type="unfinished">Rountrip a los cuerpos de operaciones Java</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Php bodies</source>
+        <translation type="unfinished">Rountrip a los cuerpos de operaciones PHP</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Python bodies</source>
+        <translation type="unfinished">Rountrip a los cuerpos de operaciones Python</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Plug-out upgrade</source>
+        <translation type="unfinished">Actualizar Plug-out</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tools settings</source>
+        <translation type="unfinished">Configuración de herramientas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import settings</source>
+        <translation type="unfinished">Importar configuraciones</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <location line="+266"/>
+        <source>Enter a folder name, this folder will be created and will name the new project</source>
+        <translation type="unfinished">Ingrese el nombre de la carpeta. Esta será creada y dará el nombre al nuevo proyecto</translation>
+    </message>
+    <message>
+        <location line="-252"/>
+        <location line="+8"/>
+        <source>New project</source>
+        <translation type="unfinished">Nuevo proyecto</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Loading aborted</source>
+        <translation type="unfinished">Carga cancelada</translation>
+    </message>
+    <message>
+        <location line="+282"/>
+        <location line="+4"/>
+        <source>Close aborted</source>
+        <translation type="unfinished">Cierre del proyecto cancelado</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Print on 1 page</source>
+        <translation type="unfinished">Imprimir en 1 página</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print on 4 pages</source>
+        <translation type="unfinished">Imprimir en 4 páginas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print on 9 pages</source>
+        <translation type="unfinished">Imprimir en 9 páginas</translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Select images root directory</source>
+        <translation type="unfinished">Select images root directory</translation>
+    </message>
+    <message>
+        <location line="-1584"/>
+        <location line="+2048"/>
+        <source>&amp;Cascade</source>
+        <translation type="unfinished">&amp;Cascada</translation>
+    </message>
+    <message>
+        <location line="-1309"/>
+        <source>Select DoUML project file</source>
+        <translation type="unfinished">Seleccione archivo de proyecto DoUML</translation>
+    </message>
+    <message>
+        <location line="+1310"/>
+        <source>&amp;Tile</source>
+        <translation type="unfinished">&amp;Mosaico</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Preferred geometry</source>
+        <translation type="unfinished">&amp;Geometría preferida</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C&amp;lose all</source>
+        <translation type="unfinished">Ce&amp;rrar todo</translation>
+    </message>
+</context>
+<context>
+    <name>UseCaseDiagramView</name>
+    <message>
+        <location filename="../diagram/UseCaseDiagramView.cpp" line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Agregar elementos marcados</translation>
+    </message>
+</context>
+<context>
+    <name>UseCaseDialog</name>
+    <message>
+        <location filename="../dialog/UseCaseDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Aceptar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use Case dialog</source>
+        <translation type="unfinished">cuadro de diálogo Caso de Uso</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name : </source>
+        <translation type="unfinished">nombre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">estereotipo : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>extension 
+points : </source>
+        <translation type="unfinished">Puntos de
+extensión : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>description :</source>
+        <translation type="unfinished">descripción :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propiedades</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nombre ilegal o actualmente en uso</translation>
+    </message>
+</context>
+<context>
+    <name>ValueSpecificationDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-467"/>
+        <location line="+27"/>
+        <source>value - Ocl</source>
+        <translation type="unfinished">valor -Ocl</translation>
+    </message>
+    <message>
+        <location line="-22"/>
+        <location line="+32"/>
+        <location line="+31"/>
+        <source>Value : </source>
+        <translation type="unfinished">Valor : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+24"/>
+        <source>value - C++</source>
+        <translation type="unfinished">valor - C++</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+24"/>
+        <source>value - Java</source>
+        <translation type="unfinished">valor - Java</translation>
+    </message>
+</context>
+</TS>
diff --git a/src/translations/frFR.qm b/src/translations/frFR.qm
new file mode 100644
index 000000000..313d04194
Binary files /dev/null and b/src/translations/frFR.qm differ
diff --git a/src/translations/frFR.ts b/src/translations/frFR.ts
new file mode 100644
index 000000000..50d1e63ac
--- /dev/null
+++ b/src/translations/frFR.ts
@@ -0,0 +1,17615 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../dialog/About.cpp" line="+45"/>
+        <source>About DoUML</source>
+        <translation type="unfinished">About DoUML</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;burasi&amp;Valider</translation>
+    </message>
+</context>
+<context>
+    <name>AccessVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+1083"/>
+        <location line="+37"/>
+        <source>variable - Ocl</source>
+        <translation type="unfinished">variable - Ocl</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <source>class : </source>
+        <translation type="unfinished">classe : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>variable :</source>
+        <translation type="unfinished">variable :</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Choose variable selected in browser</source>
+        <translation type="unfinished">Choisir la variable selectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Create attribute and choose it</source>
+        <translation type="unfinished">Créer une propriété et la choisir</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityActionCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityActionCanvas.cpp" line="+861"/>
+        <source>Add pin</source>
+        <translation type="unfinished">Ajouter une broche</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity action</source>
+        <translation type="unfinished">Editer l&apos;action d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select %1 in browser</source>
+        <translation type="unfinished">Sélectionner %1 dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set associated diagram from behavior</source>
+        <translation type="unfinished">Associer le diagramme du comportement</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <location line="+31"/>
+        <source>show opaque definition</source>
+        <translation type="unfinished">montrer la définition opaque</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+31"/>
+        <source>action color</source>
+        <translation type="unfinished">couleur d&apos;action</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityActionDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-1141"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity Action dialog</source>
+        <translation type="unfinished">Editeur d&apos;action d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>kind : </source>
+        <translation type="unfinished">sorte : </translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+13"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>constraint :</source>
+        <translation type="unfinished">contrainte :</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+145"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityCanvas.cpp" line="+628"/>
+        <source>Add parameter</source>
+        <translation type="unfinished">Ajouter un paramètre</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity</source>
+        <translation type="unfinished">Editer l&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <location line="+31"/>
+        <source>show conditions</source>
+        <translation type="unfinished">Montrer les conditions</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+31"/>
+        <source>drawing language</source>
+        <translation type="unfinished">langage d&apos;affichage</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+31"/>
+        <source>activity color</source>
+        <translation type="unfinished">couleur d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+8"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDiagramView</name>
+    <message>
+        <location filename="../diagram/ActivityDiagramView.cpp" line="+85"/>
+        <source>Activity diagram menu</source>
+        <translation type="unfinished">Menu de diagramme d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <location line="+29"/>
+        <location line="+31"/>
+        <location line="+60"/>
+        <location line="+28"/>
+        <location line="+31"/>
+        <location line="+182"/>
+        <location line="+19"/>
+        <location line="+24"/>
+        <location line="+24"/>
+        <location line="+24"/>
+        <location line="+20"/>
+        <source>already drawn</source>
+        <translation type="unfinished">déjà dessiné</translation>
+    </message>
+    <message>
+        <location line="-184"/>
+        <location line="+264"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="-260"/>
+        <source>Draw activity</source>
+        <translation type="unfinished">Dessiner l&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add a call behavior</source>
+        <translation type="unfinished">Ajouter un appel de comportement</translation>
+    </message>
+    <message>
+        <location line="+260"/>
+        <source>Add a read variable value action</source>
+        <translation type="unfinished">Ajouter une action lire la valeur d&apos;une variable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a clear variable value action</source>
+        <translation type="unfinished">Ajouter une action vider la valeur d&apos;une variable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a write variable value action</source>
+        <translation type="unfinished">Ajouter une action affecter une variable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a add variable value action</source>
+        <translation type="unfinished">Ajouter une action ajouter à une variable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a remove variable value action</source>
+        <translation type="unfinished">Ajouter une action retirer à une variable</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ActivityDiagramWindow.cpp" line="+128"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Package</source>
+        <translation type="unfinished">Nouveau paquetage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Fragment</source>
+        <translation type="unfinished">Nouveau fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Activity</source>
+        <translation type="unfinished">Nouvelle activité</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Interruptible Activity Region</source>
+        <translation type="unfinished">Nouvelle région interruptible d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>New Expansion Region</source>
+        <translation type="unfinished">Nouvelle région d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>New Activity Partition</source>
+        <translation type="unfinished">Nouvelle partition d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>New Action</source>
+        <translation type="unfinished">Nouvel objet</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Object Node</source>
+        <translation type="unfinished">Nouveau noeud objet</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Initial node</source>
+        <translation type="unfinished">Nouveau noeud initial</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Activity Final</source>
+        <translation type="unfinished">Nouvelle activité finale</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Flow Final</source>
+        <translation type="unfinished">Nouveau flux final</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Merge</source>
+        <translation type="unfinished">Nouvelle fusion</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Decision</source>
+        <translation type="unfinished">Nouvelle décision</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Fork</source>
+        <translation type="unfinished">Nouvelle bifurcation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Join</source>
+        <translation type="unfinished">Nouveau sommet d&apos;union</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Flow</source>
+        <translation type="unfinished">Nouveau flux</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dépendance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDialog</name>
+    <message>
+        <location filename="../dialog/ActivityDialog.cpp" line="+64"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity dialog</source>
+        <translation type="unfinished">Editeur d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>specification :</source>
+        <translation type="unfinished">spécification :</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>read only</source>
+        <translation type="unfinished">en lecture seule</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>single execution</source>
+        <translation type="unfinished">execution unique</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>active</source>
+        <translation type="unfinished">actif</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+14"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>constraint :</source>
+        <translation type="unfinished">contrainte :</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choisir l&apos;opération selectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Pre
+condition : </source>
+        <translation type="unfinished">Condition
+préalable : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Post
+condition : </source>
+        <translation type="unfinished">Condition
+de sortie : </translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityNodeCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityNodeCanvas.cpp" line="+481"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">dessiner verticalement</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">dessiner horizontalement</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit activity node</source>
+        <translation type="unfinished">Editer un noeud d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityObjectCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityObjectCanvas.cpp" line="+516"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity object</source>
+        <translation type="unfinished">Editer l&apos;objet d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Sélectionner la classe dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <location line="+33"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">écrire nom:type
+horizontalement</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+33"/>
+        <source>activity object color</source>
+        <translation type="unfinished">couleur d&apos;objet d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityObjectDialog</name>
+    <message>
+        <location filename="../dialog/ActivityObjectDialog.cpp" line="+66"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>name :</source>
+        <translation type="unfinished">nom :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>multiplicity : </source>
+        <translation type="unfinished">multiplicité : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordre : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>in state : </source>
+        <translation type="unfinished">dans l&apos;état : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>is control</source>
+        <translation type="unfinished">est un contrôle</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+94"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>selection : </source>
+        <translation type="unfinished">sélection : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choisir la classe sélectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Créer une classe et la choisir</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityPartitionCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityPartitionCanvas.cpp" line="+414"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">dessiner verticalement</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">dessiner horizontalement</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity partition</source>
+        <translation type="unfinished">Editer la partition d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+154"/>
+        <location line="+25"/>
+        <source>activity partition color</source>
+        <translation type="unfinished">couleur de partition d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityPartitionDialog</name>
+    <message>
+        <location filename="../dialog/ActivityPartitionDialog.cpp" line="+61"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity Partition dialog</source>
+        <translation type="unfinished">Editeur de partition d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>represents :</source>
+        <translation type="unfinished">représente :</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>is dimension</source>
+        <translation type="unfinished">est une dimension</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>is external</source>
+        <translation type="unfinished">est externe</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose element selected in browser</source>
+        <translation type="unfinished">Choisir l&apos;élément selectionné dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose element marked in browser</source>
+        <translation type="unfinished">Choisir l&apos;élément marqué dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>AddVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+924"/>
+        <source>replace all</source>
+        <translation type="unfinished">tout remplacer</translation>
+    </message>
+</context>
+<context>
+    <name>AnnotationDialog</name>
+    <message>
+        <location filename="../dialog/AnnotationDialog.cpp" line="+72"/>
+        <source>
+To add an annotation at the cursor position
+you may select it in the list and press &apos;add&apos;
+</source>
+        <translation type="unfinished">
+Pour ajouter une annotation à laposition du curseur
+pour pouvez choisir dans la liste et presser &apos;ajouter&apos;
+</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add </source>
+        <translation type="unfinished">Ajouter </translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>ArrowCanvas</name>
+    <message>
+        <location filename="../diagram/ArrowCanvas.cpp" line="+861"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dessiner toutes les relations&lt;/i&gt; forcé à &lt;i&gt;non&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>a relation can&apos;t have a relation</source>
+        <translation type="unfinished">une relation ne peut avoir de relation</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>stereotype/label dialog</source>
+        <translation type="unfinished">éditeur de stéréotype/intitulé</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>label : </source>
+        <translation type="unfinished">intitulé : </translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>line</source>
+        <translation type="unfinished">ligne</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Sélectionner stéréotype et etiquettes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Position par défaut des stéréotype et etiquettes</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach label to this segment</source>
+        <translation type="unfinished">Attacher l&apos;étiquette à ce segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attacher le stéréotype à ce segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Géométrie (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>None</source>
+        <translation type="unfinished">Aucune</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Recenter begin</source>
+        <translation type="unfinished">Recentrer le début</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Recenter end</source>
+        <translation type="unfinished">Recentrer la fin</translation>
+    </message>
+</context>
+<context>
+    <name>ArrowJunctionCanvas</name>
+    <message>
+        <location filename="../diagram/ArrowJunctionCanvas.cpp" line="+217"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ArtifactCanvas</name>
+    <message>
+        <location filename="../diagram/ArtifactCanvas.cpp" line="+578"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Ajouter les élément reliés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit artifact</source>
+        <translation type="unfinished">Editer l&apos;artefact</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Generate</source>
+        <translation type="unfinished">Générer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <location line="+34"/>
+        <source>artifact</source>
+        <translation type="unfinished">artefact</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+25"/>
+        <source>artifact color</source>
+        <translation type="unfinished">couleur d&apos;artefact</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+8"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">en lecture seule</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>illegal for a source artifact</source>
+        <translation type="unfinished">illégal pour un artefact source</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+14"/>
+        <location line="+6"/>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ArtifactDialog</name>
+    <message>
+        <location filename="../dialog/ArtifactDialog.cpp" line="+68"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>artifact dialog</source>
+        <translation type="unfinished">editeur d&apos;artefact</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+58"/>
+        <location line="+47"/>
+        <location line="+61"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-349"/>
+        <source>Default</source>
+        <translation type="unfinished">Par défaut</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Header file 
+definition : </source>
+        <translation type="unfinished">Définition de
+fichier d&apos;en-tête : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+47"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Définition par défaut</translation>
+    </message>
+    <message>
+        <location line="-292"/>
+        <location line="+47"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Non généré en C++</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+47"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Résultat après
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-285"/>
+        <source>C++ header</source>
+        <translation type="unfinished">en tête C++</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Source file 
+definition : </source>
+        <translation type="unfinished">Définition de
+fichier source : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>C++ source</source>
+        <translation type="unfinished">source C++</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>File 
+definition : </source>
+        <translation type="unfinished">Définition
+de fichier : </translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Non généré en Java</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Java source</source>
+        <translation type="unfinished">source Java</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Non généré en Php</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Php source</source>
+        <translation type="unfinished">source Php</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Non généré en Python</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Python source</source>
+        <translation type="unfinished">source Python</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Non généré en Idl</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Idl source</source>
+        <translation type="unfinished">source Idl</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Classes without artifact</source>
+        <translation type="unfinished">Classes sans artefact</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+46"/>
+        <source>Associated classes</source>
+        <translation type="unfinished">Classes associées</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>go up</source>
+        <translation type="unfinished">monter</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>go down</source>
+        <translation type="unfinished">descendre</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Stereotype filtering  </source>
+        <translation type="unfinished">Filtre sur stéréotype  </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Unassociated artifacts</source>
+        <translation type="unfinished">Artefact non associés</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+7"/>
+        <source>Associated artifacts</source>
+        <translation type="unfinished">Artefact associés</translation>
+    </message>
+    <message>
+        <location line="+1234"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>AssocContainCanvas</name>
+    <message>
+        <location filename="../diagram/AssocContainCanvas.cpp" line="+87"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Sélectionner stéréotype et etiquettes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Position par défaut des stéréotype et etiquettes</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach label to this segment</source>
+        <translation type="unfinished">Attacher l&apos;étiquette à ce segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attacher le stéréotype à ce segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Géométrie (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dessiner toutes les relations&lt;/i&gt; forcé à &lt;i&gt;non&lt;/i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AttributeDialog</name>
+    <message>
+        <location filename="../dialog/AttributeDialog.cpp" line="+75"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Enum item dialog</source>
+        <translation type="unfinished">Editeur d&apos;énuméré</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Attribute dialog</source>
+        <translation type="unfinished">Editeur de propriété</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>class : </source>
+        <translation type="unfinished">classe : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>name :</source>
+        <translation type="unfinished">nom :</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">stéréotype :</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>    multiplicity :  </source>
+        <translation type="unfinished">    multiplicité :  </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>initial value :</source>
+        <translation type="unfinished">valeur initiale :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>value :</source>
+        <translation type="unfinished">valeur :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+77"/>
+        <location line="+20"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-63"/>
+        <source>read-only</source>
+        <translation type="unfinished">lecture-seule</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>derived</source>
+        <translation type="unfinished">dérivé</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordonné</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Default</source>
+        <translation type="unfinished">Par défaut</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>constraint :</source>
+        <translation type="unfinished">contrainte :</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Visibility :</source>
+        <translation type="unfinished">Visibilité :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>follow uml</source>
+        <translation type="unfinished">suivre uml</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+59"/>
+        <location line="+71"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Declaration :</source>
+        <translation type="unfinished">Déclaration :</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+59"/>
+        <location line="+71"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Result after
+substitution :</source>
+        <translation type="unfinished">Résultat après
+substitution :</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+70"/>
+        <location line="+60"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Déclaration par défaut</translation>
+    </message>
+    <message>
+        <location line="-248"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Non généré en C++</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Default item declaration</source>
+        <translation type="unfinished">Déclaration par défaut d&apos;énuméré</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+188"/>
+        <source>Default attribute declaration</source>
+        <translation type="unfinished">Déclaration par défaut de propriété</translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Non généré en Java</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Montrer les annotations</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Editer les annotations</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Non généré en Php</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Non généré en Python</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <source>Default state declaration</source>
+        <translation type="unfinished">Déclaration par défaut d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Default constant declaration</source>
+        <translation type="unfinished">Déclaration par défaut de constante</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Non généré en Idl</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choisir la classe sélectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Créer une classe et la choisir</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>BasicDialog</name>
+    <message>
+        <location filename="../dialog/BasicDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source> dialog</source>
+        <translation type="unfinished"> dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserItemNameValidator</name>
+    <message>
+        <location filename="../browser/BrowserNode.cpp" line="+138"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserSearchDialog</name>
+    <message>
+        <location filename="../dialog/BrowserSearchDialog.cpp" line="+118"/>
+        <source>Browser search</source>
+        <translation type="unfinished">Recherche dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Kind</source>
+        <translation type="unfinished">Sorte</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Containing</source>
+        <translation type="unfinished">Contenant</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>case sensitive</source>
+        <translation type="unfinished">sensible à la casse</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>even deleted</source>
+        <translation type="unfinished">même détruit</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name</source>
+        <translation type="unfinished">nom</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>stereotype</source>
+        <translation type="unfinished">stéréotype</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>description</source>
+        <translation type="unfinished">description</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>declaration/definition/body</source>
+        <translation type="unfinished">déclaration/définition/corps</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Result</source>
+        <translation type="unfinished">Résultât</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Search</source>
+        <translation type="unfinished">Chercher</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Retirer la marque</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mark them</source>
+        <translation type="unfinished">Les marquer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Retirer toutes les marques</translation>
+    </message>
+</context>
+<context>
+    <name>BuiltinTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsBuiltinTable.cpp" line="+99"/>
+        <location line="+8"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Uml/Cpp/Java/Idl fields cannot be empty</source>
+        <translation type="unfinished">Uml/Cpp/Java/Idl fields cannot be empty</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Duplicate Uml entries are not allowed</source>
+        <translation type="unfinished">Duplicate Uml entries are not allowed</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cpp parameter controls must contain ${type}</source>
+        <translation type="unfinished">Cpp parameter controls must contain ${type}</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Add type</source>
+        <translation type="unfinished">Add type</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Language visibility:</source>
+        <translation type="unfinished">Language visibility:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Search:</source>
+        <translation type="unfinished">Chercher:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Copy row</source>
+        <translation type="unfinished">Copier la ligne</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste row</source>
+        <translation type="unfinished">Coller la ligne</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut row</source>
+        <translation type="unfinished">Couper la ligne</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete row</source>
+        <translation type="unfinished">Retirer la ligne</translation>
+    </message>
+</context>
+<context>
+    <name>CallBehaviorDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+336"/>
+        <location line="+25"/>
+        <source>behavior - Ocl</source>
+        <translation type="unfinished">comportement - Ocl</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchrone</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>behavior :</source>
+        <translation type="unfinished">comportement :</translation>
+    </message>
+</context>
+<context>
+    <name>CallOperationDialog</name>
+    <message>
+        <location line="-320"/>
+        <location line="+46"/>
+        <source>operation - Ocl</source>
+        <translation type="unfinished">opération - Ocl</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchrone</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>class : </source>
+        <translation type="unfinished">classe : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>operation :</source>
+        <translation type="unfinished">opération :</translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choisir l&apos;opération selectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Créer une opération et la choisir</translation>
+    </message>
+</context>
+<context>
+    <name>CatalogWidget</name>
+    <message>
+        <location filename="../ui/catalogwidget.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Visited</source>
+        <translation type="unfinished">Visited</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Marked</source>
+        <translation type="unfinished">Marked</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Favourites</source>
+        <translation type="unfinished">Favourites</translation>
+    </message>
+    <message>
+        <location filename="../ui/catalogwidget.cpp" line="+301"/>
+        <source>Remove from favourites</source>
+        <translation type="unfinished">Remove from favourites</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Retirer la marque</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Retirer toutes les marques</translation>
+    </message>
+</context>
+<context>
+    <name>CdClassCanvas</name>
+    <message>
+        <location filename="../diagram/CdClassCanvas.cpp" line="+1281"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Ajouter les élément reliés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show nesting relation</source>
+        <translation type="unfinished">Afficher la relation d&apos;inclusion</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Individual attribute visibility</source>
+        <translation type="unfinished">Visibilité individuelle de propriété</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Individual operation visibility</source>
+        <translation type="unfinished">Visibilité individuelle d&apos;opération</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit class</source>
+        <translation type="unfinished">Editer la classe</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+12"/>
+        <source>Add item</source>
+        <translation type="unfinished">Ajouter un énuméré</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+19"/>
+        <source>Add attribute</source>
+        <translation type="unfinished">Ajouter une propriété</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Edit item or attribute</source>
+        <translation type="unfinished">Editer l&apos;énuméré ou une propriété</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+18"/>
+        <source>Add operation</source>
+        <translation type="unfinished">Ajouter une opération</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Edit item</source>
+        <translation type="unfinished">Editer l&apos;élément</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Edit attribute</source>
+        <translation type="unfinished">Editer la propriété</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+22"/>
+        <source>Add inherited operation</source>
+        <translation type="unfinished">Ajouter une opération héritée</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Choose operation</source>
+        <translation type="unfinished">Choisir l&apos;opération</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+2"/>
+        <source>Edit operation</source>
+        <translation type="unfinished">Editer l&apos;opération</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Generate</source>
+        <translation type="unfinished">Générer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+139"/>
+        <source>class</source>
+        <translation type="unfinished">classe</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+31"/>
+        <source>class color</source>
+        <translation type="unfinished">couleur de classe</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+4"/>
+        <location line="+6"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ChangeVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-199"/>
+        <source>variable - Ocl</source>
+        <translation type="unfinished">variable - Ocl</translation>
+    </message>
+</context>
+<context>
+    <name>ClassDiagramView</name>
+    <message>
+        <location filename="../diagram/ClassDiagramView.cpp" line="+131"/>
+        <source>Class diagram menu</source>
+        <translation type="unfinished">Menu de diagramme de classe</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add classes of the selected class view</source>
+        <translation type="unfinished">Ajouter  les classes de la vue de classe sélectionnée</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+6"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Ajouter les éléments marqués</translation>
+    </message>
+</context>
+<context>
+    <name>ClassDialog</name>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="+2537"/>
+        <source>Class dialog</source>
+        <translation type="unfinished">Editeur de classe</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>base type : </source>
+        <translation type="unfinished">type de base : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>artifact : </source>
+        <translation type="unfinished">artefact : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+10"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Default</source>
+        <translation type="unfinished">Par défaut</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>constraint :</source>
+        <translation type="unfinished">contrainte :</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>
+Enter formals in case the class is parameterized
+</source>
+        <translation type="unfinished">
+Entrer les paramètres formels lorsque la classe est paramétrée
+</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>
+Specify actuals else formals default value will be used
+</source>
+        <translation type="unfinished">
+Specifier les actuels sinon les les valeurs par défaut des formels seront utilisés
+</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <location line="+184"/>
+        <source>Declaration : </source>
+        <translation type="unfinished">Déclaration : </translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <location line="+39"/>
+        <location line="+44"/>
+        <location line="+44"/>
+        <location line="+60"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Résultat après
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-181"/>
+        <location line="+189"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Déclaration par défaut</translation>
+    </message>
+    <message>
+        <location line="-188"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Non généré en C++</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+42"/>
+        <location line="+47"/>
+        <source>Definition : </source>
+        <translation type="unfinished">Définition : </translation>
+    </message>
+    <message>
+        <location line="-76"/>
+        <location line="+46"/>
+        <location line="+45"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Définition par défaut</translation>
+    </message>
+    <message>
+        <location line="-90"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Non généré en Java</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Non généré en Php</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Non généré en Python</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>switch type : </source>
+        <translation type="unfinished">type du &apos;switch&apos; : </translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Not generated in IDL</source>
+        <translation type="unfinished">Non généré en Idl</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Initialization 
+plug-out :</source>
+        <translation type="unfinished">Plug-out
+d&apos;initialisation :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+7"/>
+        <source>  parameter(s) : </source>
+        <translation type="unfinished">  paramètre(s) : </translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>Check 
+plug-out :</source>
+        <translation type="unfinished">Plug-out de
+vérification :</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Icon path :</source>
+        <translation type="unfinished">Chemin d&apos;icône :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Browse</source>
+        <translation type="unfinished">Explorer</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Apply on : </source>
+        <translation type="unfinished">Appliqué à : </translation>
+    </message>
+    <message>
+        <location line="+795"/>
+        <location line="+6"/>
+        <location line="+9"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>ClassInstanceDialog</name>
+    <message>
+        <location filename="../dialog/ClassInstanceDialog.cpp" line="+134"/>
+        <source>Class instance dialog</source>
+        <translation type="unfinished">Editeur d&apos;instance de classe</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">stéréotype :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>class :</source>
+        <translation type="unfinished">classe :</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> Attribute </source>
+        <translation type="unfinished"> Propriété </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> Class </source>
+        <translation type="unfinished"> Classe </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> Value </source>
+        <translation type="unfinished"> Valeur </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Attributes</source>
+        <translation type="unfinished">Proriétés</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Relations</source>
+        <translation type="unfinished">Relations</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choisir la classe sélectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Créer une classe et la choisir</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>Yes</source>
+        <translation type="unfinished">Oui</translation>
+    </message>
+</context>
+<context>
+    <name>ClassListDialog</name>
+    <message>
+        <location filename="../dialog/ClassListDialog.cpp" line="+72"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>ClassSettingsDialog</name>
+    <message>
+        <location filename="../dialog/ClassSettingsDialog.cpp" line="+71"/>
+        <source>Class Settings dialog</source>
+        <translation type="unfinished">Dialogue d&apos;option de classe</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>default attributes visibility : </source>
+        <translation type="unfinished">visibilité par défaut des propriétés : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>default relations visibility : </source>
+        <translation type="unfinished">visibilité par défaut des relations : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>default operations visibility : </source>
+        <translation type="unfinished">visibilité par défaut des opérations : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>ClassViewDialog</name>
+    <message>
+        <location filename="../dialog/ClassViewDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>class view dialog</source>
+        <translation type="unfinished">dialogue de vue de classe</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+18"/>
+        <source>deployment
+view : </source>
+        <translation type="unfinished">vue de
+déployment : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>CodAddMsgDialog</name>
+    <message>
+        <location filename="../dialog/CodAddMsgDialog.cpp" line="+62"/>
+        <source>Add message dialog</source>
+        <translation type="unfinished">Editeur d&apos;ajout de message</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Add message to %1</source>
+        <translation type="unfinished">Ajouter un message à %1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>rank : </source>
+        <translation type="unfinished">rang : </translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choisir l&apos;opération selectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Créer une opération et la choisir</translation>
+    </message>
+</context>
+<context>
+    <name>CodChangeMsgDialog</name>
+    <message>
+        <location filename="../dialog/CodChangeMsgDialog.cpp" line="+57"/>
+        <source>Communicationg message dialog</source>
+        <translation type="unfinished">Editeur de message de communication</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choisir l&apos;opération selectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Créer une opération et la choisir</translation>
+    </message>
+</context>
+<context>
+    <name>CodClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/CodClassInstCanvas.cpp" line="+238"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Sélectionner la classe dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Exit from model</source>
+        <translation type="unfinished">Extraire du modèle</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert in model</source>
+        <translation type="unfinished">Insérer dans le modèle</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace it</source>
+        <translation type="unfinished">Le remplacer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">écrire nom:type
+horizontalement</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">montrer le context de classe</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">montrer les propriétés
+des stéréotypes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">couleur d&apos;instance de classe</translation>
+    </message>
+</context>
+<context>
+    <name>CodDirsCanvas</name>
+    <message>
+        <location filename="../diagram/CodDirsCanvas.cpp" line="+362"/>
+        <location line="+6"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>CodLinkCanvas</name>
+    <message>
+        <location filename="../diagram/CodLinkCanvas.cpp" line="+125"/>
+        <source>Link</source>
+        <translation type="unfinished">Lien</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <source>add messages to </source>
+        <translation type="unfinished">ajouter un message à </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit its messages</source>
+        <translation type="unfinished">Editer ses messages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Editer tout les messages</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Géométrie (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+</context>
+<context>
+    <name>CodSelfLinkCanvas</name>
+    <message>
+        <location filename="../diagram/CodSelfLinkCanvas.cpp" line="+278"/>
+        <source>Self link</source>
+        <translation type="unfinished">Lien réflexif</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add messages</source>
+        <translation type="unfinished">Ajouter des messages</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit its messages</source>
+        <translation type="unfinished">Editer ses messages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Editer tout les messages</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ColDiagramView</name>
+    <message>
+        <location filename="../diagram/ColDiagramView.cpp" line="+110"/>
+        <source>Communication diagram menu</source>
+        <translation type="unfinished">Menu de diagramme de communication</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Editer tout les messages</translation>
+    </message>
+</context>
+<context>
+    <name>ColDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ColDiagramWindow.cpp" line="+78"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Ajouter un paquetage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Ajouter un fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Ajouter une instance de classe modélisée</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Ajouter une instance de classe</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Link</source>
+        <translation type="unfinished">Ajouter un lien</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Self Link</source>
+        <translation type="unfinished">Ajouter un lien réflexif</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ColMsgTable</name>
+    <message>
+        <location filename="../dialog/ColMsgTable.cpp" line="+142"/>
+        <source>Rank</source>
+        <translation type="unfinished">Rang</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hierarchical rank</source>
+        <translation type="unfinished">Rang hiérarchique</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>From</source>
+        <translation type="unfinished">De</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Message</source>
+        <translation type="unfinished">Message</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+95"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="-71"/>
+        <source>rank </source>
+        <translation type="unfinished">rang </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit message</source>
+        <translation type="unfinished">Editer le message</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change ranks</source>
+        <translation type="unfinished">Changer les rangs</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete it</source>
+        <translation type="unfinished">Le retirer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete recursively</source>
+        <translation type="unfinished">Retirer récursivement</translation>
+    </message>
+    <message>
+        <location line="+104"/>
+        <source>Enter new hierarchical rank</source>
+        <translation type="unfinished">Entrer nouveau rang hiérarchique</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Hierarchical rank : </source>
+        <translation type="unfinished">Rang hiérarchique : </translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Warning</source>
+        <translation type="unfinished">Attention</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Invalid hierarchical rank</source>
+        <translation type="unfinished">Rang hiérarchique invalide</translation>
+    </message>
+</context>
+<context>
+    <name>ComboColor</name>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="+363"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;inchangé&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ComboStates</name>
+    <message>
+        <location line="-281"/>
+        <location line="+21"/>
+        <location line="+21"/>
+        <location line="+28"/>
+        <location line="+27"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;inchangé&gt;</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>unlimited</source>
+        <translation type="unfinished">illimité</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>default</source>
+        <translation type="unfinished">par défaut</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentCanvas</name>
+    <message>
+        <location filename="../diagram/ComponentCanvas.cpp" line="+380"/>
+        <source>Choose class</source>
+        <translation type="unfinished">Choisir la classe</translation>
+    </message>
+    <message>
+        <location line="+479"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Ajouter les élément reliés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit component</source>
+        <translation type="unfinished">Editer le composant</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+34"/>
+        <source>component</source>
+        <translation type="unfinished">composant</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+32"/>
+        <source>drawn as icon</source>
+        <translation type="unfinished">dessiner via un icône</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show required and provided interfaces</source>
+        <translation type="unfinished">montrer les interfaces requises et produites</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show realizations</source>
+        <translation type="unfinished">montrer les réalisations</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show stereotype properties</source>
+        <translation type="unfinished">montrer le stéréotype des propriétés</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>component color</source>
+        <translation type="unfinished">couleur de composant</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">en lecture seule</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>no provided interfaces</source>
+        <translation type="unfinished">pas d&apos;interfaces fournies</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>no required interfaces</source>
+        <translation type="unfinished">pas d&apos;interface requises</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+31"/>
+        <location line="+22"/>
+        <location line="+4"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source>not required</source>
+        <translation type="unfinished">non requis</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>not provided</source>
+        <translation type="unfinished">non fourni</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDiagramView</name>
+    <message>
+        <location filename="../diagram/ComponentDiagramView.cpp" line="+113"/>
+        <source>Component diagram menu</source>
+        <translation type="unfinished">Menu de diagramme de composant</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Ajouter les éléments marqués</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ComponentDiagramWindow.cpp" line="+82"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Ajouter un paquetage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Ajouter un fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Component</source>
+        <translation type="unfinished">Ajouter un composant</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Inheritance</source>
+        <translation type="unfinished">Héritage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dépendance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Required interface</source>
+        <translation type="unfinished">Interface requise</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Provided interface</source>
+        <translation type="unfinished">Interface fournie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDialog</name>
+    <message>
+        <location filename="../dialog/ComponentDialog.cpp" line="+57"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>component dialog</source>
+        <translation type="unfinished">editeur de composant</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Required classes</source>
+        <translation type="unfinished">Classes requises</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Provided classes</source>
+        <translation type="unfinished">Classes fournies</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Realizing classes</source>
+        <translation type="unfinished">Classe réalisant</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Stereotype filtering  </source>
+        <translation type="unfinished">Filtre sur stéréotype  </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Available classes</source>
+        <translation type="unfinished">Classes disponibles</translation>
+    </message>
+    <message>
+        <location line="+245"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintCanvas</name>
+    <message>
+        <location filename="../diagram/ConstraintCanvas.cpp" line="+140"/>
+        <source>Constraint</source>
+        <translation type="unfinished">Contrainte</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Font</source>
+        <translation type="unfinished">Police de caractères</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <location line="+61"/>
+        <source>note color</source>
+        <translation type="unfinished">couleur de note</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintDialog</name>
+    <message>
+        <location filename="../dialog/ConstraintDialog.cpp" line="+55"/>
+        <source>Constraints visibility dialog</source>
+        <translation type="unfinished">Editeur de visibilité des contraintes</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Specify visible elements rather than hidden ones</source>
+        <translation type="unfinished">Indique les éléments visibles et non les cachés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show all</source>
+        <translation type="unfinished">Tout montrer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide all</source>
+        <translation type="unfinished">Tout cacher</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide inherited</source>
+        <translation type="unfinished">Cacher les hérités</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintTable</name>
+    <message>
+        <location line="+71"/>
+        <source>visible</source>
+        <translation type="unfinished">visible</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>element</source>
+        <translation type="unfinished">élément</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>constraint</source>
+        <translation type="unfinished">contrainte</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location line="+43"/>
+        <location line="+9"/>
+        <location line="+16"/>
+        <source>  yes</source>
+        <translation type="unfinished">  oui</translation>
+    </message>
+</context>
+<context>
+    <name>ConstructorInitializerDialog</name>
+    <message>
+        <location filename="../ui/constructorinitializerdialog.ui" line="+14"/>
+        <source>Dialog</source>
+        <translation type="unfinished">Dialog</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>All attributes:</source>
+        <translation type="unfinished">All attributes:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Initializer
+text:</source>
+        <translation type="unfinished">Initializer
+text:</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Constructor
+prototype:</source>
+        <translation type="unfinished">Constructor
+prototype:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Result after
+substitution:</source>
+        <translation type="unfinished">Résultat après
+substitution:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location filename="../ui/constructorinitializerdialog.cpp" line="+49"/>
+        <source>Constructor-initializer setup</source>
+        <translation type="unfinished">Constructor-initializer setup</translation>
+    </message>
+</context>
+<context>
+    <name>ContinuationDialog</name>
+    <message>
+        <location filename="../dialog/ContinuationDialog.cpp" line="+49"/>
+        <source>stereotype/continuation dialog</source>
+        <translation type="unfinished">editeur de stéréotype/continuation</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>label : </source>
+        <translation type="unfinished">intitulé : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>CppParamsDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="+6241"/>
+        <source>C++ parameters dialog</source>
+        <translation type="unfinished">Editeur des paramères C++</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>CppParamsTable</name>
+    <message>
+        <location line="-598"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specifier</source>
+        <translation type="unfinished">Spécificateur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pointer</source>
+        <translation type="unfinished">Pointeur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+4"/>
+        <source>Modifier</source>
+        <translation type="unfinished">Modifieur</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+4"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="+271"/>
+        <source>param %1</source>
+        <translation type="unfinished">param %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insérer un param avant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insérer un param après</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Retirer le param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copier le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Couper le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Coller le param</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Déplacer le param</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Changer le rang</translation>
+    </message>
+</context>
+<context>
+    <name>DecoratorDialog</name>
+    <message>
+        <location filename="../dialog/DecoratorDialog.cpp" line="+54"/>
+        <source>decorator dialog</source>
+        <translation type="unfinished">editeur de décoration</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+To add an decorator at the cursor position
+you may select it in the list and press &apos;add&apos;
+
+Set operation static to add @staticmethod,
+set operation abstract to add @abstractmethod
+</source>
+        <translation type="unfinished">
+Pour ajouter une décoration à la position du curseur
+vous pouvez dans la liste et presser &apos;ajouter&apos;
+
+Mettre l&apos;opération statique ajoute @staticmethod,
+Mettre l&apos;opération abstraite ajoute @abstractmethod
+</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Add </source>
+        <translation type="unfinished">Ajouter </translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentDiagramView</name>
+    <message>
+        <location filename="../diagram/DeploymentDiagramView.cpp" line="+122"/>
+        <source>Deployment diagram menu</source>
+        <translation type="unfinished">Menu de diagramme de déployment</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Ajouter les éléments marqués</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentDiagramWindow</name>
+    <message>
+        <location filename="../diagram/DeploymentDiagramWindow.cpp" line="+88"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Ajouter un paquetage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Ajouter un fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Deployment Node</source>
+        <translation type="unfinished">Ajouter un noeud de déployment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Artifact</source>
+        <translation type="unfinished">Ajouter un artefact</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Component</source>
+        <translation type="unfinished">Ajouter un composant</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Network connexion/ending</source>
+        <translation type="unfinished">Fin/connexion de réseau</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Network</source>
+        <translation type="unfinished">Réseau</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Inheritance</source>
+        <translation type="unfinished">Héritage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dépendance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentNodeCanvas</name>
+    <message>
+        <location filename="../diagram/DeploymentNodeCanvas.cpp" line="+485"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Ajouter les élément reliés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select node in browser</source>
+        <translation type="unfinished">Selectionner le noeud dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set node associated diagram</source>
+        <translation type="unfinished">Associer le diagramme au noeud</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+34"/>
+        <source>node</source>
+        <translation type="unfinished">noeud</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location line="+30"/>
+        <source>write node instance 
+horizontally</source>
+        <translation type="unfinished">écrire le noeud d&apos;
+instance horizontalement</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">montrer les propriétés
+des stéréotypes</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Node color</source>
+        <translation type="unfinished">Couleur de noeud</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>read only</source>
+        <translation type="unfinished">en lecture seule</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>DiagramView</name>
+    <message>
+        <location filename="../diagram/DiagramView.cpp" line="+1101"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Align</source>
+        <translation type="unfinished">Aligner</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>same width</source>
+        <translation type="unfinished">même largeur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>same height</source>
+        <translation type="unfinished">même hauteur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>same width and height</source>
+        <translation type="unfinished">même largeur et hauteur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size</source>
+        <translation type="unfinished">Taille</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Copy selected (Ctrl+c)</source>
+        <translation type="unfinished">Copier les éléments sélectionnés (Ctrl+c)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Cut selected (Ctrl+x, remove from diagram)</source>
+        <translation type="unfinished">Couper les éléments sélectionnés (Ctrl+x, retirer du diagramme)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove selected from view (Suppr)</source>
+        <translation type="unfinished">Retirer les éléments sélectionnés du diagramme (Suppr)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete selected (Ctrl+d)</source>
+        <translation type="unfinished">Détruire les éléments sélectionnés (Ctrl+d)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+775"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="-774"/>
+        <source>Same drawing settings</source>
+        <translation type="unfinished">Même options de dessin</translation>
+    </message>
+    <message>
+        <location line="+778"/>
+        <source>Select diagram in browser</source>
+        <translation type="unfinished">Sélectionner le diagramme dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select all (Ctrl+a)</source>
+        <translation type="unfinished">Tout sélectionner (Ctrl+a)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find selected browser element</source>
+        <translation type="unfinished">Chercher l&apos;élément sélectionné dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy optimal picture part</source>
+        <translation type="unfinished">Copier la partie optimale de l&apos;image</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy visible picture part</source>
+        <translation type="unfinished">Copier la partie visible de l&apos;image</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save optimal picture part (png)</source>
+        <translation type="unfinished">Sauver la partie optimale de l&apos;image (png)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save visible picture part (png)</source>
+        <translation type="unfinished">Sauver la partie visible de l&apos;image (png)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save optimal picture part (svg)</source>
+        <translation type="unfinished">Sauver la partie optimale de l&apos;image (svg)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save visible picture part (svg)</source>
+        <translation type="unfinished">Sauver la partie visible de l&apos;image (svg)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste copied items (Ctrl+v)</source>
+        <translation type="unfinished">Coller les éléments copiés (Ctrl+v)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Optimal scale</source>
+        <translation type="unfinished">Echelle optimale</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Optimal window size</source>
+        <translation type="unfinished">Taille de fenêtre optimale</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set preferred size and scale</source>
+        <translation type="unfinished">Etablir la taille et echelle préférées</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set preferred scale (size unset)</source>
+        <translation type="unfinished">Etablir l&apos;échelle préférée (sans la taille)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Restore preferred size and scale</source>
+        <translation type="unfinished">Rétablir la taille et échelle préférées</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unset preferred size and scale</source>
+        <translation type="unfinished">Oublier la taille et échelle préférées</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Restore preferred scale</source>
+        <translation type="unfinished">Rétablir l&apos;échelle préférée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unset preferred scale</source>
+        <translation type="unfinished">Oublier l&apos;échelle préférée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Format</source>
+        <translation type="unfinished">Format</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Undo all changes</source>
+        <translation type="unfinished">Annuller tous les changements</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Undo (Ctrl+z or Ctrl+u)</source>
+        <translation type="unfinished">Annulez (Ctrl+z ou Ctrl+u)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Redo (Ctrl+y or Ctrl+r)</source>
+        <translation type="unfinished">Refaire (Ctrl+y ou Ctrl+r)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+150"/>
+        <source>Landscape formats</source>
+        <translation type="unfinished">Formats paysage</translation>
+    </message>
+</context>
+<context>
+    <name>DiagramWindow</name>
+    <message>
+        <location filename="../diagram/DiagramWindow.cpp" line="+130"/>
+        <source>edit</source>
+        <translation type="unfinished">editer</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>scale</source>
+        <translation type="unfinished">échelle</translation>
+    </message>
+</context>
+<context>
+    <name>EnvDialog</name>
+    <message>
+        <location filename="../dialog/EnvDialog.cpp" line="+74"/>
+        <source>Environment dialog</source>
+        <translation type="unfinished">Editeur d&apos;environnement</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>MANDATORY, choose a value between 2 and 127 not used by an other person working at the same time on a project with you.
+To be safe, if possible choose a value not used by an other person even not working on a given project with you</source>
+        <translation type="unfinished">OBLIGATOIRE, choisissez une valeur entre 2 et 127 non utilisée par une autre personne travaillant avec vous sur un projet.
+Le plus sure et si possible de choisir une valeur propre non utilisée par quelqu&apos;un d&apos;autre travaillant ou non avec vous</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Own identifier </source>
+        <translation type="unfinished">Identifieur propre </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   The identifier can&apos;t be modified while a project is load</source>
+        <translation type="unfinished">   L&apos;identifieur ne peut être modifié quand un projet est chargé</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>
+Optional, to indicate where are the HTML pages of the reference manual. Used by the help (called by the F1 key) to show the
+chapter corresponding to the kind of the element selected in the browser</source>
+        <translation type="unfinished">
+Optionnel, indiquer où son les pages HTML du manuel de référence. Utilisé par l&apos;aide en ligne (appelé par la touche F1) pour montrer
+le chapitre correspondant au type d&apos;élément sélectionné dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Manual path</source>
+        <translation type="unfinished">Chemin du manuel</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+18"/>
+        <location line="+16"/>
+        <location line="+19"/>
+        <location line="+14"/>
+        <source>Browse</source>
+        <translation type="unfinished">Explorer</translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <source>
+Optional, to indicate a web navigator program. If it is not defined the reference manual will be shown with an internal simple viewer</source>
+        <translation type="unfinished">
+Optionnel, indiquer le programme de navigation web. S&apos;il n&apos;est pas indiqué le manuel de référence sera montré avec un afficheur interne simple</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Navigator</source>
+        <translation type="unfinished">Navigateur</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>
+Optional, to indicate a template project. This allows to create new projects getting all the template project settings</source>
+        <translation type="unfinished">
+Optionnel, indiquer un projet de référence (template). Permet de créer un nouveau projet ayant les options du projet de référence</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+Optional, to indicate a text editor (it must creates an own window). Else DoUML will use an internal editor</source>
+        <translation type="unfinished">
+Optionnel, indiquer un éditeur de texte (celui-ci doit créer sa propre fenêtre). Sinon un éditeur interne sera utilisé</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>
+In case you have a multiple screens configuration the best for you is to ask DoUML to place by default the dialogs in one of these
+screens giving the area, else the dialogs will be shown on the center of the virtual screen.</source>
+        <translation type="unfinished">
+Si vous avez une configuration avec plusieurs écrans le mieux est de demander à DoUML de placer par défaut les éditeurs dans l&apos;un
+de ces écrans en donnant sa zone, sinon les éditeurs seront affichés pas défaut au centre de l&apos;écran virtuel total.</translation>
+    </message>
+    <message>
+        <location line="-72"/>
+        <source>Editor path </source>
+        <translation type="unfinished">Chemin de l&apos;éditeur </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+Optional, to choose a language for menus and dialogs (default is English). You may have to select a corresponding character set</source>
+        <translation type="unfinished">
+Optionnel, choisir une langue pour les menus et éditeurs (Anglais par défaut). Un ensemble de caractère peut devoir être choisi en accord</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Translation file path </source>
+        <translation type="unfinished">Chemin du fichier de traduction </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>
+Optional, to indicate a character set in case you use non ISO_8859-1/latin1 characters. For instance KOI8-R or KOI8-RU for Cyrillic</source>
+        <translation type="unfinished">
+Optionel, indiquer un ensemble de caractères si vous n&apos;utilisez pas les caractères ISO_8859-1/latin1. Par exemple KOI8-R ou KOI8-RU pour le Cyrillic</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Character set </source>
+        <translation type="unfinished">Ensemble de caractères </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Default screen </source>
+        <translation type="unfinished">Ecran par défaut </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>left: </source>
+        <translation type="unfinished">gauche: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      top: </source>
+        <translation type="unfinished">      haut: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      right: </source>
+        <translation type="unfinished">      droite: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      bottom: </source>
+        <translation type="unfinished">      bas: </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>documentation directory</source>
+        <translation type="unfinished">répertoire de la documentation</translation>
+    </message>
+</context>
+<context>
+    <name>ExceptionsTable</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-682"/>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+47"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>exception %1</source>
+        <translation type="unfinished">exception %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert exception before</source>
+        <translation type="unfinished">Insérer une exception avant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert exception after</source>
+        <translation type="unfinished">Insérer une exception après</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete exception</source>
+        <translation type="unfinished">Retirer l&apos;exception</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy exception</source>
+        <translation type="unfinished">Copier l&apos;exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut exception</source>
+        <translation type="unfinished">Couper l&apos;exception</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste exception</source>
+        <translation type="unfinished">Coller l&apos;exception</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Move exception</source>
+        <translation type="unfinished">Déplacer l&apos;exception</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionNodeCanvas</name>
+    <message>
+        <location filename="../diagram/ExpansionNodeCanvas.cpp" line="+330"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit expansion node</source>
+        <translation type="unfinished">Editer le noeud d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <location line="+25"/>
+        <source>expansion node color</source>
+        <translation type="unfinished">couleur de noeud d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location line="+9"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionRegionCanvas</name>
+    <message>
+        <location filename="../diagram/ExpansionRegionCanvas.cpp" line="+460"/>
+        <source>Add expansion node</source>
+        <translation type="unfinished">Ajouter un noeud d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit expansion region</source>
+        <translation type="unfinished">Editer la région d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <location line="+25"/>
+        <source>expansion region color</source>
+        <translation type="unfinished">couleur de région d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionRegionDialog</name>
+    <message>
+        <location filename="../dialog/ExpansionRegionDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Expansion Region dialog</source>
+        <translation type="unfinished">Editeur de région d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>mode :</source>
+        <translation type="unfinished">mode :</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>must isolate</source>
+        <translation type="unfinished">doit isolé</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>description</source>
+        <translation type="unfinished">description</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>ExtraMemberDialog</name>
+    <message>
+        <location filename="../dialog/ExtraMemberDialog.cpp" line="+61"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Extra Class Member dialog</source>
+        <translation type="unfinished">Edireur de membre externe de class</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name :</source>
+        <translation type="unfinished">nom :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">stéréotype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+33"/>
+        <location line="+15"/>
+        <location line="+25"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-122"/>
+        <source>C++ 
+declaration :</source>
+        <translation type="unfinished">Déclaration
+C++ :</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>C++ 
+definition :</source>
+        <translation type="unfinished">Définition
+C++ :</translation>
+    </message>
+    <message>
+        <location line="+129"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+</context>
+<context>
+    <name>FlowCanvas</name>
+    <message>
+        <location filename="../diagram/FlowCanvas.cpp" line="+155"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dessiner toutes les relations&lt;/i&gt; forcé à &lt;i&gt;non&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+90"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Sélectioner les etiquettes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Position par défaut des étiquettes</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach flow label to this segment</source>
+        <translation type="unfinished">Attacher l&apos;étiquette de flux à ce segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attacher le stéréotype à ce segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Géométrie (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <location line="+34"/>
+        <source>write horizontally</source>
+        <translation type="unfinished">écrire horizontalement</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+34"/>
+        <source>Flow Drawing Settings dialog</source>
+        <translation type="unfinished">Editeur d&apos;options de dessin des flux</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>flow already drawn</source>
+        <translation type="unfinished">flux déjà dessiné</translation>
+    </message>
+</context>
+<context>
+    <name>FlowDialog</name>
+    <message>
+        <location filename="../dialog/FlowDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Flow dialog</source>
+        <translation type="unfinished">Editeur de flux</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+97"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>weight : </source>
+        <translation type="unfinished">poids : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>guard : </source>
+        <translation type="unfinished">garde : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>selection : </source>
+        <translation type="unfinished">sélection : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>transformation : </source>
+        <translation type="unfinished">transformation : </translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>FormalParamsTable</name>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="-1690"/>
+        <source>formal param %1</source>
+        <translation type="unfinished">param formel %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insérer un param avant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insérer un param après</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Retirer le param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copier le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Couper le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Coller le param</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Déplacer le param</translation>
+    </message>
+</context>
+<context>
+    <name>FragmentCanvas</name>
+    <message>
+        <location filename="../diagram/FragmentCanvas.cpp" line="+354"/>
+        <source>Fragment</source>
+        <translation type="unfinished">Fragment</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add separator</source>
+        <translation type="unfinished">Ajouter un sépérateur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show referenced diagram</source>
+        <translation type="unfinished">Montrer le diagram référencé</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+25"/>
+        <source>fragment color</source>
+        <translation type="unfinished">couleur de fragment</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>FragmentDialog</name>
+    <message>
+        <location filename="../dialog/FragmentDialog.cpp" line="+55"/>
+        <source>Fragment dialog</source>
+        <translation type="unfinished">Editeur de fragment</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>refer to : </source>
+        <translation type="unfinished">référence : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>arguments 
+/ value : </source>
+        <translation type="unfinished">arguments
+/ valeur : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose diagram selected in browser</source>
+        <translation type="unfinished">Choisir le diagramme séléctionné dans l&apos;explorateur</translation>
+    </message>
+</context>
+<context>
+    <name>GenerationSettingsDialog</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+73"/>
+        <source>Generation settings dialog</source>
+        <translation type="unfinished">Editeur d&apos;options de génération</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Types correspondence, and C++ operation argument default passing for them :</source>
+        <translation type="unfinished">Correspondance des types, forme par défaut pour un paramètre d&apos;opération en C++ en fonction de sa direction :</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Attributes and 
+Relations
+stereotypes 
+correspondence : </source>
+        <translation type="unfinished">Correspondance
+des stéréotypes
+pour les propriétés
+et relations : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Classes&apos;s 
+stereotypes 
+correspondence : </source>
+        <translation type="unfinished">Correspondance
+des stéréotypes
+pour les classes : </translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Header file
+default content :</source>
+        <translation type="unfinished">Contenu par défaut
+d&apos;un fichier d&apos;en tête :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Source file
+default content :</source>
+        <translation type="unfinished">Contenu par défaut
+d&apos;un fichier source :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>generated/reversed 
+header file extension : </source>
+        <translation type="unfinished">extension d&apos;un fichier
+d&apos;en tête généré/reversé : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generated/reversed 
+    source file extension : </source>
+        <translation type="unfinished">    extension d&apos;un fichier
+  source généré/reversé : </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+682"/>
+        <source>without path</source>
+        <translation type="unfinished">sans chemin</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with absolute path</source>
+        <translation type="unfinished">avec chemin absolue</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with relative path</source>
+        <translation type="unfinished">avec chemin relatif</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with root relative path</source>
+        <translation type="unfinished">avec chemin relatif à la racine</translation>
+    </message>
+    <message>
+        <location line="-667"/>
+        <source>force namespace 
+prefix generation : </source>
+        <translation type="unfinished">force la génération du
+namespace en préfixe : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            inline operation force 
+            includes in header : </source>
+        <translation type="unfinished">            une opération &apos;inline&apos; force
+            les inclusions dans l&apos;en tête : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            generate Javadoc 
+            style comment : </source>
+        <translation type="unfinished">            générer les commentaires
+            au format Javadoc : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            visibility indent : </source>
+        <translation type="unfinished">            indentation de la visibilité : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+366"/>
+        <location line="+287"/>
+        <location line="+179"/>
+        <source>Class default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut des classes :</translation>
+    </message>
+    <message>
+        <location line="-821"/>
+        <location line="+1058"/>
+        <source>Struct default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut des structs :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+1058"/>
+        <source>Union default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut des unions :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+355"/>
+        <location line="+287"/>
+        <location line="+181"/>
+        <location line="+235"/>
+        <source>Enum default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut des enums :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+1058"/>
+        <source>Typedef default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut des typedefs :</translation>
+    </message>
+    <message>
+        <location line="-1038"/>
+        <location line="+355"/>
+        <location line="+453"/>
+        <source>Attribute 
+default 
+declaration :</source>
+        <translation type="unfinished">par défaut :</translation>
+    </message>
+    <message>
+        <location line="-805"/>
+        <location line="+29"/>
+        <location line="+25"/>
+        <source>Multiplicity</source>
+        <translation type="unfinished">Multiplicité</translation>
+    </message>
+    <message>
+        <location line="-50"/>
+        <source>unspecified,
+or 1</source>
+        <translation type="unfinished">non spécifié
+ou 1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+38"/>
+        <location line="+21"/>
+        <source>* or a..b</source>
+        <translation type="unfinished">* ou a..b</translation>
+    </message>
+    <message>
+        <location line="-57"/>
+        <location line="+38"/>
+        <location line="+21"/>
+        <source>X (means [X])
+or [...]...[...]</source>
+        <translation type="unfinished">X (signifiant [X])
+ou [...]...[...]</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Association
+and
+aggregation
+default
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut d&apos;une
+association
+et aggrégation
+ :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Association </source>
+        <translation type="unfinished">Association </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>  and aggregation </source>
+        <translation type="unfinished">  et aggrégation </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>unspecified,
+1 or 0..1</source>
+        <translation type="unfinished">non spécifié,
+1 ou 0..1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+810"/>
+        <source>Composition
+default
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut d&apos;une
+composition :</translation>
+    </message>
+    <message>
+        <location line="-804"/>
+        <source>Composition </source>
+        <translation type="unfinished">Composition </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>unspecified
+or 1</source>
+        <translation type="unfinished">non spécifié
+ou 1</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <location line="+338"/>
+        <location line="+234"/>
+        <location line="+214"/>
+        <location line="+359"/>
+        <source>Get operation
+default definition : </source>
+        <translation type="unfinished">Définition par défaut d&apos;une
+opération d&apos;accès (get) : </translation>
+    </message>
+    <message>
+        <location line="-1139"/>
+        <location line="+38"/>
+        <source>Visibility</source>
+        <translation type="unfinished">Visibilité</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+37"/>
+        <location line="+299"/>
+        <source>Modifiers</source>
+        <translation type="unfinished">Modifieurs</translation>
+    </message>
+    <message>
+        <location line="-333"/>
+        <source>const value</source>
+        <translation type="unfinished">valeur constante</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+37"/>
+        <location line="+295"/>
+        <location line="+28"/>
+        <location line="+206"/>
+        <location line="+26"/>
+        <location line="+179"/>
+        <location line="+17"/>
+        <location line="+360"/>
+        <source>  name : </source>
+        <translation type="unfinished">  nom : </translation>
+    </message>
+    <message>
+        <location line="-1136"/>
+        <location line="+31"/>
+        <location line="+295"/>
+        <location line="+28"/>
+        <location line="+206"/>
+        <location line="+26"/>
+        <location line="+179"/>
+        <location line="+17"/>
+        <location line="+341"/>
+        <location line="+19"/>
+        <source>also in uml</source>
+        <translation type="unfinished">aussi en uml</translation>
+    </message>
+    <message>
+        <location line="-1134"/>
+        <location line="+326"/>
+        <location line="+234"/>
+        <location line="+205"/>
+        <location line="+358"/>
+        <source>Set operation
+default definition : </source>
+        <translation type="unfinished">Définition par défaut d&apos;une
+opération d&apos;assignement (set) : </translation>
+    </message>
+    <message>
+        <location line="-1112"/>
+        <source>const param</source>
+        <translation type="unfinished">param constant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>by ref</source>
+        <translation type="unfinished">par référence</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+244"/>
+        <location line="+246"/>
+        <location line="+145"/>
+        <source>Enumeration item 
+default definition :</source>
+        <translation type="unfinished">Définition par défaut
+d&apos;un énuméré :</translation>
+    </message>
+    <message>
+        <location line="-627"/>
+        <source>Default type forms
+for the enums :</source>
+        <translation type="unfinished">Forme par défaut
+du type pour les
+énumérations :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <source>input
+parameter : </source>
+        <translation type="unfinished">paramètre
+d&apos;entrée : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   output
+   parameter : </source>
+        <translation type="unfinished">   paramètre
+  de sortie : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   input output 
+   parameter : </source>
+        <translation type="unfinished">   paramètre d&apos;
+  entrée/sortie : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   operation 
+   return : </source>
+        <translation type="unfinished">   retour d&apos;
+  opération : </translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Default type forms for
+the types not given
+in the first tab:</source>
+        <translation type="unfinished">Formes par défaut des
+types non spécifiés
+dans le premier onglet:</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Operation default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut d&apos;opération :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Operation default 
+definition :</source>
+        <translation type="unfinished">Définition par
+défaut d&apos;opération :</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>External classes : 
+name making
+#include, using</source>
+        <translation type="unfinished">Classe externe :
+fabrication du nom
+#include, using</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>External types :
+#include form(s),
+using, etc...</source>
+        <translation type="unfinished">Types externes :
+forme(s) #include
+using, etc...</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Include etc...</source>
+        <translation type="unfinished">Inclusion etc...</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+267"/>
+        <location line="+220"/>
+        <location line="+223"/>
+        <source>file default 
+content :</source>
+        <translation type="unfinished">contenu par défaut
+d&apos;un fichier :</translation>
+    </message>
+    <message>
+        <location line="-687"/>
+        <source>    generated/reversed file extension </source>
+        <translation type="unfinished">    extension de fichier généré/reversé </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generate Javadoc style comment </source>
+        <translation type="unfinished">    générer les commentaires au style Javadoc </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>    force package prefix generation </source>
+        <translation type="unfinished">    force la génération du package en préfixe </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+287"/>
+        <location line="+399"/>
+        <source>Interface default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut d&apos;interface :</translation>
+    </message>
+    <message>
+        <location line="-676"/>
+        <source>Enum pattern 
+default declaration :</source>
+        <translation type="unfinished">Déclaration par défaut
+du pattern d&apos;un enum :</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+25"/>
+        <location line="+430"/>
+        <location line="+30"/>
+        <location line="+24"/>
+        <location line="+199"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>multiplicity &apos;1&apos;
+or unspecified</source>
+        <translation type="unfinished">multiplicité &apos;1&apos;
+ou non spécifiée</translation>
+    </message>
+    <message>
+        <location line="-850"/>
+        <location line="+25"/>
+        <location line="+683"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>multiplicity &apos;*&apos;
+or &apos;a..b&apos;</source>
+        <translation type="unfinished">multiplicité &apos;*&apos;
+ou &apos;a..b&apos;</translation>
+    </message>
+    <message>
+        <location line="-850"/>
+        <location line="+25"/>
+        <location line="+683"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>X (probably a
+number)</source>
+        <translation type="unfinished"> X (probablement
+un nombre)</translation>
+    </message>
+    <message>
+        <location line="-833"/>
+        <location line="+269"/>
+        <location line="+191"/>
+        <location line="+296"/>
+        <source>Association and
+aggregation
+default
+declaration :</source>
+        <translation type="unfinished">Déclaration
+par défaut
+d&apos;association
+ou aggrégation :</translation>
+    </message>
+    <message>
+        <location line="-713"/>
+        <source>Enum pattern item 
+default definition :</source>
+        <translation type="unfinished">Définition par défaut du
+pattern d&apos;un énuméré :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Enum pattern item 
+&apos;case&apos; in &apos;from_int&apos; :</source>
+        <translation type="unfinished">Pattern du &apos;case&apos; d&apos;un
+énuméré dans &apos;from_int&apos; :</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+26"/>
+        <source>Visibility (shared with Php)</source>
+        <translation type="unfinished">Visibilité (partagée avec Php)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>final parameter</source>
+        <translation type="unfinished">paramètre final</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+232"/>
+        <location line="+196"/>
+        <source>Operation
+default definition :</source>
+        <translation type="unfinished">Définition par
+défaut d&apos;opération :</translation>
+    </message>
+    <message>
+        <location line="-403"/>
+        <location line="+215"/>
+        <source>External classes : 
+name making</source>
+        <translation type="unfinished">Classes externe :
+fabrication du nom</translation>
+    </message>
+    <message>
+        <location line="-207"/>
+        <source>External types :
+import form(s) etc...</source>
+        <translation type="unfinished">Types externes :
+forme(s) import etc...</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>    generated / reversed file extension : </source>
+        <translation type="unfinished">    extension de fichier généré/reversé : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generate Javadoc style comment : </source>
+        <translation type="unfinished">    générer les commentaires au style Javadoc : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>    require_once : </source>
+        <translation type="unfinished">    require_once : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>    force namespace prefix generation : </source>
+        <translation type="unfinished">    force la génération du namespace en préfixe : </translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+427"/>
+        <source>Attribute default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut de propriété :</translation>
+    </message>
+    <message>
+        <location line="-392"/>
+        <location line="+26"/>
+        <source>Visibility (shared with Java)</source>
+        <translation type="unfinished">Visibilité (partagée avec Java)</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>indent step :</source>
+        <translation type="unfinished">le pas d&apos;indentation :</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>    generated /
+    reversed
+    file extension : </source>
+        <translation type="unfinished">    extension de
+  fichier
+  généré/reversé : </translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>    classes of Python 2.2 </source>
+        <translation type="unfinished">    classes de Python 2.2 </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+39"/>
+        <location line="+15"/>
+        <source>other
+multiplicity</source>
+        <translation type="unfinished">autre
+multiplicité</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>    operation of Python 3 (pep-3107) </source>
+        <translation type="unfinished">    opération de Python 3 (pep-3107) </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Operation __init__
+default definition :</source>
+        <translation type="unfinished">Définition par défaut
+de l&apos;opération __init__ :</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>External classes : 
+name making
+import</source>
+        <translation type="unfinished">Classes externes
+fabrication du nom
+import</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>External types :
+import form(s)</source>
+        <translation type="unfinished">Types externes :
+forme(s) import</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>    file extension : </source>
+        <translation type="unfinished">    extension de fichier : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Valuetype default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut de valuetype :</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Exception default 
+declaration :</source>
+        <translation type="unfinished">Déclation par
+défaut d&apos;exception :</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Attribute default 
+declaration in
+valuetype :</source>
+        <translation type="unfinished">Déclaration par défaut
+de propriété dans
+un valuetype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Constant default 
+declaration :</source>
+        <translation type="unfinished">Déclaration par défaut
+d&apos;une constante :</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Association and
+aggregation
+default
+declaration in
+valuetype :</source>
+        <translation type="unfinished">Déclaration par
+défaut d&apos;une
+association et
+aggrégation dans
+un valuetype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Association and
+aggregation
+default
+declaration in
+union:</source>
+        <translation type="unfinished">Déclaration par
+défaut d&apos;une
+association et
+aggrégation dans
+une union:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Union item 
+default 
+declaration :</source>
+        <translation type="unfinished">déclaration par
+défaut d&apos;un
+membre d&apos;union :</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Enumeration item 
+default declaration :</source>
+        <translation type="unfinished">Déclaration par
+défaut d&apos;un
+membre d&apos;enum :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Operation default 
+declaration : </source>
+        <translation type="unfinished">Déclaration par
+défaut d&apos;opération : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>External classes : 
+name making
+#include</source>
+        <translation type="unfinished">Classes externes :
+fabrication du nom
+#include</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>External types :
+#include form(s)
+etc...</source>
+        <translation type="unfinished">Types externes :
+forme(s) #include
+etc...</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Artifact
+default
+description : </source>
+        <translation type="unfinished">Description
+par défaut
+d&apos;un artefact : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Class
+default
+description : </source>
+        <translation type="unfinished">Description
+par défaut
+d&apos;une classe : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Operation
+default
+description : </source>
+        <translation type="unfinished">Description
+par défaut
+d&apos;une opération : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Attribute
+default
+description : </source>
+        <translation type="unfinished">Description
+par défaut
+d&apos;une propriété : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Relation
+default
+description : </source>
+        <translation type="unfinished">Description
+par défaut
+d&apos;une relation : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Defining a project root directory allows to specify                                   packages&apos;s generation directory relative to the root directory rather                                   than absolute.
+A root directory may itself be relative to the project path</source>
+        <translation type="unfinished">Defining a project root directory allows to specify                                   packages&apos;s generation directory relative to the root directory rather                                   than absolute.
+A root directory may itself be relative to the project path</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>C++ root dir : </source>
+        <translation type="unfinished">répertoire racine pour C++ : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <location line="+19"/>
+        <location line="+19"/>
+        <source>Browse</source>
+        <translation type="unfinished">Explorer</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Java root dir : </source>
+        <translation type="unfinished">répertoire racine pour Java : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Php root dir : </source>
+        <translation type="unfinished">répertoire racine pour Php : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Python root dir : </source>
+        <translation type="unfinished">répertoire racine pour Python : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Idl root dir : </source>
+        <translation type="unfinished">répertoire racine pour Idl : </translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+10"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>HelpDialog</name>
+    <message>
+        <location filename="../dialog/HelpDialog.cpp" line="+80"/>
+        <source>DoUML Help</source>
+        <translation type="unfinished">Aide DoUML</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>To set the navigator by setting the environment through the menu Miscellaneous allows to see all the documentation in better conditions</source>
+        <translation type="unfinished">Indiquer un navigateur web via l&apos;éditeur d&apos;environnement permet de voir la documentation dans de meilleures conditions</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>HelpRegexpDialog</name>
+    <message>
+        <location filename="../dialog/RevSettingsDialog.cpp" line="+260"/>
+        <source>Help regular expression</source>
+        <translation type="unfinished">Aide expression régulière</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>HideShowDialog</name>
+    <message>
+        <location filename="../dialog/HideShowDialog.cpp" line="+56"/>
+        <source>Settings dialog</source>
+        <translation type="unfinished">Dialog d&apos;options</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Visible</source>
+        <translation type="unfinished">Visible</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Hidden</source>
+        <translation type="unfinished">Caché</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Show all</source>
+        <translation type="unfinished">Tout montrer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide all</source>
+        <translation type="unfinished">Tout cacher</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide private ones</source>
+        <translation type="unfinished">Cacher les privés</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide private and
+protected ones</source>
+        <translation type="unfinished">Cacher les privés
+et protégés</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Specify visible members rather than hidden ones</source>
+        <translation type="unfinished">Indique les membres visibles et non les cachés</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>IconCanvas</name>
+    <message>
+        <location filename="../diagram/IconCanvas.cpp" line="+141"/>
+        <source>
+short cut</source>
+        <translation type="unfinished">
+raccourci</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open</source>
+        <translation type="unfinished">Ouvrir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select diagram in browser</source>
+        <translation type="unfinished">Sélectionner le diagramme dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ImageDialog</name>
+    <message>
+        <location filename="../dialog/ImageDialog.cpp" line="+57"/>
+        <source>Image dialog</source>
+        <translation type="unfinished">Editeur d&apos;image</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Image path :</source>
+        <translation type="unfinished">Chemin d&apos;image :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set it relative to image root</source>
+        <translation type="unfinished">passer en relatif / racine</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it relative to project</source>
+        <translation type="unfinished">passer en relatif / projet</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it absolute</source>
+        <translation type="unfinished">passer en absolue</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Browse</source>
+        <translation type="unfinished">Explorer</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>IncludeTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+611"/>
+        <source>External type</source>
+        <translation type="unfinished">Type externe</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+</context>
+<context>
+    <name>InfoCanvas</name>
+    <message>
+        <location filename="../diagram/InfoCanvas.cpp" line="+124"/>
+        <source>Information</source>
+        <translation type="unfinished">Information</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Font</source>
+        <translation type="unfinished">Police de caractères</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location line="+61"/>
+        <source>note color</source>
+        <translation type="unfinished">couleur de note</translation>
+    </message>
+</context>
+<context>
+    <name>InstanceDialog</name>
+    <message>
+        <location filename="../dialog/InstanceDialog.cpp" line="+63"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Choose </source>
+        <translation type="unfinished">Choisir </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> selected in browser</source>
+        <translation type="unfinished"> selected in browser</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Create </source>
+        <translation type="unfinished">Create </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> and choose it</source>
+        <translation type="unfinished"> and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>InterruptibleActivityRegionCanvas</name>
+    <message>
+        <location filename="../diagram/InterruptibleActivityRegionCanvas.cpp" line="+259"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit interruptible activity region</source>
+        <translation type="unfinished">Editer la région interruptible d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <location line="+25"/>
+        <source>interruptible activity region color</source>
+        <translation type="unfinished">couleur de région interruptible d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>KeyValuesTable</name>
+    <message>
+        <location filename="../dialog/KeyValueTable.cpp" line="+90"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>MLEDialog</name>
+    <message>
+        <location filename="../dialog/MLEDialog.cpp" line="+57"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>MyInputDialog</name>
+    <message>
+        <location filename="../dialog/MyInputDialog.cpp" line="+77"/>
+        <location line="+75"/>
+        <location line="+56"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="-130"/>
+        <location line="+75"/>
+        <location line="+56"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>NoteCanvas</name>
+    <message>
+        <location filename="../diagram/NoteCanvas.cpp" line="+219"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Color of text</source>
+        <translation type="unfinished">couleur du texte</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Font</source>
+        <translation type="unfinished">Police de caractères</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>color</source>
+        <translation type="unfinished">couleur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Text color dialog</source>
+        <translation type="unfinished">Editeur de couleur du texte</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <location line="+25"/>
+        <source>note color</source>
+        <translation type="unfinished">couleur de note</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectDiagramView</name>
+    <message>
+        <location filename="../diagram/ObjectDiagramView.cpp" line="+71"/>
+        <source>Object diagram menu</source>
+        <translation type="unfinished">Menu de diagramme objet</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ObjectDiagramWindow.cpp" line="+75"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Ajouter un paquetage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Ajouter un fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Ajouter une instance de classe modélisée</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Ajouter une instance de classe</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Link between instances</source>
+        <translation type="unfinished">Ajouter un lien entre instances</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectLinkCanvas</name>
+    <message>
+        <location filename="../diagram/ObjectLinkCanvas.cpp" line="+315"/>
+        <source>Relation already drawn</source>
+        <translation type="unfinished">Relation déjà dessinée</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dessiner toutes les relations&lt;/i&gt; forcé à &lt;i&gt;non&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Object link</source>
+        <translation type="unfinished">Lien d&apos;objet</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select relation in browser</source>
+        <translation type="unfinished">Sélectionner la relation dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Sélectioner les etiquettes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Position par défaut des étiquettes</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s name to this segment</source>
+        <translation type="unfinished">Attacher le nom de la relation à ce segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s stereotype to this segment</source>
+        <translation type="unfinished">Attacher le stéréotype de la relation à ce segment</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Géométrie (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectLinkDialog</name>
+    <message>
+        <location filename="../dialog/ObjectLinkDialog.cpp" line="+55"/>
+        <source>Object link dialog</source>
+        <translation type="unfinished">Editeur de lien d&apos;objet</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>
+To set the association, select a cell or the first column with a single click, then press &apos;OK&apos;
+To unset the association press &apos;Unset&apos; then press &apos;OK&apos;
+</source>
+        <translation type="unfinished">
+Pour positionner l&apos;association sélectionnez en une via une cellule ou la première colonne et pressez &apos;validez&apos;
+Pour retirer l&apos;association pressez &apos;Retirer&apos; puis &apos;Valider&apos;
+</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nouveau</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Unset</source>
+        <translation type="unfinished">&amp;Retirer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>Class Inst.</source>
+        <translation type="unfinished">Instance de classe</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+2"/>
+        <source>Role</source>
+        <translation type="unfinished">Rôle</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>kind</source>
+        <translation type="unfinished">sorte</translation>
+    </message>
+</context>
+<context>
+    <name>OdClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/OdClassInstCanvas.cpp" line="+567"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Sélectionner la classe dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">écrire nom:type
+horizontalement</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">montrer le context de classe</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">montrer les propriétés
+des stéréotypes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">couleur d&apos;instance de classe</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>OpaqueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-662"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Behavior : </source>
+        <translation type="unfinished">Comportement : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+</context>
+<context>
+    <name>OperationData</name>
+    <message>
+        <location filename="../data/OperationData.cpp" line="+3727"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>OperationDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-5368"/>
+        <source>Operation dialog</source>
+        <translation type="unfinished">Editeur d&apos;opération</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>class : </source>
+        <translation type="unfinished">classe : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>value type :</source>
+        <translation type="unfinished">type de valeur :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>static</source>
+        <translation type="unfinished">statique</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>abstract</source>
+        <translation type="unfinished">abstrait</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>force body generation</source>
+        <translation type="unfinished">force la génération des corps</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>parameters : </source>
+        <translation type="unfinished">paramètres : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>exceptions : </source>
+        <translation type="unfinished">exceptions : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+10"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Default</source>
+        <translation type="unfinished">Par défaut</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>constraint :</source>
+        <translation type="unfinished">contrainte :</translation>
+    </message>
+    <message>
+        <location line="+141"/>
+        <location line="+58"/>
+        <source>follow uml</source>
+        <translation type="unfinished">suivre uml</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+137"/>
+        <location line="+130"/>
+        <location line="+134"/>
+        <location line="+340"/>
+        <source>Show body</source>
+        <translation type="unfinished">Montrer le corps</translation>
+    </message>
+    <message>
+        <location line="-741"/>
+        <location line="+137"/>
+        <location line="+130"/>
+        <location line="+134"/>
+        <location line="+340"/>
+        <source>Edit body</source>
+        <translation type="unfinished">Editer le corps</translation>
+    </message>
+    <message>
+        <location line="-697"/>
+        <location line="+132"/>
+        <location line="+129"/>
+        <location line="+133"/>
+        <source>frozen</source>
+        <translation type="unfinished">gelé</translation>
+    </message>
+    <message>
+        <location line="-382"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Name form : </source>
+        <translation type="unfinished">Forme de nom : </translation>
+    </message>
+    <message>
+        <location line="-384"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Definition :</source>
+        <translation type="unfinished">Définition :</translation>
+    </message>
+    <message>
+        <location line="-383"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Résultat après
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-388"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <source>contextual
+body indent</source>
+        <translation type="unfinished">indentation de
+corps contextuelle</translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+129"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Déclaration par défaut</translation>
+    </message>
+    <message>
+        <location line="-381"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Non généré en Java</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Montrer les annotations</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Editer les annotations</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Non généré en Php</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+65"/>
+        <location line="+60"/>
+        <source>Edit parameters</source>
+        <translation type="unfinished">Editer les paramètres</translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <source>Show parameters</source>
+        <translation type="unfinished">Show parameters</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Non généré en Python</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Show decorators</source>
+        <translation type="unfinished">Montrer les décorateurs</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit decorators</source>
+        <translation type="unfinished">Editer les décorateurs</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Non généré en Idl</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choisir la classe sélectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Créer une classe et la choisir</translation>
+    </message>
+    <message>
+        <location line="+424"/>
+        <location line="+621"/>
+        <location line="+1358"/>
+        <location line="+476"/>
+        <source>wrong specification</source>
+        <translation type="unfinished">mauvaise spécification</translation>
+    </message>
+    <message>
+        <location line="-1969"/>
+        <source>[@][{][A-Za-z0-9]+[}]</source>
+        <translation type="unfinished">[@][{][A-Za-z0-9]+[}]</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>,</source>
+        <translation type="unfinished">,</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+1095"/>
+        <source>Warning!</source>
+        <translation type="unfinished">Warning!</translation>
+    </message>
+    <message>
+        <location line="-1095"/>
+        <source>Could not find correct place for these tags: </source>
+        <translation type="unfinished">Could not find correct place for these tags: </translation>
+    </message>
+    <message>
+        <location line="+1096"/>
+        <source>The Operation you are trying to change is
+inhertied from/to other classes.
+Do you want to propagate the changes to it
+ through the inheritance tree?</source>
+        <translation type="unfinished">The Operation you are trying to change is
+inhertied from/to other classes.
+Do you want to propagate the changes to it
+ through the inheritance tree?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Above</source>
+        <translation type="unfinished">Above</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Everywhere</source>
+        <translation type="unfinished">Everywhere</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Do not propagate</source>
+        <translation type="unfinished">Do not propagate</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+    <message>
+        <location line="+4110"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+</context>
+<context>
+    <name>OperationListDialog</name>
+    <message>
+        <location filename="../dialog/OperationListDialog.cpp" line="+74"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>OperationWidgetCpp</name>
+    <message>
+        <location filename="../ui/operationwidgetcpp.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>frozen</source>
+        <translation type="unfinished">gelé</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>default</source>
+        <translation type="unfinished">par défaut</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>delete</source>
+        <translation type="unfinished">delete</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>override</source>
+        <translation type="unfinished">override</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>final</source>
+        <translation type="unfinished">état final</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Name form:</source>
+        <translation type="unfinished">Forme de nom:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Declaration:</source>
+        <translation type="unfinished">Déclaration:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+76"/>
+        <source>Result after substitution:</source>
+        <translation type="unfinished">Result after substitution:</translation>
+    </message>
+    <message>
+        <location line="-50"/>
+        <source>Default Declaration</source>
+        <translation type="unfinished">Default Declaration</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>From Definition</source>
+        <translation type="unfinished">From Definition</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+90"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Non généré en C++</translation>
+    </message>
+    <message>
+        <location line="-83"/>
+        <location line="+90"/>
+        <source>Edit parameters</source>
+        <translation type="unfinished">Editer les paramètres</translation>
+    </message>
+    <message>
+        <location line="-77"/>
+        <source>Definition:</source>
+        <translation type="unfinished">Définition:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>contextual
+body indent :</source>
+        <translation type="unfinished">indentation de
+corps contextuelle :</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>EditBody</source>
+        <translation type="unfinished">EditBody</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Définition par défaut</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>From Declaration</source>
+        <translation type="unfinished">From Declaration</translation>
+    </message>
+</context>
+<context>
+    <name>PackageCanvas</name>
+    <message>
+        <location filename="../diagram/PackageCanvas.cpp" line="+492"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Ajouter les élément reliés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location line="+34"/>
+        <source>package</source>
+        <translation type="unfinished">paquetage</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+32"/>
+        <source>name in tab</source>
+        <translation type="unfinished">nom dans l&apos;onglet</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show context</source>
+        <translation type="unfinished">affficher le contexte</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">montrer les propriétés
+des stéréotypes</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>Package color</source>
+        <translation type="unfinished">Couleur de paquetage</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">en lecture seule</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+9"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>PackageDialog</name>
+    <message>
+        <location filename="../dialog/PackageDialog.cpp" line="+71"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Package dialog</source>
+        <translation type="unfinished">Editeur de paquetage</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>The generation directories may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</source>
+        <translation type="unfinished">Les répertoires de génération peuvent êre relatifs si le répertoire racine
+est spécifié (via l&apos;entrée du menu &apos;editer les options de génération&apos;)
+
+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>headers directory : </source>
+        <translation type="unfinished">répertoire des en-têtes : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+29"/>
+        <location line="+56"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>Browse</source>
+        <translation type="unfinished">Explorer</translation>
+    </message>
+    <message>
+        <location line="-226"/>
+        <source>sources directory : </source>
+        <translation type="unfinished">répertoire des sources : </translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>The generation directory may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</source>
+        <translation type="unfinished">Le répertoire de génération peut êre relatif si le répertoire racine
+est spécifié (via l&apos;entrée du menu &apos;editer les options de génération&apos;)
+
+</translation>
+    </message>
+    <message>
+        <location line="-157"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>directory : </source>
+        <translation type="unfinished">répertoire : </translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>meta model : 
+reference</source>
+        <translation type="unfinished">méta modèle :
+référence</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>meta class : 
+reference</source>
+        <translation type="unfinished">méta classe :
+référence</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <location line="+5"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Question</source>
+        <translation type="unfinished">Question</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterCanvas</name>
+    <message>
+        <location filename="../diagram/ParameterCanvas.cpp" line="+370"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Resize other like it</source>
+        <translation type="unfinished">Redimentionner les autres comme cela</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit parameter</source>
+        <translation type="unfinished">Editer le paramètre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Sélectionner la classe dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+25"/>
+        <source>parameter node color</source>
+        <translation type="unfinished">couleur de noeud de paramètre</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterDialog</name>
+    <message>
+        <location filename="../dialog/ParameterDialog.cpp" line="+68"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Parameter dialog</source>
+        <translation type="unfinished">Editeur de paramètre</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name :</source>
+        <translation type="unfinished">nom :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>direction :</source>
+        <translation type="unfinished">direction :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>   multiplicity : </source>
+        <translation type="unfinished">   multiplicité : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordre : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   effect : </source>
+        <translation type="unfinished">   effet : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>in state : </source>
+        <translation type="unfinished">dans l&apos;état : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>default value :</source>
+        <translation type="unfinished">valeur par défaut :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+43"/>
+        <location line="+92"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-125"/>
+        <source>is_control</source>
+        <translation type="unfinished">est un contrôle</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unique</source>
+        <translation type="unfinished">unique</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>standard</source>
+        <translation type="unfinished">standard</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>exception</source>
+        <translation type="unfinished">exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>stream</source>
+        <translation type="unfinished">flot</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>selection : </source>
+        <translation type="unfinished">sélection : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choisir la classe sélectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Créer une classe et la choisir</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <location line="+29"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>An input parameter cannot be an exception.
+</source>
+        <translation type="unfinished">Un paramètre d&apos;entrée ne peut être une exception.
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only in and inout parameter may have a delete effect.</source>
+        <translation type="unfinished">Seul un paramètre de sortie ou d&apos;entrée-sortie peut voir un effet de destruction.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only out, inout and return parameter may have a create effect.</source>
+        <translation type="unfinished">Seul un paramètre de sortie ou d&apos;entrée-sortie ou de retour peut voir un effet de création.</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterSetCanvas</name>
+    <message>
+        <location filename="../diagram/ParameterSetCanvas.cpp" line="+322"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit parameter set</source>
+        <translation type="unfinished">Editer l&apos;ensemble de paramètre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <location line="+25"/>
+        <source>parameter set color</source>
+        <translation type="unfinished">couleur d&apos;ensemble de paramètre</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterSetDialog</name>
+    <message>
+        <location filename="../dialog/ParameterSetDialog.cpp" line="+64"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>ParameterSet dialog</source>
+        <translation type="unfinished">Editeur d&apos;ensemble de paramètre</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Parameters out of Parameter Set</source>
+        <translation type="unfinished">Paramètres en dehors de l&apos;ensemble</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Parameters in Parameter Set</source>
+        <translation type="unfinished">Paramètres dans l&apos;ensemble</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Parameters</source>
+        <translation type="unfinished">Paramètres</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>ParamsTable</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-2686"/>
+        <source>Direction</source>
+        <translation type="unfinished">Direction</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default value</source>
+        <translation type="unfinished">Valeur par défaut</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+60"/>
+        <location line="+40"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>param %1</source>
+        <translation type="unfinished">param %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insérer un param avant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insérer un param après</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Retirer le param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copier le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Couper le param</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Coller le param</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Move param</source>
+        <translation type="unfinished">Déplacer le param</translation>
+    </message>
+</context>
+<context>
+    <name>PhpParamsDialog</name>
+    <message>
+        <location line="+1778"/>
+        <source>Php parameters dialog</source>
+        <translation type="unfinished">Editeur des paramètres Php</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>PhpParamsTable</name>
+    <message>
+        <location line="-515"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ref.</source>
+        <translation type="unfinished">Ref.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>array</source>
+        <translation type="unfinished">tableau</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>param %1</source>
+        <translation type="unfinished">param %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insérer un param avant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insérer un param après</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Retirer le param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copier le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Couper le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Coller le param</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Déplacer le param</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Changer le rang</translation>
+    </message>
+</context>
+<context>
+    <name>PinCanvas</name>
+    <message>
+        <location filename="../diagram/PinCanvas.cpp" line="+390"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit pin</source>
+        <translation type="unfinished">Editer la broche</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Sélectionner la classe dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <location line="+25"/>
+        <source>pin color</source>
+        <translation type="unfinished">couleur de broche</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>PinDialog</name>
+    <message>
+        <location filename="../dialog/PinDialog.cpp" line="+66"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Pin dialog</source>
+        <translation type="unfinished">Editeur de broche</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name :</source>
+        <translation type="unfinished">nom :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>direction :</source>
+        <translation type="unfinished">direction :</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>   multiplicity : </source>
+        <translation type="unfinished">   multiplicité : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordre : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   effect : </source>
+        <translation type="unfinished">   effet : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>in state : </source>
+        <translation type="unfinished">dans l&apos;état : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>is_control</source>
+        <translation type="unfinished">est un contrôle</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unique</source>
+        <translation type="unfinished">unique</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>standard</source>
+        <translation type="unfinished">standard</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>exception</source>
+        <translation type="unfinished">exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>stream</source>
+        <translation type="unfinished">flot</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+91"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>selection : </source>
+        <translation type="unfinished">sélection : </translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choisir la classe sélectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Créer une classe et la choisir</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <location line="+29"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>An input pin cannot be an exception.
+</source>
+        <translation type="unfinished">Une broche d&apos;entrée ne peut être une exception.
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only in and inout pin may have a delete effect.</source>
+        <translation type="unfinished">Seul une broche de sortie ou d&apos;entrée-sortie peut voir un effet de destruction.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only out, inout and return pin may have a create effect.</source>
+        <translation type="unfinished">Seul une broche de sortie ou d&apos;entrée-sortie ou de retour peut voir un effet de création.</translation>
+    </message>
+</context>
+<context>
+    <name>PseudoStateCanvas</name>
+    <message>
+        <location filename="../diagram/PseudoStateCanvas.cpp" line="+611"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">dessiner verticalement</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">dessiner horizontalement</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit pseudo state</source>
+        <translation type="unfinished">Editer le pseudo état</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <location line="+24"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>PseudoStateDialog</name>
+    <message>
+        <location filename="../dialog/PseudoStateDialog.cpp" line="+78"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>reference :</source>
+        <translation type="unfinished">référence :</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Choose pseudo state selected in browser</source>
+        <translation type="unfinished">Choisir le pseudo état sélectionné dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>PythonParamsDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="+768"/>
+        <source>Python parameters dialog</source>
+        <translation type="unfinished">Editeur des paramètres Python</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>PythonParamsTable</name>
+    <message>
+        <location line="-473"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modifier</source>
+        <translation type="unfinished">Modifieur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="+184"/>
+        <source>param %1</source>
+        <translation type="unfinished">param %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insérer un param avant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insérer un param après</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Retirer le param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copier le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Couper le param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Coller le param</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Déplacer le param</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Changer le rang</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../CustomWidgets/quickedit.cpp" line="+128"/>
+        <source>Quick Edit</source>
+        <translation type="unfinished">Quick Edit</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivity.cpp" line="+192"/>
+        <location line="+31"/>
+        <location line="+182"/>
+        <source>enter activity&apos;s name : </source>
+        <translation type="unfinished">nom de l&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>enter parameter&apos;s name : </source>
+        <translation type="unfinished">nom du paramètre : </translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <source>the activity</source>
+        <translation type="unfinished">l&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+212"/>
+        <location filename="../misc/Settings.cpp" line="+1915"/>
+        <location line="+79"/>
+        <source>activity</source>
+        <translation type="unfinished">activité</translation>
+    </message>
+    <message>
+        <location line="+249"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+260"/>
+        <location line="+9"/>
+        <location line="+17"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+288"/>
+        <location line="+26"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+197"/>
+        <location line="+9"/>
+        <location line="+17"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+182"/>
+        <location line="+9"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1777"/>
+        <location line="+18"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+166"/>
+        <location line="+9"/>
+        <location filename="../browser/BrowserPin.cpp" line="+237"/>
+        <location line="+9"/>
+        <location filename="../diagram/ArrowPointCanvas.cpp" line="+231"/>
+        <location line="+5"/>
+        <location filename="../diagram/CodObjCanvas.cpp" line="+96"/>
+        <location line="+11"/>
+        <location line="+3"/>
+        <location filename="../diagram/DiagramView.cpp" line="-1620"/>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="+170"/>
+        <location line="+5"/>
+        <location filename="../diagram/HubCanvas.cpp" line="+140"/>
+        <location line="+12"/>
+        <location line="+3"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="+266"/>
+        <location line="+5"/>
+        <location filename="../diagram/LabelCanvas.cpp" line="+347"/>
+        <location line="+5"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+201"/>
+        <location line="+8"/>
+        <location line="+3"/>
+        <location filename="../diagram/SdLostFoundMsgSupportCanvas.cpp" line="+145"/>
+        <location line="+7"/>
+        <location filename="../diagram/SdObjCanvas.cpp" line="+84"/>
+        <location line="+5"/>
+        <location filename="../diagram/TemplateCanvas.cpp" line="+195"/>
+        <location line="+5"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+308"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+741"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+307"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+444"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+596"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+881"/>
+        <location filename="../browser/BrowserClass.cpp" line="+2267"/>
+        <location line="+56"/>
+        <location line="+716"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1072"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+564"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+569"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+325"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+774"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+741"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+679"/>
+        <location filename="../browser/BrowserNode.cpp" line="+677"/>
+        <location line="+647"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-447"/>
+        <location line="+81"/>
+        <location line="+14"/>
+        <location line="+762"/>
+        <location line="+244"/>
+        <location line="+166"/>
+        <location line="+238"/>
+        <location line="+35"/>
+        <location line="+268"/>
+        <location line="+15"/>
+        <location line="+17"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+275"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+698"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+522"/>
+        <location filename="../browser/BrowserState.cpp" line="+924"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+489"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1080"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+946"/>
+        <location filename="../main.cpp" line="+211"/>
+        <location filename="../misc/Images.cpp" line="+64"/>
+        <location filename="../misc/myio.cpp" line="+875"/>
+        <location line="+19"/>
+        <location line="+22"/>
+        <location line="+70"/>
+        <location line="+16"/>
+        <location line="+19"/>
+        <location line="+16"/>
+        <location line="+31"/>
+        <location line="+28"/>
+        <location line="+28"/>
+        <location line="+103"/>
+        <location line="+49"/>
+        <location line="+91"/>
+        <location line="+40"/>
+        <location line="+32"/>
+        <location line="+25"/>
+        <location line="+178"/>
+        <location line="+30"/>
+        <location line="+63"/>
+        <location line="+67"/>
+        <location line="+7"/>
+        <location line="+202"/>
+        <location line="+6"/>
+        <location line="+12"/>
+        <location line="+20"/>
+        <location line="+26"/>
+        <location line="+6"/>
+        <location line="+26"/>
+        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+6"/>
+        <location line="+13"/>
+        <location line="+17"/>
+        <location line="+6"/>
+        <location line="+29"/>
+        <location line="+42"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+0"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+0"/>
+        <location filename="../browser/BrowserClass.cpp" line="-772"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+0"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+0"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+0"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+0"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+0"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserNode.cpp" line="-695"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-983"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+0"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+0"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserState.cpp" line="+0"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+0"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+0"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+0"/>
+        <source>Forbidden</source>
+        <translation type="unfinished">Interdit</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityAction.cpp" line="-768"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="-374"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="-471"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="-6"/>
+        <location filename="../browser/BrowserParameter.cpp" line="-281"/>
+        <location filename="../browser/BrowserPin.cpp" line="-6"/>
+        <source>not in the same activity</source>
+        <translation type="unfinished">pas dans la même activité</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <location line="+27"/>
+        <location line="+22"/>
+        <location line="+22"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+123"/>
+        <source>enter activity action&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">nom d&apos;action d&apos;activité
+(peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="-89"/>
+        <source>New pin</source>
+        <translation type="unfinished">Nouvelle broche</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;broche&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New parameter set</source>
+        <translation type="unfinished">Nouvel ensemble de paramètres</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;Parameter Set&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;ensemble de paramètres&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+238"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+108"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+102"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="-370"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="-546"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+287"/>
+        <location filename="../browser/BrowserClass.cpp" line="-1612"/>
+        <location line="+41"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+284"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-821"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+225"/>
+        <location filename="../browser/BrowserComponent.cpp" line="-268"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+228"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-370"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+231"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="-159"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-564"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+30"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-512"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+150"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+216"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-448"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+226"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+648"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+32"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+160"/>
+        <location filename="../browser/BrowserPin.cpp" line="+33"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-278"/>
+        <location filename="../browser/BrowserRegion.cpp" line="-349"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+508"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+236"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+246"/>
+        <location filename="../browser/BrowserState.cpp" line="-574"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="-268"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+228"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+220"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-832"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+239"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="-82"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+130"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-143"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt; %1 &lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt; %1 &lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+20"/>
+        <location filename="../browser/BrowserClass.cpp" line="-38"/>
+        <location line="+41"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+3"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+26"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+6"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+6"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+7"/>
+        <source>Duplicate</source>
+        <translation type="unfinished">Dupliquer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+1"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+1"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+1"/>
+        <source>to copy the &lt;i&gt;%1&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;%1&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select  %1</source>
+        <translation type="unfinished">Select  %1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+4"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+6"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+10"/>
+        <location filename="../browser/BrowserClass.cpp" line="-38"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+5"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+12"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+6"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+12"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+6"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+12"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+3"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+32"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+3"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+3"/>
+        <location filename="../browser/BrowserPin.cpp" line="+5"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+4"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+6"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+24"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+5"/>
+        <location filename="../browser/BrowserState.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+10"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+5"/>
+        <source>Delete</source>
+        <translation type="unfinished">Détruire</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+90"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="-5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+84"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+7"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+7"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+15"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="-22"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+5"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+8"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+15"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+8"/>
+        <source>Referenced by</source>
+        <translation type="unfinished">Référencé par</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt;                                          through a flow or dependency</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt;                                          through a flow or dependency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+3"/>
+        <location filename="../browser/BrowserState.cpp" line="+3"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+3"/>
+        <source>the %1</source>
+        <translation type="unfinished">the %1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+6"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+9"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+8"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+9"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+18"/>
+        <location filename="../browser/BrowserClass.cpp" line="+57"/>
+        <location filename="../browser/BrowserClassDiagram.cpp" line="+248"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+9"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+54"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+9"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+13"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+9"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+66"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+9"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+8"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+12"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+8"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+8"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+34"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1461"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+9"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+8"/>
+        <location filename="../browser/BrowserPin.cpp" line="+8"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+9"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+25"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+12"/>
+        <location filename="../browser/BrowserState.cpp" line="+6"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+6"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+8"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+9"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-705"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="+104"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+5"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+8"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+5"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+5"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+4"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+7"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+7"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+16"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+4"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+5"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+5"/>
+        <source>Undelete</source>
+        <translation type="unfinished">Restaurer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+1"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+1"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+1"/>
+        <source>to undelete the &lt;i&gt;%1&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;%1&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+7"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+7"/>
+        <location filename="../browser/BrowserClass.cpp" line="+10"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+3"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+3"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+3"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserState.cpp" line="+6"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+3"/>
+        <source>Undelete recursively</source>
+        <translation type="unfinished">Restaurer récursivement</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to undelete the &lt;i&gt;%1&lt;/i&gt; and its &lt;i&gt;pins&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt; (except if the element at the other side is also deleted)</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;%1&lt;/i&gt; and its &lt;i&gt;pins&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt; (except if the element at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="-121"/>
+        <location line="+147"/>
+        <source>enter activity diagram&apos;s name : </source>
+        <translation type="unfinished">nom de diagramme d&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-33"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-34"/>
+        <source>Show</source>
+        <translation type="unfinished">Montrer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to show and edit the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">montrer et modifier le &lt;i&gt;diagramme d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">éditer le &lt;i&gt;diagramme d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-67"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-25"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-79"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-30"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+8"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to set how the &lt;i&gt;activity diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme d&apos;activité&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer le &lt;i&gt;diagramme d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity diagram&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire le &lt;i&gt;diagramme d&apos;activité&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the activity diagram</source>
+        <translation type="unfinished">le diagramme d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;diagramme d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Activity diagram</source>
+        <translation type="unfinished">Diagramme d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+174"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+503"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+132"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+125"/>
+        <source>activity color</source>
+        <translation type="unfinished">couleur d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity region color</source>
+        <translation type="unfinished">couleur de région d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity partition color</source>
+        <translation type="unfinished">couleur de partition d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity action color</source>
+        <translation type="unfinished">couleur d&apos;action d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>parameter and pin color</source>
+        <translation type="unfinished">couleur de paramètre et broche</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-11"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+139"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+137"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+70"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+137"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+139"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+139"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-16"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+138"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+138"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-13"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+140"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-14"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+43"/>
+        <location line="+62"/>
+        <source>note color</source>
+        <translation type="unfinished">couleur de note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+2"/>
+        <source>package color</source>
+        <translation type="unfinished">couleur de packetage</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>fragment color</source>
+        <translation type="unfinished">couleur de fragment</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>activity diagram</source>
+        <translation type="unfinished">diagramme d&apos;activité</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityNode.cpp" line="-165"/>
+        <location filename="../browser/BrowserParameter.cpp" line="-72"/>
+        <location filename="../browser/BrowserPin.cpp" line="-77"/>
+        <source>can&apos;t have outgoing flow</source>
+        <translation type="unfinished">ne peux avoir de flux sortant</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>can&apos;t have several outgoing flows</source>
+        <translation type="unfinished">ne peut avoir plusieurs flux de sortie</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>initial node can&apos;t have incoming flow</source>
+        <translation type="unfinished">le noeud initial ne peut avoir de flux d&apos;entrée</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+40"/>
+        <source>fork can&apos;t have several incoming flow</source>
+        <translation type="unfinished">une bifurcation ne peut avoir plusieurs flux d&apos;entrée</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+26"/>
+        <source>an input parameter can&apos;t have incoming flows</source>
+        <translation type="unfinished">un paramètre d&apos;entrée ne peut avoir de flux d&apos;entrée</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+3"/>
+        <source>parameter can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">le paramètre ne peut recevoir de flux de contrôle (non &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">ne peut avoir de flux d&apos;entrée de contrôle (non &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>pin can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">la broche ne peut avoir de flux d&apos;entrée de contrôle (non &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>can&apos;t have incoming data flow</source>
+        <translation type="unfinished">ne peut avoir de flux d&apos;entrée de donnée</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-29"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="-29"/>
+        <source>to edit the &lt;i&gt;%1&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;%1&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+10"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+10"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt; through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt; through a flow</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityObject.cpp" line="-94"/>
+        <location line="+33"/>
+        <location line="+84"/>
+        <source>enter activity object&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">nom d&apos;objet d&apos;activité 
+(peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>to edit the &lt;i&gt;activity object&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity object&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;activity object&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier l&apos;&lt;i&gt;objet d&apos;activité&lt;/i&gt; dans uu nouveau</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity object&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity object&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;activity object&lt;/i&gt;                                                                           through a flow or dependency</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;activity object&lt;/i&gt;                                                                           through a flow or dependency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the activity object</source>
+        <translation type="unfinished">l&apos;objet d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity object&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer l&apos;&lt;i&gt;objet d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the &lt;i&gt;activity object&lt;/i&gt; and its &lt;i&gt;expansion nodes&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt;(except if the element at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;activity object&lt;/i&gt; and its &lt;i&gt;expansion nodes&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt;(except if the element at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>activity object</source>
+        <translation type="unfinished">objet d&apos;activité</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="-101"/>
+        <location line="+34"/>
+        <location line="+97"/>
+        <source>enter activity partition&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">nom de la partition d&apos;
+activité (peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="-70"/>
+        <source>New sub activity partition</source>
+        <translation type="unfinished">Nouvelle sous &lt;i&gt;partition d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a sub &lt;i&gt;activity partition&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une sous &lt;i&gt;partition d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;activity partition&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity partition&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;activity partition&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier la &lt;i&gt;partition d&apos;activité&lt;/i&gt; dans une nouvelle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity partition&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity partition&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;partition&lt;/i&gt;</source>
+        <translation type="unfinished">savoir qui référence la &lt;i&gt;partition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the activity partition</source>
+        <translation type="unfinished">la partition d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity partition&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;partition d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the activity partition and its children</source>
+        <translation type="unfinished">restaurer la partition d&apos;activité et ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>activity partition</source>
+        <translation type="unfinished">partition d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+174"/>
+        <location filename="../browser/BrowserClass.cpp" line="+1422"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+196"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+453"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+389"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+911"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+297"/>
+        <location filename="../browser/BrowserState.cpp" line="+512"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+661"/>
+        <source>move </source>
+        <translation type="unfinished">déplacer </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserClass.cpp" line="+2"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+2"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+2"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+4"/>
+        <location filename="../browser/BrowserState.cpp" line="+2"/>
+        <source>In </source>
+        <translation type="unfinished">Dans </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClass.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+1"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+2"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <source>After </source>
+        <translation type="unfinished">Après </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserArtifact.cpp" line="-136"/>
+        <location filename="../browser/BrowserComponent.cpp" line="-331"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1623"/>
+        <source>already exist</source>
+        <translation type="unfinished">existe déjà</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+3"/>
+        <source>circular inheritance</source>
+        <translation type="unfinished">héritage circulaire</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>to edit the &lt;i&gt;artifact&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;artifact&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;artifact&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;artifact&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location filename="../browser/BrowserClass.cpp" line="-1484"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-145"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-118"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+138"/>
+        <source>Generate</source>
+        <translation type="unfinished">Générer</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+31"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+49"/>
+        <source>Roundtrip body</source>
+        <translation type="unfinished">Roundtrip des corps</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>C++ header file</source>
+        <translation type="unfinished">Fichier d&apos;en-tête C++</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ source file</source>
+        <translation type="unfinished">Fichier source C++</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Java source file</source>
+        <translation type="unfinished">Fichier source Java</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Php source file</source>
+        <translation type="unfinished">Fichier source Php</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Python source file</source>
+        <translation type="unfinished">Fichier source Python</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Idl source file</source>
+        <translation type="unfinished">Fichier source Idl</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+30"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+27"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-5"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-10"/>
+        <source>Roundtrip</source>
+        <translation type="unfinished">Roundtrip</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>See file</source>
+        <translation type="unfinished">Voir le fichier</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;artifact&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;artifact&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the artifact</source>
+        <translation type="unfinished">l&apos;artefact</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;artifact&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer l&apos;&lt;i&gt;artefact&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select the associated class</source>
+        <translation type="unfinished">Selectionne la classe associée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">selectionne la &lt;i&gt;classe&lt;/i&gt; associée</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+12"/>
+        <source>Select an associated class</source>
+        <translation type="unfinished">Selectionne une classe associée</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+12"/>
+        <source>to select an associated &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">selectionne une &lt;i&gt;classe&lt;/i&gt; associée</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+156"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+38"/>
+        <location line="+19"/>
+        <source>Choose class</source>
+        <translation type="unfinished">Choisir la classe</translation>
+    </message>
+    <message>
+        <location line="+188"/>
+        <source>artifact</source>
+        <translation type="unfinished">artefact</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>choose existing artifact</source>
+        <translation type="unfinished">choisir une classe existante</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+17"/>
+        <source>enter artifact&apos;s name : </source>
+        <translation type="unfinished">nom d&apos;artefact : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserAttribute.cpp" line="-51"/>
+        <location filename="../browser/BrowserOperation.cpp" line="-89"/>
+        <source>Up</source>
+        <translation type="unfinished">Up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+1"/>
+        <source>to return to parent node</source>
+        <translation type="unfinished">to return to parent node</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;item&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;item&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to edit the &lt;i&gt;attribute&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;attribute&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-44"/>
+        <source>New get operation</source>
+        <translation type="unfinished">Nouvelle opération d&apos;accès (get)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;get operation&lt;/i&gt;</source>
+        <translation type="unfinished">auto définir l&apos;&lt;i&gt;opération d&apos;accès (get)&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+3"/>
+        <source>New set operation</source>
+        <translation type="unfinished">Nouvelle opération d&apos;assignement (set)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;set operation&lt;/i&gt;</source>
+        <translation type="unfinished">auto définir l&apos;&lt;i&gt;opération d&apos;assignement (set)&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+3"/>
+        <source>New get and set operation</source>
+        <translation type="unfinished">Nouvelles opérations d&apos;accès (get) et d&apos;assignement (set)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;get&lt;/i&gt; and &lt;i&gt;set operation&lt;/i&gt;s</source>
+        <translation type="unfinished">auto définir les &lt;i&gt;opérations d&apos;accès (get) et d&apos;assignement (set)&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to copy the &lt;i&gt;attribute&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier la &lt;i&gt;propriété&lt;/i&gt; dans une nouvelle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">savoir qui référence la &lt;i&gt;classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;item&lt;/i&gt;.                                        Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;item&lt;/i&gt;.                                        Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to delete the &lt;i&gt;attribute&lt;/i&gt;.                                             Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;attribute&lt;/i&gt;.                                             Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>the attribute</source>
+        <translation type="unfinished">la propriété</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;item&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer l&apos;&lt;i&gt;élément&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to undelete the &lt;i&gt;attribute&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;propriété&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+154"/>
+        <source>attribute</source>
+        <translation type="unfinished">propriété</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClass.cpp" line="-240"/>
+        <source>Implement whole </source>
+        <translation type="unfinished">Implement whole </translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Add item</source>
+        <translation type="unfinished">Ajouter un énuméré</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;item&lt;/i&gt; to the &lt;i&gt;enum&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;énuméré&lt;/i&gt; à une &lt;i&gt;énumération&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add attribute</source>
+        <translation type="unfinished">Ajouter une propriété</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;attribute&lt;/i&gt; to the </source>
+        <translation type="unfinished">ajouter une &lt;i&gt;propriété&lt;/i&gt; à </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add operation</source>
+        <translation type="unfinished">Ajouter une opération</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;operation&lt;/i&gt; to the </source>
+        <translation type="unfinished">ajouter une &lt;i&gt;opération&lt;/i&gt; à </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+27"/>
+        <source>Add inherited operation</source>
+        <translation type="unfinished">Ajouter une opération héritée</translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+27"/>
+        <source>to redefine an inherited &lt;i&gt;operation&lt;/i&gt; in the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">redéfinir une &lt;i&gt;opération&lt;/i&gt; héritée dans la &lt;i&gt;classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>Choose operation to add it</source>
+        <translation type="unfinished">Choisir l&apos;opération à ajouter</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Add nested class</source>
+        <translation type="unfinished">Ajouter une classe imbriquée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;nested class&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;classe imbriquée&lt;/i&gt; à la &lt;i&gt;classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Add extra member</source>
+        <translation type="unfinished">Ajouter un membre externe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;extra member&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;membre externe&lt;/i&gt; à la &lt;i&gt;classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+41"/>
+        <source>to edit the </source>
+        <translation type="unfinished">to edit the </translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+41"/>
+        <source>to duplicate the </source>
+        <translation type="unfinished">to duplicate the </translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <source>to delete the </source>
+        <translation type="unfinished">to delete the </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Create source artifact</source>
+        <translation type="unfinished">Créer un artefact source</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt; in the &lt;i&gt;deployment view&lt;/i&gt; associated to the &lt;i&gt;class view&lt;/i&gt;, this artifact will contain the generated code of the class</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;artefact &amp;lt;&amp;lt;source&amp;gt;&amp;gt;&lt;/i&gt; dans la &lt;i&gt;vue de déployment&lt;/i&gt; associée à la &lt;i&gt;vue de classe&lt;/i&gt;, cet artefact contiendra le code généré pour la classe</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Select associated artifact</source>
+        <translation type="unfinished">Selectionner l&apos;artefact associé</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt;</source>
+        <translation type="unfinished">selectionner l&apos;&lt;i&gt;artefact &amp;lt;&amp;lt;source&amp;gt;&amp;gt;&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select associated component</source>
+        <translation type="unfinished">Selectionner le composant associé</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">selectionner le &lt;i&gt;composant&lt;/i&gt; fournissant la &lt;i&gt;classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Choose component</source>
+        <translation type="unfinished">Choisir le composant</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select an associated component</source>
+        <translation type="unfinished">Selectionner un composant associé</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select a &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">selectionner un &lt;i&gt;composant&lt;/i&gt; fournissant la &lt;i&gt;classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>to know who reference the </source>
+        <translation type="unfinished">to know who reference the </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the class</source>
+        <translation type="unfinished">la classe</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+10"/>
+        <source>undelete the </source>
+        <translation type="unfinished">undelete the </translation>
+    </message>
+    <message>
+        <location line="+265"/>
+        <location line="+1199"/>
+        <location line="+30"/>
+        <source>enter class&apos;s name : </source>
+        <translation type="unfinished">nom de classe : </translation>
+    </message>
+    <message>
+        <location line="-1199"/>
+        <source>Choose inherited operation</source>
+        <translation type="unfinished">Choisir l&apos;opération héritée</translation>
+    </message>
+    <message>
+        <location line="+238"/>
+        <source>enter item&apos;s name : </source>
+        <translation type="unfinished">nom de l&apos;énuméré : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>enter attribute&apos;s name : </source>
+        <translation type="unfinished">nom de la propriété : </translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>enter operation&apos;s name : </source>
+        <translation type="unfinished">nom de l&apos;opération : </translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location line="+11"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <source>read only</source>
+        <translation type="unfinished">en lecture seule</translation>
+    </message>
+    <message>
+        <location line="-47"/>
+        <source>typedef can&apos;t generalize / realize several times</source>
+        <translation type="unfinished">un typedef ne peut généraliser/réaliser plusieurs fois</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>a typedef can&apos;t have relation</source>
+        <translation type="unfinished">un typedef ne peut avoir de relation</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+858"/>
+        <source>an union can&apos;t generalize / realize</source>
+        <translation type="unfinished">une union ne peut généraliser/réaliser</translation>
+    </message>
+    <message>
+        <location line="-828"/>
+        <source>can&apos;t have anchor between classes</source>
+        <translation type="unfinished">ne peut pas avoir d&apos;ancre entre classes</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <location filename="../misc/Settings.cpp" line="-1463"/>
+        <source>class</source>
+        <translation type="unfinished">classe</translation>
+    </message>
+    <message>
+        <location line="+697"/>
+        <source>enter stereotype&apos;s name : </source>
+        <translation type="unfinished">nom du stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>one of the two classes is not a stereotype</source>
+        <translation type="unfinished">une des deux classe n&apos;est pas un stéréotype</translation>
+    </message>
+    <message>
+        <location line="+653"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1905"/>
+        <location filename="../misc/myio.cpp" line="-734"/>
+        <source>Error while writting in
+%1
+may be your disk is full</source>
+        <translation type="unfinished">Erreur d&apos;écriture dans
+%1
+votre disque est peut être plein</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassDiagram.cpp" line="-6"/>
+        <source>the class diagram</source>
+        <translation type="unfinished">le diagramme de classe</translation>
+    </message>
+    <message>
+        <location line="+167"/>
+        <source>class diagram</source>
+        <translation type="unfinished">diagramme de classe</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassInstance.cpp" line="-28"/>
+        <source>to edit the &lt;i&gt;class instance&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;class instance&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer l&apos;&lt;i&gt;instance de classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;class instance&lt;/i&gt;.                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;class instance&lt;/i&gt;.                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;class instance&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;class instance&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the class instance</source>
+        <translation type="unfinished">l&apos;instance de classe</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer l&apos;&lt;i&gt;Instance de classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <source>class instance</source>
+        <translation type="unfinished">instance de classe</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+50"/>
+        <source>enter class instance&apos;s name (may be empty) : </source>
+        <translation type="unfinished">nom de l&apos;instance de classe (peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>choose existing instance : </source>
+        <translation type="unfinished">choisir une instance existante : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassView.cpp" line="-167"/>
+        <source>enter class view&apos;s name : </source>
+        <translation type="unfinished">nom de vue de classe : </translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>New stereotype</source>
+        <translation type="unfinished">Nouveau stéréotype</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;stereotype&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;stéréotypé&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-813"/>
+        <source>New class diagram</source>
+        <translation type="unfinished">Nouveau diagramme de classe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class diagram&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;diagramme de classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-5"/>
+        <source>New sequence diagram</source>
+        <translation type="unfinished">Nouveau diagramme de séquence</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;diagramme de séquence&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New communication diagram</source>
+        <translation type="unfinished">Nouveau diagramme de communication</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;diagramme de communication&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+3"/>
+        <source>New object diagram</source>
+        <translation type="unfinished">Nouveau diagramme d&apos;objet</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;diagramme d&apos;objet&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+6"/>
+        <source>New class</source>
+        <translation type="unfinished">Nouvelle classe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New class instance</source>
+        <translation type="unfinished">Nouvelle instance de classe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;instance de classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New state machine</source>
+        <translation type="unfinished">Nouvelle machine à état</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;state machine&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;machine à état&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New activity</source>
+        <translation type="unfinished">Nouvelle activité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;class view&lt;/i&gt;</source>
+        <translation type="unfinished">éditer une &lt;i&gt;vue de classe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit class settings</source>
+        <translation type="unfinished">Editer les options des classes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to set the sub classes&apos;s settings</source>
+        <translation type="unfinished">définir les options des sous classes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to set how the sub &lt;i&gt;class diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme de classe&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;class view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">détruire le &lt;i&gt;vue de classe&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the class view</source>
+        <translation type="unfinished">la vue de classe</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>undelete the &lt;i&gt;class view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">restaure la &lt;i&gt;vue de classe&lt;/i&gt;. Ne restaure pas ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;class view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">restaure la &lt;i&gt;vue de classe&lt;/i&gt; et ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select associated deployment view</source>
+        <translation type="unfinished">Selectionne la vue de déployment associée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;deployment view&lt;/i&gt;</source>
+        <translation type="unfinished">selectionne la &lt;i&gt;vue de déployment&lt;/i&gt; associée</translation>
+    </message>
+    <message>
+        <location line="+92"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1382"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+147"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+4"/>
+        <source>class color</source>
+        <translation type="unfinished">couleur de classe</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+6"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-9"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-2"/>
+        <source>duration color</source>
+        <translation type="unfinished">couleur de barre de durée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>continuation color</source>
+        <translation type="unfinished">couleur de continuation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-4"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+2"/>
+        <source>state color</source>
+        <translation type="unfinished">couleur d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>state action color</source>
+        <translation type="unfinished">couleur d&apos;action d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+252"/>
+        <source>class view</source>
+        <translation type="unfinished">vue de classe</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-234"/>
+        <location line="+148"/>
+        <source>enter communication diagram&apos;s name : </source>
+        <translation type="unfinished">nom du diagramme de communication : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">voir et modifier le &lt;i&gt;diagramme de communication&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">éditer le &lt;i&gt;diagramme de communication&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;communication diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment le &lt;i&gt;diagramme de communication&lt;/i&gt; doit être dessiné</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer le &lt;i&gt;diagramme de communication&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;communication diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;communication diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the communication diagram</source>
+        <translation type="unfinished">le diagramme de communication</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer de &lt;i&gt;diagramme de communication&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Communication diagram</source>
+        <translation type="unfinished">Diagramme de communication</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-2"/>
+        <source>class instance 
+color</source>
+        <translation type="unfinished">couleur d&apos;instance
+de classe</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>communication diagram</source>
+        <translation type="unfinished">diagramme de communication</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponent.cpp" line="-37"/>
+        <source>Select the %1 class</source>
+        <translation type="unfinished">Select the %1 class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the %1 &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select the %1 &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+16"/>
+        <source>Select a %1 class</source>
+        <translation type="unfinished">Select a %1 class</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <location line="+16"/>
+        <source>to select a %1 &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select a %1 &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>New nested component</source>
+        <translation type="unfinished">Nouveau composant imbriqué</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;nested component&lt;/i&gt; to the &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;composant imbriqué&lt;/i&gt; dans le &lt;i&gt;composant&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to edit the &lt;i&gt;component&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">éditer le &lt;i&gt;composant&lt;/i&gt;, un double click gauche fait la même chose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;component&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire le &lt;i&gt;composant&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;component&lt;/i&gt; through a relation</source>
+        <translation type="unfinished">savoir qui référence le &lt;i&gt;composant&lt;/i&gt; via une relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the component</source>
+        <translation type="unfinished">le composant</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;composant&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the &lt;i&gt;component&lt;/i&gt; and its nested &lt;i&gt;components&lt;/i&gt; and &lt;i&gt;relations&lt;/i&gt; (except if the component at the other side is also deleted)</source>
+        <translation type="unfinished">restaure le &lt;i&gt;composant&lt;/i&gt; et ses sous &lt;i&gt;composants&lt;/i&gt; et &lt;i&gt;relations&lt;/i&gt; (sauf si le component opposé est aussi détruit)</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <location filename="../misc/Settings.cpp" line="+844"/>
+        <location line="+198"/>
+        <source>component</source>
+        <translation type="unfinished">composant</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>choose existing component</source>
+        <translation type="unfinished">choisir un composant existant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+16"/>
+        <source>enter component&apos;s name : </source>
+        <translation type="unfinished">nom du composant : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="-238"/>
+        <location line="+150"/>
+        <source>enter component diagram&apos;s name : </source>
+        <translation type="unfinished">nom du diagramme de composant : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">voir et modifier le &lt;i&gt;diagramme de composant&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">éditer le &lt;i&gt;diagramme de composant&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;component diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment le &lt;i&gt;diagramme de composant&lt;/i&gt; doit être dessiné</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer le &lt;i&gt;diagramme de composant&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;component diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;component diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the component diagram</source>
+        <translation type="unfinished">le diagramme de composant</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;diagramme de communication&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Component diagram</source>
+        <translation type="unfinished">Diagramme de composant</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-3"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+89"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-4"/>
+        <source>component color</source>
+        <translation type="unfinished">couleur de composant</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>component diagram</source>
+        <translation type="unfinished">diagramme de composant</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponentView.cpp" line="-156"/>
+        <source>enter component view&apos;s name : </source>
+        <translation type="unfinished">nom de la vue de composant : </translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source>New component diagram</source>
+        <translation type="unfinished">Nouveau diagramme de composant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;diagramme de composant&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New component</source>
+        <translation type="unfinished">Nouveau composant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;composant&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;component view&lt;/i&gt;</source>
+        <translation type="unfinished">editer une &lt;i&gt;vue de composant&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to set how the sub &lt;i&gt;component diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments d&apos;un &lt;i&gt;diagramme de composant&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;component view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">détruire le &lt;i&gt;composant&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the component view</source>
+        <translation type="unfinished">la vue de composant</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>undelete the &lt;i&gt;component view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;vue de composant&lt;/i&gt;. Ne restaure pas ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;component view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;vue de composant&lt;/i&gt; et ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <location line="+109"/>
+        <source>Component view</source>
+        <translation type="unfinished">Vue de composant</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>component view</source>
+        <translation type="unfinished">vue de composant</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-237"/>
+        <location line="+149"/>
+        <source>enter deployment diagram&apos;s name : </source>
+        <translation type="unfinished">nom du diagramme de déployement : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">montrer et modifier le &lt;i&gt;diagramme de déployment&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">éditer le &lt;i&gt;diagramme de déployment&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;deployment diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme de déployment&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer le &lt;i&gt;diagramme de déployment&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;deployment diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;deployment diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the deployment diagram</source>
+        <translation type="unfinished">le diagramme de déployment</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;diagramme de déployment&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Deployment diagram</source>
+        <translation type="unfinished">Diagramme de déployment</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <source>artifact color</source>
+        <translation type="unfinished">couleur d&apos;artefact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <source>node color</source>
+        <translation type="unfinished">couleur de noeud</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>deployment diagram</source>
+        <translation type="unfinished">diagramme de déployment</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="-26"/>
+        <source>to edit the &lt;i&gt;node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;node&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;node&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;node&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;node&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the node</source>
+        <translation type="unfinished">le noeud</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;node&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;noeud&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+66"/>
+        <source>Node</source>
+        <translation type="unfinished">Noeud</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>node</source>
+        <translation type="unfinished">noeud</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+18"/>
+        <source>enter node&apos;s name : </source>
+        <translation type="unfinished">nom du noeud : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-229"/>
+        <source>enter deployment view&apos;s name : </source>
+        <translation type="unfinished">nom de la vue de déployment : </translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>New deployment diagram</source>
+        <translation type="unfinished">Nouveau diagramme de déployment</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;diagramme de déployment&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New node</source>
+        <translation type="unfinished">Nouveau noeud</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;node&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;noeud&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New artifact</source>
+        <translation type="unfinished">Nouvel artefact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;artifact&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;artefact&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;deployment view&lt;/i&gt;</source>
+        <translation type="unfinished">editer une &lt;i&gt;vue de déployment&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to set how the sub &lt;i&gt;deployment diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme de composant&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">détruire la &lt;i&gt;vue de déployment&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the deployment view</source>
+        <translation type="unfinished">la vue de déployment</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>undelete the &lt;i&gt;deployment view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;vue de déployment&lt;/i&gt;. Ne restaure pas ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;vue de déployment&lt;/i&gt; et ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+214"/>
+        <source>Deployment view</source>
+        <translation type="unfinished">Vue de déployment</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>deployment view</source>
+        <translation type="unfinished">vue de déployment</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="-150"/>
+        <location line="+168"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-298"/>
+        <source>enter expansion node&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">nom de noeud d&apos;expansion
+(peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>expansion node can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">le noeud d&apos;expansion ne peut recevoir de flux de contrôle (non &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>expansion node can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">le noeud d&apos;expansion ne peut recevoir de flux de donnée (est &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;expansion node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;expansion node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;expansion node&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier le &lt;i&gt;noeud d&apos;extension&lt;/i&gt; dans un nouveau</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;expansion node&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;expansion node&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;expansion node&lt;/i&gt;                                                                               through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;expansion node&lt;/i&gt;                                                                               through a flow</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the expansion node</source>
+        <translation type="unfinished">le noeud d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;expansion node&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;noeud d&apos;expansion&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <source>Expansion Node</source>
+        <translation type="unfinished">Noeud d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>expansion node</source>
+        <translation type="unfinished">noeud d&apos;expansion</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-259"/>
+        <location line="+33"/>
+        <location line="+106"/>
+        <source>enter expansion region&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">nom de région d&apos;expansion
+(peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="-86"/>
+        <source>New expansion node</source>
+        <translation type="unfinished">Nouvelle région d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;expansion node&lt;/i&gt; to the &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;noeud d&apos;expansion&lt;/i&gt; dans une &lt;i&gt;région d&apos;expansion&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New nested expansion region</source>
+        <translation type="unfinished">Nouvelle région d&apos;expansion imbriquée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-435"/>
+        <source>to add a nested &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une sous &lt;i&gt;région d&apos;expansion&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New interruptible activity region</source>
+        <translation type="unfinished">Nouvelle région interruptible d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;région d&apos;activité interruptible&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>Add activity action</source>
+        <translation type="unfinished">Ajouter une action d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity action&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;action d&apos;activité&lt;/i&gt; à une &lt;i&gt;région&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>Add object node</source>
+        <translation type="unfinished">Ajouter un noeud d&apos;objet</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity object node&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;noeud d&apos;objet&lt;/i&gt; à une &lt;i&gt;région&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;expansion region&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">éditer la &lt;i&gt;région d&apos;expansion&lt;/i&gt;, un double click gauche fait la même chose</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;expansion region&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier la &lt;i&gt;région d&apos;expansion&lt;/i&gt; dans une nouvelle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;expansion region&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire la &lt;i&gt;région d&apos;expansion&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="-12"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+20"/>
+        <source>to know who reference the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">savoir qui référence la &lt;i&gt;région&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the expansion region</source>
+        <translation type="unfinished">la région d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;région d&apos;expansion&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the expansion region and its children</source>
+        <translation type="unfinished">restaurer la région d&apos;expansion et ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+197"/>
+        <source>expansion region</source>
+        <translation type="unfinished">région d&apos;expansion</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExtraMember.cpp" line="-26"/>
+        <source>to edit the &lt;i&gt;extra member&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">éditer le &lt;i&gt;membre externe&lt;/i&gt;, un double click gauche fait la même chose</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;extra member&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier le &lt;i&gt;membre externe&lt;/i&gt; dans un nouveau</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;extra member&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire le &lt;i&gt;membre externe&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>the extra member</source>
+        <translation type="unfinished">le membre externe</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;extra member&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;membre externe&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <source>extra member</source>
+        <translation type="unfinished">membre externe</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserFlow.cpp" line="-122"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-376"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-157"/>
+        <location filename="../browser/BrowserTransition.cpp" line="-137"/>
+        <source>from</source>
+        <translation type="unfinished">de</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-2"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+2"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+2"/>
+        <source>to</source>
+        <translation type="unfinished">vers</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>to edit the &lt;i&gt;flow&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;flow&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;flow&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;flow&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+120"/>
+        <source>Select </source>
+        <translation type="unfinished">Selectionner </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+143"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+1"/>
+        <source>to select the destination</source>
+        <translation type="unfinished">sélectionner la cible</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>the flow</source>
+        <translation type="unfinished">le flux</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;flow&lt;/i&gt;                                          (except if the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;flow&lt;/i&gt;                                          (except if the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+110"/>
+        <source>flow</source>
+        <translation type="unfinished">flux</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-88"/>
+        <location line="+141"/>
+        <source>enter interruptible activity 
+region&apos;s name (may be empty) : </source>
+        <translation type="unfinished">nom de région interruptible
+d&apos;activité (peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="-107"/>
+        <source> enter interruptible activity 
+region&apos;s name (may be empty) : </source>
+        <translation type="unfinished"> nom de région interruptible
+d&apos;activité (peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>New nested interruptible activity region</source>
+        <translation type="unfinished">Nouvelle région interruptible d&apos;activité imbriquée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a nested &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;région interruptible d&apos;activité&lt;/i&gt; imbriquée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New expansion region</source>
+        <translation type="unfinished">Nouvelle région d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>to edit the &lt;i&gt;interruptible activity region&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;interruptible activity region&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;interruptible activity region&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier la &lt;i&gt;région interruptible d&apos;activité&lt;/i&gt; dans une nouvelle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;interruptible activity region&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;interruptible activity region&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the interruptible activity region</source>
+        <translation type="unfinished">la région interruptible d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;région interruptible d&apos;activité&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the interruptible activity region and its children</source>
+        <translation type="unfinished">restaurer la région interruptible d&apos;activité et ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>interruptible activity region</source>
+        <translation type="unfinished">région interruptible d&apos;activité</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserNode.cpp" line="-608"/>
+        <source> cannot be deleted because :</source>
+        <translation type="unfinished"> ne peut être détruit parce que :</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>%1 is read-only</source>
+        <translation type="unfinished">%1 est en lecture seule</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>%1 referenced by the read-only component %2</source>
+        <translation type="unfinished">%1 est référencé par le composant en lecture seule %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 referenced by the read-only artifact %2</source>
+        <translation type="unfinished">%1 est référencé par l&apos;artefact en lecture seule %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 is the target of the read-only relation %2</source>
+        <translation type="unfinished">%1 est la cible de la relation en lecture seule %2</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Some items cannot be undeleted</source>
+        <translation type="unfinished">Des éléments ne peuvent être restaurés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Some items are renamed</source>
+        <translation type="unfinished">Des éléments furent renommés</translation>
+    </message>
+    <message>
+        <location line="+536"/>
+        <source>already generalize / realize</source>
+        <translation type="unfinished">généralise / réalise déjà</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>can&apos;t have circular generalization / realization</source>
+        <translation type="unfinished">on ne peut avoir de généralisation / réalisation circulaire</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <source>to recurcivelly duplicate the marked items into %1</source>
+        <translation type="unfinished">dupliquer récursivement les éléments marqués dans %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to recurcivelly duplicate the marked items after %1</source>
+        <translation type="unfinished">dupliquer récursivement les éléments marqués dans %1</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>to unmark %1</source>
+        <translation type="unfinished">retirer la marque sur %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to unmark all the marked items</source>
+        <translation type="unfinished">retirer toutes les marques</translation>
+    </message>
+    <message>
+        <location line="+433"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+104"/>
+        <source>illegal name or already used</source>
+        <translation type="unfinished">nom illégal ou déjà utilisé</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <source>nothing available</source>
+        <translation type="unfinished">rien de disponible</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Empty name</source>
+        <translation type="unfinished">Nom vide</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Nonunicode name</source>
+        <translation type="unfinished">Nom non-Unicode</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Name starting with witespace</source>
+        <translation type="unfinished">Nom commençant par une espace</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+12"/>
+        <source>Name containing illegal character: </source>
+        <translation type="unfinished">Nom contenant un caractère illégal :</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Name already used</source>
+        <translation type="unfinished">Nom déjà utilisé</translation>
+    </message>
+    <message>
+        <location line="+490"/>
+        <source>&lt;p&gt;&lt;b&gt;Warning, the model is not consistent because some elements have
+the same internal identifier.&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Users working on the same project have the same use identifier,
+or you had change the model files, or used Project synchro
+without following the mandatory rules&lt;/p&gt;
+</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;Attention, le modèle n&apos;est pas cohérent car plusieurs éléments ont le même identificateur interne.&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Des utilisateurs travaillant sur le même projet ont le même identificateur,
+ou vous avez modifié les fichiers du modèle, ou utilisé Project synchro
+sans suivre les règles obligatoires&lt;/p&gt;
+</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>These elements was &lt;b&gt;removed&lt;/b&gt;</source>
+        <translation type="unfinished">Ces éléments furent &lt;b&gt;retirés&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The internal identifier of these elements was changed,
+but &lt;u&gt;I can&apos;t garantee the references to them are the right one&lt;/u&gt;,
+check your model</source>
+        <translation type="unfinished">L&apos;idenfiticateur interne de ces éléments furent changés,
+mais &lt;u&gt;je ne peux pas garantir que leurs références sont celles désirées&lt;/u&gt;,
+vérifier votre modèle</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-235"/>
+        <location line="+147"/>
+        <source>enter object diagram&apos;s name : </source>
+        <translation type="unfinished">nom du diagramme d&apos;objet : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">montrer et modifier le &lt;i&gt;diagramme objet&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">editer le &lt;i&gt;diagramme objet&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;object diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme d&apos;objet&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer le &lt;i&gt;diagramme objet&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;object diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;object diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the object diagram</source>
+        <translation type="unfinished">le diagramme objet</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;diagramme objet&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+137"/>
+        <source>Object diagram</source>
+        <translation type="unfinished">Diagramme objet</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserOperation.cpp" line="+4"/>
+        <source>Add constructor initializer</source>
+        <translation type="unfinished">Add constructor initializer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;operation&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit C++ body</source>
+        <translation type="unfinished">Editer le corps C++</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its C++ body</source>
+        <translation type="unfinished">editer l&apos;&lt;i&gt;opération&lt;/i&gt; et son corps C++</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Java body</source>
+        <translation type="unfinished">Editer le corps Java</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Java body</source>
+        <translation type="unfinished">editer l&apos;&lt;i&gt;opération&lt;/i&gt; et son corps Java</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Php body</source>
+        <translation type="unfinished">Editer le corps Php</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Php body</source>
+        <translation type="unfinished">editer l&apos;&lt;i&gt;opération&lt;/i&gt; et son corps Php</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Python body</source>
+        <translation type="unfinished">Editer le corps Python</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Python body</source>
+        <translation type="unfinished">editer l&apos;&lt;i&gt;opération&lt;/i&gt; et son corps Python</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;operation&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier l&apos;&lt;i&gt;opération&lt;/i&gt; dans une nouvelle</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add implementing activity</source>
+        <translation type="unfinished">Ajouter une activité d&apos;implémentation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une nouvelle &lt;i&gt;activité&lt;/i&gt; implémentant l&apos;&lt;i&gt;opération&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add implementing state</source>
+        <translation type="unfinished">Ajouter un état d&apos;implémentation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;state&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une nouvel &lt;i&gt;état&lt;/i&gt; implémentant l&apos;&lt;i&gt;opération&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">savoir qui référence l&apos;&lt;i&gt;opération&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select implementing behavior</source>
+        <translation type="unfinished">Sélectionner l&apos;activité d&apos;implémentation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select a &lt;i&gt;state&lt;/i&gt; or &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">selectionner l&apos;&lt;i&gt;état&lt;/i&gt; ou l&apos;&lt;i&gt;activité&lt;/i&gt; implémentant l&apos;&lt;i&gt;opération&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Choose behavior</source>
+        <translation type="unfinished">Choisir le comportement</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to delete the &lt;i&gt;operation&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;operation&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>the operation</source>
+        <translation type="unfinished">l&apos;opération</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to undelete the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer l&lt;i&gt;opération&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>operation</source>
+        <translation type="unfinished">opération</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPackage.cpp" line="-791"/>
+        <source>New package</source>
+        <translation type="unfinished">Nouveau paquetage</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new sub &lt;i&gt;package&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un nouveau &lt;i&gt;paquetage&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New use case view</source>
+        <translation type="unfinished">Nouvelle vue de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;use case view&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une nouvelle &lt;i&gt;vue de cas d&apos;utilisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <location filename="../diagram/UmlWindow.cpp" line="+797"/>
+        <source>to set how an Uml type is compiled in C++ etc...,to set the default parameter passing, to set the default codeproduced for an attribute etc..., and to set the root directories</source>
+        <translation type="unfinished">to set how an Uml type is compiled in C++ etc...,to set the default parameter passing, to set the default codeproduced for an attribute etc..., and to set the root directories</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>the package</source>
+        <translation type="unfinished">le paquetage</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Reverse</source>
+        <translation type="unfinished">Reverser</translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>Question</source>
+        <translation type="unfinished">Question</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../dialog/PackageDialog.cpp" line="+1"/>
+        <source>Propagate the removal of the profile ?</source>
+        <translation type="unfinished">Propager la destruction du profil ?</translation>
+    </message>
+    <message>
+        <location line="+351"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-4"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-5"/>
+        <source>subject color</source>
+        <translation type="unfinished">couleur de sujet</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-3"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-3"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-3"/>
+        <source>use case color</source>
+        <translation type="unfinished">couleur de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>choose existing package : </source>
+        <translation type="unfinished">choisir un paquetage existant : </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>enter profile&apos;s name : </source>
+        <translation type="unfinished">nom de profil : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>enter package&apos;s name : </source>
+        <translation type="unfinished">nom de paquetage : </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Do you want to be the owner of this new package ?
+(other users can&apos;t modify it while you are the owner)</source>
+        <translation type="unfinished">Voulez-vous être responsable du paquetage ?
+(les autres utilisateurs ne pourront pas le modifier)</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>The project is modified and need to be saved first.
+If you don&apos;t want to save your modifications reload
+the project then ask again for the update
+
+Save it to perform update ?
+</source>
+        <translation type="unfinished">Le projet est modifié et doit d&apos;abord être sauvé.
+Si vous ne voulez pas sauver vos modifications,
+rechargez le projet et redemandez la mise à jour.
+
+Sauver pour faire la mise à jour ?
+</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>file &apos;%1&apos; is read only, update aborted</source>
+        <translation type="unfinished">le fichier &apos;%1&apos; est en lecture seule, mise à jour annulée</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>you didn&apos;t select project &apos;%1&apos;</source>
+        <translation type="unfinished">vous n&apos;avez pas choisi le projet &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>package</source>
+        <translation type="unfinished">paquetage</translation>
+    </message>
+    <message>
+        <location line="+949"/>
+        <location filename="../misc/myio.cpp" line="-9"/>
+        <location line="+169"/>
+        <source>Cannot create file
+</source>
+        <translation type="unfinished">Ne peut pas créer le fichier
+</translation>
+    </message>
+    <message>
+        <location line="+406"/>
+        <source>cannot be read</source>
+        <translation type="unfinished">ne peut être lu</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+293"/>
+        <source>Your version of DOUML is too old to read this project</source>
+        <translation type="unfinished">Your version of DOUML is too old to read this project</translation>
+    </message>
+    <message>
+        <location line="-283"/>
+        <source>Sorry, the imported project has a too old format.
+To change its format : load this project and save it.</source>
+        <translation type="unfinished">Désolé, le projet importé à un formatage trop vieux.
+Pour changer le formatage : chargez le projet et sauver le.</translation>
+    </message>
+    <message>
+        <location line="+267"/>
+        <source>can&apos;t read project file</source>
+        <translation type="unfinished">ne peux pas lire le fichier projet</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>can&apos;t find project file</source>
+        <translation type="unfinished">ne peux trouver le fichier projet</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserParameter.cpp" line="+1"/>
+        <source>parameter can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">le paramètre ne peut recevoir de flux de donnée (est &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;parameter&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;parameter&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;parameter&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier le &lt;i&gt;paramètre&lt;/i&gt; dans un nouveau</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;parameter&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;parameter&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;parameter&lt;/i&gt;                                                                               through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;parameter&lt;/i&gt;                                                                               through a flow</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the parameter</source>
+        <translation type="unfinished">le paramètre</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;parameter&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;paramètre&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>parameter</source>
+        <translation type="unfinished">paramètre</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserParameterSet.cpp" line="-25"/>
+        <source>to edit the &lt;i&gt;parameter set&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">éditer l&apos;&lt;i&gt;ensemble de paramètres&lt;/i&gt;, un double click gauche fait la même chose</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;parameter set&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier l&apos;&lt;i&gt;ensemble de paramètre&lt;/i&gt; dans un nouveau</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;parameter set&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire l&apos;&lt;i&gt;ensemble de paramètres&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;parameter set&lt;/i&gt;</source>
+        <translation type="unfinished">savoir qui référence l&apos;&lt;i&gt;ensemble de paramètre&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the parameter set</source>
+        <translation type="unfinished">l&apos;ensemble de paramètre</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;parameter set&lt;/i&gt;</source>
+        <translation type="unfinished">pour restaurer l&apos;&lt;i&gt;ensemble de paramètre&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>parameter set</source>
+        <translation type="unfinished">ensemble de paramètre</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPin.cpp" line="-36"/>
+        <source>enter pin&apos;s name
+(may be empty) : </source>
+        <translation type="unfinished">nom de la broche
+(peut être vide) : </translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>target pin can&apos;t have incoming flow</source>
+        <translation type="unfinished">la broche cible ne peut avoir de flux entrant</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>target pin can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">la broche cible ne peut avoir de flux de contrôle (non &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>target pin can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">la broche cible ne peut avoir de flux de donnée (est &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;pin&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">éditer la &lt;i&gt;broche&lt;/i&gt;, un double click gauche fait la même chose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to copy the &lt;i&gt;pin&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier la &lt;i&gt;broche&lt;/i&gt; dans une nouvelle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;pin&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire la &lt;i&gt;broche&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">savoir qui référence la &lt;i&gt;broche&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the pin</source>
+        <translation type="unfinished">la broche</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to undelete the &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;broche&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>pin</source>
+        <translation type="unfinished">broche</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-171"/>
+        <source>can&apos;t have transition</source>
+        <translation type="unfinished">ne peux avoir de transition</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>can&apos;t have several transition</source>
+        <translation type="unfinished">ne peux avoir plusieurs transitions</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>can&apos;t have a transition to initial pseudo state</source>
+        <translation type="unfinished">un état initial ne peut avoir de transition d&apos;entrée</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>fork can&apos;t have several input transitions</source>
+        <translation type="unfinished">une bifurcation ne peut avoir plusieurs transition d&apos;entrée</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+34"/>
+        <location line="+106"/>
+        <location filename="../browser/BrowserState.cpp" line="-465"/>
+        <source>enter </source>
+        <translation type="unfinished">enter </translation>
+    </message>
+    <message>
+        <location line="-140"/>
+        <location line="+34"/>
+        <location line="+106"/>
+        <location filename="../browser/BrowserState.cpp" line="+0"/>
+        <source>&apos;s name : </source>
+        <translation type="unfinished">&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>already have a deep history</source>
+        <translation type="unfinished">à déjà un historique profond</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>already have a shallow history</source>
+        <translation type="unfinished">à déjà un historique superficiel</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt; through a transition</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt; through a transition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the </source>
+        <translation type="unfinished">the </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserRegion.cpp" line="-331"/>
+        <location filename="../browser/BrowserState.cpp" line="-101"/>
+        <location line="+7"/>
+        <source>New state</source>
+        <translation type="unfinished">Nouvel état</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;état&lt;/i&gt; à une &lt;i&gt;région&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;region&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">éditer la &lt;i&gt;région&lt;/i&gt;, un double click gauche fait la même chose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;region&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire la &lt;i&gt;région&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>the region</source>
+        <translation type="unfinished">la région</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;région&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the region and its children</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;région&lt;/i&gt; et ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location line="+16"/>
+        <source>Region</source>
+        <translation type="unfinished">Région</translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+665"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+551"/>
+        <source>In %1</source>
+        <translation type="unfinished">In %1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>After %1</source>
+        <translation type="unfinished">After %1</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserRelation.cpp" line="+10"/>
+        <source>because &lt;b&gt;%1&lt;/b&gt; cannot (or already) inherit on &lt;b&gt;%2&lt;/b&gt;</source>
+        <translation type="unfinished">parce que &lt;b&gt;%1&lt;b&gt; ne peut hérité ou hérite déjà de &lt;b&gt;%2&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+342"/>
+        <source>to edit the &lt;i&gt;relation&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;relation&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to copy the &lt;i&gt;relation&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">copier la &lt;i&gt;relation&lt;/i&gt; dans une nouvelle</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-4"/>
+        <source>to know who reference the &lt;i&gt;relation&lt;/i&gt;</source>
+        <translation type="unfinished">savoir qui référence la &lt;i&gt;relation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;relation&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;relation&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+2"/>
+        <source>select </source>
+        <translation type="unfinished">sélectionner </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to select the destination class</source>
+        <translation type="unfinished">sélectionner la classe cible</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+3"/>
+        <source>the relation</source>
+        <translation type="unfinished">la relation</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>undelete the &lt;i&gt;relation&lt;/i&gt;                                          (except if the class at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;relation&lt;/i&gt;                                          (except if the class at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+125"/>
+        <location filename="../data/RelationData.cpp" line="+390"/>
+        <source>relation</source>
+        <translation type="unfinished">relation</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-240"/>
+        <location line="+153"/>
+        <source>enter sequence diagram&apos;s name : </source>
+        <translation type="unfinished">nom du diagramme de séquence : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">montrer et modifier le &lt;i&gt;diagramme de séquence&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">éditer le &lt;i&gt;diagramme de séquence&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;sequence diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme de séquence&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer le &lt;i&gt;diagramme de séquence&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;sequence diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;sequence diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the sequence diagram</source>
+        <translation type="unfinished">le diagramme de séquence</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;diagramme de séquence&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+139"/>
+        <source>Sequence diagram</source>
+        <translation type="unfinished">Diagramme de séquence</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-143"/>
+        <source>to edit the &lt;i&gt;relation&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">éditer la &lt;i&gt;relation&lt;/i&gt;, un double click gauche fait la même chose</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;relation&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire la &lt;i&gt;relation&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>undelete the &lt;i&gt;relation&lt;/i&gt; (except if the other side is also deleted)</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;relation&lt;/i&gt; (sauf si l&apos;élément opposé est aussi détruit)</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserState.cpp" line="-98"/>
+        <location line="+33"/>
+        <source>enter state&apos;s name : </source>
+        <translation type="unfinished">nom de l&apos;état : </translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>New state diagram</source>
+        <translation type="unfinished">Nouveau diagramme d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;diagramme d&apos;état&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New submachine</source>
+        <translation type="unfinished">Nouvelle sous machine</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;submachine&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;sous machine&lt;I&gt; dans une &lt;i&gt;machine&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;état&lt;/i&gt; dans une &lt;i&gt;machine&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New nested state</source>
+        <translation type="unfinished">Nouvel état imbriqué</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;nested state&lt;/i&gt; to the &lt;i&gt;state&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;état imbriqué&lt;/i&gt; dans un &lt;i&gt;état&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;submachine&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;état&lt;/i&gt; à une &lt;i&gt;sous machine&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New region</source>
+        <translation type="unfinished">Nouvelle région</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter une &lt;i&gt;région&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;%1&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;%1&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;state&lt;/i&gt;                                                                           through a transition or a reference</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;state&lt;/i&gt;                                                                           through a transition or a reference</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>undelete the %1 and its children</source>
+        <translation type="unfinished">undelete the %1 and its children</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <location line="+136"/>
+        <source>state machine</source>
+        <translation type="unfinished">machine à état</translation>
+    </message>
+    <message>
+        <location line="-133"/>
+        <source>state submachine</source>
+        <translation type="unfinished">sous machine à état</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+134"/>
+        <location filename="../misc/Settings.cpp" line="+133"/>
+        <location line="+89"/>
+        <source>state</source>
+        <translation type="unfinished">état</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>state machine reference</source>
+        <translation type="unfinished">référence de machine à états</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserStateAction.cpp" line="+118"/>
+        <source>receive-signal action</source>
+        <translation type="unfinished">action recevoir un signal</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>send-signal action</source>
+        <translation type="unfinished">action envoyer un signal</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>state action</source>
+        <translation type="unfinished">action d&apos;état</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-239"/>
+        <location line="+153"/>
+        <source>enter state diagram&apos;s name : </source>
+        <translation type="unfinished">nom du diagramme d&apos;état : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>to show and edit the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">montrer et modifier le &lt;i&gt;diagramme d&apos;état&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">éditer le &lt;i&gt;diagramme d&apos;état&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;state diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme d&apos;état&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer le &lt;i&gt;diagramme d&apos;état&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;state diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;state diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the state diagram</source>
+        <translation type="unfinished">le diagramme d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>to undelete the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;diagramme d&apos;état&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>State diagram</source>
+        <translation type="unfinished">Diagramme d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>state diagram</source>
+        <translation type="unfinished">diagramme d&apos;état</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserTransition.cpp" line="-18"/>
+        <source>to edit the &lt;i&gt;transition&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">éditer la &lt;i&gt;transition&lt;/i&gt;, un double click gauche fait la même chose</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;transition&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">détruire la &lt;i&gt;transition&lt;/i&gt;. La destruction pourra être annulée</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>to know who reference the &lt;i&gt;transition&lt;/i&gt;</source>
+        <translation type="unfinished">savoir qui référence la &lt;i&gt;transition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the transition</source>
+        <translation type="unfinished">la transition</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;transition&lt;/i&gt; (except if the other side is also deleted)</source>
+        <translation type="unfinished">restaurer la &lt;i&gt;transition&lt;/i&gt; (sauf si l&apos;autre coté est également détruit)</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>transition</source>
+        <translation type="unfinished">transition</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCase.cpp" line="-822"/>
+        <source>New use case diagram</source>
+        <translation type="unfinished">Nouveau diagramme de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;diagramme de cas d&apos;utilisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>New use case</source>
+        <translation type="unfinished">Nouveau cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;use case&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;cas d&apos;utilisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New actor</source>
+        <translation type="unfinished">Nouvel acteur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;actor&lt;/i&gt;</source>
+        <translation type="unfinished">ajouter un &lt;i&gt;acteur&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to edit the &lt;i&gt;use case&lt;/i&gt;</source>
+        <translation type="unfinished">editer le &lt;i&gt;cas d&apos;utilisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../diagram/UmlWindow.cpp" line="+17"/>
+        <source>to set how the sub &lt;i&gt;diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;use case and its sub items&lt;/i&gt;.                                                      Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;use case and its sub items&lt;/i&gt;.                                                      Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>to know who reference the &lt;i&gt;use case&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;use case&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the use case</source>
+        <translation type="unfinished">le cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;use case&lt;/i&gt;.                                          Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;use case&lt;/i&gt;.                                          Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;use case&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">restaure le &lt;i&gt;cas d&apos;utilisation&lt;/i&gt; et ses sous éléments</translation>
+    </message>
+    <message>
+        <location line="+290"/>
+        <location line="+16"/>
+        <source>enter use case&apos;s name : </source>
+        <translation type="unfinished">nom du cas d&apos;utilisation : </translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../misc/Settings.cpp" line="-523"/>
+        <source>use case</source>
+        <translation type="unfinished">cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-236"/>
+        <location line="+147"/>
+        <source>enter use case diagram&apos;s name : </source>
+        <translation type="unfinished">nom de diagramme de cas d&apos;utilisation : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">montrer et modifier une &lt;i&gt;diagramme de case d&apos;utilisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">éditer le &lt;i&gt;diagramme de cas d&apos;utilisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;use case diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">indiquer comment les éléments du &lt;i&gt;diagramme de cas d&apos;utilisation&lt;/i&gt; doivent être dessinés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">dupliquer le &lt;i&gt;diagramme de cas d&apos;utilisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;use case diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;use case diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the use case diagram</source>
+        <translation type="unfinished">le diagramme de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">restaurer le &lt;i&gt;diagramme de cas d&apos;utilisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+142"/>
+        <source>Use Case diagram</source>
+        <translation type="unfinished">Diagramme de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-777"/>
+        <source>enter use case view&apos;s name : </source>
+        <translation type="unfinished">nom de vue de cas d&apos;utilisation : </translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>the use case view</source>
+        <translation type="unfinished">la vue de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <location line="+197"/>
+        <location line="+10"/>
+        <source>Use case view</source>
+        <translation type="unfinished">Vue de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location filename="../data/OperationData.cpp" line="+0"/>
+        <source>Expected nparams instead of </source>
+        <translation type="unfinished">Expected nparams instead of </translation>
+    </message>
+    <message>
+        <location filename="../diagram/ActivityDiagramWindow.cpp" line="-214"/>
+        <source>Click this button to add an &lt;i&gt;activity&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;activité&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;interruptible activity region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the interruptible activity region from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;région interruptible d&apos;activité&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;expansion region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the expansion region from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;région d&apos;expansion&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;activity partition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity partition from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;partition d&apos;activité&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Click this button to add an &lt;i&gt;initial node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;noeud initial&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;activity final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;activity final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;un noeud final d&apos;activité&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;flow final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;noeud de flux final&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;decision node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;decision node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;noeud de décision&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;merge node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;merge node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;noeud de fusion&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add an &lt;i&gt;action&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;action&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;object node&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;noeud objet&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;flow&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;flux&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ArrowPointCanvas.cpp" line="-27"/>
+        <source>Line break</source>
+        <translation type="unfinished">Coupure de ligne</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="+19"/>
+        <location filename="../diagram/HubCanvas.cpp" line="-39"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="+8"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+12"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location filename="../diagram/BrowserView.cpp" line="+74"/>
+        <source>browser          </source>
+        <translation type="unfinished">explorateur          </translation>
+    </message>
+    <message>
+        <location filename="../diagram/CdClassCanvas.cpp" line="-176"/>
+        <source>Choose operation to edit</source>
+        <translation type="unfinished">Choisir l&apos;opération à éditer</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Choose inherited operation to add it</source>
+        <translation type="unfinished">Choisir l&apos;opération héritée à ajouter</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ClassDiagramWindow.cpp" line="+49"/>
+        <source>Click this button to add a &lt;i&gt;class&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Ajouter une &lt;i&gt;classe&lt;/i&gt; dans le diagramme.&lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;package&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the package from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;paquetage&lt;/i&gt; dans le diagramme.&lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;explorateur&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Click this button to create a &lt;i&gt;dependency&lt;/i&gt;</source>
+        <translation type="unfinished">Créer une &lt;i&gt;dépandance&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to create an &lt;i&gt;unidirectional association&lt;/i&gt; or an &lt;i&gt;extension&lt;/i&gt;</source>
+        <translation type="unfinished">Créer une &lt;i&gt;association unidirectionnelle&lt;/i&gt; ou une &lt;i&gt;extension&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create an &lt;i&gt;aggregation&lt;/i&gt;</source>
+        <translation type="unfinished">Créer une &lt;i&gt;aggrégation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;composition&lt;/i&gt;</source>
+        <translation type="unfinished">Créer une &lt;i&gt;composition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;directional aggregation&lt;/i&gt;</source>
+        <translation type="unfinished">Créer une &lt;i&gt;aggrégation undirectionnelle&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;directional composition&lt;/i&gt;</source>
+        <translation type="unfinished">Créer une &lt;i&gt;composition unidirectionnelle&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;realization&lt;/i&gt;</source>
+        <translation type="unfinished">Créer une &lt;i&gt;réalisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+120"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+103"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class</source>
+        <translation type="unfinished">Ajouter une classe</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+25"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Ajouter un paquetage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+8"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Ajouter un fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+24"/>
+        <source>Generalisation</source>
+        <translation type="unfinished">Généralisation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Realize</source>
+        <translation type="unfinished">Réalise</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dépendance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-12"/>
+        <location line="+6"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Association / Extension</source>
+        <translation type="unfinished">Association / Extension unidirectionnelle</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Aggregation</source>
+        <translation type="unfinished">Aggrégation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Composition</source>
+        <translation type="unfinished">Composition</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Aggregation</source>
+        <translation type="unfinished">Aggrégation unidirectionnelle</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Composition</source>
+        <translation type="unfinished">Composition unidirectionnelle</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+98"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+18"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor / Class association</source>
+        <translation type="unfinished">Ancre / classe d&apos;association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+14"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-19"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+12"/>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="-15"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+7"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ColDiagramWindow.cpp" line="-82"/>
+        <source>Click this button to add a &lt;i&gt;link&lt;/i&gt;</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;lien&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;self link&lt;/i&gt;</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;lien reflexif&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ComponentDiagramWindow.cpp" line="-99"/>
+        <source>Click this button to add a &lt;i&gt;component&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the component from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;composant&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Click this button to show an interface required by a &lt;i&gt;component&lt;/i&gt;.</source>
+        <translation type="unfinished">Montrer une interface requise par le &lt;i&gt;composant&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to show an interface provided by a &lt;i&gt;component&lt;/i&gt;.</source>
+        <translation type="unfinished">Montrer une interface fournie pas le &lt;i&gt;composant&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DeploymentDiagramWindow.cpp" line="-123"/>
+        <source>Click this button to add a &lt;i&gt;node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the node from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;noeud&lt;/i&gt; dans le diagramme.&lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add a &lt;i&gt;network&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;réseau&lt;/i&gt; dans le diagramme.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;network connexion/ending&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Ajouter une &lt;i&gt;find/connection de réseau&lt;/i&gt; dans le diagramme.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;artifact&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;artefact&lt;/i&gt; dans le diagramme.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramItem.cpp" line="+175"/>
+        <source>some elements already present in the diagram are NOT paste</source>
+        <translation type="unfinished">les éléments déjà présents dans le diagrammes n&apos;ont PAS été collés</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramView.cpp" line="+583"/>
+        <source>Multiple selection menu</source>
+        <translation type="unfinished">Menu de séléction multiple</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>align top</source>
+        <translation type="unfinished">aligner par le haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align bottom</source>
+        <translation type="unfinished">aligner par le bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align left</source>
+        <translation type="unfinished">aligner par la gauche</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align right</source>
+        <translation type="unfinished">aligner par la droite</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center</source>
+        <translation type="unfinished">aligner par le centre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center verticaly</source>
+        <translation type="unfinished">aligner par la verticale centrale</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center horizontaly</source>
+        <translation type="unfinished">aligner par l&apos;horizontale centrale</translation>
+    </message>
+    <message>
+        <location line="+1507"/>
+        <source>SVG file (*.svg)</source>
+        <translation type="unfinished">Fichier SVG (*.svg)</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PNG file (*.png)</source>
+        <translation type="unfinished">Fichier PNG (*.png)</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramWindow.cpp" line="-82"/>
+        <source>Enter a new scale value or use the arrows to change the &lt;i&gt;scale&lt;/i&gt;</source>
+        <translation type="unfinished">Entrez une nouvelle échelle ou utilisez les flêches pour changer l&apos;&lt;i&gt;échelle&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to compute the &lt;i&gt;fit scale&lt;/i&gt; allowing to try to show all the diagram</source>
+        <translation type="unfinished">Calcule la plus grande echelle permettant de voir tout les éléments du diagramme (lorsque c&apos;est possible)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to compute the smallest window size allowing to show all the diagram</source>
+        <translation type="unfinished">Calcule la plus petite taille de fenêtre permettant de voir tout les éléments du diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to call the diagram menu like on a right mouse click done out of any element</source>
+        <translation type="unfinished">Appelle le menu du diagramme de la même façon qu&apos;un clic souris droit sur n&apos;importe quel élément</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>optimal scale</source>
+        <translation type="unfinished">échelle optimale</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>optimal window size</source>
+        <translation type="unfinished">taille de fenêtre optimale</translation>
+    </message>
+    <message>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="-2"/>
+        <source>Separator</source>
+        <translation type="unfinished">Séparateur</translation>
+    </message>
+    <message>
+        <location filename="../diagram/HubCanvas.cpp" line="-2"/>
+        <source>Network connexion</source>
+        <translation type="unfinished">Connexion réseau</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ImageCanvas.cpp" line="+2"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+193"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="-114"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+10"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+10"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ObjectDiagramWindow.cpp" line="-74"/>
+        <source>Click this button to add a &lt;i&gt;link&lt;/i&gt; between instances</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;lien&lt;/i&gt; entre instances</translation>
+    </message>
+    <message>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="-5"/>
+        <source>Life line</source>
+        <translation type="unfinished">Ligne de vie</translation>
+    </message>
+    <message>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="-198"/>
+        <source>Click this button to add a modeled &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class instance from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Ajouter une &lt;i&gt;instance de classe&lt;/i&gt; modélisée dans le diagramme.&lt;br&gt;&lt;br&gt;Vous pouvez aussi glisser-déposer l&apos;instance depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Ajouter une &lt;i&gt;instance de classe&lt;/i&gt; dans le diagramme.&lt;br&gt;&lt;br&gt;Vous pouvez aussi glisser-déposer une classe depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Click this button to send a &lt;i&gt;synchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Envoyez un &lt;i&gt;message synchrone&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send an &lt;i&gt;asynchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Envoyez un &lt;i&gt;message asynchrone&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;reflexive synchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Envoyez un &lt;i&gt;message synchrone réflexif&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;reflexive asynchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Envoyez un &lt;i&gt;message asynchrone réflexif&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;synchronous lost message&lt;/i&gt;</source>
+        <translation type="unfinished">Envoyer un &lt;i&gt;message synchrone perdu&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;asynchronous lost message&lt;/i&gt;</source>
+        <translation type="unfinished">Envoyer un &lt;i&gt;message asynchrone perdu&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;synchronous found message&lt;/i&gt;</source>
+        <translation type="unfinished">Recevoir un &lt;i&gt;message synchrone &apos;trouvé&apos;&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;asynchronous found message&lt;/i&gt;</source>
+        <translation type="unfinished">Recevoir un &lt;i&gt;message asynchrone &apos;trouvé&apos;&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;explicitly return&lt;/i&gt;</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;retour explicite&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;explicit reflexive return&lt;/i&gt;</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;retour explicite réflexif&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;text&lt;/i&gt;</source>
+        <translation type="unfinished">Ajouter un &lt;i&gt;texte&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;continuation&lt;/i&gt;</source>
+        <translation type="unfinished">Ajouter une &lt;i&gt;continuation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Ajouter une instance de classe modélisée</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Ajouter une instance de classe</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Continuation</source>
+        <translation type="unfinished">Ajouter une continuation</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous message</source>
+        <translation type="unfinished">Message synchrone</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous message</source>
+        <translation type="unfinished">Message asynchrone</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous Reflexive message</source>
+        <translation type="unfinished">Message synchrone réflexif</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous Reflexive message</source>
+        <translation type="unfinished">Message asynchrone réflexif</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous found message</source>
+        <translation type="unfinished">Message synchrone &apos;trouvé&apos;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous found message</source>
+        <translation type="unfinished">Message asynchrone &apos;trouvé&apos;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous lost message</source>
+        <translation type="unfinished">Message synchrone perdu</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous lost message</source>
+        <translation type="unfinished">Message asynchrone perdu</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Explicit return</source>
+        <translation type="unfinished">Retour explicite</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Explicit reflexive return</source>
+        <translation type="unfinished">Retour explicite réflexif</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-12"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancre</translation>
+    </message>
+    <message>
+        <location filename="../diagram/StateDiagramWindow.cpp" line="+45"/>
+        <source>Click this button to add a &lt;i&gt;state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the state from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;état&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Click this button to add a &lt;i&gt;entry point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;entry point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;point d&apos;entrée&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;exit point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;exit point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;point de sortie&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;initial pseudo state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial pseudo state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;pseudo état&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;final state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;final state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;état final&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;terminate node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;terminate node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;noeud de terminaison&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;deep history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;deep history&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;historique profond&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;shallow history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;historique superficiel&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;junction&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;junction&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;jonction&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;choice&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;choice&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;choix&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;fork&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;foek&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;bifurcation&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;join&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;join&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;sommet d&apos;union&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;transition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;transition&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;transition&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;region&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;région&lt;/i&gt; dans un &lt;i&gt;état&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;action&lt;/i&gt; dans un &lt;i&gt;état&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;receive signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;action recevoir un signal&lt;/i&gt; dans un &lt;i&gt;état&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;send signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Pour ajouter une &lt;i&gt;action envoyer un signal&lt;/i&gt; dans un &lt;i&gt;état&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="-15"/>
+        <source>Stereotype Properties</source>
+        <translation type="unfinished">Propriétés de stéréotype</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-5"/>
+        <source>Font</source>
+        <translation type="unfinished">Police de caractères</translation>
+    </message>
+    <message>
+        <location filename="../diagram/TextCanvas.cpp" line="-1"/>
+        <source>Color</source>
+        <translation type="unfinished">Couleur</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>foreground</source>
+        <translation type="unfinished">avant plan</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>background</source>
+        <translation type="unfinished">arrière plan</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Text color dialog</source>
+        <translation type="unfinished">Editeur de couleur du texte</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UmlWindow.cpp" line="-680"/>
+        <source>To create a &lt;i&gt;new project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</source>
+        <translation type="unfinished">Créer un &lt;i&gt;nouveau project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;Cela vous demandera où créer un nouveau répertoire ayant le nom du projet où tous les fichiers projets seront placés.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>To create a &lt;i&gt;new project&lt;/i&gt; from an already existing one.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</source>
+        <translation type="unfinished">Créer un &lt;i&gt;nouveau project&lt;/i&gt; à partir d&apos;un projet existant.&lt;br&gt;&lt;br&gt;Cela vous demandera où créer un nouveau répertoire ayant le nom du projet où tous les fichiers projets seront placés.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>To open a &lt;i&gt;project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the Project menu.</source>
+        <translation type="unfinished">Ouvrir un &lt;i&gt;project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;Vous pouvez également utiliser la commande &lt;i&gt;Ouvrir&lt;/b&gt; du menu Projet.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To save the project.&lt;br&gt;&lt;br&gt;You can also select the Save command from the Project menu.</source>
+        <translation type="unfinished">Sauver un &lt;i&gt;project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;Vous pouvez également utiliser la commande &lt;i&gt;Sauvegarder&lt;/b&gt; du menu Projet.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To save all in a new project.</source>
+        <translation type="unfinished">Sauver dans un nouveau projet.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To print the current diagram.</source>
+        <translation type="unfinished">Imprimer le diagramme courant.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To manage or not C++ and to set or not the C++ definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gère ou non C++ et positionne ou non les définitions/déclarations C++ à leur valeur par défaut lorsqu&apos;un artefact/classe/opération/propriété/relation est crée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Java and to set or not the Java definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gère ou non Java et positionne ou non les définitions Java à leur valeur par défaut lorsqu&apos;un artefact/classe/opération/propriété/relation est crée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Php and to set or not the Php definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gère ou non Php et positionne ou non les définitions Php à leur valeur par défaut lorsqu&apos;un artefact/classe/opération/propriété/relation est crée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Python and to set or not the Python definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gère ou non Python et positionne ou non les définitions Python à leur valeur par défaut lorsqu&apos;un artefact/classe/opération/propriété/relation est crée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not IDL and to set or not the IDL definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">Gère ou non Idl et positionne ou non les définitions Idl à leur valeur par défaut lorsqu&apos;un artefact/classe/opération/propriété/relation est crée</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To ask or not for a verbose code generation</source>
+        <translation type="unfinished">Génération de code bavarde ou non</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To preserve or not the operations&apos;s body</source>
+        <translation type="unfinished">Préserver ou non le corps des opérations</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To write the operation profile at the beginning of the temporary file when you edit an operation&apos;s body</source>
+        <translation type="unfinished">Pour écrire le profil de l&apos;opération au début du fichier temporaire lorsqu&apos;on en édite le corps</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To show or hide the &lt;i&gt;stereotypes&lt;/i&gt; in the &lt;b&gt;Browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Monter ou cacher les &lt;i&gt;stéréotypes/i&gt; dans l&apos;&lt;i&gt;explorateur&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To select the &lt;i&gt;browser&lt;/i&gt; current item&apos;s parent.</source>
+        <translation type="unfinished">Selectionner le parent de l&apos;élement courant dans l&apos;&lt;i&gt;explorateur&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To search an item in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">Chercher un élément dans  l&apos;&lt;i&gt;explorateur&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To get information about items.</source>
+        <translation type="unfinished">To get information about items.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To set the point size of the base font used in the &lt;i&gt;browser&lt;/i&gt; and the diagrams.</source>
+        <translation type="unfinished">Positionner la taille de la police de caractères de référence utilisée dans l&apos;explorateur et les diagrammes.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To set the default format of the diagrams.</source>
+        <translation type="unfinished">Choisir le format par défaut des diagrammes.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To select the previously selected element in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">Sélectionner dans l&apos;&lt;i&gt;explorateur&lt;/i&gt; l&apos;élément préalablement sélectionné dans l&apos;historique.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To select the next selected element in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">Sélectionner dans l&apos;&lt;i&gt;explorateur&lt;/i&gt; l&apos;élément qui a été sélectionné ensuite dans l&apos;historique.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To ask or not for an auto completion (non case sensitive) in choice list (&lt;i&gt;combo box&lt;/i&gt;)</source>
+        <translation type="unfinished">Demander ou non la complétion automatique dans le liste de choix (sans distinguer majuscule/minuscule)</translation>
+    </message>
+    <message>
+        <location line="+114"/>
+        <location line="+406"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nouveau</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create from &amp;Template</source>
+        <translation type="unfinished">Créer à partir du projet &amp;modèle (template)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Ouvrir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sauver</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save &amp;as...</source>
+        <translation type="unfinished">Sauver &amp;comme...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">&amp;Quitter</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>to set the default stereotypes list</source>
+        <translation type="unfinished">définir la liste des stéréotypes par défaut</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to set the sub classes settings</source>
+        <translation type="unfinished">positionne les options des sous classes</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Nothing available while a dialog is opened</source>
+        <translation type="unfinished">Rien de disponible tant qu&apos;une édition est en cours</translation>
+    </message>
+    <message>
+        <location line="+234"/>
+        <source>Do not forget to set the target languages list
+through the &apos;Languages&apos; menu
+
+If you program in Java, the Java Catalog plug-out
+will help you, use it !</source>
+        <translation type="unfinished">N&apos;oubliez pas de positionner la liste des langages
+via le menu &apos;Langages&apos;
+
+Si vous programmez en Java, le plug-out Catalogue Java
+vous aidera, utilisez-le !</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cannot create directory </source>
+        <translation type="unfinished">Ne peut pas créer le répertoire </translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>The name of the project and the name of
+the directory containing it must be the same
+
+</source>
+        <translation type="unfinished">Le projet et le répertoire conteneur
+doivent avoir le même nom
+
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Project name : </source>
+        <translation type="unfinished">Nom du projet : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Directory name : </source>
+        <translation type="unfinished">Nom du répertoire : </translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Saving can&apos;t be done while a dialog is opened</source>
+        <translation type="unfinished">La sauvegarde n&apos;est pas possible tant qu&apos;une édition est en cours</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>&apos;empty&apos; is reserved to the empty plug-out</source>
+        <translation type="unfinished">&apos;empty&apos; est réservé au plug-out vide</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cannot create directory
+</source>
+        <translation type="unfinished">Ne peut pas créer le répertoire
+</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>The project is modified, save it ?
+</source>
+        <translation type="unfinished">Le projet est modifié, le sauver ?
+</translation>
+    </message>
+    <message>
+        <location line="+371"/>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+853"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+26"/>
+        <source>Unchanged : project is read-only</source>
+        <translation type="unfinished">Inchangé : le projet est en lecture seule</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; set to false.&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</source>
+        <translation type="unfinished">Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; set to false.&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; toggle is cleared !&lt;br&gt;&lt;br&gt;Next code generations will replace operations&apos;s body&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</source>
+        <translation type="unfinished">Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; toggle is cleared !&lt;br&gt;&lt;br&gt;Next code generations will replace operations&apos;s body&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Project file is read-only, new font size will not be saved, continue ?
+</source>
+        <translation type="unfinished">Le fichier projet est en lecture seule, la nouvelle taille de police de caractères ne sera pas sauvée, continuer ?
+</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Project file is read-only, default format will not be saved, continue ?
+</source>
+        <translation type="unfinished">Le fichier projet est en lecture seule, le nouveau format par défaut ne sera pas sauvé, continuer ?
+</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UseCaseDiagramView.cpp" line="+121"/>
+        <source>Use case diagram menu</source>
+        <translation type="unfinished">Menu de diagramme de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-119"/>
+        <source>Click this button to add an &lt;i&gt;actor&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;acteur&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;use case&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the use case from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;cas d&apos;utilisation&lt;/i&gt; dans le diagramme. &lt;br&gt;&lt;br&gt;Vous pouvez aussi faire un glisser-déposer depuis l&apos;&lt;b&gt;explorateur&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Click this button to add a &lt;i&gt;fragment&lt;/i&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;fragment&lt;/i&gt; dans le diagramme.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;subject&lt;/i&gt;.</source>
+        <translation type="unfinished">Pour ajouter un &lt;i&gt;sujet&lt;/i&gt; dans le diagramme.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create an &lt;i&gt;association&lt;/i&gt;</source>
+        <translation type="unfinished">Pour créer une &lt;i&gt;association&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to create a &lt;i&gt;generalisation&lt;/i&gt;</source>
+        <translation type="unfinished">Pour créer une &lt;i&gt;généralisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;note&lt;/i&gt;</source>
+        <translation type="unfinished">Pour créer une &lt;i&gt;note&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a connection between a &lt;i&gt;note&lt;/i&gt; and any other item, or between an &lt;i&gt;association&lt;/i&gt; and a &lt;i&gt;class&lt;/i&gt; in case of an &lt;i&gt;association class&lt;/i&gt;.</source>
+        <translation type="unfinished">Pour créer une connexion entre une &lt;i&gt;Note&lt;/i&gt; et un autre élément, ou entre une &lt;i&gt;association&lt;/i&gt; et une &lt;i&gt;classe&lt;/i&gt; dans le cas d&apos;une &lt;i&gt;classe association&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add an &lt;i&gt;image&lt;/i&gt;</source>
+        <translation type="unfinished">Pour afficher une image</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Actor</source>
+        <translation type="unfinished">Acteur</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../dialog/StereotypesDialog.cpp" line="+195"/>
+        <source>Use Case</source>
+        <translation type="unfinished">Cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Subject</source>
+        <translation type="unfinished">Ajouter un sujet</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-1068"/>
+        <source>Pre
+condition : </source>
+        <translation type="unfinished">Condition
+préalable : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Post
+condition : </source>
+        <translation type="unfinished">Condition
+de sortie : </translation>
+    </message>
+    <message>
+        <location line="+285"/>
+        <location line="+25"/>
+        <location line="+922"/>
+        <location line="+13"/>
+        <location line="+62"/>
+        <location line="+13"/>
+        <source>trigger - Ocl</source>
+        <translation type="unfinished">déclancheur - Ocl</translation>
+    </message>
+    <message>
+        <location line="-1029"/>
+        <source>unmarshall</source>
+        <translation type="unfinished">désérialise</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>time event</source>
+        <translation type="unfinished">événement temporel</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+22"/>
+        <location line="+19"/>
+        <location line="+896"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <location line="+36"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <source>trigger : </source>
+        <translation type="unfinished">déclancheur : </translation>
+    </message>
+    <message>
+        <location line="-1031"/>
+        <location line="+12"/>
+        <location line="+923"/>
+        <location line="+12"/>
+        <location line="+63"/>
+        <location line="+12"/>
+        <source>trigger - C++</source>
+        <translation type="unfinished">déclancheur - C++</translation>
+    </message>
+    <message>
+        <location line="-1003"/>
+        <location line="+12"/>
+        <location line="+923"/>
+        <location line="+12"/>
+        <location line="+63"/>
+        <location line="+12"/>
+        <source>trigger - Java</source>
+        <translation type="unfinished">déclancheur - Java</translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+13"/>
+        <source>signal - Ocl</source>
+        <translation type="unfinished">signal - Ocl</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <source>signal : </source>
+        <translation type="unfinished">signal : </translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location line="+12"/>
+        <source>signal - C++</source>
+        <translation type="unfinished">signal - C++</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+12"/>
+        <source>signal - Java</source>
+        <translation type="unfinished">signal - Java</translation>
+    </message>
+    <message>
+        <location line="+497"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Choose behavior selected in browser</source>
+        <translation type="unfinished">Choisir le comportement sélectionné dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Create activity and choose it</source>
+        <translation type="unfinished">Créer une activité et la choisir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Create state machine and choose it</source>
+        <translation type="unfinished">Créer une machine à état et la choisir</translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <location line="+13"/>
+        <source>classifier - Ocl</source>
+        <translation type="unfinished">classifieur - Ocl</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>classifier : </source>
+        <translation type="unfinished">classifieur : </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location line="+20"/>
+        <source>flags - Ocl</source>
+        <translation type="unfinished">drapeaux - Ocl</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>links</source>
+        <translation type="unfinished">liens</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>owned objects</source>
+        <translation type="unfinished">objets propres</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BasicDialog.cpp" line="-49"/>
+        <location filename="../dialog/ClassDialog.cpp" line="+866"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-152"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <location filename="../dialog/ClassDialog.cpp" line="+783"/>
+        <location filename="../dialog/PackageDialog.cpp" line="+101"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BodyDialog.cpp" line="+81"/>
+        <source>Note : operation bodies preserved</source>
+        <translation type="unfinished">Remarque : corps d&apos;opération préservés</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can specify the editor through the environment dialog</source>
+        <translation type="unfinished">Vous pouvez spécifier l&apos;éditeur via l&apos;editeur d&apos;environnement</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BrowserSearchDialog.cpp" line="+95"/>
+        <location filename="../dialog/ReferenceDialog.cpp" line="+160"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Retirer la marque</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location filename="../dialog/ReferenceDialog.cpp" line="+0"/>
+        <source>Mark</source>
+        <translation type="unfinished">Marquer</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="-3428"/>
+        <location filename="../dialog/ImageDialog.cpp" line="+27"/>
+        <source>Select image</source>
+        <translation type="unfinished">Choisir l&apos;image</translation>
+    </message>
+    <message>
+        <location line="+1599"/>
+        <source>Type (C++)</source>
+        <translation type="unfinished">Type (C++)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default value (C++)</source>
+        <translation type="unfinished">Valeur par défaut (C++)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+72"/>
+        <location filename="../dialog/ToolDialog.cpp" line="+221"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="+369"/>
+        <source>inherited class formal</source>
+        <translation type="unfinished">formel de class hérité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>actual</source>
+        <translation type="unfinished">actuel</translation>
+    </message>
+    <message>
+        <location line="+147"/>
+        <source>element kind</source>
+        <translation type="unfinished">sorte d&apos;élément</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>applicable</source>
+        <translation type="unfinished">applicable</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+22"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="+90"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+34"/>
+        <source>yes</source>
+        <translation type="unfinished">oui</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Parameterized</source>
+        <translation type="unfinished">Paramétrée</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Instantiate</source>
+        <translation type="unfinished">Instancier</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+490"/>
+        <source>follow uml</source>
+        <translation type="unfinished">suivre uml</translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <source>Stereotype</source>
+        <translation type="unfinished">Stéréotype</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>source</source>
+        <translation type="unfinished">source</translation>
+    </message>
+    <message>
+        <location line="+204"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Montrer les annotations</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Editer les annotations</translation>
+    </message>
+    <message>
+        <location line="+303"/>
+        <source>Set it relative to image root</source>
+        <translation type="unfinished">passer en relatif / racine</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it relative to project</source>
+        <translation type="unfinished">passer en relatif / projet</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="-907"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-518"/>
+        <source>Set it absolute</source>
+        <translation type="unfinished">passer en absolue</translation>
+    </message>
+    <message>
+        <location line="+156"/>
+        <location filename="../misc/Images.cpp" line="+1"/>
+        <source>
+doesn&apos;t exist or is not a know image format</source>
+        <translation type="unfinished">
+n&apos;existe pas ou n&apos;est pas un formatage d&apos;image connu</translation>
+    </message>
+    <message>
+        <location filename="../dialog/CodEditMsgDialog.cpp" line="+47"/>
+        <source>Communication diagram message dialog</source>
+        <translation type="unfinished">Editeur de message de communication</translation>
+    </message>
+    <message>
+        <location filename="../dialog/DialogUtil.cpp" line="+315"/>
+        <source>Cannot open &apos;%1&apos;</source>
+        <translation type="unfinished">Ne peut ouvrir &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Sub dialog(s) still opened
+If you choose &apos;Ok&apos; the dialog will be closed
+without taking into account it content</source>
+        <translation type="unfinished">Sous éditeur(s) encore ouvert(s)
+Si vous validez l&apos;éditeur sera fermé
+sans prendre son contenu en compte</translation>
+    </message>
+    <message>
+        <location filename="../dialog/EdgeMenuDialog.cpp" line="+149"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location filename="../dialog/EnvDialog.cpp" line="-75"/>
+        <source>Invalid identifier, must be an integer between 2 and 127</source>
+        <translation type="unfinished">Identificateur invalide, doit valoir entre 2 et 127</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Invalid DEFAULT SCREEN : coordinates can&apos;t be negative</source>
+        <translation type="unfinished">Ecran par défaut invalide, coordonnée négative</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid DEFAULT SCREEN : the right must be greater than the left</source>
+        <translation type="unfinished">Ecran par défaut invalide, la coordonnée droite doit être supérieur à la gauche</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid DEFAULT SCREEN : the bottom must be greater than the top</source>
+        <translation type="unfinished">Ecran par défaut invalide, le coordonnée du bas doit être supérieure au haut</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>small DEFAULT SCREEN, width less than 500 points !</source>
+        <translation type="unfinished">Ecrans par défaut trés petit, largeur inférieure à 500 points !</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>small DEFAULT SCREEN, height less than 500 points !</source>
+        <translation type="unfinished">Ecrans par défaut trés petit, hauteur inférieure à 500 points !</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Invalid DEFAULT SCREENTo not specify the desktop all values must be empty or null.Else the values must be non negative, the right must be greater
+than the left, and the bottom must be greater than the top</source>
+        <translation type="unfinished">Ecrans par défaut invalide. Pour ne pas spécifier d&apos;écran par défaut toutes les valeurs doivent être vide ou nulles. Sinon les valeurs ne peuvent être négatives, la droite doit être supérieur
+à la gauche et le bas supérieur au haut
+</translation>
+    </message>
+    <message>
+        <location line="+195"/>
+        <source>Own identifier missing or invalid</source>
+        <translation type="unfinished">Identificateur propre absent ou invalide</translation>
+    </message>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="-1576"/>
+        <source>Types</source>
+        <translation type="unfinished">Types</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-50"/>
+        <location line="+38"/>
+        <location line="+28"/>
+        <source>Stereotypes</source>
+        <translation type="unfinished">Stéréotypes</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>empty</source>
+        <translation type="unfinished">vide</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>1 space</source>
+        <translation type="unfinished">1 espace</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>1 tab</source>
+        <translation type="unfinished">1 tabulation</translation>
+    </message>
+    <message>
+        <location line="+625"/>
+        <location line="+208"/>
+        <location line="+26"/>
+        <source>Modifiers</source>
+        <translation type="unfinished">Modifieurs</translation>
+    </message>
+    <message>
+        <location line="+663"/>
+        <source>Description</source>
+        <translation type="unfinished">Description</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-1"/>
+        <source>Set it relative</source>
+        <translation type="unfinished">passer en relatif</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>Directory</source>
+        <translation type="unfinished">Répertoire</translation>
+    </message>
+    <message>
+        <location line="+144"/>
+        <source>C++ &apos;in&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">la forme d&apos;un paramètre d&apos;entrée de type énumeration doit contenir ${type} pour C++</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;out&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">la forme d&apos;un paramètre de sortie de type énumeration doit contenir ${type} pour C++</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;inout&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">la forme d&apos;un paramètre d&apos;entrée/sortie de type énumeration doit contenir ${type} pour C++</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;return&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">la forme du type de retour de type énumeration doit contenir ${type} pour C++</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>C++ &apos;in&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">la forme d&apos;un paramètre d&apos;entrée doit contenir ${type} pour C++</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;out&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">la forme d&apos;un paramètre de sortie doit contenir ${type} pour C++</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;inout&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">la forme d&apos;un paramètre d&apos;entrée/sortie doit contenir ${type} pour C++</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;return&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">la forme du type de retour doit contenir ${type} pour C++</translation>
+    </message>
+    <message>
+        <location line="+299"/>
+        <source>C++ root directory</source>
+        <translation type="unfinished">répertoire racine pour C++</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Java root directory</source>
+        <translation type="unfinished">répertoire racine pour Java</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Php root directory</source>
+        <translation type="unfinished">répertoire racine pour Php</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Python root directory</source>
+        <translation type="unfinished">répertoire racine pour Python</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Idl root directory</source>
+        <translation type="unfinished">répertoire racine pour Idl</translation>
+    </message>
+    <message>
+        <location filename="../dialog/HelpDialog.cpp" line="+63"/>
+        <source>HelpDialog : error while executing &apos;%1&apos;
+perhaps you must specify its absolute pathor set the environment variable PATH ?</source>
+        <translation type="unfinished">HelpDialog : error while executing &apos;%1&apos;
+perhaps you must specify its absolute pathor set the environment variable PATH ?</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>The documentation is too old.&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished">La documentation est trop vieille.&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The documentation isn&apos;t installed.&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished">La documentation n&apos;est pas installée.&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The &quot;.tar.gz&quot; or &quot;.7z&quot; archives are available here:&lt;ul&gt;&lt;li&gt;http://bouml.sourceforge.net/documentation.html&lt;/li&gt;&lt;li&gt;http://sourceforge.net/projects/douml/documentation.html&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;Extract an archive and set the environment through the Miscellaneousmenu to indicate where the directory &quot;doc&quot; is then close this dialog and redo</source>
+        <translation type="unfinished">The &quot;.tar.gz&quot; or &quot;.7z&quot; archives are available here:&lt;ul&gt;&lt;li&gt;http://bouml.sourceforge.net/documentation.html&lt;/li&gt;&lt;li&gt;http://sourceforge.net/projects/douml/documentation.html&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;Extract an archive and set the environment through the Miscellaneousmenu to indicate where the directory &quot;doc&quot; is then close this dialog and redo</translation>
+    </message>
+    <message>
+        <location filename="../dialog/KeyValueTable.cpp" line="-44"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-74"/>
+        <source>Key</source>
+        <translation type="unfinished">Clef</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Valeur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do</source>
+        <translation type="unfinished">Do</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>key &apos;%1&apos; used several times</source>
+        <translation type="unfinished">la clef &apos;%1&apos; est utilisée plusieurs fois</translation>
+    </message>
+    <message>
+        <location filename="../dialog/PackageDialog.cpp" line="+409"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <location line="+9"/>
+        <source>conflict on stereotypes</source>
+        <translation type="unfinished">conflit au niveau des stéréotypes</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>C++ header directory</source>
+        <translation type="unfinished">Répertoire d&apos;en tête C+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ source directory</source>
+        <translation type="unfinished">Répertoire de source C+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Java directory</source>
+        <translation type="unfinished">Répertoire de source Java</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Php directory</source>
+        <translation type="unfinished">Répertoire de source Php</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Python directory</source>
+        <translation type="unfinished">Répertoire de source Python</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Idl directory</source>
+        <translation type="unfinished">Répertoire de Idl</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ReferenceDialog.cpp" line="-95"/>
+        <source> is referenced by :</source>
+        <translation type="unfinished"> est référencé par :</translation>
+    </message>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="+43"/>
+        <source>Transparent</source>
+        <translation type="unfinished">Transparent</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unknown color</source>
+        <translation type="unfinished">Couleur inconnue</translation>
+    </message>
+    <message>
+        <location line="+166"/>
+        <source>Diagram Drawing Settings dialog</source>
+        <translation type="unfinished">Editeur d&apos;option de d&apos;affichage de diagramme</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>diagram</source>
+        <translation type="unfinished">diagramme</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>color</source>
+        <translation type="unfinished">couleur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>default </source>
+        <translation type="unfinished">par défaut </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>color [1]</source>
+        <translation type="unfinished">couleur [1]</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>color [2]</source>
+        <translation type="unfinished">couleur [2]</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;inchangé&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>default</source>
+        <translation type="unfinished">par défaut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>unlimited</source>
+        <translation type="unfinished">illimité</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-68"/>
+        <source>Command</source>
+        <translation type="unfinished">Commande</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>tool display</source>
+        <translation type="unfinished">affichage d&apos;outil</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>command</source>
+        <translation type="unfinished">commande</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>shortcut </source>
+        <translation type="unfinished">raccoursi </translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Shift </source>
+        <translation type="unfinished">Shift </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Ctrl </source>
+        <translation type="unfinished">Contrôle </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Alt </source>
+        <translation type="unfinished">Alt </translation>
+    </message>
+    <message>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-92"/>
+        <source>Package</source>
+        <translation type="unfinished">Paquetage</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Class</source>
+        <translation type="unfinished">Classe</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Artifact</source>
+        <translation type="unfinished">Artefact</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Views</source>
+        <translation type="unfinished">Vues</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Diagrams</source>
+        <translation type="unfinished">Diagrammes</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Activities</source>
+        <translation type="unfinished">Activités</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Others</source>
+        <translation type="unfinished">Autres</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ToolDialog.cpp" line="-19"/>
+        <source>executable</source>
+        <translation type="unfinished">exécutable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>display</source>
+        <translation type="unfinished">affichage</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="-77"/>
+        <source>Warning</source>
+        <translation type="unfinished">Attention</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Douml is working in transitional mode.
+ All UI improvements are yours to use,  but saving is done in the format of Bouml 4.22 which loses all new c++11 and hierarchy specifiers
+
+To suppress this warning place empty file override_transition.txt into the application folder
+To disable the mode - change compatibility_save parameter to 0 in settings.ini
+</source>
+        <translation type="unfinished">Douml is working in transitional mode.
+ All UI improvements are yours to use,  but saving is done in the format of Bouml 4.22 which loses all new c++11 and hierarchy specifiers
+
+To suppress this warning place empty file override_transition.txt into the application folder
+To disable the mode - change compatibility_save parameter to 0 in settings.ini
+</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>DO NOT CONFIRM</source>
+        <translation type="unfinished">NE PAS CONFIRMER</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Root mode protection
+
+This mode allows us to develop DoUML
+
+do NOT confirm to avoid a disaster !!!
+
+confirm ?</source>
+        <translation type="unfinished">Mode de protection administrateur
+
+Ce mode nous permet de développer DoUML
+
+ne PAS confirmer sous peine de désastre !!!
+
+confirmer ?</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>DoUML was called with wrong parameters, ignore them</source>
+        <translation type="unfinished">DoUML fut appelé avec de mauvais paramètres, les ignore</translation>
+    </message>
+    <message>
+        <location filename="../misc/ProfiledStereotypes.cpp" line="+660"/>
+        <location line="+17"/>
+        <source>isn&apos;t in a profile</source>
+        <translation type="unfinished">n&apos;est pas un profil</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+17"/>
+        <source>is already a stereotype</source>
+        <translation type="unfinished">est déjà un stéréotype</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+280"/>
+        <source>Unconsistency</source>
+        <translation type="unfinished">Incohérent</translation>
+    </message>
+    <message>
+        <location line="-279"/>
+        <location line="+280"/>
+        <source>stereotype &apos;%1&apos; defined several times,
+redondant definition is not managed as a stereotype</source>
+        <translation type="unfinished">stereotype &apos;%1&apos; defined several times,
+redondant definition is not managed as a stereotype</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>Check</source>
+        <translation type="unfinished">Vérifier</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotype</source>
+        <translation type="unfinished">appeler le &lt;i&gt;plug-out de vérification&lt;/i&gt; associé au profil</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Force stereotype consistency</source>
+        <translation type="unfinished">Force la cohérence des stéréotypes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to recompute all concerning the profiles</source>
+        <translation type="unfinished">recalcule tout concernant les profils</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Check recursively</source>
+        <translation type="unfinished">Vérifier récursivement</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotypes,doing down recursively</source>
+        <translation type="unfinished">appeler le &lt;i&gt;plug-out de vérification&lt;/i&gt; associé au profil, descendant récursivement</translation>
+    </message>
+    <message>
+        <location filename="../misc/Settings.cpp" line="-822"/>
+        <location line="+43"/>
+        <location line="+42"/>
+        <location line="+288"/>
+        <location line="+13"/>
+        <location line="+155"/>
+        <location line="+17"/>
+        <location line="+22"/>
+        <location line="+761"/>
+        <location line="+8"/>
+        <location line="+191"/>
+        <location line="+7"/>
+        <source>drawing language</source>
+        <translation type="unfinished">langage d&apos;affichage</translation>
+    </message>
+    <message>
+        <location line="-1546"/>
+        <location line="+231"/>
+        <source>drawing mode</source>
+        <translation type="unfinished">mode d&apos;affichage</translation>
+    </message>
+    <message>
+        <location line="-230"/>
+        <location line="+34"/>
+        <location line="+197"/>
+        <source>show context</source>
+        <translation type="unfinished">affficher le contexte</translation>
+    </message>
+    <message>
+        <location line="-230"/>
+        <source>hide attributes</source>
+        <translation type="unfinished">cacher les propriétés</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>hide operations</source>
+        <translation type="unfinished">cacher les opérations</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>hide get/set operations</source>
+        <translation type="unfinished">cacher les opération d&apos;accès/modification</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>show members full definition</source>
+        <translation type="unfinished">montrer la définition complète des membres</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+42"/>
+        <source>show members visibility</source>
+        <translation type="unfinished">montrer la visibilité des membres</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show members stereotype</source>
+        <translation type="unfinished">montrer le stéréotype des membres</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show context in members definition</source>
+        <translation type="unfinished">afficher le contexte dans les membres</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show attributes multiplicity</source>
+        <translation type="unfinished">montrer la multiplicité des propriétés</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>show attributes initialisation</source>
+        <translation type="unfinished">montrer l&apos;initialisation des propriétés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+42"/>
+        <location line="+42"/>
+        <source>show attribute modifiers</source>
+        <translation type="unfinished">montrer les modifieurs de propriétés</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <location line="+42"/>
+        <source>show parameter direction</source>
+        <translation type="unfinished">montrer la direction des paramètres</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show parameter name</source>
+        <translation type="unfinished">montrer le nom des paramètres</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>members max width</source>
+        <translation type="unfinished">largeur maximale des membres</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+48"/>
+        <location line="+42"/>
+        <location line="+1423"/>
+        <location line="+7"/>
+        <source>show information note</source>
+        <translation type="unfinished">montrer les notes d&apos;informations</translation>
+    </message>
+    <message>
+        <location line="-1518"/>
+        <location line="+9"/>
+        <location line="+38"/>
+        <location line="+42"/>
+        <location line="+117"/>
+        <location line="+146"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+117"/>
+        <location line="+11"/>
+        <location line="+310"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location line="+201"/>
+        <location line="+8"/>
+        <location line="+191"/>
+        <location line="+7"/>
+        <source>show stereotype properties</source>
+        <translation type="unfinished">montrer le stéréotype des propriétés</translation>
+    </message>
+    <message>
+        <location line="-1513"/>
+        <source>name in tab</source>
+        <translation type="unfinished">nom dans l&apos;onglet</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+42"/>
+        <source>classes drawing mode</source>
+        <translation type="unfinished">mode d&apos;affichage des classes</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes attributes</source>
+        <translation type="unfinished">cacher les attributs des classes</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes operations</source>
+        <translation type="unfinished">cacher les opérations des classes</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes get/set operations</source>
+        <translation type="unfinished">cacher les opérations d&apos;accès/modification des classes</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>show classes members full definition</source>
+        <translation type="unfinished">montrer la définition complète des membres des classes</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <source>show attributes initialization</source>
+        <translation type="unfinished">montrer l&apos;initialisation des propriétés</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+42"/>
+        <location line="+269"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+116"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+207"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>draw all relations</source>
+        <translation type="unfinished">dessiner toutes les relations</translation>
+    </message>
+    <message>
+        <location line="-1403"/>
+        <location line="+43"/>
+        <source>show relation modifiers</source>
+        <translation type="unfinished">montrer les modificateurs de relations</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+43"/>
+        <source>show relation visibility</source>
+        <translation type="unfinished">montrer la visibilité des relations</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+40"/>
+        <location line="+455"/>
+        <location line="+131"/>
+        <location line="+127"/>
+        <location line="+103"/>
+        <location line="+114"/>
+        <location line="+217"/>
+        <location line="+209"/>
+        <source>show packages name in tab</source>
+        <translation type="unfinished">écrire les noms de paquetage dans les onglets</translation>
+    </message>
+    <message>
+        <location line="-1395"/>
+        <location line="+42"/>
+        <location line="+435"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <source>show classes and packages context</source>
+        <translation type="unfinished">montrer le contexte des classes et paquetages</translation>
+    </message>
+    <message>
+        <location line="-625"/>
+        <location line="+42"/>
+        <location line="+573"/>
+        <location line="+11"/>
+        <location line="+116"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+205"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>automatic labels position</source>
+        <translation type="unfinished">positionnement automatique des étiquettes</translation>
+    </message>
+    <message>
+        <location line="-1392"/>
+        <location line="+42"/>
+        <location line="+262"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+117"/>
+        <location line="+11"/>
+        <location line="+92"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+207"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>draw shadow</source>
+        <translation type="unfinished">montrer les ombres</translation>
+    </message>
+    <message>
+        <location line="-1381"/>
+        <source>show classes members visibility</source>
+        <translation type="unfinished">montrer la visibilité des membres des classes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show classes members stereotype</source>
+        <translation type="unfinished">montrer le stérotype des membres des classes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show context in classes members definition</source>
+        <translation type="unfinished">montrer les contexte dans les membres des classes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show attribute multiplicity</source>
+        <translation type="unfinished">montrer la multiplicité de la propriétés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show attribute initialization</source>
+        <translation type="unfinished">montrer l&apos;initialisation de la propriété</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>show operation parameter direction</source>
+        <translation type="unfinished">montrer la direction du paramètre d&apos;opération</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show operation parameter name</source>
+        <translation type="unfinished">montrer le nom du paramètre d&apos;opération</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>max members width</source>
+        <translation type="unfinished">largeur maximale des membres</translation>
+    </message>
+    <message>
+        <location line="+266"/>
+        <location line="+13"/>
+        <source>instances drawing mode</source>
+        <translation type="unfinished">mode d&apos;affichage des instances</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <location line="+13"/>
+        <location line="+154"/>
+        <location line="+18"/>
+        <location line="+21"/>
+        <source>show operations full definition</source>
+        <translation type="unfinished">montrer la définition complète des opérations</translation>
+    </message>
+    <message>
+        <location line="-205"/>
+        <location line="+13"/>
+        <location line="+157"/>
+        <location line="+18"/>
+        <location line="+121"/>
+        <location line="+11"/>
+        <source>write name:type horizontally</source>
+        <translation type="unfinished">écrire nom:type horizontalement</translation>
+    </message>
+    <message>
+        <location line="-319"/>
+        <location line="+13"/>
+        <source>show classes context</source>
+        <translation type="unfinished">montrer le contexte des classes</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+15"/>
+        <source>show messages context</source>
+        <translation type="unfinished">montrer le contexte dans les messages</translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <source>sequence</source>
+        <translation type="unfinished">séquence</translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+18"/>
+        <location line="+22"/>
+        <source>show hierarchical rank</source>
+        <translation type="unfinished">montrer le rang hiérarchique</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <location line="+138"/>
+        <location line="+127"/>
+        <location line="+105"/>
+        <location line="+113"/>
+        <location line="+216"/>
+        <location line="+209"/>
+        <source>packages name in tab</source>
+        <translation type="unfinished">nom des paquetage dans les onglets</translation>
+    </message>
+    <message>
+        <location line="-900"/>
+        <source>communication</source>
+        <translation type="unfinished">communication</translation>
+    </message>
+    <message>
+        <location line="+138"/>
+        <source>object</source>
+        <translation type="unfinished">objet</translation>
+    </message>
+    <message>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+104"/>
+        <location line="+10"/>
+        <location line="+206"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>show packages context</source>
+        <translation type="unfinished">montrer le contexte des paquetages</translation>
+    </message>
+    <message>
+        <location line="-651"/>
+        <location line="+11"/>
+        <source>class drawing mode</source>
+        <translation type="unfinished">mode d&apos;affichage de classe</translation>
+    </message>
+    <message>
+        <location line="+205"/>
+        <source>write node instance horizontally</source>
+        <translation type="unfinished">ecrire le noeud d&apos;instance horizontalement</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+84"/>
+        <source>deployment</source>
+        <translation type="unfinished">déployment</translation>
+    </message>
+    <message>
+        <location line="-80"/>
+        <source>write node instances horizontally</source>
+        <translation type="unfinished">ecrire les noeuds d&apos;instance horizontalement</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>draw component as icon</source>
+        <translation type="unfinished">dessiner le composant via un icône</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>show component&apos;s required
+and provided interfaces</source>
+        <translation type="unfinished">montrer les interfaces de
+composant requises et fournies</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>show component&apos;s realizations</source>
+        <translation type="unfinished">montrer les réalisation de composants</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <location line="+11"/>
+        <source>write transition horizontally</source>
+        <translation type="unfinished">écrire la transition horizontalement</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location line="+11"/>
+        <source>show transition definition</source>
+        <translation type="unfinished">montrer la définition de la transition</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <location line="+8"/>
+        <source>show state activities</source>
+        <translation type="unfinished">montrer les activités d&apos;état</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>draw state&apos;s regions horizontally</source>
+        <translation type="unfinished">dessiner les régions d&apos;état horizontalement</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+11"/>
+        <source>write flow label horizontally</source>
+        <translation type="unfinished">écrire les étiquettes de flux horizontalement</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location line="+11"/>
+        <source>show opaque action definition</source>
+        <translation type="unfinished">montrer la définition d&apos;une activité opaque</translation>
+    </message>
+    <message>
+        <location filename="../misc/mu.cpp" line="+66"/>
+        <source>                            The project is open in read-only mode because it is
+                            under the control of &apos;Project control&apos; or &apos;Project merge&apos;
+                            (the directory &apos;%1&apos; exists</source>
+        <translation type="unfinished">                            The project is open in read-only mode because it is
+                            under the control of &apos;Project control&apos; or &apos;Project merge&apos;
+                            (the directory &apos;%1&apos; exists</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+7"/>
+        <source>User Own Identifier</source>
+        <translation type="unfinished">Identificateur propre à un utilisateur</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Can&apos;t create directory &apos;%1&apos;,
+the project is open in read-only mode</source>
+        <translation type="unfinished">Ne peut créer le répertoire &apos;%1&apos;,
+le projet est ouvert en lecture seule</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>It seems that you are already editing the project %1.
+
+If you&apos;re SURE that this is not the case and
+another user does not have an identifier equal
+to yours you can gain ownership of the lock.</source>
+        <translation type="unfinished">It seems that you are already editing the project %1.
+
+If you&apos;re SURE that this is not the case and
+another user does not have an identifier equal
+to yours you can gain ownership of the lock.</translation>
+    </message>
+    <message>
+        <location filename="../misc/myio.cpp" line="-927"/>
+        <source> is not a visibility</source>
+        <translation type="unfinished"> n&apos;est pas une visibilité</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source> is not a direction</source>
+        <translation type="unfinished"> n&apos;est pas une direction</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source> is not a parameter effect</source>
+        <translation type="unfinished"> n&apos;est pas un effet</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source> is not an activity action kind</source>
+        <translation type="unfinished"> n&apos;est pas une sorte d&apos;action d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source> is not an expansion node kind</source>
+        <translation type="unfinished"> n&apos;est pas une sorte de noeud d&apos;expansion</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source> is not an ordering</source>
+        <translation type="unfinished"> n&apos;est pas une façon d&apos;ordonner</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source> is not a state</source>
+        <translation type="unfinished"> n&apos;est pas un état</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source> is not a class drawing mode</source>
+        <translation type="unfinished"> n&apos;est pas un mode d&apos;affichage de classe</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> is not a drawing language</source>
+        <translation type="unfinished"> n&apos;est pas un langage d&apos;affichage</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> is not a context mode</source>
+        <translation type="unfinished"> n&apos;est pas un contexte d&apos;affichage</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source> is not a color</source>
+        <translation type="unfinished"> n&apos;est pas une couleur</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source> is not a font</source>
+        <translation type="unfinished"> n&apos;est pas une police de caractères</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <source> is not a canvas format</source>
+        <translation type="unfinished"> n&apos;est pas un format</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source> is not a pseudo state kind</source>
+        <translation type="unfinished"> n&apos;est pas une sorte de pseudo état</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source> is not an activity node kind</source>
+        <translation type="unfinished"> n&apos;est pas une sortede noeud d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source> is not a line geometry</source>
+        <translation type="unfinished"> n&apos;est pas une géométrie de ligne</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>
+cannot be renamed </source>
+        <translation type="unfinished">
+ne peut être renommé </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>, retry ?
+</source>
+        <translation type="unfinished">, recommencer ?
+</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>
+cannot be opened for write, retry ?
+</source>
+        <translation type="unfinished">
+ne peut être ouvert en écriture, recommencer ?
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>
+cannot be opened for read, retry ?
+</source>
+        <translation type="unfinished">
+ne peut être ouvert en lecture, recommencer ?
+</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>cannot open %1 to read it</source>
+        <translation type="unfinished">ne peut ouvrir %1 en lecture</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>cannot create %1</source>
+        <translation type="unfinished">ne peut créer %1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>error when writing %1</source>
+        <translation type="unfinished">erreur d&apos;écriture dans %1</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>error when reading %1</source>
+        <translation type="unfinished">erreur de lecture dans %1</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <location line="+63"/>
+        <source>%1 cannot be read</source>
+        <translation type="unfinished">%1 ne peut être lu</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Cannot save definition in
+%1
+may be your disk is full</source>
+        <translation type="unfinished">Ne peut sauver la définition dans
+%1
+votre disque est peut être plein</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source> line </source>
+        <translation type="unfinished"> ligne </translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <source>premature end of file, string expected</source>
+        <translation type="unfinished">fin de fichier prématurée, chaine de caractères attendue</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>string expected after &apos;%1&apos;</source>
+        <translation type="unfinished">chaine de caractères attendue après %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+20"/>
+        <source>premature end of file reading a string</source>
+        <translation type="unfinished">fin de fichier prématurée en lisant une chaine de caractères</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>premature end of file, keyword expected</source>
+        <translation type="unfinished">fin de fichier prématurée, mot clef attendu</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>keyword expected after &apos;%1&apos;</source>
+        <translation type="unfinished">mot clef attendu après %1</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+44"/>
+        <source>premature end of file, &apos;%1&apos; expected</source>
+        <translation type="unfinished">fin de fichier prématurée, %1 attendu</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <location line="+44"/>
+        <source>&apos;%1&apos; expected rather than a string after &apos;%2&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; attendu plutôt qu&apos;une chaine de caractères après &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="-27"/>
+        <location line="+44"/>
+        <source>&apos;%1&apos; expected rather than &apos;%2&apos; after &apos;%3&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; attendu plutôt que &apos;%2&apos; après &apos;%3&apos;</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>premature end of file, id expected</source>
+        <translation type="unfinished">fin de fichier prématurée, identificateur attendu</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+9"/>
+        <source>id expected after &apos;%1&apos;</source>
+        <translation type="unfinished">identificateur attendu après &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>premature end of file, unsigned expected</source>
+        <translation type="unfinished">fin de fichier prématurée, nombre entier non signé attendu</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+13"/>
+        <source>unsigned expected after &apos;%1&apos;</source>
+        <translation type="unfinished">nombre entier non signé attendu après &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>premature end of file, float expected</source>
+        <translation type="unfinished">fin de fichier prématurée, flottant attendu</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>float expected after &apos;%1&apos;</source>
+        <translation type="unfinished">flottant attendu après &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>float expected rather than &apos;%1&apos; after &apos;%2&apos;</source>
+        <translation type="unfinished">flottant attendu plutôt que &apos;%1&apos; après &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>premature end of file</source>
+        <translation type="unfinished">fin de fichier prématurée</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>&apos;%1&apos; expected rather than &apos;%2&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; attendu plutôt que &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unknown or unexpected keyword &apos;%1&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; mot clef inconnu ou non attendu</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>%1 unknown %2 identifier</source>
+        <translation type="unfinished">%1 identificateur inconnu de &apos;%2&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>QuickEdit</name>
+    <message>
+        <location filename="../ui/quickedit.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Previous Item</source>
+        <translation type="unfinished">Previous Item</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Next Item</source>
+        <translation type="unfinished">Next Item</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>C++</source>
+        <translation type="unfinished">C++</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Java</source>
+        <translation type="unfinished">Java</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Python</source>
+        <translation type="unfinished">Python</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Php</source>
+        <translation type="unfinished">Php</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Idl</source>
+        <translation type="unfinished">Idl</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Operation</source>
+        <translation type="unfinished">Operation</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Parameter</source>
+        <translation type="unfinished">Parameter</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Propriété</translation>
+    </message>
+    <message>
+        <location filename="../CustomWidgets/quickedit.cpp" line="+136"/>
+        <source>Collapse/Expand</source>
+        <translation type="unfinished">Collapse/Expand</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Self</source>
+        <translation type="unfinished">Self</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Parent</source>
+        <translation type="unfinished">Parent</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move marked before</source>
+        <translation type="unfinished">Move marked before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move marked after</source>
+        <translation type="unfinished">Déplacer les éléments marqués après</translation>
+    </message>
+</context>
+<context>
+    <name>ReduceDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+103"/>
+        <location line="+25"/>
+        <source>reducer - Ocl</source>
+        <translation type="unfinished">réducteur - Ocl</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordonné</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>reducer :</source>
+        <translation type="unfinished">réducteur :</translation>
+    </message>
+</context>
+<context>
+    <name>ReferenceDialog</name>
+    <message>
+        <location filename="../dialog/ReferenceDialog.cpp" line="-8"/>
+        <source>Referenced By dialog</source>
+        <translation type="unfinished">Editeur de référencement</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Recompute</source>
+        <translation type="unfinished">Recalcule</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Retirer la marque</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mark them</source>
+        <translation type="unfinished">Les marquer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Retirer toutes les marques</translation>
+    </message>
+</context>
+<context>
+    <name>RelTable</name>
+    <message>
+        <location filename="../dialog/ClassInstanceDialog.cpp" line="-375"/>
+        <location line="+4"/>
+        <source>Class Inst.</source>
+        <translation type="unfinished">Instance de classe</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+2"/>
+        <source>Role</source>
+        <translation type="unfinished">Rôle</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>kind</source>
+        <translation type="unfinished">sorte</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished">Détruire</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>   Yes</source>
+        <translation type="unfinished">   Oui</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedElementsDialog</name>
+    <message>
+        <location filename="../dialog/RelatedElementsDialog.cpp" line="+57"/>
+        <source>Related elements dialog</source>
+        <translation type="unfinished">Editeur des éléments associés</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Search for : </source>
+        <translation type="unfinished">Chercher : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>referenced elements  </source>
+        <translation type="unfinished">éléments référencés  </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>referencing elements  </source>
+        <translation type="unfinished">élément référençant  </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Through relations : </source>
+        <translation type="unfinished">Via les relations : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generalization  </source>
+        <translation type="unfinished">généralisation  </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>dependency  </source>
+        <translation type="unfinished">dépendance  </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>other</source>
+        <translation type="unfinished">autre</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Search only for %1</source>
+        <translation type="unfinished">Cherche uniquement des %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>     Search on </source>
+        <translation type="unfinished">     Chercher sur </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>levels</source>
+        <translation type="unfinished">niveaux</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>RelationCanvas</name>
+    <message>
+        <location filename="../diagram/RelationCanvas.cpp" line="+157"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Dessiner toutes les relations&lt;/i&gt; forcé à &lt;i&gt;non&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+234"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Sélectioner les etiquettes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Position par défaut des étiquettes</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s name to this segment</source>
+        <translation type="unfinished">Attacher le nom de la relation à ce segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s stereotype to this segment</source>
+        <translation type="unfinished">Attacher le stéréotype de la relation à ce segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Géométrie (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+718"/>
+        <source>relation already drawn</source>
+        <translation type="unfinished">relation déjà dessinée</translation>
+    </message>
+    <message>
+        <location line="+173"/>
+        <source>read-only relation</source>
+        <translation type="unfinished">relation en lecture seule</translation>
+    </message>
+</context>
+<context>
+    <name>RelationDialog</name>
+    <message>
+        <location filename="../dialog/RelationDialog.cpp" line="+107"/>
+        <source>Relation dialog</source>
+        <translation type="unfinished">Editeur de relation</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+358"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="-351"/>
+        <source>type : </source>
+        <translation type="unfinished">type : </translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>    stereotype : </source>
+        <translation type="unfinished">    stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>association :</source>
+        <translation type="unfinished">association :</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+1"/>
+        <source>in </source>
+        <translation type="unfinished">dans </translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>multiplicity : </source>
+        <translation type="unfinished">multiplicité : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   initial value : </source>
+        <translation type="unfinished">   valeur initiale : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+103"/>
+        <location line="+35"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-95"/>
+        <source>read-only</source>
+        <translation type="unfinished">lecture-seule</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>derived</source>
+        <translation type="unfinished">dérivé</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordonné</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>description : </source>
+        <translation type="unfinished">description : </translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Default</source>
+        <translation type="unfinished">Par défaut</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>constraint : </source>
+        <translation type="unfinished">contrainte : </translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Visibility : </source>
+        <translation type="unfinished">Visibilité : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>follow uml</source>
+        <translation type="unfinished">suivre uml</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location line="+66"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+77"/>
+        <source>Declaration : </source>
+        <translation type="unfinished">Déclaration : </translation>
+    </message>
+    <message>
+        <location line="-229"/>
+        <location line="+66"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+77"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Résultat après
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <location line="+69"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+76"/>
+        <location line="+234"/>
+        <location line="+14"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Déclaration par défaut</translation>
+    </message>
+    <message>
+        <location line="-492"/>
+        <location line="+472"/>
+        <location line="+1"/>
+        <location line="+308"/>
+        <source>#include in header</source>
+        <translation type="unfinished">#include dans les en-tête</translation>
+    </message>
+    <message>
+        <location line="-776"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Non généré en C++</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Non généré en Java</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Montrer les annotations</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Editer les annotations</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Non généré en Php</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Non généré en Python</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Non généré en Idl</translation>
+    </message>
+    <message>
+        <location line="+136"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choisir la classe sélectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Créer une classe et la choisir</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+6"/>
+        <location line="+276"/>
+        <source>#include in source</source>
+        <translation type="unfinished">#include dans les sources</translation>
+    </message>
+    <message>
+        <location line="+1109"/>
+        <location line="+2"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+2"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>RemoveVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-699"/>
+        <source>remove duplicates</source>
+        <translation type="unfinished">retirer les doublons</translation>
+    </message>
+</context>
+<context>
+    <name>RevSettingsDialog</name>
+    <message>
+        <location filename="../dialog/RevSettingsDialog.cpp" line="-232"/>
+        <source>Reverse/Roundtrip Settings dialog</source>
+        <translation type="unfinished">Editeur d&apos;options de reverse/roundtrip</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>To specify through regular expression the directories
+and/or files to bypass during reverse and roundtrip</source>
+        <translation type="unfinished">Pour indiquer via une expression régulière les répertoires
+et/ou fichiers qui ne doivent pas être reversés/roundtripés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Help regexp</source>
+        <translation type="unfinished">Aide regexp</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>C++ directory : </source>
+        <translation type="unfinished">Répertoire de source C++ : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+8"/>
+        <location line="+35"/>
+        <location line="+8"/>
+        <location line="+25"/>
+        <location line="+8"/>
+        <source>case sensitive</source>
+        <translation type="unfinished">sensible à la casse</translation>
+    </message>
+    <message>
+        <location line="-79"/>
+        <source>C++ file : </source>
+        <translation type="unfinished">Fichier C++ : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated/reversed 
+header file extension : </source>
+        <translation type="unfinished">extension d&apos;un fichier
+d&apos;en tête généré/reversé : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generated/reversed 
+    source file extension : </source>
+        <translation type="unfinished">    extension d&apos;un fichier
+  source généré/reversé : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Java directory : </source>
+        <translation type="unfinished">Répertoire de source Java : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Java file : </source>
+        <translation type="unfinished">Fichier Java : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated/reversed file extension : </source>
+        <translation type="unfinished">extension de fichier généré/reversé : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Php directory : </source>
+        <translation type="unfinished">Répertoire de source Php : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Php file : </source>
+        <translation type="unfinished">Fichier Php : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated / reversed file extension : </source>
+        <translation type="unfinished">extension de fichier généré/reversé : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>SdClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/SdClassInstCanvas.cpp" line="+379"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Become immortal</source>
+        <translation type="unfinished">Devenir immortel</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Become mortal</source>
+        <translation type="unfinished">Devenir mortel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show life line</source>
+        <translation type="unfinished">Montrer la ligne de vie</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Hide life line</source>
+        <translation type="unfinished">Masquer la ligne de vie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Sélectionner la classe dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit from model</source>
+        <translation type="unfinished">Extraire du modèle</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert in model</source>
+        <translation type="unfinished">Insérer dans le modèle</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace it</source>
+        <translation type="unfinished">Le remplacer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <location line="+36"/>
+        <source>drawing mode</source>
+        <translation type="unfinished">mode d&apos;affichage</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">écrire nom:type
+horizontalement</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">montrer le context de classe</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">montrer les propriétés
+des stéréotypes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">couleur d&apos;instance de classe</translation>
+    </message>
+</context>
+<context>
+    <name>SdContinuationCanvas</name>
+    <message>
+        <location filename="../diagram/SdContinuationCanvas.cpp" line="+205"/>
+        <source>Continuation</source>
+        <translation type="unfinished">Continuation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <location line="+25"/>
+        <source>continuation color</source>
+        <translation type="unfinished">couleur de continuation</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>SdDurationCanvas</name>
+    <message>
+        <location filename="../diagram/SdDurationCanvas.cpp" line="+326"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+    <message>
+        <location line="+420"/>
+        <source>Activity bar</source>
+        <translation type="unfinished">Barre d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Draw as activity bar</source>
+        <translation type="unfinished">Dessiner comme une barre d&apos;activité</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Draw as a coregion</source>
+        <translation type="unfinished">Dessiner comme une corégion</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cut here</source>
+        <translation type="unfinished">Couper ici</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Merge juxtaposed activity bars</source>
+        <translation type="unfinished">Fusionner les barre d&apos;activité superposées</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Collapse in parent bar</source>
+        <translation type="unfinished">Fusionner dans la barre mère</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location line="+25"/>
+        <source>duration color</source>
+        <translation type="unfinished">couleur de barre de durée</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgBaseCanvas</name>
+    <message>
+        <location filename="../diagram/SdMsgBaseCanvas.cpp" line="+239"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Return</source>
+        <translation type="unfinished">Retour</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>value :</source>
+        <translation type="unfinished">valeur :</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgCanvas</name>
+    <message>
+        <location filename="../diagram/SdMsgCanvas.cpp" line="+252"/>
+        <source>Message</source>
+        <translation type="unfinished">Message</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select operation in browser</source>
+        <translation type="unfinished">Sélectionner l&apos;opération dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Sélectionner stéréotype et etiquettes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Position par défaut des stéréotype et etiquettes</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start from new overlapping bar</source>
+        <translation type="unfinished">Partir d&apos;une nouvelle barre imbriquée</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Start from parent bar</source>
+        <translation type="unfinished">Partir de la barre mère</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to new overlapping bar</source>
+        <translation type="unfinished">Aller vers une nouvelle barre imbriquée</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to parent bar</source>
+        <translation type="unfinished">Aller vers la barre mère</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+29"/>
+        <source>operation drawing language</source>
+        <translation type="unfinished">langage d&apos;écriture de l&apos;opération</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show full operation definition</source>
+        <translation type="unfinished">montrer la définition complète de l&apos;opération</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show context mode</source>
+        <translation type="unfinished">mode d&apos;affichage du contexte</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgDialog</name>
+    <message>
+        <location filename="../dialog/SdMsgDialog.cpp" line="+63"/>
+        <source>Message dialog</source>
+        <translation type="unfinished">Editeur de message</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Message type</source>
+        <translation type="unfinished">Sorte de message</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchrone</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>asynchronous</source>
+        <translation type="unfinished">asynchrone</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>
+
+When the arguments are specified they replace the operation&apos;s parameter(s) without any check</source>
+        <translation type="unfinished">
+
+Lorsque les arguments son spécifiés ils remplacent les paramètres d&apos;opération sans vérification</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>arguments : </source>
+        <translation type="unfinished">arguments : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choisir l&apos;opération selectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Créer une opération et la choisir</translation>
+    </message>
+</context>
+<context>
+    <name>SdSelfMsgCanvas</name>
+    <message>
+        <location filename="../diagram/SdSelfMsgCanvas.cpp" line="+249"/>
+        <source>Message</source>
+        <translation type="unfinished">Message</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select operation in browser</source>
+        <translation type="unfinished">Sélectionner l&apos;opération dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Sélectionner stéréotype et etiquettes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Position par défaut des stéréotype et etiquettes</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Go to new overlapping bar</source>
+        <translation type="unfinished">Aller vers une nouvelle barre imbriquée</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to parent bar</source>
+        <translation type="unfinished">Aller vers la barre mère</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <location line="+29"/>
+        <source>operation drawing language</source>
+        <translation type="unfinished">langage d&apos;écriture de l&apos;opération</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show full operation definition</source>
+        <translation type="unfinished">montrer la définition complète de l&apos;opération</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show context mode</source>
+        <translation type="unfinished">mode d&apos;affichage du contexte</translation>
+    </message>
+</context>
+<context>
+    <name>SeqDiagramView</name>
+    <message>
+        <location filename="../diagram/SeqDiagramView.cpp" line="+77"/>
+        <source>Sequence diagram menu</source>
+        <translation type="unfinished">Menu de diagramme de séquence</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Transform to flat activity bars</source>
+        <translation type="unfinished">Transformer en barres d&apos;activités non imbriquées</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transform to overlapping activity bars</source>
+        <translation type="unfinished">Transformer en barres d&apos;activités imbriquées</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="-51"/>
+        <source>Apply</source>
+        <translation type="unfinished">Appliquer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutDialog</name>
+    <message>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-358"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Shortcut dialog</source>
+        <translation type="unfinished">Editeur de raccoursis</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Here are the shortcuts to do a command (menu entry)</source>
+        <translation type="unfinished">Les raccoursis exécutant une commande (entrée de menu)</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Here are the shortcuts to call a tool (plug-out)</source>
+        <translation type="unfinished">Les raccousis exécutant un outil (plug-out)</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutTable</name>
+    <message>
+        <location line="+48"/>
+        <source>Shift</source>
+        <translation type="unfinished">Shift</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cmd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ctrl</source>
+        <translation type="unfinished">Contrôle</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Alt</source>
+        <translation type="unfinished">Alt</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>Insert shortcut before</source>
+        <translation type="unfinished">Insérer un raccoursis avant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert shortcut after</source>
+        <translation type="unfinished">Insérer un raccoursis après</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete shortcut</source>
+        <translation type="unfinished">Retirer le raccoursis</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy shortcut</source>
+        <translation type="unfinished">Copier le raccoursis</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut shortcut</source>
+        <translation type="unfinished">Couper le raccoursis</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste shortcut</source>
+        <translation type="unfinished">Coller le raccoursis</translation>
+    </message>
+    <message>
+        <location line="+173"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Raccoursi</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Several use of the shortcut &apos;%1&apos;</source>
+        <translation type="unfinished">Plusieurs utilisation du raccoursis &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SimpleRelationDialog</name>
+    <message>
+        <location filename="../dialog/SimpleRelationDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Generalisation dialog</source>
+        <translation type="unfinished">Editeur de généralisation</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Dependency dialog</source>
+        <translation type="unfinished">Editeur de dépendance</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>unknown relation dialog</source>
+        <translation type="unfinished">Editeur de relation</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>from : </source>
+        <translation type="unfinished">de : </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to : </source>
+        <translation type="unfinished">vers : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+</context>
+<context>
+    <name>SourceDialog</name>
+    <message>
+        <location filename="../dialog/SourceDialog.cpp" line="+134"/>
+        <location line="+6"/>
+        <source>cannot read %1</source>
+        <translation type="unfinished">ne peut lire %1</translation>
+    </message>
+</context>
+<context>
+    <name>StateActionCanvas</name>
+    <message>
+        <location filename="../diagram/StateActionCanvas.cpp" line="+530"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit state action</source>
+        <translation type="unfinished">Editer l&apos;action d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <location line="+30"/>
+        <source>drawing language</source>
+        <translation type="unfinished">langage d&apos;affichage</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">montrer les propriétés
+des stéréotypes</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+30"/>
+        <source>state action color</source>
+        <translation type="unfinished">couleur d&apos;action d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+22"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>StateActionDialog</name>
+    <message>
+        <location filename="../dialog/StateActionDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State Action dialog</source>
+        <translation type="unfinished">Editeur d&apos;action d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+15"/>
+        <location line="+18"/>
+        <source>behavior</source>
+        <translation type="unfinished">comportement</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+</context>
+<context>
+    <name>StateCanvas</name>
+    <message>
+        <location filename="../diagram/StateCanvas.cpp" line="+1270"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide decomposition indicator</source>
+        <translation type="unfinished">Cacher l&apos;indicateur de décomposition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show decomposition indicator</source>
+        <translation type="unfinished">Montrer l&apos;indicateur de décomposition</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit state</source>
+        <translation type="unfinished">Editer l&apos;état</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select referenced state in browser</source>
+        <translation type="unfinished">Sélectionner l&apos;état référencé dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Associer le diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Dissocier le diagramme</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+116"/>
+        <location line="+33"/>
+        <source>show activities</source>
+        <translation type="unfinished">montrer les activités</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+33"/>
+        <source>draw regions horizontally</source>
+        <translation type="unfinished">dessiner les régions horizontalement</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+33"/>
+        <source>drawing language</source>
+        <translation type="unfinished">langage d&apos;affichage</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+33"/>
+        <source>state color</source>
+        <translation type="unfinished">couleur d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <location line="+22"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>StateDiagramView</name>
+    <message>
+        <location filename="../diagram/StateDiagramView.cpp" line="+72"/>
+        <source>State diagram menu</source>
+        <translation type="unfinished">Menu de diagramme d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+199"/>
+        <location line="+34"/>
+        <location line="+21"/>
+        <source>already drawn</source>
+        <translation type="unfinished">déjà dessiné</translation>
+    </message>
+    <message>
+        <location line="-53"/>
+        <location line="+34"/>
+        <location line="+21"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>StateDiagramWindow</name>
+    <message>
+        <location filename="../diagram/StateDiagramWindow.cpp" line="+16"/>
+        <source>Select</source>
+        <translation type="unfinished">Selectionner</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Ajouter un paquetage</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Ajouter un fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add State</source>
+        <translation type="unfinished">Ajouter un état</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Region</source>
+        <translation type="unfinished">Ajouter une région</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Initial pseudo state</source>
+        <translation type="unfinished">Ajouter un état initial</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Entry Point</source>
+        <translation type="unfinished">Ajouter un point d&apos;éntrée</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Final state</source>
+        <translation type="unfinished">Ajouter un état final</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Exit Point</source>
+        <translation type="unfinished">Ajouter un point de sortie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Terminate node</source>
+        <translation type="unfinished">Ajouter un noeud de terminaison</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Deep History</source>
+        <translation type="unfinished">Ajouter un historique profond</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Shallow History</source>
+        <translation type="unfinished">Ajouter un historique superficiel</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Junction</source>
+        <translation type="unfinished">Ajouter une jonction</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Choice</source>
+        <translation type="unfinished">Ajouter un choix</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fork</source>
+        <translation type="unfinished">Ajouter une bifurcation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Join</source>
+        <translation type="unfinished">Ajouter un sommet d&apos;union</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Action</source>
+        <translation type="unfinished">Ajouter une action</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add receive signal action</source>
+        <translation type="unfinished">Ajouter une action recevoir un signal</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add send signal action</source>
+        <translation type="unfinished">Ajouter une action envoyer un signal</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Transition</source>
+        <translation type="unfinished">Ajouter une transition</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Ancre</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>StateDialog</name>
+    <message>
+        <location filename="../dialog/StateDialog.cpp" line="+63"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State dialog</source>
+        <translation type="unfinished">Editeur d&apos;état</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>specification :</source>
+        <translation type="unfinished">spécification :</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>reference :</source>
+        <translation type="unfinished">référence :</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>active</source>
+        <translation type="unfinished">actif</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+239"/>
+        <location line="+22"/>
+        <location line="+15"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+62"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choisir</translation>
+    </message>
+    <message>
+        <location line="-56"/>
+        <location line="+62"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choisir l&apos;opération selectionnée dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Choose state selected in browser</source>
+        <translation type="unfinished">Choisir l&apos;état sélectionné dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Entry
+behavior : </source>
+        <translation type="unfinished">Comportement
+d&apos;entrée : </translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Exit
+behavior : </source>
+        <translation type="unfinished">Comportement
+de sortie : </translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Do
+behavior : </source>
+        <translation type="unfinished">Comportement
+interne : </translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>StereotypeDialog</name>
+    <message>
+        <location filename="../dialog/StereotypeDialog.cpp" line="+73"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>StereotypesDialog</name>
+    <message>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-285"/>
+        <source>Default stereotypes dialog</source>
+        <translation type="unfinished">Editeur des stéréoypes par défaut</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>package
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de paquetage : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+33"/>
+        <location line="+37"/>
+        <location line="+29"/>
+        <source>relations
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de relation : </translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Stereotypes</source>
+        <translation type="unfinished">Stéréotypes</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>class
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de classe : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>attribute
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de propriété : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>operation
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+d&apos;opération : </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>use case
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+cas d&apos;utilisation : </translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>artifact
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+d&apos;artefact : </translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>class view
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+vue de classe : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>use case view
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de vue
+de cas d&apos;utilisation : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component view
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+vue de composant : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>deployment view
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+vue de déployment : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>class diagram
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+diagramme de classe : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>object diagram
+stereotypes : </source>
+        <translation type="unfinished">Stéréotype de
+diagramme objet : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>communication diagram
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de diagramme
+de communication : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>sequence diagram
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+diagramme de séquence : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>use case diagram
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de diagramme
+de cas d&apos;utilisation : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>state diagram
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+diagramme d&apos;état : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity diagram
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+diagramme d&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component diagram
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+diagramme de composant : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>deployment diagram
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+diagramme de déployment : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>activity
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+d&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>interruptible activity
+region stereotypes : </source>
+        <translation type="unfinished">stéréotypes de région
+interruptible d&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>expansion region
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+région d&apos;expansion : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>partition
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de partition : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>parameter
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+paramètre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>parameter set
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes d&apos;
+ensemble de paramètre : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity control node
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de noeud
+de contrôle d&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity action
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes d&apos;
+action d&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity object node
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de noeud
+d&apos;objet d&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>pin
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de broche : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>expansion node
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes de
+noeud d&apos;expansion : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>flow
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de flux : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>state
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+d&apos;état : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>pseudostate
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de pseudo état : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>state action
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+d&apos;action d&apos;état : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de composant : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>node
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+de noeud : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>message
+stereotypes : </source>
+        <translation type="unfinished">stéréotypes
+des messages : </translation>
+    </message>
+</context>
+<context>
+    <name>StereotypesTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+148"/>
+        <location line="+32"/>
+        <source>do</source>
+        <translation type="unfinished">faire</translation>
+    </message>
+</context>
+<context>
+    <name>StringTable</name>
+    <message>
+        <location filename="../dialog/StringTable.cpp" line="+97"/>
+        <source>row %1</source>
+        <translation type="unfinished">ligne %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert row before</source>
+        <translation type="unfinished">Insérer une ligne avant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert row after</source>
+        <translation type="unfinished">Insérer une ligne après</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete row</source>
+        <translation type="unfinished">Retirer la ligne</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy row</source>
+        <translation type="unfinished">Copier la ligne</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut row</source>
+        <translation type="unfinished">Couper la ligne</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste row</source>
+        <translation type="unfinished">Coller la ligne</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move row</source>
+        <translation type="unfinished">Déplacer la ligne</translation>
+    </message>
+</context>
+<context>
+    <name>SubjectCanvas</name>
+    <message>
+        <location filename="../diagram/SubjectCanvas.cpp" line="+152"/>
+        <source>Subject dialog</source>
+        <translation type="unfinished">Editeur de sujet</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>subject : </source>
+        <translation type="unfinished">sujet : </translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Subject</source>
+        <translation type="unfinished">Sujet</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <location line="+25"/>
+        <source>subject color</source>
+        <translation type="unfinished">couleur de sujet</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>ToolDialog</name>
+    <message>
+        <location filename="../dialog/ToolDialog.cpp" line="-63"/>
+        <source>Tools dialog</source>
+        <translation type="unfinished">Editeur d&apos;outils</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>TraceDialog</name>
+    <message>
+        <location filename="../dialog/TraceDialog.cpp" line="+58"/>
+        <source>Trace</source>
+        <translation type="unfinished">Trace</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Clear</source>
+        <translation type="unfinished">Vider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save</source>
+        <translation type="unfinished">Sauver</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>TransitionDialog</name>
+    <message>
+        <location filename="../dialog/TransitionDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transition dialog</source>
+        <translation type="unfinished">Editeur de transition</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>internal</source>
+        <translation type="unfinished">interne</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+92"/>
+        <location line="+24"/>
+        <location line="+17"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-100"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>trigger : </source>
+        <translation type="unfinished">déclancheur : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>guard
+constraint : </source>
+        <translation type="unfinished">contrainte
+de garde : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>activity
+expression : </source>
+        <translation type="unfinished">expression
+d&apos;activité : </translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>UcClassCanvas</name>
+    <message>
+        <location filename="../diagram/UcClassCanvas.cpp" line="+604"/>
+        <source>Upper</source>
+        <translation type="unfinished">En haut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">En bas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Monter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Descendre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Ajouter les élément reliés</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Sélectionner dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Sélectionner les éléments reliés</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Retirer du diagramme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Retirer du modèle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Outils</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+34"/>
+        <source>class/actor</source>
+        <translation type="unfinished">classe/acteur</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+31"/>
+        <source>class color</source>
+        <translation type="unfinished">couleur de classe</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>read only</source>
+        <translation type="unfinished">en lecture seule</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+12"/>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>UcUseCaseCanvas</name>
+    <message>
+        <location filename="../diagram/UcUseCaseCanvas.cpp" line="+415"/>
+        <location line="+34"/>
+        <source>use case</source>
+        <translation type="unfinished">cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">en lecture seule</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+21"/>
+        <location line="+5"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illégal</translation>
+    </message>
+</context>
+<context>
+    <name>UmlWindow</name>
+    <message>
+        <location filename="../diagram/UmlWindow.cpp" line="-1751"/>
+        <source>Generate:</source>
+        <translation type="unfinished">Générer:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Project</source>
+        <translation type="unfinished">&amp;Projet</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished">&amp;Fenêtres</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Tools</source>
+        <translation type="unfinished">&amp;Outils</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Languages</source>
+        <translation type="unfinished">&amp;Langages</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ management and default declaration/definition</source>
+        <translation type="unfinished">gestion de C++ et définition/déclaration par défaut</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Java management and default definition</source>
+        <translation type="unfinished">gestion de Java et définition par défaut</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Php management and default definition</source>
+        <translation type="unfinished">gestion de Php et définition par défaut</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Python management and default definition</source>
+        <translation type="unfinished">gestion de Python et définition par défaut</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Idl management and default declaration</source>
+        <translation type="unfinished">gestion d&apos;Idl et définition par défaut</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Verbose code generation</source>
+        <translation type="unfinished">Génération de code verbeuse</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Preserve operations&apos;s body</source>
+        <translation type="unfinished">Préserver les corps des opérations</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Add operation profile on body edition</source>
+        <translation type="unfinished">Ajouter le profile d&apos;une opération lorsque son corps est édité</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Miscellaneous</source>
+        <translation type="unfinished">&amp;Divers</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show s&amp;tereotypes in browser</source>
+        <translation type="unfinished">Montrer les s&amp;téréotypes dans l&apos;explorateur</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Completion in dialog</source>
+        <translation type="unfinished">Complétion lors des éditions</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Style</source>
+        <translation type="unfinished">Style</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Font size</source>
+        <translation type="unfinished">Taille de police de caractères</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Diagram default format</source>
+        <translation type="unfinished">Format par défaut des diagrammes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Landscape formats</source>
+        <translation type="unfinished">Formats paysage</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Edit shortcuts</source>
+        <translation type="unfinished">Edition des raccoursis</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Set environment</source>
+        <translation type="unfinished">Etablir l&apos;environnement</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Set images root dir</source>
+        <translation type="unfinished">Etablir le répertoire racine des images</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+17"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Aide</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>&amp;About</source>
+        <translation type="unfinished">&amp;À propos</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>About&amp;Qt</source>
+        <translation type="unfinished">À propos de &amp;Qt</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>C++</source>
+        <translation type="unfinished">C++</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Java</source>
+        <translation type="unfinished">Java</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Php</source>
+        <translation type="unfinished">Php</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Python</source>
+        <translation type="unfinished">Python</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Idl</source>
+        <translation type="unfinished">Idl</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <location line="+473"/>
+        <source>File%1</source>
+        <translation type="unfinished">File%1</translation>
+    </message>
+    <message>
+        <location line="-460"/>
+        <source>Ready</source>
+        <translation type="unfinished">Prêt</translation>
+    </message>
+    <message>
+        <location line="+123"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit generation settings</source>
+        <translation type="unfinished">Editer les options de génération</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Edit default stereotypes</source>
+        <translation type="unfinished">Editer les stéréotypes par défaut</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit class settings</source>
+        <translation type="unfinished">Editer les options des classes</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Editer les options de dessin</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>to open this project.&lt;br&gt;&lt;br&gt;The historic is saved in &lt;i&gt;settings.ini&lt;/i&gt;</source>
+        <translation type="unfinished">to open this project.&lt;br&gt;&lt;br&gt;The historic is saved in &lt;i&gt;settings.ini&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Loading aborted as supplied project id is out of history array bounds</source>
+        <translation type="unfinished">Loading aborted as supplied project id is out of history array bounds</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Loading aborted as currently opened project unloading failed</source>
+        <translation type="unfinished">Loading aborted as currently opened project unloading failed</translation>
+    </message>
+    <message>
+        <location line="-487"/>
+        <location line="+527"/>
+        <source>Show &amp;Trace Window</source>
+        <translation type="unfinished">Montrer la fenêtre de &amp;Trace</translation>
+    </message>
+    <message>
+        <location line="-327"/>
+        <source>What&apos;s This?</source>
+        <translation type="unfinished">Qu&apos;est-ce que c&apos;est ?</translation>
+    </message>
+    <message>
+        <location line="+337"/>
+        <source>Generate C++</source>
+        <translation type="unfinished">Génération C++</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Java</source>
+        <translation type="unfinished">Génération Java</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Php</source>
+        <translation type="unfinished">Génération Php</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Python</source>
+        <translation type="unfinished">Génération Python</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Idl</source>
+        <translation type="unfinished">Génération Idl</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Reverse C++</source>
+        <translation type="unfinished">Reverse C++</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Roundtrip C++</source>
+        <translation type="unfinished">Roundtrip C++</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Java</source>
+        <translation type="unfinished">Reverse Java</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Roundtrip Java</source>
+        <translation type="unfinished">Roundtrip Java</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Php</source>
+        <translation type="unfinished">Reverse Php</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Java Catalog</source>
+        <translation type="unfinished">Catalogue Java</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Roundtrip C++ bodies</source>
+        <translation type="unfinished">Roundtip des corps C++</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Java bodies</source>
+        <translation type="unfinished">Roundtip des corps Java</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Php bodies</source>
+        <translation type="unfinished">Roundtip des corps Php</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Python bodies</source>
+        <translation type="unfinished">Roundtip des corps Python</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Plug-out upgrade</source>
+        <translation type="unfinished">Mise à jour de plug-out</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tools settings</source>
+        <translation type="unfinished">Options des outils</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import settings</source>
+        <translation type="unfinished">Importer les options</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <location line="+266"/>
+        <source>Enter a folder name, this folder will be created and will name the new project</source>
+        <translation type="unfinished">Entrez un nom de répertoire, ce répertoire sera créé et nommera le nouveau projet</translation>
+    </message>
+    <message>
+        <location line="-252"/>
+        <location line="+8"/>
+        <source>New project</source>
+        <translation type="unfinished">Nouveau projet</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Loading aborted</source>
+        <translation type="unfinished">Chargement annullé</translation>
+    </message>
+    <message>
+        <location line="+282"/>
+        <location line="+4"/>
+        <source>Close aborted</source>
+        <translation type="unfinished">Fermeture annullée</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Print on 1 page</source>
+        <translation type="unfinished">Imprime sur 1 page</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print on 4 pages</source>
+        <translation type="unfinished">Imprime sur 4 pages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print on 9 pages</source>
+        <translation type="unfinished">Imprime sur 9 pages</translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Select images root directory</source>
+        <translation type="unfinished">Etablir le répertoire racine des images</translation>
+    </message>
+    <message>
+        <location line="-1584"/>
+        <location line="+2048"/>
+        <source>&amp;Cascade</source>
+        <translation type="unfinished">&amp;Cascade</translation>
+    </message>
+    <message>
+        <location line="-1309"/>
+        <source>Select DoUML project file</source>
+        <translation type="unfinished">Selectionnez le fichier de projet DoUML</translation>
+    </message>
+    <message>
+        <location line="+1310"/>
+        <source>&amp;Tile</source>
+        <translation type="unfinished">Carrela&amp;ge</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Preferred geometry</source>
+        <translation type="unfinished">&amp;Géométrie préférée</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C&amp;lose all</source>
+        <translation type="unfinished">Tout fe&amp;rmer</translation>
+    </message>
+</context>
+<context>
+    <name>UseCaseDiagramView</name>
+    <message>
+        <location filename="../diagram/UseCaseDiagramView.cpp" line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Ajouter les éléments marqués</translation>
+    </message>
+</context>
+<context>
+    <name>UseCaseDialog</name>
+    <message>
+        <location filename="../dialog/UseCaseDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">Valider</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use Case dialog</source>
+        <translation type="unfinished">Editeur de cas d&apos;utilisation</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name : </source>
+        <translation type="unfinished">nom : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stéréotype : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>extension 
+points : </source>
+        <translation type="unfinished">points d&apos;
+extention : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Propriétés</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+nom illégal ou déjà utilisé</translation>
+    </message>
+</context>
+<context>
+    <name>ValueSpecificationDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-467"/>
+        <location line="+27"/>
+        <source>value - Ocl</source>
+        <translation type="unfinished">valeur - Ocl</translation>
+    </message>
+    <message>
+        <location line="-22"/>
+        <location line="+32"/>
+        <location line="+31"/>
+        <source>Value : </source>
+        <translation type="unfinished">Valeur : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editeur</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+24"/>
+        <source>value - C++</source>
+        <translation type="unfinished">valeur - C++</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+24"/>
+        <source>value - Java</source>
+        <translation type="unfinished">valeur - Java</translation>
+    </message>
+</context>
+</TS>
diff --git a/src/translations/ptBR.qm b/src/translations/ptBR.qm
new file mode 100644
index 000000000..cd4635374
Binary files /dev/null and b/src/translations/ptBR.qm differ
diff --git a/src/translations/ptBR.ts b/src/translations/ptBR.ts
new file mode 100644
index 000000000..a16fc7b77
--- /dev/null
+++ b/src/translations/ptBR.ts
@@ -0,0 +1,17615 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pt">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../dialog/About.cpp" line="+45"/>
+        <source>About DoUML</source>
+        <translation type="unfinished">About DoUML</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+</context>
+<context>
+    <name>AccessVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+1083"/>
+        <location line="+37"/>
+        <source>variable - Ocl</source>
+        <translation type="unfinished">variable - Ocl</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <source>class : </source>
+        <translation type="unfinished">class : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>variable :</source>
+        <translation type="unfinished">variable :</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Choose variable selected in browser</source>
+        <translation type="unfinished">Choose variable selected in browser</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Create attribute and choose it</source>
+        <translation type="unfinished">Create attribute and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityActionCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityActionCanvas.cpp" line="+861"/>
+        <source>Add pin</source>
+        <translation type="unfinished">Add pin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity action</source>
+        <translation type="unfinished">Edit activity action</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select %1 in browser</source>
+        <translation type="unfinished">Select %1 in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set associated diagram from behavior</source>
+        <translation type="unfinished">Set associated diagram from behavior</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <location line="+31"/>
+        <source>show opaque definition</source>
+        <translation type="unfinished">show opaque definition</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+31"/>
+        <source>action color</source>
+        <translation type="unfinished">action color</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityActionDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-1141"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity Action dialog</source>
+        <translation type="unfinished">Activity Action dialog</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>kind : </source>
+        <translation type="unfinished">kind : </translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+13"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+145"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityCanvas.cpp" line="+628"/>
+        <source>Add parameter</source>
+        <translation type="unfinished">Add parameter</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity</source>
+        <translation type="unfinished">Edit activity</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <location line="+31"/>
+        <source>show conditions</source>
+        <translation type="unfinished">show conditions</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+31"/>
+        <source>drawing language</source>
+        <translation type="unfinished">drawing language</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+31"/>
+        <source>activity color</source>
+        <translation type="unfinished">activity color</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+8"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDiagramView</name>
+    <message>
+        <location filename="../diagram/ActivityDiagramView.cpp" line="+85"/>
+        <source>Activity diagram menu</source>
+        <translation type="unfinished">Activity diagram menu</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <location line="+29"/>
+        <location line="+31"/>
+        <location line="+60"/>
+        <location line="+28"/>
+        <location line="+31"/>
+        <location line="+182"/>
+        <location line="+19"/>
+        <location line="+24"/>
+        <location line="+24"/>
+        <location line="+24"/>
+        <location line="+20"/>
+        <source>already drawn</source>
+        <translation type="unfinished">already drawn</translation>
+    </message>
+    <message>
+        <location line="-184"/>
+        <location line="+264"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="-260"/>
+        <source>Draw activity</source>
+        <translation type="unfinished">Draw activity</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add a call behavior</source>
+        <translation type="unfinished">Add a call behavior</translation>
+    </message>
+    <message>
+        <location line="+260"/>
+        <source>Add a read variable value action</source>
+        <translation type="unfinished">Add a read variable value action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a clear variable value action</source>
+        <translation type="unfinished">Add a clear variable value action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a write variable value action</source>
+        <translation type="unfinished">Add a write variable value action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a add variable value action</source>
+        <translation type="unfinished">Add a add variable value action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add a remove variable value action</source>
+        <translation type="unfinished">Add a remove variable value action</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ActivityDiagramWindow.cpp" line="+128"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Package</source>
+        <translation type="unfinished">New Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Fragment</source>
+        <translation type="unfinished">New Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Activity</source>
+        <translation type="unfinished">New Activity</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Interruptible Activity Region</source>
+        <translation type="unfinished">New Interruptible Activity Region</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>New Expansion Region</source>
+        <translation type="unfinished">New Expansion Region</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>New Activity Partition</source>
+        <translation type="unfinished">New Activity Partition</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>New Action</source>
+        <translation type="unfinished">New Action</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Object Node</source>
+        <translation type="unfinished">New Object Node</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Initial node</source>
+        <translation type="unfinished">New Initial node</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Activity Final</source>
+        <translation type="unfinished">New Activity Final</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Flow Final</source>
+        <translation type="unfinished">New Flow Final</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Merge</source>
+        <translation type="unfinished">New Merge</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Decision</source>
+        <translation type="unfinished">New Decision</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Fork</source>
+        <translation type="unfinished">New Fork</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Join</source>
+        <translation type="unfinished">New Join</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New Flow</source>
+        <translation type="unfinished">New Flow</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dependency</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anchor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityDialog</name>
+    <message>
+        <location filename="../dialog/ActivityDialog.cpp" line="+64"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity dialog</source>
+        <translation type="unfinished">Activity dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>specification :</source>
+        <translation type="unfinished">specification :</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>single execution</source>
+        <translation type="unfinished">single execution</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>active</source>
+        <translation type="unfinished">active</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+14"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Pre
+condition : </source>
+        <translation type="unfinished">Pre
+condition : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Post
+condition : </source>
+        <translation type="unfinished">Post
+condition : </translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityNodeCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityNodeCanvas.cpp" line="+481"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">draw vertically</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">draw horizontally</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit activity node</source>
+        <translation type="unfinished">Edit activity node</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityObjectCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityObjectCanvas.cpp" line="+516"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity object</source>
+        <translation type="unfinished">Edit activity object</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Select class in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <location line="+33"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">write name:type 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+33"/>
+        <source>activity object color</source>
+        <translation type="unfinished">activity object color</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityObjectDialog</name>
+    <message>
+        <location filename="../dialog/ActivityObjectDialog.cpp" line="+66"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>name :</source>
+        <translation type="unfinished">name :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>multiplicity : </source>
+        <translation type="unfinished">multiplicity : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordering : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>in state : </source>
+        <translation type="unfinished">in state : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>is control</source>
+        <translation type="unfinished">is control</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+94"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>selection : </source>
+        <translation type="unfinished">selection : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityPartitionCanvas</name>
+    <message>
+        <location filename="../diagram/ActivityPartitionCanvas.cpp" line="+414"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">draw vertically</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">draw horizontally</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit activity partition</source>
+        <translation type="unfinished">Edit activity partition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+154"/>
+        <location line="+25"/>
+        <source>activity partition color</source>
+        <translation type="unfinished">activity partition color</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ActivityPartitionDialog</name>
+    <message>
+        <location filename="../dialog/ActivityPartitionDialog.cpp" line="+61"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity Partition dialog</source>
+        <translation type="unfinished">Activity Partition dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>represents :</source>
+        <translation type="unfinished">represents :</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>is dimension</source>
+        <translation type="unfinished">is dimension</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>is external</source>
+        <translation type="unfinished">is external</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose element selected in browser</source>
+        <translation type="unfinished">Choose element selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose element marked in browser</source>
+        <translation type="unfinished">Choose element marked in browser</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>AddVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+924"/>
+        <source>replace all</source>
+        <translation type="unfinished">replace all</translation>
+    </message>
+</context>
+<context>
+    <name>AnnotationDialog</name>
+    <message>
+        <location filename="../dialog/AnnotationDialog.cpp" line="+72"/>
+        <source>
+To add an annotation at the cursor position
+you may select it in the list and press &apos;add&apos;
+</source>
+        <translation type="unfinished">
+To add an annotation at the cursor position
+you may select it in the list and press &apos;add&apos;
+</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add </source>
+        <translation type="unfinished">Add </translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Close</translation>
+    </message>
+</context>
+<context>
+    <name>ArrowCanvas</name>
+    <message>
+        <location filename="../diagram/ArrowCanvas.cpp" line="+861"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>a relation can&apos;t have a relation</source>
+        <translation type="unfinished">a relation can&apos;t have a relation</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>stereotype/label dialog</source>
+        <translation type="unfinished">stereotype/label dialog</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>label : </source>
+        <translation type="unfinished">label : </translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>line</source>
+        <translation type="unfinished">line</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Select stereotype and label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Default stereotype and label position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach label to this segment</source>
+        <translation type="unfinished">Attach label to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attach stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometry (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>None</source>
+        <translation type="unfinished">None</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Recenter begin</source>
+        <translation type="unfinished">Recenter begin</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Recenter end</source>
+        <translation type="unfinished">Recenter end</translation>
+    </message>
+</context>
+<context>
+    <name>ArrowJunctionCanvas</name>
+    <message>
+        <location filename="../diagram/ArrowJunctionCanvas.cpp" line="+217"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ArtifactCanvas</name>
+    <message>
+        <location filename="../diagram/ArtifactCanvas.cpp" line="+578"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit artifact</source>
+        <translation type="unfinished">Edit artifact</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Generate</source>
+        <translation type="unfinished">Generate</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <location line="+34"/>
+        <source>artifact</source>
+        <translation type="unfinished">artifact</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+25"/>
+        <source>artifact color</source>
+        <translation type="unfinished">artifact color</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+8"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>illegal for a source artifact</source>
+        <translation type="unfinished">illegal for a source artifact</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+14"/>
+        <location line="+6"/>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ArtifactDialog</name>
+    <message>
+        <location filename="../dialog/ArtifactDialog.cpp" line="+68"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>artifact dialog</source>
+        <translation type="unfinished">artifact dialog</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+58"/>
+        <location line="+47"/>
+        <location line="+61"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-349"/>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Header file 
+definition : </source>
+        <translation type="unfinished">Header file 
+definition : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+47"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Default definition</translation>
+    </message>
+    <message>
+        <location line="-292"/>
+        <location line="+47"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Not generated in C++</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+47"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Result after
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-285"/>
+        <source>C++ header</source>
+        <translation type="unfinished">C++ header</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Source file 
+definition : </source>
+        <translation type="unfinished">Source file 
+definition : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>C++ source</source>
+        <translation type="unfinished">C++ source</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <location line="+62"/>
+        <source>File 
+definition : </source>
+        <translation type="unfinished">File 
+definition : </translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Not generated in Java</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Java source</source>
+        <translation type="unfinished">Java source</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Php source</source>
+        <translation type="unfinished">Php source</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Python source</source>
+        <translation type="unfinished">Python source</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Not generated in Idl</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Idl source</source>
+        <translation type="unfinished">Idl source</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Classes without artifact</source>
+        <translation type="unfinished">Classes without artifact</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+46"/>
+        <source>Associated classes</source>
+        <translation type="unfinished">Associated classes</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>go up</source>
+        <translation type="unfinished">go up</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>go down</source>
+        <translation type="unfinished">go down</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Stereotype filtering  </source>
+        <translation type="unfinished">Stereotype filtering  </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Unassociated artifacts</source>
+        <translation type="unfinished">Unassociated artifacts</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+7"/>
+        <source>Associated artifacts</source>
+        <translation type="unfinished">Associated artifacts</translation>
+    </message>
+    <message>
+        <location line="+1234"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>AssocContainCanvas</name>
+    <message>
+        <location filename="../diagram/AssocContainCanvas.cpp" line="+87"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Select stereotype and label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Default stereotype and label position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach label to this segment</source>
+        <translation type="unfinished">Attach label to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attach stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometry (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AttributeDialog</name>
+    <message>
+        <location filename="../dialog/AttributeDialog.cpp" line="+75"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Enum item dialog</source>
+        <translation type="unfinished">Enum item dialog</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Attribute dialog</source>
+        <translation type="unfinished">Attribute dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>class : </source>
+        <translation type="unfinished">class : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>name :</source>
+        <translation type="unfinished">name :</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">stereotype :</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>    multiplicity :  </source>
+        <translation type="unfinished">    multiplicity :  </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>initial value :</source>
+        <translation type="unfinished">initial value :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>value :</source>
+        <translation type="unfinished">value :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+77"/>
+        <location line="+20"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-63"/>
+        <source>read-only</source>
+        <translation type="unfinished">read-only</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>derived</source>
+        <translation type="unfinished">derived</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordered</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Visibility :</source>
+        <translation type="unfinished">Visibility :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>follow uml</source>
+        <translation type="unfinished">follow uml</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+59"/>
+        <location line="+71"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Declaration :</source>
+        <translation type="unfinished">Declaration :</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+59"/>
+        <location line="+71"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Result after
+substitution :</source>
+        <translation type="unfinished">Result after
+substitution :</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+70"/>
+        <location line="+60"/>
+        <location line="+46"/>
+        <location line="+75"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Default declaration</translation>
+    </message>
+    <message>
+        <location line="-248"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Not generated in C++</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Default item declaration</source>
+        <translation type="unfinished">Default item declaration</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+188"/>
+        <source>Default attribute declaration</source>
+        <translation type="unfinished">Default attribute declaration</translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Not generated in Java</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Show annotation</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Edit annotation</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <source>Default state declaration</source>
+        <translation type="unfinished">Default state declaration</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Default constant declaration</source>
+        <translation type="unfinished">Default constant declaration</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Not generated in Idl</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>BasicDialog</name>
+    <message>
+        <location filename="../dialog/BasicDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source> dialog</source>
+        <translation type="unfinished"> dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserItemNameValidator</name>
+    <message>
+        <location filename="../browser/BrowserNode.cpp" line="+138"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserSearchDialog</name>
+    <message>
+        <location filename="../dialog/BrowserSearchDialog.cpp" line="+118"/>
+        <source>Browser search</source>
+        <translation type="unfinished">Browser search</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Kind</source>
+        <translation type="unfinished">Kind</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Containing</source>
+        <translation type="unfinished">Containing</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>case sensitive</source>
+        <translation type="unfinished">case sensitive</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>even deleted</source>
+        <translation type="unfinished">even deleted</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name</source>
+        <translation type="unfinished">name</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>stereotype</source>
+        <translation type="unfinished">stereotype</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>description</source>
+        <translation type="unfinished">description</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>declaration/definition/body</source>
+        <translation type="unfinished">declaration/definition/body</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Result</source>
+        <translation type="unfinished">Result</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Search</source>
+        <translation type="unfinished">Search</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Unmark</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mark them</source>
+        <translation type="unfinished">Mark them</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Unmark all</translation>
+    </message>
+</context>
+<context>
+    <name>BuiltinTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsBuiltinTable.cpp" line="+99"/>
+        <location line="+8"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Uml/Cpp/Java/Idl fields cannot be empty</source>
+        <translation type="unfinished">Uml/Cpp/Java/Idl fields cannot be empty</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Duplicate Uml entries are not allowed</source>
+        <translation type="unfinished">Duplicate Uml entries are not allowed</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cpp parameter controls must contain ${type}</source>
+        <translation type="unfinished">Cpp parameter controls must contain ${type}</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Add type</source>
+        <translation type="unfinished">Add type</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Language visibility:</source>
+        <translation type="unfinished">Language visibility:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Search:</source>
+        <translation type="unfinished">Search:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Copy row</source>
+        <translation type="unfinished">Copy row</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste row</source>
+        <translation type="unfinished">Paste row</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut row</source>
+        <translation type="unfinished">Cut row</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete row</source>
+        <translation type="unfinished">Delete row</translation>
+    </message>
+</context>
+<context>
+    <name>CallBehaviorDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+336"/>
+        <location line="+25"/>
+        <source>behavior - Ocl</source>
+        <translation type="unfinished">behavior - Ocl</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchronous</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>behavior :</source>
+        <translation type="unfinished">behavior :</translation>
+    </message>
+</context>
+<context>
+    <name>CallOperationDialog</name>
+    <message>
+        <location line="-320"/>
+        <location line="+46"/>
+        <source>operation - Ocl</source>
+        <translation type="unfinished">operation - Ocl</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchronous</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>class : </source>
+        <translation type="unfinished">class : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>operation :</source>
+        <translation type="unfinished">operation :</translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Create operation and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>CatalogWidget</name>
+    <message>
+        <location filename="../ui/catalogwidget.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Visited</source>
+        <translation type="unfinished">Visited</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Marked</source>
+        <translation type="unfinished">Marked</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Favourites</source>
+        <translation type="unfinished">Favourites</translation>
+    </message>
+    <message>
+        <location filename="../ui/catalogwidget.cpp" line="+301"/>
+        <source>Remove from favourites</source>
+        <translation type="unfinished">Remove from favourites</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Unmark</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Unmark all</translation>
+    </message>
+</context>
+<context>
+    <name>CdClassCanvas</name>
+    <message>
+        <location filename="../diagram/CdClassCanvas.cpp" line="+1281"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show nesting relation</source>
+        <translation type="unfinished">Show nesting relation</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Individual attribute visibility</source>
+        <translation type="unfinished">Individual attribute visibility</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Individual operation visibility</source>
+        <translation type="unfinished">Individual operation visibility</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit class</source>
+        <translation type="unfinished">Edit class</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+12"/>
+        <source>Add item</source>
+        <translation type="unfinished">Add item</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+19"/>
+        <source>Add attribute</source>
+        <translation type="unfinished">Add attribute</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Edit item or attribute</source>
+        <translation type="unfinished">Edit item or attribute</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+18"/>
+        <source>Add operation</source>
+        <translation type="unfinished">Add operation</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Edit item</source>
+        <translation type="unfinished">Edit item</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Edit attribute</source>
+        <translation type="unfinished">Edit attribute</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+22"/>
+        <source>Add inherited operation</source>
+        <translation type="unfinished">Add inherited operation</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Choose operation</source>
+        <translation type="unfinished">Choose operation</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+2"/>
+        <source>Edit operation</source>
+        <translation type="unfinished">Edit operation</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Generate</source>
+        <translation type="unfinished">Generate</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+139"/>
+        <source>class</source>
+        <translation type="unfinished">class</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+31"/>
+        <source>class color</source>
+        <translation type="unfinished">class color</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+4"/>
+        <location line="+6"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ChangeVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-199"/>
+        <source>variable - Ocl</source>
+        <translation type="unfinished">variable - Ocl</translation>
+    </message>
+</context>
+<context>
+    <name>ClassDiagramView</name>
+    <message>
+        <location filename="../diagram/ClassDiagramView.cpp" line="+131"/>
+        <source>Class diagram menu</source>
+        <translation type="unfinished">Class diagram menu</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add classes of the selected class view</source>
+        <translation type="unfinished">Add classes of the selected class view</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+6"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Add marked elements</translation>
+    </message>
+</context>
+<context>
+    <name>ClassDialog</name>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="+2537"/>
+        <source>Class dialog</source>
+        <translation type="unfinished">Class dialog</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>base type : </source>
+        <translation type="unfinished">base type : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>artifact : </source>
+        <translation type="unfinished">artifact : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+10"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>
+Enter formals in case the class is parameterized
+</source>
+        <translation type="unfinished">
+Enter formals in case the class is parameterized
+</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>
+Specify actuals else formals default value will be used
+</source>
+        <translation type="unfinished">
+Specify actuals else formals default value will be used
+</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <location line="+184"/>
+        <source>Declaration : </source>
+        <translation type="unfinished">Declaration : </translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <location line="+39"/>
+        <location line="+44"/>
+        <location line="+44"/>
+        <location line="+60"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Result after
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-181"/>
+        <location line="+189"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Default declaration</translation>
+    </message>
+    <message>
+        <location line="-188"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Not generated in C++</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+42"/>
+        <location line="+47"/>
+        <source>Definition : </source>
+        <translation type="unfinished">Definition : </translation>
+    </message>
+    <message>
+        <location line="-76"/>
+        <location line="+46"/>
+        <location line="+45"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Default definition</translation>
+    </message>
+    <message>
+        <location line="-90"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Not generated in Java</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>switch type : </source>
+        <translation type="unfinished">switch type : </translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Not generated in IDL</source>
+        <translation type="unfinished">Not generated in IDL</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Initialization 
+plug-out :</source>
+        <translation type="unfinished">Initialization 
+plug-out :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+7"/>
+        <source>  parameter(s) : </source>
+        <translation type="unfinished">  parameter(s) : </translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>Check 
+plug-out :</source>
+        <translation type="unfinished">Check 
+plug-out :</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Icon path :</source>
+        <translation type="unfinished">Icon path :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Apply on : </source>
+        <translation type="unfinished">Apply on : </translation>
+    </message>
+    <message>
+        <location line="+795"/>
+        <location line="+6"/>
+        <location line="+9"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>ClassInstanceDialog</name>
+    <message>
+        <location filename="../dialog/ClassInstanceDialog.cpp" line="+134"/>
+        <source>Class instance dialog</source>
+        <translation type="unfinished">Class instance dialog</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">stereotype :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>class :</source>
+        <translation type="unfinished">class :</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> Attribute </source>
+        <translation type="unfinished"> Attribute </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> Class </source>
+        <translation type="unfinished"> Class </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> Value </source>
+        <translation type="unfinished"> Value </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Attributes</source>
+        <translation type="unfinished">Attributes</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Relations</source>
+        <translation type="unfinished">Relations</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>Yes</source>
+        <translation type="unfinished">Yes</translation>
+    </message>
+</context>
+<context>
+    <name>ClassListDialog</name>
+    <message>
+        <location filename="../dialog/ClassListDialog.cpp" line="+72"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>ClassSettingsDialog</name>
+    <message>
+        <location filename="../dialog/ClassSettingsDialog.cpp" line="+71"/>
+        <source>Class Settings dialog</source>
+        <translation type="unfinished">Class Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>default attributes visibility : </source>
+        <translation type="unfinished">default attributes visibility : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>default relations visibility : </source>
+        <translation type="unfinished">default relations visibility : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>default operations visibility : </source>
+        <translation type="unfinished">default operations visibility : </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>ClassViewDialog</name>
+    <message>
+        <location filename="../dialog/ClassViewDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>class view dialog</source>
+        <translation type="unfinished">class view dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+18"/>
+        <source>deployment
+view : </source>
+        <translation type="unfinished">deployment
+view : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>CodAddMsgDialog</name>
+    <message>
+        <location filename="../dialog/CodAddMsgDialog.cpp" line="+62"/>
+        <source>Add message dialog</source>
+        <translation type="unfinished">Add message dialog</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Add message to %1</source>
+        <translation type="unfinished">Add message to %1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>rank : </source>
+        <translation type="unfinished">rank : </translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Create operation and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>CodChangeMsgDialog</name>
+    <message>
+        <location filename="../dialog/CodChangeMsgDialog.cpp" line="+57"/>
+        <source>Communicationg message dialog</source>
+        <translation type="unfinished">Communicationg message dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Create operation and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>CodClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/CodClassInstCanvas.cpp" line="+238"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Select class in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Exit from model</source>
+        <translation type="unfinished">Exit from model</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert in model</source>
+        <translation type="unfinished">Insert in model</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace it</source>
+        <translation type="unfinished">Replace it</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">write name:type 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">show stereotypes 
+properties</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">class instance color</translation>
+    </message>
+</context>
+<context>
+    <name>CodDirsCanvas</name>
+    <message>
+        <location filename="../diagram/CodDirsCanvas.cpp" line="+362"/>
+        <location line="+6"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>CodLinkCanvas</name>
+    <message>
+        <location filename="../diagram/CodLinkCanvas.cpp" line="+125"/>
+        <source>Link</source>
+        <translation type="unfinished">Link</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <source>add messages to </source>
+        <translation type="unfinished">add messages to </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit its messages</source>
+        <translation type="unfinished">Edit its messages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Edit all the messages</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometry (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+</context>
+<context>
+    <name>CodSelfLinkCanvas</name>
+    <message>
+        <location filename="../diagram/CodSelfLinkCanvas.cpp" line="+278"/>
+        <source>Self link</source>
+        <translation type="unfinished">Self link</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add messages</source>
+        <translation type="unfinished">Add messages</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit its messages</source>
+        <translation type="unfinished">Edit its messages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Edit all the messages</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ColDiagramView</name>
+    <message>
+        <location filename="../diagram/ColDiagramView.cpp" line="+110"/>
+        <source>Communication diagram menu</source>
+        <translation type="unfinished">Communication diagram menu</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit all the messages</source>
+        <translation type="unfinished">Edit all the messages</translation>
+    </message>
+</context>
+<context>
+    <name>ColDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ColDiagramWindow.cpp" line="+78"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Add modeled Class instance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Add Class instance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Link</source>
+        <translation type="unfinished">Add Link</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Self Link</source>
+        <translation type="unfinished">Add Self Link</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anchor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ColMsgTable</name>
+    <message>
+        <location filename="../dialog/ColMsgTable.cpp" line="+142"/>
+        <source>Rank</source>
+        <translation type="unfinished">Rank</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hierarchical rank</source>
+        <translation type="unfinished">Hierarchical rank</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>From</source>
+        <translation type="unfinished">From</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Message</source>
+        <translation type="unfinished">Message</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">To</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+95"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="-71"/>
+        <source>rank </source>
+        <translation type="unfinished">rank </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit message</source>
+        <translation type="unfinished">Edit message</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change ranks</source>
+        <translation type="unfinished">Change ranks</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete it</source>
+        <translation type="unfinished">Delete it</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete recursively</source>
+        <translation type="unfinished">Delete recursively</translation>
+    </message>
+    <message>
+        <location line="+104"/>
+        <source>Enter new hierarchical rank</source>
+        <translation type="unfinished">Enter new hierarchical rank</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Hierarchical rank : </source>
+        <translation type="unfinished">Hierarchical rank : </translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Warning</source>
+        <translation type="unfinished">Warning</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Invalid hierarchical rank</source>
+        <translation type="unfinished">Invalid hierarchical rank</translation>
+    </message>
+</context>
+<context>
+    <name>ComboColor</name>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="+363"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unchanged&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ComboStates</name>
+    <message>
+        <location line="-281"/>
+        <location line="+21"/>
+        <location line="+21"/>
+        <location line="+28"/>
+        <location line="+27"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unchanged&gt;</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>unlimited</source>
+        <translation type="unfinished">unlimited</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>default</source>
+        <translation type="unfinished">default</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentCanvas</name>
+    <message>
+        <location filename="../diagram/ComponentCanvas.cpp" line="+380"/>
+        <source>Choose class</source>
+        <translation type="unfinished">Choose class</translation>
+    </message>
+    <message>
+        <location line="+479"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit component</source>
+        <translation type="unfinished">Edit component</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+34"/>
+        <source>component</source>
+        <translation type="unfinished">component</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+32"/>
+        <source>drawn as icon</source>
+        <translation type="unfinished">drawn as icon</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show required and provided interfaces</source>
+        <translation type="unfinished">show required and provided interfaces</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show realizations</source>
+        <translation type="unfinished">show realizations</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show stereotype properties</source>
+        <translation type="unfinished">show stereotype properties</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>component color</source>
+        <translation type="unfinished">component color</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>no provided interfaces</source>
+        <translation type="unfinished">no provided interfaces</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>no required interfaces</source>
+        <translation type="unfinished">no required interfaces</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+31"/>
+        <location line="+22"/>
+        <location line="+4"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source>not required</source>
+        <translation type="unfinished">not required</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>not provided</source>
+        <translation type="unfinished">not provided</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDiagramView</name>
+    <message>
+        <location filename="../diagram/ComponentDiagramView.cpp" line="+113"/>
+        <source>Component diagram menu</source>
+        <translation type="unfinished">Component diagram menu</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Add marked elements</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ComponentDiagramWindow.cpp" line="+82"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Component</source>
+        <translation type="unfinished">Add Component</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Inheritance</source>
+        <translation type="unfinished">Inheritance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dependency</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Required interface</source>
+        <translation type="unfinished">Required interface</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Provided interface</source>
+        <translation type="unfinished">Provided interface</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anchor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ComponentDialog</name>
+    <message>
+        <location filename="../dialog/ComponentDialog.cpp" line="+57"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>component dialog</source>
+        <translation type="unfinished">component dialog</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Required classes</source>
+        <translation type="unfinished">Required classes</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Provided classes</source>
+        <translation type="unfinished">Provided classes</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Realizing classes</source>
+        <translation type="unfinished">Realizing classes</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Stereotype filtering  </source>
+        <translation type="unfinished">Stereotype filtering  </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Available classes</source>
+        <translation type="unfinished">Available classes</translation>
+    </message>
+    <message>
+        <location line="+245"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintCanvas</name>
+    <message>
+        <location filename="../diagram/ConstraintCanvas.cpp" line="+140"/>
+        <source>Constraint</source>
+        <translation type="unfinished">Constraint</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Font</source>
+        <translation type="unfinished">Font</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <location line="+61"/>
+        <source>note color</source>
+        <translation type="unfinished">note color</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintDialog</name>
+    <message>
+        <location filename="../dialog/ConstraintDialog.cpp" line="+55"/>
+        <source>Constraints visibility dialog</source>
+        <translation type="unfinished">Constraints visibility dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Specify visible elements rather than hidden ones</source>
+        <translation type="unfinished">Specify visible elements rather than hidden ones</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show all</source>
+        <translation type="unfinished">Show all</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide all</source>
+        <translation type="unfinished">Hide all</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide inherited</source>
+        <translation type="unfinished">Hide inherited</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>ConstraintTable</name>
+    <message>
+        <location line="+71"/>
+        <source>visible</source>
+        <translation type="unfinished">visible</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>element</source>
+        <translation type="unfinished">element</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>constraint</source>
+        <translation type="unfinished">constraint</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location line="+43"/>
+        <location line="+9"/>
+        <location line="+16"/>
+        <source>  yes</source>
+        <translation type="unfinished">  yes</translation>
+    </message>
+</context>
+<context>
+    <name>ConstructorInitializerDialog</name>
+    <message>
+        <location filename="../ui/constructorinitializerdialog.ui" line="+14"/>
+        <source>Dialog</source>
+        <translation type="unfinished">Dialog</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>All attributes:</source>
+        <translation type="unfinished">All attributes:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Initializer
+text:</source>
+        <translation type="unfinished">Initializer
+text:</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Constructor
+prototype:</source>
+        <translation type="unfinished">Constructor
+prototype:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Result after
+substitution:</source>
+        <translation type="unfinished">Result after
+substitution:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location filename="../ui/constructorinitializerdialog.cpp" line="+49"/>
+        <source>Constructor-initializer setup</source>
+        <translation type="unfinished">Constructor-initializer setup</translation>
+    </message>
+</context>
+<context>
+    <name>ContinuationDialog</name>
+    <message>
+        <location filename="../dialog/ContinuationDialog.cpp" line="+49"/>
+        <source>stereotype/continuation dialog</source>
+        <translation type="unfinished">stereotype/continuation dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>label : </source>
+        <translation type="unfinished">label : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>CppParamsDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="+6241"/>
+        <source>C++ parameters dialog</source>
+        <translation type="unfinished">C++ parameters dialog</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>CppParamsTable</name>
+    <message>
+        <location line="-598"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Specifier</source>
+        <translation type="unfinished">Specifier</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pointer</source>
+        <translation type="unfinished">Pointer</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+4"/>
+        <source>Modifier</source>
+        <translation type="unfinished">Modifier</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+4"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+271"/>
+        <source>param %1</source>
+        <translation type="unfinished">param %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insert param before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insert param after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Delete param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copy param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cut param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Paste param</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Move param</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Set rank &lt;i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>DecoratorDialog</name>
+    <message>
+        <location filename="../dialog/DecoratorDialog.cpp" line="+54"/>
+        <source>decorator dialog</source>
+        <translation type="unfinished">decorator dialog</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+To add an decorator at the cursor position
+you may select it in the list and press &apos;add&apos;
+
+Set operation static to add @staticmethod,
+set operation abstract to add @abstractmethod
+</source>
+        <translation type="unfinished">
+To add an decorator at the cursor position
+you may select it in the list and press &apos;add&apos;
+
+Set operation static to add @staticmethod,
+set operation abstract to add @abstractmethod
+</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Add </source>
+        <translation type="unfinished">Add </translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Close</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentDiagramView</name>
+    <message>
+        <location filename="../diagram/DeploymentDiagramView.cpp" line="+122"/>
+        <source>Deployment diagram menu</source>
+        <translation type="unfinished">Deployment diagram menu</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Add marked elements</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentDiagramWindow</name>
+    <message>
+        <location filename="../diagram/DeploymentDiagramWindow.cpp" line="+88"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Deployment Node</source>
+        <translation type="unfinished">Add Deployment Node</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Artifact</source>
+        <translation type="unfinished">Add Artifact</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Component</source>
+        <translation type="unfinished">Add Component</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Network connexion/ending</source>
+        <translation type="unfinished">Network connexion/ending</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Network</source>
+        <translation type="unfinished">Network</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Inheritance</source>
+        <translation type="unfinished">Inheritance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dependency</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anchor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>DeploymentNodeCanvas</name>
+    <message>
+        <location filename="../diagram/DeploymentNodeCanvas.cpp" line="+485"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select node in browser</source>
+        <translation type="unfinished">Select node in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set node associated diagram</source>
+        <translation type="unfinished">Set node associated diagram</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+34"/>
+        <source>node</source>
+        <translation type="unfinished">node</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location line="+30"/>
+        <source>write node instance 
+horizontally</source>
+        <translation type="unfinished">write node instance 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">show stereotype 
+properties</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Node color</source>
+        <translation type="unfinished">Node color</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>DiagramView</name>
+    <message>
+        <location filename="../diagram/DiagramView.cpp" line="+1101"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Align</source>
+        <translation type="unfinished">Align</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>same width</source>
+        <translation type="unfinished">same width</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>same height</source>
+        <translation type="unfinished">same height</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>same width and height</source>
+        <translation type="unfinished">same width and height</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size</source>
+        <translation type="unfinished">Size</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Copy selected (Ctrl+c)</source>
+        <translation type="unfinished">Copy selected (Ctrl+c)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Cut selected (Ctrl+x, remove from diagram)</source>
+        <translation type="unfinished">Cut selected (Ctrl+x, remove from diagram)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove selected from view (Suppr)</source>
+        <translation type="unfinished">Remove selected from view (Suppr)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete selected (Ctrl+d)</source>
+        <translation type="unfinished">Delete selected (Ctrl+d)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+775"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="-774"/>
+        <source>Same drawing settings</source>
+        <translation type="unfinished">Same drawing settings</translation>
+    </message>
+    <message>
+        <location line="+778"/>
+        <source>Select diagram in browser</source>
+        <translation type="unfinished">Select diagram in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select all (Ctrl+a)</source>
+        <translation type="unfinished">Select all (Ctrl+a)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find selected browser element</source>
+        <translation type="unfinished">Find selected browser element</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy optimal picture part</source>
+        <translation type="unfinished">Copy optimal picture part</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy visible picture part</source>
+        <translation type="unfinished">Copy visible picture part</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save optimal picture part (png)</source>
+        <translation type="unfinished">Save optimal picture part (png)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save visible picture part (png)</source>
+        <translation type="unfinished">Save visible picture part (png)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save optimal picture part (svg)</source>
+        <translation type="unfinished">Save optimal picture part (svg)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save visible picture part (svg)</source>
+        <translation type="unfinished">Save visible picture part (svg)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste copied items (Ctrl+v)</source>
+        <translation type="unfinished">Paste copied items (Ctrl+v)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Optimal scale</source>
+        <translation type="unfinished">Optimal scale</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Optimal window size</source>
+        <translation type="unfinished">Optimal window size</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set preferred size and scale</source>
+        <translation type="unfinished">Set preferred size and scale</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set preferred scale (size unset)</source>
+        <translation type="unfinished">Set preferred scale (size unset)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Restore preferred size and scale</source>
+        <translation type="unfinished">Restore preferred size and scale</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unset preferred size and scale</source>
+        <translation type="unfinished">Unset preferred size and scale</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Restore preferred scale</source>
+        <translation type="unfinished">Restore preferred scale</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unset preferred scale</source>
+        <translation type="unfinished">Unset preferred scale</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Format</source>
+        <translation type="unfinished">Format</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Undo all changes</source>
+        <translation type="unfinished">Undo all changes</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Undo (Ctrl+z or Ctrl+u)</source>
+        <translation type="unfinished">Undo (Ctrl+z or Ctrl+u)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Redo (Ctrl+y or Ctrl+r)</source>
+        <translation type="unfinished">Redo (Ctrl+y or Ctrl+r)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+150"/>
+        <source>Landscape formats</source>
+        <translation type="unfinished">Landscape formats</translation>
+    </message>
+</context>
+<context>
+    <name>DiagramWindow</name>
+    <message>
+        <location filename="../diagram/DiagramWindow.cpp" line="+130"/>
+        <source>edit</source>
+        <translation type="unfinished">edit</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>scale</source>
+        <translation type="unfinished">scale</translation>
+    </message>
+</context>
+<context>
+    <name>EnvDialog</name>
+    <message>
+        <location filename="../dialog/EnvDialog.cpp" line="+74"/>
+        <source>Environment dialog</source>
+        <translation type="unfinished">Environment dialog</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>MANDATORY, choose a value between 2 and 127 not used by an other person working at the same time on a project with you.
+To be safe, if possible choose a value not used by an other person even not working on a given project with you</source>
+        <translation type="unfinished">MANDATORY, choose a value between 2 and 127 not used by an other person working at the same time on a project with you.
+To be safe, if possible choose a value not used by an other person even not working on a given project with you</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Own identifier </source>
+        <translation type="unfinished">Own identifier </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   The identifier can&apos;t be modified while a project is load</source>
+        <translation type="unfinished">   The identifier can&apos;t be modified while a project is load</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>
+Optional, to indicate where are the HTML pages of the reference manual. Used by the help (called by the F1 key) to show the
+chapter corresponding to the kind of the element selected in the browser</source>
+        <translation type="unfinished">
+Optional, to indicate where are the HTML pages of the reference manual. Used by the help (called by the F1 key) to show the
+chapter corresponding to the kind of the element selected in the browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Manual path</source>
+        <translation type="unfinished">Manual path</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+18"/>
+        <location line="+16"/>
+        <location line="+19"/>
+        <location line="+14"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <source>
+Optional, to indicate a web navigator program. If it is not defined the reference manual will be shown with an internal simple viewer</source>
+        <translation type="unfinished">
+Optional, to indicate a web navigator program. If it is not defined the reference manual will be shown with an internal simple viewer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Navigator</source>
+        <translation type="unfinished">Navigator</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>
+Optional, to indicate a template project. This allows to create new projects getting all the template project settings</source>
+        <translation type="unfinished">
+Optional, to indicate a template project. This allows to create new projects getting all the template project settings</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+Optional, to indicate a text editor (it must creates an own window). Else DoUML will use an internal editor</source>
+        <translation type="unfinished">
+Optional, to indicate a text editor (it must creates an own window). Else DoUML will use an internal editor</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>
+In case you have a multiple screens configuration the best for you is to ask DoUML to place by default the dialogs in one of these
+screens giving the area, else the dialogs will be shown on the center of the virtual screen.</source>
+        <translation type="unfinished">
+In case you have a multiple screens configuration the best for you is to ask DoUML to place by default the dialogs in one of these
+screens giving the area, else the dialogs will be shown on the center of the virtual screen.</translation>
+    </message>
+    <message>
+        <location line="-72"/>
+        <source>Editor path </source>
+        <translation type="unfinished">Editor path </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>
+Optional, to choose a language for menus and dialogs (default is English). You may have to select a corresponding character set</source>
+        <translation type="unfinished">
+Optional, to choose a language for menus and dialogs (default is English). You may have to select a corresponding character set</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Translation file path </source>
+        <translation type="unfinished">Translation file path </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>
+Optional, to indicate a character set in case you use non ISO_8859-1/latin1 characters. For instance KOI8-R or KOI8-RU for Cyrillic</source>
+        <translation type="unfinished">
+Optional, to indicate a character set in case you use non ISO_8859-1/latin1 characters. For instance KOI8-R or KOI8-RU for Cyrillic</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Character set </source>
+        <translation type="unfinished">Character set </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Default screen </source>
+        <translation type="unfinished">Default screen </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>left: </source>
+        <translation type="unfinished">left: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      top: </source>
+        <translation type="unfinished">      top: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      right: </source>
+        <translation type="unfinished">      right: </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>      bottom: </source>
+        <translation type="unfinished">      bottom: </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>documentation directory</source>
+        <translation type="unfinished">documentation directory</translation>
+    </message>
+</context>
+<context>
+    <name>ExceptionsTable</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-682"/>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+47"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>exception %1</source>
+        <translation type="unfinished">exception %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert exception before</source>
+        <translation type="unfinished">Insert exception before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert exception after</source>
+        <translation type="unfinished">Insert exception after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete exception</source>
+        <translation type="unfinished">Delete exception</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy exception</source>
+        <translation type="unfinished">Copy exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut exception</source>
+        <translation type="unfinished">Cut exception</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste exception</source>
+        <translation type="unfinished">Paste exception</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Move exception</source>
+        <translation type="unfinished">Move exception</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionNodeCanvas</name>
+    <message>
+        <location filename="../diagram/ExpansionNodeCanvas.cpp" line="+330"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit expansion node</source>
+        <translation type="unfinished">Edit expansion node</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <location line="+25"/>
+        <source>expansion node color</source>
+        <translation type="unfinished">expansion node color</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location line="+9"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionRegionCanvas</name>
+    <message>
+        <location filename="../diagram/ExpansionRegionCanvas.cpp" line="+460"/>
+        <source>Add expansion node</source>
+        <translation type="unfinished">Add expansion node</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit expansion region</source>
+        <translation type="unfinished">Edit expansion region</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <location line="+25"/>
+        <source>expansion region color</source>
+        <translation type="unfinished">expansion region color</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ExpansionRegionDialog</name>
+    <message>
+        <location filename="../dialog/ExpansionRegionDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Expansion Region dialog</source>
+        <translation type="unfinished">Expansion Region dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>mode :</source>
+        <translation type="unfinished">mode :</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>must isolate</source>
+        <translation type="unfinished">must isolate</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>description</source>
+        <translation type="unfinished">description</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>ExtraMemberDialog</name>
+    <message>
+        <location filename="../dialog/ExtraMemberDialog.cpp" line="+61"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Extra Class Member dialog</source>
+        <translation type="unfinished">Extra Class Member dialog</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name :</source>
+        <translation type="unfinished">name :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype :</source>
+        <translation type="unfinished">stereotype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+33"/>
+        <location line="+15"/>
+        <location line="+25"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-122"/>
+        <source>C++ 
+declaration :</source>
+        <translation type="unfinished">C++ 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>C++ 
+definition :</source>
+        <translation type="unfinished">C++ 
+definition :</translation>
+    </message>
+    <message>
+        <location line="+129"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+</context>
+<context>
+    <name>FlowCanvas</name>
+    <message>
+        <location filename="../diagram/FlowCanvas.cpp" line="+155"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+90"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Select labels</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Labels default position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach flow label to this segment</source>
+        <translation type="unfinished">Attach flow label to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach stereotype to this segment</source>
+        <translation type="unfinished">Attach stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometry (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <location line="+34"/>
+        <source>write horizontally</source>
+        <translation type="unfinished">write horizontally</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+34"/>
+        <source>Flow Drawing Settings dialog</source>
+        <translation type="unfinished">Flow Drawing Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>flow already drawn</source>
+        <translation type="unfinished">flow already drawn</translation>
+    </message>
+</context>
+<context>
+    <name>FlowDialog</name>
+    <message>
+        <location filename="../dialog/FlowDialog.cpp" line="+58"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Flow dialog</source>
+        <translation type="unfinished">Flow dialog</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+97"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>weight : </source>
+        <translation type="unfinished">weight : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>guard : </source>
+        <translation type="unfinished">guard : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>selection : </source>
+        <translation type="unfinished">selection : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>transformation : </source>
+        <translation type="unfinished">transformation : </translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>FormalParamsTable</name>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="-1690"/>
+        <source>formal param %1</source>
+        <translation type="unfinished">formal param %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insert param before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insert param after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Delete param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copy param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cut param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Paste param</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Move param</translation>
+    </message>
+</context>
+<context>
+    <name>FragmentCanvas</name>
+    <message>
+        <location filename="../diagram/FragmentCanvas.cpp" line="+354"/>
+        <source>Fragment</source>
+        <translation type="unfinished">Fragment</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add separator</source>
+        <translation type="unfinished">Add separator</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show referenced diagram</source>
+        <translation type="unfinished">Show referenced diagram</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+25"/>
+        <source>fragment color</source>
+        <translation type="unfinished">fragment color</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>FragmentDialog</name>
+    <message>
+        <location filename="../dialog/FragmentDialog.cpp" line="+55"/>
+        <source>Fragment dialog</source>
+        <translation type="unfinished">Fragment dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>refer to : </source>
+        <translation type="unfinished">refer to : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>arguments 
+/ value : </source>
+        <translation type="unfinished">arguments 
+/ value : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose diagram selected in browser</source>
+        <translation type="unfinished">Choose diagram selected in browser</translation>
+    </message>
+</context>
+<context>
+    <name>GenerationSettingsDialog</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+73"/>
+        <source>Generation settings dialog</source>
+        <translation type="unfinished">Generation settings dialog</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Types correspondence, and C++ operation argument default passing for them :</source>
+        <translation type="unfinished">Types correspondence, and C++ operation argument default passing for them :</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Attributes and 
+Relations
+stereotypes 
+correspondence : </source>
+        <translation type="unfinished">Attributes and 
+Relations
+stereotypes 
+correspondence : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Classes&apos;s 
+stereotypes 
+correspondence : </source>
+        <translation type="unfinished">Classes&apos;s 
+stereotypes 
+correspondence : </translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Header file
+default content :</source>
+        <translation type="unfinished">Header file
+default content :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Source file
+default content :</source>
+        <translation type="unfinished">Source file
+default content :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>generated/reversed 
+header file extension : </source>
+        <translation type="unfinished">generated/reversed 
+header file extension : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generated/reversed 
+    source file extension : </source>
+        <translation type="unfinished">    generated/reversed 
+    source file extension : </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+682"/>
+        <source>without path</source>
+        <translation type="unfinished">without path</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with absolute path</source>
+        <translation type="unfinished">with absolute path</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with relative path</source>
+        <translation type="unfinished">with relative path</translation>
+    </message>
+    <message>
+        <location line="-681"/>
+        <location line="+682"/>
+        <source>with root relative path</source>
+        <translation type="unfinished">with root relative path</translation>
+    </message>
+    <message>
+        <location line="-667"/>
+        <source>force namespace 
+prefix generation : </source>
+        <translation type="unfinished">force namespace 
+prefix generation : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            inline operation force 
+            includes in header : </source>
+        <translation type="unfinished">            inline operation force 
+            includes in header : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            generate Javadoc 
+            style comment : </source>
+        <translation type="unfinished">            generate Javadoc 
+            style comment : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>            visibility indent : </source>
+        <translation type="unfinished">            visibility indent : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+366"/>
+        <location line="+287"/>
+        <location line="+179"/>
+        <source>Class default 
+declaration :</source>
+        <translation type="unfinished">Class default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-821"/>
+        <location line="+1058"/>
+        <source>Struct default 
+declaration :</source>
+        <translation type="unfinished">Struct default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+1058"/>
+        <source>Union default 
+declaration :</source>
+        <translation type="unfinished">Union default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+355"/>
+        <location line="+287"/>
+        <location line="+181"/>
+        <location line="+235"/>
+        <source>Enum default 
+declaration :</source>
+        <translation type="unfinished">Enum default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-1053"/>
+        <location line="+1058"/>
+        <source>Typedef default 
+declaration :</source>
+        <translation type="unfinished">Typedef default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-1038"/>
+        <location line="+355"/>
+        <location line="+453"/>
+        <source>Attribute 
+default 
+declaration :</source>
+        <translation type="unfinished">Attribute 
+default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-805"/>
+        <location line="+29"/>
+        <location line="+25"/>
+        <source>Multiplicity</source>
+        <translation type="unfinished">Multiplicity</translation>
+    </message>
+    <message>
+        <location line="-50"/>
+        <source>unspecified,
+or 1</source>
+        <translation type="unfinished">unspecified,
+or 1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+38"/>
+        <location line="+21"/>
+        <source>* or a..b</source>
+        <translation type="unfinished">* or a..b</translation>
+    </message>
+    <message>
+        <location line="-57"/>
+        <location line="+38"/>
+        <location line="+21"/>
+        <source>X (means [X])
+or [...]...[...]</source>
+        <translation type="unfinished">X (means [X])
+or [...]...[...]</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Association
+and
+aggregation
+default
+declaration :</source>
+        <translation type="unfinished">Association
+and
+aggregation
+default
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Association </source>
+        <translation type="unfinished">Association </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>  and aggregation </source>
+        <translation type="unfinished">  and aggregation </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>unspecified,
+1 or 0..1</source>
+        <translation type="unfinished">unspecified,
+1 or 0..1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+810"/>
+        <source>Composition
+default
+declaration :</source>
+        <translation type="unfinished">Composition
+default
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-804"/>
+        <source>Composition </source>
+        <translation type="unfinished">Composition </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>unspecified
+or 1</source>
+        <translation type="unfinished">unspecified
+or 1</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <location line="+338"/>
+        <location line="+234"/>
+        <location line="+214"/>
+        <location line="+359"/>
+        <source>Get operation
+default definition : </source>
+        <translation type="unfinished">Get operation
+default definition : </translation>
+    </message>
+    <message>
+        <location line="-1139"/>
+        <location line="+38"/>
+        <source>Visibility</source>
+        <translation type="unfinished">Visibility</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+37"/>
+        <location line="+299"/>
+        <source>Modifiers</source>
+        <translation type="unfinished">Modifiers</translation>
+    </message>
+    <message>
+        <location line="-333"/>
+        <source>const value</source>
+        <translation type="unfinished">const value</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+37"/>
+        <location line="+295"/>
+        <location line="+28"/>
+        <location line="+206"/>
+        <location line="+26"/>
+        <location line="+179"/>
+        <location line="+17"/>
+        <location line="+360"/>
+        <source>  name : </source>
+        <translation type="unfinished">  name : </translation>
+    </message>
+    <message>
+        <location line="-1136"/>
+        <location line="+31"/>
+        <location line="+295"/>
+        <location line="+28"/>
+        <location line="+206"/>
+        <location line="+26"/>
+        <location line="+179"/>
+        <location line="+17"/>
+        <location line="+341"/>
+        <location line="+19"/>
+        <source>also in uml</source>
+        <translation type="unfinished">also in uml</translation>
+    </message>
+    <message>
+        <location line="-1134"/>
+        <location line="+326"/>
+        <location line="+234"/>
+        <location line="+205"/>
+        <location line="+358"/>
+        <source>Set operation
+default definition : </source>
+        <translation type="unfinished">Set operation
+default definition : </translation>
+    </message>
+    <message>
+        <location line="-1112"/>
+        <source>const param</source>
+        <translation type="unfinished">const param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>by ref</source>
+        <translation type="unfinished">by ref</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <location line="+244"/>
+        <location line="+246"/>
+        <location line="+145"/>
+        <source>Enumeration item 
+default definition :</source>
+        <translation type="unfinished">Enumeration item 
+default definition :</translation>
+    </message>
+    <message>
+        <location line="-627"/>
+        <source>Default type forms
+for the enums :</source>
+        <translation type="unfinished">Default type forms
+for the enums :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <source>input
+parameter : </source>
+        <translation type="unfinished">input
+parameter : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   output
+   parameter : </source>
+        <translation type="unfinished">   output
+   parameter : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   input output 
+   parameter : </source>
+        <translation type="unfinished">   input output 
+   parameter : </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+20"/>
+        <source>   operation 
+   return : </source>
+        <translation type="unfinished">   operation 
+   return : </translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Default type forms for
+the types not given
+in the first tab:</source>
+        <translation type="unfinished">Default type forms for
+the types not given
+in the first tab:</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Operation default 
+declaration :</source>
+        <translation type="unfinished">Operation default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Operation default 
+definition :</source>
+        <translation type="unfinished">Operation default 
+definition :</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>External classes : 
+name making
+#include, using</source>
+        <translation type="unfinished">External classes : 
+name making
+#include, using</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>External types :
+#include form(s),
+using, etc...</source>
+        <translation type="unfinished">External types :
+#include form(s),
+using, etc...</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Include etc...</source>
+        <translation type="unfinished">Include etc...</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+267"/>
+        <location line="+220"/>
+        <location line="+223"/>
+        <source>file default 
+content :</source>
+        <translation type="unfinished">file default 
+content :</translation>
+    </message>
+    <message>
+        <location line="-687"/>
+        <source>    generated/reversed file extension </source>
+        <translation type="unfinished">    generated/reversed file extension </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generate Javadoc style comment </source>
+        <translation type="unfinished">    generate Javadoc style comment </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>    force package prefix generation </source>
+        <translation type="unfinished">    force package prefix generation </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+287"/>
+        <location line="+399"/>
+        <source>Interface default 
+declaration :</source>
+        <translation type="unfinished">Interface default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-676"/>
+        <source>Enum pattern 
+default declaration :</source>
+        <translation type="unfinished">Enum pattern 
+default declaration :</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+25"/>
+        <location line="+430"/>
+        <location line="+30"/>
+        <location line="+24"/>
+        <location line="+199"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>multiplicity &apos;1&apos;
+or unspecified</source>
+        <translation type="unfinished">multiplicity &apos;1&apos;
+or unspecified</translation>
+    </message>
+    <message>
+        <location line="-850"/>
+        <location line="+25"/>
+        <location line="+683"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>multiplicity &apos;*&apos;
+or &apos;a..b&apos;</source>
+        <translation type="unfinished">multiplicity &apos;*&apos;
+or &apos;a..b&apos;</translation>
+    </message>
+    <message>
+        <location line="-850"/>
+        <location line="+25"/>
+        <location line="+683"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location line="+23"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <source>X (probably a
+number)</source>
+        <translation type="unfinished">X (probably a
+number)</translation>
+    </message>
+    <message>
+        <location line="-833"/>
+        <location line="+269"/>
+        <location line="+191"/>
+        <location line="+296"/>
+        <source>Association and
+aggregation
+default
+declaration :</source>
+        <translation type="unfinished">Association and
+aggregation
+default
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-713"/>
+        <source>Enum pattern item 
+default definition :</source>
+        <translation type="unfinished">Enum pattern item 
+default definition :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Enum pattern item 
+&apos;case&apos; in &apos;from_int&apos; :</source>
+        <translation type="unfinished">Enum pattern item 
+&apos;case&apos; in &apos;from_int&apos; :</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+26"/>
+        <source>Visibility (shared with Php)</source>
+        <translation type="unfinished">Visibility (shared with Php)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>final parameter</source>
+        <translation type="unfinished">final parameter</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+232"/>
+        <location line="+196"/>
+        <source>Operation
+default definition :</source>
+        <translation type="unfinished">Operation
+default definition :</translation>
+    </message>
+    <message>
+        <location line="-403"/>
+        <location line="+215"/>
+        <source>External classes : 
+name making</source>
+        <translation type="unfinished">External classes : 
+name making</translation>
+    </message>
+    <message>
+        <location line="-207"/>
+        <source>External types :
+import form(s) etc...</source>
+        <translation type="unfinished">External types :
+import form(s) etc...</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>    generated / reversed file extension : </source>
+        <translation type="unfinished">    generated / reversed file extension : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generate Javadoc style comment : </source>
+        <translation type="unfinished">    generate Javadoc style comment : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>    require_once : </source>
+        <translation type="unfinished">    require_once : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>    force namespace prefix generation : </source>
+        <translation type="unfinished">    force namespace prefix generation : </translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+427"/>
+        <source>Attribute default 
+declaration :</source>
+        <translation type="unfinished">Attribute default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="-392"/>
+        <location line="+26"/>
+        <source>Visibility (shared with Java)</source>
+        <translation type="unfinished">Visibility (shared with Java)</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>indent step :</source>
+        <translation type="unfinished">indent step :</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>    generated /
+    reversed
+    file extension : </source>
+        <translation type="unfinished">    generated /
+    reversed
+    file extension : </translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>    classes of Python 2.2 </source>
+        <translation type="unfinished">    classes of Python 2.2 </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+39"/>
+        <location line="+15"/>
+        <source>other
+multiplicity</source>
+        <translation type="unfinished">other
+multiplicity</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>    operation of Python 3 (pep-3107) </source>
+        <translation type="unfinished">    operation of Python 3 (pep-3107) </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Operation __init__
+default definition :</source>
+        <translation type="unfinished">Operation __init__
+default definition :</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>External classes : 
+name making
+import</source>
+        <translation type="unfinished">External classes : 
+name making
+import</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>External types :
+import form(s)</source>
+        <translation type="unfinished">External types :
+import form(s)</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>    file extension : </source>
+        <translation type="unfinished">    file extension : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Valuetype default 
+declaration :</source>
+        <translation type="unfinished">Valuetype default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Exception default 
+declaration :</source>
+        <translation type="unfinished">Exception default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Attribute default 
+declaration in
+valuetype :</source>
+        <translation type="unfinished">Attribute default 
+declaration in
+valuetype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Constant default 
+declaration :</source>
+        <translation type="unfinished">Constant default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Association and
+aggregation
+default
+declaration in
+valuetype :</source>
+        <translation type="unfinished">Association and
+aggregation
+default
+declaration in
+valuetype :</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Association and
+aggregation
+default
+declaration in
+union:</source>
+        <translation type="unfinished">Association and
+aggregation
+default
+declaration in
+union:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Union item 
+default 
+declaration :</source>
+        <translation type="unfinished">Union item 
+default 
+declaration :</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Enumeration item 
+default declaration :</source>
+        <translation type="unfinished">Enumeration item 
+default declaration :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Operation default 
+declaration : </source>
+        <translation type="unfinished">Operation default 
+declaration : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>External classes : 
+name making
+#include</source>
+        <translation type="unfinished">External classes : 
+name making
+#include</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>External types :
+#include form(s)
+etc...</source>
+        <translation type="unfinished">External types :
+#include form(s)
+etc...</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Artifact
+default
+description : </source>
+        <translation type="unfinished">Artifact
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Class
+default
+description : </source>
+        <translation type="unfinished">Class
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Operation
+default
+description : </source>
+        <translation type="unfinished">Operation
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Attribute
+default
+description : </source>
+        <translation type="unfinished">Attribute
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Relation
+default
+description : </source>
+        <translation type="unfinished">Relation
+default
+description : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Defining a project root directory allows to specify                                   packages&apos;s generation directory relative to the root directory rather                                   than absolute.
+A root directory may itself be relative to the project path</source>
+        <translation type="unfinished">Defining a project root directory allows to specify                                   packages&apos;s generation directory relative to the root directory rather                                   than absolute.
+A root directory may itself be relative to the project path</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>C++ root dir : </source>
+        <translation type="unfinished">C++ root dir : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <location line="+19"/>
+        <location line="+19"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Java root dir : </source>
+        <translation type="unfinished">Java root dir : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Php root dir : </source>
+        <translation type="unfinished">Php root dir : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Python root dir : </source>
+        <translation type="unfinished">Python root dir : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Idl root dir : </source>
+        <translation type="unfinished">Idl root dir : </translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+10"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>HelpDialog</name>
+    <message>
+        <location filename="../dialog/HelpDialog.cpp" line="+80"/>
+        <source>DoUML Help</source>
+        <translation type="unfinished">DoUML Help</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>To set the navigator by setting the environment through the menu Miscellaneous allows to see all the documentation in better conditions</source>
+        <translation type="unfinished">To set the navigator by setting the environment through the menu Miscellaneous allows to see all the documentation in better conditions</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+</context>
+<context>
+    <name>HelpRegexpDialog</name>
+    <message>
+        <location filename="../dialog/RevSettingsDialog.cpp" line="+260"/>
+        <source>Help regular expression</source>
+        <translation type="unfinished">Help regular expression</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+</context>
+<context>
+    <name>HideShowDialog</name>
+    <message>
+        <location filename="../dialog/HideShowDialog.cpp" line="+56"/>
+        <source>Settings dialog</source>
+        <translation type="unfinished">Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Visible</source>
+        <translation type="unfinished">Visible</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Hidden</source>
+        <translation type="unfinished">Hidden</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Show all</source>
+        <translation type="unfinished">Show all</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide all</source>
+        <translation type="unfinished">Hide all</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide private ones</source>
+        <translation type="unfinished">Hide private ones</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hide private and
+protected ones</source>
+        <translation type="unfinished">Hide private and
+protected ones</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Specify visible members rather than hidden ones</source>
+        <translation type="unfinished">Specify visible members rather than hidden ones</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>IconCanvas</name>
+    <message>
+        <location filename="../diagram/IconCanvas.cpp" line="+141"/>
+        <source>
+short cut</source>
+        <translation type="unfinished">
+short cut</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open</source>
+        <translation type="unfinished">Open</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select diagram in browser</source>
+        <translation type="unfinished">Select diagram in browser</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ImageDialog</name>
+    <message>
+        <location filename="../dialog/ImageDialog.cpp" line="+57"/>
+        <source>Image dialog</source>
+        <translation type="unfinished">Image dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Image path :</source>
+        <translation type="unfinished">Image path :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set it relative to image root</source>
+        <translation type="unfinished">Set it relative to image root</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it relative to project</source>
+        <translation type="unfinished">Set it relative to project</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it absolute</source>
+        <translation type="unfinished">Set it absolute</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>IncludeTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+611"/>
+        <source>External type</source>
+        <translation type="unfinished">External type</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+</context>
+<context>
+    <name>InfoCanvas</name>
+    <message>
+        <location filename="../diagram/InfoCanvas.cpp" line="+124"/>
+        <source>Information</source>
+        <translation type="unfinished">Information</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Font</source>
+        <translation type="unfinished">Font</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location line="+61"/>
+        <source>note color</source>
+        <translation type="unfinished">note color</translation>
+    </message>
+</context>
+<context>
+    <name>InstanceDialog</name>
+    <message>
+        <location filename="../dialog/InstanceDialog.cpp" line="+63"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Choose </source>
+        <translation type="unfinished">Choose </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> selected in browser</source>
+        <translation type="unfinished"> selected in browser</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Create </source>
+        <translation type="unfinished">Create </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> and choose it</source>
+        <translation type="unfinished"> and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>InterruptibleActivityRegionCanvas</name>
+    <message>
+        <location filename="../diagram/InterruptibleActivityRegionCanvas.cpp" line="+259"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit interruptible activity region</source>
+        <translation type="unfinished">Edit interruptible activity region</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <location line="+25"/>
+        <source>interruptible activity region color</source>
+        <translation type="unfinished">interruptible activity region color</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>KeyValuesTable</name>
+    <message>
+        <location filename="../dialog/KeyValueTable.cpp" line="+90"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>MLEDialog</name>
+    <message>
+        <location filename="../dialog/MLEDialog.cpp" line="+57"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>MyInputDialog</name>
+    <message>
+        <location filename="../dialog/MyInputDialog.cpp" line="+77"/>
+        <location line="+75"/>
+        <location line="+56"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="-130"/>
+        <location line="+75"/>
+        <location line="+56"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+</context>
+<context>
+    <name>NoteCanvas</name>
+    <message>
+        <location filename="../diagram/NoteCanvas.cpp" line="+219"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Color of text</source>
+        <translation type="unfinished">Color of text</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Font</source>
+        <translation type="unfinished">Font</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>color</source>
+        <translation type="unfinished">color</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Text color dialog</source>
+        <translation type="unfinished">Text color dialog</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <location line="+25"/>
+        <source>note color</source>
+        <translation type="unfinished">note color</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectDiagramView</name>
+    <message>
+        <location filename="../diagram/ObjectDiagramView.cpp" line="+71"/>
+        <source>Object diagram menu</source>
+        <translation type="unfinished">Object diagram menu</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectDiagramWindow</name>
+    <message>
+        <location filename="../diagram/ObjectDiagramWindow.cpp" line="+75"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Add modeled Class instance</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Add Class instance</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Link between instances</source>
+        <translation type="unfinished">Add Link between instances</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anchor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectLinkCanvas</name>
+    <message>
+        <location filename="../diagram/ObjectLinkCanvas.cpp" line="+315"/>
+        <source>Relation already drawn</source>
+        <translation type="unfinished">Relation already drawn</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Object link</source>
+        <translation type="unfinished">Object link</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select relation in browser</source>
+        <translation type="unfinished">Select relation in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Select labels</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Labels default position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s name to this segment</source>
+        <translation type="unfinished">Attach relation&apos;s name to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s stereotype to this segment</source>
+        <translation type="unfinished">Attach relation&apos;s stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometry (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectLinkDialog</name>
+    <message>
+        <location filename="../dialog/ObjectLinkDialog.cpp" line="+55"/>
+        <source>Object link dialog</source>
+        <translation type="unfinished">Object link dialog</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>
+To set the association, select a cell or the first column with a single click, then press &apos;OK&apos;
+To unset the association press &apos;Unset&apos; then press &apos;OK&apos;
+</source>
+        <translation type="unfinished">
+To set the association, select a cell or the first column with a single click, then press &apos;OK&apos;
+To unset the association press &apos;Unset&apos; then press &apos;OK&apos;
+</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;New</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Unset</source>
+        <translation type="unfinished">&amp;Unset</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>Class Inst.</source>
+        <translation type="unfinished">Class Inst.</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+2"/>
+        <source>Role</source>
+        <translation type="unfinished">Role</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>kind</source>
+        <translation type="unfinished">kind</translation>
+    </message>
+</context>
+<context>
+    <name>OdClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/OdClassInstCanvas.cpp" line="+567"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Select class in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">write name:type 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">show stereotypes 
+properties</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">class instance color</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>OpaqueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-662"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Behavior : </source>
+        <translation type="unfinished">Behavior : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+</context>
+<context>
+    <name>OperationData</name>
+    <message>
+        <location filename="../data/OperationData.cpp" line="+3727"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+</context>
+<context>
+    <name>OperationDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-5368"/>
+        <source>Operation dialog</source>
+        <translation type="unfinished">Operation dialog</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>class : </source>
+        <translation type="unfinished">class : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>value type :</source>
+        <translation type="unfinished">value type :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>static</source>
+        <translation type="unfinished">static</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>abstract</source>
+        <translation type="unfinished">abstract</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>force body generation</source>
+        <translation type="unfinished">force body generation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>parameters : </source>
+        <translation type="unfinished">parameters : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>exceptions : </source>
+        <translation type="unfinished">exceptions : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+10"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>constraint :</source>
+        <translation type="unfinished">constraint :</translation>
+    </message>
+    <message>
+        <location line="+141"/>
+        <location line="+58"/>
+        <source>follow uml</source>
+        <translation type="unfinished">follow uml</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+137"/>
+        <location line="+130"/>
+        <location line="+134"/>
+        <location line="+340"/>
+        <source>Show body</source>
+        <translation type="unfinished">Show body</translation>
+    </message>
+    <message>
+        <location line="-741"/>
+        <location line="+137"/>
+        <location line="+130"/>
+        <location line="+134"/>
+        <location line="+340"/>
+        <source>Edit body</source>
+        <translation type="unfinished">Edit body</translation>
+    </message>
+    <message>
+        <location line="-697"/>
+        <location line="+132"/>
+        <location line="+129"/>
+        <location line="+133"/>
+        <source>frozen</source>
+        <translation type="unfinished">frozen</translation>
+    </message>
+    <message>
+        <location line="-382"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Name form : </source>
+        <translation type="unfinished">Name form : </translation>
+    </message>
+    <message>
+        <location line="-384"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Definition :</source>
+        <translation type="unfinished">Definition :</translation>
+    </message>
+    <message>
+        <location line="-383"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+137"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Result after
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-388"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <source>contextual
+body indent</source>
+        <translation type="unfinished">contextual
+body indent</translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <location line="+128"/>
+        <location line="+125"/>
+        <location line="+129"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Default declaration</translation>
+    </message>
+    <message>
+        <location line="-381"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Not generated in Java</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Show annotation</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Edit annotation</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+65"/>
+        <location line="+60"/>
+        <source>Edit parameters</source>
+        <translation type="unfinished">Edit parameters</translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <source>Show parameters</source>
+        <translation type="unfinished">Show parameters</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Show decorators</source>
+        <translation type="unfinished">Show decorators</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit decorators</source>
+        <translation type="unfinished">Edit decorators</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Not generated in Idl</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+424"/>
+        <location line="+621"/>
+        <location line="+1358"/>
+        <location line="+476"/>
+        <source>wrong specification</source>
+        <translation type="unfinished">wrong specification</translation>
+    </message>
+    <message>
+        <location line="-1969"/>
+        <source>[@][{][A-Za-z0-9]+[}]</source>
+        <translation type="unfinished">[@][{][A-Za-z0-9]+[}]</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>,</source>
+        <translation type="unfinished">,</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+1095"/>
+        <source>Warning!</source>
+        <translation type="unfinished">Warning!</translation>
+    </message>
+    <message>
+        <location line="-1095"/>
+        <source>Could not find correct place for these tags: </source>
+        <translation type="unfinished">Could not find correct place for these tags: </translation>
+    </message>
+    <message>
+        <location line="+1096"/>
+        <source>The Operation you are trying to change is
+inhertied from/to other classes.
+Do you want to propagate the changes to it
+ through the inheritance tree?</source>
+        <translation type="unfinished">The Operation you are trying to change is
+inhertied from/to other classes.
+Do you want to propagate the changes to it
+ through the inheritance tree?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Above</source>
+        <translation type="unfinished">Above</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Everywhere</source>
+        <translation type="unfinished">Everywhere</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Do not propagate</source>
+        <translation type="unfinished">Do not propagate</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+    <message>
+        <location line="+4110"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+</context>
+<context>
+    <name>OperationListDialog</name>
+    <message>
+        <location filename="../dialog/OperationListDialog.cpp" line="+74"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>OperationWidgetCpp</name>
+    <message>
+        <location filename="../ui/operationwidgetcpp.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>frozen</source>
+        <translation type="unfinished">frozen</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>default</source>
+        <translation type="unfinished">default</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>delete</source>
+        <translation type="unfinished">delete</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>override</source>
+        <translation type="unfinished">override</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>final</source>
+        <translation type="unfinished">final</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Name form:</source>
+        <translation type="unfinished">Name form:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Declaration:</source>
+        <translation type="unfinished">Declaration:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+76"/>
+        <source>Result after substitution:</source>
+        <translation type="unfinished">Result after substitution:</translation>
+    </message>
+    <message>
+        <location line="-50"/>
+        <source>Default Declaration</source>
+        <translation type="unfinished">Default Declaration</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>From Definition</source>
+        <translation type="unfinished">From Definition</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+90"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Not generated in C++</translation>
+    </message>
+    <message>
+        <location line="-83"/>
+        <location line="+90"/>
+        <source>Edit parameters</source>
+        <translation type="unfinished">Edit parameters</translation>
+    </message>
+    <message>
+        <location line="-77"/>
+        <source>Definition:</source>
+        <translation type="unfinished">Definition:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>contextual
+body indent :</source>
+        <translation type="unfinished">contextual
+body indent :</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>EditBody</source>
+        <translation type="unfinished">EditBody</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Default definition</source>
+        <translation type="unfinished">Default definition</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>From Declaration</source>
+        <translation type="unfinished">From Declaration</translation>
+    </message>
+</context>
+<context>
+    <name>PackageCanvas</name>
+    <message>
+        <location filename="../diagram/PackageCanvas.cpp" line="+492"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location line="+34"/>
+        <source>package</source>
+        <translation type="unfinished">package</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+32"/>
+        <source>name in tab</source>
+        <translation type="unfinished">name in tab</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show context</source>
+        <translation type="unfinished">show context</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">show stereotype 
+properties</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+32"/>
+        <source>Package color</source>
+        <translation type="unfinished">Package color</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+9"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>PackageDialog</name>
+    <message>
+        <location filename="../dialog/PackageDialog.cpp" line="+71"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Package dialog</source>
+        <translation type="unfinished">Package dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>The generation directories may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</source>
+        <translation type="unfinished">The generation directories may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>headers directory : </source>
+        <translation type="unfinished">headers directory : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+29"/>
+        <location line="+56"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>Browse</source>
+        <translation type="unfinished">Browse</translation>
+    </message>
+    <message>
+        <location line="-226"/>
+        <source>sources directory : </source>
+        <translation type="unfinished">sources directory : </translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>The generation directory may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</source>
+        <translation type="unfinished">The generation directory may be relative in case the root directory
+is specified (through the project menu entry &apos;edit generation settings&apos;)
+
+</translation>
+    </message>
+    <message>
+        <location line="-157"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <location line="+54"/>
+        <source>directory : </source>
+        <translation type="unfinished">directory : </translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>meta model : 
+reference</source>
+        <translation type="unfinished">meta model : 
+reference</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>meta class : 
+reference</source>
+        <translation type="unfinished">meta class : 
+reference</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <location line="+5"/>
+        <location line="+9"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Question</source>
+        <translation type="unfinished">Question</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterCanvas</name>
+    <message>
+        <location filename="../diagram/ParameterCanvas.cpp" line="+370"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Resize other like it</source>
+        <translation type="unfinished">Resize other like it</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit parameter</source>
+        <translation type="unfinished">Edit parameter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Select class in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+25"/>
+        <source>parameter node color</source>
+        <translation type="unfinished">parameter node color</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterDialog</name>
+    <message>
+        <location filename="../dialog/ParameterDialog.cpp" line="+68"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Parameter dialog</source>
+        <translation type="unfinished">Parameter dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name :</source>
+        <translation type="unfinished">name :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>direction :</source>
+        <translation type="unfinished">direction :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>   multiplicity : </source>
+        <translation type="unfinished">   multiplicity : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordering : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   effect : </source>
+        <translation type="unfinished">   effect : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>in state : </source>
+        <translation type="unfinished">in state : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>default value :</source>
+        <translation type="unfinished">default value :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+43"/>
+        <location line="+92"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-125"/>
+        <source>is_control</source>
+        <translation type="unfinished">is_control</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unique</source>
+        <translation type="unfinished">unique</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>standard</source>
+        <translation type="unfinished">standard</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>exception</source>
+        <translation type="unfinished">exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>stream</source>
+        <translation type="unfinished">stream</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>selection : </source>
+        <translation type="unfinished">selection : </translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <location line="+29"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>An input parameter cannot be an exception.
+</source>
+        <translation type="unfinished">An input parameter cannot be an exception.
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only in and inout parameter may have a delete effect.</source>
+        <translation type="unfinished">Only in and inout parameter may have a delete effect.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only out, inout and return parameter may have a create effect.</source>
+        <translation type="unfinished">Only out, inout and return parameter may have a create effect.</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterSetCanvas</name>
+    <message>
+        <location filename="../diagram/ParameterSetCanvas.cpp" line="+322"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit parameter set</source>
+        <translation type="unfinished">Edit parameter set</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <location line="+25"/>
+        <source>parameter set color</source>
+        <translation type="unfinished">parameter set color</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ParameterSetDialog</name>
+    <message>
+        <location filename="../dialog/ParameterSetDialog.cpp" line="+64"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>ParameterSet dialog</source>
+        <translation type="unfinished">ParameterSet dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Parameters out of Parameter Set</source>
+        <translation type="unfinished">Parameters out of Parameter Set</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Parameters in Parameter Set</source>
+        <translation type="unfinished">Parameters in Parameter Set</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Parameters</source>
+        <translation type="unfinished">Parameters</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>ParamsTable</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="-2686"/>
+        <source>Direction</source>
+        <translation type="unfinished">Direction</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default value</source>
+        <translation type="unfinished">Default value</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+60"/>
+        <location line="+40"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>param %1</source>
+        <translation type="unfinished">param %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insert param before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insert param after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Delete param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copy param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cut param</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Paste param</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Move param</source>
+        <translation type="unfinished">Move param</translation>
+    </message>
+</context>
+<context>
+    <name>PhpParamsDialog</name>
+    <message>
+        <location line="+1778"/>
+        <source>Php parameters dialog</source>
+        <translation type="unfinished">Php parameters dialog</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>PhpParamsTable</name>
+    <message>
+        <location line="-515"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ref.</source>
+        <translation type="unfinished">Ref.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>array</source>
+        <translation type="unfinished">array</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>param %1</source>
+        <translation type="unfinished">param %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insert param before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insert param after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Delete param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copy param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cut param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Paste param</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Move param</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Set rank &lt;i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>PinCanvas</name>
+    <message>
+        <location filename="../diagram/PinCanvas.cpp" line="+390"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit pin</source>
+        <translation type="unfinished">Edit pin</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Select class in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <location line="+25"/>
+        <source>pin color</source>
+        <translation type="unfinished">pin color</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+12"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>PinDialog</name>
+    <message>
+        <location filename="../dialog/PinDialog.cpp" line="+66"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Pin dialog</source>
+        <translation type="unfinished">Pin dialog</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>name :</source>
+        <translation type="unfinished">name :</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>type :</source>
+        <translation type="unfinished">type :</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>direction :</source>
+        <translation type="unfinished">direction :</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>   multiplicity : </source>
+        <translation type="unfinished">   multiplicity : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>   ordering : </source>
+        <translation type="unfinished">   ordering : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   effect : </source>
+        <translation type="unfinished">   effect : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>in state : </source>
+        <translation type="unfinished">in state : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>is_control</source>
+        <translation type="unfinished">is_control</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unique</source>
+        <translation type="unfinished">unique</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>standard</source>
+        <translation type="unfinished">standard</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>exception</source>
+        <translation type="unfinished">exception</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>stream</source>
+        <translation type="unfinished">stream</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+91"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>selection : </source>
+        <translation type="unfinished">selection : </translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <location line="+29"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>An input pin cannot be an exception.
+</source>
+        <translation type="unfinished">An input pin cannot be an exception.
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only in and inout pin may have a delete effect.</source>
+        <translation type="unfinished">Only in and inout pin may have a delete effect.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only out, inout and return pin may have a create effect.</source>
+        <translation type="unfinished">Only out, inout and return pin may have a create effect.</translation>
+    </message>
+</context>
+<context>
+    <name>PseudoStateCanvas</name>
+    <message>
+        <location filename="../diagram/PseudoStateCanvas.cpp" line="+611"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>draw vertically</source>
+        <translation type="unfinished">draw vertically</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>draw horizontally</source>
+        <translation type="unfinished">draw horizontally</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit pseudo state</source>
+        <translation type="unfinished">Edit pseudo state</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <location line="+24"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>PseudoStateDialog</name>
+    <message>
+        <location filename="../dialog/PseudoStateDialog.cpp" line="+78"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>reference :</source>
+        <translation type="unfinished">reference :</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Choose pseudo state selected in browser</source>
+        <translation type="unfinished">Choose pseudo state selected in browser</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>PythonParamsDialog</name>
+    <message>
+        <location filename="../dialog/OperationDialog.cpp" line="+768"/>
+        <source>Python parameters dialog</source>
+        <translation type="unfinished">Python parameters dialog</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>PythonParamsTable</name>
+    <message>
+        <location line="-473"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modifier</source>
+        <translation type="unfinished">Modifier</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+184"/>
+        <source>param %1</source>
+        <translation type="unfinished">param %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert param before</source>
+        <translation type="unfinished">Insert param before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert param after</source>
+        <translation type="unfinished">Insert param after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete param</source>
+        <translation type="unfinished">Delete param</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy param</source>
+        <translation type="unfinished">Copy param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut param</source>
+        <translation type="unfinished">Cut param</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste param</source>
+        <translation type="unfinished">Paste param</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move param</source>
+        <translation type="unfinished">Move param</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set rank &lt;i&gt;</source>
+        <translation type="unfinished">Set rank &lt;i&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../CustomWidgets/quickedit.cpp" line="+128"/>
+        <source>Quick Edit</source>
+        <translation type="unfinished">Quick Edit</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivity.cpp" line="+192"/>
+        <location line="+31"/>
+        <location line="+182"/>
+        <source>enter activity&apos;s name : </source>
+        <translation type="unfinished">enter activity&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>enter parameter&apos;s name : </source>
+        <translation type="unfinished">enter parameter&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <source>the activity</source>
+        <translation type="unfinished">the activity</translation>
+    </message>
+    <message>
+        <location line="+212"/>
+        <location filename="../misc/Settings.cpp" line="+1915"/>
+        <location line="+79"/>
+        <source>activity</source>
+        <translation type="unfinished">activity</translation>
+    </message>
+    <message>
+        <location line="+249"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+260"/>
+        <location line="+9"/>
+        <location line="+17"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+288"/>
+        <location line="+26"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+197"/>
+        <location line="+9"/>
+        <location line="+17"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+182"/>
+        <location line="+9"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1777"/>
+        <location line="+18"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+166"/>
+        <location line="+9"/>
+        <location filename="../browser/BrowserPin.cpp" line="+237"/>
+        <location line="+9"/>
+        <location filename="../diagram/ArrowPointCanvas.cpp" line="+231"/>
+        <location line="+5"/>
+        <location filename="../diagram/CodObjCanvas.cpp" line="+96"/>
+        <location line="+11"/>
+        <location line="+3"/>
+        <location filename="../diagram/DiagramView.cpp" line="-1620"/>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="+170"/>
+        <location line="+5"/>
+        <location filename="../diagram/HubCanvas.cpp" line="+140"/>
+        <location line="+12"/>
+        <location line="+3"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="+266"/>
+        <location line="+5"/>
+        <location filename="../diagram/LabelCanvas.cpp" line="+347"/>
+        <location line="+5"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+201"/>
+        <location line="+8"/>
+        <location line="+3"/>
+        <location filename="../diagram/SdLostFoundMsgSupportCanvas.cpp" line="+145"/>
+        <location line="+7"/>
+        <location filename="../diagram/SdObjCanvas.cpp" line="+84"/>
+        <location line="+5"/>
+        <location filename="../diagram/TemplateCanvas.cpp" line="+195"/>
+        <location line="+5"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+308"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+741"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+307"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+444"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+596"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+881"/>
+        <location filename="../browser/BrowserClass.cpp" line="+2267"/>
+        <location line="+56"/>
+        <location line="+716"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1072"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+564"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+569"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+325"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+774"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+741"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+679"/>
+        <location filename="../browser/BrowserNode.cpp" line="+677"/>
+        <location line="+647"/>
+        <location line="+17"/>
+        <location line="+31"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-447"/>
+        <location line="+81"/>
+        <location line="+14"/>
+        <location line="+762"/>
+        <location line="+244"/>
+        <location line="+166"/>
+        <location line="+238"/>
+        <location line="+35"/>
+        <location line="+268"/>
+        <location line="+15"/>
+        <location line="+17"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+275"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+698"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+522"/>
+        <location filename="../browser/BrowserState.cpp" line="+924"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+489"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1080"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+946"/>
+        <location filename="../main.cpp" line="+211"/>
+        <location filename="../misc/Images.cpp" line="+64"/>
+        <location filename="../misc/myio.cpp" line="+875"/>
+        <location line="+19"/>
+        <location line="+22"/>
+        <location line="+70"/>
+        <location line="+16"/>
+        <location line="+19"/>
+        <location line="+16"/>
+        <location line="+31"/>
+        <location line="+28"/>
+        <location line="+28"/>
+        <location line="+103"/>
+        <location line="+49"/>
+        <location line="+91"/>
+        <location line="+40"/>
+        <location line="+32"/>
+        <location line="+25"/>
+        <location line="+178"/>
+        <location line="+30"/>
+        <location line="+63"/>
+        <location line="+67"/>
+        <location line="+7"/>
+        <location line="+202"/>
+        <location line="+6"/>
+        <location line="+12"/>
+        <location line="+20"/>
+        <location line="+26"/>
+        <location line="+6"/>
+        <location line="+26"/>
+        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+6"/>
+        <location line="+13"/>
+        <location line="+17"/>
+        <location line="+6"/>
+        <location line="+29"/>
+        <location line="+42"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location filename="../browser/BrowserActivityAction.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+0"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+0"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+0"/>
+        <location filename="../browser/BrowserClass.cpp" line="-772"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+0"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+0"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+0"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+0"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+0"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserNode.cpp" line="-695"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-983"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+0"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+0"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+0"/>
+        <location filename="../browser/BrowserState.cpp" line="+0"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+0"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+0"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+0"/>
+        <source>Forbidden</source>
+        <translation type="unfinished">Forbidden</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityAction.cpp" line="-768"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="-374"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="-471"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="-6"/>
+        <location filename="../browser/BrowserParameter.cpp" line="-281"/>
+        <location filename="../browser/BrowserPin.cpp" line="-6"/>
+        <source>not in the same activity</source>
+        <translation type="unfinished">not in the same activity</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <location line="+27"/>
+        <location line="+22"/>
+        <location line="+22"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+123"/>
+        <source>enter activity action&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">enter activity action&apos;s 
+name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-89"/>
+        <source>New pin</source>
+        <translation type="unfinished">New pin</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;pin&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New parameter set</source>
+        <translation type="unfinished">New parameter set</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;Parameter Set&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;Parameter Set&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+238"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+108"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+102"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="-370"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="-546"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+287"/>
+        <location filename="../browser/BrowserClass.cpp" line="-1612"/>
+        <location line="+41"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+284"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-821"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+225"/>
+        <location filename="../browser/BrowserComponent.cpp" line="-268"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+228"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-370"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+231"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="-159"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-564"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+30"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-512"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+150"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+216"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-448"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+226"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+648"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+32"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+160"/>
+        <location filename="../browser/BrowserPin.cpp" line="+33"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-278"/>
+        <location filename="../browser/BrowserRegion.cpp" line="-349"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+508"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+236"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+246"/>
+        <location filename="../browser/BrowserState.cpp" line="-574"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="-268"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+228"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+220"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-832"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+239"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="-82"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+130"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-143"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt; %1 &lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt; %1 &lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+20"/>
+        <location filename="../browser/BrowserClass.cpp" line="-38"/>
+        <location line="+41"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+3"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+26"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+6"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+6"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+7"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+7"/>
+        <source>Duplicate</source>
+        <translation type="unfinished">Duplicate</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+1"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+1"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+1"/>
+        <source>to copy the &lt;i&gt;%1&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;%1&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select  %1</source>
+        <translation type="unfinished">Select  %1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+4"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+6"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+10"/>
+        <location filename="../browser/BrowserClass.cpp" line="-38"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+5"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+12"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+6"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+12"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+6"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+12"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+3"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+32"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+3"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+3"/>
+        <location filename="../browser/BrowserPin.cpp" line="+5"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+4"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+6"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+24"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+5"/>
+        <location filename="../browser/BrowserState.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+10"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+5"/>
+        <source>Delete</source>
+        <translation type="unfinished">Delete</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+90"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="-5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+84"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+7"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+7"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+15"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="-22"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+5"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+8"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+15"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+8"/>
+        <source>Referenced by</source>
+        <translation type="unfinished">Referenced by</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt;                                          through a flow or dependency</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt;                                          through a flow or dependency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+3"/>
+        <location filename="../browser/BrowserState.cpp" line="+3"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+3"/>
+        <source>the %1</source>
+        <translation type="unfinished">the %1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+6"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+9"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+8"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+9"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+18"/>
+        <location filename="../browser/BrowserClass.cpp" line="+57"/>
+        <location filename="../browser/BrowserClassDiagram.cpp" line="+248"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+9"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+54"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+9"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+13"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+9"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+66"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+9"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+8"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+12"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+8"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+8"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+34"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1461"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+9"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+8"/>
+        <location filename="../browser/BrowserPin.cpp" line="+8"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+9"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+25"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+12"/>
+        <location filename="../browser/BrowserState.cpp" line="+6"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+6"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+8"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+9"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+13"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-705"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="+104"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+5"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+5"/>
+        <location filename="../browser/BrowserArtifact.cpp" line="+5"/>
+        <location filename="../browser/BrowserAttribute.cpp" line="+5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+8"/>
+        <location filename="../browser/BrowserClassInstance.cpp" line="+5"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+5"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+4"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="+5"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserExtraMember.cpp" line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="+5"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+5"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+7"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+5"/>
+        <location filename="../browser/BrowserParameterSet.cpp" line="+5"/>
+        <location filename="../browser/BrowserPin.cpp" line="+7"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+5"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+16"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+4"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+5"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+5"/>
+        <location filename="../browser/BrowserState.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+5"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+5"/>
+        <source>Undelete</source>
+        <translation type="unfinished">Undelete</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserActivityNode.cpp" line="+1"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+1"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+1"/>
+        <source>to undelete the &lt;i&gt;%1&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;%1&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../browser/BrowserActivityObject.cpp" line="+7"/>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="+7"/>
+        <location filename="../browser/BrowserClass.cpp" line="+10"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+3"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+7"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+3"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+3"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+7"/>
+        <location filename="../browser/BrowserState.cpp" line="+6"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+3"/>
+        <source>Undelete recursively</source>
+        <translation type="unfinished">Undelete recursively</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to undelete the &lt;i&gt;%1&lt;/i&gt; and its &lt;i&gt;pins&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt; (except if the element at the other side is also deleted)</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;%1&lt;/i&gt; and its &lt;i&gt;pins&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt; (except if the element at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityDiagram.cpp" line="-121"/>
+        <location line="+147"/>
+        <source>enter activity diagram&apos;s name : </source>
+        <translation type="unfinished">enter activity diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-60"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-34"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-33"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-34"/>
+        <source>Show</source>
+        <translation type="unfinished">Show</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to show and edit the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;activity diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-67"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-25"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-79"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+8"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-30"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+8"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to set how the &lt;i&gt;activity diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;activity diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;activity diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity diagram&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity diagram&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the activity diagram</source>
+        <translation type="unfinished">the activity diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;activity diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Activity diagram</source>
+        <translation type="unfinished">Activity diagram</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+174"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+503"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+132"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+125"/>
+        <source>activity color</source>
+        <translation type="unfinished">activity color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity region color</source>
+        <translation type="unfinished">activity region color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity partition color</source>
+        <translation type="unfinished">activity partition color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>activity action color</source>
+        <translation type="unfinished">activity action color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>parameter and pin color</source>
+        <translation type="unfinished">parameter and pin color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-11"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+139"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+137"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+70"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+137"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+139"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+139"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-16"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+138"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+138"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-13"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+140"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-14"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+43"/>
+        <location line="+62"/>
+        <source>note color</source>
+        <translation type="unfinished">note color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+2"/>
+        <source>package color</source>
+        <translation type="unfinished">package color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+1"/>
+        <location filename="../browser/BrowserColDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+1"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>fragment color</source>
+        <translation type="unfinished">fragment color</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>activity diagram</source>
+        <translation type="unfinished">activity diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityNode.cpp" line="-165"/>
+        <location filename="../browser/BrowserParameter.cpp" line="-72"/>
+        <location filename="../browser/BrowserPin.cpp" line="-77"/>
+        <source>can&apos;t have outgoing flow</source>
+        <translation type="unfinished">can&apos;t have outgoing flow</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>can&apos;t have several outgoing flows</source>
+        <translation type="unfinished">can&apos;t have several outgoing flows</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>initial node can&apos;t have incoming flow</source>
+        <translation type="unfinished">initial node can&apos;t have incoming flow</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+40"/>
+        <source>fork can&apos;t have several incoming flow</source>
+        <translation type="unfinished">fork can&apos;t have several incoming flow</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+26"/>
+        <source>an input parameter can&apos;t have incoming flows</source>
+        <translation type="unfinished">an input parameter can&apos;t have incoming flows</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserParameter.cpp" line="+3"/>
+        <source>parameter can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">parameter can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>pin can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">pin can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>can&apos;t have incoming data flow</source>
+        <translation type="unfinished">can&apos;t have incoming data flow</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-29"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="-29"/>
+        <source>to edit the &lt;i&gt;%1&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;%1&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../browser/BrowserPseudoState.cpp" line="+10"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+10"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt; through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt; through a flow</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityObject.cpp" line="-94"/>
+        <location line="+33"/>
+        <location line="+84"/>
+        <source>enter activity object&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">enter activity object&apos;s 
+name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>to edit the &lt;i&gt;activity object&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity object&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;activity object&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;activity object&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity object&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity object&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;activity object&lt;/i&gt;                                                                           through a flow or dependency</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;activity object&lt;/i&gt;                                                                           through a flow or dependency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the activity object</source>
+        <translation type="unfinished">the activity object</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity object&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;activity object&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the &lt;i&gt;activity object&lt;/i&gt; and its &lt;i&gt;expansion nodes&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt;(except if the element at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;activity object&lt;/i&gt; and its &lt;i&gt;expansion nodes&lt;/i&gt; and                                                  &lt;i&gt;flows&lt;/i&gt; or &lt;i&gt;dependencies&lt;/i&gt;(except if the element at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>activity object</source>
+        <translation type="unfinished">activity object</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserActivityPartition.cpp" line="-101"/>
+        <location line="+34"/>
+        <location line="+97"/>
+        <source>enter activity partition&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">enter activity partition&apos;s 
+name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-70"/>
+        <source>New sub activity partition</source>
+        <translation type="unfinished">New sub activity partition</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a sub &lt;i&gt;activity partition&lt;/i&gt;</source>
+        <translation type="unfinished">to add a sub &lt;i&gt;activity partition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;activity partition&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;activity partition&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;activity partition&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;activity partition&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;activity partition&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;activity partition&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;partition&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;partition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the activity partition</source>
+        <translation type="unfinished">the activity partition</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;activity partition&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;activity partition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the activity partition and its children</source>
+        <translation type="unfinished">undelete the activity partition and its children</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>activity partition</source>
+        <translation type="unfinished">activity partition</translation>
+    </message>
+    <message>
+        <location line="+174"/>
+        <location filename="../browser/BrowserClass.cpp" line="+1422"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+196"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+453"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+389"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+911"/>
+        <location filename="../browser/BrowserRegion.cpp" line="+297"/>
+        <location filename="../browser/BrowserState.cpp" line="+512"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+661"/>
+        <source>move </source>
+        <translation type="unfinished">move </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserClass.cpp" line="+2"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+2"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+2"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+4"/>
+        <location filename="../browser/BrowserState.cpp" line="+2"/>
+        <source>In </source>
+        <translation type="unfinished">In </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserClass.cpp" line="+1"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+1"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+2"/>
+        <location filename="../browser/BrowserState.cpp" line="+1"/>
+        <source>After </source>
+        <translation type="unfinished">After </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserArtifact.cpp" line="-136"/>
+        <location filename="../browser/BrowserComponent.cpp" line="-331"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1623"/>
+        <source>already exist</source>
+        <translation type="unfinished">already exist</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+2"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+3"/>
+        <source>circular inheritance</source>
+        <translation type="unfinished">circular inheritance</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>to edit the &lt;i&gt;artifact&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;artifact&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;artifact&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;artifact&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location filename="../browser/BrowserClass.cpp" line="-1484"/>
+        <location filename="../browser/BrowserClassView.cpp" line="-145"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-118"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+138"/>
+        <source>Generate</source>
+        <translation type="unfinished">Generate</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+31"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+49"/>
+        <source>Roundtrip body</source>
+        <translation type="unfinished">Roundtrip body</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>C++ header file</source>
+        <translation type="unfinished">C++ header file</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ source file</source>
+        <translation type="unfinished">C++ source file</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Java source file</source>
+        <translation type="unfinished">Java source file</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Php source file</source>
+        <translation type="unfinished">Php source file</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Python source file</source>
+        <translation type="unfinished">Python source file</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Idl source file</source>
+        <translation type="unfinished">Idl source file</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserClass.cpp" line="+30"/>
+        <location filename="../browser/BrowserClassView.cpp" line="+27"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-5"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-10"/>
+        <source>Roundtrip</source>
+        <translation type="unfinished">Roundtrip</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>See file</source>
+        <translation type="unfinished">See file</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;artifact&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;artifact&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the artifact</source>
+        <translation type="unfinished">the artifact</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;artifact&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;artifact&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select the associated class</source>
+        <translation type="unfinished">Select the associated class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select the associated &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+12"/>
+        <source>Select an associated class</source>
+        <translation type="unfinished">Select an associated class</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+12"/>
+        <source>to select an associated &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select an associated &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+156"/>
+        <location filename="../browser/BrowserComponent.cpp" line="+38"/>
+        <location line="+19"/>
+        <source>Choose class</source>
+        <translation type="unfinished">Choose class</translation>
+    </message>
+    <message>
+        <location line="+188"/>
+        <source>artifact</source>
+        <translation type="unfinished">artifact</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>choose existing artifact</source>
+        <translation type="unfinished">choose existing artifact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+17"/>
+        <source>enter artifact&apos;s name : </source>
+        <translation type="unfinished">enter artifact&apos;s name : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserAttribute.cpp" line="-51"/>
+        <location filename="../browser/BrowserOperation.cpp" line="-89"/>
+        <source>Up</source>
+        <translation type="unfinished">Up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserOperation.cpp" line="+1"/>
+        <source>to return to parent node</source>
+        <translation type="unfinished">to return to parent node</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;item&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;item&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to edit the &lt;i&gt;attribute&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;attribute&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-44"/>
+        <source>New get operation</source>
+        <translation type="unfinished">New get operation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;get operation&lt;/i&gt;</source>
+        <translation type="unfinished">to auto define the &lt;i&gt;get operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+3"/>
+        <source>New set operation</source>
+        <translation type="unfinished">New set operation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;set operation&lt;/i&gt;</source>
+        <translation type="unfinished">to auto define the &lt;i&gt;set operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+3"/>
+        <source>New get and set operation</source>
+        <translation type="unfinished">New get and set operation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserRelation.cpp" line="+1"/>
+        <source>to auto define the &lt;i&gt;get&lt;/i&gt; and &lt;i&gt;set operation&lt;/i&gt;s</source>
+        <translation type="unfinished">to auto define the &lt;i&gt;get&lt;/i&gt; and &lt;i&gt;set operation&lt;/i&gt;s</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to copy the &lt;i&gt;attribute&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;attribute&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;item&lt;/i&gt;.                                        Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;item&lt;/i&gt;.                                        Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to delete the &lt;i&gt;attribute&lt;/i&gt;.                                             Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;attribute&lt;/i&gt;.                                             Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>the attribute</source>
+        <translation type="unfinished">the attribute</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;item&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;item&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to undelete the &lt;i&gt;attribute&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;attribute&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+154"/>
+        <source>attribute</source>
+        <translation type="unfinished">attribute</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClass.cpp" line="-240"/>
+        <source>Implement whole </source>
+        <translation type="unfinished">Implement whole </translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Add item</source>
+        <translation type="unfinished">Add item</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;item&lt;/i&gt; to the &lt;i&gt;enum&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;item&lt;/i&gt; to the &lt;i&gt;enum&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add attribute</source>
+        <translation type="unfinished">Add attribute</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;attribute&lt;/i&gt; to the </source>
+        <translation type="unfinished">to add an &lt;i&gt;attribute&lt;/i&gt; to the </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add operation</source>
+        <translation type="unfinished">Add operation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;operation&lt;/i&gt; to the </source>
+        <translation type="unfinished">to add an &lt;i&gt;operation&lt;/i&gt; to the </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+27"/>
+        <source>Add inherited operation</source>
+        <translation type="unfinished">Add inherited operation</translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+27"/>
+        <source>to redefine an inherited &lt;i&gt;operation&lt;/i&gt; in the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to redefine an inherited &lt;i&gt;operation&lt;/i&gt; in the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>Choose operation to add it</source>
+        <translation type="unfinished">Choose operation to add it</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Add nested class</source>
+        <translation type="unfinished">Add nested class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;nested class&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;nested class&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Add extra member</source>
+        <translation type="unfinished">Add extra member</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;extra member&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;extra member&lt;/i&gt; to the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+41"/>
+        <source>to edit the </source>
+        <translation type="unfinished">to edit the </translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+41"/>
+        <source>to duplicate the </source>
+        <translation type="unfinished">to duplicate the </translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <source>to delete the </source>
+        <translation type="unfinished">to delete the </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Create source artifact</source>
+        <translation type="unfinished">Create source artifact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt; in the &lt;i&gt;deployment view&lt;/i&gt; associated to the &lt;i&gt;class view&lt;/i&gt;, this artifact will contain the generated code of the class</source>
+        <translation type="unfinished">to add a &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt; in the &lt;i&gt;deployment view&lt;/i&gt; associated to the &lt;i&gt;class view&lt;/i&gt;, this artifact will contain the generated code of the class</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Select associated artifact</source>
+        <translation type="unfinished">Select associated artifact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt;</source>
+        <translation type="unfinished">to select the associated &lt;i&gt;&amp;lt;&amp;lt;source&amp;gt;&amp;gt; artifact&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select associated component</source>
+        <translation type="unfinished">Select associated component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select the &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Choose component</source>
+        <translation type="unfinished">Choose component</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select an associated component</source>
+        <translation type="unfinished">Select an associated component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select a &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select a &lt;i&gt;component&lt;/i&gt; providing the &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>to know who reference the </source>
+        <translation type="unfinished">to know who reference the </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the class</source>
+        <translation type="unfinished">the class</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+10"/>
+        <source>undelete the </source>
+        <translation type="unfinished">undelete the </translation>
+    </message>
+    <message>
+        <location line="+265"/>
+        <location line="+1199"/>
+        <location line="+30"/>
+        <source>enter class&apos;s name : </source>
+        <translation type="unfinished">enter class&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-1199"/>
+        <source>Choose inherited operation</source>
+        <translation type="unfinished">Choose inherited operation</translation>
+    </message>
+    <message>
+        <location line="+238"/>
+        <source>enter item&apos;s name : </source>
+        <translation type="unfinished">enter item&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>enter attribute&apos;s name : </source>
+        <translation type="unfinished">enter attribute&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>enter operation&apos;s name : </source>
+        <translation type="unfinished">enter operation&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <location line="+11"/>
+        <location line="+25"/>
+        <location line="+17"/>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <location line="-47"/>
+        <source>typedef can&apos;t generalize / realize several times</source>
+        <translation type="unfinished">typedef can&apos;t generalize / realize several times</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>a typedef can&apos;t have relation</source>
+        <translation type="unfinished">a typedef can&apos;t have relation</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+858"/>
+        <source>an union can&apos;t generalize / realize</source>
+        <translation type="unfinished">an union can&apos;t generalize / realize</translation>
+    </message>
+    <message>
+        <location line="-828"/>
+        <source>can&apos;t have anchor between classes</source>
+        <translation type="unfinished">can&apos;t have anchor between classes</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <location filename="../misc/Settings.cpp" line="-1463"/>
+        <source>class</source>
+        <translation type="unfinished">class</translation>
+    </message>
+    <message>
+        <location line="+697"/>
+        <source>enter stereotype&apos;s name : </source>
+        <translation type="unfinished">enter stereotype&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>one of the two classes is not a stereotype</source>
+        <translation type="unfinished">one of the two classes is not a stereotype</translation>
+    </message>
+    <message>
+        <location line="+653"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1905"/>
+        <location filename="../misc/myio.cpp" line="-734"/>
+        <source>Error while writting in
+%1
+may be your disk is full</source>
+        <translation type="unfinished">Error while writting in
+%1
+may be your disk is full</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassDiagram.cpp" line="-6"/>
+        <source>the class diagram</source>
+        <translation type="unfinished">the class diagram</translation>
+    </message>
+    <message>
+        <location line="+167"/>
+        <source>class diagram</source>
+        <translation type="unfinished">class diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassInstance.cpp" line="-28"/>
+        <source>to edit the &lt;i&gt;class instance&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;class instance&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;class instance&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;class instance&lt;/i&gt;.                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;class instance&lt;/i&gt;.                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;class instance&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;class instance&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the class instance</source>
+        <translation type="unfinished">the class instance</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;class instance&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <source>class instance</source>
+        <translation type="unfinished">class instance</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+50"/>
+        <source>enter class instance&apos;s name (may be empty) : </source>
+        <translation type="unfinished">enter class instance&apos;s name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>choose existing instance : </source>
+        <translation type="unfinished">choose existing instance : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserClassView.cpp" line="-167"/>
+        <source>enter class view&apos;s name : </source>
+        <translation type="unfinished">enter class view&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>New stereotype</source>
+        <translation type="unfinished">New stereotype</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;stereotype&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;stereotype&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-813"/>
+        <source>New class diagram</source>
+        <translation type="unfinished">New class diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;class diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-5"/>
+        <source>New sequence diagram</source>
+        <translation type="unfinished">New sequence diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New communication diagram</source>
+        <translation type="unfinished">New communication diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;communication diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+3"/>
+        <source>New object diagram</source>
+        <translation type="unfinished">New object diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;object diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+6"/>
+        <source>New class</source>
+        <translation type="unfinished">New class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New class instance</source>
+        <translation type="unfinished">New class instance</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;class instance&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;class instance&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New state machine</source>
+        <translation type="unfinished">New state machine</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add a &lt;i&gt;state machine&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;state machine&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>New activity</source>
+        <translation type="unfinished">New activity</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;activity&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;class view&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;class view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit class settings</source>
+        <translation type="unfinished">Edit class settings</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to set the sub classes&apos;s settings</source>
+        <translation type="unfinished">to set the sub classes&apos;s settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to set how the sub &lt;i&gt;class diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the sub &lt;i&gt;class diagrams&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;class view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;class view&lt;/i&gt; and its sub items. Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the class view</source>
+        <translation type="unfinished">the class view</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>undelete the &lt;i&gt;class view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;class view&lt;/i&gt;. Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;class view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;class view&lt;/i&gt; and its sub items</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select associated deployment view</source>
+        <translation type="unfinished">Select associated deployment view</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the associated &lt;i&gt;deployment view&lt;/i&gt;</source>
+        <translation type="unfinished">to select the associated &lt;i&gt;deployment view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+92"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-1382"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+147"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+4"/>
+        <source>class color</source>
+        <translation type="unfinished">class color</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+6"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-9"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-2"/>
+        <source>duration color</source>
+        <translation type="unfinished">duration color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>continuation color</source>
+        <translation type="unfinished">continuation color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+4"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-4"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+2"/>
+        <source>state color</source>
+        <translation type="unfinished">state color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>state action color</source>
+        <translation type="unfinished">state action color</translation>
+    </message>
+    <message>
+        <location line="+252"/>
+        <source>class view</source>
+        <translation type="unfinished">class view</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserColDiagram.cpp" line="-234"/>
+        <location line="+148"/>
+        <source>enter communication diagram&apos;s name : </source>
+        <translation type="unfinished">enter communication diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;communication diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;communication diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;communication diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;communication diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;communication diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;communication diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;communication diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the communication diagram</source>
+        <translation type="unfinished">the communication diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;communication diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;communication diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Communication diagram</source>
+        <translation type="unfinished">Communication diagram</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="+2"/>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-2"/>
+        <source>class instance 
+color</source>
+        <translation type="unfinished">class instance 
+color</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>communication diagram</source>
+        <translation type="unfinished">communication diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponent.cpp" line="-37"/>
+        <source>Select the %1 class</source>
+        <translation type="unfinished">Select the %1 class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select the %1 &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select the %1 &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+16"/>
+        <source>Select a %1 class</source>
+        <translation type="unfinished">Select a %1 class</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <location line="+16"/>
+        <source>to select a %1 &lt;i&gt;class&lt;/i&gt;</source>
+        <translation type="unfinished">to select a %1 &lt;i&gt;class&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>New nested component</source>
+        <translation type="unfinished">New nested component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;nested component&lt;/i&gt; to the &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;nested component&lt;/i&gt; to the &lt;i&gt;component&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to edit the &lt;i&gt;component&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;component&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;component&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;component&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;component&lt;/i&gt; through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;component&lt;/i&gt; through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the component</source>
+        <translation type="unfinished">the component</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;component&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the &lt;i&gt;component&lt;/i&gt; and its nested &lt;i&gt;components&lt;/i&gt; and &lt;i&gt;relations&lt;/i&gt; (except if the component at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;component&lt;/i&gt; and its nested &lt;i&gt;components&lt;/i&gt; and &lt;i&gt;relations&lt;/i&gt; (except if the component at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <location filename="../misc/Settings.cpp" line="+844"/>
+        <location line="+198"/>
+        <source>component</source>
+        <translation type="unfinished">component</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>choose existing component</source>
+        <translation type="unfinished">choose existing component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+16"/>
+        <source>enter component&apos;s name : </source>
+        <translation type="unfinished">enter component&apos;s name : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponentDiagram.cpp" line="-238"/>
+        <location line="+150"/>
+        <source>enter component diagram&apos;s name : </source>
+        <translation type="unfinished">enter component diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;component diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;component diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;component diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;component diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;component diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;component diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;component diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the component diagram</source>
+        <translation type="unfinished">the component diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;component diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Component diagram</source>
+        <translation type="unfinished">Component diagram</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../browser/BrowserComponentView.cpp" line="-3"/>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-2"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="+89"/>
+        <location filename="../browser/BrowserPackage.cpp" line="-4"/>
+        <source>component color</source>
+        <translation type="unfinished">component color</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>component diagram</source>
+        <translation type="unfinished">component diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserComponentView.cpp" line="-156"/>
+        <source>enter component view&apos;s name : </source>
+        <translation type="unfinished">enter component view&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source>New component diagram</source>
+        <translation type="unfinished">New component diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;component diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;component diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New component</source>
+        <translation type="unfinished">New component</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;component&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;component&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;component view&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;component view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to set how the sub &lt;i&gt;component diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the sub &lt;i&gt;component diagrams&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;component view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;component view&lt;/i&gt; and its sub items. Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the component view</source>
+        <translation type="unfinished">the component view</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>undelete the &lt;i&gt;component view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;component view&lt;/i&gt;. Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;component view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;component view&lt;/i&gt; and its sub items</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <location line="+109"/>
+        <source>Component view</source>
+        <translation type="unfinished">Component view</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>component view</source>
+        <translation type="unfinished">component view</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentDiagram.cpp" line="-237"/>
+        <location line="+149"/>
+        <source>enter deployment diagram&apos;s name : </source>
+        <translation type="unfinished">enter deployment diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;deployment diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;deployment diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;deployment diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;deployment diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the deployment diagram</source>
+        <translation type="unfinished">the deployment diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Deployment diagram</source>
+        <translation type="unfinished">Deployment diagram</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <source>artifact color</source>
+        <translation type="unfinished">artifact color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-1"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+1"/>
+        <source>node color</source>
+        <translation type="unfinished">node color</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>deployment diagram</source>
+        <translation type="unfinished">deployment diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentNode.cpp" line="-26"/>
+        <source>to edit the &lt;i&gt;node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;node&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;node&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to know who reference the &lt;i&gt;node&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;node&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the node</source>
+        <translation type="unfinished">the node</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;node&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;node&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+66"/>
+        <source>Node</source>
+        <translation type="unfinished">Node</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>node</source>
+        <translation type="unfinished">node</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+18"/>
+        <source>enter node&apos;s name : </source>
+        <translation type="unfinished">enter node&apos;s name : </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserDeploymentView.cpp" line="-229"/>
+        <source>enter deployment view&apos;s name : </source>
+        <translation type="unfinished">enter deployment view&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>New deployment diagram</source>
+        <translation type="unfinished">New deployment diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;deployment diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;deployment diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New node</source>
+        <translation type="unfinished">New node</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;node&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;node&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New artifact</source>
+        <translation type="unfinished">New artifact</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;artifact&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;artifact&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;deployment view&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;deployment view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>to set how the sub &lt;i&gt;deployment diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the sub &lt;i&gt;deployment diagrams&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items. Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items. Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the deployment view</source>
+        <translation type="unfinished">the deployment view</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>undelete the &lt;i&gt;deployment view&lt;/i&gt;. Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;deployment view&lt;/i&gt;. Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;deployment view&lt;/i&gt; and its sub items</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+214"/>
+        <source>Deployment view</source>
+        <translation type="unfinished">Deployment view</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>deployment view</source>
+        <translation type="unfinished">deployment view</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExpansionNode.cpp" line="-150"/>
+        <location line="+168"/>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-298"/>
+        <source>enter expansion node&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">enter expansion node&apos;s 
+name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>expansion node can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">expansion node can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>expansion node can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">expansion node can&apos;t accept data flow (is &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;expansion node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;expansion node&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;expansion node&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;expansion node&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;expansion node&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;expansion node&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;expansion node&lt;/i&gt;                                                                               through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;expansion node&lt;/i&gt;                                                                               through a flow</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the expansion node</source>
+        <translation type="unfinished">the expansion node</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;expansion node&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;expansion node&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <source>Expansion Node</source>
+        <translation type="unfinished">Expansion Node</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>expansion node</source>
+        <translation type="unfinished">expansion node</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExpansionRegion.cpp" line="-259"/>
+        <location line="+33"/>
+        <location line="+106"/>
+        <source>enter expansion region&apos;s 
+name (may be empty) : </source>
+        <translation type="unfinished">enter expansion region&apos;s 
+name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-86"/>
+        <source>New expansion node</source>
+        <translation type="unfinished">New expansion node</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;expansion node&lt;/i&gt; to the &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;expansion node&lt;/i&gt; to the &lt;i&gt;expansion region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New nested expansion region</source>
+        <translation type="unfinished">New nested expansion region</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-435"/>
+        <source>to add a nested &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">to add a nested &lt;i&gt;expansion region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New interruptible activity region</source>
+        <translation type="unfinished">New interruptible activity region</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;interruptible activity region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>Add activity action</source>
+        <translation type="unfinished">Add activity action</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity action&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;activity action&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>Add object node</source>
+        <translation type="unfinished">Add object node</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+1"/>
+        <source>to add an &lt;i&gt;activity object node&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;activity object node&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;expansion region&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;expansion region&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;expansion region&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;expansion region&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;expansion region&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;expansion region&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../browser/BrowserFlow.cpp" line="-12"/>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="+20"/>
+        <source>to know who reference the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the expansion region</source>
+        <translation type="unfinished">the expansion region</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;expansion region&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;expansion region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the expansion region and its children</source>
+        <translation type="unfinished">undelete the expansion region and its children</translation>
+    </message>
+    <message>
+        <location line="+197"/>
+        <source>expansion region</source>
+        <translation type="unfinished">expansion region</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserExtraMember.cpp" line="-26"/>
+        <source>to edit the &lt;i&gt;extra member&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;extra member&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;extra member&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;extra member&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;extra member&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;extra member&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>the extra member</source>
+        <translation type="unfinished">the extra member</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;extra member&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;extra member&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <source>extra member</source>
+        <translation type="unfinished">extra member</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserFlow.cpp" line="-122"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-376"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-157"/>
+        <location filename="../browser/BrowserTransition.cpp" line="-137"/>
+        <source>from</source>
+        <translation type="unfinished">from</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../browser/BrowserRelation.cpp" line="-2"/>
+        <location line="+4"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+2"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+2"/>
+        <source>to</source>
+        <translation type="unfinished">to</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>to edit the &lt;i&gt;flow&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;flow&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;flow&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;flow&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+120"/>
+        <source>Select </source>
+        <translation type="unfinished">Select </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+143"/>
+        <location filename="../browser/BrowserTransition.cpp" line="+1"/>
+        <source>to select the destination</source>
+        <translation type="unfinished">to select the destination</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>the flow</source>
+        <translation type="unfinished">the flow</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;flow&lt;/i&gt;                                          (except if the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;flow&lt;/i&gt;                                          (except if the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+110"/>
+        <source>flow</source>
+        <translation type="unfinished">flow</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserInterruptibleActivityRegion.cpp" line="-88"/>
+        <location line="+141"/>
+        <source>enter interruptible activity 
+region&apos;s name (may be empty) : </source>
+        <translation type="unfinished">enter interruptible activity 
+region&apos;s name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="-107"/>
+        <source> enter interruptible activity 
+region&apos;s name (may be empty) : </source>
+        <translation type="unfinished"> enter interruptible activity 
+region&apos;s name (may be empty) : </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>New nested interruptible activity region</source>
+        <translation type="unfinished">New nested interruptible activity region</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a nested &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">to add a nested &lt;i&gt;interruptible activity region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New expansion region</source>
+        <translation type="unfinished">New expansion region</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>to edit the &lt;i&gt;interruptible activity region&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;interruptible activity region&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;interruptible activity region&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;interruptible activity region&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;interruptible activity region&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;interruptible activity region&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the interruptible activity region</source>
+        <translation type="unfinished">the interruptible activity region</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;interruptible activity region&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;interruptible activity region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the interruptible activity region and its children</source>
+        <translation type="unfinished">undelete the interruptible activity region and its children</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>interruptible activity region</source>
+        <translation type="unfinished">interruptible activity region</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserNode.cpp" line="-608"/>
+        <source> cannot be deleted because :</source>
+        <translation type="unfinished"> cannot be deleted because :</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>%1 is read-only</source>
+        <translation type="unfinished">%1 is read-only</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>%1 referenced by the read-only component %2</source>
+        <translation type="unfinished">%1 referenced by the read-only component %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 referenced by the read-only artifact %2</source>
+        <translation type="unfinished">%1 referenced by the read-only artifact %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 is the target of the read-only relation %2</source>
+        <translation type="unfinished">%1 is the target of the read-only relation %2</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Some items cannot be undeleted</source>
+        <translation type="unfinished">Some items cannot be undeleted</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Some items are renamed</source>
+        <translation type="unfinished">Some items are renamed</translation>
+    </message>
+    <message>
+        <location line="+536"/>
+        <source>already generalize / realize</source>
+        <translation type="unfinished">already generalize / realize</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>can&apos;t have circular generalization / realization</source>
+        <translation type="unfinished">can&apos;t have circular generalization / realization</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <source>to recurcivelly duplicate the marked items into %1</source>
+        <translation type="unfinished">to recurcivelly duplicate the marked items into %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to recurcivelly duplicate the marked items after %1</source>
+        <translation type="unfinished">to recurcivelly duplicate the marked items after %1</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>to unmark %1</source>
+        <translation type="unfinished">to unmark %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to unmark all the marked items</source>
+        <translation type="unfinished">to unmark all the marked items</translation>
+    </message>
+    <message>
+        <location line="+433"/>
+        <location filename="../browser/BrowserPackage.cpp" line="+104"/>
+        <source>illegal name or already used</source>
+        <translation type="unfinished">illegal name or already used</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <source>nothing available</source>
+        <translation type="unfinished">nothing available</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Empty name</source>
+        <translation type="unfinished">Nome vazio</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Nonunicode name</source>
+        <translation type="unfinished">Nnome não Unicode</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Name starting with witespace</source>
+        <translation type="unfinished">Nome começando com espaços em branco</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+12"/>
+        <source>Name containing illegal character: </source>
+        <translation type="unfinished">Nome que contém um caractere ilegal :</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Name already used</source>
+        <translation type="unfinished">Nome já usado</translation>
+    </message>
+    <message>
+        <location line="+490"/>
+        <source>&lt;p&gt;&lt;b&gt;Warning, the model is not consistent because some elements have
+the same internal identifier.&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Users working on the same project have the same use identifier,
+or you had change the model files, or used Project synchro
+without following the mandatory rules&lt;/p&gt;
+</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;Warning, the model is not consistent because some elements have
+the same internal identifier.&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Users working on the same project have the same use identifier,
+or you had change the model files, or used Project synchro
+without following the mandatory rules&lt;/p&gt;
+</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>These elements was &lt;b&gt;removed&lt;/b&gt;</source>
+        <translation type="unfinished">These elements was &lt;b&gt;removed&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The internal identifier of these elements was changed,
+but &lt;u&gt;I can&apos;t garantee the references to them are the right one&lt;/u&gt;,
+check your model</source>
+        <translation type="unfinished">The internal identifier of these elements was changed,
+but &lt;u&gt;I can&apos;t garantee the references to them are the right one&lt;/u&gt;,
+check your model</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserObjectDiagram.cpp" line="-235"/>
+        <location line="+147"/>
+        <source>enter object diagram&apos;s name : </source>
+        <translation type="unfinished">enter object diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;object diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;object diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;object diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;object diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;object diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;object diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;object diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the object diagram</source>
+        <translation type="unfinished">the object diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;object diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;object diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+137"/>
+        <source>Object diagram</source>
+        <translation type="unfinished">Object diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserOperation.cpp" line="+4"/>
+        <source>Add constructor initializer</source>
+        <translation type="unfinished">Add constructor initializer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+6"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt;,a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;operation&lt;/i&gt;,a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit C++ body</source>
+        <translation type="unfinished">Edit C++ body</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its C++ body</source>
+        <translation type="unfinished">to edit the &lt;i&gt;operation&lt;/i&gt; and its C++ body</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Java body</source>
+        <translation type="unfinished">Edit Java body</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Java body</source>
+        <translation type="unfinished">to edit the &lt;i&gt;operation&lt;/i&gt; and its Java body</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Php body</source>
+        <translation type="unfinished">Edit Php body</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Php body</source>
+        <translation type="unfinished">to edit the &lt;i&gt;operation&lt;/i&gt; and its Php body</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit Python body</source>
+        <translation type="unfinished">Edit Python body</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to edit the &lt;i&gt;operation&lt;/i&gt; and its Python body</source>
+        <translation type="unfinished">to edit the &lt;i&gt;operation&lt;/i&gt; and its Python body</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;operation&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;operation&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add implementing activity</source>
+        <translation type="unfinished">Add implementing activity</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">to add a new &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add implementing state</source>
+        <translation type="unfinished">Add implementing state</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;state&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">to add a new &lt;i&gt;state&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select implementing behavior</source>
+        <translation type="unfinished">Select implementing behavior</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to select a &lt;i&gt;state&lt;/i&gt; or &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">to select a &lt;i&gt;state&lt;/i&gt; or &lt;i&gt;activity&lt;/i&gt; implementing the &lt;i&gt;operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Choose behavior</source>
+        <translation type="unfinished">Choose behavior</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to delete the &lt;i&gt;operation&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;operation&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>the operation</source>
+        <translation type="unfinished">the operation</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to undelete the &lt;i&gt;operation&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;operation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>operation</source>
+        <translation type="unfinished">operation</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPackage.cpp" line="-791"/>
+        <source>New package</source>
+        <translation type="unfinished">New package</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new sub &lt;i&gt;package&lt;/i&gt;</source>
+        <translation type="unfinished">to add a new sub &lt;i&gt;package&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New use case view</source>
+        <translation type="unfinished">New use case view</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a new &lt;i&gt;use case view&lt;/i&gt;</source>
+        <translation type="unfinished">to add a new &lt;i&gt;use case view&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <location filename="../diagram/UmlWindow.cpp" line="+797"/>
+        <source>to set how an Uml type is compiled in C++ etc...,to set the default parameter passing, to set the default codeproduced for an attribute etc..., and to set the root directories</source>
+        <translation type="unfinished">to set how an Uml type is compiled in C++ etc...,to set the default parameter passing, to set the default codeproduced for an attribute etc..., and to set the root directories</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>the package</source>
+        <translation type="unfinished">the package</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Reverse</source>
+        <translation type="unfinished">Reverse</translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>Question</source>
+        <translation type="unfinished">Question</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../dialog/PackageDialog.cpp" line="+1"/>
+        <source>Propagate the removal of the profile ?</source>
+        <translation type="unfinished">Propagate the removal of the profile ?</translation>
+    </message>
+    <message>
+        <location line="+351"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-4"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-5"/>
+        <source>subject color</source>
+        <translation type="unfinished">subject color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="-3"/>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-3"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-3"/>
+        <source>use case color</source>
+        <translation type="unfinished">use case color</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>choose existing package : </source>
+        <translation type="unfinished">choose existing package : </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>enter profile&apos;s name : </source>
+        <translation type="unfinished">enter profile&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>enter package&apos;s name : </source>
+        <translation type="unfinished">enter package&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Do you want to be the owner of this new package ?
+(other users can&apos;t modify it while you are the owner)</source>
+        <translation type="unfinished">Do you want to be the owner of this new package ?
+(other users can&apos;t modify it while you are the owner)</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>The project is modified and need to be saved first.
+If you don&apos;t want to save your modifications reload
+the project then ask again for the update
+
+Save it to perform update ?
+</source>
+        <translation type="unfinished">The project is modified and need to be saved first.
+If you don&apos;t want to save your modifications reload
+the project then ask again for the update
+
+Save it to perform update ?
+</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>file &apos;%1&apos; is read only, update aborted</source>
+        <translation type="unfinished">file &apos;%1&apos; is read only, update aborted</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>you didn&apos;t select project &apos;%1&apos;</source>
+        <translation type="unfinished">you didn&apos;t select project &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>package</source>
+        <translation type="unfinished">package</translation>
+    </message>
+    <message>
+        <location line="+949"/>
+        <location filename="../misc/myio.cpp" line="-9"/>
+        <location line="+169"/>
+        <source>Cannot create file
+</source>
+        <translation type="unfinished">Cannot create file
+</translation>
+    </message>
+    <message>
+        <location line="+406"/>
+        <source>cannot be read</source>
+        <translation type="unfinished">cannot be read</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+293"/>
+        <source>Your version of DOUML is too old to read this project</source>
+        <translation type="unfinished">Your version of DOUML is too old to read this project</translation>
+    </message>
+    <message>
+        <location line="-283"/>
+        <source>Sorry, the imported project has a too old format.
+To change its format : load this project and save it.</source>
+        <translation type="unfinished">Sorry, the imported project has a too old format.
+To change its format : load this project and save it.</translation>
+    </message>
+    <message>
+        <location line="+267"/>
+        <source>can&apos;t read project file</source>
+        <translation type="unfinished">can&apos;t read project file</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>can&apos;t find project file</source>
+        <translation type="unfinished">can&apos;t find project file</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserParameter.cpp" line="+1"/>
+        <source>parameter can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">parameter can&apos;t accept data flow (is &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;parameter&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;parameter&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;parameter&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;parameter&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;parameter&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;parameter&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;parameter&lt;/i&gt;                                                                               through a flow</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;parameter&lt;/i&gt;                                                                               through a flow</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the parameter</source>
+        <translation type="unfinished">the parameter</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;parameter&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;parameter&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>parameter</source>
+        <translation type="unfinished">parameter</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserParameterSet.cpp" line="-25"/>
+        <source>to edit the &lt;i&gt;parameter set&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;parameter set&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to copy the &lt;i&gt;parameter set&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;parameter set&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to delete the &lt;i&gt;parameter set&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;parameter set&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;parameter set&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;parameter set&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the parameter set</source>
+        <translation type="unfinished">the parameter set</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;parameter set&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;parameter set&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>parameter set</source>
+        <translation type="unfinished">parameter set</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPin.cpp" line="-36"/>
+        <source>enter pin&apos;s name
+(may be empty) : </source>
+        <translation type="unfinished">enter pin&apos;s name
+(may be empty) : </translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>target pin can&apos;t have incoming flow</source>
+        <translation type="unfinished">target pin can&apos;t have incoming flow</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>target pin can&apos;t accept control flow (not &apos;is_control&apos;)</source>
+        <translation type="unfinished">target pin can&apos;t accept control flow (not &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>target pin can&apos;t accept data flow (is &apos;is_control&apos;)</source>
+        <translation type="unfinished">target pin can&apos;t accept data flow (is &apos;is_control&apos;)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>to edit the &lt;i&gt;pin&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;pin&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to copy the &lt;i&gt;pin&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;pin&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;pin&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;pin&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;pin&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the pin</source>
+        <translation type="unfinished">the pin</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to undelete the &lt;i&gt;pin&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;pin&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>pin</source>
+        <translation type="unfinished">pin</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserPseudoState.cpp" line="-171"/>
+        <source>can&apos;t have transition</source>
+        <translation type="unfinished">can&apos;t have transition</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>can&apos;t have several transition</source>
+        <translation type="unfinished">can&apos;t have several transition</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>can&apos;t have a transition to initial pseudo state</source>
+        <translation type="unfinished">can&apos;t have a transition to initial pseudo state</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>fork can&apos;t have several input transitions</source>
+        <translation type="unfinished">fork can&apos;t have several input transitions</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+34"/>
+        <location line="+106"/>
+        <location filename="../browser/BrowserState.cpp" line="-465"/>
+        <source>enter </source>
+        <translation type="unfinished">enter </translation>
+    </message>
+    <message>
+        <location line="-140"/>
+        <location line="+34"/>
+        <location line="+106"/>
+        <location filename="../browser/BrowserState.cpp" line="+0"/>
+        <source>&apos;s name : </source>
+        <translation type="unfinished">&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>already have a deep history</source>
+        <translation type="unfinished">already have a deep history</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>already have a shallow history</source>
+        <translation type="unfinished">already have a shallow history</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location filename="../browser/BrowserStateAction.cpp" line="+5"/>
+        <source>to know who reference the &lt;i&gt;%1&lt;/i&gt; through a transition</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;%1&lt;/i&gt; through a transition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the </source>
+        <translation type="unfinished">the </translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserRegion.cpp" line="-331"/>
+        <location filename="../browser/BrowserState.cpp" line="-101"/>
+        <location line="+7"/>
+        <source>New state</source>
+        <translation type="unfinished">New state</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;region&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;region&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to delete the &lt;i&gt;region&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;region&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>the region</source>
+        <translation type="unfinished">the region</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>undelete the region and its children</source>
+        <translation type="unfinished">undelete the region and its children</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <location line="+16"/>
+        <source>Region</source>
+        <translation type="unfinished">Region</translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+665"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+551"/>
+        <source>In %1</source>
+        <translation type="unfinished">In %1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserUseCase.cpp" line="+1"/>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="+1"/>
+        <source>After %1</source>
+        <translation type="unfinished">After %1</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserRelation.cpp" line="+10"/>
+        <source>because &lt;b&gt;%1&lt;/b&gt; cannot (or already) inherit on &lt;b&gt;%2&lt;/b&gt;</source>
+        <translation type="unfinished">because &lt;b&gt;%1&lt;/b&gt; cannot (or already) inherit on &lt;b&gt;%2&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+342"/>
+        <source>to edit the &lt;i&gt;relation&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;relation&lt;/i&gt;,                                              a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to copy the &lt;i&gt;relation&lt;/i&gt; in a new one</source>
+        <translation type="unfinished">to copy the &lt;i&gt;relation&lt;/i&gt; in a new one</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-4"/>
+        <source>to know who reference the &lt;i&gt;relation&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;relation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;relation&lt;/i&gt;.                                                  Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;relation&lt;/i&gt;.                                                  Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+2"/>
+        <source>select </source>
+        <translation type="unfinished">select </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to select the destination class</source>
+        <translation type="unfinished">to select the destination class</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+3"/>
+        <source>the relation</source>
+        <translation type="unfinished">the relation</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>undelete the &lt;i&gt;relation&lt;/i&gt;                                          (except if the class at the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;relation&lt;/i&gt;                                          (except if the class at the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="+125"/>
+        <location filename="../data/RelationData.cpp" line="+390"/>
+        <source>relation</source>
+        <translation type="unfinished">relation</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserSeqDiagram.cpp" line="-240"/>
+        <location line="+153"/>
+        <source>enter sequence diagram&apos;s name : </source>
+        <translation type="unfinished">enter sequence diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;sequence diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;sequence diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;sequence diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;sequence diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the sequence diagram</source>
+        <translation type="unfinished">the sequence diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;sequence diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;sequence diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+139"/>
+        <source>Sequence diagram</source>
+        <translation type="unfinished">Sequence diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserSimpleRelation.cpp" line="-143"/>
+        <source>to edit the &lt;i&gt;relation&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;relation&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;relation&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;relation&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>undelete the &lt;i&gt;relation&lt;/i&gt; (except if the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;relation&lt;/i&gt; (except if the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserState.cpp" line="-98"/>
+        <location line="+33"/>
+        <source>enter state&apos;s name : </source>
+        <translation type="unfinished">enter state&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>New state diagram</source>
+        <translation type="unfinished">New state diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New submachine</source>
+        <translation type="unfinished">New submachine</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;submachine&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;submachine&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;machine&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New nested state</source>
+        <translation type="unfinished">New nested state</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;nested state&lt;/i&gt; to the &lt;i&gt;state&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;nested state&lt;/i&gt; to the &lt;i&gt;state&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;submachine&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;state&lt;/i&gt; to the &lt;i&gt;submachine&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New region</source>
+        <translation type="unfinished">New region</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;region&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;region&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to edit the &lt;i&gt;%1&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;%1&lt;/i&gt;,                                          a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>to delete the &lt;i&gt;%1&lt;/i&gt;.                                              Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;%1&lt;/i&gt;.                                              Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to know who reference the &lt;i&gt;state&lt;/i&gt;                                                                           through a transition or a reference</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;state&lt;/i&gt;                                                                           through a transition or a reference</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>undelete the %1 and its children</source>
+        <translation type="unfinished">undelete the %1 and its children</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <location line="+136"/>
+        <source>state machine</source>
+        <translation type="unfinished">state machine</translation>
+    </message>
+    <message>
+        <location line="-133"/>
+        <source>state submachine</source>
+        <translation type="unfinished">state submachine</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+134"/>
+        <location filename="../misc/Settings.cpp" line="+133"/>
+        <location line="+89"/>
+        <source>state</source>
+        <translation type="unfinished">state</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>state machine reference</source>
+        <translation type="unfinished">state machine reference</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserStateAction.cpp" line="+118"/>
+        <source>receive-signal action</source>
+        <translation type="unfinished">receive-signal action</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>send-signal action</source>
+        <translation type="unfinished">send-signal action</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>state action</source>
+        <translation type="unfinished">state action</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserStateDiagram.cpp" line="-239"/>
+        <location line="+153"/>
+        <source>enter state diagram&apos;s name : </source>
+        <translation type="unfinished">enter state diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>to show and edit the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;state diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;state diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;state diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;state diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the state diagram</source>
+        <translation type="unfinished">the state diagram</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>to undelete the &lt;i&gt;state diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;state diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>State diagram</source>
+        <translation type="unfinished">State diagram</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>state diagram</source>
+        <translation type="unfinished">state diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserTransition.cpp" line="-18"/>
+        <source>to edit the &lt;i&gt;transition&lt;/i&gt;, a double click with the left mouse button does the same thing</source>
+        <translation type="unfinished">to edit the &lt;i&gt;transition&lt;/i&gt;, a double click with the left mouse button does the same thing</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;transition&lt;/i&gt;. Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;transition&lt;/i&gt;. Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>to know who reference the &lt;i&gt;transition&lt;/i&gt;</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;transition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>the transition</source>
+        <translation type="unfinished">the transition</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;transition&lt;/i&gt; (except if the other side is also deleted)</source>
+        <translation type="unfinished">undelete the &lt;i&gt;transition&lt;/i&gt; (except if the other side is also deleted)</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>transition</source>
+        <translation type="unfinished">transition</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCase.cpp" line="-822"/>
+        <source>New use case diagram</source>
+        <translation type="unfinished">New use case diagram</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>New use case</source>
+        <translation type="unfinished">New use case</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add a &lt;i&gt;use case&lt;/i&gt;</source>
+        <translation type="unfinished">to add a &lt;i&gt;use case&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New actor</source>
+        <translation type="unfinished">New actor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>to add an &lt;i&gt;actor&lt;/i&gt;</source>
+        <translation type="unfinished">to add an &lt;i&gt;actor&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>to edit the &lt;i&gt;use case&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;use case&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../diagram/UmlWindow.cpp" line="+17"/>
+        <source>to set how the sub &lt;i&gt;diagrams&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the sub &lt;i&gt;diagrams&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;use case and its sub items&lt;/i&gt;.                                                      Note that you can undelete them after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;use case and its sub items&lt;/i&gt;.                                                      Note that you can undelete them after</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>to know who reference the &lt;i&gt;use case&lt;/i&gt;                                          through a relation</source>
+        <translation type="unfinished">to know who reference the &lt;i&gt;use case&lt;/i&gt;                                          through a relation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>the use case</source>
+        <translation type="unfinished">the use case</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>undelete the &lt;i&gt;use case&lt;/i&gt;.                                          Do not undelete its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;use case&lt;/i&gt;.                                          Do not undelete its sub items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undelete the &lt;i&gt;use case&lt;/i&gt; and its sub items</source>
+        <translation type="unfinished">undelete the &lt;i&gt;use case&lt;/i&gt; and its sub items</translation>
+    </message>
+    <message>
+        <location line="+290"/>
+        <location line="+16"/>
+        <source>enter use case&apos;s name : </source>
+        <translation type="unfinished">enter use case&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../misc/Settings.cpp" line="-523"/>
+        <source>use case</source>
+        <translation type="unfinished">use case</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCaseDiagram.cpp" line="-236"/>
+        <location line="+147"/>
+        <source>enter use case diagram&apos;s name : </source>
+        <translation type="unfinished">enter use case diagram&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>to show and edit the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to show and edit the &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to edit the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to edit the &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>to set how the &lt;i&gt;use case diagram&lt;/i&gt;&apos;s items must be drawn</source>
+        <translation type="unfinished">to set how the &lt;i&gt;use case diagram&lt;/i&gt;&apos;s items must be drawn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>to duplicate the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to duplicate the &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>to delete the &lt;i&gt;use case diagram&lt;/i&gt;.                                                      Note that you can undelete it after</source>
+        <translation type="unfinished">to delete the &lt;i&gt;use case diagram&lt;/i&gt;.                                                      Note that you can undelete it after</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>the use case diagram</source>
+        <translation type="unfinished">the use case diagram</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>to undelete the &lt;i&gt;use case diagram&lt;/i&gt;</source>
+        <translation type="unfinished">to undelete the &lt;i&gt;use case diagram&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+142"/>
+        <source>Use Case diagram</source>
+        <translation type="unfinished">Use Case diagram</translation>
+    </message>
+    <message>
+        <location filename="../browser/BrowserUseCaseView.cpp" line="-777"/>
+        <source>enter use case view&apos;s name : </source>
+        <translation type="unfinished">enter use case view&apos;s name : </translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>the use case view</source>
+        <translation type="unfinished">the use case view</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <location line="+197"/>
+        <location line="+10"/>
+        <source>Use case view</source>
+        <translation type="unfinished">Use case view</translation>
+    </message>
+    <message>
+        <location filename="../data/OperationData.cpp" line="+0"/>
+        <source>Expected nparams instead of </source>
+        <translation type="unfinished">Expected nparams instead of </translation>
+    </message>
+    <message>
+        <location filename="../diagram/ActivityDiagramWindow.cpp" line="-214"/>
+        <source>Click this button to add an &lt;i&gt;activity&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;activity&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;interruptible activity region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the interruptible activity region from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;interruptible activity region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the interruptible activity region from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;expansion region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the expansion region from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;expansion region&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the expansion region from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;activity partition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity partition from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;activity partition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the activity partition from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Click this button to add an &lt;i&gt;initial node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;initial node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;activity final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;activity final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;activity final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;activity final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;flow final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;flow final node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow final node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;decision node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;decision node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;decision node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;decision node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;merge node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;merge node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;merge node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;merge node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add an &lt;i&gt;action&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;action&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;object node&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;object node&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;flow&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;flow&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;flow&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ArrowPointCanvas.cpp" line="-27"/>
+        <source>Line break</source>
+        <translation type="unfinished">Line break</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="+19"/>
+        <location filename="../diagram/HubCanvas.cpp" line="-39"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="+8"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+12"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location filename="../diagram/BrowserView.cpp" line="+74"/>
+        <source>browser          </source>
+        <translation type="unfinished">browser          </translation>
+    </message>
+    <message>
+        <location filename="../diagram/CdClassCanvas.cpp" line="-176"/>
+        <source>Choose operation to edit</source>
+        <translation type="unfinished">Choose operation to edit</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Choose inherited operation to add it</source>
+        <translation type="unfinished">Choose inherited operation to add it</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ClassDiagramWindow.cpp" line="+49"/>
+        <source>Click this button to add a &lt;i&gt;class&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;class&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;package&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the package from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;package&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the package from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Click this button to create a &lt;i&gt;dependency&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;dependency&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to create an &lt;i&gt;unidirectional association&lt;/i&gt; or an &lt;i&gt;extension&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create an &lt;i&gt;unidirectional association&lt;/i&gt; or an &lt;i&gt;extension&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create an &lt;i&gt;aggregation&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create an &lt;i&gt;aggregation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;composition&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;composition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;directional aggregation&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;directional aggregation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;directional composition&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;directional composition&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;realization&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;realization&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+120"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+103"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class</source>
+        <translation type="unfinished">Add Class</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+25"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+8"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+24"/>
+        <source>Generalisation</source>
+        <translation type="unfinished">Generalisation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Realize</source>
+        <translation type="unfinished">Realize</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-6"/>
+        <source>Dependency</source>
+        <translation type="unfinished">Dependency</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-12"/>
+        <location line="+6"/>
+        <source>Association</source>
+        <translation type="unfinished">Association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Association / Extension</source>
+        <translation type="unfinished">Directional Association / Extension</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Aggregation</source>
+        <translation type="unfinished">Aggregation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Composition</source>
+        <translation type="unfinished">Composition</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Aggregation</source>
+        <translation type="unfinished">Directional Aggregation</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Directional Composition</source>
+        <translation type="unfinished">Directional Composition</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+98"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+18"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor / Class association</source>
+        <translation type="unfinished">Anchor / Class association</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+14"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-19"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+12"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/ImageCanvas.cpp" line="-15"/>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="+7"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ColDiagramWindow.cpp" line="-82"/>
+        <source>Click this button to add a &lt;i&gt;link&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;link&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;self link&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;self link&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ComponentDiagramWindow.cpp" line="-99"/>
+        <source>Click this button to add a &lt;i&gt;component&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the component from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;component&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the component from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Click this button to show an interface required by a &lt;i&gt;component&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to show an interface required by a &lt;i&gt;component&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to show an interface provided by a &lt;i&gt;component&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to show an interface provided by a &lt;i&gt;component&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DeploymentDiagramWindow.cpp" line="-123"/>
+        <source>Click this button to add a &lt;i&gt;node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the node from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the node from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add a &lt;i&gt;network&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;network&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;network connexion/ending&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;network connexion/ending&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;artifact&lt;/i&gt; in the diagram.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;artifact&lt;/i&gt; in the diagram.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramItem.cpp" line="+175"/>
+        <source>some elements already present in the diagram are NOT paste</source>
+        <translation type="unfinished">some elements already present in the diagram are NOT paste</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramView.cpp" line="+583"/>
+        <source>Multiple selection menu</source>
+        <translation type="unfinished">Multiple selection menu</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>align top</source>
+        <translation type="unfinished">align top</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align bottom</source>
+        <translation type="unfinished">align bottom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align left</source>
+        <translation type="unfinished">align left</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align right</source>
+        <translation type="unfinished">align right</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center</source>
+        <translation type="unfinished">align center</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center verticaly</source>
+        <translation type="unfinished">align center verticaly</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>align center horizontaly</source>
+        <translation type="unfinished">align center horizontaly</translation>
+    </message>
+    <message>
+        <location line="+1507"/>
+        <source>SVG file (*.svg)</source>
+        <translation type="unfinished">SVG file (*.svg)</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PNG file (*.png)</source>
+        <translation type="unfinished">PNG file (*.png)</translation>
+    </message>
+    <message>
+        <location filename="../diagram/DiagramWindow.cpp" line="-82"/>
+        <source>Enter a new scale value or use the arrows to change the &lt;i&gt;scale&lt;/i&gt;</source>
+        <translation type="unfinished">Enter a new scale value or use the arrows to change the &lt;i&gt;scale&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to compute the &lt;i&gt;fit scale&lt;/i&gt; allowing to try to show all the diagram</source>
+        <translation type="unfinished">Click this button to compute the &lt;i&gt;fit scale&lt;/i&gt; allowing to try to show all the diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to compute the smallest window size allowing to show all the diagram</source>
+        <translation type="unfinished">Click this button to compute the smallest window size allowing to show all the diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to call the diagram menu like on a right mouse click done out of any element</source>
+        <translation type="unfinished">Click this button to call the diagram menu like on a right mouse click done out of any element</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>optimal scale</source>
+        <translation type="unfinished">optimal scale</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>optimal window size</source>
+        <translation type="unfinished">optimal window size</translation>
+    </message>
+    <message>
+        <location filename="../diagram/FragmentSeparatorCanvas.cpp" line="-2"/>
+        <source>Separator</source>
+        <translation type="unfinished">Separator</translation>
+    </message>
+    <message>
+        <location filename="../diagram/HubCanvas.cpp" line="-2"/>
+        <source>Network connexion</source>
+        <translation type="unfinished">Network connexion</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ImageCanvas.cpp" line="+2"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+193"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="-114"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="+1"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+1"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="+10"/>
+        <location filename="../diagram/TextCanvas.cpp" line="+10"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location filename="../diagram/ObjectDiagramWindow.cpp" line="-74"/>
+        <source>Click this button to add a &lt;i&gt;link&lt;/i&gt; between instances</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;link&lt;/i&gt; between instances</translation>
+    </message>
+    <message>
+        <location filename="../diagram/SdLifeLineCanvas.cpp" line="-5"/>
+        <source>Life line</source>
+        <translation type="unfinished">Life line</translation>
+    </message>
+    <message>
+        <location filename="../diagram/SeqDiagramWindow.cpp" line="-198"/>
+        <source>Click this button to add a modeled &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class instance from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a modeled &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class instance from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;class instance&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Click this button to send a &lt;i&gt;synchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;synchronous message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send an &lt;i&gt;asynchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send an &lt;i&gt;asynchronous message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;reflexive synchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;reflexive synchronous message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;reflexive asynchronous message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;reflexive asynchronous message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;synchronous lost message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;synchronous lost message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to send a &lt;i&gt;asynchronous lost message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to send a &lt;i&gt;asynchronous lost message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;synchronous found message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;synchronous found message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;asynchronous found message&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;asynchronous found message&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;explicitly return&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;explicitly return&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;explicit reflexive return&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;explicit reflexive return&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;text&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;text&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;continuation&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;continuation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Add modeled Class instance</source>
+        <translation type="unfinished">Add modeled Class instance</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Class instance</source>
+        <translation type="unfinished">Add Class instance</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Continuation</source>
+        <translation type="unfinished">Add Continuation</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous message</source>
+        <translation type="unfinished">Synchronous message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous message</source>
+        <translation type="unfinished">Asynchronous message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous Reflexive message</source>
+        <translation type="unfinished">Synchronous Reflexive message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous Reflexive message</source>
+        <translation type="unfinished">Asynchronous Reflexive message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous found message</source>
+        <translation type="unfinished">Synchronous found message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous found message</source>
+        <translation type="unfinished">Asynchronous found message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Synchronous lost message</source>
+        <translation type="unfinished">Synchronous lost message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Asynchronous lost message</source>
+        <translation type="unfinished">Asynchronous lost message</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Explicit return</source>
+        <translation type="unfinished">Explicit return</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Explicit reflexive return</source>
+        <translation type="unfinished">Explicit reflexive return</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-12"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anchor</translation>
+    </message>
+    <message>
+        <location filename="../diagram/StateDiagramWindow.cpp" line="+45"/>
+        <source>Click this button to add a &lt;i&gt;state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the state from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the state from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Click this button to add a &lt;i&gt;entry point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;entry point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;entry point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;entry point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;exit point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;exit point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;exit point&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;exit point&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;initial pseudo state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial pseudo state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;initial pseudo state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;initial pseudo state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;final state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;final state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;final state&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;final state&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;terminate node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;terminate node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;terminate node&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;terminate node&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;deep history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;deep history&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;deep history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;deep history&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;shallow history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;shallow history&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;junction&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;junction&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;junction&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;junction&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;choice&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;choice&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;choice&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;choice&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;fork&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;foek&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;fork&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;foek&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;join&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;join&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;join&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;join&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;transition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;transition&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;transition&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the &lt;i&gt;transition&lt;/i&gt; from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add a &lt;i&gt;region&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;region&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add an &lt;i&gt;action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;receive signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;receive signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;send signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;send signal action&lt;/i&gt; in a &lt;i&gt;state&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../diagram/StereotypePropertiesCanvas.cpp" line="-15"/>
+        <source>Stereotype Properties</source>
+        <translation type="unfinished">Stereotype Properties</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location filename="../diagram/TextCanvas.cpp" line="-5"/>
+        <source>Font</source>
+        <translation type="unfinished">Font</translation>
+    </message>
+    <message>
+        <location filename="../diagram/TextCanvas.cpp" line="-1"/>
+        <source>Color</source>
+        <translation type="unfinished">Color</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>foreground</source>
+        <translation type="unfinished">foreground</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>background</source>
+        <translation type="unfinished">background</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Text color dialog</source>
+        <translation type="unfinished">Text color dialog</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UmlWindow.cpp" line="-680"/>
+        <source>To create a &lt;i&gt;new project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</source>
+        <translation type="unfinished">To create a &lt;i&gt;new project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>To create a &lt;i&gt;new project&lt;/i&gt; from an already existing one.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</source>
+        <translation type="unfinished">To create a &lt;i&gt;new project&lt;/i&gt; from an already existing one.&lt;br&gt;&lt;br&gt;This will ask you to indicate where to create a new directory having the name of the project where all the project files will be placed.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>To open a &lt;i&gt;project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the Project menu.</source>
+        <translation type="unfinished">To open a &lt;i&gt;project&lt;/i&gt;.&lt;br&gt;&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the Project menu.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To save the project.&lt;br&gt;&lt;br&gt;You can also select the Save command from the Project menu.</source>
+        <translation type="unfinished">To save the project.&lt;br&gt;&lt;br&gt;You can also select the Save command from the Project menu.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To save all in a new project.</source>
+        <translation type="unfinished">To save all in a new project.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To print the current diagram.</source>
+        <translation type="unfinished">To print the current diagram.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To manage or not C++ and to set or not the C++ definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not C++ and to set or not the C++ definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Java and to set or not the Java definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not Java and to set or not the Java definition to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Php and to set or not the Php definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not Php and to set or not the Php definition to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not Python and to set or not the Python definition to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not Python and to set or not the Python definition to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To manage or not IDL and to set or not the IDL definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</source>
+        <translation type="unfinished">To manage or not IDL and to set or not the IDL definition/declaration to the default value when a class/operation/attribute/relation/artefact is created</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To ask or not for a verbose code generation</source>
+        <translation type="unfinished">To ask or not for a verbose code generation</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To preserve or not the operations&apos;s body</source>
+        <translation type="unfinished">To preserve or not the operations&apos;s body</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To write the operation profile at the beginning of the temporary file when you edit an operation&apos;s body</source>
+        <translation type="unfinished">To write the operation profile at the beginning of the temporary file when you edit an operation&apos;s body</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To show or hide the &lt;i&gt;stereotypes&lt;/i&gt; in the &lt;b&gt;Browser&lt;/b&gt;.</source>
+        <translation type="unfinished">To show or hide the &lt;i&gt;stereotypes&lt;/i&gt; in the &lt;b&gt;Browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To select the &lt;i&gt;browser&lt;/i&gt; current item&apos;s parent.</source>
+        <translation type="unfinished">To select the &lt;i&gt;browser&lt;/i&gt; current item&apos;s parent.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To search an item in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">To search an item in the &lt;i&gt;browser&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To get information about items.</source>
+        <translation type="unfinished">To get information about items.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To set the point size of the base font used in the &lt;i&gt;browser&lt;/i&gt; and the diagrams.</source>
+        <translation type="unfinished">To set the point size of the base font used in the &lt;i&gt;browser&lt;/i&gt; and the diagrams.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>To set the default format of the diagrams.</source>
+        <translation type="unfinished">To set the default format of the diagrams.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To select the previously selected element in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">To select the previously selected element in the &lt;i&gt;browser&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To select the next selected element in the &lt;i&gt;browser&lt;/i&gt;.</source>
+        <translation type="unfinished">To select the next selected element in the &lt;i&gt;browser&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>To ask or not for an auto completion (non case sensitive) in choice list (&lt;i&gt;combo box&lt;/i&gt;)</source>
+        <translation type="unfinished">To ask or not for an auto completion (non case sensitive) in choice list (&lt;i&gt;combo box&lt;/i&gt;)</translation>
+    </message>
+    <message>
+        <location line="+114"/>
+        <location line="+406"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;New</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create from &amp;Template</source>
+        <translation type="unfinished">Create from &amp;Template</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Open</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Save</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save &amp;as...</source>
+        <translation type="unfinished">Save &amp;as...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished">&amp;Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">&amp;Quit</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>to set the default stereotypes list</source>
+        <translation type="unfinished">to set the default stereotypes list</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>to set the sub classes settings</source>
+        <translation type="unfinished">to set the sub classes settings</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Nothing available while a dialog is opened</source>
+        <translation type="unfinished">Nothing available while a dialog is opened</translation>
+    </message>
+    <message>
+        <location line="+234"/>
+        <source>Do not forget to set the target languages list
+through the &apos;Languages&apos; menu
+
+If you program in Java, the Java Catalog plug-out
+will help you, use it !</source>
+        <translation type="unfinished">Do not forget to set the target languages list
+through the &apos;Languages&apos; menu
+
+If you program in Java, the Java Catalog plug-out
+will help you, use it !</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cannot create directory </source>
+        <translation type="unfinished">Cannot create directory </translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>The name of the project and the name of
+the directory containing it must be the same
+
+</source>
+        <translation type="unfinished">The name of the project and the name of
+the directory containing it must be the same
+
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Project name : </source>
+        <translation type="unfinished">Project name : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Directory name : </source>
+        <translation type="unfinished">Directory name : </translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Saving can&apos;t be done while a dialog is opened</source>
+        <translation type="unfinished">Saving can&apos;t be done while a dialog is opened</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>&apos;empty&apos; is reserved to the empty plug-out</source>
+        <translation type="unfinished">&apos;empty&apos; is reserved to the empty plug-out</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cannot create directory
+</source>
+        <translation type="unfinished">Cannot create directory
+</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>The project is modified, save it ?
+</source>
+        <translation type="unfinished">The project is modified, save it ?
+</translation>
+    </message>
+    <message>
+        <location line="+371"/>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+853"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+26"/>
+        <source>Unchanged : project is read-only</source>
+        <translation type="unfinished">Unchanged : project is read-only</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; set to false.&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</source>
+        <translation type="unfinished">Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; set to false.&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; toggle is cleared !&lt;br&gt;&lt;br&gt;Next code generations will replace operations&apos;s body&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</source>
+        <translation type="unfinished">Warning : &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; toggle is cleared !&lt;br&gt;&lt;br&gt;Next code generations will replace operations&apos;s body&lt;br&gt;&lt;br&gt;If you had modified body of operation outside DoUML without using &lt;i&gt;roundtrip body&lt;/i&gt; after these modifications, you will loose them.&lt;br&gt;If needed, set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to true, apply &lt;i&gt;roundtrip body&lt;/i&gt;, then set &lt;i&gt;Preserve operations&apos;s body&lt;/i&gt; to false</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Project file is read-only, new font size will not be saved, continue ?
+</source>
+        <translation type="unfinished">Project file is read-only, new font size will not be saved, continue ?
+</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Project file is read-only, default format will not be saved, continue ?
+</source>
+        <translation type="unfinished">Project file is read-only, default format will not be saved, continue ?
+</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UseCaseDiagramView.cpp" line="+121"/>
+        <source>Use case diagram menu</source>
+        <translation type="unfinished">Use case diagram menu</translation>
+    </message>
+    <message>
+        <location filename="../diagram/UseCaseDiagramWindow.cpp" line="-119"/>
+        <source>Click this button to add an &lt;i&gt;actor&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;actor&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the class from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to add an &lt;i&gt;use case&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the use case from the &lt;b&gt;browser&lt;/b&gt;.</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;use case&lt;/i&gt; in the diagram. &lt;br&gt;&lt;br&gt;You can also drop the use case from the &lt;b&gt;browser&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Click this button to add a &lt;i&gt;fragment&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;fragment&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to add a &lt;i&gt;subject&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to add a &lt;i&gt;subject&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create an &lt;i&gt;association&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create an &lt;i&gt;association&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Click this button to create a &lt;i&gt;generalisation&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;generalisation&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a &lt;i&gt;note&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to create a &lt;i&gt;note&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Click this button to create a connection between a &lt;i&gt;note&lt;/i&gt; and any other item, or between an &lt;i&gt;association&lt;/i&gt; and a &lt;i&gt;class&lt;/i&gt; in case of an &lt;i&gt;association class&lt;/i&gt;.</source>
+        <translation type="unfinished">Click this button to create a connection between a &lt;i&gt;note&lt;/i&gt; and any other item, or between an &lt;i&gt;association&lt;/i&gt; and a &lt;i&gt;class&lt;/i&gt; in case of an &lt;i&gt;association class&lt;/i&gt;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Click this button to add an &lt;i&gt;image&lt;/i&gt;</source>
+        <translation type="unfinished">Click this button to add an &lt;i&gt;image&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Actor</source>
+        <translation type="unfinished">Actor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../dialog/StereotypesDialog.cpp" line="+195"/>
+        <source>Use Case</source>
+        <translation type="unfinished">Use Case</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Subject</source>
+        <translation type="unfinished">Add Subject</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-1068"/>
+        <source>Pre
+condition : </source>
+        <translation type="unfinished">Pre
+condition : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Post
+condition : </source>
+        <translation type="unfinished">Post
+condition : </translation>
+    </message>
+    <message>
+        <location line="+285"/>
+        <location line="+25"/>
+        <location line="+922"/>
+        <location line="+13"/>
+        <location line="+62"/>
+        <location line="+13"/>
+        <source>trigger - Ocl</source>
+        <translation type="unfinished">trigger - Ocl</translation>
+    </message>
+    <message>
+        <location line="-1029"/>
+        <source>unmarshall</source>
+        <translation type="unfinished">unmarshall</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>time event</source>
+        <translation type="unfinished">time event</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+22"/>
+        <location line="+19"/>
+        <location line="+896"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <location line="+36"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <source>trigger : </source>
+        <translation type="unfinished">trigger : </translation>
+    </message>
+    <message>
+        <location line="-1031"/>
+        <location line="+12"/>
+        <location line="+923"/>
+        <location line="+12"/>
+        <location line="+63"/>
+        <location line="+12"/>
+        <source>trigger - C++</source>
+        <translation type="unfinished">trigger - C++</translation>
+    </message>
+    <message>
+        <location line="-1003"/>
+        <location line="+12"/>
+        <location line="+923"/>
+        <location line="+12"/>
+        <location line="+63"/>
+        <location line="+12"/>
+        <source>trigger - Java</source>
+        <translation type="unfinished">trigger - Java</translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+13"/>
+        <source>signal - Ocl</source>
+        <translation type="unfinished">signal - Ocl</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+20"/>
+        <location line="+19"/>
+        <source>signal : </source>
+        <translation type="unfinished">signal : </translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location line="+12"/>
+        <source>signal - C++</source>
+        <translation type="unfinished">signal - C++</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+12"/>
+        <source>signal - Java</source>
+        <translation type="unfinished">signal - Java</translation>
+    </message>
+    <message>
+        <location line="+497"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Choose behavior selected in browser</source>
+        <translation type="unfinished">Choose behavior selected in browser</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Create activity and choose it</source>
+        <translation type="unfinished">Create activity and choose it</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Create state machine and choose it</source>
+        <translation type="unfinished">Create state machine and choose it</translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <location line="+13"/>
+        <source>classifier - Ocl</source>
+        <translation type="unfinished">classifier - Ocl</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>classifier : </source>
+        <translation type="unfinished">classifier : </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <location line="+20"/>
+        <source>flags - Ocl</source>
+        <translation type="unfinished">flags - Ocl</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>links</source>
+        <translation type="unfinished">links</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>owned objects</source>
+        <translation type="unfinished">owned objects</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BasicDialog.cpp" line="-49"/>
+        <location filename="../dialog/ClassDialog.cpp" line="+866"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-152"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <location filename="../dialog/ClassDialog.cpp" line="+783"/>
+        <location filename="../dialog/PackageDialog.cpp" line="+101"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BodyDialog.cpp" line="+81"/>
+        <source>Note : operation bodies preserved</source>
+        <translation type="unfinished">Note : operation bodies preserved</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can specify the editor through the environment dialog</source>
+        <translation type="unfinished">You can specify the editor through the environment dialog</translation>
+    </message>
+    <message>
+        <location filename="../dialog/BrowserSearchDialog.cpp" line="+95"/>
+        <location filename="../dialog/ReferenceDialog.cpp" line="+160"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Unmark</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <location filename="../dialog/ReferenceDialog.cpp" line="+0"/>
+        <source>Mark</source>
+        <translation type="unfinished">Mark</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ClassDialog.cpp" line="-3428"/>
+        <location filename="../dialog/ImageDialog.cpp" line="+27"/>
+        <source>Select image</source>
+        <translation type="unfinished">Select image</translation>
+    </message>
+    <message>
+        <location line="+1599"/>
+        <source>Type (C++)</source>
+        <translation type="unfinished">Type (C++)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default value (C++)</source>
+        <translation type="unfinished">Default value (C++)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+72"/>
+        <location filename="../dialog/ToolDialog.cpp" line="+221"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+369"/>
+        <source>inherited class formal</source>
+        <translation type="unfinished">inherited class formal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>actual</source>
+        <translation type="unfinished">actual</translation>
+    </message>
+    <message>
+        <location line="+147"/>
+        <source>element kind</source>
+        <translation type="unfinished">element kind</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>applicable</source>
+        <translation type="unfinished">applicable</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+22"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="+90"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+34"/>
+        <source>yes</source>
+        <translation type="unfinished">yes</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Parameterized</source>
+        <translation type="unfinished">Parameterized</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Instantiate</source>
+        <translation type="unfinished">Instantiate</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+490"/>
+        <source>follow uml</source>
+        <translation type="unfinished">follow uml</translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <source>Stereotype</source>
+        <translation type="unfinished">Stereotype</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>source</source>
+        <translation type="unfinished">source</translation>
+    </message>
+    <message>
+        <location line="+204"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Show annotation</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Edit annotation</translation>
+    </message>
+    <message>
+        <location line="+303"/>
+        <source>Set it relative to image root</source>
+        <translation type="unfinished">Set it relative to image root</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set it relative to project</source>
+        <translation type="unfinished">Set it relative to project</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="-907"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-518"/>
+        <source>Set it absolute</source>
+        <translation type="unfinished">Set it absolute</translation>
+    </message>
+    <message>
+        <location line="+156"/>
+        <location filename="../misc/Images.cpp" line="+1"/>
+        <source>
+doesn&apos;t exist or is not a know image format</source>
+        <translation type="unfinished">
+doesn&apos;t exist or is not a know image format</translation>
+    </message>
+    <message>
+        <location filename="../dialog/CodEditMsgDialog.cpp" line="+47"/>
+        <source>Communication diagram message dialog</source>
+        <translation type="unfinished">Communication diagram message dialog</translation>
+    </message>
+    <message>
+        <location filename="../dialog/DialogUtil.cpp" line="+315"/>
+        <source>Cannot open &apos;%1&apos;</source>
+        <translation type="unfinished">Cannot open &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Sub dialog(s) still opened
+If you choose &apos;Ok&apos; the dialog will be closed
+without taking into account it content</source>
+        <translation type="unfinished">Sub dialog(s) still opened
+If you choose &apos;Ok&apos; the dialog will be closed
+without taking into account it content</translation>
+    </message>
+    <message>
+        <location filename="../dialog/EdgeMenuDialog.cpp" line="+149"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location filename="../dialog/EnvDialog.cpp" line="-75"/>
+        <source>Invalid identifier, must be an integer between 2 and 127</source>
+        <translation type="unfinished">Invalid identifier, must be an integer between 2 and 127</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Invalid DEFAULT SCREEN : coordinates can&apos;t be negative</source>
+        <translation type="unfinished">Invalid DEFAULT SCREEN : coordinates can&apos;t be negative</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid DEFAULT SCREEN : the right must be greater than the left</source>
+        <translation type="unfinished">Invalid DEFAULT SCREEN : the right must be greater than the left</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid DEFAULT SCREEN : the bottom must be greater than the top</source>
+        <translation type="unfinished">Invalid DEFAULT SCREEN : the bottom must be greater than the top</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>small DEFAULT SCREEN, width less than 500 points !</source>
+        <translation type="unfinished">small DEFAULT SCREEN, width less than 500 points !</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>small DEFAULT SCREEN, height less than 500 points !</source>
+        <translation type="unfinished">small DEFAULT SCREEN, height less than 500 points !</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Invalid DEFAULT SCREENTo not specify the desktop all values must be empty or null.Else the values must be non negative, the right must be greater
+than the left, and the bottom must be greater than the top</source>
+        <translation type="unfinished">Invalid DEFAULT SCREENTo not specify the desktop all values must be empty or null.Else the values must be non negative, the right must be greater
+than the left, and the bottom must be greater than the top</translation>
+    </message>
+    <message>
+        <location line="+195"/>
+        <source>Own identifier missing or invalid</source>
+        <translation type="unfinished">Own identifier missing or invalid</translation>
+    </message>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="-1576"/>
+        <source>Types</source>
+        <translation type="unfinished">Types</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-50"/>
+        <location line="+38"/>
+        <location line="+28"/>
+        <source>Stereotypes</source>
+        <translation type="unfinished">Stereotypes</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>empty</source>
+        <translation type="unfinished">empty</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>1 space</source>
+        <translation type="unfinished">1 space</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>1 tab</source>
+        <translation type="unfinished">1 tab</translation>
+    </message>
+    <message>
+        <location line="+625"/>
+        <location line="+208"/>
+        <location line="+26"/>
+        <source>Modifiers</source>
+        <translation type="unfinished">Modifiers</translation>
+    </message>
+    <message>
+        <location line="+663"/>
+        <source>Description</source>
+        <translation type="unfinished">Description</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../dialog/PackageDialog.cpp" line="-1"/>
+        <source>Set it relative</source>
+        <translation type="unfinished">Set it relative</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <source>Directory</source>
+        <translation type="unfinished">Directory</translation>
+    </message>
+    <message>
+        <location line="+144"/>
+        <source>C++ &apos;in&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;in&apos; enum argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;out&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;out&apos; enum argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;inout&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;inout&apos; enum argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;return&apos; enum argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;return&apos; enum argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>C++ &apos;in&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;in&apos; argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;out&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;out&apos; argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;inout&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;inout&apos; argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C++ &apos;return&apos; argument default passing must contains ${type}</source>
+        <translation type="unfinished">C++ &apos;return&apos; argument default passing must contains ${type}</translation>
+    </message>
+    <message>
+        <location line="+299"/>
+        <source>C++ root directory</source>
+        <translation type="unfinished">C++ root directory</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Java root directory</source>
+        <translation type="unfinished">Java root directory</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Php root directory</source>
+        <translation type="unfinished">Php root directory</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Python root directory</source>
+        <translation type="unfinished">Python root directory</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Idl root directory</source>
+        <translation type="unfinished">Idl root directory</translation>
+    </message>
+    <message>
+        <location filename="../dialog/HelpDialog.cpp" line="+63"/>
+        <source>HelpDialog : error while executing &apos;%1&apos;
+perhaps you must specify its absolute pathor set the environment variable PATH ?</source>
+        <translation type="unfinished">HelpDialog : error while executing &apos;%1&apos;
+perhaps you must specify its absolute pathor set the environment variable PATH ?</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>The documentation is too old.&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished">The documentation is too old.&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The documentation isn&apos;t installed.&lt;br&gt;&lt;br&gt;</source>
+        <translation type="unfinished">The documentation isn&apos;t installed.&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The &quot;.tar.gz&quot; or &quot;.7z&quot; archives are available here:&lt;ul&gt;&lt;li&gt;http://bouml.sourceforge.net/documentation.html&lt;/li&gt;&lt;li&gt;http://sourceforge.net/projects/douml/documentation.html&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;Extract an archive and set the environment through the Miscellaneousmenu to indicate where the directory &quot;doc&quot; is then close this dialog and redo</source>
+        <translation type="unfinished">The &quot;.tar.gz&quot; or &quot;.7z&quot; archives are available here:&lt;ul&gt;&lt;li&gt;http://bouml.sourceforge.net/documentation.html&lt;/li&gt;&lt;li&gt;http://sourceforge.net/projects/douml/documentation.html&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;Extract an archive and set the environment through the Miscellaneousmenu to indicate where the directory &quot;doc&quot; is then close this dialog and redo</translation>
+    </message>
+    <message>
+        <location filename="../dialog/KeyValueTable.cpp" line="-44"/>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-74"/>
+        <source>Key</source>
+        <translation type="unfinished">Key</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do</source>
+        <translation type="unfinished">Do</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>key &apos;%1&apos; used several times</source>
+        <translation type="unfinished">key &apos;%1&apos; used several times</translation>
+    </message>
+    <message>
+        <location filename="../dialog/PackageDialog.cpp" line="+409"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profile</translation>
+    </message>
+    <message>
+        <location line="+115"/>
+        <location line="+9"/>
+        <source>conflict on stereotypes</source>
+        <translation type="unfinished">conflict on stereotypes</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>C++ header directory</source>
+        <translation type="unfinished">C++ header directory</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ source directory</source>
+        <translation type="unfinished">C++ source directory</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Java directory</source>
+        <translation type="unfinished">Java directory</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Php directory</source>
+        <translation type="unfinished">Php directory</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Python directory</source>
+        <translation type="unfinished">Python directory</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Idl directory</source>
+        <translation type="unfinished">Idl directory</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ReferenceDialog.cpp" line="-95"/>
+        <source> is referenced by :</source>
+        <translation type="unfinished"> is referenced by :</translation>
+    </message>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="+43"/>
+        <source>Transparent</source>
+        <translation type="unfinished">Transparent</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unknown color</source>
+        <translation type="unfinished">Unknown color</translation>
+    </message>
+    <message>
+        <location line="+166"/>
+        <source>Diagram Drawing Settings dialog</source>
+        <translation type="unfinished">Diagram Drawing Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>diagram</source>
+        <translation type="unfinished">diagram</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>color</source>
+        <translation type="unfinished">color</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>default </source>
+        <translation type="unfinished">default </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>color [1]</source>
+        <translation type="unfinished">color [1]</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>color [2]</source>
+        <translation type="unfinished">color [2]</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>&lt;unchanged&gt;</source>
+        <translation type="unfinished">&lt;unchanged&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>default</source>
+        <translation type="unfinished">default</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>unlimited</source>
+        <translation type="unfinished">unlimited</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-68"/>
+        <source>Command</source>
+        <translation type="unfinished">Command</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>tool display</source>
+        <translation type="unfinished">tool display</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>command</source>
+        <translation type="unfinished">command</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>shortcut </source>
+        <translation type="unfinished">shortcut </translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Shift </source>
+        <translation type="unfinished">Shift </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Ctrl </source>
+        <translation type="unfinished">Ctrl </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Alt </source>
+        <translation type="unfinished">Alt </translation>
+    </message>
+    <message>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-92"/>
+        <source>Package</source>
+        <translation type="unfinished">Package</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Class</source>
+        <translation type="unfinished">Class</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Artifact</source>
+        <translation type="unfinished">Artifact</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Views</source>
+        <translation type="unfinished">Views</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Diagrams</source>
+        <translation type="unfinished">Diagrams</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Activities</source>
+        <translation type="unfinished">Activities</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Others</source>
+        <translation type="unfinished">Others</translation>
+    </message>
+    <message>
+        <location filename="../dialog/ToolDialog.cpp" line="-19"/>
+        <source>executable</source>
+        <translation type="unfinished">executable</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>display</source>
+        <translation type="unfinished">display</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="-77"/>
+        <source>Warning</source>
+        <translation type="unfinished">Warning</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Douml is working in transitional mode.
+ All UI improvements are yours to use,  but saving is done in the format of Bouml 4.22 which loses all new c++11 and hierarchy specifiers
+
+To suppress this warning place empty file override_transition.txt into the application folder
+To disable the mode - change compatibility_save parameter to 0 in settings.ini
+</source>
+        <translation type="unfinished">Douml is working in transitional mode.
+ All UI improvements are yours to use,  but saving is done in the format of Bouml 4.22 which loses all new c++11 and hierarchy specifiers
+
+To suppress this warning place empty file override_transition.txt into the application folder
+To disable the mode - change compatibility_save parameter to 0 in settings.ini
+</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>DO NOT CONFIRM</source>
+        <translation type="unfinished">DO NOT CONFIRM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Root mode protection
+
+This mode allows us to develop DoUML
+
+do NOT confirm to avoid a disaster !!!
+
+confirm ?</source>
+        <translation type="unfinished">Root mode protection
+
+This mode allows us to develop DoUML
+
+do NOT confirm to avoid a disaster !!!
+
+confirm ?</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>DoUML was called with wrong parameters, ignore them</source>
+        <translation type="unfinished">DoUML was called with wrong parameters, ignore them</translation>
+    </message>
+    <message>
+        <location filename="../misc/ProfiledStereotypes.cpp" line="+660"/>
+        <location line="+17"/>
+        <source>isn&apos;t in a profile</source>
+        <translation type="unfinished">isn&apos;t in a profile</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+17"/>
+        <source>is already a stereotype</source>
+        <translation type="unfinished">is already a stereotype</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+280"/>
+        <source>Unconsistency</source>
+        <translation type="unfinished">Unconsistency</translation>
+    </message>
+    <message>
+        <location line="-279"/>
+        <location line="+280"/>
+        <source>stereotype &apos;%1&apos; defined several times,
+redondant definition is not managed as a stereotype</source>
+        <translation type="unfinished">stereotype &apos;%1&apos; defined several times,
+redondant definition is not managed as a stereotype</translation>
+    </message>
+    <message>
+        <location line="+201"/>
+        <source>Check</source>
+        <translation type="unfinished">Check</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotype</source>
+        <translation type="unfinished">to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotype</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Force stereotype consistency</source>
+        <translation type="unfinished">Force stereotype consistency</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to recompute all concerning the profiles</source>
+        <translation type="unfinished">to recompute all concerning the profiles</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Check recursively</source>
+        <translation type="unfinished">Check recursively</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotypes,doing down recursively</source>
+        <translation type="unfinished">to call the &lt;i&gt;check plug-out&lt;/i&gt; associated to the stereotypes,doing down recursively</translation>
+    </message>
+    <message>
+        <location filename="../misc/Settings.cpp" line="-822"/>
+        <location line="+43"/>
+        <location line="+42"/>
+        <location line="+288"/>
+        <location line="+13"/>
+        <location line="+155"/>
+        <location line="+17"/>
+        <location line="+22"/>
+        <location line="+761"/>
+        <location line="+8"/>
+        <location line="+191"/>
+        <location line="+7"/>
+        <source>drawing language</source>
+        <translation type="unfinished">drawing language</translation>
+    </message>
+    <message>
+        <location line="-1546"/>
+        <location line="+231"/>
+        <source>drawing mode</source>
+        <translation type="unfinished">drawing mode</translation>
+    </message>
+    <message>
+        <location line="-230"/>
+        <location line="+34"/>
+        <location line="+197"/>
+        <source>show context</source>
+        <translation type="unfinished">show context</translation>
+    </message>
+    <message>
+        <location line="-230"/>
+        <source>hide attributes</source>
+        <translation type="unfinished">hide attributes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>hide operations</source>
+        <translation type="unfinished">hide operations</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>hide get/set operations</source>
+        <translation type="unfinished">hide get/set operations</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>show members full definition</source>
+        <translation type="unfinished">show members full definition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+42"/>
+        <source>show members visibility</source>
+        <translation type="unfinished">show members visibility</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show members stereotype</source>
+        <translation type="unfinished">show members stereotype</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show context in members definition</source>
+        <translation type="unfinished">show context in members definition</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show attributes multiplicity</source>
+        <translation type="unfinished">show attributes multiplicity</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>show attributes initialisation</source>
+        <translation type="unfinished">show attributes initialisation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+42"/>
+        <location line="+42"/>
+        <source>show attribute modifiers</source>
+        <translation type="unfinished">show attribute modifiers</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <location line="+42"/>
+        <source>show parameter direction</source>
+        <translation type="unfinished">show parameter direction</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>show parameter name</source>
+        <translation type="unfinished">show parameter name</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+42"/>
+        <source>members max width</source>
+        <translation type="unfinished">members max width</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <location line="+48"/>
+        <location line="+42"/>
+        <location line="+1423"/>
+        <location line="+7"/>
+        <source>show information note</source>
+        <translation type="unfinished">show information note</translation>
+    </message>
+    <message>
+        <location line="-1518"/>
+        <location line="+9"/>
+        <location line="+38"/>
+        <location line="+42"/>
+        <location line="+117"/>
+        <location line="+146"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+117"/>
+        <location line="+11"/>
+        <location line="+310"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location line="+201"/>
+        <location line="+8"/>
+        <location line="+191"/>
+        <location line="+7"/>
+        <source>show stereotype properties</source>
+        <translation type="unfinished">show stereotype properties</translation>
+    </message>
+    <message>
+        <location line="-1513"/>
+        <source>name in tab</source>
+        <translation type="unfinished">name in tab</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+42"/>
+        <source>classes drawing mode</source>
+        <translation type="unfinished">classes drawing mode</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes attributes</source>
+        <translation type="unfinished">hide classes attributes</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes operations</source>
+        <translation type="unfinished">hide classes operations</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>hide classes get/set operations</source>
+        <translation type="unfinished">hide classes get/set operations</translation>
+    </message>
+    <message>
+        <location line="-41"/>
+        <location line="+42"/>
+        <source>show classes members full definition</source>
+        <translation type="unfinished">show classes members full definition</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <source>show attributes initialization</source>
+        <translation type="unfinished">show attributes initialization</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+42"/>
+        <location line="+269"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+116"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+207"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>draw all relations</source>
+        <translation type="unfinished">draw all relations</translation>
+    </message>
+    <message>
+        <location line="-1403"/>
+        <location line="+43"/>
+        <source>show relation modifiers</source>
+        <translation type="unfinished">show relation modifiers</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+43"/>
+        <source>show relation visibility</source>
+        <translation type="unfinished">show relation visibility</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+40"/>
+        <location line="+455"/>
+        <location line="+131"/>
+        <location line="+127"/>
+        <location line="+103"/>
+        <location line="+114"/>
+        <location line="+217"/>
+        <location line="+209"/>
+        <source>show packages name in tab</source>
+        <translation type="unfinished">show packages name in tab</translation>
+    </message>
+    <message>
+        <location line="-1395"/>
+        <location line="+42"/>
+        <location line="+435"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <source>show classes and packages context</source>
+        <translation type="unfinished">show classes and packages context</translation>
+    </message>
+    <message>
+        <location line="-625"/>
+        <location line="+42"/>
+        <location line="+573"/>
+        <location line="+11"/>
+        <location line="+116"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+205"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>automatic labels position</source>
+        <translation type="unfinished">automatic labels position</translation>
+    </message>
+    <message>
+        <location line="-1392"/>
+        <location line="+42"/>
+        <location line="+262"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+117"/>
+        <location line="+11"/>
+        <location line="+92"/>
+        <location line="+9"/>
+        <location line="+105"/>
+        <location line="+10"/>
+        <location line="+207"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>draw shadow</source>
+        <translation type="unfinished">draw shadow</translation>
+    </message>
+    <message>
+        <location line="-1381"/>
+        <source>show classes members visibility</source>
+        <translation type="unfinished">show classes members visibility</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show classes members stereotype</source>
+        <translation type="unfinished">show classes members stereotype</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show context in classes members definition</source>
+        <translation type="unfinished">show context in classes members definition</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show attribute multiplicity</source>
+        <translation type="unfinished">show attribute multiplicity</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show attribute initialization</source>
+        <translation type="unfinished">show attribute initialization</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>show operation parameter direction</source>
+        <translation type="unfinished">show operation parameter direction</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>show operation parameter name</source>
+        <translation type="unfinished">show operation parameter name</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>max members width</source>
+        <translation type="unfinished">max members width</translation>
+    </message>
+    <message>
+        <location line="+266"/>
+        <location line="+13"/>
+        <source>instances drawing mode</source>
+        <translation type="unfinished">instances drawing mode</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <location line="+13"/>
+        <location line="+154"/>
+        <location line="+18"/>
+        <location line="+21"/>
+        <source>show operations full definition</source>
+        <translation type="unfinished">show operations full definition</translation>
+    </message>
+    <message>
+        <location line="-205"/>
+        <location line="+13"/>
+        <location line="+157"/>
+        <location line="+18"/>
+        <location line="+121"/>
+        <location line="+11"/>
+        <source>write name:type horizontally</source>
+        <translation type="unfinished">write name:type horizontally</translation>
+    </message>
+    <message>
+        <location line="-319"/>
+        <location line="+13"/>
+        <source>show classes context</source>
+        <translation type="unfinished">show classes context</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <location line="+13"/>
+        <location line="+159"/>
+        <location line="+18"/>
+        <location line="+15"/>
+        <source>show messages context</source>
+        <translation type="unfinished">show messages context</translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <source>sequence</source>
+        <translation type="unfinished">sequence</translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+18"/>
+        <location line="+22"/>
+        <source>show hierarchical rank</source>
+        <translation type="unfinished">show hierarchical rank</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <location line="+138"/>
+        <location line="+127"/>
+        <location line="+105"/>
+        <location line="+113"/>
+        <location line="+216"/>
+        <location line="+209"/>
+        <source>packages name in tab</source>
+        <translation type="unfinished">packages name in tab</translation>
+    </message>
+    <message>
+        <location line="-900"/>
+        <source>communication</source>
+        <translation type="unfinished">communication</translation>
+    </message>
+    <message>
+        <location line="+138"/>
+        <source>object</source>
+        <translation type="unfinished">object</translation>
+    </message>
+    <message>
+        <location line="+120"/>
+        <location line="+11"/>
+        <location line="+94"/>
+        <location line="+9"/>
+        <location line="+104"/>
+        <location line="+10"/>
+        <location line="+206"/>
+        <location line="+11"/>
+        <location line="+198"/>
+        <location line="+11"/>
+        <source>show packages context</source>
+        <translation type="unfinished">show packages context</translation>
+    </message>
+    <message>
+        <location line="-651"/>
+        <location line="+11"/>
+        <source>class drawing mode</source>
+        <translation type="unfinished">class drawing mode</translation>
+    </message>
+    <message>
+        <location line="+205"/>
+        <source>write node instance horizontally</source>
+        <translation type="unfinished">write node instance horizontally</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+84"/>
+        <source>deployment</source>
+        <translation type="unfinished">deployment</translation>
+    </message>
+    <message>
+        <location line="-80"/>
+        <source>write node instances horizontally</source>
+        <translation type="unfinished">write node instances horizontally</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>draw component as icon</source>
+        <translation type="unfinished">draw component as icon</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>show component&apos;s required
+and provided interfaces</source>
+        <translation type="unfinished">show component&apos;s required
+and provided interfaces</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>show component&apos;s realizations</source>
+        <translation type="unfinished">show component&apos;s realizations</translation>
+    </message>
+    <message>
+        <location line="+113"/>
+        <location line="+11"/>
+        <source>write transition horizontally</source>
+        <translation type="unfinished">write transition horizontally</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location line="+11"/>
+        <source>show transition definition</source>
+        <translation type="unfinished">show transition definition</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <location line="+8"/>
+        <source>show state activities</source>
+        <translation type="unfinished">show state activities</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>draw state&apos;s regions horizontally</source>
+        <translation type="unfinished">draw state&apos;s regions horizontally</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <location line="+11"/>
+        <source>write flow label horizontally</source>
+        <translation type="unfinished">write flow label horizontally</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <location line="+11"/>
+        <source>show opaque action definition</source>
+        <translation type="unfinished">show opaque action definition</translation>
+    </message>
+    <message>
+        <location filename="../misc/mu.cpp" line="+66"/>
+        <source>                            The project is open in read-only mode because it is
+                            under the control of &apos;Project control&apos; or &apos;Project merge&apos;
+                            (the directory &apos;%1&apos; exists</source>
+        <translation type="unfinished">                            The project is open in read-only mode because it is
+                            under the control of &apos;Project control&apos; or &apos;Project merge&apos;
+                            (the directory &apos;%1&apos; exists</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+7"/>
+        <source>User Own Identifier</source>
+        <translation type="unfinished">User Own Identifier</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Can&apos;t create directory &apos;%1&apos;,
+the project is open in read-only mode</source>
+        <translation type="unfinished">Can&apos;t create directory &apos;%1&apos;,
+the project is open in read-only mode</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>It seems that you are already editing the project %1.
+
+If you&apos;re SURE that this is not the case and
+another user does not have an identifier equal
+to yours you can gain ownership of the lock.</source>
+        <translation type="unfinished">It seems that you are already editing the project %1.
+
+If you&apos;re SURE that this is not the case and
+another user does not have an identifier equal
+to yours you can gain ownership of the lock.</translation>
+    </message>
+    <message>
+        <location filename="../misc/myio.cpp" line="-927"/>
+        <source> is not a visibility</source>
+        <translation type="unfinished"> is not a visibility</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source> is not a direction</source>
+        <translation type="unfinished"> is not a direction</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source> is not a parameter effect</source>
+        <translation type="unfinished"> is not a parameter effect</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source> is not an activity action kind</source>
+        <translation type="unfinished"> is not an activity action kind</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source> is not an expansion node kind</source>
+        <translation type="unfinished"> is not an expansion node kind</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source> is not an ordering</source>
+        <translation type="unfinished"> is not an ordering</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source> is not a state</source>
+        <translation type="unfinished"> is not a state</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source> is not a class drawing mode</source>
+        <translation type="unfinished"> is not a class drawing mode</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> is not a drawing language</source>
+        <translation type="unfinished"> is not a drawing language</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source> is not a context mode</source>
+        <translation type="unfinished"> is not a context mode</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source> is not a color</source>
+        <translation type="unfinished"> is not a color</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source> is not a font</source>
+        <translation type="unfinished"> is not a font</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <source> is not a canvas format</source>
+        <translation type="unfinished"> is not a canvas format</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source> is not a pseudo state kind</source>
+        <translation type="unfinished"> is not a pseudo state kind</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source> is not an activity node kind</source>
+        <translation type="unfinished"> is not an activity node kind</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source> is not a line geometry</source>
+        <translation type="unfinished"> is not a line geometry</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>
+cannot be renamed </source>
+        <translation type="unfinished">
+cannot be renamed </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>, retry ?
+</source>
+        <translation type="unfinished">, retry ?
+</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>
+cannot be opened for write, retry ?
+</source>
+        <translation type="unfinished">
+cannot be opened for write, retry ?
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>
+cannot be opened for read, retry ?
+</source>
+        <translation type="unfinished">
+cannot be opened for read, retry ?
+</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>cannot open %1 to read it</source>
+        <translation type="unfinished">cannot open %1 to read it</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>cannot create %1</source>
+        <translation type="unfinished">cannot create %1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>error when writing %1</source>
+        <translation type="unfinished">error when writing %1</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>error when reading %1</source>
+        <translation type="unfinished">error when reading %1</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <location line="+63"/>
+        <source>%1 cannot be read</source>
+        <translation type="unfinished">%1 cannot be read</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Cannot save definition in
+%1
+may be your disk is full</source>
+        <translation type="unfinished">Cannot save definition in
+%1
+may be your disk is full</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source> line </source>
+        <translation type="unfinished"> line </translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <source>premature end of file, string expected</source>
+        <translation type="unfinished">premature end of file, string expected</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>string expected after &apos;%1&apos;</source>
+        <translation type="unfinished">string expected after &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+20"/>
+        <source>premature end of file reading a string</source>
+        <translation type="unfinished">premature end of file reading a string</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>premature end of file, keyword expected</source>
+        <translation type="unfinished">premature end of file, keyword expected</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>keyword expected after &apos;%1&apos;</source>
+        <translation type="unfinished">keyword expected after &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+44"/>
+        <source>premature end of file, &apos;%1&apos; expected</source>
+        <translation type="unfinished">premature end of file, &apos;%1&apos; expected</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <location line="+44"/>
+        <source>&apos;%1&apos; expected rather than a string after &apos;%2&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; expected rather than a string after &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="-27"/>
+        <location line="+44"/>
+        <source>&apos;%1&apos; expected rather than &apos;%2&apos; after &apos;%3&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; expected rather than &apos;%2&apos; after &apos;%3&apos;</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>premature end of file, id expected</source>
+        <translation type="unfinished">premature end of file, id expected</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+9"/>
+        <source>id expected after &apos;%1&apos;</source>
+        <translation type="unfinished">id expected after &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>premature end of file, unsigned expected</source>
+        <translation type="unfinished">premature end of file, unsigned expected</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+13"/>
+        <source>unsigned expected after &apos;%1&apos;</source>
+        <translation type="unfinished">unsigned expected after &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>premature end of file, float expected</source>
+        <translation type="unfinished">premature end of file, float expected</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>float expected after &apos;%1&apos;</source>
+        <translation type="unfinished">float expected after &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>float expected rather than &apos;%1&apos; after &apos;%2&apos;</source>
+        <translation type="unfinished">float expected rather than &apos;%1&apos; after &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>premature end of file</source>
+        <translation type="unfinished">premature end of file</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>&apos;%1&apos; expected rather than &apos;%2&apos;</source>
+        <translation type="unfinished">&apos;%1&apos; expected rather than &apos;%2&apos;</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>unknown or unexpected keyword &apos;%1&apos;</source>
+        <translation type="unfinished">unknown or unexpected keyword &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>%1 unknown %2 identifier</source>
+        <translation type="unfinished">%1 unknown %2 identifier</translation>
+    </message>
+</context>
+<context>
+    <name>QuickEdit</name>
+    <message>
+        <location filename="../ui/quickedit.ui" line="+14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Previous Item</source>
+        <translation type="unfinished">Previous Item</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Next Item</source>
+        <translation type="unfinished">Next Item</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>C++</source>
+        <translation type="unfinished">C++</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Java</source>
+        <translation type="unfinished">Java</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Python</source>
+        <translation type="unfinished">Python</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Php</source>
+        <translation type="unfinished">Php</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Idl</source>
+        <translation type="unfinished">Idl</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Operation</source>
+        <translation type="unfinished">Operation</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Parameter</source>
+        <translation type="unfinished">Parameter</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Attribute</translation>
+    </message>
+    <message>
+        <location filename="../CustomWidgets/quickedit.cpp" line="+136"/>
+        <source>Collapse/Expand</source>
+        <translation type="unfinished">Collapse/Expand</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Self</source>
+        <translation type="unfinished">Self</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Parent</source>
+        <translation type="unfinished">Parent</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move marked before</source>
+        <translation type="unfinished">Move marked before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move marked after</source>
+        <translation type="unfinished">Move marked after</translation>
+    </message>
+</context>
+<context>
+    <name>ReduceDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="+103"/>
+        <location line="+25"/>
+        <source>reducer - Ocl</source>
+        <translation type="unfinished">reducer - Ocl</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordered</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>reducer :</source>
+        <translation type="unfinished">reducer :</translation>
+    </message>
+</context>
+<context>
+    <name>ReferenceDialog</name>
+    <message>
+        <location filename="../dialog/ReferenceDialog.cpp" line="-8"/>
+        <source>Referenced By dialog</source>
+        <translation type="unfinished">Referenced By dialog</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Recompute</source>
+        <translation type="unfinished">Recompute</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark</source>
+        <translation type="unfinished">Unmark</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mark them</source>
+        <translation type="unfinished">Mark them</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unmark all</source>
+        <translation type="unfinished">Unmark all</translation>
+    </message>
+</context>
+<context>
+    <name>RelTable</name>
+    <message>
+        <location filename="../dialog/ClassInstanceDialog.cpp" line="-375"/>
+        <location line="+4"/>
+        <source>Class Inst.</source>
+        <translation type="unfinished">Class Inst.</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+2"/>
+        <source>Role</source>
+        <translation type="unfinished">Role</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>kind</source>
+        <translation type="unfinished">kind</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished">Delete</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>   Yes</source>
+        <translation type="unfinished">   Yes</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedElementsDialog</name>
+    <message>
+        <location filename="../dialog/RelatedElementsDialog.cpp" line="+57"/>
+        <source>Related elements dialog</source>
+        <translation type="unfinished">Related elements dialog</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Search for : </source>
+        <translation type="unfinished">Search for : </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>referenced elements  </source>
+        <translation type="unfinished">referenced elements  </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>referencing elements  </source>
+        <translation type="unfinished">referencing elements  </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Through relations : </source>
+        <translation type="unfinished">Through relations : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generalization  </source>
+        <translation type="unfinished">generalization  </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>dependency  </source>
+        <translation type="unfinished">dependency  </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>other</source>
+        <translation type="unfinished">other</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Search only for %1</source>
+        <translation type="unfinished">Search only for %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>     Search on </source>
+        <translation type="unfinished">     Search on </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>levels</source>
+        <translation type="unfinished">levels</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>RelationCanvas</name>
+    <message>
+        <location filename="../diagram/RelationCanvas.cpp" line="+157"/>
+        <source>&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</source>
+        <translation type="unfinished">&lt;i&gt;Draw all relations&lt;/i&gt; forced to &lt;i&gt;no&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+234"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select labels</source>
+        <translation type="unfinished">Select labels</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Labels default position</source>
+        <translation type="unfinished">Labels default position</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s name to this segment</source>
+        <translation type="unfinished">Attach relation&apos;s name to this segment</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Attach relation&apos;s stereotype to this segment</source>
+        <translation type="unfinished">Attach relation&apos;s stereotype to this segment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Geometry (Ctrl+l)</source>
+        <translation type="unfinished">Geometry (Ctrl+l)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+718"/>
+        <source>relation already drawn</source>
+        <translation type="unfinished">relation already drawn</translation>
+    </message>
+    <message>
+        <location line="+173"/>
+        <source>read-only relation</source>
+        <translation type="unfinished">read-only relation</translation>
+    </message>
+</context>
+<context>
+    <name>RelationDialog</name>
+    <message>
+        <location filename="../dialog/RelationDialog.cpp" line="+107"/>
+        <source>Relation dialog</source>
+        <translation type="unfinished">Relation dialog</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+358"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="-351"/>
+        <source>type : </source>
+        <translation type="unfinished">type : </translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>    stereotype : </source>
+        <translation type="unfinished">    stereotype : </translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>association :</source>
+        <translation type="unfinished">association :</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+1"/>
+        <source>in </source>
+        <translation type="unfinished">in </translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>multiplicity : </source>
+        <translation type="unfinished">multiplicity : </translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>   initial value : </source>
+        <translation type="unfinished">   initial value : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+103"/>
+        <location line="+35"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-95"/>
+        <source>read-only</source>
+        <translation type="unfinished">read-only</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>derived</source>
+        <translation type="unfinished">derived</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>ordered</source>
+        <translation type="unfinished">ordered</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>description : </source>
+        <translation type="unfinished">description : </translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>constraint : </source>
+        <translation type="unfinished">constraint : </translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Visibility : </source>
+        <translation type="unfinished">Visibility : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>follow uml</source>
+        <translation type="unfinished">follow uml</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location line="+66"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+77"/>
+        <source>Declaration : </source>
+        <translation type="unfinished">Declaration : </translation>
+    </message>
+    <message>
+        <location line="-229"/>
+        <location line="+66"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+77"/>
+        <source>Result after
+substitution : </source>
+        <translation type="unfinished">Result after
+substitution : </translation>
+    </message>
+    <message>
+        <location line="-237"/>
+        <location line="+69"/>
+        <location line="+54"/>
+        <location line="+50"/>
+        <location line="+76"/>
+        <location line="+234"/>
+        <location line="+14"/>
+        <source>Default declaration</source>
+        <translation type="unfinished">Default declaration</translation>
+    </message>
+    <message>
+        <location line="-492"/>
+        <location line="+472"/>
+        <location line="+1"/>
+        <location line="+308"/>
+        <source>#include in header</source>
+        <translation type="unfinished">#include in header</translation>
+    </message>
+    <message>
+        <location line="-776"/>
+        <source>Not generated in C++</source>
+        <translation type="unfinished">Not generated in C++</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Not generated in Java</source>
+        <translation type="unfinished">Not generated in Java</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show annotation</source>
+        <translation type="unfinished">Show annotation</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Edit annotation</source>
+        <translation type="unfinished">Edit annotation</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Not generated in Php</source>
+        <translation type="unfinished">Not generated in Php</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Not generated in Python</source>
+        <translation type="unfinished">Not generated in Python</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Not generated in Idl</source>
+        <translation type="unfinished">Not generated in Idl</translation>
+    </message>
+    <message>
+        <location line="+136"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose class selected in browser</source>
+        <translation type="unfinished">Choose class selected in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Create class and choose it</source>
+        <translation type="unfinished">Create class and choose it</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+6"/>
+        <location line="+276"/>
+        <source>#include in source</source>
+        <translation type="unfinished">#include in source</translation>
+    </message>
+    <message>
+        <location line="+1109"/>
+        <location line="+2"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+2"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>RemoveVariableValueDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-699"/>
+        <source>remove duplicates</source>
+        <translation type="unfinished">remove duplicates</translation>
+    </message>
+</context>
+<context>
+    <name>RevSettingsDialog</name>
+    <message>
+        <location filename="../dialog/RevSettingsDialog.cpp" line="-232"/>
+        <source>Reverse/Roundtrip Settings dialog</source>
+        <translation type="unfinished">Reverse/Roundtrip Settings dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>To specify through regular expression the directories
+and/or files to bypass during reverse and roundtrip</source>
+        <translation type="unfinished">To specify through regular expression the directories
+and/or files to bypass during reverse and roundtrip</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Help regexp</source>
+        <translation type="unfinished">Help regexp</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>C++ directory : </source>
+        <translation type="unfinished">C++ directory : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+8"/>
+        <location line="+35"/>
+        <location line="+8"/>
+        <location line="+25"/>
+        <location line="+8"/>
+        <source>case sensitive</source>
+        <translation type="unfinished">case sensitive</translation>
+    </message>
+    <message>
+        <location line="-79"/>
+        <source>C++ file : </source>
+        <translation type="unfinished">C++ file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated/reversed 
+header file extension : </source>
+        <translation type="unfinished">generated/reversed 
+header file extension : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>    generated/reversed 
+    source file extension : </source>
+        <translation type="unfinished">    generated/reversed 
+    source file extension : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Java directory : </source>
+        <translation type="unfinished">Java directory : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Java file : </source>
+        <translation type="unfinished">Java file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated/reversed file extension : </source>
+        <translation type="unfinished">generated/reversed file extension : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Php directory : </source>
+        <translation type="unfinished">Php directory : </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Php file : </source>
+        <translation type="unfinished">Php file : </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>generated / reversed file extension : </source>
+        <translation type="unfinished">generated / reversed file extension : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>SdClassInstCanvas</name>
+    <message>
+        <location filename="../diagram/SdClassInstCanvas.cpp" line="+379"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Become immortal</source>
+        <translation type="unfinished">Become immortal</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Become mortal</source>
+        <translation type="unfinished">Become mortal</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show life line</source>
+        <translation type="unfinished">Show life line</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Hide life line</source>
+        <translation type="unfinished">Hide life line</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select class in browser</source>
+        <translation type="unfinished">Select class in browser</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit from model</source>
+        <translation type="unfinished">Exit from model</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert in model</source>
+        <translation type="unfinished">Insert in model</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace it</source>
+        <translation type="unfinished">Replace it</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <location line="+36"/>
+        <source>drawing mode</source>
+        <translation type="unfinished">drawing mode</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>write name:type 
+horizontally</source>
+        <translation type="unfinished">write name:type 
+horizontally</translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <location line="+36"/>
+        <source>show class context</source>
+        <translation type="unfinished">show class context</translation>
+    </message>
+    <message>
+        <location line="-33"/>
+        <source>show stereotypes 
+properties</source>
+        <translation type="unfinished">show stereotypes 
+properties</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+32"/>
+        <source>class instance color</source>
+        <translation type="unfinished">class instance color</translation>
+    </message>
+</context>
+<context>
+    <name>SdContinuationCanvas</name>
+    <message>
+        <location filename="../diagram/SdContinuationCanvas.cpp" line="+205"/>
+        <source>Continuation</source>
+        <translation type="unfinished">Continuation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <location line="+25"/>
+        <source>continuation color</source>
+        <translation type="unfinished">continuation color</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>SdDurationCanvas</name>
+    <message>
+        <location filename="../diagram/SdDurationCanvas.cpp" line="+326"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+    <message>
+        <location line="+420"/>
+        <source>Activity bar</source>
+        <translation type="unfinished">Activity bar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Draw as activity bar</source>
+        <translation type="unfinished">Draw as activity bar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Draw as a coregion</source>
+        <translation type="unfinished">Draw as a coregion</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cut here</source>
+        <translation type="unfinished">Cut here</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Merge juxtaposed activity bars</source>
+        <translation type="unfinished">Merge juxtaposed activity bars</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Collapse in parent bar</source>
+        <translation type="unfinished">Collapse in parent bar</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location line="+25"/>
+        <source>duration color</source>
+        <translation type="unfinished">duration color</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgBaseCanvas</name>
+    <message>
+        <location filename="../diagram/SdMsgBaseCanvas.cpp" line="+239"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Return</source>
+        <translation type="unfinished">Return</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>value :</source>
+        <translation type="unfinished">value :</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgCanvas</name>
+    <message>
+        <location filename="../diagram/SdMsgCanvas.cpp" line="+252"/>
+        <source>Message</source>
+        <translation type="unfinished">Message</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select operation in browser</source>
+        <translation type="unfinished">Select operation in browser</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Select stereotype and label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Default stereotype and label position</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start from new overlapping bar</source>
+        <translation type="unfinished">Start from new overlapping bar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Start from parent bar</source>
+        <translation type="unfinished">Start from parent bar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to new overlapping bar</source>
+        <translation type="unfinished">Go to new overlapping bar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to parent bar</source>
+        <translation type="unfinished">Go to parent bar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+29"/>
+        <source>operation drawing language</source>
+        <translation type="unfinished">operation drawing language</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show full operation definition</source>
+        <translation type="unfinished">show full operation definition</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show context mode</source>
+        <translation type="unfinished">show context mode</translation>
+    </message>
+</context>
+<context>
+    <name>SdMsgDialog</name>
+    <message>
+        <location filename="../dialog/SdMsgDialog.cpp" line="+63"/>
+        <source>Message dialog</source>
+        <translation type="unfinished">Message dialog</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>message :</source>
+        <translation type="unfinished">message :</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Message type</source>
+        <translation type="unfinished">Message type</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>synchronous</source>
+        <translation type="unfinished">synchronous</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>asynchronous</source>
+        <translation type="unfinished">asynchronous</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>
+
+When the arguments are specified they replace the operation&apos;s parameter(s) without any check</source>
+        <translation type="unfinished">
+
+When the arguments are specified they replace the operation&apos;s parameter(s) without any check</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>arguments : </source>
+        <translation type="unfinished">arguments : </translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Create operation and choose it</source>
+        <translation type="unfinished">Create operation and choose it</translation>
+    </message>
+</context>
+<context>
+    <name>SdSelfMsgCanvas</name>
+    <message>
+        <location filename="../diagram/SdSelfMsgCanvas.cpp" line="+249"/>
+        <source>Message</source>
+        <translation type="unfinished">Message</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select operation in browser</source>
+        <translation type="unfinished">Select operation in browser</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select stereotype and label</source>
+        <translation type="unfinished">Select stereotype and label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default stereotype and label position</source>
+        <translation type="unfinished">Default stereotype and label position</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Go to new overlapping bar</source>
+        <translation type="unfinished">Go to new overlapping bar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to parent bar</source>
+        <translation type="unfinished">Go to parent bar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <location line="+29"/>
+        <source>operation drawing language</source>
+        <translation type="unfinished">operation drawing language</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show full operation definition</source>
+        <translation type="unfinished">show full operation definition</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+29"/>
+        <source>show context mode</source>
+        <translation type="unfinished">show context mode</translation>
+    </message>
+</context>
+<context>
+    <name>SeqDiagramView</name>
+    <message>
+        <location filename="../diagram/SeqDiagramView.cpp" line="+77"/>
+        <source>Sequence diagram menu</source>
+        <translation type="unfinished">Sequence diagram menu</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Transform to flat activity bars</source>
+        <translation type="unfinished">Transform to flat activity bars</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transform to overlapping activity bars</source>
+        <translation type="unfinished">Transform to overlapping activity bars</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../dialog/SettingsDialog.cpp" line="-51"/>
+        <source>Apply</source>
+        <translation type="unfinished">Apply</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutDialog</name>
+    <message>
+        <location filename="../dialog/ShortcutDialog.cpp" line="-358"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Shortcut dialog</source>
+        <translation type="unfinished">Shortcut dialog</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Here are the shortcuts to do a command (menu entry)</source>
+        <translation type="unfinished">Here are the shortcuts to do a command (menu entry)</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Here are the shortcuts to call a tool (plug-out)</source>
+        <translation type="unfinished">Here are the shortcuts to call a tool (plug-out)</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutTable</name>
+    <message>
+        <location line="+48"/>
+        <source>Shift</source>
+        <translation type="unfinished">Shift</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cmd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ctrl</source>
+        <translation type="unfinished">Ctrl</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Alt</source>
+        <translation type="unfinished">Alt</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>Insert shortcut before</source>
+        <translation type="unfinished">Insert shortcut before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert shortcut after</source>
+        <translation type="unfinished">Insert shortcut after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete shortcut</source>
+        <translation type="unfinished">Delete shortcut</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy shortcut</source>
+        <translation type="unfinished">Copy shortcut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut shortcut</source>
+        <translation type="unfinished">Cut shortcut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste shortcut</source>
+        <translation type="unfinished">Paste shortcut</translation>
+    </message>
+    <message>
+        <location line="+173"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Shortcut</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Several use of the shortcut &apos;%1&apos;</source>
+        <translation type="unfinished">Several use of the shortcut &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SimpleRelationDialog</name>
+    <message>
+        <location filename="../dialog/SimpleRelationDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Generalisation dialog</source>
+        <translation type="unfinished">Generalisation dialog</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Dependency dialog</source>
+        <translation type="unfinished">Dependency dialog</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>unknown relation dialog</source>
+        <translation type="unfinished">unknown relation dialog</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>from : </source>
+        <translation type="unfinished">from : </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to : </source>
+        <translation type="unfinished">to : </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+</context>
+<context>
+    <name>SourceDialog</name>
+    <message>
+        <location filename="../dialog/SourceDialog.cpp" line="+134"/>
+        <location line="+6"/>
+        <source>cannot read %1</source>
+        <translation type="unfinished">cannot read %1</translation>
+    </message>
+</context>
+<context>
+    <name>StateActionCanvas</name>
+    <message>
+        <location filename="../diagram/StateActionCanvas.cpp" line="+530"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit state action</source>
+        <translation type="unfinished">Edit state action</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <location line="+30"/>
+        <source>drawing language</source>
+        <translation type="unfinished">drawing language</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>show stereotype 
+properties</source>
+        <translation type="unfinished">show stereotype 
+properties</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <location line="+30"/>
+        <source>state action color</source>
+        <translation type="unfinished">state action color</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+22"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>StateActionDialog</name>
+    <message>
+        <location filename="../dialog/StateActionDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State Action dialog</source>
+        <translation type="unfinished">State Action dialog</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+15"/>
+        <location line="+18"/>
+        <source>behavior</source>
+        <translation type="unfinished">behavior</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+</context>
+<context>
+    <name>StateCanvas</name>
+    <message>
+        <location filename="../diagram/StateCanvas.cpp" line="+1270"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide decomposition indicator</source>
+        <translation type="unfinished">Hide decomposition indicator</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show decomposition indicator</source>
+        <translation type="unfinished">Show decomposition indicator</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit state</source>
+        <translation type="unfinished">Edit state</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select referenced state in browser</source>
+        <translation type="unfinished">Select referenced state in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set associated diagram</source>
+        <translation type="unfinished">Set associated diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove diagram association</source>
+        <translation type="unfinished">Remove diagram association</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+116"/>
+        <location line="+33"/>
+        <source>show activities</source>
+        <translation type="unfinished">show activities</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+33"/>
+        <source>draw regions horizontally</source>
+        <translation type="unfinished">draw regions horizontally</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+33"/>
+        <source>drawing language</source>
+        <translation type="unfinished">drawing language</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <location line="+33"/>
+        <source>state color</source>
+        <translation type="unfinished">state color</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <location line="+22"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>StateDiagramView</name>
+    <message>
+        <location filename="../diagram/StateDiagramView.cpp" line="+72"/>
+        <source>State diagram menu</source>
+        <translation type="unfinished">State diagram menu</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location line="+199"/>
+        <location line="+34"/>
+        <location line="+21"/>
+        <source>already drawn</source>
+        <translation type="unfinished">already drawn</translation>
+    </message>
+    <message>
+        <location line="-53"/>
+        <location line="+34"/>
+        <location line="+21"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>StateDiagramWindow</name>
+    <message>
+        <location filename="../diagram/StateDiagramWindow.cpp" line="+16"/>
+        <source>Select</source>
+        <translation type="unfinished">Select</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Package</source>
+        <translation type="unfinished">Add Package</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fragment</source>
+        <translation type="unfinished">Add Fragment</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add State</source>
+        <translation type="unfinished">Add State</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Region</source>
+        <translation type="unfinished">Add Region</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Initial pseudo state</source>
+        <translation type="unfinished">Add Initial pseudo state</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Entry Point</source>
+        <translation type="unfinished">Add Entry Point</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Final state</source>
+        <translation type="unfinished">Add Final state</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Exit Point</source>
+        <translation type="unfinished">Add Exit Point</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Terminate node</source>
+        <translation type="unfinished">Add Terminate node</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Deep History</source>
+        <translation type="unfinished">Add Deep History</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Shallow History</source>
+        <translation type="unfinished">Add Shallow History</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Junction</source>
+        <translation type="unfinished">Add Junction</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Choice</source>
+        <translation type="unfinished">Add Choice</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Fork</source>
+        <translation type="unfinished">Add Fork</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Join</source>
+        <translation type="unfinished">Add Join</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Action</source>
+        <translation type="unfinished">Add Action</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add receive signal action</source>
+        <translation type="unfinished">Add receive signal action</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add send signal action</source>
+        <translation type="unfinished">Add send signal action</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Add Transition</source>
+        <translation type="unfinished">Add Transition</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Note</source>
+        <translation type="unfinished">Note</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Anchor</source>
+        <translation type="unfinished">Anchor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Image</source>
+        <translation type="unfinished">Image</translation>
+    </message>
+</context>
+<context>
+    <name>StateDialog</name>
+    <message>
+        <location filename="../dialog/StateDialog.cpp" line="+63"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State dialog</source>
+        <translation type="unfinished">State dialog</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>specification :</source>
+        <translation type="unfinished">specification :</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>reference :</source>
+        <translation type="unfinished">reference :</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>active</source>
+        <translation type="unfinished">active</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+239"/>
+        <location line="+22"/>
+        <location line="+15"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <location line="+62"/>
+        <source>Choose</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location line="-56"/>
+        <location line="+62"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Choose operation selected in browser</source>
+        <translation type="unfinished">Choose operation selected in browser</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Choose state selected in browser</source>
+        <translation type="unfinished">Choose state selected in browser</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Entry
+behavior : </source>
+        <translation type="unfinished">Entry
+behavior : </translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Exit
+behavior : </source>
+        <translation type="unfinished">Exit
+behavior : </translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Do
+behavior : </source>
+        <translation type="unfinished">Do
+behavior : </translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>StereotypeDialog</name>
+    <message>
+        <location filename="../dialog/StereotypeDialog.cpp" line="+73"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>StereotypesDialog</name>
+    <message>
+        <location filename="../dialog/StereotypesDialog.cpp" line="-285"/>
+        <source>Default stereotypes dialog</source>
+        <translation type="unfinished">Default stereotypes dialog</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>package
+stereotypes : </source>
+        <translation type="unfinished">package
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+33"/>
+        <location line="+37"/>
+        <location line="+29"/>
+        <source>relations
+stereotypes : </source>
+        <translation type="unfinished">relations
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Stereotypes</source>
+        <translation type="unfinished">Stereotypes</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>class
+stereotypes : </source>
+        <translation type="unfinished">class
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>attribute
+stereotypes : </source>
+        <translation type="unfinished">attribute
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>operation
+stereotypes : </source>
+        <translation type="unfinished">operation
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>use case
+stereotypes : </source>
+        <translation type="unfinished">use case
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>artifact
+stereotypes : </source>
+        <translation type="unfinished">artifact
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>class view
+stereotypes : </source>
+        <translation type="unfinished">class view
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>use case view
+stereotypes : </source>
+        <translation type="unfinished">use case view
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component view
+stereotypes : </source>
+        <translation type="unfinished">component view
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>deployment view
+stereotypes : </source>
+        <translation type="unfinished">deployment view
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>class diagram
+stereotypes : </source>
+        <translation type="unfinished">class diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>object diagram
+stereotypes : </source>
+        <translation type="unfinished">object diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>communication diagram
+stereotypes : </source>
+        <translation type="unfinished">communication diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>sequence diagram
+stereotypes : </source>
+        <translation type="unfinished">sequence diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>use case diagram
+stereotypes : </source>
+        <translation type="unfinished">use case diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>state diagram
+stereotypes : </source>
+        <translation type="unfinished">state diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity diagram
+stereotypes : </source>
+        <translation type="unfinished">activity diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component diagram
+stereotypes : </source>
+        <translation type="unfinished">component diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>deployment diagram
+stereotypes : </source>
+        <translation type="unfinished">deployment diagram
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>activity
+stereotypes : </source>
+        <translation type="unfinished">activity
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>interruptible activity
+region stereotypes : </source>
+        <translation type="unfinished">interruptible activity
+region stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>expansion region
+stereotypes : </source>
+        <translation type="unfinished">expansion region
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>partition
+stereotypes : </source>
+        <translation type="unfinished">partition
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>parameter
+stereotypes : </source>
+        <translation type="unfinished">parameter
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>parameter set
+stereotypes : </source>
+        <translation type="unfinished">parameter set
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity control node
+stereotypes : </source>
+        <translation type="unfinished">activity control node
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity action
+stereotypes : </source>
+        <translation type="unfinished">activity action
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>activity object node
+stereotypes : </source>
+        <translation type="unfinished">activity object node
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>pin
+stereotypes : </source>
+        <translation type="unfinished">pin
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>expansion node
+stereotypes : </source>
+        <translation type="unfinished">expansion node
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>flow
+stereotypes : </source>
+        <translation type="unfinished">flow
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>state
+stereotypes : </source>
+        <translation type="unfinished">state
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>pseudostate
+stereotypes : </source>
+        <translation type="unfinished">pseudostate
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>state action
+stereotypes : </source>
+        <translation type="unfinished">state action
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>component
+stereotypes : </source>
+        <translation type="unfinished">component
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>node
+stereotypes : </source>
+        <translation type="unfinished">node
+stereotypes : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>message
+stereotypes : </source>
+        <translation type="unfinished">message
+stereotypes : </translation>
+    </message>
+</context>
+<context>
+    <name>StereotypesTable</name>
+    <message>
+        <location filename="../dialog/GenerationSettingsDialog.cpp" line="+148"/>
+        <location line="+32"/>
+        <source>do</source>
+        <translation type="unfinished">do</translation>
+    </message>
+</context>
+<context>
+    <name>StringTable</name>
+    <message>
+        <location filename="../dialog/StringTable.cpp" line="+97"/>
+        <source>row %1</source>
+        <translation type="unfinished">row %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Insert row before</source>
+        <translation type="unfinished">Insert row before</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert row after</source>
+        <translation type="unfinished">Insert row after</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete row</source>
+        <translation type="unfinished">Delete row</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy row</source>
+        <translation type="unfinished">Copy row</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut row</source>
+        <translation type="unfinished">Cut row</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste row</source>
+        <translation type="unfinished">Paste row</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Move row</source>
+        <translation type="unfinished">Move row</translation>
+    </message>
+</context>
+<context>
+    <name>SubjectCanvas</name>
+    <message>
+        <location filename="../diagram/SubjectCanvas.cpp" line="+152"/>
+        <source>Subject dialog</source>
+        <translation type="unfinished">Subject dialog</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>subject : </source>
+        <translation type="unfinished">subject : </translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Subject</source>
+        <translation type="unfinished">Subject</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <location line="+25"/>
+        <source>subject color</source>
+        <translation type="unfinished">subject color</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+5"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>ToolDialog</name>
+    <message>
+        <location filename="../dialog/ToolDialog.cpp" line="-63"/>
+        <source>Tools dialog</source>
+        <translation type="unfinished">Tools dialog</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+</context>
+<context>
+    <name>TraceDialog</name>
+    <message>
+        <location filename="../dialog/TraceDialog.cpp" line="+58"/>
+        <source>Trace</source>
+        <translation type="unfinished">Trace</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Clear</source>
+        <translation type="unfinished">Clear</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save</source>
+        <translation type="unfinished">Save</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+</context>
+<context>
+    <name>TransitionDialog</name>
+    <message>
+        <location filename="../dialog/TransitionDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transition dialog</source>
+        <translation type="unfinished">Transition dialog</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>internal</source>
+        <translation type="unfinished">internal</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+92"/>
+        <location line="+24"/>
+        <location line="+17"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-100"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>trigger : </source>
+        <translation type="unfinished">trigger : </translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>guard
+constraint : </source>
+        <translation type="unfinished">guard
+constraint : </translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>activity
+expression : </source>
+        <translation type="unfinished">activity
+expression : </translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>UcClassCanvas</name>
+    <message>
+        <location filename="../diagram/UcClassCanvas.cpp" line="+604"/>
+        <source>Upper</source>
+        <translation type="unfinished">Upper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower</source>
+        <translation type="unfinished">Lower</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go up</source>
+        <translation type="unfinished">Go up</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go down</source>
+        <translation type="unfinished">Go down</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add related elements</source>
+        <translation type="unfinished">Add related elements</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select in browser</source>
+        <translation type="unfinished">Select in browser</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select linked items</source>
+        <translation type="unfinished">Select linked items</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove from diagram</source>
+        <translation type="unfinished">Remove from diagram</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete from model</source>
+        <translation type="unfinished">Delete from model</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool</source>
+        <translation type="unfinished">Tool</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <location line="+34"/>
+        <source>class/actor</source>
+        <translation type="unfinished">class/actor</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+31"/>
+        <source>class color</source>
+        <translation type="unfinished">class color</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+12"/>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>UcUseCaseCanvas</name>
+    <message>
+        <location filename="../diagram/UcUseCaseCanvas.cpp" line="+415"/>
+        <location line="+34"/>
+        <source>use case</source>
+        <translation type="unfinished">use case</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+4"/>
+        <source>read only</source>
+        <translation type="unfinished">read only</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+21"/>
+        <location line="+5"/>
+        <location line="+3"/>
+        <source>illegal</source>
+        <translation type="unfinished">illegal</translation>
+    </message>
+</context>
+<context>
+    <name>UmlWindow</name>
+    <message>
+        <location filename="../diagram/UmlWindow.cpp" line="-1751"/>
+        <source>Generate:</source>
+        <translation type="unfinished">Generate:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Project</source>
+        <translation type="unfinished">&amp;Project</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished">&amp;Windows</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Tools</source>
+        <translation type="unfinished">&amp;Tools</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Languages</source>
+        <translation type="unfinished">&amp;Languages</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C++ management and default declaration/definition</source>
+        <translation type="unfinished">C++ management and default declaration/definition</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Java management and default definition</source>
+        <translation type="unfinished">Java management and default definition</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Php management and default definition</source>
+        <translation type="unfinished">Php management and default definition</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Python management and default definition</source>
+        <translation type="unfinished">Python management and default definition</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Idl management and default declaration</source>
+        <translation type="unfinished">Idl management and default declaration</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Verbose code generation</source>
+        <translation type="unfinished">Verbose code generation</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Preserve operations&apos;s body</source>
+        <translation type="unfinished">Preserve operations&apos;s body</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Add operation profile on body edition</source>
+        <translation type="unfinished">Add operation profile on body edition</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Miscellaneous</source>
+        <translation type="unfinished">&amp;Miscellaneous</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show s&amp;tereotypes in browser</source>
+        <translation type="unfinished">Show s&amp;tereotypes in browser</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Completion in dialog</source>
+        <translation type="unfinished">Completion in dialog</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Style</source>
+        <translation type="unfinished">Style</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Font size</source>
+        <translation type="unfinished">Font size</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Diagram default format</source>
+        <translation type="unfinished">Diagram default format</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Landscape formats</source>
+        <translation type="unfinished">Landscape formats</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Edit shortcuts</source>
+        <translation type="unfinished">Edit shortcuts</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Set environment</source>
+        <translation type="unfinished">Set environment</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Set images root dir</source>
+        <translation type="unfinished">Set images root dir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+17"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Help</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>&amp;About</source>
+        <translation type="unfinished">&amp;About</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>About&amp;Qt</source>
+        <translation type="unfinished">About&amp;Qt</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>C++</source>
+        <translation type="unfinished">C++</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Java</source>
+        <translation type="unfinished">Java</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Php</source>
+        <translation type="unfinished">Php</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Python</source>
+        <translation type="unfinished">Python</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Idl</source>
+        <translation type="unfinished">Idl</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <location line="+473"/>
+        <source>File%1</source>
+        <translation type="unfinished">File%1</translation>
+    </message>
+    <message>
+        <location line="-460"/>
+        <source>Ready</source>
+        <translation type="unfinished">Ready</translation>
+    </message>
+    <message>
+        <location line="+123"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edit</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Edit generation settings</source>
+        <translation type="unfinished">Edit generation settings</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Edit default stereotypes</source>
+        <translation type="unfinished">Edit default stereotypes</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit class settings</source>
+        <translation type="unfinished">Edit class settings</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit drawing settings</source>
+        <translation type="unfinished">Edit drawing settings</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>to open this project.&lt;br&gt;&lt;br&gt;The historic is saved in &lt;i&gt;settings.ini&lt;/i&gt;</source>
+        <translation type="unfinished">to open this project.&lt;br&gt;&lt;br&gt;The historic is saved in &lt;i&gt;settings.ini&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Loading aborted as supplied project id is out of history array bounds</source>
+        <translation type="unfinished">Loading aborted as supplied project id is out of history array bounds</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Loading aborted as currently opened project unloading failed</source>
+        <translation type="unfinished">Loading aborted as currently opened project unloading failed</translation>
+    </message>
+    <message>
+        <location line="-487"/>
+        <location line="+527"/>
+        <source>Show &amp;Trace Window</source>
+        <translation type="unfinished">Show &amp;Trace Window</translation>
+    </message>
+    <message>
+        <location line="-327"/>
+        <source>What&apos;s This?</source>
+        <translation type="unfinished">O que é isso?</translation>
+    </message>
+    <message>
+        <location line="+337"/>
+        <source>Generate C++</source>
+        <translation type="unfinished">Generate C++</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Java</source>
+        <translation type="unfinished">Generate Java</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Php</source>
+        <translation type="unfinished">Generate Php</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Python</source>
+        <translation type="unfinished">Generate Python</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Generate Idl</source>
+        <translation type="unfinished">Generate Idl</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Reverse C++</source>
+        <translation type="unfinished">Reverse C++</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Roundtrip C++</source>
+        <translation type="unfinished">Roundtrip C++</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Java</source>
+        <translation type="unfinished">Reverse Java</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Roundtrip Java</source>
+        <translation type="unfinished">Roundtrip Java</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Php</source>
+        <translation type="unfinished">Reverse Php</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Java Catalog</source>
+        <translation type="unfinished">Java Catalog</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Roundtrip C++ bodies</source>
+        <translation type="unfinished">Roundtrip C++ bodies</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Java bodies</source>
+        <translation type="unfinished">Roundtrip Java bodies</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Php bodies</source>
+        <translation type="unfinished">Roundtrip Php bodies</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Roundtrip Python bodies</source>
+        <translation type="unfinished">Roundtrip Python bodies</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Plug-out upgrade</source>
+        <translation type="unfinished">Plug-out upgrade</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tools settings</source>
+        <translation type="unfinished">Tools settings</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import settings</source>
+        <translation type="unfinished">Import settings</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <location line="+266"/>
+        <source>Enter a folder name, this folder will be created and will name the new project</source>
+        <translation type="unfinished">Enter a folder name, this folder will be created and will name the new project</translation>
+    </message>
+    <message>
+        <location line="-252"/>
+        <location line="+8"/>
+        <source>New project</source>
+        <translation type="unfinished">New project</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Loading aborted</source>
+        <translation type="unfinished">Loading aborted</translation>
+    </message>
+    <message>
+        <location line="+282"/>
+        <location line="+4"/>
+        <source>Close aborted</source>
+        <translation type="unfinished">Close aborted</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Print on 1 page</source>
+        <translation type="unfinished">Print on 1 page</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print on 4 pages</source>
+        <translation type="unfinished">Print on 4 pages</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Print on 9 pages</source>
+        <translation type="unfinished">Print on 9 pages</translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Select images root directory</source>
+        <translation type="unfinished">Select images root directory</translation>
+    </message>
+    <message>
+        <location line="-1584"/>
+        <location line="+2048"/>
+        <source>&amp;Cascade</source>
+        <translation type="unfinished">&amp;Cascade</translation>
+    </message>
+    <message>
+        <location line="-1309"/>
+        <source>Select DoUML project file</source>
+        <translation type="unfinished">Selecione arquivo de projeto DoUML</translation>
+    </message>
+    <message>
+        <location line="+1310"/>
+        <source>&amp;Tile</source>
+        <translation type="unfinished">&amp;Tile</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Preferred geometry</source>
+        <translation type="unfinished">&amp;Preferred geometry</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C&amp;lose all</source>
+        <translation type="unfinished">C&amp;lose all</translation>
+    </message>
+</context>
+<context>
+    <name>UseCaseDiagramView</name>
+    <message>
+        <location filename="../diagram/UseCaseDiagramView.cpp" line="+9"/>
+        <source>Add marked elements</source>
+        <translation type="unfinished">Add marked elements</translation>
+    </message>
+</context>
+<context>
+    <name>UseCaseDialog</name>
+    <message>
+        <location filename="../dialog/UseCaseDialog.cpp" line="+59"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use Case dialog</source>
+        <translation type="unfinished">Use Case dialog</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>name : </source>
+        <translation type="unfinished">name : </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>stereotype : </source>
+        <translation type="unfinished">stereotype : </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>extension 
+points : </source>
+        <translation type="unfinished">extension 
+points : </translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>description :</source>
+        <translation type="unfinished">description :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Properties</source>
+        <translation type="unfinished">Properties</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>
+
+illegal name or already used</source>
+        <translation type="unfinished">
+
+illegal name or already used</translation>
+    </message>
+</context>
+<context>
+    <name>ValueSpecificationDialog</name>
+    <message>
+        <location filename="../dialog/ActivityActionDialog.cpp" line="-467"/>
+        <location line="+27"/>
+        <source>value - Ocl</source>
+        <translation type="unfinished">value - Ocl</translation>
+    </message>
+    <message>
+        <location line="-22"/>
+        <location line="+32"/>
+        <location line="+31"/>
+        <source>Value : </source>
+        <translation type="unfinished">Value : </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+31"/>
+        <location line="+31"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+24"/>
+        <source>value - C++</source>
+        <translation type="unfinished">value - C++</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+24"/>
+        <source>value - Java</source>
+        <translation type="unfinished">value - Java</translation>
+    </message>
+</context>
+</TS>
diff --git a/src/ui/bbuttongroup.cpp b/src/ui/bbuttongroup.cpp
new file mode 100644
index 000000000..5ad4d429f
--- /dev/null
+++ b/src/ui/bbuttongroup.cpp
@@ -0,0 +1,71 @@
+#include "bbuttongroup.h"
+
+BButtonGroup::BButtonGroup(QWidget *parent) :
+    QGroupBox(parent)
+{
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = Qt::Horizontal;
+    m_hLayout = new QHBoxLayout(this);
+    this->setLayout(m_hLayout);
+    m_hLayout->setSpacing(3);
+    m_hLayout->setMargin(3);
+    m_buttonGroup.setExclusive(false);
+    connect(&m_buttonGroup, SIGNAL(buttonClicked(int)), this, SIGNAL(clicked(int)));
+}
+
+BButtonGroup::BButtonGroup(const QString &title, QWidget *parent):
+    QGroupBox(title, parent)
+{
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = Qt::Horizontal;
+    m_hLayout = new QHBoxLayout(this);
+    this->setLayout(m_hLayout);
+    m_hLayout->setSpacing(3);
+    m_hLayout->setMargin(3);
+    m_buttonGroup.setExclusive(false);
+}
+
+BButtonGroup::BButtonGroup(int strips, Qt::Orientation orientation, const QString &title, QWidget *parent, QString):
+QGroupBox(title, parent)
+{
+    Q_UNUSED(strips);
+
+    m_hLayout = 0;
+    m_vLayout = 0;
+    m_orientation = orientation;
+    m_buttonGroup.setExclusive(false);
+    if(orientation == Qt::Horizontal)
+    {
+        m_hLayout = new QHBoxLayout(this);
+        this->setLayout(m_hLayout);
+        m_hLayout->setSpacing(3);
+        m_hLayout->setMargin(3);
+    }
+    else
+    {
+        m_vLayout = new QHBoxLayout(this);
+        this->setLayout(m_vLayout);
+        m_vLayout->setSpacing(3);
+        m_vLayout->setMargin(3);
+    }
+}
+
+void BButtonGroup::setExclusive(bool isEx)
+{
+    m_buttonGroup.setExclusive(isEx);
+}
+
+void BButtonGroup::addWidget(QAbstractButton *widget)
+{
+    m_buttonGroup.addButton(widget);
+    if(m_orientation == Qt::Horizontal)
+    {
+        m_hLayout->addWidget((QWidget*)widget);
+    }
+    else
+    {
+        m_vLayout->addWidget((QWidget*)widget);
+    }
+}
diff --git a/src/ui/bbuttongroup.h b/src/ui/bbuttongroup.h
new file mode 100644
index 000000000..6c746eb5c
--- /dev/null
+++ b/src/ui/bbuttongroup.h
@@ -0,0 +1,29 @@
+#ifndef BBUTTONGROUP_H
+#define BBUTTONGROUP_H
+
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <QButtonGroup>
+class BButtonGroup : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit BButtonGroup(QWidget *parent = 0);
+    explicit BButtonGroup(const QString &title, QWidget* parent=0);
+    BButtonGroup( int strips, Qt::Orientation orientation, const QString & title, QWidget * parent = 0, QString = QString());
+    void setExclusive(bool isEx);
+    void addWidget(QAbstractButton *widget);
+    QHBoxLayout *m_hLayout;
+    QHBoxLayout *m_vLayout;
+    Qt::Orientation m_orientation;
+signals:
+    void clicked(int);
+public slots:
+private:
+    QButtonGroup m_buttonGroup;
+
+};
+
+#endif // BBUTTONGROUP_H
diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp
new file mode 100644
index 000000000..e39f4d858
--- /dev/null
+++ b/src/ui/catalogwidget.cpp
@@ -0,0 +1,445 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#include "catalogwidget.h"
+#include "ui_catalogwidget.h"
+
+// some very perverted stuff
+#include "Libs/L_UniversalModels/include/TreeModel.h"
+#include "Libs/L_UniversalModels/include/TreeItemInterface.h"
+#include "Libs/L_UniversalModels/include/treeviewfunctions.h"
+#include "Libs/L_UniversalModels/include/treeviewtemplatefunctions.h"
+#include "Libs/L_UniversalModels/include/TreeItem.h"
+#include "Libs/L_UniversalModels/include/genericeventfilter.h"
+#include "diagram/BrowserView.h"
+#include "browser/BrowserClassView.h"
+#include "browser/BrowserNodeDummy.h"
+#include "diagram/UmlWindow.h"
+#include "misc/UmlDrag.h"
+#include "ClassData.h"
+#include <functional>
+#include <QTreeView>
+#include <QMouseEvent>
+#include <QDragMoveEvent>
+
+CatalogWidget::CatalogWidget( QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::CatalogWidget)
+{
+    ui->setupUi(this);
+#ifdef __sil__
+    this->setToolTip("CatalogWidget");
+#endif
+    if(!dummyView)
+        dummyView = new BrowserView();
+}
+
+CatalogWidget::~CatalogWidget()
+{
+    delete dummyView;
+    delete ui;
+}
+
+bool ProcessDragDrop(QObject* /*obj*/, QEvent *event, std::function<void(BrowserNode*)> favsFunc)
+{
+    if(event->type() == QEvent::DragEnter)
+    {
+        QList<UmlCode> codes;
+        codes << UmlClass << UmlAttribute << UmlOperation << UmlDeploymentNode;
+        BrowserNode * node = UmlDrag::get_node();
+        UmlCode code = node->get_type();
+        if(codes.contains(code))
+            return true;
+        return false;
+    }
+    else if(event->type() == QEvent::Drop)
+    {
+        QList<UmlCode> codes;
+        codes << UmlClass << UmlAttribute << UmlOperation << UmlDeploymentNode;
+        BrowserNode * node = UmlDrag::get_node();
+        UmlCode code = node->get_type();
+        if(!codes.contains(code))
+            return false;
+
+        favsFunc(UmlDrag::get_node());
+        return true;
+    }
+    return false;
+}
+
+void CatalogWidget::Init(UmlWindow* window, BrowserView* view)
+{
+    originalView = view;
+    mainWindow = window;
+    connect(view, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+            this, SLOT(OnUpdateVisitedView(QTreeWidgetItem*,QTreeWidgetItem*)));
+    connect(ui->leVisitedSearch, SIGNAL(textChanged(QString)), this, SLOT(OnPerformVisitedFiltering(QString)));
+
+    qRegisterMetaType<QList<BrowserNode*>>("QList<BrowserNode*>");
+    connect(view, SIGNAL(marked_list(QList<BrowserNode*>)), this, SLOT(OnUpdateMarkedView(QList<BrowserNode*>)));
+    SetupTreeModel(tmodVisited, ui->tvVisitedNodes,rootVisitedInterface,controllerVisited,rootVisited,
+                   this, SLOT(OnSelectedInVisited(const QModelIndex &, const QModelIndex &)));
+    SetupTreeModel(tmodMarked, ui->tvMarkedNodes,rootMarkedInterface,controllerMarked,rootMarked,
+                   mainWindow, SLOT(OnPickSelectionFromItem(QModelIndex,QModelIndex )));
+    SetupTreeModel(tmodFavourites, ui->tvFavourites,rootFavouritesInterface,controllerFavourites,rootFavourites,
+                   mainWindow, SLOT(OnPickSelectionFromItem( QModelIndex, QModelIndex )));
+
+
+    //dragDropFilter = new GenericEventFilter(this);
+    //std::function<void(BrowserNode*)>favsFunc = std::bind(&CatalogWidget::AddToFavourites, this, std::placeholders::_1);
+    //dragDropFilter->SetEventProcessor(std::bind(ProcessDragDrop,std::placeholders::_1, std::placeholders::_2, favsFunc));
+    //ui->tvFavourites->installEventFilter(dragDropFilter);
+    ui->tvFavourites->setAcceptDrops(true);
+    ui->tvFavourites->setContextMenuPolicy(Qt::CustomContextMenu);
+    ui->tvMarkedNodes->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(ui->tvFavourites, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnFavouritesContextMenu(QPoint)));
+    connect(ui->tvMarkedNodes, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnMarkedContextMenu(QPoint)));
+}
+
+void CatalogWidget::CleanupBeforeNewProject()
+{
+    rootVisitedInterface->removeChildren(0,rootVisitedInterface->childCount());
+    tmodVisited->InsertRootItem(rootVisitedInterface);
+    if(rootMarkedInterface)
+    {
+        rootMarkedInterface->removeChildren(0,rootMarkedInterface->childCount());
+        tmodMarked->InsertRootItem(rootMarkedInterface);
+    }
+    if(rootFavouritesInterface)
+    {
+        rootFavouritesInterface->removeChildren(0,rootFavouritesInterface->childCount());
+        tmodFavourites->InsertRootItem(rootFavouritesInterface);
+    }
+}
+
+void CatalogWidget::StageSkipVisited()
+{
+    skipVisited = true;
+}
+
+bool CatalogWidget::UseSkipVisited()
+{
+    if(skipVisited)
+    {
+        skipVisited = false;
+        return true;
+    }
+    return false;
+}
+
+
+void CatalogWidget::SetupTreeModel(TreeModel*& model , QTreeView* view,
+                                   QSharedPointer<TreeItemInterface> &interface,
+                                   QSharedPointer<ItemController<BrowserNode> > &controller,
+                                   QSharedPointer<BrowserNode> &data, QWidget* originalView ,const char* slotName)
+{
+    model = new TreeModel();
+    SetupTreeController(controller);
+
+    TreeItem<BrowserNode>* pointer = new TreeItem<BrowserNode>(0);
+    interface = QSharedPointer<TreeItemInterface >(pointer);
+    QList<QSharedPointer<TreeItemInterface > >  items;
+    pointer->SetController(controller);
+    pointer->addChildren(items);
+
+    data = QSharedPointer<BrowserNode>(new BrowserNodeDummy(dummyView));
+    pointer->SetInternalData(data.data());
+
+    controller->SetColumns(QStringList() << "class");
+
+
+    model->InsertRootItem(interface);
+
+    view->setModel(model);
+    view->setContextMenuPolicy(Qt::CustomContextMenu);
+    view->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    view->setColumnWidth(0, 230);
+    view->setExpandsOnDoubleClick(false);
+    view->setRootIsDecorated(true);
+    if(originalView)
+        connect(view->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+                originalView, slotName);
+}
+
+
+void CatalogWidget::SetupTreeController(QSharedPointer<ItemController<BrowserNode> >& treeController)
+{
+
+    treeController = QSharedPointer<ItemController<BrowserNode> >( new ItemController<BrowserNode>());
+    treeController->AddGetter(QPair<int,int>(0,0),
+                              [] (const BrowserNode* data, QModelIndex )
+    {
+        if(data)
+            return QVariant(data->get_name());
+        else
+            return QVariant();
+    }
+    );
+
+    treeController->AddGetter(QPair<int,int>(0,1),
+
+                              [] (const BrowserNode* data, QModelIndex )
+    {
+        const QPixmap * pm = data->pixmap(true);
+        if(!pm)
+            return QIcon();
+        return QIcon(*pm);
+    }
+    );
+
+    treeController->AddFlagsFunctor(
+                [](const QModelIndex& )
+    {
+        Qt::ItemFlags result;
+        result |= Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+        return result;
+    }
+    );
+}
+
+
+QList<std::function<bool (TreeItemInterface *)> > CatalogWidget::CreateCheckList()
+{
+    QList<std::function<bool (TreeItemInterface *)> > result;
+    if(!ui->leVisitedSearch->text().trimmed().isEmpty())
+    {
+        QString value = ui->leVisitedSearch->text();
+        std::function<bool(TreeItemInterface*)> addressFilterFunc =  [value](TreeItemInterface* iface)
+        {
+            BrowserNode* data = static_cast<BrowserNode*>(iface->InternalPointer());
+            bool match = data->get_name().contains(value, Qt::CaseInsensitive);
+            return match;
+        };
+        result.append(addressFilterFunc);
+    }
+    return result;
+}
+
+bool CatalogWidget::RemoveExisting(BrowserNode * node, QSharedPointer<TreeItemInterface> rootInterface)
+{
+    QList<std::function<bool (TreeItemInterface *)> > checkList;
+    QString value = node->get_name();
+    std::function<bool(TreeItemInterface*)> nameFilterFunc =  [value](TreeItemInterface* iface)
+    {
+        BrowserNode* data = static_cast<BrowserNode*>(iface->InternalPointer());
+        bool match = data->get_name() == value;
+        return match;
+    };
+
+
+    QList<std::function<void (TreeItemInterface *)> > modifyList;
+    TreeFunctions::ModifierFunction<TreeItemInterface> modifyFunc = [] (TreeItemInterface* interface)
+    {
+        TreeItemInterface* parent = interface->parent();
+        if(parent)
+            parent->removeChildren(parent->GetIndexOfChild(interface),1);
+    };
+
+    return TreeFunctions::RecursiveModify(rootInterface.data(), checkList << nameFilterFunc, modifyList << modifyFunc, true, false);
+}
+
+bool CatalogWidget::AddToFavourites(BrowserNode * node)
+{
+    QList<std::function<bool (TreeItemInterface *)> > checkList;
+    QString value = node->get_name();
+    UmlCode code = node->get_type();
+    std::function<bool(TreeItemInterface*)> nameFilterFunc =  [value](TreeItemInterface* iface)
+    {
+        BrowserNode* data = static_cast<BrowserNode*>(iface->InternalPointer());
+        bool match = data->get_name() == value;
+        return match;
+    };
+    std::function<bool(TreeItemInterface*)> typeFilterFunc =  [code](TreeItemInterface* iface)
+    {
+        BrowserNode* data = static_cast<BrowserNode*>(iface->InternalPointer());
+        bool match = data->get_type() == code;
+        return match;
+    };
+    bool result = TreeFunctions::RecursiveSearch<TreeItemInterface>(rootFavouritesInterface.data(), checkList << nameFilterFunc << typeFilterFunc);
+    if(result)
+        return true;
+
+    TreeItem<BrowserNode>* pointer = new TreeItem<BrowserNode>(0);
+    QSharedPointer<TreeItemInterface > interfaceItem(pointer);
+
+    pointer->SetController(controllerFavourites);
+
+    pointer->SetInternalData(node);
+    pointer->SetParent(rootFavouritesInterface);
+    QList<QSharedPointer<TreeItemInterface > >  items;
+    items << interfaceItem;
+    rootFavouritesInterface->AddChildren(items);
+    tmodFavourites->InsertRootItem(rootFavouritesInterface);
+    return true;
+}
+
+void CatalogWidget::CreateFavouritesMenu()
+{
+    if(favouritesMenu.isNull())
+    {
+        favouritesMenu.reset(new QMenu());
+        favouritesMenu->addAction(tr("Remove from favourites"), this, SLOT(OnRemoveCurrentItemFromFavourites()));
+    }
+}
+
+void CatalogWidget::CreateMarkedMenu()
+{
+    if(markedMenu.isNull())
+    {
+        markedMenu.reset(new QMenu());
+        markedMenu->addAction(tr("Unmark"), this, SLOT(OnRemoveCurrentItemFromMarked()));
+        markedMenu->addAction(tr("Unmark all"), this, SLOT(OnRemoveAllItemsFromMarked()));
+    }
+}
+
+void CatalogWidget::PullNodeUpwardsInVisited(BrowserNode * itemAsNode)
+{
+    RemoveExisting(itemAsNode, rootVisitedInterface);
+
+    TreeItem<BrowserNode>* pointer = new TreeItem<BrowserNode>(0);
+    QSharedPointer<TreeItemInterface > interfaceItem(pointer);
+
+    pointer->SetController(controllerVisited);
+
+    pointer->SetInternalData(itemAsNode);
+    pointer->SetParent(rootVisitedInterface);
+    QList<QSharedPointer<TreeItemInterface > >  items;
+    items << interfaceItem;
+    rootVisitedInterface->AddChildren(items);
+    tmodVisited->InsertRootItem(rootVisitedInterface);
+}
+
+
+void CatalogWidget::OnUpdateFavoutitesView()
+{
+}
+
+void CatalogWidget::OnSelectedInVisited(const QModelIndex& current, const QModelIndex&)
+{
+    StageSkipVisited();
+    TreeItemInterface *itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* itemAsNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+    itemAsNode->select_in_browser();
+}
+
+void CatalogWidget::OnRemoveCurrentItemFromFavourites()
+{
+    QModelIndex current = ui->tvFavourites->currentIndex();
+    rootFavouritesInterface->removeChildren(current.row(),1);
+    tmodFavourites->InsertRootItem(rootFavouritesInterface);
+}
+
+void CatalogWidget::OnRemoveCurrentItemFromMarked()
+{
+    QModelIndex current = ui->tvMarkedNodes->currentIndex();
+    TreeItemInterface *itemAsInterface = static_cast<TreeItemInterface*>(current.internalPointer());
+    BrowserNode* itemAsNode = static_cast<BrowserNode*>(itemAsInterface->InternalPointer());
+    if(itemAsNode)
+    {
+        emit markedRemove(itemAsNode->get_name(), itemAsNode->get_type());
+    }
+}
+
+void CatalogWidget::OnRemoveAllItemsFromMarked()
+{
+    emit allMarkedRemove();
+}
+
+void CatalogWidget::OnFavouritesContextMenu(QPoint point)
+{
+    CreateFavouritesMenu();
+    favouritesMenu->popup(ui->tvFavourites->mapToGlobal(point));
+}
+void CatalogWidget::OnMarkedContextMenu(QPoint point)
+{
+    CreateMarkedMenu();
+    markedMenu->popup(ui->tvMarkedNodes->mapToGlobal(point));
+}
+
+void CatalogWidget::OnPerformVisitedFiltering(QString)
+{
+    PerformFiltering(expandedNodesVisited, ui->tvVisitedNodes, tmodVisited, rootVisitedInterface);
+}
+
+void CatalogWidget::OnPerformMarkedFiltering()
+{
+    PerformFiltering(expandedNodesMarked, ui->tvMarkedNodes, tmodMarked, rootMarkedInterface);
+}
+
+void CatalogWidget::OnPerformFavouritesFiltering()
+{
+    PerformFiltering(expandedNodesFavourites, ui->tvFavourites, tmodFavourites, rootFavouritesInterface);
+}
+
+void CatalogWidget::PerformFiltering(QStringList expandedNodes, QTreeView* view, TreeModel* model, QSharedPointer<TreeItemInterface > interface)
+{
+    std::function<QVariant(BrowserNode*)> dataAccessFunc =
+            [](BrowserNode* data){return QVariant(data->get_name());};
+
+    std::function<QList<std::function<bool (TreeItemInterface *)> > ()> checksFunc =
+            std::bind(&CatalogWidget::CreateCheckList, this);
+
+    TreeFunctions::FilterTreeAndRestoreNodes<TreeItemInterface, TreeItem, BrowserNode>
+            (dataAccessFunc, checksFunc,
+             expandedNodes, view, model, interface);
+}
+
+void CatalogWidget::OnUpdateVisitedView(QTreeWidgetItem *current, QTreeWidgetItem *previous)
+{
+    Q_UNUSED(previous);
+    
+    if(UseSkipVisited())
+        return;
+    //this->ui->tabWidget->setCurrentWidget(this->ui->tabVisited);
+    BrowserNode* itemAsNode = static_cast<BrowserNode*>(current);
+    if(itemAsNode)
+    {
+        itemAsNode = itemAsNode->get_first_generatable_node();
+
+        PullNodeUpwardsInVisited(itemAsNode);
+    }
+}
+
+void CatalogWidget::OnUpdateMarkedView(QList<BrowserNode *> markedItems)
+{
+    this->ui->tabWidget->setCurrentWidget(this->ui->tabMarked);
+    if(rootMarkedInterface.isNull())
+        return;
+    StageSkipVisited();
+    QList<QSharedPointer<TreeItemInterface > >  items;
+    rootMarkedInterface->removeChildren(0, rootMarkedInterface->childCount());
+    for(BrowserNode * marked : markedItems)
+    {
+        TreeItem<BrowserNode>* pointer = new TreeItem<BrowserNode>(0);
+        QSharedPointer<TreeItemInterface > interfaceItem(pointer);
+
+        pointer->SetController(controllerMarked);
+
+        pointer->SetInternalData(marked);
+        pointer->SetParent(rootMarkedInterface);
+
+        items << interfaceItem;
+    }
+    rootMarkedInterface->AddChildren(items);
+    tmodMarked->InsertRootItem(rootMarkedInterface);
+}
diff --git a/src/ui/catalogwidget.h b/src/ui/catalogwidget.h
new file mode 100644
index 000000000..5d8478a83
--- /dev/null
+++ b/src/ui/catalogwidget.h
@@ -0,0 +1,128 @@
+// *************************************************************************
+//
+// Copyright 2012-2013 Nikolai Marchenko.
+//
+// This file is part of the Douml Uml Toolkit.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License Version 3.0 as published by
+// the Free Software Foundation and appearing in the file LICENSE.GPL included in the
+//  packaging of this file.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License Version 3.0 for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// e-mail : doumleditor@gmail.com
+//
+// *************************************************************************
+#ifndef CATALOGWIDGET_H
+#define CATALOGWIDGET_H
+
+#include <QWidget>
+#include <QSharedPointer>
+#include <QMenu>
+#include <functional>
+#include "Libs/L_UniversalModels/include/ItemController.h"
+
+namespace Ui {
+class CatalogWidget;
+}
+class BrowserView;
+class TreeModel;
+
+class BrowserNode;
+class TreeItemInterface;
+class QTreeView;
+class QTreeWidgetItem;
+class GenericEventFilter;
+class UmlWindow;
+class CatalogWidget : public QWidget
+{
+    Q_OBJECT
+    
+public:
+    explicit CatalogWidget(QWidget *parent = 0);
+    ~CatalogWidget();
+
+    void Init(UmlWindow*,BrowserView*);
+    void CleanupBeforeNewProject();
+    void StageSkipVisited();
+    bool UseSkipVisited();
+    
+private:
+    Ui::CatalogWidget *ui = nullptr;
+    BrowserView* dummyView = nullptr;
+    BrowserView* originalView = nullptr;
+    UmlWindow* mainWindow = nullptr;
+    QScopedPointer<QMenu> favouritesMenu;
+    QScopedPointer<QMenu> markedMenu;
+    bool skipVisited = false;
+
+    // visited treeview
+    TreeModel* tmodVisited = nullptr;
+    bool isFilteredVisited = false;
+    QStringList expandedNodesVisited;
+    QSharedPointer<TreeItemInterface> rootVisitedInterface;
+    QSharedPointer<ItemController<BrowserNode> > controllerVisited;
+    QSharedPointer<BrowserNode> rootVisited;
+
+    // marked treeview
+    TreeModel* tmodMarked = nullptr;
+    bool isFilteredMarked = false;
+    QStringList expandedNodesMarked;
+    QSharedPointer<TreeItemInterface> rootMarkedInterface;
+    QSharedPointer<ItemController<BrowserNode> > controllerMarked;
+    QSharedPointer<BrowserNode> rootMarked;
+
+    // favourites treeview
+    TreeModel* tmodFavourites = nullptr;
+    bool isFilteredFavourites = false;
+    QStringList expandedNodesFavourites;
+    QSharedPointer<TreeItemInterface> rootFavouritesInterface;
+    QSharedPointer<ItemController<BrowserNode> > controllerFavourites;
+    //QList<QSharedPointer<BrowserNode> >favouritesList;
+    QSharedPointer<BrowserNode> rootFavourites;
+
+    GenericEventFilter* dragDropFilter;
+
+
+    void SetupTreeModel(TreeModel*& , QTreeView*,
+                        QSharedPointer<TreeItemInterface>&,
+                        QSharedPointer<ItemController<BrowserNode> >&,
+                        QSharedPointer<BrowserNode>&, QWidget *window, const char *);
+    void SetupTreeController(QSharedPointer<ItemController<BrowserNode> >&);
+    void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer<TreeItemInterface>);
+    QList<std::function<bool (TreeItemInterface *)> > CreateCheckList();
+    bool RemoveExisting(BrowserNode *,QSharedPointer<TreeItemInterface> );
+    bool AddToFavourites(BrowserNode*);
+    void CreateFavouritesMenu();
+    void CreateMarkedMenu();
+    void PullNodeUpwardsInVisited(BrowserNode*);
+
+public slots:
+    //void OnPerformVisitedFiltering();
+    void OnPerformVisitedFiltering(QString);
+    void OnPerformMarkedFiltering();
+    void OnPerformFavouritesFiltering();
+    void OnUpdateVisitedView(QTreeWidgetItem *current, QTreeWidgetItem *previous);
+    void OnUpdateMarkedView(QList<BrowserNode*>);
+    void OnUpdateFavoutitesView();
+    void OnSelectedInVisited(const QModelIndex &, const QModelIndex &);
+    void OnRemoveCurrentItemFromFavourites();
+    void OnRemoveCurrentItemFromMarked();
+    void OnRemoveAllItemsFromMarked();
+    void OnFavouritesContextMenu(QPoint);
+    void OnMarkedContextMenu(QPoint point);
+signals:
+    void markedRemove(QString, int);
+    void allMarkedRemove();
+
+};
+
+#endif // CATALOGWIDGET_H
diff --git a/src/ui/catalogwidget.ui b/src/ui/catalogwidget.ui
new file mode 100644
index 000000000..04ff2ccc2
--- /dev/null
+++ b/src/ui/catalogwidget.ui
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CatalogWidget</class>
+ <widget class="QWidget" name="CatalogWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>403</width>
+    <height>289</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tabVisited">
+      <attribute name="title">
+       <string>Visited</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="QTreeView" name="tvVisitedNodes"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLineEdit" name="leVisitedSearch"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tabMarked">
+      <attribute name="title">
+       <string>Marked</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="QTreeView" name="tvMarkedNodes"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLineEdit" name="leMarkedSearch"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tabFavourites">
+      <attribute name="title">
+       <string>Favourites</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_4">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="QSplitter" name="splitter">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <widget class="QWidget" name="layoutWidget">
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QTreeView" name="tvFavourites"/>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="leFavouriteSearch"/>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/ui/constructorinitializerdialog.cpp b/src/ui/constructorinitializerdialog.cpp
index 07b359077..966ec5893 100644
--- a/src/ui/constructorinitializerdialog.cpp
+++ b/src/ui/constructorinitializerdialog.cpp
@@ -1,6 +1,6 @@
 // *************************************************************************
 //
-// Copyright 2012-2013 Nikolai Marchenko  .
+// Copyright 2012-2013 Nikolai Marchenko.
 //
 // This file is part of the Douml Uml Toolkit.
 //
@@ -53,7 +53,7 @@ void ConstructorInitializerDialog::Init(OperationData * _oper)
         ui->edConstructorPrototype->setText(constructorPrototype.replace("${volatile}", "@{constructor-initializer}${volatile}"));
     initializerCopy = QString(oper->get_browser_node()->get_value("constructor-initializer"));
     definitionCopy = oper->get_cppdef();
-    oper->set_cppdef(ui->edConstructorPrototype->text());
+    oper->set_cppdef(ui->edConstructorPrototype->toPlainText());
     connect(ui->edInitializer,SIGNAL(textChanged()),this, SLOT(OnInitializerChanged()));
     oper->get_browser_node()->set_value("constructor-initializer", ui->edInitializer->toPlainText());
     RegenerateConstructor();
@@ -64,15 +64,19 @@ void ConstructorInitializerDialog::reject()
 {
    oper->get_browser_node()->set_value("constructor-initializer", initializerCopy);
    oper->set_cppdef(definitionCopy);
+#ifdef EDGETOOLENABLED
    toolbar->setParent(0);
    toolbar->hide();
+#endif
    QDialog::reject();
 }
 
 void ConstructorInitializerDialog::accept()
 {
+#ifdef EDGETOOLENABLED
     toolbar->setParent(0);
     toolbar->hide();
+#endif
     QDialog::accept();
 }
 
diff --git a/src/ui/constructorinitializerdialog.h b/src/ui/constructorinitializerdialog.h
index f115786fb..3b76ac7c5 100644
--- a/src/ui/constructorinitializerdialog.h
+++ b/src/ui/constructorinitializerdialog.h
@@ -41,11 +41,11 @@ class ConstructorInitializerDialog : public EdgeMenuDialogQt4
     Ui::ConstructorInitializerDialog *ui;
     void Init(OperationData*);
 
-    void reject() override;
-    void accept() override;
+    virtual void reject() override;
+    virtual void accept() override;
     //! return unique TypeId associated with each classs
     //! crc on PRETTY_FUNCTION is basically used to create one
-    virtual uint TypeID() ;
+    virtual uint TypeID() override;
 private:
     OperationData* oper = nullptr;
     QString initializerCopy;
diff --git a/src/ui/gridbox.cpp b/src/ui/gridbox.cpp
new file mode 100644
index 000000000..561da24a8
--- /dev/null
+++ b/src/ui/gridbox.cpp
@@ -0,0 +1,37 @@
+#include "gridbox.h"
+#include <QGridLayout>
+GridBox::GridBox(int n, QWidget * parent, QString name) :
+    QGroupBox(name, parent)
+{
+    m_layout = new QGridLayout(this);
+    setLayout(m_layout);
+    m_numCols = n;
+    currentIndex = 0;
+    setSpacing(2);
+    setMargin(2);
+    if(!name.isEmpty())
+        this->setObjectName(name);
+}
+
+void GridBox::setMargin(int mar)
+{
+    m_layout->setMargin(mar);
+}
+
+void GridBox::setSpacing(int spacing)
+{
+    m_layout->setSpacing(spacing);
+}
+
+void GridBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget, currentIndex/m_numCols, currentIndex%m_numCols);
+    currentIndex ++;
+}
+
+QString GridBox::name(QString name)
+{
+    if(objectName().isEmpty())
+        setObjectName(name);
+    return objectName();
+}
diff --git a/src/ui/gridbox.h b/src/ui/gridbox.h
new file mode 100644
index 000000000..64793941d
--- /dev/null
+++ b/src/ui/gridbox.h
@@ -0,0 +1,26 @@
+#ifndef GRIDBOX_H
+#define GRIDBOX_H
+
+#include <QWidget>
+#include <QGroupBox>
+class QGridLayout;
+class GridBox : public QGroupBox
+{
+    Q_OBJECT
+public:
+    explicit GridBox(int n, QWidget *parent = 0,QString name = QString());
+    void setMargin(int mar);
+    void setSpacing(int spacing);
+    void addWidget(QWidget *widget);
+    QString name(QString name = QString());
+
+signals:
+
+public slots:
+private:
+    QGridLayout *m_layout;
+    int m_numCols;
+    int currentIndex;
+};
+
+#endif // GRIDBOX_H
diff --git a/src/ui/hhbox.cpp b/src/ui/hhbox.cpp
new file mode 100644
index 000000000..a3799e584
--- /dev/null
+++ b/src/ui/hhbox.cpp
@@ -0,0 +1,30 @@
+#include "hhbox.h"
+
+HHBox::HHBox(QWidget *parent, QString name) :
+    QWidget(parent)
+{
+    m_layout = new QHBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(2);
+    m_layout->setMargin(2);
+    setObjectName(name);
+}
+
+void HHBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+
+bool HHBox::setStretchFactor(QWidget *w, int stretch)
+{
+    //if not in layout
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+
+void HHBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/src/ui/hhbox.h b/src/ui/hhbox.h
new file mode 100644
index 000000000..06a8620d6
--- /dev/null
+++ b/src/ui/hhbox.h
@@ -0,0 +1,22 @@
+#ifndef HHBOX_H
+#define HHBOX_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+class HHBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit HHBox(QWidget *parent = 0, QString name= QString());
+    void addWidget(QWidget* widget);
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+
+signals:
+
+public slots:
+private:
+    QHBoxLayout *m_layout;
+};
+
+#endif // HHBOX_H
diff --git a/src/ui/menufactory.cpp b/src/ui/menufactory.cpp
index dcded1c90..72bf10b15 100644
--- a/src/ui/menufactory.cpp
+++ b/src/ui/menufactory.cpp
@@ -38,7 +38,7 @@ void MenuFactory::createTitle(
 }
 
 void MenuFactory::addItems(
-    Q3PopupMenu & menu,
+    QMenu & menu,
     const Item items[],
     const int nofItems)
 {
@@ -52,25 +52,21 @@ void MenuFactory::addItems(
 }
 
 void MenuFactory::addItem(
-    Q3PopupMenu   &   menu,
-    const char * const name,
+    QMenu   &   menu,
+    const QString name,
     const int         id,
-    const char * const whatsThis)
+    QString const whatsThis)
 {
-    const int itemId = menu.insertItem(
-                           TR(name),
-                           id);
-
-    if (NULL != whatsThis) {
-        menu.setWhatsThis(itemId, TR(whatsThis));
-    }
+    QAction *action = menu.addAction(name);
+    if(!whatsThis.isEmpty())
+        action->setWhatsThis((whatsThis));
+    action->setData(id);
 }
 
 MenuFactory::MenuFactory(
     const WrapperStr & menuName)
-    : m_menu(0, menuName)
+    : m_menu(menuName,0)
 {
-
 }
 
 MenuFactory::~MenuFactory()
@@ -78,7 +74,7 @@ MenuFactory::~MenuFactory()
 
 }
 
-Q3PopupMenu & MenuFactory::menu()
+QMenu & MenuFactory::menu()
 {
     return m_menu;
 }
@@ -108,11 +104,28 @@ void MenuFactory::addItem(
     const char * const name,
     QMenu * const      subMenu)
 {
-    m_menu.insertItem(name, subMenu);
-}
+    Q_UNUSED(name);
 
+    m_menu.addMenu(subMenu);
+}
 
 void MenuFactory::insertSeparator()
 {
-    m_menu.insertSeparator();
+    m_menu.addSeparator();
+}
+
+QAction *MenuFactory::findAction(const QMenu &menu, int id)
+{
+    foreach (QAction* action, menu.actions()) {
+        if(action->data().toInt() == id)return action;
+    }
+    return NULL;
+}
+
+void MenuFactory::insertItem(QMenu &parentMenu, QString name, QMenu *menu, QString what)
+{
+    menu->setTitle(name);
+    parentMenu.addMenu(menu);
+    if(!what.isEmpty())
+        menu->setWhatsThis(what);
 }
diff --git a/src/ui/menufactory.h b/src/ui/menufactory.h
index 16eb47805..d803633b5 100644
--- a/src/ui/menufactory.h
+++ b/src/ui/menufactory.h
@@ -27,14 +27,13 @@
 #define MENUFACTORY_H
 
 #include <QMenu>
-#include <QMenuItem>
-#include <Q3PopupMenu>
+//#include <QMenuItem>
 #include "mystr.h"
 
 class MenuFactory
 {
 private:
-    Q3PopupMenu m_menu;
+    QMenu m_menu;
 
 public:
     typedef struct _Item {
@@ -52,15 +51,15 @@ class MenuFactory
         const QString & title);
 
     static void addItems(
-        Q3PopupMenu & menu,
+        QMenu & menu,
         const Item    items[],
         const int     nofItems);
 
     static void addItem(
-        Q3PopupMenu   &   menu,
-        const char * const name,
+        QMenu   &   menu,
+        const QString name,
         const int         id,
-        const char * const whatsThis = NULL);
+        QString const whatsThis = QString());
 
     virtual void createTitle(
         const QString title);
@@ -78,9 +77,11 @@ class MenuFactory
         const char * const name,
         QMenu * const      subMenu);
 
-    virtual Q3PopupMenu & menu();
+    virtual QMenu & menu();
 
     virtual void insertSeparator();
+    static QAction* findAction(const QMenu &menu , int id);
+    static void insertItem(QMenu& parentMenu, QString name, QMenu* menu, QString what = QString());
 
 };
 
diff --git a/src/ui/quickedit.ui b/src/ui/quickedit.ui
new file mode 100644
index 000000000..307235a26
--- /dev/null
+++ b/src/ui/quickedit.ui
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QuickEdit</class>
+ <widget class="QWidget" name="QuickEdit">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>927</width>
+    <height>595</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="4">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="pbRefreshView">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../icons.qrc">
+         <normaloff>:/root/icons/arrow_refresh.png</normaloff>:/root/icons/arrow_refresh.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pbUpOneLevel">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../icons.qrc">
+         <normaloff>:/root/icons/next_folder.png</normaloff>:/root/icons/next_folder.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pbDownOneLevel">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../icons.qrc">
+         <normaloff>:/root/icons/previous folder.png</normaloff>:/root/icons/previous folder.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="leSearch"/>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cbViewMode">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QWidget" name="wdgContextButtonHolder" native="true"/>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_2">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Previous Item</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Next Item</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="chkCpp">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>C++</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="chkJava">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Java</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="chkPython">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Python</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="chkPhp">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Php</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="chkIdl">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Idl</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="3">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>825</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="4">
+    <widget class="QTreeView" name="tvEditor"/>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="pbAddOperation">
+     <property name="text">
+      <string>Operation</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../icons.qrc">
+       <normaloff>:/root/icons/bullet_add.png</normaloff>:/root/icons/bullet_add.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="pbAddParameter">
+     <property name="text">
+      <string>Parameter</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../icons.qrc">
+       <normaloff>:/root/icons/bullet_add.png</normaloff>:/root/icons/bullet_add.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QPushButton" name="pbAddAttribute">
+     <property name="text">
+      <string>Attribute</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../icons.qrc">
+       <normaloff>:/root/icons/bullet_add.png</normaloff>:/root/icons/bullet_add.png</iconset>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/ui/toolbarfactory.cpp b/src/ui/toolbarfactory.cpp
new file mode 100644
index 000000000..4ee45fd28
--- /dev/null
+++ b/src/ui/toolbarfactory.cpp
@@ -0,0 +1,38 @@
+#include "toolbarfactory.h"
+#include <QToolButton>
+#include <QLayout>
+ToolBarFactory::ToolBarFactory()
+{
+}
+QToolButton *
+ToolBarFactory::createToolButton(
+        QPixmap icon,
+        QWidget * receiver,
+        const char * boundslot,
+        QToolBar * parent,
+        QString shown)
+{
+    QToolButton * newButton = new QToolButton(parent);
+    QObject::connect(newButton, SIGNAL(clicked()), receiver, boundslot);
+    newButton->setIcon(icon);
+    newButton->setText(shown);
+    newButton->setToolTip(shown);
+    newButton->setMinimumSize(30, 30);
+    parent->addWidget(newButton);
+    return newButton;
+}
+
+
+QToolButton *ToolBarFactory::createToolButton(const QIcon &icon, const QString &textLabel, const QString &statusTip, QObject *receiver,
+                                              const char *slot, QToolBar *parent, const char *name)
+{
+    QToolButton *newButton = new QToolButton(parent);
+    QObject::connect(newButton, SIGNAL(clicked()), receiver, slot);
+    newButton->setIcon(icon);
+    newButton->setText(textLabel);
+    newButton->setToolTip(statusTip);
+    newButton->setMinimumSize(30, 30);
+    parent->addWidget(newButton);
+    newButton->setToolTip(name);
+    return newButton;
+}
diff --git a/src/ui/toolbarfactory.h b/src/ui/toolbarfactory.h
new file mode 100644
index 000000000..3a8803206
--- /dev/null
+++ b/src/ui/toolbarfactory.h
@@ -0,0 +1,13 @@
+#ifndef TOOLBARFACTORY_H
+#define TOOLBARFACTORY_H
+#include <QToolBar>
+class QToolButton;
+class ToolBarFactory
+{
+public:
+    ToolBarFactory();
+    static QToolButton *createToolButton(QPixmap icon, QWidget *receiver, const char *boundslot, QToolBar *parent, QString shown);
+    static QToolButton *createToolButton(const QIcon & icon, const QString & textLabel, const QString & statusTip, QObject * receiver, const char * slot, QToolBar * parent, const char * name = 0);
+};
+
+#endif // TOOLBARFACTORY_H
diff --git a/src/ui/vvbox.cpp b/src/ui/vvbox.cpp
new file mode 100644
index 000000000..9f2e153da
--- /dev/null
+++ b/src/ui/vvbox.cpp
@@ -0,0 +1,26 @@
+#include "vvbox.h"
+
+VVBox::VVBox(QWidget *parent) :
+    QWidget(parent)
+{
+    m_layout = new QVBoxLayout(this);
+    this->setLayout(m_layout);
+    m_layout->setSpacing(2);
+    m_layout->setMargin(2);
+}
+
+void VVBox::addWidget(QWidget *widget)
+{
+    m_layout->addWidget(widget);
+}
+bool VVBox::setStretchFactor(QWidget *w, int stretch)
+{
+    if(m_layout->indexOf(w) == -1)
+        m_layout->addWidget(w);
+    m_layout->setStretchFactor(w, stretch);
+    return 0;
+}
+void VVBox::setMargin(int margin)
+{
+    m_layout->setMargin(margin);
+}
diff --git a/src/ui/vvbox.h b/src/ui/vvbox.h
new file mode 100644
index 000000000..7f27f2ea8
--- /dev/null
+++ b/src/ui/vvbox.h
@@ -0,0 +1,22 @@
+#ifndef VVBOX_H
+#define VVBOX_H
+
+#include <QWidget>
+#include <QVBoxLayout>
+class VVBox : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit VVBox(QWidget *parent = 0);
+    void addWidget(QWidget* widget);
+
+    bool setStretchFactor(QWidget *w, int stretch);
+    void setMargin(int margin);
+signals:
+
+public slots:
+private:
+    QVBoxLayout *m_layout;
+};
+
+#endif // VVBOX_H
diff --git a/src/ui/widgetwithlayout.cpp b/src/ui/widgetwithlayout.cpp
new file mode 100644
index 000000000..b502e5585
--- /dev/null
+++ b/src/ui/widgetwithlayout.cpp
@@ -0,0 +1,33 @@
+#include "widgetwithlayout.h"
+#include <QGridLayout>
+#include <QVBoxLayout>
+
+QWidget *WidgetWithLayout::gridBox(int nCols, QWidget *parent)
+{
+    Q_UNUSED(nCols);
+    
+    QGridLayout *layout = new QGridLayout();
+    QWidget *widget = new QWidget(parent);
+    widget->setLayout(layout);
+    return widget;
+}
+
+QWidget *WidgetWithLayout::vBox(QWidget *parent)
+{
+    QVBoxLayout *layout = new QVBoxLayout();
+    QWidget *widget = new QWidget(parent);
+    widget->setLayout(layout);
+    return widget;
+}
+
+QWidget *WidgetWithLayout::hBox(QWidget *parent)
+{
+    QHBoxLayout *layout = new QHBoxLayout();
+    QWidget *widget = new QWidget(parent);
+    widget->setLayout(layout);
+    return widget;
+}
+
+WidgetWithLayout::WidgetWithLayout()
+{
+}
diff --git a/src/ui/widgetwithlayout.h b/src/ui/widgetwithlayout.h
new file mode 100644
index 000000000..009977a00
--- /dev/null
+++ b/src/ui/widgetwithlayout.h
@@ -0,0 +1,14 @@
+#ifndef WIDGETWITHLAYOUT_H
+#define WIDGETWITHLAYOUT_H
+#include <QWidget>
+class WidgetWithLayout
+{
+public:
+    static QWidget *gridBox(int nCols, QWidget *parent);
+    static QWidget *vBox(QWidget *parent);
+    static QWidget *hBox(QWidget *parent);
+private:
+    WidgetWithLayout();
+};
+
+#endif // WIDGETWITHLAYOUT_H